reorganize basic layout

ssciwr · Aug 21, 2024 · 0b9fbc9 · 0b9fbc9
1 parent b4884e7
commit 0b9fbc9
Show file tree

Hide file tree

Showing 11 changed files with 125 additions and 182 deletions.
diff --git a/src/lib/components/AbstractContent.svelte b/src/lib/components/AbstractContent.svelte
@@ -1,27 +1,9 @@
 <script>
-	import {
-		Avatar,
-		BottomNav,
-		DarkMode,
-		Navbar,
-		NavBrand,
-		NavHamburger,
-		NavLi,
-		NavUl
-	} from 'flowbite-svelte';
+	import { BottomNav } from 'flowbite-svelte';
 
-	import {
-		CaretLeftSolid,
-		CaretRightSolid,
-		LightbulbSolid,
-		MoonSolid,
-		SunSolid
-	} from 'flowbite-svelte-icons';
+	import { CaretLeftSolid, CaretRightSolid, LightbulbSolid } 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;
@@ -34,30 +16,6 @@
 </script>
 
 <!-- Top element: basic navigation-->
-<Navbar>
-	<NavBrand href="/">
-		<img src={logo_light} class="block h-16 dark:hidden" alt="MONDEY Logo" />
-		<img src={logo_dark} class="hidden h-16 dark:block" alt="MONDEY Logo" />
-	</NavBrand>
-	<NavHamburger />
-	<NavUl ulClass="flex space-x-4 text-lg ">
-		<NavLi href="/" active={true}>Home</NavLi>
-		<NavLi href="/">Aktuelles</NavLi>
-		<NavLi href="/">Downloads</NavLi>
-		<NavLi href="/">Kontakt</NavLi>
-
-		<FunctionalIcon tooltip={'Darkmode ein- oder ausschalten'}>
-			<DarkMode class="apply-icon-style">
-				<MoonSolid slot="darkIcon" />
-				<SunSolid slot="lightIcon" />
-			</DarkMode>
-		</FunctionalIcon>
-
-		<FunctionalIcon tooltip={'Registrieren oder einloggen'}>
-			<Avatar rounded class="apply-icon-style" />
-		</FunctionalIcon>
-	</NavUl>
-</Navbar>
 
 <!--Page content goes here-->
 <div class="mx-auto max-w-6xl flex-1 overflow-y-auto p-4 pb-20">

diff --git a/src/lib/components/DataDisplay/CardDisplay.svelte b/src/lib/components/DataDisplay/CardDisplay.svelte
@@ -0,0 +1,20 @@
+<script>
+	import { Button, Card } from 'flowbite-svelte';
+	import { ArrowRightOutline } from 'flowbite-svelte-icons';
+	export let header = 'header';
+	export let summary = 'summary';
+	export let button = 'button';
+	export let link = '/';
+</script>
+
+<Card class="m-4 w-full p-6">
+	<h5 class="mb-2 text-2xl font-bold tracking-tight text-gray-900 dark:text-white">
+		{header}
+	</h5>
+	<p class="mb-3 font-normal leading-tight text-gray-700 dark:text-gray-400">
+		{summary}
+	</p>
+	<Button href={link} class="w-fit"
+		>{button} <ArrowRightOutline class="ms-2 h-6 w-6 text-white" /></Button
+	>
+</Card>
diff --git a/src/lib/components/Frontpage.svelte b/src/lib/components/Frontpage.svelte
@@ -1,126 +1,76 @@
 <script>
-	import { Button, Card, Gallery } from 'flowbite-svelte';
-	import { ArrowRightOutline } from 'flowbite-svelte-icons';
+	import CardDisplay from '$lib/components/DataDisplay/CardDisplay.svelte';
+	import { Gallery } from 'flowbite-svelte';
 	export let getStarted = '/';
 	console.log('get started: ', getStarted);
