Refactor Docker setup and update environment configurations

config/settings/__init__.py

@@ -27,7 +27,7 @@ SECRET_KEY = 'django-insecure-1fy&f@qu8zuwei(7n3*ta5r=5pp1o84*e4bmk))tl9d_w72cg!
 # SECURITY WARNING: don't run with debug turned on in production!
 DEBUG = True
 
-ALLOWED_HOSTS = env.list("ALLOWED_HOSTS", default=[".localhost", "127.0.0.1", "testserver", ".hf.space", ".vercel.app"])
+ALLOWED_HOSTS = env.list("ALLOWED_HOSTS", default=[".localhost", "127.0.0.1", "testserver", ".hf.space", ".ngrok-free.app", ".ngrok.io", ".ngrok-free.dev"])
 
 # Subdomain Tenancy Settings
 BASE_DOMAIN = env("BASE_DOMAIN", default="localhost:9000")
@@ -43,7 +43,9 @@ CSRF_TRUSTED_ORIGINS = env.list("CSRF_TRUSTED_ORIGINS", default=[
     "http://localhost:9000",
     "http://127.0.0.1:9000",
     "https://*.hf.space",
-    "https://*.vercel.app",
+    "https://*.ngrok-free.app",
+    "https://*.ngrok.io",
+    "https://*.ngrok-free.dev",
 ])
 
 # Site URL (Used for email verification links)
@@ -142,7 +144,10 @@ WSGI_APPLICATION = 'config.wsgi.application'
 # https://docs.djangoproject.com/en/6.0/ref/settings/#databases
 
 DATABASES = {
-    'default': env.db("DATABASE_URL", default="postgresql://postgres:ngbksZaNkjulikrp@db.tyhlrlpebsgcciglxonc.supabase.co:5432/postgres")
+    'default': env.db(
+        'DATABASE_URL',
+        default=f"sqlite:///{BASE_DIR / 'db.sqlite3'}"
+    )
 }
 
 

docker-compose.yml

@@ -0,0 +1,27 @@
+version: '3.8'
+
+services:
+  db:
+    image: postgres:16-alpine
+    restart: always
+    environment:
+      POSTGRES_USER: postgres
+      POSTGRES_PASSWORD: postgres
+      POSTGRES_DB: saas_db
+    volumes:
+      - ./docker_pg_db:/var/lib/postgresql/data
+    ports:
+      - "5432:5432"
+
+  web:
+    build: .
+    command: python manage.py runserver 0.0.0.0:7860
+    volumes:
+      - .:/app
+    ports:
+      - "9000:7860"
+    environment:
+      - DATABASE_URL=postgres://postgres:postgres@db:5432/saas_db
+      - DJANGO_SETTINGS_MODULE=config.settings
+    depends_on:
+      - db

start_dev.ps1

@@ -0,0 +1,49 @@
+<#
+.SYNOPSIS
+Starts Docker Desktop, spins up the SaaS application via docker-compose, and launches ngrok.
+#>
+
+Write-Host "==========================================" -ForegroundColor Cyan
+Write-Host "  Starting SaaS Local Dev Environment" -ForegroundColor Cyan
+Write-Host "==========================================" -ForegroundColor Cyan
+
+# 1. Check if Docker is running
+Write-Host "`n[1/3] Checking Docker daemon..." -ForegroundColor Yellow
+$dockerInfo = docker info 2>&1
+if ($LASTEXITCODE -ne 0) {
+    Write-Host "Docker is not running. Attempting to start Docker Desktop..." -ForegroundColor Yellow
+    $dockerPath = "C:\Program Files\Docker\Docker\Docker Desktop.exe"
+    if (Test-Path $dockerPath) {
+        Start-Process -FilePath $dockerPath
+        Write-Host "Waiting for Docker to start (this may take a minute)..."
+        while ($true) {
+            Start-Sleep -Seconds 3
+            docker info >$null 2>&1
+            if ($LASTEXITCODE -eq 0) {
+                Write-Host "Docker is now running!" -ForegroundColor Green
+                break
+            }
+            Write-Host "." -NoNewline
+        }
+        Write-Host ""
+    } else {
+        Write-Host "Error: Could not find Docker Desktop at $dockerPath. Please start Docker manually." -ForegroundColor Red
+        exit 1
+    }
+} else {
+    Write-Host "Docker is already running!" -ForegroundColor Green
+}
+
+# 2. Start Application via Docker Compose
+Write-Host "`n[2/3] Starting Database and Web Application via Docker Compose..." -ForegroundColor Yellow
+docker-compose up -d --build
+if ($LASTEXITCODE -ne 0) {
+    Write-Host "Failed to start docker containers!" -ForegroundColor Red
+    exit 1
+}
+Write-Host "Containers are up and running!" -ForegroundColor Green
+
+# 3. Start ngrok
+Write-Host "`n[3/3] Generating public ngrok URL..." -ForegroundColor Yellow
+Write-Host "Starting ngrok on port 9000..." -ForegroundColor Green
+ngrok http 9000

test_db.py

@@ -1,26 +0,0 @@
-import psycopg2
-from dotenv import load_dotenv
-import os
-
-print("Loading environment variables...")
-# Load environment variables from .env
-load_dotenv()
-
-# Fetch variables
-DATABASE_URL = os.getenv("DATABASE_URL")
-if not DATABASE_URL:
-    print("No DATABASE_URL found in .env! Using Supabase URL directly for test.")
-    DATABASE_URL = "postgresql://postgres:ngbksZaNkjulikrp@db.tyhlrlpebsgcciglxonc.supabase.co:5432/postgres"
-
-print("Connecting to the database...")
-try:
-    # Connect to the database
-    connection = psycopg2.connect(DATABASE_URL)
-    print("SUCCESS! Database connection string works perfectly!")
-    
-    # Close connection
-    connection.close()
-except Exception as e:
-    print("FAILED to connect!")
-    print("Error:", e)
-    print("\nReminder: Vercel does not support IPv6. If this URL works locally but fails on Vercel, you MUST use the IPv4 Connection Pooler URL from Supabase!")