From 4486cb10cf86cfb3746478be08698d6d5d9df713 Mon Sep 17 00:00:00 2001
From: Christian Cueni <christian.cueni@iterativ.ch>
Date: Mon, 24 Jul 2023 10:25:49 +0200
Subject: [PATCH] Add uk texts on dashboard

---
 client/src/locales/de/translation.json |  8 ++-
 client/src/locales/fr/translation.json |  2 +-
 client/src/locales/it/translation.json |  2 +-
 client/src/pages/DashboardPage.vue     | 89 +++++++++++++++-----------
 client/src/pages/LoginPage.vue         |  4 +-
 5 files changed, 62 insertions(+), 43 deletions(-)

diff --git a/client/src/locales/de/translation.json b/client/src/locales/de/translation.json
index a47646ee..a1153cae 100644
--- a/client/src/locales/de/translation.json
+++ b/client/src/locales/de/translation.json
@@ -209,7 +209,6 @@
     "welcomeBack": "Willkommen zurück in deinem Lehrgang:"
   },
   "login": {
-    "contact": "Kontakt",
     "demoLogin": "Demo Login",
     "login": "Login",
     "ssoLogin": "SSO Login/Registration",
@@ -264,10 +263,15 @@
       "address": "Laupenstrasse 10, 3008 Bern",
       "team": "Team Nachwuchsentwicklung",
       "title": "Berufsbildungsverband der Versicherungswirtschaft VBV"
+    },
+    "dashboard": {
+      "allClear": "Alles klar?",
+      "nextSteps": "Als lernende Person wirst in den kommenden Tagen einem üK-Lehrgang zugewiesen. Dann\nerscheint hier Deine personalisierte Lehrgangs-Box mit den weiteren Informationen.",
+      "welcome": "Es hat alles geklappt, du bist nun auf der digitalen Lernumgebung des Berufsbildungsverbands der\nVersicherungswirtschaft (VBV) registriert!"
     }
   },
   "x von y Bewertungen freigegeben": "{{x}} von {{y}} Bewertungen freigegeben",
   "x von y Ergebnisse abgegeben": "{{x}} von {{y}} Ergebnisse abgegeben",
   "x von y Feedbacks abgegeben": "{{x}} von {{y}} Feedbacks abgegeben",
   "x von y abgeschlossen": "{{x}} von {{y}} abgeschlossen"
-}
\ No newline at end of file
+}
diff --git a/client/src/locales/fr/translation.json b/client/src/locales/fr/translation.json
index f83ec0e2..ce39c427 100644
--- a/client/src/locales/fr/translation.json
+++ b/client/src/locales/fr/translation.json
@@ -247,4 +247,4 @@
   "settings": {
     "emailNotifications": "Notifications par e-mail"
   }
-}
\ No newline at end of file
+}
diff --git a/client/src/locales/it/translation.json b/client/src/locales/it/translation.json
index 57e6193f..8948cffc 100644
--- a/client/src/locales/it/translation.json
+++ b/client/src/locales/it/translation.json
@@ -247,4 +247,4 @@
   "settings": {
     "emailNotifications": "Notifiche e-mail"
   }
