убрал остатки старой авторизации
This commit is contained in:
parent
67c1044fef
commit
a53387a471
|
|
@ -11,14 +11,15 @@ from rest_framework_simplejwt.views import (
|
||||||
from django.conf.urls.static import static
|
from django.conf.urls.static import static
|
||||||
from news import views as newsViews
|
from news import views as newsViews
|
||||||
from rest_framework import routers, serializers, viewsets
|
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 django.conf import settings
|
||||||
from rubricks.views import RubricViewSet
|
from rubricks.views import RubricViewSet
|
||||||
|
|
||||||
|
|
||||||
router = routers.DefaultRouter()
|
router = routers.DefaultRouter()
|
||||||
router.register(r'news', newsViews.NewsViewSet)
|
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'teams', TeamViewSet, basename='teams')
|
||||||
router.register(r'rubriks', RubricViewSet, basename='rubriks')
|
router.register(r'rubriks', RubricViewSet, basename='rubriks')
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -1,18 +1,13 @@
|
||||||
from django.contrib import admin
|
from django.contrib import admin
|
||||||
|
|
||||||
from rest_framework.authtoken.admin import TokenAdmin
|
from rest_framework.authtoken.admin import TokenAdmin
|
||||||
from .models import Profile, Team
|
from .models import Team
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
TokenAdmin.raw_id_fields = ['user']
|
TokenAdmin.raw_id_fields = ['user']
|
||||||
|
|
||||||
|
|
||||||
@admin.register(Profile)
|
|
||||||
class ProfileAdmin(admin.ModelAdmin):
|
|
||||||
list_display = ('user', 'likedSongs') # Add other fields if necessary
|
|
||||||
|
|
||||||
|
|
||||||
@admin.register(Team)
|
@admin.register(Team)
|
||||||
class TeamAdmin(admin.ModelAdmin):
|
class TeamAdmin(admin.ModelAdmin):
|
||||||
list_display = ('id', 'name', 'last_name', 'position', 'img_person')
|
list_display = ('id', 'name', 'last_name', 'position', 'img_person')
|
||||||
|
|
|
||||||
|
|
@ -1,8 +1,8 @@
|
||||||
from rest_framework import serializers, views, status
|
from rest_framework import serializers, views, status
|
||||||
from rest_framework.response import Response
|
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:
|
class Meta:
|
||||||
model = Profile
|
model = Profile
|
||||||
fields = ['user', 'likedSongs']
|
fields = ['user', 'likedSongs']
|
||||||
|
|
@ -19,7 +19,7 @@ class ProfileSerializer(serializers.ModelSerializer):
|
||||||
return instance
|
return instance
|
||||||
def create(self, validated_data):
|
def create(self, validated_data):
|
||||||
validated_data['likedSongs'] = []
|
validated_data['likedSongs'] = []
|
||||||
return Profile.objects.create(**validated_data)
|
return Profile.objects.create(**validated_data) """
|
||||||
|
|
||||||
class TeamSerializer(serializers.ModelSerializer):
|
class TeamSerializer(serializers.ModelSerializer):
|
||||||
class Meta:
|
class Meta:
|
||||||
|
|
|
||||||
|
|
@ -12,7 +12,7 @@ from rest_framework_simplejwt.exceptions import InvalidToken, AuthenticationFail
|
||||||
from .models import Profile, Team
|
from .models import Profile, Team
|
||||||
from .serializers import ProfileSerializer, TeamSerializer
|
from .serializers import ProfileSerializer, TeamSerializer
|
||||||
|
|
||||||
class ProfileViewSet(viewsets.ViewSet):
|
""" class ProfileViewSet(viewsets.ViewSet):
|
||||||
queryset = Profile.objects.all()
|
queryset = Profile.objects.all()
|
||||||
def list(self, request):
|
def list(self, request):
|
||||||
queryset = Profile.objects.all()
|
queryset = Profile.objects.all()
|
||||||
|
|
@ -59,7 +59,7 @@ class ProfileViewSet(viewsets.ViewSet):
|
||||||
user = request.user.pk
|
user = request.user.pk
|
||||||
profile = get_object_or_404(Profile, user=user)
|
profile = get_object_or_404(Profile, user=user)
|
||||||
serializer = ProfileSerializer(profile)
|
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):
|
class TeamViewSet(ViewSet):
|
||||||
def list(self, request):
|
def list(self, request):
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue