From a53387a471183da9368ae73fe3c5563874ea5348 Mon Sep 17 00:00:00 2001 From: Mike0001-droid Date: Tue, 4 Jun 2024 15:08:06 +0500 Subject: [PATCH] =?UTF-8?q?=D1=83=D0=B1=D1=80=D0=B0=D0=BB=20=D0=BE=D1=81?= =?UTF-8?q?=D1=82=D0=B0=D1=82=D0=BA=D0=B8=20=D1=81=D1=82=D0=B0=D1=80=D0=BE?= =?UTF-8?q?=D0=B9=20=D0=B0=D0=B2=D1=82=D0=BE=D1=80=D0=B8=D0=B7=D0=B0=D1=86?= =?UTF-8?q?=D0=B8=D0=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- server/proj/conf/urls.py | 5 +++-- server/proj/userProfile/admin.py | 7 +------ server/proj/userProfile/serializers.py | 6 +++--- server/proj/userProfile/views.py | 4 ++-- 4 files changed, 9 insertions(+), 13 deletions(-) diff --git a/server/proj/conf/urls.py b/server/proj/conf/urls.py index d9b9c7d..0d7908c 100644 --- a/server/proj/conf/urls.py +++ b/server/proj/conf/urls.py @@ -11,14 +11,15 @@ from rest_framework_simplejwt.views import ( from django.conf.urls.static import static from news import views as newsViews from rest_framework import routers, serializers, viewsets -from userProfile.views import ProfileViewSet, TeamViewSet +#from userProfile.views import ProfileViewSet, TeamViewSet +from userProfile.views import TeamViewSet from django.conf import settings from rubricks.views import RubricViewSet router = routers.DefaultRouter() router.register(r'news', newsViews.NewsViewSet) -router.register(r'profiles', ProfileViewSet, basename='profiles') +#router.register(r'profiles', ProfileViewSet, basename='profiles') router.register(r'teams', TeamViewSet, basename='teams') router.register(r'rubriks', RubricViewSet, basename='rubriks') diff --git a/server/proj/userProfile/admin.py b/server/proj/userProfile/admin.py index fd14c65..72b223f 100644 --- a/server/proj/userProfile/admin.py +++ b/server/proj/userProfile/admin.py @@ -1,18 +1,13 @@ from django.contrib import admin from rest_framework.authtoken.admin import TokenAdmin -from .models import Profile, Team +from .models import Team TokenAdmin.raw_id_fields = ['user'] -@admin.register(Profile) -class ProfileAdmin(admin.ModelAdmin): - list_display = ('user', 'likedSongs') # Add other fields if necessary - - @admin.register(Team) class TeamAdmin(admin.ModelAdmin): list_display = ('id', 'name', 'last_name', 'position', 'img_person') diff --git a/server/proj/userProfile/serializers.py b/server/proj/userProfile/serializers.py index 58bb8c5..1b8a4f3 100644 --- a/server/proj/userProfile/serializers.py +++ b/server/proj/userProfile/serializers.py @@ -1,8 +1,8 @@ from rest_framework import serializers, views, status from rest_framework.response import Response -from .models import Profile, Team +from .models import Team -class ProfileSerializer(serializers.ModelSerializer): +""" class ProfileSerializer(serializers.ModelSerializer): class Meta: model = Profile fields = ['user', 'likedSongs'] @@ -19,7 +19,7 @@ class ProfileSerializer(serializers.ModelSerializer): return instance def create(self, validated_data): validated_data['likedSongs'] = [] - return Profile.objects.create(**validated_data) + return Profile.objects.create(**validated_data) """ class TeamSerializer(serializers.ModelSerializer): class Meta: diff --git a/server/proj/userProfile/views.py b/server/proj/userProfile/views.py index d5343de..691d795 100644 --- a/server/proj/userProfile/views.py +++ b/server/proj/userProfile/views.py @@ -12,7 +12,7 @@ from rest_framework_simplejwt.exceptions import InvalidToken, AuthenticationFail from .models import Profile, Team from .serializers import ProfileSerializer, TeamSerializer -class ProfileViewSet(viewsets.ViewSet): +""" class ProfileViewSet(viewsets.ViewSet): queryset = Profile.objects.all() def list(self, request): queryset = Profile.objects.all() @@ -59,7 +59,7 @@ class ProfileViewSet(viewsets.ViewSet): user = request.user.pk profile = get_object_or_404(Profile, user=user) serializer = ProfileSerializer(profile) - return Response(serializer.data['likedSongs'], status=status.HTTP_200_OK) + return Response(serializer.data['likedSongs'], status=status.HTTP_200_OK) """ class TeamViewSet(ViewSet): def list(self, request):