-}
\ No newline at end of file
+}
diff --git a/client/src/pages/DashboardPage.vue b/client/src/pages/DashboardPage.vue
index 78893e11..8606d679 100644
--- a/client/src/pages/DashboardPage.vue
+++ b/client/src/pages/DashboardPage.vue
@@ -34,50 +34,65 @@ const getNextStepLink = (courseSession: CourseSession) => {
         <h1 data-cy="welcome-message">
           {{ $t("dashboard.welcome", { name: userStore.first_name }) }}
         </h1>
-        <div
-          v-if="courseSessionsStore.uniqueCourseSessionsByCourse.length > 0"
-          class="mb-14"
-        >
-          <h2 class="mb-3 mt-12">{{ $t("dashboard.courses") }}</h2>
+        <div v-if="courseSessionsStore.uniqueCourseSessionsByCourse.length > 0">
+          <div class="mb-14">
+            <h2 class="mb-3 mt-12">{{ $t("dashboard.courses") }}</h2>
 
-          <div class="grid auto-rows-fr grid-cols-1 gap-4 md:grid-cols-2">
-            <div
-              v-for="courseSession in courseSessionsStore.uniqueCourseSessionsByCourse"
-              :key="courseSession.id"
-            >
-              <div class="bg-white p-6 md:h-full">
-                <h3 class="mb-4">{{ courseSession.course.title }}</h3>
-                <div>
-                  <LearningPathDiagramSmall
-                    class="mb-4"
-                    :course-slug="courseSession.course.slug"
-                  ></LearningPathDiagramSmall>
-                </div>
-                <div>
-                  <router-link
-                    class="btn-blue"
-                    :to="getNextStepLink(courseSession).value"
-                    :data-cy="`continue-course-${courseSession.course.id}`"
-                  >
-                    {{ $t("general.nextStep") }}
-                  </router-link>
+            <div class="grid auto-rows-fr grid-cols-1 gap-4 md:grid-cols-2">
+              <div
+                v-for="courseSession in courseSessionsStore.uniqueCourseSessionsByCourse"
+                :key="courseSession.id"
+              >
+                <div class="bg-white p-6 md:h-full">
+                  <h3 class="mb-4">{{ courseSession.course.title }}</h3>
+                  <div>
+                    <LearningPathDiagramSmall
+                      class="mb-4"
+                      :course-slug="courseSession.course.slug"
+                    ></LearningPathDiagramSmall>
+                  </div>
+                  <div>
+                    <router-link
+                      class="btn-blue"
+                      :to="getNextStepLink(courseSession).value"
+                      :data-cy="`continue-course-${courseSession.course.id}`"
+                    >
+                      {{ $t("general.nextStep") }}
+                    </router-link>
+                  </div>
                 </div>
               </div>
             </div>
           </div>
+          <div>
+            <h3 class="mb-6">{{ $t("dashboard.dueDatesTitle") }}</h3>
+            <DueDatesList
+              class="bg-white p-6"
+              :due-dates="allDueDates"
+              :max-count="10"
+              :show-top-border="false"
+            ></DueDatesList>
+          </div>
         </div>
         <div v-else class="mb-14">
-          <h2 class="mb-3 mt-12">{{ $t("dashboard.courses") }}</h2>
-          <p>{{ $t("dashboard.nocourses") }}</p>
-        </div>
-        <div>
-          <h3 class="mb-6">{{ $t("dashboard.dueDatesTitle") }}</h3>
-          <DueDatesList
-            class="bg-white p-6"
-            :due-dates="allDueDates"
-            :max-count="10"
-            :show-top-border="false"
-          ></DueDatesList>
+          <div class="mb-12">
+            <h2 class="mb-3 mt-12">{{ $t("dashboard.courses") }}</h2>
+            <p class="mb-8">{{ $t("uk.dashboard.welcome") }}</p>
+            <p>{{ $t("uk.dashboard.nextSteps") }}</p>
+          </div>
+          <div>
+            <h2 class="mb-3 mt-12">{{ $t("uk.dashboard.allClear") }}</h2>
+            <h3 class="font-normal">{{ $t("footer.contact") }}</h3>
+            <address class="not-italic">
+              <p class="non-italic">
+                {{ $t("uk.contact.title") }}
+                <br />
+                {{ $t("uk.contact.team") }}
+                <br />
+                {{ $t("uk.contact.address") }}
+              </p>
+            </address>
+          </div>
         </div>
       </div>
     </main>
diff --git a/client/src/pages/LoginPage.vue b/client/src/pages/LoginPage.vue
index 0e141f4d..3363da51 100644
--- a/client/src/pages/LoginPage.vue
+++ b/client/src/pages/LoginPage.vue
@@ -94,8 +94,8 @@ const userStore = useUserStore();
       </div>
     </div>
     <div class="container-medium">
-      <h2 class="mb-8">{{ $t("login.contact") }}</h2>
-      <address class="non-italic">
+      <h2 class="mb-8">{{ $t("footer.contact") }}</h2>
+      <address class="not-italic">
         <p class="non-italic">
           {{ $t("uk.contact.title") }}
           <br />