feat(login): display currently logged in user and municipality

inosca · Jul 11, 2022 · 4e24d1e · 4e24d1e
1 parent bb90ccc
commit 4e24d1e
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 4 deletions.
diff --git a/addon/components/login-modal.hbs b/addon/components/login-modal.hbs
@@ -1,7 +1,8 @@
 {{#if this.authFetch.showAuthModal}}
   <UkCard
     @color="default"
-    class="ember-ebau-gwr-login uk-width-2xlarge uk-margin-auto" as |card|
+    class="ember-ebau-gwr-login uk-width-2xlarge uk-margin-auto"
+    as |card|
   >
     <card.header>
       <h2 class="uk-modal-title">
@@ -46,7 +47,8 @@
             @noMatchesMessage={{t
               "ember-gwr.components.loginModal.municipalityNoneFound"
             }}
-            @onChange={{this.updateMunicipality}} as |municipality|
+            @onChange={{this.updateMunicipality}}
+            as |municipality|
           >
             {{municipality.name}}
           </PowerSelect>
@@ -65,6 +67,17 @@
     </card.footer>
   </UkCard>
 {{else}}
-  <Logout />
+  <div class="uk-flex uk-flex-middle uk-flex-right">
+    <span class="uk-margin-right">
+      {{t
+        "ember-gwr.components.loginModal.loginInfo"
+        user=this.authFetch.username
+        municipality=(get
+          (find-by "id" this.authFetch.municipality this.municipalities) "name"
+        )
+      }}
+    </span>
+    <Logout />
+  </div>
   {{yield}}
-{{/if}}
+{{/if}}
diff --git a/addon/services/auth-fetch.js b/addon/services/auth-fetch.js
@@ -11,6 +11,7 @@ export default class AuthFetchService extends Service {
   @tracked showAuthModal = false;
   @tracked token;
   @tracked municipality;
+  @tracked username;
 
   constructor(...args) {
     super(...args);
@@ -69,6 +70,7 @@ export default class AuthFetchService extends Service {
 
     this.token = json.token;
     this.municipality = json.municipality;
+    this.username = json.username;
     return json;
   }
 

diff --git a/translations/de.yaml b/translations/de.yaml
@@ -225,6 +225,7 @@ ember-gwr:
       municipality: Wählen Sie Ihre Gemeinde aus...
       municipalitySearch: Gemeinde suchen...
       municipalityNoneFound: Es wurde keine Gemeinde gefunden
+      loginInfo: "{user} angemeldet in  {municipality}"
 
     logout: Abmelden
 

diff --git a/translations/fr.yaml b/translations/fr.yaml
@@ -225,6 +225,7 @@ ember-gwr:
       municipality: Sélectionnez votre commune...
       municipalitySearch: Chercher une commune...
       municipalityNoneFound: Aucune commune n'a été trouvée
+      loginInfo:
 
     logout: Se déconnecter