phzhik/gault-millau
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

URL refactoring

Browse Source
This commit is contained in:
Dmitriy Kuzmenko 2019-08-28 11:35:38 +03:00
parent 3d7727b4b4
commit 253da87a99
18 changed files with 92 additions and 130 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
apps/account/urls/common.py
View File

@ -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'),
]

2
apps/advertisement/urls/web.py
View File

@ -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')
]

35
apps/collection/urls/common.py
View File

@ -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('<int:pk>/', views.CollectionRetrieveView.as_view(),
# name='collection_retrieve'),
# path('<int:pk>/delete/', views.CollectionDestroyView.as_view(),
# name='collection_destroy'),
# path('<int:pk>/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/<int:pk>/', views.CollectionItemRetrieveView.as_view(),
# name='collection_items_retrieve'),
# path('collection_items/<int:pk>/delete/', views.CollectionDestroyView.as_view(),
# name='collection_items_destroy'),
# path('collection_items/<int:pk>/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/<int:pk>/', views.GuideRetrieveView.as_view(),
# name='guide_retrieve'),
# path('guides/<int:pk>/delete/', views.GuideDestroyView.as_view(),
# name='guide_destroy'),
# path('guides/<int:pk>/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'),
]

8
apps/establishment/admin.py
View File

@ -1,6 +1,8 @@
"""Establishment admin conf."""
from django.contrib import admin
from establishment import models
from django.contrib.contenttypes.admin import GenericTabularInline
from main.models import Award
@admin.register(models.EstablishmentType)
@ -13,6 +15,12 @@ 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, ]

3
apps/gallery/urls.py
View File

@ -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')
]

26
apps/location/urls.py
View File

@ -6,25 +6,15 @@ from location import views
app_name = 'location'
urlpatterns = [
path('country/', views.CountryListView.as_view(), name='country-list'),
path('country/<int:pk>/', views.CountryRetrieveView.as_view(),
name='country-retrieve'),
path('addresses/', views.AddressListView.as_view(), name='address-list'),
path('addresses/<int:pk>/', 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/<int:pk>/', views.RegionRetrieveView.as_view(), name='region_retrieve'),
path('region/<int:pk>/delete/', views.RegionDestroyView.as_view(), name='region_destroy'),
path('region/<int:pk>/update/', views.RegionUpdateView.as_view(), name='region_update'),
path('cities/', views.CityListView.as_view(), name='city-list'),
path('cities/<int:pk>/', 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/<int:pk>/', views.CityRetrieveView.as_view(), name='city_retrieve'),
path('city/<int:pk>/delete/', views.CityDestroyView.as_view(), name='city_destroy'),
path('city/<int:pk>/update/', views.CityUpdateView.as_view(), name='city_update'),
path('countries/', views.CountryListView.as_view(), name='country-list'),
path('countries/<int:pk>/', 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/<int:pk>/', views.AddressRetrieveView.as_view(), name='address_retrieve'),
path('address/<int:pk>/delete/', views.AddressDestroyView.as_view(), name='address_destroy'),
path('address/<int:pk>/update/', views.AddressUpdateView.as_view(), name='address_update'),
path('regions/', views.RegionListView.as_view(), name='region-list'),
path('regions/<int:pk>/', views.RegionRetrieveView.as_view(), name='region-retrieve'),
]

3
apps/main/models.py
View File

@ -209,3 +209,6 @@ class AwardType(models.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

18
apps/main/urls.py
View File

@ -5,18 +5,8 @@ from main import views
app = 'main'
urlpatterns = [
path('determine-site/', views.DetermineSiteView.as_view(),
name='determine-site'),
path('site-settings/<subdomain>/', views.SiteSettingsView.as_view(),
name='site-settings', ),
# path('features/', views.FeaturesLCView.as_view(),
# name='features-lc'),
# path('features/<int:pk>/', views.FeaturesRUDView.as_view(),
# name='features-rud'),
# path('site-features/', views.SiteFeaturesLCView.as_view(),
# name='site-features-lc'),
# path('site-features/<int:pk>/', views.SiteFeaturesRUDView.as_view(),
# name='site-features-rud'),
path('awards/', views.AwardView.as_view(), name='awards_list', ),
path('awards/<int:pk>/', views.AwardRetrieveView.as_view(), name='awards_retrieve', ),
path('determine-site/', views.DetermineSiteView.as_view(), name='determine-site'),
path('site-settings/<subdomain>/', views.SiteSettingsView.as_view(), name='site-settings'),
path('awards/', views.AwardView.as_view(), name='awards_list'),
path('awards/<int:pk>/', views.AwardRetrieveView.as_view(), name='awards_retrieve'),
]

2
apps/main/views.py
View File

@ -69,7 +69,7 @@ class AwardView(generics.ListAPIView):
permission_classes = (permissions.AllowAny, )
class AwardRetrieveView(generics.RetrieveUpdateDestroyAPIView):
class AwardRetrieveView(generics.RetrieveAPIView):
"""Award retrieve view."""
serializer_class = serializers.AwardSerializer
queryset = models.Award.objects.all()

9
apps/news/urls/web.py
View File

@ -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('<int:pk>/', common.NewsDetail.as_view(), name='news_detail'),
path('<int:pk>/update/', common.NewsUpdate.as_view(), name='news_update'),
path('<int:pk>/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('<int:pk>/', common.NewsDetailView.as_view(), name='rud'),
path('type/', common.NewsTypeListView.as_view(), name='type'),
]

30
apps/news/views/common.py
View File

@ -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, )

3
apps/partner/urls/common.py
View File

@ -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')
]

11
apps/translation/urls.py
View File

@ -5,12 +5,9 @@ from translation import views
app_name = 'translation'
urlpatterns = [
path('languages/', views.LanguageListCreateView.as_view(),
name='languages'),
path('languages/<int:pk>/', views.LanguageRetrieveUpdateDestroyView.as_view(),
name='language'),
path('site/', views.SiteInterfaceDictionaryView.as_view(),
name='site-interface'),
path('site/<int:pk>/', views.SiteInterfaceDictionaryRUDView.as_view(),
path('languages/', views.LanguageListView.as_view(), name='languages'),
path('languages/<int:pk>/', views.LanguageRetrieveView.as_view(), name='language'),
path('site/', views.SiteInterfaceDictionaryView.as_view(), name='site-interface'),
path('site/<int:pk>/', views.SiteInterfaceDictionaryRetrieveView.as_view(),
name='site-interface-rud'),
]

13
apps/translation/views.py
View File

@ -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,)

23
project/urls/__init__.py
View File

@ -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)

14
project/urls/back.py Normal file
View File

@ -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')),
]

12
project/urls/mobile.py Normal file
View File

@ -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')),
]

6
project/urls/web.py
View File

@ -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')),
]