+
+	export let items = [
+		{
+			header: 'Was ist Mondey?',
+			summary:
+				'Mondey ist ein wissentschaftlich geprüftes Programm zure Dokumentation der Entwicklung von Kindern bis 6 Jahren.',
+			link: '/info',
+			buttonName: 'Mehr Info'
+		},
+		{
+			header: 'Wozu ist Mondey gut?',
+			summary:
+				'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.',
+			link: '/info',
+			buttonName: 'Mehr Info'
+		},
+		{
+			header: 'Was umfasst Mondey?',
+			summary:
+				'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.',
+			link: '/info',
+			buttonName: 'Mehr Info'
+		},
+		{
+			header: 'Wie funktioniert Mondey?',
+			summary:
+				'Sie bewerten wie gut das Kind bestimmte Alltagshandlungen durchführen kann mit Hilfe einer Liste von Fragen.',
+			link: '/info',
+			buttonName: 'Mehr Info'
+		},
+		{
+			header: 'Wo fange ich an?',
+			summary: 'Um zu beginnen, müssen sie sich registrieren und ein Profil für ihr Kind anlegen.',
+			link: '/firstdropdown',
+			buttonName: 'Los geht´s'
+		},
+		{
+			header: 'dummy?',
+			summary:
+				'Lorem, ipsum dolor sit amet consectetur adipisicing elit. Impedit repellendus distinctio facilis! Voluptas corrupti recusandae sapiente doloribus voluptatem fugiat ducimus.',
+			link: '/info',
+			buttonName: 'Mehr Info'
+		},
+		{
+			header: 'dummy?',
+			summary:
+				'Lorem, ipsum dolor sit amet consectetur adipisicing elit. Impedit repellendus distinctio facilis! Voluptas corrupti recusandae sapiente doloribus voluptatem fugiat ducimus.',
+			link: '/info',
+			buttonName: 'Mehr Info'
+		},
+		{
+			header: 'dummy?',
+			summary:
+				'Lorem, ipsum dolor sit amet consectetur adipisicing elit. Impedit repellendus distinctio facilis! Voluptas corrupti recusandae sapiente doloribus voluptatem fugiat ducimus.',
+			link: '/info',
+			buttonName: 'Mehr Info'
+		}
+	];
 </script>
 
 <!-- This is a dummy landing page that is only there to check that the AbstractComponent works as it should-->
 <Gallery class="grid-cols-1 gap-y-12 md:grid-cols-2">
