diff --git a/config.ini b/config.ini index 8b6f1a3..ef8dd93 100644 --- a/config.ini +++ b/config.ini @@ -1,8 +1,8 @@ [EMLy] SDK_DECODER_SEMVER = 1.3.2 -SDK_DECODER_RELEASE_CHANNEL = beta -GUI_SEMVER = 1.4.0 -GUI_RELEASE_CHANNEL = stable +SDK_DECODER_RELEASE_CHANNEL = stable +GUI_SEMVER = 1.5.0 +GUI_RELEASE_CHANNEL = beta LANGUAGE = it UPDATE_CHECK_ENABLED = false UPDATE_PATH = diff --git a/frontend/messages/en.json b/frontend/messages/en.json index 346513e..6dfb4e2 100644 --- a/frontend/messages/en.json +++ b/frontend/messages/en.json @@ -50,7 +50,9 @@ "settings_danger_reset_dialog_continue": "Continue", "settings_danger_warning": "Warning: This action is irreversible. Please ensure you have backed up any important data before proceeding.", "settings_danger_alert_title": "Advanced options enabled", - "settings_danger_alert_description": "You're about to access EMLy's advanced options. Modifying such options may cause instability, including crashes, freezes, or security software alerts. For support or troubleshooting, contact @lyzcoote on Discord.", + "settings_danger_alert_description_part1": "You're about to access EMLy's advanced options.", + "settings_danger_alert_description_part2": "Modifying such options may cause instability, including crashes, freezes, or security software alerts.", + "settings_danger_alert_description_part3": "For support or troubleshooting, contact your TL/RDS.", "settings_danger_alert_understood": "Understood", "settings_toast_reverted": "Reverted to last saved settings.", "settings_toast_save_failed": "Failed to save settings.", @@ -98,6 +100,12 @@ "bugreport_email_placeholder": "your.email@example.com", "bugreport_text_label": "Bug Description", "bugreport_text_placeholder": "Describe the bug in detail...", + "settings_appearance_title": "Appearance", + "settings_appearance_description": "Customize the application theme.", + "settings_theme_label": "Theme", + "settings_theme_hint": "Choose between light and dark mode.", + "settings_theme_light": "Light", + "settings_theme_dark": "Dark", "bugreport_info": "Your message, email file (if loaded), screenshot, and system information will be included in the report.", "bugreport_screenshot_label": "Attached Screenshot:", "bugreport_cancel": "Cancel", @@ -160,5 +168,35 @@ "credits_lib_dompurify": "XSS sanitizer for HTML content", "credits_license_title": "License & Source", "credits_license_text": "EMLy is proprietary software developed by 3gIT. All rights reserved. The application uses various open source libraries, each governed by their respective licenses.", - "credits_copyright": "All rights reserved." + "credits_copyright": "All rights reserved.", + "settings_updates_title": "Updates", + "settings_updates_description": "Check for and install application updates from your network share.", + "settings_updates_current_version": "Current Version", + "settings_updates_available": "Update Available", + "settings_updates_check_failed": "Check failed", + "settings_updates_no_updates": "No updates found", + "settings_updates_check_label": "Check for Updates", + "settings_updates_last_checked": "Last checked: {time}", + "settings_updates_click_check": "Click to check for available updates", + "settings_updates_checking": "Checking...", + "settings_updates_check_now": "Check Now", + "settings_updates_version_available": "Version {version} Available", + "settings_updates_downloading": "Downloading... {progress}%", + "settings_updates_click_download": "Click to download the update", + "settings_updates_download_button": "Download", + "settings_updates_ready_title": "Update Ready to Install", + "settings_updates_ready_ref": "Version {version} has been downloaded and verified", + "settings_updates_install_button": "Install Now", + "settings_updates_info_message": "Updates are checked from your configured network share path.", + "settings_updates_current_path": "Current path:", + "settings_updates_no_path": "No update path configured", + "settings_toast_update_available": "Update available: {version}", + "settings_toast_latest_version": "You're on the latest version", + "settings_toast_check_failed": "Failed to check for updates", + "settings_toast_download_success": "Update downloaded successfully", + "settings_toast_download_failed": "Failed to download update", + "settings_toast_install_failed": "Failed to launch installer", + "settings_danger_update_checker_label": "Enable Update Checker", + "settings_danger_update_checker_hint": "Check for application updates from network share", + "settings_danger_update_checker_info": "Info: When enabled, the app will check for updates from your configured network share. Disable this if you manage updates manually or don't have network access." } diff --git a/frontend/messages/it.json b/frontend/messages/it.json index abd5811..c56c8dc 100644 --- a/frontend/messages/it.json +++ b/frontend/messages/it.json @@ -50,7 +50,9 @@ "settings_danger_reset_dialog_continue": "Continua", "settings_danger_warning": "Attenzione: Questa azione è irreversibile. Assicurati di aver effettuato il backup di tutti i dati importanti prima di procedere.", "settings_danger_alert_title": "Opzioni avanzate abilitate", - "settings_danger_alert_description": "Stai per accedere alle opzioni avanzate di EMLy. Modificare tali opzioni può causare instabilità, inclusi crash, blocchi o avvisi del software di sicurezza. Per supporto o risoluzione dei problemi, contatta @lyzcoote su Discord.", + "settings_danger_alert_description_part1": "Stai per accedere alle opzioni avanzate di EMLy.", + "settings_danger_alert_description_part2": "Modificare tali opzioni può causare instabilità, inclusi crash, blocchi o avvisi del software di sicurezza.", + "settings_danger_alert_description_part3": "Per supporto o risoluzione dei problemi, contatta il proprio TL/RDS.", "settings_danger_alert_understood": "Capito", "settings_toast_reverted": "Ripristinato alle ultime impostazioni salvate.", "settings_toast_save_failed": "Impossibile salvare le impostazioni.", @@ -98,6 +100,12 @@ "bugreport_email_placeholder": "tua.email@esempio.com", "bugreport_text_label": "Descrizione del Bug", "bugreport_text_placeholder": "Descrivi il bug in dettaglio...", + "settings_appearance_title": "Aspetto", + "settings_appearance_description": "Personalizza il tema dell'applicazione.", + "settings_theme_label": "Tema", + "settings_theme_hint": "Scegli tra modalità chiara e scura.", + "settings_theme_light": "Chiaro", + "settings_theme_dark": "Scuro", "bugreport_info": "Il tuo messaggio, il file email (se caricato), lo screenshot e le informazioni di sistema saranno inclusi nella segnalazione.", "bugreport_screenshot_label": "Screenshot Allegato:", "bugreport_cancel": "Annulla", @@ -160,5 +168,35 @@ "credits_lib_dompurify": "Sanitizzatore XSS per contenuti HTML", "credits_license_title": "Licenza e Sorgente", "credits_license_text": "EMLy è un software proprietario sviluppato da 3gIT. Tutti i diritti riservati. L'applicazione utilizza varie librerie open source, ciascuna governata dalle rispettive licenze.", - "credits_copyright": "Tutti i diritti riservati." + "credits_copyright": "Tutti i diritti riservati.", + "settings_updates_title": "Aggiornamenti", + "settings_updates_description": "Controlla e installa gli aggiornamenti dell'applicazione dalla condivisione di rete.", + "settings_updates_current_version": "Versione corrente", + "settings_updates_available": "Aggiornamento disponibile", + "settings_updates_check_failed": "Controllo fallito", + "settings_updates_no_updates": "Nessun aggiornamento trovato", + "settings_updates_check_label": "Controlla aggiornamenti", + "settings_updates_last_checked": "Ultimo controllo: {time}", + "settings_updates_click_check": "Clicca per cercare aggiornamenti disponibili", + "settings_updates_checking": "Controllo in corso...", + "settings_updates_check_now": "Controlla ora", + "settings_updates_version_available": "Versione {version} disponibile", + "settings_updates_downloading": "Download in corso... {progress}%", + "settings_updates_click_download": "Clicca per scaricare l'aggiornamento", + "settings_updates_download_button": "Scarica", + "settings_updates_ready_title": "Aggiornamento pronto per l'installazione", + "settings_updates_ready_ref": "La versione {version} è stata scaricata e verificata", + "settings_updates_install_button": "Installa ora", + "settings_updates_info_message": "Gli aggiornamenti vengono controllati dal percorso di rete configurato.", + "settings_updates_current_path": "Percorso attuale:", + "settings_updates_no_path": "Nessun percorso di aggiornamento configurato", + "settings_toast_update_available": "Aggiornamento disponibile: {version}", + "settings_toast_latest_version": "Sei sull'ultima versione", + "settings_toast_check_failed": "Impossibile controllare gli aggiornamenti", + "settings_toast_download_success": "Aggiornamento scaricato con successo", + "settings_toast_download_failed": "Impossibile scaricare l'aggiornamento", + "settings_toast_install_failed": "Impossibile avviare l'installazione", + "settings_danger_update_checker_label": "Abilita controllo aggiornamenti", + "settings_danger_update_checker_hint": "Controlla aggiornamenti applicazione dalla condivisione di rete", + "settings_danger_update_checker_info": "Info: Quando abilitato, l'app controllerà gli aggiornamenti dal percorso di rete configurato. Disabilitalo se gestisci gli aggiornamenti manualmente o non hai accesso alla rete." } diff --git a/frontend/package.json b/frontend/package.json index a4702d7..57dc77d 100644 --- a/frontend/package.json +++ b/frontend/package.json @@ -36,6 +36,7 @@ "vite-plugin-devtools-json": "^1.0.0" }, "dependencies": { + "@rollup/rollup-win32-arm64-msvc": "^4.57.1", "@types/html2canvas": "^1.0.0", "dompurify": "^3.3.1", "html2canvas": "^1.4.1", diff --git a/frontend/src/app.html b/frontend/src/app.html index a3b1624..08986d3 100644 --- a/frontend/src/app.html +++ b/frontend/src/app.html @@ -14,11 +14,11 @@ try { const key = "emly_theme"; const stored = localStorage.getItem(key); - const theme = stored === "light" || stored === "dark" ? stored : "dark"; + const theme = stored === "light" || stored === "dark" ? stored : "light"; document.documentElement.classList.toggle("dark", theme === "dark"); } catch { - // If storage is blocked, default to dark. - document.documentElement.classList.add("dark"); + // If storage is blocked, default to light. + document.documentElement.classList.remove("dark"); } })(); @@ -67,8 +67,21 @@
-
Loading, please wait...
+
Loading...
+
%sveltekit.body%
diff --git a/frontend/src/lib/components/MailViewer.svelte b/frontend/src/lib/components/MailViewer.svelte index 70c0ebe..349919c 100644 --- a/frontend/src/lib/components/MailViewer.svelte +++ b/frontend/src/lib/components/MailViewer.svelte @@ -403,8 +403,8 @@ } .panel { - background: rgba(255, 255, 255, 0.04); - border: 1px solid rgba(255, 255, 255, 0.1); + background: var(--card); + border: 1px solid var(--border); border-radius: 14px; overflow: hidden; } @@ -423,20 +423,20 @@ height: 34px; padding: 0 12px; border-radius: 10px; - border: 1px solid rgba(255, 255, 255, 0.12); - background: rgba(255, 255, 255, 0.06); - color: inherit; + border: 1px solid var(--border); + background: var(--muted); + color: var(--muted-foreground); cursor: pointer; user-select: none; font-size: 11px; font-weight: 700; text-transform: uppercase; letter-spacing: 0.05em; - color: rgba(255, 255, 255, 0.5); } .btn:hover { - background: rgba(255, 255, 255, 0.09); + background: var(--accent); + color: var(--accent-foreground); } .events { @@ -454,16 +454,16 @@ } .email-header-content { - background: rgba(255, 255, 255, 0.05); + background: var(--card); padding: 16px; - border-bottom: 1px solid rgba(255, 255, 255, 0.08); + border-bottom: 1px solid var(--border); } .email-subject { font-size: 18px; font-weight: 600; line-height: 1.25; - color: inherit; + color: var(--foreground); min-width: 0; overflow-wrap: break-word; } @@ -496,21 +496,21 @@ .email-meta-grid .label { text-align: right; - color: rgba(255, 255, 255, 0.5); + color: var(--muted-foreground); margin-right: 8px; font-weight: 500; } .email-meta-grid .value { - color: rgba(255, 255, 255, 0.9); + color: var(--foreground); word-break: break-all; font-weight: 500; } .email-attachments { padding: 10px 16px; - border-bottom: 1px solid rgba(255, 255, 255, 0.08); - background: rgba(255, 255, 255, 0.03); + border-bottom: 1px solid var(--border); + background: var(--muted); display: flex; align-items: center; gap: 12px; @@ -522,7 +522,7 @@ font-weight: 700; text-transform: uppercase; letter-spacing: 0.05em; - color: rgba(255, 255, 255, 0.5); + color: var(--muted-foreground); flex-shrink: 0; } @@ -538,9 +538,9 @@ height: 28px; padding: 0 10px; border-radius: 6px; - border: 1px solid rgba(255, 255, 255, 0.15); + border: 1px solid var(--border); background: transparent; - color: rgba(255, 255, 255, 0.8); + color: var(--foreground); font-size: 12px; cursor: pointer; text-decoration: none; @@ -548,8 +548,8 @@ } .att-btn:hover { - background: rgba(255, 255, 255, 0.05); - color: #fff; + background: var(--accent); + color: var(--accent-foreground); } .att-btn.image { @@ -628,10 +628,10 @@ justify-content: center; height: 36px; padding: 0 16px; - background: rgba(255, 255, 255, 0.1); - border: 1px solid rgba(255, 255, 255, 0.15); + background: var(--muted); + border: 1px solid var(--border); border-radius: 8px; - color: white; + color: var(--foreground); font-size: 13px; font-weight: 500; cursor: pointer; @@ -639,8 +639,8 @@ } .browse-btn:hover { - background: rgba(255, 255, 255, 0.15); - border-color: rgba(255, 255, 255, 0.25); + background: var(--accent); + border-color: var(--accent-foreground); } .browse-btn:disabled, @@ -660,12 +660,12 @@ } ::-webkit-scrollbar-thumb { - background: rgba(255, 255, 255, 0.1); + background: var(--border); border-radius: 6px; } ::-webkit-scrollbar-thumb:hover { - background: rgba(255, 255, 255, 0.2); + background: var(--muted-foreground); } ::-webkit-scrollbar-corner { @@ -674,7 +674,7 @@ .att-empty { font-size: 11px; - color: rgba(255, 255, 255, 0.4); + color: var(--muted-foreground); font-style: italic; } diff --git a/frontend/src/lib/components/SidebarApp.svelte b/frontend/src/lib/components/SidebarApp.svelte index 693ce5e..d80a675 100644 --- a/frontend/src/lib/components/SidebarApp.svelte +++ b/frontend/src/lib/components/SidebarApp.svelte @@ -56,8 +56,8 @@
Logo -
+
{m.settings_unsaved_toast_message()} @@ -19,9 +19,3 @@
- - diff --git a/frontend/src/lib/stores/settings.svelte.ts b/frontend/src/lib/stores/settings.svelte.ts index 5d54064..cc2450e 100644 --- a/frontend/src/lib/stores/settings.svelte.ts +++ b/frontend/src/lib/stores/settings.svelte.ts @@ -1,6 +1,8 @@ import { browser } from "$app/environment"; import type { EMLy_GUI_Settings } from "$lib/types"; import { getFromLocalStorage, saveToLocalStorage } from "$lib/utils/localStorageHelper"; +import { applyTheme, getStoredTheme } from "$lib/utils/theme"; +import { setLocale } from "$lib/paraglide/runtime"; const STORAGE_KEY = "emly_gui_settings"; @@ -11,7 +13,9 @@ const defaults: EMLy_GUI_Settings = { previewFileSupportedTypes: ["jpg", "jpeg", "png"], enableAttachedDebuggerProtection: true, useDarkEmailViewer: true, - enableUpdateChecker: true, + enableUpdateChecker: false, + musicInspirationEnabled: false, + theme: "dark", }; class SettingsStore { @@ -33,6 +37,37 @@ class SettingsStore { console.error("Failed to load settings", e); } } + + // Migration: Check for legacy musicInspirationEnabled key + const legacyMusic = getFromLocalStorage("musicInspirationEnabled"); + if (legacyMusic !== null) { + this.settings.musicInspirationEnabled = legacyMusic === "true"; + localStorage.removeItem("musicInspirationEnabled"); + this.save(); // Save immediately to persist the migration + } + + // Sync theme from localStorage key used in app.html + const storedTheme = getStoredTheme(); + if (!this.settings.theme) { + this.settings.theme = storedTheme; + } else if (this.settings.theme !== storedTheme) { + // If there's a mismatch, prioritize the theme from emly_theme key + this.settings.theme = storedTheme; + } + + // Apply the theme + applyTheme(this.settings.theme); + + // Apply the language + if (this.settings.selectedLanguage) { + setLocale(this.settings.selectedLanguage); + } + + // Save defaults/merged settings to storage if they didn't exist or were updated during load + if (!stored) { + this.save(); + } + this.hasHydrated = true; } @@ -43,11 +78,20 @@ class SettingsStore { update(newSettings: Partial) { this.settings = { ...this.settings, ...newSettings }; + + // Apply theme if it changed + if (newSettings.theme && this.settings.theme) { + applyTheme(this.settings.theme); + } + this.save(); } reset() { this.settings = { ...defaults }; + if (this.settings.theme) { + applyTheme(this.settings.theme); + } this.save(); } } diff --git a/frontend/src/lib/types.d.ts b/frontend/src/lib/types.d.ts index f6bc66a..43c6e2f 100644 --- a/frontend/src/lib/types.d.ts +++ b/frontend/src/lib/types.d.ts @@ -10,6 +10,8 @@ interface EMLy_GUI_Settings { enableAttachedDebuggerProtection?: boolean; useDarkEmailViewer?: boolean; enableUpdateChecker?: boolean; + musicInspirationEnabled?: boolean; + theme?: "light" | "dark"; } type SupportedLanguages = "en" | "it"; diff --git a/frontend/src/lib/utils/theme.ts b/frontend/src/lib/utils/theme.ts new file mode 100644 index 0000000..af0deca --- /dev/null +++ b/frontend/src/lib/utils/theme.ts @@ -0,0 +1,45 @@ +import { browser } from "$app/environment"; + +const THEME_KEY = "emly_theme"; + +export type Theme = "light" | "dark"; + +/** + * Applies the theme to the document element and saves it to localStorage + */ +export function applyTheme(theme: Theme) { + if (!browser) return; + + const isDark = theme === "dark"; + document.documentElement.classList.toggle("dark", isDark); + + try { + localStorage.setItem(THEME_KEY, theme); + } catch (e) { + console.error("Failed to save theme to localStorage:", e); + } +} + +/** + * Gets the current theme from localStorage or returns the default + */ +export function getStoredTheme(): Theme { + if (!browser) return "light"; + + try { + const stored = localStorage.getItem(THEME_KEY); + return stored === "light" || stored === "dark" ? stored : "light"; + } catch { + return "light"; + } +} + +/** + * Toggles between light and dark theme + */ +export function toggleTheme(): Theme { + const current = getStoredTheme(); + const newTheme: Theme = current === "dark" ? "light" : "dark"; + applyTheme(newTheme); + return newTheme; +} diff --git a/frontend/src/routes/(app)/+layout.svelte b/frontend/src/routes/(app)/+layout.svelte index 2a9bcec..e21c881 100644 --- a/frontend/src/routes/(app)/+layout.svelte +++ b/frontend/src/routes/(app)/+layout.svelte @@ -3,8 +3,7 @@ import { page, navigating } from "$app/state"; import { beforeNavigate, goto } from "$app/navigation"; import { locales, localizeHref } from "$lib/paraglide/runtime"; - import { unsavedChanges, sidebarOpen, bugReportDialogOpen } from "$lib/stores/app"; - import "../layout.css"; + import { unsavedChanges, sidebarOpen, bugReportDialogOpen, dangerZoneEnabled } from "$lib/stores/app"; import { onMount } from "svelte"; import * as m from "$lib/paraglide/messages.js"; import type { utils } from "$lib/wailsjs/go/models"; @@ -100,6 +99,7 @@ } onMount(async () => { + if(dev) dangerZoneEnabled.set(true); if (browser && isDebbugerProtectionOn) { detectDebugging(); setInterval(detectDebugging, 1000); @@ -391,15 +391,17 @@ style="cursor: pointer; opacity: 0.7;" class="hover:opacity-100 transition-opacity" /> - { - if (page.url.pathname !== "/inspiration" && page.url.pathname !== "/inspiration/") - goto("/inspiration"); - }} - style="cursor: pointer; opacity: 0.7;" - class="hover:opacity-100 transition-opacity" - /> + {#if settingsStore.settings.musicInspirationEnabled} + { + if (page.url.pathname !== "/inspiration" && page.url.pathname !== "/inspiration/") + goto("/inspiration"); + }} + style="cursor: pointer; opacity: 0.7;" + class="hover:opacity-100 transition-opacity" + /> + {/if} :global(body) { margin: 0; - background: oklch(0 0 0); - color: #eaeaea; font-family: system-ui, sans-serif; } @@ -578,11 +578,13 @@ flex-direction: column; height: 100vh; overflow: hidden; + background: var(--background); + color: var(--foreground); } .titlebar { height: 32px; - background: oklch(0 0 0); + background: var(--background); display: flex; align-items: center; justify-content: space-between; @@ -592,11 +594,12 @@ flex: 0 0 32px; z-index: 50; position: relative; + border-bottom: 1px solid var(--border); } .footerbar { height: 32px; - background: oklch(0 0 0); + background: var(--background); display: flex; align-items: center; justify-content: flex-start; @@ -604,28 +607,28 @@ padding: 0 12px; user-select: none; flex: 0 0 32px; - border-top: 1px solid rgba(255, 255, 255, 0.08); + border-top: 1px solid var(--border); } .title { font-size: 13px; opacity: 0.9; - color: gray; + color: var(--muted-foreground); } .title bold { font-weight: 600; - color: white; + color: var(--foreground); opacity: 0.7; } .title version { - color: rgb(228, 221, 221); - opacity: 0.4; + color: var(--muted-foreground); + opacity: 0.6; } .title version debug { - color: #e11d48; + color: var(--destructive); opacity: 1; font-weight: 600; } @@ -642,8 +645,9 @@ position: absolute; top: 100%; left: 0; - background-color: #111; - border: 1px solid rgba(255, 255, 255, 0.1); + background-color: var(--popover); + color: var(--popover-foreground); + border: 1px solid var(--border); border-radius: 6px; padding: 8px 12px; z-index: 1000; @@ -673,16 +677,16 @@ } .tooltip-item .label { - color: #9ca3af; + color: var(--muted-foreground); } .tooltip-item .value { - color: #f3f4f6; + color: var(--foreground); font-family: monospace; } .tooltip-item .channel { - color: #6b7280; + color: var(--muted-foreground); font-size: 10px; } @@ -697,20 +701,20 @@ height: 100%; border: none; background: transparent; - color: white; + color: var(--foreground); font-size: 14px; cursor: pointer; -webkit-app-region: no-drag; } .btn:hover { - background: rgba(255, 255, 255, 0.1); + background: var(--accent); } .btn:disabled { opacity: 0.5; cursor: not-allowed; - background: rgba(255, 255, 255, 0.02); + background: var(--muted); } .close:hover { @@ -721,7 +725,7 @@ flex: 1 1 auto; min-height: 0; display: flex; - background: oklch(0 0 0); + background: var(--background); overflow: hidden; position: relative; } @@ -758,12 +762,12 @@ } ::-webkit-scrollbar-thumb { - background: rgba(255, 255, 255, 0.1); + background: var(--border); border-radius: 6px; } ::-webkit-scrollbar-thumb:hover { - background: rgba(255, 255, 255, 0.2); + background: var(--muted-foreground); } ::-webkit-scrollbar-corner { @@ -779,14 +783,14 @@ gap: 10px; align-items: center; justify-content: center; - background: oklch(0 0 0); + background: var(--background); } .spinner { width: 32px; height: 32px; - border: 2px solid rgba(255, 255, 255, 0.1); - border-top-color: rgba(255, 255, 255, 0.8); + border: 2px solid var(--border); + border-top-color: var(--primary); border-radius: 50%; animation: spin 0.6s linear infinite; } @@ -807,12 +811,12 @@ } :global(.custom-scrollbar::-webkit-scrollbar-thumb) { - background: rgba(255, 255, 255, 0.1); + background: var(--border); border-radius: 6px; } :global(.custom-scrollbar::-webkit-scrollbar-thumb:hover) { - background: rgba(255, 255, 255, 0.2); + background: var(--muted-foreground); } :global(.custom-scrollbar::-webkit-scrollbar-corner) { diff --git a/frontend/src/routes/(app)/credits/+page.svelte b/frontend/src/routes/(app)/credits/+page.svelte index 3df6e82..1d86332 100644 --- a/frontend/src/routes/(app)/credits/+page.svelte +++ b/frontend/src/routes/(app)/credits/+page.svelte @@ -1,15 +1,48 @@ -
+
@@ -132,19 +165,29 @@ {#each team as member} -
+ + +
+ + {#if member.username === "FOISX" && $dangerZoneEnabled && !settingsStore.settings.musicInspirationEnabled} +
+ {/if} + {member.name} -
+
{member.username} ({member.name})
{member.role}
{member.description}
 {member.email} diff --git a/frontend/src/routes/(app)/inspiration/+page.svelte b/frontend/src/routes/(app)/inspiration/+page.svelte index f8eaf2a..7c9e6d9 100644 --- a/frontend/src/routes/(app)/inspiration/+page.svelte +++ b/frontend/src/routes/(app)/inspiration/+page.svelte @@ -6,69 +6,11 @@ import { ChevronLeft, Music, ExternalLink } from "@lucide/svelte"; import * as m from "$lib/paraglide/messages"; import { OpenURLInBrowser } from "$lib/wailsjs/go/main/App"; + import type { SpotifyTrack } from "./+page"; let { data } = $props(); let config = $derived(data.config); - - interface SpotifyTrack { - name: string; - artist: string; - albumArt?: string; - spotifyUrl: string; - embedUrl: string; - } - - // Music that inspired this project - const inspirationTracks: SpotifyTrack[] = [ - { - name: "Strays", - artist: "Ivycomb, Stephanafro", - spotifyUrl: "https://open.spotify.com/track/1aXATIo34e5ZZvFcavePpy", - embedUrl: "https://open.spotify.com/embed/track/1aXATIo34e5ZZvFcavePpy?utm_source=generator" - }, - { - name: "Headlock", - artist: "Imogen Heap", - spotifyUrl: "https://open.spotify.com/track/63Pi2NAx5yCgeLhCTOrEou", - embedUrl: "https://open.spotify.com/embed/track/63Pi2NAx5yCgeLhCTOrEou?utm_source=generator" - }, - { - name: "I Still Create", - artist: "YonKaGor", - spotifyUrl: "https://open.spotify.com/track/0IqTgwWU2syiSYbdBEromt", - embedUrl: "https://open.spotify.com/embed/track/0IqTgwWU2syiSYbdBEromt?utm_source=generator" - }, - { - name: "Raised by Aliens", - artist: "ivy comb, Stephanafro", - spotifyUrl: "https://open.spotify.com/track/5ezyCaoc5XiVdkpRYWeyG5", - embedUrl: "https://open.spotify.com/embed/track/5ezyCaoc5XiVdkpRYWeyG5?utm_source=generator" - }, - { - name: "VENOMOUS", - artist: "passengerprincess", - spotifyUrl: "https://open.spotify.com/track/4rPKifkzrhIYAsl1njwmjd", - embedUrl: "https://open.spotify.com/embed/track/4rPKifkzrhIYAsl1njwmjd?utm_source=generator" - }, - { - name: "PREY", - artist: "passengerprincess", - spotifyUrl: "https://open.spotify.com/track/510m8qwFCHgzi4zsQnjLUX", - embedUrl: "https://open.spotify.com/embed/track/510m8qwFCHgzi4zsQnjLUX?utm_source=generator" - }, - { - name: "Dracula", - artist: "Tame Impala", - spotifyUrl: "https://open.spotify.com/track/1NXbNEAcPvY5G1xvfN57aA", - embedUrl: "https://open.spotify.com/embed/track/1NXbNEAcPvY5G1xvfN57aA?utm_source=generator" - }, - { - name: "Electric love", - artist: "When Snakes Sing", - spotifyUrl: "https://open.spotify.com/track/1nDkT2Cn13qDnFegF93UHi", - embedUrl: "https://open.spotify.com/embed/track/1nDkT2Cn13qDnFegF93UHi?utm_source=generator" - } - ]; + let tracks: SpotifyTrack[] = $derived(data.tracks ?? []); // Open external URL in default browser async function openUrl(url: string) { @@ -80,7 +22,7 @@ } -
+
@@ -119,37 +61,25 @@
- {#each inspirationTracks as track} + {#each tracks as track}
-
- -
-
-
-

{track.name}

-

- {track.artist} -

-
- +
+ {#if track.embedHtml} + {@html track.embedHtml} + {:else} + + {/if}
+
{/each}
@@ -184,10 +114,6 @@ and ♥

-

- GUI: {config ? `v${config.GUISemver}` : "N/A"} • - SDK: {config ? `v${config.SDKDecoderSemver}` : "N/A"} -

diff --git a/frontend/src/routes/(app)/inspiration/+page.ts b/frontend/src/routes/(app)/inspiration/+page.ts index ed92a80..1a40589 100644 --- a/frontend/src/routes/(app)/inspiration/+page.ts +++ b/frontend/src/routes/(app)/inspiration/+page.ts @@ -2,18 +2,98 @@ import type { PageLoad } from './$types'; import { GetConfig } from "$lib/wailsjs/go/main/App"; import { browser } from '$app/environment'; -export const load = (async () => { - if (!browser) return { config: null }; +export interface SpotifyTrack { + name: string; + artist: string; + spotifyUrl: string; + embedUrl: string; + embedHtml?: string; +} + +// Music that inspired this project +const inspirationTracks: SpotifyTrack[] = [ + { + name: "Strays", + artist: "Ivycomb, Stephanafro", + spotifyUrl: "https://open.spotify.com/track/1aXATIo34e5ZZvFcavePpy", + embedUrl: "https://open.spotify.com/embed/track/1aXATIo34e5ZZvFcavePpy?utm_source=generator" + }, + { + name: "Headlock", + artist: "Imogen Heap", + spotifyUrl: "https://open.spotify.com/track/63Pi2NAx5yCgeLhCTOrEou", + embedUrl: "https://open.spotify.com/embed/track/63Pi2NAx5yCgeLhCTOrEou?utm_source=generator" + }, + { + name: "I Still Create", + artist: "YonKaGor", + spotifyUrl: "https://open.spotify.com/track/0IqTgwWU2syiSYbdBEromt", + embedUrl: "https://open.spotify.com/embed/track/0IqTgwWU2syiSYbdBEromt?utm_source=generator" + }, + { + name: "Raised by Aliens", + artist: "ivy comb, Stephanafro", + spotifyUrl: "https://open.spotify.com/track/5ezyCaoc5XiVdkpRYWeyG5", + embedUrl: "https://open.spotify.com/embed/track/5ezyCaoc5XiVdkpRYWeyG5?utm_source=generator" + }, + { + name: "VENOMOUS", + artist: "passengerprincess", + spotifyUrl: "https://open.spotify.com/track/4rPKifkzrhIYAsl1njwmjd", + embedUrl: "https://open.spotify.com/embed/track/4rPKifkzrhIYAsl1njwmjd?utm_source=generator" + }, + { + name: "PREY", + artist: "passengerprincess", + spotifyUrl: "https://open.spotify.com/track/510m8qwFCHgzi4zsQnjLUX", + embedUrl: "https://open.spotify.com/embed/track/510m8qwFCHgzi4zsQnjLUX?utm_source=generator" + }, + { + name: "Dracula", + artist: "Tame Impala", + spotifyUrl: "https://open.spotify.com/track/1NXbNEAcPvY5G1xvfN57aA", + embedUrl: "https://open.spotify.com/embed/track/1NXbNEAcPvY5G1xvfN57aA?utm_source=generator" + }, + { + name: "Electric love", + artist: "When Snakes Sing", + spotifyUrl: "https://open.spotify.com/track/1nDkT2Cn13qDnFegF93UHi", + embedUrl: "https://open.spotify.com/embed/track/1nDkT2Cn13qDnFegF93UHi?utm_source=generator" + } +]; + +async function fetchEmbedHtml(track: SpotifyTrack, fetch: typeof globalThis.fetch): Promise { + try { + const oEmbedUrl = `https://open.spotify.com/oembed?url=${encodeURIComponent(track.spotifyUrl)}`; + const res = await fetch(oEmbedUrl); + if (res.ok) { + const data = await res.json(); + return { ...track, embedHtml: data.html }; + } + } catch (e) { + console.error(`Failed to fetch oEmbed for ${track.name}:`, e); + } + return track; +} + +export const load = (async ({fetch}) => { + if (!browser) return { config: null, tracks: inspirationTracks }; try { - const configRoot = await GetConfig(); + const [configRoot, ...tracks] = await Promise.all([ + GetConfig(), + ...inspirationTracks.map(t => fetchEmbedHtml(t, fetch)) + ]); + return { - config: configRoot.EMLy + config: configRoot.EMLy, + tracks }; } catch (e) { - console.error("Failed to load config for inspiration", e); + console.error("Failed to load data for inspiration", e); return { - config: null + config: null, + tracks: inspirationTracks }; } }) satisfies PageLoad; diff --git a/frontend/src/routes/(app)/settings/+page.svelte b/frontend/src/routes/(app)/settings/+page.svelte index 66d808a..42bc6d9 100644 --- a/frontend/src/routes/(app)/settings/+page.svelte +++ b/frontend/src/routes/(app)/settings/+page.svelte @@ -6,7 +6,7 @@ import { Label } from "$lib/components/ui/label"; import { Separator } from "$lib/components/ui/separator"; import { Switch } from "$lib/components/ui/switch"; - import { ChevronLeft, Flame, Download, Upload, RefreshCw, CheckCircle2, AlertCircle } from "@lucide/svelte"; + import { ChevronLeft, Flame, Download, Upload, RefreshCw, CheckCircle2, AlertCircle, Sun, Moon } from "@lucide/svelte"; import type { EMLy_GUI_Settings } from "$lib/types"; import { toast } from "svelte-sonner"; import { It, Us } from "svelte-flags"; @@ -40,7 +40,8 @@ previewFileSupportedTypes: ["jpg", "jpeg", "png"], enableAttachedDebuggerProtection: true, useDarkEmailViewer: true, - enableUpdateChecker: true, + enableUpdateChecker: false, + theme: "dark", }; async function setLanguage( @@ -73,8 +74,10 @@ s.enableAttachedDebuggerProtection ?? defaults.enableAttachedDebuggerProtection ?? true, useDarkEmailViewer: s.useDarkEmailViewer ?? defaults.useDarkEmailViewer ?? true, - enableUpdateChecker: - s.enableUpdateChecker ?? defaults.enableUpdateChecker ?? true, + enableUpdateChecker: runningInDevMode + ? false + : (s.enableUpdateChecker ?? defaults.enableUpdateChecker ?? true), + theme: s.theme || defaults.theme || "light", }; } @@ -86,6 +89,7 @@ !!a.enableAttachedDebuggerProtection === !!b.enableAttachedDebuggerProtection && !!a.useDarkEmailViewer === !!b.useDarkEmailViewer && !!a.enableUpdateChecker === !!b.enableUpdateChecker && + (a.theme ?? "light") === (b.theme ?? "light") && JSON.stringify(a.previewFileSupportedTypes?.sort()) === JSON.stringify(b.previewFileSupportedTypes?.sort()) ); @@ -278,25 +282,25 @@ updateStatus = status; if (status.updateAvailable) { - toast.success(`Update available: ${status.availableVersion}`); + toast.success(m.settings_toast_update_available({ version: status.availableVersion })); } else if (!status.errorMessage) { - toast.info("You're on the latest version"); + toast.info(m.settings_toast_latest_version()); } else { toast.error(status.errorMessage); } } catch (err) { console.error("Failed to check for updates:", err); - toast.error("Failed to check for updates"); + toast.error(m.settings_toast_check_failed()); } } async function downloadUpdate() { try { await DownloadUpdate(); - toast.success("Update downloaded successfully"); + toast.success(m.settings_toast_download_success()); } catch (err) { console.error("Failed to download update:", err); - toast.error("Failed to download update"); + toast.error(m.settings_toast_download_failed()); } } @@ -306,7 +310,7 @@ // App will quit, so no toast needed } catch (err) { console.error("Failed to install update:", err); - toast.error("Failed to launch installer"); + toast.error(m.settings_toast_install_failed()); } } @@ -324,7 +328,7 @@ }); -
+
@@ -393,6 +397,52 @@ + + + {m.settings_appearance_title()} + {m.settings_appearance_description()} + + + +
+ + +
+
+ + +
+ +
+ Info: + {m.settings_theme_hint()} +
+ + + {m.settings_export_import_title()} @@ -592,14 +642,14 @@ {#if form.enableUpdateChecker} - Updates - Check for and install application updates from your network share + {m.settings_updates_title()} + {m.settings_updates_description()}
-
Current Version
+
{m.settings_updates_current_version()}
{updateStatus.currentVersion} ({config?.GUIReleaseChannel || "stable"})
@@ -607,17 +657,17 @@ {#if updateStatus.updateAvailable}
- Update Available + {m.settings_updates_available()}
{:else if updateStatus.errorMessage && updateStatus.lastCheckTime}
- Check failed + {m.settings_updates_check_failed()}
{:else if updateStatus.lastCheckTime}
- No updates found + {m.settings_updates_no_updates()}
{/if}
@@ -627,12 +677,12 @@
-
Check for Updates
+
{m.settings_updates_check_label()}
{#if updateStatus.lastCheckTime} - Last checked: {updateStatus.lastCheckTime} + {m.settings_updates_last_checked({ time: updateStatus.lastCheckTime })} {:else} - Click to check for available updates + {m.settings_updates_click_check()} {/if}
@@ -643,7 +693,7 @@ disabled={updateStatus.checking || updateStatus.downloading} > - {updateStatus.checking ? "Checking..." : "Check Now"} + {updateStatus.checking ? m.settings_updates_checking() : m.settings_updates_check_now()}
@@ -652,12 +702,12 @@
-
Version {updateStatus.availableVersion} Available
+
{m.settings_updates_version_available({ version: updateStatus.availableVersion })}
{#if updateStatus.downloading} - Downloading... {updateStatus.downloadProgress}% + {m.settings_updates_downloading({ progress: updateStatus.downloadProgress })} {:else} - Click to download the update + {m.settings_updates_click_download()} {/if}
{#if updateStatus.releaseNotes} @@ -673,7 +723,7 @@ disabled={updateStatus.downloading} > - {updateStatus.downloading ? `${updateStatus.downloadProgress}%` : "Download"} + {updateStatus.downloading ? `${updateStatus.downloadProgress}%` : m.settings_updates_download_button()}
{/if} @@ -683,9 +733,9 @@
-
Update Ready to Install
+
{m.settings_updates_ready_title()}
- Version {updateStatus.availableVersion} has been downloaded and verified + {m.settings_updates_ready_ref({ version: updateStatus.availableVersion })}
{/if} @@ -713,11 +763,11 @@
- Info: Updates are checked from your configured network share path. + Info: {m.settings_updates_info_message()} {#if (config as any)?.UpdatePath} - Current path: {(config as any).UpdatePath} + {m.settings_updates_current_path()} {(config as any).UpdatePath} {:else} - No update path configured + {m.settings_updates_no_path()} {/if}
@@ -843,18 +893,19 @@ class="flex items-center justify-between gap-4 rounded-lg border bg-card p-4 border-destructive/30" >
- +
- Check for application updates from network share + {m.settings_danger_update_checker_hint()}
- Info: When enabled, the app will check for updates from your configured network share. Disable this if you manage updates manually or don't have network access. + {m.settings_danger_update_checker_info()}
@@ -871,6 +922,7 @@ {/if} + {#if !runningInDevMode} @@ -878,7 +930,11 @@ >{m.settings_danger_alert_title()} - {m.settings_danger_alert_description()} + {m.settings_danger_alert_description_part1()} +
+ {m.settings_danger_alert_description_part2()} +
+ {m.settings_danger_alert_description_part3()} @@ -888,5 +944,6 @@ + {/if}
diff --git a/frontend/src/routes/+layout.svelte b/frontend/src/routes/+layout.svelte index a27fe7b..a6d2443 100644 --- a/frontend/src/routes/+layout.svelte +++ b/frontend/src/routes/+layout.svelte @@ -1,6 +1,7 @@