Skip to content

Commit 39938d3

Browse files
dumax315github-actions[bot]
authored andcommitted
Auto code format
1 parent 31456ec commit 39938d3

11 files changed

Lines changed: 276 additions & 240 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: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,9 @@
33

44
from UserAuth.views import delete_account
55

6-
from .views import (create_wrap, like_unlike_wrap, make_wraps_public,
7-
view_public_wraps, view_wrap, view_wraps, view_liked_wraps, make_wraps_private)
6+
from .views import (create_wrap, like_unlike_wrap, make_wraps_private,
7+
make_wraps_public, view_liked_wraps, view_public_wraps,
8+
view_wrap, view_wraps)
89

910
urlpatterns = [
1011
path("view_wraps/", view_wraps, name="view_wraps"),
@@ -15,6 +16,6 @@
1516
path("make_wraps_public/", make_wraps_public, name="make_wraps_public"),
1617
path("view_public_wraps/", view_public_wraps, name="view_public_wraps"),
1718
path("delete_account/", delete_account, name="delete_account"),
18-
path('liked-wraps/', view_liked_wraps, name='view_liked_wraps'),
19+
path("liked-wraps/", view_liked_wraps, name="view_liked_wraps"),
1920
path("make_wraps_private/", make_wraps_private, name="make_wraps_private"),
2021
]

Wrapped/views.py

Lines changed: 47 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

@@ -33,6 +31,7 @@ def make_wraps_public(request):
3331

3432
return redirect("profile")
3533

34+
3635
def make_wraps_private(request):
3736
wrap_ids = request.POST.getlist("wrap_ids")
3837
action = request.POST.get("action")
@@ -61,8 +60,8 @@ def view_liked_wraps(request):
6160

6261
public_wraps = public_wraps.filter(is_liked_by_user=True)
6362

64-
if request.method == 'POST':
65-
wrap_uuid = request.POST.get('wrap_uuid')
63+
if request.method == "POST":
64+
wrap_uuid = request.POST.get("wrap_uuid")
6665
wrap = get_object_or_404(SpotifyWrap, uuid=wrap_uuid)
6766

6867
liked = None
@@ -77,14 +76,21 @@ def view_liked_wraps(request):
7776

7877
wrap.save()
7978
print(liked)
80-
return JsonResponse({
81-
"success": True,
82-
"liked": liked,
83-
"wrap_uuid": wrap.uuid,
84-
})
85-
return render(request, "Wrapped/view_liked_wraps.html", {
86-
"wraps": public_wraps,
87-
})
79+
return JsonResponse(
80+
{
81+
"success": True,
82+
"liked": liked,
83+
"wrap_uuid": wrap.uuid,
84+
}
85+
)
86+
return render(
87+
request,
88+
"Wrapped/view_liked_wraps.html",
89+
{
90+
"wraps": public_wraps,
91+
},
92+
)
93+
8894

8995
def view_public_wraps(request):
9096
public_wraps = SpotifyWrap.objects.filter(is_public=True).annotate(
@@ -96,9 +102,8 @@ def view_public_wraps(request):
96102
)
97103
)
98104

99-
100-
if request.method == 'POST':
101-
wrap_uuid = request.POST.get('wrap_uuid')
105+
if request.method == "POST":
106+
wrap_uuid = request.POST.get("wrap_uuid")
102107
wrap = get_object_or_404(SpotifyWrap, uuid=wrap_uuid)
103108

104109
liked = None
@@ -113,14 +118,20 @@ def view_public_wraps(request):
113118

114119
wrap.save()
115120
print(liked)
116-
return JsonResponse({
117-
"success": True,
118-
"liked": liked,
119-
"wrap_uuid": wrap.uuid,
120-
})
121-
return render(request, "Wrapped/view_public_wraps.html", {
122-
"wraps": public_wraps,
123-
})
121+
return JsonResponse(
122+
{
123+
"success": True,
124+
"liked": liked,
125+
"wrap_uuid": wrap.uuid,
126+
}
127+
)
128+
return render(
129+
request,
130+
"Wrapped/view_public_wraps.html",
131+
{
132+
"wraps": public_wraps,
133+
},
134+
)
124135

125136

126137
@login_required
@@ -140,14 +151,17 @@ def like_unlike_wrap(request, wrap_id):
140151

141152
wrap.save()
142153

143-
return JsonResponse({
144-
"success": True,
145-
"liked": liked,
146-
"wrap_uuid": wrap.uuid,
147-
})
154+
return JsonResponse(
155+
{
156+
"success": True,
157+
"liked": liked,
158+
"wrap_uuid": wrap.uuid,
159+
}
160+
)
148161

149162
return JsonResponse({"success": False, "message": "Invalid request."})
150163

164+
151165
def view_wraps(request):
152166
wraps = SpotifyWrap.objects.filter(user=request.user)
153167
return render(request, "Wrapped/view_wraps.html", {"wraps": wraps})
@@ -202,6 +216,7 @@ def view_wrap(request, wrap_id):
202216
},
203217
)
204218

219+
205220
def like_wrap(request, wrap_id):
206221
wrap = get_object_or_404(SpotifyWrap, uuid=wrap_id)
207222

@@ -213,7 +228,7 @@ def like_wrap(request, wrap_id):
213228
message = "Liked"
214229
wrap.save()
215230

216-
return JsonResponse({'message': message})
231+
return JsonResponse({"message": message})
217232

218233

