Merge branch 'master' into Max/Backend/loginApi
This commit is contained in:
		| @ -53,5 +53,5 @@ jobs: | |||||||
|         scp -o "StrictHostKeyChecking=no" -o "LogLevel=ERROR" -i key -r * ${{ secrets.SSH_USER }}@${{ secrets.SSH_HOST }}:api/ |         scp -o "StrictHostKeyChecking=no" -o "LogLevel=ERROR" -i key -r * ${{ secrets.SSH_USER }}@${{ secrets.SSH_HOST }}:api/ | ||||||
|     - name: restarting the backend  |     - name: restarting the backend  | ||||||
|       run: | |       run: | | ||||||
|         ssh -o "StrictHostKeyChecking=no" -o "LogLevel=ERROR" -i key ${{ secrets.SSH_USER }}@${{ secrets.SSH_HOST }} "cd api/backend && docker build -t clyde/backend . && docker rm clyde_backend_prod -f || true && docker run --rm -d --name clyde_backend_prod -p 4000:8080 clyde/backend && docker image prune -f" |         ssh -o "StrictHostKeyChecking=no" -o "LogLevel=ERROR" -i key ${{ secrets.SSH_USER }}@${{ secrets.SSH_HOST }} 'cd api/backend && docker build -t clyde/backend . && docker rm clyde_backend_prod -f || true && docker run --rm -d -u $(id -u clyde):$(id -g clyde) -v /var/run/postgresql:/var/run/postgresql --name clyde_backend_prod -p 4000:8080 clyde/backend && docker image prune -f' | ||||||
|     - run: echo "The backend has been deployed. running at https://clyde.herisson.ovh/api" |     - run: echo "The backend has been deployed. running at https://clyde.herisson.ovh/api" | ||||||
|  | |||||||
| @ -22,6 +22,7 @@ dependencies { | |||||||
| 	implementation("org.springframework.boot:spring-boot-starter-web") | 	implementation("org.springframework.boot:spring-boot-starter-web") | ||||||
| 	implementation("org.springframework.boot:spring-boot-starter-data-jpa") | 	implementation("org.springframework.boot:spring-boot-starter-data-jpa") | ||||||
| 	implementation("org.springframework.boot:spring-boot-starter-security") | 	implementation("org.springframework.boot:spring-boot-starter-security") | ||||||
|  | 	implementation("com.kohlschutter.junixsocket:junixsocket-core:2.9.0") | ||||||
| 	// implementation("org.springframework.session:spring-session-jdbc") | 	// implementation("org.springframework.session:spring-session-jdbc") | ||||||
| 	developmentOnly("org.springframework.boot:spring-boot-devtools") | 	developmentOnly("org.springframework.boot:spring-boot-devtools") | ||||||
| 	developmentOnly("org.springframework.boot:spring-boot-docker-compose") | 	developmentOnly("org.springframework.boot:spring-boot-docker-compose") | ||||||
|  | |||||||
| @ -5,7 +5,6 @@ import org.springframework.http.HttpStatus; | |||||||
|  |  | ||||||
| import org.springframework.http.ResponseEntity; | import org.springframework.http.ResponseEntity; | ||||||
| import org.springframework.web.bind.annotation.*; | import org.springframework.web.bind.annotation.*; | ||||||
| import ovh.herisson.Clyde.Repositories.UserRepository; |  | ||||||
| import ovh.herisson.Clyde.Responses.UnauthorizedResponse; | import ovh.herisson.Clyde.Responses.UnauthorizedResponse; | ||||||
| import ovh.herisson.Clyde.Services.TokenService; | import ovh.herisson.Clyde.Services.TokenService; | ||||||
| import ovh.herisson.Clyde.Services.UserService; | import ovh.herisson.Clyde.Services.UserService; | ||||||
| @ -20,7 +19,7 @@ public class UserController { | |||||||
|  |  | ||||||
|     private final TokenService tokenService; |     private final TokenService tokenService; | ||||||
|     public UserController(UserService userService, TokenService tokenService){ |     public UserController(UserService userService, TokenService tokenService){ | ||||||
|         this.userService =userService; |         this.userService = userService; | ||||||
|         this.tokenService = tokenService; // todo find a way to be clearer |         this.tokenService = tokenService; // todo find a way to be clearer | ||||||
|  |  | ||||||
|         tokenService.postMockToken(userService.postMockUsers());// todo find a better place to put that |         tokenService.postMockToken(userService.postMockUsers());// todo find a better place to put that | ||||||
|  | |||||||
| @ -6,8 +6,6 @@ import org.springframework.context.annotation.Bean; | |||||||
| import org.springframework.context.annotation.Configuration; | import org.springframework.context.annotation.Configuration; | ||||||
| import org.springframework.context.annotation.Profile; | import org.springframework.context.annotation.Profile; | ||||||
| import org.springframework.jdbc.datasource.DriverManagerDataSource; | import org.springframework.jdbc.datasource.DriverManagerDataSource; | ||||||
| import org.springframework.web.servlet.config.annotation.CorsRegistry; |  | ||||||
| import org.springframework.web.servlet.config.annotation.WebMvcConfigurer; |  | ||||||
|  |  | ||||||
| @Configuration | @Configuration | ||||||
| public class JdbcConfig { | public class JdbcConfig { | ||||||
| @ -29,7 +27,7 @@ public class JdbcConfig { | |||||||
| 	public DataSource psqlSourceProd(){ | 	public DataSource psqlSourceProd(){ | ||||||
| 		DriverManagerDataSource source = new DriverManagerDataSource(); | 		DriverManagerDataSource source = new DriverManagerDataSource(); | ||||||
| 		source.setDriverClassName("org.postgresql.Driver"); | 		source.setDriverClassName("org.postgresql.Driver"); | ||||||
| 		source.setUrl("jdbc:postgresql://localhost:5432/clyde"); | 		source.setUrl("jdbc:postgresql:clyde?socketFactory=org.newsclub.net.unix.AFUNIXSocketFactory$FactoryArg&socketFactoryArg=/var/run/postgresql/.s.PGSQL.5432"); | ||||||
| 		source.setUsername("clyde"); | 		source.setUsername("clyde"); | ||||||
|  |  | ||||||
| 		return source; | 		return source; | ||||||
|  | |||||||
							
								
								
									
										642
									
								
								frontend/package-lock.json
									
									
									
										generated
									
									
									
								
							
							
						
						
									
										642
									
								
								frontend/package-lock.json
									
									
									
										generated
									
									
									
								
							| @ -13,7 +13,6 @@ | |||||||
|       }, |       }, | ||||||
|       "devDependencies": { |       "devDependencies": { | ||||||
|         "@vitejs/plugin-vue": "^5.0.3", |         "@vitejs/plugin-vue": "^5.0.3", | ||||||
|         "@vue/test-utils": "^2.4.4", |  | ||||||
|         "jsdom": "^24.0.0", |         "jsdom": "^24.0.0", | ||||||
|         "vite": "^5.0.11" |         "vite": "^5.0.11" | ||||||
|       } |       } | ||||||
| @ -397,44 +396,11 @@ | |||||||
|         "node": ">=12" |         "node": ">=12" | ||||||
|       } |       } | ||||||
|     }, |     }, | ||||||
|     "node_modules/@isaacs/cliui": { |  | ||||||
|       "version": "8.0.2", |  | ||||||
|       "resolved": "https://registry.npmjs.org/@isaacs/cliui/-/cliui-8.0.2.tgz", |  | ||||||
|       "integrity": "sha512-O8jcjabXaleOG9DQ0+ARXWZBTfnP4WNAqzuiJK7ll44AmxGKv/J2M4TPjxjY3znBCfvBXFzucm1twdyFybFqEA==", |  | ||||||
|       "dev": true, |  | ||||||
|       "dependencies": { |  | ||||||
|         "string-width": "^5.1.2", |  | ||||||
|         "string-width-cjs": "npm:string-width@^4.2.0", |  | ||||||
|         "strip-ansi": "^7.0.1", |  | ||||||
|         "strip-ansi-cjs": "npm:strip-ansi@^6.0.1", |  | ||||||
|         "wrap-ansi": "^8.1.0", |  | ||||||
|         "wrap-ansi-cjs": "npm:wrap-ansi@^7.0.0" |  | ||||||
|       }, |  | ||||||
|       "engines": { |  | ||||||
|         "node": ">=12" |  | ||||||
|       } |  | ||||||
|     }, |  | ||||||
|     "node_modules/@jridgewell/sourcemap-codec": { |     "node_modules/@jridgewell/sourcemap-codec": { | ||||||
|       "version": "1.4.15", |       "version": "1.4.15", | ||||||
|       "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.15.tgz", |       "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.15.tgz", | ||||||
|       "integrity": "sha512-eF2rxCRulEKXHTRiDrDy6erMYWqNw4LPdQ8UQA4huuxaQsVeRPFl2oM8oDGxMFhJUWZf9McpLtJasDDZb/Bpeg==" |       "integrity": "sha512-eF2rxCRulEKXHTRiDrDy6erMYWqNw4LPdQ8UQA4huuxaQsVeRPFl2oM8oDGxMFhJUWZf9McpLtJasDDZb/Bpeg==" | ||||||
|     }, |     }, | ||||||
|     "node_modules/@one-ini/wasm": { |  | ||||||
|       "version": "0.1.1", |  | ||||||
|       "resolved": "https://registry.npmjs.org/@one-ini/wasm/-/wasm-0.1.1.tgz", |  | ||||||
|       "integrity": "sha512-XuySG1E38YScSJoMlqovLru4KTUNSjgVTIjyh7qMX6aNN5HY5Ct5LhRJdxO79JtTzKfzV/bnWpz+zquYrISsvw==", |  | ||||||
|       "dev": true |  | ||||||
|     }, |  | ||||||
|     "node_modules/@pkgjs/parseargs": { |  | ||||||
|       "version": "0.11.0", |  | ||||||
|       "resolved": "https://registry.npmjs.org/@pkgjs/parseargs/-/parseargs-0.11.0.tgz", |  | ||||||
|       "integrity": "sha512-+1VkjdD0QBLPodGrJUeqarH8VAIvQODIbwh9XpP5Syisf7YoQgsJKPNFoqqLQlu+VQ/tVSshMR6loPMn8U+dPg==", |  | ||||||
|       "dev": true, |  | ||||||
|       "optional": true, |  | ||||||
|       "engines": { |  | ||||||
|         "node": ">=14" |  | ||||||
|       } |  | ||||||
|     }, |  | ||||||
|     "node_modules/@rollup/rollup-android-arm-eabi": { |     "node_modules/@rollup/rollup-android-arm-eabi": { | ||||||
|       "version": "4.12.0", |       "version": "4.12.0", | ||||||
|       "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.12.0.tgz", |       "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.12.0.tgz", | ||||||
| @ -723,34 +689,6 @@ | |||||||
|       "resolved": "https://registry.npmjs.org/@vue/shared/-/shared-3.4.19.tgz", |       "resolved": "https://registry.npmjs.org/@vue/shared/-/shared-3.4.19.tgz", | ||||||
|       "integrity": "sha512-/KliRRHMF6LoiThEy+4c1Z4KB/gbPrGjWwJR+crg2otgrf/egKzRaCPvJ51S5oetgsgXLfc4Rm5ZgrKHZrtMSw==" |       "integrity": "sha512-/KliRRHMF6LoiThEy+4c1Z4KB/gbPrGjWwJR+crg2otgrf/egKzRaCPvJ51S5oetgsgXLfc4Rm5ZgrKHZrtMSw==" | ||||||
|     }, |     }, | ||||||
|     "node_modules/@vue/test-utils": { |  | ||||||
|       "version": "2.4.4", |  | ||||||
|       "resolved": "https://registry.npmjs.org/@vue/test-utils/-/test-utils-2.4.4.tgz", |  | ||||||
|       "integrity": "sha512-8jkRxz8pNhClAf4Co4ZrpAoFISdvT3nuSkUlY6Ys6rmTpw3DMWG/X3mw3gQ7QJzgCZO9f+zuE2kW57fi09MW7Q==", |  | ||||||
|       "dev": true, |  | ||||||
|       "dependencies": { |  | ||||||
|         "js-beautify": "^1.14.9", |  | ||||||
|         "vue-component-type-helpers": "^1.8.21" |  | ||||||
|       }, |  | ||||||
|       "peerDependencies": { |  | ||||||
|         "@vue/server-renderer": "^3.0.1", |  | ||||||
|         "vue": "^3.0.1" |  | ||||||
|       }, |  | ||||||
|       "peerDependenciesMeta": { |  | ||||||
|         "@vue/server-renderer": { |  | ||||||
|           "optional": true |  | ||||||
|         } |  | ||||||
|       } |  | ||||||
|     }, |  | ||||||
|     "node_modules/abbrev": { |  | ||||||
|       "version": "2.0.0", |  | ||||||
|       "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-2.0.0.tgz", |  | ||||||
|       "integrity": "sha512-6/mh1E2u2YgEsCHdY0Yx5oW+61gZU+1vXaoiHHrpKeuRNNgFvS+/jrwHiQhB5apAf5oB7UB7E19ol2R2LKH8hQ==", |  | ||||||
|       "dev": true, |  | ||||||
|       "engines": { |  | ||||||
|         "node": "^14.17.0 || ^16.13.0 || >=18.0.0" |  | ||||||
|       } |  | ||||||
|     }, |  | ||||||
|     "node_modules/agent-base": { |     "node_modules/agent-base": { | ||||||
|       "version": "7.1.0", |       "version": "7.1.0", | ||||||
|       "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-7.1.0.tgz", |       "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-7.1.0.tgz", | ||||||
| @ -763,57 +701,12 @@ | |||||||
|         "node": ">= 14" |         "node": ">= 14" | ||||||
|       } |       } | ||||||
|     }, |     }, | ||||||
|     "node_modules/ansi-regex": { |  | ||||||
|       "version": "6.0.1", |  | ||||||
|       "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.0.1.tgz", |  | ||||||
|       "integrity": "sha512-n5M855fKb2SsfMIiFFoVrABHJC8QtHwVx+mHWP3QcEqBHYienj5dHSgjbxtC0WEZXYt4wcD6zrQElDPhFuZgfA==", |  | ||||||
|       "dev": true, |  | ||||||
|       "engines": { |  | ||||||
|         "node": ">=12" |  | ||||||
|       }, |  | ||||||
|       "funding": { |  | ||||||
|         "url": "https://github.com/chalk/ansi-regex?sponsor=1" |  | ||||||
|       } |  | ||||||
|     }, |  | ||||||
|     "node_modules/asynckit": { |     "node_modules/asynckit": { | ||||||
|       "version": "0.4.0", |       "version": "0.4.0", | ||||||
|       "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz", |       "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz", | ||||||
|       "integrity": "sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q==", |       "integrity": "sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q==", | ||||||
|       "dev": true |       "dev": true | ||||||
|     }, |     }, | ||||||
|     "node_modules/balanced-match": { |  | ||||||
|       "version": "1.0.2", |  | ||||||
|       "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz", |  | ||||||
|       "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==", |  | ||||||
|       "dev": true |  | ||||||
|     }, |  | ||||||
|     "node_modules/brace-expansion": { |  | ||||||
|       "version": "2.0.1", |  | ||||||
|       "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz", |  | ||||||
|       "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==", |  | ||||||
|       "dev": true, |  | ||||||
|       "dependencies": { |  | ||||||
|         "balanced-match": "^1.0.0" |  | ||||||
|       } |  | ||||||
|     }, |  | ||||||
|     "node_modules/color-convert": { |  | ||||||
|       "version": "2.0.1", |  | ||||||
|       "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", |  | ||||||
|       "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", |  | ||||||
|       "dev": true, |  | ||||||
|       "dependencies": { |  | ||||||
|         "color-name": "~1.1.4" |  | ||||||
|       }, |  | ||||||
|       "engines": { |  | ||||||
|         "node": ">=7.0.0" |  | ||||||
|       } |  | ||||||
|     }, |  | ||||||
|     "node_modules/color-name": { |  | ||||||
|       "version": "1.1.4", |  | ||||||
|       "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", |  | ||||||
|       "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", |  | ||||||
|       "dev": true |  | ||||||
|     }, |  | ||||||
|     "node_modules/combined-stream": { |     "node_modules/combined-stream": { | ||||||
|       "version": "1.0.8", |       "version": "1.0.8", | ||||||
|       "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz", |       "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz", | ||||||
| @ -826,39 +719,6 @@ | |||||||
|         "node": ">= 0.8" |         "node": ">= 0.8" | ||||||
|       } |       } | ||||||
|     }, |     }, | ||||||
|     "node_modules/commander": { |  | ||||||
|       "version": "10.0.1", |  | ||||||
|       "resolved": "https://registry.npmjs.org/commander/-/commander-10.0.1.tgz", |  | ||||||
|       "integrity": "sha512-y4Mg2tXshplEbSGzx7amzPwKKOCGuoSRP/CjEdwwk0FOGlUbq6lKuoyDZTNZkmxHdJtp54hdfY/JUrdL7Xfdug==", |  | ||||||
|       "dev": true, |  | ||||||
|       "engines": { |  | ||||||
|         "node": ">=14" |  | ||||||
|       } |  | ||||||
|     }, |  | ||||||
|     "node_modules/config-chain": { |  | ||||||
|       "version": "1.1.13", |  | ||||||
|       "resolved": "https://registry.npmjs.org/config-chain/-/config-chain-1.1.13.tgz", |  | ||||||
|       "integrity": "sha512-qj+f8APARXHrM0hraqXYb2/bOVSV4PvJQlNZ/DVj0QrmNM2q2euizkeuVckQ57J+W0mRH6Hvi+k50M4Jul2VRQ==", |  | ||||||
|       "dev": true, |  | ||||||
|       "dependencies": { |  | ||||||
|         "ini": "^1.3.4", |  | ||||||
|         "proto-list": "~1.2.1" |  | ||||||
|       } |  | ||||||
|     }, |  | ||||||
|     "node_modules/cross-spawn": { |  | ||||||
|       "version": "7.0.3", |  | ||||||
|       "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz", |  | ||||||
|       "integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==", |  | ||||||
|       "dev": true, |  | ||||||
|       "dependencies": { |  | ||||||
|         "path-key": "^3.1.0", |  | ||||||
|         "shebang-command": "^2.0.0", |  | ||||||
|         "which": "^2.0.1" |  | ||||||
|       }, |  | ||||||
|       "engines": { |  | ||||||
|         "node": ">= 8" |  | ||||||
|       } |  | ||||||
|     }, |  | ||||||
|     "node_modules/cssstyle": { |     "node_modules/cssstyle": { | ||||||
|       "version": "4.0.1", |       "version": "4.0.1", | ||||||
|       "resolved": "https://registry.npmjs.org/cssstyle/-/cssstyle-4.0.1.tgz", |       "resolved": "https://registry.npmjs.org/cssstyle/-/cssstyle-4.0.1.tgz", | ||||||
| @ -921,36 +781,6 @@ | |||||||
|         "node": ">=0.4.0" |         "node": ">=0.4.0" | ||||||
|       } |       } | ||||||
|     }, |     }, | ||||||
|     "node_modules/eastasianwidth": { |  | ||||||
|       "version": "0.2.0", |  | ||||||
|       "resolved": "https://registry.npmjs.org/eastasianwidth/-/eastasianwidth-0.2.0.tgz", |  | ||||||
|       "integrity": "sha512-I88TYZWc9XiYHRQ4/3c5rjjfgkjhLyW2luGIheGERbNQ6OY7yTybanSpDXZa8y7VUP9YmDcYa+eyq4ca7iLqWA==", |  | ||||||
|       "dev": true |  | ||||||
|     }, |  | ||||||
|     "node_modules/editorconfig": { |  | ||||||
|       "version": "1.0.4", |  | ||||||
|       "resolved": "https://registry.npmjs.org/editorconfig/-/editorconfig-1.0.4.tgz", |  | ||||||
|       "integrity": "sha512-L9Qe08KWTlqYMVvMcTIvMAdl1cDUubzRNYL+WfA4bLDMHe4nemKkpmYzkznE1FwLKu0EEmy6obgQKzMJrg4x9Q==", |  | ||||||
|       "dev": true, |  | ||||||
|       "dependencies": { |  | ||||||
|         "@one-ini/wasm": "0.1.1", |  | ||||||
|         "commander": "^10.0.0", |  | ||||||
|         "minimatch": "9.0.1", |  | ||||||
|         "semver": "^7.5.3" |  | ||||||
|       }, |  | ||||||
|       "bin": { |  | ||||||
|         "editorconfig": "bin/editorconfig" |  | ||||||
|       }, |  | ||||||
|       "engines": { |  | ||||||
|         "node": ">=14" |  | ||||||
|       } |  | ||||||
|     }, |  | ||||||
|     "node_modules/emoji-regex": { |  | ||||||
|       "version": "9.2.2", |  | ||||||
|       "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-9.2.2.tgz", |  | ||||||
|       "integrity": "sha512-L18DaJsXSUk2+42pv8mLs5jJT2hqFkFE4j21wOmgbUqsZ2hL72NsUU785g9RXgo3s0ZNgVl42TiHp3ZtOv/Vyg==", |  | ||||||
|       "dev": true |  | ||||||
|     }, |  | ||||||
|     "node_modules/entities": { |     "node_modules/entities": { | ||||||
|       "version": "4.5.0", |       "version": "4.5.0", | ||||||
|       "resolved": "https://registry.npmjs.org/entities/-/entities-4.5.0.tgz", |       "resolved": "https://registry.npmjs.org/entities/-/entities-4.5.0.tgz", | ||||||
| @ -1000,22 +830,6 @@ | |||||||
|         "@esbuild/win32-x64": "0.19.12" |         "@esbuild/win32-x64": "0.19.12" | ||||||
|       } |       } | ||||||
|     }, |     }, | ||||||
|     "node_modules/foreground-child": { |  | ||||||
|       "version": "3.1.1", |  | ||||||
|       "resolved": "https://registry.npmjs.org/foreground-child/-/foreground-child-3.1.1.tgz", |  | ||||||
|       "integrity": "sha512-TMKDUnIte6bfb5nWv7V/caI169OHgvwjb7V4WkeUvbQQdjr5rWKqHFiKWb/fcOwB+CzBT+qbWjvj+DVwRskpIg==", |  | ||||||
|       "dev": true, |  | ||||||
|       "dependencies": { |  | ||||||
|         "cross-spawn": "^7.0.0", |  | ||||||
|         "signal-exit": "^4.0.1" |  | ||||||
|       }, |  | ||||||
|       "engines": { |  | ||||||
|         "node": ">=14" |  | ||||||
|       }, |  | ||||||
|       "funding": { |  | ||||||
|         "url": "https://github.com/sponsors/isaacs" |  | ||||||
|       } |  | ||||||
|     }, |  | ||||||
|     "node_modules/form-data": { |     "node_modules/form-data": { | ||||||
|       "version": "4.0.0", |       "version": "4.0.0", | ||||||
|       "resolved": "https://registry.npmjs.org/form-data/-/form-data-4.0.0.tgz", |       "resolved": "https://registry.npmjs.org/form-data/-/form-data-4.0.0.tgz", | ||||||
| @ -1044,28 +858,6 @@ | |||||||
|         "node": "^8.16.0 || ^10.6.0 || >=11.0.0" |         "node": "^8.16.0 || ^10.6.0 || >=11.0.0" | ||||||
|       } |       } | ||||||
|     }, |     }, | ||||||
|     "node_modules/glob": { |  | ||||||
|       "version": "10.3.10", |  | ||||||
|       "resolved": "https://registry.npmjs.org/glob/-/glob-10.3.10.tgz", |  | ||||||
|       "integrity": "sha512-fa46+tv1Ak0UPK1TOy/pZrIybNNt4HCv7SDzwyfiOZkvZLEbjsZkJBPtDHVshZjbecAoAGSC20MjLDG/qr679g==", |  | ||||||
|       "dev": true, |  | ||||||
|       "dependencies": { |  | ||||||
|         "foreground-child": "^3.1.0", |  | ||||||
|         "jackspeak": "^2.3.5", |  | ||||||
|         "minimatch": "^9.0.1", |  | ||||||
|         "minipass": "^5.0.0 || ^6.0.2 || ^7.0.0", |  | ||||||
|         "path-scurry": "^1.10.1" |  | ||||||
|       }, |  | ||||||
|       "bin": { |  | ||||||
|         "glob": "dist/esm/bin.mjs" |  | ||||||
|       }, |  | ||||||
|       "engines": { |  | ||||||
|         "node": ">=16 || 14 >=14.17" |  | ||||||
|       }, |  | ||||||
|       "funding": { |  | ||||||
|         "url": "https://github.com/sponsors/isaacs" |  | ||||||
|       } |  | ||||||
|     }, |  | ||||||
|     "node_modules/html-encoding-sniffer": { |     "node_modules/html-encoding-sniffer": { | ||||||
|       "version": "4.0.0", |       "version": "4.0.0", | ||||||
|       "resolved": "https://registry.npmjs.org/html-encoding-sniffer/-/html-encoding-sniffer-4.0.0.tgz", |       "resolved": "https://registry.npmjs.org/html-encoding-sniffer/-/html-encoding-sniffer-4.0.0.tgz", | ||||||
| @ -1116,81 +908,12 @@ | |||||||
|         "node": ">=0.10.0" |         "node": ">=0.10.0" | ||||||
|       } |       } | ||||||
|     }, |     }, | ||||||
|     "node_modules/ini": { |  | ||||||
|       "version": "1.3.8", |  | ||||||
|       "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.8.tgz", |  | ||||||
|       "integrity": "sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew==", |  | ||||||
|       "dev": true |  | ||||||
|     }, |  | ||||||
|     "node_modules/is-fullwidth-code-point": { |  | ||||||
|       "version": "3.0.0", |  | ||||||
|       "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz", |  | ||||||
|       "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==", |  | ||||||
|       "dev": true, |  | ||||||
|       "engines": { |  | ||||||
|         "node": ">=8" |  | ||||||
|       } |  | ||||||
|     }, |  | ||||||
|     "node_modules/is-potential-custom-element-name": { |     "node_modules/is-potential-custom-element-name": { | ||||||
|       "version": "1.0.1", |       "version": "1.0.1", | ||||||
|       "resolved": "https://registry.npmjs.org/is-potential-custom-element-name/-/is-potential-custom-element-name-1.0.1.tgz", |       "resolved": "https://registry.npmjs.org/is-potential-custom-element-name/-/is-potential-custom-element-name-1.0.1.tgz", | ||||||
|       "integrity": "sha512-bCYeRA2rVibKZd+s2625gGnGF/t7DSqDs4dP7CrLA1m7jKWz6pps0LpYLJN8Q64HtmPKJ1hrN3nzPNKFEKOUiQ==", |       "integrity": "sha512-bCYeRA2rVibKZd+s2625gGnGF/t7DSqDs4dP7CrLA1m7jKWz6pps0LpYLJN8Q64HtmPKJ1hrN3nzPNKFEKOUiQ==", | ||||||
|       "dev": true |       "dev": true | ||||||
|     }, |     }, | ||||||
|     "node_modules/isexe": { |  | ||||||
|       "version": "2.0.0", |  | ||||||
|       "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz", |  | ||||||
|       "integrity": "sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==", |  | ||||||
|       "dev": true |  | ||||||
|     }, |  | ||||||
|     "node_modules/jackspeak": { |  | ||||||
|       "version": "2.3.6", |  | ||||||
|       "resolved": "https://registry.npmjs.org/jackspeak/-/jackspeak-2.3.6.tgz", |  | ||||||
|       "integrity": "sha512-N3yCS/NegsOBokc8GAdM8UcmfsKiSS8cipheD/nivzr700H+nsMOxJjQnvwOcRYVuFkdH0wGUvW2WbXGmrZGbQ==", |  | ||||||
|       "dev": true, |  | ||||||
|       "dependencies": { |  | ||||||
|         "@isaacs/cliui": "^8.0.2" |  | ||||||
|       }, |  | ||||||
|       "engines": { |  | ||||||
|         "node": ">=14" |  | ||||||
|       }, |  | ||||||
|       "funding": { |  | ||||||
|         "url": "https://github.com/sponsors/isaacs" |  | ||||||
|       }, |  | ||||||
|       "optionalDependencies": { |  | ||||||
|         "@pkgjs/parseargs": "^0.11.0" |  | ||||||
|       } |  | ||||||
|     }, |  | ||||||
|     "node_modules/js-beautify": { |  | ||||||
|       "version": "1.15.1", |  | ||||||
|       "resolved": "https://registry.npmjs.org/js-beautify/-/js-beautify-1.15.1.tgz", |  | ||||||
|       "integrity": "sha512-ESjNzSlt/sWE8sciZH8kBF8BPlwXPwhR6pWKAw8bw4Bwj+iZcnKW6ONWUutJ7eObuBZQpiIb8S7OYspWrKt7rA==", |  | ||||||
|       "dev": true, |  | ||||||
|       "dependencies": { |  | ||||||
|         "config-chain": "^1.1.13", |  | ||||||
|         "editorconfig": "^1.0.4", |  | ||||||
|         "glob": "^10.3.3", |  | ||||||
|         "js-cookie": "^3.0.5", |  | ||||||
|         "nopt": "^7.2.0" |  | ||||||
|       }, |  | ||||||
|       "bin": { |  | ||||||
|         "css-beautify": "js/bin/css-beautify.js", |  | ||||||
|         "html-beautify": "js/bin/html-beautify.js", |  | ||||||
|         "js-beautify": "js/bin/js-beautify.js" |  | ||||||
|       }, |  | ||||||
|       "engines": { |  | ||||||
|         "node": ">=14" |  | ||||||
|       } |  | ||||||
|     }, |  | ||||||
|     "node_modules/js-cookie": { |  | ||||||
|       "version": "3.0.5", |  | ||||||
|       "resolved": "https://registry.npmjs.org/js-cookie/-/js-cookie-3.0.5.tgz", |  | ||||||
|       "integrity": "sha512-cEiJEAEoIbWfCZYKWhVwFuvPX1gETRYPw6LlaTKoxD3s2AkXzkCjnp6h0V77ozyqj0jakteJ4YqDJT830+lVGw==", |  | ||||||
|       "dev": true, |  | ||||||
|       "engines": { |  | ||||||
|         "node": ">=14" |  | ||||||
|       } |  | ||||||
|     }, |  | ||||||
|     "node_modules/jsdom": { |     "node_modules/jsdom": { | ||||||
|       "version": "24.0.0", |       "version": "24.0.0", | ||||||
|       "resolved": "https://registry.npmjs.org/jsdom/-/jsdom-24.0.0.tgz", |       "resolved": "https://registry.npmjs.org/jsdom/-/jsdom-24.0.0.tgz", | ||||||
| @ -1231,15 +954,6 @@ | |||||||
|         } |         } | ||||||
|       } |       } | ||||||
|     }, |     }, | ||||||
|     "node_modules/lru-cache": { |  | ||||||
|       "version": "10.2.0", |  | ||||||
|       "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-10.2.0.tgz", |  | ||||||
|       "integrity": "sha512-2bIM8x+VAf6JT4bKAljS1qUWgMsqZRPGJS6FSahIMPVvctcNhyVp7AJu7quxOW9jwkryBReKZY5tY5JYv2n/7Q==", |  | ||||||
|       "dev": true, |  | ||||||
|       "engines": { |  | ||||||
|         "node": "14 || >=16.14" |  | ||||||
|       } |  | ||||||
|     }, |  | ||||||
|     "node_modules/magic-string": { |     "node_modules/magic-string": { | ||||||
|       "version": "0.30.7", |       "version": "0.30.7", | ||||||
|       "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.30.7.tgz", |       "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.30.7.tgz", | ||||||
| @ -1272,30 +986,6 @@ | |||||||
|         "node": ">= 0.6" |         "node": ">= 0.6" | ||||||
|       } |       } | ||||||
|     }, |     }, | ||||||
|     "node_modules/minimatch": { |  | ||||||
|       "version": "9.0.1", |  | ||||||
|       "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.1.tgz", |  | ||||||
|       "integrity": "sha512-0jWhJpD/MdhPXwPuiRkCbfYfSKp2qnn2eOc279qI7f+osl/l+prKSrvhg157zSYvx/1nmgn2NqdT6k2Z7zSH9w==", |  | ||||||
|       "dev": true, |  | ||||||
|       "dependencies": { |  | ||||||
|         "brace-expansion": "^2.0.1" |  | ||||||
|       }, |  | ||||||
|       "engines": { |  | ||||||
|         "node": ">=16 || 14 >=14.17" |  | ||||||
|       }, |  | ||||||
|       "funding": { |  | ||||||
|         "url": "https://github.com/sponsors/isaacs" |  | ||||||
|       } |  | ||||||
|     }, |  | ||||||
|     "node_modules/minipass": { |  | ||||||
|       "version": "7.0.4", |  | ||||||
|       "resolved": "https://registry.npmjs.org/minipass/-/minipass-7.0.4.tgz", |  | ||||||
|       "integrity": "sha512-jYofLM5Dam9279rdkWzqHozUo4ybjdZmCsDHePy5V/PbBcVMiSZR97gmAy45aqi8CK1lG2ECd356FU86avfwUQ==", |  | ||||||
|       "dev": true, |  | ||||||
|       "engines": { |  | ||||||
|         "node": ">=16 || 14 >=14.17" |  | ||||||
|       } |  | ||||||
|     }, |  | ||||||
|     "node_modules/ms": { |     "node_modules/ms": { | ||||||
|       "version": "2.1.2", |       "version": "2.1.2", | ||||||
|       "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", |       "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", | ||||||
| @ -1319,21 +1009,6 @@ | |||||||
|         "node": "^10 || ^12 || ^13.7 || ^14 || >=15.0.1" |         "node": "^10 || ^12 || ^13.7 || ^14 || >=15.0.1" | ||||||
|       } |       } | ||||||
|     }, |     }, | ||||||
|     "node_modules/nopt": { |  | ||||||
|       "version": "7.2.0", |  | ||||||
|       "resolved": "https://registry.npmjs.org/nopt/-/nopt-7.2.0.tgz", |  | ||||||
|       "integrity": "sha512-CVDtwCdhYIvnAzFoJ6NJ6dX3oga9/HyciQDnG1vQDjSLMeKLJ4A93ZqYKDrgYSr1FBY5/hMYC+2VCi24pgpkGA==", |  | ||||||
|       "dev": true, |  | ||||||
|       "dependencies": { |  | ||||||
|         "abbrev": "^2.0.0" |  | ||||||
|       }, |  | ||||||
|       "bin": { |  | ||||||
|         "nopt": "bin/nopt.js" |  | ||||||
|       }, |  | ||||||
|       "engines": { |  | ||||||
|         "node": "^14.17.0 || ^16.13.0 || >=18.0.0" |  | ||||||
|       } |  | ||||||
|     }, |  | ||||||
|     "node_modules/nwsapi": { |     "node_modules/nwsapi": { | ||||||
|       "version": "2.2.7", |       "version": "2.2.7", | ||||||
|       "resolved": "https://registry.npmjs.org/nwsapi/-/nwsapi-2.2.7.tgz", |       "resolved": "https://registry.npmjs.org/nwsapi/-/nwsapi-2.2.7.tgz", | ||||||
| @ -1352,31 +1027,6 @@ | |||||||
|         "url": "https://github.com/inikulin/parse5?sponsor=1" |         "url": "https://github.com/inikulin/parse5?sponsor=1" | ||||||
|       } |       } | ||||||
|     }, |     }, | ||||||
|     "node_modules/path-key": { |  | ||||||
|       "version": "3.1.1", |  | ||||||
|       "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz", |  | ||||||
|       "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==", |  | ||||||
|       "dev": true, |  | ||||||
|       "engines": { |  | ||||||
|         "node": ">=8" |  | ||||||
|       } |  | ||||||
|     }, |  | ||||||
|     "node_modules/path-scurry": { |  | ||||||
|       "version": "1.10.1", |  | ||||||
|       "resolved": "https://registry.npmjs.org/path-scurry/-/path-scurry-1.10.1.tgz", |  | ||||||
|       "integrity": "sha512-MkhCqzzBEpPvxxQ71Md0b1Kk51W01lrYvlMzSUaIzNsODdd7mqhiimSZlr+VegAz5Z6Vzt9Xg2ttE//XBhH3EQ==", |  | ||||||
|       "dev": true, |  | ||||||
|       "dependencies": { |  | ||||||
|         "lru-cache": "^9.1.1 || ^10.0.0", |  | ||||||
|         "minipass": "^5.0.0 || ^6.0.2 || ^7.0.0" |  | ||||||
|       }, |  | ||||||
|       "engines": { |  | ||||||
|         "node": ">=16 || 14 >=14.17" |  | ||||||
|       }, |  | ||||||
|       "funding": { |  | ||||||
|         "url": "https://github.com/sponsors/isaacs" |  | ||||||
|       } |  | ||||||
|     }, |  | ||||||
|     "node_modules/picocolors": { |     "node_modules/picocolors": { | ||||||
|       "version": "1.0.0", |       "version": "1.0.0", | ||||||
|       "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.0.0.tgz", |       "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.0.0.tgz", | ||||||
| @ -1409,12 +1059,6 @@ | |||||||
|         "node": "^10 || ^12 || >=14" |         "node": "^10 || ^12 || >=14" | ||||||
|       } |       } | ||||||
|     }, |     }, | ||||||
|     "node_modules/proto-list": { |  | ||||||
|       "version": "1.2.4", |  | ||||||
|       "resolved": "https://registry.npmjs.org/proto-list/-/proto-list-1.2.4.tgz", |  | ||||||
|       "integrity": "sha512-vtK/94akxsTMhe0/cbfpR+syPuszcuwhqVjJq26CuNDgFGj682oRBXOP5MJpv2r7JtE8MsiepGIqvvOTBwn2vA==", |  | ||||||
|       "dev": true |  | ||||||
|     }, |  | ||||||
|     "node_modules/psl": { |     "node_modules/psl": { | ||||||
|       "version": "1.9.0", |       "version": "1.9.0", | ||||||
|       "resolved": "https://registry.npmjs.org/psl/-/psl-1.9.0.tgz", |       "resolved": "https://registry.npmjs.org/psl/-/psl-1.9.0.tgz", | ||||||
| @ -1498,66 +1142,6 @@ | |||||||
|         "node": ">=v12.22.7" |         "node": ">=v12.22.7" | ||||||
|       } |       } | ||||||
|     }, |     }, | ||||||
|     "node_modules/semver": { |  | ||||||
|       "version": "7.6.0", |  | ||||||
|       "resolved": "https://registry.npmjs.org/semver/-/semver-7.6.0.tgz", |  | ||||||
|       "integrity": "sha512-EnwXhrlwXMk9gKu5/flx5sv/an57AkRplG3hTK68W7FRDN+k+OWBj65M7719OkA82XLBxrcX0KSHj+X5COhOVg==", |  | ||||||
|       "dev": true, |  | ||||||
|       "dependencies": { |  | ||||||
|         "lru-cache": "^6.0.0" |  | ||||||
|       }, |  | ||||||
|       "bin": { |  | ||||||
|         "semver": "bin/semver.js" |  | ||||||
|       }, |  | ||||||
|       "engines": { |  | ||||||
|         "node": ">=10" |  | ||||||
|       } |  | ||||||
|     }, |  | ||||||
|     "node_modules/semver/node_modules/lru-cache": { |  | ||||||
|       "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" |  | ||||||
|       }, |  | ||||||
|       "engines": { |  | ||||||
|         "node": ">=10" |  | ||||||
|       } |  | ||||||
|     }, |  | ||||||
|     "node_modules/shebang-command": { |  | ||||||
|       "version": "2.0.0", |  | ||||||
|       "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz", |  | ||||||
|       "integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==", |  | ||||||
|       "dev": true, |  | ||||||
|       "dependencies": { |  | ||||||
|         "shebang-regex": "^3.0.0" |  | ||||||
|       }, |  | ||||||
|       "engines": { |  | ||||||
|         "node": ">=8" |  | ||||||
|       } |  | ||||||
|     }, |  | ||||||
|     "node_modules/shebang-regex": { |  | ||||||
|       "version": "3.0.0", |  | ||||||
|       "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz", |  | ||||||
|       "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==", |  | ||||||
|       "dev": true, |  | ||||||
|       "engines": { |  | ||||||
|         "node": ">=8" |  | ||||||
|       } |  | ||||||
|     }, |  | ||||||
|     "node_modules/signal-exit": { |  | ||||||
|       "version": "4.1.0", |  | ||||||
|       "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-4.1.0.tgz", |  | ||||||
|       "integrity": "sha512-bzyZ1e88w9O1iNJbKnOlvYTrWPDl46O1bG0D3XInv+9tkPrxrN8jUUTiFlDkkmKWgn1M6CfIA13SuGqOa9Korw==", |  | ||||||
|       "dev": true, |  | ||||||
|       "engines": { |  | ||||||
|         "node": ">=14" |  | ||||||
|       }, |  | ||||||
|       "funding": { |  | ||||||
|         "url": "https://github.com/sponsors/isaacs" |  | ||||||
|       } |  | ||||||
|     }, |  | ||||||
|     "node_modules/source-map-js": { |     "node_modules/source-map-js": { | ||||||
|       "version": "1.0.2", |       "version": "1.0.2", | ||||||
|       "resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-1.0.2.tgz", |       "resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-1.0.2.tgz", | ||||||
| @ -1566,102 +1150,6 @@ | |||||||
|         "node": ">=0.10.0" |         "node": ">=0.10.0" | ||||||
|       } |       } | ||||||
|     }, |     }, | ||||||
|     "node_modules/string-width": { |  | ||||||
|       "version": "5.1.2", |  | ||||||
|       "resolved": "https://registry.npmjs.org/string-width/-/string-width-5.1.2.tgz", |  | ||||||
|       "integrity": "sha512-HnLOCR3vjcY8beoNLtcjZ5/nxn2afmME6lhrDrebokqMap+XbeW8n9TXpPDOqdGK5qcI3oT0GKTW6wC7EMiVqA==", |  | ||||||
|       "dev": true, |  | ||||||
|       "dependencies": { |  | ||||||
|         "eastasianwidth": "^0.2.0", |  | ||||||
|         "emoji-regex": "^9.2.2", |  | ||||||
|         "strip-ansi": "^7.0.1" |  | ||||||
|       }, |  | ||||||
|       "engines": { |  | ||||||
|         "node": ">=12" |  | ||||||
|       }, |  | ||||||
|       "funding": { |  | ||||||
|         "url": "https://github.com/sponsors/sindresorhus" |  | ||||||
|       } |  | ||||||
|     }, |  | ||||||
|     "node_modules/string-width-cjs": { |  | ||||||
|       "name": "string-width", |  | ||||||
|       "version": "4.2.3", |  | ||||||
|       "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz", |  | ||||||
|       "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==", |  | ||||||
|       "dev": true, |  | ||||||
|       "dependencies": { |  | ||||||
|         "emoji-regex": "^8.0.0", |  | ||||||
|         "is-fullwidth-code-point": "^3.0.0", |  | ||||||
|         "strip-ansi": "^6.0.1" |  | ||||||
|       }, |  | ||||||
|       "engines": { |  | ||||||
|         "node": ">=8" |  | ||||||
|       } |  | ||||||
|     }, |  | ||||||
|     "node_modules/string-width-cjs/node_modules/ansi-regex": { |  | ||||||
|       "version": "5.0.1", |  | ||||||
|       "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz", |  | ||||||
|       "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==", |  | ||||||
|       "dev": true, |  | ||||||
|       "engines": { |  | ||||||
|         "node": ">=8" |  | ||||||
|       } |  | ||||||
|     }, |  | ||||||
|     "node_modules/string-width-cjs/node_modules/emoji-regex": { |  | ||||||
|       "version": "8.0.0", |  | ||||||
|       "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz", |  | ||||||
|       "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==", |  | ||||||
|       "dev": true |  | ||||||
|     }, |  | ||||||
|     "node_modules/string-width-cjs/node_modules/strip-ansi": { |  | ||||||
|       "version": "6.0.1", |  | ||||||
|       "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz", |  | ||||||
|       "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==", |  | ||||||
|       "dev": true, |  | ||||||
|       "dependencies": { |  | ||||||
|         "ansi-regex": "^5.0.1" |  | ||||||
|       }, |  | ||||||
|       "engines": { |  | ||||||
|         "node": ">=8" |  | ||||||
|       } |  | ||||||
|     }, |  | ||||||
|     "node_modules/strip-ansi": { |  | ||||||
|       "version": "7.1.0", |  | ||||||
|       "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.1.0.tgz", |  | ||||||
|       "integrity": "sha512-iq6eVVI64nQQTRYq2KtEg2d2uU7LElhTJwsH4YzIHZshxlgZms/wIc4VoDQTlG/IvVIrBKG06CrZnp0qv7hkcQ==", |  | ||||||
|       "dev": true, |  | ||||||
|       "dependencies": { |  | ||||||
|         "ansi-regex": "^6.0.1" |  | ||||||
|       }, |  | ||||||
|       "engines": { |  | ||||||
|         "node": ">=12" |  | ||||||
|       }, |  | ||||||
|       "funding": { |  | ||||||
|         "url": "https://github.com/chalk/strip-ansi?sponsor=1" |  | ||||||
|       } |  | ||||||
|     }, |  | ||||||
|     "node_modules/strip-ansi-cjs": { |  | ||||||
|       "name": "strip-ansi", |  | ||||||
|       "version": "6.0.1", |  | ||||||
|       "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz", |  | ||||||
|       "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==", |  | ||||||
|       "dev": true, |  | ||||||
|       "dependencies": { |  | ||||||
|         "ansi-regex": "^5.0.1" |  | ||||||
|       }, |  | ||||||
|       "engines": { |  | ||||||
|         "node": ">=8" |  | ||||||
|       } |  | ||||||
|     }, |  | ||||||
|     "node_modules/strip-ansi-cjs/node_modules/ansi-regex": { |  | ||||||
|       "version": "5.0.1", |  | ||||||
|       "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz", |  | ||||||
|       "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==", |  | ||||||
|       "dev": true, |  | ||||||
|       "engines": { |  | ||||||
|         "node": ">=8" |  | ||||||
|       } |  | ||||||
|     }, |  | ||||||
|     "node_modules/symbol-tree": { |     "node_modules/symbol-tree": { | ||||||
|       "version": "3.2.4", |       "version": "3.2.4", | ||||||
|       "resolved": "https://registry.npmjs.org/symbol-tree/-/symbol-tree-3.2.4.tgz", |       "resolved": "https://registry.npmjs.org/symbol-tree/-/symbol-tree-3.2.4.tgz", | ||||||
| @ -1789,12 +1277,6 @@ | |||||||
|         } |         } | ||||||
|       } |       } | ||||||
|     }, |     }, | ||||||
|     "node_modules/vue-component-type-helpers": { |  | ||||||
|       "version": "1.8.27", |  | ||||||
|       "resolved": "https://registry.npmjs.org/vue-component-type-helpers/-/vue-component-type-helpers-1.8.27.tgz", |  | ||||||
|       "integrity": "sha512-0vOfAtI67UjeO1G6UiX5Kd76CqaQ67wrRZiOe7UAb9Jm6GzlUr/fC7CV90XfwapJRjpCMaZFhv1V0ajWRmE9Dg==", |  | ||||||
|       "dev": true |  | ||||||
|     }, |  | ||||||
|     "node_modules/vue3-toastify": { |     "node_modules/vue3-toastify": { | ||||||
|       "version": "0.2.1", |       "version": "0.2.1", | ||||||
|       "resolved": "https://registry.npmjs.org/vue3-toastify/-/vue3-toastify-0.2.1.tgz", |       "resolved": "https://registry.npmjs.org/vue3-toastify/-/vue3-toastify-0.2.1.tgz", | ||||||
| @ -1871,124 +1353,6 @@ | |||||||
|         "node": ">=18" |         "node": ">=18" | ||||||
|       } |       } | ||||||
|     }, |     }, | ||||||
|     "node_modules/which": { |  | ||||||
|       "version": "2.0.2", |  | ||||||
|       "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz", |  | ||||||
|       "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==", |  | ||||||
|       "dev": true, |  | ||||||
|       "dependencies": { |  | ||||||
|         "isexe": "^2.0.0" |  | ||||||
|       }, |  | ||||||
|       "bin": { |  | ||||||
|         "node-which": "bin/node-which" |  | ||||||
|       }, |  | ||||||
|       "engines": { |  | ||||||
|         "node": ">= 8" |  | ||||||
|       } |  | ||||||
|     }, |  | ||||||
|     "node_modules/wrap-ansi": { |  | ||||||
|       "version": "8.1.0", |  | ||||||
|       "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-8.1.0.tgz", |  | ||||||
|       "integrity": "sha512-si7QWI6zUMq56bESFvagtmzMdGOtoxfR+Sez11Mobfc7tm+VkUckk9bW2UeffTGVUbOksxmSw0AA2gs8g71NCQ==", |  | ||||||
|       "dev": true, |  | ||||||
|       "dependencies": { |  | ||||||
|         "ansi-styles": "^6.1.0", |  | ||||||
|         "string-width": "^5.0.1", |  | ||||||
|         "strip-ansi": "^7.0.1" |  | ||||||
|       }, |  | ||||||
|       "engines": { |  | ||||||
|         "node": ">=12" |  | ||||||
|       }, |  | ||||||
|       "funding": { |  | ||||||
|         "url": "https://github.com/chalk/wrap-ansi?sponsor=1" |  | ||||||
|       } |  | ||||||
|     }, |  | ||||||
|     "node_modules/wrap-ansi-cjs": { |  | ||||||
|       "name": "wrap-ansi", |  | ||||||
|       "version": "7.0.0", |  | ||||||
|       "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz", |  | ||||||
|       "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==", |  | ||||||
|       "dev": true, |  | ||||||
|       "dependencies": { |  | ||||||
|         "ansi-styles": "^4.0.0", |  | ||||||
|         "string-width": "^4.1.0", |  | ||||||
|         "strip-ansi": "^6.0.0" |  | ||||||
|       }, |  | ||||||
|       "engines": { |  | ||||||
|         "node": ">=10" |  | ||||||
|       }, |  | ||||||
|       "funding": { |  | ||||||
|         "url": "https://github.com/chalk/wrap-ansi?sponsor=1" |  | ||||||
|       } |  | ||||||
|     }, |  | ||||||
|     "node_modules/wrap-ansi-cjs/node_modules/ansi-regex": { |  | ||||||
|       "version": "5.0.1", |  | ||||||
|       "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz", |  | ||||||
|       "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==", |  | ||||||
|       "dev": true, |  | ||||||
|       "engines": { |  | ||||||
|         "node": ">=8" |  | ||||||
|       } |  | ||||||
|     }, |  | ||||||
|     "node_modules/wrap-ansi-cjs/node_modules/ansi-styles": { |  | ||||||
|       "version": "4.3.0", |  | ||||||
|       "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", |  | ||||||
|       "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", |  | ||||||
|       "dev": true, |  | ||||||
|       "dependencies": { |  | ||||||
|         "color-convert": "^2.0.1" |  | ||||||
|       }, |  | ||||||
|       "engines": { |  | ||||||
|         "node": ">=8" |  | ||||||
|       }, |  | ||||||
|       "funding": { |  | ||||||
|         "url": "https://github.com/chalk/ansi-styles?sponsor=1" |  | ||||||
|       } |  | ||||||
|     }, |  | ||||||
|     "node_modules/wrap-ansi-cjs/node_modules/emoji-regex": { |  | ||||||
|       "version": "8.0.0", |  | ||||||
|       "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz", |  | ||||||
|       "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==", |  | ||||||
|       "dev": true |  | ||||||
|     }, |  | ||||||
|     "node_modules/wrap-ansi-cjs/node_modules/string-width": { |  | ||||||
|       "version": "4.2.3", |  | ||||||
|       "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz", |  | ||||||
|       "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==", |  | ||||||
|       "dev": true, |  | ||||||
|       "dependencies": { |  | ||||||
|         "emoji-regex": "^8.0.0", |  | ||||||
|         "is-fullwidth-code-point": "^3.0.0", |  | ||||||
|         "strip-ansi": "^6.0.1" |  | ||||||
|       }, |  | ||||||
|       "engines": { |  | ||||||
|         "node": ">=8" |  | ||||||
|       } |  | ||||||
|     }, |  | ||||||
|     "node_modules/wrap-ansi-cjs/node_modules/strip-ansi": { |  | ||||||
|       "version": "6.0.1", |  | ||||||
|       "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz", |  | ||||||
|       "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==", |  | ||||||
|       "dev": true, |  | ||||||
|       "dependencies": { |  | ||||||
|         "ansi-regex": "^5.0.1" |  | ||||||
|       }, |  | ||||||
|       "engines": { |  | ||||||
|         "node": ">=8" |  | ||||||
|       } |  | ||||||
|     }, |  | ||||||
|     "node_modules/wrap-ansi/node_modules/ansi-styles": { |  | ||||||
|       "version": "6.2.1", |  | ||||||
|       "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-6.2.1.tgz", |  | ||||||
|       "integrity": "sha512-bN798gFfQX+viw3R7yrGWRqnrN2oRkEkUjjl4JNn4E8GxxbjtG3FbrEIIY3l8/hrwUwIeCZvi4QuOTP4MErVug==", |  | ||||||
|       "dev": true, |  | ||||||
|       "engines": { |  | ||||||
|         "node": ">=12" |  | ||||||
|       }, |  | ||||||
|       "funding": { |  | ||||||
|         "url": "https://github.com/chalk/ansi-styles?sponsor=1" |  | ||||||
|       } |  | ||||||
|     }, |  | ||||||
|     "node_modules/ws": { |     "node_modules/ws": { | ||||||
|       "version": "8.16.0", |       "version": "8.16.0", | ||||||
|       "resolved": "https://registry.npmjs.org/ws/-/ws-8.16.0.tgz", |       "resolved": "https://registry.npmjs.org/ws/-/ws-8.16.0.tgz", | ||||||
| @ -2024,12 +1388,6 @@ | |||||||
|       "resolved": "https://registry.npmjs.org/xmlchars/-/xmlchars-2.2.0.tgz", |       "resolved": "https://registry.npmjs.org/xmlchars/-/xmlchars-2.2.0.tgz", | ||||||
|       "integrity": "sha512-JZnDKK8B0RCDw84FNdDAIpZK+JuJw+s7Lz8nksI7SIuU3UXJJslUthsi+uWBUYOwPFwW7W7PRLRfUKpxjtjFCw==", |       "integrity": "sha512-JZnDKK8B0RCDw84FNdDAIpZK+JuJw+s7Lz8nksI7SIuU3UXJJslUthsi+uWBUYOwPFwW7W7PRLRfUKpxjtjFCw==", | ||||||
|       "dev": true |       "dev": true | ||||||
|     }, |  | ||||||
|     "node_modules/yallist": { |  | ||||||
|       "version": "4.0.0", |  | ||||||
|       "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz", |  | ||||||
|       "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==", |  | ||||||
|       "dev": true |  | ||||||
|     } |     } | ||||||
|   } |   } | ||||||
| } | } | ||||||
|  | |||||||
| @ -9,6 +9,8 @@ | |||||||
|  * |  * | ||||||
|  */ |  */ | ||||||
|  |  | ||||||
|  | import { getCookie } from './utils.js'; | ||||||
|  |  | ||||||
| const default_lang = "EN"; | const default_lang = "EN"; | ||||||
| let langs; | let langs; | ||||||
|  |  | ||||||
| @ -36,22 +38,6 @@ export default function i18n(key, options) { | |||||||
| // Those functions are utility functions use by previous exported functions. | // Those functions are utility functions use by previous exported functions. | ||||||
| // | // | ||||||
|  |  | ||||||
| /** |  | ||||||
|  * Return the content of a cookie with specified key |  | ||||||
|  * @param key cookie name |  | ||||||
|  */ |  | ||||||
| function getCookie(key){ |  | ||||||
| 	key = key + "=" |  | ||||||
| 	let cookies = decodeURIComponent(document.cookie).split(";"); |  | ||||||
| 	for (let el of cookies) { |  | ||||||
| 		el = el.trimStart(); |  | ||||||
| 		if(el.indexOf(key) == 0){ |  | ||||||
| 			return el.substr(key.length, el.length); |  | ||||||
| 		} |  | ||||||
| 	} |  | ||||||
| 	return ""; |  | ||||||
| } |  | ||||||
|  |  | ||||||
| /** | /** | ||||||
|  * Function that load the file with translation from the specified lang and return a dictionnary |  * Function that load the file with translation from the specified lang and return a dictionnary | ||||||
|  * @param select the language to load. could be null to fetch the cookies for an answer |  * @param select the language to load. could be null to fetch the cookies for an answer | ||||||
| @ -61,7 +47,7 @@ export async function loadLangs(lang){ | |||||||
| 	lang = lang != null ? lang : getCookie("lang"); | 	lang = lang != null ? lang : getCookie("lang"); | ||||||
| 	lang = lang != "" ? lang : default_lang; | 	lang = lang != "" ? lang : default_lang; | ||||||
|  |  | ||||||
| 	const filename = "./i18n/" + lang.toUpperCase() + ".txt"; | 	const filename = "/i18n/" + lang.toUpperCase() + ".txt"; | ||||||
| 	const content = await (await fetch(filename)).text(); | 	const content = await (await fetch(filename)).text(); | ||||||
| 	const lines = content.split("\n"); | 	const lines = content.split("\n"); | ||||||
|  |  | ||||||
|  | |||||||
| @ -1,4 +1,5 @@ | |||||||
| import './assets/main.css' | import './assets/main.css' | ||||||
|  | import 'vue3-toastify/dist/index.css'; | ||||||
|  |  | ||||||
| import { createApp } from 'vue' | import { createApp } from 'vue' | ||||||
| import App from './Login.vue' | import App from './Login.vue' | ||||||
|  | |||||||
							
								
								
									
										45
									
								
								frontend/src/rest/restConsumer.js
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										45
									
								
								frontend/src/rest/restConsumer.js
									
									
									
									
									
										Normal file
									
								
							| @ -0,0 +1,45 @@ | |||||||
|  | import { getCookie } from '../utils.js' | ||||||
|  | import { toast } from 'vue3-toastify' | ||||||
|  |  | ||||||
|  | const restURL = import.meta.env.PROD ? "https://clyde.herisson.ovh/api" : "http://localhost:8080" | ||||||
|  |  | ||||||
|  | export async function restGet(endPoint) { | ||||||
|  | 	return await _rest(endPoint, {method: "GET"}); | ||||||
|  | } | ||||||
|  |  | ||||||
|  | export async function restPost(endPoint, data) { | ||||||
|  | 	return await _rest(endPoint, {method: "POST", body: data}); | ||||||
|  | } | ||||||
|  |  | ||||||
|  | export async function restDelete(endPoint, data) { | ||||||
|  | 	return await _rest(endPoint, {method: "DELETE", body: data}); | ||||||
|  | } | ||||||
|  |  | ||||||
|  | export async function restPatch(endPoint, data) { | ||||||
|  | 	return await _rest(endPoint, {method: "PATCH", body: data}); | ||||||
|  | } | ||||||
|  |  | ||||||
|  | /** | ||||||
|  |  * backbone for the request made by the frontend | ||||||
|  |  * | ||||||
|  |  * specification | ||||||
|  |  *  - If the user has "session_token" cookie set, it will use it in the authorization field of the http request | ||||||
|  |  *  - The result will be returned as a json to access fields easily ( the backend should send json response ) | ||||||
|  |  * | ||||||
|  |  *  @Example _rest("/ping", {user: data}) -> {id:0, txt:"pong"} | ||||||
|  |  */ | ||||||
|  | async function _rest(endPoint, config){ | ||||||
|  | 	endPoint.at(0) != "/" ? console.error("Carefull, you certainly should put a / at the begenning of your endPoint ") : true; | ||||||
|  | 	let session_token = getCookie("session_token"); | ||||||
|  | 	let headers = new Headers({'Authorization': session_token}); | ||||||
|  | 	config['headers'] = headers; | ||||||
|  | 	return toast.promise(fetch(restURL + endPoint, config), | ||||||
|  | 		{ | ||||||
|  | 			pending: config['pending'] != null ? config['pending'] : 'pending', | ||||||
|  | 			error: config['error'] != null ? config['error'] : 'Network Failure...', | ||||||
|  | 			success: config['success'] != null ? config['success'] : {render(res){ | ||||||
|  | 				return res.ok ? "Success" : "error"; | ||||||
|  | 			}}, | ||||||
|  | 		}) | ||||||
|  | 		.then( e => e.json()).catch( e => e ); | ||||||
|  | } | ||||||
							
								
								
									
										17
									
								
								frontend/src/utils.js
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										17
									
								
								frontend/src/utils.js
									
									
									
									
									
										Normal file
									
								
							| @ -0,0 +1,17 @@ | |||||||
|  | /** | ||||||
|  |  * Return the content of a cookie with specified key | ||||||
|  |  * @param key cookie name | ||||||
|  |  */ | ||||||
|  | function getCookie(key){ | ||||||
|  | 	key = key + "=" | ||||||
|  | 	let cookies = decodeURIComponent(document.cookie).split(";"); | ||||||
|  | 	for (let el of cookies) { | ||||||
|  | 		el = el.trimStart(); | ||||||
|  | 		if(el.indexOf(key) == 0){ | ||||||
|  | 			return el.substr(key.length, el.length); | ||||||
|  | 		} | ||||||
|  | 	} | ||||||
|  | 	return ""; | ||||||
|  | } | ||||||
|  |  | ||||||
|  | export {getCookie}; | ||||||
		Reference in New Issue
	
	Block a user