From ffbe230b215fef783784dfa3e7328953af021d70 Mon Sep 17 00:00:00 2001 From: Jonas Wanke Date: Mon, 28 Oct 2024 20:49:28 +0100 Subject: [PATCH 1/5] Update texts --- src/components/skill/SkillRoadmap.astro | 42 +++++++------------ src/layouts/SkillPage.astro | 2 +- src/pages/[lang]/anmeldung.astro | 2 +- src/pages/en/index.astro | 7 ++-- .../en/mobile-applications-development.astro | 4 +- src/pages/en/web-technologies.astro | 4 +- src/pages/index.astro | 5 +-- .../mobile-applications-development.astro | 2 +- src/pages/web-technologies.astro | 4 +- 9 files changed, 28 insertions(+), 44 deletions(-) diff --git a/src/components/skill/SkillRoadmap.astro b/src/components/skill/SkillRoadmap.astro index b24b817..e55bf96 100644 --- a/src/components/skill/SkillRoadmap.astro +++ b/src/components/skill/SkillRoadmap.astro @@ -38,7 +38,7 @@ const t = useTranslations(lang);
  • - {t({ de: "Du registrierst dich", en: "You register yourself" })} + {t({ de: "Du meldest dich an", en: "You register yourself" })} { t({ - de: "und erhältst weitere Informationen sowie nach Abschluss des Registrierungszeitraumes deine Zugangsdaten.", - en: "and receive further information as well as, after the registration is closed, your credentials.", + de: "und erhältst vor dem Start des Online-Vorausscheides deine Zugangsdaten.", + en: "and receive your credentials before the online preliminary competition starts.", }) }
    • @@ -100,51 +100,37 @@ const t = useTranslations(lang); { t({ de: "Innerhalb der Laufzeit des Online-Ausscheids löst du zu einem Zeitpunkt deiner Wahl mehrere anspruchsvolle Testaufgaben, die jeweils ca. 60 – 120 Minuten dauern. Diese kannst du auch über mehrere Tage verteilen. Die Wahl deiner Programmiersprache spielt hierbei noch keine Rolle.", - en: "During this month, you solve multiple complex tasks at a time of your choosing. Each task takes around 60 – 120 minutes, but you can distribute them across multiple days. The programming language that you use is not relevant.", + en: "During the online preliminary competition, you solve multiple complex tasks at a time of your choosing. Each task takes around 60 – 120 minutes, but you can distribute them across multiple days. The programming language that you use is not relevant.", }) }
  • { t({ - de: "Die gemeinsame Deutsche Meisterschaft für beide Disziplinen findet am Bundesleistungszentrum in Neubrandenburg statt. Hier werden über vier Tage anspruchsvolle Desktopanwendungen und Android-Apps programmiert. Damit wird das gemeinsame vier- bis sechsköpfige Nationalteam bestimmt. Es sind nur noch die folgenden Entwicklungsumgebungen/Programmiersprachen zugelassen:", - en: "The shared German Championship for both Skills takes place at the National Training Centre in Neubrandenburg. Over four competition days, you will develop complex desktop and Android applications. This determines the joint four- to six-strong national team. Only the following development environments / programming languages can be used:", + de: "Am Bundesleistungszentrum, dem Albert-Einstein-Gymnasium in Neubrandenburg, finden die Deutschen Meisterschaften der drei Disziplinen zusammen statt. Hier werden über vier Tage anspruchsvolle Android-, Desktop- bzw. Web-Apps entwickelt. Am Ende steht für jede Disziplin das Nationalteam fest.", + en: "The German Championships for the three skills take place together at the National Training Center, the Albert-Einstein-Gymnasium in Neubrandenburg. Sophisticated Android, desktop, and web apps are developed here over four days. At the end, the national team is determined for each skills.", }) } -
      -
    • - Visual Studio (C#) { - t({ de: "für Desktopanwendungen", en: "for desktop applications" }) - } -
      • -
    • - Xamarin (C#), Flutter (Dart), {t({ de: "und", en: "and" })} Android Studio - (Kotlin or Java) { - t({ de: "für App-Entwicklung", en: "for app development" }) - } -
      • -
    • Microsoft SQL Server
      • -
  • { t({ - de: "Das gemeinsame Nationalteam wird von unserem Trainerteam in mehreren Trainingslagern und online auf die weiteren Wettkämpfe vorbereitet und im Februar 2024 im Rahmen eines Wettkampfes auf ein Team pro Disziplin aufgeteilt.", - en: "The joint national team is being prepared for the following competitions online and in multiple training camps by our trainer team. In February 2024, the Competitors are divided into two separate national teams, one for each Skill.", + de: "Die Nationalteams werden von unserem Trainerteam in mehreren Trainingslagern und online auf die weiteren Wettbewerbe vorbereitet.", + en: "The national teams are being prepared for the following competitions in multiple training camps and online by our trainer team.", }) } { t({ - de: "Beim Albert-Einstein-Cup treten beide Nationalteams in ihren Wettbewerbsberufen gegen die besten Softwareentwickler*innen Europas und anderer Kontinente an. Im Ergebnis werden die beiden deutschen Teilnehmer*innen für die WorldSkills Lyon 2024 bestimmt.", - en: "At the Albert Einstein Cup, both national teams compete against the best software developers of Europe and other continents in their respective Skill. As a result, the two German Competitors for the WorldSkills Lyon 2024 will be determined.", + de: "Die Mitglieder der drei Nationalteams treten beim Albert-Einstein-Cup in ihren Disziplinen gegen die besten Softwareentwickler*innen der Welt an. Im Ergebnis werden die drei deutschen Teilnehmer*innen für die WorldSkills Shanghai 2026 bestimmt.", + en: "The members of the three national teams compete against the best software developers in the world in their skills at the Albert Einstein Cup. The results will determine the three German competitors for WorldSkills Shanghai 2026.", }) }
  • { t({ - de: "Jeweils ein*e Teilnehmer*in vertritt Deutschland in den beiden Disziplinen bei den WorldSkills in Lyon. Der Wettkampf geht über vier Tage.", - en: "In each of the two Skills, one Competitor represents Germany at the WorldSkills in Lyon. The Competition takes place over four days.", + de: "Jeweils ein*e Teilnehmer*in vertritt Deutschland in den drei Disziplinen bei den WorldSkills in Shanghai. Der Wettkampf geht über vier Tage.", + en: "In each of the three Skills, one competitor represents Germany at the WorldSkills in Shanghai. The competition takes place over four days.", }) }
    • diff --git a/src/layouts/SkillPage.astro b/src/layouts/SkillPage.astro index 438dbfe..5d8c884 100644 --- a/src/layouts/SkillPage.astro +++ b/src/layouts/SkillPage.astro @@ -55,7 +55,7 @@ const t = useTranslations(lang); > - +
    diff --git a/src/pages/[lang]/anmeldung.astro b/src/pages/[lang]/anmeldung.astro index 4e0f61e..d5262d8 100644 --- a/src/pages/[lang]/anmeldung.astro +++ b/src/pages/[lang]/anmeldung.astro @@ -13,7 +13,7 @@ export const getStaticPaths = localeParams;

    - Anmeldung zur Deutschen Meisterschaft + Anmeldung zum Online-Vorausscheid

    Der Online-Vorausscheid wird für alle drei Disziplinen gemeinsam diff --git a/src/pages/en/index.astro b/src/pages/en/index.astro index 71068ad..8980935 100644 --- a/src/pages/en/index.astro +++ b/src/pages/en/index.astro @@ -33,10 +33,10 @@ const lang = (Astro.currentLocale || defaultLang) as Language; WorldSkills Germany, which, for example, also hosts national and international - competitions. In Germany, each skill has a National Training Centre. + competitions. In Germany, each skill has a National Training Center.

    - The National Training Centres by WorldSkills Germany have the task of + The National Training Centers by WorldSkills Germany have the task of training future members of the German national team and thus participants in international competitions, in addition to training according to WorldSkills principles for as broad a group of participants @@ -51,8 +51,7 @@ const lang = (Astro.currentLocale || defaultLang) as Language; The National Training Centers in Software Development are located at the Albert-Einstein-Gymnasium Neubrandenburg. More information on the individual skills can be found on their - respective pages: + >. More information on the individual skills can be found here:


    For the job, you need a certain understanding of technology and design. You need to understand the requirements and wishes of the clients and develop a product that is reliable, updatable, and easy for users to understand and use.", requirements: - "You master at least one programming language, e.g. Dart or Kotlin, and program mobile apps, including the connection to online APIs and the use of integrated sensors. You understand tasks in English.", + "For the online preliminary competition, you must be able to understand tasks in English and should be able to develop simple apps. The programming language you use is up to you.

    For the German Championship, the international Albert Einstein Cup, and the WorldSkills, we will be using the framework Flutter with the Dart programming language. These competition rounds are about developing and designing user interfaces, connecting to web APIs, and using integrated sensors.

    We will offer an online workshop about Flutter and Dart after the online preliminary competition, and hold multiple training camps preparing you for the later rounds.", videoUrl: "https://www.youtube-nocookie.com/embed/Qe0ZaQAOQUY", occupation: { title: "A career with a future and always on the cutting edge", - text: "The possibilities of communication and information exchange are constantly increasing. With a degree in IT, you are in demand: in 2021, about 12 % more IT talents were sought than in the previous year. The Mobile Applications Developer is therefore one of the fastest growing occupations.

    Your main working tool is your laptop, so you are almost unrestricted in terms of work location and time, as long as there is no customer appointment. The only thing you need is a stable internet connection.", + text: "The possibilities of communication and information exchange are constantly increasing. With a degree in IT, you are in demand: In 2021, about 12 % more IT talents were sought than in the previous year. The Mobile Applications Developer is therefore one of the fastest growing occupations.

    Your main working tool is your laptop, so you are almost unrestricted in terms of work location and time, as long as there is no customer appointment. The only thing you need is a stable internet connection.", }, }} img={Skill08Image} diff --git a/src/pages/en/web-technologies.astro b/src/pages/en/web-technologies.astro index 1d6d52a..af9addc 100644 --- a/src/pages/en/web-technologies.astro +++ b/src/pages/en/web-technologies.astro @@ -29,12 +29,12 @@ const historyData = historyJson[lang]["skill17"]; additionalLinks={[ { name: "worldskills.org", - text: "Skill 17 at WorldSkills International", + text: "Web Technologies at WorldSkills International", href: "https://worldskills.org/skills/id/127/", }, { name: "worldskills2024.com", - text: "Skill 17 at the WorldSkills Lyon 2024", + text: "Web Technologies at the WorldSkills Lyon 2024", href: "https://worldskills2024.com/en/skills/web-technologies", }, ]} diff --git a/src/pages/index.astro b/src/pages/index.astro index 38889a8..c38ba48 100644 --- a/src/pages/index.astro +++ b/src/pages/index.astro @@ -52,8 +52,7 @@ const lang = (Astro.currentLocale || defaultLang) as Language; Die Bundesleistungszentren der Softwareentwicklung haben ihren Standort am Albert-Einstein-Gymnasium Neubrandenburg. Mehr Informationen zu den einzelnen Disziplinen finden sich auf den - jeweiligen Unterseiten: + >. Mehr Informationen zu den einzelnen Disziplinen gibt es hier:


    Für den Beruf brauchst du ein gewisses Verständnis für Technologie und Design. Du musst die Anforderungen und Wünsche der Auftraggeber*innen verstehen und ein Produkt entwickeln, das zuverlässig, aktualisierbar und für Benutzer*innen leicht zu verstehen und zu verwenden ist.", requirements: - "Du beherrschst mindestens eine Programmiersprache, z. B. Dart oder Kotlin, und programmierst Android-Apps, auch mit Verknüpfung zu Webschnittstellen und der Verwendung integrierter Sensoren. Du verstehst englischsprachige Aufgabenstellungen.", + "Für den Online-Vorausscheid musst du Aufgabenstellungen auf Englisch verstehen und solltest einfache Apps entwickeln können. Die Programmiersprache ist dabei noch dir überlassen.

    Bei der Deutschen Meisterschaft, dem internationalen Albert-Einstein-Cup und den WorldSkills setzen wir dann auf die Technologie Flutter mit der Programmiersprache Dart. In diesen Runden geht es um das Entwickeln und Designen von Benutzeroberflächen, die Verknüpfung zu Webschnittstellen und die Verwendung integrierter Sensoren.

    Wir bieten nach dem Online-Vorausscheid einen Online-Workshop zu Flutter und Dart an und veranstalten als Vorbereitung auf die späteren Runden mehrere Trainingslager.", videoUrl: "https://www.youtube-nocookie.com/embed/v7I124lty3s", occupation: { title: "Ein Beruf mit Zukunft und stets am Puls der Zeit", diff --git a/src/pages/web-technologies.astro b/src/pages/web-technologies.astro index 82232b1..101288e 100644 --- a/src/pages/web-technologies.astro +++ b/src/pages/web-technologies.astro @@ -29,12 +29,12 @@ const historyData = historyJson[lang]["skill17"]; additionalLinks={[ { name: "worldskills.org", - text: "Skill 17 bei WorldSkills International", + text: "Web-Entwicklung bei WorldSkills International", href: "https://worldskills.org/skills/id/127/", }, { name: "worldskills2024.com", - text: "Skill 17 bei den WorldSkills Lyon 2024", + text: "Web-Entwicklung bei den WorldSkills Lyon 2024", href: "https://worldskills2024.com/en/skills/web-technologies", }, ]} From c99cf480b4fd10d2422b36f733935952a55b4610 Mon Sep 17 00:00:00 2001 From: Jonas Wanke Date: Mon, 28 Oct 2024 20:55:13 +0100 Subject: [PATCH 2/5] Reorder history --- src/assets/data/history.json | 182 +++++++++--------- .../it-software-solutions-for-business.astro | 2 +- .../en/mobile-applications-development.astro | 2 +- src/pages/en/web-technologies.astro | 2 +- .../it-software-solutions-for-business.astro | 2 +- .../mobile-applications-development.astro | 2 +- src/pages/web-technologies.astro | 2 +- 7 files changed, 97 insertions(+), 97 deletions(-) diff --git a/src/assets/data/history.json b/src/assets/data/history.json index f7929f8..f73ef09 100644 --- a/src/assets/data/history.json +++ b/src/assets/data/history.json @@ -1,148 +1,148 @@ { "de": { - "skill08": { - "einsteinCup2022": { - "date": "30. Mai – 02. Juni 2022", + "skill08": [ + { + "date": "10 – 15 September 2024", + "title": "WorldSkills Lyon 2024", + "text": "Daniel Kalisch gewinnt die Bronzemedaille für Deutschland." + }, + { + "date": "27 Mai – 30 Mai 2024", "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." + "text": "Jongwon Kim (Südkorea), Daniel Kalisch (Deutschland) und Wei-Hung Lai (Chinesisch Taipeh) sind die Gewinner des Albert-Einstein-Cups. Stefan Kornel (Ungarn) gewinnt die zusätzliche Disziplin Speed-Programming. Der “Hungarian Speed Test“ machte seinen ersten Auftritt und wurde von Nils Jakubzick (Deutschland) gewonnen." }, - "wsc2022": { - "date": "13. – 16. Oktober 2022", - "title": "WorldSkills Competition 2022 Special Edition", - "text": "Justin Konratt holt die Bronzemedaille für Deutschland." + { + "date": "25 Mai – 25 Mai 2023", + "title": "Deutsche Meisterschaft", + "text": "Beide Disziplinen der Deutschen Meisterschaft wurden von Daniel Kalisch, Simon Brebeck and Nils Jakubzick gewonnen. Florian Darsow ist bester im 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", - "title": "Deutsche Meisterschaft", - "text": "Beide Disziplinen der Deutschen Meisterschaft wurden von Daniel Kalisch, Simon Brebeck and Nils Jakubzick gewonnen. Florian Darsow ist bester im Speed-Programming." + { + "date": "13. – 16. Oktober 2022", + "title": "WorldSkills Competition 2022 Special Edition", + "text": "Justin Konratt holt die Bronzemedaille für Deutschland." }, - "einsteinCup2024": { - "date": "27 Mai – 30 Mai 2024", + { + "date": "30. Mai – 02. Juni 2022", "title": "Albert-Einstein-Cup", - "text": "Jongwon Kim (Südkorea), Daniel Kalisch (Deutschland) und Wei-Hung Lai (Chinesisch Taipeh) sind die Gewinner des Albert-Einstein-Cups. Stefan Kornel (Ungarn) gewinnt die zusätzliche Disziplin Speed-Programming. Der “Hungarian Speed Test“ machte seinen ersten Auftritt und wurde von Nils Jakubzick (Deutschland) gewonnen." - }, - "wsc2024": { + "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." + } + ], + "skill09": [ + { "date": "10 – 15 September 2024", "title": "WorldSkills Lyon 2024", - "text": "Daniel Kalisch gewinnt die Bronzemedaille für Deutschland." - } - }, - "skill09": { - "einsteinCup2022": { - "date": "30 Mai – 02 Juni 2022", - "title": "Albert-Einstein-Cup", - "text": "Die Gewinner des Albert-Einstein-Cups in Neubrandenburg sind: Thomas Gassmann (Schweiz), Glenn Skrzypczak (Deutschland) and Bence Lakos (Ungarn). Justin Konratt gewinnt die zusätzliche Disziplin Speed-Programming." + "text": "Simon Brebeck gewinnt eine Exzellenzmedaille und wird zweiter im Speed Programming." }, - "wsc2022": { - "date": "13  – 16 Oktober 2022", - "title": "WorldSkills Competition 2022 Special Edition", - "text": "Glenn Skrzypczak wird Vize-Weltmeister im Speed-Programming." + { + "date": "27 Mai – 30 Mai 2024", + "title": "Albert-Einstein-Cup", + "text": "Simon Brebeck (Deutschland), Lukas Hertkorn (Deutschland) und Besart Memeti (Schweiz) sind die Gewinner des Albert-Einstein-Cups. Kornél Stefán (Ungarn) gewinnt die zusätzliche Disziplin Speed-Programming. Der “Hungarian Speed Test“ wurde das erste Mal durchgeführt und von Nils Jakubzick (Deutschland) gewonnen." }, - "euroskills2023": { + { "date": "5 September – 9 September 2023", "title": "EuroSkills Gdańsk 2023", "text": "Glenn Skrzypczak erreicht bei den EuroSkills Gold und gewinnt außerdem das Speed-Programming." }, - "nationalChampionship2023": { + { "date": "25 Mai – 25 Mai 2023", "title": "Deutsche Meisterschaft", "text": "Beide Disziplinen der Deutschen Meisterschaft wurden von Daniel Kalisch, Simon Brebeck and Nils Jakubzick gewonnen. Florian Darsow ist bester im Speed-Programming." }, - "einsteinCup2024": { - "date": "27 Mai – 30 Mai 2024", - "title": "Albert-Einstein-Cup", - "text": "Simon Brebeck (Deutschland), Lukas Hertkorn (Deutschland) und Besart Memeti (Schweiz) sind die Gewinner des Albert-Einstein-Cups. Kornél Stefán (Ungarn) gewinnt die zusätzliche Disziplin Speed-Programming. Der “Hungarian Speed Test“ wurde das erste Mal durchgeführt und von Nils Jakubzick (Deutschland) gewonnen." + { + "date": "13  – 16 Oktober 2022", + "title": "WorldSkills Competition 2022 Special Edition", + "text": "Glenn Skrzypczak wird Vize-Weltmeister im Speed-Programming." }, - "wsc2024": { - "date": "10 – 15 September 2024", - "title": "WorldSkills Lyon 2024", - "text": "Simon Brebeck gewinnt eine Exzellenzmedaille und wird zweiter im Speed Programming." + { + "date": "30 Mai – 02 Juni 2022", + "title": "Albert-Einstein-Cup", + "text": "Die Gewinner des Albert-Einstein-Cups in Neubrandenburg sind: Thomas Gassmann (Schweiz), Glenn Skrzypczak (Deutschland) and Bence Lakos (Ungarn). Justin Konratt gewinnt die zusätzliche Disziplin Speed-Programming." } - }, - "skill17": { - "todo": { + ], + "skill17": [ + { "date": "2024", "title": "Folgt bald", "text": "" } - } + ] }, "en": { - "skill08": { - "einsteinCup2022": { - "date": "30 May – 02 June 2022", + "skill08": [ + { + "date": "10 – 15 September 2024", + "title": "WorldSkills Competition 2024 Lyon", + "text": "Daniel Kalisch wins a bronze medal for Germany." + }, + { + "date": "27 – 30 May 2024", "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." + "text": "Jongwon Kim (South Korea), Daniel Kalisch (Germany), and Wei-Hung Lai (Chinese Taipei) are the winners of the Albert Einstein Cup. Stefan Kornel (Hungary) wins the additional Speed Programming discipline. The “Hungarian Speed Test“ made its first appearance and was won by Nils Jakubzick (Germany)." }, - "wsc2022": { - "date": "13 – 16 October 2022", - "title": "WorldSkills Competition 2022 Special Edition", - "text": "Justin Konratt wins the bronze medal for Germany." + { + "date": "25 – 25 May 2023", + "title": "German National Championship", + "text": "Both skills of the German National Championship are won by Daniel Kalisch, Simon Brebeck, and Nils Jakubzick. Speed Programming is won by Florian Darsow." }, - "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", - "title": "German National Championship", - "text": "Both skills of the German National Championship are won by Daniel Kalisch, Simon Brebeck, and Nils Jakubzick. Speed Programming is won by Florian Darsow." + { + "date": "13 – 16 October 2022", + "title": "WorldSkills Competition 2022 Special Edition", + "text": "Justin Konratt wins the bronze medal for Germany." }, - "einsteinCup2024": { - "date": "27 – 30 May 2024", + { + "date": "30 May – 02 June 2022", "title": "Albert Einstein Cup", - "text": "Jongwon Kim (South Korea), Daniel Kalisch (Germany), and Wei-Hung Lai (Chinese Taipei) are the winners of the Albert Einstein Cup. Stefan Kornel (Hungary) wins the additional Speed Programming discipline. The “Hungarian Speed Test“ made its first appearance and was won by Nils Jakubzick (Germany)." - }, - "wsc2024": { - "date": "10 – 15 September 2024", - "title": "WorldSkills Competition 2024 Lyon", - "text": "Daniel Kalisch wins a bronze medal for Germany." + "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." } - }, - "skill09": { - "einsteinCup2022": { - "date": "30 May – 02 June 2022", + ], + "skill09": [ + { + "date": "10 – 15 September 2024", + "title": "WorldSkills Lyon 2024", + "text": "Simon Brebeck wins a Medallion for Excellence and places second in Speedprogramming." + }, + { + "date": "27 – 30 May 2024", "title": "Albert Einstein Cup", - "text": "The winners of the Albert Einstein Cup in Neubrandenburg are: Thomas Gassmann (Switzerland), Glenn Skryzpczak (Germany), and Bence Lakos (Hungary). Justin Konratt wins the additional discipline of Speed Programming." + "text": "Simon Brebeck (Germany), Lukas Hertkorn (Germany) and Besart Memeti (Switzerland), are the winners of the Albert Einstein Cup. Stefan Kornel (Hungary) wins the additional Speed Programming discipline. The “Hungarian Speed Test“ made its first appearance and was won by Nils Jakubzick (Germany)." }, - "wsc2022": { - "date": "13  – 16 October 2022", - "title": "WorldSkills Competition 2022 Special Edition", - "text": "Glenn Skrzypczak becomes the vice world-champion in the additional Speed Programming discipline." + { + "date": "5 – 9 September 2023", + "title": "EuroSkills Gdańsk 2023", + "text": "Glenn Skrzypczak achieves a gold medal at the EuroSkills and additionally wins the Speed Programming." }, - "nationalChampionship2023": { + { "date": "25 – 25 May 2023", "title": "German National Championship", "text": "Both skills of the German National Championship are won by Daniel Kalisch, Simon Brebeck, and Nils Jakubzick. Speed Programming is won by Florian Darsow." }, - "euroskills2023": { - "date": "5 – 9 September 2023", - "title": "EuroSkills Gdańsk 2023", - "text": "Glenn Skrzypczak achieves a gold medal at the EuroSkills and additionally wins the Speed Programming." + { + "date": "13  – 16 October 2022", + "title": "WorldSkills Competition 2022 Special Edition", + "text": "Glenn Skrzypczak becomes the vice world-champion in the additional Speed Programming discipline." }, - "einsteinCup2024": { - "date": "27 – 30 May 2024", + { + "date": "30 May – 02 June 2022", "title": "Albert Einstein Cup", - "text": "Simon Brebeck (Germany), Lukas Hertkorn (Germany) and Besart Memeti (Switzerland), are the winners of the Albert Einstein Cup. Stefan Kornel (Hungary) wins the additional Speed Programming discipline. The “Hungarian Speed Test“ made its first appearance and was won by Nils Jakubzick (Germany)." - }, - "wsc2024": { - "date": "10 – 15 September 2024", - "title": "WorldSkills Lyon 2024", - "text": "Simon Brebeck wins a Medallion for Excellence and places second in Speedprogramming." + "text": "The winners of the Albert Einstein Cup in Neubrandenburg are: Thomas Gassmann (Switzerland), Glenn Skryzpczak (Germany), and Bence Lakos (Hungary). Justin Konratt wins the additional discipline of Speed Programming." } - }, - "skill17": { - "todo": { + ], + "skill17": [ + { "date": "2024", "title": "Coming soon", "text": "" } - } + ] } } diff --git a/src/pages/en/it-software-solutions-for-business.astro b/src/pages/en/it-software-solutions-for-business.astro index fb2383e..2459759 100644 --- a/src/pages/en/it-software-solutions-for-business.astro +++ b/src/pages/en/it-software-solutions-for-business.astro @@ -25,7 +25,7 @@ const historyData = historyJson[lang]["skill09"]; img={Skill09Image} contact="mailto:skills@kapplers.de" nationalTeam={[]} - timelineEntries={Object.values(historyData)} + timelineEntries={historyData} additionalLinks={[ { name: "worldskills.org", diff --git a/src/pages/en/mobile-applications-development.astro b/src/pages/en/mobile-applications-development.astro index 5531675..6bcadc6 100644 --- a/src/pages/en/mobile-applications-development.astro +++ b/src/pages/en/mobile-applications-development.astro @@ -25,7 +25,7 @@ const historyData = historyJson[lang]["skill08"]; img={Skill08Image} contact="mailto:worldskills@jonas-wanke.de" nationalTeam={[]} - timelineEntries={Object.values(historyData)} + timelineEntries={historyData} additionalLinks={[ { name: "worldskills.org", diff --git a/src/pages/en/web-technologies.astro b/src/pages/en/web-technologies.astro index af9addc..ab3ba8e 100644 --- a/src/pages/en/web-technologies.astro +++ b/src/pages/en/web-technologies.astro @@ -25,7 +25,7 @@ const historyData = historyJson[lang]["skill17"]; img={Skill09Image} contact="mailto:glenn.skrzypczak@gmail.com" nationalTeam={[]} - timelineEntries={Object.values(historyData)} + timelineEntries={historyData} additionalLinks={[ { name: "worldskills.org", diff --git a/src/pages/it-software-solutions-for-business.astro b/src/pages/it-software-solutions-for-business.astro index 87e0753..b44454a 100644 --- a/src/pages/it-software-solutions-for-business.astro +++ b/src/pages/it-software-solutions-for-business.astro @@ -25,7 +25,7 @@ const historyData = historyJson[lang]["skill09"]; img={Skill09Image} contact="mailto:skills@kapplers.de" nationalTeam={[]} - timelineEntries={Object.values(historyData)} + timelineEntries={historyData} additionalLinks={[ { name: "worldskills.org", diff --git a/src/pages/mobile-applications-development.astro b/src/pages/mobile-applications-development.astro index 52ff8cb..8aeb73e 100644 --- a/src/pages/mobile-applications-development.astro +++ b/src/pages/mobile-applications-development.astro @@ -25,7 +25,7 @@ const historyData = historyJson[lang]["skill08"]; img={Skill08Image} contact="mailto:worldskills@jonas-wanke.de" nationalTeam={[]} - timelineEntries={Object.values(historyData)} + timelineEntries={historyData} additionalLinks={[ { name: "worldskills.org", diff --git a/src/pages/web-technologies.astro b/src/pages/web-technologies.astro index 101288e..551d870 100644 --- a/src/pages/web-technologies.astro +++ b/src/pages/web-technologies.astro @@ -25,7 +25,7 @@ const historyData = historyJson[lang]["skill17"]; img={Skill09Image} contact="mailto:glenn.skrzypczak@gmail.com" nationalTeam={[]} - timelineEntries={Object.values(historyData)} + timelineEntries={historyData} additionalLinks={[ { name: "worldskills.org", From a4fc4d422acfb7b96adc577f154d6106c6a5a21c Mon Sep 17 00:00:00 2001 From: Jonas Wanke Date: Mon, 28 Oct 2024 20:57:57 +0100 Subject: [PATCH 3/5] Add Glenn becoming an expert to history data --- src/assets/data/history.json | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/assets/data/history.json b/src/assets/data/history.json index f73ef09..dac9b99 100644 --- a/src/assets/data/history.json +++ b/src/assets/data/history.json @@ -66,9 +66,9 @@ ], "skill17": [ { - "date": "2024", - "title": "Folgt bald", - "text": "" + "date": "30 Mai 2024", + "title": "Bundestrainer", + "text": "Glenn Skrzypczak wird zum Bundestrainer für Web-Technologien ernannt." } ] }, @@ -139,9 +139,9 @@ ], "skill17": [ { - "date": "2024", - "title": "Coming soon", - "text": "" + "date": "30 May 2024", + "title": "Expert", + "text": "Glenn Skrzypczak becomes the German expert for Web Technologies." } ] } From feb50d42b05ad55ec5ccadbcf71ef41e06c7f4ac Mon Sep 17 00:00:00 2001 From: Jonas Wanke Date: Tue, 29 Oct 2024 14:18:59 +0100 Subject: [PATCH 4/5] Update roadmap links --- src/components/skill/SkillRoadmap.astro | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/components/skill/SkillRoadmap.astro b/src/components/skill/SkillRoadmap.astro index e55bf96..c533b4e 100644 --- a/src/components/skill/SkillRoadmap.astro +++ b/src/components/skill/SkillRoadmap.astro @@ -62,7 +62,7 @@ const t = useTranslations(lang); img={GermanChampionshipImage} title={t({ de: "Deutsche Meisterschaft", en: "German Championship" })} 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/" + link="https://youtu.be/GSxIuskpALY" className="lg:mt-54 md:ml-20 md:mt-48 lg:ml-24 xl:ml-32 xl:mt-72" hoverTextColor="white" /> @@ -70,7 +70,7 @@ const t = useTranslations(lang); img={AlbertEinsteinCupImage} title={t({ de: "Albert-Einstein-Cup", en: "Albert Einstein Cup" })} date={t({ de: "vsl. Mai 2026", en: "around May 2026" })} - link="https://youtu.be/Cvrt7g8es9k" + link="https://youtu.be/dLzMXGLjN3w" className="md:float-right md:mr-20 md:mt-[-4rem] lg:mr-24 xl:mr-32" hoverTextColor="white" /> @@ -78,7 +78,7 @@ const t = useTranslations(lang); img={WsgHandsImage} title="WorldSkills Shanghai" date={t({ de: "22. – 27. September 2026", en: "22 – 27 September 2026" })} - link="https://worldskills2024.com/" + link="https://worldskills2026.com" className="md:ml-60 md:mt-64 lg:ml-72 lg:mt-72 xl:ml-96 xl:mt-96" hoverTextColor="white" /> From 2770db9b17be4da59aeede410199ca9afb19a409 Mon Sep 17 00:00:00 2001 From: Jonas Wanke Date: Wed, 30 Oct 2024 08:45:45 +0100 Subject: [PATCH 5/5] Fix nationals dates 2023 Co-authored-by: Benjamin Frost <58258541+Benjamin-Frost@users.noreply.github.com> --- src/assets/data/history.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/assets/data/history.json b/src/assets/data/history.json index dac9b99..218972e 100644 --- a/src/assets/data/history.json +++ b/src/assets/data/history.json @@ -12,7 +12,7 @@ "text": "Jongwon Kim (Südkorea), Daniel Kalisch (Deutschland) und Wei-Hung Lai (Chinesisch Taipeh) sind die Gewinner des Albert-Einstein-Cups. Stefan Kornel (Ungarn) gewinnt die zusätzliche Disziplin Speed-Programming. Der “Hungarian Speed Test“ machte seinen ersten Auftritt und wurde von Nils Jakubzick (Deutschland) gewonnen." }, { - "date": "25 Mai – 25 Mai 2023", + "date": "22 Mai – 25 Mai 2023", "title": "Deutsche Meisterschaft", "text": "Beide Disziplinen der Deutschen Meisterschaft wurden von Daniel Kalisch, Simon Brebeck and Nils Jakubzick gewonnen. Florian Darsow ist bester im Speed-Programming." }, @@ -85,7 +85,7 @@ "text": "Jongwon Kim (South Korea), Daniel Kalisch (Germany), and Wei-Hung Lai (Chinese Taipei) are the winners of the Albert Einstein Cup. Stefan Kornel (Hungary) wins the additional Speed Programming discipline. The “Hungarian Speed Test“ made its first appearance and was won by Nils Jakubzick (Germany)." }, { - "date": "25 – 25 May 2023", + "date": "22 – 25 May 2023", "title": "German National Championship", "text": "Both skills of the German National Championship are won by Daniel Kalisch, Simon Brebeck, and Nils Jakubzick. Speed Programming is won by Florian Darsow." },