From 74f17a18d6e0cee2d41ae1656f8c95bd1ad3ff54 Mon Sep 17 00:00:00 2001
From: batche <chebadad@lilo.org>
Date: Mon, 2 Jan 2023 20:17:51 +0100
Subject: [PATCH] changements de l'invocation des environnements dans les
 fichiers svelte

---
 make_env.sh                                   |   5 +-
 srcs/requirements/nestjs/Dockerfile           |   4 +-
 .../nestjs/api_back/package-lock.json         | 251 +-----------------
 .../requirements/nestjs/api_back/package.json |   2 +-
 .../nestjs/api_back/src/chat/chat.gateway.ts  |   2 +-
 .../api_front/src/pages/SplashPage.svelte     |   7 +-
 .../src/pages/TwoFactorAuthentication.svelte  |   6 +-
 .../api_front/src/pages/game/Game.svelte      |  14 +-
 .../src/pages/game/GameSpectator.svelte       |  10 +-
 .../api_front/src/pages/game/Ranking.svelte   |   8 +-
 .../src/pages/profile/ProfileDisplay.svelte   |   4 +-
 .../src/pages/profile/ProfileFriends.svelte   |  22 +-
 .../src/pages/profile/ProfileSettings.svelte  |  12 +-
 .../api_front/src/pieces/DisplayAUser.svelte  |  14 +-
 .../src/pieces/GenerateUserDisplay.svelte     |   4 +-
 .../svelte/api_front/src/pieces/Header.svelte |   4 +-
 .../api_front/src/pieces/chat/Chat.svelte     |   4 +-
 17 files changed, 71 insertions(+), 302 deletions(-)

diff --git a/make_env.sh b/make_env.sh
index bdc6363f..671ec3ae 100644
--- a/make_env.sh
+++ b/make_env.sh
@@ -36,10 +36,8 @@
 		fi
 	fi
 
-
-
 # Create a new environment for docker
-#
+
 	echo "Creating a new environment for docker"
 	NODE_ENV=""
 	# Ask if dev or prod environment
@@ -55,6 +53,7 @@
 	read -p "Enter the name of the host like \"localhost\" : " PROJECT_HOST
 	echo "WEBSITE_HOST=$PROJECT_HOST"							>> "$ENV_FILE_DOCKER"
 	echo "WEBSITE_PORT=8080"									>> "$ENV_FILE_DOCKER"
+	cp "$ENV_FILE_DOCKER" "$ENV_FILE_SVELTE"
 	echo "POSTGRES_USER=postgres"								>> "$ENV_FILE_DOCKER"
 	echo "#if change postgres pswd, do make destroy"			>> "$ENV_FILE_DOCKER"
 	echo "POSTGRES_PASSWORD=$(generate_password)"				>> "$ENV_FILE_DOCKER"
diff --git a/srcs/requirements/nestjs/Dockerfile b/srcs/requirements/nestjs/Dockerfile
index 8773c1b1..d4228c0b 100644
--- a/srcs/requirements/nestjs/Dockerfile
+++ b/srcs/requirements/nestjs/Dockerfile
@@ -4,7 +4,7 @@ WORKDIR /usr/app
 
 COPY ./api_back ./
 COPY ./api_back/src/uploads/avatars/default.png ./uploads/avatars/default.png
-RUN npm ci
+
+RUN npm i
 
 CMD [ "npm", "run", "start:dev" ]
-
diff --git a/srcs/requirements/nestjs/api_back/package-lock.json b/srcs/requirements/nestjs/api_back/package-lock.json
index 2085d3b6..c3e88cfb 100644
--- a/srcs/requirements/nestjs/api_back/package-lock.json
+++ b/srcs/requirements/nestjs/api_back/package-lock.json
@@ -19,7 +19,6 @@
         "@nestjs/typeorm": "^9.0.1",
         "@nestjs/websockets": "^9.2.1",
         "@types/express-session": "^1.17.5",
-        "@types/redis": "^4.0.11",
         "@types/validator": "^13.7.9",
         "class-transformer": "^0.5.1",
         "class-validator": "^0.13.2",
@@ -48,7 +47,7 @@
         "@types/express": "^4.17.13",
         "@types/jest": "28.1.8",
         "@types/multer": "^1.4.7",
-        "@types/node": "^16.0.0",
+        "@types/node": "^16.18.11",
         "@types/passport-local": "^1.0.34",
         "@types/supertest": "^2.0.11",
         "@typescript-eslint/eslint-plugin": "^5.0.0",
@@ -1694,65 +1693,6 @@
         "@nestjs/core": "^9.0.0"
       }
     },
-    "node_modules/@nestjs/platform-express/node_modules/debug": {
-      "version": "2.6.9",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
-      "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
-      "dependencies": {
-        "ms": "2.0.0"
-      }
-    },
-    "node_modules/@nestjs/platform-express/node_modules/express": {
-      "version": "4.18.1",
-      "resolved": "https://registry.npmjs.org/express/-/express-4.18.1.tgz",
-      "integrity": "sha512-zZBcOX9TfehHQhtupq57OF8lFZ3UZi08Y97dwFCkD8p9d/d2Y3M+ykKcwaMDEL+4qyUolgBDX6AblpR3fL212Q==",
-      "dependencies": {
-        "accepts": "~1.3.8",
-        "array-flatten": "1.1.1",
-        "body-parser": "1.20.0",
-        "content-disposition": "0.5.4",
-        "content-type": "~1.0.4",
-        "cookie": "0.5.0",
-        "cookie-signature": "1.0.6",
-        "debug": "2.6.9",
-        "depd": "2.0.0",
-        "encodeurl": "~1.0.2",
-        "escape-html": "~1.0.3",
-        "etag": "~1.8.1",
-        "finalhandler": "1.2.0",
-        "fresh": "0.5.2",
-        "http-errors": "2.0.0",
-        "merge-descriptors": "1.0.1",
-        "methods": "~1.1.2",
-        "on-finished": "2.4.1",
-        "parseurl": "~1.3.3",
-        "path-to-regexp": "0.1.7",
-        "proxy-addr": "~2.0.7",
-        "qs": "6.10.3",
-        "range-parser": "~1.2.1",
-        "safe-buffer": "5.2.1",
-        "send": "0.18.0",
-        "serve-static": "1.15.0",
-        "setprototypeof": "1.2.0",
-        "statuses": "2.0.1",
-        "type-is": "~1.6.18",
-        "utils-merge": "1.0.1",
-        "vary": "~1.1.2"
-      },
-      "engines": {
-        "node": ">= 0.10.0"
-      }
-    },
-    "node_modules/@nestjs/platform-express/node_modules/ms": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-      "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A=="
-    },
-    "node_modules/@nestjs/platform-express/node_modules/path-to-regexp": {
-      "version": "0.1.7",
-      "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.7.tgz",
-      "integrity": "sha512-5DFkuoqlv1uYQKxy8omFBeJPQcdoE07Kv2sferDCrAq1ohOU+MSDswDIbnx3YAM60qIOnYa53wBhXW0EbMonrQ=="
-    },
     "node_modules/@nestjs/platform-socket.io": {
       "version": "9.2.1",
       "resolved": "https://registry.npmjs.org/@nestjs/platform-socket.io/-/platform-socket.io-9.2.1.tgz",
@@ -1787,11 +1727,6 @@
         "node": ">=10.0.0"
       }
     },
