From 3bdcf77cb0644d1d1e8ace78ca600cb47c05f7f9 Mon Sep 17 00:00:00 2001 From: Moritz Utcke Date: Wed, 20 Nov 2024 12:29:53 +1100 Subject: [PATCH] Fix falsche Style Datei wird reingeladen --- src/layouts/AusweisLayout.astro | 8 ++++---- src/layouts/MinimalLayout.astro | 4 ++-- src/layouts/ORG_Layout.astro | 2 +- src/layouts/UserLayout.astro | 4 ++-- src/pages/email.astro | 2 +- tsconfig.json | 1 + 6 files changed, 11 insertions(+), 10 deletions(-) diff --git a/src/layouts/AusweisLayout.astro b/src/layouts/AusweisLayout.astro index 7735a688..8845b62a 100644 --- a/src/layouts/AusweisLayout.astro +++ b/src/layouts/AusweisLayout.astro @@ -1,9 +1,9 @@ --- -import "../style/global.scss" +import "#style/global.css" import "../../svelte-dialogs.config" -import Footer from '../components/Footer.astro'; -import Header from '../components/Header.astro'; -import SidebarLeft from '../components/SidebarLeft.astro'; +import Footer from '#components/design/footer/Footer.astro'; +import Header from '#components/design/header/Header.astro'; +import SidebarLeft from '#components/design/sidebars/left/SidebarLeft.astro'; export interface Props { title: string; diff --git a/src/layouts/MinimalLayout.astro b/src/layouts/MinimalLayout.astro index bbe9a90a..5e6d63c8 100644 --- a/src/layouts/MinimalLayout.astro +++ b/src/layouts/MinimalLayout.astro @@ -1,7 +1,7 @@ --- import i18next from "i18next"; -import "../style/global.scss"; +import "#style/global.css"; import "../../svelte-dialogs.config" import "svelte-ripple-action/ripple.css" import ThemeController from "#components/ThemeController.svelte"; @@ -38,7 +38,7 @@ const schema = JSON.stringify({ }, }); -const lightTheme = Astro.cookies.get("theme").value === "light"; +const lightTheme = Astro.cookies.get("theme")?.value === "light"; --- diff --git a/src/layouts/ORG_Layout.astro b/src/layouts/ORG_Layout.astro index 160e81aa..81b69e4a 100644 --- a/src/layouts/ORG_Layout.astro +++ b/src/layouts/ORG_Layout.astro @@ -2,7 +2,7 @@ import i18next from "i18next"; import "../style/UMBE_global.css"; -import "../style/global.scss"; +import "#style/global.css"; import "../../svelte-dialogs.config" import Footer from "../components/Footer.astro"; import Header from "../components/Header.astro"; diff --git a/src/layouts/UserLayout.astro b/src/layouts/UserLayout.astro index 5c013bc7..70bd4ff8 100644 --- a/src/layouts/UserLayout.astro +++ b/src/layouts/UserLayout.astro @@ -1,7 +1,7 @@ --- import i18next from "i18next"; -import "../style/global.scss"; +import "#style/global.css"; import "../../svelte-dialogs.config" import "svelte-ripple-action/ripple.css" import DashboardSidebar from "../components/Dashboard/DashboardSidebar.svelte" @@ -50,7 +50,7 @@ const schema = JSON.stringify({ }, }); -let lightTheme = Astro.cookies.get("theme").value === "light"; +let lightTheme = Astro.cookies.get("theme")?.value === "light"; --- diff --git a/src/pages/email.astro b/src/pages/email.astro index 2d289d68..28de0da9 100644 --- a/src/pages/email.astro +++ b/src/pages/email.astro @@ -2,7 +2,7 @@ import ThemeController from "../components/ThemeController.svelte"; import moment from "moment" -const lightTheme = Astro.cookies.get("theme").value === "light"; +const lightTheme = Astro.cookies.get("theme")?.value === "light"; --- diff --git a/tsconfig.json b/tsconfig.json index 4dad34b8..a595c637 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -27,6 +27,7 @@ "#modules/*": ["./src/modules/*"], "#client/*": ["./src/client/*"], "#server/*": ["./src/server/*"], + "#style/*": ["./src/style/*"], "#footer/*": ["./src/components/design/footer/*"], "#header/*": ["./src/components/design/header/*"],