From 1c85c034b3b9c0fe41b8524e9998515d1d796a86 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Najborowski?= Date: Sun, 23 Jan 2022 22:32:21 +0100 Subject: [PATCH] reorder packages --- Serwer_django/config/__init__.py | 0 Serwer_django/{Serwer_django => config}/asgi.py | 2 +- .../{Serwer_django => config}/settings.py | 14 +++++++++++--- Serwer_django/{Serwer_django => config}/urls.py | 10 +++++++++- Serwer_django/{Serwer_django => config}/wsgi.py | 2 +- 5 files changed, 22 insertions(+), 6 deletions(-) create mode 100644 Serwer_django/config/__init__.py rename Serwer_django/{Serwer_django => config}/asgi.py (81%) rename Serwer_django/{Serwer_django => config}/settings.py (92%) rename Serwer_django/{Serwer_django => config}/urls.py (59%) rename Serwer_django/{Serwer_django => config}/wsgi.py (81%) diff --git a/Serwer_django/config/__init__.py b/Serwer_django/config/__init__.py new file mode 100644 index 000000000..e69de29bb diff --git a/Serwer_django/Serwer_django/asgi.py b/Serwer_django/config/asgi.py similarity index 81% rename from Serwer_django/Serwer_django/asgi.py rename to Serwer_django/config/asgi.py index fed472541..100dda647 100644 --- a/Serwer_django/Serwer_django/asgi.py +++ b/Serwer_django/config/asgi.py @@ -11,6 +11,6 @@ import os from django.core.asgi import get_asgi_application -os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'Serwer_django.settings') +os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'config.settings') application = get_asgi_application() diff --git a/Serwer_django/Serwer_django/settings.py b/Serwer_django/config/settings.py similarity index 92% rename from Serwer_django/Serwer_django/settings.py rename to Serwer_django/config/settings.py index 507bef497..caaadc816 100644 --- a/Serwer_django/Serwer_django/settings.py +++ b/Serwer_django/config/settings.py @@ -9,7 +9,7 @@ https://docs.djangoproject.com/en/4.0/topics/settings/ For the full list of settings and their values, see https://docs.djangoproject.com/en/4.0/ref/settings/ """ - +import os from pathlib import Path # Build paths inside the project like this: BASE_DIR / 'subdir'. @@ -49,7 +49,7 @@ MIDDLEWARE = [ 'django.middleware.clickjacking.XFrameOptionsMiddleware', ] -ROOT_URLCONF = 'Serwer_django.urls' +ROOT_URLCONF = 'config.urls' TEMPLATES = [ { @@ -68,7 +68,7 @@ TEMPLATES = [ }, ] -WSGI_APPLICATION = 'Serwer_django.wsgi.application' +WSGI_APPLICATION = 'config.wsgi.application' # Database @@ -117,6 +117,14 @@ USE_TZ = True # https://docs.djangoproject.com/en/4.0/howto/static-files/ STATIC_URL = 'static/' +STATICFILES_DIRS = ( + os.path.join(BASE_DIR, 'static'), +) +STATIC_ROOT = os.path.join(BASE_DIR, 'staticfiles') + + +LOGIN_REDIRECT_URL = 'home' +LOGOUT_REDIRECT_URL = 'home' # Default primary key field type # https://docs.djangoproject.com/en/4.0/ref/settings/#default-auto-field diff --git a/Serwer_django/Serwer_django/urls.py b/Serwer_django/config/urls.py similarity index 59% rename from Serwer_django/Serwer_django/urls.py rename to Serwer_django/config/urls.py index f4fcd4d0c..3f6900bb6 100644 --- a/Serwer_django/Serwer_django/urls.py +++ b/Serwer_django/config/urls.py @@ -14,8 +14,16 @@ Including another URLconf 2. Add a URL to urlpatterns: path('blog/', include('blog.urls')) """ from django.contrib import admin -from django.urls import path +from django.contrib.staticfiles.storage import staticfiles_storage +from django.urls import path, include +from django.views.generic import TemplateView, RedirectView + +from .views import SignUpView urlpatterns = [ path('admin/', admin.site.urls), + path('accounts/', include('django.contrib.auth.urls')), + path('accounts/signup/', SignUpView.as_view(), name='signup'), + path('', TemplateView.as_view(template_name='home.html'), name='home'), + path('favicon.ico', RedirectView.as_view(url=staticfiles_storage.url('images/favicon.ico'))), ] diff --git a/Serwer_django/Serwer_django/wsgi.py b/Serwer_django/config/wsgi.py similarity index 81% rename from Serwer_django/Serwer_django/wsgi.py rename to Serwer_django/config/wsgi.py index 538ef2af3..8ea86a8bf 100644 --- a/Serwer_django/Serwer_django/wsgi.py +++ b/Serwer_django/config/wsgi.py @@ -11,6 +11,6 @@ import os from django.core.wsgi import get_wsgi_application -os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'Serwer_django.settings') +os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'config.settings') application = get_wsgi_application()