-    "node_modules/@nestjs/platform-socket.io/node_modules/tslib": {
-      "version": "2.4.1",
-      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.4.1.tgz",
-      "integrity": "sha512-tGyy4dAjRIEwI7BzsB0lynWgOpfqjUdq91XXAlIWD2OwKBH7oCl/GZG/HT4BOHrTlPMOASlMQ7veyTqpmRcrNA=="
-    },
     "node_modules/@nestjs/schematics": {
       "version": "9.0.3",
       "resolved": "https://registry.npmjs.org/@nestjs/schematics/-/schematics-9.0.3.tgz",
@@ -1960,11 +1895,6 @@
         }
       }
     },
-    "node_modules/@nestjs/websockets/node_modules/tslib": {
-      "version": "2.4.1",
-      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.4.1.tgz",
-      "integrity": "sha512-tGyy4dAjRIEwI7BzsB0lynWgOpfqjUdq91XXAlIWD2OwKBH7oCl/GZG/HT4BOHrTlPMOASlMQ7veyTqpmRcrNA=="
-    },
     "node_modules/@nodelib/fs.scandir": {
       "version": "2.1.5",
       "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz",
@@ -2381,9 +2311,9 @@
       }
     },
     "node_modules/@types/node": {
-      "version": "16.18.10",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-16.18.10.tgz",
-      "integrity": "sha512-XU1+v7h81p7145ddPfjv7jtWvkSilpcnON3mQ+bDi9Yuf7OI56efOglXRyXWgQ57xH3fEQgh7WOJMncRHVew5w=="
+      "version": "16.18.11",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-16.18.11.tgz",
+      "integrity": "sha512-3oJbGBUWuS6ahSnEq1eN2XrCyf4YsWI8OyCvo7c64zQJNplk3mO84t53o8lfTk+2ji59g5ycfc6qQ3fdHliHuA=="
     },
     "node_modules/@types/parse-json": {
       "version": "4.0.0",
@@ -2437,15 +2367,6 @@
       "resolved": "https://registry.npmjs.org/@types/range-parser/-/range-parser-1.2.4.tgz",
       "integrity": "sha512-EEhsLsD6UsDM1yFhAvy0Cjr6VwmpMWqFBCb9w07wVugF7w9nfajxLuVmngTIpgS6svCnm6Vaw+MZhoDCKnOfsw=="
     },
-    "node_modules/@types/redis": {
-      "version": "4.0.11",
-      "resolved": "https://registry.npmjs.org/@types/redis/-/redis-4.0.11.tgz",
-      "integrity": "sha512-bI+gth8La8Wg/QCR1+V1fhrL9+LZUSWfcqpOj2Kc80ZQ4ffbdL173vQd5wovmoV9i071FU9oP2g6etLuEwb6Rg==",
-      "deprecated": "This is a stub types definition. redis provides its own type definitions, so you do not need this installed.",
-      "dependencies": {
-        "redis": "*"
-      }
-    },
     "node_modules/@types/semver": {
       "version": "7.3.13",
       "resolved": "https://registry.npmjs.org/@types/semver/-/semver-7.3.13.tgz",
@@ -3372,11 +3293,6 @@
         "ieee754": "^1.1.13"
       }
     },
-    "node_modules/buffer-equal-constant-time": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/buffer-equal-constant-time/-/buffer-equal-constant-time-1.0.1.tgz",
-      "integrity": "sha512-zRpUiDwd/xk6ADqPMATG8vc9VPrkck7T07OIx0gnjmJAnHnTVXNQG3vfvWNuiZIkwu9KrKdA1iJKfsfTVxE6NA=="
-    },
     "node_modules/buffer-from": {
       "version": "1.1.2",
       "resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.2.tgz",
@@ -4070,14 +3986,6 @@
         "node": ">=12"
       }
     },
-    "node_modules/ecdsa-sig-formatter": {
-      "version": "1.0.11",
-      "resolved": "https://registry.npmjs.org/ecdsa-sig-formatter/-/ecdsa-sig-formatter-1.0.11.tgz",
-      "integrity": "sha512-nagl3RYrbNv6kQkeJIpt6NJZy8twLB/2vtz6yN9Z4vRKHN4/QZJIEbqohALSgwKdnksuY3k5Addp5lg8sVoVcQ==",
-      "dependencies": {
-        "safe-buffer": "^5.0.1"
-      }
-    },
     "node_modules/ee-first": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/ee-first/-/ee-first-1.1.1.tgz",
@@ -6533,25 +6441,6 @@
         "graceful-fs": "^4.1.6"
       }
     },
-    "node_modules/jwa": {
-      "version": "1.4.1",
-      "resolved": "https://registry.npmjs.org/jwa/-/jwa-1.4.1.tgz",
-      "integrity": "sha512-qiLX/xhEEFKUAJ6FiBMbes3w9ATzyk5W7Hvzpa/SLYdxNtng+gcurvrI7TbACjIXlsJyr05/S1oUhZrc63evQA==",
-      "dependencies": {
-        "buffer-equal-constant-time": "1.0.1",
-        "ecdsa-sig-formatter": "1.0.11",
-        "safe-buffer": "^5.0.1"
-      }
-    },
-    "node_modules/jws": {
-      "version": "3.2.2",
-      "resolved": "https://registry.npmjs.org/jws/-/jws-3.2.2.tgz",
-      "integrity": "sha512-YHlZCB6lMTllWDtSPHz/ZXTsi8S00usEV6v1tjq8tOUZzw7DpSDWVXjXDre6ed1w/pd495ODpHZYSdkRTsa0HA==",
-      "dependencies": {
-        "jwa": "^1.4.1",
-        "safe-buffer": "^5.0.1"
-      }
-    },
     "node_modules/kleur": {
       "version": "3.0.3",
       "resolved": "https://registry.npmjs.org/kleur/-/kleur-3.0.3.tgz",
@@ -6630,11 +6519,6 @@
       "optional": true,
       "peer": true
     },
-    "node_modules/lodash.includes": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/lodash.includes/-/lodash.includes-4.3.0.tgz",
-      "integrity": "sha512-W3Bx6mdkRTGtlJISOvVD/lbqjTlPPUDTMnlXZFnVwi9NKJ6tiAk6LVdlhZMm17VZisqhKcgzpO5Wz91PCt5b0w=="
-    },
     "node_modules/lodash.isarguments": {
       "version": "3.1.0",
       "resolved": "https://registry.npmjs.org/lodash.isarguments/-/lodash.isarguments-3.1.0.tgz",
@@ -6642,31 +6526,6 @@
       "optional": true,
       "peer": true
     },
