From 38bdfb7dcf90f9906f31769191787bbfbe31e3ef Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lo=C3=AFc=20Dachary?= Date: Thu, 7 Jul 2022 09:50:47 +0200 Subject: [PATCH] tmp --- Makefile | 3 ++- dashboard/settings.py | 9 ++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Makefile b/Makefile index aca3588..1036086 100644 --- a/Makefile +++ b/Makefile @@ -18,13 +18,14 @@ coverage: ## Generate test coverage report doc: ## Generates documentation $(call unimplemented) - + docker: ## Build Docker image from source $(call unimplemented) env: ## Install all dependencies @-virtualenv venv . ./venv/bin/activate && pip install -r requirements.txt + . ./venv/bin/activate && yes yes | python manage.py collectstatic . ./venv/bin/activate && ./integration/ci.sh init freeze: ## Freeze python dependencies diff --git a/dashboard/settings.py b/dashboard/settings.py index 18716c1..b777c2a 100644 --- a/dashboard/settings.py +++ b/dashboard/settings.py @@ -23,7 +23,7 @@ BASE_DIR = Path(__file__).resolve().parent.parent SECRET_KEY = "django-insecure-44zt@)$td7_yh(01q^hrce%h(311n!djn%%#s1b7$cvfy!pf7y" # SECURITY WARNING: don't run with debug turned on in production! -DEBUG = True +#DEBUG = True ALLOWED_HOSTS = [] @@ -48,7 +48,6 @@ INSTALLED_APPS = [ MIDDLEWARE = [ "django.middleware.security.SecurityMiddleware", - "whitenoise.middleware.WhiteNoiseMiddleware", "django.contrib.sessions.middleware.SessionMiddleware", "oauth2_provider.middleware.OAuth2TokenMiddleware", "django.middleware.common.CommonMiddleware", @@ -131,11 +130,11 @@ USE_TZ = True STATIC_URL = "static/" STATIC_ROOT = BASE_DIR / "static" -# STATICFILES_DIRS = [ +#STATICFILES_DIRS = [ # BASE_DIR / "static", -# ] +#] -STATICFILES_STORAGE = "whitenoise.storage.CompressedManifestStaticFilesStorage" +STATICFILES_STORAGE = "django.contrib.staticfiles.storage.StaticFilesStorage" # Default primary key field type # https://docs.djangoproject.com/en/4.0/ref/settings/#default-auto-field