fix: typescript issue

This commit is contained in:
Xyphyn committed 2023-09-14 19:22:11 -07:00
1 parent b500bc8221
commit dce4e4e751
2 files changed
+22 -5

No files matched your search

+5 -3
View File
@@ -17,8 +17,9 @@ import { get, writable } from 'svelte/store'
import { env } from '$env/dynamic/public' import { env } from '$env/dynamic/public'
const configuredTheme = env.PUBLIC_THEME ?? 'system' const configuredTheme = env.PUBLIC_THEME ?? 'system'
export const theme = writable<'system' | 'light' | 'dark'>(configuredTheme) export const theme = writable<'system' | 'light' | 'dark'>(
configuredTheme as 'system' | 'light' | 'dark'
)
export const toggleTheme = () => { export const toggleTheme = () => {
theme.update((theme) => { theme.update((theme) => {
@@ -43,7 +44,8 @@ export const inDarkTheme = (): boolean => {
if (typeof localStorage != 'undefined') { if (typeof localStorage != 'undefined') {
const localTheme: 'system' | 'light' | 'dark' = const localTheme: 'system' | 'light' | 'dark' =
(localStorage.getItem('theme') as 'system' | 'light' | 'dark') || configuredTheme (localStorage.getItem('theme') as 'system' | 'light' | 'dark') ||
configuredTheme
theme.update((theme) => localTheme) theme.update((theme) => localTheme)
+17 -2
View File
@@ -8,9 +8,11 @@
import Sidebar from '$lib/components/ui/sidebar/Sidebar.svelte' import Sidebar from '$lib/components/ui/sidebar/Sidebar.svelte'
// @ts-ignore // @ts-ignore
import { pwaInfo } from 'virtual:pwa-info' import { pwaInfo } from 'virtual:pwa-info'
import { inDarkTheme } from '$lib/ui/colors.js' import { inDarkTheme, theme } from '$lib/ui/colors.js'
import { userSettings } from '$lib/settings.js' import { userSettings } from '$lib/settings.js'
import { ToastContainer } from 'mono-svelte' import { ToastContainer } from 'mono-svelte'
import { onMount } from 'svelte'
import { browser } from '$app/environment'
nProgress.configure({ nProgress.configure({
minimum: 0.4, minimum: 0.4,
@@ -34,10 +36,23 @@
} }
$: webManifest = pwaInfo ? pwaInfo.webManifest.linkTag : '' $: webManifest = pwaInfo ? pwaInfo.webManifest.linkTag : ''
$: darkTheme = $theme && inDarkTheme()
$: console.log(darkTheme)
onMount(() => {
if (browser) {
window
.matchMedia('(prefers-color-scheme: dark)')
.addEventListener('change', (event) => {
darkTheme = inDarkTheme()
})
}
})
</script> </script>
<svelte:head> <svelte:head>
<meta name="theme-color" content={inDarkTheme() ? '#020202' : '#f6f9fb'} /> <meta name="theme-color" content={darkTheme ? '#020202' : '#f6f9fb'} />
{@html webManifest} {@html webManifest}
</svelte:head> </svelte:head>