From 55efe4b09a47a6b62b448bc716d6c49b73811004 Mon Sep 17 00:00:00 2001 From: "k.triantafyllou" Date: Wed, 25 Jan 2023 08:01:33 +0200 Subject: [PATCH] Add toggle and hover behaviour in sidebar --- src/app/app.component.html | 2 +- src/app/app.component.ts | 5 ++++- src/app/app.module.ts | 7 ++++--- src/app/openaireLibrary | 2 +- src/app/topic/topic.component.html | 23 +++++++++++------------ src/app/topic/topic.module.ts | 3 ++- src/assets/common-assets | 2 +- 7 files changed, 24 insertions(+), 20 deletions(-) diff --git a/src/app/app.component.html b/src/app/app.component.html index 591d04e..bcd3c13 100644 --- a/src/app/app.component.html +++ b/src/app/app.component.html @@ -3,7 +3,7 @@
+ [class.sidebar_mini]="!open && (hasSidebar || hasAdminMenu || hasInternalSidebar)" [class.sidebar_hover]="hover"> diff --git a/src/app/app.component.ts b/src/app/app.component.ts index c7c22d9..1ed197c 100644 --- a/src/app/app.component.ts +++ b/src/app/app.component.ts @@ -166,7 +166,6 @@ export class AppComponent implements OnInit, OnDestroy { this.subscriptions.push(this.stakeholderService.getStakeholder(params['stakeholder'], this.updateStakeholder).subscribe(stakeholder => { if (stakeholder) { this.stakeholder = stakeholder; - console.log(this.stakeholder); this.updateStakeholder = false; LinksResolver.setProperties(this.stakeholder.alias); this.setProperties(this.stakeholder.alias, this.stakeholder.type); @@ -274,6 +273,10 @@ export class AppComponent implements OnInit, OnDestroy { return this.layoutService.open; } + public get hover() { + return this.layoutService.hover; + } + get isHidden() { return this.stakeholder && !this.hasPermission(this.view?this.view:this.stakeholder.visibility); } diff --git a/src/app/app.module.ts b/src/app/app.module.ts index c57b304..d83acd9 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, BrowserTransferStateModule} from '@angular/platform-browser'; +import {BrowserModule} from '@angular/platform-browser'; import {BrowserAnimationsModule} from '@angular/platform-browser/animations'; import {AppComponent} from './app.component'; import {OpenaireErrorPageComponent} from './error/errorPage.component'; @@ -22,7 +22,9 @@ import {DEFAULT_TIMEOUT, TimeoutInterceptor} from "./openaireLibrary/timeout-int import {ErrorInterceptorService} from "./openaireLibrary/error-interceptor.service"; import {AdminLoginGuard} from "./openaireLibrary/login/adminLoginGuard.guard"; import {AdminDashboardGuard} from "./utils/adminDashboard.guard"; -import {NotificationsSidebarModule} from "./openaireLibrary/notifications/notifications-sidebar/notifications-sidebar.module"; +import { + NotificationsSidebarModule +} from "./openaireLibrary/notifications/notifications-sidebar/notifications-sidebar.module"; import {LoginGuard} from "./openaireLibrary/login/loginGuard.guard"; import {IconsModule} from "./openaireLibrary/utils/icons/icons.module"; import {IconsService} from "./openaireLibrary/utils/icons/icons.service"; @@ -42,7 +44,6 @@ import {incognito} from "./openaireLibrary/utils/icons/icons"; CookieLawModule, BrowserModule.withServerTransition({appId: 'serverApp'}), AppRoutingModule, - BrowserTransferStateModule, SideBarModule, Schema2jsonldModule, RoleVerificationModule, LoadingModule, NotificationsSidebarModule, IconsModule ], declarations: [AppComponent, OpenaireErrorPageComponent], diff --git a/src/app/openaireLibrary b/src/app/openaireLibrary index 53400f7..9f4be4b 160000 --- a/src/app/openaireLibrary +++ b/src/app/openaireLibrary @@ -1 +1 @@ -Subproject commit 53400f774505b7461ba5773f3d2d40cfc7091e34 +Subproject commit 9f4be4b29b98118e62dbd6ed6b8cd2b8a3e98b90 diff --git a/src/app/topic/topic.component.html b/src/app/topic/topic.component.html index 1da3d53..ba16a6f 100644 --- a/src/app/topic/topic.component.html +++ b/src/app/topic/topic.component.html @@ -1,13 +1,12 @@