Merge branch 'master' of https://github.com/EDM115-org/Tab-Magiques

Author: EuphoriaReal

.zellij.dev.kdl

@@ -20,4 +20,4 @@ layout {
     pane size=2 borderless=true {
         plugin location="zellij:status-bar"
     }
-}
+}

docker-compose.yml

@@ -6,8 +6,7 @@ services:
       - MYSQL_USER=${DB_USER}
       - MYSQL_PASSWORD=${DB_PASSWORD}
     image: mysql:8.0.36
-    ports:
-      - "3306:3306"
+    network_mode: "host"
     profiles:
       - dev
       - prod

package.json

@@ -87,8 +87,8 @@
     "stop-dev-docker": "docker compose --profile dev stop",
     "stop-prod-docker": "docker compose --profile prod stop",
     "upgrade": "nuxi upgrade --force",
-    "zellij-dev": "cross-env DEV_SHELL=$(basename \"$SHELL\") && zellij --layout .zellij.dev.kdl && npm run stop-dev-docker",
-    "zellij-prod": "cross-env DEV_SHELL=$(basename \"$SHELL\") && zellij --layout .zellij.prod.kdl && npm run stop-prod-docker"
+    "zellij-dev": "export $(cat .env | xargs) && cross-env-shell DEV_SHELL=$(basename $SHELL) \"zellij --layout .zellij.dev.kdl && npm run stop-dev-docker\"",
+    "zellij-prod": "export $(cat .env | xargs) && cross-env-shell DEV_SHELL=$(basename $SHELL) \"zellij --layout .zellij.prod.kdl && npm run stop-prod-docker\""
   },
   "type": "module",
   "version": "1.0.0"

server/api/db.js

@@ -7,7 +7,8 @@ try {
     host: process.env.DB_HOST,
     user: process.env.DB_USER,
     password: process.env.DB_PASSWORD,
-    database: process.env.DB_NAME
+    database: process.env.DB_NAME,
+    port: process.env.DB_PORT
   })
 } catch (err) {
   console.error(err)