Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: update dates #290

Merged
merged 4 commits into from
Oct 28, 2024
Merged

feat: update dates #290

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
e891958
feat: update dates
styrix560 Oct 19, 2024
fb01854
feat: Update history
styrix560 Oct 19, 2024
7f472ac
fix: apply suggestions
styrix560 Oct 28, 2024
6d628c1
fix: registration year
styrix560 Oct 28, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
44 changes: 22 additions & 22 deletions src/assets/data/history.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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",
Expand All @@ -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": {
Expand Down Expand Up @@ -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."
styrix560 marked this conversation as resolved.
Show resolved Hide resolved
}
}
},
"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",
Expand All @@ -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": {
Expand Down Expand Up @@ -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."
styrix560 marked this conversation as resolved.
Show resolved Hide resolved
}
}
}
Expand Down
14 changes: 7 additions & 7 deletions src/components/skill/SkillRoadmap.astro
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
styrix560 marked this conversation as resolved.
Show resolved Hide resolved
})}
link={getRelativeLocaleUrl(lang, "dm-registration")}
className="xl:mt-0"
Expand All @@ -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]"
Expand All @@ -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: "ca. Mai 2026", en: "around May 2026" })}
styrix560 marked this conversation as resolved.
Show resolved Hide resolved
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"
Expand Down