Browse Source

Merge branch 'hotfix/V8-6741-brancher-le-site-logiciels-et-la'

Olivier Massot 1 year ago
parent
commit
f920a5bd2d

+ 12 - 7
components/Formation/Catalogue.vue

@@ -75,7 +75,8 @@
 
                 <v-chip
                   class="chip-register"
-                  @click="downloadPdf(course.downloadLink)"
+                  :href="course.url"
+                  target="_blank"
                 >
                   Télécharger le programme de formation
                 </v-chip>
@@ -99,9 +100,7 @@
 import AnchoredSection from '~/components/Layout/AnchoredSection.vue'
 import type { Training } from '~/types/interface'
 
-const downloadPdf = (pdfUrl: string) => {
-  window.open(pdfUrl, '_blank')
-}
+const runtimeConfig = useRuntimeConfig()
 
 const courses: Array<Training> = [
   {
@@ -139,7 +138,9 @@ const courses: Array<Training> = [
       },
     ],
     price: '2 008,80€ HT',
-    downloadLink: 'files/PF-School-2024-06_2-jours.pdf',
+    url:
+      runtimeConfig.public.fileStorageBaseUrl +
+      '/Programme_de_formation/PF-School_2-jours.pdf',
   },
   {
     number: '02',
@@ -163,7 +164,9 @@ const courses: Array<Training> = [
       },
     ],
     price: '1004,40€ HT',
-    downloadLink: 'files/PF-School-2024-06_1-jour.pdf',
+    url:
+      runtimeConfig.public.fileStorageBaseUrl +
+      '/Programme_de_formation/PF-School_1-jour.pdf',
   },
   {
     number: '03',
@@ -188,7 +191,9 @@ const courses: Array<Training> = [
       },
     ],
     price: '1004,40€ HT',
-    downloadLink: 'files/PF-Typo3-2024-06_1-jour.pdf',
+    url:
+      runtimeConfig.public.fileStorageBaseUrl +
+      '/Programme_de_formation/PF-Typo3_1-jour.pdf',
   },
 ]
 </script>

+ 7 - 2
components/Logiciels/Artist/Abonnement/ToSubscribe.vue

@@ -12,7 +12,10 @@
       avant de nous le transmettre
     </p>
     <a
-      href="/files/Bon_De_Commande_Artist_Public-2024.pdf"
+      :href="
+        runtimeConfig.public.fileStorageBaseUrl +
+        '/Bon_de_commande/Opentalent_Artist_Public.pdf'
+      "
       target="_blank"
       class="download-button"
     >
@@ -34,7 +37,9 @@
   </div>
 </template>
 
