@@ -114,4 +116,4 @@
{m.scout_start()}
-
\ No newline at end of file
+
diff --git a/src/components/ui/BottomNav.svelte b/src/components/ui/BottomNav.svelte
index 6bcfca4..e9e594e 100644
--- a/src/components/ui/BottomNav.svelte
+++ b/src/components/ui/BottomNav.svelte
@@ -1,21 +1,20 @@
@@ -48,9 +47,7 @@
{@const Icon = btn.icon}
{#snippet icon()}
-
-
+
{/snippet}
- import { slide } from 'svelte/transition';
+ import { slide } from "svelte/transition";
import { Binoculars, Clipboard, Navigation, Pin } from "lucide-svelte";
- import ContextMenuItem from '@/components/ui/contextmenu/ContextMenuItem.svelte';
- import * as m from '@/lib/paraglide/messages';
-
- import { getContextMenuEvent, getIsContextMenuOpen, setIsContextMenuOpen } from '@/lib/ui/contextmenu.svelte.js';
- import { onClickOutside } from 'runed';
- import { openMenu } from '@/lib/ui/menus.svelte.js';
- import { setCurrentScoutCenter, setCurrentScoutCoords } from '@/lib/features/scout.svelte.js';
- import { Coords } from '@/lib/utils/coordinates';
+ import ContextMenuItem from "@/components/ui/contextmenu/ContextMenuItem.svelte";
+ import * as m from "@/lib/paraglide/messages";
+
+ import { getContextMenuEvent, getIsContextMenuOpen, setIsContextMenuOpen } from "@/lib/ui/contextmenu.svelte.js";
+ import { onClickOutside } from "runed";
+ import { Menu, openMenu } from "@/lib/ui/menus.svelte.js";
+ import { setCurrentScoutCenter, setCurrentScoutCoords } from "@/lib/features/scout.svelte.js";
+ import { Coords } from "@/lib/utils/coordinates";
import {
backupShareUrl,
canBackupShare,
@@ -17,9 +17,9 @@
isMenuSidebar,
isUiLeft
} from "@/lib/utils/device";
- import { getMapsUrl } from '@/lib/utils/mapUrl';
- import { hasFeatureAnywhere } from '@/lib/services/user/checkPerm';
- import { getUserDetails } from '@/lib/services/user/userDetails.svelte';
+ import { getMapsUrl } from "@/lib/utils/mapUrl";
+ import { hasFeatureAnywhere } from "@/lib/services/user/checkPerm";
+ import { getUserDetails } from "@/lib/services/user/userDetails.svelte";
import { getMap } from "@/lib/map/map.svelte";
import { Features } from "@/lib/utils/features";
@@ -76,7 +76,7 @@
const center = Coords.infer(event.lngLat)
setCurrentScoutCoords([center])
setCurrentScoutCenter(center)
- openMenu("scout")
+ openMenu(Menu.SCOUT)
}
function shareMapPosition() {
diff --git a/src/hooks.server.ts b/src/hooks.server.ts
index cf487c5..f84c9c3 100644
--- a/src/hooks.server.ts
+++ b/src/hooks.server.ts
@@ -16,6 +16,19 @@ import type { Perms } from "@/lib/utils/features";
import { getServerLogger } from "@/lib/server/logging";
import { setServerLoggerFactory } from "@/lib/utils/logger";
import { getServerConfig } from "@/lib/services/config/config.server";
+import { paraglideMiddleware } from "@/lib/paraglide/server";
+import { sequence } from "@sveltejs/kit/hooks";
+
+const paraglideHandle: Handle = ({ event, resolve }) =>
+ paraglideMiddleware(
+ event.request,
+ ({ request: localizedRequest, locale }) => {
+ event.request = localizedRequest;
+ return resolve(event, {
+ transformPageChunk: ({ html }) => html.replace("%lang%", locale),
+ });
+ },
+ );
setServerLoggerFactory((name) => {
const winstonLogger = getServerLogger(name);
@@ -89,4 +102,4 @@ const handleAuth: Handle = async ({ event, resolve }) => {
return resolve(event);
};
-export const handle: Handle = handleAuth;
+export const handle: Handle = sequence(paraglideHandle, handleAuth);
diff --git a/src/lib/map/map.svelte.ts b/src/lib/map/map.svelte.ts
index 7f80597..7bc009a 100644
--- a/src/lib/map/map.svelte.ts
+++ b/src/lib/map/map.svelte.ts
@@ -1,5 +1,5 @@
import maplibre from "maplibre-gl";
-import { openMenu } from "@/lib/ui/menus.svelte.js";
+import { closeMenu, openMenu } from "@/lib/ui/menus.svelte.js";
let map: maplibre.Map | undefined = $state(undefined);
@@ -12,7 +12,7 @@ export function setMap(newMap: maplibre.Map | undefined) {
}
export function resetMap() {
- openMenu(null);
+ closeMenu()
// closePopup();
map?.easeTo({
bearing: 0,
diff --git a/src/lib/mapObjects/interact.ts b/src/lib/mapObjects/interact.ts
index 6ca01c6..f4276fc 100644
--- a/src/lib/mapObjects/interact.ts
+++ b/src/lib/mapObjects/interact.ts
@@ -11,7 +11,7 @@ import { getMapPath } from "@/lib/utils/getMapPath";
import type { MapData } from "@/lib/mapObjects/mapObjectTypes";
import { getMap } from "@/lib/map/map.svelte";
import { MapObjectLayerId } from "@/lib/map/layers";
-import { openMenu } from "@/lib/ui/menus.svelte";
+import { closeMenu, openMenu } from "@/lib/ui/menus.svelte";
export function closePopup() {
setCurrentSelectedData(null);
@@ -64,7 +64,7 @@ export function clickMapHandler(event: MapMouseEvent) {
if (feature) {
openPopup(getMapObjects()[feature.properties.id])
} else {
- openMenu(null)
+ closeMenu()
closePopup()
}
}
\ No newline at end of file
diff --git a/src/lib/ui/menus.svelte.ts b/src/lib/ui/menus.svelte.ts
index 48544a3..0d93f6f 100644
--- a/src/lib/ui/menus.svelte.ts
+++ b/src/lib/ui/menus.svelte.ts
@@ -1,11 +1,19 @@
-export type MenuTypes = null | "profile" | "filters" | "scout"
+export enum Menu {
+ PROFILE = "profile",
+ FILTERS = "filters",
+ SCOUT = "scout"
+}
-let openedMenu: MenuTypes = $state(null)
+let openedMenu: Menu | null = $state(null)
-export function openMenu(type: MenuTypes) {
+export function openMenu(type: Menu) {
openedMenu = type
}
+export function closeMenu() {
+ openedMenu = null
+}
+
export function getOpenedMenu() {
return openedMenu;
}
diff --git a/src/lib/utils/device.ts b/src/lib/utils/device.ts
index 5def620..f367cc0 100644
--- a/src/lib/utils/device.ts
+++ b/src/lib/utils/device.ts
@@ -40,5 +40,16 @@ export function backupShareUrl(url: string) {
}
export function hasTouch() {
- return "ontouchstart" in window || (navigator?.maxTouchPoints ?? 0) > 0 || (navigator?.msMaxTouchPoints ?? 0) > 0;
+ return (
+ "ontouchstart" in window ||
+ (navigator?.maxTouchPoints ?? 0) > 0 ||
+ (navigator?.msMaxTouchPoints ?? 0) > 0
+ );
+}
+
+export function isMobileWebKit() {
+ return (
+ /iPad|iPhone|iPod/.test(navigator.userAgent) ||
+ (navigator.userAgent.includes("Mac") && navigator.maxTouchPoints > 1)
+ );
}
diff --git a/src/routes/[[map=map]]/+page.svelte b/src/routes/[[map=map]]/+page.svelte
index 5f18b9c..1b34a77 100644
--- a/src/routes/[[map=map]]/+page.svelte
+++ b/src/routes/[[map=map]]/+page.svelte
@@ -8,10 +8,9 @@
import { isSupportedFeature } from "@/lib/services/supportedFeatures";
import { getUserDetails } from "@/lib/services/user/userDetails.svelte.js";
import SignInButton from "@/components/ui/user/SignInButton.svelte";
- import { getOpenedMenu, openMenu } from "@/lib/ui/menus.svelte.js";
+ import { closeMenu, getOpenedMenu, openMenu } from "@/lib/ui/menus.svelte.js";
import Fabs from "@/components/ui/fab/Fabs.svelte";
import PopupContainer from "@/components/ui/popups/PopupContainer.svelte";
- import MobileMenu from "@/components/menus/MobileMenu.svelte";
import DesktopMenu from "@/components/menus/DesktopMenu.svelte";
import { hasLoadedFeature, LoadedFeature } from "@/lib/services/initialLoad.svelte.js";
import Metadata from "@/components/utils/Metadata.svelte";
@@ -33,11 +32,12 @@
import { Search } from "lucide-svelte";
import { isOpenModal } from "@/lib/ui/modal.svelte";
import ActiveSearchView from "@/components/ui/search/ActiveSearchView.svelte";
+ import MobileMenu from "@/components/menus/mobile/MobileMenu.svelte";
$effect(() => {
// When opening a popup on mobile while in a menu, close the menu
if (getCurrentSelectedData() && !isMenuSidebar()) {
- openMenu(null);
+ closeMenu()
}
});