From d680cae84d6d0049eb43ab6ba7472ffedc325253 Mon Sep 17 00:00:00 2001
From: Alexis <35.alexis.pele@gmail.com>
Date: Wed, 10 Jan 2024 21:03:37 +0100
Subject: [PATCH] Refactored tag list in their own component

---
 src/assets/scss/theme.scss                    |   2 +
 src/components/maps/WorldMap.astro            |   6 +
 src/components/maps/overlay/MarkerCreator.vue |   2 +-
 src/components/maps/overlay/SearchMarkers.vue | 167 +++-------------
 .../maps/overlay/SearchMarkersTags.vue        | 182 ++++++++++++++++++
 src/types/Leaflet.ts                          |  10 +-
 src/types/Search.ts                           |   8 +
 7 files changed, 236 insertions(+), 141 deletions(-)
 create mode 100644 src/components/maps/overlay/SearchMarkersTags.vue
 create mode 100644 src/types/Search.ts

diff --git a/src/assets/scss/theme.scss b/src/assets/scss/theme.scss
index f039a4d3..94ee8c61 100644
--- a/src/assets/scss/theme.scss
+++ b/src/assets/scss/theme.scss
@@ -28,6 +28,8 @@
     --blue-700: #0284c7;
     --orange-500: #f97316;
     --orange-700: #c2410c;