-<script setup lang="ts"></script>
+<script setup lang="ts">
+const runtimeConfig = useRuntimeConfig()
+</script>
 
 <style scoped lang="scss">
 .profile-circle {

+ 2 - 0
env/.env.docker

@@ -12,3 +12,5 @@ NUXT_PUBLIC_SITE_URL=http://local.logiciels.opentalent.fr
 NUXT_AGENDA_BASE_URL=https://local.agenda.opentalent.fr
 NUXT_PUBLIC_AGENDA_BASE_URL=https://local.agenda.opentalent.fr
 
+NUXT_FILE_STORAGE_BASE_URL=https://local.maestro.opentalent.fr/uploads/share
+NUXT_PUBLIC_FILE_STORAGE_BASE_URL=https://local.maestro.opentalent.fr/uploads/share

+ 3 - 0
env/.env.prod

@@ -13,3 +13,6 @@ NUXT_PUBLIC_SITE_URL=http://logiciels.opentalent.fr
 
 NUXT_AGENDA_BASE_URL=https://opentalent.fr
 NUXT_PUBLIC_AGENDA_BASE_URL=https://opentalent.fr
+
+NUXT_FILE_STORAGE_BASE_URL=https://maestro.opentalent.fr/uploads/share
+NUXT_PUBLIC_FILE_STORAGE_BASE_URL=https://maestro.opentalent.fr/uploads/share

+ 3 - 0
env/.env.test

@@ -12,3 +12,6 @@ NUXT_PUBLIC_SITE_URL=http://logiciels.test.opentalent.fr
 
 NUXT_AGENDA_BASE_URL=https://agenda.test.opentalent.fr
 NUXT_PUBLIC_AGENDA_BASE_URL=https://agenda.test.opentalent.fr
+
+NUXT_FILE_STORAGE_BASE_URL=https://maestro.test.opentalent.fr/uploads/share
+NUXT_PUBLIC_FILE_STORAGE_BASE_URL=https://maestro.test.opentalent.fr/uploads/share

+ 3 - 0
env/.env.test1

@@ -12,3 +12,6 @@ NUXT_PUBLIC_SITE_URL=http://logiciels.test1.opentalent.fr
 
 NUXT_AGENDA_BASE_URL=https://agenda.test1.opentalent.fr
 NUXT_PUBLIC_AGENDA_BASE_URL=https://agenda.test1.opentalent.fr
+
+NUXT_FILE_STORAGE_BASE_URL=https://maestro.test1.opentalent.fr/uploads/share
+NUXT_PUBLIC_FILE_STORAGE_BASE_URL=https://maestro.test1.opentalent.fr/uploads/share

+ 3 - 0
env/.env.test2

@@ -12,3 +12,6 @@ NUXT_PUBLIC_SITE_URL=http://logiciels.test2.opentalent.fr
 
 NUXT_AGENDA_BASE_URL=https://agenda.test2.opentalent.fr
 NUXT_PUBLIC_AGENDA_BASE_URL=https://agenda.test2.opentalent.fr
+
+NUXT_FILE_STORAGE_BASE_URL=https://maestro.test2.opentalent.fr/uploads/share
+NUXT_PUBLIC_FILE_STORAGE_BASE_URL=https://maestro.test2.opentalent.fr/uploads/share

+ 3 - 0
env/.env.test3

@@ -12,3 +12,6 @@ NUXT_PUBLIC_SITE_URL=http://logiciels.test3.opentalent.fr
 
 NUXT_AGENDA_BASE_URL=https://agenda.test3.opentalent.fr
 NUXT_PUBLIC_AGENDA_BASE_URL=https://agenda.test3.opentalent.fr
+
+NUXT_FILE_STORAGE_BASE_URL=https://maestro.test3.opentalent.fr/uploads/share
+NUXT_PUBLIC_FILE_STORAGE_BASE_URL=https://maestro.test3.opentalent.fr/uploads/share

+ 3 - 0
env/.env.test4

@@ -12,3 +12,6 @@ NUXT_PUBLIC_SITE_URL=http://logiciels.test4.opentalent.fr
 
 NUXT_AGENDA_BASE_URL=https://agenda.test4.opentalent.fr
 NUXT_PUBLIC_AGENDA_BASE_URL=https://agenda.test4.opentalent.fr
+
+NUXT_FILE_STORAGE_BASE_URL=https://maestro.test4.opentalent.fr/uploads/share
+NUXT_PUBLIC_FILE_STORAGE_BASE_URL=https://maestro.test4.opentalent.fr/uploads/share

+ 3 - 0
env/.env.test5

@@ -12,3 +12,6 @@ NUXT_PUBLIC_SITE_URL=http://logiciels.test5.opentalent.fr
 
 NUXT_AGENDA_BASE_URL=https://agenda.test5.opentalent.fr
 NUXT_PUBLIC_AGENDA_BASE_URL=https://agenda.test5.opentalent.fr
+
+NUXT_FILE_STORAGE_BASE_URL=https://maestro.test5.opentalent.fr/uploads/share
+NUXT_PUBLIC_FILE_STORAGE_BASE_URL=https://maestro.test5.opentalent.fr/uploads/share

+ 3 - 0
env/.env.test6

@@ -12,3 +12,6 @@ NUXT_PUBLIC_SITE_URL=http://logiciels.test6.opentalent.fr
 
 NUXT_AGENDA_BASE_URL=https://agenda.test6.opentalent.fr
 NUXT_PUBLIC_AGENDA_BASE_URL=https://agenda.test6.opentalent.fr
+
+NUXT_FILE_STORAGE_BASE_URL=https://maestro.test6.opentalent.fr/uploads/share
+NUXT_PUBLIC_FILE_STORAGE_BASE_URL=https://maestro.test6.opentalent.fr/uploads/share

+ 3 - 0
env/.env.test7

@@ -12,3 +12,6 @@ NUXT_PUBLIC_SITE_URL=http://logiciels.test7.opentalent.fr
 
 NUXT_AGENDA_BASE_URL=https://agenda.test7.opentalent.fr
 NUXT_PUBLIC_AGENDA_BASE_URL=https://agenda.test7.opentalent.fr
+
+NUXT_FILE_STORAGE_BASE_URL=https://maestro.test7.opentalent.fr/uploads/share
+NUXT_PUBLIC_FILE_STORAGE_BASE_URL=https://maestro.test7.opentalent.fr/uploads/share

+ 3 - 0
env/.env.test8

@@ -12,3 +12,6 @@ NUXT_PUBLIC_SITE_URL=http://logiciels.test8.opentalent.fr
 
 NUXT_AGENDA_BASE_URL=https://agenda.test8.opentalent.fr
 NUXT_PUBLIC_AGENDA_BASE_URL=https://agenda.test8.opentalent.fr
+
+NUXT_FILE_STORAGE_BASE_URL=https://maestro.test8.opentalent.fr/uploads/share
+NUXT_PUBLIC_FILE_STORAGE_BASE_URL=https://maestro.test8.opentalent.fr/uploads/share

+ 3 - 0
env/.env.test9

@@ -12,3 +12,6 @@ NUXT_PUBLIC_SITE_URL=http://logiciels.test9.opentalent.fr
 
 NUXT_AGENDA_BASE_URL=https://agenda.test9.opentalent.fr
 NUXT_PUBLIC_AGENDA_BASE_URL=https://agenda.test9.opentalent.fr
+
+NUXT_FILE_STORAGE_BASE_URL=https://maestro.test9.opentalent.fr/uploads/share
+NUXT_PUBLIC_FILE_STORAGE_BASE_URL=https://maestro.test9.opentalent.fr/uploads/share

+ 2 - 0
nuxt.config.ts

@@ -40,6 +40,7 @@ export default defineNuxtConfig({
     siteUrl: '',
     apiBaseUrl: '',
     agendaBaseUrl: '',
+    fileStorageBaseUrl: '',
     hCaptchaSiteKey: '35360874-ebb1-4748-86e3-9b156d5bfc53',
     // Config within public will be also exposed to the client
     public: {
@@ -47,6 +48,7 @@ export default defineNuxtConfig({
       siteUrl: '',
       apiBaseUrl: '',
       agendaBaseUrl: '',
+      fileStorageBaseUrl: '',
       hCaptchaSiteKey: '35360874-ebb1-4748-86e3-9b156d5bfc53',
     },
   },

+ 5 - 1
pages/opentalent-artist.vue

@@ -54,6 +54,8 @@ import type { MenuScroll, ActionMenuItem } from '~/types/interface'
 
 const { lgAndUp } = useDisplay()
 
+const runtimeConfig = useRuntimeConfig()
+
 const menus: Array<MenuScroll> = [
   { anchor: 'presentation', label: 'Présentation' },
   { anchor: 'benefits', label: 'Avantages' },
@@ -77,7 +79,9 @@ const stickyMenuActions: Array<ActionMenuItem> = [
     color: 'primary',
     icon: 'fa-brands fa-readme icon',
     text: 'Brochure',
-    url: '/files/Depliant_Opentalent_Artist_2024.pdf',
+    url:
+      runtimeConfig.public.fileStorageBaseUrl +
+      '/Brochures/Brochure_Opentalent_Artist.pdf',
     target: '_blank',
   },
 ]

+ 5 - 1
pages/opentalent-manager.vue

@@ -52,6 +52,8 @@ import { ActionMenuItemType } from '~/types/enum/layout'
 
 const { lgAndUp } = useDisplay()
 
+const runtimeConfig = useRuntimeConfig()
+
 const menus: Array<MenuScroll> = ref([
   { anchor: 'presentation', label: 'Présentation' },
   { anchor: 'benefits', label: 'Avantages' },
@@ -74,7 +76,9 @@ const stickyMenuActions: Array<ActionMenuItem> = [
     color: 'primary',
     icon: 'fa-brands fa-readme icon',
     text: 'Brochure',
-    url: '/files/Depliant_Opentalent_Manager_2024.pdf',
+    url:
+      runtimeConfig.public.fileStorageBaseUrl +
+      '/Brochures/Brochure_Opentalent_Manager.pdf',
     target: '_blank',
   },
   {

+ 5 - 1
pages/opentalent-school.vue

@@ -55,6 +55,8 @@ import { ActionMenuItemType } from '~/types/enum/layout'
 
 const { lgAndUp } = useDisplay()
 
+const runtimeConfig = useRuntimeConfig()
+
 const menus: Array<MenuScroll> = [
   { anchor: 'presentation', label: 'Présentation' },
   { anchor: 'benefits', label: 'Avantages' },
@@ -85,7 +87,9 @@ const stickyMenuActions: Array<ActionMenuItem> = [
     color: 'primary',
     icon: 'fa-brands fa-readme icon',
     text: 'Brochure',
-    url: '/files/Dépliant-Opentalent_School_2024.pdf',
+    url:
+      runtimeConfig.public.fileStorageBaseUrl +
+      '/Brochures/Brochure_Opentalent_School.pdf',
     target: '_blank',
   },
   {

BIN
public/files/Bon_De_Commande_Artist_Public-2024.pdf


BIN
public/files/Depliant_Opentalent_Artist_2024.pdf


BIN
public/files/Depliant_Opentalent_Manager_2024.pdf


BIN
public/files/Dépliant-Opentalent_School_2024.pdf


BIN
public/files/PF-School-2024-06_1-jour.pdf


BIN
public/files/PF-School-2024-06_2-jours.pdf


BIN
public/files/PF-Typo3-2024-06_1-jour.pdf