From f5a03511acd2864b9a04871e6565f8a20e2848cc Mon Sep 17 00:00:00 2001 From: Robert Jagtiani Date: Thu, 12 Dec 2024 18:10:16 +0100 Subject: [PATCH 1/5] Schimpfe von Moritz --- .gitignore | 4 + Makefile | 2 +- ...Olive-Std-Compact_3864.ttfZone.Identifier | 3 - .../HeronSans-Light.woff2Zone.Identifier | 3 - .../HeronSans-Regular.eotZone.Identifier | 3 - .../HeronSans-Regular.ttfZone.Identifier | 3 - .../HeronSans-Regular.woff2Zone.Identifier | 3 - .../HeronSans-Regular.woffZone.Identifier | 3 - ...ronSansCond-SemiBold.woff2Zone.Identifier | 3 - src/components/Ausweis/Ausweisart.svelte | 6 +- src/components/Ausweis/GebaeudeDaten.svelte | 2 +- ...BAG-widget.svelte => cardBAGwidget.svelte} | 2 +- ...d-BA-widget.svelte => cardBAwidget.svelte} | 2 +- ...VAG-widget.svelte => cardVAGwidget.svelte} | 2 +- ...d-VA-widget.svelte => cardVAwidget.svelte} | 2 +- ...-saeule.svelte => produktVergleich.svelte} | 0 src/components/design/header/Header.astro | 4 +- .../headerLogin.svelte} | 0 .../design/sidebars/cards/card-review.svelte | 0 ...-BA-G-promo.svelte => cardBAGpromo.svelte} | 5 +- ...ard-BA-promo.svelte => cardBApromo.svelte} | 4 +- ...card-contact.svelte => cardContact.svelte} | 2 +- .../{card-login_1.svelte => cardLogin.svelte} | 5 +- ...avigation.svelte => cardNavigation.svelte} | 8 +- ...rice-info.svelte => cardPriceiInfo.svelte} | 13 +-- .../design/sidebars/cards/cardReview.svelte | 0 ...-VA-G-promo.svelte => cardVAGpromo.svelte} | 4 +- ...ard-VA-promo.svelte => cardVApromo.svelte} | 4 +- .../design/sidebars/cards/navcard.astro | 96 ------------------- .../design/sidebars/left/SidebarLeft.astro | 9 +- .../design/sidebars/right/SidebarRight.astro | 28 +++--- .../sidebars/right/SidebarRight_1.astro | 14 +-- src/components/labels/BereichLabel.svelte | 29 +++++- .../welcherAusweisWidget.svelte} | 16 ++-- .../VerbrauchsausweisWohnenModule.svelte | 12 ++- src/pages/index.astro | 4 +- src/pages/welcher-energieausweis.mdx | 4 +- src/style/formular.css | 12 ++- src/style/global.css | 11 ++- tsconfig.json | 3 +- 40 files changed, 122 insertions(+), 208 deletions(-) delete mode 100644 public/fonts/Antique-Olive-Std-Compact_3864.ttfZone.Identifier delete mode 100644 public/fonts/HeronSans-Light.woff2Zone.Identifier delete mode 100644 public/fonts/HeronSans-Regular.eotZone.Identifier delete mode 100644 public/fonts/HeronSans-Regular.ttfZone.Identifier delete mode 100644 public/fonts/HeronSans-Regular.woff2Zone.Identifier delete mode 100644 public/fonts/HeronSans-Regular.woffZone.Identifier delete mode 100644 public/fonts/HeronSansCond-SemiBold.woff2Zone.Identifier rename src/components/design/content/{card-BAG-widget.svelte => cardBAGwidget.svelte} (97%) rename src/components/design/content/{card-BA-widget.svelte => cardBAwidget.svelte} (97%) rename src/components/design/content/{card-VAG-widget.svelte => cardVAGwidget.svelte} (97%) rename src/components/design/content/{card-VA-widget.svelte => cardVAwidget.svelte} (97%) rename src/components/design/content/{banner-saeule.svelte => produktVergleich.svelte} (100%) rename src/components/design/{sidebars/cards/card-login.svelte => header/headerLogin.svelte} (100%) delete mode 100644 src/components/design/sidebars/cards/card-review.svelte rename src/components/design/sidebars/cards/{card-BA-G-promo.svelte => cardBAGpromo.svelte} (89%) rename src/components/design/sidebars/cards/{card-BA-promo.svelte => cardBApromo.svelte} (91%) rename src/components/design/sidebars/cards/{card-contact.svelte => cardContact.svelte} (88%) rename src/components/design/sidebars/cards/{card-login_1.svelte => cardLogin.svelte} (95%) rename src/components/design/sidebars/cards/{card-navigation.svelte => cardNavigation.svelte} (95%) rename src/components/design/sidebars/cards/{card-price-info.svelte => cardPriceiInfo.svelte} (86%) rename public/fonts/Antique Olive Std Compact.woff2Zone.Identifier => src/components/design/sidebars/cards/cardReview.svelte (100%) rename src/components/design/sidebars/cards/{card-VA-G-promo.svelte => cardVAGpromo.svelte} (91%) rename src/components/design/sidebars/cards/{card-VA-promo.svelte => cardVApromo.svelte} (91%) delete mode 100644 src/components/design/sidebars/cards/navcard.astro rename src/components/{Widget.svelte => widgets/welcherAusweisWidget.svelte} (94%) diff --git a/.gitignore b/.gitignore index 5271c4c5..5a26c926 100644 --- a/.gitignore +++ b/.gitignore @@ -26,3 +26,7 @@ bun.lockb # macOS-specific files .DS_Store + +public/fonts/ + +*.Identifier diff --git a/Makefile b/Makefile index a6393fe3..82b60cbe 100644 --- a/Makefile +++ b/Makefile @@ -1,7 +1,7 @@ .PHONY: dev database api online-energieausweis all prod bun-install-database bun-install-api online-energieausweis: - bun run dev + bun run dev --host dev: online-energieausweis api database diff --git a/public/fonts/Antique-Olive-Std-Compact_3864.ttfZone.Identifier b/public/fonts/Antique-Olive-Std-Compact_3864.ttfZone.Identifier deleted file mode 100644 index 23631344..00000000 --- a/public/fonts/Antique-Olive-Std-Compact_3864.ttfZone.Identifier +++ /dev/null @@ -1,3 +0,0 @@ -[ZoneTransfer] -ZoneId=3 -ReferrerUrl=C:\Users\all\Downloads\antique-olive-std.zip diff --git a/public/fonts/HeronSans-Light.woff2Zone.Identifier b/public/fonts/HeronSans-Light.woff2Zone.Identifier deleted file mode 100644 index ceb1d4ac..00000000 --- a/public/fonts/HeronSans-Light.woff2Zone.Identifier +++ /dev/null @@ -1,3 +0,0 @@ -[ZoneTransfer] -ZoneId=3 -ReferrerUrl=C:\Users\all\Downloads\font (1).zip diff --git a/public/fonts/HeronSans-Regular.eotZone.Identifier b/public/fonts/HeronSans-Regular.eotZone.Identifier deleted file mode 100644 index ceb1d4ac..00000000 --- a/public/fonts/HeronSans-Regular.eotZone.Identifier +++ /dev/null @@ -1,3 +0,0 @@ -[ZoneTransfer] -ZoneId=3 -ReferrerUrl=C:\Users\all\Downloads\font (1).zip diff --git a/public/fonts/HeronSans-Regular.ttfZone.Identifier b/public/fonts/HeronSans-Regular.ttfZone.Identifier deleted file mode 100644 index ceb1d4ac..00000000 --- a/public/fonts/HeronSans-Regular.ttfZone.Identifier +++ /dev/null @@ -1,3 +0,0 @@ -[ZoneTransfer] -ZoneId=3 -ReferrerUrl=C:\Users\all\Downloads\font (1).zip diff --git a/public/fonts/HeronSans-Regular.woff2Zone.Identifier b/public/fonts/HeronSans-Regular.woff2Zone.Identifier deleted file mode 100644 index ceb1d4ac..00000000 --- a/public/fonts/HeronSans-Regular.woff2Zone.Identifier +++ /dev/null @@ -1,3 +0,0 @@ -[ZoneTransfer] -ZoneId=3 -ReferrerUrl=C:\Users\all\Downloads\font (1).zip diff --git a/public/fonts/HeronSans-Regular.woffZone.Identifier b/public/fonts/HeronSans-Regular.woffZone.Identifier deleted file mode 100644 index ceb1d4ac..00000000 --- a/public/fonts/HeronSans-Regular.woffZone.Identifier +++ /dev/null @@ -1,3 +0,0 @@ -[ZoneTransfer] -ZoneId=3 -ReferrerUrl=C:\Users\all\Downloads\font (1).zip diff --git a/public/fonts/HeronSansCond-SemiBold.woff2Zone.Identifier b/public/fonts/HeronSansCond-SemiBold.woff2Zone.Identifier deleted file mode 100644 index ceb1d4ac..00000000 --- a/public/fonts/HeronSansCond-SemiBold.woff2Zone.Identifier +++ /dev/null @@ -1,3 +0,0 @@ -[ZoneTransfer] -ZoneId=3 -ReferrerUrl=C:\Users\all\Downloads\font (1).zip diff --git a/src/components/Ausweis/Ausweisart.svelte b/src/components/Ausweis/Ausweisart.svelte index fe7ef99a..dd6ac3ed 100644 --- a/src/components/Ausweis/Ausweisart.svelte +++ b/src/components/Ausweis/Ausweisart.svelte @@ -1,7 +1,5 @@ -
-
+

