From 14421be7e0824300fc67ba677d3e87a65d809308 Mon Sep 17 00:00:00 2001 From: bwees Date: Sat, 14 Nov 2026 14:57:43 -0600 Subject: [PATCH 1/4] feat(web): add header with logo and app download button --- src/lib/assets/logo.png | Bin 0 -> 11232 bytes src/lib/components/WebHeader.svelte | 24 ++++++++++++++++++++++ src/lib/utils/app-store.test.ts | 30 ++++++++++++++++++++++++++++ src/lib/utils/app-store.ts | 29 +++++++++++++++++++++++++++ src/lib/utils/app-version.ts | 9 ++++----- src/routes/+layout.svelte | 6 ++++++ 6 files changed, 93 insertions(+), 5 deletions(-) create mode 100644 src/lib/assets/logo.png create mode 100644 src/lib/components/WebHeader.svelte create mode 100644 src/lib/utils/app-store.test.ts create mode 100644 src/lib/utils/app-store.ts diff --git a/src/lib/assets/logo.png b/src/lib/assets/logo.png new file mode 100644 index 0000000000000000000000000000000000000000..ce2e9b3ce89a32ef53f2abe3fc2c7d0b0832f2fd GIT binary patch literal 11232 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 + import logo from '$lib/assets/logo.png'; + import Button from '$lib/components/ui/button/button.svelte'; + import { detectStorePlatform, storeUrl } from '$lib/utils/app-store'; + import { Download } from '@lucide/svelte'; + + const storePlatform = detectStorePlatform(navigator.userAgent, navigator.maxTouchPoints); + + +
+
+ + Maroon Rides +
+ + {#if storePlatform} + + {/if} +
diff --git a/src/lib/utils/app-store.test.ts b/src/lib/utils/app-store.test.ts new file mode 100644 index 00000000..d4316d8d --- /dev/null +++ b/src/lib/utils/app-store.test.ts @@ -0,0 +1,30 @@ +import { describe, expect, it } from 'vitest'; +import { detectStorePlatform, StorePlatform } from './app-store'; + +const IPHONE = + 'Mozilla/5.0 (iPhone; CPU iPhone OS 18_0 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/18.0 Mobile/15E148 Safari/604.1'; +const ANDROID = + 'Mozilla/5.0 (Linux; Android 15; Pixel 9) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/130.0.0.0 Mobile Safari/537.36'; +const MAC = + 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/18.0 Safari/605.1.15'; +const WINDOWS = + 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/130.0.0.0 Safari/537.36'; + +describe('detectStorePlatform', () => { + it('sends iPhones to the App Store', () => { + expect(detectStorePlatform(IPHONE, 5)).toBe(StorePlatform.IOS); + }); + + it('sends Android phones to the Play Store', () => { + expect(detectStorePlatform(ANDROID, 5)).toBe(StorePlatform.ANDROID); + }); + + it('treats a touch-capable Mac user agent as an iPad', () => { + expect(detectStorePlatform(MAC, 5)).toBe(StorePlatform.IOS); + }); + + it('has no store for desktop browsers', () => { + expect(detectStorePlatform(MAC, 0)).toBeNull(); + expect(detectStorePlatform(WINDOWS, 0)).toBeNull(); + }); +}); diff --git a/src/lib/utils/app-store.ts b/src/lib/utils/app-store.ts new file mode 100644 index 00000000..129d5b29 --- /dev/null +++ b/src/lib/utils/app-store.ts @@ -0,0 +1,29 @@ +export enum StorePlatform { + IOS = 'ios', + ANDROID = 'android', +} + +const STORE_URLS: Record = { + [StorePlatform.IOS]: 'https://apps.apple.com/app/id6475358068', + [StorePlatform.ANDROID]: + 'https://play.google.com/store/apps/details?id=com.maroonrides.maroonrides', +}; + +const IOS_USER_AGENT = /iPhone|iPad|iPod/; +const ANDROID_USER_AGENT = /Android/; +const MAC_USER_AGENT = /Macintosh/; + +export function storeUrl(platform: StorePlatform): string { + return STORE_URLS[platform]; +} + +// iPadOS Safari reports itself as a Mac, so touch support is what tells them apart. +export function detectStorePlatform( + userAgent: string, + maxTouchPoints: number, +): StorePlatform | null { + if (ANDROID_USER_AGENT.test(userAgent)) return StorePlatform.ANDROID; + if (IOS_USER_AGENT.test(userAgent)) return StorePlatform.IOS; + if (MAC_USER_AGENT.test(userAgent) && maxTouchPoints > 1) return StorePlatform.IOS; + return null; +} diff --git a/src/lib/utils/app-version.ts b/src/lib/utils/app-version.ts index bf2bccaa..0b81da8c 100644 --- a/src/lib/utils/app-version.ts +++ b/src/lib/utils/app-version.ts @@ -1,17 +1,16 @@ import { AppLauncher } from '@capacitor/app-launcher'; import { Capacitor } from '@capacitor/core'; import semver from 'semver'; +import { StorePlatform, storeUrl } from './app-store'; export const APP_VERSION = __APP_VERSION__; -const APP_STORE_URL = 'https://apps.apple.com/app/id6475358068'; -const PLAY_STORE_URL = 'https://play.google.com/store/apps/details?id=com.maroonrides.maroonrides'; - export function isAppVersionSupported(minimumVersion: string): boolean { return semver.gte(APP_VERSION, minimumVersion); } export async function openAppStore() { - const url = Capacitor.getPlatform() === 'android' ? PLAY_STORE_URL : APP_STORE_URL; - await AppLauncher.openUrl({ url }); + const platform = + Capacitor.getPlatform() === StorePlatform.ANDROID ? StorePlatform.ANDROID : StorePlatform.IOS; + await AppLauncher.openUrl({ url: storeUrl(platform) }); } diff --git a/src/routes/+layout.svelte b/src/routes/+layout.svelte index 99e0d2f5..89b24252 100644 --- a/src/routes/+layout.svelte +++ b/src/routes/+layout.svelte @@ -4,6 +4,7 @@ import PlanMapElements from '$lib/components/map/PlanMapElements.svelte'; import OfflinePill from '$lib/components/OfflinePill.svelte'; import UpdateRequired from '$lib/components/UpdateRequired.svelte'; + import WebHeader from '$lib/components/WebHeader.svelte'; import Map from '$lib/components/ui/map/Map.svelte'; import MapControls from '$lib/components/ui/map/MapControls.svelte'; import { frontPageManager } from '$lib/managers/frontpage.manager.svelte'; @@ -13,6 +14,7 @@ import { installDynamicType } from '$lib/utils/dynamic-type'; import { migratePrefs } from '$lib/utils/prefs'; import { queryClient } from '$lib/utils/queries'; + import { Capacitor } from '@capacitor/core'; import { QueryClientProvider } from '@tanstack/svelte-query'; import { page } from '$app/state'; import { ModeWatcher } from 'mode-watcher'; @@ -71,6 +73,10 @@ +{#if !Capacitor.isNativePlatform()} + +{/if} + {#if syncManager.versionStatus === VersionStatus.UNSUPPORTED} From 608cfd9209b0cd3cea1aff0edf7d3e6eea6284b3 Mon Sep 17 00:00:00 2001 From: bwees Date: Sat, 14 Nov 2026 15:02:46 -0600 Subject: [PATCH 2/4] fix(web): move map controls and offline pill below the header --- src/lib/components/OfflinePill.svelte | 2 +- src/lib/components/WebHeader.svelte | 3 ++- src/lib/components/ui/map/MapControls.svelte | 4 ++-- src/routes/layout.css | 5 +++++ 4 files changed, 10 insertions(+), 4 deletions(-) diff --git a/src/lib/components/OfflinePill.svelte b/src/lib/components/OfflinePill.svelte index 2900584c..60c3c411 100644 --- a/src/lib/components/OfflinePill.svelte +++ b/src/lib/components/OfflinePill.svelte @@ -6,7 +6,7 @@
diff --git a/src/lib/components/ui/map/MapControls.svelte b/src/lib/components/ui/map/MapControls.svelte index add4a8e6..fa1b6dae 100644 --- a/src/lib/components/ui/map/MapControls.svelte +++ b/src/lib/components/ui/map/MapControls.svelte @@ -25,8 +25,8 @@ const loaded = $derived(mapCtx.isLoaded()); const positionClasses = { - 'top-left': 'top-[calc(env(safe-area-inset-top)+8px)] left-2', - 'top-right': 'top-[calc(env(safe-area-inset-top)+8px)] right-2', + 'top-left': 'top-[calc(env(safe-area-inset-top)+var(--web-header-height)+8px)] left-2', + 'top-right': 'top-[calc(env(safe-area-inset-top)+var(--web-header-height)+8px)] right-2', 'bottom-left': 'bottom-2 left-2', 'bottom-right': 'bottom-10 right-2', }; diff --git a/src/routes/layout.css b/src/routes/layout.css index 4558ee9f..9c99b3e9 100644 --- a/src/routes/layout.css +++ b/src/routes/layout.css @@ -8,7 +8,12 @@ --spacing: 4px; } +:root:has([data-web-header]) { + --web-header-height: 56px; +} + :root { + --web-header-height: 0px; --dynamic-type-scale: 1; font-size: calc(1rem * var(--dynamic-type-scale)); From b5bf6f3a3d1e6ca0fc740cf5b10cece2c824b15c Mon Sep 17 00:00:00 2001 From: bwees Date: Sat, 14 Nov 2026 15:04:20 -0600 Subject: [PATCH 3/4] fix(web): use the app logo as the favicon --- src/lib/assets/favicon.svg | 1 - src/routes/+layout.svelte | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) delete mode 100644 src/lib/assets/favicon.svg diff --git a/src/lib/assets/favicon.svg b/src/lib/assets/favicon.svg deleted file mode 100644 index cc5dc66a..00000000 --- a/src/lib/assets/favicon.svg +++ /dev/null @@ -1 +0,0 @@ -svelte-logo \ No newline at end of file diff --git a/src/routes/+layout.svelte b/src/routes/+layout.svelte index 89b24252..fc1de026 100644 --- a/src/routes/+layout.svelte +++ b/src/routes/+layout.svelte @@ -1,5 +1,5 @@