l'env fonctionne enfin pour qsvelte

make_env.sh

@@ -51,7 +51,7 @@ ENV_FILE_SVELTE=./srcs/requirements/svelte/api_front/.env
 		echo "PORT=3000" 											>> "$ENV_FILE_DOCKER"
 		echo "TWO_FACTOR_AUTHENTICATION_APP_NAME=Transcendance"		>> "$ENV_FILE_DOCKER"
 		echo "TICKET_FOR_PLAYING_GAME_SECRET=$(generate_password)"	>> "$ENV_FILE_DOCKER"
-		sed 's/^WEBSITE_/PUBLIC_&/' "$ENV_FILE_DOCKER" | grep "PUBLIC_" > "$ENV_FILE_SVELTE"
+		grep "WEBSITE_" > "$ENV_FILE_SVELTE"
 	}
 
 	function choose_options_and_process {
@@ -68,8 +68,7 @@ ENV_FILE_SVELTE=./srcs/requirements/svelte/api_front/.env
 				make_env_for_docker_and_svelte
 			else
 				if [ ! -f "$ENV_FILE_SVELTE" ]; then
-					sed 's/^WEBSITE_/PUBLIC_&/' "$ENV_FILE_DOCKER" | grep "PUBLIC_" > "$ENV_FILE_SVELTE"
+					grep "WEBSITE_" > "$ENV_FILE_SVELTE"
-
 				fi
 				echo "The file $ENV_FILE_DOCKER will not be overwritten. The script will exit."
 				exit 0

srcs/docker-compose.yml

@@ -39,8 +39,6 @@ services:
       dockerfile: Dockerfile
     environment:
       NODE_ENV: "${NODE_ENV}"
-      WEBSITE_HOST: "${WEBSITE_HOST}"
-      WEBSITE_PORT: "${WEBSITE_PORT}"
     restart: unless-stopped
     ports:
       - "8042:8042"

srcs/requirements/svelte/api_front/README.md

@@ -1,107 +0,0 @@
-# This repo is no longer maintained. Consider using `npm init vite` and selecting the `svelte` option or — if you want a full-fledged app framework and don't mind using pre-1.0 software — use [SvelteKit](https://kit.svelte.dev), the official application framework for Svelte.
-
----
-
-# svelte app
-
-This is a project template for [Svelte](https://svelte.dev) apps. It lives at https://github.com/sveltejs/template.
-
-To create a new project based on this template using [degit](https://github.com/Rich-Harris/degit):
-
-```bash
-npx degit sveltejs/template svelte-app
-cd svelte-app
-```
-
-*Note that you will need to have [Node.js](https://nodejs.org) installed.*
-
-
-## Get started
-
-Install the dependencies...
-
-```bash
-cd svelte-app
-npm install
-```
-
-...then start [Rollup](https://rollupjs.org):
-
-```bash
-npm run dev
-```
-
-Navigate to [localhost:8080](http://localhost:8080). You should see your app running. Edit a component file in `src`, save it, and reload the page to see your changes.
-
-By default, the server will only respond to requests from localhost. To allow connections from other computers, edit the `sirv` commands in package.json to include the option `--host 0.0.0.0`.
-
-If you're using [Visual Studio Code](https://code.visualstudio.com/) we recommend installing the official extension [Svelte for VS Code](https://marketplace.visualstudio.com/items?itemName=svelte.svelte-vscode). If you are using other editors you may need to install a plugin in order to get syntax highlighting and intellisense.
-
-## Building and running in production mode
-
-To create an optimised version of the app:
-
-```bash
-npm run build
-```
-
-You can run the newly built app with `npm run start`. This uses [sirv](https://github.com/lukeed/sirv), which is included in your package.json's `dependencies` so that the app will work when you deploy to platforms like [Heroku](https://heroku.com).
-
-
-## Single-page app mode
-
-By default, sirv will only respond to requests that match files in `public`. This is to maximise compatibility with static fileservers, allowing you to deploy your app anywhere.
-
-If you're building a single-page app (SPA) with multiple routes, sirv needs to be able to respond to requests for *any* path. You can make it so by editing the `"start"` command in package.json:
-
-```js
-"start": "sirv public --single"
-```
-
-## Using TypeScript
-
-This template comes with a script to set up a TypeScript development environment, you can run it immediately after cloning the template with:
-
-```bash
-node scripts/setupTypeScript.js
-```
-
-Or remove the script via:
-
-```bash
-rm scripts/setupTypeScript.js
-```
-
-If you want to use `baseUrl` or `path` aliases within your `tsconfig`, you need to set up `@rollup/plugin-alias` to tell Rollup to resolve the aliases. For more info, see [this StackOverflow question](https://stackoverflow.com/questions/63427935/setup-tsconfig-path-in-svelte).
-
-## Deploying to the web
-
-### With [Vercel](https://vercel.com)
-
-Install `vercel` if you haven't already:
-
-```bash
-npm install -g vercel
-```
-
-Then, from within your project folder:
-
-```bash
-cd public
-vercel deploy --name my-project
-```
-
-### With [surge](https://surge.sh/)
-
-Install `surge` if you haven't already:
-
-```bash
-npm install -g surge
-```
-
-Then, from within your project folder:
-
-```bash
-npm run build
-surge public my-project.surge.sh
-```

srcs/requirements/svelte/api_front/package-lock.json

@@ -8,6 +8,7 @@
       "name": "svelte-app",
       "version": "1.0.0",
       "dependencies": {
+        "@rollup/plugin-replace": "^5.0.2",
         "dotenv": "^16.0.3",
         "sirv-cli": "^2.0.0",
         "socket.io-client": "^4.5.4",
@@ -111,8 +112,7 @@
     "node_modules/@jridgewell/sourcemap-codec": {
       "version": "1.4.14",
       "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.14.tgz",
-      "integrity": "sha512-XPSJHWmi394fuUuzDnGz1wiKqWfo1yXecHQMRf2l6hztTO+nPru658AyDngaBe7isIxEkRsPR3FZh+s7iVa4Uw==",
+      "integrity": "sha512-XPSJHWmi394fuUuzDnGz1wiKqWfo1yXecHQMRf2l6hztTO+nPru658AyDngaBe7isIxEkRsPR3FZh+s7iVa4Uw=="
-      "dev": true
     },
     "node_modules/@jridgewell/trace-mapping": {
       "version": "0.3.17",
@@ -205,6 +205,63 @@
         "rollup": "^1.20.0||^2.0.0"
       }
     },
+    "node_modules/@rollup/plugin-replace": {
+      "version": "5.0.2",
+      "resolved": "https://registry.npmjs.org/@rollup/plugin-replace/-/plugin-replace-5.0.2.tgz",
+      "integrity": "sha512-M9YXNekv/C/iHHK+cvORzfRYfPbq0RDD8r0G+bMiTXjNGKulPnCT9O3Ss46WfhI6ZOCgApOP7xAdmCQJ+U2LAA==",
+      "dependencies": {
+        "@rollup/pluginutils": "^5.0.1",
+        "magic-string": "^0.27.0"
+      },
+      "engines": {
+        "node": ">=14.0.0"
+      },
+      "peerDependencies": {
+        "rollup": "^1.20.0||^2.0.0||^3.0.0"
+      },
+      "peerDependenciesMeta": {
+        "rollup": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@rollup/plugin-replace/node_modules/@rollup/pluginutils": {
+      "version": "5.0.2",
+      "resolved": "https://registry.npmjs.org/@rollup/pluginutils/-/pluginutils-5.0.2.tgz",
+      "integrity": "sha512-pTd9rIsP92h+B6wWwFbW8RkZv4hiR/xKsqre4SIuAOaOEQRxi0lqLke9k2/7WegC85GgUs9pjmOjCUi3In4vwA==",
+      "dependencies": {
+        "@types/estree": "^1.0.0",
+        "estree-walker": "^2.0.2",
+        "picomatch": "^2.3.1"
+      },
+      "engines": {
+        "node": ">=14.0.0"
+      },
+      "peerDependencies": {
+        "rollup": "^1.20.0||^2.0.0||^3.0.0"
+      },
+      "peerDependenciesMeta": {
+        "rollup": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@rollup/plugin-replace/node_modules/@types/estree": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.0.tgz",
+      "integrity": "sha512-WulqXMDUTYAXCjZnk6JtIHPigp55cVtDgDrO2gHRwhyJto21+1zbVCtOYB2L1F9w4qCQ0rOGWBnBe0FNTiEJIQ=="
+    },
+    "node_modules/@rollup/plugin-replace/node_modules/magic-string": {
+      "version": "0.27.0",
+      "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.27.0.tgz",
+      "integrity": "sha512-8UnnX2PeRAPZuN12svgR9j7M1uWMovg/CEnIwIG0LFkXSJJe4PdfUGiTGl8V9bsBHFUtfVINcSyYxd7q+kx9fA==",
+      "dependencies": {
+        "@jridgewell/sourcemap-codec": "^1.4.13"
+      },
+      "engines": {
+        "node": ">=12"
+      }
+    },
     "node_modules/@rollup/plugin-typescript": {
       "version": "8.5.0",
       "resolved": "https://registry.npmjs.org/@rollup/plugin-typescript/-/plugin-typescript-8.5.0.tgz",
@@ -590,8 +647,7 @@
     "node_modules/estree-walker": {
       "version": "2.0.2",
       "resolved": "https://registry.npmjs.org/estree-walker/-/estree-walker-2.0.2.tgz",
-      "integrity": "sha512-Rfkk/Mp/DL7JVje3u18FxFujQlTNR2q6QfMSMB7AvCBx91NGj/ba3kCfza0f6dVDbw7YlRf/nDrn7pQrCCyQ/w==",
+      "integrity": "sha512-Rfkk/Mp/DL7JVje3u18FxFujQlTNR2q6QfMSMB7AvCBx91NGj/ba3kCfza0f6dVDbw7YlRf/nDrn7pQrCCyQ/w=="
-      "dev": true
     },
     "node_modules/fast-glob": {
       "version": "3.2.12",
@@ -1066,7 +1122,6 @@
       "version": "2.3.1",
       "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz",
       "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==",
-      "dev": true,
       "engines": {
         "node": ">=8.6"
       },
@@ -1181,7 +1236,7 @@
       "version": "2.79.1",
       "resolved": "https://registry.npmjs.org/rollup/-/rollup-2.79.1.tgz",
       "integrity": "sha512-uKxbd0IhMZOhjAiD5oAFp7BqvkA4Dv47qpOCtaNvng4HBwdbWtdOh8f5nZNuk2rp51PMGk3bzfWu5oayNEuYnw==",
-      "dev": true,
+      "devOptional": true,
       "bin": {
         "rollup": "dist/bin/rollup"
       },

srcs/requirements/svelte/api_front/package.json

@@ -26,6 +26,7 @@
     "typescript": "^4.0.0"
   },
   "dependencies": {
+    "@rollup/plugin-replace": "^5.0.2",
     "dotenv": "^16.0.3",
     "sirv-cli": "^2.0.0",
     "socket.io-client": "^4.5.4",

srcs/requirements/svelte/api_front/rollup.config.js

@@ -6,8 +6,13 @@ import { terser } from 'rollup-plugin-terser';
 import sveltePreprocess from 'svelte-preprocess';
 import typescript from '@rollup/plugin-typescript';
 import css from 'rollup-plugin-css-only';
+import replace from '@rollup/plugin-replace';
+import dotenv from 'dotenv';
+
 
 const production = !process.env.ROLLUP_WATCH;
+dotenv.config();
+
 
 function serve() {
 	let server;
@@ -47,6 +52,10 @@ export default {
 				dev: !production
 			}
 		}),
+		replace({
+			'process.env.WEBSITE_HOST': `'${process.env.WEBSITE_HOST}'`,
+			'process.env.WEBSITE_PORT': `'${process.env.WEBSITE_PORT}'`,
+		  }),
 		// we'll extract any component CSS out into
 		// a separate file - better for performance
 		css({ output: 'bundle.css' }),

srcs/requirements/svelte/api_front/src/pages/SplashPage.svelte

@@ -2,7 +2,6 @@
   import Canvas from "../pieces/Canvas.svelte";
   import { push } from "svelte-spa-router";
   import { onMount } from 'svelte';
-  import { get } from "svelte/store";
 
 
   let user;

srcs/requirements/svelte/api_front/src/pages/TwoFactorAuthentication.svelte

@@ -1,7 +1,7 @@
 <script lang="ts">
   import { onMount } from "svelte";
   import { push } from "svelte-spa-router";
-  import { Domain, Port } from "../Constantes.svelte";
+
 
 
   let qrCodeImg;

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.svelte";
+
 
 	import * as pong from "./client/pong";
 	import { gameState } from "./client/ws";

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.svelte";
+
 
 	import * as pongSpectator from "./client/pongSpectator";
 	import { gameState } from "./client/ws";

srcs/requirements/svelte/api_front/src/pages/game/Ranking.svelte

@@ -2,7 +2,7 @@
 <script lang="ts">
 	import { onMount, onDestroy } from "svelte";
 	import Header from "../../pieces/Header.svelte";
-	import { Domain, Port } from "../../Constantes.svelte";
+
 
 	//user's stuff
 	let currentUser;

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.svelte";
+
 
 	import Chat from '../../pieces/chat/Chat.svelte';
 

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.svelte";
+
   import Button from "../../pieces/Button.svelte";
   import DisplayAUser from "../../pieces/DisplayAUser.svelte";
 

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.svelte";
+
   import Button from '../../pieces/Button.svelte';
 
   let user;

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.svelte";
+
   // import {updateGeneratedUser} from './GenerateUserDisplay.svelte';
 
   export let aUsername;

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.svelte";
+
 
   export let user;
   export let primary;

srcs/requirements/svelte/api_front/src/pieces/Header.svelte

@@ -1,7 +1,7 @@
 <script lang="ts">
   import { push } from "svelte-spa-router";
   import { location } from 'svelte-spa-router';
-  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?

srcs/requirements/svelte/api_front/src/pieces/chat/Chat.svelte

@@ -2,7 +2,6 @@
 <script lang="ts">
 
 	import Layouts from './Chat_layouts.svelte';
-	import { Domain, PortIo } from "../../Constantes.svelte";
 	export let color = "transparent";
 
 	/* web sockets with socket.io