diff --git a/auction/urls.py b/auction/urls.py index b9efc6b..115a29b 100644 --- a/auction/urls.py +++ b/auction/urls.py @@ -1,6 +1,6 @@ from django.urls import path -from public.views import HomeView +from frontend.views import HomeView from .views import InquiryCreateView, InquiryProcessView, InquiryPaymentView, OfferSelectionView, OfferSelectionTableView, BiddingListView, OfferCreationView diff --git a/auction/views.py b/auction/views.py index a472a9d..7aec505 100644 --- a/auction/views.py +++ b/auction/views.py @@ -7,7 +7,7 @@ from django.contrib.gis.db.models.functions import Distance from django.conf import settings from django.utils import timezone -from public.mixins import InConstructionMixin +from frontend.mixins import InConstructionMixin from partners.mixins import PartnerProfileRequiredMixin from clients.mixins import ClientBaseMixin from localauth.helpers import name_to_coords diff --git a/clients/views.py b/clients/views.py index 5d8c52e..5b74271 100644 --- a/clients/views.py +++ b/clients/views.py @@ -7,7 +7,7 @@ from .models import ClientProfile from .mixins import ClientBaseMixin from localauth.mixins import LoginRequiredMixin, RedirectToNextMixin -from public.mixins import InConstructionMixin +from frontend.mixins import InConstructionMixin from auction.models import Inquiry class ClientRegistrationView(LoginRequiredMixin, RedirectToNextMixin, CreateView): diff --git a/public/__init__.py b/frontend/__init__.py similarity index 100% rename from public/__init__.py rename to frontend/__init__.py diff --git a/public/admin.py b/frontend/admin.py similarity index 100% rename from public/admin.py rename to frontend/admin.py diff --git a/frontend/apps.py b/frontend/apps.py new file mode 100644 index 0000000..33ae5ca --- /dev/null +++ b/frontend/apps.py @@ -0,0 +1,5 @@ +from django.apps import AppConfig + + +class FrontendConfig(AppConfig): + name = 'frontend' diff --git a/public/context_processors.py b/frontend/context_processors.py similarity index 100% rename from public/context_processors.py rename to frontend/context_processors.py diff --git a/public/middleware.py b/frontend/middleware.py similarity index 100% rename from public/middleware.py rename to frontend/middleware.py diff --git a/public/mixins.py b/frontend/mixins.py similarity index 100% rename from public/mixins.py rename to frontend/mixins.py diff --git a/public/models.py b/frontend/models.py similarity index 100% rename from public/models.py rename to frontend/models.py diff --git a/public/places/__init__.py b/frontend/places/__init__.py similarity index 100% rename from public/places/__init__.py rename to frontend/places/__init__.py diff --git a/public/places/api.py b/frontend/places/api.py similarity index 100% rename from public/places/api.py rename to frontend/places/api.py diff --git a/public/places/urls.py b/frontend/places/urls.py similarity index 100% rename from public/places/urls.py rename to frontend/places/urls.py diff --git a/public/places/views.py b/frontend/places/views.py similarity index 100% rename from public/places/views.py rename to frontend/places/views.py diff --git a/public/templatetags/__init__.py b/frontend/templatetags/__init__.py similarity index 100% rename from public/templatetags/__init__.py rename to frontend/templatetags/__init__.py diff --git a/public/templatetags/mapimage.py b/frontend/templatetags/mapimage.py similarity index 100% rename from public/templatetags/mapimage.py rename to frontend/templatetags/mapimage.py diff --git a/public/templatetags/splitter.py b/frontend/templatetags/splitter.py similarity index 100% rename from public/templatetags/splitter.py rename to frontend/templatetags/splitter.py diff --git a/public/templatetags/testimonials.py b/frontend/templatetags/testimonials.py similarity index 89% rename from public/templatetags/testimonials.py rename to frontend/templatetags/testimonials.py index 75ddee5..9ee1744 100644 --- a/public/templatetags/testimonials.py +++ b/frontend/templatetags/testimonials.py @@ -2,7 +2,7 @@ from django import template from random import SystemRandom -from public.models import Testimonial +from frontend.models import Testimonial register = template.Library() diff --git a/public/tests.py b/frontend/tests.py similarity index 100% rename from public/tests.py rename to frontend/tests.py diff --git a/public/urls.py b/frontend/urls.py similarity index 85% rename from public/urls.py rename to frontend/urls.py index 8d44e99..14c07c5 100644 --- a/public/urls.py +++ b/frontend/urls.py @@ -6,7 +6,7 @@ app_name = "frontend" urlpatterns = [ path('', HomeView.as_view(), name="home"), - path('api/places/', include("public.places.urls"), name="places"), + path('api/places/', include("frontend.places.urls"), name="places"), path('demo/template/', DemoTemplateView.as_view()), path('impressum/', ImpressumView.as_view(), name="impressum"), path('privacy/', PrivacyNoticeView.as_view(), name="privacy"), diff --git a/public/views.py b/frontend/views.py similarity index 100% rename from public/views.py rename to frontend/views.py diff --git a/partners/views.py b/partners/views.py index 3bcb5e3..28ff316 100644 --- a/partners/views.py +++ b/partners/views.py @@ -9,7 +9,7 @@ from .mixins import PartnerProfileRequiredMixin from .forms import VerificationForm from auction.models import Inquiry, Offer -from public.mixins import InConstructionMixin +from frontend.mixins import InConstructionMixin from localauth.mixins import LoginRequiredMixin, SuperUserRequiredMixin from gallery.models import Image diff --git a/public/apps.py b/public/apps.py deleted file mode 100644 index 903db63..0000000 --- a/public/apps.py +++ /dev/null @@ -1,5 +0,0 @@ -from django.apps import AppConfig - - -class PublicConfig(AppConfig): - name = 'public' diff --git a/urlaubsauktion/settings.py b/urlaubsauktion/settings.py index c5ab804..4d19144 100644 --- a/urlaubsauktion/settings.py +++ b/urlaubsauktion/settings.py @@ -17,7 +17,7 @@ INSTALLED_APPS = [ 'django.contrib.gis', 'phonenumber_field', 'localauth', - 'public', + 'frontend', 'partners', 'payment', 'clients', @@ -38,7 +38,7 @@ MIDDLEWARE = [ 'django.contrib.auth.middleware.AuthenticationMiddleware', 'django.contrib.messages.middleware.MessageMiddleware', 'django.middleware.clickjacking.XFrameOptionsMiddleware', - 'public.middleware.DemoMiddleware', + 'frontend.middleware.DemoMiddleware', ] ROOT_URLCONF = 'urlaubsauktion.urls' @@ -54,7 +54,7 @@ TEMPLATES = [ 'django.template.context_processors.request', 'django.contrib.auth.context_processors.auth', 'django.contrib.messages.context_processors.messages', - 'public.context_processors.demo', + 'frontend.context_processors.demo', ], }, }, diff --git a/urlaubsauktion/urls.py b/urlaubsauktion/urls.py index 70dd6df..29439a6 100644 --- a/urlaubsauktion/urls.py +++ b/urlaubsauktion/urls.py @@ -15,13 +15,13 @@ Including another URLconf """ from .admin import joker_admin -from public.views import Error404View +from frontend.views import Error404View from django.urls import path, include urlpatterns = [ path('admin_area/', joker_admin.urls), - path('', include('public.urls'), name="frontend"), + path('', include('frontend.urls'), name="frontend"), path('auth/', include('localauth.urls'), name="localauth"), path('auction/', include('auction.urls'), name="auction"), path('payment/', include('payment.urls'), name="payment"),