+    --purple-500: #8b5cf6;
+    --purple-700: #6d28d9;
 }
 
 html {
diff --git a/src/components/maps/WorldMap.astro b/src/components/maps/WorldMap.astro
index f2ade415..e9e45857 100644
--- a/src/components/maps/WorldMap.astro
+++ b/src/components/maps/WorldMap.astro
@@ -44,6 +44,8 @@ const inertiaDeceleration = 2000
 const maxBoundsPadding = 10
 const maxBoundsViscosity = .75
 
+const mapEl = document.getElementById('world')
+
 // Initializes the map
 const map = L.map('world', {
     crs: L.CRS.Simple,
@@ -296,6 +298,10 @@ let customMarkersList = []
 
 function saveCustomMarkers() {
     localStorage.setItem('custom-markers', JSON.stringify(customMarkersList))
+
+    const refreshCustomMarkersEvent = new CustomEvent('refresh-custom-markers', { bubbles: true })
+
+    mapEl.dispatchEvent(refreshCustomMarkersEvent)
 }
 
 // Stores last map coords on context
diff --git a/src/components/maps/overlay/MarkerCreator.vue b/src/components/maps/overlay/MarkerCreator.vue
index febbcd18..a99e497f 100644
--- a/src/components/maps/overlay/MarkerCreator.vue
+++ b/src/components/maps/overlay/MarkerCreator.vue
@@ -260,7 +260,7 @@ dialog {
     }
 
     &::backdrop {
-        background-color: rgba(0, 0, 0, 0.15);
+        backdrop-filter: blur(1px);
     }
 
     &.open {
diff --git a/src/components/maps/overlay/SearchMarkers.vue b/src/components/maps/overlay/SearchMarkers.vue
index 33abc75a..eb55e584 100644
--- a/src/components/maps/overlay/SearchMarkers.vue
+++ b/src/components/maps/overlay/SearchMarkers.vue
@@ -1,25 +1,26 @@
 <script setup lang="ts">
 import type { MapMarker, MapMarkerGroup, PlayerMarker } from '@/types/Leaflet';
-import { useFocus, useMagicKeys, whenever } from '@vueuse/core';
+import type { SearchMode } from '@/types/Search';
+import { useFocus, useLocalStorage, useMagicKeys, whenever } from '@vueuse/core';
 import { computed, onMounted, ref, onUpdated, watch } from 'vue';
+import SearchMarkersTags from './SearchMarkersTags.vue';
 
 const props = defineProps<{
     markers: MapMarker[],
     players: PlayerMarker,
 }>()
 
-const markers = props.markers
+const fixedMarkers = props.markers
+const customMarkersData = useLocalStorage('custom-markers', [])
+
+const allMarkers = computed(() => {
+    return [...fixedMarkers, ...customMarkersData.value]
+})
 
 // Search functions
 const qInput = ref()
 const { focused: isFocused } = useFocus(qInput)
 
-/**
- * Available advanced search modes
- * Currently only groups MapMarkerGroup and string "query"
- */
- type SearchMode = "query" | MapMarkerGroup
-
 const currentSearchMode = ref<SearchMode>('query')
 
 onMounted(() => {
@@ -39,7 +40,7 @@ const unifier = new RegExp(/[^a-zA-Z0-9\-\'']/g)
  */
 const filteredMarkers = computed(() => {
     if (currentSearchMode.value === "query") {
-        return markers?.filter(m => {
+        return allMarkers.value?.filter(m => {
             const queryString = new String(q.value).replace(unifier, "").toLocaleLowerCase()
             const hitTitle = m.title.replace(unifier, "").toLocaleLowerCase().includes(queryString)
             const hitDesc = m.description?.replace(unifier, "").toLocaleLowerCase().includes(queryString)
@@ -48,7 +49,7 @@ const filteredMarkers = computed(() => {
         })
     }
 
-    return markers?.filter(m => {
+    return allMarkers.value?.filter(m => {
         return m.group === currentSearchMode.value
     })
 })
@@ -115,14 +116,11 @@ onUpdated(() => {
  * Advanced Search Mode
  * Uses filters to show specific kinds of markers in the search results
  */
-
-// TODO: This should be refactored with better type checking
-// It does the job for now but will be a pain if I had another feature that uses group sorting
 const hasGroupFilter = computed(() => {
     return currentSearchMode.value !== 'query'
 })
 
-function setActiveCategory(g: MapMarkerGroup) {
+function handleCategorySwitch(g: MapMarkerGroup) {
     resetQueryValue()
 
     if (currentSearchMode.value !== g) {
@@ -166,6 +164,17 @@ function resetAllFields(actionAfter?: "focusAfter") {
 
     if (actionAfter === "focusAfter") isFocused.value = true
 }
+
+/**
+ * CUSTOM MARKERS HANDLING
+ * This is really dirty (to me at least)
+ * It should probably be handled by a store system, but nanostores doesn't mesh well 
+ */
+onMounted(() => {
+    document.addEventListener('refresh-custom-markers', () => {
+        customMarkersData.value = useLocalStorage('custom-markers', []).value
+    })
+})
 </script>
 
 <template>
@@ -209,61 +218,11 @@ function resetAllFields(actionAfter?: "focusAfter") {
             </ul>
         </div>
 
-        <menu class="tag-list">
-            <li>
-                <button
-                    @click="setActiveCategory('quests')"
-                    class="red"
-                    :class="{
-                        'active': currentSearchMode === 'quests'
-                    }"
-                >
-                    <span class="icon">
-                        <i v-if="currentSearchMode === 'quests'" class="ph-bold ph-check"></i>
-                        <i v-else class="ph-fill ph-flag-banner"></i>
-                    </span>
-                    <span class="label">
-                        Quêtes
-                    </span>
-                </button>
-            </li>
-
-            <li>
-                <button
-                    @click="setActiveCategory('capitals')"
-                    class="blue"
-                    :class="{
-                        'active': currentSearchMode === 'capitals'
-                    }"
-                >
-                    <span class="icon">
-                        <i v-if="currentSearchMode === 'capitals'" class="ph-bold ph-check"></i>
-                        <i v-else class="ph-fill ph-castle-turret"></i>
-                    </span>
-                    <span class="label">
-                        Capitales
-                    </span>
-                </button>
-            </li>
-
-            <li>
-                <button
-                    @click="setActiveCategory('landmarks')"
-                    class="orange"
-                    :class="{
-                        'active': currentSearchMode === 'landmarks'
-                    }"
-                >
-                    <span class="icon">
-                        <i v-if="currentSearchMode === 'landmarks'" class="ph-bold ph-check"></i>
-                        <i v-else class="ph-fill ph-lighthouse"></i>
-                    </span>
-                    <span class="label">
-                        Points d'intérêt
-                    </span>
-                </button>
-            </li>
-        </menu>
+        <SearchMarkersTags
+            :current-search-mode="currentSearchMode"
+            :custom-markers="customMarkersData"
+            @on-category-switch="handleCategorySwitch"
+        />
     </nav>
 </template>
 
@@ -491,75 +450,5 @@ function resetAllFields(actionAfter?: "focusAfter") {
             }
         }
     }
-
-    /**
-    * TAG LIST
-    */
-    .tag-list {
-        display: flex;
-        gap: .5rem;
-        margin-top: .5rem;
-
-        button {
-            display: inline-flex;
-            align-items: center;
-            gap: .5ch;
-            padding-block: .25rem;
-            padding-inline: .8rem;
-            font-weight: 600;
-            font-size: .85em;
-            background: var(--white);
-            border: 1px solid var(--slate-400);
-            border-radius: 100vmax;
-            box-shadow: rgba(0, 0, 0, 0.1) 0px 4px 12px;
-            pointer-events: all;
-            cursor: pointer;
-            outline: .2rem solid transparent;
-            transition-property: color, background-color, border-color, outline-color;
-            transition-duration: .15s;
-            transition-timing-function: cubic-bezier(0.445, 0.05, 0.55, 0.95);
-
-            @media screen and (width < 900px) {
-                font-size: .76em;
-            }
-
-            .icon {
-                font-size: 1.1em;
-            }
-
-            .label {
-                text-underline-offset: .15rem;
-            }
-
-            $colors: 'red', 'blue', 'orange';
-
-            @each $c in $colors {
-                &.#{$c} {
-                    &.active {
-                        color: var(--white);
-                        background-color: var(--#{$c}-500);
-                        border-color: var(--#{$c}-700);
-                    }
-
-                    &:not(.active) {
-                        &:hover,
-                        &:focus-visible {
-                            color: var(--#{$c}-500);
-                        }
-                    }
-
-                    &:hover,
-                    &:focus-visible {
-                        outline-color: color-mix(in srgb, var(--#{$c}-500) 20%, transparent);
-                        border-color: var(--#{$c}-500);
-                        
-                        .label {
-                            text-decoration: underline;
-                        }
-                    }
-                }
-            }
-        }
-    }
 }
 </style>
\ No newline at end of file
diff --git a/src/components/maps/overlay/SearchMarkersTags.vue b/src/components/maps/overlay/SearchMarkersTags.vue
new file mode 100644
index 00000000..5df4a18f
--- /dev/null
+++ b/src/components/maps/overlay/SearchMarkersTags.vue
@@ -0,0 +1,182 @@
+<script lang="ts" setup>
+import type { MapMarker, MapMarkerGroup } from '@/types/Leaflet';
+import type { SearchMode } from '@/types/Search';
+
+defineProps<{
+    currentSearchMode: SearchMode,
+    customMarkers: MapMarker[]
+}>()
+
+const emit = defineEmits<{
+    (e: 'on-category-switch', cat: MapMarkerGroup): void
+}>()
+
+function emitCategorySwitch(newCategory: MapMarkerGroup) {
+    emit('on-category-switch', newCategory)
+}
+</script>
+
+<template>
+    <menu class="tag-list">
+        <TransitionGroup name="tag-menu">
+            <li>
+                <button
+                    @click="emitCategorySwitch('quests')"
+                    class="red"
+                    :class="{
+                        'active': currentSearchMode === 'quests'
+                    }"
+                >
+                    <span class="icon">
+                        <i v-if="currentSearchMode === 'quests'" class="ph-bold ph-check"></i>
+                        <i v-else class="ph-fill ph-flag-banner"></i>
+                    </span>
+                    <span class="label">
+                        Quêtes
+                    </span>
+                </button>
+            </li>
+
+            <li>
+                <button
+                    @click="emitCategorySwitch('capitals')"
+                    class="blue"
+                    :class="{
+                        'active': currentSearchMode === 'capitals'
+                    }"
+                >
+                    <span class="icon">
+                        <i v-if="currentSearchMode === 'capitals'" class="ph-bold ph-check"></i>
+                        <i v-else class="ph-fill ph-castle-turret"></i>
+                    </span>
+                    <span class="label">
+                        Capitales
+                    </span>
+                </button>
+            </li>
+
+            <li>
+                <button
+                    @click="emitCategorySwitch('landmarks')"
+                    class="orange"
+                    :class="{
+                        'active': currentSearchMode === 'landmarks'
+                    }"
+                >
+                    <span class="icon">
+                        <i v-if="currentSearchMode === 'landmarks'" class="ph-bold ph-check"></i>
+                        <i v-else class="ph-fill ph-lighthouse"></i>
+                    </span>
+                    <span class="label">
+                        Points d'intérêt
+                    </span>
+                </button>
+            </li>
+
+            <li v-if="customMarkers.length > 0">
+                <button
+                    @click="emitCategorySwitch('custom')"
+                    class="purple"
+                    :class="{
+                        'active': currentSearchMode === 'custom'
+                    }"
+                >
+                    <span class="icon">
+                        <i v-if="currentSearchMode === 'custom'" class="ph-bold ph-check"></i>
+                        <i v-else class="ph-fill ph-user-circle"></i>
+                    </span>
+                    <span class="label">
+                        Personnels
+                    </span>
+                </button>
+            </li>
+        </TransitionGroup>
+    </menu>
+</template>
+
+<style lang="scss" scoped>
+.tag-list {
+    display: flex;
+    gap: .5rem;
+    margin-top: .5rem;
+
+    .tag-menu-move, /* apply transition to moving elements */
+    .tag-menu-enter-active,
+    .tag-menu-leave-active {
+        transition: all 0.5s ease;
+    }
+
+    .tag-menu-enter-from,
+    .tag-menu-leave-to {
+        opacity: 0;
+        transform: translateX(30px);
+    }
+
+    /* ensure leaving items are taken out of layout flow so that moving
+    animations can be calculated correctly. */
+    .tag-menu-leave-active {
+        position: absolute;
+    }
+
+    button {
+        display: inline-flex;
+        align-items: center;
+        gap: .5ch;
+        padding-block: .25rem;
+        padding-inline: .8rem;
+        font-weight: 600;
+        font-size: .85em;
+        background: var(--white);
+        border: 1px solid var(--slate-400);
+        border-radius: 100vmax;
+        box-shadow: rgba(0, 0, 0, 0.1) 0px 4px 12px;
+        pointer-events: all;
+        cursor: pointer;
+        outline: .2rem solid transparent;
+        transition-property: color, background-color, border-color, outline-color;
+        transition-duration: .15s;
+        transition-timing-function: cubic-bezier(0.445, 0.05, 0.55, 0.95);
+
+        @media screen and (width < 900px) {
+            font-size: .76em;
+        }
+
+        .icon {
+            font-size: 1.1em;
+        }
+
+        .label {
+            text-underline-offset: .15rem;
+        }
+
+        $colors: 'red', 'blue', 'orange', 'purple';
+
+        @each $c in $colors {
+            &.#{$c} {
+                &.active {
+                    color: var(--white);
+                    background-color: var(--#{$c}-500);
+                    border-color: var(--#{$c}-700);
+                }
+
+                &:not(.active) {
+                    &:hover,
+                    &:focus-visible {
+                        color: var(--#{$c}-500);
+                    }
+                }
+
+                &:hover,
+                &:focus-visible {
+                    outline-color: color-mix(in srgb, var(--#{$c}-500) 20%, transparent);
+                    border-color: var(--#{$c}-500);
+                    
+                    .label {
+                        text-decoration: underline;
+                    }
+                }
+            }
+        }
+    }
+}
+</style>
\ No newline at end of file
diff --git a/src/types/Leaflet.ts b/src/types/Leaflet.ts
index ee0b9926..50c3736a 100644
--- a/src/types/Leaflet.ts
+++ b/src/types/Leaflet.ts
@@ -1,4 +1,5 @@
-export type MapMarkerGroup = "capitals" | "cities" | "towns" | "landmarks" | "quests";
+export type MapMarkerGroup = "capitals" | "cities" | "towns" | "landmarks" | "quests" | "custom";
+
 export type MapCoords = {
     x: number,
     y: number,
@@ -18,3 +19,10 @@ export type PlayerMarker = {
     description?: string,
     link?: string,
 }
+
+export type CustomMarker = {
+    lat: number,
+    lon: number,
+    title: string,
+    icon: Object
+}
diff --git a/src/types/Search.ts b/src/types/Search.ts
new file mode 100644
index 00000000..9934c5a0
--- /dev/null
+++ b/src/types/Search.ts
@@ -0,0 +1,8 @@
+import type { MapMarkerGroup } from "./Leaflet";
+
+/**
+ * Available advanced search modes for the filter functions
+ *
+ * Currently only groups MapMarkerGroup and string "query"
+ */
+export type SearchMode = "query" | MapMarkerGroup
\ No newline at end of file