diff --git a/apps/account/urls/common.py b/apps/account/urls/common.py index 49819503..4d55f2fa 100644 --- a/apps/account/urls/common.py +++ b/apps/account/urls/common.py @@ -6,6 +6,6 @@ from account.views import common as views app_name = 'account' urlpatterns = [ - path('user/', views.UserView.as_view(), name='user_get_update'), - path('device/', views.FCMDeviceViewSet.as_view(), name='fcm_device_create'), + path('user/', views.UserView.as_view(), name='user-get-update'), + ] diff --git a/apps/advertisement/urls/web.py b/apps/advertisement/urls/web.py index a2974e9a..f7550015 100644 --- a/apps/advertisement/urls/web.py +++ b/apps/advertisement/urls/web.py @@ -6,5 +6,5 @@ from advertisement.views import web as views app_name = 'advertisement' urlpatterns = [ - path('list/', views.AdvertisementListView.as_view(), name='advertisements_list') + path('', views.AdvertisementListView.as_view(), name='list') ] diff --git a/apps/collection/urls/common.py b/apps/collection/urls/common.py index eab4a277..f3633b6b 100644 --- a/apps/collection/urls/common.py +++ b/apps/collection/urls/common.py @@ -6,36 +6,7 @@ from collection.views import common as views app_name = 'collection' urlpatterns = [ - path('list/', views.CollectionListView.as_view(), - name='collections_list'), - path('create/', views.CollectionCreateView.as_view(), - name='collection_create'), - # path('/', views.CollectionRetrieveView.as_view(), - # name='collection_retrieve'), - # path('/delete/', views.CollectionDestroyView.as_view(), - # name='collection_destroy'), - # path('/update/', views.CollectionUpdateView.as_view(), - # name='collection_update'), - - path('collection_items/', views.CollectionItemListView.as_view(), - name='collection_items_list'), - # path('collection_items/create/', views.CollectionItemCreateView.as_view(), - # name='collection_items_create'), - # path('collection_items//', views.CollectionItemRetrieveView.as_view(), - # name='collection_items_retrieve'), - # path('collection_items//delete/', views.CollectionDestroyView.as_view(), - # name='collection_items_destroy'), - # path('collection_items//update/', views.CollectionItemUpdateView.as_view(), - # name='collection_items_update'), - - path('guides/', views.GuideListView.as_view(), - name='guides_list'), - # path('guides/create/', views.GuideCreateView.as_view(), - # name='guide_create'), - # path('guides//', views.GuideRetrieveView.as_view(), - # name='guide_retrieve'), - # path('guides//delete/', views.GuideDestroyView.as_view(), - # name='guide_destroy'), - # path('guides//update/', views.GuideUpdateView.as_view(), - # name='guide_update'), + path('', views.CollectionListView.as_view(), name='list'), + path('items/', views.CollectionItemListView.as_view(), name='collection-items-list'), + path('guides/', views.GuideListView.as_view(), name='guides-list'), ] diff --git a/apps/establishment/admin.py b/apps/establishment/admin.py index 0562fb8e..7ac20493 100644 --- a/apps/establishment/admin.py +++ b/apps/establishment/admin.py @@ -1,4 +1,26 @@ """Establishment admin conf.""" from django.contrib import admin +from establishment import models +from django.contrib.contenttypes.admin import GenericTabularInline +from main.models import Award -# Register your models here. + +@admin.register(models.EstablishmentType) +class EstablishmentTypeAdmin(admin.ModelAdmin): + """EstablishmentType admin.""" + + +@admin.register(models.EstablishmentSubType) +class EstablishmentSubTypeAdmin(admin.ModelAdmin): + """EstablishmentSubType admin.""" + + +class AwardInline(GenericTabularInline): + model = Award + extra = 0 + + +@admin.register(models.Establishment) +class EstablishmentAdmin(admin.ModelAdmin): + """Establishment admin.""" + inlines = [AwardInline, ] diff --git a/apps/establishment/models.py b/apps/establishment/models.py index 67a6b6ce..26a3a87d 100644 --- a/apps/establishment/models.py +++ b/apps/establishment/models.py @@ -5,6 +5,7 @@ from django.db import models from django.utils.translation import gettext_lazy as _ from location.models import Address from utils.models import ProjectBaseMixin, ImageMixin, LocaleManagerMixin +from django.contrib.contenttypes import fields as generic # todo: establishment type&subtypes check @@ -91,6 +92,7 @@ class Establishment(ProjectBaseMixin, ImageMixin): price_level = models.PositiveIntegerField(blank=True, null=True, default=None, verbose_name=_('Price level')) + awards = generic.GenericRelation(to='main.Award') objects = EstablishmentManager() diff --git a/apps/gallery/urls.py b/apps/gallery/urls.py index b7fda0ca..53d1c097 100644 --- a/apps/gallery/urls.py +++ b/apps/gallery/urls.py @@ -6,6 +6,5 @@ from . import views app_name = 'gallery' urlpatterns = [ - path('upload/', views.ImageUploadView.as_view(), - name='upload_image') + path('upload/', views.ImageUploadView.as_view(), name='upload-image') ] diff --git a/apps/location/urls.py b/apps/location/urls.py index 5f90c1b8..0630db93 100644 --- a/apps/location/urls.py +++ b/apps/location/urls.py @@ -6,25 +6,15 @@ from location import views app_name = 'location' urlpatterns = [ - path('country/', views.CountryListView.as_view(), name='country-list'), - path('country//', views.CountryRetrieveView.as_view(), - name='country-retrieve'), + path('addresses/', views.AddressListView.as_view(), name='address-list'), + path('addresses//', views.AddressRetrieveView.as_view(), name='address-retrieve'), - path('region/', views.RegionListView.as_view(), name='region_list'), - path('region/create/', views.RegionCreateView.as_view(), name='region_create'), - path('region//', views.RegionRetrieveView.as_view(), name='region_retrieve'), - path('region//delete/', views.RegionDestroyView.as_view(), name='region_destroy'), - path('region//update/', views.RegionUpdateView.as_view(), name='region_update'), + path('cities/', views.CityListView.as_view(), name='city-list'), + path('cities//', views.CityRetrieveView.as_view(), name='city-retrieve'), - path('city/', views.CityListView.as_view(), name='city_list'), - path('city/create/', views.CityCreateView.as_view(), name='city_create'), - path('city//', views.CityRetrieveView.as_view(), name='city_retrieve'), - path('city//delete/', views.CityDestroyView.as_view(), name='city_destroy'), - path('city//update/', views.CityUpdateView.as_view(), name='city_update'), + path('countries/', views.CountryListView.as_view(), name='country-list'), + path('countries//', views.CountryRetrieveView.as_view(), name='country-retrieve'), - path('address/', views.AddressListView.as_view(), name='address_list'), - path('address/create/', views.AddressCreateView.as_view(), name='address_create'), - path('address//', views.AddressRetrieveView.as_view(), name='address_retrieve'), - path('address//delete/', views.AddressDestroyView.as_view(), name='address_destroy'), - path('address//update/', views.AddressUpdateView.as_view(), name='address_update'), + path('regions/', views.RegionListView.as_view(), name='region-list'), + path('regions//', views.RegionRetrieveView.as_view(), name='region-retrieve'), ] diff --git a/apps/main/admin.py b/apps/main/admin.py index ab34c8dc..1666511d 100644 --- a/apps/main/admin.py +++ b/apps/main/admin.py @@ -11,3 +11,15 @@ class SiteSettingsAdmin(admin.ModelAdmin): @admin.register(models.Feature) class FeatureAdmin(admin.ModelAdmin): """Feature admin conf.""" + + +@admin.register(models.AwardType) +class AwardTypeAdmin(admin.ModelAdmin): + """Award type admin conf.""" + + +@admin.register(models.Award) +class AwardAdmin(admin.ModelAdmin): + """Award admin conf.""" + # list_display = ['id', '__str__'] + # list_display_links = ['id', '__str__'] diff --git a/apps/main/migrations/0007_award_awardtype.py b/apps/main/migrations/0007_award_awardtype.py new file mode 100644 index 00000000..130549f2 --- /dev/null +++ b/apps/main/migrations/0007_award_awardtype.py @@ -0,0 +1,35 @@ +# Generated by Django 2.2.4 on 2019-08-27 13:46 + +from django.db import migrations, models +import django.db.models.deletion + + +class Migration(migrations.Migration): + + dependencies = [ + ('location', '0005_auto_20190822_1144'), + ('contenttypes', '0002_remove_content_type_name'), + ('main', '0006_auto_20190822_1118'), + ] + + operations = [ + migrations.CreateModel( + name='AwardType', + fields=[ + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('name', models.CharField(max_length=255, verbose_name='name')), + ('country', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='location.Country', verbose_name='country')), + ], + ), + migrations.CreateModel( + name='Award', + fields=[ + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('title', models.CharField(default='', max_length=255, verbose_name='title')), + ('vintage_year', models.CharField(default='', max_length=255, verbose_name='vintage year')), + ('object_id', models.PositiveIntegerField()), + ('award_type', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='main.AwardType')), + ('content_type', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='contenttypes.ContentType')), + ], + ), + ] diff --git a/apps/main/migrations/0008_merge_20190827_1433.py b/apps/main/migrations/0008_merge_20190827_1433.py new file mode 100644 index 00000000..aea59504 --- /dev/null +++ b/apps/main/migrations/0008_merge_20190827_1433.py @@ -0,0 +1,14 @@ +# Generated by Django 2.2.4 on 2019-08-27 14:33 + +from django.db import migrations + + +class Migration(migrations.Migration): + + dependencies = [ + ('main', '0007_award_awardtype'), + ('main', '0007_sitefeature_main'), + ] + + operations = [ + ] diff --git a/apps/main/migrations/0009_remove_award_title.py b/apps/main/migrations/0009_remove_award_title.py new file mode 100644 index 00000000..b0c50bc9 --- /dev/null +++ b/apps/main/migrations/0009_remove_award_title.py @@ -0,0 +1,17 @@ +# Generated by Django 2.2.4 on 2019-08-28 07:03 + +from django.db import migrations + + +class Migration(migrations.Migration): + + dependencies = [ + ('main', '0008_merge_20190827_1433'), + ] + + operations = [ + migrations.RemoveField( + model_name='award', + name='title', + ), + ] diff --git a/apps/main/migrations/0010_award_title.py b/apps/main/migrations/0010_award_title.py new file mode 100644 index 00000000..d09784a9 --- /dev/null +++ b/apps/main/migrations/0010_award_title.py @@ -0,0 +1,19 @@ +# Generated by Django 2.2.4 on 2019-08-28 07:05 + +import django.contrib.postgres.fields.jsonb +from django.db import migrations + + +class Migration(migrations.Migration): + + dependencies = [ + ('main', '0009_remove_award_title'), + ] + + operations = [ + migrations.AddField( + model_name='award', + name='title', + field=django.contrib.postgres.fields.jsonb.JSONField(blank=True, default=None, help_text='{"en":"some text"}', null=True, verbose_name='title'), + ), + ] diff --git a/apps/main/models.py b/apps/main/models.py index 4f42e019..6608feb9 100644 --- a/apps/main/models.py +++ b/apps/main/models.py @@ -1,9 +1,10 @@ """Main app models.""" from django.conf import settings +from django.contrib.contenttypes import fields as generic from django.contrib.postgres.fields import JSONField from django.db import models from django.utils.translation import gettext_lazy as _ - +from django.contrib.contenttypes.models import ContentType from location.models import Country from main import methods from utils.models import ProjectBaseMixin @@ -182,3 +183,32 @@ class SiteFeature(ProjectBaseMixin): verbose_name = _('Site feature') verbose_name_plural = _('Site features') unique_together = ('site_settings', 'feature') + + +class Award(models.Model): + """Award model.""" + award_type = models.ForeignKey('main.AwardType', on_delete=models.CASCADE) + title = JSONField( + _('title'), null=True, blank=True, + default=None, help_text='{"en":"some text"}') + vintage_year = models.CharField(_('vintage year'), max_length=255, default='') + + content_type = models.ForeignKey(ContentType, on_delete=models.CASCADE) + object_id = models.PositiveIntegerField() + content_object = generic.GenericForeignKey('content_type', 'object_id') + + def __str__(self): + title = 'None' + if self.title and 'en' in self.title: + title = self.title['en'] + return f'id:{self.id}-{title}' + + +class AwardType(models.Model): + """AwardType model.""" + country = models.ForeignKey( + 'location.Country', verbose_name=_('country'), on_delete=models.CASCADE) + name = models.CharField(_('name'), max_length=255) + + def __str__(self): + return self.name diff --git a/apps/main/serializers.py b/apps/main/serializers.py index 372e1b68..73ec941b 100644 --- a/apps/main/serializers.py +++ b/apps/main/serializers.py @@ -68,3 +68,15 @@ class SiteSettingsSerializer(serializers.ModelSerializer): # 'site_settings', # 'feature', # ) + + +class AwardSerializer(serializers.ModelSerializer): + """Award serializer.""" + + class Meta: + model = models.Award + fields = [ + # 'title', + 'award_type', + 'vintage_year', + ] \ No newline at end of file diff --git a/apps/main/urls.py b/apps/main/urls.py index 10379c3a..6d8cd1e4 100644 --- a/apps/main/urls.py +++ b/apps/main/urls.py @@ -5,16 +5,8 @@ from main import views app = 'main' urlpatterns = [ - path('determine-site/', views.DetermineSiteView.as_view(), - name='determine-site'), - path('site-settings//', views.SiteSettingsView.as_view(), - name='site-settings', ), - # path('features/', views.FeaturesLCView.as_view(), - # name='features-lc'), - # path('features//', views.FeaturesRUDView.as_view(), - # name='features-rud'), - # path('site-features/', views.SiteFeaturesLCView.as_view(), - # name='site-features-lc'), - # path('site-features//', views.SiteFeaturesRUDView.as_view(), - # name='site-features-rud'), + path('determine-site/', views.DetermineSiteView.as_view(), name='determine-site'), + path('site-settings//', views.SiteSettingsView.as_view(), name='site-settings'), + path('awards/', views.AwardView.as_view(), name='awards_list'), + path('awards//', views.AwardRetrieveView.as_view(), name='awards_retrieve'), ] \ No newline at end of file diff --git a/apps/main/views.py b/apps/main/views.py index 4e32aadc..b13b7f64 100644 --- a/apps/main/views.py +++ b/apps/main/views.py @@ -60,3 +60,17 @@ class SiteSettingsView(generics.RetrieveAPIView): # class SiteFeaturesRUDView(SiteFeaturesViewMixin, # generics.RetrieveUpdateDestroyAPIView): # """Site features RUD.""" + + +class AwardView(generics.ListAPIView): + """Awards list view.""" + serializer_class = serializers.AwardSerializer + queryset = models.Award.objects.all() + permission_classes = (permissions.AllowAny, ) + + +class AwardRetrieveView(generics.RetrieveAPIView): + """Award retrieve view.""" + serializer_class = serializers.AwardSerializer + queryset = models.Award.objects.all() + permission_classes = (permissions.IsAuthenticatedOrReadOnly,) diff --git a/apps/news/models.py b/apps/news/models.py index 28983fdf..9228f86f 100644 --- a/apps/news/models.py +++ b/apps/news/models.py @@ -1,6 +1,7 @@ from django.contrib.postgres.fields import JSONField from django.db import models from django.utils.translation import gettext_lazy as _ +from django.utils.translation import get_language from utils.models import (ProjectBaseMixin, BaseAttributes, LocaleManagerMixin, ImageMixin) @@ -80,3 +81,8 @@ class News(BaseAttributes): def __str__(self): return f'news: {self.id}' + + @property + def test_trans(self): + language = get_language() + return self.title.get(language) diff --git a/apps/news/urls/web.py b/apps/news/urls/web.py index 04203f1a..1dbcc0fe 100644 --- a/apps/news/urls/web.py +++ b/apps/news/urls/web.py @@ -6,10 +6,7 @@ from news.views import common app_name = 'news' urlpatterns = [ - path('', common.NewsList.as_view(), name='news_list'), - path('create/', common.NewsCreate.as_view(), name='news_create'), - path('/', common.NewsDetail.as_view(), name='news_detail'), - path('/update/', common.NewsUpdate.as_view(), name='news_update'), - path('/delete/', common.NewsDelete.as_view(), name='news_delete'), - path('type/', common.NewsTypeList.as_view(), name='news_type'), + path('', common.NewsListView.as_view(), name='list'), + path('/', common.NewsDetailView.as_view(), name='rud'), + path('type/', common.NewsTypeListView.as_view(), name='type'), ] diff --git a/apps/news/views/common.py b/apps/news/views/common.py index 4b9c6796..7e706ddb 100644 --- a/apps/news/views/common.py +++ b/apps/news/views/common.py @@ -16,7 +16,7 @@ class NewsViewMixin(JWTGenericViewMixin): return News.objects.annotate_localized_fields(locale=self.request.locale) -class NewsList(NewsViewMixin, JWTListAPIView): +class NewsListView(NewsViewMixin, JWTListAPIView): """News list view.""" permission_classes = (permissions.AllowAny, ) serializer_class = serializers.NewsSerializer @@ -30,32 +30,20 @@ class NewsList(NewsViewMixin, JWTListAPIView): .order_by('-is_highlighted', '-created') -class NewsCreate(generics.CreateAPIView): - """News list view.""" - queryset = News.objects.all() - permission_classes = (permissions.IsAuthenticated, ) - serializer_class = serializers.NewsCreateUpdateSerializer +# class NewsCreateView(generics.CreateAPIView): +# """News list view.""" +# queryset = News.objects.all() +# permission_classes = (permissions.IsAuthenticated, ) +# serializer_class = serializers.NewsCreateUpdateSerializer -class NewsDetail(NewsViewMixin, generics.RetrieveAPIView): +class NewsDetailView(NewsViewMixin, generics.RetrieveAPIView): """News detail view.""" - permission_classes = (permissions.AllowAny, ) + permission_classes = (permissions.IsAuthenticatedOrReadOnly, ) serializer_class = serializers.NewsSerializer -class NewsDelete(generics.DestroyAPIView): - """News delete view.""" - queryset = News.objects.all() - permission_classes = (permissions.IsAuthenticated, ) - - -class NewsUpdate(NewsViewMixin, generics.UpdateAPIView): - """News update view.""" - permission_classes = (permissions.IsAuthenticated, ) - serializer_class = serializers.NewsCreateUpdateSerializer - - -class NewsTypeList(generics.ListAPIView): +class NewsTypeListView(generics.ListAPIView): """NewsType list view.""" serializer_class = serializers.NewsTypeSerializer permission_classes = (permissions.AllowAny, ) diff --git a/apps/partner/urls/common.py b/apps/partner/urls/common.py index e93fe916..9cd10817 100644 --- a/apps/partner/urls/common.py +++ b/apps/partner/urls/common.py @@ -6,6 +6,5 @@ from partner.views import common as views app_name = 'partner' urlpatterns = [ - path('list/', views.PartnerListView.as_view(), - name='partner_list') + path('', views.PartnerListView.as_view(), name='list') ] diff --git a/apps/products/__init__.py b/apps/products/__init__.py new file mode 100644 index 00000000..e69de29b diff --git a/apps/products/admin.py b/apps/products/admin.py new file mode 100644 index 00000000..8c38f3f3 --- /dev/null +++ b/apps/products/admin.py @@ -0,0 +1,3 @@ +from django.contrib import admin + +# Register your models here. diff --git a/apps/products/apps.py b/apps/products/apps.py new file mode 100644 index 00000000..17d75292 --- /dev/null +++ b/apps/products/apps.py @@ -0,0 +1,8 @@ +from django.apps import AppConfig +from django.utils.translation import gettext_lazy as _ + + +class ProductsConfig(AppConfig): + """Products model.""" + name = 'products' + verbose_name = _('products') diff --git a/apps/products/migrations/__init__.py b/apps/products/migrations/__init__.py new file mode 100644 index 00000000..e69de29b diff --git a/apps/products/models.py b/apps/products/models.py new file mode 100644 index 00000000..3c0e6ee8 --- /dev/null +++ b/apps/products/models.py @@ -0,0 +1,63 @@ +# from django.contrib.postgres.fields import JSONField +# from django.db import models +# from django.utils.translation import gettext_lazy as _ +# +# from utils.models import BaseAttributes +# +# +# class ProductManager(models.Manager): +# """Product manager.""" +# +# +# class ProductQuerySet(models.QuerySet): +# """Product queryset.""" +# +# +# class Product(BaseAttributes): +# """Product models.""" +# name = models.CharField(_('name'), max_length=255) +# country = models.ForeignKey('location.Country', on_delete=models.CASCADE) +# region = models.ForeignKey('location.Region', on_delete=models.CASCADE) +# # ASK: What is the "subregion" +# +# description = JSONField(_('description')) +# characteristics = JSONField(_('characteristics')) +# metadata_values = JSONField(_('metadata_values')) +# # common_relations_id +# # product_region_id +# code = models.CharField(_('code'), max_length=255) +# available = models.BooleanField(_('available')) +# +# # dealer_type +# # target_scope +# # target_type +# # rank +# # excluding_tax_unit_price +# # column_21 +# # currencies_id +# # vintage +# # producer_price +# # producer_description +# # annual_produced_quantity +# # production_method_description +# # unit_name +# # unit +# # unit_values +# # organic_source +# # certificates +# # establishments_id +# # restrictions +# # +# objects = ProductManager.from_queryset(ProductQuerySet)() +# +# class Meta: +# verbose_name = _('product') +# verbose_name_plural = _('products') +# +# +# class ProductType(models.Model): +# """ProductType model.""" +# +# class Meta: +# verbose_name_plural = _('product types') +# verbose_name = _('product type') diff --git a/apps/products/serializers/__init__.py b/apps/products/serializers/__init__.py new file mode 100644 index 00000000..e69de29b diff --git a/apps/products/serializers/common.py b/apps/products/serializers/common.py new file mode 100644 index 00000000..236cd38b --- /dev/null +++ b/apps/products/serializers/common.py @@ -0,0 +1 @@ +from rest_framework import serializers diff --git a/apps/products/serializers/mobile.py b/apps/products/serializers/mobile.py new file mode 100644 index 00000000..e69de29b diff --git a/apps/products/serializers/web.py b/apps/products/serializers/web.py new file mode 100644 index 00000000..e69de29b diff --git a/apps/products/tests.py b/apps/products/tests.py new file mode 100644 index 00000000..7ce503c2 --- /dev/null +++ b/apps/products/tests.py @@ -0,0 +1,3 @@ +from django.test import TestCase + +# Create your tests here. diff --git a/apps/products/urls/__init__.py b/apps/products/urls/__init__.py new file mode 100644 index 00000000..e69de29b diff --git a/apps/products/urls/common.py b/apps/products/urls/common.py new file mode 100644 index 00000000..e69de29b diff --git a/apps/products/urls/mobile.py b/apps/products/urls/mobile.py new file mode 100644 index 00000000..e69de29b diff --git a/apps/products/urls/web.py b/apps/products/urls/web.py new file mode 100644 index 00000000..e69de29b diff --git a/apps/products/views/__init__.py b/apps/products/views/__init__.py new file mode 100644 index 00000000..e69de29b diff --git a/apps/products/views/common.py b/apps/products/views/common.py new file mode 100644 index 00000000..e69de29b diff --git a/apps/products/views/mobile.py b/apps/products/views/mobile.py new file mode 100644 index 00000000..e69de29b diff --git a/apps/products/views/views.py b/apps/products/views/views.py new file mode 100644 index 00000000..60f00ef0 --- /dev/null +++ b/apps/products/views/views.py @@ -0,0 +1 @@ +# Create your views here. diff --git a/apps/products/views/web.py b/apps/products/views/web.py new file mode 100644 index 00000000..e69de29b diff --git a/apps/translation/urls.py b/apps/translation/urls.py index 507ce165..94df1daa 100644 --- a/apps/translation/urls.py +++ b/apps/translation/urls.py @@ -5,12 +5,9 @@ from translation import views app_name = 'translation' urlpatterns = [ - path('languages/', views.LanguageListCreateView.as_view(), - name='languages'), - path('languages//', views.LanguageRetrieveUpdateDestroyView.as_view(), - name='language'), - path('site/', views.SiteInterfaceDictionaryView.as_view(), - name='site-interface'), - path('site//', views.SiteInterfaceDictionaryRUDView.as_view(), + path('languages/', views.LanguageListView.as_view(), name='languages'), + path('languages//', views.LanguageRetrieveView.as_view(), name='language'), + path('site/', views.SiteInterfaceDictionaryView.as_view(), name='site-interface'), + path('site//', views.SiteInterfaceDictionaryRetrieveView.as_view(), name='site-interface-rud'), ] diff --git a/apps/translation/views.py b/apps/translation/views.py index 01b8ce1d..974e6ff5 100644 --- a/apps/translation/views.py +++ b/apps/translation/views.py @@ -14,15 +14,14 @@ class LanguageViewMixin(generics.GenericAPIView): # Views -class LanguageListCreateView(LanguageViewMixin, generics.ListCreateAPIView): +class LanguageListView(LanguageViewMixin, generics.ListAPIView): """List view for model Language""" pagination_class = None permission_classes = (permissions.IsAuthenticatedOrReadOnly, ) -class LanguageRetrieveUpdateDestroyView(LanguageViewMixin, - generics.RetrieveUpdateDestroyAPIView): +class LanguageRetrieveView(LanguageViewMixin, generics.RetrieveAPIView): """Retrieve, Update, Destroy view for model Language""" @@ -37,7 +36,7 @@ class SiteInterfaceDictionaryMixin: class SiteInterfaceDictionaryView(JWTGenericViewMixin, SiteInterfaceDictionaryMixin, - generics.ListCreateAPIView): + generics.ListAPIView): """Site interface dictionary LC view.""" pagination_class = None @@ -46,9 +45,9 @@ class SiteInterfaceDictionaryView(JWTGenericViewMixin, filter_fields = ['page', 'keywords'] -class SiteInterfaceDictionaryRUDView(JWTGenericViewMixin, - SiteInterfaceDictionaryMixin, - generics.RetrieveUpdateDestroyAPIView): +class SiteInterfaceDictionaryRetrieveView(JWTGenericViewMixin, + SiteInterfaceDictionaryMixin, + generics.RetrieveAPIView): """Site interface dictionary RUD view.""" permission_classes = (permissions.AllowAny,) diff --git a/project/urls/__init__.py b/project/urls/__init__.py index 5355ca31..eb9b623e 100644 --- a/project/urls/__init__.py +++ b/project/urls/__init__.py @@ -20,7 +20,7 @@ from django.urls import path, include, re_path from drf_yasg import openapi from drf_yasg.views import get_schema_view from rest_framework import permissions - +from account.views.common import FCMDeviceViewSet # Docs urls schema_view = get_schema_view( @@ -48,22 +48,13 @@ urlpatterns_doc = [ name='schema-redoc'), ] -# API urls -urlpatterns_auth = [ - path('api/auth/', include('authorization.urls.common')), -] api_urlpatterns = [ - path('gallery/', include(('gallery.urls', 'gallery'), - namespace='gallery')), - path('location/', include(('location.urls', 'location'), - namespace='location')), - path('main/', include(('main.urls', 'main'), - namespace='main')), - path('translation/', include(('translation.urls', 'translation'), - namespace='translation')), - path('web/', include(('project.urls.web', 'web'), - namespace='web')), + path('auth/', include('authorization.urls.common')), + path('device/', FCMDeviceViewSet.as_view(), name='fcm-device-create'), + path('web/', include(('project.urls.web', 'web'), namespace='web')), + path('back/', include(('project.urls.back', 'back'), namespace='back')), + path('mobile/', include(('project.urls.mobile', 'mobile'), namespace='mobile')), ] urlpatterns = [ @@ -72,9 +63,7 @@ urlpatterns = [ ] urlpatterns = urlpatterns + \ - urlpatterns_auth + \ static(settings.MEDIA_URL, document_root=settings.MEDIA_ROOT) if settings.DEBUG: - urlpatterns.extend(urlpatterns_doc) diff --git a/project/urls/back.py b/project/urls/back.py new file mode 100644 index 00000000..af823cd2 --- /dev/null +++ b/project/urls/back.py @@ -0,0 +1,14 @@ +from django.urls import path, include + +app_name = 'back' + +urlpatterns = [ + path('gallery/', include(('gallery.urls', 'gallery'), + namespace='gallery')), + # path('account/', include('account.urls.web')), + # path('advertisement/', include('advertisement.urls.web')), + # path('collection/', include('collection.urls.web')), + # path('establishments/', include('establishment.urls.web')), + # path('news/', include('news.urls.web')), + # path('partner/', include('partner.urls.web')), +] \ No newline at end of file diff --git a/project/urls/mobile.py b/project/urls/mobile.py new file mode 100644 index 00000000..c007e260 --- /dev/null +++ b/project/urls/mobile.py @@ -0,0 +1,12 @@ +from django.urls import path, include + +app_name = 'mobile' + +urlpatterns = [ + # path('account/', include('account.urls.web')), + # path('advertisement/', include('advertisement.urls.web')), + # path('collection/', include('collection.urls.web')), + # path('establishments/', include('establishment.urls.web')), + # path('news/', include('news.urls.web')), + # path('partner/', include('partner.urls.web')), +] \ No newline at end of file diff --git a/project/urls/web.py b/project/urls/web.py index 7f4a20c7..6b80b3db 100644 --- a/project/urls/web.py +++ b/project/urls/web.py @@ -24,4 +24,10 @@ urlpatterns = [ path('establishments/', include('establishment.urls.web')), path('news/', include('news.urls.web')), path('partner/', include('partner.urls.web')), + path('location/', include(('location.urls', 'location'), + namespace='location')), + path('main/', include(('main.urls', 'main'), + namespace='main')), + path('translation/', include(('translation.urls', 'translation'), + namespace='translation')), ]