Skip to content

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

refactor(frontend): simplify sidebar navigation and clean up styles

johaven49e630df927a
diff --git a/frontend/src/app/app.constants.ts b/frontend/src/app/app.constants.ts
index aeb93d8c..83fb87ec 100644
--- a/frontend/src/app/app.constants.ts
+++ b/frontend/src/app/app.constants.ts
@@ -1,6 +1,4 @@
-import { LucideContrast } from '@lucide/angular'
import { productName, version } from '../../../package.json'
-import { AppMenu } from './layout/layout.interfaces'
export const APP_NAME = productName
export const APP_VERSION = version
@@ -10,12 +8,5 @@ export const APP_PATH = {
HOME: 'home'
} as const
-export const APP_MENU: AppMenu = {
- title: 'NAVIGATION',
- icon: LucideContrast,
- link: '',
- submenus: []
-} as const
-
export const SERVICE_INTERRUPTION_ERROR = 'Service interruption'
export const SERVICE_UNAVAILABLE_ERROR = 'Service unavailable'
diff --git a/frontend/src/app/applications/admin/admin.constants.ts b/frontend/src/app/applications/admin/admin.constants.ts
index bbb18bdc..8c1c5c0f 100644
--- a/frontend/src/app/applications/admin/admin.constants.ts
+++ b/frontend/src/app/applications/admin/admin.constants.ts
@@ -12,7 +12,7 @@ export const ADMIN_PATH = {
} as const
export const ADMIN_TITLE = {
- ADMIN: 'Administration',
+ ADMIN: 'Admin',
USERS: 'Users',
GROUPS: 'Groups',
GUESTS: 'Guests',
diff --git a/frontend/src/app/applications/sync/sync.constants.ts b/frontend/src/app/applications/sync/sync.constants.ts
index 010f35c5..b025fd4a 100644
--- a/frontend/src/app/applications/sync/sync.constants.ts
+++ b/frontend/src/app/applications/sync/sync.constants.ts
@@ -5,7 +5,7 @@ import { BehaviorSubject } from 'rxjs'
import { AppMenu } from '../../layout/layout.interfaces'
export const SYNC_TITLE = {
- SYNC: 'Synchronization',
+ SYNC: 'Sync',
SYNCS: 'Synchronizations',
TRANSFERS: 'Transfers',
WIZARD: 'Wizard',
diff --git a/frontend/src/app/layout/navbar/navbar.component.html b/frontend/src/app/layout/navbar/navbar.component.html
index 142e8b62..a2234e9d 100644
--- a/frontend/src/app/layout/navbar/navbar.component.html
+++ b/frontend/src/app/layout/navbar/navbar.component.html
@@ -7,14 +7,6 @@
</span>
</a>
}
- @if (leftSideBarIsOpen) {
- <a (click)="navigateTo('back')" class="d-none d-md-flex navbar-button navbar-history-button navbar-history-button-left" role="button">
- <svg [lucideIcon]="icons.LucideChevronLeft"></svg>
- </a>
- <a (click)="navigateTo('next')" class="d-none d-md-flex navbar-button navbar-history-button navbar-history-button-right" role="button">
- <svg [lucideIcon]="icons.LucideChevronRight"></svg>
- </a>
- }
<div class="navbar-breadcrumb">
<app-breadcrumb></app-breadcrumb>
</div>
diff --git a/frontend/src/app/layout/navbar/navbar.component.ts b/frontend/src/app/layout/navbar/navbar.component.ts
index c87724f9..2d5fa43f 100644
--- a/frontend/src/app/layout/navbar/navbar.component.ts
+++ b/frontend/src/app/layout/navbar/navbar.component.ts
@@ -1,6 +1,4 @@
-import { Location } from '@angular/common'
import { Component, inject, OnDestroy } from '@angular/core'
-import { LucideChevronLeft, LucideChevronRight, LucideDynamicIcon } from '@lucide/angular'
import { Subscription } from 'rxjs'
import { UserType } from '../../applications/users/interfaces/user.interface'
import { USER_ONLINE_STATUS_LIST } from '../../applications/users/user.constants'
@@ -12,15 +10,13 @@ import { LayoutService } from '../layout.service'
@Component({
selector: 'app-navbar',
templateUrl: 'navbar.component.html',
- imports: [BreadcrumbComponent, LucideDynamicIcon]
+ imports: [BreadcrumbComponent]
})
export class NavBarComponent implements OnDestroy {
protected readonly allOnlineStatus = USER_ONLINE_STATUS_LIST
- protected readonly icons = { LucideChevronLeft, LucideChevronRight }
protected leftSideBarIsOpen = true
protected user: UserType
protected userAvatar: string = null
- private readonly location = inject(Location)
private readonly layout = inject(LayoutService)
private readonly store = inject(StoreService)
private subscriptions: Subscription[] = []
@@ -42,12 +38,4 @@ export class NavBarComponent implements OnDestroy {
toggleLeftSideBar() {
this.layout.toggleLSideBar()
}
-
- navigateTo(action: string) {
- if (action === 'back') {
- this.location.back()
- } else {
- this.location.forward()
- }
- }
}
diff --git a/frontend/src/app/layout/sidebar/sidebar.left.component.html b/frontend/src/app/layout/sidebar/sidebar.left.component.html
index 7666fbb9..2d11b653 100644
--- a/frontend/src/app/layout/sidebar/sidebar.left.component.html
+++ b/frontend/src/app/layout/sidebar/sidebar.left.component.html
@@ -7,30 +7,40 @@
</button>
<div class="sidebar-brand">
<span class="sidebar-app-name">{{ appName }}</span>
- <span class="sidebar-title">{{ dynamicTitle }}</span>
+ <span class="sidebar-title" l10nTranslate>{{ dynamicTitle }}</span>
</div>
+ <button (click)="navigateInHistory('back')"
+ aria-label="Back"
+ class="d-none d-md-flex menu-title-history-button"
+ type="button">
+ <svg [lucideIcon]="icons.LucideChevronLeft"></svg>
+ </button>
+ <button (click)="navigateInHistory('next')"
+ aria-label="Forward"
+ class="d-none d-md-flex menu-title-history-button"
+ type="button">
+ <svg [lucideIcon]="icons.LucideChevronRight"></svg>
+ </button>
</div>
</div>
<div class="apps-shortcuts">
- @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">
- <svg [class]="menu.iconAnimated ? 'icon-spin' : ''" [lucideIcon]="menu.icon"></svg>
- @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>
+ @for (menu of appMenus; track $index) {
+ @if (!menu.hide) {
+ <button (click)="navigateToMenu(menu)"
+ (mouseenter)="previewMenuTitle(menu.title)"
+ (mouseleave)="restoreMenuTitle()"
+ [class.active]="menu.isActive"
+ class="app-shortcut"
+ type="button">
+ <svg [class]="menu.iconAnimated ? 'icon-spin' : ''" [lucideIcon]="menu.icon"></svg>
+ @if (menu.count) {
+ <span class="menu-badge-icon">
+ @if (menu.count.value | async; as count) {
+ <span class="badge bg-{{menu.count.level}}">{{ count }}</span>
}
- </button>
- }
+ </span>
+ }
+ </button>
}
}
@if (store.userImpersonate()) {
diff --git a/frontend/src/app/layout/sidebar/sidebar.left.component.ts b/frontend/src/app/layout/sidebar/sidebar.left.component.ts
index 519a01a5..3b744c12 100644
--- a/frontend/src/app/layout/sidebar/sidebar.left.component.ts
+++ b/frontend/src/app/layout/sidebar/sidebar.left.component.ts
@@ -1,11 +1,11 @@
-import { AsyncPipe, NgTemplateOutlet } from '@angular/common'
+import { AsyncPipe, Location, NgTemplateOutlet } from '@angular/common'
import { Component, inject, OnDestroy } from '@angular/core'
import { ResolveEnd, Router, RouterLink } from '@angular/router'
-import { LucideDynamicIcon, LucideVenetianMask } from '@lucide/angular'
+import { LucideChevronLeft, LucideChevronRight, LucideDynamicIcon, LucideVenetianMask } from '@lucide/angular'
import { L10nTranslateDirective } from 'angular-l10n'
import { Subscription } from 'rxjs'
import { filter } from 'rxjs/operators'
-import { APP_MENU, APP_NAME } from '../../app.constants'
+import { APP_NAME } from '../../app.constants'
import { ADMIN_MENU } from '../../applications/admin/admin.constants'
import { SEARCH_MENU } from '../../applications/search/search.constants'
import { SPACES_MENU } from '../../applications/spaces/spaces.constants'
@@ -24,13 +24,13 @@ import { LayoutService } from '../layout.service'
})
export class SideBarLeftComponent implements OnDestroy {
protected readonly store = inject(StoreService)
- protected readonly icons = { LucideVenetianMask }
+ protected readonly icons = { LucideChevronLeft, LucideChevronRight, LucideVenetianMask }
protected readonly appName = APP_NAME
+ protected readonly appMenus = [SPACES_MENU, SEARCH_MENU, SYNC_MENU, USER_MENU, ADMIN_MENU]
protected dynamicTitle: string
- protected currentUrl: string
- protected currentMenu: AppMenu
- protected appsMenu: AppMenu = APP_MENU
protected readonly isMenu = isAppMenu
+ private currentMenu: AppMenu = this.appMenus[0]
+ private readonly location = inject(Location)
private readonly router = inject(Router)
private readonly authService = inject(AuthService)
private readonly layout = inject(LayoutService)
@@ -39,7 +39,6 @@ export class SideBarLeftComponent implements OnDestroy {
private subscriptions: Subscription[] = []
constructor() {
- 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(
this.router.events.pipe(filter((ev) => ev instanceof ResolveEnd)).subscribe((ev: any) => this.updateUrl(ev.urlAfterRedirects))
@@ -51,7 +50,7 @@ export class SideBarLeftComponent implements OnDestroy {
}
loadMenus() {
- this.userService.setMenusVisibility(this.appsMenu.submenus ?? [])
+ this.userService.setMenusVisibility(this.appMenus)
this.updateUrl(this.router.url)
}
@@ -63,8 +62,16 @@ export class SideBarLeftComponent implements OnDestroy {
this.layout.toggleLSideBar()
}
+ navigateInHistory(action: 'back' | 'next') {
+ if (action === 'back') {
+ this.location.back()
+ } else {
+ this.location.forward()
+ }
+ }
+
navigateToMenu(menu: AppMenu) {
- this.navigateToUrl([menu.link])
+ this.router.navigate([menu.link]).catch(console.error)
this.closeSideBarOnMobile()
}
@@ -104,10 +111,6 @@ export class SideBarLeftComponent implements OnDestroy {
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]
@@ -135,15 +138,10 @@ export class SideBarLeftComponent implements OnDestroy {
}
private updateUrl(url: string) {
- this.currentUrl = url.substring(1)
- 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)))
- )
+ const currentUrl = url.substring(1)
+ this.currentMenu = this.appMenus.find((menu) => !menu.hide) ?? this.appMenus[0]
+ for (const mainMenu of this.appMenus) {
+ mainMenu.isActive = !!(!mainMenu.hide && (mainMenu.link === currentUrl || (!!mainMenu.matchLink && mainMenu.matchLink.test(currentUrl))))
if (mainMenu.isActive) {
this.currentMenu = mainMenu
}
@@ -152,26 +150,22 @@ export class SideBarLeftComponent implements OnDestroy {
if (isAppMenuSeparator(menu)) {
continue
}
- menu.isActive = mainMenu.isActive && (menu.link === this.currentUrl || (!!menu.matchLink && menu.matchLink.test(this.currentUrl)))
+ menu.isActive = mainMenu.isActive && (menu.link === currentUrl || (!!menu.matchLink && menu.matchLink.test(currentUrl)))
if (menu.submenus?.length) {
for (const subMenu of menu.submenus) {
if (isAppMenuSeparator(subMenu)) {
continue
}
- subMenu.isActive = this.currentUrl.startsWith(subMenu.link)
+ subMenu.isActive = currentUrl.startsWith(subMenu.link)
}
}
}
}
}
- const firstMenu = this.appsMenu.submenus?.find(isAppMenu)
- if (firstMenu) {
- this.currentMenu ??= firstMenu
- }
this.updateDynamicTitle()
}
private updateDynamicTitle(title?: string) {
- this.dynamicTitle = this.layout.translateString(title !== undefined ? title : this.currentMenu ? this.currentMenu.title : this.appsMenu.title)
+ this.dynamicTitle = title ?? this.currentMenu.title
}
}
diff --git a/frontend/src/i18n/de.json b/frontend/src/i18n/de.json
index 24c0e0a8..3b4d868d 100644
--- a/frontend/src/i18n/de.json
+++ b/frontend/src/i18n/de.json
@@ -107,7 +107,7 @@
"Add members": "Mitglieder hinzufügen",
"See members": "Mitglieder anzeigen",
"Administrator": "Administrator",
- "Administration": "Administration",
+ "Admin": "Admin",
"Tools": "Werkzeuge",
"User": "Benutzer",
"user": "benutzer",
@@ -334,6 +334,7 @@
"The access has expired": "Der Zugriff ist abgelaufen",
"Never expires": "Läuft nie ab",
"synchronization": "synchronisierung",
+ "Sync": "Sync",
"Synchronization": "Synchronisierung",
"Synchronizations": "Synchronisierungen",
"Synchronize": "Synchronisieren",
diff --git a/frontend/src/i18n/es.json b/frontend/src/i18n/es.json
index e0a9b949..c5abaed0 100644
--- a/frontend/src/i18n/es.json
+++ b/frontend/src/i18n/es.json
@@ -107,7 +107,7 @@
"Add members": "Añadir miembros",
"See members": "Ver miembros",
"Administrator": "Administrador",
- "Administration": "Administración",
+ "Admin": "Admin",
"Tools": "Herramientas",
"User": "Usuario",
"user": "usuario",
@@ -334,6 +334,7 @@
"The access has expired": "El acceso ha expirado",
"Never expires": "Nunca expira",
"synchronization": "sincronización",
+ "Sync": "Sync",
"Synchronization": "Sincronización",
"Synchronizations": "Sincronizaciones",
"Synchronize": "Sincronizar",
diff --git a/frontend/src/i18n/fr.json b/frontend/src/i18n/fr.json
index 444ba1b6..e492f8b7 100644
--- a/frontend/src/i18n/fr.json
+++ b/frontend/src/i18n/fr.json
@@ -107,7 +107,7 @@
"Add members": "Ajouter des membres",
"See members": "Voir les membres",
"Administrator": "Administrateur",
- "Administration": "Administration",
+ "Admin": "Admin",
"Tools": "Outils",
"User": "Utilisateur",
"user": "utilisateur",
@@ -334,6 +334,7 @@
"The access has expired": "L'accès a expiré",
"Never expires": "N’expire jamais",
"synchronization": "synchronisation",
+ "Sync": "Sync",
"Synchronization": "Synchronisation",
"Synchronizations": "Synchronisations",
"Synchronize": "Synchroniser",
diff --git a/frontend/src/i18n/hi.json b/frontend/src/i18n/hi.json
index 25003434..589cb114 100644
--- a/frontend/src/i18n/hi.json
+++ b/frontend/src/i18n/hi.json
@@ -107,7 +107,7 @@
"Add members": "सदस्य जोड़ें",
"See members": "सदस्य देखें",
"Administrator": "प्रशासक",
- "Administration": "प्रशासन",
+ "Admin": "प्रशासन",
"Tools": "उपकरण",
"User": "उपयोगकर्ता",
"user": "उपयोगकर्ता",
@@ -334,6 +334,7 @@
"The access has expired": "पहुँच समाप्त हो चुकी है",
"Never expires": "कभी समाप्त नहीं होता",
"synchronization": "सिंक",
+ "Sync": "सिंक",
"Synchronization": "सिंक्रोनाइज़ेशन",
"Synchronizations": "सिंक्रोनाइज़ेशन",
"Synchronize": "सिंक्रोनाइज़ करें",
diff --git a/frontend/src/i18n/it.json b/frontend/src/i18n/it.json
index 8d5346c0..dd5c14c3 100644
--- a/frontend/src/i18n/it.json
+++ b/frontend/src/i18n/it.json
@@ -107,7 +107,7 @@
"Add members": "Aggiungi membri",
"See members": "Vedi membri",
"Administrator": "Amministratore",
- "Administration": "Amministrazione",
+ "Admin": "Admin",
"Tools": "Strumenti",
"User": "Utente",
"user": "utente",
@@ -334,6 +334,7 @@
"The access has expired": "L’accesso è scaduto",
"Never expires": "Non scade mai",
"synchronization": "sincronizzazione",
+ "Sync": "Sync",
"Synchronization": "Sincronizzazione",
"Synchronizations": "Sincronizzazioni",
"Synchronize": "Sincronizza",
diff --git a/frontend/src/i18n/ja.json b/frontend/src/i18n/ja.json
index 208bcd85..66f4e081 100644
--- a/frontend/src/i18n/ja.json
+++ b/frontend/src/i18n/ja.json
@@ -107,7 +107,7 @@
"Add members": "メンバーを追加",
"See members": "メンバーを表示",
"Administrator": "管理者",
- "Administration": "管理",
+ "Admin": "管理",
"Tools": "ツール",
"User": "ユーザー",
"user": "ユーザー",
@@ -334,6 +334,7 @@
"The access has expired": "アクセスの有効期限が切れています",
"Never expires": "有効期限なし",
"synchronization": "同期",
+ "Sync": "同期",
"Synchronization": "同期",
"Synchronizations": "同期",
"Synchronize": "同期",
diff --git a/frontend/src/i18n/ko.json b/frontend/src/i18n/ko.json
index a4dc2296..c2069e52 100644
--- a/frontend/src/i18n/ko.json
+++ b/frontend/src/i18n/ko.json
@@ -107,7 +107,7 @@
"Add members": "멤버 추가",
"See members": "멤버 보기",
"Administrator": "관리자",
- "Administration": "관리",
+ "Admin": "관리",
"Tools": "도구",
"User": "사용자",
"user": "사용자",
@@ -334,6 +334,7 @@
"The access has expired": "접근이 만료되었습니다",
"Never expires": "만료 없음",
"synchronization": "동기화",
+ "Sync": "동기화",
"Synchronization": "동기화",
"Synchronizations": "동기화",
"Synchronize": "동기화",
diff --git a/frontend/src/i18n/nl.json b/frontend/src/i18n/nl.json
index f633f6b5..cfc772c5 100644
--- a/frontend/src/i18n/nl.json
+++ b/frontend/src/i18n/nl.json
@@ -107,7 +107,7 @@
"Add members": "Leden toevoegen",
"See members": "Leden bekijken",
"Administrator": "Beheerder",
- "Administration": "Beheer",
+ "Admin": "Beheer",
"Tools": "Hulpmiddelen",
"User": "Gebruiker",
"user": "gebruiker",
@@ -334,6 +334,7 @@
"The access has expired": "De toegang is verlopen",
"Never expires": "Verloopt nooit",
"synchronization": "synchronisatie",
+ "Sync": "Sync",
"Synchronization": "Synchronisatie",
"Synchronizations": "Synchronisaties",
"Synchronize": "Synchroniseren",
diff --git a/frontend/src/i18n/pl.json b/frontend/src/i18n/pl.json
index f5f079e0..19726006 100644
--- a/frontend/src/i18n/pl.json
+++ b/frontend/src/i18n/pl.json
@@ -107,7 +107,7 @@
"Add members": "Dodaj członków",
"See members": "Zobacz członków",
"Administrator": "Administrator",
- "Administration": "Administracja",
+ "Admin": "Admin",
"Tools": "Narzędzia",
"User": "Użytkownik",
"user": "użytkownik",
@@ -334,6 +334,7 @@
"The access has expired": "Dostęp wygasł",
"Never expires": "Nigdy nie wygasa",
"synchronization": "synchronizacja",
+ "Sync": "Sync",
"Synchronization": "Synchronizacja",
"Synchronizations": "Synchronizacje",
"Synchronize": "Synchronizuj",
diff --git a/frontend/src/i18n/pt-BR.json b/frontend/src/i18n/pt-BR.json
index 1c15a689..43920597 100644
--- a/frontend/src/i18n/pt-BR.json
+++ b/frontend/src/i18n/pt-BR.json
@@ -107,7 +107,7 @@
"Add members": "Adicionar membros",
"See members": "Ver membros",
"Administrator": "Administrador",
- "Administration": "Administração",
+ "Admin": "Admin",
"Tools": "Ferramentas",
"User": "Usuário",
"user": "usuário",
@@ -334,6 +334,7 @@
"The access has expired": "O acesso expirou",
"Never expires": "Nunca expira",
"synchronization": "sincronização",
+ "Sync": "Sync",
"Synchronization": "Sincronização",
"Synchronizations": "Sincronizações",
"Synchronize": "Sincronizar",
diff --git a/frontend/src/i18n/pt.json b/frontend/src/i18n/pt.json
index 49ca4fd5..5e8b24a1 100644
--- a/frontend/src/i18n/pt.json
+++ b/frontend/src/i18n/pt.json
@@ -107,7 +107,7 @@
"Add members": "Adicionar membros",
"See members": "Ver membros",
"Administrator": "Administrador",
- "Administration": "Administração",
+ "Admin": "Admin",
"Tools": "Ferramentas",
"User": "Usuário",
"user": "usuário",
@@ -334,6 +334,7 @@
"The access has expired": "O acesso expirou",
"Never expires": "Nunca expira",
"synchronization": "sincronização",
+ "Sync": "Sync",
"Synchronization": "Sincronização",
"Synchronizations": "Sincronizações",
"Synchronize": "Sincronizar",
diff --git a/frontend/src/i18n/ru.json b/frontend/src/i18n/ru.json
index 5d4a9124..005b4429 100644
--- a/frontend/src/i18n/ru.json
+++ b/frontend/src/i18n/ru.json
@@ -107,7 +107,7 @@
"Add members": "Добавить участников",
"See members": "Просмотреть участников",
"Administrator": "Администратор",
- "Administration": "Администрирование",
+ "Admin": "Админ",
"Tools": "Инструменты",
"User": "Пользователь",
"user": "пользователь",
@@ -334,6 +334,7 @@
"The access has expired": "Срок доступа истёк",
"Never expires": "Никогда не истекает",
"synchronization": "синхронизация",
+ "Sync": "Sync",
"Synchronization": "Синхронизация",
"Synchronizations": "Синхронизации",
"Synchronize": "Синхронизировать",
diff --git a/frontend/src/i18n/tr.json b/frontend/src/i18n/tr.json
index 7bd6a933..ab9844ad 100644
--- a/frontend/src/i18n/tr.json
+++ b/frontend/src/i18n/tr.json
@@ -107,7 +107,7 @@
"Add members": "Üye ekle",
"See members": "Üyeleri görüntüle",
"Administrator": "Yönetici",
- "Administration": "Yönetim",
+ "Admin": "Yönetim",
"Tools": "Araçlar",
"User": "Kullanıcı",
"user": "kullanıcı",
@@ -334,6 +334,7 @@
"The access has expired": "Erişim süresi doldu",
"Never expires": "Süresiz",
"synchronization": "eşitleme",
+ "Sync": "Eşitleme",
"Synchronization": "Eşitleme",
"Synchronizations": "Eşitlemeler",
"Synchronize": "Eşitle",
diff --git a/frontend/src/i18n/zh.json b/frontend/src/i18n/zh.json
index 0139024d..dd5aa688 100644
--- a/frontend/src/i18n/zh.json
+++ b/frontend/src/i18n/zh.json
@@ -107,7 +107,7 @@
"Add members": "添加成员",
"See members": "查看成员",
"Administrator": "管理员",
- "Administration": "管理",
+ "Admin": "管理",
"Tools": "管理工具",
"User": "用户",
"user": "用户",
@@ -334,6 +334,7 @@
"The access has expired": "访问已过期",
"Never expires": "永不过期",
"synchronization": "同步",
+ "Sync": "同步",
"Synchronization": "同步",
"Synchronizations": "同步任务",
"Synchronize": "同步",
diff --git a/frontend/src/styles/components/_header.scss b/frontend/src/styles/components/_header.scss
index f44ae831..026a8fae 100644
--- a/frontend/src/styles/components/_header.scss
+++ b/frontend/src/styles/components/_header.scss
@@ -81,34 +81,11 @@
}
}
- .navbar-history-button {
- font-size: $font-size-2xl;
- 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;
- @include media-breakpoint-up(md) {
- border-left: .5px solid mix($sidebar-light-icons-menu-hover-bg, $primary, 50%);
- }
- }
-
- .navbar-history-button-right {
- border-right: none;
- }
-
.navbar-breadcrumb {
+ margin-left: -.5px;
border-left: .5px solid mix($sidebar-light-icons-menu-hover-bg, $primary, 50%);
flex: 1 1 auto;
min-width: 0;
- max-width: none;
overflow: hidden;
}
@@ -121,7 +98,7 @@
.menu {
display: flex;
justify-content: center;
- align-content: center;
+ align-items: center;
width: $sidebar-apps-icons-width;
height: $sidebar-apps-icons-height;
cursor: pointer;
@@ -134,7 +111,6 @@
}
.avatar-img {
- display: flex;
align-self: center;
width: 30px;
height: 30px;
@@ -188,7 +164,6 @@
.breadcrumb {
display: flex;
align-items: center;
- align-content: center;
justify-content: flex-start;
min-width: 0;
height: $navbar-height;
@@ -250,7 +225,7 @@
}
> .lucide {
- font-size: $font-size-xl;
+ font-size: 1.1rem;
}
}
}
diff --git a/frontend/src/styles/components/_sidebar_left.scss b/frontend/src/styles/components/_sidebar_left.scss
index c247622f..bc5dbafd 100755
--- a/frontend/src/styles/components/_sidebar_left.scss
+++ b/frontend/src/styles/components/_sidebar_left.scss
@@ -31,14 +31,6 @@
color: $sidebar-light-apps-menu-title-color;
}
- &:hover, &.active {
- background: $sidebar-light-apps-menu-title-bg;
-
- .menu-title-content {
- color: $sidebar-light-apps-menu-title-color;
- }
- }
-
.logo-toggle {
display: flex;
align-items: center;
@@ -49,7 +41,7 @@
padding: 0;
border: none;
border-radius: 50%;
- margin-right: .55rem;
+ margin-right: .35rem;
margin-left: .5rem;
background: $black;
cursor: pointer;
@@ -61,6 +53,8 @@
}
.sidebar-brand {
+ position: relative;
+ z-index: 2;
display: flex;
flex-direction: column;
justify-content: center;
@@ -74,14 +68,42 @@
@include text-truncate-utility;
color: $white;
font-size: $font-size-base;
- font-weight: 600;
+ font-weight: 550;
}
.sidebar-title {
@include text-truncate-utility;
+ width: max-content;
+ max-width: calc(#{$sidebar-apps-menus-width} - #{$layout-logo-container-size} - 1rem);
+ padding-right: .25rem;
+ background: $sidebar-light-apps-menu-title-bg;
color: rgba($white, .68);
font-size: $font-size-xs;
font-weight: 500;
+ pointer-events: none;
+ }
+
+ .menu-title-history-button {
+ position: relative;
+ z-index: 1;
+ align-items: center;
+ justify-content: center;
+ flex: 0 0 30px;
+ height: $sidebar-apps-height;
+ padding: 0;
+ border: 0;
+ background: transparent;
+ color: $sidebar-light-apps-menu-title-color;
+ font-size: $font-size-2xl;
+ cursor: pointer;
+
+ &:hover,
+ &:focus-visible,
+ &:active {
+ z-index: 3;
+ background-color: $sidebar-light-icons-menu-hover-bg;
+ color: $white;
+ }
}
}
@@ -89,10 +111,9 @@
display: flex;
align-items: center;
justify-content: space-between;
- gap: 0.2rem 0;
- padding: 0 6px 0 6px;
- min-height: 40px;
- max-height: 40px;
+ padding: 0 0.5rem;
+ min-height: $sidebar-apps-height;
+ max-height: $sidebar-apps-height;
border-bottom: .5px solid transparent;
border-right: .5px solid transparent;
diff --git a/frontend/src/styles/components/_sidebar_left_collapse.scss b/frontend/src/styles/components/_sidebar_left_collapse.scss
index febbcabf..0b4606eb 100755
--- a/frontend/src/styles/components/_sidebar_left_collapse.scss
+++ b/frontend/src/styles/components/_sidebar_left_collapse.scss
@@ -17,7 +17,6 @@
.sidebar-apps-menus {
transform: translate3d(0, 0, 0);
transition: width $transition-speed $transition-fn;
- border-right: none !important;
overflow: hidden;
width: 0;
}
diff --git a/frontend/src/styles/components/_variables.scss b/frontend/src/styles/components/_variables.scss
index 767ddeed..4604bd71 100644
--- a/frontend/src/styles/components/_variables.scss
+++ b/frontend/src/styles/components/_variables.scss
@@ -5,7 +5,7 @@ $navbar-height: 40px;
//Sidebar left
$sidebar-apps-icons-width: 40px;
$sidebar-apps-icons-height: 40px;
-$sidebar-apps-menus-width: 185px;
+$sidebar-apps-menus-width: 190px;
$sidebar-apps-height: $sidebar-apps-icons-height;
$layout-logo-container-size: 32px;
$layout-logo-image-size: 24px;
@@ -32,7 +32,6 @@ $theme-light-panel-alt-bg: #eaf1f8;
$sidebar-dark-icons-menu-bg: $custom-dark-color;
$sidebar-dark-icons-menu-hover-bg: darken($sidebar-dark-icons-menu-bg, 4%);
$sidebar-dark-icons-menu-color: $theme-muted-blue;
-$sidebar-dark-icons-menu-hover-color: $primary;
$sidebar-dark-icons-menu-border-color: #304047;
$sidebar-dark-apps-menu-title-bg: $sidebar-dark-icons-menu-hover-bg;
$sidebar-dark-apps-menu-bg: lighten($sidebar-dark-icons-menu-bg, 2%);
@@ -40,17 +39,14 @@ $sidebar-dark-apps-menu-hover-bg: $sidebar-dark-icons-menu-hover-bg;
$sidebar-dark-apps-menu-color: lighten($sidebar-dark-icons-menu-bg, 60%);
$sidebar-dark-apps-menu-hover-color: #fff;
$sidebar-dark-apps-menu-border-color: #8ea8b4;
-$sidebar-dark-mini-menu-bg: $sidebar-dark-icons-menu-hover-bg;
//Light sidebar
$sidebar-light-icons-menu-bg: $primary;
//$sidebar-light-icons-menu-hover-bg: #2a445e;
$sidebar-light-icons-menu-hover-bg: darken($sidebar-light-icons-menu-bg, 15%);
$sidebar-light-icons-menu-color: $gray-lightest;
-$sidebar-light-icons-menu-hover-color: $white;
$sidebar-light-apps-menu-title-bg: $sidebar-light-icons-menu-bg;
$sidebar-light-apps-menu-title-color: $theme-muted-blue;
$sidebar-light-apps-menu-bg: mix($gray-lightest, $gray-lighter, 60%);
-$sidebar-light-apps-menu-hover-bg: mix($gray-light, $gray-lighter, 55%);
$sidebar-light-apps-menu-color: $custom-dark-color;
$sidebar-light-apps-menu-hover-color: $black;
$sidebar-light-apps-menu-border-color: $gray-mid;
@@ -58,7 +54,6 @@ $sidebar-light-apps-menu-border-color: $gray-mid;
//THEME TOKENS
//--------------------------------------------------------
//Shared theme tokens
-$theme-btn-focus-outline-fallback: rgba(13, 110, 253, 0.25);
$theme-btn-bg-hover-overlay-shadow: rgba(0, 0, 0, 0.2);
$theme-dropdown-divider-bg: #eee;
$theme-dialog-tab-active-bg: $primary;
@@ -119,13 +114,11 @@ $light-tree-node-selected-bg: $selected-background;
$light-surface-bg: mix($white, $gray-lightest, 94%);
$light-surface-border: mix($primary, $gray-light, 14%);
$light-item-color: darken($gray-dark, 18%);
-$light-item-hover-bg: lighten($selected-background, 3%);
$light-item-hover-color: darken($gray-dark, 28%);
$light-item-disabled-color: lighten($gray-dark, 18%);
$light-table-head-bg: #F3F7FD;
$light-table-row-hover-bg: mix($table-bg-hover, $white, 50%);
$light-table-row-selected-bg: mix($selected-background, $white, 50%);
-$light-table-striped-hover-bg: mix($table-bg-hover, $white, 55%);
$light-row-selected-bg: darken($table-bg-hover, 4%);
$light-menu-surface-bg: #eef4fc;
$light-menu-surface-border: #cfdded;
@@ -133,10 +126,7 @@ $light-menu-item-hover-bg: #bdd7f4;
$light-menu-surface-shadow: 0 12px 24px rgba(27, 56, 94, 0.14);
$light-nav-bg: lighten($gray-mid, 4%);
$light-nav-hover-bg: darken($gray-mid, 2%);
-$light-box-border-strong: darken($gray-lighter, 5%);
$light-btn-focus-color: rgba($primary, 0.24);
-$light-chat-button-color: darken($gray, 30%);
-$light-chat-button-hover-color: $black;
$light-dialog-tab-card-bg: rgba(255, 255, 255, 0.52);
$light-dialog-tab-card-border-color: rgba(20, 45, 72, 0.11);
$light-dialog-tab-card-shadow-color: rgba(31, 56, 86, 0.1);
@@ -146,7 +136,6 @@ $light-dialog-check-card-hover-bg: rgba(236, 243, 251, 0.88);
$light-dialog-check-card-hover-border-color: rgba(52, 94, 146, 0.48);
$light-dialog-check-card-hover-shadow-color: rgba(31, 56, 86, 0.12);
$light-dialog-check-card-active-border-color: rgba(30, 59, 89, 0.3);
-$light-dialog-tabs-bar-bg: mix($light-dialog-tab-card-bg, #eaf2fc, 74%);
$light-dialog-tabs-bar-border-color: rgba(51, 84, 121, 0.24);
$light-dialog-tab-bg: rgba(mix($light-surface-bg, $gray-light, 72%), 0.72);
$light-dialog-tab-color: $light-item-color;
@@ -166,10 +155,5 @@ $light-app-top-menu-gradient-end: #f4f8fe;
$light-box-transparent-shadow-color: rgba(24, 32, 58, 0.1);
//BOXES
//--------------------------------------------------------
-$box-border-color: #f4f4f4;
$box-border-radius: 3px;
-$box-footer-bg: $gray-200;
-$box-boxshadow: 0 1px 1px rgba(0, 0, 0, .1);
$box-padding: 8px;
-//Box variants
-$box-default-border-top-color: #d2d6de;