From 54bf9730ba1ebc809c58c26163edb171425ccc08 Mon Sep 17 00:00:00 2001 From: Fx64b <90456762+Fx64b@users.noreply.github.com> Date: Wed, 19 Nov 2025 14:31:28 +0100 Subject: [PATCH] feat: update project assets and components with new images and improve image handling --- package-lock.json | 3 +- {public => src/assets}/images/Background.png | Bin {public => src/assets}/images/Logo.png | Bin {public => src/assets}/images/MonthlyHit.png | Bin {public => src/assets}/images/Welcome.png | Bin .../images/events/event_advents-kalender.jpeg | Bin .../assets}/images/events/event_ferien.jpeg | Bin .../assets}/images/events/event_karaoke.jpg | Bin .../images/events/event_neujahrs-apero.jpeg | Bin .../assets}/images/events/event_pub-quiz.jpg | Bin .../images/events/event_schlager-karaoke.jpeg | Bin .../assets}/images/events/old/Event2.png | Bin .../assets}/images/events/old/Event3.png | Bin .../assets}/images/events/old/Event4.png | Bin .../assets}/images/gallery/Gallery1.png | Bin .../assets}/images/gallery/Gallery2.png | Bin .../assets}/images/gallery/Gallery3.png | Bin .../assets}/images/gallery/Gallery4.png | Bin .../assets}/images/gallery/Gallery5.png | Bin .../assets}/images/gallery/Gallery6.png | Bin .../assets}/images/gallery/Gallery7.png | Bin .../assets}/images/gallery/Gallery8.png | Bin .../assets}/images/gallery/Gallery9.png | Bin .../assets}/images/whiskey/Whiskey1.png | Bin .../assets}/images/whiskey/Whiskey2.png | Bin .../assets}/images/whiskey/Whiskey3.png | Bin src/components/Drinks.astro | 13 +++-- src/components/EventsGrid.astro | 3 +- src/components/Header.astro | 14 ++--- src/components/HoverCard.astro | 11 +++- src/components/ImageCarousel.astro | 10 ++-- src/components/Welcome.astro | 4 +- src/pages/index.astro | 49 ++++++++++++------ 33 files changed, 73 insertions(+), 34 deletions(-) rename {public => src/assets}/images/Background.png (100%) rename {public => src/assets}/images/Logo.png (100%) rename {public => src/assets}/images/MonthlyHit.png (100%) rename {public => src/assets}/images/Welcome.png (100%) rename {public => src/assets}/images/events/event_advents-kalender.jpeg (100%) rename {public => src/assets}/images/events/event_ferien.jpeg (100%) rename {public => src/assets}/images/events/event_karaoke.jpg (100%) rename {public => src/assets}/images/events/event_neujahrs-apero.jpeg (100%) rename {public => src/assets}/images/events/event_pub-quiz.jpg (100%) rename {public => src/assets}/images/events/event_schlager-karaoke.jpeg (100%) rename {public => src/assets}/images/events/old/Event2.png (100%) rename {public => src/assets}/images/events/old/Event3.png (100%) rename {public => src/assets}/images/events/old/Event4.png (100%) rename {public => src/assets}/images/gallery/Gallery1.png (100%) rename {public => src/assets}/images/gallery/Gallery2.png (100%) rename {public => src/assets}/images/gallery/Gallery3.png (100%) rename {public => src/assets}/images/gallery/Gallery4.png (100%) rename {public => src/assets}/images/gallery/Gallery5.png (100%) rename {public => src/assets}/images/gallery/Gallery6.png (100%) rename {public => src/assets}/images/gallery/Gallery7.png (100%) rename {public => src/assets}/images/gallery/Gallery8.png (100%) rename {public => src/assets}/images/gallery/Gallery9.png (100%) rename {public => src/assets}/images/whiskey/Whiskey1.png (100%) rename {public => src/assets}/images/whiskey/Whiskey2.png (100%) rename {public => src/assets}/images/whiskey/Whiskey3.png (100%) diff --git a/package-lock.json b/package-lock.json index 8ffe5f8..e1ae000 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,10 +1,11 @@ { - "name": "Gallus_Pub", + "name": "Gallus Pub Site", "version": "0.0.1", "lockfileVersion": 3, "requires": true, "packages": { "": { + "name": "Gallus Pub Site", "version": "0.0.1", "dependencies": { "astro": "^5.12.0" diff --git a/public/images/Background.png b/src/assets/images/Background.png similarity index 100% rename from public/images/Background.png rename to src/assets/images/Background.png diff --git a/public/images/Logo.png b/src/assets/images/Logo.png similarity index 100% rename from public/images/Logo.png rename to src/assets/images/Logo.png diff --git a/public/images/MonthlyHit.png b/src/assets/images/MonthlyHit.png similarity index 100% rename from public/images/MonthlyHit.png rename to src/assets/images/MonthlyHit.png diff --git a/public/images/Welcome.png b/src/assets/images/Welcome.png similarity index 100% rename from public/images/Welcome.png rename to src/assets/images/Welcome.png diff --git a/public/images/events/event_advents-kalender.jpeg b/src/assets/images/events/event_advents-kalender.jpeg similarity index 100% rename from public/images/events/event_advents-kalender.jpeg rename to src/assets/images/events/event_advents-kalender.jpeg diff --git a/public/images/events/event_ferien.jpeg b/src/assets/images/events/event_ferien.jpeg similarity index 100% rename from public/images/events/event_ferien.jpeg rename to src/assets/images/events/event_ferien.jpeg diff --git a/public/images/events/event_karaoke.jpg b/src/assets/images/events/event_karaoke.jpg similarity index 100% rename from public/images/events/event_karaoke.jpg rename to src/assets/images/events/event_karaoke.jpg diff --git a/public/images/events/event_neujahrs-apero.jpeg b/src/assets/images/events/event_neujahrs-apero.jpeg similarity index 100% rename from public/images/events/event_neujahrs-apero.jpeg rename to src/assets/images/events/event_neujahrs-apero.jpeg diff --git a/public/images/events/event_pub-quiz.jpg b/src/assets/images/events/event_pub-quiz.jpg similarity index 100% rename from public/images/events/event_pub-quiz.jpg rename to src/assets/images/events/event_pub-quiz.jpg diff --git a/public/images/events/event_schlager-karaoke.jpeg b/src/assets/images/events/event_schlager-karaoke.jpeg similarity index 100% rename from public/images/events/event_schlager-karaoke.jpeg rename to src/assets/images/events/event_schlager-karaoke.jpeg diff --git a/public/images/events/old/Event2.png b/src/assets/images/events/old/Event2.png similarity index 100% rename from public/images/events/old/Event2.png rename to src/assets/images/events/old/Event2.png diff --git a/public/images/events/old/Event3.png b/src/assets/images/events/old/Event3.png similarity index 100% rename from public/images/events/old/Event3.png rename to src/assets/images/events/old/Event3.png diff --git a/public/images/events/old/Event4.png b/src/assets/images/events/old/Event4.png similarity index 100% rename from public/images/events/old/Event4.png rename to src/assets/images/events/old/Event4.png diff --git a/public/images/gallery/Gallery1.png b/src/assets/images/gallery/Gallery1.png similarity index 100% rename from public/images/gallery/Gallery1.png rename to src/assets/images/gallery/Gallery1.png diff --git a/public/images/gallery/Gallery2.png b/src/assets/images/gallery/Gallery2.png similarity index 100% rename from public/images/gallery/Gallery2.png rename to src/assets/images/gallery/Gallery2.png diff --git a/public/images/gallery/Gallery3.png b/src/assets/images/gallery/Gallery3.png similarity index 100% rename from public/images/gallery/Gallery3.png rename to src/assets/images/gallery/Gallery3.png diff --git a/public/images/gallery/Gallery4.png b/src/assets/images/gallery/Gallery4.png similarity index 100% rename from public/images/gallery/Gallery4.png rename to src/assets/images/gallery/Gallery4.png diff --git a/public/images/gallery/Gallery5.png b/src/assets/images/gallery/Gallery5.png similarity index 100% rename from public/images/gallery/Gallery5.png rename to src/assets/images/gallery/Gallery5.png diff --git a/public/images/gallery/Gallery6.png b/src/assets/images/gallery/Gallery6.png similarity index 100% rename from public/images/gallery/Gallery6.png rename to src/assets/images/gallery/Gallery6.png diff --git a/public/images/gallery/Gallery7.png b/src/assets/images/gallery/Gallery7.png similarity index 100% rename from public/images/gallery/Gallery7.png rename to src/assets/images/gallery/Gallery7.png diff --git a/public/images/gallery/Gallery8.png b/src/assets/images/gallery/Gallery8.png similarity index 100% rename from public/images/gallery/Gallery8.png rename to src/assets/images/gallery/Gallery8.png diff --git a/public/images/gallery/Gallery9.png b/src/assets/images/gallery/Gallery9.png similarity index 100% rename from public/images/gallery/Gallery9.png rename to src/assets/images/gallery/Gallery9.png diff --git a/public/images/whiskey/Whiskey1.png b/src/assets/images/whiskey/Whiskey1.png similarity index 100% rename from public/images/whiskey/Whiskey1.png rename to src/assets/images/whiskey/Whiskey1.png diff --git a/public/images/whiskey/Whiskey2.png b/src/assets/images/whiskey/Whiskey2.png similarity index 100% rename from public/images/whiskey/Whiskey2.png rename to src/assets/images/whiskey/Whiskey2.png diff --git a/public/images/whiskey/Whiskey3.png b/src/assets/images/whiskey/Whiskey3.png similarity index 100% rename from public/images/whiskey/Whiskey3.png rename to src/assets/images/whiskey/Whiskey3.png diff --git a/src/components/Drinks.astro b/src/components/Drinks.astro index ab0834c..dd51eb9 100644 --- a/src/components/Drinks.astro +++ b/src/components/Drinks.astro @@ -1,5 +1,10 @@ --- +import { Image } from "astro:assets"; import "../styles/components/Drinks.css" +import MonthlyHit from "../assets/images/MonthlyHit.png"; +import Whiskey1 from "../assets/images/whiskey/Whiskey1.png"; +import Whiskey2 from "../assets/images/whiskey/Whiskey2.png"; +import Whiskey3 from "../assets/images/whiskey/Whiskey3.png"; const { id } = Astro.props; --- @@ -17,7 +22,7 @@ const { id } = Astro.props;
- Monats Hit + Monats Hit
Mate Vodka
@@ -29,15 +34,15 @@ const { id } = Astro.props;
- Whiskey 1 + Whiskey 1
- Whiskey 2 + Whiskey 2
- Whiskey 3 + Whiskey 3
diff --git a/src/components/EventsGrid.astro b/src/components/EventsGrid.astro index 326c0bd..5184eed 100644 --- a/src/components/EventsGrid.astro +++ b/src/components/EventsGrid.astro @@ -2,9 +2,10 @@ // src/components/EventsGrid.astro import HoverCard from "./HoverCard.astro"; +import type { ImageMetadata } from "astro"; interface Event { - image: string; + image: ImageMetadata; title: string; date: string; description: string; diff --git a/src/components/Header.astro b/src/components/Header.astro index 382c777..50882fa 100644 --- a/src/components/Header.astro +++ b/src/components/Header.astro @@ -1,5 +1,7 @@ --- // src/components/Header.astro +import { Image } from "astro:assets"; +import Logo from "../assets/images/Logo.png"; const { url } = Astro; import "../styles/components/Header.css"; --- @@ -9,7 +11,7 @@ import "../styles/components/Header.css";
- +
@@ -31,7 +33,7 @@ import "../styles/components/Header.css";
- +
@@ -65,16 +67,16 @@ import "../styles/components/Header.css"; const mobileMenuLinks = document.querySelectorAll('.mobile-menu a'); // Toggle menu when burger icon is clicked - burgerIcon.addEventListener('click', () => { + burgerIcon?.addEventListener('click', () => { burgerIcon.classList.toggle('active'); - mobileMenu.classList.toggle('active'); + mobileMenu?.classList.toggle('active'); }); // Close menu when a navigation link is clicked mobileMenuLinks.forEach(link => { link.addEventListener('click', () => { - burgerIcon.classList.remove('active'); - mobileMenu.classList.remove('active'); + burgerIcon?.classList.remove('active'); + mobileMenu?.classList.remove('active'); }); }); }); diff --git a/src/components/HoverCard.astro b/src/components/HoverCard.astro index 8737696..ff65434 100644 --- a/src/components/HoverCard.astro +++ b/src/components/HoverCard.astro @@ -1,11 +1,18 @@ --- +import { Image } from "astro:assets"; +import type { ImageMetadata } from "astro"; import "../styles/components/HoverCard.css"; -const {title, description, image = "", date} = Astro.props; +const {title, description, image, date} = Astro.props as { + title: string; + description: string; + image: ImageMetadata; + date: string; +}; ---
- {title} + {title}
diff --git a/src/components/ImageCarousel.astro b/src/components/ImageCarousel.astro index e1f994e..60998ce 100644 --- a/src/components/ImageCarousel.astro +++ b/src/components/ImageCarousel.astro @@ -1,13 +1,15 @@ --- // src/components/ImageCarousel.astro +import { Image } from "astro:assets"; +import type { ImageMetadata } from "astro"; import "../styles/components/ImageCarousel.css"; -interface Image { - src: string; +interface ImageData { + src: ImageMetadata; alt: string; } -const { images = [], id } = Astro.props as { images: Image[], id?: string }; +const { images = [], id } = Astro.props as { images: ImageData[], id?: string }; --- diff --git a/src/pages/index.astro b/src/pages/index.astro index 89227dc..0bc585b 100644 --- a/src/pages/index.astro +++ b/src/pages/index.astro @@ -6,9 +6,28 @@ import EventsGrid from "../components/EventsGrid.astro"; import Drinks from "../components/Drinks.astro"; import ImageCarousel from "../components/ImageCarousel.astro"; +// Import event images +import eventKaraoke from "../assets/images/events/event_karaoke.jpg"; +import eventPubQuiz from "../assets/images/events/event_pub-quiz.jpg"; +import eventSchlager from "../assets/images/events/event_schlager-karaoke.jpeg"; +import eventAdvent from "../assets/images/events/event_advents-kalender.jpeg"; +import eventFerien from "../assets/images/events/event_ferien.jpeg"; +import eventNeujahr from "../assets/images/events/event_neujahrs-apero.jpeg"; + +// Import gallery images +import Gallery1 from "../assets/images/gallery/Gallery1.png"; +import Gallery2 from "../assets/images/gallery/Gallery2.png"; +import Gallery3 from "../assets/images/gallery/Gallery3.png"; +import Gallery4 from "../assets/images/gallery/Gallery4.png"; +import Gallery5 from "../assets/images/gallery/Gallery5.png"; +import Gallery6 from "../assets/images/gallery/Gallery6.png"; +import Gallery7 from "../assets/images/gallery/Gallery7.png"; +import Gallery8 from "../assets/images/gallery/Gallery8.png"; +import Gallery9 from "../assets/images/gallery/Gallery9.png"; + const events = [ { - image: "/images/events/event_karaoke.jpg", + image: eventKaraoke, title: "Karaoke", date: "Mittwoch - Samstag", description: ` @@ -18,7 +37,7 @@ const events = [ `, }, { - image: "/images/events/event_pub-quiz.jpg", + image: eventPubQuiz, title: "Pub Quiz", date: "Jeden Freitag", description: ` @@ -29,7 +48,7 @@ const events = [ `, }, { - image: "/images/events/event_schlager-karaoke.jpeg", + image: eventSchlager, title: "Schlager Hüttenzauber Karaoke", date: "27. November - 19:00 Uhr", description: ` @@ -37,7 +56,7 @@ const events = [ `, }, { - image: "/images/events/event_advents-kalender.jpeg", + image: eventAdvent, title: "Adventskalender", date: "03. Dezember - 20. Dezember 2025", description: ` @@ -45,7 +64,7 @@ const events = [ `, }, { - image: "/images/events/event_ferien.jpeg", + image: eventFerien, title: "Weihnachtsferien", date: "21. Dezember 2025 - 01. Januar 2026", description: ` @@ -53,7 +72,7 @@ const events = [ `, }, { - image: "/images/events/event_neujahrs-apero.jpeg", + image: eventNeujahr, title: "Neujahrs-Apero", date: "02. Januar 2026 - 18:00-20:00 Uhr", description: ` @@ -64,15 +83,15 @@ const events = [ ]; const images = [ - { src: "/images/gallery/Gallery7.png", alt: "Siebtes Bild" }, - { src: "/images/gallery/Gallery8.png", alt: "Achtes Bild" }, - { src: "/images/gallery/Gallery9.png", alt: "Neuntes Bild" }, - { src: "/images/gallery/Gallery6.png", alt: "Sechstes Bild" }, - { src: "/images/gallery/Gallery1.png", alt: "Erstes Bild" }, - { src: "/images/gallery/Gallery2.png", alt: "Zweites Bild" }, - { src: "/images/gallery/Gallery3.png", alt: "Drittes Bild" }, - { src: "/images/gallery/Gallery4.png", alt: "Viertes Bild" }, - { src: "/images/gallery/Gallery5.png", alt: "Fünftes Bild" }, + { src: Gallery7, alt: "Siebtes Bild" }, + { src: Gallery8, alt: "Achtes Bild" }, + { src: Gallery9, alt: "Neuntes Bild" }, + { src: Gallery6, alt: "Sechstes Bild" }, + { src: Gallery1, alt: "Erstes Bild" }, + { src: Gallery2, alt: "Zweites Bild" }, + { src: Gallery3, alt: "Drittes Bild" }, + { src: Gallery4, alt: "Viertes Bild" }, + { src: Gallery5, alt: "Fünftes Bild" }, ]; ---