diff --git a/containers/libreportal/frontend/core/setup/css/setup-wizard.css b/containers/libreportal/frontend/core/setup/css/setup-wizard.css index 148c8ca..e7f3277 100755 --- a/containers/libreportal/frontend/core/setup/css/setup-wizard.css +++ b/containers/libreportal/frontend/core/setup/css/setup-wizard.css @@ -936,62 +936,6 @@ body.setup-wizard-open { font-size: 13px; } -/* "No apps selected" confirm — a self-contained dialog layered over the - wizard card (the shared confirmation-dialog component isn't loaded this - early in boot). Backdrop dims the wizard; the box mirrors .setup-card. */ -.setup-confirm { - /* Fixed + explicit offsets (not `inset`/`absolute`) so it reliably covers - the whole wizard regardless of the flex flow it's appended into. */ - position: fixed; - top: 0; - right: 0; - bottom: 0; - left: 0; - z-index: 10000; - display: flex; - align-items: center; - justify-content: center; - padding: 20px; - background: rgba(var(--bg-rgb), 0.55); - backdrop-filter: blur(4px); - opacity: 0; - transition: opacity 0.2s ease; -} -.setup-confirm.active { opacity: 1; } - -.setup-confirm-box { - width: min(440px, 100%); - background: rgba(var(--bg-rgb), 0.92); - border: 1px solid rgba(var(--accent-rgb), 0.28); - border-radius: 16px; - padding: 26px 24px 22px; - text-align: center; - box-shadow: 0 24px 60px rgba(0, 0, 0, 0.45); - transform: translateY(8px) scale(0.98); - transition: transform 0.2s ease; -} -.setup-confirm.active .setup-confirm-box { transform: translateY(0) scale(1); } - -.setup-confirm-icon { font-size: 34px; line-height: 1; margin-bottom: 10px; } - -.setup-confirm-title { - margin: 0 0 8px; - font-size: 18px; - font-weight: 700; - color: var(--text-primary); -} - -.setup-confirm-text { - margin: 0 0 20px; - font-size: 13.5px; - line-height: 1.5; - color: var(--text-secondary); -} - -.setup-confirm-actions { display: flex; gap: 10px; } -.setup-confirm-actions .setup-btn-back { flex: 1; } -.setup-confirm-proceed { flex: 1.4; } - /* Top-nav disabled state — applied while setup isn't complete. */ .topbar-nav.setup-needed .nav-item { opacity: 0.35; diff --git a/containers/libreportal/frontend/core/setup/js/setup-wizard.js b/containers/libreportal/frontend/core/setup/js/setup-wizard.js index 54b7e92..6e1e75d 100755 --- a/containers/libreportal/frontend/core/setup/js/setup-wizard.js +++ b/containers/libreportal/frontend/core/setup/js/setup-wizard.js @@ -702,23 +702,6 @@ class SetupWizard { const apps = Array.from(this.container.querySelectorAll('.setup-app input[type=checkbox][data-app]:checked')) .map(cb => cb.dataset.app); - - // Zero apps is valid but almost always a mistake — the whole point of the - // wizard is to stand up a *working* install. Without a guard, setup would - // finish in seconds having installed nothing and fast-forward the user into - // an empty App Center wondering why "setup complete" left them with nothing. - // Confirm first, with a self-contained in-wizard dialog (the shared - // confirmation-dialog component isn't loaded this early in boot, so we - // can't rely on window.showConfirmation here). _zeroAppsConfirmed lets the - // confirm callback re-enter submit() and skip this branch the second time. - if (apps.length === 0 && !this._zeroAppsConfirmed) { - this._submitting = false; - this.showZeroAppConfirm( - () => { this._zeroAppsConfirmed = true; this.submit(); }, // Continue - () => { this.showStep(3); } // Go back to apps - ); - return; - } // Sub-options live under their parent app and only matter if the parent // is installed. Shape: { crowdsec: { dashboard: true }, ... } const appOptions = {}; @@ -784,60 +767,6 @@ class SetupWizard { } } - // Self-contained "no apps selected" confirm. Rendered inside the wizard's - // own full-screen shell (so it inherits the aurora aesthetic and doesn't - // depend on the shared confirmation-dialog component, which hasn't loaded - // this early in boot). Calls onProceed / onCancel exactly once. - showZeroAppConfirm(onProceed, onCancel) { - // Never stack two. - document.querySelector('.setup-confirm')?.remove(); - - const overlay = document.createElement('div'); - overlay.className = 'setup-confirm'; - overlay.innerHTML = ` - - `; - // Mount on , not the wizard: the wizard is an `.aurora-bg` surface - // whose `.aurora-bg > :not(.aurora-stars){position:relative}` FX-stacking - // rule would otherwise force this fixed overlay back to `relative` and - // collapse it into the flex flow. A modal belongs above everything anyway. - document.body.appendChild(overlay); - // Entrance on next frame so the CSS transition plays. - requestAnimationFrame(() => overlay.classList.add('active')); - - let done = false; - const close = (cb) => { - if (done) return; - done = true; - overlay.classList.remove('active'); - setTimeout(() => overlay.remove(), 250); - if (typeof cb === 'function') cb(); - }; - overlay.querySelector('[data-act="proceed"]').addEventListener('click', () => close(onProceed)); - overlay.querySelector('[data-act="cancel"]').addEventListener('click', () => close(onCancel)); - // Backdrop click / Escape cancels (same as "Pick apps"). - overlay.addEventListener('click', (e) => { if (e.target === overlay) close(onCancel); }); - const onKey = (e) => { - if (e.key === 'Escape') { document.removeEventListener('keydown', onKey); close(onCancel); } - }; - document.addEventListener('keydown', onKey); - setTimeout(() => overlay.querySelector('[data-act="proceed"]')?.focus(), 260); - } - handoffToTasks({ firstTaskId, finalizeTaskId, setupGroup, installName, taskIds }) { try { sessionStorage.setItem('libreportal_setup_handoff', JSON.stringify({