Fusion of two domains into one : local + dev

Author: jess2304

.github/workflows/dev.yml

@@ -1,7 +1,7 @@
 name: NextShape CI - Dev
 on:
   push:
-    branches: [develop]
+    branches: [develop, fusion-domains]
   pull_request:
     branches: [develop]
 

.gitignore

@@ -198,3 +198,4 @@ dist-ssr
 *.sw?
 
 WS/brevo.pem
+.env.prod

UI/Dockerfile

@@ -5,7 +5,7 @@
   "type": "module",
   "scripts": {
     "dev": "vite",
-    "build": "vue-tsc -b && vite build",
+    "build": "vue-tsc --noEmit && vite build",
     "preview": "vite preview"
   },
   "dependencies": {

UI/package.json

@@ -12,7 +12,8 @@
     "paths": {
       "@/*": ["src/*"]
     },
-    "skipLibCheck": true
+    "skipLibCheck": true,
+    "noEmit": true
   },
   "include": ["src", "vite.config.ts"],
   "exclude": ["node_modules"]

UI/tsconfig.json

@@ -3,7 +3,11 @@ import vue from "@vitejs/plugin-vue"
 import { fileURLToPath, URL } from "url"
 // https://vitejs.dev/config/
 export default defineConfig({
-  base: "/",
+  base: "/assets/",
+  build: {
+    outDir: "dist",
+    assetsDir: "assets",
+  },
   plugins: [vue()],
   resolve: {
     alias: [

UI/vite.config.ts

@@ -1,28 +1,23 @@
-# Image Python
-FROM python:3.11
+# Étape 1 : Build Vue frontend
+FROM node:20 AS frontend
+WORKDIR /app
+COPY UI/ ./UI/
+RUN cd UI && npm install && npm run build
 
-# Dossier de travail
+# Étape 2 : Django backend avec frontend intégré
+FROM python:3.11
 WORKDIR /app
 
 RUN apt-get update && apt-get install -y postgresql-client
 
-# Copier et installer les dépendances
-COPY requirements.txt .
+COPY WS/requirements.txt .
 RUN pip install --no-cache-dir -r requirements.txt
 
-# Copier le projet
-COPY . .
-COPY wait.sh .
+COPY WS/ .
 
-# Ajouter le certificat Brevo
-COPY brevo.pem /usr/local/share/ca-certificates/brevo.crt
-RUN update-ca-certificates
+COPY --from=frontend /app/UI/dist /app/UI/dist
 
-# Donner les droits d'exécution au script d'entrée
 RUN chmod +x wait.sh entrypoint.sh
 
-# Exposer le port de Django
 EXPOSE 8000
-
-# Définir le script comme point d'entrée
 ENTRYPOINT ["bash", "entrypoint.sh"]

WS/Dockerfile

@@ -2,12 +2,23 @@
 
 echo "ENV = $ENV"
 
+# Check if cert is mounted and update it
+if [ -f /usr/local/share/ca-certificates/brevo.crt ]; then
+    echo "Certificat brevo.pem détecté — update-ca-certificates"
+    update-ca-certificates
+else
+    echo "Aucun certificat Brevo détecté, skip"
+fi
+
 ./wait.sh "$DATABASE_HOST:$DATABASE_PORT"
 
 # Apply migrations
 echo "Apply the migrations"
 python manage.py migrate
 
+echo "Collect static files"
+python manage.py collectstatic --noinput
+
 if [ "$ENV" = "local" ]; then
     echo "Local mode (Docker local)"
     echo "Seeding the database..."

WS/entrypoint.sh

@@ -14,11 +14,10 @@
 from datetime import timedelta
 from pathlib import Path
 
-from corsheaders.defaults import default_headers
 from dotenv import load_dotenv
 
 # Build paths inside the project like this: BASE_DIR / 'subdir'.
-BASE_DIR = Path(__file__).resolve().parent.parent.parent
+BASE_DIR = Path(__file__).resolve().parent.parent
 
 dotenv_path = BASE_DIR / ".env"
 load_dotenv(dotenv_path, override=True)
@@ -29,8 +28,11 @@
 # SECURITY WARNING: keep the secret key used in production secret!
 SECRET_KEY = os.getenv("DJANGO_SECRET_KEY", "fallback-secret-key-for-dev")
 
+# Environment
+ENV = os.getenv("ENV", "local")
+
 # SECURITY WARNING: don't run with debug turned on in production!
-DEBUG = True
+DEBUG = ENV == "local"
 
 ALLOWED_HOSTS: list = os.getenv("DJANGO_ALLOWED_HOSTS", "localhost").split(",")
 
@@ -45,12 +47,11 @@
     "django.contrib.messages",
     "django.contrib.staticfiles",
     "rest_framework",
-    "corsheaders",
     "api",
 ]
 
 MIDDLEWARE = [
-    "corsheaders.middleware.CorsMiddleware",
+    "whitenoise.middleware.WhiteNoiseMiddleware",
     "django.middleware.security.SecurityMiddleware",
     "django.contrib.sessions.middleware.SessionMiddleware",
     "django.middleware.common.CommonMiddleware",
@@ -60,49 +61,13 @@
     "django.middleware.clickjacking.XFrameOptionsMiddleware",
 ]
 
-CORS_ALLOWED_ORIGINS = [
-    "https://nextshape.onrender.com",  # prod
-    "https://nextshape-dev.onrender.com",  # dev
-    "http://localhost:5173",
-    "http://127.0.0.1:5173",
-]
-
-CORS_ALLOW_CREDENTIALS = True
-CORS_ALLOW_HEADERS = list(default_headers) + [
-    "content-type",
-]
-
-CORS_ALLOW_METHODS = [
-    "DELETE",
-    "GET",
-    "OPTIONS",
-    "PATCH",
-    "POST",
-    "PUT",
-]
-
-ENV = os.getenv("ENV", "local")
-
-if ENV == "local":
-    CORS_ALLOWED_ORIGINS = [
-        "http://localhost:5173",
-    ]
-
-elif ENV == "dev":
-    CORS_ALLOWED_ORIGINS = [
-        "http://localhost:5173",
-        "https://nextshape-dev.onrender.com",
-        "https://nextshape.onrender.com",  # prod front calls back dev for the current moment
-    ]
-elif ENV == "prod":
-    CORS_ALLOWED_ORIGINS = ["https://nextshape.onrender.com"]
 
 ROOT_URLCONF = "next_shape_ws.urls"
 
 TEMPLATES = [
     {
         "BACKEND": "django.template.backends.django.DjangoTemplates",
-        "DIRS": [],
+        "DIRS": [os.path.join(BASE_DIR, "UI", "dist")],
         "APP_DIRS": True,
         "OPTIONS": {
             "context_processors": [
@@ -192,7 +157,12 @@
 # Static files (CSS, JavaScript, Images)
 # https://docs.djangoproject.com/en/5.1/howto/static-files/
 
-STATIC_URL = "static/"
+STATIC_URL = "/assets/"
+MEDIA_URL = "/media/"
+
+STATICFILES_DIRS = [BASE_DIR / "UI" / "dist"]
+STATIC_ROOT = BASE_DIR / "staticfiles"
+MEDIA_ROOT = BASE_DIR / "media"
 
 # Default primary key field type
 # https://docs.djangoproject.com/en/5.1/ref/settings/#default-auto-field
@@ -201,7 +171,6 @@
 
 
 # JWT Settings
-
 SIMPLE_JWT = {
     "ACCESS_TOKEN_LIFETIME": timedelta(minutes=30),
     "REFRESH_TOKEN_LIFETIME": timedelta(days=1),
@@ -210,23 +179,20 @@
 }
 
 
-# Default AutoField
-
-DEFAULT_AUTO_FIELD = "django.db.models.BigAutoField"
-
-
 # Cookie settings for auth
-def get_cookie_settings():
-    if ENV in ["dev", "prod"]:
-        return {
-            "httponly": True,
-            "secure": True,
-            "samesite": "None",
-            "domain": "nextshape-backend-dev.onrender.com",
-            "path": "/",
-        }
-    else:
-        return {"httponly": True, "secure": False, "samesite": "Lax", "path": "/"}
-
-
-COOKIE_PARAMS = get_cookie_settings()
+COOKIE_PARAMS = {
+    "httponly": True,
+    "secure": not DEBUG,
+    "samesite": "None" if not DEBUG else "Lax",
+    "path": "/",
+}
+
+if ENV == "local":
+    # CORS config in local when we don't use docker,
+    # we may need the access between back and front
+    INSTALLED_APPS += ["corsheaders"]
+    MIDDLEWARE.insert(0, "corsheaders.middleware.CorsMiddleware")
+
+    CORS_ALLOWED_ORIGINS = ["http://localhost:5173"]
+    CORS_ALLOW_CREDENTIALS = True
+    CSRF_TRUSTED_ORIGINS = ["http://localhost:5173"]

WS/next_shape_ws/settings.py

@@ -16,8 +16,10 @@
 """
 from django.contrib import admin
 from django.urls import include, path
+from django.views.generic import TemplateView
 
 urlpatterns = [
     path("admin/", admin.site.urls),
     path("api/", include("api.urls")),
+    path("", TemplateView.as_view(template_name="index.html")),
 ]