This PR breaks the large web and player bootstrap files into smaller modules with clearer ownership.
Web changes: Split shared helpers, bootstrap logic, route groups, and upload-sync behavior out of web.js. Kept web.js focused on wiring and server startup. Fixed screen playlist reassignment so changing a screen’s playlist now triggers a refresh. Fixed single-slide playlist refresh behavior so updates do not get stuck behind the current slide. Player changes: Split websocket/runtime handling into runtime.js. Split playlist assembly and revision hashing into playlist.js. Split onboarding and player HTTP routes into dedicated modules. Split render utilities and template loading into render-helpers.js. Kept player.js mostly as startup/orchestration. Validation: Rebuilt both services with Docker Compose. Smoke-checked web and player routes after the refactor. Verified get_errors was clean on the touched modules.
This commit is contained in:
+179
-74
@@ -6,103 +6,206 @@
|
||||
<title>{{title}} - Pulse</title>
|
||||
<link rel="icon" type="image/png" href="/assets/favicon.png" />
|
||||
<script src="/assets/js/theme-init.js"></script>
|
||||
<link rel="stylesheet" href="/assets/css/admin.css" />
|
||||
<link rel="stylesheet" href="/assets/adminlte/bootstrap-icons/css/bootstrap-icons.min.css" />
|
||||
<link rel="stylesheet" href="/assets/adminlte/css/adminlte.min.css" />
|
||||
<link rel="stylesheet" href="/assets/css/theme-custom.css" />
|
||||
{{#if stylesheets.length}}
|
||||
{{#each stylesheets}}
|
||||
<link rel="stylesheet" href="/assets/{{this}}" />
|
||||
{{/each}}
|
||||
{{/if}}
|
||||
</head>
|
||||
<body class="admin-shell-body {{#if authShell}}auth-shell-body{{/if}} {{bodyClass}}">
|
||||
<body class="hold-transition layout-fixed sidebar-expand-lg bg-body-tertiary {{#if authShell}}login-page{{/if}} {{bodyClass}}">
|
||||
{{#if authShell}}
|
||||
<main class="auth-page">
|
||||
{{{body}}}
|
||||
<main class="login-page d-flex align-items-center justify-content-center min-vh-100 p-3">
|
||||
<div class="login-box">
|
||||
{{{body}}}
|
||||
</div>
|
||||
</main>
|
||||
<script src="/assets/js/admin-page.js"></script>
|
||||
<script src="/assets/js/system-status.js"></script>
|
||||
{{else}}
|
||||
{{#if message}}
|
||||
<div class="toast" id="app-toast" role="status" aria-live="polite">
|
||||
<div class="toast-body">{{message}}</div>
|
||||
<button type="button" class="toast-close" id="app-toast-close" aria-label="Dismiss notification">×</button>
|
||||
</div>
|
||||
{{/if}}
|
||||
<div class="app-shell">
|
||||
<aside class="sidebar" aria-label="Primary navigation">
|
||||
<div class="brand">
|
||||
<div class="brand-mark">PS</div>
|
||||
<div class="brand-copy">
|
||||
<strong>Pulse Signage</strong>
|
||||
<span>Admin Panel</span>
|
||||
<div id="app-toast-container" class="toast-container position-fixed top-0 end-0 p-3">
|
||||
{{#if message}}
|
||||
<div class="toast align-items-center text-bg-primary border-0" id="app-toast" role="status" aria-live="polite" aria-atomic="true" data-bs-autohide="true" data-bs-delay="4000">
|
||||
<div class="d-flex">
|
||||
<div class="toast-body">{{message}}</div>
|
||||
<button type="button" class="btn-close btn-close-white me-2 m-auto" data-bs-dismiss="toast" aria-label="Dismiss notification"></button>
|
||||
</div>
|
||||
</div>
|
||||
<div class="sidebar-footer">
|
||||
<span class="status-dot status-dot--unknown" id="sidebar-status-dot"></span>
|
||||
<div>
|
||||
<strong>System status</strong>
|
||||
<span id="sidebar-status-text">Checking player service</span>
|
||||
</div>
|
||||
{{/if}}
|
||||
</div>
|
||||
<div class="app-wrapper">
|
||||
<div class="sidebar-overlay" aria-hidden="true"></div>
|
||||
<nav class="app-header navbar navbar-expand bg-body">
|
||||
<div class="container-fluid">
|
||||
<ul class="navbar-nav">
|
||||
<li class="nav-item">
|
||||
<button type="button" class="nav-link btn btn-link text-reset p-0" data-lte-toggle="sidebar" aria-label="Toggle navigation">
|
||||
<i class="bi bi-list fs-4"></i>
|
||||
</button>
|
||||
</li>
|
||||
<li class="nav-item d-none d-md-flex align-items-center text-secondary small ms-3">
|
||||
<span class="status-dot status-dot--unknown me-2" id="sidebar-status-dot"></span>
|
||||
<span id="sidebar-status-text">Player service</span>
|
||||
</li>
|
||||
</ul>
|
||||
<ul class="navbar-nav ms-auto align-items-center">
|
||||
<li class="nav-item dropdown">
|
||||
<a
|
||||
class="nav-link"
|
||||
href="#"
|
||||
id="bd-theme"
|
||||
data-bs-toggle="dropdown"
|
||||
aria-label="Toggle color scheme"
|
||||
aria-expanded="false"
|
||||
>
|
||||
<span class="theme-icon-active">
|
||||
<i class="bi bi-sun-fill" data-lte-theme-icon="light"></i>
|
||||
<i class="bi bi-moon-fill d-none" data-lte-theme-icon="dark"></i>
|
||||
<i class="bi bi-circle-half d-none" data-lte-theme-icon="auto"></i>
|
||||
</span>
|
||||
</a>
|
||||
<ul class="dropdown-menu dropdown-menu-end" aria-labelledby="bd-theme" style="--bs-dropdown-min-width: 8rem;">
|
||||
<li>
|
||||
<button type="button" class="dropdown-item d-flex align-items-center" data-bs-theme-value="light" aria-pressed="false">
|
||||
<i class="bi bi-sun-fill me-2"></i>
|
||||
Light
|
||||
<i class="bi bi-check-lg ms-auto d-none"></i>
|
||||
</button>
|
||||
</li>
|
||||
<li>
|
||||
<button type="button" class="dropdown-item d-flex align-items-center" data-bs-theme-value="dark" aria-pressed="false">
|
||||
<i class="bi bi-moon-fill me-2"></i>
|
||||
Dark
|
||||
<i class="bi bi-check-lg ms-auto d-none"></i>
|
||||
</button>
|
||||
</li>
|
||||
<li>
|
||||
<button type="button" class="dropdown-item d-flex align-items-center active" data-bs-theme-value="auto" aria-pressed="true">
|
||||
<i class="bi bi-circle-half me-2"></i>
|
||||
Auto
|
||||
<i class="bi bi-check-lg ms-auto d-none"></i>
|
||||
</button>
|
||||
</li>
|
||||
</ul>
|
||||
</li>
|
||||
<li class="nav-item dropdown user-menu">
|
||||
<a class="nav-link dropdown-toggle d-flex align-items-center gap-2" href="#" role="button" data-bs-toggle="dropdown" aria-expanded="false">
|
||||
<span class="user-menu-avatar" aria-hidden="true">{{userInitial currentUser.name currentUser.username}}</span>
|
||||
<span class="d-none d-md-inline user-menu-name">
|
||||
{{#if currentUser}}{{#if currentUser.name}}{{currentUser.name}}{{else}}{{currentUser.username}}{{/if}}{{/if}}
|
||||
</span>
|
||||
</a>
|
||||
<ul class="dropdown-menu dropdown-menu-lg dropdown-menu-end user-menu-dropdown">
|
||||
{{#if currentUser}}
|
||||
<li class="user-header text-bg-primary">
|
||||
<span class="user-menu-avatar user-menu-avatar--lg" aria-hidden="true">{{userInitial currentUser.name currentUser.username}}</span>
|
||||
<p>
|
||||
{{#if currentUser.name}}{{currentUser.name}}{{else}}{{currentUser.username}}{{/if}}
|
||||
{{!-- <small>Member since today</small> --}}
|
||||
</p>
|
||||
</li>
|
||||
{{!-- <li class="user-body">
|
||||
<div class="row">
|
||||
<div class="col-4 text-center"><a href="/admin/account">Account</a></div>
|
||||
<div class="col-4 text-center"><a href="/admin/account">Settings</a></div>
|
||||
<div class="col-4 text-center"><a href="/logout">Logout</a></div>
|
||||
</div>
|
||||
</li> --}}
|
||||
<li class="user-footer">
|
||||
<a class="btn btn-outline-secondary" href="/admin/account">Profile</a>
|
||||
<a class="btn btn-outline-danger float-end" href="/logout">Sign out</a>
|
||||
</li>
|
||||
{{else}}
|
||||
<li><a class="dropdown-item" href="/login">Sign in</a></li>
|
||||
{{/if}}
|
||||
</ul>
|
||||
</li>
|
||||
</ul>
|
||||
</div>
|
||||
<nav class="nav">
|
||||
<span class="nav-label">Manage</span>
|
||||
<a class="nav-item {{#if (eq active 'dashboard')}}active{{/if}}" href="/admin">Dashboard</a>
|
||||
<a class="nav-item {{#if (eq active 'clients')}}active{{/if}}" href="/admin/clients">Connected clients</a>
|
||||
<a class="nav-item {{#if (eq active 'screens')}}active{{/if}}" href="/admin/screens">Screens</a>
|
||||
<a class="nav-item {{#if (eq active 'playlists')}}active{{/if}}" href="/admin/playlists">Playlists</a>
|
||||
<a class="nav-item {{#if (eq active 'slides')}}active{{/if}}" href="/admin/slides">Slides</a>
|
||||
<a class="nav-item {{#if (eq active 'templates')}}active{{/if}}" href="/admin/templates">Slide templates</a>
|
||||
<a class="nav-item {{#if (eq active 'canvas-sizes')}}active{{/if}}" href="/admin/canvas-sizes">Canvas sizes</a>
|
||||
</nav>
|
||||
<div class="sidebar-divider" aria-hidden="true"></div>
|
||||
<nav class="nav nav--sidebar-bottom" aria-label="Secondary navigation">
|
||||
<a class="nav-item {{#if (eq active 'users')}}active{{/if}}" href="/admin/users">Users</a>
|
||||
</nav>
|
||||
<div class="sidebar-footer sidebar-footer--account">
|
||||
{{#if currentUser}}
|
||||
<div class="user-avatar" aria-hidden="true">{{userInitial currentUser.name currentUser.username}}</div>
|
||||
{{else}}
|
||||
<div class="user-avatar user-avatar--fallback" aria-hidden="true">A</div>
|
||||
{{/if}}
|
||||
<div>
|
||||
<strong class="sidebar-account-name">{{#if currentUser}}{{#if currentUser.name}}{{currentUser.name}}{{else}}{{currentUser.username}}{{/if}}{{else}}Account{{/if}}</strong>
|
||||
<span>{{#if currentUser}}{{currentUser.username}}{{else}}Not signed in{{/if}}</span>
|
||||
<div class="sidebar-footer-links">
|
||||
{{#if currentUser}}
|
||||
<a href="/admin/account">Account</a>
|
||||
<a href="/logout">Sign out</a>
|
||||
{{else}}
|
||||
<a href="/login">Sign in</a>
|
||||
{{/if}}
|
||||
</div>
|
||||
</div>
|
||||
</nav>
|
||||
|
||||
<aside class="app-sidebar bg-body-secondary shadow" data-bs-theme="dark">
|
||||
<div class="sidebar-brand">
|
||||
<a href="/admin" class="brand-link">
|
||||
<span class="brand-text fw-light">Pulse Signage</span>
|
||||
</a>
|
||||
</div>
|
||||
<div class="sidebar-footer sidebar-footer--bottom" aria-label="Sidebar controls">
|
||||
<span class="sidebar-version">v{{appVersion}}</span>
|
||||
<button type="button" class="theme-toggle theme-toggle--sidebar" data-theme-toggle aria-pressed="false" aria-label="Switch to dark mode">
|
||||
<span class="theme-toggle__icon theme-toggle__icon--moon" aria-hidden="true"></span>
|
||||
</button>
|
||||
<div class="sidebar-wrapper">
|
||||
<nav class="mt-2" aria-label="Main navigation">
|
||||
<ul class="nav sidebar-menu flex-column" data-lte-toggle="treeview" data-accordion="false" role="menu" id="navigation">
|
||||
<li class="nav-header">MAIN NAVIGATION</li>
|
||||
<li class="nav-item">
|
||||
<a class="nav-link {{#if (eq active 'dashboard')}}active{{/if}}" href="/admin">
|
||||
<i class="nav-icon bi bi-speedometer2"></i>
|
||||
<p>Dashboard</p>
|
||||
</a>
|
||||
</li>
|
||||
<li class="nav-item">
|
||||
<a class="nav-link {{#if (eq active 'clients')}}active{{/if}}" href="/admin/clients">
|
||||
<i class="nav-icon bi bi-broadcast"></i>
|
||||
<p>Connected clients</p>
|
||||
</a>
|
||||
</li>
|
||||
<li class="nav-item">
|
||||
<a class="nav-link {{#if (eq active 'screens')}}active{{/if}}" href="/admin/screens">
|
||||
<i class="nav-icon bi bi-display"></i>
|
||||
<p>Screens</p>
|
||||
</a>
|
||||
</li>
|
||||
<li class="nav-item">
|
||||
<a class="nav-link {{#if (eq active 'playlists')}}active{{/if}}" href="/admin/playlists">
|
||||
<i class="nav-icon bi bi-collection-play"></i>
|
||||
<p>Playlists</p>
|
||||
</a>
|
||||
</li>
|
||||
<li class="nav-item">
|
||||
<a class="nav-link {{#if (eq active 'slides')}}active{{/if}}" href="/admin/slides">
|
||||
<i class="nav-icon bi bi-file-earmark-richtext"></i>
|
||||
<p>Slides</p>
|
||||
</a>
|
||||
</li>
|
||||
<li class="nav-item">
|
||||
<a class="nav-link {{#if (eq active 'templates')}}active{{/if}}" href="/admin/templates">
|
||||
<i class="nav-icon bi bi-layout-text-window-reverse"></i>
|
||||
<p>Slide templates</p>
|
||||
</a>
|
||||
</li>
|
||||
<li class="nav-item">
|
||||
<a class="nav-link {{#if (eq active 'canvas-sizes')}}active{{/if}}" href="/admin/canvas-sizes">
|
||||
<i class="nav-icon bi bi-aspect-ratio"></i>
|
||||
<p>Canvas sizes</p>
|
||||
</a>
|
||||
</li>
|
||||
<li class="nav-header">SETTINGS</li>
|
||||
<li class="nav-item">
|
||||
<a class="nav-link {{#if (eq active 'users')}}active{{/if}}" href="/admin/users">
|
||||
<i class="nav-icon bi bi-people"></i>
|
||||
<p>Users</p>
|
||||
</a>
|
||||
</li>
|
||||
</ul>
|
||||
</nav>
|
||||
</div>
|
||||
</aside>
|
||||
|
||||
<button type="button" class="sidebar-backdrop" data-sidebar-backdrop aria-label="Close navigation"></button>
|
||||
|
||||
<div class="shell-main">
|
||||
<button type="button" class="sidebar-toggle sidebar-toggle--shell" data-sidebar-toggle aria-label="Toggle navigation" aria-expanded="false">
|
||||
<span class="sidebar-toggle-icon" aria-hidden="true"></span>
|
||||
</button>
|
||||
|
||||
<main class="content">
|
||||
<div class="page-shell">
|
||||
<main class="app-main">
|
||||
<div class="app-content">
|
||||
<div class="container-fluid py-3">
|
||||
{{{body}}}
|
||||
</div>
|
||||
</main>
|
||||
</div>
|
||||
</div>
|
||||
</main>
|
||||
</div>
|
||||
<script src="/assets/js/theme-sidebar.js"></script>
|
||||
<dialog id="slide-schedule-dialog" class="slide-schedule-dialog">
|
||||
<div id="slide-schedule-content" class="slide-schedule-content"></div>
|
||||
</dialog>
|
||||
<script src="/assets/adminlte/js/bootstrap.bundle.min.js"></script>
|
||||
<script src="/assets/adminlte/js/adminlte.min.js"></script>
|
||||
<script src="/assets/js/toast.js"></script>
|
||||
<script src="/assets/js/table-sort.js"></script>
|
||||
<script src="/assets/js/admin-page.js"></script>
|
||||
<script src="/assets/js/system-status.js"></script>
|
||||
{{/if}}
|
||||
{{#if scripts.length}}
|
||||
{{#each scripts}}
|
||||
{{#if (isExternalUrl this)}}
|
||||
@@ -112,5 +215,7 @@
|
||||
{{/if}}
|
||||
{{/each}}
|
||||
{{/if}}
|
||||
<script src="/assets/js/system-status.js"></script>
|
||||
{{/if}}
|
||||
</body>
|
||||
</html>
|
||||
|
||||
Reference in New Issue
Block a user