diff --git a/package.json b/package.json index fdbc064..b2412e8 100644 --- a/package.json +++ b/package.json @@ -59,6 +59,7 @@ "svelte-preprocess": "^4.10.7", "tailwindcss": "^3.2.1", "tauri-plugin-store-api": "github:tauri-apps/tauri-plugin-store#dev", + "tinro": "^0.6.12", "tslib": "^2.4.0", "typescript": "^4.8.4", "vite": "^3.2.0" diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 6e10943..1ca45ac 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -31,6 +31,7 @@ specifiers: svelte-preprocess: ^4.10.7 tailwindcss: ^3.2.1 tauri-plugin-store-api: github:tauri-apps/tauri-plugin-store#dev + tinro: ^0.6.12 tslib: ^2.4.0 typescript: ^4.8.4 vite: ^3.2.0 @@ -66,6 +67,7 @@ devDependencies: svelte-preprocess: 4.10.7_4n3z2octtzg5pdokl7pjruqnki tailwindcss: 3.2.1_postcss@8.4.18 tauri-plugin-store-api: github.com/tauri-apps/tauri-plugin-store/9bd993aa67766596638bbfd91e79a1bf8f632014 + tinro: 0.6.12 tslib: 2.4.0 typescript: 4.8.4 vite: 3.2.0 @@ -2378,6 +2380,10 @@ packages: resolution: {integrity: sha512-w89qg7PI8wAdvX60bMDP+bFoD5Dvhm9oLheFp5O4a2QF0cSBGsBX4qZmadPMvVqlLJBBci+WqGGOAPvcDeNSVg==} dev: true + /tinro/0.6.12: + resolution: {integrity: sha512-YYLh0a21GXXpS66ilZbywfXcPTKQQ+bv3tihoqKqSFQP6/F11N7ZmtRbFWcyZXXPFRSzNxmPJBB8ZhP0GkoS0Q==} + dev: true + /to-regex-range/5.0.1: resolution: {integrity: sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==} engines: {node: '>=8.0'} diff --git a/src/App.svelte b/src/App.svelte index f8ff493..260dfac 100644 --- a/src/App.svelte +++ b/src/App.svelte @@ -1,10 +1,7 @@ {#await theme.load() then} -
-
-
- -
-
+ + + {/await} diff --git a/src/lib/components/ThemeToggleIcon.svelte b/src/lib/components/buttons/ThemeToggleIcon.svelte similarity index 94% rename from src/lib/components/ThemeToggleIcon.svelte rename to src/lib/components/buttons/ThemeToggleIcon.svelte index 77644fa..9a140d6 100644 --- a/src/lib/components/ThemeToggleIcon.svelte +++ b/src/lib/components/buttons/ThemeToggleIcon.svelte @@ -1,9 +1,4 @@ - - -
+ +
diff --git a/src/lib/components/nav/HeaderNav.svelte b/src/lib/components/nav/HeaderNav.svelte new file mode 100644 index 0000000..9e13f11 --- /dev/null +++ b/src/lib/components/nav/HeaderNav.svelte @@ -0,0 +1,8 @@ + diff --git a/src/lib/layout/BaseLayout.svelte b/src/lib/layout/BaseLayout.svelte new file mode 100644 index 0000000..bfb09a3 --- /dev/null +++ b/src/lib/layout/BaseLayout.svelte @@ -0,0 +1,16 @@ + + +
+
+
+ +
+
+
diff --git a/src/lib/router/Router.svelte b/src/lib/router/Router.svelte new file mode 100644 index 0000000..b5276e9 --- /dev/null +++ b/src/lib/router/Router.svelte @@ -0,0 +1,14 @@ + + + + + + + diff --git a/src/lib/components/CallTauri.svelte b/src/lib/router/routes/CallTauri.svelte similarity index 100% rename from src/lib/components/CallTauri.svelte rename to src/lib/router/routes/CallTauri.svelte diff --git a/src/lib/components/HashString.svelte b/src/lib/router/routes/HashString.svelte similarity index 100% rename from src/lib/components/HashString.svelte rename to src/lib/router/routes/HashString.svelte diff --git a/src/lib/Index.svelte b/src/lib/router/routes/Index.svelte similarity index 57% rename from src/lib/Index.svelte rename to src/lib/router/routes/Index.svelte index 9bdbed7..d16397a 100644 --- a/src/lib/Index.svelte +++ b/src/lib/router/routes/Index.svelte @@ -1,9 +1,3 @@ - -

Welcome

@@ -13,8 +7,4 @@ - Tauri Template

- - - -
diff --git a/src/lib/components/Versions.svelte b/src/lib/router/routes/Versions.svelte similarity index 100% rename from src/lib/components/Versions.svelte rename to src/lib/router/routes/Versions.svelte diff --git a/src/lib/stores/theme.ts b/src/lib/stores/theme.ts index 13c0a6c..479d582 100644 --- a/src/lib/stores/theme.ts +++ b/src/lib/stores/theme.ts @@ -1,6 +1,6 @@ import { Store } from 'tauri-plugin-store-api'; -import type { Theme } from '../../types'; import { writable } from 'svelte/store'; +import type { Theme } from '$types'; const store = new Store('.settings.dat'); diff --git a/src/types.ts b/src/types.ts new file mode 100644 index 0000000..77aa4c1 --- /dev/null +++ b/src/types.ts @@ -0,0 +1,3 @@ +export const themes = ['dark', 'light'] as const; + +export type Theme = typeof themes[number]; diff --git a/tsconfig.json b/tsconfig.json index e075d16..4b8f98f 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -8,13 +8,15 @@ "baseUrl": ".", "allowJs": true, "checkJs": true, - "isolatedModules": true, "paths": { "$lib": ["src/lib"], "$lib/*": ["src/lib/*"], "$styles": ["src/styles/app.postcss"], "$assets": ["src/assets"], - "$assets/*": ["src/assets/*"] + "$assets/*": ["src/assets/*"], + "$router/*": ["src/lib/router/*"], + "$layout/*": ["src/lib/layout/*"], + "$types": ["src/types.ts"] } }, "include": ["src/**/*.d.ts", "src/**/*.ts", "src/**/*.js", "src/**/*.svelte"], diff --git a/vite.config.ts b/vite.config.ts index fdd03e6..18d71a5 100644 --- a/vite.config.ts +++ b/vite.config.ts @@ -8,7 +8,9 @@ export default defineConfig({ resolve: { alias: { $lib: join(__dirname, 'src/lib'), - $assets: join(__dirname, 'src/assets/'), + $assets: join(__dirname, 'src/assets'), + $router: join(__dirname, 'src/lib/router'), + $layout: join(__dirname, 'src/lib/layout'), $styles: join(__dirname, 'src/styles/app.postcss') } },