From d0687323bd53dd781694bbd5c15c057e14acb270 Mon Sep 17 00:00:00 2001
From: Konstantinos Triantafyllou <k.triantafyllou@di.uoa.gr>
Date: Mon, 16 Nov 2020 13:37:20 +0000
Subject: [PATCH] [Monitor Dashboard | Trunk]: Add intrceptors. FIx user-info
 page

git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-monitor-portal/trunk/monitor_dashboard@59857 d315682c-612b-4755-9ff5-7f18f6832af3
---
 src/app/app.module.ts                    | 23 +++++++++++++++++++----
 src/assets/dashboard-theme/structure.css |  8 ++++----
 2 files changed, 23 insertions(+), 8 deletions(-)

diff --git a/src/app/app.module.ts b/src/app/app.module.ts
index 684f38e..e22a64a 100755
--- a/src/app/app.module.ts
+++ b/src/app/app.module.ts
@@ -2,7 +2,7 @@ import {NgModule} from '@angular/core';
 import {FormsModule} from '@angular/forms';
 import {CommonModule} from '@angular/common';
 import {HTTP_INTERCEPTORS, HttpClientModule} from "@angular/common/http";
-import {BrowserModule} from '@angular/platform-browser';
+import {BrowserModule, BrowserTransferStateModule} from '@angular/platform-browser';
 import {BrowserAnimationsModule} from '@angular/platform-browser/animations';
 import {AppComponent} from './app.component';
 import {OpenaireErrorPageComponent} from './error/errorPage.component';
@@ -20,7 +20,9 @@ import {SharedModule} from "./openaireLibrary/shared/shared.module";
 import {Schema2jsonldModule} from "./openaireLibrary/sharedComponents/schema2jsonld/schema2jsonld.module";
 import {RoleVerificationModule} from "./openaireLibrary/role-verification/role-verification.module";
 import {LoadingModule} from "./openaireLibrary/utils/loading/loading.module";
+import {HttpInterceptorService} from "./openaireLibrary/http-interceptor.service";
 import {DEFAULT_TIMEOUT, TimeoutInterceptor} from "./openaireLibrary/timeout-interceptor.service";
+import {ErrorInterceptorService} from "./openaireLibrary/error-interceptor.service";
 
 @NgModule({
   
@@ -36,13 +38,26 @@ import {DEFAULT_TIMEOUT, TimeoutInterceptor} from "./openaireLibrary/timeout-int
     CookieLawModule,
     BrowserModule.withServerTransition({appId: 'my-app'}),
     AppRoutingModule,
+    BrowserTransferStateModule,
     UserMiniModule, SideBarModule, Schema2jsonldModule, RoleVerificationModule, LoadingModule
   ],
   declarations: [AppComponent, OpenaireErrorPageComponent],
   exports: [AppComponent],
-  providers: [EnvironmentSpecificResolver,
-    [{ provide: HTTP_INTERCEPTORS, useClass: TimeoutInterceptor, multi: true }],
-    [{ provide: DEFAULT_TIMEOUT, useValue: 30000 }]],
+  providers: [
+    EnvironmentSpecificResolver,
+    {
+      provide: HTTP_INTERCEPTORS,
+      useClass: HttpInterceptorService,
+      multi: true
+    },
+    {
+      provide: HTTP_INTERCEPTORS,
+      useClass: ErrorInterceptorService,
+      multi: true
+    },
+    [{provide: HTTP_INTERCEPTORS, useClass: TimeoutInterceptor, multi: true}],
+    [{provide: DEFAULT_TIMEOUT, useValue: 30000}]
+  ],
   bootstrap: [AppComponent]
 })
 //
diff --git a/src/assets/dashboard-theme/structure.css b/src/assets/dashboard-theme/structure.css
index 3327c1e..9343a42 100644
--- a/src/assets/dashboard-theme/structure.css
+++ b/src/assets/dashboard-theme/structure.css
@@ -85,7 +85,7 @@
   transition-property: left;
 }
 
-.sidebar_main_swipe #page_content, .sidebar_main_swipe openaire-user  > *,
+.sidebar_main_swipe #page_content, .sidebar_main_swipe openaire-user  > user > *,
 .sidebar_main_swipe openaire-error  > * {
   padding-left: var(--sidebar-width);
   padding-top: var(--header-height);
@@ -107,7 +107,7 @@
 
 /*Sidebar close*/
 .sidebar_main_swipe:not(.sidebar_main_active):not(.sidebar_mini) #page_content,
-.sidebar_main_swipe:not(.sidebar_main_active):not(.sidebar_mini) openaire-user  > *,
+.sidebar_main_swipe:not(.sidebar_main_active):not(.sidebar_mini) openaire-user > user > *,
 .sidebar_main_swipe:not(.sidebar_main_active):not(.sidebar_mini) openaire-error  > *,
 .sidebar_main_swipe:not(.sidebar_main_active):not(.sidebar_mini) bottom > *{
   padding-left: 0;
@@ -124,7 +124,7 @@
 
 /*Sidebar mini*/
 .sidebar_main_swipe.sidebar_mini #page_content,
-.sidebar_main_swipe.sidebar_mini openaire-user  > *,
+.sidebar_main_swipe.sidebar_mini openaire-user > user > *,
 .sidebar_main_swipe.sidebar_mini openaire-error  > *,
 .sidebar_main_swipe.sidebar_mini bottom > * {
   padding-left: var(--sidebar-mini-width);
@@ -171,6 +171,6 @@
   padding: 50px 90px 90px;
 }
 
-navbar > *, openaire-error > *, openaire-user > * {
+navbar > *, openaire-error > *, openaire-user> user > * {
   background-color: var(--background-color);
 }