From ebb1f8af55296b98e06b08079600eda06bc83aec Mon Sep 17 00:00:00 2001 From: SeyedAb2 Date: Wed, 19 May 2021 12:59:50 +0430 Subject: [PATCH 1/3] add .venv to git --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index 2b00f1b..9044aac 100644 --- a/.gitignore +++ b/.gitignore @@ -81,6 +81,7 @@ celerybeat-schedule # virtualenv venv/ ENV/ +.venv/ # Spyder project settings .spyderproject From 9496f322c31d5eb873da9a65e8bd978f3f8b5b28 Mon Sep 17 00:00:00 2001 From: SeyedAb2 Date: Wed, 19 May 2021 14:48:55 +0430 Subject: [PATCH 2/3] update django --- conduit/urls.py | 6 +++--- requirements.txt | 12 ++++++------ 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/conduit/urls.py b/conduit/urls.py index 54612f9..ed6f90f 100644 --- a/conduit/urls.py +++ b/conduit/urls.py @@ -19,7 +19,7 @@ urlpatterns = [ url(r'^admin/', admin.site.urls), - url(r'^api/', include('conduit.apps.articles.urls', namespace='articles')), - url(r'^api/', include('conduit.apps.authentication.urls', namespace='authentication')), - url(r'^api/', include('conduit.apps.profiles.urls', namespace='profiles')), + url(r'^api/', include(('conduit.apps.articles.urls','conduit.apps.articles') ,namespace='articles')), + url(r'^api/', include(('conduit.apps.authentication.urls','conduit.apps.authentication'), namespace='authentication')), + url(r'^api/', include(('conduit.apps.profiles.urls','conduit.apps.profiles'), namespace='profiles')), ] diff --git a/requirements.txt b/requirements.txt index 6eb9d54..b8891be 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,6 +1,6 @@ -Django==1.10.5 -django-cors-middleware==1.3.1 -django-extensions==1.7.1 -djangorestframework==3.4.4 -PyJWT==1.4.2 -six==1.10.0 +Django +django-cors-middleware +django-extensions +djangorestframework +PyJWTd +six From 78c7618ed83c1df71ce56b38d3e6ff52d64cb4fe Mon Sep 17 00:00:00 2001 From: SeyedAb2 Date: Wed, 19 May 2021 15:51:14 +0430 Subject: [PATCH 3/3] changes app url and setup admin --- conduit/apps/articles/admin.py | 5 +++++ conduit/apps/articles/serializers.py | 2 +- conduit/apps/profiles/serializers.py | 2 +- requirements.txt | 15 +++++++++------ 4 files changed, 16 insertions(+), 8 deletions(-) create mode 100644 conduit/apps/articles/admin.py diff --git a/conduit/apps/articles/admin.py b/conduit/apps/articles/admin.py new file mode 100644 index 0000000..56da068 --- /dev/null +++ b/conduit/apps/articles/admin.py @@ -0,0 +1,5 @@ +from django.contrib import admin +from .models import * +admin.site.register(Article) +admin.site.register(Comment) +admin.site.register(Tag) \ No newline at end of file diff --git a/conduit/apps/articles/serializers.py b/conduit/apps/articles/serializers.py index 167909b..a61ed67 100644 --- a/conduit/apps/articles/serializers.py +++ b/conduit/apps/articles/serializers.py @@ -62,7 +62,7 @@ def get_favorited(self, instance): if request is None: return False - if not request.user.is_authenticated(): + if not request.user.is_authenticated: return False return request.user.profile.has_favorited(instance) diff --git a/conduit/apps/profiles/serializers.py b/conduit/apps/profiles/serializers.py index b799082..4d2ee8c 100644 --- a/conduit/apps/profiles/serializers.py +++ b/conduit/apps/profiles/serializers.py @@ -26,7 +26,7 @@ def get_following(self, instance): if request is None: return False - if not request.user.is_authenticated(): + if not request.user.is_authenticated: return False follower = request.user.profile diff --git a/requirements.txt b/requirements.txt index b8891be..bec789a 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,6 +1,9 @@ -Django -django-cors-middleware -django-extensions -djangorestframework -PyJWTd -six +asgiref==3.3.4 +Django==3.2.3 +django-cors-middleware==1.5.0 +django-extensions==3.1.3 +djangorestframework==3.12.4 +PyJWT==2.1.0 +pytz==2021.1 +six==1.16.0 +sqlparse==0.4.1 \ No newline at end of file