Olivier Massot преди 1 година
родител
ревизия
05a79dd73f
променени са 11 файла, в които са добавени 57 реда и са изтрити 4 реда
  1. 25 0
      components/Common/AgendaLink.vue
  2. 5 4
      components/Layout/Footer/Footer.vue
  3. 4 0
      env/.env.docker
  4. 3 0
      env/.env.prod
  5. 3 0
      env/.env.test
  6. 3 0
      env/.env.test1
  7. 3 0
      env/.env.test2
  8. 3 0
      env/.env.test3
  9. 3 0
      env/.env.test4
  10. 3 0
      env/.env.test5
  11. 2 0
      nuxt.config.ts

+ 25 - 0
components/Common/AgendaLink.vue

@@ -0,0 +1,25 @@
+<template>
+  <nuxt-link :href="target">
+    <slot />
+  </nuxt-link>
+</template>
+
+<script setup lang="ts">
+import UrlUtils from "~/services/utils/urlUtils";
+
+const runtimeConfig = useRuntimeConfig()
+
+const props = defineProps({
+  href: {
+    type: String
+  }
+})
+
+const target = computed(() => {
+  return UrlUtils.join(runtimeConfig.public.agendaBaseUrl as string, props.href as string)
+})
+</script>
+
+<style scoped lang="scss">
+
+</style>

+ 5 - 4
components/Layout/Footer/Footer.vue

@@ -19,9 +19,9 @@
               </h5>
             </v-row>
             <v-row>
-              <nuxt-link to="/annuaire">
+              <AgendaLink href="/annuaire">
                 Annuaire
-              </nuxt-link>
+              </AgendaLink>
             </v-row>
             <v-row>
               <nuxt-link to="/actualites">
@@ -29,9 +29,9 @@
               </nuxt-link>
             </v-row>
             <v-row>
-              <nuxt-link to="/annonces">
+              <AgendaLink to="/annonces">
                 Annonces
-              </nuxt-link>
+              </AgendaLink>
             </v-row>
           </v-col>
 
@@ -218,6 +218,7 @@
 <script setup>
 import { useDisplay } from "vuetify";
 import { useLayoutStore } from "~/stores/layoutStore";
+import AgendaLink from "~/components/Common/AgendaLink.vue";
 
 
 const { mdAndDown, mdAndUp } = useDisplay();

+ 4 - 0
env/.env.docker

@@ -5,3 +5,7 @@ DEBUG=1
 
 NUXT_API_BASE_URL=https://nginx_maestro
 NUXT_PUBLIC_API_BASE_URL=https://local.maestro.opentalent.fr
+
+NUXT_AGENDA_BASE_URL=https://local.agenda.opentalent.fr
+NUXT_PUBLIC_AGENDA_BASE_URL=https://local.agenda.opentalent.fr
+

+ 3 - 0
env/.env.prod

@@ -2,3 +2,6 @@
 # /!\ -- USE ONLY IN PRODUCTION --
 NUXT_ENV=production
 NUXT_DEBUG=0
+
+NUXT_AGENDA_BASE_URL=https://opentalent.fr
+NUXT_PUBLIC_AGENDA_BASE_URL=https://opentalent.fr

+ 3 - 0
env/.env.test

@@ -4,3 +4,6 @@ DEBUG=1
 
 NUXT_API_BASE_URL=https://api.test.opentalent.fr
 NUXT_PUBLIC_API_BASE_URL=https://api.test.opentalent.fr
+
+NUXT_AGENDA_BASE_URL=https://agenda.test.opentalent.fr
+NUXT_PUBLIC_AGENDA_BASE_URL=https://local.test.opentalent.fr

+ 3 - 0
env/.env.test1

@@ -4,3 +4,6 @@ DEBUG=1
 
 NUXT_API_BASE_URL=https://api.test1.opentalent.fr
 NUXT_PUBLIC_API_BASE_URL=https://api.test1.opentalent.fr
+
+NUXT_AGENDA_BASE_URL=https://agenda.test1.opentalent.fr
+NUXT_PUBLIC_AGENDA_BASE_URL=https://local.test1.opentalent.fr

+ 3 - 0
env/.env.test2

@@ -4,3 +4,6 @@ DEBUG=1
 
 NUXT_API_BASE_URL=https://api.test2.opentalent.fr
 NUXT_PUBLIC_API_BASE_URL=https://api.test2.opentalent.fr
+
+NUXT_AGENDA_BASE_URL=https://agenda.test2.opentalent.fr
+NUXT_PUBLIC_AGENDA_BASE_URL=https://local.test2.opentalent.fr

+ 3 - 0
env/.env.test3

@@ -4,3 +4,6 @@ DEBUG=1
 
 NUXT_API_BASE_URL=https://api.test3.opentalent.fr
 NUXT_PUBLIC_API_BASE_URL=https://api.test3.opentalent.fr
+
+NUXT_AGENDA_BASE_URL=https://agenda.test3.opentalent.fr
+NUXT_PUBLIC_AGENDA_BASE_URL=https://local.test3.opentalent.fr

+ 3 - 0
env/.env.test4

@@ -4,3 +4,6 @@ DEBUG=1
 
 NUXT_API_BASE_URL=https://api.test4.opentalent.fr
 NUXT_PUBLIC_API_BASE_URL=https://api.test4.opentalent.fr
+
+NUXT_AGENDA_BASE_URL=https://agenda.test4.opentalent.fr
+NUXT_PUBLIC_AGENDA_BASE_URL=https://local.test4.opentalent.fr

+ 3 - 0
env/.env.test5

@@ -4,3 +4,6 @@ DEBUG=1
 
 NUXT_API_BASE_URL=https://api.test5.opentalent.fr
 NUXT_PUBLIC_API_BASE_URL=https://api.test5.opentalent.fr
+
+NUXT_AGENDA_BASE_URL=https://agenda.test5.opentalent.fr
+NUXT_PUBLIC_AGENDA_BASE_URL=https://local.test5.opentalent.fr

+ 2 - 0
nuxt.config.ts

@@ -31,11 +31,13 @@ export default defineNuxtConfig({
     // Private config that is only available on the server
     env: "",
     apiBaseUrl: "",
+    agendaBaseUrl: "",
     hCaptchaSiteKey: "35360874-ebb1-4748-86e3-9b156d5bfc53",
     // Config within public will be also exposed to the client
     public: {
       env: "",
       apiBaseUrl: "",
+      agendaBaseUrl: "",
       hCaptchaSiteKey: "35360874-ebb1-4748-86e3-9b156d5bfc53",
     },
   },