From 13a317d3df27144bd7d322eb910dad36618a9a6e Mon Sep 17 00:00:00 2001
From: WGAVermeer <90707235+WGAVermeer@users.noreply.github.com>
Date: Wed, 11 Mar 2026 08:12:07 +0100
Subject: [PATCH] Make Dev enters into the webserver shell. Fixed database env
 variables to properly connect.

---
 Makefile                | 3 ++-
 compose.yaml            | 4 +++-
 src/website/settings.py | 4 ++--
 src/website/urls.py     | 6 ++++--
 4 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/Makefile b/Makefile
index 4e2289a..c61f5ba 100644
--- a/Makefile
+++ b/Makefile
@@ -4,7 +4,8 @@ prod:
 
 dev:
 	docker compose down
-	docker compose -f ./compose.yaml -f ./compose.dev.yaml up --build
+	docker compose -f ./compose.yaml -f ./compose.dev.yaml up --build -d
+	docker exec -it quatsh-website-web-1 sh
 
 test:
 	docker compose --env-file .env.template -f ./compose.yaml -f ./compose.test.yaml up --build --abort-on-container-exit --exit-code-from web
diff --git a/compose.yaml b/compose.yaml
index 36e320f..5fa3bbf 100644
--- a/compose.yaml
+++ b/compose.yaml
@@ -10,16 +10,18 @@ services:
       PYTHONDONTWRITEBYTECODE: 1
       PYTHONUNBUFFERED: 1
       DJANGO_SETTINGS_MODULE: ${DJANGO_SETTINGS_MODULE}
+    env_file: ".env"
     restart: unless-stopped
 
   db:
     image: postgres:18
     environment:
-      POSTGRES_DB: ${POSTGRES_DB}
+      POSTGRES_DB: ${POSTGRES_DBNAME}
       POSTGRES_USER: ${POSTGRES_USER}
       POSTGRES_PASSWORD: ${POSTGRES_PASSWORD}
     volumes:
       - postgres_data:/var/lib/postgresql
+    env_file: ".env"
     restart: unless-stopped
 
   adminer:
diff --git a/src/website/settings.py b/src/website/settings.py
index 7a4d735..2bdcd39 100644
--- a/src/website/settings.py
+++ b/src/website/settings.py
@@ -77,7 +77,7 @@ WSGI_APPLICATION = "website.wsgi.application"
 DATABASES = {
     "default": {
         "ENGINE": "django.db.backends.postgresql",
-        "DBNAME": os.getenv("POSTGRES_DBNAME"),
+        "NAME": os.getenv("POSTGRES_DBNAME"),
         "USER": os.getenv("POSTGRES_USER"),
         "PASSWORD": os.getenv("POSTGRES_PASSWORD"),
         "HOST": os.getenv("POSTGRES_HOST"),
@@ -110,7 +110,7 @@ AUTH_PASSWORD_VALIDATORS = [
 
 LANGUAGE_CODE = "en-us"
 
-TIME_ZONE = "UTC"
+TIME_ZONE = "Europe/Amsterdam"
 
 USE_I18N = True
 
diff --git a/src/website/urls.py b/src/website/urls.py
index ac9ab57..37f07e2 100644
--- a/src/website/urls.py
+++ b/src/website/urls.py
@@ -14,9 +14,11 @@ 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
+from django.urls import path, include
 
 urlpatterns = [
-    path('admin/', admin.site.urls),
+    path("polls/", include("polls.urls")),
+    path("admin/", admin.site.urls),
 ]