Skip to content

Commit 67ac107

Browse files
Auto code format
1 parent a85cb50 commit 67ac107

10 files changed

Lines changed: 227 additions & 196 deletions

UserAuth/urls.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,5 @@
1313
path("unlink/", views.delete_token, name="unlink_token"),
1414
path("view_wraps/", include("Wrapped.urls"), name="view_wraps"),
1515
path("delete-wrap/<uuid:wrap_uuid>/", views.delete_wrap, name="delete_wrap"),
16-
1716
path("contact/", views.contact, name="contact"),
1817
]

Wrapped/migrations/0007_spotifywrap_liked_by.py

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,14 +8,19 @@
88
class Migration(migrations.Migration):
99

1010
dependencies = [
11-
('Wrapped', '0006_alter_spotifywrap_uuid'),
11+
("Wrapped", "0006_alter_spotifywrap_uuid"),
1212
migrations.swappable_dependency(settings.AUTH_USER_MODEL),
1313
]
1414

1515
operations = [
1616
migrations.AddField(
17-
model_name='spotifywrap',
18-
name='liked_by',
19-
field=models.ForeignKey(null=True, on_delete=django.db.models.deletion.CASCADE, related_name='liked_by', to=settings.AUTH_USER_MODEL),
17+
model_name="spotifywrap",
18+
name="liked_by",
19+
field=models.ForeignKey(
20+
null=True,
21+
on_delete=django.db.models.deletion.CASCADE,
22+
related_name="liked_by",
23+
to=settings.AUTH_USER_MODEL,
24+
),
2025
),
2126
]

Wrapped/migrations/0008_remove_spotifywrap_liked_by_spotifywrap_liked_by.py

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,18 +7,21 @@
77
class Migration(migrations.Migration):
88

99
dependencies = [
10-
('Wrapped', '0007_spotifywrap_liked_by'),
10+
("Wrapped", "0007_spotifywrap_liked_by"),
1111
migrations.swappable_dependency(settings.AUTH_USER_MODEL),
1212
]
1313

1414
operations = [
1515
migrations.RemoveField(
16-
model_name='spotifywrap',
17-
name='liked_by',
16+
model_name="spotifywrap",
17+
name="liked_by",
1818
),
1919
migrations.AddField(
20-
model_name='spotifywrap',
21-
name='liked_by',
22-
field=models.ManyToManyField(blank=True, related_name='liked_wraps', to=settings.AUTH_USER_MODEL),
20+
model_name="spotifywrap",
21+
name="liked_by",
22+
field=models.ManyToManyField(
23+
blank=True,
24+
related_name="liked_wraps",
25+
to=settings.AUTH_USER_MODEL),
2326
),
2427
]

Wrapped/migrations/0009_alter_spotifywrap_is_public.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,13 @@
66
class Migration(migrations.Migration):
77

88
dependencies = [
9-
('Wrapped', '0008_remove_spotifywrap_liked_by_spotifywrap_liked_by'),
9+
("Wrapped", "0008_remove_spotifywrap_liked_by_spotifywrap_liked_by"),
1010
]
1111

1212
operations = [
1313
migrations.AlterField(
14-
model_name='spotifywrap',
15-
name='is_public',
14+
model_name="spotifywrap",
15+
name="is_public",
1616
field=models.BooleanField(default=False),
1717
),
1818
]

Wrapped/models.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,8 @@ class SpotifyWrap(models.Model):
1717
audio_features = models.TextField(default="{}")
1818
is_public = models.BooleanField(default=False)
1919
likes = models.IntegerField(default=0)
20-
liked_by = models.ManyToManyField(User, related_name="liked_wraps", blank=True)
20+
liked_by = models.ManyToManyField(
21+
User, related_name="liked_wraps", blank=True)
2122

2223
def set_top_artists(self, artists_data):
2324
self.artists = json.dumps(artists_data)

Wrapped/urls.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
from UserAuth.views import delete_account
55

66
from .views import (create_wrap, like_unlike_wrap, make_wraps_public,
7-
view_public_wraps, view_wrap, view_wraps, view_liked_wraps)
7+
view_liked_wraps, view_public_wraps, view_wrap, view_wraps)
88

