From d234cf129323783037bf7e9af20080570d014d87 Mon Sep 17 00:00:00 2001 From: Arthur FRIN Date: Tue, 19 Mar 2024 20:17:11 +0100 Subject: [PATCH 01/61] feat: replace article to discover in nav bar --- front/src/components/MobileHome.vue | 2 +- front/src/components/icons/icon-article.vue | 5 ----- front/src/components/icons/icon-discover.vue | 6 ++++++ front/src/components/navBar.vue | 12 +++++++----- front/src/router/index.ts | 6 +++--- .../src/views/{ArticleView.vue => DiscoverView.vue} | 2 +- 6 files changed, 18 insertions(+), 15 deletions(-) delete mode 100644 front/src/components/icons/icon-article.vue create mode 100644 front/src/components/icons/icon-discover.vue rename front/src/views/{ArticleView.vue => DiscoverView.vue} (86%) diff --git a/front/src/components/MobileHome.vue b/front/src/components/MobileHome.vue index 6ed48e0..9ae7d49 100644 --- a/front/src/components/MobileHome.vue +++ b/front/src/components/MobileHome.vue @@ -217,7 +217,7 @@ function mapClick() {
+ :iconUrl="cleanwalk.isAsso ? 'https://firebasestorage.googleapis.com/v0/b/horrorfire-88d56.appspot.com/o/cw%2FGroup%20172.svg?alt=media&token=2b337af1-bed2-4491-834c-c2aeaf8be593' : 'https://firebasestorage.googleapis.com/v0/b/horrorfire-88d56.appspot.com/o/cw%2FGroup%20173.svg?alt=media&token=2c75133b-e73f-4cac-95fb-277e4516dfb7'">
diff --git a/front/src/components/icons/icon-article.vue b/front/src/components/icons/icon-article.vue deleted file mode 100644 index c9fac39..0000000 --- a/front/src/components/icons/icon-article.vue +++ /dev/null @@ -1,5 +0,0 @@ - \ No newline at end of file diff --git a/front/src/components/icons/icon-discover.vue b/front/src/components/icons/icon-discover.vue new file mode 100644 index 0000000..dbcacaf --- /dev/null +++ b/front/src/components/icons/icon-discover.vue @@ -0,0 +1,6 @@ + \ No newline at end of file diff --git a/front/src/components/navBar.vue b/front/src/components/navBar.vue index d228c2f..83cdd22 100644 --- a/front/src/components/navBar.vue +++ b/front/src/components/navBar.vue @@ -1,6 +1,6 @@ \ No newline at end of file From 504c3a84f9c2a3b339c2ca3c4e04f8279ef2f13d Mon Sep 17 00:00:00 2001 From: Arthur FRIN Date: Wed, 20 Mar 2024 00:00:51 +0100 Subject: [PATCH 02/61] feat: add filepond --- front/package-lock.json | 67 ++++++++++++++++++++++---------- front/package.json | 3 ++ front/src/App.vue | 2 + front/src/assets/main.scss | 2 +- front/src/components/Profile.vue | 24 ++++++++++++ front/src/components/TopBar.vue | 6 ++- front/src/views/ProfileView.vue | 5 ++- 7 files changed, 85 insertions(+), 24 deletions(-) create mode 100644 front/src/components/Profile.vue diff --git a/front/package-lock.json b/front/package-lock.json index 74444ac..cbc5914 100644 --- a/front/package-lock.json +++ b/front/package-lock.json @@ -10,11 +10,14 @@ "dependencies": { "@vue-leaflet/vue-leaflet": "^0.10.1", "date-fns": "^3.3.1", + "filepond": "^4.30.6", + "filepond-plugin-image-preview": "^4.6.12", "ky": "^1.2.0", "leaflet": "^1.9.4", "pinia": "^2.1.7", "vue": "^3.4.15", "vue-cookies": "^1.8.3", + "vue-filepond": "^7.0.4", "vue-router": "^4.2.5" }, "devDependencies": { @@ -1308,27 +1311,6 @@ "@vue/shared": "3.4.19" } }, - "node_modules/@vue/compiler-sfc": { - "version": "3.4.19", - "resolved": "https://registry.npmjs.org/@vue/compiler-sfc/-/compiler-sfc-3.4.19.tgz", - "integrity": "sha512-LQ3U4SN0DlvV0xhr1lUsgLCYlwQfUfetyPxkKYu7dkfvx7g3ojrGAkw0AERLOKYXuAGnqFsEuytkdcComei3Yg==", - "dependencies": { - "@babel/parser": "^7.23.9", - "@vue/compiler-core": "3.4.19", - "@vue/compiler-dom": "3.4.19", - "@vue/compiler-ssr": "3.4.19", - "@vue/shared": "3.4.19", - "estree-walker": "^2.0.2", - "magic-string": "^0.30.6", - "postcss": "^8.4.33", - "source-map-js": "^1.0.2" - } - }, - "node_modules/@vue/compiler-sfc/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==" - }, "node_modules/@vue/compiler-ssr": { "version": "3.4.19", "resolved": "https://registry.npmjs.org/@vue/compiler-ssr/-/compiler-ssr-3.4.19.tgz", @@ -2404,6 +2386,19 @@ "node": "^10.12.0 || >=12.0.0" } }, + "node_modules/filepond": { + "version": "4.30.6", + "resolved": "https://registry.npmjs.org/filepond/-/filepond-4.30.6.tgz", + "integrity": "sha512-gBsVKJgr5HFTkQSA/3R6utne4Qt6Pue0O3+k3IjjVBbaQxMgGMI0fXwoob9SdRRoULCs8BAhWjttM28hOAi/0w==" + }, + "node_modules/filepond-plugin-image-preview": { + "version": "4.6.12", + "resolved": "https://registry.npmjs.org/filepond-plugin-image-preview/-/filepond-plugin-image-preview-4.6.12.tgz", + "integrity": "sha512-Y8ETX5QVV0mbPB0586UH8AUmG9tZg8PuN5bdEAIlZVJFTct5ebViJ7+Am94/VhTPjLqZjBf1zmDq5JU6XRsZKw==", + "peerDependencies": { + "filepond": ">=4.x <5.x" + } + }, "node_modules/fill-range": { "version": "7.0.1", "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz", @@ -4622,6 +4617,15 @@ "eslint": ">=6.0.0" } }, + "node_modules/vue-filepond": { + "version": "7.0.4", + "resolved": "https://registry.npmjs.org/vue-filepond/-/vue-filepond-7.0.4.tgz", + "integrity": "sha512-HvWlCG8qjvyykrpPTDjJ+JqsHTXt5/0zWMX9vu7kU3JXCUODPUkGi9prZcauOnIZ4MqyeSZ9M0sDVwdMATyt1g==", + "peerDependencies": { + "filepond": ">=4.7.4 < 5.x", + "vue": ">=3 < 4" + } + }, "node_modules/vue-router": { "version": "4.2.5", "resolved": "https://registry.npmjs.org/vue-router/-/vue-router-4.2.5.tgz", @@ -4663,6 +4667,27 @@ "typescript": "*" } }, + "node_modules/vue/node_modules/@vue/compiler-sfc": { + "version": "3.4.19", + "resolved": "https://registry.npmjs.org/@vue/compiler-sfc/-/compiler-sfc-3.4.19.tgz", + "integrity": "sha512-LQ3U4SN0DlvV0xhr1lUsgLCYlwQfUfetyPxkKYu7dkfvx7g3ojrGAkw0AERLOKYXuAGnqFsEuytkdcComei3Yg==", + "dependencies": { + "@babel/parser": "^7.23.9", + "@vue/compiler-core": "3.4.19", + "@vue/compiler-dom": "3.4.19", + "@vue/compiler-ssr": "3.4.19", + "@vue/shared": "3.4.19", + "estree-walker": "^2.0.2", + "magic-string": "^0.30.6", + "postcss": "^8.4.33", + "source-map-js": "^1.0.2" + } + }, + "node_modules/vue/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==" + }, "node_modules/w3c-xmlserializer": { "version": "5.0.0", "resolved": "https://registry.npmjs.org/w3c-xmlserializer/-/w3c-xmlserializer-5.0.0.tgz", diff --git a/front/package.json b/front/package.json index c925cd2..2fff064 100644 --- a/front/package.json +++ b/front/package.json @@ -16,11 +16,14 @@ "dependencies": { "@vue-leaflet/vue-leaflet": "^0.10.1", "date-fns": "^3.3.1", + "filepond": "^4.30.6", + "filepond-plugin-image-preview": "^4.6.12", "ky": "^1.2.0", "leaflet": "^1.9.4", "pinia": "^2.1.7", "vue": "^3.4.15", "vue-cookies": "^1.8.3", + "vue-filepond": "^7.0.4", "vue-router": "^4.2.5" }, "devDependencies": { diff --git a/front/src/App.vue b/front/src/App.vue index c660c1b..82dcda6 100644 --- a/front/src/App.vue +++ b/front/src/App.vue @@ -1,5 +1,7 @@ diff --git a/front/src/views/AddView.vue b/front/src/views/AddView.vue index 7ccf159..47fdaaf 100644 --- a/front/src/views/AddView.vue +++ b/front/src/views/AddView.vue @@ -1,8 +1,10 @@ \ No newline at end of file diff --git a/front/src/views/ArticlesView.vue b/front/src/views/ArticlesView.vue index ca7b554..d4ebb6d 100644 --- a/front/src/views/ArticlesView.vue +++ b/front/src/views/ArticlesView.vue @@ -5,7 +5,7 @@ import SwithChoice from '@/components/SwithChoice.vue'; import ArticlesList from '@/components/ArticlesList.vue';