diff --git a/app/polyphonic/default_settings.py b/app/polyphonic/default_settings.py index 4c1202f..2bc881c 100644 --- a/app/polyphonic/default_settings.py +++ b/app/polyphonic/default_settings.py @@ -16,7 +16,7 @@ from os import environ # Build paths inside the project like this: BASE_DIR / 'subdir'. BASE_DIR = Path(__file__).resolve().parent.parent -SECRET_KEY=environ.get('SECRET_KEY') +SECRET_KEY = environ.get("SECRET_KEY") # Quick-start development settings - unsuitable for production # See https://docs.djangoproject.com/en/3.1/howto/deployment/checklist/ @@ -25,90 +25,89 @@ SECRET_KEY=environ.get('SECRET_KEY') # SECURITY WARNING: don't run with debug turned on in production! DEBUG = False -ALLOWED_HOSTS = ['localhost'] +ALLOWED_HOSTS = ["localhost"] +INTERNAL_IPS = ["127.0.0.1"] # Application definition -POLYPHONIC_MODULES = [ - 'library' -] +POLYPHONIC_MODULES = ["library"] INSTALLED_APPS = [ - 'django.contrib.admin', - 'django.contrib.auth', - 'django.contrib.contenttypes', - 'django.contrib.sessions', - 'django.contrib.messages', - 'django.contrib.staticfiles', - 'django_markdown2', - 'rest_framework', - 'crispy_forms', - 'crispy_bulma', - 'byostorage', - 'interface', + "django.contrib.admin", + "django.contrib.auth", + "django.contrib.contenttypes", + "django.contrib.sessions", + "django.contrib.messages", + "django.contrib.staticfiles", + "django_markdown2", + "rest_framework", + "crispy_forms", + "crispy_bulma", + "byostorage", + "interface", ] CRISPY_ALLOWED_TEMPLATE_PACKS = ("bulma",) CRISPY_TEMPLATE_PACK = "bulma" MIDDLEWARE = [ - 'django.middleware.security.SecurityMiddleware', - 'django.contrib.sessions.middleware.SessionMiddleware', - 'django.middleware.common.CommonMiddleware', - 'django.middleware.csrf.CsrfViewMiddleware', - 'django.contrib.auth.middleware.AuthenticationMiddleware', - 'django.contrib.messages.middleware.MessageMiddleware', - 'django.middleware.clickjacking.XFrameOptionsMiddleware', + "django.middleware.security.SecurityMiddleware", + "django.contrib.sessions.middleware.SessionMiddleware", + "django.middleware.common.CommonMiddleware", + "django.middleware.csrf.CsrfViewMiddleware", + "django.contrib.auth.middleware.AuthenticationMiddleware", + "django.contrib.messages.middleware.MessageMiddleware", + "django.middleware.clickjacking.XFrameOptionsMiddleware", ] -ROOT_URLCONF = 'polyphonic.urls' +ROOT_URLCONF = "polyphonic.urls" TEMPLATES = [ { - 'BACKEND': 'django.template.backends.django.DjangoTemplates', - 'DIRS': [], - 'APP_DIRS': True, - 'OPTIONS': { - 'context_processors': [ - 'django.template.context_processors.debug', - 'django.template.context_processors.request', - 'django.contrib.auth.context_processors.auth', - 'django.contrib.messages.context_processors.messages', + "BACKEND": "django.template.backends.django.DjangoTemplates", + "DIRS": [], + "APP_DIRS": True, + "OPTIONS": { + "context_processors": [ + "django.template.context_processors.debug", + "django.template.context_processors.request", + "django.contrib.auth.context_processors.auth", + "django.contrib.messages.context_processors.messages", ], }, }, ] -WSGI_APPLICATION = 'polyphonic.wsgi.application' +WSGI_APPLICATION = "polyphonic.wsgi.application" # Database # https://docs.djangoproject.com/en/3.1/ref/settings/#databases DATABASES = { - 'default': { - 'ENGINE': 'django.db.backends.sqlite3', - 'NAME': BASE_DIR / 'db.sqlite3', + "default": { + "ENGINE": "django.db.backends.sqlite3", + "NAME": BASE_DIR / "db.sqlite3", } } -DEFAULT_AUTO_FIELD = 'django.db.models.AutoField' +DEFAULT_AUTO_FIELD = "django.db.models.AutoField" # Password validation # https://docs.djangoproject.com/en/3.1/ref/settings/#auth-password-validators AUTH_PASSWORD_VALIDATORS = [ { - 'NAME': 'django.contrib.auth.password_validation.UserAttributeSimilarityValidator', + "NAME": "django.contrib.auth.password_validation.UserAttributeSimilarityValidator", }, { - 'NAME': 'django.contrib.auth.password_validation.MinimumLengthValidator', + "NAME": "django.contrib.auth.password_validation.MinimumLengthValidator", }, { - 'NAME': 'django.contrib.auth.password_validation.CommonPasswordValidator', + "NAME": "django.contrib.auth.password_validation.CommonPasswordValidator", }, { - 'NAME': 'django.contrib.auth.password_validation.NumericPasswordValidator', + "NAME": "django.contrib.auth.password_validation.NumericPasswordValidator", }, ] LOGIN_REDIRECT_URL = "/" @@ -117,8 +116,8 @@ LOGIN_REDIRECT_URL = "/" # https://docs.djangoproject.com/en/3.1/topics/i18n/ # Localisation (localization?) -LANGUAGE_CODE = 'en-us' -TIME_ZONE = 'Australia/Melbourne' +LANGUAGE_CODE = "en-us" +TIME_ZONE = "Australia/Melbourne" USE_I18N = True @@ -130,9 +129,8 @@ USE_TZ = True # Static files (CSS, JavaScript, Images) # https://docs.djangoproject.com/en/3.1/howto/static-files/ -STATIC_URL = '/static/' -STATIC_ROOT = 'static' +STATIC_URL = "/static/" +STATIC_ROOT = "static" # Need to set this -AWS_BUCKET = '' - +AWS_BUCKET = "" diff --git a/app/polyphonic/settings.py b/app/polyphonic/settings.py index e30a451..251427e 100644 --- a/app/polyphonic/settings.py +++ b/app/polyphonic/settings.py @@ -1,7 +1,6 @@ -from .default_settings import * try: from .local_settings import * except ImportError: - pass + from .default_settings import * INSTALLED_APPS += POLYPHONIC_MODULES diff --git a/app/polyphonic/urls.py b/app/polyphonic/urls.py index 4cefc4b..042aef9 100644 --- a/app/polyphonic/urls.py +++ b/app/polyphonic/urls.py @@ -13,18 +13,20 @@ Including another URLconf 1. Import the include() function: from django.urls import include, path 2. Add a URL to urlpatterns: path('blog/', include('blog.urls')) """ + from django.contrib import admin from django.urls import path, re_path, include urlpatterns = [ - path('admin/', admin.site.urls), - path('', include('interface.urls')), - #path('', include('submissions.urls')), - path('', include('library.urls')), + path("admin/", admin.site.urls), + path("", include("interface.urls")), + # path('', include('submissions.urls')), + path("", include("library.urls")), ] try: import debug_toolbar - urlpatterns.append(path('__debug__', include(debug_toolbar.urls))) + + urlpatterns.append(path("__debug__", include(debug_toolbar.urls))) except ImportError: pass