-
-
diff --git a/status/js/backup-restore.js b/status/js/backup-restore.js
index c328de6..f462aec 100644
--- a/status/js/backup-restore.js
+++ b/status/js/backup-restore.js
@@ -1,11 +1,94 @@
-// ========== BACKUP/RESTORE (Enhanced) ==========
+// ========== UNIFIED BACKUP/RESTORE v2.0 ==========
+// Single file captures everything: server config + browser state + themes + encryption key
(function() {
+ // All DashCaddy localStorage keys to include in backup
+ var BROWSER_STATE_KEYS = [
+ 'dashcaddy_site_config', 'dashcaddy_onboarding', 'dashcaddy-encryption-key',
+ 'dashcaddy-setup', 'dashcaddy-config',
+ 'theme', 'user-themes', 'custom-theme',
+ 'custom-apps', 'custom-services', 'toolbar-sections',
+ 'weather-location', 'weather-zip', 'weather-geo', 'weather-unit',
+ 'clock-style', 'clock-chimes', 'clock-chime-volume'
+ ];
+
+ // Collect all DashCaddy browser state from localStorage
+ function collectBrowserState() {
+ var state = {};
+ // Grab all whitelisted keys
+ for (var i = 0; i < BROWSER_STATE_KEYS.length; i++) {
+ var key = BROWSER_STATE_KEYS[i];
+ var val = safeGet(key);
+ if (val !== null && val !== undefined) state[key] = val;
+ }
+ // Grab dynamic widget-*-enabled keys
+ try {
+ for (var j = 0; j < localStorage.length; j++) {
+ var k = localStorage.key(j);
+ if (/^widget-.+-enabled$/.test(k)) {
+ state[k] = localStorage.getItem(k);
+ }
+ }
+ } catch (e) { /* private browsing */ }
+ return state;
+ }
+
+ // Restore browser state from backup into localStorage
+ function restoreBrowserState(browserState) {
+ if (!browserState || typeof browserState !== 'object') return 0;
+ var count = 0;
+ for (var key in browserState) {
+ if (!browserState.hasOwnProperty(key)) continue;
+ safeSet(key, browserState[key]);
+ count++;
+ }
+ return count;
+ }
+
+ // Handle legacy v1.0.0 import-export format (pre-backup modal)
+ function isLegacyFormat(data) {
+ return data.version && !data.files && data.services;
+ }
+
+ function restoreLegacyFormat(data) {
+ // Map the old flat keys into browserState for localStorage restore
+ var browserState = {};
+ if (data.customServices) browserState['custom-services'] = JSON.stringify(data.customServices);
+ if (data.customApps) browserState['custom-apps'] = JSON.stringify(data.customApps);
+ if (data.weatherZip) browserState['weather-zip'] = data.weatherZip;
+ if (data.theme) browserState['theme'] = data.theme;
+ if (data.userThemes && Object.keys(data.userThemes).length) browserState['user-themes'] = JSON.stringify(data.userThemes);
+ restoreBrowserState(browserState);
+
+ // Push services to server if available
+ if (data.services && Array.isArray(data.services)) {
+ secureFetch('/api/v1/services', {
+ method: 'PUT',
+ headers: { 'Content-Type': 'application/json' },
+ body: JSON.stringify(data.services)
+ }).catch(function() {});
+ }
+
+ // Push themes to server if available
+ if (data.userThemes) {
+ Object.keys(data.userThemes).forEach(function(slug) {
+ var t = data.userThemes[slug];
+ var colors = {};
+ (window.THEME_PROPS || []).forEach(function(p) { if (t[p]) colors[p] = t[p]; });
+ secureFetch('/api/v1/themes/' + slug, {
+ method: 'POST',
+ headers: { 'Content-Type': 'application/json' },
+ body: JSON.stringify({ name: t.name || slug, colors: colors })
+ }).catch(function() {});
+ });
+ }
+ }
+
// Inject modal HTML
injectModal('backup-modal', `
💾 Backup & Restore
- Manual and automated backups for your DashCaddy configuration.
+ Full backup of your entire DashCaddy setup — server config, credentials, themes, and browser preferences in one file.
@@ -15,16 +98,16 @@
-
+
📤 Export Backup
- Download all your settings: services, Caddyfile, DNS credentials, notifications.
+ Downloads everything — services, Caddyfile, credentials, encryption key, themes, and all browser preferences.
@@ -32,7 +115,7 @@
📥 Restore Backup
- Upload a backup file to restore your configuration.
+ Upload a backup file to restore your entire configuration — drag and drop ready.
';
try {
- const res = await fetch('/api/v1/backups/history?limit=50');
- const data = await res.json();
+ var res = await fetch('/api/v1/backups/history?limit=50');
+ var data = await res.json();
if (!data.success || !data.history?.length) {
historyContainer.innerHTML = '
📋 No backup history yet
';
return;
}
- let html = '
';
- for (const bk of data.history) {
- const statusColor = bk.status === 'success' ? '#2ecc71' : '#e74c3c';
- const sizeMB = bk.size ? (bk.size / 1024 / 1024).toFixed(2) : '?';
- html += `
';
+ for (var i = 0; i < data.history.length; i++) {
+ var bk = data.history[i];
+ var sizeMB = bk.size ? (bk.size / 1024 / 1024).toFixed(2) : '?';
+ html += '
';
+ html += '
';
+ html += ' ' + escapeHtml(bk.name || 'backup') + '';
+ html += '
';
+ html += ' ' + escapeHtml(bk.status) + '';
+ if (bk.status === 'success') html += ' ';
+ html += '
';
+ html += '
';
+ html += '
';
+ html += ' ' + new Date(bk.timestamp).toLocaleString() + ' | ' + sizeMB + ' MB | ' + (bk.duration ? (bk.duration / 1000).toFixed(1) + 's' : '--');
+ if (bk.encrypted) html += ' | 🔒';
+ html += '