Merge branch 'PPF-237-redirect-to-public-platform' into PPF-198-docke…

…r-setup
cultuurnet · Dec 19, 2023 · 5433d04 · 5433d04
2 parents acba8dd + 8d30ecc
commit 5433d04
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 9 deletions.
diff --git a/src/app/core/route/guard/auth-guard.service.ts b/src/app/core/route/guard/auth-guard.service.ts
@@ -1,11 +1,7 @@
 import { Injectable } from '@angular/core';
-import { of as observableOf, Observable } from 'rxjs';
+import { of as observableOf } from 'rxjs';
 import { catchError, map } from 'rxjs/operators';
-import {
-  ActivatedRouteSnapshot,
-  CanActivate,
-  RouterStateSnapshot,
-} from '@angular/router';
+import { CanActivate } from '@angular/router';
 import { UserService } from '../../user/services/user.service';
 import { environment } from '../../../../environments/environment';
 
@@ -30,11 +26,15 @@ export class AuthGuard implements CanActivate {
           return true;
         },
         () => {
-          window.location.href = environment.projectaanvraagDashboardUrl;
+          window.location.href = environment.platformIsLive
+            ? environment.platformUrl
+            : environment.projectaanvraagDashboardUrl;
         }
       ),
       catchError((error) => {
-        window.location.href = environment.projectaanvraagDashboardUrl;
+        window.location.href = environment.platformIsLive
+          ? environment.platformUrl
+          : environment.projectaanvraagDashboardUrl;
         return observableOf(false);
       })
     );

diff --git a/src/app/core/topbar/components/topbar.component.html b/src/app/core/topbar/components/topbar.component.html
@@ -29,7 +29,11 @@
         <button class="btn btn-outline-secondary" ngbDropdownToggle>
           <span class="hidden-lg-down"> {{ user.displayName }}</span>
         </button>
-        <div ngbDropdownMenu class="dropdown-menu dropdown-menu-right">
+        <div
+          *ngIf="!platformIsLive"
+          ngbDropdownMenu
+          class="dropdown-menu dropdown-menu-right"
+        >
           <button ngbDropdownItem class="dropdown-item" (click)="logout()">
             {{ 'TOPBAR_USER_MENU_BUTTON_LOGOUT' | translate }}
           </button>

diff --git a/src/app/core/topbar/components/topbar.component.ts b/src/app/core/topbar/components/topbar.component.ts
@@ -61,6 +61,8 @@ export class TopbarComponent implements OnInit, OnDestroy {
    */
   private dynamicComponentSubscriptions: any = {};
 
+  private platformIsLive: boolean = environment.platformIsLive;
+
   /**
    * TopbarComponent constructor
    * @param userService