-    "node_modules/lodash.isboolean": {
-      "version": "3.0.3",
-      "resolved": "https://registry.npmjs.org/lodash.isboolean/-/lodash.isboolean-3.0.3.tgz",
-      "integrity": "sha512-Bz5mupy2SVbPHURB98VAcw+aHh4vRV5IPNhILUCsOzRmsTmSQ17jIuqopAentWoehktxGd9e/hbIXq980/1QJg=="
-    },
-    "node_modules/lodash.isinteger": {
-      "version": "4.0.4",
-      "resolved": "https://registry.npmjs.org/lodash.isinteger/-/lodash.isinteger-4.0.4.tgz",
-      "integrity": "sha512-DBwtEWN2caHQ9/imiNeEA5ys1JoRtRfY3d7V9wkqtbycnAmTvRRmbHKDV4a0EYc678/dia0jrte4tjYwVBaZUA=="
-    },
-    "node_modules/lodash.isnumber": {
-      "version": "3.0.3",
-      "resolved": "https://registry.npmjs.org/lodash.isnumber/-/lodash.isnumber-3.0.3.tgz",
-      "integrity": "sha512-QYqzpfwO3/CWf3XP+Z+tkQsfaLL/EnUlXWVkIk5FUPc4sBdTehEqZONuyRt2P67PXAk+NXmTBcc97zw9t1FQrw=="
-    },
-    "node_modules/lodash.isplainobject": {
-      "version": "4.0.6",
-      "resolved": "https://registry.npmjs.org/lodash.isplainobject/-/lodash.isplainobject-4.0.6.tgz",
-      "integrity": "sha512-oSXzaWypCMHkPC3NvBEaPHf0KsA5mvPrOPgQWDsbg8n7orZ290M0BmC/jgRZ4vcJ6DTAhjrsSYgdsW/F+MFOBA=="
-    },
-    "node_modules/lodash.isstring": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/lodash.isstring/-/lodash.isstring-4.0.1.tgz",
-      "integrity": "sha512-0wJxfxH1wgO3GrbuP+dTTk7op+6L41QCXbGINEmD+ny/G/eCqGzxyCsh7159S+mgDDcoarnBw6PC1PS5+wUGgw=="
-    },
     "node_modules/lodash.memoize": {
       "version": "4.1.2",
       "resolved": "https://registry.npmjs.org/lodash.memoize/-/lodash.memoize-4.1.2.tgz",
@@ -6679,11 +6538,6 @@
       "integrity": "sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==",
       "dev": true
     },
-    "node_modules/lodash.once": {
-      "version": "4.1.1",
-      "resolved": "https://registry.npmjs.org/lodash.once/-/lodash.once-4.1.1.tgz",
-      "integrity": "sha512-Sb487aTOCr9drQVL8pIxOzVhafOjZN9UU54hiN8PU3uAiSV7lx1yYNpbNmex2PK6dSJoNTSJUUswT651yww3Mg=="
-    },
     "node_modules/log-symbols": {
       "version": "4.1.0",
       "resolved": "https://registry.npmjs.org/log-symbols/-/log-symbols-4.1.0.tgz",
@@ -6720,6 +6574,7 @@
       "version": "6.0.0",
       "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
       "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
+      "dev": true,
       "dependencies": {
         "yallist": "^4.0.0"
       },
@@ -8300,6 +8155,7 @@
       "version": "7.3.8",
       "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.8.tgz",
       "integrity": "sha512-NB1ctGL5rlHrPJtFDVIVzTyQylMLu9N9VICA6HSFJo8MCGVTMW6gfpicwKmmK/dAjTOrqu5l63JJOpDSrAis3A==",
+      "dev": true,
       "dependencies": {
         "lru-cache": "^6.0.0"
       },
@@ -11132,11 +10988,6 @@
             "socket.io-adapter": "~2.4.0",
             "socket.io-parser": "~4.2.0"
           }
-        },
-        "tslib": {
-          "version": "2.4.1",
-          "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.4.1.tgz",
-          "integrity": "sha512-tGyy4dAjRIEwI7BzsB0lynWgOpfqjUdq91XXAlIWD2OwKBH7oCl/GZG/HT4BOHrTlPMOASlMQ7veyTqpmRcrNA=="
         }
       }
     },
@@ -11250,13 +11101,6 @@
         "iterare": "1.2.1",
         "object-hash": "3.0.0",
         "tslib": "2.4.1"
-      },
-      "dependencies": {
-        "tslib": {
-          "version": "2.4.1",
-          "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.4.1.tgz",
-          "integrity": "sha512-tGyy4dAjRIEwI7BzsB0lynWgOpfqjUdq91XXAlIWD2OwKBH7oCl/GZG/HT4BOHrTlPMOASlMQ7veyTqpmRcrNA=="
-        }
       }
     },
     "@nodelib/fs.scandir": {
@@ -11642,9 +11486,9 @@
       }
     },
     "@types/node": {
-      "version": "16.18.10",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-16.18.10.tgz",
-      "integrity": "sha512-XU1+v7h81p7145ddPfjv7jtWvkSilpcnON3mQ+bDi9Yuf7OI56efOglXRyXWgQ57xH3fEQgh7WOJMncRHVew5w=="
+      "version": "16.18.11",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-16.18.11.tgz",
+      "integrity": "sha512-3oJbGBUWuS6ahSnEq1eN2XrCyf4YsWI8OyCvo7c64zQJNplk3mO84t53o8lfTk+2ji59g5ycfc6qQ3fdHliHuA=="
     },
     "@types/parse-json": {
       "version": "4.0.0",
@@ -11698,14 +11542,6 @@
       "resolved": "https://registry.npmjs.org/@types/range-parser/-/range-parser-1.2.4.tgz",
       "integrity": "sha512-EEhsLsD6UsDM1yFhAvy0Cjr6VwmpMWqFBCb9w07wVugF7w9nfajxLuVmngTIpgS6svCnm6Vaw+MZhoDCKnOfsw=="
     },
-    "@types/redis": {
-      "version": "4.0.11",
-      "resolved": "https://registry.npmjs.org/@types/redis/-/redis-4.0.11.tgz",
-      "integrity": "sha512-bI+gth8La8Wg/QCR1+V1fhrL9+LZUSWfcqpOj2Kc80ZQ4ffbdL173vQd5wovmoV9i071FU9oP2g6etLuEwb6Rg==",
-      "requires": {
-        "redis": "*"
-      }
-    },
     "@types/semver": {
       "version": "7.3.13",
       "resolved": "https://registry.npmjs.org/@types/semver/-/semver-7.3.13.tgz",
@@ -12397,11 +12233,6 @@
         "ieee754": "^1.1.13"
       }
     },
