From 00634ebbc801f9b00839b523c5c759e45dd07418 Mon Sep 17 00:00:00 2001 From: Nicolas Froger Date: Fri, 26 Jul 2024 16:05:05 +0200 Subject: [PATCH 01/29] frontend: display version in corner Signed-off-by: Nicolas Froger --- summer2024-frontend/.env | 1 + summer2024-frontend/src/App.vue | 20 +++++++++++++++++--- summer2024-frontend/src/config.js | 6 +++--- summer2024-frontend/vite.config.js | 2 +- 4 files changed, 22 insertions(+), 7 deletions(-) create mode 100644 summer2024-frontend/.env diff --git a/summer2024-frontend/.env b/summer2024-frontend/.env new file mode 100644 index 0000000..5e01b0f --- /dev/null +++ b/summer2024-frontend/.env @@ -0,0 +1 @@ +VITE_APP_VERSION=$npm_package_version \ No newline at end of file diff --git a/summer2024-frontend/src/App.vue b/summer2024-frontend/src/App.vue index 8d10567..663d6ed 100644 --- a/summer2024-frontend/src/App.vue +++ b/summer2024-frontend/src/App.vue @@ -1,19 +1,33 @@ diff --git a/summer2024-frontend/src/config.js b/summer2024-frontend/src/config.js index 7a73a12..de29f13 100644 --- a/summer2024-frontend/src/config.js +++ b/summer2024-frontend/src/config.js @@ -1,3 +1,3 @@ -export const API_BASE_URL = import.meta.env.VITE_API_BASEURL; -export const S3_ENDPOINT = import.meta.env.VITE_S3_ENDPOINT; -export const S3_BUCKET = import.meta.env.VITE_S3_BUCKET; +export const API_BASE_URL = import.meta.env.VITE_API_BASEURL +export const S3_ENDPOINT = import.meta.env.VITE_S3_ENDPOINT +export const S3_BUCKET = import.meta.env.VITE_S3_BUCKET diff --git a/summer2024-frontend/vite.config.js b/summer2024-frontend/vite.config.js index 6e38a91..4754cfc 100644 --- a/summer2024-frontend/vite.config.js +++ b/summer2024-frontend/vite.config.js @@ -27,4 +27,4 @@ export default defineConfig({ esbuild: { drop: [] } -}) \ No newline at end of file +}) From 9aa549dd6de4152b6dd24466adbca4514a0c7f54 Mon Sep 17 00:00:00 2001 From: Nicolas Froger Date: Fri, 26 Jul 2024 16:10:42 +0200 Subject: [PATCH 02/29] release 1.2.1 Signed-off-by: Nicolas Froger --- summer2024-backend/pom.xml | 2 +- summer2024-frontend/package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/summer2024-backend/pom.xml b/summer2024-backend/pom.xml index 574a3ab..ef6df36 100644 --- a/summer2024-backend/pom.xml +++ b/summer2024-backend/pom.xml @@ -3,7 +3,7 @@ 4.0.0 fr.kektus summer2024-backend - 1.2.0-SNAPSHOT + 1.2.1-SNAPSHOT 3.13.0 diff --git a/summer2024-frontend/package.json b/summer2024-frontend/package.json index f2d0b9d..9730223 100644 --- a/summer2024-frontend/package.json +++ b/summer2024-frontend/package.json @@ -1,6 +1,6 @@ { "name": "summer2024-frontend", - "version": "1.2.0", + "version": "1.2.1", "private": true, "type": "module", "scripts": { From 67c1257b3d3b366edfafacde495f367ca981d961 Mon Sep 17 00:00:00 2001 From: Nicolas Froger Date: Fri, 26 Jul 2024 16:59:24 +0200 Subject: [PATCH 03/29] frontend: add goal locations Signed-off-by: Nicolas Froger --- summer2024-frontend/src/views/MapView.vue | 35 +++++++++++++++++++++-- 1 file changed, 33 insertions(+), 2 deletions(-) diff --git a/summer2024-frontend/src/views/MapView.vue b/summer2024-frontend/src/views/MapView.vue index 81515e9..d7b9cb5 100644 --- a/summer2024-frontend/src/views/MapView.vue +++ b/summer2024-frontend/src/views/MapView.vue @@ -1,10 +1,11 @@ - + diff --git a/summer2024-frontend/src/components/ui/alert/Alert.vue b/summer2024-frontend/src/components/ui/alert/Alert.vue index 3ac2f85..f889172 100644 --- a/summer2024-frontend/src/components/ui/alert/Alert.vue +++ b/summer2024-frontend/src/components/ui/alert/Alert.vue @@ -1,11 +1,11 @@