diff --git a/.idea/workspace.xml b/.idea/workspace.xml index e50ad7b..43975b9 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -10,23 +10,32 @@ + + + + + - + + + + + + + - - - - - - + + + + + + @@ -118,7 +141,19 @@ - + + + @@ -127,7 +162,8 @@ - @@ -138,6 +174,10 @@ + + + + @@ -166,6 +206,14 @@ + + + + + + + + @@ -174,13 +222,17 @@ - + - + + + + + \ No newline at end of file diff --git a/ITShowPlatform/settings.py b/ITShowPlatform/settings.py index 5b796f0..eb7b1de 100644 --- a/ITShowPlatform/settings.py +++ b/ITShowPlatform/settings.py @@ -25,7 +25,7 @@ SECRET_KEY = 'django-insecure-0cn#v4ei2(^n+txyh4%3d5sllz6mknz#7t$!cq-d!ly*_rwvh2 # SECURITY WARNING: don't run with debug turned on in production! DEBUG = True -ALLOWED_HOSTS = [] +ALLOWED_HOSTS = ["*"] # Application definition @@ -47,7 +47,7 @@ MIDDLEWARE = [ 'django.middleware.security.SecurityMiddleware', 'django.contrib.sessions.middleware.SessionMiddleware', 'django.middleware.common.CommonMiddleware', - 'django.middleware.csrf.CsrfViewMiddleware', + #'django.middleware.csrf.CsrfViewMiddleware', 'django.contrib.auth.middleware.AuthenticationMiddleware', 'django.contrib.messages.middleware.MessageMiddleware', 'django.middleware.clickjacking.XFrameOptionsMiddleware', diff --git a/ITShowPlatform/urls.py b/ITShowPlatform/urls.py index 38184d1..61cc431 100644 --- a/ITShowPlatform/urls.py +++ b/ITShowPlatform/urls.py @@ -25,6 +25,7 @@ urlpatterns = [ path('admin/', admin.site.urls), path('v1/api/', include('comments.urls')), path('v1/api/', include('history.urls')), + path('v1/api/', include('enroll.urls')), path(r'^api-auth/', include('rest_framework.urls')), re_path(r'^media/(?P.*)', serve, {"document_root": settings.MEDIA_ROOT}), ] diff --git a/history/urls.py b/history/urls.py index 6d8989b..d0da8d0 100644 --- a/history/urls.py +++ b/history/urls.py @@ -6,5 +6,5 @@ from history.views import DepartmentViewSet, MemberViewSet, HistoryViewSet urlpatterns = [ path('department/', DepartmentViewSet.as_view()), path('member/', MemberViewSet.as_view()), - path('history_list/', HistoryViewSet.as_view()), + path('history/', HistoryViewSet.as_view()), ] + static(settings.MEDIA_URL, document_root=settings.MEDIA_ROOT)