From 5d37cefec11bc58363f6e581a84a28837737db9d Mon Sep 17 00:00:00 2001 From: Dominic Villemure Date: Sun, 21 Apr 2024 13:52:40 -0400 Subject: [PATCH] #30 Prepare for deploy. Images need to be public, added swa-cli. Defined VITE_API_URL to the env var for azure --- .env.production | 2 +- {images => public/images}/Chevron.png | Bin {images => public/images}/Chevron2.png | Bin {images => public/images}/ChevronBlanc.png | Bin {images => public/images}/anonyme.png | Bin {images => public/images}/anonymelarge.png | Bin {images => public/images}/checkprofile.png | Bin .../images}/contactpage/contactpicture.png | Bin {images => public/images}/facebook.svg | 0 {images => public/images}/facebookblack.png | Bin {images => public/images}/facebookicon.png | Bin .../images}/facebookiconblackpink.png | Bin {images => public/images}/guillaimeaime.png | Bin {images => public/images}/guillaimeaime2x.png | Bin {images => public/images}/guillaimeaime3x.png | Bin {images => public/images}/guillaume.jpg | Bin {images => public/images}/guillaume.png | Bin .../images}/guillaumepublication.jpg | Bin .../images}/homepage/banniere.png | Bin .../images}/homepage/bannierehomepage.png | Bin .../images}/homepage/bannierenousjoindre.png | Bin .../images}/homepage/cestquoihutopy.png | Bin {images => public/images}/homepage/creer.png | Bin .../images}/homepage/girlarmy.png | Bin {images => public/images}/homepage/girlvr.png | Bin .../images}/homepage/grinding.png | Bin .../images}/homepage/inspirer.png | Bin {images => public/images}/homepage/love.png | Bin .../images}/homepage/microphone.png | Bin .../images}/homepage/partager.png | Bin .../images}/homepage/votrehutopy.png | Bin {images => public/images}/hutopy.png | Bin {images => public/images}/hutopyblack.png | Bin {images => public/images}/icons/bookmark.png | Bin {images => public/images}/icons/home.svg | 0 {images => public/images}/icons/messenger.png | Bin {images => public/images}/icons/share.png | Bin {images => public/images}/inspirer.png | Bin {images => public/images}/instablack.png | Bin {images => public/images}/instagram.svg | 0 .../images}/instagramblackpink.png | Bin {images => public/images}/instaicon.png | Bin {images => public/images}/instawhite.png | Bin {images => public/images}/likeicon.svg | 0 .../images}/loginpage/loginhutopy.png | Bin {images => public/images}/pascal.jpg | Bin {images => public/images}/roadmapbanner.png | Bin {images => public/images}/tiktok.png | Bin {images => public/images}/tiktok.svg | 0 .../images}/tos/headerbackground.png | Bin {images => public/images}/x.svg | 0 {images => public/images}/xblack.png | Bin {images => public/images}/xblackpink.png | Bin {images => public/images}/xicon.png | Bin src/layouts/FooterLayout.vue | 6 ++-- src/views/LoginView.vue | 4 +-- src/views/main/ContactView.vue | 4 +-- src/views/main/CreatorFeed.vue | 4 +-- src/views/main/CreatorFolio copy.vue | 4 +-- src/views/main/CreatorFolio.vue | 8 +++--- src/views/main/HomeView.vue | 22 +++++++-------- swa-cli.config.json | 13 +++++++++ vite.config.js | 26 ++++++++++++------ 63 files changed, 57 insertions(+), 36 deletions(-) rename {images => public/images}/Chevron.png (100%) rename {images => public/images}/Chevron2.png (100%) rename {images => public/images}/ChevronBlanc.png (100%) rename {images => public/images}/anonyme.png (100%) rename {images => public/images}/anonymelarge.png (100%) rename {images => public/images}/checkprofile.png (100%) rename {images => public/images}/contactpage/contactpicture.png (100%) rename {images => public/images}/facebook.svg (100%) rename {images => public/images}/facebookblack.png (100%) rename {images => public/images}/facebookicon.png (100%) rename {images => public/images}/facebookiconblackpink.png (100%) rename {images => public/images}/guillaimeaime.png (100%) rename {images => public/images}/guillaimeaime2x.png (100%) rename {images => public/images}/guillaimeaime3x.png (100%) rename {images => public/images}/guillaume.jpg (100%) rename {images => public/images}/guillaume.png (100%) rename {images => public/images}/guillaumepublication.jpg (100%) rename {images => public/images}/homepage/banniere.png (100%) rename {images => public/images}/homepage/bannierehomepage.png (100%) rename {images => public/images}/homepage/bannierenousjoindre.png (100%) rename {images => public/images}/homepage/cestquoihutopy.png (100%) rename {images => public/images}/homepage/creer.png (100%) rename {images => public/images}/homepage/girlarmy.png (100%) rename {images => public/images}/homepage/girlvr.png (100%) rename {images => public/images}/homepage/grinding.png (100%) rename {images => public/images}/homepage/inspirer.png (100%) rename {images => public/images}/homepage/love.png (100%) rename {images => public/images}/homepage/microphone.png (100%) rename {images => public/images}/homepage/partager.png (100%) rename {images => public/images}/homepage/votrehutopy.png (100%) rename {images => public/images}/hutopy.png (100%) rename {images => public/images}/hutopyblack.png (100%) rename {images => public/images}/icons/bookmark.png (100%) rename {images => public/images}/icons/home.svg (100%) rename {images => public/images}/icons/messenger.png (100%) rename {images => public/images}/icons/share.png (100%) rename {images => public/images}/inspirer.png (100%) rename {images => public/images}/instablack.png (100%) rename {images => public/images}/instagram.svg (100%) rename {images => public/images}/instagramblackpink.png (100%) rename {images => public/images}/instaicon.png (100%) rename {images => public/images}/instawhite.png (100%) rename {images => public/images}/likeicon.svg (100%) rename {images => public/images}/loginpage/loginhutopy.png (100%) rename {images => public/images}/pascal.jpg (100%) rename {images => public/images}/roadmapbanner.png (100%) rename {images => public/images}/tiktok.png (100%) rename {images => public/images}/tiktok.svg (100%) rename {images => public/images}/tos/headerbackground.png (100%) rename {images => public/images}/x.svg (100%) rename {images => public/images}/xblack.png (100%) rename {images => public/images}/xblackpink.png (100%) rename {images => public/images}/xicon.png (100%) create mode 100644 swa-cli.config.json diff --git a/.env.production b/.env.production index 5a800a5..8382eb2 100644 --- a/.env.production +++ b/.env.production @@ -1 +1 @@ -VITE_API_URL=todo +VITE_API_URL=https://hutopy.azurewebsites.net/ diff --git a/images/Chevron.png b/public/images/Chevron.png similarity index 100% rename from images/Chevron.png rename to public/images/Chevron.png diff --git a/images/Chevron2.png b/public/images/Chevron2.png similarity index 100% rename from images/Chevron2.png rename to public/images/Chevron2.png diff --git a/images/ChevronBlanc.png b/public/images/ChevronBlanc.png similarity index 100% rename from images/ChevronBlanc.png rename to public/images/ChevronBlanc.png diff --git a/images/anonyme.png b/public/images/anonyme.png similarity index 100% rename from images/anonyme.png rename to public/images/anonyme.png diff --git a/images/anonymelarge.png b/public/images/anonymelarge.png similarity index 100% rename from images/anonymelarge.png rename to public/images/anonymelarge.png diff --git a/images/checkprofile.png b/public/images/checkprofile.png similarity index 100% rename from images/checkprofile.png rename to public/images/checkprofile.png diff --git a/images/contactpage/contactpicture.png b/public/images/contactpage/contactpicture.png similarity index 100% rename from images/contactpage/contactpicture.png rename to public/images/contactpage/contactpicture.png diff --git a/images/facebook.svg b/public/images/facebook.svg similarity index 100% rename from images/facebook.svg rename to public/images/facebook.svg diff --git a/images/facebookblack.png b/public/images/facebookblack.png similarity index 100% rename from images/facebookblack.png rename to public/images/facebookblack.png diff --git a/images/facebookicon.png b/public/images/facebookicon.png similarity index 100% rename from images/facebookicon.png rename to public/images/facebookicon.png diff --git a/images/facebookiconblackpink.png b/public/images/facebookiconblackpink.png similarity index 100% rename from images/facebookiconblackpink.png rename to public/images/facebookiconblackpink.png diff --git a/images/guillaimeaime.png b/public/images/guillaimeaime.png similarity index 100% rename from images/guillaimeaime.png rename to public/images/guillaimeaime.png diff --git a/images/guillaimeaime2x.png b/public/images/guillaimeaime2x.png similarity index 100% rename from images/guillaimeaime2x.png rename to public/images/guillaimeaime2x.png diff --git a/images/guillaimeaime3x.png b/public/images/guillaimeaime3x.png similarity index 100% rename from images/guillaimeaime3x.png rename to public/images/guillaimeaime3x.png diff --git a/images/guillaume.jpg b/public/images/guillaume.jpg similarity index 100% rename from images/guillaume.jpg rename to public/images/guillaume.jpg diff --git a/images/guillaume.png b/public/images/guillaume.png similarity index 100% rename from images/guillaume.png rename to public/images/guillaume.png diff --git a/images/guillaumepublication.jpg b/public/images/guillaumepublication.jpg similarity index 100% rename from images/guillaumepublication.jpg rename to public/images/guillaumepublication.jpg diff --git a/images/homepage/banniere.png b/public/images/homepage/banniere.png similarity index 100% rename from images/homepage/banniere.png rename to public/images/homepage/banniere.png diff --git a/images/homepage/bannierehomepage.png b/public/images/homepage/bannierehomepage.png similarity index 100% rename from images/homepage/bannierehomepage.png rename to public/images/homepage/bannierehomepage.png diff --git a/images/homepage/bannierenousjoindre.png b/public/images/homepage/bannierenousjoindre.png similarity index 100% rename from images/homepage/bannierenousjoindre.png rename to public/images/homepage/bannierenousjoindre.png diff --git a/images/homepage/cestquoihutopy.png b/public/images/homepage/cestquoihutopy.png similarity index 100% rename from images/homepage/cestquoihutopy.png rename to public/images/homepage/cestquoihutopy.png diff --git a/images/homepage/creer.png b/public/images/homepage/creer.png similarity index 100% rename from images/homepage/creer.png rename to public/images/homepage/creer.png diff --git a/images/homepage/girlarmy.png b/public/images/homepage/girlarmy.png similarity index 100% rename from images/homepage/girlarmy.png rename to public/images/homepage/girlarmy.png diff --git a/images/homepage/girlvr.png b/public/images/homepage/girlvr.png similarity index 100% rename from images/homepage/girlvr.png rename to public/images/homepage/girlvr.png diff --git a/images/homepage/grinding.png b/public/images/homepage/grinding.png similarity index 100% rename from images/homepage/grinding.png rename to public/images/homepage/grinding.png diff --git a/images/homepage/inspirer.png b/public/images/homepage/inspirer.png similarity index 100% rename from images/homepage/inspirer.png rename to public/images/homepage/inspirer.png diff --git a/images/homepage/love.png b/public/images/homepage/love.png similarity index 100% rename from images/homepage/love.png rename to public/images/homepage/love.png diff --git a/images/homepage/microphone.png b/public/images/homepage/microphone.png similarity index 100% rename from images/homepage/microphone.png rename to public/images/homepage/microphone.png diff --git a/images/homepage/partager.png b/public/images/homepage/partager.png similarity index 100% rename from images/homepage/partager.png rename to public/images/homepage/partager.png diff --git a/images/homepage/votrehutopy.png b/public/images/homepage/votrehutopy.png similarity index 100% rename from images/homepage/votrehutopy.png rename to public/images/homepage/votrehutopy.png diff --git a/images/hutopy.png b/public/images/hutopy.png similarity index 100% rename from images/hutopy.png rename to public/images/hutopy.png diff --git a/images/hutopyblack.png b/public/images/hutopyblack.png similarity index 100% rename from images/hutopyblack.png rename to public/images/hutopyblack.png diff --git a/images/icons/bookmark.png b/public/images/icons/bookmark.png similarity index 100% rename from images/icons/bookmark.png rename to public/images/icons/bookmark.png diff --git a/images/icons/home.svg b/public/images/icons/home.svg similarity index 100% rename from images/icons/home.svg rename to public/images/icons/home.svg diff --git a/images/icons/messenger.png b/public/images/icons/messenger.png similarity index 100% rename from images/icons/messenger.png rename to public/images/icons/messenger.png diff --git a/images/icons/share.png b/public/images/icons/share.png similarity index 100% rename from images/icons/share.png rename to public/images/icons/share.png diff --git a/images/inspirer.png b/public/images/inspirer.png similarity index 100% rename from images/inspirer.png rename to public/images/inspirer.png diff --git a/images/instablack.png b/public/images/instablack.png similarity index 100% rename from images/instablack.png rename to public/images/instablack.png diff --git a/images/instagram.svg b/public/images/instagram.svg similarity index 100% rename from images/instagram.svg rename to public/images/instagram.svg diff --git a/images/instagramblackpink.png b/public/images/instagramblackpink.png similarity index 100% rename from images/instagramblackpink.png rename to public/images/instagramblackpink.png diff --git a/images/instaicon.png b/public/images/instaicon.png similarity index 100% rename from images/instaicon.png rename to public/images/instaicon.png diff --git a/images/instawhite.png b/public/images/instawhite.png similarity index 100% rename from images/instawhite.png rename to public/images/instawhite.png diff --git a/images/likeicon.svg b/public/images/likeicon.svg similarity index 100% rename from images/likeicon.svg rename to public/images/likeicon.svg diff --git a/images/loginpage/loginhutopy.png b/public/images/loginpage/loginhutopy.png similarity index 100% rename from images/loginpage/loginhutopy.png rename to public/images/loginpage/loginhutopy.png diff --git a/images/pascal.jpg b/public/images/pascal.jpg similarity index 100% rename from images/pascal.jpg rename to public/images/pascal.jpg diff --git a/images/roadmapbanner.png b/public/images/roadmapbanner.png similarity index 100% rename from images/roadmapbanner.png rename to public/images/roadmapbanner.png diff --git a/images/tiktok.png b/public/images/tiktok.png similarity index 100% rename from images/tiktok.png rename to public/images/tiktok.png diff --git a/images/tiktok.svg b/public/images/tiktok.svg similarity index 100% rename from images/tiktok.svg rename to public/images/tiktok.svg diff --git a/images/tos/headerbackground.png b/public/images/tos/headerbackground.png similarity index 100% rename from images/tos/headerbackground.png rename to public/images/tos/headerbackground.png diff --git a/images/x.svg b/public/images/x.svg similarity index 100% rename from images/x.svg rename to public/images/x.svg diff --git a/images/xblack.png b/public/images/xblack.png similarity index 100% rename from images/xblack.png rename to public/images/xblack.png diff --git a/images/xblackpink.png b/public/images/xblackpink.png similarity index 100% rename from images/xblackpink.png rename to public/images/xblackpink.png diff --git a/images/xicon.png b/public/images/xicon.png similarity index 100% rename from images/xicon.png rename to public/images/xicon.png diff --git a/src/layouts/FooterLayout.vue b/src/layouts/FooterLayout.vue index 935bbc8..65851f3 100644 --- a/src/layouts/FooterLayout.vue +++ b/src/layouts/FooterLayout.vue @@ -20,17 +20,17 @@ - Description image 2 + Description image 2 - Description image 3 + Description image 3 - Description image 1 + Description image 1 diff --git a/src/views/LoginView.vue b/src/views/LoginView.vue index d62c6d6..bad546a 100644 --- a/src/views/LoginView.vue +++ b/src/views/LoginView.vue @@ -8,7 +8,7 @@ - + @@ -58,7 +58,7 @@
+ src="../../public/images/loginpage/loginhutopy.png">

