config/sync/views.view.etapes.yml

@@ -269,7 +269,7 @@ display:
             popupAnchor:
               x: ''
               'y': ''
-            html: "<div></div>\r\n<div></div>\r\n<div></div>\r\n<div class=\"url\">[node:url]</div>\r\n<div class=\"couleur\">[node:field_couleur]</div>"
+            html: "<div></div>\r\n<div></div>\r\n<div></div>\r\n<div class=\"nid\">{{ nid }}</div>\r\n<div class=\"couleur\">{{ field_couleur }}</div>"
             html_class: 'leaflet-map-divicon '
             circle_marker_options: '{"radius":100,"color":"red","fillColor":"#f03","fillOpacity":0.5}'
           leaflet_markercluster:

web/themes/custom/caravane/assets/js/main.js

@@ -1,7 +1,7 @@
 import { initVueContentModale } from './utils/vue-setup';
 import { processClickableElements } from './utils/process-clickable-elements';
 import { handleReactiveness, setMenuToggle, setHamburgerWhenLogged } from './utils/layout-setup';
-import { initFirstLoadRouting, handleClickableElements, handleBrowserNavigation } from './utils/handle-navigation';
+import { initFirstLoadRouting, handleClickableElements } from './utils/handle-navigation';
 import { setupMapStore } from './utils/map-setup';
 
 import '../scss/main.scss'
@@ -39,10 +39,6 @@ import '../scss/main.scss'
                         initFirstLoadRouting(store, router, baseUrl, siteName);
 
                         handleClickableElements(clickableElements, store, router, baseUrl, siteName, mapStore);
-
-                        window.addEventListener("popstate", () => {
-                          handleBrowserNavigation(store, baseUrl, siteName, mapStore);
-                        });
                     });
                 }
             }

web/themes/custom/caravane/assets/js/stores/layout.js

@@ -34,48 +34,38 @@ export const useLayoutStore = defineStore('layout', {
             this.isEtapeListRetracted = false;
         },
         setUpHamburgerToggle(menuBurger, menuContainer) {
-          const menuTitle = document.querySelector('#menu-title');
+            const menuTitle = document.querySelector('#menu-title');
-          const menuH2 = document.querySelector('#menu > h2');
+            const menuH2 = document.querySelector('#menu > h2');
 
-          menuBurger.addEventListener('click', (e) => {
+            menuBurger.addEventListener('click', (e) => { 
-            this.toggleHamburgerMenu(menuBurger, menuContainer, menuTitle, menuH2);
-          });
-          document.addEventListener('click', (e) => {
-            if (
-              (!menuContainer.contains(e.target) && !menuBurger.contains(e.target))
-              || e.target.tagName === 'A'
-            ) {
-              menuContainer.classList.remove('open');
-              menuTitle.classList.remove('open');
-              menuBurger.classList.remove('open');
-              menuH2.classList.remove('open');
               setTimeout(() => {
-                if (this.isHamburgerMenuOpen) {
+                  if (!this.isHamburgerMenuOpen) menuContainer.style.display = 'block';
-                    menuContainer.style.display = 'none';
+                  menuContainer.classList.toggle('open');
+                  menuTitle.classList.toggle('open');
+                  menuBurger.classList.toggle('open');
+                  menuH2.classList.toggle('open');
+                  if (this.isHamburgerMenuOpen) {
+                    setTimeout(() => {
+                        menuContainer.style.display = 'none';
+                        this.isHamburgerMenuOpen = !this.isHamburgerMenuOpen;
+                    }, 300);
+                  }
+              }, 50);
+              document.addEventListener('click', (e) => {
+                if (!menuContainer.contains(e.target) && !menuBurger.contains(e.target)) {
+                  menuContainer.classList.remove('open');
+                  menuTitle.classList.remove('open');
+                  menuBurger.classList.remove('open');
+                  menuH2.classList.remove('open');  
+                  setTimeout(() => {
+                    if (this.isHamburgerMenuOpen) {
+                        menuContainer.style.display = 'none';
+                    }
+                    this.isHamburgerMenuOpen = false;
+                  }, 300);
                 }
-              }, 300);
+              });
-              this.isHamburgerMenuOpen = false;
+            });
-            }
-          });
-        },
-        toggleHamburgerMenu(menuBurger, menuContainer, menuTitle, menuH2) {
-          setTimeout(() => {
-            if (!this.isHamburgerMenuOpen) menuContainer.style.display = 'block';
-            menuContainer.classList.toggle('open');
-            menuTitle.classList.toggle('open');
-            menuBurger.classList.toggle('open');
-            menuH2.classList.toggle('open');
-            // console.log('isHamburgerMenuOpen', this.isHamburgerMenuOpen);
-            console.log(this.isHamburgerMenuOpen);
-            if (this.isHamburgerMenuOpen) {
-              setTimeout(() => {
-                menuContainer.style.display = 'none';
-              }, 300);
-            }
-            console.log('TOGGLE', this.isHamburgerMenuOpen);
-            console.log('isHamburgerMenuOpen', this.isHamburgerMenuOpen);
-            this.isHamburgerMenuOpen = !this.isHamburgerMenuOpen;
-          }, 50);
         }
     },
 })

