From 95239e05909f0e7bb77f876be0c78a2e775f7144 Mon Sep 17 00:00:00 2001
From: Julius Gruber <julius.gruber@tuwien.ac.at>
Date: Tue, 8 Oct 2019 10:13:46 +0200
Subject: [PATCH] upToDate - ready to be worked on

---
 src/app/+login-page/login-page.component.html |  8 ++++--
 .../auth-nav-menu.component.html              | 28 +++++++++++--------
 src/app/shared/log-in/log-in.component.ts     |  2 ++
 .../password/log-in-password.component.ts     |  2 +-
 src/app/shared/shared.module.ts               |  1 -
 5 files changed, 25 insertions(+), 16 deletions(-)

diff --git a/src/app/+login-page/login-page.component.html b/src/app/+login-page/login-page.component.html
index ebfa0a3aeb..4da0af9cde 100644
--- a/src/app/+login-page/login-page.component.html
+++ b/src/app/+login-page/login-page.component.html
@@ -3,9 +3,11 @@
     <div>
       <img class="mb-4 login-logo" src="assets/images/dspace-logo.png">
       <h1 class="h3 mb-0 font-weight-normal">{{"login.form.header" | translate}}</h1>
-      <ds-log-in
-      [isStandalonePage]="true"></ds-log-in>
-      <ds-auth-methods></ds-auth-methods>
+     <!-- <ds-log-in
+        [isStandalonePage]="true"></ds-log-in>-->
+      <ds-auth-methods
+        [isStandalonePage]="true">
+      </ds-auth-methods>
     </div>
   </div>
 </div>
diff --git a/src/app/shared/auth-nav-menu/auth-nav-menu.component.html b/src/app/shared/auth-nav-menu/auth-nav-menu.component.html
index 7a64eb5e9f..00258b861e 100644
--- a/src/app/shared/auth-nav-menu/auth-nav-menu.component.html
+++ b/src/app/shared/auth-nav-menu/auth-nav-menu.component.html
@@ -1,29 +1,35 @@
 <ul class="navbar-nav" [ngClass]="{'mr-auto': (isXsOrSm$ | async)}">
-  <li *ngIf="!(isAuthenticated | async) && !(isXsOrSm$ | async) && (showAuth | async)" class="nav-item" (click)="$event.stopPropagation();">
+  <li *ngIf="!(isAuthenticated | async) && !(isXsOrSm$ | async) && (showAuth | async)" class="nav-item"
+      (click)="$event.stopPropagation();">
     <div ngbDropdown placement="bottom-right" class="d-inline-block" @fadeInOut>
-      <a href="#" id="dropdownLogin" (click)="$event.preventDefault()" ngbDropdownToggle class="px-1">{{ 'nav.login' | translate }}</a>
-      <div id="loginDropdownMenu" [ngClass]="{'pl-3 pr-3': (loading | async)}" ngbDropdownMenu aria-labelledby="dropdownLogin">
-        <ds-log-in
-        [isStandalonePage]="false"></ds-log-in>
-       <!-- <ds-log-in></ds-log-in>-->
-       <!-- <ds-login-container></ds-login-container>-->
-        <ds-auth-methods></ds-auth-methods>
+      <a href="#" id="dropdownLogin" (click)="$event.preventDefault()" ngbDropdownToggle
+         class="px-1">{{ 'nav.login' | translate }}</a>
+      <div id="loginDropdownMenu" [ngClass]="{'pl-3 pr-3': (loading | async)}" ngbDropdownMenu
+           aria-labelledby="dropdownLogin">
+      <!--  <ds-log-in
+          [isStandalonePage]="false"></ds-log-in>-->
+        <ds-auth-methods
+          [isStandalonePage]="false"></ds-auth-methods>
       </div>
     </div>
   </li>
   <li *ngIf="!(isAuthenticated | async) && (isXsOrSm$ | async)" class="nav-item">
