diff --git a/.gitignore b/.gitignore index 2b00f1b..2697a46 100644 --- a/.gitignore +++ b/.gitignore @@ -90,3 +90,4 @@ ENV/ # SQLite3 db.sqlite3 +.venv \ No newline at end of file diff --git a/conduit/apps/articles/admin.py b/conduit/apps/articles/admin.py new file mode 100644 index 0000000..e096146 --- /dev/null +++ b/conduit/apps/articles/admin.py @@ -0,0 +1,23 @@ +from django.contrib import admin +from .models import * + +class ArticleAdmin(admin.ModelAdmin): + list_display = ['slug', 'title', 'description'] + + +admin.site.register(Article, ArticleAdmin) + + +class CommentAdmin(admin.ModelAdmin): + search_fields = ['author', 'body'] + list_display = ['author', 'body'] + + +admin.site.register(Comment, CommentAdmin) + + +class TagAdmin(admin.ModelAdmin): + list_display = ['tag', 'slug'] + + +admin.site.register(Tag, TagAdmin) \ No newline at end of file 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/conduit/settings.py b/conduit/settings.py index 17b2df7..a906e0b 100644 --- a/conduit/settings.py +++ b/conduit/settings.py @@ -130,8 +130,8 @@ STATIC_URL = '/static/' CORS_ORIGIN_WHITELIST = ( - '0.0.0.0:4000', - 'localhost:4000', + 'http://0.0.0.0:4000', + 'http://localhost:4000', ) # Tell Django about the custom `User` model we created. The string diff --git a/conduit/urls.py b/conduit/urls.py index 54612f9..4f33d05 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..1240c83 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==3.2.3 +django-cors-middleware==1.5.0 +django-extensions==3.1.3 +djangorestframework==3.12.4 +PyJWT==2.1.0 +six==1.16.0