web/themes/custom/caravane/assets/js/stores/map.js

@@ -10,30 +10,23 @@ export const useMapStore = defineStore('mapState', {
         currentPlace: Object,
         maxZoom: Number,
         currentZoom: Number,
-        animationsAreEnabled: true,
+        duration: 3,
-        animationDuration: 3,
     }),
     actions: {
         zoomToPlace(lat, long) {
             if (useLayoutStore().isDesktop) long = long - 0.03;
-            this.map.flyTo(
+            this.map.flyTo([lat, long], this.maxZoom, { duration: this.duration });
-              [lat, long],
-              this.maxZoom,
-              { animate: this.animationsAreEnabled, animationDuration: this.animationDuration });
             this.currentZoom = this.maxZoom;            
         },
         resetMap() {
-            this.map.flyTo(
+            this.map.flyTo(this.defaultMapCenter, useLayoutStore().isDesktop ? this.defaultZoomDesktop : this.defaultZoomMobile, { duration: this.duration });
-              this.defaultMapCenter,
-              useLayoutStore().isDesktop ? this.defaultZoomDesktop : this.defaultZoomMobile,
-              { animate: this.animationsAreEnabled, animationDuration: this.animationDuration });
             this.currentZoom = useLayoutStore().isDesktop ? this.defaultZoomDesktop : this.defaultZoomMobile;
         },
         lockMap() {
             setTimeout(() => {
                 this.map.options.minZoom = this.currentZoom;
                 this.map.options.maxZoom = this.currentZoom;
-            }, this.animationDuration * 1000 + 100);
+            }, this.duration * 1000 + 100);
             this.map.dragging.disable();
             this.map.touchZoom.disable();
             this.map.doubleClickZoom.disable();
@@ -41,28 +34,17 @@ export const useMapStore = defineStore('mapState', {
             this.map.boxZoom.disable();
             this.map.keyboard.disable();
             // map.tap.disable();
-        },
+          },
-        unlockMap() {
+          unlockMap() {
-          this.map.options.minZoom = useLayoutStore().isDesktop ? this.defaultZoomDesktop : this.defaultZoomMobile;
+            this.map.options.minZoom = useLayoutStore().isDesktop ? this.defaultZoomDesktop : this.defaultZoomMobile;
-          this.map.options.maxZoom = this.maxZoom;
+            this.map.options.maxZoom = this.maxZoom;
-          this.map.dragging.enable();
+            this.map.dragging.enable();
-          this.map.touchZoom.enable();
+            this.map.touchZoom.enable();
-          this.map.doubleClickZoom.enable();
+            this.map.doubleClickZoom.enable();
-          this.map.scrollWheelZoom.enable();
+            this.map.scrollWheelZoom.enable();
-          this.map.boxZoom.enable();
+            this.map.boxZoom.enable();
-          this.map.keyboard.enable();
+            this.map.keyboard.enable();
-          // map.tap.enable();
+            // map.tap.enable();
-        },
+          },
-        toggleAnimation() {
-            this.animationsAreEnabled = !this.animationsAreEnabled;
-        },
-        checkReducedMotion() {
-          const mediaQuery = window.matchMedia('(prefers-reduced-motion: reduce)');
-          this.animationsAreEnabled = !mediaQuery.matches;
-
-          mediaQuery.addEventListener('change', (event) => {
-            this.animationsAreEnabled = !event.matches;
-          });
-        },
     },
 });

web/themes/custom/caravane/assets/js/utils/handle-navigation.js