Bedarfsausweis Gewerbe

diff --git a/src/components/design/content/card-BA-widget.svelte b/src/components/design/content/cardBAwidget.svelte similarity index 97% rename from src/components/design/content/card-BA-widget.svelte rename to src/components/design/content/cardBAwidget.svelte index 3980145b..ad8431f3 100644 --- a/src/components/design/content/card-BA-widget.svelte +++ b/src/components/design/content/cardBAwidget.svelte @@ -2,7 +2,7 @@ import { PRICES } from "#lib/constants"; -
+

Bedarfssausweis Wohngebäude

diff --git a/src/components/design/content/card-VAG-widget.svelte b/src/components/design/content/cardVAGwidget.svelte similarity index 97% rename from src/components/design/content/card-VAG-widget.svelte rename to src/components/design/content/cardVAGwidget.svelte index abd7a744..7c57820c 100644 --- a/src/components/design/content/card-VAG-widget.svelte +++ b/src/components/design/content/cardVAGwidget.svelte @@ -2,7 +2,7 @@ import { PRICES } from "#lib/constants"; -
+

Verbrauchsausweis Gewerbe

diff --git a/src/components/design/content/card-VA-widget.svelte b/src/components/design/content/cardVAwidget.svelte similarity index 97% rename from src/components/design/content/card-VA-widget.svelte rename to src/components/design/content/cardVAwidget.svelte index 0baabee1..a47e9f56 100644 --- a/src/components/design/content/card-VA-widget.svelte +++ b/src/components/design/content/cardVAwidget.svelte @@ -2,7 +2,7 @@ import { PRICES } from "#lib/constants"; -
+

