Merge pull request #11 from GilbN/chore/rename-repo

GilbN · web-flow · commit 7e34ed69b991 · 2026-04-12T15:19:22.000+02:00
Rename repo to nsf-timer
diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
@@ -1,5 +1,5 @@
 {
-  "name": "OPK Timer",
+  "name": "NSF Timer",
   "dockerComposeFile": "docker-compose.yml",
   "service": "app",
   "workspaceFolder": "/workspace",
diff --git a/CLAUDE.md b/CLAUDE.md
@@ -20,7 +20,7 @@ No test runner or linter is configured.
 
 ## Architecture Overview
 
-OPK Timer is a **Svelte 5 + Vite PWA** for running synchronized NSF 25m shooting competition timers across multiple devices via a WebSocket relay server.
+NSF Timer is a **Svelte 5 + Vite PWA** for running synchronized NSF 25m shooting competition timers across multiple devices via a WebSocket relay server.
 
 ### Host/Client model
 
@@ -31,7 +31,7 @@ The app uses a strict host/client topology:
 - Room codes avoid ambiguous characters (no O, 0, I, 1, L).
 - The relay server (`server/index.js`) is stateless except for an in-memory room registry and a cached last `STATE_SYNC` per room for fast reconnection.
 
-Global singletons `window.__opkHost` (SocketHost), `window.__opkClient` (SocketClient), and `window.__opkScheduler` (TimerScheduler) hold the active connection/scheduler. These are set in `App.svelte` during session creation or restore.
+Global singletons `window.__nsfHost` (SocketHost), `window.__nsfClient` (SocketClient), and `window.__nsfScheduler` (TimerScheduler) hold the active connection/scheduler. These are set in `App.svelte` during session creation or restore.
 
 ### State flow
 
@@ -70,11 +70,11 @@ Programs (defined in `registry.js`) have `stages[]` → `exercises[]`. Each exer
 - **`rapid`**: hidden phase (`targetHiddenTime`) then visible phase (`timePerSeries`)
 - **`duell`**: repeated hidden/visible cycles (`targetHiddenTime`/`targetVisibleTime`) with `shotsPerShowing` shots each cycle
 
-Custom programs are stored in localStorage under key `opk-timer-custom-programs`.
+Custom programs are stored in localStorage under key `nsf-timer-custom-programs`.
 
 ### Session persistence
 
-On page load, `App.svelte` calls `restoreSession()` which reads `localStorage` for room and timer state and attempts to reconnect or reclaim the host's room code. All localStorage keys are prefixed with `opk-timer-`.
+On page load, `App.svelte` calls `restoreSession()` which reads `localStorage` for room and timer state and attempts to reconnect or reclaim the host's room code. All localStorage keys are prefixed with `nsf-timer-`.
 
 ### Malfunction (jam) rules
 
diff --git a/README.md b/README.md
@@ -1,4 +1,4 @@
-# OPK Timer
+# NSF Timer
 
 Synchronized timer for NSF 25m shooting competitions. Built as a Progressive Web App — install it on any phone, tablet, or computer and run competitions across multiple devices via a WebSocket relay server.
 
@@ -26,7 +26,7 @@ Synchronized timer for NSF 25m shooting competitions. Built as a Progressive Web
 The Docker image bundles the Svelte frontend and WebSocket relay server into a single container. Nginx serves the static files and proxies `/ws` to the Node.js relay server internally.
 
 ```bash
-docker run -d -p 80:80 ghcr.io/gilbn/opk-timer:latest
+docker run -d -p 80:80 ghcr.io/gilbn/nsf-timer:latest
 ```
 
 Access the app at `http://<server-ip>/`.
@@ -36,7 +36,7 @@ For internet-facing deployments, restrict WebSocket origins:
 ```bash
 docker run -d -p 80:80 \
   -e WS_ALLOWED_ORIGINS=https://timer.example.com \
-  ghcr.io/gilbn/opk-timer:latest
+  ghcr.io/gilbn/nsf-timer:latest
 ```
 
 For HTTPS, place the container behind a reverse proxy (e.g. Caddy, Traefik, nginx Proxy Manager) that handles TLS termination. The app automatically upgrades to `wss://` when served over HTTPS.
@@ -45,8 +45,8 @@ For HTTPS, place the container behind a reverse proxy (e.g. Caddy, Traefik, ngin
 
 ```yaml
 services:
-  opk-timer:
-    image: ghcr.io/gilbn/opk-timer:latest
+  nsf-timer:
+    image: ghcr.io/gilbn/nsf-timer:latest
     ports:
       - "80:80"
     restart: unless-stopped
diff --git a/index.html b/index.html
@@ -11,7 +11,7 @@
     <link rel="preconnect" href="https://fonts.googleapis.com" />
     <link rel="preconnect" href="https://fonts.gstatic.com" crossorigin />
     <link href="https://fonts.googleapis.com/css2?family=JetBrains+Mono:wght@400;700;900&family=Inter:wght@400;500;600;700&display=swap" rel="stylesheet" />
-    <title>OPK Timer</title>
+    <title>NSF Timer</title>
   </head>
   <body>
     <div id="app"></div>
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,5 +1,5 @@
 {
-  "name": "opk-timer",
+  "name": "nsf-timer",
   "private": true,
   "version": "1.0.0",
   "type": "module",
diff --git a/server/fly.toml b/server/fly.toml
@@ -1,9 +1,9 @@
-# fly.toml app configuration file generated for opk-timer on 2026-04-08T18:19:38Z
+# fly.toml app configuration file generated for nsf-timer on 2026-04-08T18:19:38Z
 #
 # See https://fly.io/docs/reference/configuration/ for information about how to use this file.
 #
 
-app = 'opk-timer'
+app = 'nsf-timer'
 primary_region = 'iad'
 
 [build]
diff --git a/server/index.js b/server/index.js
@@ -285,4 +285,4 @@ wss.on('connection', (ws) => {
 
 startHeartbeat(wss)
 
-console.log(`opk-timer relay server listening on ws://localhost:${WS_PORT}`)
+console.log(`nsf-timer relay server listening on ws://localhost:${WS_PORT}`)
diff --git a/server/package-lock.json b/server/package-lock.json
diff --git a/server/package.json b/server/package.json
@@ -1,5 +1,5 @@
 {
-  "name": "opk-timer-server",
+  "name": "nsf-timer-server",
   "private": true,
   "type": "module",
   "scripts": {
diff --git a/src/App.svelte b/src/App.svelte
@@ -36,7 +36,7 @@
         const savedTimer = loadTimerState()
         if (savedTimer?.programId || savedRoom.programId) {
           const scheduler = new TimerScheduler()
-          window.__opkScheduler = scheduler
+          window.__nsfScheduler = scheduler
           if (savedTimer?.programId) {
             scheduler.loadProgram(savedTimer.programId)
             scheduler.restoreState(savedTimer)
@@ -51,13 +51,13 @@
         // Host reload: reclaim the same room code
         const host = new SocketHost()
         await host.createRoom(savedRoom.code)
-        window.__opkHost = host
+        window.__nsfHost = host
 
         // Restore timer state if a program was active
         const savedTimer = loadTimerState()
         if (savedTimer?.programId || savedRoom.programId) {
           const scheduler = new TimerScheduler()
-          window.__opkScheduler = scheduler
+          window.__nsfScheduler = scheduler
 
           // Wire up broadcasting before loading so initial state is sent
           scheduler.onStateChange((state) => {
@@ -79,22 +79,22 @@
       } else if (savedRoom.isSpectator) {
         // Display/spectator reload: reconnect as spectator
         const client = new SocketClient()
-        window.__opkClient = client
+        window.__nsfClient = client
         await client.joinRoom(savedRoom.code, { role: 'spectator' })
         currentView.set('display')
       } else {
         // Client reload: reconnect to the same room
         const client = new SocketClient()
-        window.__opkClient = client
+        window.__nsfClient = client
         await client.joinRoom(savedRoom.code, { name: savedRoom.name || '', lane: savedRoom.lane || '' })
         currentView.set('timer')
       }
     } catch {
       // Reconnection failed — clean up and go home
       clearRoomState()
       clearTimerState()
-      window.__opkHost = null
-      window.__opkClient = null
+      window.__nsfHost = null
+      window.__nsfClient = null
     }
   }
 </script>
diff --git a/src/components/JumpToModal.svelte b/src/components/JumpToModal.svelte
@@ -39,7 +39,7 @@
   }
 
   function handleConfirm() {
-    window.__opkScheduler?.jumpTo(selectedStageIdx, selectedExerciseIdx, selectedSeriesIdx)
+    window.__nsfScheduler?.jumpTo(selectedStageIdx, selectedExerciseIdx, selectedSeriesIdx)
     onClose()
   }
 </script>
diff --git a/src/lib/i18n.js b/src/lib/i18n.js
@@ -3,8 +3,8 @@ import { preferences } from './stores.js'
 
 const translations = {
   no: {
-    appName: 'OPK Timer',
-    shareRoomPrefix: 'Bli med i OPK Timer-rom:',
+    appName: 'NSF Timer',
+    shareRoomPrefix: 'Bli med i NSF Timer-rom:',
     installApp: 'Installer app',
     installIosHint: 'Trykk på Del-knappen og velg «Legg til på Hjem-skjerm»',
     shareToInstall: 'Del',
@@ -125,10 +125,11 @@ const translations = {
     spectatorScreen: 'Tilskuermodus',
     watchDisplay: 'Vis',
     watchDisplayHint: 'Stor skjermvisning for monitor/nettbrett uten kontroller',
+    tagline: 'NSF 25m Konkurransetimer',
   },
   en: {
-    appName: 'OPK Timer',
-    shareRoomPrefix: 'Join OPK Timer room:',
+    appName: 'NSF Timer',
+    shareRoomPrefix: 'Join NSF Timer room:',
     installApp: 'Install App',
     installIosHint: 'Tap the Share button and select "Add to Home Screen"',
     shareToInstall: 'Share',
@@ -249,6 +250,7 @@ const translations = {
     spectatorScreen: 'Spectator mode',
     watchDisplay: 'Display',
     watchDisplayHint: 'Large-screen view for monitors/tablets — no controls',
+    tagline: 'NSF 25m Competition Timer',
   },
 }
 
diff --git a/src/lib/programs/registry.js b/src/lib/programs/registry.js
@@ -5,6 +5,8 @@
  * Reference: "SKYTEPROGRAMMER 25 METER NSF (BANE & FELT)"
  */
 
+import { loadCustomPrograms } from '../storage'
+
 const DEFAULT_LOADING_TIME = 60
 const DEFAULT_TARGET_HIDDEN_TIME = 7
 const DEFAULT_TARGET_VISIBLE_TIME_DUEL = 3
@@ -332,9 +334,9 @@ export const programs = [
 export function getProgramById(id) {
   const builtin = programs.find((p) => p.id === id)
   if (builtin) return builtin
-  // Check custom programs in localStorage
+  // Check custom programs via shared storage helper
   try {
-    const custom = JSON.parse(localStorage.getItem('opk-timer-custom-programs') || '[]')
+    const custom = loadCustomPrograms()
     return custom.find((p) => p.id === id) || null
   } catch {
     return null
diff --git a/src/lib/storage.js b/src/lib/storage.js
@@ -1,9 +1,9 @@
 const STORAGE_KEYS = {
-  TIMER_STATE: 'opk-timer-state',
-  PREFERENCES: 'opk-timer-prefs',
-  ROOM: 'opk-timer-room',
-  CUSTOM_PROGRAMS: 'opk-timer-custom-programs',
-  ROOM_HISTORY: 'opk-timer-room-history',
+  TIMER_STATE: 'nsf-timer-state',
+  PREFERENCES: 'nsf-timer-prefs',
+  ROOM: 'nsf-timer-room',
+  CUSTOM_PROGRAMS: 'nsf-timer-custom-programs',
+  ROOM_HISTORY: 'nsf-timer-room-history',
 }
 
 const MAX_ROOM_HISTORY = 10
diff --git a/src/views/DisplayView.svelte b/src/views/DisplayView.svelte
@@ -25,7 +25,7 @@
 
   // Client connection status
   $effect(() => {
-    const client = window.__opkClient
+    const client = window.__nsfClient
     if (client) {
       client.onStatusChange((status) => {
         if (status === 'connected') connectionStatus = 'connected'
@@ -60,9 +60,9 @@
         lane: savedRoom?.lane,
       })
     }
-    if (window.__opkClient) {
-      window.__opkClient.destroy()
-      window.__opkClient = null
+    if (window.__nsfClient) {
+      window.__nsfClient.destroy()
+      window.__nsfClient = null
     }
     clearTimerState()
     clearRoomState()
diff --git a/src/views/HomeView.svelte b/src/views/HomeView.svelte
diff --git a/src/views/LobbyView.svelte b/src/views/LobbyView.svelte
diff --git a/src/views/TimerView.svelte b/src/views/TimerView.svelte
diff --git a/vite.config.js b/vite.config.js

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`{`
`2`		`- "name": "OPK Timer",`
	`2`	`+ "name": "NSF Timer",`
`3`	`3`	`"dockerComposeFile": "docker-compose.yml",`
`4`	`4`	`"service": "app",`
`5`	`5`	`"workspaceFolder": "/workspace",`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`{`
`2`		`- "name": "opk-timer",`
	`2`	`+ "name": "nsf-timer",`
`3`	`3`	`"private": true,`
`4`	`4`	`"version": "1.0.0",`
`5`	`5`	`"type": "module",`
Original file line number	Diff line number	Diff line change
`@@ -1,9 +1,9 @@`
`1`		`-# fly.toml app configuration file generated for opk-timer on 2026-04-08T18:19:38Z`
	`1`	`+# fly.toml app configuration file generated for nsf-timer on 2026-04-08T18:19:38Z`
`2`	`2`	`#`
`3`	`3`	`# See https://fly.io/docs/reference/configuration/ for information about how to use this file.`
`4`	`4`	`#`
`5`	`5`
`6`		`-app = 'opk-timer'`
	`6`	`+app = 'nsf-timer'`
`7`	`7`	`primary_region = 'iad'`
`8`	`8`
`9`	`9`	`[build]`
Original file line number	Diff line number	Diff line change
`@@ -285,4 +285,4 @@ wss.on('connection', (ws) => {`
`285`	`285`
`286`	`286`	`startHeartbeat(wss)`
`287`	`287`
`288`		-console.log(`opk-timer relay server listening on ws://localhost:${WS_PORT}`)
	`288`	+console.log(`nsf-timer relay server listening on ws://localhost:${WS_PORT}`)
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`{`
`2`		`- "name": "opk-timer-server",`
	`2`	`+ "name": "nsf-timer-server",`
`3`	`3`	`"private": true,`
`4`	`4`	`"type": "module",`
`5`	`5`	`"scripts": {`