From c7d54cbbfd0607f46bacde38d7bb706108520e9a Mon Sep 17 00:00:00 2001 From: Mike0001-droid Date: Wed, 3 Jul 2024 17:57:42 +0500 Subject: [PATCH] =?UTF-8?q?=D1=81=D0=BE=D0=B7=D0=B4=D0=B0=D0=BB=20=D0=B7?= =?UTF-8?q?=D0=B0=D0=BF=D1=80=D0=BE=D1=81=20=D0=BD=D0=B0=20=D0=B8=D0=BD?= =?UTF-8?q?=D1=84=D0=BE=D1=80=D0=BC=D0=B0=D1=86=D0=B8=D1=8E=20=D0=BE=20?= =?UTF-8?q?=D1=82=D0=B5=D1=85=20=D0=BF=D0=BE=D0=B4=D0=B4=D0=B5=D1=80=D0=B6?= =?UTF-8?q?=D0=BA=D0=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../conf/__pycache__/urls.cpython-310.pyc | Bin 1543 -> 1604 bytes server/proj/conf/urls.py | 3 ++- server/proj/config_site/admin.py | 7 +++++-- server/proj/config_site/models.py | 12 ++++++++++++ server/proj/config_site/serializers.py | 7 +++++-- server/proj/config_site/views.py | 14 ++++++++++---- 6 files changed, 34 insertions(+), 9 deletions(-) diff --git a/server/proj/conf/__pycache__/urls.cpython-310.pyc b/server/proj/conf/__pycache__/urls.cpython-310.pyc index 5e9a03fbdb725547ca35ec26f8514b9dae721102..30c42f9fb3ce44fc07f6037be4e465d2d0ceb38c 100644 GIT binary patch delta 548 zcmYk3Jxjwt7{~7tQ)+WblfKu!*lM+iprebcgHB3C`tq>cytGYjQUU~` z-GrUw$uLiMQ+ArC!yM~o>@3gPIi9ogJWmPgPczSi7qDOzK}7>pV4f^|z#5vMO|Xt> z&?h*KIfzg2rGZ&6CWMK3FvqMw0;yH9%GVMqki_WI>@$HBq&-=12B$;LjyZ?1kn>}n zK^Y2A^k{gxgc0$;^7V+y7=c-+Ky}-b!uFgH^H76oz(-MD!K77nzp#Q#q&ZRZu;58+ zM07^3CfvfmgT)33YN_sj(3^rZRClpy?{)B^foH=+V{mffxM!Qaw&U+ew#ND+anKRw z^-Wr(bkYBnA8E$FpQ>!QOnlQ&1*_RRa#mVSukC8WaNQjox}DZ>f8|`<+;{ars?7m( toUw@u;~K$Y`ae@wk$Mp8{;9HGTo;iMMh%*xObK=-W{O5-gZke}?GHt*h)Mte delta 487 zcmYk2%}T>S5XX0urnb!{P22Rlwch~|dKJWj_zHTE+-hf98k+`Es(7kc!BY+;;7w@n z-h2YVi?7h<(7T(oLU)E)D*TgJg$tr`48pyyrk^6uZ)Ir%}74x9(aT0To z++z(3FxPfMf)rA#VpSIcN|46b>TpdU1G*=2&SE^|+>Y~@2)VH1B8pIgvPZ+;6^!zM zs*5dEF$#xJgSsb#-3I3-w6=UUjF~k|TXpvvYsh$N@M=Qa6HW;4Y+Z}H_P>M9B?;=t z@Hh1NfNta~?AiWal?@R_RM86(w{{i^v BbNc`Q diff --git a/server/proj/conf/urls.py b/server/proj/conf/urls.py index 947e8c3..8169b46 100644 --- a/server/proj/conf/urls.py +++ b/server/proj/conf/urls.py @@ -8,7 +8,7 @@ from rest_framework_simplejwt.views import ( ) from django.conf.urls.static import static from rest_framework import routers -from config_site.views import TeamViewSet +from config_site.views import TeamViewSet, SupportInfoViewSet from django.conf import settings from rubricks.views import RubricViewSet from audio.views import SongViewSet, PlayListViewSet, FavoriteSongViewSet @@ -16,6 +16,7 @@ from audio.views import SongViewSet, PlayListViewSet, FavoriteSongViewSet router = routers.DefaultRouter() router.register(r'teams', TeamViewSet, basename='teams') +router.register(r'support_info', SupportInfoViewSet, basename='support_info') router.register(r'rubriks', RubricViewSet, basename='rubriks') router.register(r'playlists', PlayListViewSet, basename='playlists') router.register(r'song', SongViewSet, basename='song') diff --git a/server/proj/config_site/admin.py b/server/proj/config_site/admin.py index f24b8a8..0e04d4c 100644 --- a/server/proj/config_site/admin.py +++ b/server/proj/config_site/admin.py @@ -1,7 +1,10 @@ -from .models import Team +from .models import Team, SupportInfo from django.contrib import admin @admin.register(Team) class TeamAdmin(admin.ModelAdmin): list_display = ('name', 'last_name', 'position', 'img_person') - \ No newline at end of file + +@admin.register(SupportInfo) +class SupportInfoAdmin(admin.ModelAdmin): + list_display = ('phone', 'city', 'street', 'house', 'email', 'vk_url', 'telegram_url') \ No newline at end of file diff --git a/server/proj/config_site/models.py b/server/proj/config_site/models.py index d7908e5..05f0e7d 100644 --- a/server/proj/config_site/models.py +++ b/server/proj/config_site/models.py @@ -25,3 +25,15 @@ class Team(models.Model): verbose_name = 'Команда' verbose_name_plural = 'Команда' +class SupportInfo(models.Model): + phone = models.CharField('Номер телефона', max_length=50, null=True, blank=True) + city = models.CharField('Город', max_length=50, null=True, blank=True) + street = models.CharField('Улица', max_length=50, null=True, blank=True) + house = models.CharField('Номер дома', max_length=3, null=True, blank=True) + email = models.EmailField('Почта', max_length=50, null=True, blank=True) + vk_url = models.URLField('Ссылка на группу Вк', max_length=50, null=True, blank=True) + telegram_url = models.URLField('Ссылка на канал в Телегерамме', max_length=50, null=True, blank=True) + + class Meta: + verbose_name = 'Тех поддержка' + verbose_name_plural = 'Тех поддержка' diff --git a/server/proj/config_site/serializers.py b/server/proj/config_site/serializers.py index 0fb00ef..6d04259 100644 --- a/server/proj/config_site/serializers.py +++ b/server/proj/config_site/serializers.py @@ -1,9 +1,12 @@ from rest_framework import serializers -from .models import Team +from .models import Team, SupportInfo class TeamSerializer(serializers.ModelSerializer): class Meta: model = Team fields = ('id', 'name', 'last_name', 'position', 'img_person') - +class SupportInfoSerializer(serializers.ModelSerializer): + class Meta: + model = SupportInfo + fields = '__all__' \ No newline at end of file diff --git a/server/proj/config_site/views.py b/server/proj/config_site/views.py index 069c36b..0f5be9c 100644 --- a/server/proj/config_site/views.py +++ b/server/proj/config_site/views.py @@ -1,12 +1,10 @@ -from django.shortcuts import render from rest_framework.viewsets import GenericViewSet from rest_framework.response import Response -from rest_framework.decorators import action from rest_framework import status -from .models import Team -from .serializers import TeamSerializer +from .models import Team, SupportInfo +from .serializers import TeamSerializer, SupportInfoSerializer class TeamViewSet(GenericViewSet): @@ -18,4 +16,12 @@ class TeamViewSet(GenericViewSet): serializer = self.get_serializer(queryset, many=True) return Response(serializer.data, status=status.HTTP_200_OK) +class SupportInfoViewSet(GenericViewSet): + queryset = SupportInfo + serializer_class = SupportInfoSerializer + + def list(self, request): + queryset = self.get_queryset().objects.all() + serializer = self.get_serializer(queryset, many=True) + return Response(serializer.data, status=status.HTTP_200_OK) \ No newline at end of file