diff --git a/chirper/blog/static/Segoe UI Bold Italic.ttfZone.Identifier b/chirper/blog/static/Segoe UI Bold Italic.ttf:Zone.Identifier similarity index 96% rename from chirper/blog/static/Segoe UI Bold Italic.ttfZone.Identifier rename to chirper/blog/static/Segoe UI Bold Italic.ttf:Zone.Identifier index 37425d8..f04798a 100644 --- a/chirper/blog/static/Segoe UI Bold Italic.ttfZone.Identifier +++ b/chirper/blog/static/Segoe UI Bold Italic.ttf:Zone.Identifier @@ -1,3 +1,3 @@ -[ZoneTransfer] -ZoneId=3 -ReferrerUrl=C:\Users\rushi\Downloads\segoe-ui-4-cufonfonts.zip +[ZoneTransfer] +ZoneId=3 +ReferrerUrl=C:\Users\rushi\Downloads\segoe-ui-4-cufonfonts.zip diff --git a/chirper/blog/static/Segoe UI Bold.ttfZone.Identifier b/chirper/blog/static/Segoe UI Bold.ttf:Zone.Identifier similarity index 96% rename from chirper/blog/static/Segoe UI Bold.ttfZone.Identifier rename to chirper/blog/static/Segoe UI Bold.ttf:Zone.Identifier index 37425d8..f04798a 100644 --- a/chirper/blog/static/Segoe UI Bold.ttfZone.Identifier +++ b/chirper/blog/static/Segoe UI Bold.ttf:Zone.Identifier @@ -1,3 +1,3 @@ -[ZoneTransfer] -ZoneId=3 -ReferrerUrl=C:\Users\rushi\Downloads\segoe-ui-4-cufonfonts.zip +[ZoneTransfer] +ZoneId=3 +ReferrerUrl=C:\Users\rushi\Downloads\segoe-ui-4-cufonfonts.zip diff --git a/chirper/blog/static/Segoe UI Italic.ttfZone.Identifier b/chirper/blog/static/Segoe UI Italic.ttf:Zone.Identifier similarity index 96% rename from chirper/blog/static/Segoe UI Italic.ttfZone.Identifier rename to chirper/blog/static/Segoe UI Italic.ttf:Zone.Identifier index 37425d8..f04798a 100644 --- a/chirper/blog/static/Segoe UI Italic.ttfZone.Identifier +++ b/chirper/blog/static/Segoe UI Italic.ttf:Zone.Identifier @@ -1,3 +1,3 @@ -[ZoneTransfer] -ZoneId=3 -ReferrerUrl=C:\Users\rushi\Downloads\segoe-ui-4-cufonfonts.zip +[ZoneTransfer] +ZoneId=3 +ReferrerUrl=C:\Users\rushi\Downloads\segoe-ui-4-cufonfonts.zip diff --git a/chirper/blog/static/Segoe UI.ttfZone.Identifier b/chirper/blog/static/Segoe UI.ttf:Zone.Identifier similarity index 96% rename from chirper/blog/static/Segoe UI.ttfZone.Identifier rename to chirper/blog/static/Segoe UI.ttf:Zone.Identifier index 37425d8..f04798a 100644 --- a/chirper/blog/static/Segoe UI.ttfZone.Identifier +++ b/chirper/blog/static/Segoe UI.ttf:Zone.Identifier @@ -1,3 +1,3 @@ -[ZoneTransfer] -ZoneId=3 -ReferrerUrl=C:\Users\rushi\Downloads\segoe-ui-4-cufonfonts.zip +[ZoneTransfer] +ZoneId=3 +ReferrerUrl=C:\Users\rushi\Downloads\segoe-ui-4-cufonfonts.zip diff --git a/chirper/blog/static/android-chrome-192x192.png b/chirper/blog/static/android-chrome-192x192.png new file mode 100644 index 0000000..bef084a Binary files /dev/null and b/chirper/blog/static/android-chrome-192x192.png differ diff --git a/chirper/blog/static/android-chrome-192x192.png:Zone.Identifier b/chirper/blog/static/android-chrome-192x192.png:Zone.Identifier new file mode 100644 index 0000000..9d37583 --- /dev/null +++ b/chirper/blog/static/android-chrome-192x192.png:Zone.Identifier @@ -0,0 +1,3 @@ +[ZoneTransfer] +ZoneId=3 +ReferrerUrl=C:\Users\rushi\Downloads\favicon_io.zip diff --git a/chirper/blog/static/android-chrome-512x512.png b/chirper/blog/static/android-chrome-512x512.png new file mode 100644 index 0000000..1e6903f Binary files /dev/null and b/chirper/blog/static/android-chrome-512x512.png differ diff --git a/chirper/blog/static/android-chrome-512x512.png:Zone.Identifier b/chirper/blog/static/android-chrome-512x512.png:Zone.Identifier new file mode 100644 index 0000000..9d37583 --- /dev/null +++ b/chirper/blog/static/android-chrome-512x512.png:Zone.Identifier @@ -0,0 +1,3 @@ +[ZoneTransfer] +ZoneId=3 +ReferrerUrl=C:\Users\rushi\Downloads\favicon_io.zip diff --git a/chirper/blog/static/apple-touch-icon.png b/chirper/blog/static/apple-touch-icon.png new file mode 100644 index 0000000..3e3cd5f Binary files /dev/null and b/chirper/blog/static/apple-touch-icon.png differ diff --git a/chirper/blog/static/apple-touch-icon.png:Zone.Identifier b/chirper/blog/static/apple-touch-icon.png:Zone.Identifier new file mode 100644 index 0000000..9d37583 --- /dev/null +++ b/chirper/blog/static/apple-touch-icon.png:Zone.Identifier @@ -0,0 +1,3 @@ +[ZoneTransfer] +ZoneId=3 +ReferrerUrl=C:\Users\rushi\Downloads\favicon_io.zip diff --git a/chirper/blog/static/favicon-16x16.png b/chirper/blog/static/favicon-16x16.png new file mode 100644 index 0000000..5e04421 Binary files /dev/null and b/chirper/blog/static/favicon-16x16.png differ diff --git a/chirper/blog/static/favicon-16x16.png:Zone.Identifier b/chirper/blog/static/favicon-16x16.png:Zone.Identifier new file mode 100644 index 0000000..9d37583 --- /dev/null +++ b/chirper/blog/static/favicon-16x16.png:Zone.Identifier @@ -0,0 +1,3 @@ +[ZoneTransfer] +ZoneId=3 +ReferrerUrl=C:\Users\rushi\Downloads\favicon_io.zip diff --git a/chirper/blog/static/favicon-32x32.png b/chirper/blog/static/favicon-32x32.png new file mode 100644 index 0000000..a61529e Binary files /dev/null and b/chirper/blog/static/favicon-32x32.png differ diff --git a/chirper/blog/static/favicon-32x32.png:Zone.Identifier b/chirper/blog/static/favicon-32x32.png:Zone.Identifier new file mode 100644 index 0000000..9d37583 --- /dev/null +++ b/chirper/blog/static/favicon-32x32.png:Zone.Identifier @@ -0,0 +1,3 @@ +[ZoneTransfer] +ZoneId=3 +ReferrerUrl=C:\Users\rushi\Downloads\favicon_io.zip diff --git a/chirper/blog/static/favicon.ico b/chirper/blog/static/favicon.ico new file mode 100644 index 0000000..990fed3 Binary files /dev/null and b/chirper/blog/static/favicon.ico differ diff --git a/chirper/blog/static/favicon.ico:Zone.Identifier b/chirper/blog/static/favicon.ico:Zone.Identifier new file mode 100644 index 0000000..9d37583 --- /dev/null +++ b/chirper/blog/static/favicon.ico:Zone.Identifier @@ -0,0 +1,3 @@ +[ZoneTransfer] +ZoneId=3 +ReferrerUrl=C:\Users\rushi\Downloads\favicon_io.zip diff --git a/chirper/blog/static/site.webmanifest b/chirper/blog/static/site.webmanifest new file mode 100644 index 0000000..45dc8a2 --- /dev/null +++ b/chirper/blog/static/site.webmanifest @@ -0,0 +1 @@ +{"name":"","short_name":"","icons":[{"src":"/android-chrome-192x192.png","sizes":"192x192","type":"image/png"},{"src":"/android-chrome-512x512.png","sizes":"512x512","type":"image/png"}],"theme_color":"#ffffff","background_color":"#ffffff","display":"standalone"} \ No newline at end of file diff --git a/chirper/blog/static/site.webmanifest:Zone.Identifier b/chirper/blog/static/site.webmanifest:Zone.Identifier new file mode 100644 index 0000000..9d37583 --- /dev/null +++ b/chirper/blog/static/site.webmanifest:Zone.Identifier @@ -0,0 +1,3 @@ +[ZoneTransfer] +ZoneId=3 +ReferrerUrl=C:\Users\rushi\Downloads\favicon_io.zip diff --git a/chirper/blog/templates/blog/base.html b/chirper/blog/templates/blog/base.html index 3067fbb..8d69a23 100644 --- a/chirper/blog/templates/blog/base.html +++ b/chirper/blog/templates/blog/base.html @@ -14,8 +14,10 @@ + + - Chirper🐦 + Chirper diff --git a/chirper/blog/templates/blog/post_confirm_delete.html b/chirper/blog/templates/blog/post_confirm_delete.html index d175393..68668a8 100644 --- a/chirper/blog/templates/blog/post_confirm_delete.html +++ b/chirper/blog/templates/blog/post_confirm_delete.html @@ -1,27 +1,27 @@ -{% extends "blog/base.html" %} -{% block content %} -
-
- {% csrf_token %} -
- Delete post -

Are you sure you want to delete this post?

- -
-
- - No, take me back -
-
-
- -{% endblock content %} +{% extends "blog/base.html" %} +{% block content %} +
+
+ {% csrf_token %} +
+ Delete post +

Are you sure you want to delete this post?

+ +
+
+ + No, take me back +
+
+
+ +{% endblock content %} diff --git a/chirper/blog/templates/blog/post_detail.html b/chirper/blog/templates/blog/post_detail.html index e6de4cc..42364dd 100644 --- a/chirper/blog/templates/blog/post_detail.html +++ b/chirper/blog/templates/blog/post_detail.html @@ -1,19 +1,19 @@ -{% extends "blog/base.html" %} -{% block content %} -
- Profile Picture -
-
- {{ object.author.get_full_name }} - @{{ object.author }} · {{ object.date_posted }} - {% if object.author == user %} -
- Edit chirp - Delete chirp -
- {% endif %} -
-

{{ post.content }}

-
-
-{% endblock content %} +{% extends "blog/base.html" %} +{% block content %} +
+ Profile Picture +
+
+ {{ object.author.get_full_name }} + @{{ object.author }} · {{ object.date_posted }} + {% if object.author == user %} +
+ Edit chirp + Delete chirp +
+ {% endif %} +
+

{{ post.content }}

