chore: move all raw forum and map url to global config

components/app/AppShareModal.vue

@@ -28,12 +28,12 @@
           v-for="network in networks"
           :key="network.name"
           :network="network.network"
-          :url="$config.siteUrl + document.path.replace(/^\/pages\//, '/')"
+          :url="$config.site_url + document.path.replace(/^\/pages\//, '/')"
           :title="document.title"
           :description="document.description"
           :quote="document.description"
-          :hashtags="$config.socialNetworksHashtags"
-          :twitter-user="$config.twitterUser"
+          :hashtags="$config.social_networks_hashtags"
+          :twitter-user="$config.twitter_user"
           :media="media"
           class="
             flex

components/app/MiniMap.vue

@@ -4,7 +4,17 @@
     <span
       v-show="hovered"
       id="tooltip-mini-map"
-      class="absolute whitespace-nowrap pointer-events-none p-1 shadow-lg rounded text-xs bg-opacity-90 bg-white dark:bg-gray-700"
+      class="
+        absolute
+        whitespace-nowrap
+        pointer-events-none
+        p-1
+        shadow-lg
+        rounded
+        text-xs
+        bg-opacity-90 bg-white
+        dark:bg-gray-700
+      "
     >
       {{ hovered && hovered.name }}
     </span>
@@ -223,7 +233,7 @@ export default {
 
       region.addEventListener('click', (evt) => {
         window.open(
-          `https://forum.monnaie-libre.fr/c/${regions[evt.target.id].id}`,
+          `${this.$config.forum_url}/c/${regions[evt.target.id].id}`,
           '_blank'
         )
       })

components/home/HomeMap.vue

@@ -26,7 +26,7 @@
     </div>
 
     <iframe
-      :src="intersected ? 'https://carte.monnaie-libre.fr/?zoom=5' : null"
+      :src="intersected ? $config.map_url : null"
       class="w-screen bg-gray-200"
       style="height: 50vh; min-height: 600px"
       title="Carte monnaie-libre"

components/home/HomeNextEvents.vue

@@ -3,9 +3,18 @@
     <div class="border-b-2 container flex items-end mb-3 pb-2">
       <JuneCalendar class="w-12 mr-3 fill-current dark:text-gray-100" />
       <a
-        href="https://forum.monnaie-libre.fr/calendar"
+        :href="`${$config.forum_url}/calendar`"
         target="_blank"
-        class="group bg-clip-text bg-gradient-to-r font-extrabold from-purple-800 hover:underline text-4xl text-transparent to-blue-600 uppercase"
+        class="
+          group
+          bg-clip-text bg-gradient-to-r
+          font-extrabold
+          from-purple-800
+          hover:underline
+          text-4xl text-transparent
+          to-blue-600
+          uppercase
+        "
         rel="noopener noreferrer"
       >
         Agenda
@@ -26,9 +35,17 @@
         <a
           v-for="(event, index) in column"
           :key="index"
-          :href="`https://forum.monnaie-libre.fr/t/${event.slug}/${event.id}`"
+          :href="`${$config.forum_url}/t/${event.slug}/${event.id}`"
           target="_blank"
-          class="block hover:bg-hover-light dark-hover:text-gray-800 p-2 mt-1 rounded-lg transition-colors"
+          class="
+            block
+            hover:bg-hover-light
+            dark-hover:text-gray-800
+            p-2
+            mt-1
+            rounded-lg
+            transition-colors
+          "
           rel="noopener noreferrer"
         >
           <div class="event-date text-sm text-gray-500">

components/layout/LayoutHeaderMenu.vue

 <template>
   <div class="flex">
     <template v-for="(item, index) of menu">
-      <nuxt-link
-        v-if="item.url.startsWith('/')"
-        :key="index"
-        class="menu-item"
-        :to="item.url"
-      >
+      <nuxt-link v-if="item.url" :key="index" class="menu-item" :to="item.url">
         {{ item.title }}
       </nuxt-link>
-    </template>
-
-    <t-dropdown
-      toggle-on-hover
-      :hide-on-leave-timeout="0"
-      :classes="{
-        dropdown:
-          'absolute right-0 rounded-md shadow-lg bg-white dark:bg-gray-600 dark:border-gray-500 border transform translate-y-1',
-      }"
-    >
-      <a
-        slot="trigger"
-        class="menu-item"
-        href="https://forum.monnaie-libre.fr/"
-        target="_blank"
-        rel="noopener noreferrer"
+      <t-dropdown
+        v-else-if="item.title.toLowerCase() === 'forum'"
+        :key="index"
+        toggle-on-hover
+        :hide-on-leave-timeout="0"
+        :classes="{
+          dropdown:
+            'absolute right-0 rounded-md shadow-lg bg-white dark:bg-gray-600 dark:border-gray-500 border transform translate-y-1',
+        }"
       >