99
urlpatterns = [
1010
path("view_wraps/", view_wraps, name="view_wraps"),
@@ -15,5 +15,5 @@
1515
path("make_wraps_public/", make_wraps_public, name="make_wraps_public"),
1616
path("view_public_wraps/", view_public_wraps, name="view_public_wraps"),
1717
path("delete_account/", delete_account, name="delete_account"),
18-
path('liked-wraps/', view_liked_wraps, name='view_liked_wraps'),
18+
path("liked-wraps/", view_liked_wraps, name="view_liked_wraps"),
1919
]

Wrapped/views.py

Lines changed: 46 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -3,17 +3,15 @@
33
from datetime import datetime
44

55
import requests
6-
from django.http import JsonResponse, HttpResponseServerError
7-
from django.shortcuts import render, redirect, get_object_or_404
86
from django.contrib.auth.decorators import login_required
97
from django.contrib.auth.models import AnonymousUser
10-
from django.http import HttpResponseRedirect
11-
from django.http import HttpResponseNotFound, JsonResponse
8+
from django.db.models import Exists, OuterRef
9+
from django.http import (HttpResponseNotFound, HttpResponseRedirect,
10+
HttpResponseServerError, JsonResponse)
1211
from django.shortcuts import get_object_or_404, redirect, render
1312

1413
from UserAuth.models import SpotifyToken
1514
from UserAuth.util import get_user_tokens
16-
from django.db.models import Exists, OuterRef
1715

1816
from .models import SpotifyWrap
1917

@@ -46,8 +44,8 @@ def view_liked_wraps(request):
4644

4745
public_wraps = public_wraps.filter(is_liked_by_user=True)
4846

49-
if request.method == 'POST':
50-
wrap_uuid = request.POST.get('wrap_uuid')
47+
if request.method == "POST":
48+
wrap_uuid = request.POST.get("wrap_uuid")
5149
wrap = get_object_or_404(SpotifyWrap, uuid=wrap_uuid)
5250

5351
liked = None
@@ -62,14 +60,21 @@ def view_liked_wraps(request):
6260

6361
wrap.save()
6462
print(liked)
65-
return JsonResponse({
66-
"success": True,
67-
"liked": liked,
68-
"wrap_uuid": wrap.uuid,
69-
})
70-
return render(request, "Wrapped/view_liked_wraps.html", {
71-
"wraps": public_wraps,
72-
})
63+
return JsonResponse(
64+
{
65+
"success": True,
66+
"liked": liked,
67+
"wrap_uuid": wrap.uuid,
68+
}
69+
)
70+
return render(
71+
request,
72+
"Wrapped/view_liked_wraps.html",
73+
{
74+
"wraps": public_wraps,
75+
},
76+
)
77+
7378

7479
def view_public_wraps(request):
7580
public_wraps = SpotifyWrap.objects.filter(is_public=True).annotate(
@@ -81,9 +86,8 @@ def view_public_wraps(request):
8186
)
8287
)
8388

84-
85-
if request.method == 'POST':
86-
wrap_uuid = request.POST.get('wrap_uuid')
89+
if request.method == "POST":
90+
wrap_uuid = request.POST.get("wrap_uuid")
8791
wrap = get_object_or_404(SpotifyWrap, uuid=wrap_uuid)
8892

8993
liked = None
@@ -98,14 +102,20 @@ def view_public_wraps(request):
98102

99103
wrap.save()
100104
print(liked)
101-
return JsonResponse({
102-
"success": True,
103-
"liked": liked,
104-
"wrap_uuid": wrap.uuid,
105-
})
106-
return render(request, "Wrapped/view_public_wraps.html", {
107-
"wraps": public_wraps,
108-
})
105+
return JsonResponse(
106+
{
107+
"success": True,
108+
"liked": liked,
109+
"wrap_uuid": wrap.uuid,
110+
}
111+
)
112+
return render(
113+
request,
114+
"Wrapped/view_public_wraps.html",
115+
{
116+
"wraps": public_wraps,
117+
},
118+
)
109119

