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

env/.env.docker

@@ -32,3 +32,6 @@ MERCURE_SUBSCRIBER_JWT_KEY=TXsLVKnU4Ew4oyH4qcQO81CuSOVTbj58W42fDTIzIZPwpPCaGu2Ev
 # Other links
 NUXT_SUPPORT_URL=https://support.opentalent.fr/
 NUXT_PUBLIC_SUPPORT_URL=https://support.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

env/.env.prod

@@ -34,3 +34,5 @@ MERCURE_SUBSCRIBER_JWT_KEY=TXsLVKnU4Ew4oyH4qcQO81CuSOVTbj58W42fDTIzIZPwpPCaGu2Ev
 NUXT_SUPPORT_URL=https://support.opentalent.fr/
 NUXT_PUBLIC_SUPPORT_URL=https://support.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

env/.env.test

@@ -34,3 +34,5 @@ MERCURE_SUBSCRIBER_JWT_KEY=TXsLVKnU4Ew4oyH4qcQO81CuSOVTbj58W42fDTIzIZPwpPCaGu2Ev
 NUXT_SUPPORT_URL=https://support.opentalent.fr/
 NUXT_PUBLIC_SUPPORT_URL=https://support.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

env/.env.test1

@@ -34,3 +34,5 @@ MERCURE_SUBSCRIBER_JWT_KEY=TXsLVKnU4Ew4oyH4qcQO81CuSOVTbj58W42fDTIzIZPwpPCaGu2Ev
 NUXT_SUPPORT_URL=https://support.opentalent.fr/
 NUXT_PUBLIC_SUPPORT_URL=https://support.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

env/.env.test2

@@ -34,3 +34,5 @@ MERCURE_SUBSCRIBER_JWT_KEY=TXsLVKnU4Ew4oyH4qcQO81CuSOVTbj58W42fDTIzIZPwpPCaGu2Ev
 NUXT_SUPPORT_URL=https://support.opentalent.fr/
 NUXT_PUBLIC_SUPPORT_URL=https://support.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

env/.env.test3

@@ -34,3 +34,5 @@ MERCURE_SUBSCRIBER_JWT_KEY=TXsLVKnU4Ew4oyH4qcQO81CuSOVTbj58W42fDTIzIZPwpPCaGu2Ev
 NUXT_SUPPORT_URL=https://support.opentalent.fr/
 NUXT_PUBLIC_SUPPORT_URL=https://support.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

env/.env.test4

@@ -34,3 +34,5 @@ MERCURE_SUBSCRIBER_JWT_KEY=TXsLVKnU4Ew4oyH4qcQO81CuSOVTbj58W42fDTIzIZPwpPCaGu2Ev
 NUXT_SUPPORT_URL=https://support.opentalent.fr/
 NUXT_PUBLIC_SUPPORT_URL=https://support.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

env/.env.test5

@@ -34,3 +34,5 @@ MERCURE_SUBSCRIBER_JWT_KEY=TXsLVKnU4Ew4oyH4qcQO81CuSOVTbj58W42fDTIzIZPwpPCaGu2Ev
 NUXT_SUPPORT_URL=https://support.opentalent.fr/
 NUXT_PUBLIC_SUPPORT_URL=https://support.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

env/.env.test6

@@ -34,3 +34,5 @@ MERCURE_SUBSCRIBER_JWT_KEY=TXsLVKnU4Ew4oyH4qcQO81CuSOVTbj58W42fDTIzIZPwpPCaGu2Ev
 NUXT_SUPPORT_URL=https://support.opentalent.fr/
 NUXT_PUBLIC_SUPPORT_URL=https://support.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

env/.env.test7

@@ -34,3 +34,5 @@ MERCURE_SUBSCRIBER_JWT_KEY=TXsLVKnU4Ew4oyH4qcQO81CuSOVTbj58W42fDTIzIZPwpPCaGu2Ev
 NUXT_SUPPORT_URL=https://support.opentalent.fr/
 NUXT_PUBLIC_SUPPORT_URL=https://support.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

env/.env.test8

@@ -34,3 +34,5 @@ MERCURE_SUBSCRIBER_JWT_KEY=TXsLVKnU4Ew4oyH4qcQO81CuSOVTbj58W42fDTIzIZPwpPCaGu2Ev
 NUXT_SUPPORT_URL=https://support.opentalent.fr/
 NUXT_PUBLIC_SUPPORT_URL=https://support.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

env/.env.test9

