diff --git a/backend/.gitignore b/backend/.gitignore index 97edf94..4e1cfce 100644 --- a/backend/.gitignore +++ b/backend/.gitignore @@ -143,4 +143,5 @@ GitHub.sublime-settings # Migrations # **/migrations/** !**/migrations -!**/migrations/__init__.py \ No newline at end of file +!**/migrations/__init__.py +videoflix/user/migrations \ No newline at end of file diff --git a/backend/videoflix/users/__init__.py b/backend/videoflix/__init__.py similarity index 100% rename from backend/videoflix/users/__init__.py rename to backend/videoflix/__init__.py diff --git a/backend/videoflix/videoflix/asgi.py b/backend/videoflix/asgi.py similarity index 100% rename from backend/videoflix/videoflix/asgi.py rename to backend/videoflix/asgi.py diff --git a/backend/videoflix/videoflix/settings.py b/backend/videoflix/settings.py similarity index 92% rename from backend/videoflix/videoflix/settings.py rename to backend/videoflix/settings.py index 7a0d131..2f63baf 100644 --- a/backend/videoflix/videoflix/settings.py +++ b/backend/videoflix/settings.py @@ -20,7 +20,7 @@ BASE_DIR = Path(__file__).resolve().parent.parent # See https://docs.djangoproject.com/en/5.0/howto/deployment/checklist/ # SECURITY WARNING: keep the secret key used in production secret! -SECRET_KEY = 'django-insecure-l88ot$w3&q2v439@j_5ps()@1*fa&ho1o=eiig9##0!#3mz9nr' +SECRET_KEY = 'django-insecure-0uaid_f*y1j7ukfk5*im@axnjp#scxb51w#8j*^18axqc#o#v(' # SECURITY WARNING: don't run with debug turned on in production! DEBUG = True @@ -30,11 +30,6 @@ ALLOWED_HOSTS = [] # Application definition -REST_FRAMEWORK = { - 'DEFAULT_PAGINATION_CLASS': 'rest_framework.pagination.PageNumberPagination', - 'PAGE_SIZE': 10 -} - INSTALLED_APPS = [ 'django.contrib.admin', 'django.contrib.auth', @@ -42,8 +37,6 @@ INSTALLED_APPS = [ 'django.contrib.sessions', 'django.contrib.messages', 'django.contrib.staticfiles', - 'rest_framework', - 'users', ] MIDDLEWARE = [ diff --git a/backend/videoflix/videoflix/urls.py b/backend/videoflix/urls.py similarity index 68% rename from backend/videoflix/videoflix/urls.py rename to backend/videoflix/urls.py index 7ed4a4d..6b7d18f 100644 --- a/backend/videoflix/videoflix/urls.py +++ b/backend/videoflix/urls.py @@ -15,16 +15,8 @@ Including another URLconf 2. Add a URL to urlpatterns: path('blog/', include('blog.urls')) """ from django.contrib import admin -from django.urls import include, path -from rest_framework import routers -from users import views - -router = routers.DefaultRouter() -router.register(r'users', views.UserViewSet) -router.register(r'groups', views.GroupViewSet) +from django.urls import path urlpatterns = [ path('admin/', admin.site.urls), - path('', include(router.urls)), - path('api-auth/', include('rest_framework.urls', namespace='rest_framework')) ] diff --git a/backend/videoflix/users/migrations/__init__.py b/backend/videoflix/user/__init__.py similarity index 100% rename from backend/videoflix/users/migrations/__init__.py rename to backend/videoflix/user/__init__.py diff --git a/backend/videoflix/users/admin.py b/backend/videoflix/user/admin.py similarity index 100% rename from backend/videoflix/users/admin.py rename to backend/videoflix/user/admin.py diff --git a/backend/videoflix/users/apps.py b/backend/videoflix/user/apps.py similarity index 65% rename from backend/videoflix/users/apps.py rename to backend/videoflix/user/apps.py index 72b1401..36cce4c 100644 --- a/backend/videoflix/users/apps.py +++ b/backend/videoflix/user/apps.py @@ -1,6 +1,6 @@ from django.apps import AppConfig -class UsersConfig(AppConfig): +class UserConfig(AppConfig): default_auto_field = 'django.db.models.BigAutoField' - name = 'users' + name = 'user' diff --git a/backend/videoflix/users/models.py b/backend/videoflix/user/models.py similarity index 100% rename from backend/videoflix/users/models.py rename to backend/videoflix/user/models.py diff --git a/backend/videoflix/users/tests.py b/backend/videoflix/user/tests.py similarity index 100% rename from backend/videoflix/users/tests.py rename to backend/videoflix/user/tests.py diff --git a/backend/videoflix/user/views.py b/backend/videoflix/user/views.py new file mode 100644 index 0000000..91ea44a --- /dev/null +++ b/backend/videoflix/user/views.py @@ -0,0 +1,3 @@ +from django.shortcuts import render + +# Create your views here. diff --git a/backend/videoflix/users/serializer.py b/backend/videoflix/users/serializer.py deleted file mode 100644 index d265c6d..0000000 --- a/backend/videoflix/users/serializer.py +++ /dev/null @@ -1,12 +0,0 @@ -from django.contrib.auth.models import User, Group -from rest_framework import serializers - -class UserSerializer(serializers.HyperlinkedModelSerializer): - class Meta: - model = User - fields = ['url', 'id', 'username', 'email'] - -class GroupSerializer(serializers.HyperlinkedModelSerializer): - class Meta: - model = Group - fields = ['url', 'name'] \ No newline at end of file diff --git a/backend/videoflix/users/views.py b/backend/videoflix/users/views.py deleted file mode 100644 index 786d925..0000000 --- a/backend/videoflix/users/views.py +++ /dev/null @@ -1,20 +0,0 @@ -from django.shortcuts import render -from django.contrib.auth.models import Group, User -from rest_framework import permissions, viewsets -from users.serializer import GroupSerializer, UserSerializer - -class UserViewSet(viewsets.ModelViewSet): - """ - API endpoint that allows users to be viewed or edited. - """ - queryset = User.objects.all().order_by('id') - serializer_class = UserSerializer - # permission_classes = [permissions.IsAuthenticated] - -class GroupViewSet(viewsets.ModelViewSet): - """ - API endpoint that allows groups to be viewed or edited. - """ - queryset = Group.objects.all().order_by('name') - serializer_class = GroupSerializer - # permission_classes = [permissions.IsAuthenticated] \ No newline at end of file diff --git a/backend/videoflix/videoflix/__init__.py b/backend/videoflix/videoflix/__init__.py deleted file mode 100644 index e69de29..0000000 diff --git a/backend/videoflix/videoflix/wsgi.py b/backend/videoflix/wsgi.py similarity index 100% rename from backend/videoflix/videoflix/wsgi.py rename to backend/videoflix/wsgi.py