Compare commits
No commits in common. "870027faca858ba02f4ac80a4ec4a4981bf724e6" and "46441c3b3514b371f10ea1a9d504ba03b80e9198" have entirely different histories.
870027faca
...
46441c3b35
7 changed files with 7 additions and 208 deletions
|
|
@ -1,6 +1,4 @@
|
||||||
import logging
|
import logging
|
||||||
import os
|
|
||||||
import time
|
|
||||||
from contextlib import asynccontextmanager
|
from contextlib import asynccontextmanager
|
||||||
|
|
||||||
from fastapi import FastAPI
|
from fastapi import FastAPI
|
||||||
|
|
@ -59,11 +57,10 @@ app = FastAPI(
|
||||||
version="1.0.0",
|
version="1.0.0",
|
||||||
lifespan=lifespan,
|
lifespan=lifespan,
|
||||||
)
|
)
|
||||||
STARTED_AT = str(int(time.time() * 1000))
|
|
||||||
|
|
||||||
app.include_router(kds_api.router, prefix="/api/kds", tags=["KDS"])
|
app.include_router(kds_api.router, prefix="/api/kds", tags=["KDS"])
|
||||||
|
|
||||||
|
|
||||||
@app.get("/health")
|
@app.get("/health")
|
||||||
async def health_check():
|
async def health_check():
|
||||||
return {"status": "healthy", "version": os.environ.get("BUILD_VERSION", STARTED_AT)}
|
return {"status": "healthy"}
|
||||||
|
|
|
||||||
|
|
@ -3,11 +3,6 @@
|
||||||
<head>
|
<head>
|
||||||
<meta charset="UTF-8" />
|
<meta charset="UTF-8" />
|
||||||
<meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1, user-scalable=no" />
|
<meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1, user-scalable=no" />
|
||||||
<meta name="mobile-web-app-capable" content="yes" />
|
|
||||||
<meta name="apple-mobile-web-app-capable" content="yes" />
|
|
||||||
<meta name="apple-mobile-web-app-status-bar-style" content="default" />
|
|
||||||
<meta name="apple-mobile-web-app-title" content="Kitchen Display" />
|
|
||||||
<link rel="apple-touch-icon" href="/kds/icons/icon-192.png" />
|
|
||||||
<title>Kitchen Display</title>
|
<title>Kitchen Display</title>
|
||||||
</head>
|
</head>
|
||||||
<body>
|
<body>
|
||||||
|
|
|
||||||
|
|
@ -1,8 +1,5 @@
|
||||||
import { Routes, Route, Navigate } from 'react-router-dom'
|
import { Routes, Route, Navigate } from 'react-router-dom'
|
||||||
import AuthGate from './components/AuthGate'
|
import AuthGate from './components/AuthGate'
|
||||||
import { UpdateBanner } from './components/UpdateBanner'
|
|
||||||
import IosInstallHint from './components/IosInstallHint'
|
|
||||||
import { useVersionCheck } from './hooks/useVersionCheck'
|
|
||||||
|
|
||||||
// Re-export for any archive imports that use `import { useAuth } from '../App'`
|
// Re-export for any archive imports that use `import { useAuth } from '../App'`
|
||||||
export { useAuth } from './components/AuthGate'
|
export { useAuth } from './components/AuthGate'
|
||||||
|
|
@ -10,17 +7,12 @@ export { useAuth } from './components/AuthGate'
|
||||||
import KDSApp from './pages/KDSApp'
|
import KDSApp from './pages/KDSApp'
|
||||||
|
|
||||||
export default function App() {
|
export default function App() {
|
||||||
const updateAvailable = useVersionCheck('/kds/health')
|
|
||||||
return (
|
return (
|
||||||
<>
|
|
||||||
<AuthGate>
|
<AuthGate>
|
||||||
<Routes>
|
<Routes>
|
||||||
<Route path="/" element={<KDSApp />} />
|
<Route path="/" element={<KDSApp />} />
|
||||||
<Route path="*" element={<Navigate to="/" replace />} />
|
<Route path="*" element={<Navigate to="/" replace />} />
|
||||||
</Routes>
|
</Routes>
|
||||||
</AuthGate>
|
</AuthGate>
|
||||||
<UpdateBanner visible={updateAvailable} />
|
|
||||||
<IosInstallHint />
|
|
||||||
</>
|
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -1,89 +0,0 @@
|
||||||
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 (
|
|
||||||
<div style={{
|
|
||||||
position: 'fixed', inset: 0, zIndex: 9999,
|
|
||||||
background: 'rgba(15,15,32,0.55)',
|
|
||||||
display: 'flex', alignItems: 'flex-end', justifyContent: 'center',
|
|
||||||
padding: '0 16px 24px',
|
|
||||||
}}>
|
|
||||||
<div style={{
|
|
||||||
position: 'relative',
|
|
||||||
width: '100%', maxWidth: '360px',
|
|
||||||
background: 'var(--card-bg)', borderRadius: 'var(--radius)',
|
|
||||||
border: '1px solid var(--card-border)', boxShadow: 'var(--shadow-md)',
|
|
||||||
padding: '20px', textAlign: 'center',
|
|
||||||
}}>
|
|
||||||
<button
|
|
||||||
onClick={() => setMode(null)}
|
|
||||||
aria-label="Dismiss"
|
|
||||||
style={{
|
|
||||||
position: 'absolute', top: '10px', right: '10px',
|
|
||||||
background: 'none', border: 'none', color: 'var(--text-mid)',
|
|
||||||
padding: '4px', cursor: 'pointer', lineHeight: 0,
|
|
||||||
}}
|
|
||||||
>
|
|
||||||
<X size={16} strokeWidth={1.75} />
|
|
||||||
</button>
|
|
||||||
|
|
||||||
<div style={{
|
|
||||||
width: '44px', height: '44px', margin: '0 auto 12px',
|
|
||||||
borderRadius: '50%', background: 'var(--gold)',
|
|
||||||
display: 'flex', alignItems: 'center', justifyContent: 'center',
|
|
||||||
}}>
|
|
||||||
{mode === 'safari'
|
|
||||||
? <Share size={22} strokeWidth={1.75} color="var(--navy)" />
|
|
||||||
: <ExternalLink size={22} strokeWidth={1.75} color="var(--navy)" />}
|
|
||||||
</div>
|
|
||||||
|
|
||||||
{mode === 'safari' ? (
|
|
||||||
<p style={{ fontSize: '14px', color: 'var(--text-dark)', lineHeight: 1.5, margin: 0 }}>
|
|
||||||
To install this app, tap the <strong>Share</strong> icon in Safari's
|
|
||||||
toolbar, then choose <strong>Add to Home Screen</strong>.
|
|
||||||
</p>
|
|
||||||
) : (
|
|
||||||
<p style={{ fontSize: '14px', color: 'var(--text-dark)', lineHeight: 1.5, margin: 0 }}>
|
|
||||||
iOS only allows installing apps from <strong>Safari</strong>. Open this
|
|
||||||
page in Safari, then tap Share → <strong>Add to Home Screen</strong>.
|
|
||||||
</p>
|
|
||||||
)}
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
)
|
|
||||||
}
|
|
||||||
|
|
@ -1,44 +0,0 @@
|
||||||
import { RefreshCw } from 'lucide-react'
|
|
||||||
|
|
||||||
export function UpdateBanner({ visible }: { visible: boolean }) {
|
|
||||||
if (!visible) return null
|
|
||||||
return (
|
|
||||||
<div style={{
|
|
||||||
position: 'fixed',
|
|
||||||
bottom: 0,
|
|
||||||
left: 0,
|
|
||||||
right: 0,
|
|
||||||
zIndex: 9999,
|
|
||||||
background: 'var(--sidebar)',
|
|
||||||
color: 'var(--text-light)',
|
|
||||||
display: 'flex',
|
|
||||||
alignItems: 'center',
|
|
||||||
justifyContent: 'center',
|
|
||||||
gap: '12px',
|
|
||||||
padding: '10px 16px',
|
|
||||||
fontSize: '14px',
|
|
||||||
boxShadow: '0 -2px 8px rgba(0,0,0,0.3)',
|
|
||||||
}}>
|
|
||||||
<span>A new version is available.</span>
|
|
||||||
<button
|
|
||||||
onClick={() => window.location.reload()}
|
|
||||||
style={{
|
|
||||||
display: 'flex',
|
|
||||||
alignItems: 'center',
|
|
||||||
gap: '6px',
|
|
||||||
background: 'var(--accent)',
|
|
||||||
color: 'var(--sidebar)',
|
|
||||||
border: 'none',
|
|
||||||
borderRadius: '4px',
|
|
||||||
padding: '6px 14px',
|
|
||||||
fontWeight: 600,
|
|
||||||
cursor: 'pointer',
|
|
||||||
fontSize: '13px',
|
|
||||||
}}
|
|
||||||
>
|
|
||||||
<RefreshCw size={14} strokeWidth={1.75} />
|
|
||||||
Reload
|
|
||||||
</button>
|
|
||||||
</div>
|
|
||||||
)
|
|
||||||
}
|
|
||||||
|
|
@ -1,43 +0,0 @@
|
||||||
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
|
|
||||||
}
|
|
||||||
|
|
@ -9,15 +9,6 @@ const qc = new QueryClient({
|
||||||
defaultOptions: { queries: { staleTime: 10 * 1000, retry: 1 } },
|
defaultOptions: { queries: { staleTime: 10 * 1000, retry: 1 } },
|
||||||
})
|
})
|
||||||
|
|
||||||
// When opened from the portal's install button (?install=1), trigger the
|
|
||||||
// PWA install prompt as soon as the browser offers it (Chrome/Edge only).
|
|
||||||
if (new URLSearchParams(window.location.search).has('install')) {
|
|
||||||
window.addEventListener('beforeinstallprompt', e => {
|
|
||||||
e.preventDefault()
|
|
||||||
;(e as Event & { prompt: () => Promise<void> }).prompt()
|
|
||||||
}, { once: true })
|
|
||||||
}
|
|
||||||
|
|
||||||
ReactDOM.createRoot(document.getElementById('root')!).render(
|
ReactDOM.createRoot(document.getElementById('root')!).render(
|
||||||
<React.StrictMode>
|
<React.StrictMode>
|
||||||
<BrowserRouter basename="/kds">
|
<BrowserRouter basename="/kds">
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue