Skip to content

Sync-in · Sovereign platform for file storage, sharing, synchronization, and collaboration.

feat(sidebar): improve files navigation layout

johaven47125dd78cea
diff --git a/frontend/src/app/applications/files/components/sidebar/files-tree.component.ts b/frontend/src/app/applications/files/components/sidebar/files-tree.component.ts
index 0eea3969..bbd51a0e 100644
--- a/frontend/src/app/applications/files/components/sidebar/files-tree.component.ts
+++ b/frontend/src/app/applications/files/components/sidebar/files-tree.component.ts
@@ -209,7 +209,7 @@ export class FilesTreeComponent implements OnInit, OnDestroy {
if (this.user.userHavePermission(USER_PERMISSION.PERSONAL_SPACE)) {
const node: FileTree | TreeNode = {
id: 0,
- name: this.layout.translateString(SPACES_TITLE.PERSONAL_FILES),
+ name: this.layout.translateString(SPACES_TITLE.PERSONAL_SPACE),
path: `${SPACES_PATH.FILES}/${SPACE_ALIAS.PERSONAL}`,
isDir: true,
inShare: false,
@@ -226,7 +226,7 @@ export class FilesTreeComponent implements OnInit, OnDestroy {
if (this.allowSpaces && this.user.userHavePermission(USER_PERMISSION.SPACES)) {
const node: FileTree | TreeNode = {
id: -1,
- name: this.layout.translateString(SPACES_TITLE.SPACES),
+ name: this.layout.translateString(SPACES_TITLE.COLLABORATIVE_SPACES),
path: SPACES_PATH.SPACES,
isDir: true,
mime: mimeDirectory,
diff --git a/frontend/src/app/applications/files/components/utils/file-location.utils.ts b/frontend/src/app/applications/files/components/utils/file-location.utils.ts
index 75911559..da2c246c 100644
--- a/frontend/src/app/applications/files/components/utils/file-location.utils.ts
+++ b/frontend/src/app/applications/files/components/utils/file-location.utils.ts
@@ -22,11 +22,11 @@ interface FileLocationOptions {
const FILE_LOCATION_PRESENTATION: Record<FileLocationRepository, Pick<FileLocationPresentation, 'repositoryTitle' | 'icon' | 'iconClass'>> = {
[SPACE_ALIAS.PERSONAL]: {
- repositoryTitle: SPACES_TITLE.PERSONAL_FILES,
+ repositoryTitle: SPACES_TITLE.PERSONAL_SPACE,
icon: SPACES_ICON.PERSONAL,
iconClass: 'primary'
},
- [FILE_REPOSITORY.SPACE]: { repositoryTitle: SPACES_TITLE.SPACES, icon: SPACES_ICON.SPACES, iconClass: 'primary' },
+ [FILE_REPOSITORY.SPACE]: { repositoryTitle: SPACES_TITLE.COLLABORATIVE_SPACES, icon: SPACES_ICON.SPACES, iconClass: 'primary' },
[FILE_REPOSITORY.SHARE]: { repositoryTitle: SPACES_TITLE.SHARES, icon: SPACES_ICON.SHARES, iconClass: 'purple' }
}
diff --git a/frontend/src/app/applications/recents/components/widgets/recents-apps-widget.component.html b/frontend/src/app/applications/recents/components/widgets/recents-apps-widget.component.html
index 0ac8ce1f..ea2f477a 100644
--- a/frontend/src/app/applications/recents/components/widgets/recents-apps-widget.component.html
+++ b/frontend/src/app/applications/recents/components/widgets/recents-apps-widget.component.html
@@ -3,7 +3,7 @@
<div class="col">
<div [routerLink]="[SPACES_PATH.PERSONAL_FILES]" [relativeTo]="null" class="small-box">
<div class="inner">
- <p l10nTranslate>{{ SPACES_TITLE.PERSONAL_FILES }}</p>
+ <p l10nTranslate>{{ SPACES_TITLE.PERSONAL_SPACE }}</p>
</div>
<div class="icon text-primary">
<fa-icon [icon]="SPACES_ICON.PERSONAL"></fa-icon>
@@ -15,7 +15,7 @@
<div class="col">
<div [routerLink]="[SPACES_PATH.SPACES]" [relativeTo]="null" class="small-box">
<div class="inner">
- <p l10nTranslate>{{ SPACES_TITLE.SPACES }}</p>
+ <p l10nTranslate>{{ SPACES_TITLE.COLLABORATIVE_SPACES }}</p>
</div>
<div class="icon text-primary">
<fa-icon [icon]="SPACES_ICON.SPACES"></fa-icon>
@@ -47,4 +47,4 @@
</div>
</div>
}
-</div>
\ No newline at end of file
+</div>
diff --git a/frontend/src/app/applications/shares/components/utils/share-repository.component.ts b/frontend/src/app/applications/shares/components/utils/share-repository.component.ts
index cd497f56..9e6e3d75 100644
--- a/frontend/src/app/applications/shares/components/utils/share-repository.component.ts
+++ b/frontend/src/app/applications/shares/components/utils/share-repository.component.ts
@@ -79,7 +79,7 @@ export class ShareRepositoryComponent implements OnInit, OnChanges {
} else if (this.share.file?.ownerId) {
this.repository = {
icon: SPACES_ICON.PERSONAL,
- label: SPACES_TITLE.PERSONAL_FILES,
+ label: SPACES_TITLE.PERSONAL_SPACE,
class: 'circle-primary-icon',
translate: true
}
@@ -120,7 +120,7 @@ export class ShareRepositoryComponent implements OnInit, OnChanges {
}
}
}
- if (this.repository.label === SPACES_TITLE.PERSONAL_FILES) {
+ if (this.repository.label === SPACES_TITLE.PERSONAL_SPACE) {
this.repository.label = this.layout.translateString(this.repository.label)
}
if (paths.length) {
diff --git a/frontend/src/app/applications/spaces/components/spaces.component.ts b/frontend/src/app/applications/spaces/components/spaces.component.ts
index f08b0a67..a9029be6 100644
--- a/frontend/src/app/applications/spaces/components/spaces.component.ts
+++ b/frontend/src/app/applications/spaces/components/spaces.component.ts
@@ -159,7 +159,7 @@ export class SpacesComponent implements OnInit {
this.loadSpaces()
this.canCreateSpace = this.userService.userHavePermission(USER_PERMISSION.SPACES_ADMIN)
this.layout.setBreadcrumbIcon(SPACES_ICON.SPACES)
- this.layout.setBreadcrumbNav({ url: `/${SPACES_PATH.SPACES}/${SPACES_TITLE.SPACES}`, translating: true, sameLink: true })
+ this.layout.setBreadcrumbNav({ url: `/${SPACES_PATH.SPACES}/${SPACES_TITLE.COLLABORATIVE_SPACES}`, translating: true, sameLink: true })
this.activatedRoute.queryParams.subscribe((params) => (this.focusOnSelect = params.select))
}
diff --git a/frontend/src/app/applications/spaces/services/spaces-browser.service.ts b/frontend/src/app/applications/spaces/services/spaces-browser.service.ts
index f5518014..11e38bd4 100644
--- a/frontend/src/app/applications/spaces/services/spaces-browser.service.ts
+++ b/frontend/src/app/applications/spaces/services/spaces-browser.service.ts
@@ -56,7 +56,7 @@ export class SpacesBrowserService {
const mutateLevel: NonNullable<BreadCrumbUrl['mutateLevel']> = {}
if (this.inPersonalSpace && !this.breadCrumbFilesRepo && !this.inRootSpace) {
mutateLevel[0] = {
- setTitle: SPACES_TITLE.PERSONAL_FILES,
+ setTitle: SPACES_TITLE.PERSONAL_SPACE,
translateTitle: true
}
} else if (spaceName && !this.inPersonalSpace && !(this.inShareRepo && this.inRootSpace)) {
@@ -65,7 +65,7 @@ export class SpacesBrowserService {
return {
url:
this.inPersonalSpace && this.inRootSpace
- ? `${this.breadCrumbUrl}/${SPACES_TITLE.SHORT_PERSONAL_FILES}`
+ ? `${this.breadCrumbUrl}/${SPACES_TITLE.PERSONAL_SPACE}`
: this.inShareRepo && this.inRootSpace
? `${this.breadCrumbUrl}/${SPACES_TITLE.SHARED_WITH_ME}`
: this.breadCrumbUrl,
diff --git a/frontend/src/app/applications/spaces/spaces.constants.ts b/frontend/src/app/applications/spaces/spaces.constants.ts
index 9d583a33..4b54eadd 100644
--- a/frontend/src/app/applications/spaces/spaces.constants.ts
+++ b/frontend/src/app/applications/spaces/spaces.constants.ts
@@ -16,15 +16,17 @@ import {
import { SPACES_BASE_ROUTE } from '@sync-in-server/backend/src/applications/spaces/constants/routes'
import { SPACE_ALIAS, SPACE_OPERATION, SPACE_REPOSITORY } from '@sync-in-server/backend/src/applications/spaces/constants/spaces'
import { USER_PERMISSION } from '@sync-in-server/backend/src/applications/users/constants/user'
-import { AppMenu } from '../../layout/layout.interfaces'
+import { AppMenu, AppMenuSeparator } from '../../layout/layout.interfaces'
import { LINKS_PATH } from '../links/links.constants'
import { RECENTS_ICON, RECENTS_PATH, RECENTS_TITLE } from '../recents/recents.constants'
export const SPACES_TITLE = {
RECENTS: 'Recents',
FILES: 'Files',
- PERSONAL_FILES: 'Personal files',
- SHORT_PERSONAL_FILES: 'Personal',
+ PERSONAL_SPACE: 'Personal space',
+ SHORT_PERSONAL_SPACE: 'Personal',
+ COLLABORATIVE_SPACES: 'Collaborative spaces',
+ SHORT_COLLABORATIVE_SPACES: 'Collaborative',
TRASH: 'Trash',
SPACES: 'Spaces',
SHARES: 'Shares',
@@ -81,60 +83,75 @@ export const SPACES_PERMISSIONS_MODEL: Record<SPACE_OPERATION, boolean> = {
so: false
} as const
+const SPACES_MENU_SECTION = {
+ SPACES: { separator: true, title: SPACES_TITLE.SPACES },
+ SHARED: { separator: true, title: SPACES_TITLE.SHARED },
+ BOTTOM_SEPARATOR: { separator: true, placement: 'bottom', wide: true }
+} as const satisfies Record<string, AppMenuSeparator>
+
export const SPACES_MENU: AppMenu = {
title: SPACES_TITLE.FILES,
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}`),
+ matchLink: new RegExp(
+ `^${RECENTS_PATH.BASE}|^${SPACES_PATH.SPACES}|^${SPACES_PATH.TRASH}|^${SPACES_PATH.SHARES}|^${SPACES_PATH.SHARED}|^${SPACES_PATH.LINKS}`
+ ),
submenus: [
{
title: RECENTS_TITLE,
icon: RECENTS_ICON,
link: RECENTS_PATH.BASE
},
+ SPACES_MENU_SECTION.SPACES,
{
id: USER_PERMISSION.PERSONAL_SPACE,
- title: SPACES_TITLE.SHORT_PERSONAL_FILES,
+ title: SPACES_TITLE.SHORT_PERSONAL_SPACE,
icon: SPACES_ICON.PERSONAL,
link: SPACES_PATH.PERSONAL_FILES,
- matchLink: new RegExp(`^${SPACES_PATH.PERSONAL_FILES}[/|?]`)
+ matchLink: new RegExp(`^${SPACES_PATH.PERSONAL_FILES}[/|?]`),
+ defaultLinkCandidate: true
},
{
id: USER_PERMISSION.SPACES,
- title: SPACES_TITLE.SPACES,
+ title: SPACES_TITLE.SHORT_COLLABORATIVE_SPACES,
icon: SPACES_ICON.SPACES,
link: SPACES_PATH.SPACES,
- matchLink: new RegExp(`^${SPACES_PATH.SPACES}(\\?|$)|^${SPACES_PATH.SPACES}/${SPACES_PATH.FILES}/(?!${SPACES_PATH.PERSONAL}(/|\\?|$))`)
+ matchLink: new RegExp(`^${SPACES_PATH.SPACES}(\\?|$)|^${SPACES_PATH.SPACES}/${SPACES_PATH.FILES}/(?!${SPACES_PATH.PERSONAL}(/|\\?|$))`),
+ defaultLinkCandidate: true
},
+ SPACES_MENU_SECTION.SHARED,
{
id: USER_PERMISSION.SHARES,
- title: SPACES_TITLE.SHARED,
- icon: SPACES_ICON.SHARES,
+ title: SPACES_TITLE.SHARED_WITH_ME_SHORT,
+ icon: SPACES_ICON.SHARED_WITH_ME,
link: SPACES_PATH.SPACES_SHARES,
- matchLink: new RegExp(`^${SPACES_PATH.SPACES_SHARES}|^${SPACES_PATH.SHARED}|^${SPACES_PATH.LINKS}`),
- hasSubmenus: true,
- submenus: [
- {
- id: USER_PERMISSION.SHARES_ADMIN,
- title: SPACES_TITLE.SHARED_WITH_ME_SHORT,
- icon: SPACES_ICON.SHARED_WITH_ME,
- link: SPACES_PATH.SPACES_SHARES
- },
- {
- id: USER_PERMISSION.SHARES_ADMIN,
- title: SPACES_TITLE.SHARED_WITH_OTHER_SHORT,
- icon: SPACES_ICON.SHARED_WITH_OTHERS,
- link: SPACES_PATH.SHARED
- },
- { id: USER_PERMISSION.SHARES_ADMIN, title: SPACES_TITLE.SHARED_BY_LINKS_SHORT, icon: SPACES_ICON.LINKS, link: SPACES_PATH.LINKS }
- ]
+ matchLink: new RegExp(`^${SPACES_PATH.SPACES_SHARES}`),
+ defaultLinkCandidate: true
+ },
+ {
+ id: USER_PERMISSION.SHARES_ADMIN,
+ title: SPACES_TITLE.SHARED_WITH_OTHER_SHORT,
+ icon: SPACES_ICON.SHARED_WITH_OTHERS,
+ link: SPACES_PATH.SHARED,
+ matchLink: new RegExp(`^${SPACES_PATH.SHARED}`),
+ defaultLinkCandidate: true
+ },
+ {
+ id: USER_PERMISSION.SHARES_ADMIN,
+ title: SPACES_TITLE.SHARED_BY_LINKS_SHORT,
+ icon: SPACES_ICON.LINKS,
+ link: SPACES_PATH.LINKS,
+ matchLink: new RegExp(`^${SPACES_PATH.LINKS}`),
+ defaultLinkCandidate: true
},
+ SPACES_MENU_SECTION.BOTTOM_SEPARATOR,
{
id: USER_PERMISSION.PERSONAL_SPACE,
title: SPACES_TITLE.TRASH,
icon: SPACES_ICON.TRASH,
link: SPACES_PATH.TRASH,
- matchLink: new RegExp(`^${SPACES_PATH.SPACES}/${SPACES_PATH.TRASH}/`)
+ matchLink: new RegExp(`^${SPACES_PATH.SPACES}/${SPACES_PATH.TRASH}/`),
+ placement: 'bottom'
}
]
} as const
diff --git a/frontend/src/app/applications/sync/components/wizard/sync-wizard-server.component.ts b/frontend/src/app/applications/sync/components/wizard/sync-wizard-server.component.ts
index 3a83bfe8..9d522522 100644
--- a/frontend/src/app/applications/sync/components/wizard/sync-wizard-server.component.ts
+++ b/frontend/src/app/applications/sync/components/wizard/sync-wizard-server.component.ts
@@ -43,7 +43,7 @@ export class SyncWizardServerComponent {
this.userService.userHavePermission(USER_PERMISSION.PERSONAL_SPACE)
? new SyncWizardPath({
id: 0,
- name: this.layout.translateString(SPACES_TITLE.PERSONAL_FILES),
+ name: this.layout.translateString(SPACES_TITLE.PERSONAL_SPACE),
path: `${SPACES_PATH.FILES}/${SPACES_PATH.PERSONAL}`,
icon: SPACES_ICON.PERSONAL,
hasChildren: true,
@@ -54,7 +54,7 @@ export class SyncWizardServerComponent {
this.userService.userHavePermission(USER_PERMISSION.SPACES)
? new SyncWizardPath({
id: -1,
- name: this.layout.translateString(SPACES_TITLE.SPACES),
+ name: this.layout.translateString(SPACES_TITLE.COLLABORATIVE_SPACES),
path: SPACES_PATH.SPACES,
icon: SPACES_ICON.SPACES,
hasChildren: true,
diff --git a/frontend/src/app/applications/sync/services/sync.service.ts b/frontend/src/app/applications/sync/services/sync.service.ts
index b5189322..81c0602a 100644
--- a/frontend/src/app/applications/sync/services/sync.service.ts
+++ b/frontend/src/app/applications/sync/services/sync.service.ts
@@ -155,7 +155,7 @@ export class SyncService {
}
segments[0] =
segments[0] === SPACES_PATH.PERSONAL
- ? this.layout.translateString(SPACES_TITLE.PERSONAL_FILES)
+ ? this.layout.translateString(SPACES_TITLE.PERSONAL_SPACE)
: this.layout.translateString(capitalizeString(segments[0]))
return segments.join('/')
}
diff --git a/frontend/src/app/applications/users/components/sidebar/user-profile.component.html b/frontend/src/app/applications/users/components/sidebar/user-profile.component.html
index 3e4b48a9..844c4cb1 100755
--- a/frontend/src/app/applications/users/components/sidebar/user-profile.component.html
+++ b/frontend/src/app/applications/users/components/sidebar/user-profile.component.html
@@ -50,8 +50,9 @@
<div class="mt-auto">
<hr class="my-0 w-100" />
<div class="profile-sync-in-footer">
- <div class="mb-1">
+ <div class="profile-sync-in-brand">
<img alt="" height="30" [src]="this.layout.switchTheme.getValue() === themeLight ? logoUrl: logoDarkUrl">
+ <span class="profile-sync-in-version">v{{ appVersion }}</span>
</div>
<div class="d-flex">
<a class="text-primary cursor-pointer" (click)="openLink('website')" l10nTranslate>Website</a>
diff --git a/frontend/src/app/applications/users/components/sidebar/user-profile.component.ts b/frontend/src/app/applications/users/components/sidebar/user-profile.component.ts
index 29d53ce8..46802a87 100644
--- a/frontend/src/app/applications/users/components/sidebar/user-profile.component.ts
+++ b/frontend/src/app/applications/users/components/sidebar/user-profile.component.ts
@@ -6,6 +6,7 @@ import { faCircleHalfStroke, faCog, faPowerOff, faThumbTack, faThumbTackSlash, f
import { APP_URL } from '@sync-in-server/backend/src/common/shared'
import { L10N_LOCALE, L10nLocale, L10nTranslateDirective, L10nTranslatePipe } from 'angular-l10n'
import { Subscription } from 'rxjs'
+import { APP_VERSION } from '../../../../app.constants'
import { AuthService } from '../../../../auth/auth.service'
import { AutoResizeDirective } from '../../../../common/directives/auto-resize.directive'
import { CapitalizePipe } from '../../../../common/pipes/capitalize.pipe'
@@ -29,6 +30,7 @@ export class UserProfileComponent implements OnDestroy {
protected readonly locale = inject<L10nLocale>(L10N_LOCALE)
protected readonly USER_PATH = USER_PATH
protected readonly allOnlineStatus = USER_ONLINE_STATUS_LIST
+ protected readonly appVersion = APP_VERSION
protected appBaseUrl = `${APP_URL.WEBSITE}`
protected readonly icons = { faUserAlt, faCircleHalfStroke, faCog, faPowerOff, faUserSecret, faThumbTack, faThumbTackSlash }
protected user: UserType
diff --git a/frontend/src/app/applications/users/user.service.ts b/frontend/src/app/applications/users/user.service.ts
index edeec8ed..bcb7602d 100644
--- a/frontend/src/app/applications/users/user.service.ts
+++ b/frontend/src/app/applications/users/user.service.ts
@@ -56,7 +56,7 @@ import type {
import { BsModalRef } from 'ngx-bootstrap/modal'
import { Socket } from 'ngx-socket-io'
import { catchError, map, Observable, of } from 'rxjs'
-import { AppMenu } from '../../layout/layout.interfaces'
+import { AppMenu, AppMenuEntry, isAppMenu, isAppMenuSeparator } from '../../layout/layout.interfaces'
import { LayoutService } from '../../layout/layout.service'
import { StoreService } from '../../store/store.service'
import { NotificationsService } from '../notifications/notifications.service'
@@ -264,8 +264,11 @@ export class UserService {
)
}
- setMenusVisibility(menus: AppMenu[]) {
+ setMenusVisibility(menus: AppMenuEntry[]) {
for (const menu of menus) {
+ if (isAppMenuSeparator(menu)) {
+ continue
+ }
if (menu.id) {
menu.hide = !this.userHavePermission(menu.id)
if (menu.hide) continue
@@ -276,19 +279,21 @@ export class UserService {
if (menu.submenus?.length) {
this.setMenusVisibility(menu.submenus)
}
- menu.hasSubmenus = !!menu.submenus?.some((submenu) => !submenu.hide)
+ menu.hasSubmenus = !!menu.submenus?.some((submenu) => isAppMenu(submenu) && !submenu.hide)
// updates the files menu link based on user permissions
if (menu.title === SPACES_TITLE.FILES) {
- for (const submenu of menu.submenus) {
- if (!submenu.hide) {
- menu.link = submenu.link
- break
- }
+ const defaultMenu = this.findFirstVisibleMenu(menu.submenus, true) ?? this.findFirstVisibleMenu(menu.submenus)
+ if (defaultMenu) {
+ menu.link = defaultMenu.link
}
}
}
}
+ private findFirstVisibleMenu(menus: AppMenuEntry[] | undefined, defaultLinkCandidate = false): AppMenu | undefined {
+ return menus?.find((menu): menu is AppMenu => isAppMenu(menu) && !menu.hide && (!defaultLinkCandidate || !!menu.defaultLinkCandidate))
+ }
+
refreshAvatar() {
this.store.userAvatarUrl.next(myAvatarUrl())
}
diff --git a/frontend/src/app/layout/layout.interfaces.ts b/frontend/src/app/layout/layout.interfaces.ts
index 24d8d80e..5fefaf61 100644
--- a/frontend/src/app/layout/layout.interfaces.ts
+++ b/frontend/src/app/layout/layout.interfaces.ts
@@ -22,6 +22,30 @@ export enum TAB_MENU {
NOTIFICATIONS = 'notifications'
}
+// Moves an entry out of the regular menu flow into a dedicated visual area.
+export type AppMenuPlacement = 'bottom'
+
+export interface AppMenuSeparator {
+ separator: true
+ // When provided, the separator is rendered as a section label instead of a line.
+ title?: string
+ // Use "bottom" for entries such as Trash that should be pinned at the bottom of the sidebar menu.
+ placement?: AppMenuPlacement
+ // Extends the separator line across the full sidebar menu width.
+ wide?: boolean
+}
+
+// Sidebar submenus can contain real navigation entries and visual separators.
+export type AppMenuEntry = AppMenu | AppMenuSeparator
+
+export function isAppMenuSeparator(menu: AppMenuEntry): menu is AppMenuSeparator {
+ return 'separator' in menu && menu.separator
+}
+
+export function isAppMenu(menu: AppMenuEntry): menu is AppMenu {
+ return !isAppMenuSeparator(menu)
+}
+
export interface AppMenu {
id?: USER_PERMISSION
title: string
@@ -29,12 +53,16 @@ export interface AppMenu {
iconAnimated?: boolean
link: string
matchLink?: RegExp
+ // Allows a parent menu link to target the first visible preferred child instead of the first visible child.
+ defaultLinkCandidate?: boolean
+ // Use "bottom" for entries such as Trash that should be pinned at the bottom of the sidebar menu.
+ placement?: AppMenuPlacement
isActive?: boolean
hide?: boolean
count?: { value: Observable<any> & BehaviorSubject<any>; level: string }
// prop must be an attribute of the userService
checks?: { negate?: boolean; prop: 'user'; value: UserStatus }[]
- submenus?: AppMenu[]
+ submenus?: AppMenuEntry[]
hasSubmenus?: boolean
}
diff --git a/frontend/src/app/layout/sidebar/sidebar.left.component.html b/frontend/src/app/layout/sidebar/sidebar.left.component.html
index f32ea41d..9b3b2b64 100644
--- a/frontend/src/app/layout/sidebar/sidebar.left.component.html
+++ b/frontend/src/app/layout/sidebar/sidebar.left.component.html
@@ -5,27 +5,32 @@
<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 class="sidebar-brand">
+ <span class="sidebar-app-name">{{ appName }}</span>
+ <span class="sidebar-title">{{ dynamicTitle }}</span>
+ </div>
</div>
</div>
<div class="apps-shortcuts">
- @for (menu of appsMenu.submenus; track menu.title) {
- @if (!menu.hide) {
- <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>
+ @for (menu of appsMenu.submenus; track $index) {
+ @if (isMenu(menu)) {
+ @if (!menu.hide) {
+ <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>
}
- </span>
- }
- </button>
+ </button>
+ }
}
}
@if (store.userImpersonate()) {
@@ -40,19 +45,36 @@
</div>
<div class="menus-content">
<div class="menus-group">
- @for (menu of currentMenu.submenus; track menu.title) {
- @if (!menu.hide) {
- <ng-container [ngTemplateOutlet]="MenuApps" [ngTemplateOutletContext]="{menu: menu}"></ng-container>
+ <div class="menus-top">
+ @for (menu of currentMenu.submenus; track $index; let menuIndex = $index) {
+ @if (menu.placement !== 'bottom') {
+ <ng-container [ngTemplateOutlet]="MenuEntry"
+ [ngTemplateOutletContext]="{menus: currentMenu.submenus, menu: menu, menuIndex: menuIndex}"></ng-container>
+ }
}
- }
- </div>
- <div class="sidebar-apps-footer">
- <span>{{ appVersion }}</span>
+ </div>
+ <div class="menus-bottom">
+ @for (menu of currentMenu.submenus; track $index; let menuIndex = $index) {
+ @if (menu.placement === 'bottom') {
+ <ng-container [ngTemplateOutlet]="MenuEntry"
+ [ngTemplateOutletContext]="{menus: currentMenu.submenus, menu: menu, menuIndex: menuIndex}"></ng-container>
+ }
+ }
+ </div>
</div>
</div>
</div>
</aside>
<!--Start Templates-->
+<ng-template #MenuEntry let-menus="menus" let-menu="menu" let-menuIndex="menuIndex">
+ @if (isMenu(menu)) {
+ @if (!menu.hide) {
+ <ng-container [ngTemplateOutlet]="MenuApps" [ngTemplateOutletContext]="{menu: menu}"></ng-container>
+ }
+ } @else if (showMenuSeparator(menus, menuIndex, menu)) {
+ <ng-container [ngTemplateOutlet]="MenuSeparator" [ngTemplateOutletContext]="{menu: menu}"></ng-container>
+ }
+</ng-template>
<ng-template #MenuTemplate let-menu="menu">
<fa-icon [icon]="menu.icon" [animation]="menu.iconAnimated ? 'spin' : null"></fa-icon>
<span l10nTranslate>{{ menu.title }}</span>
@@ -75,15 +97,27 @@
</a>
</div>
@if (menu.hasSubmenus) {
- @for (submenu of menu.submenus; track submenu.title) {
- @if (!submenu.hide) {
- <div class="menu submenu" [class.active]="submenu.isActive">
- <a (click)="closeSideBarOnMobile()" [routerLink]="submenu.link">
- <ng-container [ngTemplateOutlet]="MenuTemplate" [ngTemplateOutletContext]="{menu: submenu}"></ng-container>
- </a>
- </div>
+ @for (submenu of menu.submenus; track $index; let submenuIndex = $index) {
+ @if (isMenu(submenu)) {
+ @if (!submenu.hide) {
+ <div class="menu submenu" [class.active]="submenu.isActive">
+ <a (click)="closeSideBarOnMobile()" [routerLink]="submenu.link">
+ <ng-container [ngTemplateOutlet]="MenuTemplate" [ngTemplateOutletContext]="{menu: submenu}"></ng-container>
+ </a>
+ </div>
+ }
+ } @else if (showMenuSeparator(menu.submenus, submenuIndex, submenu)) {
+ <ng-container [ngTemplateOutlet]="MenuSeparator" [ngTemplateOutletContext]="{menu: submenu}"></ng-container>
}
}
}
</ng-template>
+<!--Start Menu Separator Template-->
+<ng-template #MenuSeparator let-menu="menu">
+ <div class="menu-separator" [class.has-label]="menu.title" [class.is-wide]="menu.wide" [attr.aria-hidden]="menu.title ? null : true">
+ @if (menu.title) {
+ <span l10nTranslate>{{ menu.title }}</span>
+ }
+ </div>
+</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.ts
index a18147ca..c65845b5 100644
--- a/frontend/src/app/layout/sidebar/sidebar.left.component.ts
+++ b/frontend/src/app/layout/sidebar/sidebar.left.component.ts
@@ -6,7 +6,7 @@ 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_VERSION } from '../../app.constants'
+import { APP_MENU, APP_NAME } 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'
@@ -16,7 +16,7 @@ import { USER_MENU } from '../../applications/users/user.constants'
import { UserService } from '../../applications/users/user.service'
import { AuthService } from '../../auth/auth.service'
import { StoreService } from '../../store/store.service'
-import { AppMenu } from '../layout.interfaces'
+import { AppMenu, AppMenuEntry, isAppMenu, isAppMenuSeparator } from '../layout.interfaces'
import { LayoutService } from '../layout.service'
@Component({
@@ -27,20 +27,21 @@ import { LayoutService } from '../layout.service'
export class SideBarLeftComponent implements OnDestroy {
protected readonly store = inject(StoreService)
protected readonly icons = { faUserSecret, faChevronDown }
+ protected readonly appName = APP_NAME
protected logoIconUrl = logoIconUrl
- protected appVersion: string
protected dynamicTitle: string
protected currentUrl: string
protected currentMenu: AppMenu
protected appsMenu: AppMenu = APP_MENU
+ protected readonly isMenu = isAppMenu
private readonly router = inject(Router)
private readonly authService = inject(AuthService)
private readonly layout = inject(LayoutService)
private readonly userService = inject(UserService)
+ private readonly canPreviewMenuTitle = window.matchMedia('(hover: hover) and (pointer: fine)')
private subscriptions: Subscription[] = []
constructor() {
- this.appVersion = APP_VERSION
this.appsMenu.submenus = [SPACES_MENU, SEARCH_MENU, SYNC_MENU, USER_MENU, ADMIN_MENU]
this.subscriptions.push(this.store.user.pipe(filter((u) => !!u)).subscribe(() => this.loadMenus()))
this.subscriptions.push(
@@ -53,7 +54,7 @@ export class SideBarLeftComponent implements OnDestroy {
}
loadMenus() {
- this.userService.setMenusVisibility(this.appsMenu.submenus)
+ this.userService.setMenusVisibility(this.appsMenu.submenus ?? [])
this.updateUrl(this.router.url)
}
@@ -77,26 +78,67 @@ export class SideBarLeftComponent implements OnDestroy {
}
previewMenuTitle(title: string) {
- if (!window.matchMedia('(hover: hover) and (pointer: fine)').matches) {
+ if (!this.canPreviewMenuTitle.matches) {
return
}
this.updateDynamicTitle(title)
}
restoreMenuTitle() {
- if (!window.matchMedia('(hover: hover) and (pointer: fine)').matches) {
+ if (!this.canPreviewMenuTitle.matches) {
return
}
this.updateDynamicTitle()
}
+ protected showMenuSeparator(menus: AppMenuEntry[] | undefined, separatorIndex: number, separator: AppMenuEntry): boolean {
+ if (!menus?.length || !isAppMenuSeparator(separator)) {
+ return false
+ }
+ if (separator.title) {
+ return this.hasVisibleMenuUntilNextSeparator(menus, separatorIndex + 1, 1)
+ }
+ const hasMenuBefore = this.hasVisibleMenuUntilNextSimpleSeparator(menus, separatorIndex - 1, -1)
+ const hasMenuAfter = this.hasVisibleMenuUntilNextSimpleSeparator(menus, separatorIndex + 1, 1)
+ return hasMenuBefore && hasMenuAfter
+ }
+
private navigateToUrl(url: string[]) {
this.router.navigate(url).catch(console.error)
}
+ private hasVisibleMenuUntilNextSeparator(menus: AppMenuEntry[], startIndex: number, direction: 1 | -1): boolean {
+ for (let i = startIndex; i >= 0 && i < menus.length; i += direction) {
+ const menu = menus[i]
+ if (isAppMenuSeparator(menu)) {
+ return false
+ }
+ if (isAppMenu(menu) && !menu.hide) {
+ return true
+ }
+ }
+ return false
+ }
+
+ private hasVisibleMenuUntilNextSimpleSeparator(menus: AppMenuEntry[], startIndex: number, direction: 1 | -1): boolean {
+ for (let i = startIndex; i >= 0 && i < menus.length; i += direction) {
+ const menu = menus[i]
+ if (isAppMenu(menu) && !menu.hide) {
+ return true
+ }
+ if (isAppMenuSeparator(menu) && !menu.title) {
+ return false
+ }
+ }
+ return false
+ }
+
private updateUrl(url: string) {
this.currentUrl = url.substring(1)
- for (const mainMenu of this.appsMenu.submenus) {
+ for (const mainMenu of this.appsMenu.submenus ?? []) {
+ if (isAppMenuSeparator(mainMenu)) {
+ continue
+ }
mainMenu.isActive = !!(
!mainMenu.hide &&
(mainMenu.link === this.currentUrl || (!!mainMenu.matchLink && mainMenu.matchLink.test(this.currentUrl)))
@@ -106,16 +148,25 @@ export class SideBarLeftComponent implements OnDestroy {
}
if (mainMenu.submenus?.length) {
for (const menu of mainMenu.submenus) {
+ if (isAppMenuSeparator(menu)) {
+ continue
+ }
menu.isActive = mainMenu.isActive && (menu.link === this.currentUrl || (!!menu.matchLink && menu.matchLink.test(this.currentUrl)))
if (menu.submenus?.length) {
for (const subMenu of menu.submenus) {
+ if (isAppMenuSeparator(subMenu)) {
+ continue
+ }
subMenu.isActive = this.currentUrl.startsWith(subMenu.link)
}
}
}
}
}
- this.currentMenu ??= this.appsMenu.submenus[0]
+ const firstMenu = this.appsMenu.submenus?.find(isAppMenu)
+ if (firstMenu) {
+ this.currentMenu ??= firstMenu
+ }
this.updateDynamicTitle()
}
diff --git a/frontend/src/i18n/de.json b/frontend/src/i18n/de.json
index c45e9af4..0ab84272 100644
--- a/frontend/src/i18n/de.json
+++ b/frontend/src/i18n/de.json
@@ -55,8 +55,10 @@
"Event": "Ereignis",
"File": "Datei",
"Files": "Dateien",
- "Personal files": "Persönliche Dateien",
+ "Personal space": "Persönlicher Bereich",
"Personal": "Persönlich",
+ "Collaborative": "Gemeinsam",
+ "Collaborative spaces": "Gemeinsame Bereiche",
"External": "Extern",
"Share status": "Freigabestatus",
"No recent files": "Keine aktuellen Dateien",
diff --git a/frontend/src/i18n/en.json b/frontend/src/i18n/en.json
index ce60902f..afa66d17 100644
--- a/frontend/src/i18n/en.json
+++ b/frontend/src/i18n/en.json
@@ -22,6 +22,9 @@
"office_editor_init_error": "{{ editor }} editor failed to initialize",
"office_editor_unknown_error": "Unknown {{ editor }} error",
"edit_in_office_editor": "Edit in {{ editor }}",
+ "Personal space": "Personal space",
+ "Collaborative": "Collaborative",
+ "Collaborative spaces": "Collaborative spaces",
"personal_space": "Personal space access",
"spaces_access": "Spaces access",
"spaces_admin": "Spaces administration",
diff --git a/frontend/src/i18n/es.json b/frontend/src/i18n/es.json
index fe94d839..0da58ecf 100644
--- a/frontend/src/i18n/es.json
+++ b/frontend/src/i18n/es.json
@@ -55,8 +55,10 @@
"Event": "Evento",
"File": "Archivo",
"Files": "Archivos",
- "Personal files": "Archivos personales",
+ "Personal space": "Espacio personal",
"Personal": "Personales",
+ "Collaborative": "Colaborativos",
+ "Collaborative spaces": "Espacios colaborativos",
"External": "Externo",
"Share status": "Estado del recurso compartido",
"No recent files": "No hay archivos recientes",
diff --git a/frontend/src/i18n/fr.json b/frontend/src/i18n/fr.json
index 415f33e6..8814bca5 100644
--- a/frontend/src/i18n/fr.json
+++ b/frontend/src/i18n/fr.json
@@ -55,8 +55,10 @@
"Event": "Évènement",
"File": "Fichier",
"Files": "Fichiers",
- "Personal files": "Fichiers personnels",
- "Personal": "Personnels",
+ "Personal space": "Espace personnel",
+ "Personal": "Personnel",
+ "Collaborative": "Collaboratifs",
+ "Collaborative spaces": "Espaces collaboratifs",
"External": "Externe",
"Share status": "État du partage",
"No recent files": "Aucun fichier récent",
diff --git a/frontend/src/i18n/hi.json b/frontend/src/i18n/hi.json
index e7d5c31b..029586a4 100644
--- a/frontend/src/i18n/hi.json
+++ b/frontend/src/i18n/hi.json
@@ -55,8 +55,10 @@
"Event": "घटना",
"File": "फ़ाइल",
"Files": "फ़ाइलें",
- "Personal files": "व्यक्तिगत फ़ाइलें",
+ "Personal space": "व्यक्तिगत स्थान",
"Personal": "व्यक्तिगत",
+ "Collaborative": "सहयोगी",
+ "Collaborative spaces": "सहयोगी स्थान",
"External": "बाह्य",
"Share status": "साझाकरण स्थिति",
"No recent files": "कोई हाल की फ़ाइल नहीं",
diff --git a/frontend/src/i18n/it.json b/frontend/src/i18n/it.json
index 61f9d62a..21d3ffc6 100644
--- a/frontend/src/i18n/it.json
+++ b/frontend/src/i18n/it.json
@@ -55,8 +55,10 @@
"Event": "Evento",
"File": "File",
"Files": "File",
- "Personal files": "File personali",
+ "Personal space": "Spazio personale",
"Personal": "Personali",
+ "Collaborative": "Collaborativi",
+ "Collaborative spaces": "Spazi collaborativi",
"External": "Esterno",
"Share status": "Stato della condivisione",
"No recent files": "Nessun file recente",
diff --git a/frontend/src/i18n/ja.json b/frontend/src/i18n/ja.json
index 92042048..ae447b67 100644
--- a/frontend/src/i18n/ja.json
+++ b/frontend/src/i18n/ja.json
@@ -55,8 +55,10 @@
"Event": "イベント",
"File": "ファイル",
"Files": "ファイル",
- "Personal files": "個人ファイル",
+ "Personal space": "個人スペース",
"Personal": "個人",
+ "Collaborative": "共同",
+ "Collaborative spaces": "共同スペース",
"External": "外部",
"Share status": "共有状況",
"No recent files": "最近のファイルはありません",
diff --git a/frontend/src/i18n/ko.json b/frontend/src/i18n/ko.json
index 9c769b76..521f0eff 100644
--- a/frontend/src/i18n/ko.json
+++ b/frontend/src/i18n/ko.json
@@ -55,8 +55,10 @@
"Event": "이벤트",
"File": "파일",
"Files": "파일",
- "Personal files": "개인 파일",
+ "Personal space": "개인 공간",
"Personal": "개인",
+ "Collaborative": "공동",
+ "Collaborative spaces": "공동 작업 공간",
"External": "외부",
"Share status": "공유 상태",
"No recent files": "최근 파일이 없습니다",
diff --git a/frontend/src/i18n/nl.json b/frontend/src/i18n/nl.json
index e59c574e..165be003 100644
--- a/frontend/src/i18n/nl.json
+++ b/frontend/src/i18n/nl.json
@@ -55,8 +55,10 @@
"Event": "Gebeurtenis",
"File": "Bestand",
"Files": "Bestanden",
- "Personal files": "Persoonlijke bestanden",
+ "Personal space": "Persoonlijke ruimte",
"Personal": "Persoonlijk",
+ "Collaborative": "Samenwerking",
+ "Collaborative spaces": "Samenwerkingsruimten",
"External": "Extern",
"Share status": "Status van de share",
"No recent files": "Geen recente bestanden",
diff --git a/frontend/src/i18n/pl.json b/frontend/src/i18n/pl.json
index 706b95e3..73dfd7a3 100644
--- a/frontend/src/i18n/pl.json
+++ b/frontend/src/i18n/pl.json
@@ -55,8 +55,10 @@
"Event": "Zdarzenie",
"File": "Plik",
"Files": "Pliki",
- "Personal files": "Pliki osobiste",
+ "Personal space": "Przestrzeń osobista",
"Personal": "Osobiste",
+ "Collaborative": "Współdzielone",
+ "Collaborative spaces": "Przestrzenie współpracy",
"External": "Zewnętrzne",
"Share status": "Status udostępnienia",
"No recent files": "Brak ostatnich plików",
diff --git a/frontend/src/i18n/pt-BR.json b/frontend/src/i18n/pt-BR.json
index 6eef57a5..c982ad0e 100644
--- a/frontend/src/i18n/pt-BR.json
+++ b/frontend/src/i18n/pt-BR.json
@@ -55,8 +55,10 @@
"Event": "Evento",
"File": "Arquivo",
"Files": "Arquivos",
- "Personal files": "Arquivos pessoais",
+ "Personal space": "Espaço pessoal",
"Personal": "Pessoal",
+ "Collaborative": "Colaborativos",
+ "Collaborative spaces": "Espaços colaborativos",
"External": "Externo",
"Share status": "Status do compartilhamento",
"No recent files": "Nenhum arquivo recente",
diff --git a/frontend/src/i18n/pt.json b/frontend/src/i18n/pt.json
index d5995764..4fc8d3eb 100644
--- a/frontend/src/i18n/pt.json
+++ b/frontend/src/i18n/pt.json
@@ -55,8 +55,10 @@
"Event": "Evento",
"File": "Arquivo",
"Files": "Arquivos",
- "Personal files": "Arquivos pessoais",
+ "Personal space": "Espaço pessoal",
"Personal": "Pessoais",
+ "Collaborative": "Colaborativos",
+ "Collaborative spaces": "Espaços colaborativos",
"External": "Externo",
"Share status": "Status do compartilhamento",
"No recent files": "Nenhum arquivo recente",
diff --git a/frontend/src/i18n/ru.json b/frontend/src/i18n/ru.json
index fc97124c..f7bdd92c 100644
--- a/frontend/src/i18n/ru.json
+++ b/frontend/src/i18n/ru.json
@@ -55,8 +55,10 @@
"Event": "Событие",
"File": "Файл",
"Files": "Файлы",
- "Personal files": "Личные файлы",
+ "Personal space": "Личное пространство",
"Personal": "Личное",
+ "Collaborative": "Совместные",
+ "Collaborative spaces": "Совместные пространства",
"External": "Внешнее",
"Share status": "Статус общего доступа",
"No recent files": "Нет недавних файлов",
diff --git a/frontend/src/i18n/tr.json b/frontend/src/i18n/tr.json
index 9d693c9f..df8e1a7a 100644
--- a/frontend/src/i18n/tr.json
+++ b/frontend/src/i18n/tr.json
@@ -55,8 +55,10 @@
"Event": "Olay",
"File": "Dosya",
"Files": "Dosyalar",
- "Personal files": "Kişisel dosyalar",
+ "Personal space": "Kişisel alan",
"Personal": "Kişisel",
+ "Collaborative": "İşbirlikçi",
+ "Collaborative spaces": "İşbirliği alanları",
"External": "Harici",
"Share status": "Paylaşım durumu",
"No recent files": "Son dosya yok",
diff --git a/frontend/src/i18n/zh.json b/frontend/src/i18n/zh.json
index f24a611f..22e2871a 100644
--- a/frontend/src/i18n/zh.json
+++ b/frontend/src/i18n/zh.json
@@ -55,8 +55,10 @@
"Event": "事件",
"File": "文件",
"Files": "文件",
- "Personal files": "个人文件",
+ "Personal space": "个人空间",
"Personal": "个人",
+ "Collaborative": "协作",
+ "Collaborative spaces": "协作空间",
"External": "外部",
"Share status": "共享状态",
"No recent files": "没有最近的文件",
diff --git a/frontend/src/styles/components/_profile.scss b/frontend/src/styles/components/_profile.scss
index 061d353d..505db8fa 100644
--- a/frontend/src/styles/components/_profile.scss
+++ b/frontend/src/styles/components/_profile.scss
@@ -38,6 +38,18 @@
font-size: $font-size-sm;
}
+.profile-sync-in-brand {
+ display: flex;
+ align-items: center;
+ justify-content: space-between;
+ margin-bottom: .25rem;
+}
+
+.profile-sync-in-version {
+ font-size: $font-size-2xs;
+ opacity: .72;
+}
+
.profile-user-img {
margin: 0 auto;
width: 100px;
diff --git a/frontend/src/styles/components/_sidebar_left.scss b/frontend/src/styles/components/_sidebar_left.scss
index 82b30497..0ca56b00 100755
--- a/frontend/src/styles/components/_sidebar_left.scss
+++ b/frontend/src/styles/components/_sidebar_left.scss
@@ -19,7 +19,6 @@
height: $sidebar-apps-height;
min-width: $sidebar-apps-menus-width;
font-size: $font-size-xs;
- cursor: pointer;
background: $sidebar-light-apps-menu-title-bg;
border-bottom: .5px solid $sidebar-light-apps-menu-title-bg;
@@ -50,8 +49,8 @@
padding: 0;
border: none;
border-radius: 50%;
- margin-right: .4rem;
- margin-left: .4rem;
+ margin-right: .55rem;
+ margin-left: .5rem;
background: $black;
cursor: pointer;
@@ -61,20 +60,28 @@
}
}
- .sidebar-title {
- @include text-truncate-utility;
- text-transform: uppercase;
+ .sidebar-brand {
+ display: flex;
+ flex-direction: column;
+ justify-content: center;
+ gap: 2px;
+ min-width: 0;
margin-right: auto;
- font-size: $font-size-xs;
+ line-height: 1.12;
+ }
- > span {
- @include text-truncate-utility;
- }
+ .sidebar-app-name {
+ @include text-truncate-utility;
+ color: $white;
+ font-size: $font-size-base;
+ font-weight: 600;
+ }
- > fa-icon {
- margin-right: .25rem;
- font-size: $font-size-lg;
- }
+ .sidebar-title {
+ @include text-truncate-utility;
+ color: rgba($white, .68);
+ font-size: $font-size-xs;
+ font-weight: 500;
}
}
@@ -142,9 +149,62 @@
}
.menus-group {
- overflow-y: auto;
- overflow-x: hidden;
- scrollbar-width: thin;
+ display: flex;
+ flex-direction: column;
+ flex: 1 1 auto;
+ min-height: 0;
+ overflow: hidden;
+
+ .menus-top {
+ flex: 0 1 auto;
+ min-height: 0;
+ overflow-y: auto;
+ overflow-x: hidden;
+ scrollbar-width: thin;
+ }
+
+ .menus-bottom {
+ flex: 0 0 auto;
+ margin-top: auto;
+ padding-bottom: 6px;
+ }
+
+ .menu-separator {
+ display: flex;
+ align-items: center;
+ min-width: $sidebar-apps-menus-width;
+ height: 8px;
+ pointer-events: none;
+
+ &.has-label {
+ height: 24px;
+ align-items: flex-end;
+ padding: 0 16px 4px;
+
+ > span {
+ @include text-truncate-utility;
+ font-size: $font-size-2xs;
+ font-weight: 700;
+ line-height: 1;
+ letter-spacing: .08em;
+ text-transform: uppercase;
+ }
+ }
+
+ &:not(.has-label)::before {
+ content: '';
+ display: block;
+ width: calc(100% - 16px);
+ height: .5px;
+ margin: 0 8px;
+ background: currentColor;
+ }
+
+ &.is-wide:not(.has-label)::before {
+ width: 100%;
+ margin-inline: 0;
+ }
+ }
.menu {
display: flex;
@@ -195,20 +255,5 @@
}
}
-
- .sidebar-apps-footer {
- @media screen and ((height < 350px) or (width < map-get($grid-breakpoints, md))) {
- display: none !important;
- }
- display: flex;
- padding: 4px;
- margin-left: auto;
- margin-top: auto;
-
- span {
- @include no-select-utility;
- font-size: $font-size-2xs;
- }
- }
}
}
diff --git a/frontend/src/styles/components/_theme_dark.scss b/frontend/src/styles/components/_theme_dark.scss
index 616e8336..85f3b7c9 100755
--- a/frontend/src/styles/components/_theme_dark.scss
+++ b/frontend/src/styles/components/_theme_dark.scss
@@ -29,6 +29,14 @@
border-right: .5px solid $sidebar-dark-icons-menu-border-color;
}
+ .menu-separator {
+ color: rgba(146, 173, 204, 0.14);
+
+ &.has-label {
+ color: rgba(154, 177, 189, 0.78);
+ }
+ }
+
.menu {
> a {
color: $sidebar-dark-apps-menu-border-color;
@@ -45,10 +53,6 @@
}
}
}
-
- .sidebar-apps-footer {
- color: $secondary;
- }
}
}
}
diff --git a/frontend/src/styles/components/_theme_light.scss b/frontend/src/styles/components/_theme_light.scss
index 4b697def..a9e095fe 100755
--- a/frontend/src/styles/components/_theme_light.scss
+++ b/frontend/src/styles/components/_theme_light.scss
@@ -35,6 +35,14 @@
border-right: .5px solid $sidebar-light-apps-menu-border-color;
}
+ .menu-separator {
+ color: mix($sidebar-light-apps-menu-border-color, $light-sidebar-mini-bg, 42%);
+
+ &.has-label {
+ color: mix($sidebar-light-apps-menu-color, $sidebar-light-apps-menu-border-color, 70%);
+ }
+ }
+
.menu {
> a {
color: $sidebar-light-apps-menu-hover-color;
@@ -60,10 +68,6 @@
}
}
}
-
- .sidebar-apps-footer {
- color: $sidebar-light-apps-menu-color;
- }
}
}
}