diff --git a/frontend/src/App.svelte b/frontend/src/App.svelte index 2610df3..26c8b9e 100644 --- a/frontend/src/App.svelte +++ b/frontend/src/App.svelte @@ -1,109 +1,92 @@ + {#if googleCookiesAllowed} - - - -
-
- -
-

Newsletter

-
{ - submitNewsletter(email, dataProt).then(() => { - emailIsSubscribed = true - }) - }} - > - {#if emailIsSubscribed} -

Du hast dich zum Newsletter angemeldet!

- {:else} - -
- -

- Datenschutz zum Newsletterversand akzeptieren -

-
- - {/if} -
-
-
-
-
-
- Symbol -
-
- + {:else} + Aktuell keine Service-Links + {/if}
-
-
+ + + + diff --git a/frontend/src/lib/components/Modal.svelte b/frontend/src/lib/components/Modal.svelte index 9465e51..fd6c9b2 100644 --- a/frontend/src/lib/components/Modal.svelte +++ b/frontend/src/lib/components/Modal.svelte @@ -4,7 +4,7 @@ import Icon from "./widgets/Icon.svelte" import Notifications from "./widgets/Notifications.svelte" import { isMobile } from "../store" - import { changeStateOfSite } from "./header/Desktop.svelte" + import { enableScrolling, stopScrolling } from "../functions/utils" export let show: boolean = false, size: string = "md", @@ -13,6 +13,7 @@ let dialog: HTMLDialogElement, dispatch = createEventDispatcher() + const scrollPosition = { top: 0, left: 0 } const onCancel = (e: any) => { show = false @@ -30,19 +31,19 @@ $: if (dialog) if (show) { dialog.showModal() - changeStateOfSite(true) dialog.classList.add("dialog-open") + stopScrolling(scrollPosition) } else if (dialog.classList.contains("dialog-open")) { - changeStateOfSite(false) dialog.classList.remove("dialog-open") dialog.close() + enableScrolling(scrollPosition) dispatch("close") } onMount(() => { return () => { dialog.classList.remove("dialog-open") - changeStateOfSite(false) + enableScrolling(scrollPosition) } }) @@ -53,7 +54,6 @@ bind:this={dialog} on:cancel={onCancel} on:click|stopPropagation={onDialogClick} - on:keypress data-cy="modal" > {#if $$slots.title} @@ -85,7 +85,7 @@ > diff --git a/frontend/src/lib/components/SidebarOverlay.svelte b/frontend/src/lib/components/SidebarOverlay.svelte deleted file mode 100644 index f86c514..0000000 --- a/frontend/src/lib/components/SidebarOverlay.svelte +++ /dev/null @@ -1,428 +0,0 @@ - - - - - - - - diff --git a/frontend/src/lib/components/header/Desktop.svelte b/frontend/src/lib/components/header/Desktop.svelte deleted file mode 100644 index f26add4..0000000 --- a/frontend/src/lib/components/header/Desktop.svelte +++ /dev/null @@ -1,476 +0,0 @@ - - - - - - -{#each elements as submenu, i (submenu.name)} - {#if submenu.elements?.length} -
!isHoveringMenu && closeSubmenuWithTimeout()} - on:focus|stopPropagation - class="submenu-container" - id={`submenu-${i}`} - style="top: 86px" - > - -
-
-
- img - - - -
-
-
- {/if} -{/each} - - diff --git a/frontend/src/lib/components/header/Header.svelte b/frontend/src/lib/components/header/Header.svelte index 00749aa..1b15f53 100644 --- a/frontend/src/lib/components/header/Header.svelte +++ b/frontend/src/lib/components/header/Header.svelte @@ -1,125 +1,247 @@ - - - -