-    "buffer-equal-constant-time": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/buffer-equal-constant-time/-/buffer-equal-constant-time-1.0.1.tgz",
-      "integrity": "sha512-zRpUiDwd/xk6ADqPMATG8vc9VPrkck7T07OIx0gnjmJAnHnTVXNQG3vfvWNuiZIkwu9KrKdA1iJKfsfTVxE6NA=="
-    },
     "buffer-from": {
       "version": "1.1.2",
       "resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.2.tgz",
@@ -12906,14 +12737,6 @@
       "resolved": "https://registry.npmjs.org/dotenv-expand/-/dotenv-expand-8.0.3.tgz",
       "integrity": "sha512-SErOMvge0ZUyWd5B0NXMQlDkN+8r+HhVUsxgOO7IoPDOdDRD2JjExpN6y3KnFR66jsJMwSn1pqIivhU5rcJiNg=="
     },
-    "ecdsa-sig-formatter": {
-      "version": "1.0.11",
-      "resolved": "https://registry.npmjs.org/ecdsa-sig-formatter/-/ecdsa-sig-formatter-1.0.11.tgz",
-      "integrity": "sha512-nagl3RYrbNv6kQkeJIpt6NJZy8twLB/2vtz6yN9Z4vRKHN4/QZJIEbqohALSgwKdnksuY3k5Addp5lg8sVoVcQ==",
-      "requires": {
-        "safe-buffer": "^5.0.1"
-      }
-    },
     "ee-first": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/ee-first/-/ee-first-1.1.1.tgz",
@@ -14766,25 +14589,6 @@
         "universalify": "^2.0.0"
       }
     },
-    "jwa": {
-      "version": "1.4.1",
-      "resolved": "https://registry.npmjs.org/jwa/-/jwa-1.4.1.tgz",
-      "integrity": "sha512-qiLX/xhEEFKUAJ6FiBMbes3w9ATzyk5W7Hvzpa/SLYdxNtng+gcurvrI7TbACjIXlsJyr05/S1oUhZrc63evQA==",
-      "requires": {
-        "buffer-equal-constant-time": "1.0.1",
-        "ecdsa-sig-formatter": "1.0.11",
-        "safe-buffer": "^5.0.1"
-      }
-    },
-    "jws": {
-      "version": "3.2.2",
-      "resolved": "https://registry.npmjs.org/jws/-/jws-3.2.2.tgz",
-      "integrity": "sha512-YHlZCB6lMTllWDtSPHz/ZXTsi8S00usEV6v1tjq8tOUZzw7DpSDWVXjXDre6ed1w/pd495ODpHZYSdkRTsa0HA==",
-      "requires": {
-        "jwa": "^1.4.1",
-        "safe-buffer": "^5.0.1"
-      }
-    },
     "kleur": {
       "version": "3.0.3",
       "resolved": "https://registry.npmjs.org/kleur/-/kleur-3.0.3.tgz",
@@ -14845,11 +14649,6 @@
       "optional": true,
       "peer": true
     },
-    "lodash.includes": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/lodash.includes/-/lodash.includes-4.3.0.tgz",
-      "integrity": "sha512-W3Bx6mdkRTGtlJISOvVD/lbqjTlPPUDTMnlXZFnVwi9NKJ6tiAk6LVdlhZMm17VZisqhKcgzpO5Wz91PCt5b0w=="
-    },
     "lodash.isarguments": {
       "version": "3.1.0",
       "resolved": "https://registry.npmjs.org/lodash.isarguments/-/lodash.isarguments-3.1.0.tgz",
@@ -14857,31 +14656,6 @@
       "optional": true,
       "peer": true
     },
-    "lodash.isboolean": {
-      "version": "3.0.3",
-      "resolved": "https://registry.npmjs.org/lodash.isboolean/-/lodash.isboolean-3.0.3.tgz",
-      "integrity": "sha512-Bz5mupy2SVbPHURB98VAcw+aHh4vRV5IPNhILUCsOzRmsTmSQ17jIuqopAentWoehktxGd9e/hbIXq980/1QJg=="
-    },
-    "lodash.isinteger": {
-      "version": "4.0.4",
-      "resolved": "https://registry.npmjs.org/lodash.isinteger/-/lodash.isinteger-4.0.4.tgz",
-      "integrity": "sha512-DBwtEWN2caHQ9/imiNeEA5ys1JoRtRfY3d7V9wkqtbycnAmTvRRmbHKDV4a0EYc678/dia0jrte4tjYwVBaZUA=="
-    },
-    "lodash.isnumber": {
-      "version": "3.0.3",
-      "resolved": "https://registry.npmjs.org/lodash.isnumber/-/lodash.isnumber-3.0.3.tgz",
-      "integrity": "sha512-QYqzpfwO3/CWf3XP+Z+tkQsfaLL/EnUlXWVkIk5FUPc4sBdTehEqZONuyRt2P67PXAk+NXmTBcc97zw9t1FQrw=="
-    },
-    "lodash.isplainobject": {
-      "version": "4.0.6",
-      "resolved": "https://registry.npmjs.org/lodash.isplainobject/-/lodash.isplainobject-4.0.6.tgz",
-      "integrity": "sha512-oSXzaWypCMHkPC3NvBEaPHf0KsA5mvPrOPgQWDsbg8n7orZ290M0BmC/jgRZ4vcJ6DTAhjrsSYgdsW/F+MFOBA=="
-    },
-    "lodash.isstring": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/lodash.isstring/-/lodash.isstring-4.0.1.tgz",
-      "integrity": "sha512-0wJxfxH1wgO3GrbuP+dTTk7op+6L41QCXbGINEmD+ny/G/eCqGzxyCsh7159S+mgDDcoarnBw6PC1PS5+wUGgw=="
-    },
     "lodash.memoize": {
       "version": "4.1.2",
       "resolved": "https://registry.npmjs.org/lodash.memoize/-/lodash.memoize-4.1.2.tgz",
@@ -14894,11 +14668,6 @@
       "integrity": "sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==",
       "dev": true
     },
