WIP for #1197

Author: oharsta

.gitignore

@@ -30,4 +30,5 @@ spring-security-migration.md
 pom.xml.versionsBackup
 dependency.tree
 PlaygroundTest.java
-ERRORS.md
+ERRORS.md
+website

public-gui/src/App.jsx

@@ -14,6 +14,7 @@ import {Privacy} from "./routes/Privacy.jsx";
 import {InstallApp} from "./routes/InstallApp.jsx";
 import {TiqrAuth} from "./routes/TiqrAuth.jsx";
 import {ServiceDesk} from "./routes/ServiceDesk.jsx";
+import {Verify} from "./routes/Verify.jsx";
 
 function App() {
 
@@ -47,6 +48,7 @@ function App() {
                         <Route path="/install-app" element={<InstallApp/>}/>
                         <Route path="/servicedesk" element={<ServiceDesk/>}/>
                         <Route path="/servicedesk-en" element={<ServiceDesk/>}/>
+                        <Route path="/verify" element={<Verify/>}/>
                         <Route path="*" element={<NotFound/>}/>
                     </Routes>
                 </div>

public-gui/src/App.scss

@@ -81,8 +81,9 @@ h5 {
 
     &.with-collapse-fields {
         padding: 35px 0;
+        gap: 0;
         width: 100%;
-        h3 {
+        h2, h3 {
             padding: 0 35px 12px 35px;
         }
     }
@@ -101,5 +102,28 @@ h5 {
 
 }
 
+table.servicedesk-table {
+    width: 100%;
+    border-collapse: collapse;
+    margin: 12px 0;
+    font-size: 14px;
 
+    th, td {
+        text-align: left;
+        padding: 8px 12px;
+        border: 1px solid var(--sl-color-grey-100);
+    }
+
+    thead tr {
+        background-color: var(--sl-color-neutral-50);
+
+        th {
+            font-weight: 600;
+        }
+    }
+
+    tbody tr {
+        background-color: white;
+    }
+}
 

public-gui/src/assets/verify.svg

@@ -5,7 +5,10 @@
     padding: 16px 24px 16px 35px;
 
     border-top: 1px solid var(--sl-color-grey-100);
-    border-bottom: 1px solid var(--sl-color-grey-100);
+
+    &:last-child {
+        border-bottom: 1px solid var(--sl-color-grey-100);
+    }
 
     .info-link-field-inner {
         display: flex;

public-gui/src/components/InfoLinkField.scss

@@ -7,7 +7,7 @@ import {useAppStore} from "../stores/AppStore.js";
 import {Button, ButtonType} from "@surfnet/sds";
 import {LanguageSelector} from "./LanguageSelector.jsx";
 
-const tabNames = ["home", "about", "support"]
+const tabNames = ["home", "about", "support", "verify", "servicedesk"]
 
 export const Navigation = ({mobile, path}) => {
 

public-gui/src/components/Navigation.jsx

@@ -28,3 +28,12 @@ $tablet-width-cutoff: 821px;
     flex-direction: column;
     gap: 25px;
 }
+
+strong {
+    font-weight: 600;
+}
+
+p.section-label {
+    font-weight: 600;
+    margin-bottom: 10px;
+}

public-gui/src/index.scss

@@ -5,7 +5,9 @@ const en = {
     tabs: {
         home: "Home",
         support: "Help",
-        about: "About eduID"
+        about: "About eduID",
+        verify: "Verify",
+        servicedesk: "Service Desk"
     },
     header: {
         mineEduID: "My eduID",
@@ -18,9 +20,9 @@ const en = {
         eduID: "eduID",
         title: "Easily prove who you are",
         whatCanYouDo: "What is eduID for?",
-        info1: "Verify your identity for education and research in the Netherlands",
-        info2: "Log in to a growing number of websites and online services",
-        info3: "For students, staff, and professionals",
+        info1: "Log in to a growing number of education and research services, whether you're a student, staff member, or professional.",
+        info2: "Your eduID stays with you throughout your entire career, from your studies to work and courses later in life.",
+        info3: "You always have full insight into and control over your personal data.",
         readMore: "Learn more about eduID",
         eduIdApp: "Want to log in faster and more securely?",
         appInfo: "With the <strong>eduID app</strong>, you can log in without a password or checking your email. Installation is quick and easy.",
@@ -29,47 +31,6 @@ const en = {
         appStoreAlt: "Download on the App Store",
         googlePlayAlt: "Get it on Google Play",
     },
-    about: {
-        eduID: "About eduID",
-        title: "One account for educational and research institutions",
-        why: "What is eduID?",
-        whyInfo1: "eduID helps students, staff, and professionals easily prove their identity at educational and research institutions in the Netherlands. Students are increasingly attending courses at multiple institutions. Previously, students couldn't log in to one institution using an account from another. Staff, professionals, and guests experience the same problems and are often active at multiple institutions.",
-        whyInfo2: "eduID solves this problem by providing one account to verify your identity across multiple Dutch educational and research institutions.",
-        register: "How to get an eduID?",
-        registerInfo: "Creating an eduID is simple. Press <strong>Create an eduID</strong> at the top of the page. After creating your eduID, you may need to verify your identity through an official party, such as your school, university, or bank.",
-        logins: "How to confirm your identity?",
-        loginsInfo: "In most cases, you must prove your identity through an official party before you can fully use your eduID. You can do this in the following ways:",
-
-        magicLink: "Code in email",
-        password: "Password",
-        passKey: "Passkey",
-        identity: "How to use eduID?",
-        identityInfo1: "You can use eduID to log in to websites and online services in the Netherlands. We recommend using the eduID app for the most secure and convenient experience. The app lets you log in without a password, and two-factor authentication (2FA) adds an extra layer of security.",
-        identityInfo2: "Prefer not to download an app? You can also log in using:",
-        institution: "Via a Dutch educational institution",
-        institutionInfo: "Log in to your institution, which will then share details like your name and role (student, lecturer, etc.) with us.",
-        bank: "Via a Dutch banking app",
-        bankInfo: "Log in to your bank, which will provide us with your name and date of birth. No payment is required.",
-        european: "With a European ID",
-        europeanInfo: "Show your ID and a verification code at an eduID Service Desk (online or at an institution).",
-        manage: "Where can you find your data?",
-        manageInfo: "In <a href='{{url}}'>My eduID</a>, you can view your name, email address, and security settings. You can also check which websites and services you’ve accessed with eduID and download or delete your data."
-    },
-    support: {
-        eduID: "Help",
-        title: "When you need assistance",
-        studying: "Do you study in the Netherlands?",
-        connect: "Connect your educational institution",
-        studyInfo: "Before you can use eduID for services in Dutch education, we need to verify your identity. That’s why we ask you to add the following information to your eduID:",
-        informationBullet1: "Your full name, verified by an official party",
-        informationBullet2: "Proof that you are a student",
-        informationBullet3: "Your current institutionValidation of your full name by a third party",
-        allAtOnce: "You can add this information all at once by connecting your educational institution to eduID. To do this, press <strong>Add an institution</strong> in the eduID app or <a href='{{url}}'>My eduID</a>.",
-        mobileScreenshotAlt: "Screenshot of the eduID app showing where to add an institution",
-        note: "<strong>Note</strong>: did you create an eduID last school year? You may need to connect your institution again.",
-        help: "Need more help?",
-        helpInfo: "Have a look at the <a href=\"https://servicedesk.surf.nl/wiki/x/MIJsB\">eduID documentation</a> and the <a href=\"https://servicedesk.surf.nl/wiki/x/ToJsB\">FAQ</a>, or send an email to <a href='mailto:help@eduid.nl'>help@eduid.nl</a>. We’ll get back to you as soon as possible."
-    },
     privacy: {
         eduID: "Privacy Policy",
         title: "Version October 18, 2024"
@@ -78,33 +39,12 @@ const en = {
         eduID: "Terms of Use",
         title: "Version June 17, 2024"
     },
-    servicedesk: {
-        title: "Servicedesk",
-        info:"For more information about how, when and by which service desk you can verify your eduID using a code, please visit our" +
-            " <a href='https://servicedesk.surf.nl/wiki/pages/viewpage.action?pageId=166920533'>Wiki</a>"
-    },
     footer: {
         terms: "Terms of Use",
-        termsLink: "https://support.surfconext.nl/terms-en",
         privacy: "Privacy Policy",
-        privacyLink: "https://support.surfconext.nl/privacy-en",
         surfLink: "https://surf.nl",
         surfLogoLabel: "SURF",
         euLogoAlt: "Funded by the European Union. NextGenerationEU."
     },
-    faq: [
-        {
-            q: "question 1",
-            a: "answer 1 with {{variable}} interpolation"
-        },
-        {
-            q: "question 2",
-            a: "answer 2 with <code>HTML</code> formatting"
-        },
-        {
-            q: "question 3",
-            a: "answer 3"
-        }
-    ]
 }
 export default en;

public-gui/src/locale/en.js

@@ -5,7 +5,9 @@ const nl = {
     tabs: {
         home: "Home",
         support: "Help",
-        about: "Over eduID"
+        about: "Over eduID",
+        verify: "Verificatie",
+        servicedesk: "Servicedesk"
     },
     header: {
         mineEduID: "Mijn eduID",
@@ -29,34 +31,6 @@ const nl = {
         appStoreAlt: "Download in de App Store",
         googlePlayAlt: "Ontdek het op Google Play",
     },
-    about: {
-        eduID: "Over eduID",
-        title: "Eén account voor onderwijs- en onderzoeksinstellingen",
-        why: "Wat is eduID?",
-        whyInfo1: "eduID is één account waarmee je eenvoudig inlogt bij verschillende onderwijs- en onderzoeksinstellingen in Nederland, of je nu student, medewerker of professional bent.",
-        whyInfo2: "eduID is de oplossing: één account waarmee je bij verschillende Nederlandse onderwijs- en onderzoeksinstellingen kunt bewijzen wie je bent.",
-        register: "Hoe gebruik je eduID?",
-        createEduId: "1. Maak een eduID aan",
-        createEduIdInfo: "Klik op 'eduID aanmaken' en volg de stappen.</br>. Gebruik een persoonlijk e-mailadres dat je blijft gebruiken, ook als je van school of baan verandert.",
-        logins: "Waar vind je je account en gegevens terug?",
-        loginsInfo: "Heb je een eduID aangemaakt? Dan vind je in <a href='{{}}' target='_blank'>Mijn eduID</a> alle gegevens, zoals je naam, e-mailadres en hoe je eduID beveiligd is. Deze gegevens kun je beheren en aanpassen als je dat wilt. In Mijn eduID kun je ook zien bij welke websites en diensten je bent ingelogd met eduID.",
-
-    },
-    support: {
-        eduID: "Help",
-        title: "Voor als je er niet uit komt",
-        studying: "Studeer je in Nederland?",
-        connect: "Koppel je onderwijsinstelling",
-        studyInfo: "We moeten eerst zeker zijn wie je bent. Alleen zo kun je eduID gebruiken voor diensten in het Nederlandse onderwijs. Daarom vragen we je deze gegevens toe te voegen aan je eduID:",
-        informationBullet1: "Je volledige naam, bevestigd door een officiële partij",
-        informationBullet2: "Bewijs dat je student bent",
-        informationBullet3: "Je huidige instelling",
-        allAtOnce: "Je kunt deze gegevens in één keer toevoegen door je onderwijsinstelling te koppelen met eduID. Druk hiervoor op <strong>Voeg instelling toe</strong> in de eduID app of <a href='{{url}}'>Mijn eduID</a>.",
-        mobileScreenshotAlt: "Screenshot van de eduID app waarop te zien is waar je een instelling toevoegt",
-        note: "<strong>Let op:</strong> heb je vorig schooljaar al een eduID gemaakt? Dan moet je misschien opnieuw je instelling koppelen",
-        help: "Meer hulp nodig?",
-        helpInfo: "Bekijk de <a href=\"https://servicedesk.surf.nl/wiki/x/L4JsB\">eduID documentatie</a> en de <a href=\"https://servicedesk.surf.nl/wiki/x/UIJsB\">veelgestelde vragen</a>. Als je er niet uit komt kun je een e-mail sturen naar <a href='mailto:help@eduID.nl'>help@eduid.nl</a>. We komen zo snel mogelijk bij je terug."
-    },
     privacy: {
         eduID: "Privacyverklaring",
         title: "Versie 18 oktober 2024"
@@ -65,20 +39,12 @@ const nl = {
         eduID: "Gebruiksvoorwaarden",
         title: "Versie 17 juni 2024"
     },
-    servicedesk: {
-        title: "Servicedesk",
-        info:"Meer informatie over hoe, wanneer en bij welke service desk je je eduID met behulp van een code kan verifiëren? Kijk dan op onze" +
-            " <a href='https://servicedesk.surf.nl/wiki/pages/viewpage.action?pageId=166920530'>Wiki</a>",
-    },
     footer: {
         terms: "Gebruiksvoorwaarden",
-        termsLink: "https://eduid.nl/terms",
         privacy: "Privacyverklaring",
-        privacyLink: "https://eduid.nl/privacy",
         surfLink: "https://surf.nl",
         surfLogoLabel: "SURF",
         euLogoAlt: "Funded by the European Union. NextGenerationEU."
     },
-
 }
 export default nl;