-        Forum
-        <fa
-          icon="external-link-alt"
-          class="w-3 ml-1.5 text-gray-500 opacity-75"
-        />
-      </a>
-      <LayoutHeaderMenuForum />
-    </t-dropdown>
+        <a
+          slot="trigger"
+          class="menu-item"
+          :href="$config.forum_url"
+          target="_blank"
+          rel="noopener noreferrer"
+        >
+          Forum
+          <fa
+            icon="external-link-alt"
+            class="w-3 ml-1.5 text-gray-500 opacity-75"
+          />
+        </a>
+        <LayoutHeaderMenuForum />
+      </t-dropdown>
+    </template>
   </div>
 </template>
 

components/layout/LayoutHeaderMenuForum.vue

@@ -6,8 +6,15 @@
       <a
         v-for="(cat, index) in categories"
         :key="index"
-        class="block text-gray-600 hover:text-gray-700 hover:bg-hover-light dark:text-gray-200 p-2 w-full"
-        :href="`https://forum.monnaie-libre.fr/c/${cat.slug}/${cat.id}`"
+        class="
+          block
+          text-gray-600
+          hover:text-gray-700 hover:bg-hover-light
+          dark:text-gray-200
+          p-2
+          w-full
+        "
+        :href="`${$config.forum_url}/c/${cat.slug}/${cat.id}`"
         target="_blank"
         rel="noopener noreferrer"
       >

components/search/SearchContainer.vue

@@ -70,7 +70,7 @@
               </li>
               <li>
                 <a
-                  :href="`https://forum.monnaie-libre.fr/search?q=${query}`"
+                  :href="`${$config.forum_url}/search?q=${query}`"
                   class="hover:underline"
                   target="_blank"
                   rel="noopener noreferrer"

libs/feedFactory.js

