From d710411056788865fcc7267a63ecf9cef35d4254 Mon Sep 17 00:00:00 2001 From: Felix Kleinekathoefer Date: Sat, 30 Dec 2023 23:01:26 +0100 Subject: [PATCH] Added crispy bootstrap3 pack --- .run/migrate dev.run.xml | 26 ++++++++++++++++++++++++++ .run/run dev.run.xml | 26 ++++++++++++++++++++++++++ docker-compose.dev.yml | 17 +++++++++++++++++ requirements/base.txt | 1 + spongeauth/spongeauth/settings/base.py | 2 ++ 5 files changed, 72 insertions(+) create mode 100644 .run/migrate dev.run.xml create mode 100644 .run/run dev.run.xml create mode 100644 docker-compose.dev.yml diff --git a/.run/migrate dev.run.xml b/.run/migrate dev.run.xml new file mode 100644 index 00000000..8a569196 --- /dev/null +++ b/.run/migrate dev.run.xml @@ -0,0 +1,26 @@ + + + + + \ No newline at end of file diff --git a/.run/run dev.run.xml b/.run/run dev.run.xml new file mode 100644 index 00000000..6bc14c2b --- /dev/null +++ b/.run/run dev.run.xml @@ -0,0 +1,26 @@ + + + + + \ No newline at end of file diff --git a/docker-compose.dev.yml b/docker-compose.dev.yml new file mode 100644 index 00000000..80f2dc37 --- /dev/null +++ b/docker-compose.dev.yml @@ -0,0 +1,17 @@ +version: '3.8' + +services: + postgres: + image: postgres:latest + container_name: spongeauth-postgres + environment: + POSTGRES_DB: spongeauth + POSTGRES_USER: spongeauth + POSTGRES_PASSWORD: spongeauth + ports: + - "5432:5432" + volumes: + - postgres_data:/var/lib/postgresql/data + +volumes: + postgres_data: diff --git a/requirements/base.txt b/requirements/base.txt index 6e882acf..d9acb66d 100644 --- a/requirements/base.txt +++ b/requirements/base.txt @@ -3,6 +3,7 @@ Django==4.2.6 Pillow==10.1.0 oauth2client==4.1.3 django-crispy-forms==2.1 +crispy-bootstrap3==2022.1 django-model-utils==4.3.1 qrcode==7.4.2 pytz==2023.3.post1 diff --git a/spongeauth/spongeauth/settings/base.py b/spongeauth/spongeauth/settings/base.py index 56e90db0..1ad3e48f 100644 --- a/spongeauth/spongeauth/settings/base.py +++ b/spongeauth/spongeauth/settings/base.py @@ -37,6 +37,7 @@ "migrator", "api", "crispy_forms", + "crispy_bootstrap3", "dal", "dal_select2", "django.contrib.admin", @@ -137,6 +138,7 @@ GOOGLE_SCOPES = ["profile", "email"] SECURE_CROSS_ORIGIN_OPENER_POLICY = 'same-origin-allow-popups' +CRISPY_ALLOWED_TEMPLATE_PACKS = "bootstrap3" CRISPY_TEMPLATE_PACK = "bootstrap3" AUTH_USER_MODEL = "accounts.User"