ProPresenter 1.1.0: a Now tile, and switches for everything on it

The ＋ picker now offers the module two ways. "Now / Next" is the card as it
was. "Now" is the live item on its own: the gradient comes off the card and
fills the tile edge to edge, the border, radius and box go, and the playlist
name and live dot float over the colour instead of sitting above it. A wall
of them reads as panels of colour rather than cards on a background.

Every part of the tile is now a switch in a "Show" group in the gear —
playlist, live status, the NOW and NEXT labels, slide count, progress bar,
the next list and its item tags. One or two words each, no descriptions. The
Now entry carries its own six, since the three Next ones have nothing to act
on there.

Two things the tile still insists on. Trouble overrides the switches: the
top row and the live chip come back the moment the feed drops, whatever is
switched off, because a tile that has stopped updating must never look like
one with nothing live. And at the Now tile's shortest sizes the floating top
row would sit on the title, so below the height it needs it goes — the
header dot and the title itself still say what is wrong.

Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>

README.md

@@ -99,19 +99,10 @@ with this machine's shell settings — the same keys as the checked-in
 | Key | Meaning |
 | --- | --- |
 | `port` | Port ProdDash serves on (default `24500`). The macOS launcher writes this one, so the port it is set to holds however ProdDash is started. |
-| `adminPin` | The admin PIN, as a scrypt hash. **Set it in the admin page's Admin PIN section**, not by hand — 6 digits, and only the hash is stored. Absent means admin is open to anyone on the network. |
-| `adminPasscode` | An older free-text passcode. Still honoured, so an existing install keeps working; new installs should use `adminPin`. |
+| `adminPasscode` | If set, the admin page asks for this shared passcode. Leave `""` for none — it's a plain-HTTP LAN tool. |
 | `forge` | Where updates and module installs are fetched from. Absent or `"github"` uses GitHub; a Gitea or Forgejo base URL such as `"http://10.3.8.90:3000"` uses a server of your own. Set it per machine in the data directory, alongside `repo`. |
 | `theme` | The dashboard palette: `booth` (default), `harbor`, `graphite`, `ember` or `daylight`. The admin page's **Theme** section writes this one — see [Themes](#themes). |
 
-**Locked out?** Delete `adminPin` from the data directory's `proddash.json`
-and restart, or start the server with `PRODDASH_PASSCODE` set — that passcode
-overrides the PIN and always gets you in.
-
-Only `/admin` and the admin API are behind the PIN. Dashboards stay open, so a
-wall display needs no PIN, and it is unrelated to a module's own PIN (Slack's
-4–8 digit send PIN, say), which guards that module's actions only.
-
 **Updating from your own git server.** ProdDash fetches one `tar.gz` of the
 branch — nothing else — so any Gitea or Forgejo works. Point `forge` at its
 base URL and `repo` at the owner/repo there:
@@ -154,10 +145,11 @@ set on a tile itself (a PCO Plan header colour, say) is deliberately kept.
 
 ## Installing modules and updating
 
-Everything below happens in the **admin page**; ProdDash talks to its GitHub
-repository (`michaelmcgary2008/ProdDash`, branch `main` — change with
-`repo` / `branch` in `proddash.json` or the `PRODDASH_REPO` variable,
-`owner/repo#branch`). It downloads one small archive of the branch, at most
+Everything below happens in the **admin page**; ProdDash talks to its git
+repository — `michael/ProdDash` on the church's own Gitea at
+`chronicles-ab.waterschurch.org:3000`, branch `main`. Change it with `forge`,
+`repo` and `branch` in `proddash.json`, or the `PRODDASH_FORGE` and
+`PRODDASH_REPO` variables (`owner/repo#branch`). It downloads one small archive of the branch, at most
 every few minutes, only while the admin page is open or for the update check
 below. Nothing is installed without someone clicking.
 
@@ -239,7 +231,13 @@ below. Nothing is installed without someone clicking.
   Tile settings: channel icons, direction and timestamps.
 - **ProPresenter** — what's live and what's next, with slide progress,
   driven by the shared `propresenter-core` client (ProPresenter 7/20).
+  The ＋ picker offers two tiles: **Now / Next**, the full card, and **Now**,
+  the live item alone with the gradient filling the tile edge to edge — a
+  wall panel that says one thing.
   Admin config: ProPresenter endpoint (host : port), password.
+  Tile settings: a **Show** group of switches for the playlist name, live
+  status, NOW and NEXT labels, slide count, progress bar, the next list and
+  its item tags, plus tidy titles.
 - **Timers** — live ProPresenter timers (countdown, countdown-to-time,
   elapsed) and LTC timecode as auto-sized cards. The ＋ picker lists every
   discovered timer (and the LTC card) as its own tile, or add "All timers"

config/proddash.json

