From da092f9cef31acb356ed5070deaff219d6bec701 Mon Sep 17 00:00:00 2001
From: Max <maxes2000@t-online.de>
Date: Sun, 29 Dec 2019 21:36:04 +0100
Subject: [PATCH] added "hello, <username>"

---
 .../main-navigation/main-navigation.component.html    | 11 +++++++----
 .../main-navigation/main-navigation.component.sass    |  2 +-
 src/app/services/selfservice/self.service.ts          |  2 +-
 3 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/src/app/components/main-navigation/main-navigation.component.html b/src/app/components/main-navigation/main-navigation.component.html
index 7e6bd26..cc00b3d 100644
--- a/src/app/components/main-navigation/main-navigation.component.html
+++ b/src/app/components/main-navigation/main-navigation.component.html
@@ -3,9 +3,11 @@
   <mat-sidenav #drawer class="sidenav" 
       fxShow="true" fxHide.gt-sm="true"
       fixedInViewport="false"
-      autoFocus="false"
-     >
-    <mat-toolbar>Menu</mat-toolbar>
+      autoFocus="false">
+    <mat-toolbar *ngIf="!loggedIn">Menu</mat-toolbar>
+    <mat-toolbar *ngIf="loggedIn">
+        <span>Hello, {{user.username}}</span>
+    </mat-toolbar>
     <mat-nav-list>
       <a mat-list-item routerLink="" (click)="drawer.close()">Home</a>
       <a mat-list-item *ngIf="loggedIn" routerLink={{profileUrl}} (click)="drawer.close()">Profile</a>
@@ -56,6 +58,7 @@
         </div>
       </nav>
       <div id="menu-button-box">
+        <span class="mat-button" [hidden]="!loggedIn" fxShow="true" fxHide.lt-md="true" routerLink={{profileUrl}}>Hello, {{user.username}}</span>
         <button mat-icon-button [matMenuTriggerFor]="requestMenu" [disabled]="!loggedIn" id="menu-button">
           <mat-icon [matBadge]="user.receivedRequests.length" [matBadgeHidden]="!(user.receivedRequests.length > 0)" matBadgeColor="accent">notifications</mat-icon>
         </button>
@@ -81,7 +84,7 @@
           <mat-slide-toggle
             color="primary"
             class="theme-button"
-            (change)="toggleTheme()"><!--stays white when dragged-->
+            (change)="toggleTheme()">
             dark mode
           </mat-slide-toggle>
         </button>
diff --git a/src/app/components/main-navigation/main-navigation.component.sass b/src/app/components/main-navigation/main-navigation.component.sass
index 7338cbb..b650cc7 100644
--- a/src/app/components/main-navigation/main-navigation.component.sass
+++ b/src/app/components/main-navigation/main-navigation.component.sass
@@ -19,7 +19,7 @@
   top: 0
   z-index: 1000
   .mat-tab-nav-bar
-    width: 70%
+    width: 50%
     height: 56px
   .mat-tab-links
     height: 56px
diff --git a/src/app/services/selfservice/self.service.ts b/src/app/services/selfservice/self.service.ts
index 05127d9..6422530 100644
--- a/src/app/services/selfservice/self.service.ts
+++ b/src/app/services/selfservice/self.service.ts
@@ -32,7 +32,7 @@ export class SelfService {
       }, error => {
         this.notLoggedIn();
         console.log(error.text());
-        // this.fakeLogin();
+        this.fakeLogin();
         // console.log('user wurde übergeben');
       }
       );