From fd551f1ab9d27876aa90ec9ae31cdcd591b6e5b8 Mon Sep 17 00:00:00 2001 From: Robert Jagtiani Date: Tue, 19 Nov 2024 20:49:58 +0100 Subject: [PATCH] so wie Jens es will --- postcss.config.cjs | 8 + postcss.config.js | 11 - src/components/UMBE_SidebarLeft.astro | 14 - src/components/UMBE_SidebarRight.astro | 25 -- .../content/banner-saeule.svelte} | 0 .../footer/Footer.astro} | 0 .../footer/ORG_Footer.astro} | 0 .../header/Header.astro} | 0 .../header/ORG_Header.astro} | 0 .../sidebars/cards/card-BA-G-promo.svelte} | 0 .../sidebars/cards/card-BA-promo.svelte} | 2 +- .../sidebars/cards/card-VA-G-promo.svelte} | 2 +- .../sidebars/cards/card-VA-promo.svelte} | 0 .../sidebars/cards/card-contact.svelte} | 0 .../sidebars/cards/card-navigation.svelte} | 0 .../sidebars/cards/card-price-info.svelte} | 0 .../sidebars/cards/card-review.svelte} | 0 .../sidebars/cards/navcard.astro} | 0 .../sidebars/left/ORG_SidebarLeft.astro} | 0 .../design/sidebars/left/SidebarLeft.astro | 14 + .../sidebars/right/ORG_SidebarRight.astro} | 0 .../design/sidebars/right/SidebarRight.astro | 25 ++ src/layouts/Layout.astro | 148 ++----- src/layouts/ORG_Layout.astro | 154 ++++++++ src/layouts/UMBE_Layout.astro | 68 ---- src/pages/ORG_index.astro | 365 ++++++++++++++++++ src/pages/UMBE_test.astro | 18 - src/pages/index.astro | 363 +---------------- src/style/{global.scss => ORG_global.scss} | 0 src/style/{UMBE_global.css => global.css} | 12 +- tsconfig.json | 6 + 31 files changed, 619 insertions(+), 616 deletions(-) create mode 100644 postcss.config.cjs delete mode 100644 postcss.config.js delete mode 100644 src/components/UMBE_SidebarLeft.astro delete mode 100644 src/components/UMBE_SidebarRight.astro rename src/components/{UMBE_banner-saeule.svelte => design/content/banner-saeule.svelte} (100%) rename src/components/{UMBE_Footer.astro => design/footer/Footer.astro} (100%) rename src/components/{Footer.astro => design/footer/ORG_Footer.astro} (100%) rename src/components/{UMBE_Header.astro => design/header/Header.astro} (100%) rename src/components/{Header.astro => design/header/ORG_Header.astro} (100%) rename src/components/{UMBE_card-BA-G-promo.svelte => design/sidebars/cards/card-BA-G-promo.svelte} (100%) rename src/components/{UMBE_card-BA-promo.svelte => design/sidebars/cards/card-BA-promo.svelte} (95%) rename src/components/{UMBE_card-VA-G-promo.svelte => design/sidebars/cards/card-VA-G-promo.svelte} (95%) rename src/components/{UMBE_card-VA-promo.svelte => design/sidebars/cards/card-VA-promo.svelte} (100%) rename src/components/{UMBE_card-contact.svelte => design/sidebars/cards/card-contact.svelte} (100%) rename src/components/{UMBE_card-navigation.svelte => design/sidebars/cards/card-navigation.svelte} (100%) rename src/components/{UMBE_card-price-info.svelte => design/sidebars/cards/card-price-info.svelte} (100%) rename src/components/{UMBE_card-review.svelte => design/sidebars/cards/card-review.svelte} (100%) rename src/components/{UMBE_navcard.astro => design/sidebars/cards/navcard.astro} (100%) rename src/components/{SidebarLeft.astro => design/sidebars/left/ORG_SidebarLeft.astro} (100%) create mode 100644 src/components/design/sidebars/left/SidebarLeft.astro rename src/components/{SidebarRight.astro => design/sidebars/right/ORG_SidebarRight.astro} (100%) create mode 100644 src/components/design/sidebars/right/SidebarRight.astro create mode 100644 src/layouts/ORG_Layout.astro delete mode 100644 src/layouts/UMBE_Layout.astro create mode 100644 src/pages/ORG_index.astro delete mode 100644 src/pages/UMBE_test.astro rename src/style/{global.scss => ORG_global.scss} (100%) rename src/style/{UMBE_global.css => global.css} (97%) diff --git a/postcss.config.cjs b/postcss.config.cjs new file mode 100644 index 00000000..1b2ba7eb --- /dev/null +++ b/postcss.config.cjs @@ -0,0 +1,8 @@ +module.exports = { + plugins: { + 'postcss-import': {}, + 'tailwindcss/nesting': {}, + tailwindcss: {}, + autoprefixer: {}, + } +} \ No newline at end of file diff --git a/postcss.config.js b/postcss.config.js deleted file mode 100644 index 7f2f09c0..00000000 --- a/postcss.config.js +++ /dev/null @@ -1,11 +0,0 @@ -// postcss.config.js -module.exports = { - plugins: { - 'postcss-import': {}, - 'tailwindcss/nesting': 'postcss-nesting', - tailwindcss: {}, - 'postcss-preset-env': { - features: { 'nesting-rules': false }, - }, - } -} \ No newline at end of file diff --git a/src/components/UMBE_SidebarLeft.astro b/src/components/UMBE_SidebarLeft.astro deleted file mode 100644 index 95bbe08e..00000000 --- a/src/components/UMBE_SidebarLeft.astro +++ /dev/null @@ -1,14 +0,0 @@ ---- -import Navigation from "#components/UMBE_card-navigation.svelte"; -import Preistabelle from "#components/UMBE_card-price-info.svelte"; - ---- - -
- - - - - - -
\ No newline at end of file diff --git a/src/components/UMBE_SidebarRight.astro b/src/components/UMBE_SidebarRight.astro deleted file mode 100644 index efce530b..00000000 --- a/src/components/UMBE_SidebarRight.astro +++ /dev/null @@ -1,25 +0,0 @@ ---- -import Login from "#components/SidebarWidgetLogin.svelte"; -import Contact from "#components/UMBE_card-contact.svelte"; -import Review from "#components/UMBE_card-review.svelte"; -import VApromo from "#components/UMBE_card-VA-promo.svelte"; -import VAGpromo from "#components/UMBE_card-VA-G-promo.svelte"; -import BApromo from "#components/UMBE_card-BA-promo.svelte"; -import BAGpromo from "#components/UMBE_card-BA-G-promo.svelte"; ---- - - - - - \ No newline at end of file diff --git a/src/components/UMBE_banner-saeule.svelte b/src/components/design/content/banner-saeule.svelte similarity index 100% rename from src/components/UMBE_banner-saeule.svelte rename to src/components/design/content/banner-saeule.svelte diff --git a/src/components/UMBE_Footer.astro b/src/components/design/footer/Footer.astro similarity index 100% rename from src/components/UMBE_Footer.astro rename to src/components/design/footer/Footer.astro diff --git a/src/components/Footer.astro b/src/components/design/footer/ORG_Footer.astro similarity index 100% rename from src/components/Footer.astro rename to src/components/design/footer/ORG_Footer.astro diff --git a/src/components/UMBE_Header.astro b/src/components/design/header/Header.astro similarity index 100% rename from src/components/UMBE_Header.astro rename to src/components/design/header/Header.astro diff --git a/src/components/Header.astro b/src/components/design/header/ORG_Header.astro similarity index 100% rename from src/components/Header.astro rename to src/components/design/header/ORG_Header.astro diff --git a/src/components/UMBE_card-BA-G-promo.svelte b/src/components/design/sidebars/cards/card-BA-G-promo.svelte similarity index 100% rename from src/components/UMBE_card-BA-G-promo.svelte rename to src/components/design/sidebars/cards/card-BA-G-promo.svelte diff --git a/src/components/UMBE_card-BA-promo.svelte b/src/components/design/sidebars/cards/card-BA-promo.svelte similarity index 95% rename from src/components/UMBE_card-BA-promo.svelte rename to src/components/design/sidebars/cards/card-BA-promo.svelte index c334eab2..c36f2c73 100644 --- a/src/components/UMBE_card-BA-promo.svelte +++ b/src/components/design/sidebars/cards/card-BA-promo.svelte @@ -12,7 +12,7 @@ class=" box card hidden bg-white px-6 py-4 mb-5
Wohnhaus Verbrauchsausweis -jetzt Bedarfssausweis erstellen diff --git a/src/components/UMBE_card-VA-G-promo.svelte b/src/components/design/sidebars/cards/card-VA-G-promo.svelte similarity index 95% rename from src/components/UMBE_card-VA-G-promo.svelte rename to src/components/design/sidebars/cards/card-VA-G-promo.svelte index 804ace97..cfa95d9d 100644 --- a/src/components/UMBE_card-VA-G-promo.svelte +++ b/src/components/design/sidebars/cards/card-VA-G-promo.svelte @@ -12,7 +12,7 @@
Gewerbe Verbrauchsausweis - jetzt Verbrauchsausweis erstellen diff --git a/src/components/UMBE_card-VA-promo.svelte b/src/components/design/sidebars/cards/card-VA-promo.svelte similarity index 100% rename from src/components/UMBE_card-VA-promo.svelte rename to src/components/design/sidebars/cards/card-VA-promo.svelte diff --git a/src/components/UMBE_card-contact.svelte b/src/components/design/sidebars/cards/card-contact.svelte similarity index 100% rename from src/components/UMBE_card-contact.svelte rename to src/components/design/sidebars/cards/card-contact.svelte diff --git a/src/components/UMBE_card-navigation.svelte b/src/components/design/sidebars/cards/card-navigation.svelte similarity index 100% rename from src/components/UMBE_card-navigation.svelte rename to src/components/design/sidebars/cards/card-navigation.svelte diff --git a/src/components/UMBE_card-price-info.svelte b/src/components/design/sidebars/cards/card-price-info.svelte similarity index 100% rename from src/components/UMBE_card-price-info.svelte rename to src/components/design/sidebars/cards/card-price-info.svelte diff --git a/src/components/UMBE_card-review.svelte b/src/components/design/sidebars/cards/card-review.svelte similarity index 100% rename from src/components/UMBE_card-review.svelte rename to src/components/design/sidebars/cards/card-review.svelte diff --git a/src/components/UMBE_navcard.astro b/src/components/design/sidebars/cards/navcard.astro similarity index 100% rename from src/components/UMBE_navcard.astro rename to src/components/design/sidebars/cards/navcard.astro diff --git a/src/components/SidebarLeft.astro b/src/components/design/sidebars/left/ORG_SidebarLeft.astro similarity index 100% rename from src/components/SidebarLeft.astro rename to src/components/design/sidebars/left/ORG_SidebarLeft.astro diff --git a/src/components/design/sidebars/left/SidebarLeft.astro b/src/components/design/sidebars/left/SidebarLeft.astro new file mode 100644 index 00000000..2e7b2cac --- /dev/null +++ b/src/components/design/sidebars/left/SidebarLeft.astro @@ -0,0 +1,14 @@ +--- +import Navigation from "#sidebarCards/card-navigation.svelte"; +import Preistabelle from "#sidebarCards/card-price-info.svelte"; + +--- + +
+ + + + + + +
\ No newline at end of file diff --git a/src/components/SidebarRight.astro b/src/components/design/sidebars/right/ORG_SidebarRight.astro similarity index 100% rename from src/components/SidebarRight.astro rename to src/components/design/sidebars/right/ORG_SidebarRight.astro diff --git a/src/components/design/sidebars/right/SidebarRight.astro b/src/components/design/sidebars/right/SidebarRight.astro new file mode 100644 index 00000000..db702f6f --- /dev/null +++ b/src/components/design/sidebars/right/SidebarRight.astro @@ -0,0 +1,25 @@ +--- +import Login from "#sidebarCards/SidebarWidgetLogin.svelte"; +import Contact from "#sidebarCards/Ucard-contact.svelte"; +import Review from "#sidebarCards/card-review.svelte"; +import VApromo from "#sidebarCards/card-VA-promo.svelte"; +import VAGpromo from "#sidebarCards/card-VA-G-promo.svelte"; +import BApromo from "#sidebarCards/card-BA-promo.svelte"; +import BAGpromo from "#sidebarCards/card-BA-G-promo.svelte"; +--- + + + + + \ No newline at end of file diff --git a/src/layouts/Layout.astro b/src/layouts/Layout.astro index 160e81aa..3b8a1400 100644 --- a/src/layouts/Layout.astro +++ b/src/layouts/Layout.astro @@ -1,15 +1,11 @@ --- -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"; -import SidebarLeft from "../components/SidebarLeft.astro"; -import SidebarRight from "../components/SidebarRight.astro"; +import Header from "#header/Header.astro"; +import Footer from "#footer/Footer.astro"; +import SidebarLeft from "#sidebarLeft/SidebarLeft.astro"; +import SidebarRight from "#sidebarRight/SidebarRight.astro"; import { NotificationWrapper } from "@ibcornelsen/ui"; -import TicketPopup from "../components/Tickets/TicketButton.svelte" export interface Props { title: string; @@ -17,138 +13,54 @@ export interface Props { const { title } = Astro.props; -const schema = JSON.stringify({ - "@context": "http://schema.org", - "@type": "Corporation", - name: "IB Cornelsen", - alternateName: "online-energieausweis.org", - url: "https://online-energieausweis.org", - logo: "https://online-energieausweis.org/ib-cornelsen.png", - address: { - "@type": "PostalAddress", - streetAddress: "Katendeich 5A", - addressLocality: "Hamburg", - postalCode: "21035", - addressCountry: "Deutschland", - email: "info@online-energieausweis.org", - }, - contactPoint: { - "@type": "ContactPoint", - telephone: "+49-040-209339850", - faxNumber: "+49-040-209339859", - contactType: "customer service", - areaServed: "DE", - availableLanguage: "German", - }, -}); + --- - + - - - - - - - - - - - - - - - {title || "Energieausweis online erstellen - Online Energieausweis"} + + + +
- -
- -
-
+