From e8919589d6cf0d592a6f4b523d2fa31258b51eea Mon Sep 17 00:00:00 2001 From: styrix560 <60841004+styrix560@users.noreply.github.com> Date: Sat, 19 Oct 2024 14:02:53 +0200 Subject: [PATCH 1/4] feat: update dates --- src/components/skill/SkillRoadmap.astro | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/components/skill/SkillRoadmap.astro b/src/components/skill/SkillRoadmap.astro index ef329ad..2f1f452 100644 --- a/src/components/skill/SkillRoadmap.astro +++ b/src/components/skill/SkillRoadmap.astro @@ -40,8 +40,8 @@ const t = useTranslations(lang); img={RegistrationImage} title={t({ de: "Registrierung", en: "Registration" })} date={t({ - de: "25. Januar – 24. Februar 2023", - en: "25 January – 24 February 2023", + de: "11. Oktober – 27. Dezember 2024", + en: "11 October – 27 December 2024", })} link={getRelativeLocaleUrl(lang, "dm-registration")} className="xl:mt-0" @@ -51,8 +51,8 @@ const t = useTranslations(lang); img={OnlineCompetitionImage} title={t({ de: "Online-Vorausscheidung", en: "Online Competition" })} date={t({ - de: "28. Februar – 27. März 2023", - en: "28 February – 27 March 2023", + de: "28. Dezember 2024 – 28. Februar 2025", + en: "28 December 2024 – 28 February 2025", })} link={getRelativeLocaleUrl(lang, "dm-registration")} className="md:float-right md:mt-[-4rem]" @@ -61,7 +61,7 @@ const t = useTranslations(lang); Date: Sat, 19 Oct 2024 14:14:00 +0200 Subject: [PATCH 2/4] feat: Update history --- src/assets/data/history.json | 44 ++++++++++++++++++------------------ 1 file changed, 22 insertions(+), 22 deletions(-) diff --git a/src/assets/data/history.json b/src/assets/data/history.json index 01a0c16..344cb96 100644 --- a/src/assets/data/history.json +++ b/src/assets/data/history.json @@ -1,20 +1,20 @@ { "de": { "skill08": { - "chancellery2022": { - "date": "08. Dezember 2022", - "title": "Empfang im Bundeskanzleramt", - "text": "Justin Konratt bekommt von Bundeskanzler Olaf Scholz die “Best of Nation”-Medaille verliehen." + "einsteinCup2022": { + "date": "30. Mai – 02. Juni 2022", + "title": "Albert-Einstein-Cup", + "text": "Die Gewinner beim Albert-Einstein-Cup in Neubrandenburg sind: Joachim Schiller (Deutschland), Justin Konratt (Deutschland) und Kantubhukta Lavanya Sai Kumar (Indien). Justin Konratt gewinnt außerdem die Zusatzdisziplin Speed-Programming." }, "wsc2022": { "date": "13. – 16. Oktober 2022", "title": "WorldSkills Competition 2022 Special Edition", - "text": "Justin Konratt holt in Goyang, Korea bei der Weltmeisterschaft die Bronzemedaille für Deutschland." + "text": "Justin Konratt holt die Bronzemedaille für Deutschland." }, - "einsteinCup2022": { - "date": "30. Mai – 02. Juni 2022", - "title": "Albert-Einstein-Cup", - "text": "Die Gewinner beim Albert-Einstein-Cup in Neubrandenburg sind: Joachim Schiller (Deutschland), Justin Konratt (Deutschland) und Kantubhukta Lavanya Sai Kumar (Indien). Justin Konratt gewinnt außerdem die Zusatzdisziplin Speed-Programming." + "chancellery2022": { + "date": "08. Dezember 2022", + "title": "Empfang im Bundeskanzleramt", + "text": "Justin Konratt bekommt von Bundeskanzler Olaf Scholz die “Best of Nation”-Medaille verliehen." }, "nationalChampionship2023": { "date": "25 Mai – 25 Mai 2023", @@ -29,7 +29,7 @@ "wsc2024": { "date": "10 – 15 September 2024", "title": "WorldSkills Lyon 2024", - "text": "" + "text": "Daniel Kalisch gewinnt die Bronzemedaille für Deutschland." } }, "skill09": { @@ -61,26 +61,26 @@ "wsc2024": { "date": "10 – 15 September 2024", "title": "WorldSkills Lyon 2024", - "text": "" + "text": "Simon Brebeck gewinnt eine Exzellenzmedaille und wird 2. im Speed Programming." } } }, "en": { "skill08": { - "chancellery2022": { - "date": "08 December 2022", - "title": "Federal Chancellery", - "text": "Justin Konratt receives the “Best of Nation” medal from Chancellor Olaf Scholz." + "einsteinCup2022": { + "date": "30 May – 02 June 2022", + "title": "Albert Einstein Cup", + "text": "The winners of the Albert Einstein Cup in Neubrandenburg are: Joachim Schiller (Germany), Justin Konratt (Germany), and Kantubhukta Lavanya Sai Kumar (India). Justin Konratt also wins the additional discipline of Speed Programming." }, "wsc2022": { "date": "13 – 16 October 2022", "title": "WorldSkills Competition 2022 Special Edition", - "text": "Justin Konratt wins the bronze medal for Germany at the World Championships in Goyang (Korea)." + "text": "Justin Konratt wins the bronze medal for Germany." }, - "einsteinCup2022": { - "date": "30 May – 02 June 2022", - "title": "Albert Einstein Cup", - "text": "The winners of the Albert Einstein Cup in Neubrandenburg are: Joachim Schiller (Germany), Justin Konratt (Germany), and Kantubhukta Lavanya Sai Kumar (India). Justin Konratt also wins the additional discipline of Speed Programming." + "chancellery2022": { + "date": "08 December 2022", + "title": "Federal Chancellery", + "text": "Justin Konratt receives the “Best of Nation” medal from Chancellor Olaf Scholz." }, "nationalChampionship2023": { "date": "25 – 25 May 2023", @@ -95,7 +95,7 @@ "wsc2024": { "date": "10 – 15 September 2024", "title": "WorldSkills Competition 2024 Lyon", - "text": "" + "text": "Daniel Kalisch wins a bronze medal for Germany." } }, "skill09": { @@ -127,7 +127,7 @@ "wsc2024": { "date": "10 – 15 September 2024", "title": "WorldSkills Lyon 2024", - "text": "" + "text": "Simon Brebeck wins a Medallion of Excellence and places 2nd in Speedprogramming." } } } From 7f472ac1264279e036c78e058b9df21feec309b4 Mon Sep 17 00:00:00 2001 From: styrix560 <60841004+styrix560@users.noreply.github.com> Date: Mon, 28 Oct 2024 16:32:19 +0100 Subject: [PATCH 3/4] fix: apply suggestions --- src/assets/data/history.json | 4 ++-- src/components/skill/SkillRoadmap.astro | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/assets/data/history.json b/src/assets/data/history.json index 344cb96..5e5374f 100644 --- a/src/assets/data/history.json +++ b/src/assets/data/history.json @@ -61,7 +61,7 @@ "wsc2024": { "date": "10 – 15 September 2024", "title": "WorldSkills Lyon 2024", - "text": "Simon Brebeck gewinnt eine Exzellenzmedaille und wird 2. im Speed Programming." + "text": "Simon Brebeck gewinnt eine Exzellenzmedaille und wird zweiter im Speed Programming." } } }, @@ -127,7 +127,7 @@ "wsc2024": { "date": "10 – 15 September 2024", "title": "WorldSkills Lyon 2024", - "text": "Simon Brebeck wins a Medallion of Excellence and places 2nd in Speedprogramming." + "text": "Simon Brebeck wins a Medallion for Excellence and places second in Speedprogramming." } } } diff --git a/src/components/skill/SkillRoadmap.astro b/src/components/skill/SkillRoadmap.astro index 2f1f452..f624717 100644 --- a/src/components/skill/SkillRoadmap.astro +++ b/src/components/skill/SkillRoadmap.astro @@ -40,8 +40,8 @@ const t = useTranslations(lang); img={RegistrationImage} title={t({ de: "Registrierung", en: "Registration" })} date={t({ - de: "11. Oktober – 27. Dezember 2024", - en: "11 October – 27 December 2024", + de: "1. November – 21. Februar 2024", + en: "1 November – 21 February 2024", })} link={getRelativeLocaleUrl(lang, "dm-registration")} className="xl:mt-0" @@ -69,7 +69,7 @@ const t = useTranslations(lang); Date: Mon, 28 Oct 2024 16:43:50 +0100 Subject: [PATCH 4/4] fix: registration year --- src/components/skill/SkillRoadmap.astro | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/components/skill/SkillRoadmap.astro b/src/components/skill/SkillRoadmap.astro index f624717..e80db46 100644 --- a/src/components/skill/SkillRoadmap.astro +++ b/src/components/skill/SkillRoadmap.astro @@ -40,8 +40,8 @@ const t = useTranslations(lang); img={RegistrationImage} title={t({ de: "Registrierung", en: "Registration" })} date={t({ - de: "1. November – 21. Februar 2024", - en: "1 November – 21 February 2024", + de: "1. November 2024 – 21. Februar 2025", + en: "1 November 2024 – 21 February 2025", })} link={getRelativeLocaleUrl(lang, "dm-registration")} className="xl:mt-0"