diff --git a/package-lock.json b/package-lock.json index 00f6cb7ad..53fb3ffb1 100644 --- a/package-lock.json +++ b/package-lock.json @@ -9,8 +9,8 @@ "version": "0.0.1", "dependencies": { "@aw-labs/appwrite-console": "^1.0.0-0", - "@aw-labs/icons": "^0.0.0-24", - "@aw-labs/ui": "^0.0.0-24", + "@aw-labs/icons": "^0.0.0-27", + "@aw-labs/ui": "^0.0.0-27", "echarts": "^5.3.3" }, "devDependencies": { @@ -69,14 +69,14 @@ } }, "node_modules/@aw-labs/icons": { - "version": "0.0.0-24", - "resolved": "https://registry.npmjs.org/@aw-labs/icons/-/icons-0.0.0-24.tgz", - "integrity": "sha512-DwVJiMvPyUuzhsQlzhJS4MZIyOHreAT8dEC1ZHx88LWN0ykogYcGtN4N8mLaYjdwb+PDrDeGyWIFBQbK6XOgbw==" + "version": "0.0.0-27", + "resolved": "https://registry.npmjs.org/@aw-labs/icons/-/icons-0.0.0-27.tgz", + "integrity": "sha512-8cXsTerCmeKt2zMMdwSqsrbbYGQQSUOKCABEC1rendoCACNY5Nmms1QrTQzhzWSuvX1j4a4k+HXNL3ZfM18iZQ==" }, "node_modules/@aw-labs/ui": { - "version": "0.0.0-24", - "resolved": "https://registry.npmjs.org/@aw-labs/ui/-/ui-0.0.0-24.tgz", - "integrity": "sha512-vUAQ7fj3MiLklvMRJarA57OZB7lv6d92XQ4G5yvs1SYk6BVpVpDztV4iGPd7+/AOPBEZ7AVnvlaGDm16ENC/lA==", + "version": "0.0.0-27", + "resolved": "https://registry.npmjs.org/@aw-labs/ui/-/ui-0.0.0-27.tgz", + "integrity": "sha512-GS9RB5eevpl5TRYEvjo9Xgipbw4nR6M+8gEKLUWbTKHPJ6RCNtQOqVi+vqM7Ad7r1zKPuA7gILSDSNdEChVNiA==", "dependencies": { "@aw-labs/icons": "*" } @@ -7853,14 +7853,14 @@ } }, "@aw-labs/icons": { - "version": "0.0.0-24", - "resolved": "https://registry.npmjs.org/@aw-labs/icons/-/icons-0.0.0-24.tgz", - "integrity": "sha512-DwVJiMvPyUuzhsQlzhJS4MZIyOHreAT8dEC1ZHx88LWN0ykogYcGtN4N8mLaYjdwb+PDrDeGyWIFBQbK6XOgbw==" + "version": "0.0.0-27", + "resolved": "https://registry.npmjs.org/@aw-labs/icons/-/icons-0.0.0-27.tgz", + "integrity": "sha512-8cXsTerCmeKt2zMMdwSqsrbbYGQQSUOKCABEC1rendoCACNY5Nmms1QrTQzhzWSuvX1j4a4k+HXNL3ZfM18iZQ==" }, "@aw-labs/ui": { - "version": "0.0.0-24", - "resolved": "https://registry.npmjs.org/@aw-labs/ui/-/ui-0.0.0-24.tgz", - "integrity": "sha512-vUAQ7fj3MiLklvMRJarA57OZB7lv6d92XQ4G5yvs1SYk6BVpVpDztV4iGPd7+/AOPBEZ7AVnvlaGDm16ENC/lA==", + "version": "0.0.0-27", + "resolved": "https://registry.npmjs.org/@aw-labs/ui/-/ui-0.0.0-27.tgz", + "integrity": "sha512-GS9RB5eevpl5TRYEvjo9Xgipbw4nR6M+8gEKLUWbTKHPJ6RCNtQOqVi+vqM7Ad7r1zKPuA7gILSDSNdEChVNiA==", "requires": { "@aw-labs/icons": "*" } diff --git a/package.json b/package.json index b847cf76b..ac96d3cd3 100644 --- a/package.json +++ b/package.json @@ -20,8 +20,8 @@ }, "dependencies": { "@aw-labs/appwrite-console": "^1.0.0-0", - "@aw-labs/icons": "^0.0.0-24", - "@aw-labs/ui": "^0.0.0-24", + "@aw-labs/icons": "^0.0.0-27", + "@aw-labs/ui": "^0.0.0-27", "echarts": "^5.3.3" }, "devDependencies": { diff --git a/src/lib/charts/echarts.svelte b/src/lib/charts/echarts.svelte index faab1721e..a387a4622 100644 --- a/src/lib/charts/echarts.svelte +++ b/src/lib/charts/echarts.svelte @@ -16,7 +16,6 @@ import { app } from '$lib/stores/app'; import light from './echartLight.json'; import dark from './echartDark.json'; - import { browser } from '$app/env'; echarts.use([ TitleComponent, @@ -60,25 +59,11 @@ let timeoutId: unknown; $: option && setOption(); - $: if (myChart && selectedTheme) { + $: if (myChart && $app.themeInUse) { makeChart(); setOption(); } - $: selectedTheme = $app.theme; - $: if ($app.theme === 'auto') { - if (browser) { - const darkThemeMq = window.matchMedia('(prefers-color-scheme: dark)'); - if (darkThemeMq.matches) { - selectedTheme = 'dark'; - } else { - selectedTheme = 'light'; - } - } - } else { - selectedTheme = $app.theme; - } - onMount(() => { makeChart(); }); @@ -100,7 +85,7 @@ const makeChart = () => { destroyChart(); - myChart = echarts.init(document.getElementById(`echart-${title}`), selectedTheme); + myChart = echarts.init(document.getElementById(`echart-${title}`), $app.themeInUse); series.forEach((s: LineSeriesOption, i: number) => { s.areaStyle = colorToGradient(myChart['_theme'].color[i]); }); diff --git a/src/lib/components/cardDrop.svelte b/src/lib/components/InnerModal.svelte similarity index 54% rename from src/lib/components/cardDrop.svelte rename to src/lib/components/InnerModal.svelte index 7ce00a63b..5b59d4f1c 100644 --- a/src/lib/components/cardDrop.svelte +++ b/src/lib/components/InnerModal.svelte @@ -1,12 +1,13 @@ {#if show} - -