110120

111121
@login_required
@@ -125,14 +135,17 @@ def like_unlike_wrap(request, wrap_id):
125135

126136
wrap.save()
127137

128-
return JsonResponse({
129-
"success": True,
130-
"liked": liked,
131-
"wrap_uuid": wrap.uuid,
132-
})
138+
return JsonResponse(
139+
{
140+
"success": True,
141+
"liked": liked,
142+
"wrap_uuid": wrap.uuid,
143+
}
144+
)
133145

134146
return JsonResponse({"success": False, "message": "Invalid request."})
135147

148+
136149
def view_wraps(request):
137150
wraps = SpotifyWrap.objects.filter(user=request.user)
138151
return render(request, "Wrapped/view_wraps.html", {"wraps": wraps})
@@ -187,6 +200,7 @@ def view_wrap(request, wrap_id):
187200
},
188201
)
189202

203+
190204
def like_wrap(request, wrap_id):
191205
wrap = get_object_or_404(SpotifyWrap, uuid=wrap_id)
192206

@@ -198,7 +212,7 @@ def like_wrap(request, wrap_id):
198212
message = "Liked"
199213
wrap.save()
200214

201-
return JsonResponse({'message': message})
215+
return JsonResponse({"message": message})
202216

203217

204218
key_map = {

templates/UserAuth/profile.html

Lines changed: 25 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -35,29 +35,31 @@ <h2 class="pf-page-heading">Your Spotify Accounts</h2>
3535
{% if wraps is not none %}
3636
<h2 class="pf-page-heading">Spotify Wraps</h2>
3737
<ul>
38-
{% for wrap in wraps %}
39-
<li class="wrap">
40-
<h3>{{ wrap.title }}</h3>
41-
<a href="{% url 'view_wrap' wrap.uuid %}">View this wrap</a>
42-
<p>Posted by: {{ wrap.user.username }}</p>
43-
<div class="wrap-buttons">
44-
<form method="post" action="{% url 'like_unlike_wrap' wrap.uuid %}">
45-
{% csrf_token %}
46-
<button type="submit" class="like-button">Like</button>
47-
</form>
48-
<form method="post" action="{% url 'delete_wrap' wrap.uuid %}" class="delete-form">
49-
{% csrf_token %}
50-
<button type="button" class="delete-button">Delete</button>
51-
</form>
52-
<form class="post" method="post" action="{% url 'make_wraps_public' %}">
53-
{% csrf_token %}
54-
<input type="hidden" name="wrap_ids" value="{{ wrap.id }}">
55-
<input type="hidden" name="action" value="post">
56-
<button type="submit" class="post-button">Post</button>
57-
</form>
58-
</div>
59-
</li>
60-
{% endfor %}
38+
{% for wrap in wraps %}
39+
<li class="wrap">
40+
<h3>{{ wrap.title }}</h3>
41+
<a href="{% url 'view_wrap' wrap.uuid %}">View this wrap</a>
42+
<p>Posted by: {{ wrap.user.username }}</p>
43+
<div class="wrap-buttons">
44+
<form method="post" action="{% url 'like_unlike_wrap' wrap.uuid %}">
45+
{% csrf_token %}
46+
<button type="submit" class="like-button">Like</button>
47+
</form>
48+
<form method="post"
49+
action="{% url 'delete_wrap' wrap.uuid %}"
50+
class="delete-form">
51+
{% csrf_token %}
52+
<button type="button" class="delete-button">Delete</button>
53+
</form>
54+
<form class="post" method="post" action="{% url 'make_wraps_public' %}">
55+
{% csrf_token %}
56+
<input type="hidden" name="wrap_ids" value="{{ wrap.id }}">
57+
<input type="hidden" name="action" value="post">
58+
<button type="submit" class="post-button">Post</button>
59+
</form>
60+
</div>
61+
</li>
62+
{% endfor %}
6163
</ul>
6264
{% else %}
6365
<div class="no-wraps">

0 commit comments

Comments
 (0)