Connexion

Comment souhaitez-vous diff --git a/src/views/main/ContactView.vue b/src/views/main/ContactView.vue index 3108e71..381d407 100644 --- a/src/views/main/ContactView.vue +++ b/src/views/main/ContactView.vue @@ -8,7 +8,7 @@ - + @@ -27,7 +27,7 @@ - + diff --git a/src/views/main/CreatorFeed.vue b/src/views/main/CreatorFeed.vue index 877fbe5..30deb38 100644 --- a/src/views/main/CreatorFeed.vue +++ b/src/views/main/CreatorFeed.vue @@ -1,8 +1,8 @@
- +
diff --git a/src/views/main/CreatorFolio copy.vue b/src/views/main/CreatorFolio copy.vue index 06fc8a3..b178e38 100644 --- a/src/views/main/CreatorFolio copy.vue +++ b/src/views/main/CreatorFolio copy.vue @@ -14,8 +14,8 @@
- +
diff --git a/src/views/main/CreatorFolio.vue b/src/views/main/CreatorFolio.vue index 1d28a9e..da891f4 100644 --- a/src/views/main/CreatorFolio.vue +++ b/src/views/main/CreatorFolio.vue @@ -246,17 +246,17 @@ - - + - + - + diff --git a/src/views/main/HomeView.vue b/src/views/main/HomeView.vue index 06e910f..dce5400 100644 --- a/src/views/main/HomeView.vue +++ b/src/views/main/HomeView.vue @@ -191,17 +191,17 @@ - Profile Image + Profile Image - Profile Image + Profile Image - Profile Image + Profile Image @@ -227,8 +227,8 @@
- +
@@ -301,19 +301,19 @@
- Profile Image + Profile Image - Profile Image + Profile Image - Profile Image + Profile Image
diff --git a/swa-cli.config.json b/swa-cli.config.json new file mode 100644 index 0000000..a14b361 --- /dev/null +++ b/swa-cli.config.json @@ -0,0 +1,13 @@ +{ + "$schema": "https://aka.ms/azure/static-web-apps-cli/schema", + "configurations": { + "taim-ui": { + "appLocation": ".", + "outputLocation": "dist", + "appBuildCommand": "npm run build", + "run": "npm run dev", + "appDevserverUrl": "https://hutopy.azurewebsites.net", + "apiDevserverUrl": "https://hutopy.azurewebsites.net" + } + } +} \ No newline at end of file diff --git a/vite.config.js b/vite.config.js index 5c45e1d..755350d 100644 --- a/vite.config.js +++ b/vite.config.js @@ -1,16 +1,24 @@ import { fileURLToPath, URL } from 'node:url' - -import { defineConfig } from 'vite' +import { defineConfig, loadEnv } from 'vite' import vue from '@vitejs/plugin-vue' + // https://vitejs.dev/config/ -export default defineConfig({ - plugins: [ - vue(), - ], - resolve: { - alias: { - '@': fileURLToPath(new URL('./src', import.meta.url)) +export default defineConfig(({ mode }) => { + // Load environment variables based on the mode + const env = loadEnv(mode, process.cwd(), '') + return { + plugins: [ + vue(), + ], + resolve: { + alias: { + '@': fileURLToPath(new URL('./src', import.meta.url)) + } + }, + define: { + // Define a global constant __APP_ENV__ based on loaded environment variables + VITE_API_URL: JSON.stringify(env.VITE_API_URL) } } })