@@ -34,3 +34,5 @@ MERCURE_SUBSCRIBER_JWT_KEY=TXsLVKnU4Ew4oyH4qcQO81CuSOVTbj58W42fDTIzIZPwpPCaGu2Ev
 NUXT_SUPPORT_URL=https://support.opentalent.fr/
 NUXT_PUBLIC_SUPPORT_URL=https://support.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

nuxt.config.ts

@@ -44,6 +44,7 @@ export default defineNuxtConfig({
     baseUrlAdminLegacy: '',
     baseUrlTypo3: '',
     baseUrlMercure: '',
+    fileStorageBaseUrl: '',
     supportUrl: '',
     // Config within public will be also exposed to the client
     public: {
@@ -53,6 +54,7 @@ export default defineNuxtConfig({
       baseUrlAdminLegacy: '',
       baseUrlTypo3: '',
       baseUrlMercure: '',
+      fileStorageBaseUrl: '',
       supportUrl: '',
     },
   },

pages/subscription.vue

@@ -207,7 +207,10 @@ Page 'Mon abonnement'
 
                   <p class="mt-3">
                     <a
-                      href="/resources/Fiche_produit_Opentalent_Artist.pdf"
+                      :href="
+                        runtimeConfig.public.fileStorageBaseUrl +
+                        '/Fiche_produit/Fiche_produit_Opentalent_Artist.pdf'
+                      "
                       target="_blank"
                     >
                       {{ $t('product_sheet') }}
@@ -216,12 +219,23 @@ Page 'Mon abonnement'
                   </p>
 
                   <p v-if="organizationProfile.isCmf" class="mt-3">
-                    <a href="/resources/BDC_Opentalent_Artist_CMF.pdf">
+                    <a
+                      :href="
+                        runtimeConfig.public.fileStorageBaseUrl +
+                        '/Bon_de_commande/Opentalent_Artist_CMF.pdf'
+                      "
+                    >
                       <b>{{ $t('download_cmf_order_form') }}</b>
                     </a>
                   </p>
                   <p v-else class="mt-3">
-                    <a href="/resources/BDC_Opentalent_Artist_Public.pdf">
+                    <a
+                      :href="
+                        runtimeConfig.public.fileStorageBaseUrl +
+                        '/Bon_de_commande/Opentalent_Artist_CMF.pdf'
+                      "
+                      target="_blank"
+                    >
                       <b>{{ $t('download_order_form') }}</b>
                     </a>
                   </p>
@@ -323,7 +337,10 @@ Page 'Mon abonnement'
 
                   <p class="mt-4">
                     <a
-                      href="/resources/Fiche_produit_Opentalent_School.pdf"
+                      :href="
+                        runtimeConfig.public.fileStorageBaseUrl +
+                        '/Fiche_produit/Fiche_produit_Opentalent_School.pdf'
+                      "
                       target="_blank"
                     >
                       {{ $t('product_sheet') }} {{ $t('PRODUCT_SCHOOL') }}
@@ -376,7 +393,13 @@ Page 'Mon abonnement'
 
                     <p>
                       <b>
-                        <a href="/resources/BDC_SMS_CMF.pdf" target="_blank">
+                        <a
+                          :href="
+                            runtimeConfig.public.fileStorageBaseUrl +
+                            '/Bon_de_commande/Achat_SMS_CMF.pdf'
+                          "
+                          target="_blank"
+                        >
                           {{ i18n.t('download_cmf_order_form') }}
                         </a>
                       </b>
@@ -400,7 +423,13 @@ Page 'Mon abonnement'
                     </p>
 
                     <p>
-                      <a href="/resources/BDC_SMS_Public.pdf" target="_blank">
+                      <a
+                        :href="
+                          runtimeConfig.public.fileStorageBaseUrl +
+                          '/Bon_de_commande/Achat_SMS_Public.pdf'
+                        "
+                        target="_blank"
+                      >
                         <b>{{ $t('download_order_form') }}</b>
                       </a>
                     </p>
@@ -452,7 +481,10 @@ Page 'Mon abonnement'
 
                     <p>
                       <a
-                        href="/resources/BDC_Nom_de_domaine.pdf"
+                        :href="
+                          runtimeConfig.public.fileStorageBaseUrl +
+                          '/Bon_de_commande/Nom_de_domaine.pdf'
+                        "
                         target="_blank"
                       >
                         <b>{{ $t('download_order_form') }}</b>
@@ -481,6 +513,8 @@ import MobytUserStatus from '~/models/Organization/MobytUserStatus'
 
 const ability = useAbility()
 
+const runtimeConfig = useRuntimeConfig()
+
 definePageMeta({
   name: 'subscription_page',
 })