Merge pull request #26 from privacybydesign/yivi-rebranding

Rebranding to Yivi look, feel and texts
privacybydesign · Mar 30, 2023 · 12b493e · 12b493e
2 parents 291ac4a + 2427a17
commit 12b493e
Show file tree

Hide file tree

Showing 30 changed files with 225 additions and 151 deletions.
diff --git a/LICENSE b/LICENSE
@@ -1,6 +1,6 @@
 BSD 3-Clause License
 
-Copyright (c) 2017, IRMA project
+Copyright (c) 2023, Yivi
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without

diff --git a/README.md b/README.md
@@ -1,7 +1,7 @@
 
 # Email server
 
-Add an email address for use in your [IRMA app](https://github.com/privacybydesign/irma_mobile).
+Add an email address for use in your [Yivi app](https://github.com/privacybydesign/irma_mobile).
 
 
 ## Setting up the server

diff --git a/src/main/resources/config.sample.json b/src/main/resources/config.sample.json
@@ -1,7 +1,7 @@
 {
   "verify_email_subject": {
-    "en": "Add email address to your IRMA app",
-    "nl": "Voeg e-mailadres toe aan je IRMA app"
+    "en": "Add email address to your Yivi app",
+    "nl": "Voeg e-mailadres toe aan je Yivi-app"
   },
   "server_url": {
     "en": "http://localhost:8080/irma_email_issuer",
@@ -11,7 +11,7 @@
   "mail_port": 25,
   "mail_user": "",
   "mail_password": "",
-  "mail_from_address": "IRMA Email Issuer <irma@privacybydesign.foundation>",
+  "mail_from_address": "Yivi Email Issuer <yivi@privacybydesign.foundation>",
   "secret_key": "",
   "token_validity": 86400,
   "private_key_path": "sk.der",

diff --git a/src/main/resources/email-en.html b/src/main/resources/email-en.html
@@ -1,9 +1,9 @@
 <html>
     <body style="font-family: Arial, Helvetica, sans-serif; font-size: 16px; line-height: 22px;">
         <div>
-            <p>Click the following link to add your email address to your IRMA app.</p>
+            <p>Click the following link to add the e-mail address to your Yivi app.</p>
             <div>
-                <a href="%s">Load email address attribute</a>
+                <a href="%s">Load e-mail address attribute</a>
             </div>
         </div>
     </body>

diff --git a/src/main/resources/email-nl.html b/src/main/resources/email-nl.html
@@ -1,10 +1,10 @@
 <html>
     <body style="font-family: Arial, Helvetica, sans-serif; font-size: 16px; line-height: 22px;">
         <div>
-            <p>Klik op onderstaande link om je e-mailadres toe te voegen aan je IRMA app.</p>
+            <p>Klik op onderstaande link om het e-mailadres toe te voegen aan je Yivi-app.</p>
             <div>
                 <a href="%s">Laad e-mailadres attribuut</a>
             </div>
         </div>
     </body>
-</html>
+</html>
diff --git a/webapp/build.sh b/webapp/build.sh
@@ -13,7 +13,8 @@ mkdir -p ./build/assets
 cp ./$1/index.html ./build/
 cp ./$1/messages.js ./build/assets/
 cp -r ./fonts ./build/assets/
+cp -r ./images ./build/assets/
 cp ./style.css ./build/assets/
 cp ./common.js ./build/assets/
 cp ./node_modules/jquery/dist/jquery.min.js ./build/assets/
-cp ./node_modules/@privacybydesign/irma-frontend/dist/irma.js ./build/assets/
+cp ./node_modules/@privacybydesign/yivi-frontend/dist/yivi.js ./build/assets/
diff --git a/webapp/common.js b/webapp/common.js
@@ -103,10 +103,10 @@ function issue(jwt, url) {
     setStatus('info', MESSAGES['email-add-verified']);
     console.log('success: ', jwt);
 
-    irma.newPopup({
-        url: config.IRMASERVER,
+    yivi.newPopup({
         language: language,
         session: {
+            url: config.IRMASERVER,
             start: {
                 method: 'POST',
                 headers: {

diff --git a/webapp/en/index.html b/webapp/en/index.html
@@ -7,7 +7,7 @@
   <link rel="stylesheet" href="assets/style.css"/>
   <script src="assets/config.js" defer></script>
   <script src="assets/jquery.min.js" defer></script>
-  <script src="assets/irma.js" defer></script>
+  <script src="assets/yivi.js" defer></script>
   <script src="assets/messages.js" defer></script>
   <script src="assets/common.js" defer></script>
   <script>
@@ -25,10 +25,9 @@
     </div>
     <div id="window-email-add" class="hidden">
       <h1>Adding an e-mail address</h1>
-      <p>On this page you can add an e-mail address to your IRMA app.</p>
+      <p>On this page you can add an e-mail address to your Yivi app.</p>
       <p>
-        Do you want to add multiple e-mail addresses to your IRMA app?
-        Then perform these steps multiple times.
+        Do you want to add multiple e-mail addresses? Then perform these steps multiple times.
       </p>
       <label for="email">E-mail address</label>
       <input type="email" id="email" required class="form-control" placeholder="[email protected]" />
@@ -45,11 +44,11 @@ <h1>Check e-mail address</h1>
     <div id="window-email-sent" class="hidden">
       <h1>Adding an e-mail address</h1>
       <p>It may take a couple of minutes for the e-mail to arrive.
-        If you do not see it, check your spam folder too. Please
+        If it does not, check your spam folder too. Please 
         complete the following steps:</p>
       <ol>
         <li>Open your e-mail application.</li>
-        <li>Open the e-mail message sent by SIDN.</li>
+        <li>Open the e-mail message sent by Yivi.</li>
         <li>Open the link within the e-mail message.</li>
         <li>Go through the steps that are offered.</li>
       </ol>

diff --git a/webapp/en/messages.js b/webapp/en/messages.js
@@ -13,7 +13,7 @@ var MESSAGES = {
     'email-add-success': 'E-mail address added',
     'email-add-cancel': 'Adding personal data is cancelled. You can retry by clicking on the link in the e-mail again.',
     'email-add-timeout': 'Session timed out. Reload this page in order to try again.',
-    'email-add-error': 'Unfortunately, adding this e-mail address to the IRMA app did not succeed.',
+    'email-add-error': 'Unfortunately, adding this e-mail address to your Yivi app did not succeed.',
     'submit-email-add': 'Add address',
     'submit-email-confirm': 'Confirm',
     'issuers-overview-page': 'https://privacybydesign.foundation/issuance/',

diff --git a/webapp/fonts/alexandria-v1-latin-700.woff b/webapp/fonts/alexandria-v1-latin-700.woff
diff --git a/webapp/fonts/alexandria-v1-latin-700.woff2 b/webapp/fonts/alexandria-v1-latin-700.woff2
diff --git a/webapp/fonts/alexandria-v1-latin-regular.woff b/webapp/fonts/alexandria-v1-latin-regular.woff
diff --git a/webapp/fonts/alexandria-v1-latin-regular.woff2 b/webapp/fonts/alexandria-v1-latin-regular.woff2
diff --git a/webapp/fonts/open-sans-v34-latin-700.woff b/webapp/fonts/open-sans-v34-latin-700.woff
diff --git a/webapp/fonts/open-sans-v34-latin-700.woff2 b/webapp/fonts/open-sans-v34-latin-700.woff2
diff --git a/webapp/fonts/open-sans-v34-latin-regular.woff b/webapp/fonts/open-sans-v34-latin-regular.woff
diff --git a/webapp/fonts/open-sans-v34-latin-regular.woff2 b/webapp/fonts/open-sans-v34-latin-regular.woff2
diff --git a/webapp/fonts/subset-Karla-Bold.woff b/webapp/fonts/subset-Karla-Bold.woff
diff --git a/webapp/fonts/subset-Karla-Bold.woff2 b/webapp/fonts/subset-Karla-Bold.woff2
diff --git a/webapp/fonts/subset-Montserrat-Regular.woff b/webapp/fonts/subset-Montserrat-Regular.woff
diff --git a/webapp/fonts/subset-Montserrat-Regular.woff2 b/webapp/fonts/subset-Montserrat-Regular.woff2
diff --git a/webapp/fonts/subset-Montserrat-SemiBold.woff b/webapp/fonts/subset-Montserrat-SemiBold.woff
diff --git a/webapp/fonts/subset-Montserrat-SemiBold.woff2 b/webapp/fonts/subset-Montserrat-SemiBold.woff2
diff --git a/webapp/images/button-primary.svg b/webapp/images/button-primary.svg
diff --git a/webapp/nl/index.html b/webapp/nl/index.html
@@ -7,7 +7,7 @@
   <link rel="stylesheet" href="assets/style.css" />
   <script src="assets/config.js" defer></script>
   <script src="assets/jquery.min.js" defer></script>
-  <script src="assets/irma.js" defer></script>
+  <script src="assets/yivi.js" defer></script>
   <script src="assets/messages.js" defer></script>
   <script src="assets/common.js" defer></script>
   <script>
@@ -25,7 +25,7 @@
     </div>
     <div id="window-email-add" class="hidden">
       <h1>E-mailadres toevoegen</h1>
-      <p>Zet je e-mailadres in je IRMA-app.</p>
+      <p>Zet je e-mailadres in je Yivi-app.</p>
       <p>Wil je meerdere e-mailadressen toevoegen? Doorloop deze stappen dan voor elk e-mailadres dat je wilt toevoegen.</p>
       <label for="email">E-mailadres</label>
       <input type="email" id="email" required class="form-control" placeholder="[email protected]"/>
@@ -42,7 +42,7 @@ <h1>E-mailadres toevoegen</h1>
         ook de spam-folder. Doorloop de volgende stappen:</p>
       <ol>
         <li>Open je e-mailprogramma.</li>
-        <li>Open het e-mailbericht van SIDN.</li>
+        <li>Open het e-mailbericht van Yivi.</li>
         <li>Open de link in het e-mailbericht.</li>
         <li>Doorloop de stappen die worden aangeboden.</li>
       </ol>

diff --git a/webapp/nl/messages.js b/webapp/nl/messages.js
@@ -13,7 +13,7 @@ var MESSAGES = {
     'email-add-success': 'Het e-mailadres is toegevoegd',
     'email-add-cancel': 'Gegevens toevoegen is geannuleerd. Je kan het opnieuw proberen door nogmaals op de link in de e-mail te klikken.',
     'email-add-timeout': 'De sessie is verlopen. Herlaad de pagina om het eventueel opnieuw te proberen.',
-    'email-add-error': 'Het is helaas niet gelukt dit e-mailadres toe te voegen aan de IRMA app.',
+    'email-add-error': 'Het is helaas niet gelukt dit e-mailadres toe te voegen aan jouw Yivi-app.',
     'submit-email-add': 'Voeg adres toe',
     'submit-email-confirm': 'Bevestig',
     'issuers-overview-page': 'https://privacybydesign.foundation/uitgifte/',

diff --git a/webapp/package-lock.json b/webapp/package-lock.json
diff --git a/webapp/package.json b/webapp/package.json
@@ -7,7 +7,7 @@
     "build": "./build.sh"
   },
   "dependencies": {
-    "@privacybydesign/irma-frontend": "^0.4.3",
-    "jquery": "^3.4.1"
+    "@privacybydesign/yivi-frontend": "^0.1.0",
+    "jquery": "^3.6.3"
   }
 }