Merge pull request #27 from akirachix/dev

Dev to staging

api/urls.py

@@ -14,7 +14,6 @@
 router = DefaultRouter()
 router.register(r"notifications", NotificationViewSet)
 urlpatterns = router.urls
-
 urlpatterns = [
     path("", include(router.urls)),
     path("users/", UserListView.as_view(), name="user-list"),

aquasens/settings.py

@@ -1,3 +1,5 @@
+import dj_database_url
+
 """
 Django settings for newproject project.
 
@@ -14,7 +16,7 @@
 import os
 from pathlib import Path
 from dotenv import load_dotenv, find_dotenv
-from pathlib import Path
+
 
 BASE_DIR = Path(__file__).resolve().parent.parent
 TEMPLATE_DIR = os.path.join(BASE_DIR, "drainage", "templates")
@@ -41,20 +43,24 @@
     "sensor",
     "notification",
     "corsheaders",
+    "django_extensions",
 ]
 
 MIDDLEWARE = [
     "django.middleware.security.SecurityMiddleware",
     "django.contrib.sessions.middleware.SessionMiddleware",
+    "corsheaders.middleware.CorsMiddleware",
     "django.middleware.common.CommonMiddleware",
     "django.middleware.csrf.CsrfViewMiddleware",
-    "corsheaders.middleware.CorsMiddleware",
     "django.contrib.auth.middleware.AuthenticationMiddleware",
     "django.contrib.messages.middleware.MessageMiddleware",
     "django.middleware.clickjacking.XFrameOptionsMiddleware",
     "whitenoise.middleware.WhiteNoiseMiddleware",
 ]
 
+CORS_ORIGIN_ALLOW_ALL = True
+
+
 ROOT_URLCONF = "aquasens.urls"
 
 REST_FRAMEWORK = {
@@ -96,11 +102,12 @@
 # Database
 # https://docs.djangoproject.com/en/5.1/ref/settings/#databases
 
-import os
-import dj_database_url
 
-DATABASES = {"default": dj_database_url.config(default=os.getenv("DATABASE_URL"))}
-if not os.getenv("DATABASE_URL"):
+DATABASE_URL = os.getenv("DATABASE_URL")
+
+if DATABASE_URL:
+    DATABASES = {"default": dj_database_url.config(default=DATABASE_URL)}
+else:
     DATABASES = {
         "default": {
             "ENGINE": "django.db.backends.sqlite3",

requirements.txt

@@ -26,3 +26,4 @@ gunicorn==23.0.0
 typing_extensions==4.12.2
 urllib3==2.2.3
 whitenoise==6.7.0
+django-extensions==3.2.3