diff --git a/backend/src/index.js b/backend/src/index.js
index 046877b..f1ec079 100644
--- a/backend/src/index.js
+++ b/backend/src/index.js
@@ -10,6 +10,7 @@ import { activityRoutes } from './routes/activity.js'
import { eventsRoutes } from './routes/events.js'
const app = Fastify({ logger: true, trustProxy: true })
+const startedAt = Date.now()
await app.register(cookie)
await app.register(cors, {
@@ -17,7 +18,7 @@ await app.register(cors, {
credentials: true,
})
-app.get('/health', async () => ({ status: 'healthy' }))
+app.get('/health', async () => ({ status: 'healthy', version: process.env.BUILD_VERSION || String(startedAt) }))
await app.register(roomRoutes)
await app.register(taskRoutes)
diff --git a/backend/src/lib/booking-flow.js b/backend/src/lib/booking-flow.js
index e02dd97..5f3b5b1 100644
--- a/backend/src/lib/booking-flow.js
+++ b/backend/src/lib/booking-flow.js
@@ -89,6 +89,10 @@ export function classifyRoom(site, allBookings, viewDate, yesterday, tomorrow, o
// Determine flow type
let flowType = 'vacant'
+ // True when primaryBooking is a historical depart-only record (set below) rather
+ // than a booking that actually occupies viewDate — the room was vacant that night.
+ let isPastDepartureRecord = false
+
if (primaryBooking) {
const status = (primaryBooking.booking_status || '').toLowerCase()
if (status === 'blocked') {
@@ -113,6 +117,7 @@ export function classifyRoom(site, allBookings, viewDate, yesterday, tomorrow, o
} else if (effectiveDeparting && opts.past) {
primaryBooking = effectiveDeparting
flowType = 'depart'
+ isPastDepartureRecord = true
}
const arrivalDate = primaryBooking ? toDateStr(primaryBooking.booking_arrival) : null
@@ -158,7 +163,10 @@ export function classifyRoom(site, allBookings, viewDate, yesterday, tomorrow, o
flow_type: flowType,
booking: primaryBooking,
- spans_previous: isVacantFlow
+ // A past-departure record only marks that a checkout happened on viewDate — it
+ // never occupied the night before viewDate, so it must not merge with the prior
+ // card the way a booking that's still actively occupying viewDate would.
+ spans_previous: (isVacantFlow || isPastDepartureRecord)
? prevVacant
: !!primaryBooking && !!arrivalDate && arrivalDate < viewDate,
spans_next: isVacantFlow ? nextVacant : spansNext,
diff --git a/frontend/index.html b/frontend/index.html
index 79eb4a3..79cc39e 100644
--- a/frontend/index.html
+++ b/frontend/index.html
@@ -6,6 +6,8 @@
+
+
Room Planner
diff --git a/frontend/src/App.tsx b/frontend/src/App.tsx
index 74d4452..8a845de 100644
--- a/frontend/src/App.tsx
+++ b/frontend/src/App.tsx
@@ -1,22 +1,30 @@
import { BrowserRouter, Routes, Route, Navigate } from 'react-router-dom'
import AuthGate from './components/AuthGate'
+import { UpdateBanner } from './components/UpdateBanner'
+import IosInstallHint from './components/IosInstallHint'
+import { useVersionCheck } from './hooks/useVersionCheck'
import Layout from './components/Layout'
import Planner from './pages/Planner'
import Settings from './pages/Settings'
export default function App() {
+ const updateAvailable = useVersionCheck('/room-planner/health')
return (
-
-
-
-
- } />
- } />
- } />
- } />
-
-
-
-
+ <>
+
+
+
+
+ } />
+ } />
+ } />
+ } />
+
+
+
+
+
+
+
)
}
diff --git a/frontend/src/components/IosInstallHint.tsx b/frontend/src/components/IosInstallHint.tsx
new file mode 100644
index 0000000..da58dd2
--- /dev/null
+++ b/frontend/src/components/IosInstallHint.tsx
@@ -0,0 +1,89 @@
+import { useEffect, useState } from 'react'
+import { Share, ExternalLink, X } from 'lucide-react'
+
+function isIos() {
+ return /iPad|iPhone|iPod/.test(navigator.userAgent) ||
+ // iPadOS 13+ reports as 'MacIntel' but has touch support, unlike a real Mac
+ (navigator.platform === 'MacIntel' && navigator.maxTouchPoints > 1)
+}
+
+function isStandalone() {
+ return window.matchMedia('(display-mode: standalone)').matches ||
+ (window.navigator as unknown as { standalone?: boolean }).standalone === true
+}
+
+// Safari's UA also matches "Safari", so this checks for the other iOS
+// browsers/in-app webviews that spoof it — none of them can add to the
+// home screen; only Safari itself can.
+function isNonSafariIosBrowser() {
+ return /CriOS|FxiOS|EdgiOS|OPiOS|mercury|GSA|DuckDuckGo|Instagram|FBAN|FBAV|Line\//.test(navigator.userAgent)
+}
+
+/**
+ * iOS has no `beforeinstallprompt` API — Safari never fires it, so the
+ * portal's Install button (?install=1) does nothing there. This shows the
+ * manual steps instead: Share -> Add to Home Screen in Safari, or a prompt
+ * to switch to Safari first if the page was opened in another browser/app.
+ */
+export default function IosInstallHint() {
+ const [mode, setMode] = useState<'safari' | 'other' | null>(null)
+
+ useEffect(() => {
+ if (!isIos() || isStandalone()) return
+ if (!new URLSearchParams(window.location.search).has('install')) return
+ setMode(isNonSafariIosBrowser() ? 'other' : 'safari')
+ }, [])
+
+ if (!mode) return null
+
+ return (
+
+
+
+
+
+ {mode === 'safari'
+ ?
+ : }
+
+
+ {mode === 'safari' ? (
+
+ To install this app, tap the Share icon in Safari's
+ toolbar, then choose Add to Home Screen.
+
+ ) : (
+
+ iOS only allows installing apps from Safari. Open this
+ page in Safari, then tap Share → Add to Home Screen.
+
+ )}
+
+
+ A new version is available.
+
+
+ )
+}
diff --git a/frontend/src/hooks/useVersionCheck.ts b/frontend/src/hooks/useVersionCheck.ts
new file mode 100644
index 0000000..e4fed28
--- /dev/null
+++ b/frontend/src/hooks/useVersionCheck.ts
@@ -0,0 +1,43 @@
+import { useEffect, useState } from 'react'
+
+const POLL_MS = 2 * 60 * 1000
+
+export function useVersionCheck(healthUrl: string) {
+ const [updateAvailable, setUpdateAvailable] = useState(false)
+
+ useEffect(() => {
+ let seenVersion: string | null = null
+
+ async function check() {
+ try {
+ const res = await fetch(healthUrl, { cache: 'no-store' })
+ if (!res.ok) return
+ const data = await res.json()
+ const v: string | undefined = data.version
+ if (!v) return
+ if (seenVersion === null) {
+ seenVersion = v
+ } else if (v !== seenVersion) {
+ setUpdateAvailable(true)
+ }
+ } catch {
+ // network error — skip silently
+ }
+ }
+
+ check()
+ const interval = setInterval(check, POLL_MS)
+
+ function onVisible() {
+ if (document.visibilityState === 'visible') check()
+ }
+ document.addEventListener('visibilitychange', onVisible)
+
+ return () => {
+ clearInterval(interval)
+ document.removeEventListener('visibilitychange', onVisible)
+ }
+ }, [healthUrl])
+
+ return updateAvailable
+}