Skip to content

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

chore(frontend): improve global and sync ui

johaven60faf03374e9
diff --git a/frontend/src/app/applications/shares/components/dialogs/share-dialog.component.html b/frontend/src/app/applications/shares/components/dialogs/share-dialog.component.html
index 3f007877..293f5d78 100644
--- a/frontend/src/app/applications/shares/components/dialogs/share-dialog.component.html
+++ b/frontend/src/app/applications/shares/components/dialogs/share-dialog.component.html
@@ -65,7 +65,12 @@
<div>
<label for="switchStatus" l10nTranslate>Share status</label>
<div class="d-flex align-items-center form-check form-switch cursor-pointer">
- <input class="form-check-input" [(ngModel)]="share.enabled" id="switchStatus" type="checkbox" role="button">
+ <input class="form-check-input"
+ [ngModel]="share.enabled"
+ (ngModelChange)="setShareStatus($event)"
+ id="switchStatus"
+ type="checkbox"
+ role="button">
<label class="form-check-label mb-0 ms-2" for="switchStatus" l10nTranslate>
{{ share.enabled ? 'enabled' : 'disabled' }}
</label>
@@ -103,17 +108,17 @@
</div>
</div>
@if (share?.id) {
- <div class="d-flex d-none d-lg-flex mt-auto">
- <div class="d-flex flex-column align-items-start col-4 px-0">
+ <div class="d-flex flex-column d-none d-lg-flex mt-auto align-self-start gap-4">
+ <div class="d-flex flex-column px-0">
<label for="created" l10nTranslate>Creation date</label>
<div id="created">{{ share.createdAt | amDateFormat }}</div>
</div>
- <div class="d-flex flex-column align-items-center col-4 px-0">
+ <div class="d-flex flex-column px-0">
<label for="modified" l10nTranslate>Modification date</label>
<div id="modified">{{ share.modifiedAt | amDateFormat }}</div>
</div>
@if (share.disabledAt && !share.enabled) {
- <div class="d-flex flex-column align-items-end col-4 text-danger px-0">
+ <div class="d-flex flex-column text-danger px-0">
<label for="disabled" l10nTranslate>Deactivation date</label>
<div id="disabled">{{ share.disabledAt | amDateFormat }}</div>
</div>
diff --git a/frontend/src/app/applications/shares/components/dialogs/share-dialog.component.ts b/frontend/src/app/applications/shares/components/dialogs/share-dialog.component.ts
index 607e0d0d..7de0106e 100644
--- a/frontend/src/app/applications/shares/components/dialogs/share-dialog.component.ts
+++ b/frontend/src/app/applications/shares/components/dialogs/share-dialog.component.ts
@@ -153,6 +153,11 @@ export class ShareDialogComponent implements OnInit {
this.linksService.createLinkDialog(this.share)
}
+ setShareStatus(status: boolean) {
+ this.share.enabled = status
+ this.share.disabledAt = status ? null : new Date()
+ }
+
cantSubmit() {
return this.submitted || (!this.share.externalPath && !this.share.file)
}
diff --git a/frontend/src/app/applications/spaces/components/dialogs/space-dialog.component.html b/frontend/src/app/applications/spaces/components/dialogs/space-dialog.component.html
index ad96739d..b2f7c642 100644
--- a/frontend/src/app/applications/spaces/components/dialogs/space-dialog.component.html
+++ b/frontend/src/app/applications/spaces/components/dialogs/space-dialog.component.html
@@ -63,7 +63,12 @@
<div>
<label for="switchStatus" l10nTranslate>Space status</label>
<div class="d-flex align-items-center form-check form-switch cursor-pointer">
- <input class="form-check-input" [ngModel]="space.enabled" (ngModelChange)="setSpaceStatus($event)" id="switchStatus" type="checkbox" role="button">
+ <input class="form-check-input"
+ [ngModel]="space.enabled"
+ (ngModelChange)="setSpaceStatus($event)"
+ id="switchStatus"
+ type="checkbox"
+ role="button">
<label class="form-check-label mb-0 ms-2" for="switchStatus" l10nTranslate>
{{ space.enabled ? 'enabled' : 'disabled' }}
</label>
@@ -97,18 +102,18 @@
<small class="text-danger" l10nTranslate>At least one manager is required</small>
}
@if (space.id) {
- <div class="d-flex d-none d-lg-flex mt-auto">
- <div class="d-flex flex-column align-items-start col-4 px-0 text-danger">
- @if (space.disabledAt && !space.enabled) {
+ <div class="d-flex fs-xxxs d-none d-lg-flex mt-auto align-items-end flex-fill justify-content-between">
+ @if (space.disabledAt && !space.enabled) {
+ <div class="d-flex flex-column text-danger">
<label for="disabled" l10nTranslate>Deactivation date</label>
<div id="disabled">{{ space.disabledAt | amDateFormat }}</div>
- }
- </div>
- <div class="d-flex flex-column align-items-center col-4 px-0">
+ </div>
+ }
+ <div class="d-flex flex-column">
<label for="created" l10nTranslate>Creation date</label>
<div id="created">{{ space.createdAt | amDateFormat }}</div>
</div>
- <div class="d-flex flex-column align-items-end col-4 px-0">
+ <div class="d-flex flex-column">
<label for="modified" l10nTranslate>Modification date</label>
<div id="modified">{{ space.modifiedAt | amDateFormat }}</div>
</div>
diff --git a/frontend/src/app/applications/spaces/components/utils/space-manage-roots.component.html b/frontend/src/app/applications/spaces/components/utils/space-manage-roots.component.html
index 235a378c..c04e7c02 100644
--- a/frontend/src/app/applications/spaces/components/utils/space-manage-roots.component.html
+++ b/frontend/src/app/applications/spaces/components/utils/space-manage-roots.component.html
@@ -1,6 +1,6 @@
@for (r of space.roots; track r.alias) {
<div class="bg-theme mb-1 p-2" style="border-radius: 4px">
- <div class="d-flex align-items-center text-truncate no-select fs-xs" style="height: 32px">
+ <div class="d-flex align-items-center text-truncate no-select fs-xs" style="max-height: 34px">
<div class="d-flex align-items-center text-truncate me-auto">
@if (showUsers) {
<app-user-avatar [user]="r.owner" tooltipPlacement="bottom"></app-user-avatar>
diff --git a/frontend/src/app/applications/sync/components/shared/sync-path-settings.component.ts b/frontend/src/app/applications/sync/components/shared/sync-path-settings.component.ts
index 19e1b324..2524e037 100755
--- a/frontend/src/app/applications/sync/components/shared/sync-path-settings.component.ts
+++ b/frontend/src/app/applications/sync/components/shared/sync-path-settings.component.ts
@@ -1,16 +1,7 @@
import { Component, inject, Input } from '@angular/core'
import { FormsModule } from '@angular/forms'
import { FaIconComponent } from '@fortawesome/angular-fontawesome'
-import {
- faBug,
- faClock,
- faEdit,
- faExclamationCircle,
- faGauge,
- faLongArrowAltDown,
- faLongArrowAltUp,
- faRotate
-} from '@fortawesome/free-solid-svg-icons'
+import { faBug, faClock, faEdit, faExclamationCircle, faGauge, faRotate } from '@fortawesome/free-solid-svg-icons'
import {
SYNC_PATH_CONFLICT_MODE,
SYNC_PATH_DIFF_MODE,
@@ -38,8 +29,6 @@ export class SyncPathSettingsComponent {
CLIENT: SYNC_ICON.CLIENT,
SERVER: SYNC_ICON.SERVER,
faExclamationCircle,
- faLongArrowAltDown,
- faLongArrowAltUp,
faGauge,
faClock,
faRotate,
diff --git a/frontend/src/app/applications/sync/components/sync-paths.component.html b/frontend/src/app/applications/sync/components/sync-paths.component.html
index 617eaa6a..b33e2045 100644
--- a/frontend/src/app/applications/sync/components/sync-paths.component.html
+++ b/frontend/src/app/applications/sync/components/sync-paths.component.html
@@ -51,7 +51,7 @@
</button>
} @else {
<div [tooltip]="'Synchronize all' | translate:locale.language" container="body">
- <div class="btn-group btn-group-sm me-1" dropdown>
+ <div class="btn-group btn-group-sm me-1" dropdown [isDisabled]="!store.clientSyncPaths().length">
<button class="btn btn-sm btn-secondary dropdown-toggle" dropdownToggle type="button">
<fa-icon [icon]="icons.faForward"></fa-icon>
</button>
@@ -166,7 +166,9 @@
</tr>
</thead>
</table>
-<div (contextmenu)="onContextMenu($event)" appAutoResize [resizeOffset]="105">
+<app-virtual-scroll (contextmenu)="onContextMenu($event)"
+ [bufferAmount]="5"
+ [items]="store.clientSyncPaths() | searchFilter:inputFilter.search():'name'">
<table class="app-table">
<tbody tabindex="-1">
@for (s of store.clientSyncPaths() | searchFilter:inputFilter.search(); track s.id) {
@@ -234,7 +236,7 @@
}
</tbody>
</table>
-</div>
+</app-virtual-scroll>
<!--Start Context Menu -->
<context-menu #SyncPathContextMenu>
@if (syncPathSelected && syncPathSelected.inSync) {
@@ -265,7 +267,7 @@
<context-menu #SyncSchedulerContextMenu>
@if (store.clientScheduler() !== CLIENT_SCHEDULER_STATE.DISABLED) {
<ng-template (execute)="setScheduler(CLIENT_SCHEDULER_STATE.DISABLED)" contextMenuItem>
- <span l10nTranslate><fa-icon [icon]="icons.faCalendarXmark"></fa-icon>Disabled</span>
+ <span><fa-icon [icon]="icons.faCalendarXmark"></fa-icon>{{'disabled' | translate:locale.language | capitalize}}</span>
</ng-template>
}
<ng-template (execute)="setScheduler(CLIENT_SCHEDULER_STATE.SEQ)" contextMenuItem><span l10nTranslate><fa-icon [icon]="icons.faArrowsSpin"></fa-icon>Sequentially</span>
@@ -277,7 +279,7 @@
@if (allSyncsRunning) {
<ng-template (execute)="doAllSyncs(false)" contextMenuItem><span l10nTranslate><fa-icon [icon]="icons.faStop"></fa-icon>Stop synchronizations</span>
</ng-template>
- } @else {
+ } @else if (store.clientSyncPaths().length) {
<ng-template [subMenu]="SyncAllContextMenu" contextMenuItem>
<span l10nTranslate><fa-icon [icon]="icons.faForward"></fa-icon>Synchronize</span>
</ng-template>
diff --git a/frontend/src/app/applications/sync/components/sync-paths.component.ts b/frontend/src/app/applications/sync/components/sync-paths.component.ts
index b808631d..d0479294 100644
--- a/frontend/src/app/applications/sync/components/sync-paths.component.ts
+++ b/frontend/src/app/applications/sync/components/sync-paths.component.ts
@@ -1,5 +1,5 @@
import { KeyValuePipe } from '@angular/common'
-import { Component, effect, inject, OnDestroy, OnInit, ViewChild } from '@angular/core'
+import { Component, effect, ElementRef, inject, OnDestroy, OnInit, ViewChild } from '@angular/core'
import { Router } from '@angular/router'
import { FaIconComponent } from '@fortawesome/angular-fontawesome'
import {
@@ -27,8 +27,10 @@ import { BsDropdownDirective, BsDropdownMenuDirective, BsDropdownToggleDirective
import { TooltipDirective } from 'ngx-bootstrap/tooltip'
import { Subscription } from 'rxjs'
import { FilterComponent } from '../../../common/components/filter.component'
+import { VirtualScrollComponent } from '../../../common/components/virtual-scroll.component'
import { AutoResizeDirective } from '../../../common/directives/auto-resize.directive'
import { TableHeaderConfig } from '../../../common/interfaces/table.interface'
+import { CapitalizePipe } from '../../../common/pipes/capitalize.pipe'
import { SearchFilterPipe } from '../../../common/pipes/search.pipe'
import { TimeAgoPipe } from '../../../common/pipes/time-ago.pipe'
import { originalOrderKeyValue } from '../../../common/utils/functions'
@@ -55,7 +57,6 @@ import { SyncPathSchedulerComponent } from './utils/sync-path-scheduler.componen
BsDropdownToggleDirective,
BsDropdownMenuDirective,
FilterComponent,
- AutoResizeDirective,
ContextMenuModule,
SearchFilterPipe,
SyncPathDirectionIconComponent,
@@ -63,12 +64,18 @@ import { SyncPathSchedulerComponent } from './utils/sync-path-scheduler.componen
TimeAgoPipe,
KeyValuePipe,
L10nTranslateDirective,
- SyncPathSchedulerComponent
+ SyncPathSchedulerComponent,
+ VirtualScrollComponent,
+ CapitalizePipe
],
templateUrl: 'sync-paths.component.html'
})
export class SyncPathsComponent implements OnInit, OnDestroy {
- locale = inject<L10nLocale>(L10N_LOCALE)
+ @ViewChild(VirtualScrollComponent) scrollView: {
+ element: ElementRef
+ viewPortItems: SyncPathModel[]
+ scrollInto: (arg: SyncPathModel | number) => void
+ }
@ViewChild(AutoResizeDirective, { static: true }) autoResize: AutoResizeDirective
@ViewChild(FilterComponent, { static: true }) inputFilter: FilterComponent
@ViewChild('SyncPathContextMenu', { static: true }) syncPathContextMenu: ContextMenuComponent<any>
@@ -77,6 +84,7 @@ export class SyncPathsComponent implements OnInit, OnDestroy {
public syncsInProgress: SyncStatus[] = []
public syncPathSelected: SyncPathModel = null
public allSyncsRunning = false
+ protected readonly locale = inject<L10nLocale>(L10N_LOCALE)
protected readonly store = inject(StoreService)
protected readonly originalOrderKeyValue = originalOrderKeyValue
protected readonly icons = {
@@ -198,10 +206,10 @@ export class SyncPathsComponent implements OnInit, OnDestroy {
ngOnInit() {
if (this.focusOnPathId) {
- const index = this.store.clientSyncPaths().findIndex((s) => s.id === this.focusOnPathId)
- if (index > -1) {
- this.onSelect(this.store.clientSyncPaths()[index])
- this.autoResize.scrollIntoView(Math.max(index, 1) * 35 - 35)
+ const syncPath = this.store.clientSyncPaths().find((s) => s.id === this.focusOnPathId)
+ if (syncPath) {
+ this.onSelect(syncPath)
+ setTimeout(() => this.scrollView.scrollInto(syncPath), 200)
if (this.focusOnPathSettings) {
setTimeout(() => this.openSettingsDialog(), 500)
}
diff --git a/frontend/src/app/applications/sync/components/utils/sync-path-direction-icon.component.ts b/frontend/src/app/applications/sync/components/utils/sync-path-direction-icon.component.ts
index 5d2c5443..4bdbaf11 100644
--- a/frontend/src/app/applications/sync/components/utils/sync-path-direction-icon.component.ts
+++ b/frontend/src/app/applications/sync/components/utils/sync-path-direction-icon.component.ts
@@ -1,6 +1,6 @@
import { Component, Input } from '@angular/core'
import { FaIconComponent } from '@fortawesome/angular-fontawesome'
-import { faLongArrowAltDown, faLongArrowAltUp } from '@fortawesome/free-solid-svg-icons'
+import { faUpDown } from '@fortawesome/free-solid-svg-icons'
import { SYNC_PATH_MODE } from '@sync-in-server/backend/src/applications/sync/constants/sync'
import { SYNC_TRANSFER_SIDE, SYNC_TRANSFER_SIDE_CLASS, SYNC_TRANSFER_SIDE_ICON } from '../../constants/transfer'
import { SyncPathModel } from '../../models/sync-path.model'
@@ -10,22 +10,21 @@ import { SyncPathModel } from '../../models/sync-path.model'
imports: [FaIconComponent],
template: `
<span class="d-flex justify-content-center">
- @if (syncPath.settings.mode === SYNC_PATH_MODE.DOWNLOAD || syncPath.settings.mode === SYNC_PATH_MODE.BOTH) {
- @if (small) {
- <fa-icon [icon]="icons.faLongArrowAltDown" [fixedWidth]="syncPath.settings.mode !== SYNC_PATH_MODE.BOTH"></fa-icon>
- } @else {
- <fa-icon [icon]="SYNC_TRANSFER_SIDE_ICON[SYNC_TRANSFER_SIDE.LOCAL]" class="{{ SYNC_TRANSFER_SIDE_CLASS[SYNC_TRANSFER_SIDE.LOCAL] }}">
+ @if (small && syncPath.settings.mode === SYNC_PATH_MODE.BOTH) {
+ <fa-icon [icon]="SYNC_TRANSFER_BOTH_ICON"> </fa-icon>
+ } @else {
+ @if (syncPath.settings.mode === SYNC_PATH_MODE.DOWNLOAD || syncPath.settings.mode === SYNC_PATH_MODE.BOTH) {
+ <fa-icon
+ [icon]="SYNC_TRANSFER_SIDE_ICON[SYNC_TRANSFER_SIDE.LOCAL]"
+ class="{{ small ? '' : SYNC_TRANSFER_SIDE_CLASS[SYNC_TRANSFER_SIDE.LOCAL] }}"
+ >
</fa-icon>
}
- }
- @if (syncPath.settings.mode === SYNC_PATH_MODE.UPLOAD || syncPath.settings.mode === SYNC_PATH_MODE.BOTH) {
- @if (small) {
- <fa-icon [icon]="icons.faLongArrowAltUp" [fixedWidth]="syncPath.settings.mode !== SYNC_PATH_MODE.BOTH"></fa-icon>
- } @else {
+ @if (syncPath.settings.mode === SYNC_PATH_MODE.UPLOAD || syncPath.settings.mode === SYNC_PATH_MODE.BOTH) {
<fa-icon
[icon]="SYNC_TRANSFER_SIDE_ICON[SYNC_TRANSFER_SIDE.REMOTE]"
[class.ms-1]="syncPath.settings.mode === SYNC_PATH_MODE.BOTH"
- class="{{ SYNC_TRANSFER_SIDE_CLASS[SYNC_TRANSFER_SIDE.REMOTE] }}"
+ class="{{ small ? '' : SYNC_TRANSFER_SIDE_CLASS[SYNC_TRANSFER_SIDE.REMOTE] }}"
></fa-icon>
}
}
@@ -37,7 +36,7 @@ export class SyncPathDirectionIconComponent {
@Input() small = false
protected readonly SYNC_PATH_MODE = SYNC_PATH_MODE
protected readonly SYNC_TRANSFER_SIDE_ICON = SYNC_TRANSFER_SIDE_ICON
- protected readonly icons = { faLongArrowAltDown, faLongArrowAltUp }
protected readonly SYNC_TRANSFER_SIDE = SYNC_TRANSFER_SIDE
protected readonly SYNC_TRANSFER_SIDE_CLASS = SYNC_TRANSFER_SIDE_CLASS
+ protected readonly SYNC_TRANSFER_BOTH_ICON = faUpDown
}
diff --git a/frontend/src/app/applications/sync/components/wizard/sync-wizard-client.component.html b/frontend/src/app/applications/sync/components/wizard/sync-wizard-client.component.html
index 6b6a0b3b..c9255fd9 100644
--- a/frontend/src/app/applications/sync/components/wizard/sync-wizard-client.component.html
+++ b/frontend/src/app/applications/sync/components/wizard/sync-wizard-client.component.html
@@ -33,7 +33,10 @@
<fa-icon [icon]="icons.faTimesCircle"></fa-icon>
Cancel
</button>
- <button (click)="onSelect()" class="btn btn-secondary" type="button" l10nTranslate>Select a folder</button>
+ <button (click)="onSelect()" class="btn btn-secondary" type="button" l10nTranslate>
+ <fa-icon [icon]="icons.faDownload"></fa-icon>
+ Select a folder
+ </button>
<button (click)="onNext()" [disabled]="!pathIsValid" class="btn btn-secondary ms-auto" type="button" l10nTranslate>
<fa-icon [icon]="icons.faArrowCircleRight"></fa-icon>
Next
diff --git a/frontend/src/app/applications/sync/components/wizard/sync-wizard-client.component.ts b/frontend/src/app/applications/sync/components/wizard/sync-wizard-client.component.ts
index 581d9a27..7fa390cb 100644
--- a/frontend/src/app/applications/sync/components/wizard/sync-wizard-client.component.ts
+++ b/frontend/src/app/applications/sync/components/wizard/sync-wizard-client.component.ts
@@ -1,7 +1,7 @@
import { Component, inject, Renderer2 } from '@angular/core'
import { Router } from '@angular/router'
import { FaIconComponent } from '@fortawesome/angular-fontawesome'
-import { faArrowCircleRight, faTimesCircle } from '@fortawesome/free-solid-svg-icons'
+import { faArrowCircleRight, faDownload, faTimesCircle } from '@fortawesome/free-solid-svg-icons'
import { L10nTranslateDirective } from 'angular-l10n'
import { ELECTRON_DIALOG } from '../../../../electron/constants/dialogs'
import { LayoutService } from '../../../../layout/layout.service'
@@ -21,7 +21,7 @@ export class SyncWizardClientComponent {
public pathIsValid = false
public infoMsg: string = null
protected readonly syncService = inject(SyncService)
- protected readonly icons = { faTimesCircle, faArrowCircleRight }
+ protected readonly icons = { faTimesCircle, faArrowCircleRight, faDownload }
private readonly router = inject(Router)
private readonly renderer = inject(Renderer2)
private readonly store = inject(StoreService)
diff --git a/frontend/src/app/applications/sync/components/wizard/sync-wizard-server.component.html b/frontend/src/app/applications/sync/components/wizard/sync-wizard-server.component.html
index 739f69f1..bee2fd78 100644
--- a/frontend/src/app/applications/sync/components/wizard/sync-wizard-server.component.html
+++ b/frontend/src/app/applications/sync/components/wizard/sync-wizard-server.component.html
@@ -12,10 +12,9 @@
<span l10nTranslate>Please select the server directory to sync, if it doesn't exist you can create it.</span>
}
</div>
- <div class="app-top-menu px-0 bg-transparent">
+ <div class="app-top-menu px-0">
<button (click)="onBack()"
[disabled]="!currentPath"
- [tooltip]="'Back' | translate:locale.language"
class="btn btn-sm btn-secondary"
type="button">
<fa-icon [icon]="icons.faArrowCircleLeft"></fa-icon>
@@ -30,7 +29,6 @@
<button (click)="addDirectory()"
[hidden]="!canCreateDir"
[disabled]="!newDirectoryName"
- [tooltip]="'Add' | translate:locale.language"
class="btn btn-sm btn-secondary input-group-text"
type="button">
<fa-icon [icon]="icons.faFolderPlus"></fa-icon>
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 72fc96f7..3a83bfe8 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
@@ -7,7 +7,6 @@ import { faArrowCircleLeft, faArrowCircleRight, faFolderPlus } from '@fortawesom
import { FileTree } from '@sync-in-server/backend/src/applications/files/interfaces/file-tree.interface'
import { USER_PERMISSION } from '@sync-in-server/backend/src/applications/users/constants/user'
import { L10N_LOCALE, L10nLocale, L10nTranslateDirective, L10nTranslatePipe } from 'angular-l10n'
-import { TooltipDirective } from 'ngx-bootstrap/tooltip'
import { AutoResizeDirective } from '../../../../common/directives/auto-resize.directive'
import { LayoutService } from '../../../../layout/layout.service'
import { StoreService } from '../../../../store/store.service'
@@ -21,7 +20,7 @@ import { isSynchronizable } from '../../sync.utils'
@Component({
selector: 'app-sync-wizard-server',
- imports: [FaIconComponent, L10nTranslateDirective, AutoResizeDirective, FormsModule, L10nTranslatePipe, ReactiveFormsModule, TooltipDirective],
+ imports: [FaIconComponent, L10nTranslateDirective, AutoResizeDirective, FormsModule, L10nTranslatePipe, ReactiveFormsModule],
templateUrl: 'sync-wizard-server.component.html'
})
export class SyncWizardServerComponent {
diff --git a/frontend/src/app/applications/sync/components/wizard/sync-wizard-settings.component.html b/frontend/src/app/applications/sync/components/wizard/sync-wizard-settings.component.html
index 6a0a7fb6..7d554c76 100644
--- a/frontend/src/app/applications/sync/components/wizard/sync-wizard-settings.component.html
+++ b/frontend/src/app/applications/sync/components/wizard/sync-wizard-settings.component.html
@@ -70,7 +70,7 @@
} @else {
<div>
<span l10nTranslate>All files created or modified in</span>
- <span class="fw-bold mx-1" l10nTranslate>{{ syncPath.settings.mode === SYNC_PATH_MODE.DOWNLOAD ? syncService.wizard.localPath.name : syncService.wizard.remotePath.name }}</span>
+ <span class="fw-bold mx-1">{{ syncPath.settings.mode === SYNC_PATH_MODE.DOWNLOAD ? syncService.wizard.localPath.name : syncService.wizard.remotePath.name }}</span>
<span l10nTranslate>will be ignored and deleted</span>
</div>
}
@@ -79,11 +79,11 @@
<div class="mt-auto">
<div class="d-flex align-items-start">
<button (click)="onPrevious()" class="btn btn-sm btn-secondary me-auto" translate type="button">
- <i class="fas fa-arrow-circle-left fa-fw"></i>
+ <fa-icon [icon]="icons.faArrowCircleLeft"></fa-icon>
Previous
</button>
<button (click)="onSubmit()" [disabled]="!syncPath.settings.name" class="btn btn-sm btn-secondary ms-auto" translate type="button">
- <i class="fas fa-check-circle fa-fw"></i>
+ <fa-icon [icon]="icons.faCheckCircle"></fa-icon>
Done
</button>
</div>
diff --git a/frontend/src/app/applications/sync/components/wizard/sync-wizard-settings.component.ts b/frontend/src/app/applications/sync/components/wizard/sync-wizard-settings.component.ts
index 77119ee1..a389fd41 100644
--- a/frontend/src/app/applications/sync/components/wizard/sync-wizard-settings.component.ts
+++ b/frontend/src/app/applications/sync/components/wizard/sync-wizard-settings.component.ts
@@ -1,6 +1,7 @@
import { Component, inject } from '@angular/core'
import { Router } from '@angular/router'
import { FaIconComponent } from '@fortawesome/angular-fontawesome'
+import { faArrowCircleLeft, faCheckCircle } from '@fortawesome/free-solid-svg-icons'
import { SYNC_PATH_CONFLICT_MODE, SYNC_PATH_MODE } from '@sync-in-server/backend/src/applications/sync/constants/sync'
import { L10nTranslateDirective } from 'angular-l10n'
import { TooltipDirective } from 'ngx-bootstrap/tooltip'
@@ -20,7 +21,7 @@ export class SyncWizardSettingsComponent {
protected readonly syncService = inject(SyncService)
protected readonly SYNC_PATH_CONFLICT_MODE = SYNC_PATH_CONFLICT_MODE
protected readonly SYNC_PATH_MODE = SYNC_PATH_MODE
- protected readonly icons = { CLIENT: SYNC_ICON.CLIENT, SERVER: SYNC_ICON.SERVER }
+ protected readonly icons = { CLIENT: SYNC_ICON.CLIENT, SERVER: SYNC_ICON.SERVER, faArrowCircleLeft, faCheckCircle }
protected readonly translatedRemotePath = this.syncService.translateServerPath(this.syncService.wizard.remotePath.serverPath)
protected syncPath: SyncPathModel
protected error: string = null
diff --git a/frontend/src/app/applications/users/components/utils/users-search.component.html b/frontend/src/app/applications/users/components/utils/users-search.component.html
index ec5743eb..32b8f036 100644
--- a/frontend/src/app/applications/users/components/utils/users-search.component.html
+++ b/frontend/src/app/applications/users/components/utils/users-search.component.html
@@ -43,7 +43,7 @@
<div class="col-12 mt-1">
@for (member of members; track member.mid) {
<div class="bg-theme mb-1 p-2" style="border-radius: 4px">
- <div class="d-flex align-items-center text-truncate no-select fs-xs" style="height: 32px">
+ <div class="d-flex align-items-center text-truncate no-select fs-xs" style="max-height: 34px">
<div class="d-flex align-items-center text-truncate me-auto">
@if (member.isUser) {
<img alt="" class="avatar-base-img" height="30" width="30" [src]="member.avatarUrl" />
diff --git a/frontend/src/app/common/components/virtual-scroll.component.ts b/frontend/src/app/common/components/virtual-scroll.component.ts
index dd49cb33..b710d8b3 100644
--- a/frontend/src/app/common/components/virtual-scroll.component.ts
+++ b/frontend/src/app/common/components/virtual-scroll.component.ts
@@ -58,7 +58,7 @@ export class VirtualScrollComponent<T> implements OnInit, OnChanges, OnDestroy {
@ViewChild('shim', { read: ElementRef, static: true }) shimElementRef: ElementRef
@Output() isScrollBottom = new EventEmitter<boolean>()
@Output() isScrollTop = new EventEmitter<boolean>()
- @Input() resizeOffset = 132
+ @Input() resizeOffset = 130
@Input() galleryMode = false
@Input() selectedChat: any = null
@Input() items: T[] = []
diff --git a/frontend/src/app/layout/sidebar/sidebar.left.component.html b/frontend/src/app/layout/sidebar/sidebar.left.component.html
index c7940c64..f98a6acb 100644
--- a/frontend/src/app/layout/sidebar/sidebar.left.component.html
+++ b/frontend/src/app/layout/sidebar/sidebar.left.component.html
@@ -54,6 +54,9 @@
<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>
+ }
}
@if (menu.count) {
<span class="{{isMenuIcon ? 'menu-badge-icon' : 'menu-badge'}}">
@@ -70,16 +73,16 @@
(click)="checkMenuContext(mainMenu)">
<ng-container [ngTemplateOutlet]="MenuTemplate" [ngTemplateOutletContext]="{menu: mainMenu, isMenuIcon: true}"></ng-container>
<!-- start mini menu-->
- @if (mainMenu.miniOpened) {
+ @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 (currentMenu.component) {
+ @if (mainMenu.component) {
<div (click)="checkComponentRoute(mainMenu)" appAutoResize [resizeOffset]="40">
- <ng-container *ngComponentOutlet="currentMenu.component"></ng-container>
+ <ng-container *ngComponentOutlet="mainMenu.component"></ng-container>
</div>
}
</div>
@@ -108,13 +111,13 @@
}
</ng-template>
<ng-template #MiniMenuApps let-mainMenu="mainMenu" let-menu="menu">
- <a (click)="onMiniMenuNavigate($event, [menu.link], mainMenu)" [class.active]="menu.isActive">
+ <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 (click)="onMiniMenuNavigate($event, [submenu.link], mainMenu)" [class.active]="submenu.isActive">
+ <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>
}
diff --git a/frontend/src/app/layout/sidebar/sidebar.left.component.ts b/frontend/src/app/layout/sidebar/sidebar.left.component.ts
index c68f96af..5539696d 100644
--- a/frontend/src/app/layout/sidebar/sidebar.left.component.ts
+++ b/frontend/src/app/layout/sidebar/sidebar.left.component.ts
@@ -2,7 +2,7 @@ import { AsyncPipe, Location, NgComponentOutlet, NgTemplateOutlet } from '@angul
import { Component, ElementRef, inject, OnDestroy, Renderer2, ViewChild } from '@angular/core'
import { ResolveEnd, Router, RouterLink } from '@angular/router'
import { FaIconComponent } from '@fortawesome/angular-fontawesome'
-import { faAngleLeft, faAngleRight, faUserSecret } from '@fortawesome/free-solid-svg-icons'
+import { faAngleLeft, faAngleRight, faChevronDown, faUserSecret } from '@fortawesome/free-solid-svg-icons'
import { L10nTranslateDirective } from 'angular-l10n'
import { Subscription } from 'rxjs'
import { filter } from 'rxjs/operators'
@@ -29,7 +29,7 @@ import { LayoutService } from '../layout.service'
export class SideBarLeftComponent implements OnDestroy {
@ViewChild('sidebar', { static: true }) sidebar: ElementRef
protected readonly store = inject(StoreService)
- protected readonly icons = { faAngleLeft, faAngleRight, faUserSecret }
+ protected readonly icons = { faAngleLeft, faAngleRight, faUserSecret, faChevronDown }
protected logoIconUrl = logoIconUrl
protected appName: string
protected appVersion: string
diff --git a/frontend/src/styles/components/_boxes.scss b/frontend/src/styles/components/_boxes.scss
index d047f724..cf35e3f6 100644
--- a/frontend/src/styles/components/_boxes.scss
+++ b/frontend/src/styles/components/_boxes.scss
@@ -90,7 +90,6 @@
.box-title {
font-weight: 500;
- letter-spacing: 0.02em;
}
}
diff --git a/frontend/src/styles/components/_header.scss b/frontend/src/styles/components/_header.scss
index 0732e73a..3bf5d28f 100644
--- a/frontend/src/styles/components/_header.scss
+++ b/frontend/src/styles/components/_header.scss
@@ -49,6 +49,7 @@
height: $sidebar-apps-icons-height;
cursor: pointer;
padding: 6px;
+ user-select: none;
&:hover {
background-color: $sidebar-light-icons-menu-hover-bg;
@@ -133,7 +134,7 @@
}
> fa-icon {
- font-size: $font-size-xl;
+ font-size: $font-size-lg;
}
}
}
diff --git a/frontend/src/styles/components/_products.scss b/frontend/src/styles/components/_products.scss
index 8494e27c..5dc9fa3a 100644
--- a/frontend/src/styles/components/_products.scss
+++ b/frontend/src/styles/components/_products.scss
@@ -24,9 +24,11 @@
.product-img {
float: none;
+ min-width: 30px;
width: 30px;
+ min-height: 30px;
height: 30px;
- border-radius: 8px;
+ border-radius: $btn-border-radius;
display: grid;
place-items: center;
margin-right: 0.5rem;
diff --git a/frontend/src/styles/components/_sidebar_left.scss b/frontend/src/styles/components/_sidebar_left.scss
index d6d043fa..436ffbf5 100755
--- a/frontend/src/styles/components/_sidebar_left.scss
+++ b/frontend/src/styles/components/_sidebar_left.scss
@@ -27,6 +27,7 @@
justify-content: center;
min-height: $sidebar-apps-height;
width: 100%;
+ position: relative;
&:first-child {
user-select: none;
@@ -76,32 +77,50 @@
.menu-mini {
display: flex;
flex-direction: column;
- align-items: flex-start;
+ align-items: stretch;
position: absolute;
- left: $sidebar-apps-icons-width;
- min-width: 150px;
+ 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-xs;
- border-top-right-radius: $border-radius-base;
- border-bottom-right-radius: $border-radius-base;
- overflow: hidden;
+ font-size: $font-size-xxs;
+ 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: $sidebar-apps-height;
- width: 100%;
- padding-left: 8px;
- padding-right: 5px;
+ height: calc(#{$sidebar-apps-height} - 6px);
+ padding: 0 8px;
+ border-radius: $btn-border-radius;
+ @extend .text-truncate;
+ @extend .no-select-pointer;
> fa-icon {
- margin-right: .25rem;
- font-size: $font-size-lg;
- }
-
- > span:first-of-type {
- margin-right: 15px;
+ font-size: $font-size-md;
+ margin-right: 0;
+ width: .95rem;
+ min-width: .95rem;
+ display: inline-flex;
+ justify-content: center;
+ opacity: .88;
}
.menu-badge {
@@ -109,6 +128,11 @@
font-size: $font-size-xxxs;
}
}
+
+ > a.mini-submenu-item {
+ font-size: $font-size-xxxs;
+ padding-left: 20px;
+ }
}
}
}
@@ -197,8 +221,8 @@
.menu {
display: flex;
align-items: center;
- min-height: calc(#{$sidebar-apps-height} - 3px);
- height: calc(#{$sidebar-apps-height} - 3px);
+ min-height: $sidebar-apps-height;
+ height: $sidebar-apps-height;
min-width: $sidebar-apps-menus-width;
font-size: $font-size-xs;
cursor: pointer;
@@ -218,14 +242,13 @@
gap: .5rem;
flex: 1 1 auto;
width: auto;
- height: calc(#{$sidebar-apps-height} - 6px);
+ height: calc(#{$sidebar-apps-height} - 5px);
margin: 0 6px;
padding: 0 10px;
border-radius: $btn-border-radius;
max-height: none;
@extend .text-truncate;
@extend .no-select-pointer;
- transition: color .1s ease-in-out;
> fa-icon {
font-size: $font-size-md;
diff --git a/frontend/src/styles/components/_theme_dark.scss b/frontend/src/styles/components/_theme_dark.scss
index 98c7f09c..d168bf83 100755
--- a/frontend/src/styles/components/_theme_dark.scss
+++ b/frontend/src/styles/components/_theme_dark.scss
@@ -24,15 +24,14 @@
}
.menu-mini {
- background-color: $sidebar-dark-mini-menu-bg;
+ background-color: $sidebar-dark-apps-menu-bg;
> a {
- color: $sidebar-dark-mini-menu-color;
- border-bottom: .5px solid $sidebar-dark-mini-menu-bg !important;
+ color: $sidebar-dark-apps-menu-border-color;
&:hover, &.active {
- background: darken($sidebar-dark-mini-menu-bg, 5%) !important;
- color: $sidebar-dark-mini-menu-hover-color;
+ background: $sidebar-dark-apps-menu-hover-bg;
+ color: $sidebar-dark-apps-menu-hover-color;
> fa-icon:first-child {
color: $primary;
@@ -613,7 +612,7 @@
}
.product-img {
- background-color: darken($sidebar-dark-icons-menu-bg, 6%);
+ background-color: darken($sidebar-dark-icons-menu-border-color, 8%);
border: 1px solid $sidebar-dark-icons-menu-border-color;
}
}
diff --git a/frontend/src/styles/components/_theme_light.scss b/frontend/src/styles/components/_theme_light.scss
index ff3cc45d..99196622 100755
--- a/frontend/src/styles/components/_theme_light.scss
+++ b/frontend/src/styles/components/_theme_light.scss
@@ -23,37 +23,40 @@
}
.menu-mini {
- background-color: $sidebar-light-mini-menu-bg;
+ background-color: #ebeef5;
> a {
- color: $sidebar-light-mini-menu-color;
+ color: $sidebar-light-apps-menu-hover-color;
+ border: .5px solid transparent;
- &:not(:last-child) {
- border-bottom: .5px solid $sidebar-light-mini-menu-bg !important;
+ &:hover {
+ background: lighten(#d4e1f1, 2%);
}
- &:hover, &.active {
- background: darken($sidebar-light-mini-menu-bg, 10%) !important;
- color: $sidebar-light-mini-menu-hover-color;
+ &.active {
+ background: darken(#d4e1f1, 4%);
+ border-color: mix($primary, $gray-light, 30%);
+ font-weight: 500;
+ color: $navy;
> fa-icon:first-child {
- color: $primary;
+ color: darken($primary, 5%);
}
}
}
.chat-item-sidebar {
- background-color: $sidebar-light-mini-menu-bg;
- color: $sidebar-light-mini-menu-color;
+ background-color: #ebeef5;
+ color: $sidebar-light-apps-menu-hover-color;
&:not(:last-child) {
- border-bottom: .5px solid $sidebar-light-mini-menu-bg !important;
+ border-bottom: .5px solid #ebeef5 !important;
}
&:hover, &.active {
border-left-color: transparent !important;
- background: darken($sidebar-light-mini-menu-bg, 5%) !important;
- color: $sidebar-light-mini-menu-hover-color;
+ background: darken(#d4e1f1, 4%) !important;
+ color: $navy;
}
}
}
@@ -61,7 +64,7 @@
.sidebar-apps-menus {
.menus-content {
- background-color: #eef2f9;
+ background-color: #ebeef5;
border-right: .5px solid $sidebar-light-apps-menu-border-color;
}
@@ -466,7 +469,7 @@
}
.wizard-nav-content {
- background-color: $gray-lightest;
+ background-color: white;
}
}
.sidebar-item {
diff --git a/frontend/src/styles/components/_wizard.scss b/frontend/src/styles/components/_wizard.scss
index c96121dd..826dba62 100644
--- a/frontend/src/styles/components/_wizard.scss
+++ b/frontend/src/styles/components/_wizard.scss
@@ -34,7 +34,7 @@
.app-top-menu {
border: none !important;
- background: transparent;
+ background: transparent !important;
}
.area {
@@ -44,12 +44,12 @@
.dropzone {
display: flex;
justify-content: center;
- border: 2px dashed #bbb;
+ border: 2px dashed $gray;
border-radius: $border-radius-base;
padding: 80px;
font-size: 21px;
font-weight: bold;
- color: #bbb;
+ color: $gray;
height: 100%;
&.active {
diff --git a/frontend/src/styles/variables.scss b/frontend/src/styles/variables.scss
index 7f0c5e50..288ed16b 100644
--- a/frontend/src/styles/variables.scss
+++ b/frontend/src/styles/variables.scss
@@ -72,8 +72,8 @@ $font-size-md: $font-size-base; // 15.5px
$font-size-sm: 0.875rem; // 14px
$font-size-xs: 0.8125rem; // 13px
$font-size-xxs: 0.75rem; // 12px
-$font-size-xxxs: 0.71875rem; // 11.5px
-$font-size-xxxxs: 0.6875rem; // 11px
+$font-size-xxxs: 0.7125rem; // 11.4px
+$font-size-xxxxs: 0.65rem; // 10.4px
//LAYOUT
//--------------------------------------------------------