-	<Card class="m-4 w-full p-6">
-		<h5 class="mb-2 text-2xl font-bold tracking-tight text-gray-900 dark:text-white">
-			Was ist Mondey?
-		</h5>
-		<p class="mb-3 font-normal leading-tight text-gray-700 dark:text-gray-400">
-			<i>Mondey</i> ist ein wissentschaftlich geprüftes Programm zure Dokumentation der Entwicklung von
-			Kindern bis 6 Jahren.
-		</p>
-		<Button href="/info" class="w-fit"
-			>Mehr Info <ArrowRightOutline class="ms-2 h-6 w-6 text-white" /></Button
-		>
-	</Card>
-
-	<Card class="m-4 w-full p-6">
-		<h5 class="mb-2 text-2xl font-bold tracking-tight text-gray-900 dark:text-white">
-			Wozu ist Mondey gut?
-		</h5>
-		<p class="mb-3 font-normal leading-tight text-gray-700 dark:text-gray-400">
-			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.
-		</p>
-		<Button href="/info" class="w-fit"
-			>Mehr Info <ArrowRightOutline class="ms-2 h-6 w-6 text-white" /></Button
-		>
-	</Card>
-
-	<Card class="m-4 w-full p-6">
-		<h5 class="mb-2 text-2xl font-bold tracking-tight text-gray-900 dark:text-white">
-			Was umfasst Mondey?
-		</h5>
-		<p class="mb-3 font-normal leading-tight text-gray-700 dark:text-gray-400">
-			<i>Mondey</i> 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.
-		</p>
-		<Button href="/info" class="w-fit"
-			>Mehr Info <ArrowRightOutline class="ms-2 h-6 w-6 text-white" /></Button
-		>
-	</Card>
-	<Card class="m-4 w-full p-6">
-		<h5 class="mb-2 text-2xl font-bold tracking-tight text-gray-900 dark:text-white">
-			Wie funktioniert Mondey?
-		</h5>
-		<p class="mb-3 font-normal leading-tight text-gray-700 dark:text-gray-400">
-			Sie bewerten wie gut das Kind bestimmte Alltagshandlungen durchführen kann mit Hilfe einer
-			Liste von Fragen.
-		</p>
-		<Button href="/info" class="w-fit"
-			>Mehr Info <ArrowRightOutline class="ms-2 h-6 w-6 text-white" /></Button
-		>
-	</Card>
-
-	<Card class="m-4 w-full p-6">
-		<h5 class="mb-2 text-2xl font-bold tracking-tight text-gray-900 dark:text-white">
-			Wo fange ich an?
-		</h5>
-		<p class="mb-3 font-normal leading-tight text-gray-700 dark:text-gray-400">
-			Um zu beginnen, müssen sie sich registrieren und ein Profil für ihr Kind anlegen.
-		</p>
-		<Button class="w-fit" href={getStarted}
-			>Los geht's <ArrowRightOutline class="ms-2 h-6 w-6 text-white" /></Button
-		>
-	</Card>
-
-	<Card class="m-4 w-full p-6">
-		<h5 class="mb-2 text-2xl font-bold tracking-tight text-gray-900 dark:text-white">dummy?</h5>
-		<p class="mb-3 font-normal leading-tight text-gray-700 dark:text-gray-400">
-			<i
-				>Lorem, ipsum dolor sit amet consectetur adipisicing elit. Impedit repellendus distinctio
-				facilis! Voluptas corrupti recusandae sapiente doloribus voluptatem fugiat ducimus.
-			</i>
-		</p>
-		<Button href="/info" class="w-fit"
-			>dummy <ArrowRightOutline class="ms-2 h-6 w-6 text-white" /></Button
-		>
-	</Card>
-
-	<Card class="m-4 w-full p-6">
-		<h5 class="mb-2 text-2xl font-bold tracking-tight text-gray-900 dark:text-white">dummy?</h5>
-		<p class="mb-3 font-normal leading-tight text-gray-700 dark:text-gray-400">
-			<i
-				>Lorem, ipsum dolor sit amet consectetur adipisicing elit. Impedit repellendus distinctio
-				facilis! Voluptas corrupti recusandae sapiente doloribus voluptatem fugiat ducimus.
-			</i>
-		</p>
-		<Button href="/info" class="w-fit"
-			>dummy <ArrowRightOutline class="ms-2 h-6 w-6 text-white" /></Button
-		>
-	</Card>
-
-	<Card class="m-4 w-full p-6">
-		<h5 class="mb-2 text-2xl font-bold tracking-tight text-gray-900 dark:text-white">dummy?</h5>
-		<p class="mb-3 font-normal leading-tight text-gray-700 dark:text-gray-400">
-			<i
-				>Lorem, ipsum dolor sit amet consectetur adipisicing elit. Impedit repellendus distinctio
-				facilis! Voluptas corrupti recusandae sapiente doloribus voluptatem fugiat ducimus.
-			</i>
-		</p>
-		<Button href="/info" class="w-fit"
-			>dummy <ArrowRightOutline class="ms-2 h-6 w-6 text-white" /></Button
-		>
-	</Card>
-
-	<Card class="m-4 w-full p-6">
-		<h5 class="mb-2 text-2xl font-bold tracking-tight text-gray-900 dark:text-white">dummy?</h5>
-		<p class="mb-3 font-normal leading-tight text-gray-700 dark:text-gray-400">
-			<i
-				>Lorem, ipsum dolor sit amet consectetur adipisicing elit. Impedit repellendus distinctio
-				facilis! Voluptas corrupti recusandae sapiente doloribus voluptatem fugiat ducimus.
-			</i>
-		</p>
-		<Button href="/info" class="w-fit"
-			>dummy <ArrowRightOutline class="ms-2 h-6 w-6 text-white" /></Button
-		>
-	</Card>
+	{#each items as item}
+		<CardDisplay
+			header={item.header}
+			summary={item.summary}
+			link={item.link}
+			button={item.buttonName}
+		/>
+	{/each}
 </Gallery>
diff --git a/src/routes/+layout.svelte b/src/routes/+layout.svelte
@@ -1,5 +1,38 @@
 <script>
+	import logo_dark from '$lib/assets/mondey_dark.svg';
+	import logo_light from '$lib/assets/mondey_light.svg';
+	import FunctionalIcon from '$lib/components/Navigation/FunctionalIcon.svelte';
+	import { Avatar, DarkMode, Navbar, NavBrand, NavHamburger, NavLi, NavUl } from 'flowbite-svelte';
+	import { MoonSolid, SunSolid } from 'flowbite-svelte-icons';
 	import '../app.css';
+	// logo
 </script>
 
-<slot></slot>
+<Navbar>
+	<NavBrand href="/">
+		<img src={logo_light} class="block h-16 dark:hidden" alt="MONDEY Logo" />
+		<img src={logo_dark} class="hidden h-16 dark:block" alt="MONDEY Logo" />
+	</NavBrand>
+	<NavHamburger />
+	<NavUl ulClass="flex space-x-4 text-lg ">
+		<NavLi href="/" active={true}>Home</NavLi>
+		<NavLi href="/">Aktuelles</NavLi>
+		<NavLi href="/">Downloads</NavLi>
+		<NavLi href="/">Kontakt</NavLi>
+
+		<FunctionalIcon tooltip={'Darkmode ein- oder ausschalten'}>
+			<DarkMode class="apply-icon-style">
+				<MoonSolid slot="darkIcon" />
+				<SunSolid slot="lightIcon" />
+			</DarkMode>
+		</FunctionalIcon>
+
+		<FunctionalIcon tooltip={'Registrieren oder einloggen'}>
+			<Avatar rounded class="apply-icon-style" />
+		</FunctionalIcon>
+	</NavUl>
+</Navbar>
+
+<div class="mx-auto max-w-6xl flex-1 overflow-y-auto p-4 pb-20">
+	<slot></slot>
+</div>
diff --git a/src/routes/firstdropdown/+layout.svelte b/src/routes/firstdropdown/+layout.svelte
diff --git a/src/routes/firstdropdown/+layout.ts b/src/routes/firstdropdown/+layout.ts
diff --git a/src/routes/firstdropdown/+page.svelte b/src/routes/firstdropdown/+page.svelte
@@ -31,6 +31,6 @@
 	const heading = 'some initial dummy dropdown page';
 </script>
 
-<AbstractContent showBottomNavbar={true} lastPage="/" nextPage="/nextdropdown" infoPage="/info">
+<AbstractContent showBottomNavbar={true} lastpage="/" nextpage="/nextdropdown" infopage="/info">
 	<AbstractDataInput data={data_to_display} {heading} itemComponent={AbstractDropdownItem} />
 </AbstractContent>
diff --git a/src/routes/info/+layout.svelte b/src/routes/info/+layout.svelte
diff --git a/src/routes/info/+layout.ts b/src/routes/info/+layout.ts
diff --git a/src/routes/nextdropdown/+layout.svelte b/src/routes/nextdropdown/+layout.svelte
diff --git a/src/routes/nextdropdown/+layout.ts b/src/routes/nextdropdown/+layout.ts