mirror of
https://github.com/jcreek/LivingDexTracker.git
synced 2026-07-12 18:43:45 +00:00
refactor(#48): Address PR comments
This commit is contained in:
@@ -5,6 +5,18 @@
|
||||
<link rel="icon" href="%sveltekit.assets%/favicon.png" />
|
||||
<meta name="viewport" content="width=device-width, initial-scale=1" />
|
||||
%sveltekit.head%
|
||||
<script>
|
||||
(function () {
|
||||
try {
|
||||
const storedTheme = localStorage.getItem('theme');
|
||||
const theme = storedTheme || 'pokeball';
|
||||
document.documentElement.setAttribute('data-theme', theme);
|
||||
} catch (e) {
|
||||
// Fallback to default theme if localStorage is not accessible
|
||||
document.documentElement.setAttribute('data-theme', 'pokeball');
|
||||
}
|
||||
})();
|
||||
</script>
|
||||
<link rel="stylesheet" href="%sveltekit.assets%/output.css" />
|
||||
</head>
|
||||
<body data-sveltekit-preload-data="hover">
|
||||
|
||||
@@ -2,13 +2,10 @@
|
||||
import { theme, applyTheme } from '$lib/stores/theme.js';
|
||||
import { onMount } from 'svelte';
|
||||
|
||||
let currentTheme: 'pokeball' | 'dark';
|
||||
let currentTheme: 'pokeball' | 'dark' = 'pokeball';
|
||||
|
||||
// Subscribe to theme changes
|
||||
$: if ($theme) {
|
||||
currentTheme = $theme;
|
||||
applyTheme($theme);
|
||||
}
|
||||
$: (currentTheme = $theme), applyTheme($theme);
|
||||
|
||||
onMount(() => {
|
||||
// Initialize theme from localStorage
|
||||
|
||||
@@ -602,7 +602,7 @@
|
||||
*/
|
||||
:global(:root) {
|
||||
--ld-box-bg-even: var(--fallback-b1, oklch(var(--b1) / 1));
|
||||
--ld-box-bg-odd: var(--fallback-b2, oklch(var(--b3) / 1));
|
||||
--ld-box-bg-odd: var(--fallback-b3, oklch(var(--b3) / 1));
|
||||
}
|
||||
|
||||
:global([data-theme='pokeball']) {
|
||||
@@ -610,11 +610,6 @@
|
||||
--ld-box-bg-odd: #f9f9f9;
|
||||
}
|
||||
|
||||
:global([data-theme='dark']) {
|
||||
--ld-box-bg-even: var(--fallback-b1, oklch(var(--b1) / 1));
|
||||
--ld-box-bg-odd: var(--fallback-b2, oklch(var(--b3) / 1));
|
||||
}
|
||||
|
||||
.boxes-grid {
|
||||
display: grid;
|
||||
grid-template-columns: repeat(1, minmax(0, 1fr));
|
||||
|
||||
+48
-9
@@ -4,23 +4,62 @@ type Theme = 'pokeball' | 'dark';
|
||||
|
||||
const STORAGE_KEY = 'theme';
|
||||
|
||||
function isTheme(type: string): type is Theme {
|
||||
return type === 'pokeball' || type === 'dark';
|
||||
}
|
||||
|
||||
function createThemeStore() {
|
||||
// Get stored theme from localStorage or default to 'pokeball'
|
||||
const storedTheme = (typeof window !== 'undefined' &&
|
||||
localStorage.getItem(STORAGE_KEY)) as Theme | null;
|
||||
const initialTheme: Theme = storedTheme || 'pokeball';
|
||||
let initialTheme: Theme = 'pokeball';
|
||||
if (typeof window !== 'undefined') {
|
||||
try {
|
||||
const storedTheme = localStorage.getItem(STORAGE_KEY);
|
||||
if (storedTheme && isTheme(storedTheme)) {
|
||||
initialTheme = storedTheme;
|
||||
}
|
||||
} catch {
|
||||
// ignore (privacy mode / disabled storage)
|
||||
}
|
||||
}
|
||||
|
||||
const { subscribe, set, update } = writable<Theme>(initialTheme);
|
||||
const { subscribe, set: writableSet, update } = writable<Theme>(initialTheme);
|
||||
|
||||
return {
|
||||
subscribe,
|
||||
set,
|
||||
toggle: () => update((theme) => (theme === 'pokeball' ? 'dark' : 'pokeball')),
|
||||
set: (value: Theme) => {
|
||||
if (isTheme(value)) {
|
||||
writableSet(value);
|
||||
if (typeof window !== 'undefined') {
|
||||
try {
|
||||
localStorage.setItem(STORAGE_KEY, value);
|
||||
} catch {
|
||||
// ignore (privacy mode / disabled storage)
|
||||
}
|
||||
}
|
||||
}
|
||||
},
|
||||
toggle: () => {
|
||||
update((theme) => {
|
||||
const newTheme = theme === 'pokeball' ? 'dark' : 'pokeball';
|
||||
if (typeof window !== 'undefined') {
|
||||
try {
|
||||
localStorage.setItem(STORAGE_KEY, newTheme);
|
||||
} catch {
|
||||
// ignore (privacy mode / disabled storage)
|
||||
}
|
||||
}
|
||||
return newTheme;
|
||||
});
|
||||
},
|
||||
init: () => {
|
||||
if (typeof window !== 'undefined') {
|
||||
const stored = localStorage.getItem(STORAGE_KEY) as Theme | null;
|
||||
if (stored) {
|
||||
set(stored);
|
||||
try {
|
||||
const stored = localStorage.getItem(STORAGE_KEY);
|
||||
if (stored && isTheme(stored)) {
|
||||
writableSet(stored);
|
||||
}
|
||||
} catch {
|
||||
// ignore (privacy mode / disabled storage)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user