Merge pull request #290 from blz-it/272-update-website-data

blz-it · Oct 28, 2024 · 07b78a2 · 07b78a2
2 parents 57adca0 + 6d628c1
commit 07b78a2
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 29 deletions.
diff --git a/src/assets/data/history.json b/src/assets/data/history.json
@@ -1,20 +1,20 @@
 {
   "de": {
     "skill08": {
-      "chancellery2022": {
-        "date": "08.&nbsp;Dezember 2022",
-        "title": "Empfang im Bundeskanzleramt",
-        "text": "Justin Konratt bekommt von Bundeskanzler Olaf Scholz die &ldquo;Best of Nation&rdquo;-Medaille verliehen."
+      "einsteinCup2022": {
+        "date": "30.&nbsp;Mai&thinsp;&ndash;&thinsp;02.&nbsp;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.&thinsp;&ndash;&thinsp;16.&nbsp;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.&nbsp;Mai&thinsp;&ndash;&thinsp;02.&nbsp;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.&nbsp;Dezember 2022",
+        "title": "Empfang im Bundeskanzleramt",
+        "text": "Justin Konratt bekommt von Bundeskanzler Olaf Scholz die &ldquo;Best of Nation&rdquo;-Medaille verliehen."
       },
       "nationalChampionship2023": {
         "date": "25&nbsp;Mai&thinsp;&ndash;&thinsp;25&nbsp;Mai 2023",
@@ -29,7 +29,7 @@
       "wsc2024": {
         "date": "10&thinsp;&ndash;&thinsp;15&nbsp;September 2024",
         "title": "WorldSkills Lyon 2024",
-        "text": ""
+        "text": "Daniel Kalisch gewinnt die Bronzemedaille für Deutschland."
       }
     },
     "skill09": {
@@ -61,7 +61,7 @@
       "wsc2024": {
         "date": "10&thinsp;&ndash;&thinsp;15&nbsp;September 2024",
         "title": "WorldSkills Lyon 2024",
-        "text": ""
+        "text": "Simon Brebeck gewinnt eine Exzellenzmedaille und wird zweiter im Speed Programming."
       }
     },
     "skill17": {
@@ -74,20 +74,20 @@
   },
   "en": {
     "skill08": {
-      "chancellery2022": {
-        "date": "08&nbsp;December 2022",
-        "title": "Federal Chancellery",
-        "text": "Justin Konratt receives the &ldquo;Best of Nation&rdquo; medal from Chancellor Olaf Scholz."
+      "einsteinCup2022": {
+        "date": "30&nbsp;May&thinsp;&ndash;&thinsp;02&nbsp;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&thinsp;&ndash;&thinsp;16&nbsp;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&nbsp;May&thinsp;&ndash;&thinsp;02&nbsp;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&nbsp;December 2022",
+        "title": "Federal Chancellery",
+        "text": "Justin Konratt receives the &ldquo;Best of Nation&rdquo; medal from Chancellor Olaf Scholz."
       },
       "nationalChampionship2023": {
         "date": "25&thinsp;&ndash;&thinsp;25&nbsp;May 2023",
@@ -102,7 +102,7 @@
       "wsc2024": {
         "date": "10&thinsp;&ndash;&thinsp;15&nbsp;September 2024",
         "title": "WorldSkills Competition 2024 Lyon",
-        "text": ""
+        "text": "Daniel Kalisch wins a bronze medal for Germany."
       }
     },
     "skill09": {
@@ -134,7 +134,7 @@
       "wsc2024": {
         "date": "10&thinsp;&ndash;&thinsp;15&nbsp;September 2024",
         "title": "WorldSkills Lyon 2024",
-        "text": ""
+        "text": "Simon Brebeck wins a Medallion for Excellence and places second in Speedprogramming."
       }
     },
     "skill17": {

diff --git 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: "1. November 2024 – 21. Februar 2025",
+        en: "1 November 2024 – 21 February 2025",
       })}
       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,23 +61,23 @@ const t = useTranslations(lang);
     <EventCard
       img={GermanChampionshipImage}
       title={t({ de: "Deutsche Meisterschaft", en: "German Championship" })}
-      date={t({ de: "22. – 25. Mai 2023", en: "22 – 25 May 2023" })}
+      date={t({ de: "2. – 5. Juni 2025", en: "2 – 5 June 2025" })}
       link="https://www.worldskillsgermany.com/de/termine/dm-mobile-app-development-it-software-solutions-for-business/"
       className="lg:mt-54 md:ml-20 md:mt-48 lg:ml-24 xl:ml-32 xl:mt-72"
       hoverTextColor="white"
     />
     <EventCard
       img={AlbertEinsteinCupImage}
       title={t({ de: "Albert-Einstein-Cup", en: "Albert Einstein Cup" })}
-      date={t({ de: "27. – 30. Mai 2024", en: "27 – 30 May 2024" })}
+      date={t({ de: "vsl. Mai 2026", en: "around May 2026" })}
       link="https://youtu.be/Cvrt7g8es9k"
       className="md:float-right md:mr-20 md:mt-[-4rem] lg:mr-24 xl:mr-32"
       hoverTextColor="white"
     />
     <EventCard
       img={WsgHandsImage}
       title="WorldSkills Lyon"
-      date={t({ de: "10. – 15. September 2024", en: "10 – 15 September 2024" })}
+      date={t({ de: "22. – 27. September 2026", en: "22 – 27 September 2026" })}
       link="https://worldskills2024.com/"
       className="md:ml-60 md:mt-64 lg:ml-72 lg:mt-72 xl:ml-96 xl:mt-96"
       hoverTextColor="white"