Skip to content

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

refactor(frontend): harmonize selection and gallery controls

johaven388cd2eed171
diff --git a/frontend/src/app/applications/admin/components/admin-groups.component.html b/frontend/src/app/applications/admin/components/admin-groups.component.html
index 11c13dd5..24b43dcc 100644
--- a/frontend/src/app/applications/admin/components/admin-groups.component.html
+++ b/frontend/src/app/applications/admin/components/admin-groups.component.html
@@ -1,11 +1,5 @@
<!--Start Top Menu-->
<div class="app-top-menu">
- <button (click)="refresh()"
- class="d-none d-sm-block btn btn-default me-1"
- [tooltip]="'Refresh' | translate:locale.language"
- type="button">
- <svg [lucideIcon]="icons.LucideRotateCw" [class.icon-spin]="loading"></svg>
- </button>
<div class="btn-group me-1" dropdown>
<button class="btn btn-default dropdown-toggle"
dropdownToggle
@@ -41,7 +35,7 @@
type="button">
<svg [lucideIcon]="icons.LucidePencil"></svg>
</button>
- <div class="ms-auto">
+ <div class="d-flex align-items-center ms-auto">
<button btnCheckbox
[ngModel]="personalGroupsView"
(ngModelChange)="onPersonalGroupsView($event)"
@@ -53,10 +47,16 @@
</div>
</button>
<!--Start Filter Button-->
- <div class="btn-group">
+ <div class="btn-group me-1">
<app-input-filter class="d-none d-sm-block"></app-input-filter>
</div>
<!--End Filter Button-->
+ <button (click)="refresh()"
+ class="d-none d-sm-block btn btn-default"
+ [tooltip]="'Refresh' | translate:locale.language"
+ type="button">
+ <svg [lucideIcon]="icons.LucideRotateCw" [class.icon-spin]="loading"></svg>
+ </button>
</div>
</div>
<!--End Top Menu-->
diff --git a/frontend/src/app/applications/admin/components/admin-spaces.component.html b/frontend/src/app/applications/admin/components/admin-spaces.component.html
index 539d7593..50581dc1 100644
--- a/frontend/src/app/applications/admin/components/admin-spaces.component.html
+++ b/frontend/src/app/applications/admin/components/admin-spaces.component.html
@@ -1,11 +1,5 @@
<!--Start Top Menu-->
<div class="app-top-menu">
- <button (click)="loadSpaces()"
- class="d-none d-sm-block btn btn-default me-1"
- [tooltip]="'Refresh' | translate:locale.language"
- type="button">
- <svg [lucideIcon]="icons.LucideRotateCw" [class.icon-spin]="loading"></svg>
- </button>
<button (click)="openSpaceDialog(true)"
class="btn btn-default me-1"
[tooltip]="'New space' | translate:locale.language"
@@ -26,12 +20,18 @@
type="button">
<svg [lucideIcon]="icons.SHARES"></svg>
</button>
- <div class="ms-auto">
+ <div class="d-flex align-items-center ms-auto">
<!--Start Filter Button-->
- <div class="btn-group">
+ <div class="btn-group me-1">
<app-input-filter class="d-none d-sm-block"></app-input-filter>
</div>
<!--End Filter Button-->
+ <button (click)="loadSpaces()"
+ class="d-none d-sm-block btn btn-default"
+ [tooltip]="'Refresh' | translate:locale.language"
+ type="button">
+ <svg [lucideIcon]="icons.LucideRotateCw" [class.icon-spin]="loading"></svg>
+ </button>
</div>
</div>
<!--End Top Menu-->
diff --git a/frontend/src/app/applications/admin/components/admin-users.component.html b/frontend/src/app/applications/admin/components/admin-users.component.html
index 224bb1f4..a3fd1638 100644
--- a/frontend/src/app/applications/admin/components/admin-users.component.html
+++ b/frontend/src/app/applications/admin/components/admin-users.component.html
@@ -1,11 +1,5 @@
<!--Start Top Menu-->
<div class="app-top-menu">
- <button (click)="loadUsersOrGuests()"
- class="d-none d-sm-block btn btn-default me-1"
- [tooltip]="'Refresh' | translate:locale.language"
- type="button">
- <svg [lucideIcon]="icons.LucideRotateCw" [class.icon-spin]="loading"></svg>
- </button>
<button (click)="openDialog(true)"
class="btn btn-default me-1"
[tooltip]="(guestsView ? 'New guest' : 'New user') | translate:locale.language"
@@ -26,7 +20,7 @@
type="button">
<svg [lucideIcon]="icons.LucideVenetianMask"></svg>
</button>
- <div class="ms-auto">
+ <div class="d-flex align-items-center ms-auto">
<!--Start Filter Button-->
<button btnCheckbox
[ngModel]="guestsView"
@@ -38,10 +32,16 @@
<span l10nTranslate>Guests</span>
</div>
</button>
- <div class="btn-group">
+ <div class="btn-group me-1">
<app-input-filter class="d-none d-sm-block"></app-input-filter>
</div>
<!--End Filter Button-->
+ <button (click)="loadUsersOrGuests()"
+ class="d-none d-sm-block btn btn-default"
+ [tooltip]="'Refresh' | translate:locale.language"
+ type="button">
+ <svg [lucideIcon]="icons.LucideRotateCw" [class.icon-spin]="loading"></svg>
+ </button>
</div>
</div>
<!--End Top Menu-->
diff --git a/frontend/src/app/applications/favorites/components/favorites.component.html b/frontend/src/app/applications/favorites/components/favorites.component.html
index 194b7616..f9a96c3c 100644
--- a/frontend/src/app/applications/favorites/components/favorites.component.html
+++ b/frontend/src/app/applications/favorites/components/favorites.component.html
@@ -1,11 +1,5 @@
<!--Start Top Menu-->
<div class="app-top-menu">
- <button (click)="loadFavorites()"
- class="d-none d-sm-block btn btn-default me-1"
- [tooltip]="'Refresh' | translate:locale.language"
- type="button">
- <svg [lucideIcon]="icons.LucideRotateCw" [class.icon-spin]="loading"></svg>
- </button>
<button (click)="goTo()"
[disabled]="!selected || selected.isDisabled"
class="btn btn-default me-1"
@@ -20,10 +14,16 @@
type="button">
<svg [lucideIcon]="icons.REMOVE_FAVORITE"></svg>
</button>
- <div class="ms-auto">
+ <div class="d-flex align-items-center ms-auto">
<div class="btn-group me-1">
<app-input-filter class="d-none d-sm-block"></app-input-filter>
</div>
+ <button (click)="loadFavorites()"
+ class="d-none d-sm-block btn btn-default me-1"
+ [tooltip]="'Refresh' | translate:locale.language"
+ type="button">
+ <svg [lucideIcon]="icons.LucideRotateCw" [class.icon-spin]="loading"></svg>
+ </button>
<app-navigation-view (switchView)="galleryMode = $event"></app-navigation-view>
</div>
</div>
@@ -31,6 +31,7 @@
@if (galleryMode?.enabled) {
<!--Start Gallery Content-->
<div [style.--gallery-card-size]="galleryMode.dimensions + 'px'"
+ [style.--gallery-badge-size]="galleryMode.badgeSize + 'px'"
[style.--gallery-image-size]="galleryMode.image + 'px'"
[style.--gallery-text-size]="galleryMode.textSize + 'px'"
class="app-gallery">
diff --git a/frontend/src/app/applications/links/components/links.component.html b/frontend/src/app/applications/links/components/links.component.html
index 9d9cb7d9..be9a5071 100644
--- a/frontend/src/app/applications/links/components/links.component.html
+++ b/frontend/src/app/applications/links/components/links.component.html
@@ -1,11 +1,5 @@
<!--Start Top Menu-->
<div class="app-top-menu">
- <button (click)="loadShareLinks()"
- class="d-none d-sm-block btn btn-default me-1"
- [tooltip]="'Refresh' | translate:locale.language"
- type="button">
- <svg [lucideIcon]="icons.LucideRotateCw" [class.icon-spin]="loading"></svg>
- </button>
<button (click)="openLinkDialog()"
[disabled]="!selected" class="btn btn-default me-1"
[tooltip]="'Edit link' | translate:locale.language"
@@ -26,12 +20,18 @@
type="button">
<svg [lucideIcon]="icons.LucideMapPin"></svg>
</button>
- <div class="ms-auto">
+ <div class="d-flex align-items-center ms-auto">
<!--Start Filter Button-->
<div class="btn-group me-1">
<app-input-filter class="d-none d-sm-block"></app-input-filter>
</div>
<!--End Filter Button-->
+ <button (click)="loadShareLinks()"
+ class="d-none d-sm-block btn btn-default me-1"
+ [tooltip]="'Refresh' | translate:locale.language"
+ type="button">
+ <svg [lucideIcon]="icons.LucideRotateCw" [class.icon-spin]="loading"></svg>
+ </button>
<!--Start View Button-->
<app-navigation-view (switchView)="galleryMode = $event">
</app-navigation-view>
@@ -42,6 +42,7 @@
@if (galleryMode?.enabled) {
<!--Start Gallery Content-->
<div [style.--gallery-card-size]="galleryMode.dimensions + 'px'"
+ [style.--gallery-badge-size]="galleryMode.badgeSize + 'px'"
[style.--gallery-image-size]="galleryMode.image + 'px'"
[style.--gallery-text-size]="galleryMode.textSize + 'px'"
class="app-gallery">
@@ -228,7 +229,7 @@
</ng-template>
<ng-template [divider]="true" contextMenuItem></ng-template>
<ng-template (execute)="layout.showRSideBarTab(TAB_MENU.SELECTION)" contextMenuItem>
- <span l10nTranslate><svg [lucideIcon]="icons.LucideSquareCheckBig"></svg>Info</span>
+ <span l10nTranslate><svg [lucideIcon]="icons.SELECTION"></svg>View selection</span>
</ng-template>
</context-menu>
<!--End Context Menu-->
diff --git a/frontend/src/app/applications/links/components/links.component.ts b/frontend/src/app/applications/links/components/links.component.ts
index 513db557..c1a064be 100644
--- a/frontend/src/app/applications/links/components/links.component.ts
+++ b/frontend/src/app/applications/links/components/links.component.ts
@@ -14,8 +14,7 @@ import {
LucideLock,
LucideMapPin,
LucidePencil,
- LucideRotateCw,
- LucideSquareCheckBig
+ LucideRotateCw
} from '@lucide/angular'
import { ContextMenuComponent, ContextMenuModule } from '@perfectmemory/ngx-contextmenu'
import { L10N_LOCALE, L10nLocale, L10nTranslateDirective, L10nTranslatePipe } from 'angular-l10n'
@@ -37,7 +36,7 @@ import { StoreService } from '../../../store/store.service'
import { ShareRepositoryComponent } from '../../shares/components/utils/share-repository.component'
import { ShareModel } from '../../shares/models/share.model'
import { SharesService } from '../../shares/services/shares.service'
-import { SPACES_PATH, SPACES_TITLE } from '../../spaces/spaces.constants'
+import { SPACES_ICON, SPACES_PATH, SPACES_TITLE } from '../../spaces/spaces.constants'
import { ShareLinkModel } from '../models/share-link.model'
import { LinksService } from '../services/links.service'
import { LinkDialogComponent } from './dialogs/link-dialog.component'
@@ -85,7 +84,7 @@ export class LinksComponent implements OnInit {
LucideLock,
LucideClipboard,
LucideClipboardCheck,
- LucideSquareCheckBig
+ SELECTION: SPACES_ICON.SELECTION
}
protected readonly originalOrderKeyValue = originalOrderKeyValue
protected readonly TAB_MENU = TAB_MENU
diff --git a/frontend/src/app/applications/shares/components/shared.component.html b/frontend/src/app/applications/shares/components/shared.component.html
index 32d5d033..83efc812 100644
--- a/frontend/src/app/applications/shares/components/shared.component.html
+++ b/frontend/src/app/applications/shares/components/shared.component.html
@@ -1,11 +1,5 @@
<!--Start Top Menu-->
<div class="app-top-menu">
- <button (click)="loadShares()"
- class="d-none d-sm-block btn btn-default me-1"
- [tooltip]="'Refresh' | translate:locale.language"
- type="button">
- <svg [lucideIcon]="icons.LucideRotateCw" [class.icon-spin]="loading"></svg>
- </button>
<button (click)="openShareDialog(true)"
class="btn btn-default me-1"
[tooltip]="'New share' | translate:locale.language"
@@ -33,12 +27,18 @@
type="button">
<svg [lucideIcon]="icons.LucideMapPin"></svg>
</button>
- <div class="ms-auto">
+ <div class="d-flex align-items-center ms-auto">
<!--Start Filter Button-->
<div class="btn-group me-1">
<app-input-filter class="d-none d-sm-block"></app-input-filter>
</div>
<!--End Filter Button-->
+ <button (click)="loadShares()"
+ class="d-none d-sm-block btn btn-default me-1"
+ [tooltip]="'Refresh' | translate:locale.language"
+ type="button">
+ <svg [lucideIcon]="icons.LucideRotateCw" [class.icon-spin]="loading"></svg>
+ </button>
<!--Start View Button-->
<app-navigation-view (switchView)="galleryMode = $event">
</app-navigation-view>
@@ -49,6 +49,7 @@
@if (galleryMode?.enabled) {
<!--Start Gallery Content-->
<div [style.--gallery-card-size]="galleryMode.dimensions + 'px'"
+ [style.--gallery-badge-size]="galleryMode.badgeSize + 'px'"
[style.--gallery-image-size]="galleryMode.image + 'px'"
[style.--gallery-text-size]="galleryMode.textSize + 'px'"
class="app-gallery">
@@ -219,7 +220,7 @@
}
<ng-template [divider]="true" contextMenuItem></ng-template>
<ng-template (execute)="layout.showRSideBarTab(TAB_MENU.SELECTION)" contextMenuItem>
- <span l10nTranslate><svg [lucideIcon]="icons.LucideSquareCheckBig"></svg>Info</span>
+ <span l10nTranslate><svg [lucideIcon]="icons.SELECTION"></svg>View selection</span>
</ng-template>
</context-menu>
<!--End Context Menu-->
diff --git a/frontend/src/app/applications/shares/components/shared.component.ts b/frontend/src/app/applications/shares/components/shared.component.ts
index dea681fc..bacfbc9c 100644
--- a/frontend/src/app/applications/shares/components/shared.component.ts
+++ b/frontend/src/app/applications/shares/components/shared.component.ts
@@ -12,8 +12,7 @@ import {
LucideMinus,
LucidePencil,
LucidePlus,
- LucideRotateCw,
- LucideSquareCheckBig
+ LucideRotateCw
} from '@lucide/angular'
import { ContextMenuComponent, ContextMenuModule } from '@perfectmemory/ngx-contextmenu'
import type { ShareFile } from '@sync-in-server/backend/src/applications/shares/interfaces/share-file.interface'
@@ -85,7 +84,7 @@ export class SharedComponent implements OnInit {
LucidePencil,
LucideEllipsis,
LucideMapPin,
- LucideSquareCheckBig,
+ SELECTION: SPACES_ICON.SELECTION,
LucideMessageSquareMore
}
protected readonly originalOrderKeyValue = originalOrderKeyValue
diff --git a/frontend/src/app/applications/spaces/components/spaces-browser.component.html b/frontend/src/app/applications/spaces/components/spaces-browser.component.html
index a248fb0f..7673f950 100644
--- a/frontend/src/app/applications/spaces/components/spaces-browser.component.html
+++ b/frontend/src/app/applications/spaces/components/spaces-browser.component.html
@@ -1,11 +1,5 @@
<!--Start Top Menu-->
<div class="app-top-menu">
- <button (click)="loadFiles()"
- class="d-none d-sm-block btn btn-default me-1"
- [tooltip]="'Refresh' | translate:locale.language"
- type="button">
- <svg [lucideIcon]="icons.LucideRotateCw" [class.icon-spin]="loading"></svg>
- </button>
<!--Start New Button-->
@if (!isTrashRepo && !inSharesList) {
<div (onShown)="initUpload()" class="btn-group me-1" dropdown>
@@ -123,7 +117,7 @@
}
<li role="menuitem">
<a (click)="layout.showRSideBarTab(TAB_MENU.SELECTION)" class="dropdown-item">
- <span l10nTranslate><svg [lucideIcon]="icons.LucideSquareCheckBig"></svg>Selection</span>
+ <span l10nTranslate><svg [lucideIcon]="icons.SELECTION"></svg>View selection</span>
</a>
</li>
<li class="dropdown-divider"></li>
@@ -205,12 +199,18 @@
</ul>
</div>
<!--End Actions Button-->
- <div class="ms-auto">
+ <div class="d-flex align-items-center ms-auto">
<!--Start Filter Button-->
<div class="btn-group me-1">
<app-input-filter class="d-none d-sm-block"></app-input-filter>
</div>
<!--End Filter Button-->
+ <button (click)="loadFiles()"
+ class="d-none d-sm-block btn btn-default me-1"
+ [tooltip]="'Refresh' | translate:locale.language"
+ type="button">
+ <svg [lucideIcon]="icons.LucideRotateCw" [class.icon-spin]="loading"></svg>
+ </button>
<!--Start View Button-->
<app-navigation-view (switchView)="switchView($event)">
</app-navigation-view>
@@ -221,6 +221,7 @@
@if (galleryMode?.enabled) {
<!--Start Gallery Content-->
<div [style.--gallery-card-size]="galleryMode.dimensions + 'px'"
+ [style.--gallery-badge-size]="galleryMode.badgeSize + 'px'"
[style.--gallery-image-size]="galleryMode.image + 'px'"
[style.--gallery-selection-size]="galleryMode.dimensions / 2.25 + 'px'"
[style.--gallery-text-size]="galleryMode.textSize + 'px'"
diff --git a/frontend/src/app/applications/spaces/components/spaces-browser.component.ts b/frontend/src/app/applications/spaces/components/spaces-browser.component.ts
index 3f23ace5..4f4132b5 100644
--- a/frontend/src/app/applications/spaces/components/spaces-browser.component.ts
+++ b/frontend/src/app/applications/spaces/components/spaces-browser.component.ts
@@ -27,8 +27,7 @@ import {
LucidePencil,
LucidePlus,
LucideRotateCw,
- LucideSpellCheck,
- LucideSquareCheckBig
+ LucideSpellCheck
} from '@lucide/angular'
import { ContextMenuComponent, ContextMenuModule } from '@perfectmemory/ngx-contextmenu'
import { TAR_EXTENSION } from '@sync-in-server/backend/src/applications/files/constants/compress'
@@ -134,6 +133,7 @@ export class SpacesBrowserComponent implements OnInit, AfterViewInit, OnDestroy
LINKS: SPACES_ICON.LINKS,
SYNC: SYNC_ICON.SYNC,
FAVORITES: FAVORITES_ICON,
+ SELECTION: SPACES_ICON.SELECTION,
LucidePlus,
LucideCirclePlus,
LucideFileText,
@@ -151,7 +151,6 @@ export class SpacesBrowserComponent implements OnInit, AfterViewInit, OnDestroy
LucideFileArchive,
LucideSpellCheck,
LucideMove,
- LucideSquareCheckBig,
LucideBan,
LucideCheck,
LucideArrowUp,
diff --git a/frontend/src/app/applications/spaces/components/spaces-nav.component.ts b/frontend/src/app/applications/spaces/components/spaces-nav.component.ts
index aab068d8..872e9ad9 100644
--- a/frontend/src/app/applications/spaces/components/spaces-nav.component.ts
+++ b/frontend/src/app/applications/spaces/components/spaces-nav.component.ts
@@ -1,7 +1,7 @@
import { Component, computed, inject, OnDestroy } from '@angular/core'
import { toObservable } from '@angular/core/rxjs-interop'
import { RouterOutlet } from '@angular/router'
-import { LucideFolderTree, LucideList, LucideMessageSquareMore, LucideSquareCheckBig } from '@lucide/angular'
+import { LucideFolderTree, LucideList, LucideMessageSquareMore } from '@lucide/angular'
import { map } from 'rxjs/operators'
import { TAB_GROUP, TAB_MENU, TabMenu } from '../../../layout/layout.interfaces'
import { LayoutService } from '../../../layout/layout.service'
@@ -11,6 +11,7 @@ import { CommentsSelectionComponent } from '../../comments/components/sidebar/co
import { FilesClipboardComponent } from '../../files/components/sidebar/files-clipboard.component'
import { FilesTreeComponent } from '../../files/components/sidebar/files-tree.component'
import { FileModel } from '../../files/models/file.model'
+import { SPACES_ICON } from '../spaces.constants'
@Component({
selector: 'app-spaces-nav',
@@ -26,7 +27,7 @@ export class SpacesNavComponent implements OnDestroy {
label: TAB_MENU.SELECTION,
components: [SelectionComponent],
loadComponent: false,
- icon: LucideSquareCheckBig,
+ icon: SPACES_ICON.SELECTION,
count: {
value: toObservable(
computed(() =>
diff --git a/frontend/src/app/applications/spaces/components/spaces.component.html b/frontend/src/app/applications/spaces/components/spaces.component.html
index fbaaf021..0a107d99 100644
--- a/frontend/src/app/applications/spaces/components/spaces.component.html
+++ b/frontend/src/app/applications/spaces/components/spaces.component.html
@@ -1,11 +1,5 @@
<!--Start Top Menu-->
<div class="app-top-menu">
- <button (click)="loadSpaces()"
- class="d-none d-sm-block btn btn-default me-1"
- [tooltip]="'Refresh' | translate:locale.language"
- type="button">
- <svg [lucideIcon]="icons.LucideRotateCw" [class.icon-spin]="loading"></svg>
- </button>
@if (canCreateSpace) {
<button (click)="openSpaceDialog(true)"
class="btn btn-default me-1"
@@ -35,12 +29,18 @@
type="button">
<svg [lucideIcon]="icons.LucideAnchor"></svg>
</button>
- <div class="ms-auto">
+ <div class="d-flex align-items-center ms-auto">
<!--Start Filter Button-->
<div class="btn-group me-1">
<app-input-filter class="d-none d-sm-block"></app-input-filter>
</div>
<!--End Filter Button-->
+ <button (click)="loadSpaces()"
+ class="d-none d-sm-block btn btn-default me-1"
+ [tooltip]="'Refresh' | translate:locale.language"
+ type="button">
+ <svg [lucideIcon]="icons.LucideRotateCw" [class.icon-spin]="loading"></svg>
+ </button>
<!--Start View Button-->
<app-navigation-view (switchView)="galleryMode = $event">
</app-navigation-view>
@@ -51,6 +51,7 @@
@if (galleryMode?.enabled) {
<!--Start Gallery Content-->
<div [style.--gallery-card-size]="galleryMode.dimensions + 'px'"
+ [style.--gallery-badge-size]="galleryMode.badgeSize + 'px'"
[style.--gallery-image-size]="galleryMode.image + 'px'"
[style.--gallery-icon-size]="galleryMode.iconSize + 'px'"
[style.--gallery-text-size]="galleryMode.textSize + 'px'"
@@ -243,7 +244,7 @@
<ng-template [divider]="true" contextMenuItem></ng-template>
}
<ng-template (execute)="layout.showRSideBarTab(TAB_MENU.SELECTION)" contextMenuItem>
- <span l10nTranslate><svg [lucideIcon]="icons.LucideSquareCheckBig"></svg>Info</span>
+ <span l10nTranslate><svg [lucideIcon]="icons.SELECTION"></svg>View selection</span>
</ng-template>
</context-menu>
<!--End Context Menu-->
diff --git a/frontend/src/app/applications/spaces/components/spaces.component.ts b/frontend/src/app/applications/spaces/components/spaces.component.ts
index c01727e2..abbc609e 100644
--- a/frontend/src/app/applications/spaces/components/spaces.component.ts
+++ b/frontend/src/app/applications/spaces/components/spaces.component.ts
@@ -10,8 +10,7 @@ import {
LucideHardDriveUpload,
LucidePencil,
LucidePlus,
- LucideRotateCw,
- LucideSquareCheckBig
+ LucideRotateCw
} from '@lucide/angular'
import { ContextMenuComponent, ContextMenuModule } from '@perfectmemory/ngx-contextmenu'
import { SPACE_OPERATION, SPACE_ROLE } from '@sync-in-server/backend/src/applications/spaces/constants/spaces'
@@ -85,7 +84,7 @@ export class SpacesComponent implements OnInit {
LucideHardDriveUpload,
LucidePlus,
LucidePencil,
- LucideSquareCheckBig
+ SELECTION: SPACES_ICON.SELECTION
}
// Sort
protected tableHeaders: Record<'name' | 'managers' | 'members' | 'info' | 'permissions' | 'modified', TableHeaderConfig> = {
diff --git a/frontend/src/app/applications/spaces/components/trash.component.html b/frontend/src/app/applications/spaces/components/trash.component.html
index 8dff6253..5335cf8c 100644
--- a/frontend/src/app/applications/spaces/components/trash.component.html
+++ b/frontend/src/app/applications/spaces/components/trash.component.html
@@ -1,17 +1,17 @@
<!--Start Top Menu-->
<div class="app-top-menu">
- <button (click)="loadTrashBins()"
- class="btn btn-default me-1"
- [tooltip]="'Refresh' | translate:locale.language"
- type="button">
- <svg [lucideIcon]="icons.LucideRotateCw" [class.icon-spin]="loading"></svg>
- </button>
- <div class="ms-auto">
+ <div class="d-flex align-items-center ms-auto">
<!--Start Filter Button-->
<div class="btn-group me-1">
<app-input-filter class="d-none d-sm-block"></app-input-filter>
</div>
<!--End Filter Button-->
+ <button (click)="loadTrashBins()"
+ class="btn btn-default me-1"
+ [tooltip]="'Refresh' | translate:locale.language"
+ type="button">
+ <svg [lucideIcon]="icons.LucideRotateCw" [class.icon-spin]="loading"></svg>
+ </button>
<!--Start View Button-->
<app-navigation-view (switchView)="galleryMode = $event">
</app-navigation-view>
@@ -22,6 +22,7 @@
@if (galleryMode?.enabled) {
<!--Start Gallery Content-->
<div [style.--gallery-card-size]="galleryMode.dimensions + 'px'"
+ [style.--gallery-badge-size]="galleryMode.badgeSize + 'px'"
[style.--gallery-image-size]="galleryMode.image + 'px'"
[style.--gallery-icon-size]="galleryMode.iconSize + 'px'"
[style.--gallery-text-size]="galleryMode.textSize + 'px'"
@@ -145,7 +146,7 @@
</context-menu>
<context-menu #TargetContextMenu>
<ng-template (execute)="layout.showRSideBarTab(TAB_MENU.SELECTION)" contextMenuItem>
- <span l10nTranslate><svg [lucideIcon]="icons.LucideSquareCheckBig"></svg>Info</span>
+ <span l10nTranslate><svg [lucideIcon]="icons.SELECTION"></svg>View selection</span>
</ng-template>
</context-menu>
<!--End Context Menu-->
diff --git a/frontend/src/app/applications/spaces/components/trash.component.ts b/frontend/src/app/applications/spaces/components/trash.component.ts
index b29f9e5a..5b14bd8f 100644
--- a/frontend/src/app/applications/spaces/components/trash.component.ts
+++ b/frontend/src/app/applications/spaces/components/trash.component.ts
@@ -1,7 +1,7 @@
import { KeyValuePipe } from '@angular/common'
import { Component, ElementRef, inject, OnInit, ViewChild } from '@angular/core'
import { Router } from '@angular/router'
-import { LucideArrowDown, LucideArrowUp, LucideDynamicIcon, LucideRotateCw, LucideSquareCheckBig } from '@lucide/angular'
+import { LucideArrowDown, LucideArrowUp, LucideDynamicIcon, LucideRotateCw } from '@lucide/angular'
import { ContextMenuComponent, ContextMenuModule } from '@perfectmemory/ngx-contextmenu'
import type { SpaceTrash } from '@sync-in-server/backend/src/applications/spaces/interfaces/space-trash.interface'
import { L10N_LOCALE, L10nLocale, L10nTranslateDirective, L10nTranslatePipe } from 'angular-l10n'
@@ -53,7 +53,7 @@ export class TrashComponent implements OnInit {
LucideArrowDown,
LucideArrowUp,
LucideRotateCw,
- LucideSquareCheckBig
+ SELECTION: SPACES_ICON.SELECTION
}
protected readonly TAB_MENU = TAB_MENU
protected galleryMode: ViewMode
diff --git a/frontend/src/app/applications/spaces/spaces.constants.ts b/frontend/src/app/applications/spaces/spaces.constants.ts
index d91ecfe6..1edeb2a7 100644
--- a/frontend/src/app/applications/spaces/spaces.constants.ts
+++ b/frontend/src/app/applications/spaces/spaces.constants.ts
@@ -10,6 +10,7 @@ import {
LucideLink,
LucideRedo,
LucideShare2,
+ LucideSquareCheckBig,
LucideTrash2
} from '@lucide/angular'
import { SPACES_BASE_ROUTE } from '@sync-in-server/backend/src/applications/spaces/constants/routes'
@@ -52,6 +53,7 @@ export const SPACES_ICON = {
SHARED_WITH_OTHERS: LucideShare2,
ANCHORED: LucideAnchor,
LINKS: LucideLink,
+ SELECTION: LucideSquareCheckBig,
TRASH: LucideTrash2,
EXTERNAL: LucideFileInput
} as const
diff --git a/frontend/src/app/applications/sync/components/sync-clients.component.html b/frontend/src/app/applications/sync/components/sync-clients.component.html
index 11bd106d..c922d06b 100644
--- a/frontend/src/app/applications/sync/components/sync-clients.component.html
+++ b/frontend/src/app/applications/sync/components/sync-clients.component.html
@@ -1,10 +1,4 @@
<div class="app-top-menu">
- <button (click)="loadClients()"
- [tooltip]="'Refresh' | translate:locale.language"
- class="d-none d-sm-block btn btn-default me-1"
- type="button">
- <svg [lucideIcon]="icons.LucideRotateCw"></svg>
- </button>
<button (click)="onDeleteClient()"
[disabled]="!selected"
[tooltip]="'Remove' | translate:locale.language"
@@ -12,6 +6,14 @@
type="button">
<svg [lucideIcon]="icons.LucideTrash2"></svg>
</button>
+ <div class="d-flex align-items-center ms-auto">
+ <button (click)="loadClients()"
+ [tooltip]="'Refresh' | translate:locale.language"
+ class="d-none d-sm-flex align-items-center justify-content-center btn btn-default"
+ type="button">
+ <svg [lucideIcon]="icons.LucideRotateCw"></svg>
+ </button>
+ </div>
</div>
<div class="app-sync-clients" appAutoResize>
@for (client of clients; track client.id) {
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 011fbf7c..f93ab88b 100644
--- a/frontend/src/app/applications/sync/components/sync-paths.component.html
+++ b/frontend/src/app/applications/sync/components/sync-paths.component.html
@@ -1,9 +1,4 @@
<div class="app-top-menu">
- <button (click)="onRefresh()"
- [tooltip]="'Refresh' | translate:locale.language"
- class="d-none d-sm-block btn btn-default me-1" type="button">
- <svg [lucideIcon]="icons.LucideRotateCw"></svg>
- </button>
<button (click)="addToSync()"
[tooltip]="'Add' | translate:locale.language"
class="btn btn-default me-1" type="button">
@@ -135,7 +130,14 @@
</div>
</div>
<!--Start Filter Button-->
- <app-input-filter class="d-none d-sm-block ms-auto"></app-input-filter>
+ <div class="d-flex align-items-center ms-auto">
+ <app-input-filter class="d-none d-sm-block me-1"></app-input-filter>
+ <button (click)="onRefresh()"
+ [tooltip]="'Refresh' | translate:locale.language"
+ class="d-none d-sm-block btn btn-default" type="button">
+ <svg [lucideIcon]="icons.LucideRotateCw"></svg>
+ </button>
+ </div>
<!--End Filter Button-->
</div>
<table class="app-table">
diff --git a/frontend/src/app/applications/sync/components/sync-transfers.component.html b/frontend/src/app/applications/sync/components/sync-transfers.component.html
index 7ba27acb..3c37a9d6 100644
--- a/frontend/src/app/applications/sync/components/sync-transfers.component.html
+++ b/frontend/src/app/applications/sync/components/sync-transfers.component.html
@@ -16,7 +16,10 @@
<option l10nTranslate value="ERROR">Error</option>
</select>
</div>
- <div class="d-flex ms-auto">
+ <div class="d-flex align-items-center ms-auto">
+ <!--Start Filter Button-->
+ <app-input-filter class="d-none d-sm-block me-1"></app-input-filter>
+ <!--End Filter Button-->
<button (click)="refresh()"
[tooltip]="'Refresh' | translate:locale.language"
@@ -27,13 +30,10 @@
<button (click)="openClearDialog()"
[tooltip]="'Clear events' | translate:locale.language"
placement="bottom"
- class="btn btn-default me-1"
+ class="btn btn-default"
type="button">
<svg [lucideIcon]="icons.LucideTrash2"></svg>
</button>
- <!--Start Filter Button-->
- <app-input-filter class="d-none d-sm-block"></app-input-filter>
- <!--End Filter Button-->
</div>
</div>
<table class="app-table">
diff --git a/frontend/src/app/applications/users/components/user-groups.component.html b/frontend/src/app/applications/users/components/user-groups.component.html
index 8f8d9ac6..71ff561a 100644
--- a/frontend/src/app/applications/users/components/user-groups.component.html
+++ b/frontend/src/app/applications/users/components/user-groups.component.html
@@ -1,11 +1,5 @@
<!--Start Top Menu-->
<div class="app-top-menu">
- <button (click)="refresh()"
- class="btn btn-default me-1"
- [tooltip]="'Refresh' | translate:locale.language"
- type="button">
- <svg [lucideIcon]="icons.LucideRotateCw" [class.icon-spin]="loading"></svg>
- </button>
<button (click)="openDialog(true)"
[disabled]="!allowedAction.addGroup && !allowedAction.addUsers"
class="btn btn-default me-1"
@@ -50,7 +44,17 @@
</div>
}
<!--Start Filter Button-->
- <app-input-filter class="d-none d-sm-block ms-auto"></app-input-filter>
+ <div class="d-flex align-items-center ms-auto">
+ <div class="btn-group me-1">
+ <app-input-filter class="d-none d-sm-block"></app-input-filter>
+ </div>
+ <button (click)="refresh()"
+ class="btn btn-default"
+ [tooltip]="'Refresh' | translate:locale.language"
+ type="button">
+ <svg [lucideIcon]="icons.LucideRotateCw" [class.icon-spin]="loading"></svg>
+ </button>
+ </div>
<!--End Filter Button-->
</div>
<!--End Top Menu-->
diff --git a/frontend/src/app/applications/users/components/user-guests.component.html b/frontend/src/app/applications/users/components/user-guests.component.html
index e56dfd07..3945f19d 100644
--- a/frontend/src/app/applications/users/components/user-guests.component.html
+++ b/frontend/src/app/applications/users/components/user-guests.component.html
@@ -1,11 +1,5 @@
<!--Start Top Menu-->
<div class="app-top-menu">
- <button (click)="loadGuests()"
- class="btn btn-default me-1"
- [tooltip]="'Refresh' | translate:locale.language"
- type="button">
- <svg [lucideIcon]="icons.LucideRotateCw" [class.icon-spin]="loading"></svg>
- </button>
<button (click)="openGuestDialog(true)"
[disabled]="!canCreateGuest"
class="btn btn-default me-1"
@@ -21,7 +15,17 @@
<svg [lucideIcon]="icons.LucidePencil"></svg>
</button>
<!--Start Filter Button-->
- <app-input-filter class="d-none d-sm-block ms-auto"></app-input-filter>
+ <div class="d-flex align-items-center ms-auto">
+ <div class="btn-group me-1">
+ <app-input-filter class="d-none d-sm-block"></app-input-filter>
+ </div>
+ <button (click)="loadGuests()"
+ class="btn btn-default"
+ [tooltip]="'Refresh' | translate:locale.language"
+ type="button">
+ <svg [lucideIcon]="icons.LucideRotateCw" [class.icon-spin]="loading"></svg>
+ </button>
+ </div>
<!--End Filter Button-->
</div>
<!--End Top Menu-->
diff --git a/frontend/src/app/common/components/navigation-view/navigation-view.component.ts b/frontend/src/app/common/components/navigation-view/navigation-view.component.ts
index a8cb63ea..aee1286f 100644
--- a/frontend/src/app/common/components/navigation-view/navigation-view.component.ts
+++ b/frontend/src/app/common/components/navigation-view/navigation-view.component.ts
@@ -11,6 +11,7 @@ export interface ViewMode {
enabled: boolean
dimensions?: number
maxBadges?: number
+ badgeSize?: number
image?: number
imageRes?: number
iconSize?: number
@@ -28,13 +29,14 @@ const GALLERY_VIEW_OPTIONS = [
const VIEW_MODES: Record<string, ViewMode> = {
tl: { enabled: false },
- th: { enabled: true, maxBadges: 0, dimensions: 96, image: 56, imageRes: 128, iconSize: 30, textSize: 12, margins: 18 },
- thM: { enabled: true, maxBadges: 1, dimensions: 112, image: 72, imageRes: 192, iconSize: 34, textSize: 12, margins: 18 },
- thL: { enabled: true, maxBadges: 2, dimensions: 152, image: 112, imageRes: 256, iconSize: 50, textSize: 13, margins: 18 },
- thXl: { enabled: true, maxBadges: 6, dimensions: 192, image: 152, imageRes: 512, iconSize: 65, textSize: 13, margins: 18 },
+ th: { enabled: true, maxBadges: 0, badgeSize: 10, dimensions: 96, image: 56, imageRes: 128, iconSize: 30, textSize: 12, margins: 18 },
+ thM: { enabled: true, maxBadges: 1, badgeSize: 11, dimensions: 112, image: 72, imageRes: 192, iconSize: 34, textSize: 12, margins: 18 },
+ thL: { enabled: true, maxBadges: 2, badgeSize: 12, dimensions: 152, image: 112, imageRes: 256, iconSize: 50, textSize: 13, margins: 18 },
+ thXl: { enabled: true, maxBadges: 6, badgeSize: 13, dimensions: 192, image: 152, imageRes: 512, iconSize: 65, textSize: 13, margins: 18 },
thXxl: {
enabled: true,
maxBadges: 6,
+ badgeSize: 14,
dimensions: 232,
image: 192,
imageRes: 1024,
diff --git a/frontend/src/i18n/de.json b/frontend/src/i18n/de.json
index 6e696371..98bec14c 100644
--- a/frontend/src/i18n/de.json
+++ b/frontend/src/i18n/de.json
@@ -355,6 +355,7 @@
"This name is already used": "Dieser Name wird bereits verwendet",
"Info": "Info",
"Selection": "Auswahl",
+ "View selection": "Auswahl anzeigen",
"Size": "Größe",
"Modified": "Geändert",
"modified": "geändert",
diff --git a/frontend/src/i18n/es.json b/frontend/src/i18n/es.json
index 0b3a8606..912f8725 100644
--- a/frontend/src/i18n/es.json
+++ b/frontend/src/i18n/es.json
@@ -355,6 +355,7 @@
"This name is already used": "Este nombre ya está utilizado",
"Info": "Info",
"Selection": "Selección",
+ "View selection": "Ver selección",
"Size": "Tamaño",
"Modified": "Modificado",
"modified": "modificado",
diff --git a/frontend/src/i18n/fr.json b/frontend/src/i18n/fr.json
index 74daa9eb..32346711 100644
--- a/frontend/src/i18n/fr.json
+++ b/frontend/src/i18n/fr.json
@@ -355,6 +355,7 @@
"This name is already used": "Ce nom est déjà utilisé",
"Info": "Info",
"Selection": "Sélection",
+ "View selection": "Voir la sélection",
"Size": "Taille",
"Modified": "Modifié",
"modified": "modifié",
diff --git a/frontend/src/i18n/hi.json b/frontend/src/i18n/hi.json
index d52bb6fa..bbbb65d3 100644
--- a/frontend/src/i18n/hi.json
+++ b/frontend/src/i18n/hi.json
@@ -355,6 +355,7 @@
"This name is already used": "यह नाम पहले से उपयोग में है",
"Info": "जानकारी",
"Selection": "चयन",
+ "View selection": "चयन देखें",
"Size": "आकार",
"Modified": "संशोधित",
"modified": "संशोधित",
diff --git a/frontend/src/i18n/it.json b/frontend/src/i18n/it.json
index 70e4f594..de5394e5 100644
--- a/frontend/src/i18n/it.json
+++ b/frontend/src/i18n/it.json
@@ -355,6 +355,7 @@
"This name is already used": "Questo nome è già utilizzato",
"Info": "Info",
"Selection": "Selezione",
+ "View selection": "Visualizza selezione",
"Size": "Dimensione",
"Modified": "Modificato",
"modified": "modificato",
diff --git a/frontend/src/i18n/ja.json b/frontend/src/i18n/ja.json
index aa914969..11165142 100644
--- a/frontend/src/i18n/ja.json
+++ b/frontend/src/i18n/ja.json
@@ -355,6 +355,7 @@
"This name is already used": "この名前は既に使用されています",
"Info": "情報",
"Selection": "選択",
+ "View selection": "選択を表示",
"Size": "サイズ",
"Modified": "変更日時",
"modified": "変更済み",
diff --git a/frontend/src/i18n/ko.json b/frontend/src/i18n/ko.json
index 533a8d6f..748b624d 100644
--- a/frontend/src/i18n/ko.json
+++ b/frontend/src/i18n/ko.json
@@ -355,6 +355,7 @@
"This name is already used": "이 이름은 이미 사용 중입니다",
"Info": "정보",
"Selection": "선택",
+ "View selection": "선택 보기",
"Size": "크기",
"Modified": "수정됨",
"modified": "수정됨",
diff --git a/frontend/src/i18n/nl.json b/frontend/src/i18n/nl.json
index 0388c862..b78cf9f5 100644
--- a/frontend/src/i18n/nl.json
+++ b/frontend/src/i18n/nl.json
@@ -355,6 +355,7 @@
"This name is already used": "Deze naam is al in gebruik",
"Info": "Info",
"Selection": "Selectie",
+ "View selection": "Selectie bekijken",
"Size": "Grootte",
"Modified": "Gewijzigd",
"modified": "gewijzigd",
diff --git a/frontend/src/i18n/pl.json b/frontend/src/i18n/pl.json
index 19aaa4f3..e1622832 100644
--- a/frontend/src/i18n/pl.json
+++ b/frontend/src/i18n/pl.json
@@ -355,6 +355,7 @@
"This name is already used": "Ta nazwa jest już używana",
"Info": "Info",
"Selection": "Zaznaczenie",
+ "View selection": "Wyświetl zaznaczenie",
"Size": "Rozmiar",
"Modified": "Zmodyfikowano",
"modified": "zmodyfikowano",
diff --git a/frontend/src/i18n/pt-BR.json b/frontend/src/i18n/pt-BR.json
index ff888827..61556d82 100644
--- a/frontend/src/i18n/pt-BR.json
+++ b/frontend/src/i18n/pt-BR.json
@@ -355,6 +355,7 @@
"This name is already used": "Este nome já está em uso",
"Info": "Info",
"Selection": "Seleção",
+ "View selection": "Ver seleção",
"Size": "Tamanho",
"Modified": "Modificado",
"modified": "modificado",
diff --git a/frontend/src/i18n/pt.json b/frontend/src/i18n/pt.json
index 0b62c65d..bf59d1b5 100644
--- a/frontend/src/i18n/pt.json
+++ b/frontend/src/i18n/pt.json
@@ -355,6 +355,7 @@
"This name is already used": "Este nome já está em uso",
"Info": "Info",
"Selection": "Seleção",
+ "View selection": "Ver seleção",
"Size": "Tamanho",
"Modified": "Modificado",
"modified": "modificado",
diff --git a/frontend/src/i18n/ru.json b/frontend/src/i18n/ru.json
index c0bb3f92..e7875d1c 100644
--- a/frontend/src/i18n/ru.json
+++ b/frontend/src/i18n/ru.json
@@ -355,6 +355,7 @@
"This name is already used": "Это имя уже используется",
"Info": "Инфо",
"Selection": "Выбор",
+ "View selection": "Просмотреть выбор",
"Size": "Размер",
"Modified": "Изменено",
"modified": "изменено",
diff --git a/frontend/src/i18n/tr.json b/frontend/src/i18n/tr.json
index 88adabb3..48783c9f 100644
--- a/frontend/src/i18n/tr.json
+++ b/frontend/src/i18n/tr.json
@@ -355,6 +355,7 @@
"This name is already used": "Bu ad zaten kullanılıyor",
"Info": "Bilgi",
"Selection": "Seçim",
+ "View selection": "Seçimi görüntüle",
"Size": "Boyut",
"Modified": "Değiştirildi",
"modified": "değiştirildi",
diff --git a/frontend/src/i18n/zh.json b/frontend/src/i18n/zh.json
index 201b6d9e..4840028c 100644
--- a/frontend/src/i18n/zh.json
+++ b/frontend/src/i18n/zh.json
@@ -355,6 +355,7 @@
"This name is already used": "该名称已被使用",
"Info": "信息",
"Selection": "选择",
+ "View selection": "查看选择",
"Size": "大小",
"Modified": "修改时间",
"modified": "已修改",
diff --git a/frontend/src/styles/components/_gallery.scss b/frontend/src/styles/components/_gallery.scss
index 421db6ce..3445d1a7 100644
--- a/frontend/src/styles/components/_gallery.scss
+++ b/frontend/src/styles/components/_gallery.scss
@@ -83,9 +83,15 @@
.badge {
display: inline-flex;
+ gap: .22em;
+ padding: .35em .6em;
+ font-size: var(--gallery-badge-size, var(--gallery-text-size));
+
+ .lucide {
+ font-size: 1.15em;
+ }
}
- .badge,
.card-footer,
.card-footer input {
font-size: var(--gallery-text-size);