@@ -1,7 +1,7 @@
 {
   "port": 24500,
   "adminPasscode": "",
-  "forge": "github",
-  "repo": "michaelmcgary2008/ProdDash",
+  "forge": "http://chronicles-ab.waterschurch.org:3000",
+  "repo": "michael/ProdDash",
   "branch": "main"
 }

modules/propresenter-now-next/client.js

@@ -6,6 +6,12 @@
    in /admin; the tile only renders. */
 
 export default function create({ root, moduleApi }) {
+  /* "now" is the live item on its own, filling the tile; "full" is that plus
+     the rest of the playlist. The picker presets `view`; a tile placed before
+     this module had a picker has neither, and gets the full card. */
+  const view = String(moduleApi.instanceSettings.view || moduleApi.variant || 'full');
+  const nowOnly = view === 'now';
+
   let state = null;
   let feedOffline = false;
   let stream = null;
@@ -33,11 +39,13 @@ export default function create({ root, moduleApi }) {
     </div>`;
 
   const screenEl = root.querySelector('.nn-screen');
+  if (nowOnly) screenEl.classList.add('nn-only-now');
   const topRow = root.querySelector('.nn-top');
   const playlistNameEl = root.querySelector('.nn-playlist');
   const liveEl = root.querySelector('.nn-live');
   const liveTextEl = root.querySelector('.nn-live-text');
   const nowEl = root.querySelector('.nn-now');
+  const nowLabelEl = root.querySelector('.nn-label');
   const nowTitleBox = root.querySelector('.nn-title-box');
   let nowTitleEl = root.querySelector('.nn-title');
   const nowMetaEl = root.querySelector('.nn-meta');
@@ -47,9 +55,11 @@ export default function create({ root, moduleApi }) {
   const nextListEl = root.querySelector('.nn-next-list');
   const nextMoreEl = root.querySelector('.nn-next-more');
 
+  /** A setting, defaulting to on — a Now tile's schema omits the Next ones. */
   function prefs() {
-    return moduleApi.instanceSettings; // showPlaylist / showProgress / cleanTitles
+    return moduleApi.instanceSettings;
   }
+  const on = (key) => prefs()[key] !== false;
 
   /* ── title tidying (same rule as propresenter-core.cleanItemName) ─ */
 
@@ -65,7 +75,7 @@ export default function create({ root, moduleApi }) {
   }
 
   function displayName(raw) {
-    return prefs().cleanTitles ? cleanItemName(raw) : String(raw || '').trim();
+    return on('cleanTitles') ? cleanItemName(raw) : String(raw || '').trim();
   }
 
   function itemTypeTag(type) {
@@ -307,7 +317,9 @@ export default function create({ root, moduleApi }) {
 
     const total = state.currentSlideTotal || activeItem?.slideCount || 0;
     const current = state.currentSlide || 0;
-    if (total > 0 && current > 0) {
+    if (!on('showSlideCount')) {
+      nowMetaEl.textContent = '';
+    } else if (total > 0 && current > 0) {
       const remaining = Math.max(0, total - current);
       nowMetaEl.textContent = `Slide ${current} / ${total} · ${remaining} left`;
     } else if (total > 0) {
@@ -318,7 +330,7 @@ export default function create({ root, moduleApi }) {
       nowMetaEl.textContent = '';
     }
 
-    if (prefs().showProgress && total > 0) {
+    if (on('showProgress') && total > 0) {
       progressEl.hidden = false;
       const pct = current > 0 ? Math.max(0, Math.min(100, (current / total) * 100)) : 0;
       progressFillEl.style.width = `${pct}%`;
@@ -349,6 +361,10 @@ export default function create({ root, moduleApi }) {
       nameEl.textContent = displayName(item.name) || '(untitled)';
       row.appendChild(nameEl);
 
+      if (!on('showTags')) {
+        nextListEl.appendChild(row);
+        continue;
+      }
       if (item.type === 'presentation' && Number.isInteger(item.slideCount)) {
         const chip = document.createElement('div');
         chip.className = 'nn-count-chip';
@@ -366,7 +382,7 @@ export default function create({ root, moduleApi }) {
       nextListEl.appendChild(row);
     }
 
-    nextLabelEl.hidden = upcoming.length === 0;
+    nextLabelEl.hidden = upcoming.length === 0 || !on('showNextLabel');
     nextMoreEl.hidden = true;
     markNextOverflow();
     requestAnimationFrame(markNextOverflow);
@@ -374,12 +390,22 @@ export default function create({ root, moduleApi }) {
 
   function render() {
     screenEl.classList.toggle('is-offline', feedOffline);
-    const showTop = prefs().showPlaylist || feedOffline || !state?.reachable || !state?.enabled;
-    topRow.classList.toggle('hidden-row', !showTop);
-    playlistNameEl.textContent = prefs().showPlaylist ? state?.playlistName || '' : '';
+    // Trouble always shows, whatever is switched off: a tile that has stopped
+    // updating must never look like one with nothing live.
+    const trouble = feedOffline || !state?.reachable || !state?.enabled;
+    const wantPlaylist = on('showPlaylist');
+    const wantLive = on('showLive') || trouble;
+    topRow.classList.toggle('hidden-row', !wantPlaylist && !wantLive);
+    liveEl.hidden = !wantLive;
+    // Hidden, not just emptied: it is flex:1, so an emptied one still holds
+    // the row open and pushes the live dot off the right edge.
+    playlistNameEl.hidden = !wantPlaylist;
+    playlistNameEl.textContent = state?.playlistName || '';
+    nowLabelEl.hidden = !on('showNowLabel');
+    screenEl.classList.toggle('nn-no-next', nowOnly || !on('showNext'));
     renderLive();
     renderNow();
-    renderNext();
+    if (!nowOnly && on('showNext')) renderNext();
   }
 
   /* ── sizing: --unit scales the whole card to the tile ───────────── */
@@ -387,6 +413,10 @@ export default function create({ root, moduleApi }) {
   function applyUnit() {
     const unit = Math.max(6.5, Math.min(20, root.clientHeight * 0.032));
     screenEl.style.setProperty('--unit', unit.toFixed(2) + 'px');
+    // On a Now tile the top row floats over the gradient, so at the shortest
+    // sizes it would sit on the title. Below the height it needs, it goes —
+    // the header dot and the title itself still report trouble.
+    screenEl.classList.toggle('nn-tight', nowOnly && root.clientHeight < unit * 9);
   }
 
   /* ── live feed ──────────────────────────────────────────────────── */

modules/propresenter-now-next/module.json

@@ -1,8 +1,8 @@
 {
   "id": "propresenter-now-next",
   "name": "ProPresenter",
-  "version": "1.0.1",
-  "proddash": ">=1.1.0",
+  "version": "1.1.0",
+  "proddash": ">=1.5.0",
   "description": "What is live in ProPresenter and what comes next",
   "permissions": [
     { "kind": "local-network", "reason": "Reaching ProPresenter on this network" }
@@ -20,13 +20,22 @@
     },
     "password": {
       "type": "password",
-      "label": "API password (only if set in ProPresenter)",
+      "label": "Password",
       "default": ""
     }
   },
   "instanceSchema": {
-    "showPlaylist": { "type": "boolean", "label": "Show the playlist name", "default": true },
-    "showProgress": { "type": "boolean", "label": "Show the slide progress bar", "default": true },
-    "cleanTitles": { "type": "boolean", "label": "Tidy titles (hide [ Full ] tags and date codes)", "default": true }
+    "cleanTitles": { "type": "switch", "label": "Tidy titles", "default": true },
+    "showPlaylist": { "type": "switch", "label": "Playlist", "default": true, "group": "Show" },
+    "showLive": { "type": "switch", "label": "Live status", "default": true, "group": "Show" },
+    "showNowLabel": { "type": "switch", "label": "Now label", "default": true, "group": "Show" },
+    "showSlideCount": { "type": "switch", "label": "Slide count", "default": true, "group": "Show" },
+    "showProgress": { "type": "switch", "label": "Progress bar", "default": true, "group": "Show" },
+    "showNext": { "type": "switch", "label": "Next list", "default": true, "group": "Show" },
+    "showNextLabel": { "type": "switch", "label": "Next label", "default": true, "group": "Show" },
+    "showTags": { "type": "switch", "label": "Item tags", "default": true, "group": "Show" }
+  },
+  "instanceGroups": {
+    "Show": { "collapsed": false, "columns": 2 }
   }
 }

modules/propresenter-now-next/server.js

@@ -108,6 +108,43 @@ module.exports = {
     };
   },
 
+  /**
+   * Two ways to place this module. "Now / Next" is the full card — what is
+   * live, then the rest of the playlist. "Now" is the same live item alone,
+   * edge to edge with the gradient filling the tile: a wall display that says
+   * one thing. The Now entry offers only the settings it can act on, so its
+   * gear carries no Next switches.
+   */
+  tiles() {
+    return [
+      {
+        id: 'full',
+        name: 'Now / Next',
+        description: 'What is live, and the rest of the playlist',
+        defaultSize: { w: 4, h: 5 },
+        minSize: { w: 3, h: 3 },
+        settings: { view: 'full' },
+      },
+      {
+        id: 'now',
+        name: 'Now',
+        description: 'Only what is live, filling the tile',
+        defaultSize: { w: 4, h: 2 },
+        minSize: { w: 2, h: 1 },
+        settings: { view: 'now' },
+        instanceSchema: {
+          cleanTitles: { type: 'switch', label: 'Tidy titles', default: true },
+          showPlaylist: { type: 'switch', label: 'Playlist', default: true, group: 'Show' },
+          showLive: { type: 'switch', label: 'Live status', default: true, group: 'Show' },
+          showNowLabel: { type: 'switch', label: 'Now label', default: true, group: 'Show' },
+          showSlideCount: { type: 'switch', label: 'Slide count', default: true, group: 'Show' },
+          showProgress: { type: 'switch', label: 'Progress bar', default: true, group: 'Show' },
+        },
+        instanceGroups: { Show: { collapsed: false, columns: 2 } },
+      },
+    ];
+  },
+
   routes() {
     return {
       'GET /state': (req, res) => {

modules/propresenter-now-next/style.css

@@ -21,6 +21,51 @@
   justify-content: center;
 }
 
+/* NEXT switched off, or a Now tile: the list goes and the card takes the room. */
+[data-module="propresenter-now-next"] .nn-screen.nn-no-next .nn-next-wrap { display: none; }
+[data-module="propresenter-now-next"] .nn-screen.nn-no-next { justify-content: center; }
+
+/* ── the "Now" tile ──
+   Only what is live, edge to edge: the gradient moves off the card and onto
+   the whole tile, the card loses its border, radius and box, and the title
+   sits in the middle of everything. Nothing is inset, so a wall of these
+   reads as panels of colour rather than cards on a background. */
+[data-module="propresenter-now-next"] .nn-screen.nn-only-now {
+  gap: 0;
+  background: linear-gradient(
+    160deg,
+    color-mix(in srgb, var(--accent) 14%, transparent),
+    color-mix(in srgb, var(--bg) 70%, transparent)
+  );
+}
+[data-module="propresenter-now-next"] .nn-only-now .nn-now {
+  flex: 1;
+  height: auto;
+  min-height: 0;
+  justify-content: center;
+  border: none;
+  border-radius: 0;
+  background: none;
+  padding: 0;
+}
+/* The live dot and playlist ride over the gradient rather than above it. */
+[data-module="propresenter-now-next"] .nn-only-now .nn-top {
+  position: absolute;
+  inset: var(--nn-pad) var(--nn-pad) auto;
+  pointer-events: none;
+}
+[data-module="propresenter-now-next"] .nn-only-now .nn-title-box { margin-top: 0; }
+/* The overlay floats, so it takes no room — this keeps the title clear of it
+   and still centred, by holding back as much at the bottom as at the top. */
+[data-module="propresenter-now-next"] .nn-only-now:not(.nn-tight) .nn-now {
+  padding: calc(var(--unit) * 1.4) 0;
+}
+/* Too short for the overlay: the title gets the whole panel to itself. */
+[data-module="propresenter-now-next"] .nn-only-now.nn-tight .nn-top,
+[data-module="propresenter-now-next"] .nn-only-now.nn-tight.is-offline .nn-top {
+  display: none !important;
+}
+
 /* ── top row ── */
 
 [data-module="propresenter-now-next"] .nn-top {
@@ -59,6 +104,7 @@
   overflow: hidden;
   text-overflow: ellipsis;
 }
+[data-module="propresenter-now-next"] .nn-playlist[hidden] { display: none; }
 
 [data-module="propresenter-now-next"] .nn-live {
   display: flex;
@@ -71,6 +117,7 @@
   text-transform: uppercase;
   color: var(--muted);
 }
+[data-module="propresenter-now-next"] .nn-live[hidden] { display: none; }
 
 [data-module="propresenter-now-next"] .nn-live-dot {
   width: calc(var(--unit) * 0.6);
@@ -122,6 +169,7 @@
   text-transform: uppercase;
   color: var(--accent);
 }
+[data-module="propresenter-now-next"] .nn-label[hidden] { display: none; }
 
 [data-module="propresenter-now-next"] .nn-title-box {
   flex: 1;

public/admin/admin.css

@@ -512,49 +512,3 @@ a.btn { text-decoration: none; }
   color: var(--accent);
 }
 #theme-status { margin-top: 4px; }
-
-/* ── the admin PIN ── */
-
-/* Digits, evenly spaced, so six of them read as a PIN rather than a word. */
-.pin-input {
-  font-variant-numeric: tabular-nums;
-  letter-spacing: 0.35em;
-  text-align: center;
-  max-width: 9em;
-}
-.pin-form {
-  display: flex;
-  flex-wrap: wrap;
-  align-items: flex-end;
-  gap: 12px;
-}
-.pin-field {
-  display: flex;
-  flex-direction: column;
-  gap: 4px;
-  font-size: 12px;
-  color: var(--muted);
-}
-.pin-field[hidden] { display: none; }
-.pin-field input {
-  padding: 8px 10px;
-  font-size: 14px;
-  color: var(--text);
-  background: var(--bg);
-  border: 1px solid var(--border);
-  border-radius: 7px;
-}
-.pin-field input:focus { outline: none; border-color: var(--accent); }
-.pin-actions {
-  display: flex;
-  gap: 8px;
-  margin-left: auto;
-}
-.pin-note { margin-top: 12px; }
-.pin-note code {
-  font-size: 0.92em;
-  padding: 1px 5px;
-  border-radius: 4px;
-  background: var(--bg);
-  border: 1px solid var(--border);
-}

public/admin/admin.js

@@ -2,10 +2,8 @@
 
    Everything here is server-wide: module enable/disable and admin config
    (written to config/modules.json, module re-inited on save), plus named
-   layout management. Behind the admin PIN when one is set — a shell setting of
-   its own, nothing to do with a module's PIN (Slack's send PIN, say). */
+   layout management. Guarded by the shared passcode when one is set. */
 
-const securitySection = document.getElementById('security-section');
 const loginCard = document.getElementById('login-card');
 const loginStatus = document.getElementById('login-status');
 const passcodeInput = document.getElementById('passcode');
@@ -64,30 +62,20 @@ function showLogin() {
   layoutsSection.hidden = true;
   updateCard.hidden = true;
   themeSection.hidden = true;
-  securitySection.hidden = true;
-  passcodeInput.value = '';
   passcodeInput.focus();
 }
 
-let loggingIn = false;
-
 async function login() {
-  if (loggingIn) return;
-  loggingIn = true;
   loginStatus.textContent = '';
   loginStatus.className = 'admin-status';
   try {
-    await api('/api/admin/login', { method: 'POST', body: JSON.stringify({ pin: passcodeInput.value }) });
+    await api('/api/admin/login', { method: 'POST', body: JSON.stringify({ passcode: passcodeInput.value }) });
     passcodeInput.value = '';
     loginCard.hidden = true;
     await loadState();
   } catch (e) {
-    passcodeInput.value = '';
     loginStatus.textContent = e.message;
     loginStatus.className = 'admin-status error';
-    passcodeInput.focus();
-  } finally {
-    loggingIn = false;
   }
 }
 
@@ -95,83 +83,6 @@ document.getElementById('login-btn').addEventListener('click', login);
 passcodeInput.addEventListener('keydown', (e) => {
   if (e.key === 'Enter') login();
 });
-// Six digits is the whole PIN, so there is nothing left to press.
-passcodeInput.addEventListener('input', () => {
-  passcodeInput.value = passcodeInput.value.replace(/\D/g, '').slice(0, 6);
-  if (passcodeInput.value.length === 6) login();
-});
-
-/* ── the admin PIN ───────────────────────────────────────────────────── */
-
-const pinCurrentField = document.getElementById('pin-current-field');
-const pinCurrent = document.getElementById('pin-current');
-const pinNew = document.getElementById('pin-new');
-const pinRepeat = document.getElementById('pin-repeat');
-const pinSaveBtn = document.getElementById('pin-save');
-const pinClearBtn = document.getElementById('pin-clear');
-const pinStatus = document.getElementById('pin-status');
-const pinStateEl = document.getElementById('pin-state');
-
-for (const input of [pinCurrent, pinNew, pinRepeat]) {
-  input.addEventListener('input', () => {
-    input.value = input.value.replace(/\D/g, '').slice(0, 6);
-  });
-}
-
-/** Paint the section for "no PIN yet" or "one is set". */
-function renderPin(state) {
-  const set = Boolean(state.pinSet);
-  const fromEnv = Boolean(state.pinFromEnv);
-  securitySection.hidden = false;
-  pinCurrentField.hidden = !set;
-  pinClearBtn.hidden = !set;
-  document.getElementById('pin-new-label').textContent = set ? 'New PIN' : 'PIN';
-  pinSaveBtn.textContent = set ? 'Change PIN' : 'Set PIN';
-  pinStateEl.textContent = fromEnv
-    ? 'A passcode is set in this server’s environment (PRODDASH_PASSCODE) and takes precedence. Anything set here applies once that is removed.'
-    : set
-      ? 'Admin is locked. This page asks for the PIN, and so does every admin request.'
-      : 'Admin is open to anyone on the network. Set a 6-digit PIN to lock it.';
-  if (state.dataDir) document.getElementById('pin-file').textContent = state.dataDir + '/proddash.json';
-}
-
-function pinMessage(text, bad = false) {
-  pinStatus.textContent = text;
-  pinStatus.className = 'admin-status' + (bad ? ' error' : ' ok');
-}
-
-async function savePin(clearing = false) {
-  pinStatus.textContent = '';
-  pinStatus.className = 'admin-status';
-  const current = pinCurrent.value;
-  const next = clearing ? '' : pinNew.value;
-  if (!clearing) {
-    if (!/^\d{6}$/.test(next)) return pinMessage('The PIN must be exactly 6 digits.', true);
-    if (next !== pinRepeat.value) return pinMessage('The two PINs are not the same.', true);
-  }
-  if (!pinCurrentField.hidden && !/^\d{6}$/.test(current)) {
-    return pinMessage('Enter the current PIN to change it.', true);
-  }
-  pinSaveBtn.disabled = true;
-  pinClearBtn.disabled = true;
-  try {
-    const body = await api('/api/admin/pin', { method: 'POST', body: JSON.stringify({ pin: next, current }) });
-    for (const i of [pinCurrent, pinNew, pinRepeat]) i.value = '';
-    pinMessage(body.pinSet ? 'PIN saved. It is asked for from the next visit.' : 'PIN removed — admin is open again.');
-    await loadState();
-  } catch (e) {
-    pinMessage(e.message, true);
-  } finally {
-    pinSaveBtn.disabled = false;
-    pinClearBtn.disabled = false;
-  }
-}
-
-pinSaveBtn.addEventListener('click', () => savePin(false));
-pinClearBtn.addEventListener('click', () => {
-  if (confirm('Turn the admin PIN off? Anyone on the network could then change this server’s settings.')) savePin(true);
-});
-pinRepeat.addEventListener('keydown', (e) => { if (e.key === 'Enter') savePin(false); });
 
 /* ── module cards ───────────────────────────────────────────────────── */
 
@@ -945,7 +856,6 @@ async function loadState() {
   for (const mod of state.modules || []) {
     modulesList.appendChild(buildModuleCard(mod));
   }
-  renderPin(state);
   loadTheme();
   loadLayouts();
   loadCatalog(false);

public/admin/index.html

@@ -18,11 +18,10 @@
 
   <main id="admin-main">
     <section class="admin-card" id="login-card" hidden>
-      <h2>Admin PIN</h2>
+      <h2>Admin passcode</h2>
       <p class="admin-copy">This page changes the server-wide configuration for every dashboard in the building.</p>
       <div class="login-row">
-        <input type="password" id="passcode" class="pin-input" inputmode="numeric" autocomplete="off"
-               maxlength="6" placeholder="••••••" aria-label="Admin PIN">
+        <input type="password" id="passcode" placeholder="Passcode" autocomplete="current-password">
         <button class="btn primary" id="login-btn">Unlock</button>
       </div>
       <div class="admin-status" id="login-status"></div>
@@ -66,39 +65,6 @@
       <h1 class="admin-h1">Saved layouts</h1>
       <div id="layouts-list"></div>
     </section>
-
-    <section id="security-section" hidden>
-      <h1 class="admin-h1">Admin PIN</h1>
-      <p class="admin-copy" id="pin-state"></p>
-      <div class="admin-card">
-        <div class="pin-form">
-          <label class="pin-field" id="pin-current-field" hidden>
-            <span>Current PIN</span>
-            <input type="password" id="pin-current" class="pin-input" inputmode="numeric"
-                   autocomplete="off" maxlength="6" placeholder="••••••">
-          </label>
-          <label class="pin-field">
-            <span id="pin-new-label">New PIN</span>
-            <input type="password" id="pin-new" class="pin-input" inputmode="numeric"
-                   autocomplete="off" maxlength="6" placeholder="6 digits">
-          </label>
-          <label class="pin-field">
-            <span>Repeat</span>
-            <input type="password" id="pin-repeat" class="pin-input" inputmode="numeric"
-                   autocomplete="off" maxlength="6" placeholder="6 digits">
-          </label>
-          <div class="pin-actions">
-            <button class="btn primary" id="pin-save">Set PIN</button>
-            <button class="btn" id="pin-clear" hidden>Turn off</button>
-          </div>
-        </div>
-        <p class="admin-copy pin-note">Only this page and the admin API ask for it — dashboards stay
-          open, and it is nothing to do with a module's own PIN, such as Slack's send PIN. Forgotten?
-          Remove <code>adminPin</code> from <code id="pin-file">proddash.json</code> in the settings
-          folder and restart.</p>
-        <div class="admin-status" id="pin-status"></div>
-      </div>
-    </section>
   </main>
 
   <div id="toast" hidden></div>

server.js

@@ -12,8 +12,7 @@
  * Configure via config/proddash.json (defaults, in the repo), an optional
  * proddash.json in the data directory (this machine's overrides), or env vars:
  *   PORT               (default: value in proddash.json, else 24500)
- *   PRODDASH_PASSCODE  (a passcode that overrides the stored admin PIN —
- *                       also the way back in if the PIN is ever forgotten)
+ *   PRODDASH_PASSCODE  (overrides adminPasscode in proddash.json)
  *   PRODDASH_FORGE     (overrides `forge`: "github", or a Gitea/Forgejo base
  *                       URL such as http://10.3.8.90:3000)
  *   PRODDASH_DATA_DIR  (where module config + layouts are kept; see below)
@@ -767,7 +766,7 @@ function parseRepoSetting(value, fallbackBranch) {
 }
 
 const REPO = parseRepoSetting(process.env.PRODDASH_REPO || shellConfig.repo, shellConfig.branch)
-  || parseRepoSetting('michaelmcgary2008/ProdDash', 'main');
+  || parseRepoSetting('michael/ProdDash', 'main');
 
 /**
  * Which server the code comes from. GitHub unless `forge` names another —
@@ -1171,109 +1170,12 @@ function restartServer(reason) {
 
 /* ── admin API ──────────────────────────────────────────────────────── */
 
-/* Admin is behind a 6-digit PIN, set in the admin page and kept in this
-   machine's proddash.json as a scrypt hash — never in the clear, because that
-   file gets copied between machines. A dashboard needs no PIN; only /admin
-   and the admin API do. Two ways back in if it is ever forgotten: set
-   PRODDASH_PASSCODE in the environment, or delete "adminPin" from
-   proddash.json in the data directory and restart. `adminPasscode` (the older
-   free-text setting) still works so an existing install keeps running. */
-const PIN_RE = /^\d{6}$/;
-const PIN_MAX_WRONG = 5;
-const PIN_LOCKOUT_MS = 30000;
 const ADMIN_PASSCODE = String(process.env.PRODDASH_PASSCODE || shellConfig.adminPasscode || '');
-/** Session token: regenerating it every boot is fine — admins just re-enter the PIN. */
+/** Session token: regenerating it every boot is fine — admins just re-enter the passcode. */
 const adminToken = crypto.randomBytes(24).toString('hex');
-/** The stored PIN, as "scrypt$<salt>$<hash>"; '' when admin is open. */
-let adminPinHash = String(shellConfig.adminPin || '');
-const pinAttempts = new Map(); // ip → { count, lockedUntil }
-
-function hashPin(pin, salt = crypto.randomBytes(16).toString('hex')) {
-  return `scrypt$${salt}$${crypto.scryptSync(String(pin), salt, 32).toString('hex')}`;
-}
-
-/** Constant-time check of a PIN against the stored hash. */
-function pinMatches(given, stored) {
-  const parts = String(stored || '').split('$');
-  if (parts.length !== 3 || parts[0] !== 'scrypt') return false;
-  const expected = Buffer.from(parts[2], 'hex');
-  const actual = crypto.scryptSync(String(given), parts[1], expected.length);
-  return expected.length === actual.length && crypto.timingSafeEqual(expected, actual);
-}
-
-/** Is a credential required at all? */
-function adminLocked() {
-  return Boolean(ADMIN_PASSCODE || adminPinHash);
-}
-
-/** True when `given` is the credential in force (the env passcode, or the PIN). */
-function credentialOk(given) {
-  const s = String(given ?? '');
-  if (!s) return false;
-  if (ADMIN_PASSCODE) {
-    const a = Buffer.from(s);
-    const b = Buffer.from(ADMIN_PASSCODE);
-    if (a.length === b.length && crypto.timingSafeEqual(a, b)) return true;
-  }
-  return adminPinHash ? pinMatches(s, adminPinHash) : false;
-}
-
-function clientIp(req) {
-  return String(req.socket?.remoteAddress || 'unknown');
-}
-
-/** Seconds of lockout left for this address, or 0. */
-function lockoutLeft(ip) {
-  const a = pinAttempts.get(ip);
-  if (!a || !a.lockedUntil) return 0;
-  const left = a.lockedUntil - Date.now();
-  if (left <= 0) {
-    pinAttempts.delete(ip);
-    return 0;
-  }
-  return Math.ceil(left / 1000);
-}
-
-function noteWrongPin(ip) {
-  const a = pinAttempts.get(ip) || { count: 0, lockedUntil: 0 };
-  a.count += 1;
-  if (a.count >= PIN_MAX_WRONG) {
-    a.count = 0;
-    a.lockedUntil = Date.now() + PIN_LOCKOUT_MS;
-    console.warn(`[proddash] ${PIN_MAX_WRONG} wrong admin PINs from ${ip} — locked out for ${PIN_LOCKOUT_MS / 1000} s`);
-  }
-  pinAttempts.set(ip, a);
-}
-
-/**
- * Store a new PIN (6 digits), or '' to open admin up again. Keeps every other
- * key in this machine's proddash.json. Throws an httpError the route reports.
- */
-function setAdminPin(pin) {
-  const next = String(pin ?? '');
-  if (next && !PIN_RE.test(next)) throw httpError(400, 'The PIN must be exactly 6 digits.');
-  const file = path.join(DATA_DIR, 'proddash.json');
-  let existing = {};
-  if (fs.existsSync(file)) {
-    existing = readJson(file, null);
-    if (!existing || typeof existing !== 'object' || Array.isArray(existing)) {
-      throw httpError(500, `${file} is not a JSON object — fix it by hand before changing the PIN.`);
-    }
-  }
-  const hash = next ? hashPin(next) : '';
-  const out = { ...existing };
-  if (hash) out.adminPin = hash;
-  else delete out.adminPin;
-  writeJson(file, out);
-  adminPinHash = hash;
-  shellConfig.adminPin = hash;
-  pinAttempts.clear();
-  console.log(`[proddash] admin PIN ${hash ? 'set' : 'removed — admin is open again'}`);
-  return { pinSet: Boolean(hash) };
-}
 
 function isAuthed(req) {
-  if (!adminLocked()) return true;
+  if (!ADMIN_PASSCODE) return true;
   const cookies = String(req.headers.cookie || '');
   return cookies.split(';').some((c) => c.trim() === 'proddash_admin=' + adminToken);
 }
@@ -1281,7 +1183,7 @@ function isAuthed(req) {
 /** Guard a state-changing admin route. Returns true when the request was refused. */
 function refuseAdminWrite(req, res) {
   if (!isAuthed(req)) {
-    sendJson(res, 401, { error: 'Enter the admin PIN first.', authRequired: true });
+    sendJson(res, 401, { error: 'Enter the admin passcode first.', authRequired: true });
     return true;
   }
   // Requiring application/json forces a CORS preflight that a hostile page
@@ -1366,19 +1268,10 @@ async function handleAdminApi(req, res, urlPath) {
     } catch {
       return sendJson(res, 400, { error: 'Malformed request.' });
     }
-    if (!adminLocked()) return sendJson(res, 200, { ok: true, authRequired: false });
-    const ip = clientIp(req);
-    const left = lockoutLeft(ip);
-    if (left) return sendJson(res, 429, { error: `Too many wrong PINs — try again in ${left} s.`, retryAfter: left });
-    // `passcode` is what the older admin page sent; `pin` is what this one does.
-    if (!credentialOk(body.pin ?? body.passcode)) {
-      noteWrongPin(ip);
-      const now = lockoutLeft(ip);
-      return sendJson(res, 403, now
-        ? { error: `Too many wrong PINs — try again in ${now} s.`, retryAfter: now }
-        : { error: 'Wrong PIN.' });
+    if (!ADMIN_PASSCODE) return sendJson(res, 200, { ok: true, authRequired: false });
+    if (String(body.passcode || '') !== ADMIN_PASSCODE) {
+      return sendJson(res, 403, { error: 'Wrong passcode.' });
     }
-    pinAttempts.delete(ip);
     res.writeHead(200, {
       'Content-Type': 'application/json; charset=utf-8',
       'Set-Cookie': `proddash_admin=${adminToken}; Path=/; SameSite=Lax; HttpOnly`,
@@ -1387,50 +1280,12 @@ async function handleAdminApi(req, res, urlPath) {
     return res.end(JSON.stringify({ ok: true }));
   }
 
-  if (urlPath === '/api/admin/pin' && req.method === 'POST') {
-    if (refuseAdminWrite(req, res)) return;
-    let body = {};
-    try {
-      body = JSON.parse((await readBody(req)) || '{}');
-    } catch {
-      return sendJson(res, 400, { error: 'Malformed request.' });
-    }
-    // Changing a credential re-asserts it, so a browser left open on the
-    // admin page can't be used to take the machine over.
-    if (adminPinHash) {
-      const ip = clientIp(req);
-      const left = lockoutLeft(ip);
-      if (left) return sendJson(res, 429, { error: `Too many wrong PINs — try again in ${left} s.`, retryAfter: left });
-      if (!pinMatches(String(body.current ?? ''), adminPinHash)) {
-        noteWrongPin(ip);
-        return sendJson(res, 403, { error: 'That is not the current PIN.' });
-      }
-      pinAttempts.delete(ip);
-    }
-    try {
-      const result = setAdminPin(body.pin);
-      // Whoever just set it has proved they are allowed, so hand them the
-      // session rather than bouncing them to the unlock card they just built.
-      res.writeHead(200, {
-        'Content-Type': 'application/json; charset=utf-8',
-        'Set-Cookie': `proddash_admin=${adminToken}; Path=/; SameSite=Lax; HttpOnly`,
-        'Cache-Control': 'no-store',
-      });
-      return res.end(JSON.stringify(result));
-    } catch (err) {
-      return sendJson(res, err.status || 500, { error: err.message || 'Could not save the PIN.' });
-    }
-  }
-
   if (urlPath === '/api/admin/state' && req.method === 'GET') {
     if (!isAuthed(req)) {
       return sendJson(res, 401, { authRequired: true, authed: false });
     }
     return sendJson(res, 200, {
-      authRequired: adminLocked(),
-      // The env passcode can't be changed from here; the page says so.
-      pinSet: Boolean(adminPinHash),
-      pinFromEnv: Boolean(ADMIN_PASSCODE),
+      authRequired: Boolean(ADMIN_PASSCODE),
       authed: true,
       version: SHELL_VERSION,
       dataDir: DATA_DIR,
@@ -1611,7 +1466,7 @@ async function handleLayoutsApi(req, res, urlPath) {
   }
 
   if (!m[2] && req.method === 'DELETE') {
-    if (!isAuthed(req)) return sendJson(res, 401, { error: 'Enter the admin PIN first.', authRequired: true });
+    if (!isAuthed(req)) return sendJson(res, 401, { error: 'Enter the admin passcode first.', authRequired: true });
     try {
       fs.unlinkSync(layoutPath(name));
     } catch {