From bd837cf1136916a9b1c3234e909ab118444fc368 Mon Sep 17 00:00:00 2001 From: Harald Mack Date: Wed, 21 Aug 2024 13:32:57 +0200 Subject: [PATCH 1/5] start componentizing bottom navbar --- src/lib/components/AbstractContent.svelte | 60 +++++++------------ .../Navigation/BottomNavElement.svelte | 17 ++++++ .../components/Navigation/NaviBottom.svelte | 2 + src/lib/components/Navigation/NaviTop.svelte | 2 + 4 files changed, 43 insertions(+), 38 deletions(-) create mode 100644 src/lib/components/Navigation/BottomNavElement.svelte create mode 100644 src/lib/components/Navigation/NaviBottom.svelte create mode 100644 src/lib/components/Navigation/NaviTop.svelte diff --git a/src/lib/components/AbstractContent.svelte b/src/lib/components/AbstractContent.svelte index 21d32d9..2eefaf2 100644 --- a/src/lib/components/AbstractContent.svelte +++ b/src/lib/components/AbstractContent.svelte @@ -2,7 +2,6 @@ import { Avatar, BottomNav, - BottomNavItem, DarkMode, Navbar, NavBrand, @@ -11,16 +10,11 @@ NavUl, Tooltip } from 'flowbite-svelte'; - import { - CaretLeftSolid, - CaretRightSolid, - LightbulbSolid, - MoonSolid, - SunSolid - } from 'flowbite-svelte-icons'; + import { CaretLeftSolid, MoonSolid, SunSolid } from 'flowbite-svelte-icons'; // logo import logo_dark from '../assets/mondey_dark.svg'; import logo_light from '../assets/mondey_light.svg'; + import BottomNavElement from './Navigation/BottomNavElement.svelte'; // variables for showing or hiding elements export let showBottomNavbar = true; @@ -78,35 +72,25 @@ class="fixed bottom-0 left-0 right-0 border-t border-gray-200 bg-white dark:border-gray-700 dark:bg-gray-800" classInner="grid-cols-3" > - - - Zur letzten Seite - - - - Hilfe - - - - Zur nächsten Seite - + + + {/if} diff --git a/src/lib/components/Navigation/BottomNavElement.svelte b/src/lib/components/Navigation/BottomNavElement.svelte new file mode 100644 index 0000000..9806e1a --- /dev/null +++ b/src/lib/components/Navigation/BottomNavElement.svelte @@ -0,0 +1,17 @@ + + + + + {tooltip} + diff --git a/src/lib/components/Navigation/NaviBottom.svelte b/src/lib/components/Navigation/NaviBottom.svelte new file mode 100644 index 0000000..49f5fcd --- /dev/null +++ b/src/lib/components/Navigation/NaviBottom.svelte @@ -0,0 +1,2 @@ + diff --git a/src/lib/components/Navigation/NaviTop.svelte b/src/lib/components/Navigation/NaviTop.svelte new file mode 100644 index 0000000..49f5fcd --- /dev/null +++ b/src/lib/components/Navigation/NaviTop.svelte @@ -0,0 +1,2 @@ + From 85c32969cfb1e086972ba02172bacfc572653cc4 Mon Sep 17 00:00:00 2001 From: Harald Mack Date: Wed, 21 Aug 2024 14:37:09 +0200 Subject: [PATCH 2/5] add icon component, work on styling --- src/lib/components/AbstractContent.svelte | 71 +++++++++---------- .../Navigation/FunctionalIcon.svelte | 39 ++++++++++ .../components/Navigation/NaviBottom.svelte | 2 - src/lib/components/Navigation/NaviTop.svelte | 2 - 4 files changed, 74 insertions(+), 40 deletions(-) create mode 100644 src/lib/components/Navigation/FunctionalIcon.svelte delete mode 100644 src/lib/components/Navigation/NaviBottom.svelte delete mode 100644 src/lib/components/Navigation/NaviTop.svelte diff --git a/src/lib/components/AbstractContent.svelte b/src/lib/components/AbstractContent.svelte index 2eefaf2..08f0ef1 100644 --- a/src/lib/components/AbstractContent.svelte +++ b/src/lib/components/AbstractContent.svelte @@ -7,14 +7,21 @@ NavBrand, NavHamburger, NavLi, - NavUl, - Tooltip + NavUl } from 'flowbite-svelte'; - import { CaretLeftSolid, MoonSolid, SunSolid } from 'flowbite-svelte-icons'; + + import { + CaretLeftSolid, + CaretRightSolid, + LightbulbSolid, + MoonSolid, + SunSolid + } from 'flowbite-svelte-icons'; // logo import logo_dark from '../assets/mondey_dark.svg'; import logo_light from '../assets/mondey_light.svg'; import BottomNavElement from './Navigation/BottomNavElement.svelte'; + import FunctionalIcon from './Navigation/FunctionalIcon.svelte'; // variables for showing or hiding elements export let showBottomNavbar = true; @@ -24,8 +31,6 @@ export let lastpage = '/'; export let nextpage = '/'; export let infopage = '/'; - - export let userName = 'Registrieren'; @@ -36,28 +41,23 @@ - + Home Aktuelles Downloads Kontakt - - - - - Darkmode ein- oder ausschalten + + + + + + + + + + + -
- -
{userName}
- Registrieren oder einloggen -
@@ -67,30 +67,29 @@ {#if showBottomNavbar} - + /> - + /> {/if} diff --git a/src/lib/components/Navigation/FunctionalIcon.svelte b/src/lib/components/Navigation/FunctionalIcon.svelte new file mode 100644 index 0000000..dce6748 --- /dev/null +++ b/src/lib/components/Navigation/FunctionalIcon.svelte @@ -0,0 +1,39 @@ + + +
+ + {tooltip} +
+ + diff --git a/src/lib/components/Navigation/NaviBottom.svelte b/src/lib/components/Navigation/NaviBottom.svelte deleted file mode 100644 index 49f5fcd..0000000 --- a/src/lib/components/Navigation/NaviBottom.svelte +++ /dev/null @@ -1,2 +0,0 @@ - diff --git a/src/lib/components/Navigation/NaviTop.svelte b/src/lib/components/Navigation/NaviTop.svelte deleted file mode 100644 index 49f5fcd..0000000 --- a/src/lib/components/Navigation/NaviTop.svelte +++ /dev/null @@ -1,2 +0,0 @@ - From b4884e7a657e64842ee74e07f302acc3868e12dc Mon Sep 17 00:00:00 2001 From: Harald Mack Date: Wed, 21 Aug 2024 15:12:56 +0200 Subject: [PATCH 3/5] work on styling --- src/lib/components/AbstractContent.svelte | 44 +++++++++---------- .../Navigation/FunctionalIcon.svelte | 2 +- 2 files changed, 22 insertions(+), 24 deletions(-) diff --git a/src/lib/components/AbstractContent.svelte b/src/lib/components/AbstractContent.svelte index 08f0ef1..7b3421b 100644 --- a/src/lib/components/AbstractContent.svelte +++ b/src/lib/components/AbstractContent.svelte @@ -34,31 +34,29 @@ - -
- - MONDEY Logo - - - - - Home - Aktuelles - Downloads - Kontakt + + + MONDEY Logo + + + + + Home + Aktuelles + Downloads + Kontakt - - - - - - + + + + + + - - - - -
+ + + +
diff --git a/src/lib/components/Navigation/FunctionalIcon.svelte b/src/lib/components/Navigation/FunctionalIcon.svelte index dce6748..bc30f5f 100644 --- a/src/lib/components/Navigation/FunctionalIcon.svelte +++ b/src/lib/components/Navigation/FunctionalIcon.svelte @@ -14,7 +14,7 @@ } :global(.apply-icon-style) { - @apply rounded-lg p-2 text-xl text-gray-500 transition-colors; + @apply rounded-lg p-2 text-xl text-gray-500; } :global(.apply-icon-style:hover) { From 0b9fbc933c7b0d5a8ce45f26d2194e4d8800d6da Mon Sep 17 00:00:00 2001 From: Harald Mack Date: Wed, 21 Aug 2024 15:45:47 +0200 Subject: [PATCH 4/5] reorganize basic layout --- src/lib/components/AbstractContent.svelte | 46 +---- .../components/DataDisplay/CardDisplay.svelte | 20 ++ src/lib/components/Frontpage.svelte | 186 +++++++----------- src/routes/+layout.svelte | 35 +++- src/routes/firstdropdown/+layout.svelte | 5 - src/routes/firstdropdown/+layout.ts | 1 - src/routes/firstdropdown/+page.svelte | 2 +- src/routes/info/+layout.svelte | 5 - src/routes/info/+layout.ts | 1 - src/routes/nextdropdown/+layout.svelte | 5 - src/routes/nextdropdown/+layout.ts | 1 - 11 files changed, 125 insertions(+), 182 deletions(-) create mode 100644 src/lib/components/DataDisplay/CardDisplay.svelte delete mode 100644 src/routes/firstdropdown/+layout.svelte delete mode 100644 src/routes/firstdropdown/+layout.ts delete mode 100644 src/routes/info/+layout.svelte delete mode 100644 src/routes/info/+layout.ts delete mode 100644 src/routes/nextdropdown/+layout.svelte delete mode 100644 src/routes/nextdropdown/+layout.ts diff --git a/src/lib/components/AbstractContent.svelte b/src/lib/components/AbstractContent.svelte index 7b3421b..7eda68a 100644 --- a/src/lib/components/AbstractContent.svelte +++ b/src/lib/components/AbstractContent.svelte @@ -1,27 +1,9 @@ - - - MONDEY Logo - - - - - Home - Aktuelles - Downloads - Kontakt - - - - - - - - - - - - -
diff --git a/src/lib/components/DataDisplay/CardDisplay.svelte b/src/lib/components/DataDisplay/CardDisplay.svelte new file mode 100644 index 0000000..bedc9d1 --- /dev/null +++ b/src/lib/components/DataDisplay/CardDisplay.svelte @@ -0,0 +1,20 @@ + + + +
+ {header} +
+

+ {summary} +

+ +
diff --git a/src/lib/components/Frontpage.svelte b/src/lib/components/Frontpage.svelte index 0458179..72e86c0 100644 --- a/src/lib/components/Frontpage.svelte +++ b/src/lib/components/Frontpage.svelte @@ -1,126 +1,76 @@ - -
- Was ist Mondey? -
-

- Mondey ist ein wissentschaftlich geprüftes Programm zure Dokumentation der Entwicklung von - Kindern bis 6 Jahren. -

- -
- - -
- Wozu ist Mondey gut? -
-

- Anhand ihrer Bewertungen der Fähigkeiten des Kindes erhalten sie Feedback zum - Entwicklungsstand des Kindes und können so frühzeitig Fördermaßnahmen einleiten. Dies folgt - einem übersichtlichen Ampelsystem. -

- -
- - -
- Was umfasst Mondey? -
-

- Mondey umfasst unterschiedliche Entwicklungsbereiche wie von Kindern im Alter von 0 bis - 6 Jahren. Dazu gehören unter anderem Grob-und feinmotorik, Wahrnehmung, Denkne, Sprache und Soziale - Beziehungen. -

- -
- -
- Wie funktioniert Mondey? -
-

- Sie bewerten wie gut das Kind bestimmte Alltagshandlungen durchführen kann mit Hilfe einer - Liste von Fragen. -

- -
- - -
- Wo fange ich an? -
-

- Um zu beginnen, müssen sie sich registrieren und ein Profil für ihr Kind anlegen. -

- -
- - -
dummy?
-

- Lorem, ipsum dolor sit amet consectetur adipisicing elit. Impedit repellendus distinctio - facilis! Voluptas corrupti recusandae sapiente doloribus voluptatem fugiat ducimus. - -

- -
- - -
dummy?
-

- Lorem, ipsum dolor sit amet consectetur adipisicing elit. Impedit repellendus distinctio - facilis! Voluptas corrupti recusandae sapiente doloribus voluptatem fugiat ducimus. - -

- -
- - -
dummy?
-

- Lorem, ipsum dolor sit amet consectetur adipisicing elit. Impedit repellendus distinctio - facilis! Voluptas corrupti recusandae sapiente doloribus voluptatem fugiat ducimus. - -

- -
- - -
dummy?
-

- Lorem, ipsum dolor sit amet consectetur adipisicing elit. Impedit repellendus distinctio - facilis! Voluptas corrupti recusandae sapiente doloribus voluptatem fugiat ducimus. - -

- -
+ {#each items as item} + + {/each}
diff --git a/src/routes/+layout.svelte b/src/routes/+layout.svelte index e551b53..f42f2bd 100644 --- a/src/routes/+layout.svelte +++ b/src/routes/+layout.svelte @@ -1,5 +1,38 @@ - + + + MONDEY Logo + + + + + Home + Aktuelles + Downloads + Kontakt + + + + + + + + + + + + + + +
+ +
diff --git a/src/routes/firstdropdown/+layout.svelte b/src/routes/firstdropdown/+layout.svelte deleted file mode 100644 index e87af49..0000000 --- a/src/routes/firstdropdown/+layout.svelte +++ /dev/null @@ -1,5 +0,0 @@ - - - diff --git a/src/routes/firstdropdown/+layout.ts b/src/routes/firstdropdown/+layout.ts deleted file mode 100644 index 189f71e..0000000 --- a/src/routes/firstdropdown/+layout.ts +++ /dev/null @@ -1 +0,0 @@ -export const prerender = true; diff --git a/src/routes/firstdropdown/+page.svelte b/src/routes/firstdropdown/+page.svelte index 03a2c4a..4b28b19 100644 --- a/src/routes/firstdropdown/+page.svelte +++ b/src/routes/firstdropdown/+page.svelte @@ -31,6 +31,6 @@ const heading = 'some initial dummy dropdown page'; - + diff --git a/src/routes/info/+layout.svelte b/src/routes/info/+layout.svelte deleted file mode 100644 index e87af49..0000000 --- a/src/routes/info/+layout.svelte +++ /dev/null @@ -1,5 +0,0 @@ - - - diff --git a/src/routes/info/+layout.ts b/src/routes/info/+layout.ts deleted file mode 100644 index 189f71e..0000000 --- a/src/routes/info/+layout.ts +++ /dev/null @@ -1 +0,0 @@ -export const prerender = true; diff --git a/src/routes/nextdropdown/+layout.svelte b/src/routes/nextdropdown/+layout.svelte deleted file mode 100644 index e87af49..0000000 --- a/src/routes/nextdropdown/+layout.svelte +++ /dev/null @@ -1,5 +0,0 @@ - - - diff --git a/src/routes/nextdropdown/+layout.ts b/src/routes/nextdropdown/+layout.ts deleted file mode 100644 index 189f71e..0000000 --- a/src/routes/nextdropdown/+layout.ts +++ /dev/null @@ -1 +0,0 @@ -export const prerender = true; From 2ed7a2df0791ffbaa89943fb85dce4065b4308c4 Mon Sep 17 00:00:00 2001 From: Harald Mack Date: Wed, 21 Aug 2024 15:55:20 +0200 Subject: [PATCH 5/5] remove old comment --- src/routes/+layout.svelte | 1 - 1 file changed, 1 deletion(-) diff --git a/src/routes/+layout.svelte b/src/routes/+layout.svelte index f42f2bd..169e0f3 100644 --- a/src/routes/+layout.svelte +++ b/src/routes/+layout.svelte @@ -5,7 +5,6 @@ import { Avatar, DarkMode, Navbar, NavBrand, NavHamburger, NavLi, NavUl } from 'flowbite-svelte'; import { MoonSolid, SunSolid } from 'flowbite-svelte-icons'; import '../app.css'; - // logo