@@ -23,29 +23,19 @@ export function handleClickableElements(clickableElements, store, router, baseUr
         link.onclick = async function (e) {
             router.push(href);
             if (href !== window.location.pathname) {
-              pageChange(href, store, siteName, mapStore, baseUrl);
+                if (href === '/') {
+                    store.resetStore(true);
+                    document.title = siteName;
+                    mapStore.resetMap();
+                } else {
+                    await store.fetchContentData(baseUrl + href);
+                    document.title = store.pageTitle;                
+                }
+                setActiveNavItem(store.contentType, href);
+
+                const listeEtape = document.querySelector('#etapes-liste');
+                if (!useLayoutStore().isDesktop) useLayoutStore().collapseEtapeListe(listeEtape);
             }
         }
     }
 }
-
-export async function handleBrowserNavigation(store, baseUrl, siteName, mapStore) {
-  let href = window.location.pathname;
-  if (href.startsWith(baseUrl)) href = href.replace(baseUrl, '');
-  pageChange(href, store, siteName, mapStore, baseUrl)
-}
-
-async function pageChange(href, store, siteName, mapStore, baseUrl) {
-  if (href === '/') {
-      store.resetStore(true);
-      document.title = siteName;
-      mapStore.resetMap();
-  } else {
-      await store.fetchContentData(baseUrl + href);
-      document.title = store.pageTitle;
-  }
-  setActiveNavItem(store.contentType, href);
-
-  const listeEtape = document.querySelector('#etapes-liste');
-  if (!useLayoutStore().isDesktop) useLayoutStore().collapseEtapeListe(listeEtape);
-}

web/themes/custom/caravane/assets/js/utils/process-clickable-elements.js