-    "lodash.once": {
-      "version": "4.1.1",
-      "resolved": "https://registry.npmjs.org/lodash.once/-/lodash.once-4.1.1.tgz",
-      "integrity": "sha512-Sb487aTOCr9drQVL8pIxOzVhafOjZN9UU54hiN8PU3uAiSV7lx1yYNpbNmex2PK6dSJoNTSJUUswT651yww3Mg=="
-    },
     "log-symbols": {
       "version": "4.1.0",
       "resolved": "https://registry.npmjs.org/log-symbols/-/log-symbols-4.1.0.tgz",
@@ -14925,6 +14694,7 @@
       "version": "6.0.0",
       "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
       "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
+      "dev": true,
       "requires": {
         "yallist": "^4.0.0"
       }
@@ -16078,6 +15848,7 @@
       "version": "7.3.8",
       "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.8.tgz",
       "integrity": "sha512-NB1ctGL5rlHrPJtFDVIVzTyQylMLu9N9VICA6HSFJo8MCGVTMW6gfpicwKmmK/dAjTOrqu5l63JJOpDSrAis3A==",
+      "dev": true,
       "requires": {
         "lru-cache": "^6.0.0"
       }
diff --git a/srcs/requirements/nestjs/api_back/package.json b/srcs/requirements/nestjs/api_back/package.json
index a75c646c..4e8c4666 100644
--- a/srcs/requirements/nestjs/api_back/package.json
+++ b/srcs/requirements/nestjs/api_back/package.json
@@ -59,7 +59,7 @@
     "@types/express": "^4.17.13",
     "@types/jest": "28.1.8",
     "@types/multer": "^1.4.7",
-    "@types/node": "^16.0.0",
+    "@types/node": "^16.18.11",
     "@types/passport-local": "^1.0.34",
     "@types/supertest": "^2.0.11",
     "@typescript-eslint/eslint-plugin": "^5.0.0",
diff --git a/srcs/requirements/nestjs/api_back/src/chat/chat.gateway.ts b/srcs/requirements/nestjs/api_back/src/chat/chat.gateway.ts
index c69413b1..c26edf36 100644
--- a/srcs/requirements/nestjs/api_back/src/chat/chat.gateway.ts
+++ b/srcs/requirements/nestjs/api_back/src/chat/chat.gateway.ts
@@ -4,7 +4,7 @@ import {
 	WebSocketServer,
 	MessageBody,
 	OnGatewayConnection,
-	OnGatewayDisconnect, 
+	OnGatewayDisconnect,
 } from '@nestjs/websockets';
 import { UsersService } from 'src/users/users.service';
 import { PaginationQueryDto } from 'src/common/dto/pagination-query.dto';
diff --git a/srcs/requirements/svelte/api_front/src/pages/SplashPage.svelte b/srcs/requirements/svelte/api_front/src/pages/SplashPage.svelte
index 2b66674f..0c15d65f 100644
--- a/srcs/requirements/svelte/api_front/src/pages/SplashPage.svelte
+++ b/srcs/requirements/svelte/api_front/src/pages/SplashPage.svelte
@@ -3,13 +3,12 @@
   import { push } from "svelte-spa-router";
   import { onMount } from 'svelte';
   import { get } from "svelte/store";
-  import { Domain, Port } from "../Constantes";
 
 
   let user;
 
 	onMount(async () => {
-    user = await fetch(`http://${process.env.WEBSITE_HOST}:${Port}/api/v2/user`)
+    user = await fetch(`http://${process.env.WEBSITE_HOST}:${process.env.WEBSITE_PORT}/api/v2/user`)
       .then((resp) => resp.json())
 
     // i mean i could do a failed to load user or some shit, maybe with a .catch or something? but atm why bother
@@ -33,14 +32,14 @@
 	});
 
   const login = async() => {
-    window.location.href = `http://${Domain}:${Port}/api/v2/auth`;
+    window.location.href = `http://${process.env.WEBSITE_HOST}:${process.env.WEBSITE_PORT}/api/v2/auth`;
     console.log('you are now logged in');
   }
 
 // i could prolly put this in it's own compoent, i seem to use it in several places... or maybe just some JS? like no need for html
 // we could .then( () => replace('/') ) need the func so TS compatible...
   const logout = async() => {
-		await fetch(`http://${Domain}:${Port}/api/v2/auth/logout`, {
+		await fetch(`http://${process.env.WEBSITE_HOST}:${process.env.WEBSITE_PORT}/api/v2/auth/logout`, {
         method: 'POST',
       });
     user = undefined;
diff --git a/srcs/requirements/svelte/api_front/src/pages/TwoFactorAuthentication.svelte b/srcs/requirements/svelte/api_front/src/pages/TwoFactorAuthentication.svelte
index d36019ee..67908a2d 100644
--- a/srcs/requirements/svelte/api_front/src/pages/TwoFactorAuthentication.svelte
+++ b/srcs/requirements/svelte/api_front/src/pages/TwoFactorAuthentication.svelte
@@ -1,14 +1,14 @@
 <script lang="ts">
   import { onMount } from "svelte";
   import { push } from "svelte-spa-router";
-  import { Domain, Port } from "../Constantes";
+  import { Domain, Port } from "../Constantes.svelte";
 
 
   let qrCodeImg;
   let qrCode = "";
   let wrongCode = "";
   const fetchQrCodeImg = (async() => {
-    await fetch(`http://${Domain}:${Port}/api/v2/auth/2fa/generate`,
+    await fetch(`http://${process.env.WEBSITE_HOST}:${process.env.WEBSITE_PORT}/api/v2/auth/2fa/generate`,
     {
       method: 'POST',
     })
@@ -20,7 +20,7 @@
   })()
 
   const submitCode = async() => {
-    const response = await fetch(`http://${Domain}:${Port}/api/v2/auth/2fa/check`,
+    const response = await fetch(`http://${process.env.WEBSITE_HOST}:${process.env.WEBSITE_PORT}/api/v2/auth/2fa/check`,
       {
         method : 'POST',
         headers : {
diff --git a/srcs/requirements/svelte/api_front/src/pages/game/Game.svelte b/srcs/requirements/svelte/api_front/src/pages/game/Game.svelte
index 8d7af255..3bf19454 100644
--- a/srcs/requirements/svelte/api_front/src/pages/game/Game.svelte
+++ b/srcs/requirements/svelte/api_front/src/pages/game/Game.svelte
@@ -3,7 +3,7 @@
 	import { onMount, onDestroy } from "svelte";
 	import Header from '../../pieces/Header.svelte';
 	import { fade, fly } from 'svelte/transition';
-	import { Domain, Port } from "../../Constantes";
+	import { Domain, Port } from "../../Constantes.svelte";
 
 	import * as pong from "./client/pong";
 	import { gameState } from "./client/ws";
@@ -35,9 +35,9 @@
 	let idOfIntevalCheckTerminationOfTheMatch;
 
 	onMount( async() => {
-		user = await fetch(`http://${Domain}:${Port}/api/v2/user`)
+		user = await fetch(`http://${process.env.WEBSITE_HOST}:${process.env.WEBSITE_PORT}/api/v2/user`)
 		.then( x => x.json() );
-		allUsers = await fetch(`http://${Domain}:${Port}/api/v2/user/all`)
+		allUsers = await fetch(`http://${process.env.WEBSITE_HOST}:${process.env.WEBSITE_PORT}/api/v2/user/all`)
 		.then( x => x.json() );
 		options.playerOneUsername = user.username;
 	})
@@ -53,7 +53,7 @@
 		showWaitPage = true;
 		const matchOptions = pong.computeMatchOptions(options);
 
-		const responseWhenGrantToken = fetch(`http://${Domain}:${Port}/api/v2/game/ticket`, {
+		const responseWhenGrantToken = fetch(`http://${process.env.WEBSITE_HOST}:${process.env.WEBSITE_PORT}/api/v2/game/ticket`, {
 			method : "POST",
 			headers : {'Content-Type': 'application/json'},
 			body : JSON.stringify({
@@ -142,13 +142,13 @@
 	const showInvitation = async() => {
 		showGameOption = false;
 		showInvitations = true;
-		invitations = await fetch(`http://${Domain}:${Port}/api/v2/game/invitations`)
+		invitations = await fetch(`http://${process.env.WEBSITE_HOST}:${process.env.WEBSITE_PORT}/api/v2/game/invitations`)
 		.then(x => x.json())
 		invitations.length !== 0 ? isThereAnyInvitation = true : isThereAnyInvitation = false
 	}
 
 	const rejectInvitation = async(invitation) => {
-		await fetch(`http://${Domain}:${Port}/api/v2/game/decline`, {
+		await fetch(`http://${process.env.WEBSITE_HOST}:${process.env.WEBSITE_PORT}/api/v2/game/decline`, {
 			method: "POST",
 			headers: { 'Content-Type': 'application/json'},
 			body: JSON.stringify({
@@ -161,7 +161,7 @@
 	}
 
 	const acceptInvitation = async(invitation : any) => {
-		const res  = await fetch(`http://${Domain}:${Port}/api/v2/game/accept`, {
+		const res  = await fetch(`http://${process.env.WEBSITE_HOST}:${process.env.WEBSITE_PORT}/api/v2/game/accept`, {
 			method: "POST",
 			headers: { 'Content-Type': 'application/json'},
 			body: JSON.stringify({
diff --git a/srcs/requirements/svelte/api_front/src/pages/game/GameSpectator.svelte b/srcs/requirements/svelte/api_front/src/pages/game/GameSpectator.svelte
index 27215a8f..41c2400a 100644
--- a/srcs/requirements/svelte/api_front/src/pages/game/GameSpectator.svelte
+++ b/srcs/requirements/svelte/api_front/src/pages/game/GameSpectator.svelte
@@ -4,7 +4,7 @@
 	import Header from '../../pieces/Header.svelte';
 	import MatchListElem from "../../pieces/MatchListElem.svelte";
 	import { fade, fly } from 'svelte/transition';
-	import { Domain, Port } from "../../Constantes";
+	import { Domain, Port } from "../../Constantes.svelte";
 
 	import * as pongSpectator from "./client/pongSpectator";
 	import { gameState } from "./client/ws";
@@ -51,12 +51,12 @@
 
 
 	onMount( async() => {
-		user = await fetch(`http://${Domain}:${Port}/api/v2/user`)
+		user = await fetch(`http://${process.env.WEBSITE_HOST}:${process.env.WEBSITE_PORT}/api/v2/user`)
 		.then( x => x.json() );
-		allUsers = await fetch(`http://${Domain}:${Port}/api/v2/user/all`)
+		allUsers = await fetch(`http://${process.env.WEBSITE_HOST}:${process.env.WEBSITE_PORT}/api/v2/user/all`)
 		.then( x => x.json() );
 		// WIP: fetch for match list here
-		const responseForMatchList = await fetch(`http://${Domain}:${Port}/api/v2/game/match/all`)
+		const responseForMatchList = await fetch(`http://${process.env.WEBSITE_HOST}:${process.env.WEBSITE_PORT}/api/v2/game/match/all`)
 		const jsonForMatchList = await responseForMatchList.json();
 		matchList = jsonForMatchList;
 		console.log("matchList");
@@ -82,7 +82,7 @@
 		hiddenGame = true;
 		pongSpectator.destroy();
 		// WIP: fetch for match list here
-		matchList = await fetch(`http://${Domain}:${Port}/api/v2/game/match/all`)
+		matchList = await fetch(`http://${process.env.WEBSITE_HOST}:${process.env.WEBSITE_PORT}/api/v2/game/match/all`)
 		.then( x => x.json() );
 		console.log("matchList");
 		if (matchList.length <= 0)
diff --git a/srcs/requirements/svelte/api_front/src/pages/game/Ranking.svelte b/srcs/requirements/svelte/api_front/src/pages/game/Ranking.svelte
index 3d458c5d..7af2c1f7 100644
--- a/srcs/requirements/svelte/api_front/src/pages/game/Ranking.svelte
+++ b/srcs/requirements/svelte/api_front/src/pages/game/Ranking.svelte
@@ -2,16 +2,16 @@
 <script lang="ts">
 	import { onMount, onDestroy } from "svelte";
 	import Header from "../../pieces/Header.svelte";
-	import { Domain, Port } from "../../Constantes";
+	import { Domain, Port } from "../../Constantes.svelte";
 
 	//user's stuff
 	let currentUser;
 	let allUsers = [];
 	let idInterval;
 	onMount( async() => {
-		currentUser = await fetch(`http://${Domain}:${Port}/api/v2/user`)
+		currentUser = await fetch(`http://${process.env.WEBSITE_HOST}:${process.env.WEBSITE_PORT}/api/v2/user`)
 		.then( x => x.json() );
-		allUsers = await fetch(`http://${Domain}:${Port}/api/v2/game/ranking`)
+		allUsers = await fetch(`http://${process.env.WEBSITE_HOST}:${process.env.WEBSITE_PORT}/api/v2/game/ranking`)
 		.then( x => x.json() );
 		idInterval = setInterval(fetchScores, 10000);
 	})
@@ -21,7 +21,7 @@
 	})
 
 	function fetchScores() {
-		fetch(`http://${Domain}:${Port}/api/v2/game/ranking`)
+		fetch(`http://${process.env.WEBSITE_HOST}:${process.env.WEBSITE_PORT}/api/v2/game/ranking`)
 		.then( x => x.json() )
 		.then( x => allUsers = x );
 	}
diff --git a/srcs/requirements/svelte/api_front/src/pages/profile/ProfileDisplay.svelte b/srcs/requirements/svelte/api_front/src/pages/profile/ProfileDisplay.svelte
index d24bd087..0455ef7e 100644
--- a/srcs/requirements/svelte/api_front/src/pages/profile/ProfileDisplay.svelte
+++ b/srcs/requirements/svelte/api_front/src/pages/profile/ProfileDisplay.svelte
@@ -2,7 +2,7 @@
 
   import { onMount } from 'svelte';
 	import GenerateUserDisplay from '../../pieces/GenerateUserDisplay.svelte';
-	import { Domain, Port } from "../../Constantes";
+	import { Domain, Port } from "../../Constantes.svelte";
 
 	import Chat from '../../pieces/chat/Chat.svelte';
 
@@ -10,7 +10,7 @@
 
   onMount( async() => {
     // console.log('mounting profile display')
-    user = await fetch(`http://${Domain}:${Port}/api/v2/user`)
+    user = await fetch(`http://${process.env.WEBSITE_HOST}:${process.env.WEBSITE_PORT}/api/v2/user`)
       .then( (x) => x.json() );
   })
 
diff --git a/srcs/requirements/svelte/api_front/src/pages/profile/ProfileFriends.svelte b/srcs/requirements/svelte/api_front/src/pages/profile/ProfileFriends.svelte
index 9202d701..2ea69bf5 100644
--- a/srcs/requirements/svelte/api_front/src/pages/profile/ProfileFriends.svelte
+++ b/srcs/requirements/svelte/api_front/src/pages/profile/ProfileFriends.svelte
@@ -2,7 +2,7 @@
 
   import { onMount } from "svelte";
   import { binding_callbacks } from "svelte/internal";
-  import { Domain, Port } from "../../Constantes";
+  import { Domain, Port } from "../../Constantes.svelte";
   import Button from "../../pieces/Button.svelte";
   import DisplayAUser from "../../pieces/DisplayAUser.svelte";
 
@@ -39,7 +39,7 @@ could be a list of friends and if they're active but i can't see that yet
   onMount( async() => {
     // yea no idea what
     // i mean do i fetch user? i will for now
-    user = await fetch(`http://${Domain}:${Port}/api/v2/user`)
+    user = await fetch(`http://${process.env.WEBSITE_HOST}:${process.env.WEBSITE_PORT}/api/v2/user`)
       .then( (x) => x.json() );
 
     // userBeingViewed = user;
@@ -47,26 +47,26 @@ could be a list of friends and if they're active but i can't see that yet
     // console.log(user)
     // console.log(user.username)
 
-    myFriends = await fetch(`http://${Domain}:${Port}/api/v2/network/myfriends`)
+    myFriends = await fetch(`http://${process.env.WEBSITE_HOST}:${process.env.WEBSITE_PORT}/api/v2/network/myfriends`)
       .then( (x) => x.json() );
 
     // console.log('my friends')
     // console.log(myFriends)
 
-    requestsMade = await fetch(`http://${Domain}:${Port}/api/v2/network/pending`)
+    requestsMade = await fetch(`http://${process.env.WEBSITE_HOST}:${process.env.WEBSITE_PORT}/api/v2/network/pending`)
       .then( x => x.json() );
 
     // console.log('Requests pending ');
     // console.log(requestsMade);
 
 
-    requestsRecieved = await fetch(`http://${Domain}:${Port}/api/v2/network/received`)
+    requestsRecieved = await fetch(`http://${process.env.WEBSITE_HOST}:${process.env.WEBSITE_PORT}/api/v2/network/received`)
       .then( x => x.json() );
 
     // console.log('Requests received ');
     // console.log(requestsRecieved);
 
-    allUsers = await fetch(`http://${Domain}:${Port}/api/v2/user/all`)
+    allUsers = await fetch(`http://${process.env.WEBSITE_HOST}:${process.env.WEBSITE_PORT}/api/v2/user/all`)
       .then( x => x.json() );
     // console.log('got all users ' + allUsers)
 
@@ -75,20 +75,20 @@ could be a list of friends and if they're active but i can't see that yet
 
 
   const displayAllUsers = async() => {
-    allUsers = await fetch(`http://${Domain}:${Port}/api/v2/user/all`)
+    allUsers = await fetch(`http://${process.env.WEBSITE_HOST}:${process.env.WEBSITE_PORT}/api/v2/user/all`)
       .then( x => x.json() );
     // console.log('got all users ' + allUsers)
   };
 
 
   const displayAllFriends = async() => {
-    myFriends = await fetch(`http://${Domain}:${Port}/api/v2/network/myfriends`)
+    myFriends = await fetch(`http://${process.env.WEBSITE_HOST}:${process.env.WEBSITE_PORT}/api/v2/network/myfriends`)
       .then( x => x.json() );
     // console.log('got all friends ' + allFriends)
   };
 
   const displayRequestsMade = async() => {
-    requestsMade = await fetch(`http://${Domain}:${Port}/api/v2/network/pending`)
+    requestsMade = await fetch(`http://${process.env.WEBSITE_HOST}:${process.env.WEBSITE_PORT}/api/v2/network/pending`)
       .then( x => x.json() );
     // console.log('got requests made ' + requestsMade)
   };
@@ -107,7 +107,7 @@ could be a list of friends and if they're active but i can't see that yet
     }
 
     if (valid) {
-      sentFriendRequest = await fetch(`http://${Domain}:${Port}/api/v2/network/myfriends`, {
+      sentFriendRequest = await fetch(`http://${process.env.WEBSITE_HOST}:${process.env.WEBSITE_PORT}/api/v2/network/myfriends`, {
           method : "POST",
           headers: { 'Content-Type': 'application/json'},
             body: JSON.stringify({
@@ -125,7 +125,7 @@ could be a list of friends and if they're active but i can't see that yet
     // sendUsername = userBeingViewed.username;
 
     // prolly like fetch if you're friends or not?
-    // GET `http://${Domain}:${Port}/api/v2/networks/myfriends?username=aUser` but i need to make that as long as Cherif
+    // GET `http://${process.env.WEBSITE_HOST}:${process.env.WEBSITE_PORT}/api/v2/networks/myfriends?username=aUser` but i need to make that as long as Cherif
       // doesn't have a better option
       // like i want this thing to return the Friendship ID ideally
   };
diff --git a/srcs/requirements/svelte/api_front/src/pages/profile/ProfileSettings.svelte b/srcs/requirements/svelte/api_front/src/pages/profile/ProfileSettings.svelte
index 2c59eff5..8385b507 100644
--- a/srcs/requirements/svelte/api_front/src/pages/profile/ProfileSettings.svelte
+++ b/srcs/requirements/svelte/api_front/src/pages/profile/ProfileSettings.svelte
@@ -3,7 +3,7 @@
   import Card from '../../pieces/Card.svelte';
   import {onMount} from 'svelte';
   import { push } from 'svelte-spa-router';
-  import { Domain, Port } from "../../Constantes";
+  import { Domain, Port } from "../../Constantes.svelte";
   import Button from '../../pieces/Button.svelte';
 
   let user;
@@ -17,7 +17,7 @@
   let success = {username: '', avatar: '' };
 
   onMount( async() => {
-    user = await fetch(`http://${Domain}:${Port}/api/v2/user`)
+    user = await fetch(`http://${process.env.WEBSITE_HOST}:${process.env.WEBSITE_PORT}/api/v2/user`)
       .then( (x) => x.json() );
     // do a .catch?
 
@@ -34,7 +34,7 @@
     // console.log('this is what is in the avatar before fetch')
     // console.log(avatar)
 
-    await fetch(`http://${Domain}:${Port}/api/v2/user/avatar`, {method: "GET"})
+    await fetch(`http://${process.env.WEBSITE_HOST}:${process.env.WEBSITE_PORT}/api/v2/user/avatar`, {method: "GET"})
 		  .then(response => {return response.blob()})
 		  .then(data => {
 		  	const url = URL.createObjectURL(data);
@@ -64,7 +64,7 @@
 	else {
       errors.username = '';
     }
-	await fetch(`http://${Domain}:${Port}/api/v2/user`, {
+	await fetch(`http://${process.env.WEBSITE_HOST}:${process.env.WEBSITE_PORT}/api/v2/user`, {
 		method: 'PATCH',
 		headers: {
 		'Content-Type': 'application/json'
@@ -101,7 +101,7 @@
 // tmp
 	console.log(data);
 
-	await fetch(`http://${Domain}:${Port}/api/v2/user/avatar`,
+	await fetch(`http://${process.env.WEBSITE_HOST}:${process.env.WEBSITE_PORT}/api/v2/user/avatar`,
 	{
 		method : 'POST',
 		body : data,
@@ -109,7 +109,7 @@
 	.then(() => uploadAvatarSuccess = true ) // for some reason it needs to be a function, i think a TS thing, not a promis otherwise
 	.then(() => success.avatar = 'Your changes have been saved')
 	.catch(() => errors.avatar = 'Sorry failed to upload your new Avatar' );
-	await fetch(`http://${Domain}:${Port}/api/v2/user/avatar`, {method: "GET"})
+	await fetch(`http://${process.env.WEBSITE_HOST}:${process.env.WEBSITE_PORT}/api/v2/user/avatar`, {method: "GET"})
 		.then(response => {return response.blob()})
 		.then(data => {
 			const url = URL.createObjectURL(data);
diff --git a/srcs/requirements/svelte/api_front/src/pieces/DisplayAUser.svelte b/srcs/requirements/svelte/api_front/src/pieces/DisplayAUser.svelte
index 8983469d..f0c06c4e 100644
--- a/srcs/requirements/svelte/api_front/src/pieces/DisplayAUser.svelte
+++ b/srcs/requirements/svelte/api_front/src/pieces/DisplayAUser.svelte
@@ -2,7 +2,7 @@
 
   import { onMount } from 'svelte';
   import GenerateUserDisplay from './GenerateUserDisplay.svelte';
-  import { Domain, Port } from "../Constantes";
+  import { Domain, Port } from "../Constantes.svelte";
   // import {updateGeneratedUser} from './GenerateUserDisplay.svelte';
 
   export let aUsername;
@@ -10,8 +10,8 @@
 
   onMount( async() => {
     console.log('Display aUser username: '+ aUsername)
-    //`http://${Domain}:${Port}/api/v2/user?username=NomDuUserATrouve`
-    user = await fetch(`http://${Domain}:${Port}/api/v2/user?username=${aUsername}`)
+    //`http://${process.env.WEBSITE_HOST}:${process.env.WEBSITE_PORT}/api/v2/user?username=NomDuUserATrouve`
+    user = await fetch(`http://${process.env.WEBSITE_HOST}:${process.env.WEBSITE_PORT}/api/v2/user?username=${aUsername}`)
       .then( (x) => x.json() );
 
     // console.log('Display a user: ')
@@ -27,15 +27,15 @@
 
   const updateUser = async(updatedUser) => {
     console.log('Display Update aUser username: '+ updateUser)
-    //`http://${Domain}:${Port}/api/v2/user?username=NomDuUserATrouve`
-    user = await fetch(`http://${Domain}:${Port}/api/v2/user?username=${updateUser}`)
+    //`http://${process.env.WEBSITE_HOST}:${process.env.WEBSITE_PORT}/api/v2/user?username=NomDuUserATrouve`
+    user = await fetch(`http://${process.env.WEBSITE_HOST}:${process.env.WEBSITE_PORT}/api/v2/user?username=${updateUser}`)
       .then( (x) => x.json() );
   };
 
   // export const updateUser = async(updatedUser) => {
   //   console.log('Display Update aUser username: '+ updateUser)
-  //   //`http://${Domain}:${Port}/api/v2/user?username=NomDuUserATrouve`
-  //   user = await fetch(`http://${Domain}:${Port}/api/v2/user?username=${updateUser}`)
+  //   //`http://${process.env.WEBSITE_HOST}:${process.env.WEBSITE_PORT}/api/v2/user?username=NomDuUserATrouve`
+  //   user = await fetch(`http://${process.env.WEBSITE_HOST}:${process.env.WEBSITE_PORT}/api/v2/user?username=${updateUser}`)
   //     .then( (x) => x.json() );
   //   updateGeneratedUser(updateUser);
 
diff --git a/srcs/requirements/svelte/api_front/src/pieces/GenerateUserDisplay.svelte b/srcs/requirements/svelte/api_front/src/pieces/GenerateUserDisplay.svelte
index 0bda1998..03a35f52 100644
--- a/srcs/requirements/svelte/api_front/src/pieces/GenerateUserDisplay.svelte
+++ b/srcs/requirements/svelte/api_front/src/pieces/GenerateUserDisplay.svelte
@@ -1,7 +1,7 @@
 <script lang="ts">
 
   import { onMount } from 'svelte';
-  import { Domain, Port } from "../Constantes";
+  import { Domain, Port } from "../Constantes.svelte";
 
   export let user;
   export let primary;
@@ -12,7 +12,7 @@
   onMount( async() => {
     // using this for now cuz for some reason there is yet to be a way to fet another person's avatar
     if (primary) {
-      await fetch(`http://${Domain}:${Port}/api/v2/user/avatar`, {method: "GET"})
+      await fetch(`http://${process.env.WEBSITE_HOST}:${process.env.WEBSITE_PORT}/api/v2/user/avatar`, {method: "GET"})
         .then(response => {return response.blob()})
         .then(data => {
           const url = URL.createObjectURL(data);
diff --git a/srcs/requirements/svelte/api_front/src/pieces/Header.svelte b/srcs/requirements/svelte/api_front/src/pieces/Header.svelte
index 74dd2a01..761b1a4e 100644
--- a/srcs/requirements/svelte/api_front/src/pieces/Header.svelte
+++ b/srcs/requirements/svelte/api_front/src/pieces/Header.svelte
@@ -1,14 +1,14 @@
 <script lang="ts">
   import { push } from "svelte-spa-router";
   import { location } from 'svelte-spa-router';
-  import { Domain, Port } from "../Constantes";
+  import { Domain, Port } from "../Constantes.svelte";
 
   import active from 'svelte-spa-router/active'
   // or i could leave them all and not display if they're active?
 
 
   let handleClickLogout = async () => {
-    await fetch(`http://${Domain}:${Port}/api/v2/auth/logout`, {
+    await fetch(`http://${process.env.WEBSITE_HOST}:${process.env.WEBSITE_PORT}/api/v2/auth/logout`, {
         method: 'POST',
       })
       // .then(resp => resp.json)
diff --git a/srcs/requirements/svelte/api_front/src/pieces/chat/Chat.svelte b/srcs/requirements/svelte/api_front/src/pieces/chat/Chat.svelte
index 250d435f..d2117f6f 100644
--- a/srcs/requirements/svelte/api_front/src/pieces/chat/Chat.svelte
+++ b/srcs/requirements/svelte/api_front/src/pieces/chat/Chat.svelte
@@ -2,14 +2,14 @@
 <script lang="ts">
 
 	import Layouts from './Chat_layouts.svelte';
-	import { Domain, PortIo } from "../../Constantes";
+	import { Domain, PortIo } from "../../Constantes.svelte";
 	export let color = "transparent";
 
 	/* web sockets with socket.io
 	*/
 	import { onMount } from 'svelte';
 	import io from 'socket.io-client';
-	const socket = io(`http://${Domain}:${PortIo}`, {
+	const socket = io(`http://${process.env.WEBSITE_HOST}:${process.env.WEBSITE_PORT}`, {
 		path: '/chat'
 	});
 	onMount(async => {