Verbrauchsausweis Wohngebäude

diff --git a/src/components/design/content/banner-saeule.svelte b/src/components/design/content/produktVergleich.svelte similarity index 100% rename from src/components/design/content/banner-saeule.svelte rename to src/components/design/content/produktVergleich.svelte diff --git a/src/components/design/header/Header.astro b/src/components/design/header/Header.astro index c8bdb710..55ce74fa 100644 --- a/src/components/design/header/Header.astro +++ b/src/components/design/header/Header.astro @@ -1,5 +1,5 @@ --- -import Login from "#sidebarCards/card-login.svelte"; +import HeaderLogin from "#header/headerLogin.svelte"; ---
@@ -56,7 +56,7 @@ lg:px-0 lg:gap-x-4">
- +
diff --git a/src/components/design/sidebars/cards/card-login.svelte b/src/components/design/header/headerLogin.svelte similarity index 100% rename from src/components/design/sidebars/cards/card-login.svelte rename to src/components/design/header/headerLogin.svelte diff --git a/src/components/design/sidebars/cards/card-review.svelte b/src/components/design/sidebars/cards/card-review.svelte deleted file mode 100644 index e69de29b..00000000 diff --git a/src/components/design/sidebars/cards/card-BA-G-promo.svelte b/src/components/design/sidebars/cards/cardBAGpromo.svelte similarity index 89% rename from src/components/design/sidebars/cards/card-BA-G-promo.svelte rename to src/components/design/sidebars/cards/cardBAGpromo.svelte index be852fcf..4d2d5ede 100644 --- a/src/components/design/sidebars/cards/card-BA-G-promo.svelte +++ b/src/components/design/sidebars/cards/cardBAGpromo.svelte @@ -2,9 +2,8 @@ import { PRICES } from "#lib/constants"; -
+
diff --git a/src/components/design/sidebars/cards/card-BA-promo.svelte b/src/components/design/sidebars/cards/cardBApromo.svelte similarity index 91% rename from src/components/design/sidebars/cards/card-BA-promo.svelte rename to src/components/design/sidebars/cards/cardBApromo.svelte index 7a39700e..d94da9c0 100644 --- a/src/components/design/sidebars/cards/card-BA-promo.svelte +++ b/src/components/design/sidebars/cards/cardBApromo.svelte @@ -2,8 +2,8 @@ import { PRICES } from "#lib/constants"; -
+
diff --git a/src/components/design/sidebars/cards/card-contact.svelte b/src/components/design/sidebars/cards/cardContact.svelte similarity index 88% rename from src/components/design/sidebars/cards/card-contact.svelte rename to src/components/design/sidebars/cards/cardContact.svelte index 5a78ab3a..03a920e4 100644 --- a/src/components/design/sidebars/cards/card-contact.svelte +++ b/src/components/design/sidebars/cards/cardContact.svelte @@ -1,4 +1,4 @@ -
+
diff --git a/src/components/design/sidebars/cards/card-login_1.svelte b/src/components/design/sidebars/cards/cardLogin.svelte similarity index 95% rename from src/components/design/sidebars/cards/card-login_1.svelte rename to src/components/design/sidebars/cards/cardLogin.svelte index a46e0040..22d13e27 100644 --- a/src/components/design/sidebars/cards/card-login_1.svelte +++ b/src/components/design/sidebars/cards/cardLogin.svelte @@ -23,9 +23,8 @@