From 357a7394702a6c24cf09f0c27968a710d4c04576 Mon Sep 17 00:00:00 2001 From: Fractal-Tess Date: Fri, 12 May 2023 23:30:22 +0300 Subject: [PATCH] refactor --- TODO.md | 3 - src-tauri/tauri.conf.json | 2 +- src/lib/components/footer/Footer.svelte | 3 - .../components/transition/Transition.svelte | 10 ---- src/lib/data/NavLinks.ts | 41 -------------- .../BaseHeader.svelte} | 55 +++++++++++-------- src/lib/layout/BaseLayout.svelte | 10 +--- src/lib/router/Router.svelte | 20 +++---- src/lib/router/routes/CallTauri.svelte | 51 +++++++++++------ src/lib/router/routes/HashString.svelte | 23 -------- src/lib/router/routes/Index.svelte | 11 ++-- src/lib/router/routes/Versions.svelte | 16 +++--- src/styles.postcss | 24 +++++--- vite.config.ts | 1 + 14 files changed, 108 insertions(+), 162 deletions(-) delete mode 100644 TODO.md delete mode 100644 src/lib/components/footer/Footer.svelte delete mode 100644 src/lib/components/transition/Transition.svelte delete mode 100644 src/lib/data/NavLinks.ts rename src/lib/{components/header/Header.svelte => layout/BaseHeader.svelte} (50%) delete mode 100644 src/lib/router/routes/HashString.svelte diff --git a/TODO.md b/TODO.md deleted file mode 100644 index f2df375..0000000 --- a/TODO.md +++ /dev/null @@ -1,3 +0,0 @@ -Change router to svelte-spa-router -Remove data directory -Build and update workflows diff --git a/src-tauri/tauri.conf.json b/src-tauri/tauri.conf.json index 9a8ef8b..f3057ec 100644 --- a/src-tauri/tauri.conf.json +++ b/src-tauri/tauri.conf.json @@ -4,7 +4,7 @@ "beforeBuildCommand": "pnpm svelte:build", "beforeDevCommand": "pnpm svelte:dev", "devPath": "http://localhost:5173", - "distDir": "../dist" + "distDir": "../build" }, "package": { "productName": "svelte-tauri", diff --git a/src/lib/components/footer/Footer.svelte b/src/lib/components/footer/Footer.svelte deleted file mode 100644 index 385cdfb..0000000 --- a/src/lib/components/footer/Footer.svelte +++ /dev/null @@ -1,3 +0,0 @@ - diff --git a/src/lib/components/transition/Transition.svelte b/src/lib/components/transition/Transition.svelte deleted file mode 100644 index 5ad787a..0000000 --- a/src/lib/components/transition/Transition.svelte +++ /dev/null @@ -1,10 +0,0 @@ - - -{#key $router.path} -
- -
-{/key} diff --git a/src/lib/data/NavLinks.ts b/src/lib/data/NavLinks.ts deleted file mode 100644 index 53135e9..0000000 --- a/src/lib/data/NavLinks.ts +++ /dev/null @@ -1,41 +0,0 @@ -import type { NavLink } from '$types'; - -export const navLinks: NavLink[] = [ - { - content: { - text: 'Home' - }, - target: { - href: '/', - newTab: false - } - }, - { - content: { - text: 'Call-Tauri' - }, - target: { - href: '/call-tauri', - newTab: false - } - }, - { - content: { - text: 'Hash-string' - }, - target: { - href: '/hash-string', - newTab: false - } - }, - - { - content: { - text: 'Versions' - }, - target: { - href: '/versions', - newTab: false - } - } -]; diff --git a/src/lib/components/header/Header.svelte b/src/lib/layout/BaseHeader.svelte similarity index 50% rename from src/lib/components/header/Header.svelte rename to src/lib/layout/BaseHeader.svelte index 5478752..1ead1bb 100644 --- a/src/lib/components/header/Header.svelte +++ b/src/lib/layout/BaseHeader.svelte @@ -5,43 +5,52 @@ import { faXmark, faWindowMinimize } from '@fortawesome/free-solid-svg-icons'; import { faGithub } from '@fortawesome/free-brands-svg-icons'; import Fa from 'svelte-fa'; - import { navLinks } from '$data/NavLinks'; + import { link } from 'svelte-spa-router';
- -
+
+ class="flex items-center hover:text-secondary" + rel="noreferrer"> -
- {#key message} -

- {message} -

- {/key} -
+
+
+ +
+ {#key message} +

+ {message} +

+ {/key} +
+
+
+ +

{hashOutput}

+
diff --git a/src/lib/router/routes/HashString.svelte b/src/lib/router/routes/HashString.svelte deleted file mode 100644 index f6a2944..0000000 --- a/src/lib/router/routes/HashString.svelte +++ /dev/null @@ -1,23 +0,0 @@ - - -
-
- -
-

{hashOutput}

-
diff --git a/src/lib/router/routes/Index.svelte b/src/lib/router/routes/Index.svelte index bc3f37f..be39959 100644 --- a/src/lib/router/routes/Index.svelte +++ b/src/lib/router/routes/Index.svelte @@ -1,20 +1,17 @@
+ class="form-control flex-1 items-center justify-center space-y-6 text-center font-bold">

Welcome

-

+

This is a   - svelte logo + svelte logo  -  - svelte logo + svelte logo   Template

diff --git a/src/lib/router/routes/Versions.svelte b/src/lib/router/routes/Versions.svelte index 719d655..72fcb4c 100644 --- a/src/lib/router/routes/Versions.svelte +++ b/src/lib/router/routes/Versions.svelte @@ -8,9 +8,9 @@ const getVersions = async (): Promise => { const [tauri, app, name] = await Promise.all([ + getName(), getTauriVersion(), - getVersion(), - getName() + getVersion() ]); return { tauri, @@ -21,15 +21,15 @@
-

Versions

+ class="form-control flex-1 items-center justify-center space-y-8 text-2xl font-bold"> +

Versions

-
    +
      {#await getVersions() then versions} - {#each Object.entries(versions) as [key, val], i (i)} + {#each Object.entries(versions) as [key, val]}
    • - {key} - {val} + {key} - + {val}
      • {/each} {/await} diff --git a/src/styles.postcss b/src/styles.postcss index 3f18ff2..2922120 100644 --- a/src/styles.postcss +++ b/src/styles.postcss @@ -8,16 +8,24 @@ html { -webkit-font-smoothing: antialiased; } -body, -html { - /* Fix tailwindcss/daisyUI applying color to the body tag */ - background-color: transparent !important; - @apply rounded-3xl overflow-hidden; -} - @layer utilities { /* Class is used for development purposes only */ .dev { - border: 1px solid red; + @apply border-[1px]; + } + .devo { + @apply outline outline-dashed outline-1 outline-primary; } } + +@layer base { + input[type='number']::-webkit-inner-spin-button, + input[type='number']::-webkit-outer-spin-button { + -webkit-appearance: none; + margin: 0; + } +} + +input[type='number'] { + -moz-appearance: textfield; +} diff --git a/vite.config.ts b/vite.config.ts index f5fd7e7..4201f32 100644 --- a/vite.config.ts +++ b/vite.config.ts @@ -29,6 +29,7 @@ export default defineConfig({ envPrefix: ['VITE_', 'TAURI_'], build: { + outDir: 'build', target: ['es2021', 'chrome100', 'safari13'], minify: !process.env.TAURI_DEBUG ? 'esbuild' : false, sourcemap: !!process.env.TAURI_DEBUG