diff --git a/package-lock.json b/package-lock.json index eb42fa6..374965d 100644 --- a/package-lock.json +++ b/package-lock.json @@ -16,7 +16,7 @@ "astro": "^4.15.1", "astro-embed": "^0.7.2", "astro-icon": "^1.1.1", - "axios": "^1.7.9", + "axios": "^1.8.2", "dotenv": "^16.4.7", "gsap": "^3.12.5", "i18next": "^24.2.0", @@ -3930,9 +3930,9 @@ } }, "node_modules/axios": { - "version": "1.7.9", - "resolved": "https://registry.npmjs.org/axios/-/axios-1.7.9.tgz", - "integrity": "sha512-LhLcE7Hbiryz8oMDdDptSrWowmB4Bl6RCt6sIJKpRB4XtVf0iEgewX3au/pJqm+Py1kCASkb/FFKjxQaLtxJvw==", + "version": "1.8.2", + "resolved": "https://repo.huaweicloud.com/repository/npm/axios/-/axios-1.8.2.tgz", + "integrity": "sha512-ls4GYBm5aig9vWx8AWDSGLpnpDQRtWAfrjU+EuytuODrFBkqesN2RkOQCBzrA1RQNHw1SmRMSDDDSwzNAYQ6Rg==", "license": "MIT", "dependencies": { "follow-redirects": "^1.15.6", diff --git a/package.json b/package.json index 979bb27..d8b1ad2 100644 --- a/package.json +++ b/package.json @@ -31,7 +31,7 @@ "astro": "^4.15.1", "astro-embed": "^0.7.2", "astro-icon": "^1.1.1", - "axios": "^1.7.9", + "axios": "^1.8.2", "dotenv": "^16.4.7", "gsap": "^3.12.5", "i18next": "^24.2.0", diff --git a/src/assets/images/portraits/portrait-image-default.jpg b/src/assets/images/portraits/portrait-image-default.jpg new file mode 100644 index 0000000..111ad62 Binary files /dev/null and b/src/assets/images/portraits/portrait-image-default.jpg differ diff --git a/src/assets/images/portraits/portrait-img-01-02.jpg b/src/assets/images/portraits/portrait-img-01-02.jpg new file mode 100644 index 0000000..c92c823 Binary files /dev/null and b/src/assets/images/portraits/portrait-img-01-02.jpg differ diff --git a/src/assets/images/portraits/portrait-img-01-03.jpg b/src/assets/images/portraits/portrait-img-01-03.jpg new file mode 100644 index 0000000..a564083 Binary files /dev/null and b/src/assets/images/portraits/portrait-img-01-03.jpg differ diff --git a/src/assets/images/portraits/portrait-img-02-02.jpg b/src/assets/images/portraits/portrait-img-02-02.jpg new file mode 100644 index 0000000..537afa9 Binary files /dev/null and b/src/assets/images/portraits/portrait-img-02-02.jpg differ diff --git a/src/assets/images/portraits/portrait-img-02-03.jpg b/src/assets/images/portraits/portrait-img-02-03.jpg new file mode 100644 index 0000000..de0fe36 Binary files /dev/null and b/src/assets/images/portraits/portrait-img-02-03.jpg differ diff --git a/src/assets/images/portraits/portrait-img-03-02.jpg b/src/assets/images/portraits/portrait-img-03-02.jpg new file mode 100644 index 0000000..54e9360 Binary files /dev/null and b/src/assets/images/portraits/portrait-img-03-02.jpg differ diff --git a/src/assets/images/portraits/portrait-img-03-03.jpg b/src/assets/images/portraits/portrait-img-03-03.jpg new file mode 100644 index 0000000..f96ffa1 Binary files /dev/null and b/src/assets/images/portraits/portrait-img-03-03.jpg differ diff --git a/src/assets/images/portraits/portrait-img-04-02.jpg b/src/assets/images/portraits/portrait-img-04-02.jpg new file mode 100644 index 0000000..9eb8aa8 Binary files /dev/null and b/src/assets/images/portraits/portrait-img-04-02.jpg differ diff --git a/src/assets/images/portraits/portrait-img-04-03.jpg b/src/assets/images/portraits/portrait-img-04-03.jpg new file mode 100644 index 0000000..99c4e2b Binary files /dev/null and b/src/assets/images/portraits/portrait-img-04-03.jpg differ diff --git a/src/assets/images/portraits/portrait-img-04.jpg b/src/assets/images/portraits/portrait-img-04.jpg index b694238..1737df1 100644 Binary files a/src/assets/images/portraits/portrait-img-04.jpg and b/src/assets/images/portraits/portrait-img-04.jpg differ diff --git a/src/assets/images/portraits/portrait-img-05-02.jpg b/src/assets/images/portraits/portrait-img-05-02.jpg new file mode 100644 index 0000000..10f3a8d Binary files /dev/null and b/src/assets/images/portraits/portrait-img-05-02.jpg differ diff --git a/src/assets/images/portraits/portrait-img-05-03.jpg b/src/assets/images/portraits/portrait-img-05-03.jpg new file mode 100644 index 0000000..d755b8d Binary files /dev/null and b/src/assets/images/portraits/portrait-img-05-03.jpg differ diff --git a/src/assets/images/portraits/portrait-img-06-02.jpg b/src/assets/images/portraits/portrait-img-06-02.jpg new file mode 100644 index 0000000..8e3a87d Binary files /dev/null and b/src/assets/images/portraits/portrait-img-06-02.jpg differ diff --git a/src/assets/images/portraits/portrait-img-06-03.jpg b/src/assets/images/portraits/portrait-img-06-03.jpg new file mode 100644 index 0000000..3e56e15 Binary files /dev/null and b/src/assets/images/portraits/portrait-img-06-03.jpg differ diff --git a/src/assets/images/portraits/portrait-img-07-02.jpg b/src/assets/images/portraits/portrait-img-07-02.jpg new file mode 100644 index 0000000..21224d7 Binary files /dev/null and b/src/assets/images/portraits/portrait-img-07-02.jpg differ diff --git a/src/assets/images/portraits/portrait-img-07-03.jpg b/src/assets/images/portraits/portrait-img-07-03.jpg new file mode 100644 index 0000000..cbbbc34 Binary files /dev/null and b/src/assets/images/portraits/portrait-img-07-03.jpg differ diff --git a/src/components/blog/Headline.astro b/src/components/blog/Headline.astro index ad9c3ca..ebce275 100644 --- a/src/components/blog/Headline.astro +++ b/src/components/blog/Headline.astro @@ -3,6 +3,7 @@ const { title = await Astro.slots.render('default'), subtitle = await Astro.slot ---
+

{ subtitle && ( diff --git a/src/components/blog/SinglePost.astro b/src/components/blog/SinglePost.astro index e2cb710..36c7c2e 100644 --- a/src/components/blog/SinglePost.astro +++ b/src/components/blog/SinglePost.astro @@ -55,43 +55,45 @@ const { post, url } = Astro.props;

-

- {post.title} +

+

+ {post.title} +

+

+ {post.excerpt} +

+ + { + post.image ? ( + {post?.excerpt + ) : ( +
+
+
+ ) + } -

- {post.excerpt} -

- - { - post.image ? ( - {post?.excerpt - ) : ( -
-
-
- ) - } + +
+
+ + +
-
- -
-
- - -
diff --git a/src/components/widgets/CafeFlutterSection.astro b/src/components/widgets/CafeFlutterSection.astro index 2ab7572..c6c3358 100644 --- a/src/components/widgets/CafeFlutterSection.astro +++ b/src/components/widgets/CafeFlutterSection.astro @@ -1,10 +1,10 @@ --- import type { CafeFlutterItem, Widget } from '~/types'; import WidgetWrapper from '../ui/WidgetWrapper.astro'; -import { cafeFlutterEvents } from '~/data/mockCafeFlutter'; import PastCafeFlutterCard from './PastCafeFlutterCard.astro'; import CafeFlutterCountdown from '~/components/widgets/cafeFlutterCountdown/CafeFlutterCountdown.astro'; import SectionTitle from '../widgets/SectionTitleTwo.astro'; +import { getCollection, getEntry } from 'astro:content'; interface Props extends Widget { upcomingEvent?: CafeFlutterItem; @@ -13,9 +13,88 @@ interface Props extends Widget { const { id, isDark = false, classes = {} } = Astro.props; +const rawCollection = await getCollection('cafeFlutter'); +const cafeFlutterCollection = rawCollection.filter(({ slug }) => slug.startsWith(Astro.currentLocale!)); + +// Convert content collection to CafeFlutterItem model +const contentCollectionEvents: CafeFlutterItem[] = await Promise.all( + cafeFlutterCollection.map(async (item) => { + // Extract event number from ID or use a fallback + const numberMatch = item.id.match(/cafe-flutter-(\d+)/i); + const eventNumber = numberMatch ? parseInt(numberMatch[1], 10) : 0; + + // Create speaker objects from talks + const speakers = await Promise.all( + item.data.talks.map(async (talk) => { + // Handle speaker reference safely + let speakerName = ''; + let speakerImage = 'https://via.placeholder.com/50x50'; // Default placeholder image + + if (talk.speaker) { + const speakerData = await getEntry(talk.speaker); + if (speakerData) { + // Use the name and family from the referenced collection + speakerName = `${speakerData.data.name} ${speakerData.data.family}`; + + // Use the speaker's image if available + if ( + speakerData.data.image && + typeof speakerData.data.image === 'object' && + 'src' in speakerData.data.image + ) { + speakerImage = speakerData.data.image.src; + } + } + } else if (typeof talk.speaker === 'string') { + // If the speaker is a string, use it directly + speakerName = talk.speaker; + } else { + // Default fallback + speakerName = 'Speaker'; + } + + return { + name: speakerName, + title: talk.talkTitle, + image: { + src: speakerImage, + alt: speakerName, + }, + }; + }) + ); + + // Create image object + let imageSrc = ''; + if (typeof item.data.image === 'string') { + imageSrc = item.data.image; + } else if (item.data.image && typeof item.data.image === 'object' && 'src' in item.data.image) { + imageSrc = item.data.image.src; + } + + // Convert to CafeFlutterItem + return { + number: eventNumber, + image: { + src: imageSrc, + alt: item.data.title, + }, + speakers: speakers, + dateTime: new Date(item.data.dateTime), // Ensure it's a Date object + youtubeLink: item.data.youtubeLink, + googleMeetLink: item.data.googleMeetLink, + googleCalendarLink: item.data.calendarLink, + }; + }) +); + +// Use only content collection events now +const allEvents = contentCollectionEvents; + // Filter past events const now = new Date(); -const pastEvents = cafeFlutterEvents + +const pastEvents = allEvents .filter((event) => { const eventDate = new Date(event.dateTime); const eventEndTime = new Date(eventDate.getTime() + 3 * 60 * 60 * 1000); @@ -31,7 +110,7 @@ const getServerTime = async () => { const serverTime = await getServerTime(); // Find an upcoming event -const upcomingEvent = cafeFlutterEvents +const upcomingEvent = allEvents .filter((event) => { const eventDate = new Date(event.dateTime); const serverTimeLocal = new Date(serverTime); diff --git a/src/components/widgets/hero/CurvedAnimation.astro b/src/components/widgets/hero/CurvedAnimation.astro index 5985a64..eede632 100644 --- a/src/components/widgets/hero/CurvedAnimation.astro +++ b/src/components/widgets/hero/CurvedAnimation.astro @@ -34,13 +34,28 @@ * - Icon elements with position-specific classes (e.g., .top-left-icon) * - Portrait containers with specific IDs (e.g., portrait-top-left) */ + import portraitImage1 from '~/assets/images/portraits/portrait-img-01.jpg'; +import portraitImage1_02 from '~/assets/images/portraits/portrait-img-01-02.jpg'; +import portraitImage1_03 from '~/assets/images/portraits/portrait-img-01-03.jpg'; import portraitImage2 from '~/assets/images/portraits/portrait-img-02.jpg'; +import portraitImage2_02 from '~/assets/images/portraits/portrait-img-02-02.jpg'; +import portraitImage2_03 from '~/assets/images/portraits/portrait-img-02-03.jpg'; import portraitImage3 from '~/assets/images/portraits/portrait-img-03.jpg'; +import portraitImage3_02 from '~/assets/images/portraits/portrait-img-03-02.jpg'; +import portraitImage3_03 from '~/assets/images/portraits/portrait-img-03-03.jpg'; import portraitImage4 from '~/assets/images/portraits/portrait-img-04.jpg'; +import portraitImage4_02 from '~/assets/images/portraits/portrait-img-04-02.jpg'; +import portraitImage4_03 from '~/assets/images/portraits/portrait-img-04-03.jpg'; import portraitImage5 from '~/assets/images/portraits/portrait-img-05.jpg'; +import portraitImage5_02 from '~/assets/images/portraits/portrait-img-05-02.jpg'; +import portraitImage5_03 from '~/assets/images/portraits/portrait-img-05-03.jpg'; import portraitImage6 from '~/assets/images/portraits/portrait-img-06.jpg'; +import portraitImage6_02 from '~/assets/images/portraits/portrait-img-06-02.jpg'; +import portraitImage6_03 from '~/assets/images/portraits/portrait-img-06-03.jpg'; import portraitImage7 from '~/assets/images/portraits/portrait-img-07.jpg'; +import portraitImage7_02 from '~/assets/images/portraits/portrait-img-07-02.jpg'; +import portraitImage7_03 from '~/assets/images/portraits/portrait-img-07-03.jpg'; import portraitImage8 from '~/assets/images/portraits/portrait-img-08.jpg'; import portraitImage9 from '~/assets/images/portraits/portrait-img-09.jpg'; import portraitImage10 from '~/assets/images/portraits/portrait-img-10.jpg'; @@ -54,12 +69,26 @@ import portraitImage17 from '~/assets/images/portraits/portrait-img-17.jpg'; const portraitPaths = { portrait1: portraitImage1.src, + portrait1_02: portraitImage1_02.src, + portrait1_03: portraitImage1_03.src, portrait2: portraitImage2.src, + portrait2_02: portraitImage2_02.src, + portrait2_03: portraitImage2_03.src, portrait3: portraitImage3.src, + portrait3_02: portraitImage3_02.src, + portrait3_03: portraitImage3_03.src, portrait4: portraitImage4.src, + portrait4_02: portraitImage4_02.src, + portrait4_03: portraitImage4_03.src, portrait5: portraitImage5.src, + portrait5_02: portraitImage5_02.src, + portrait5_03: portraitImage5_03.src, portrait6: portraitImage6.src, + portrait6_02: portraitImage6_02.src, + portrait6_03: portraitImage6_03.src, portrait7: portraitImage7.src, + portrait7_02: portraitImage7_02.src, + portrait7_03: portraitImage7_03.src, portrait8: portraitImage8.src, portrait9: portraitImage9.src, portrait10: portraitImage10.src, @@ -82,52 +111,56 @@ const portraitPaths = { // Define portrait images mapping const portraitImagePaths = { 0: portraitPaths.portrait1, - 1: portraitPaths.portrait2, - 2: portraitPaths.portrait3, - 3: portraitPaths.portrait4, - 4: portraitPaths.portrait5, - 5: portraitPaths.portrait6, - 6: portraitPaths.portrait7, - 7: portraitPaths.portrait8, - 8: portraitPaths.portrait9, - 9: portraitPaths.portrait10, - 10: portraitPaths.portrait11, - 11: portraitPaths.portrait12, - 12: portraitPaths.portrait13, - 13: portraitPaths.portrait14, - 14: portraitPaths.portrait15, - 15: portraitPaths.portrait16, - 16: portraitPaths.portrait17, + 1: portraitPaths.portrait1_02, + 2: portraitPaths.portrait1_03, + 3: portraitPaths.portrait2, + 4: portraitPaths.portrait2_02, + 5: portraitPaths.portrait2_03, + 6: portraitPaths.portrait3, + 7: portraitPaths.portrait3_02, + 8: portraitPaths.portrait3_03, + 9: portraitPaths.portrait4, + 10: portraitPaths.portrait4_02, + 11: portraitPaths.portrait4_03, + 12: portraitPaths.portrait5, + 13: portraitPaths.portrait5_02, + 14: portraitPaths.portrait5_03, + 15: portraitPaths.portrait6, + 16: portraitPaths.portrait6_02, + 17: portraitPaths.portrait6_03, + 18: portraitPaths.portrait7, + 19: portraitPaths.portrait7_02, + 20: portraitPaths.portrait7_03, }; const imageMappings = { topLeft: { containerId: 'portrait-top-left', - imageIndices: [0, 4, 8, 12, 16], + imageIndices: [3, 4, 5], }, topRight: { containerId: 'portrait-top-right', - imageIndices: [1, 5, 9, 13, 2], + imageIndices: [0, 1, 2], }, middleLeft: { containerId: 'portrait-middle-left', - imageIndices: [2, 6, 10, 14, 15], + imageIndices: [12, 13, 14], }, middleCenter: { containerId: 'portrait-middle-center', - imageIndices: [3, 7, 11, 15, 16], + imageIndices: [9, 10, 11], }, middleRight: { containerId: 'portrait-middle-right', - imageIndices: [4, 8, 12, 16, 0], + imageIndices: [6, 7, 8], }, bottomLeft: { containerId: 'portrait-bottom-left', - imageIndices: [5, 9, 13, 3, 0], + imageIndices: [18, 19, 20], }, bottomRight: { containerId: 'portrait-bottom-right', - imageIndices: [6, 10, 14, 1, 2], + imageIndices: [15, 16, 17], }, }; @@ -541,7 +574,7 @@ const portraitPaths = { curves.forEach((curve, index) => { if (curve.icon && curve.path) { - new CurvedAnimation(curve.icon, curve.path, curve.type, { delay: index * 0.3 }); + new CurvedAnimation(curve.icon, curve.path, curve.type, { delay: index * 0.01 }); } }); } diff --git a/src/components/widgets/hero/Hero.astro b/src/components/widgets/hero/Hero.astro index 42e193e..869bb21 100644 --- a/src/components/widgets/hero/Hero.astro +++ b/src/components/widgets/hero/Hero.astro @@ -25,12 +25,26 @@ import youtubeIcon from '~/assets/images/youtube-icon.jpg'; //portrait images import portraitImage1 from '~/assets/images/portraits/portrait-img-01.jpg'; +import portraitImage1_02 from '~/assets/images/portraits/portrait-img-01-02.jpg'; +import portraitImage1_03 from '~/assets/images/portraits/portrait-img-01-03.jpg'; import portraitImage2 from '~/assets/images/portraits/portrait-img-02.jpg'; +import portraitImage2_02 from '~/assets/images/portraits/portrait-img-02-02.jpg'; +import portraitImage2_03 from '~/assets/images/portraits/portrait-img-02-03.jpg'; import portraitImage3 from '~/assets/images/portraits/portrait-img-03.jpg'; +import portraitImage3_02 from '~/assets/images/portraits/portrait-img-03-02.jpg'; +import portraitImage3_03 from '~/assets/images/portraits/portrait-img-03-03.jpg'; import portraitImage4 from '~/assets/images/portraits/portrait-img-04.jpg'; +import portraitImage4_02 from '~/assets/images/portraits/portrait-img-04-02.jpg'; +import portraitImage4_03 from '~/assets/images/portraits/portrait-img-04-03.jpg'; import portraitImage5 from '~/assets/images/portraits/portrait-img-05.jpg'; +import portraitImage5_02 from '~/assets/images/portraits/portrait-img-05-02.jpg'; +import portraitImage5_03 from '~/assets/images/portraits/portrait-img-05-03.jpg'; import portraitImage6 from '~/assets/images/portraits/portrait-img-06.jpg'; +import portraitImage6_02 from '~/assets/images/portraits/portrait-img-06-02.jpg'; +import portraitImage6_03 from '~/assets/images/portraits/portrait-img-06-03.jpg'; import portraitImage7 from '~/assets/images/portraits/portrait-img-07.jpg'; +import portraitImage7_02 from '~/assets/images/portraits/portrait-img-07-02.jpg'; +import portraitImage7_03 from '~/assets/images/portraits/portrait-img-07-03.jpg'; import portraitImage8 from '~/assets/images/portraits/portrait-img-08.jpg'; import portraitImage9 from '~/assets/images/portraits/portrait-img-09.jpg'; import portraitImage10 from '~/assets/images/portraits/portrait-img-10.jpg'; @@ -41,6 +55,7 @@ import portraitImage14 from '~/assets/images/portraits/portrait-img-14.jpg'; import portraitImage15 from '~/assets/images/portraits/portrait-img-15.jpg'; import portraitImage16 from '~/assets/images/portraits/portrait-img-16.jpg'; import portraitImage17 from '~/assets/images/portraits/portrait-img-17.jpg'; +import portraitImageDefault from '~/assets/images/portraits/portrait-image-default.jpg'; import i18n from '~/utils/i18n'; export interface Props extends Widget { @@ -81,13 +96,28 @@ const telegramMembers = [ ]; const portraitImages = [ + { image: { src: portraitImageDefault, alt: 'portraitImageDefault' } }, { image: { src: portraitImage1, alt: 'portraitImage1' } }, + { image: { src: portraitImage1_02, alt: 'portraitImage1' } }, + { image: { src: portraitImage1_03, alt: 'portraitImage1' } }, { image: { src: portraitImage2, alt: 'portraitImage2' } }, + { image: { src: portraitImage2_02, alt: 'portraitImage2' } }, + { image: { src: portraitImage2_03, alt: 'portraitImage2' } }, { image: { src: portraitImage3, alt: 'portraitImage3' } }, + { image: { src: portraitImage3_02, alt: 'portraitImage3' } }, + { image: { src: portraitImage3_03, alt: 'portraitImage3' } }, { image: { src: portraitImage4, alt: 'portraitImage4' } }, + { image: { src: portraitImage4_02, alt: 'portraitImage4' } }, + { image: { src: portraitImage4_03, alt: 'portraitImage4' } }, { image: { src: portraitImage5, alt: 'portraitImage5' } }, + { image: { src: portraitImage5_02, alt: 'portraitImage5' } }, + { image: { src: portraitImage5_03, alt: 'portraitImage5' } }, { image: { src: portraitImage6, alt: 'portraitImage6' } }, + { image: { src: portraitImage6_02, alt: 'portraitImage6' } }, + { image: { src: portraitImage6_03, alt: 'portraitImage6' } }, { image: { src: portraitImage7, alt: 'portraitImage7' } }, + { image: { src: portraitImage7_02, alt: 'portraitImage7' } }, + { image: { src: portraitImage7_03, alt: 'portraitImage7' } }, { image: { src: portraitImage8, alt: 'portraitImage8' } }, { image: { src: portraitImage9, alt: 'portraitImage9' } }, { image: { src: portraitImage10, alt: 'portraitImage10' } }, @@ -117,8 +147,8 @@ const formattedMembers = formatMemberCount(membersCount);
-
-
+
+