-    <a id="loginLink" routerLink="/login" routerLinkActive="active" class="px-1" >{{ 'nav.login' | translate }}<span class="sr-only">(current)</span></a>
+    <a id="loginLink" routerLink="/login" routerLinkActive="active" class="px-1">{{ 'nav.login' | translate }}<span
+      class="sr-only">(current)</span></a>
   </li>
   <li *ngIf="(isAuthenticated | async) && !(isXsOrSm$ | async) && (showAuth | async)" class="nav-item">
     <div ngbDropdown placement="bottom-right" class="d-inline-block" @fadeInOut>
-      <a href="#" id="dropdownUser" (click)="$event.preventDefault()" class="px-1" ngbDropdownToggle><i class="fas fa-user-circle fa-lg fa-fw" [title]="'nav.logout' | translate"></i></a>
+      <a href="#" id="dropdownUser" (click)="$event.preventDefault()" class="px-1" ngbDropdownToggle><i
+        class="fas fa-user-circle fa-lg fa-fw" [title]="'nav.logout' | translate"></i></a>
       <div id="logoutDropdownMenu" ngbDropdownMenu aria-labelledby="dropdownUser">
         <ds-user-menu></ds-user-menu>
       </div>
     </div>
   </li>
   <li *ngIf="(isAuthenticated | async) && (isXsOrSm$ | async)" class="nav-item">
-    <a id="logoutLink" routerLink="/logout" routerLinkActive="active" class="px-1"><i class="fas fa-user-circle fa-lg fa-fw" [title]="'nav.logout' | translate"></i><span class="sr-only">(current)</span></a>
+    <a id="logoutLink" routerLink="/logout" routerLinkActive="active" class="px-1"><i
+      class="fas fa-user-circle fa-lg fa-fw" [title]="'nav.logout' | translate"></i><span
+      class="sr-only">(current)</span></a>
   </li>
 </ul>
 
diff --git a/src/app/shared/log-in/log-in.component.ts b/src/app/shared/log-in/log-in.component.ts
index e800718db0..0678701c3c 100644
--- a/src/app/shared/log-in/log-in.component.ts
+++ b/src/app/shared/log-in/log-in.component.ts
@@ -17,6 +17,8 @@ export class LogInComponent implements OnInit {
    */
   @Input() authMethodData: Observable<AuthMethodModel[]>;
 
+  @Input() isStandalonePage: boolean;
+
   /**
    * Whether user is authenticated.
    * @type {Observable<string>}
diff --git a/src/app/shared/log-in/methods/password/log-in-password.component.ts b/src/app/shared/log-in/methods/password/log-in-password.component.ts
index 7f98152391..564e4174e5 100644
--- a/src/app/shared/log-in/methods/password/log-in-password.component.ts
+++ b/src/app/shared/log-in/methods/password/log-in-password.component.ts
@@ -139,7 +139,7 @@ export class LogInPasswordComponent implements OnDestroy, OnInit {
       takeWhile(() => this.alive),
       filter((authenticated) => authenticated))
       .subscribe(() => {
-          this.authService.redirectToPreviousUrl();
+          this.authService.redirectAfterLoginSuccess(true); // HARDCODED FOR DEV _ CHANGE IT
         }
       );
 
diff --git a/src/app/shared/shared.module.ts b/src/app/shared/shared.module.ts
index 302135aa6d..17f5eb9db8 100644
--- a/src/app/shared/shared.module.ts
+++ b/src/app/shared/shared.module.ts
@@ -47,7 +47,6 @@ import { SearchResultGridElementComponent } from './object-grid/search-result-gr
 import { ViewModeSwitchComponent } from './view-mode-switch/view-mode-switch.component';
 import { GridThumbnailComponent } from './object-grid/grid-thumbnail/grid-thumbnail.component';
 import { VarDirective } from './utils/var.directive';
-import { LogInComponent } from './log-in/log-in.component';
 import { AuthNavMenuComponent } from './auth-nav-menu/auth-nav-menu.component';
 import { LogOutComponent } from './log-out/log-out.component';
 import { FormComponent } from './form/form.component';