From a72deaec37916ed9ea462fe74075ea9a645885c0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=92=D0=B8=D0=BA=D1=82=D0=BE=D1=80=20=D0=93=D0=BB=D0=B0?= =?UTF-8?q?=D0=B4=D0=BA=D0=B8=D1=85?= Date: Mon, 2 Dec 2019 17:24:51 +0300 Subject: [PATCH 1/2] Site site settings --- apps/main/serializers.py | 9 ++++++++- apps/main/urls/back.py | 2 +- apps/main/views/back.py | 5 +++++ apps/main/views/web.py | 4 ++-- 4 files changed, 16 insertions(+), 4 deletions(-) diff --git a/apps/main/serializers.py b/apps/main/serializers.py index 410eb6bb..c0bf14ad 100644 --- a/apps/main/serializers.py +++ b/apps/main/serializers.py @@ -108,7 +108,14 @@ class SiteSerializer(serializers.ModelSerializer): fields = [ 'subdomain', 'site_url', - 'country' + 'country', + 'default_site', + 'pinterest_page_url', + 'twitter_page_url', + 'facebook_page_url', + 'instagram_page_url', + 'contact_email', + 'currency' ] diff --git a/apps/main/urls/back.py b/apps/main/urls/back.py index 40011aa2..25347434 100644 --- a/apps/main/urls/back.py +++ b/apps/main/urls/back.py @@ -9,7 +9,7 @@ urlpatterns = [ path('awards/', views.AwardLstView.as_view(), name='awards-list-create'), path('awards//', views.AwardRUDView.as_view(), name='awards-rud'), path('content_type/', views.ContentTypeView.as_view(), name='content_type-list'), - path('sites/', views.SiteListBackOfficeView.as_view(), name='site-list'), + path('sites/', views.SiteListBackOfficeView.as_view(), name='site-list-create'), path('site-settings//', views.SiteSettingsBackOfficeView.as_view(), name='site-settings'), ] diff --git a/apps/main/views/back.py b/apps/main/views/back.py index de47825b..95ac3b24 100644 --- a/apps/main/views/back.py +++ b/apps/main/views/back.py @@ -44,6 +44,11 @@ class SiteSettingsBackOfficeView(SiteSettingsView): serializer_class = serializers.SiteSettingsBackOfficeSerializer +# class SiteSettingsBackRUDView(generics.RetrieveUpdateDestroyAPIView): +# """Site settings RUD View.""" +# serializer_class = serializers.SiteSettingsBackOfficeSerializer + + class SiteListBackOfficeView(SiteListView): """Site settings View.""" serializer_class = serializers.SiteBackOfficeSerializer diff --git a/apps/main/views/web.py b/apps/main/views/web.py index 86c550da..12e23649 100644 --- a/apps/main/views/web.py +++ b/apps/main/views/web.py @@ -19,7 +19,7 @@ class DetermineSiteView(generics.GenericAPIView): return Response(data={'url': url}) -class SiteSettingsView(generics.RetrieveAPIView): +class SiteSettingsView(generics.RetrieveUpdateDestroyAPIView): """Site settings View.""" lookup_field = 'subdomain' @@ -28,7 +28,7 @@ class SiteSettingsView(generics.RetrieveAPIView): serializer_class = serializers.SiteSettingsBackOfficeSerializer -class SiteListView(generics.ListAPIView): +class SiteListView(generics.ListCreateAPIView): """Site settings View.""" pagination_class = None From e02db4958afd5f2b344d67cdd7b5e76833a06844 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=92=D0=B8=D0=BA=D1=82=D0=BE=D1=80=20=D0=93=D0=BB=D0=B0?= =?UTF-8?q?=D0=B4=D0=BA=D0=B8=D1=85?= Date: Mon, 2 Dec 2019 17:40:01 +0300 Subject: [PATCH 2/2] Add feature serializer --- apps/main/serializers.py | 16 ++++++++++++++++ apps/main/urls/back.py | 2 ++ apps/main/views/back.py | 15 ++++++++++----- 3 files changed, 28 insertions(+), 5 deletions(-) diff --git a/apps/main/serializers.py b/apps/main/serializers.py index c0bf14ad..561a50c0 100644 --- a/apps/main/serializers.py +++ b/apps/main/serializers.py @@ -139,6 +139,22 @@ class SiteBackOfficeSerializer(SiteSerializer): ] +class FeatureSerializer(serializers.ModelSerializer): + """Site feature serializer.""" + + class Meta: + """Meta class.""" + + model = models.Feature + fields = ( + 'id', + 'slug', + 'priority', + 'route', + 'site_settings', + ) + + # class SiteFeatureSerializer(serializers.ModelSerializer): # """Site feature serializer.""" # diff --git a/apps/main/urls/back.py b/apps/main/urls/back.py index 25347434..99e6a50f 100644 --- a/apps/main/urls/back.py +++ b/apps/main/urls/back.py @@ -12,4 +12,6 @@ urlpatterns = [ path('sites/', views.SiteListBackOfficeView.as_view(), name='site-list-create'), path('site-settings//', views.SiteSettingsBackOfficeView.as_view(), name='site-settings'), + path('feature/', views.FeatureBackView.as_view(), name='feature-list-create'), + path('feature//', views.FeatureRUDBackView.as_view(), name='feature-rud') ] diff --git a/apps/main/views/back.py b/apps/main/views/back.py index 95ac3b24..76c99e3d 100644 --- a/apps/main/views/back.py +++ b/apps/main/views/back.py @@ -39,16 +39,21 @@ class ContentTypeView(generics.ListAPIView): ) +class FeatureBackView(generics.ListCreateAPIView): + """Feature list or create View.""" + serializer_class = serializers.FeatureSerializer + + +class FeatureRUDBackView(generics.RetrieveUpdateDestroyAPIView): + """Feature RUD View.""" + serializer_class = serializers.FeatureSerializer + + class SiteSettingsBackOfficeView(SiteSettingsView): """Site settings View.""" serializer_class = serializers.SiteSettingsBackOfficeSerializer -# class SiteSettingsBackRUDView(generics.RetrieveUpdateDestroyAPIView): -# """Site settings RUD View.""" -# serializer_class = serializers.SiteSettingsBackOfficeSerializer - - class SiteListBackOfficeView(SiteListView): """Site settings View.""" serializer_class = serializers.SiteBackOfficeSerializer