From 146ab00d3d68322274b8da2200c385ad9f9c4add Mon Sep 17 00:00:00 2001 From: gsovereignty Date: Sat, 29 Jun 2024 17:46:40 +0800 Subject: [PATCH] problem: layout and menu structure are repetative --- src/components/Heading.svelte | 9 ++ src/components/Menu.svelte | 1 + src/layouts/SidePanelLayout.svelte | 220 ++++++++++++++-------------- src/routes/+layout.svelte | 6 +- src/routes/+page.svelte | 5 +- src/routes/rockets/new/+page.svelte | 51 +++---- src/routes/test/+page.svelte | 5 +- src/views/rockets/Rockets.svelte | 90 ++++++------ 8 files changed, 187 insertions(+), 200 deletions(-) create mode 100644 src/components/Heading.svelte diff --git a/src/components/Heading.svelte b/src/components/Heading.svelte new file mode 100644 index 0000000..df4b85d --- /dev/null +++ b/src/components/Heading.svelte @@ -0,0 +1,9 @@ + + +
+

+ {title} +

+
diff --git a/src/components/Menu.svelte b/src/components/Menu.svelte index 0d6ea06..5f408cf 100644 --- a/src/components/Menu.svelte +++ b/src/components/Menu.svelte @@ -8,6 +8,7 @@ let iconClass = "h-5 w-5 md:h-4 md:w-4" let getClass = (menuItem:string) => { + //todo: make this re-run any time our path changes if ($page.url.pathname.includes(menuItem)) { return "flex items-center gap-3 rounded-lg bg-muted px-3 py-2 text-primary transition-all hover:text-primary" } else { diff --git a/src/layouts/SidePanelLayout.svelte b/src/layouts/SidePanelLayout.svelte index 1aaec0f..40dc8e5 100644 --- a/src/layouts/SidePanelLayout.svelte +++ b/src/layouts/SidePanelLayout.svelte @@ -1,118 +1,110 @@ - -
- -
-
- - - - - - -
- -
- - + import { Button } from '$lib/components/ui/button/index.js'; + import * as DropdownMenu from '$lib/components/ui/dropdown-menu/index.js'; + import { Input } from '$lib/components/ui/input/index.js'; + import * as Sheet from '$lib/components/ui/sheet/index.js'; + import { Rocket } from 'lucide-svelte'; + import NewMenu from '../components/Menu.svelte'; + import RocketPillCard from '../components/RocketPillCard.svelte'; + import { base } from '$app/paths'; - + export let title = ''; + -
-
-
- - -
-
-
- - - - - - My Account - - Settings - Support - - Logout - - -
-
-
-

{title}

-
- -
-
-
- \ No newline at end of file +
+ +
+
+ + + + + + +
+ +
+ + + + + +
+
+
+ + +
+
+
+ + + + + + My Account + + Settings + Support + + Logout + + +
+
+ +
+
+
diff --git a/src/routes/+layout.svelte b/src/routes/+layout.svelte index a7e8200..bf495cc 100644 --- a/src/routes/+layout.svelte +++ b/src/routes/+layout.svelte @@ -2,8 +2,10 @@ import { RocketSolid } from 'svelte-awesome-icons'; import '../app.css'; import { ModeWatcher } from 'mode-watcher'; + import SidePanelLayout from '../layouts/SidePanelLayout.svelte'; - - + +
+ diff --git a/src/routes/+page.svelte b/src/routes/+page.svelte index 8aeb342..538b6de 100644 --- a/src/routes/+page.svelte +++ b/src/routes/+page.svelte @@ -1,9 +1,6 @@ - - - \ No newline at end of file + \ No newline at end of file diff --git a/src/routes/rockets/new/+page.svelte b/src/routes/rockets/new/+page.svelte index dcccef6..a4e1203 100644 --- a/src/routes/rockets/new/+page.svelte +++ b/src/routes/rockets/new/+page.svelte @@ -4,34 +4,29 @@ import { RocketState } from '@/types'; import { NDKEvent } from '@nostr-dev-kit/ndk'; import SidePanelLayout from '../../../layouts/SidePanelLayout.svelte'; + import Heading from '../../../components/Heading.svelte'; - let rocketName:string; - $:err = undefined; + let rocketName: string; + $: err = undefined; - function validate() { - let e = new NDKEvent() - e.dTag = rocketName - try { - new RocketState(e) - } catch(_err) { - console.log(_err) - err = _err - return - } - err = undefined - console.log(new RocketState(e)) - - } - + function validate() { + let e = new NDKEvent(); + e.dTag = rocketName; + try { + new RocketState(e); + } catch (_err) { + console.log(_err); + err = _err; + return; + } + err = undefined; + console.log(new RocketState(e)); + } - - -
-
- -

Enter the name of your new Rocket

- -
{err?err:""}
-
-
- + +
+ +

Enter the name of your new Rocket

+ +
{err ? err : ''}
+
diff --git a/src/routes/test/+page.svelte b/src/routes/test/+page.svelte index 0016c02..6a04858 100644 --- a/src/routes/test/+page.svelte +++ b/src/routes/test/+page.svelte @@ -1,8 +1,5 @@ - -
- \ No newline at end of file + \ No newline at end of file diff --git a/src/views/rockets/Rockets.svelte b/src/views/rockets/Rockets.svelte index 37b1f0e..924ab37 100644 --- a/src/views/rockets/Rockets.svelte +++ b/src/views/rockets/Rockets.svelte @@ -1,55 +1,49 @@ - -
-

- Rockets -

-
+
+ + + +
+ +
+ The People's Rocket +
+ +

+ Dedicated to delivering excellence through central planning. +

+

Created by PabloF7z

+ - - + - -
- -
- The People's Rocket -
- -

- Dedicated to delivering excellence through central planning. -

-

Created by PabloF7z

- - Read more - - -
-
+ +
- +