@@ -3,7 +3,7 @@
 export default async ({ publicRuntimeConfig, config, paths }) => {
   const { $content } = require('@nuxt/content')
 
-  const siteUrl = publicRuntimeConfig.siteUrl
+  const link = publicRuntimeConfig.site_url
   const basePath = '/feed'
 
   // auto fetch all first level dirs in content
@@ -26,7 +26,7 @@ export default async ({ publicRuntimeConfig, config, paths }) => {
 
   const feedOptions = {
     title: config.site_title,
-    link: siteUrl,
+    link,
     description: config.site_description,
     language: 'fr',
   }
@@ -52,7 +52,7 @@ export default async ({ publicRuntimeConfig, config, paths }) => {
           feed.options = feedOptions
 
           posts.forEach((post) => {
-            const url = `${siteUrl}${post.path}`
+            const url = `${link}${post.path}`
             feed.addItem({
               id: url,
               link: url,

nuxt.config.js

@@ -6,12 +6,13 @@ import sitemapRoutes from './libs/sitemapRoutes.js'
 import feedFactory from './libs/feedFactory.js'
 
 const publicRuntimeConfig = {
-  siteUrl: process.env.SITE_URL || 'https://monnaie-libre.fr',
-  forumUrl: process.env.FORUM_URL || 'https://forum.monnaie-libre.fr',
-  mapUrl: process.env.MAP_URL || 'https://carte.monnaie-libre.fr',
-  socialNetworksHashtags:
-    process.env.SOCIAL_NETWORKS_HASHTAGS || 'MonnaieLibre,Ğ1',
-  twitterUser: process.env.TWITTER_USER || 'monnaie_libre',
+  site_url: process.env.site_url || 'https://monnaie-libre.fr',
+  forum_url: process.env.forum_url || 'https://forum.monnaie-libre.fr',
+  map_url: process.env.map_url || 'https://carte.monnaie-libre.fr',
+  twitter_user: process.env.twitter_user || 'monnaie_libre',
+  social_networks_hashtags:
+    process.env.social_networks_hashtags || 'MonnaieLibre,Ğ1',
+  ...config,
 }
 
 export default {
@@ -171,7 +172,7 @@ export default {
   hooks,
 
   sitemap: {
-    hostname: publicRuntimeConfig.siteUrl,
+    hostname: publicRuntimeConfig.site_url,
     gzip: true,
     routes: sitemapRoutes,
   },

pages/faq/index.vue

@@ -14,7 +14,7 @@
         </li>
         <li>
           <a
-            :href="`https://forum.monnaie-libre.fr/search?q=${query}`"
+            :href="`${$config.forum_url}/search?q=${query}`"
             class="hover:underline"
             target="_blank"
             rel="noopener noreferrer"

pages/recherche.vue

@@ -16,7 +16,16 @@
               )"
               :key="item.path"
               :to="item.path.replace(/^\/pages\//, '/')"
-              class="block cursor-pointer dark-hover:bg-gray-700 hover:bg-gray-100 mb-2 p-2 rounded-lg transition-colors"
+              class="
+                block
+                cursor-pointer
+                dark-hover:bg-gray-700
+                hover:bg-gray-100
+                mb-2
+                p-2
+                rounded-lg
+                transition-colors
+              "
             >
               <div
                 class="rounded text-gray-400 text-xs uppercase font-semibold"
@@ -65,7 +74,16 @@
             :href="item.href"
             target="_blank"
             rel="noopener noreferrer"
-            class="block cursor-pointer dark-hover:bg-gray-700 hover:bg-gray-100 mb-2 p-2 rounded-lg transition-colors"
+            class="
+              block
+              cursor-pointer
+              dark-hover:bg-gray-700
+              hover:bg-gray-100
+              mb-2
+              p-2
+              rounded-lg
+              transition-colors
+            "
           >
             <h1 class="text-xl" v-html="item.title" />
             <div
@@ -128,7 +146,7 @@ export default {
       }
 
       let results = await fetch(
-        `https://forum.monnaie-libre.fr/search.json?q=${query}`
+        `${this.$config.forum_url}/search.json?q=${query}`
       ).then((response) => response.json())
 
       if (!results.posts) {
@@ -145,7 +163,7 @@ export default {
             post_number: item.post_number,
             title: topic.title,
             description: item.blurb,
-            href: `https://forum.monnaie-libre.fr/t/${topic.slug}/${item.topic_id}/${item.post_number}`,
+            href: `${this.$config.forum_url}/t/${topic.slug}/${item.topic_id}/${item.post_number}`,
           }
         })
 

static/admin/config.yml

@@ -142,7 +142,7 @@ collections:
             widget: list
             fields:
               - { label: Titre, name: title }
-              - { name: url }
+              - { name: url, required: false }
               - { label: Icône, name: icon, required: false }
           - label: Menus du footer
             name: menu_footer
@@ -175,4 +175,7 @@ collections:
           - { label: Titre du site, name: site_title, widget: string }
           - { label: Logo du site, name: site_logo, widget: image, allow_multiple: false }
           - { label: Meta description du site, name: site_description, widget: string }
-          - { label: Url du forum, name: forum_url, widget: string }
+          - { label: Url du forum, name: forum_url, widget: string }
\ No newline at end of file
+          - { label: Url de la carte, name: map_url, widget: string }
+          - { label: Compte Twitter, name: twitter_user, widget: string, hint: Sans @ }
+          - { label: Hashtags pour les réseaux sociaux, name: social_networks_hashtags, widget: string, hint: "Sans #, séparé par des virgules" }
\ No newline at end of file

static/settings/globals.json

 {
-  "site_url": "https://monnaie-libre.fr/",
-  "site_logo": "/img/logo-monnaie-libre.svg",
+  "site_url": "https://monnaie-libre.fr",
   "site_title": "monnaie-libre.fr",
-  "forum_url": "https://forum.monnaie-libre.fr/",
-  "site_description": "Tout savoir sur la monnaie libre ! Une monnaie au service de l'homme, le mettant au centre de l'économie."
-}
+  "site_logo": "/img/logo-monnaie-libre.svg",
+  "site_description": "Tout savoir sur la monnaie libre ! Une monnaie au service de l'homme, le mettant au centre de l'économie.",
+  "forum_url": "https://forum.monnaie-libre.fr",
\ No newline at end of file
+  "map_url": "https://carte.monnaie-libre.fr/?zoom=5",
+  "twitter_user": "monnaie_libre",
+  "social_networks_hashtags": "MonnaieLibre,Ğ1"
+}

static/settings/menus.json

@@ -13,8 +13,7 @@
       "url": "/lexique"
     },
     {
-      "title": "Forum",
-      "url": "https://forum.monnaie-libre.fr"
+      "title": "Forum"
     }
   ],
   "menu_footer": [