+
+
+{% endblock content %} diff --git a/chirper/blog/templates/blog/post_form.html b/chirper/blog/templates/blog/post_form.html index 7a07423..3aebb79 100644 --- a/chirper/blog/templates/blog/post_form.html +++ b/chirper/blog/templates/blog/post_form.html @@ -1,16 +1,16 @@ -{% extends "blog/base.html" %} -{% load crispy_forms_tags %} -{% block content %} -
-
- {% csrf_token %} -
- {{ form | crispy}} -
-
- -
-
-
- -{% endblock content %} +{% extends "blog/base.html" %} +{% load crispy_forms_tags %} +{% block content %} +
+
+ {% csrf_token %} +
+ {{ form | crispy}} +
+
+ +
+
+
+ +{% endblock content %} diff --git a/chirper/blog/templates/blog/user_posts.html b/chirper/blog/templates/blog/user_posts.html index bf349cc..acbfdaf 100644 --- a/chirper/blog/templates/blog/user_posts.html +++ b/chirper/blog/templates/blog/user_posts.html @@ -1,37 +1,37 @@ -{% extends "blog/base.html" %} -{% block content %} -

Posts by {{ view.kwargs.username }} ({{ page_obj.paginator.count }})

- {% for post in posts %} -
- Profile Picture -
-
- {{ post.author.get_full_name }} - @{{ post.author }} · {{ post.date_posted }} -
-

{{ post.content }}

-
-
- {% endfor %} - {% if is_paginated %} - - {% if page_obj.has_previous %} - First - Previous - {% endif %} - - {% for num in page_obj.paginator.page_range %} - {% if page_obj.number == num %} - {{ num }} - {% elif num > page_obj.number|add:'-3' and num < page_obj.number|add:'3' %} - {{ num }} - {% endif %} - {% endfor %} - - {% if page_obj.has_next %} - Next - Last - {% endif %} - - {% endif %} -{% endblock content %} +{% extends "blog/base.html" %} +{% block content %} +

Posts by {{ view.kwargs.username }} ({{ page_obj.paginator.count }})

+ {% for post in posts %} +
+ Profile Picture +
+
+ {{ post.author.get_full_name }} + @{{ post.author }} · {{ post.date_posted }} +
+

{{ post.content }}

