From dafd8bb325ebf2f011990b3816d773d26b07cc4b Mon Sep 17 00:00:00 2001
From: Will Freeman <hohosanta@me.com>
Date: Fri, 28 Mar 2025 13:41:21 -0600
Subject: [PATCH] allow ?fullscreen=true for embedded map support

---
 webapp/src/App.vue                   | 89 ++++++++++++++--------------
 webapp/src/components/LeafletMap.vue | 10 +++-
 webapp/src/views/Map.vue             |  7 ++-
 3 files changed, 59 insertions(+), 47 deletions(-)

diff --git a/webapp/src/App.vue b/webapp/src/App.vue
index 15c1d92..11e354c 100644
--- a/webapp/src/App.vue
+++ b/webapp/src/App.vue
@@ -6,6 +6,7 @@ import { useTheme } from 'vuetify';
 const theme = useTheme();
 const router = useRouter();
 const isDark = computed(() => theme.name.value === 'dark');
+const isFullscreen = computed(() => router.currentRoute.value?.query.fullscreen === 'true');
 
 function toggleTheme() {
   const newTheme = theme.global.name.value === 'dark' ? 'light' : 'dark';
@@ -46,53 +47,55 @@ watch(() => theme.global.name.value, (newTheme) => {
 
 <template>
   <v-app>
-    <v-app-bar
-      flat
-      prominent
-    >
-      <v-app-bar-nav-icon variant="text" @click.stop="drawer = !drawer"></v-app-bar-nav-icon>
+    <template v-if="!isFullscreen">
+      <v-app-bar
+        flat
+        prominent
+      >
+        <v-app-bar-nav-icon variant="text" @click.stop="drawer = !drawer"></v-app-bar-nav-icon>
 
-      <v-toolbar-title>
-        <v-img style="cursor: pointer" height="36" width="130" src="/deflock-logo.svg" @click="router.push('/')" />
-      </v-toolbar-title>
+        <v-toolbar-title>
+          <v-img style="cursor: pointer" height="36" width="130" src="/deflock-logo.svg" @click="router.push('/')" />
+        </v-toolbar-title>
 
-      <v-spacer></v-spacer>
+        <v-spacer></v-spacer>
 
-      <!-- <v-btn icon>
-        <v-icon @click="toggleTheme">mdi-theme-light-dark</v-icon>
-      </v-btn> -->
-    </v-app-bar>
+        <!-- <v-btn icon>
+          <v-icon @click="toggleTheme">mdi-theme-light-dark</v-icon>
+        </v-btn> -->
+      </v-app-bar>
 
-    <v-navigation-drawer
-      v-model="drawer"
-      temporary
-    >
-      <v-list nav>
-        <v-list-subheader>DeFlock</v-list-subheader>
-        <v-list-item
-          v-for="item in items"
-          :key="item.title"
-          link
-          :to="item.to"
-        ><v-icon start>{{ item.icon }}</v-icon>{{ item.title }}</v-list-item>
-        
-        <v-divider />
-        
-        <v-list-subheader>Get Involved</v-list-subheader>
-        <v-list-item
-          v-for="item in metaItems"
-          :key="item.title"
-          link
-          :to="item.to"
-          :href="item.href"
-          :target="{ '_blank': item.href }"
-        >
-          <v-icon v-if="item.icon" start>{{ item.icon }}</v-icon>
-            <v-img v-else-if="item.customIcon" class="mr-2 custom-icon" contain width="24" height="24" :src="isDark ? item.customIconDark : item.customIcon" style="vertical-align: middle;" />
-            <span style="vertical-align: middle;">{{ item.title }}</span>
-        </v-list-item>
-      </v-list>
-    </v-navigation-drawer>
+      <v-navigation-drawer
+        v-model="drawer"
+        temporary
+      >
+        <v-list nav>
+          <v-list-subheader>DeFlock</v-list-subheader>
+          <v-list-item
+            v-for="item in items"
+            :key="item.title"
+            link
+            :to="item.to"
+          ><v-icon start>{{ item.icon }}</v-icon>{{ item.title }}</v-list-item>
+          
+          <v-divider />
+          
+          <v-list-subheader>Get Involved</v-list-subheader>
+          <v-list-item
+            v-for="item in metaItems"
+            :key="item.title"
+            link
+            :to="item.to"
+            :href="item.href"
+            :target="{ '_blank': item.href }"
+          >
+            <v-icon v-if="item.icon" start>{{ item.icon }}</v-icon>
+              <v-img v-else-if="item.customIcon" class="mr-2 custom-icon" contain width="24" height="24" :src="isDark ? item.customIconDark : item.customIcon" style="vertical-align: middle;" />
+              <span style="vertical-align: middle;">{{ item.title }}</span>
+          </v-list-item>
+        </v-list>
+      </v-navigation-drawer>
+    </template>
 
     <v-main>
       <RouterView />
diff --git a/webapp/src/components/LeafletMap.vue b/webapp/src/components/LeafletMap.vue
index a52b502..261974a 100644
--- a/webapp/src/components/LeafletMap.vue
+++ b/webapp/src/components/LeafletMap.vue
@@ -1,5 +1,8 @@
 <template>
-  <div id="map">
+  <div id="map" :style="{
+    height: isFullScreen ? '100dvh' : 'calc(100dvh - 64px)',
+    marginTop: isFullScreen ? '0' : '64px',
+  }">
     <div class="topleft">
       <slot name="topleft"></slot>
     </div>
@@ -16,6 +19,8 @@ import L, { type LatLngTuple, type FeatureGroup, type MarkerClusterGroup, type M
 import type { ALPR } from '@/types';
 import DFMapPopup from './DFMapPopup.vue';
 import { createVuetify } from 'vuetify'
+import { useRoute } from 'vue-router';
+import { computed } from 'vue';
 import 'leaflet/dist/leaflet.css';
 import 'leaflet.markercluster';
 import 'leaflet.markercluster/dist/MarkerCluster.Default.css';
@@ -26,6 +31,7 @@ const MARKER_COLOR = 'rgb(63,84,243)';
 // Internal State Management
 const markerMap = new Map<string, Marker | CircleMarker>();
 const isInternalUpdate = ref(false);
+const isFullScreen = computed(() => useRoute().query.fullscreen === 'true');
 
 const props = defineProps({
   center: {
@@ -278,8 +284,6 @@ function registerMapEvents() {
 @import 'leaflet.markercluster/dist/MarkerCluster.css';
 
 #map {
-  height: calc(100dvh - 64px);
-  margin-top: 64px;
   width: 100%;
   position: absolute;
   top: 0;
diff --git a/webapp/src/views/Map.vue b/webapp/src/views/Map.vue
index 7b8fb64..aa5f3db 100644
--- a/webapp/src/views/Map.vue
+++ b/webapp/src/views/Map.vue
@@ -140,8 +140,13 @@ function updateURL() {
     return;
   }
 
+  const currentRoute = router.currentRoute.value;
+  const newHash = `#map=${zoom.value}/${center.value.lat.toFixed(6)}/${center.value.lng.toFixed(6)}`;
+
   router.replace({
-    hash: `#map=${zoom.value}/${center.value.lat.toFixed(6)}/${center.value.lng.toFixed(6)}`
+    path: currentRoute.path,
+    query: currentRoute.query,
+    hash: newHash,
   });
 }