@@ -26,7 +26,15 @@ function processEtapeLinks() {
 function processStaticLinks() {
     const general_link_fields = document.querySelectorAll('#menu > ul > li > a');
     for (let i = 0; i <  general_link_fields.length; i ++) {
-      general_link_fields[i].addEventListener('click', (e) => e.preventDefault());
+        let general_link_path = general_link_fields[i].getAttribute('data-drupal-link-system-path');
+        if (general_link_path && general_link_path !== '<front>') {           
+            const match = [...general_link_path.match(/^node\/(\d+)$/)];
+            if (match) {
+                const nid = match[1];
+                general_link_fields[i].setAttribute('data-nid', parseInt(nid));
+            }
+        }
+        general_link_fields[i].addEventListener('click', (e) => e.preventDefault());
     }
 
     return general_link_fields;

web/themes/custom/caravane/assets/js/utils/vue-setup.js

@@ -2,7 +2,6 @@ import { createApp } from 'vue';
 import { createPinia } from 'pinia';
 import router from '../router/router';
 import Modale from '../vuejs/Modale.vue';
-import AnimationToggle from '../vuejs/AnimationToggle.vue';
 import VueImageZoomer from 'vue-image-zoomer';
 import 'vue-image-zoomer/dist/style.css';
 
@@ -10,20 +9,14 @@ import { useContentStore } from '../stores/content';
 import { useMapStore } from '../stores/map';
 
 export function initVueContentModale() {
-    const pinia = createPinia();
-
     const app = createApp(Modale)
-      .use(pinia)
+        .use(createPinia())
-      .use(router)
+        .use(router)
-      .use(VueImageZoomer);
+        .use(VueImageZoomer);
 
     const store = useContentStore();
     const mapStore = useMapStore();
     app.mount('#content-modale');    
 
-    const animationToggle = createApp(AnimationToggle)
-      .use(pinia)
-      .mount('#animation-toggle');
-
   return { store, mapStore, router };
 }

web/themes/custom/caravane/assets/js/vuejs/AnimationToggle.vue

@@ -1,37 +0,0 @@
-<template>
-  <div @click="handleClick" class="animation-toggle-container">
-    <div><p>Activer les animations</p></div>
-    <label class="switch">
-      <input type="checkbox" v-model="animationsAreEnabled"  @click.stop @change="toggleAnimation" />
-      <span class="slider round"></span>
-    </label>
-  </div>
-</template>
-
-<script>
-
-import { useMapStore } from '../stores/map';
-import { storeToRefs } from 'pinia';
-
-export default {
-  setup() {
-    const mapStore = useMapStore();
-
-    const { animationsAreEnabled } = storeToRefs(mapStore);
-
-    const toggleAnimation = () => {
-      mapStore.toggleAnimation();
-    };
-
-    const handleClick = () => {
-      toggleAnimation();
-    };
-
-    return {
-      handleClick,
-      toggleAnimation,
-      animationsAreEnabled,
-    };
-  },
-};
-</script>

web/themes/custom/caravane/assets/js/vuejs/Modale.vue

@@ -1,8 +1,5 @@
 <template>
-    <Transition
+    <Transition>
-      :enter-active-class="animationsAreEnabled ? 'v-enter-active' : 'no-transition'"
-      :leave-active-class="animationsAreEnabled ? 'v-leave-active' : 'no-transition'"
-    >
         <div v-if="!loading && (contentType === 'etape' || contentType === 'static')">
             <div class="content-wrapper">
                 <ModaleHeader
@@ -84,7 +81,7 @@ const {
     error, 
 } = storeToRefs(store);
 
-const { defaultMapCenter, animationDuration, animationsAreEnabled } = storeToRefs(mapState);
+const { map, duration } = storeToRefs(mapState);
 
 let isModaleEtape, wasModaleEtape;
 
@@ -108,57 +105,31 @@ const handleMapMovement = () => {
         if (!loading.value) {
             isModaleEtape = contentType.value === 'etape';            
             
-            // Define helper functions in variables
+            if (!wasModaleEtape && isModaleEtape) {
-            const disableModaleTransition = () => {
+                // national -> détail
-              document.documentElement.style.setProperty('margin-top', '0');
+                document.documentElement.style.setProperty('--modale-enter-delay', `${duration.value}s`);
-              document.documentElement.style.setProperty('transition', 'none');
+                mapState.zoomToPlace(content.value.coordinates.lat, content.value.coordinates.lon);
-            }
+            } else if (wasModaleEtape && isModaleEtape) { 
-            const setModaleTransition = (enterDelay) => {
+                // détail -> détail
-              document.documentElement.style.setProperty('--modale-enter-delay', `${enterDelay}s`);
+                document.documentElement.style.setProperty('--modale-leave-delay', 0);
-            };
+                document.documentElement.style.setProperty('--modale-enter-delay', `${duration.value * 2}s`);
+                mapState.resetMap(map.value);
+                setTimeout(() => {
+                mapState.zoomToPlace(content.value.coordinates.lat, content.value.coordinates.lon);
+                }, duration.value * 1000);
     
-            const zoomToContentPlace = () => {
+            } else if (wasModaleEtape && !isModaleEtape) { 
-              mapState.zoomToPlace(
+                // détail -> national
-                content.value.coordinates.lat ? content.value.coordinates.lat : defaultMapCenter.value.lat,
+                document.documentElement.style.setProperty('--modale-leave-delay', 0);
-                content.value.coordinates.lon ? content.value.coordinates.lon : defaultMapCenter.value.lng
+                document.documentElement.style.setProperty('--modale-enter-delay', `${duration.value}s`);
-              );
-            };
-
-            if (animationsAreEnabled.value) {
-
-              if (isModaleEtape) {
-                if (!wasModaleEtape) {
-                  console.log('national -> détail');
-                  setModaleTransition(animationDuration.value);
-                  zoomToContentPlace();
-                } else {
-                  console.log('détail -> détail');
-                  setModaleTransition(animationDuration.value);
-                  //mapState.resetMap();
-                  zoomToContentPlace();
-                  //setTimeout(zoomToContentPlace, animationDuration.value * 1000);
-                }
-              } else {
-                if (wasModaleEtape) {
-                  console.log('détail -> national');
-                  setModaleTransition(animationDuration.value);
-                  mapState.resetMap();
-                } else {
-                  console.log('national -> national');
-                  setModaleTransition(0);
-                }
-              }
-            } else {
-              if (isModaleEtape) {
-                zoomToContentPlace();
-              } else {
                 mapState.resetMap();
-              }
+            } else if (!wasModaleEtape && !isModaleEtape) {
-              disableModaleTransition();
+                // national -> national
+                console.log('national -> national');
+                document.documentElement.style.setProperty('--modale-leave-delay', 0);
+                document.documentElement.style.setProperty('--modale-enter-delay', '0.5s');
             }
     
-            scrollTo(0, 0);
-
             wasModaleEtape = isModaleEtape;
         }
     },
@@ -179,7 +150,7 @@ onMounted(() => {
 }
 
 .v-leave-active {
-  transition: margin-top 0.5s ease-in;
+    transition: margin-top 0.5s ease-in var(--modale-leave-delay);
 }
 
 .v-enter-from,
@@ -189,12 +160,6 @@ onMounted(() => {
 
 .v-enter-to,
 .v-leave-from {
-  margin-top: 0vh;
+    margin-top: 0vh;
-}
-
-/* This class will disable transitions */
-.no-transition {
-  margin-top: 0 !important;
-  transition: none !important;
 }
 </style>

web/themes/custom/caravane/assets/js/vuejs/components/ModaleFooter.vue

@@ -5,7 +5,7 @@
         </div>
     
         <div v-if="contentType === 'etape' && (content.previous || content.next)" class="related-etape-links">
-            <div v-if="content.previous" class="card previous" @click="clickRelatedElement(content.previous.url)">
+            <div v-if="content.previous" class="card previous" @click="displayRelatedElement(content.previous.url)">
                 <div class="icon">
                     <div :style="{ backgroundColor: content.previous.couleur }"></div>
                     <div :style="{ backgroundColor: content.previous.couleur }"></div>
@@ -21,7 +21,7 @@
                     </div>
                 </div>
             </div>
-            <div v-if="content.next" class="card next" @click="clickRelatedElement(content.next.url)">
+            <div v-if="content.next" class="card next" @click="displayRelatedElement(content.next.url)">
                 <div class="icon">
                     <div :style="{ backgroundColor: content.next.couleur }"></div>
                     <div :style="{ backgroundColor: content.next.couleur }"></div>
@@ -63,13 +63,4 @@ async function displayRelatedElement(href) {
     await store.fetchContentData(baseUrl + href);
     document.title = store.pageTitle;
 }
-
-import { setActiveNavItem } from '../../utils/set-active-nav-item.js';
-
-function clickRelatedElement(href) {
-  const baseUrl = window.location.protocol + "//" + window.location.host;
-  if (href.startsWith(baseUrl)) href = href.replace(baseUrl, '');
-  setActiveNavItem('etape', href);
-  displayRelatedElement(href);
-}
 </script>

web/themes/custom/caravane/assets/scss/main.scss

@@ -597,7 +597,6 @@ body{
                     margin: 30px 0;
                     transform: scale(1);
                     opacity: 1;
-                    padding-right: 0.5rem;
                     transition: transform 0.3s ease-out, opacity 0.3s ease-out;
                     cursor: pointer;
                     > .infos-arret {
@@ -1179,75 +1178,6 @@ body{
                 }
               }
             }
-            > #animation-toggle > div {
-              cursor: pointer;
-              position: fixed;
-              bottom: $body-margin-bottom;
-              right: $body-margin-x;
-              z-index: 999;
-              display: flex;
-              align-items: center;
-              padding: 0.4rem 1.2rem;
-              border-radius: 10rem;
-              background-color: white;
-              transition: background-color 0.3s ease-out;
-
-              > div {
-                margin-right: 1rem;
-                > p {
-                  font-size: $sm-font-size-mobile;
-                  @media screen and (min-width: $desktop-min-width) {
-                    font-size: $sm-font-size-desktop;
-                  }
-                }
-              }
-              > .switch {
-                position: relative;
-                display: inline-block;
-                width: 2.2rem;
-                height: 1.2rem;
-                > input {
-                  opacity: 0;
-                  width: 0;
-                  height: 0;
-                  &:checked + .slider {
-                    background-color: $brand-color;
-                  }
-                  &:focus + .slider {
-                    box-shadow: 0 0 1px $brand-color;
-                  }
-                  &:checked + .slider::before {
-                    -webkit-transform: translateX(1rem);
-                    -ms-transform: translateX(1rem);
-                    transform: translateX(1rem);
-                  }
-                }
-                > .slider {
-                  position: absolute;
-                  cursor: pointer;
-                  top: 0;
-                  left: 0;
-                  right: 0;
-                  bottom: 0;
-                  border-radius: 34px;
-                  background-color: $main-color-light;
-                  -webkit-transition: .4s;
-                  transition: .4s;
-                  &::before {
-                    position: absolute;
-                    content: "";
-                    height: 1rem;
-                    width: 1rem;
-                    border-radius: 50%;
-                    left: 0.1rem;
-                    bottom: 0.1rem;
-                    background-color: $light-color;
-                    -webkit-transition: .4s;
-                    transition: .4s;
-                  }
-                }
-              }
-            }
           }
           > .user-login-form {
             height: 90vh;

web/themes/custom/caravane/templates/layout--threecol-25-50-25.html.twig

@@ -52,6 +52,5 @@
       </div>
     {% endif %}
     <div id="content-modale"></div>
-    <div id="animation-toggle"></div>
   </div>
 {% endif %}