+
+
+ {% endfor %} + {% if is_paginated %} + + {% if page_obj.has_previous %} + First + Previous + {% endif %} + + {% for num in page_obj.paginator.page_range %} + {% if page_obj.number == num %} + {{ num }} + {% elif num > page_obj.number|add:'-3' and num < page_obj.number|add:'3' %} + {{ num }} + {% endif %} + {% endfor %} + + {% if page_obj.has_next %} + Next + Last + {% endif %} + + {% endif %} +{% endblock content %} diff --git a/chirper/manage.py b/chirper/manage.py old mode 100644 new mode 100755 diff --git a/chirper/media/default2.jpg b/chirper/media/default2.jpg old mode 100644 new mode 100755 diff --git a/chirper/users/forms.py b/chirper/users/forms.py index bba9641..bab7193 100644 --- a/chirper/users/forms.py +++ b/chirper/users/forms.py @@ -1,22 +1,22 @@ -from django import forms -from django.contrib.auth.models import User -from .models import Profile - -class UserUpdateForm(forms.ModelForm): - - email = forms.EmailField() - - def __init__(self, *args, **kwargs): - super(UserUpdateForm, self).__init__(*args, **kwargs) - instance = getattr(self, 'instance', None) - if instance and instance.pk: - self.fields['username'].widget.attrs['readonly'] = True - - class Meta: - model = User - fields = ['username', 'email'] - -class ProfileUpdateForm(forms.ModelForm): - class Meta: - model = Profile - fields = ['profile_pic'] +from django import forms +from django.contrib.auth.models import User +from .models import Profile + +class UserUpdateForm(forms.ModelForm): + + email = forms.EmailField() + + def __init__(self, *args, **kwargs): + super(UserUpdateForm, self).__init__(*args, **kwargs) + instance = getattr(self, 'instance', None) + if instance and instance.pk: + self.fields['username'].widget.attrs['readonly'] = True + + class Meta: + model = User + fields = ['username', 'email'] + +class ProfileUpdateForm(forms.ModelForm): + class Meta: + model = Profile + fields = ['profile_pic'] diff --git a/chirper/users/signals.py b/chirper/users/signals.py index 5be6310..cb32c48 100644 --- a/chirper/users/signals.py +++ b/chirper/users/signals.py @@ -1,13 +1,13 @@ -from django.db.models.signals import post_save -from django.contrib.auth.models import User -from django.dispatch import receiver -from .models import Profile - -@receiver(post_save, sender=User) -def create_profile(sender, instance, created, **kwargs): - if created: - Profile.objects.create(user=instance) - -@receiver(post_save, sender=User) -def save_profile(sender, instance, **kwargs): - instance.profile.save() +from django.db.models.signals import post_save +from django.contrib.auth.models import User +from django.dispatch import receiver +from .models import Profile + +@receiver(post_save, sender=User) +def create_profile(sender, instance, created, **kwargs): + if created: + Profile.objects.create(user=instance) + +@receiver(post_save, sender=User) +def save_profile(sender, instance, **kwargs): + instance.profile.save() diff --git a/chirper/users/templates/users/logout.html b/chirper/users/templates/users/logout.html index 8a4e050..8a80d71 100644 --- a/chirper/users/templates/users/logout.html +++ b/chirper/users/templates/users/logout.html @@ -1,9 +1,9 @@ -{% extends "blog/base.html" %} -{% block content %} -

You have been logged out

-
- - Log In Again - -
-{% endblock content %} +{% extends "blog/base.html" %} +{% block content %} +

You have been logged out

+
+ + Log In Again + +
+{% endblock content %} diff --git a/chirper/users/templates/users/profile.html b/chirper/users/templates/users/profile.html index 3c529bc..bcfafbf 100644 --- a/chirper/users/templates/users/profile.html +++ b/chirper/users/templates/users/profile.html @@ -1,25 +1,25 @@ -{% extends "blog/base.html" %} -{% load crispy_forms_tags %} -{% block content %} -
-
- -
- -

{{ user.email }}

-
-
-
- {% csrf_token %} -
- Your profile - {{ userForm|crispy}} - {{ profileForm|crispy }} -
-
- -
-
-
- -{% endblock content %} +{% extends "blog/base.html" %} +{% load crispy_forms_tags %} +{% block content %} +
+
+ +
+ +

{{ user.email }}

+
+
+
+ {% csrf_token %} +
+ Your profile + {{ userForm|crispy}} + {{ profileForm|crispy }} +
+
+ +
+
+
+ +{% endblock content %} diff --git a/requirements.txt b/requirements.txt new file mode 100644 index 0000000..afc1b6c --- /dev/null +++ b/requirements.txt @@ -0,0 +1,31 @@ +asgiref==3.2.7 +certifi==2020.4.5.1 +cffi==1.14.0 +chardet==3.0.4 +cryptography==2.9.2 +defusedxml==0.7.0rc1 +Django==3.0.6 +django-cors-headers==3.2.1 +django-crispy-forms==1.9.1 +django-oauth-toolkit==1.3.2 +idna==2.9 +ion-oauth==0.1 +mongoengine==0.20.0 +oauth2-provider==0.0 +oauthlib==3.1.0 +Pillow==7.1.2 +pkg-resources==0.0.0 +pycparser==2.20 +PyJWT==1.7.1 +pymongo==3.10.1 +python-social-auth==0.3.6 +python3-openid==3.1.0 +pytz==2020.1 +requests==2.23.0 +requests-oauth==0.4.1 +requests-oauthlib==1.3.0 +six==1.15.0 +social-auth-core==3.3.3 +social-auth-storage-mongoengine==1.0.1 +sqlparse==0.3.1 +urllib3==1.25.9