Sync-in · Sovereign platform for file storage, sharing, synchronization, and collaboration.
TypeScript cloud-alternativecollaborationcollaborative-editingdropboxfile-serverfile-sharingfile-storagefile-syncfull-text-searchhomelabnextcloudon-premiseopen-sourceprivacy-firstprivate-cloudrealtimesecureself-hostedstorage-serverwebdav
chore(frontend): new sidebar left
johaven0749dcbe0a54
diff --git a/frontend/src/app/app.constants.ts b/frontend/src/app/app.constants.tsindex 02ce7825..c5bd0a84 100644--- a/frontend/src/app/app.constants.ts+++ b/frontend/src/app/app.constants.ts@@ -13,7 +13,6 @@ export const APP_MENU: AppMenu = {title: 'NAVIGATION',icon: faCircleHalfStroke,link: '',- level: 0,submenus: []} as constdiff --git a/frontend/src/app/applications/admin/admin.constants.ts b/frontend/src/app/applications/admin/admin.constants.tsindex 8cef5c1b..f92a2371 100644--- a/frontend/src/app/applications/admin/admin.constants.ts+++ b/frontend/src/app/applications/admin/admin.constants.ts@@ -28,7 +28,6 @@ export const ADMIN_MENU: AppMenu = {link: `${ADMIN_PATH.BASE}/${ADMIN_PATH.USERS}`,icon: ADMIN_ICON.BASE,matchLink: new RegExp(`^${ADMIN_PATH.BASE}`),- level: 12,checks: [{ prop: 'user', value: 'isAdmin' }],submenus: [{diff --git a/frontend/src/app/applications/recents/components/recents.component.html b/frontend/src/app/applications/recents/components/recents.component.htmlindex 1baf5338..c8c26678 100644--- a/frontend/src/app/applications/recents/components/recents.component.html+++ b/frontend/src/app/applications/recents/components/recents.component.html@@ -1,5 +1,5 @@<div appAutoResize class="recents-dashboard" [useMaxHeight]="false" [resizeOffset]="40">- <div class="row recents-grid g-2">+ <div class="row recents-grid g-3"><div class="col-md-6"><app-files-recents-widget></app-files-recents-widget></div>diff --git a/frontend/src/app/applications/recents/components/recents.component.scss b/frontend/src/app/applications/recents/components/recents.component.scssdeleted file mode 100644index 1b104fe5..00000000--- a/frontend/src/app/applications/recents/components/recents.component.scss+++ /dev/null@@ -1,14 +0,0 @@-.recents-dashboard {- padding: 0.16rem 0.3rem 0.3rem;-}--.recents-grid {- margin-left: 0;- margin-right: 0;-}--@media (max-width: 1199.98px) {- .recents-dashboard {- padding-inline: 0.16rem;- }-}diff --git a/frontend/src/app/applications/recents/components/recents.component.ts b/frontend/src/app/applications/recents/components/recents.component.tsindex 33b48748..3b16176b 100644--- a/frontend/src/app/applications/recents/components/recents.component.ts+++ b/frontend/src/app/applications/recents/components/recents.component.ts@@ -8,8 +8,7 @@ import { RECENTS_ICON, RECENTS_PATH, RECENTS_TITLE } from '../recents.constants'@Component({selector: 'app-recents',imports: [AutoResizeDirective, FilesRecentsWidgetComponent, CommentsRecentsWidgetComponent],- templateUrl: './recents.component.html',- styleUrl: './recents.component.scss'+ templateUrl: './recents.component.html'})export class RecentsComponent {private readonly layout = inject(LayoutService)diff --git a/frontend/src/app/applications/search/search.constants.ts b/frontend/src/app/applications/search/search.constants.tsindex ec6a1e51..e04a6473 100644--- a/frontend/src/app/applications/search/search.constants.ts+++ b/frontend/src/app/applications/search/search.constants.ts@@ -13,6 +13,5 @@ export const SEARCH_MENU: AppMenu = {title: SEARCH_TITLE,link: SEARCH_PATH.BASE,icon: SEARCH_ICON,- level: 2,submenus: []} as constdiff --git a/frontend/src/app/applications/spaces/spaces.constants.ts b/frontend/src/app/applications/spaces/spaces.constants.tsindex 6306047d..eef95487 100644--- a/frontend/src/app/applications/spaces/spaces.constants.ts+++ b/frontend/src/app/applications/spaces/spaces.constants.ts@@ -86,7 +86,6 @@ export const SPACES_MENU: AppMenu = {icon: faFolderClosed,link: SPACES_PATH.PERSONAL_FILES,matchLink: new RegExp(`^${SPACES_PATH.SPACES}|^${SPACES_PATH.TRASH}|^${SPACES_PATH.SHARES}|^${SPACES_PATH.SHARED}|^${SPACES_PATH.LINKS}`),- level: 1,submenus: [{title: RECENTS_TITLE,diff --git a/frontend/src/app/applications/sync/sync.constants.ts b/frontend/src/app/applications/sync/sync.constants.tsindex 0b5f4fcb..2eda5234 100644--- a/frontend/src/app/applications/sync/sync.constants.ts+++ b/frontend/src/app/applications/sync/sync.constants.ts@@ -41,7 +41,6 @@ export const SYNC_MENU: AppMenu = {checks: [{ prop: 'user', value: 'clientId' }],count: { value: new BehaviorSubject<number>(0), level: 'warning' },matchLink: new RegExp(`^${SYNC_PATH.BASE}`),- level: 3,submenus: [{title: SYNC_TITLE.SYNCS,diff --git a/frontend/src/app/applications/users/components/user-applications.component.html b/frontend/src/app/applications/users/components/user-applications.component.htmlindex 553e762e..0d5fb4cc 100644--- a/frontend/src/app/applications/users/components/user-applications.component.html+++ b/frontend/src/app/applications/users/components/user-applications.component.html@@ -13,7 +13,7 @@</div>@if (store.appStoreManifest()) {<div class="profile-page user-applications-page d-flex flex-column fs-sm" appAutoResize [resizeOffset]="80" style="height: 100%">- <div class="container-fluid p-3 p-xl-4">+ <div class="container-fluid p-2"><div class="row g-3">@for (app of APP_STORE_PLATFORM_LIST; track $index) {<div class="col-12 col-md-6 col-xl-4 d-flex">diff --git a/frontend/src/app/applications/users/user.constants.ts b/frontend/src/app/applications/users/user.constants.tsindex 6231ef4d..05e97ecc 100644--- a/frontend/src/app/applications/users/user.constants.ts+++ b/frontend/src/app/applications/users/user.constants.ts@@ -44,7 +44,6 @@ export const USER_MENU: AppMenu = {link: `${USER_PATH.BASE}/${USER_PATH.ACCOUNT}`,icon: USER_ICON.ACCOUNT,matchLink: new RegExp(`^${USER_PATH.BASE}`),- level: 11,checks: [{ negate: true, prop: 'user', value: 'isLink' }],submenus: [{diff --git a/frontend/src/app/layout/layout.interfaces.ts b/frontend/src/app/layout/layout.interfaces.tsindex 34d373a9..e9517206 100644--- a/frontend/src/app/layout/layout.interfaces.ts+++ b/frontend/src/app/layout/layout.interfaces.ts@@ -30,14 +30,11 @@ export interface AppMenu {link: stringmatchLink?: RegExpisActive?: boolean- miniOpened?: boolean- level?: numberhide?: booleancount?: { value: Observable<any> & BehaviorSubject<any>; level: string }// prop must be an attribute of the userServicechecks?: { negate?: boolean; prop: 'user'; value: UserStatus }[]submenus?: AppMenu[]- component?: any}export interface TabMenu {diff --git a/frontend/src/app/layout/navbar/navbar.component.html b/frontend/src/app/layout/navbar/navbar.component.htmlindex 9ffc6ae5..78a76354 100644--- a/frontend/src/app/layout/navbar/navbar.component.html+++ b/frontend/src/app/layout/navbar/navbar.component.html@@ -1,9 +1,24 @@<header class="main-header"><nav class="navbar navbar-content">- <a (click)="navigateTo('back')" class="d-sm-none navbar-button" role="button">+ @if (!leftSideBarIsOpen) {+ <a (click)="toggleLeftSideBar()" class="navbar-button navbar-logo-button navbar-logo-button--delayed" role="button">+ <span class="logo-container">+ <img alt="" class="logo-spin-in" [src]="logoIconUrl">+ </span>+ </a>+ }+ @if (leftSideBarIsOpen) {+ <a (click)="navigateTo('back')" class="d-none d-sm-flex navbar-button navbar-history-button navbar-history-button-left" role="button">+ <fa-icon [icon]="icons.faAngleLeft"></fa-icon>+ </a>+ <a (click)="navigateTo('next')" class="d-none d-sm-flex navbar-button navbar-history-button navbar-history-button-right" role="button">+ <fa-icon [icon]="icons.faAngleRight"></fa-icon>+ </a>+ }+ <a (click)="navigateTo('back')" class="d-sm-none navbar-button navbar-history-button navbar-history-button-left" role="button"><fa-icon [icon]="icons.faAngleLeft"></fa-icon></a>- <a (click)="navigateTo('next')" class="d-sm-none navbar-button" role="button">+ <a (click)="navigateTo('next')" class="d-sm-none navbar-button navbar-history-button navbar-history-button-right" role="button"><fa-icon [icon]="icons.faAngleRight"></fa-icon></a><div class="navbar-breadcrumb">diff --git a/frontend/src/app/layout/navbar/navbar.component.ts b/frontend/src/app/layout/navbar/navbar.component.tsindex 48bf344c..35e5bc42 100644--- a/frontend/src/app/layout/navbar/navbar.component.ts+++ b/frontend/src/app/layout/navbar/navbar.component.ts@@ -3,6 +3,7 @@ import { Component, inject, OnDestroy } from '@angular/core'import { FaIconComponent } from '@fortawesome/angular-fontawesome'import { faAngleLeft, faAngleRight } from '@fortawesome/free-solid-svg-icons'import { Subscription } from 'rxjs'+import { logoIconUrl } from '../../applications/files/files.constants'import { UserType } from '../../applications/users/interfaces/user.interface'import { USER_ONLINE_STATUS_LIST } from '../../applications/users/user.constants'import { StoreService } from '../../store/store.service'@@ -18,6 +19,8 @@ import { LayoutService } from '../layout.service'export class NavBarComponent implements OnDestroy {protected readonly allOnlineStatus = USER_ONLINE_STATUS_LISTprotected readonly icons = { faAngleLeft, faAngleRight }+ protected logoIconUrl = logoIconUrl+ protected leftSideBarIsOpen = trueprotected user: UserTypeprotected userAvatar: string = nullprivate readonly location = inject(Location)@@ -28,6 +31,7 @@ export class NavBarComponent implements OnDestroy {constructor() {this.subscriptions.push(this.store.user.subscribe((user: UserType) => (this.user = user)))this.subscriptions.push(this.store.userAvatarUrl.subscribe((avatarUrl) => (this.userAvatar = avatarUrl)))+ this.subscriptions.push(this.layout.leftSideBarIsOpen.subscribe((isOpen) => (this.leftSideBarIsOpen = isOpen)))}ngOnDestroy() {@@ -38,6 +42,10 @@ export class NavBarComponent implements OnDestroy {this.layout.showRSideBarTab(TAB_MENU.PROFILE)}+ toggleLeftSideBar() {+ this.layout.toggleLSideBar()+ }+navigateTo(action: string) {if (action === 'back') {this.location.back()diff --git a/frontend/src/app/layout/sidebar/sidebar.left.component.html b/frontend/src/app/layout/sidebar/sidebar.left.component.htmlindex 74380d32..f3dfa295 100644--- a/frontend/src/app/layout/sidebar/sidebar.left.component.html+++ b/frontend/src/app/layout/sidebar/sidebar.left.component.html@@ -1,35 +1,43 @@-<aside #sidebar class="left-sidebar">- <div class="sidebar-apps-icons">- <div class="menu">- <a (click)="toggleSideBar()"- (mouseenter)="onHoverIconsMenuMouse(true, {title: appName}, true)"- (mouseleave)="onHoverIconsMenuMouse(false, {title: appName}, true)">- <div class="logo-container">- <img alt="" [src]="logoIconUrl">- </div>- </a>+<aside class="left-sidebar">+ <div class="sidebar-apps-menus">+ <div class="menu-title">+ <div class="menu-title-content">+ <button (click)="toggleSideBar()" class="logo-toggle" type="button">+ <img alt="" class="logo-toggle-spin-in" [src]="logoIconUrl">+ </button>+ <span class="sidebar-title">{{ dynamicTitle }}</span>+ </div>+ </div>+ <div class="apps-shortcuts">@for (menu of appsMenu.submenus; track menu.title) {@if (!menu.hide) {- <ng-container [ngTemplateOutlet]="sidebarMenuIcons" [ngTemplateOutletContext]="{menu: menu, previousLevel:$index === 0 ? 0 : appsMenu.submenus[$index-1].level}"></ng-container>+ <button (click)="navigateToMenu(menu)"+ (mouseenter)="previewMenuTitle(menu.title)"+ (mouseleave)="restoreMenuTitle()"+ [class.active]="menu.isActive"+ class="app-shortcut"+ type="button">+ <fa-icon [animation]="menu.iconAnimated ? 'spin' : null" [icon]="menu.icon"></fa-icon>+ @if (menu.count) {+ <span class="menu-badge-icon">+ @if (menu.count.value | async; as count) {+ <span class="badge bg-{{menu.count.level}}">{{ count }}</span>+ }+ </span>+ }+ </button>}}@if (store.userImpersonate()) {- <a (click)="logOut()"- (mouseenter)="onHoverIconsMenuMouse(true, {title: 'logout'})"- (mouseleave)="onHoverIconsMenuMouse(false, {title: 'logout'})">+ <button (click)="logOut()"+ (mouseenter)="previewMenuTitle('logout')"+ (mouseleave)="restoreMenuTitle()"+ class="app-shortcut"+ type="button"><fa-icon [icon]="icons.faUserSecret"></fa-icon>- </a>+ </button>}</div>- </div>- <div class="sidebar-apps-menus" (mouseenter)="onHoverAppsMenu(true)" (mouseleave)="onHoverAppsMenu(false)">- <div class="menu-title" (mouseenter)="onHoverAppsMenu(false)">- <a>- <span class="sidebar-title">{{ dynamicTitle }}</span>- <fa-icon (click)="navigateTo('back')" [icon]="icons.faAngleLeft" class="sidebar-btn" role="button"></fa-icon>- <fa-icon (click)="navigateTo('next')" [icon]="icons.faAngleRight" class="sidebar-btn" role="button"></fa-icon>- </a>- </div><div class="menus-content"><div class="menus-group">@for (menu of currentMenu.submenus; track menu.title) {@@ -37,11 +45,6 @@<ng-container [ngTemplateOutlet]="MenuApps" [ngTemplateOutletContext]="{menu: menu}"></ng-container>}}- @if (leftSideBarIsOpen && currentMenu.component) {- <div (click)="checkComponentRoute()" appAutoResize [resizeOffset]="40">- <ng-container *ngComponentOutlet="currentMenu.component"></ng-container>- </div>- }</div><div class="sidebar-apps-footer"><span>{{ appVersion }}</span>@@ -50,78 +53,37 @@</div></aside><!--Start Templates-->-<ng-template #MenuTemplate let-menu="menu" let-isMenuIcon="isMenuIcon">+<ng-template #MenuTemplate let-menu="menu"><fa-icon [icon]="menu.icon" [animation]="menu.iconAnimated ? 'spin' : null"></fa-icon>- @if (!isMenuIcon) {- <span l10nTranslate>{{ menu.title }}</span>- @if (menu?.submenus?.length) {- <span class="ms-auto opacity-75"><fa-icon [icon]="icons.faChevronDown" size="sm"></fa-icon></span>- }+ <span l10nTranslate>{{ menu.title }}</span>+ @if (menu?.submenus?.length) {+ <span class="ms-auto opacity-75"><fa-icon [icon]="icons.faChevronDown" size="sm"></fa-icon></span>}@if (menu.count) {- <span class="{{isMenuIcon ? 'menu-badge-icon' : 'menu-badge'}}">+ <span class="menu-badge">@if (menu.count.value | async; as count) {<span class="badge bg-{{menu.count.level}}">{{ count }}</span>}</span>}</ng-template>-<ng-template #sidebarMenuIcons let-mainMenu="menu" let-previousLevel="previousLevel">- <a [class.mt-auto]="previousLevel < 9 && mainMenu.level > 9" [class.active]="mainMenu.isActive"- (mouseenter)="onHoverIconsMenuMouse(true, mainMenu)"- (mouseleave)="onHoverIconsMenuMouse(false, mainMenu)"- (click)="checkMenuContext(mainMenu)">- <ng-container [ngTemplateOutlet]="MenuTemplate" [ngTemplateOutletContext]="{menu: mainMenu, isMenuIcon: true}"></ng-container>- <!-- start mini menu-->- @if (mainMenu.miniOpened && (mainMenu.submenus?.length || mainMenu.component)) {- <div class="menu-mini {{mainMenu.level < 9 ? 'align-self-start' : 'align-self-end'}}">- @for (menu of mainMenu.submenus; track menu.title) {- @if (!menu.hide) {- <ng-container [ngTemplateOutlet]="MiniMenuApps" [ngTemplateOutletContext]="{mainMenu: mainMenu, menu: menu}"></ng-container>- }- }- @if (mainMenu.component) {- <div (click)="checkComponentRoute(mainMenu)" appAutoResize [resizeOffset]="40">- <ng-container *ngComponentOutlet="mainMenu.component"></ng-container>- </div>- }- </div>- }- <!-- end mini menu-->- </a>-</ng-template>-<!--End Apps Icon Template--><!--Start Apps Menu Template--><ng-template #MenuApps let-menu="menu"><div class="menu" [class.active]="menu.isActive"><a [routerLink]="menu.link">- <ng-container [ngTemplateOutlet]="MenuTemplate" [ngTemplateOutletContext]="{menu: menu, isMenuIcon: false}"></ng-container>+ <ng-container [ngTemplateOutlet]="MenuTemplate" [ngTemplateOutletContext]="{menu: menu}"></ng-container></a></div>@if (menu.submenus?.length) {@for (submenu of menu.submenus; track submenu.title) {@if (!submenu.hide) {- <div class="menu submenu" [class.active]="submenu.isActive" [class]="menu.isActive ? 'collapse-show': 'collapse-hide'">+ <div class="menu submenu" [class.active]="submenu.isActive"><a [routerLink]="submenu.link">- <ng-container [ngTemplateOutlet]="MenuTemplate" [ngTemplateOutletContext]="{menu: submenu, isMenuIcon: false}"></ng-container>+ <ng-container [ngTemplateOutlet]="MenuTemplate" [ngTemplateOutletContext]="{menu: submenu}"></ng-container></a></div>}}}</ng-template>-<ng-template #MiniMenuApps let-mainMenu="mainMenu" let-menu="menu">- <a class="mini-menu-item" (click)="onMiniMenuNavigate($event, [menu.link], mainMenu)" [class.active]="menu.isActive">- <ng-container [ngTemplateOutlet]="MenuTemplate" [ngTemplateOutletContext]="{menu: menu, isMenuIcon: false}"></ng-container>- </a>- @if (menu.submenus?.length) {- @for (submenu of menu.submenus; track submenu.title) {- @if (!submenu.hide) {- <a class="mini-menu-item mini-submenu-item" (click)="onMiniMenuNavigate($event, [submenu.link], mainMenu)" [class.active]="submenu.isActive">- <ng-container [ngTemplateOutlet]="MenuTemplate" [ngTemplateOutletContext]="{menu: submenu, isMenuIcon: false}"></ng-container>- </a>- }- }- }-</ng-template><!--End Templates-->diff --git a/frontend/src/app/layout/sidebar/sidebar.left.component.ts b/frontend/src/app/layout/sidebar/sidebar.left.component.tsindex eab24d03..f21f4069 100644--- a/frontend/src/app/layout/sidebar/sidebar.left.component.ts+++ b/frontend/src/app/layout/sidebar/sidebar.left.component.ts@@ -1,12 +1,12 @@-import { AsyncPipe, Location, NgComponentOutlet, NgTemplateOutlet } from '@angular/common'-import { Component, ElementRef, inject, OnDestroy, Renderer2, ViewChild } from '@angular/core'+import { AsyncPipe, NgTemplateOutlet } from '@angular/common'+import { Component, inject, OnDestroy } from '@angular/core'import { ResolveEnd, Router, RouterLink } from '@angular/router'import { FaIconComponent } from '@fortawesome/angular-fontawesome'-import { faAngleLeft, faAngleRight, faChevronDown, faUserSecret } from '@fortawesome/free-solid-svg-icons'+import { faChevronDown, faUserSecret } from '@fortawesome/free-solid-svg-icons'import { L10nTranslateDirective } from 'angular-l10n'import { Subscription } from 'rxjs'import { filter } from 'rxjs/operators'-import { APP_MENU, APP_NAME, APP_VERSION } from '../../app.constants'+import { APP_MENU, APP_VERSION } from '../../app.constants'import { ADMIN_MENU } from '../../applications/admin/admin.constants'import { logoIconUrl } from '../../applications/files/files.constants'import { SEARCH_MENU } from '../../applications/search/search.constants'@@ -15,8 +15,6 @@ import { SYNC_MENU } from '../../applications/sync/sync.constants'import { USER_MENU } from '../../applications/users/user.constants'import { UserService } from '../../applications/users/user.service'import { AuthService } from '../../auth/auth.service'-import { AutoResizeDirective } from '../../common/directives/auto-resize.directive'-import { sortCollectionByType } from '../../common/utils/sort'import { StoreService } from '../../store/store.service'import { AppMenu } from '../layout.interfaces'import { LayoutService } from '../layout.service'@@ -24,39 +22,27 @@ import { LayoutService } from '../layout.service'@Component({selector: 'app-sidebar-left',templateUrl: 'sidebar.left.component.html',- imports: [RouterLink, FaIconComponent, AutoResizeDirective, L10nTranslateDirective, NgComponentOutlet, AsyncPipe, NgTemplateOutlet]+ imports: [RouterLink, FaIconComponent, L10nTranslateDirective, AsyncPipe, NgTemplateOutlet]})export class SideBarLeftComponent implements OnDestroy {- @ViewChild('sidebar', { static: true }) sidebar: ElementRefprotected readonly store = inject(StoreService)- protected readonly icons = { faAngleLeft, faAngleRight, faUserSecret, faChevronDown }+ protected readonly icons = { faUserSecret, faChevronDown }protected logoIconUrl = logoIconUrl- protected appName: stringprotected appVersion: string- protected leftSideBarIsOpen = falseprotected dynamicTitle: stringprotected currentUrl: stringprotected currentMenu: AppMenuprotected appsMenu: AppMenu = APP_MENUprivate readonly router = inject(Router)- private readonly renderer = inject(Renderer2)- private readonly location = inject(Location)private readonly authService = inject(AuthService)private readonly layout = inject(LayoutService)private readonly userService = inject(UserService)private subscriptions: Subscription[] = []- private menuAppsHovered = false- private menuIconsHovered = false- private menuAppsHoveredTimeout: ReturnType<typeof setTimeout> = null- private menuIconsStopPropagation = falseconstructor() {- this.appName = APP_NAMEthis.appVersion = APP_VERSIONthis.appsMenu.submenus = [SPACES_MENU, SEARCH_MENU, SYNC_MENU, USER_MENU, ADMIN_MENU]- sortCollectionByType('number', this.appsMenu.submenus, 'level', true)this.subscriptions.push(this.store.user.pipe(filter((u) => !!u)).subscribe(() => this.loadMenus()))- this.subscriptions.push(this.layout.leftSideBarIsOpen.subscribe((isOpen) => (this.leftSideBarIsOpen = isOpen)))this.subscriptions.push(this.router.events.pipe(filter((ev) => ev instanceof ResolveEnd)).subscribe((ev: any) => this.updateUrl(ev.urlAfterRedirects)))@@ -75,106 +61,30 @@ export class SideBarLeftComponent implements OnDestroy {this.authService.logout(true)}- navigateTo(action: string) {- if (action === 'back') {- this.location.back()- } else {- this.location.forward()- }- }-toggleSideBar() {- for (const m of this.appsMenu.submenus) {- m.miniOpened = false- }- if (this.leftSideBarIsOpen) {- this.renderer.removeStyle(this.sidebar.nativeElement, 'z-index')- }this.layout.toggleLSideBar()}- checkMenuContext(menu: AppMenu) {- if (!this.leftSideBarIsOpen && this.layout.isSmallerScreen() && menu.submenus?.length) {- this.onHoverIconsMenu(!menu.miniOpened, menu)- } else {- this.navigateToUrl([menu.link])- }+ navigateToMenu(menu: AppMenu) {+ this.navigateToUrl([menu.link])}- onHoverIconsMenuMouse(state: boolean, menu: AppMenu | any, ignoreCollapse = false) {+ previewMenuTitle(title: string) {if (!window.matchMedia('(hover: hover) and (pointer: fine)').matches) {return}- this.onHoverIconsMenu(state, menu, ignoreCollapse)- }-- onMiniMenuNavigate(ev: MouseEvent, url: string[], menu: AppMenu = null) {- ev.stopPropagation()- this.navigateToUrl(url, menu)- }-- checkComponentRoute(menu?: AppMenu) {- if (this.currentMenu.link !== this.currentUrl) {- this.router.navigate([this.currentMenu.link]).catch(console.error)- }- if (menu) {- menu.miniOpened = false- }- }-- onHoverAppsMenu(state: boolean) {- if (this.leftSideBarIsOpen) {- this.menuAppsHovered = state- if (state) {- this.menuAppsHoveredTimeout = setTimeout(() => this.setActiveMenu(), 5000)- } else {- clearTimeout(this.menuAppsHoveredTimeout)- this.checkHoveredMenu()- }- }+ this.updateDynamicTitle(title)}- onHoverIconsMenu(state: boolean, menu: AppMenu | any, ignoreCollapse = false) {- if (this.leftSideBarIsOpen && this.menuIconsStopPropagation) {+ restoreMenuTitle() {+ if (!window.matchMedia('(hover: hover) and (pointer: fine)').matches) {return}- if ((state && menu.submenus?.length) || menu.component) {- this.currentMenu = menu- }- if (this.leftSideBarIsOpen || ignoreCollapse) {- this.menuIconsHovered = state- if (state) {- this.updateDynamicTitle(menu.title)- } else {- this.checkHoveredMenu()- }- } else {- if (state) {- this.renderer.setStyle(this.sidebar.nativeElement, 'z-index', '1030')- } else {- this.renderer.removeStyle(this.sidebar.nativeElement, 'z-index')- }- for (const m of this.appsMenu.submenus.filter((m: AppMenu) => m.title !== menu.title)) {- m.miniOpened = false- }- menu.miniOpened = !!state- }- }-- private checkHoveredMenu() {- setTimeout(() => {- if (!this.menuIconsHovered && !this.menuAppsHovered) {- this.setActiveMenu()- }- }, 50)+ this.updateDynamicTitle()}- private navigateToUrl(url: string[], menu: AppMenu = null) {- this.router.navigate(url).then(() => {- if (menu && menu.miniOpened) {- menu.miniOpened = false- }- })+ private navigateToUrl(url: string[]) {+ this.router.navigate(url).catch(console.error)}private updateUrl(url: string) {@@ -200,16 +110,6 @@ export class SideBarLeftComponent implements OnDestroy {}this.currentMenu ??= this.appsMenu.submenus[0]this.updateDynamicTitle()- this.menuIconsStopPropagation = true- setTimeout(() => (this.menuIconsStopPropagation = false), 500)- }-- private setActiveMenu() {- const menu = this.appsMenu.submenus.find((m: AppMenu) => m.isActive)- if (menu) {- this.currentMenu = menu- this.updateDynamicTitle(this.currentMenu.title)- }}private updateDynamicTitle(title?: string) {diff --git a/frontend/src/styles/components/_app.scss b/frontend/src/styles/components/_app.scssindex 19d7d1a4..4512b947 100755--- a/frontend/src/styles/components/_app.scss+++ b/frontend/src/styles/components/_app.scss@@ -326,7 +326,7 @@align-items: center;align-content: center;flex: 1 1 auto !important;- padding: 5px;+ padding: .5rem;border-top: .5px solid;border-bottom: .5px solid;height: $sidebar-apps-icons-height;diff --git a/frontend/src/styles/components/_core.scss b/frontend/src/styles/components/_core.scssindex 5983eb21..e5454b99 100644--- a/frontend/src/styles/components/_core.scss+++ b/frontend/src/styles/components/_core.scss@@ -44,7 +44,7 @@ body {.content-wrapper {display: flex;position: relative;- margin-left: $sidebar-apps-menus-width + $sidebar-apps-icons-width;+ margin-left: $sidebar-apps-menus-width;margin-right: $control-sidebar-menu-width;padding-top: $navbar-height;flex: 1 1 auto;diff --git a/frontend/src/styles/components/_header.scss b/frontend/src/styles/components/_header.scssindex 19d10d5d..ecde9ae7 100644--- a/frontend/src/styles/components/_header.scss+++ b/frontend/src/styles/components/_header.scss@@ -3,7 +3,7 @@top: 0;right: 0;left: 0;- margin-left: $sidebar-apps-icons-width + $sidebar-apps-menus-width;+ margin-left: $sidebar-apps-menus-width;max-height: $navbar-height;z-index: $sidebar-z-index;transform: translate3d(0, 0, 0);@@ -29,11 +29,71 @@> a {padding: $nav-link-padding;- width: $sidebar-apps-icons-width;+ min-width: $sidebar-apps-icons-width;justify-content: center;}+ .navbar-logo-button {+ padding: 0 .4rem 0 .4rem;++ &.navbar-logo-button--delayed {+ opacity: 0;+ visibility: hidden;+ animation: navbar-logo-show .01s linear $transition-speed forwards;+ }++ &:hover,+ &:focus,+ &:active {+ background: transparent;+ }++ .logo-container {+ display: flex;+ align-items: center;+ justify-content: center;+ width: $layout-logo-container-size;+ height: $layout-logo-container-size;+ margin: auto;+ border-radius: 50%;+ background: $sidebar-light-apps-menu-hover-color;+ transition: background-color $transition-speed $transition-fn;++ > img {+ width: $layout-logo-image-size;+ height: $layout-logo-image-size;++ &.logo-spin-in {+ animation: logo-spin-in .45s $transition-fn $transition-speed both;+ transform-origin: 50% 50%;+ }+ }+ }+ }++ .navbar-history-button {+ font-size: $font-size-lg;+ color: $sidebar-light-apps-menu-title-color;++ &:hover,+ &:focus,+ &:active {+ background-color: $sidebar-light-icons-menu-hover-bg;+ color: $white;+ }+ }++ .navbar-history-button-left {+ margin-left: -.5px;+ border-left: .5px solid mix($sidebar-light-icons-menu-hover-bg, $primary, 45%);+ }++ .navbar-history-button-right {+ border-right: none;+ }+.navbar-breadcrumb {+ border-left: .5px solid mix($sidebar-light-icons-menu-hover-bg, $primary, 45%);max-width: 93%;@include media-breakpoint-down(sm) {display: none;@@ -91,6 +151,28 @@}}+@keyframes navbar-logo-show {+ from {+ opacity: 0;+ visibility: hidden;+ }+ to {+ opacity: 1;+ visibility: visible;+ }+}++@keyframes logo-spin-in {+ from {+ transform: rotate(220deg);+ opacity: .25;+ }+ to {+ transform: rotate(0);+ opacity: 1;+ }+}+.breadcrumb {display: flex;align-items: center;@@ -99,7 +181,7 @@height: $navbar-height;background: transparent;font-size: $font-size-sm;- padding: 10px 8px;+ padding: .5rem;margin: 0;color: $sidebar-light-icons-menu-color;diff --git a/frontend/src/styles/components/_profile.scss b/frontend/src/styles/components/_profile.scssindex e70cfa70..0f04d68a 100644--- a/frontend/src/styles/components/_profile.scss+++ b/frontend/src/styles/components/_profile.scss@@ -1,5 +1,6 @@.profile-page {height: 100%;+ padding: 0.5rem;}.user-groups-page {diff --git a/frontend/src/styles/components/_recents.scss b/frontend/src/styles/components/_recents.scssindex 0aaef628..ceddcd50 100644--- a/frontend/src/styles/components/_recents.scss+++ b/frontend/src/styles/components/_recents.scss@@ -1,8 +1,17 @@+.recents-dashboard {+ padding: .4rem;+}++.recents-grid {+ margin-left: 0;+ margin-right: 0;+}+.recents-widget-card {position: relative;width: 100%;border: 1px solid;- border-radius: 14px;+ border-radius: $border-radius;overflow: hidden;transition: box-shadow 0.14s ease;}diff --git a/frontend/src/styles/components/_sidebar_left.scss b/frontend/src/styles/components/_sidebar_left.scssindex 99980e84..7d403901 100755--- a/frontend/src/styles/components/_sidebar_left.scss+++ b/frontend/src/styles/components/_sidebar_left.scss@@ -6,165 +6,6 @@height: 100%;z-index: $sidebar-z-index;- .sidebar-apps-icons {- display: flex;- align-items: center;- white-space: nowrap;- height: 100%;- width: $sidebar-apps-icons-width;-- .menu {- display: flex;- flex-direction: column;- align-items: center;- height: 100%;- width: $sidebar-apps-icons-width;- cursor: pointer;-- > a {- display: flex;- align-items: center;- justify-content: center;- min-height: $sidebar-apps-height;- width: 100%;- position: relative;-- &:not(:first-child) {- $icon-item-inset: 3px;- box-sizing: border-box;- padding: $icon-item-inset;- border-radius: calc(#{$border-radius-base} + #{$icon-item-inset});- background-clip: content-box !important;- }-- &:first-child {- user-select: none;- background-color: $sidebar-light-apps-menu-title-bg;-- &:hover {- background: $sidebar-light-icons-menu-hover-bg;- }-- .logo-container {- background: $sidebar-light-apps-menu-hover-color;- }- }-- > fa-icon {- font-size: $font-size-xl;- }-- > .logo-container {- display: flex;- justify-content: center;- align-self: center;- width: 32px;- height: 32px;- object-fit: cover;- border-radius: 50%;-- > img {- display: flex;- justify-content: center;- align-self: center;- height: 26px;- width: 26px;- }- }--- .menu-badge-icon {- position: absolute;- font-size: $font-size-xs;- width: $sidebar-apps-icons-width;- inset: 0;- pointer-events: none;-- .badge {- @extend .badge-color-full;- position: absolute;- top: 2px;- right: 2px;- min-width: 16px;- height: 16px;- padding: 0 5px;- border-radius: 9999px;- font-size: $font-size-2xs;- line-height: 16px;- display: inline-flex;- align-items: center;- justify-content: center;- }- }- }-- .menu-mini {- display: flex;- flex-direction: column;- align-items: stretch;- position: absolute;- left: 100%;- top: 0;- width: calc($sidebar-apps-menus-width - 20px);- box-sizing: border-box;- padding: 3px 2px;- z-index: $sidebar-z-index;- font-size: $font-size-sm;- border-top-right-radius: $btn-border-radius;- border-bottom-right-radius: $btn-border-radius;-- &.align-self-start {- top: 0;- bottom: auto;- }-- &.align-self-end {- top: auto;- bottom: 0;- }-- > a {- display: flex;- align-items: center;- gap: .5rem;- flex: 1 1 auto;- width: auto;- margin: 2px 2px;- justify-content: flex-start;- height: calc(#{$sidebar-apps-height} - 6px);- padding: 0 8px;- border-radius: $btn-border-radius;- @extend .text-truncate;- @extend .no-select-pointer;-- > fa-icon {- font-size: $font-size-base;- margin-right: 0;- width: .95rem;- min-width: .95rem;- display: inline-flex;- justify-content: center;- opacity: .88;- }-- .menu-badge {- margin-left: auto;- font-size: $font-size-xs;- }- }-- > a.mini-submenu-item {- font-size: $font-size-xs;- padding-left: 20px;-- fa-icon {- font-size: $font-size-xs;- }- }- }- }- }-.sidebar-apps-menus {display: flex;flex-direction: column;@@ -182,11 +23,11 @@background: $sidebar-light-apps-menu-title-bg;border-bottom: .5px solid $sidebar-light-apps-menu-title-bg;- > a {+ .menu-title-content {@extend .text-truncate;display: flex;align-items: center;- padding-left: 8px;+ padding-left: 6px;padding-right: 0;max-height: $sidebar-apps-height;width: 100%;@@ -196,11 +37,31 @@&:hover, &.active {background: $sidebar-light-apps-menu-title-bg;- > a {+ .menu-title-content {color: $sidebar-light-apps-menu-title-color;}}+ .logo-toggle {+ display: flex;+ align-items: center;+ justify-content: center;+ min-width: $layout-logo-container-size;+ width: $layout-logo-container-size;+ height: $layout-logo-container-size;+ padding: 0;+ border: none;+ border-radius: 50%;+ margin-right: .5rem;+ background: $black;+ cursor: pointer;++ > img {+ width: $layout-logo-image-size;+ height: $layout-logo-image-size;+ }+ }+.sidebar-title {@extend .text-truncate;text-transform: uppercase;@@ -216,20 +77,58 @@font-size: $font-size-lg;}}+ }- .sidebar-btn {+ .apps-shortcuts {+ display: flex;+ align-items: center;+ justify-content: space-between;+ gap: 0.2rem 0;+ padding: 0 6px 0 6px;+ min-height: 40px;+ max-height: 40px;+ border-bottom: .5px solid transparent;+ border-right: .5px solid transparent;++ .app-shortcut {+ flex: 0 0 calc(#{$sidebar-apps-height} - 8px);+ position: relative;display: flex;align-items: center;justify-content: center;- min-height: $navbar-height;- min-width: 30px;- font-size: $font-size-xl;- margin: 0;- color: inherit;+ width: calc(#{$sidebar-apps-height} - 8px);+ height: calc(#{$sidebar-apps-height} - 8px);+ border: .5px solid transparent;+ border-radius: $btn-border-radius;+ background: transparent;+ cursor: pointer;++ > fa-icon {+ font-size: $font-size-lg;+ }++ .menu-badge-icon {+ position: absolute;+ font-size: $font-size-xs;+ width: 100%;+ inset: 0;+ pointer-events: none;- &:hover {- color: $white;- background: $sidebar-light-icons-menu-hover-bg;+ .badge {+ @extend .badge-color-full;+ position: absolute;+ top: 2px;+ right: 2px;+ min-width: 16px;+ height: 16px;+ padding: 0 5px;+ border-radius: 9999px;+ font-size: $font-size-2xs;+ line-height: 16px;+ display: inline-flex;+ align-items: center;+ justify-content: center;+ }}}}@@ -293,23 +192,6 @@}}- // Auto collapse on submenus-- //&.collapse-hide {- // min-height: 0 !important;- // height: 0 !important;- // overflow: hidden;- // opacity: 0;- // transition: all .2s ease-in-out;- // border-bottom: none !important;- //}- //- //&.collapse-show {- // min-height: $sidebar-apps-height;- // height: $sidebar-apps-height;- // opacity: 1;- // transition: min-height .25s, height .25s, opacity .4s ease-in-out;- //}}}diff --git a/frontend/src/styles/components/_sidebar_left_collapse.scss b/frontend/src/styles/components/_sidebar_left_collapse.scssindex ff0d0340..f123f9fb 100755--- a/frontend/src/styles/components/_sidebar_left_collapse.scss+++ b/frontend/src/styles/components/_sidebar_left_collapse.scss@@ -1,6 +1,6 @@.sidebar-collapse {.main-header, .content-wrapper {- margin-left: $sidebar-apps-icons-width !important;+ margin-left: 0 !important;}&.theme-dark {@@ -25,6 +25,19 @@}.sidebar-open {+ .left-sidebar {+ .sidebar-apps-menus {+ .menu-title {+ .logo-toggle {+ > img.logo-toggle-spin-in {+ animation: logo-toggle-spin-in .45s $transition-fn both;+ transform-origin: 50% 50%;+ }+ }+ }+ }+ }+@include media-breakpoint-up(md) {.left-sidebar {transition-delay: $transition-speed;@@ -34,33 +47,18 @@}@include media-breakpoint-down(md) {.main-header, .content-wrapper {- margin-left: $sidebar-apps-icons-width;+ margin-left: 0;}}}--// Method using the width (this allow to use popup menus on sidebar app icons)--//.sidebar-collapse {-// .content-wrapper, .main-header {-// margin-left: $sidebar-apps-icons-width !important;-// }-//-// .left-sidebar {-// .sidebar-apps-menus {-// @include transition(width $transition-speed $transition-fn);-// border-right: none !important;-// overflow: hidden;-// width: 0;-// }-// }-//}-//-//.sidebar-open {-// .left-sidebar {-// z-index: $content-z-index;-// }-//}--+@keyframes logo-toggle-spin-in {+ from {+ transform: rotate(220deg);+ opacity: .25;+ }+ to {+ transform: rotate(0);+ opacity: 1;+ }+}diff --git a/frontend/src/styles/components/_theme_dark.scss b/frontend/src/styles/components/_theme_dark.scssindex a3ea6b60..36728acb 100755--- a/frontend/src/styles/components/_theme_dark.scss+++ b/frontend/src/styles/components/_theme_dark.scss@@ -1,33 +1,27 @@//Dark Sidebar Mixin@mixin skin-dark-left-sidebar() {+ .main-header {+ .navbar-content {+ .navbar-logo-button {+ .logo-container {+ background: $sidebar-dark-icons-menu-bg;+ }+ }+ }+ }+// Sidebar background color (Both .wrapper is responsible for sidebar bg color).wrapper, .left-sidebar {background-color: $sidebar-dark-apps-menu-bg;}.left-sidebar {- // Side bar Menu apps- .sidebar-apps-icons {- background-color: $sidebar-dark-icons-menu-bg;-- .menu > a {- color: $sidebar-dark-icons-menu-color;-- &:not(:first-child) {- &:hover, &.active {- color: $sidebar-dark-icons-menu-hover-color;- background: $sidebar-dark-icons-menu-hover-bg;- border-right: .5px solid $sidebar-dark-icons-menu-bg;- }- }- }-- .menu-mini {+ .sidebar-apps-menus {+ .apps-shortcuts {background-color: $sidebar-dark-apps-menu-bg;- border-top: .5px solid $sidebar-dark-icons-menu-border-color;- border-right: .5px solid $sidebar-dark-icons-menu-border-color;- border-bottom: .5px solid $sidebar-dark-icons-menu-border-color;+ border-bottom-color: $dark-surface-border;+ border-right-color: $sidebar-dark-icons-menu-border-color;- > a {+ .app-shortcut {color: $sidebar-dark-apps-menu-border-color;&:hover, &.active {@@ -41,17 +35,6 @@}}- .chat-item-sidebar {- color: $sidebar-dark-apps-menu-border-color;- border-bottom: .5px solid $sidebar-dark-mini-menu-bg;-- &:hover, &.active {- background-color: darken($sidebar-dark-mini-menu-bg, 5%);- }- }- }-- .sidebar-apps-menus {.menus-content {border-right: .5px solid $sidebar-dark-icons-menu-border-color;}@@ -456,9 +439,9 @@--sync-client-card-selected-border: #{$dark-dialog-check-card-active-border-color};--sync-client-details-border: #{$dark-dialog-check-card-border-color};--sync-client-details-bg: linear-gradient(- 158deg,- #{mix($dark-dialog-tab-bg, $sidebar-dark-apps-menu-bg, 68%)} 0%,- #{mix($sidebar-dark-apps-menu-title-bg, $dark-dialog-tab-bg, 62%)} 100%+ 158deg,+ #{mix($dark-dialog-tab-bg, $sidebar-dark-apps-menu-bg, 68%)} 0%,+ #{mix($sidebar-dark-apps-menu-title-bg, $dark-dialog-tab-bg, 62%)} 100%);--sync-client-subtle-color: #{$dark-item-color};--sync-client-paths-count-fg: #{$white};diff --git a/frontend/src/styles/components/_theme_light.scss b/frontend/src/styles/components/_theme_light.scssindex c5283c94..7ebcb8c6 100755--- a/frontend/src/styles/components/_theme_light.scss+++ b/frontend/src/styles/components/_theme_light.scss@@ -1,34 +1,28 @@//Light Sidebar Mixins@mixin skin-light-left-sidebar() {+ .main-header {+ .navbar-content {+ .navbar-logo-button {+ .logo-container {+ background: $sidebar-light-apps-menu-hover-color;+ }+ }+ }+ }+// Sidebar background color (Both .wrapper is responsible for sidebar bg color).wrapper, .left-sidebar {background-color: $sidebar-light-apps-menu-bg;}.left-sidebar {- // Side bar Menu apps- .sidebar-apps-icons {- background-color: $sidebar-light-icons-menu-bg;-- .menu > a {- color: $sidebar-light-icons-menu-color;-- &:not(:first-child) {- &:hover, &.active {- color: $sidebar-light-icons-menu-hover-color;- background: $sidebar-light-icons-menu-hover-bg;- }- }- }-- .menu-mini {+ .sidebar-apps-menus {+ .apps-shortcuts {background-color: $light-sidebar-mini-bg;- border-top: .5px solid $sidebar-light-apps-menu-border-color;- border-right: .5px solid $sidebar-light-apps-menu-border-color;- border-bottom: .5px solid $sidebar-light-apps-menu-border-color;+ border-bottom-color: $sidebar-light-apps-menu-border-color;+ border-right-color: $sidebar-light-apps-menu-border-color;- > a {+ .app-shortcut {color: $sidebar-light-apps-menu-hover-color;- border: .5px solid transparent;&:hover {background: $light-sidebar-mini-hover-bg;@@ -37,7 +31,6 @@&.active {background: $light-sidebar-mini-active-bg;border-color: $light-sidebar-mini-active-border;- font-weight: 500;color: $navy;> fa-icon:first-child {@@ -45,25 +38,8 @@}}}-- .chat-item-sidebar {- background-color: $light-sidebar-mini-bg;- color: $sidebar-light-apps-menu-hover-color;-- &:not(:last-child) {- border-bottom: .5px solid $light-sidebar-mini-bg !important;- }-- &:hover, &.active {- border-left-color: transparent !important;- background: $light-sidebar-mini-active-bg !important;- color: $navy;- }- }}- }- .sidebar-apps-menus {.menus-content {background-color: $light-sidebar-mini-bg;border-right: .5px solid $sidebar-light-apps-menu-border-color;@@ -416,9 +392,9 @@--sync-client-card-selected-border: #{$light-dialog-check-card-hover-border-color};--sync-client-details-border: #{$light-dialog-check-card-border-color};--sync-client-details-bg: linear-gradient(- 158deg,- #{mix($theme-light-panel-bg, $white, 74%)} 0%,- #{mix($light-dialog-tab-card-bg, $theme-light-panel-bg, 68%)} 100%+ 158deg,+ #{mix($theme-light-panel-bg, $white, 74%)} 0%,+ #{mix($light-dialog-tab-card-bg, $theme-light-panel-bg, 68%)} 100%);--sync-client-subtle-color: #{$light-text-muted-color};--sync-client-paths-count-fg: #{$white};diff --git a/frontend/src/styles/components/_variables.scss b/frontend/src/styles/components/_variables.scssindex b9ec54d3..e8f4fb7f 100644--- a/frontend/src/styles/components/_variables.scss+++ b/frontend/src/styles/components/_variables.scss@@ -5,8 +5,10 @@ $navbar-height: 40px;//Sidebar left$sidebar-apps-icons-width: 40px;$sidebar-apps-icons-height: 40px;-$sidebar-apps-menus-width: 170px;+$sidebar-apps-menus-width: 180px;$sidebar-apps-height: $sidebar-apps-icons-height;+$layout-logo-container-size: 32px;+$layout-logo-image-size: 24px;$sidebar-z-index: 1030;$content-z-index: 1000;// Sidebar right (control)