219234
key_map = {

templates/UserAuth/login.html

Lines changed: 6 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -2,36 +2,28 @@
22
{% load static %}
33
{% block body %}
44
<div class="vert-center">
5-
<form class="authForm" action='{% url 'login' %}' method="post">
6-
{% csrf_token %}
7-
<h3>Sign in</h3>
8-
<br>
5+
<form class="authForm" action='{% url 'login' %}' method="post">
6+
{% csrf_token %}
7+
<h3>Sign in</h3>
8+
<br>
99
{% if form.email.errors %}
1010
<div class="form-errors">
11-
{% for error in form.email.errors %}
12-
<p class="error-message">{{ error }}</p>
13-
{% endfor %}
11+
{% for error in form.email.errors %}<p class="error-message">{{ error }}</p>{% endfor %}
1412
</div>
1513
{% endif %}
16-
1714
<div>
1815
<label for="id_email">Email</label>
1916
{{ form.email }}
2017
</div>
21-
2218
{% if form.password.errors %}
2319
<div class="form-errors">
24-
{% for error in form.password.errors %}
25-
<p class="error-message">{{ error }}</p>
26-
{% endfor %}
20+
{% for error in form.password.errors %}<p class="error-message">{{ error }}</p>{% endfor %}
2721
</div>
2822
{% endif %}
29-
3023
<div class="account-validation-error">
3124
<label for="id_password">Password</label>
3225
{{ form.password }}
3326
</div>
34-
3527
<span class="clearfix">
3628
<button type="submit">Login with email</button>
3729
</span>

templates/UserAuth/profile.html

Lines changed: 41 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -35,35 +35,42 @@ <h2 class="pf-page-heading">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 'delete_wrap' wrap.uuid %}" class="delete-form">
45-
{% csrf_token %}
46-
<button type="button" class="delete-button">Delete</button>
47-
</form>
48-
<form class="toggle-public-form" method="post" action="{% url 'make_wraps_public' %}">
49-
{% csrf_token %}
50-
<input type="hidden" name="wrap_ids" value="{{ wrap.id }}">
51-
{% if wrap.is_public %}
52-
<input type="hidden" name="action" value="private">
53-
<button type="submit" class="post-button">Make Private</button>
54-
{% else %}
55-
<input type="hidden" name="action" value="post">
56-
<button type="submit" class="post-button">Make Public</button>
57-
{% endif %}
58-
</form>
59-
<div class="share-container">
60-
<a class="share-button" href="https://x.com/intent/post?text=Check out my anytime Spotify wrap on Spotify Wrapper&url={{ request.scheme }}://{{ request.get_host }}{% url 'view_wrap' wrap.uuid %}"><i class="fa fa-twitter"></i></a>
61-
<a class="share-button" href="https://www.linkedin.com/feed/?shareActive=true&text=Check out my anytime Spotify wrap on Spotify Wrapper {{ request.scheme }}://{{ request.get_host }}{% url 'view_wrap' wrap.uuid %}"><i class="fa fa-linkedin"></i></a>
62-
<a class="share-button" onclick="share('Check out my anytime Spotify wrap on Spotify Wrapper', '{{ request.scheme }}://{{ request.get_host }}{% url 'view_wrap' wrap.uuid %}')"><i class="fa fa-share"></i></a>
63-
</div>
64-
</div>
65-
</li>
66-
{% 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"
45+
action="{% url 'delete_wrap' wrap.uuid %}"
46+
class="delete-form">
47+
{% csrf_token %}
48+
<button type="button" class="delete-button">Delete</button>
49+
</form>
50+
<form class="toggle-public-form"
51+
method="post"
52+
action="{% url 'make_wraps_public' %}">
53+
{% csrf_token %}
54+
<input type="hidden" name="wrap_ids" value="{{ wrap.id }}">
55+
{% if wrap.is_public %}
56+
<input type="hidden" name="action" value="private">
57+
<button type="submit" class="post-button">Make Private</button>
58+
{% else %}
59+
<input type="hidden" name="action" value="post">
60+
<button type="submit" class="post-button">Make Public</button>
61+
{% endif %}
62+
</form>
63+
<div class="share-container">
64+
<a class="share-button"
65+
href="https://x.com/intent/post?text=Check out my anytime Spotify wrap on Spotify Wrapper&url={{ request.scheme }}://{{ request.get_host }}{% url 'view_wrap' wrap.uuid %}"><i class="fa fa-twitter"></i></a>
66+
<a class="share-button"
67+
href="https://www.linkedin.com/feed/?shareActive=true&text=Check out my anytime Spotify wrap on Spotify Wrapper {{ request.scheme }}://{{ request.get_host }}{% url 'view_wrap' wrap.uuid %}"><i class="fa fa-linkedin"></i></a>
68+
<a class="share-button"
69+
onclick="share('Check out my anytime Spotify wrap on Spotify Wrapper', '{{ request.scheme }}://{{ request.get_host }}{% url 'view_wrap' wrap.uuid %}')"><i class="fa fa-share"></i></a>
70+
</div>
71+
</div>
72+
</li>
73+
{% endfor %}
6774
</ul>
6875
{% else %}
6976
<div class="no-wraps">
@@ -101,14 +108,14 @@ <h3>{{ wrap.title }}</h3>
101108
}
102109
});
103110
});
104-
111+
105112
function share(text, url) {
106113
const shareData = {
107-
title: "SpotifyWrapped",
108-
text: text,
109-
url: url,
114+
title: "SpotifyWrapped",
115+
text: text,
116+
url: url,
110117
};
111-
118+
112119
navigator.share(shareData);
113120
}
114121
</script>

0 commit comments

Comments
 (0)