Sync-in · Sovereign platform for file storage, sharing, synchronization, and collaboration.
TypeScript cloud-alternativecollaborationcollaborative-editingdropboxfile-serverfile-sharingfile-storagefile-syncfull-text-searchhomelabnextcloudon-premiseopen-sourceprivacy-firstprivate-cloudrealtimesecureself-hostedstorage-serverwebdav
refactor(frontend): harmonize toggle controls with view-switch component and update styling
johavende7cc72075ef
diff --git a/frontend/src/app/applications/admin/components/admin-groups.component.html b/frontend/src/app/applications/admin/components/admin-groups.component.htmlindex 24b43dcc..aa5d2e41 100644--- a/frontend/src/app/applications/admin/components/admin-groups.component.html+++ b/frontend/src/app/applications/admin/components/admin-groups.component.html@@ -36,16 +36,28 @@<svg [lucideIcon]="icons.LucidePencil"></svg></button><div class="d-flex align-items-center ms-auto">- <button btnCheckbox- [ngModel]="personalGroupsView"- (ngModelChange)="onPersonalGroupsView($event)"- type="button"- class="btn btn-custom me-1">- <div class="d-flex align-items-center">- <svg [lucideIcon]="personalGroupsView ? icons.LucideToggleRight : icons.LucideToggleLeft" class="me-2"></svg>- <span l10nTranslate>Personal groups</span>- </div>- </button>+ <div class="view-switch me-1" role="group" aria-label="Select group type">+ <button+ type="button"+ class="view-switch__option"+ [class.active]="!personalGroupsView"+ [attr.aria-pressed]="!personalGroupsView"+ (click)="onPersonalGroupsView(false)"+ l10nTranslate+ >+ Groups+ </button>+ <button+ type="button"+ class="view-switch__option"+ [class.active]="personalGroupsView"+ [attr.aria-pressed]="personalGroupsView"+ (click)="onPersonalGroupsView(true)"+ l10nTranslate+ >+ Personal groups+ </button>+ </div><!--Start Filter Button--><div class="btn-group me-1"><app-input-filter class="d-none d-sm-block"></app-input-filter>diff --git a/frontend/src/app/applications/admin/components/admin-groups.component.ts b/frontend/src/app/applications/admin/components/admin-groups.component.tsindex 28808229..cc9a6779 100644--- a/frontend/src/app/applications/admin/components/admin-groups.component.ts+++ b/frontend/src/app/applications/admin/components/admin-groups.component.ts@@ -1,7 +1,6 @@import { KeyValuePipe } from '@angular/common'import { HttpErrorResponse } from '@angular/common/http'import { Component, ElementRef, inject, ViewChild } from '@angular/core'-import { FormsModule } from '@angular/forms'import { ActivatedRoute, Data, Router, UrlSegment } from '@angular/router'import {LucideArrowDown,@@ -12,8 +11,6 @@ import {LucidePencil,LucidePlus,LucideRotateCw,- LucideToggleLeft,- LucideToggleRight,LucideUserMinus,LucideUserRoundPlus} from '@lucide/angular'@@ -22,7 +19,6 @@ import { GROUP_TYPE } from '@sync-in-server/backend/src/applications/users/constimport { MEMBER_TYPE } from '@sync-in-server/backend/src/applications/users/constants/member'import { USER_GROUP_ROLE } from '@sync-in-server/backend/src/applications/users/constants/user'import { L10N_LOCALE, L10nLocale, L10nTranslateDirective, L10nTranslatePipe } from 'angular-l10n'-import { ButtonCheckboxDirective } from 'ngx-bootstrap/buttons'import { BsDropdownDirective, BsDropdownMenuDirective, BsDropdownToggleDirective } from 'ngx-bootstrap/dropdown'import { BsModalRef } from 'ngx-bootstrap/modal'import { TooltipDirective } from 'ngx-bootstrap/tooltip'@@ -65,8 +61,6 @@ import { AdminGroupEditUserDialogComponent } from './dialogs/admin-group-edit-usBsDropdownDirective,BsDropdownToggleDirective,BsDropdownMenuDirective,- ButtonCheckboxDirective,- FormsModule,TapDirective,BadgeMembersComponent],@@ -93,9 +87,7 @@ export class AdminGroupsComponent {LucideArrowUp,LucideKeyRound,LucideUserRoundPlus,- LucideUserMinus,- LucideToggleRight,- LucideToggleLeft+ LucideUserMinus}// Sortprotected tableHeaders: Record<'name' | 'type' | 'members' | 'createdAndModified', TableHeaderConfig> = {diff --git a/frontend/src/app/applications/admin/components/admin-users.component.html b/frontend/src/app/applications/admin/components/admin-users.component.htmlindex a3fd1638..7f1656be 100644--- a/frontend/src/app/applications/admin/components/admin-users.component.html+++ b/frontend/src/app/applications/admin/components/admin-users.component.html@@ -21,17 +21,31 @@<svg [lucideIcon]="icons.LucideVenetianMask"></svg></button><div class="d-flex align-items-center ms-auto">+ <!--Start View Switch-->+ <div class="view-switch me-1" role="group" aria-label="Select user type">+ <button+ type="button"+ class="view-switch__option"+ [class.active]="!guestsView"+ [attr.aria-pressed]="!guestsView"+ (click)="onGuestsView(false)"+ l10nTranslate+ >+ Users+ </button>+ <button+ type="button"+ class="view-switch__option"+ [class.active]="guestsView"+ [attr.aria-pressed]="guestsView"+ (click)="onGuestsView(true)"+ l10nTranslate+ >+ Guests+ </button>+ </div>+ <!--End View Switch--><!--Start Filter Button-->- <button btnCheckbox- [ngModel]="guestsView"- (ngModelChange)="onGuestsView($event)"- type="button"- class="btn btn-custom me-1">- <div class="d-flex align-items-center">- <svg [lucideIcon]="guestsView ? icons.LucideToggleRight : icons.LucideToggleLeft" class="me-2"></svg>- <span l10nTranslate>Guests</span>- </div>- </button><div class="btn-group me-1"><app-input-filter class="d-none d-sm-block"></app-input-filter></div>diff --git a/frontend/src/app/applications/admin/components/admin-users.component.ts b/frontend/src/app/applications/admin/components/admin-users.component.tsindex cb0efbce..4a5c9d51 100644--- a/frontend/src/app/applications/admin/components/admin-users.component.ts+++ b/frontend/src/app/applications/admin/components/admin-users.component.ts@@ -1,7 +1,6 @@import { KeyValuePipe } from '@angular/common'import { HttpErrorResponse } from '@angular/common/http'import { Component, ElementRef, inject, ViewChild } from '@angular/core'-import { FormsModule } from '@angular/forms'import { ActivatedRoute, Data, Router } from '@angular/router'import {LucideArrowDown,@@ -9,8 +8,6 @@ import {LucideDynamicIcon,LucideKeyRound,LucideRotateCw,- LucideToggleLeft,- LucideToggleRight,LucideUserRoundPen,LucideUserRoundPlus,LucideVenetianMask@@ -19,7 +16,6 @@ import { ContextMenuComponent, ContextMenuModule } from '@perfectmemory/ngx-contimport { USER_ROLE } from '@sync-in-server/backend/src/applications/users/constants/user'import type { LoginResponseDto } from '@sync-in-server/backend/src/authentication/dto/login-response.dto'import { L10N_LOCALE, L10nLocale, L10nTranslateDirective, L10nTranslatePipe } from 'angular-l10n'-import { ButtonCheckboxDirective } from 'ngx-bootstrap/buttons'import { BsModalRef } from 'ngx-bootstrap/modal'import { TooltipDirective } from 'ngx-bootstrap/tooltip'import { take } from 'rxjs/operators'@@ -57,8 +53,6 @@ import { ToBytesPipe } from '../../../common/pipes/to-bytes.pipe'StorageUsageComponent,TimeDateFormatPipe,ContextMenuModule,- ButtonCheckboxDirective,- FormsModule,UserAvatarStackComponent,TapDirective,ToBytesPipe@@ -83,9 +77,7 @@ export class AdminUsersComponent {LucideArrowDown,LucideArrowUp,LucideKeyRound,- LucideVenetianMask,- LucideToggleRight,- LucideToggleLeft+ LucideVenetianMask}// Sortprotected tableHeaders: Record<'login' | 'fullName' | 'managers' | 'storage' | 'currentAccess' | 'currentIp' | 'isActive', TableHeaderConfig> = {diff --git a/frontend/src/app/applications/admin/components/dialogs/admin-user-dialog.component.html b/frontend/src/app/applications/admin/components/dialogs/admin-user-dialog.component.htmlindex 678967e2..ed6a4d5a 100644--- a/frontend/src/app/applications/admin/components/dialogs/admin-user-dialog.component.html+++ b/frontend/src/app/applications/admin/components/dialogs/admin-user-dialog.component.html@@ -207,11 +207,13 @@<div class="card-body d-flex flex-column gap-2"><label for="" class="form-label mb-1" l10nTranslate>Account status</label><div class="card dialog-check-card dialog-check-card--interactive"- [class.dialog-check-card--active]="userForm.value.isActive">+ [class.dialog-check-card--active]="userForm.value.isActive"+ (click)="toggleAccountSetting('isActive')"><div class="card-body p-2"><div class="d-flex align-items-center form-check form-switch cursor-pointer mb-0">- <input class="form-check-input" formControlName="isActive" id="isActive" type="checkbox">- <label class="form-label form-check-label mb-0 ms-2" for="isActive" [class.text-danger]="!userForm.value.isActive">+ <input class="form-check-input" formControlName="isActive" id="isActive" type="checkbox" (click)="$event.stopPropagation()">+ <label class="form-label form-check-label mb-0 ms-2" for="isActive" [class.text-danger]="!userForm.value.isActive"+ (click)="$event.stopPropagation()">{{ (userForm.value.isActive ? 'active' : 'suspended') | translate:locale.language | titlecase }}</label></div>@@ -219,11 +221,12 @@</div><div class="card dialog-check-card dialog-check-card--interactive"- [class.dialog-check-card--active]="userForm.value.isAdmin">+ [class.dialog-check-card--active]="userForm.value.isAdmin"+ (click)="toggleAccountSetting('isAdmin')"><div class="card-body p-2"><div class="d-flex align-items-center form-check form-switch cursor-pointer mb-0">- <input class="form-check-input" formControlName="isAdmin" id="isAdmin" type="checkbox">- <label class="form-label form-check-label mb-0 ms-2" for="isAdmin" l10nTranslate>Administrator</label>+ <input class="form-check-input" formControlName="isAdmin" id="isAdmin" type="checkbox" (click)="$event.stopPropagation()">+ <label class="form-label form-check-label mb-0 ms-2" for="isAdmin" (click)="$event.stopPropagation()" l10nTranslate>Administrator</label></div></div></div>diff --git a/frontend/src/app/applications/admin/components/dialogs/admin-user-dialog.component.ts b/frontend/src/app/applications/admin/components/dialogs/admin-user-dialog.component.tsindex b9ea0d1e..10812bee 100644--- a/frontend/src/app/applications/admin/components/dialogs/admin-user-dialog.component.ts+++ b/frontend/src/app/applications/admin/components/dialogs/admin-user-dialog.component.ts@@ -164,6 +164,12 @@ export class AdminUserDialogComponent implements OnInit {this.user.storageQuota = quota}+ toggleAccountSetting(controlName: 'isActive' | 'isAdmin') {+ const control = this.userForm.controls[controlName]+ control.setValue(!control.value)+ control.markAsDirty()+ }+onCancel() {if (this.confirmDeletion) {this.confirmDeletion = falsediff --git a/frontend/src/app/applications/recents/components/recents.component.html b/frontend/src/app/applications/recents/components/recents.component.htmlindex 911facb5..7d7d64db 100644--- a/frontend/src/app/applications/recents/components/recents.component.html+++ b/frontend/src/app/applications/recents/components/recents.component.html@@ -1,9 +1,9 @@<div appAutoResize [useMaxHeight]="false" [resizeOffset]="40"><div class="recents-timeline" [class.recents-timeline--with-content]="groups().length > 0">- <div class="recents-timeline__filters" role="group" aria-label="Filter recents">+ <div class="view-switch" role="group" aria-label="Filter recents"><buttontype="button"- class="recents-filter"+ class="view-switch__option"[class.active]="activeFilter() === 'all'"[attr.aria-pressed]="activeFilter() === 'all'"(click)="activeFilter.set('all')"@@ -13,7 +13,7 @@</button><buttontype="button"- class="recents-filter"+ class="view-switch__option"[class.active]="activeFilter() === 'file'"[attr.aria-pressed]="activeFilter() === 'file'"(click)="activeFilter.set('file')"@@ -23,7 +23,7 @@</button><buttontype="button"- class="recents-filter"+ class="view-switch__option"[class.active]="activeFilter() === 'comment'"[attr.aria-pressed]="activeFilter() === 'comment'"(click)="activeFilter.set('comment')"diff --git a/frontend/src/app/applications/sync/components/sync-clients.component.html b/frontend/src/app/applications/sync/components/sync-clients.component.htmlindex c922d06b..e3d52c62 100644--- a/frontend/src/app/applications/sync/components/sync-clients.component.html+++ b/frontend/src/app/applications/sync/components/sync-clients.component.html@@ -74,7 +74,6 @@<div class="sync-client-paths"><div class="sync-client-paths-header"><span l10nTranslate>Synchronizations</span>- <span class="badge sync-client-paths-count">{{ client.paths.length }}</span></div>@if (client.paths.length) {@for (path of client.paths; track path.id) {diff --git a/frontend/src/app/applications/sync/components/sync-clients.component.scss b/frontend/src/app/applications/sync/components/sync-clients.component.scssindex 5f5b17be..d6f49804 100644--- a/frontend/src/app/applications/sync/components/sync-clients.component.scss+++ b/frontend/src/app/applications/sync/components/sync-clients.component.scss@@ -11,11 +11,11 @@ $sync-client-card-radius: 0.9rem;--sync-client-details-border: transparent;--sync-client-details-bg: transparent;--sync-client-subtle-color: inherit;- --sync-client-paths-count-fg: inherit;- --sync-client-paths-count-bg: transparent;--sync-client-path-empty-border: transparent;--sync-client-path-empty-bg: transparent;--sync-path-actions-separator: transparent;+ --sync-path-border: transparent;+ --sync-path-hover-border: transparent;--sync-path-hover-bg: transparent;font-size: calc(var(--font-size-base) * 0.832);@@ -74,7 +74,7 @@ $sync-client-card-radius: 0.9rem;}.sync-client-subtitle {- font-size: var(--font-size-sm);+ font-size: var(--font-size-xs);text-transform: uppercase;letter-spacing: 0.08em;}@@ -125,28 +125,22 @@ $sync-client-card-radius: 0.9rem;justify-content: space-between;text-transform: uppercase;letter-spacing: 0.08em;- font-size: var(--font-size-sm);+ font-size: var(--font-size-xs);font-weight: 600;padding: 0 0.15rem;}- .sync-client-paths-count {- min-width: 1.2rem;- line-height: 1.15;- font-size: var(--font-size-sm);- font-weight: 600;- color: var(--sync-client-paths-count-fg);- background: var(--sync-client-paths-count-bg);- }-.sync-path-card {cursor: default;margin: 0;+ border-color: var(--sync-path-border);border-radius: 0.7rem;}.sync-path-card.dialog-check-card--interactive:hover {background: var(--sync-path-hover-bg);+ border-color: var(--sync-path-hover-border);+ box-shadow: 0 2px 5px rgb(0 0 0 / 8%);}.sync-path-image {@@ -276,3 +270,13 @@ $sync-client-card-radius: 0.9rem;}}}++:host-context(body.theme-light) .app-sync-clients {+ --sync-path-border: #b6c9df;+ --sync-path-hover-border: rgb(52 94 146 / 48%);+}++:host-context(body.theme-dark) .app-sync-clients {+ --sync-path-border: #455b65;+ --sync-path-hover-border: rgb(146 173 204 / 40%);+}diff --git a/frontend/src/app/common/components/virtual-scroll.component.ts b/frontend/src/app/common/components/virtual-scroll.component.tsindex 3cecc4c0..62244e9b 100644--- a/frontend/src/app/common/components/virtual-scroll.component.ts+++ b/frontend/src/app/common/components/virtual-scroll.component.ts@@ -56,7 +56,7 @@ export class VirtualScrollComponent<T> implements OnInit, OnChanges, OnDestroy {@Input() resizeOffset = 134@Input() galleryMode = false@Input() items: T[] = []- @Input() childHeight = 36+ @Input() childHeight = 37@Input() childWidth: number@Input() bufferAmount = 0protected viewPortItems: T[] = []diff --git a/frontend/src/styles/components/_app.scss b/frontend/src/styles/components/_app.scssindex 7cede8f3..8564a53e 100755--- a/frontend/src/styles/components/_app.scss+++ b/frontend/src/styles/components/_app.scss@@ -142,7 +142,7 @@.app-table {--app-table-cell-inline-padding: .5rem;--app-table-leading-icon-gap: .3rem;- --app-table-row-height: 36px;+ --app-table-row-height: 37px;@extend .table;@include no-select-utility;diff --git a/frontend/src/styles/components/_forms.scss b/frontend/src/styles/components/_forms.scssindex 14cd7718..03897c58 100644--- a/frontend/src/styles/components/_forms.scss+++ b/frontend/src/styles/components/_forms.scss@@ -21,16 +21,6 @@}}-.form-validation {- .ng-valid:not(.form-check-input), .ng-valid[required], .ng-valid.required {- border-left: 5px solid $primary;- }-- .ng-invalid:not(form) {- border-left: 5px solid $red !important;- }-}-.form-check-label {font-weight: inherit;cursor: pointer !important;diff --git a/frontend/src/styles/components/_recents.scss b/frontend/src/styles/components/_recents.scssindex f19759be..8917c8ef 100644--- a/frontend/src/styles/components/_recents.scss+++ b/frontend/src/styles/components/_recents.scss@@ -12,23 +12,23 @@$card-shadow,$card-hover-shadow) {- app-recents {- .recents-timeline__filters {- border-color: $border;- background: $surface-muted;- }+ .view-switch {+ border-color: $border;+ background: $surface-muted;+ }- .recents-filter {- color: $muted;+ .view-switch__option {+ color: $muted;- &:hover,- &:focus-visible,- &.active {- color: $text;- background: $primary-soft;- }+ &:hover,+ &:focus-visible,+ &.active {+ color: $text;+ background: $primary-soft;}+ }+ app-recents {.recents-day__date,.recents-day__range,.recent-card__time,@@ -75,7 +75,7 @@ app-recents {.recents-timeline--with-content {position: relative;- > .recents-timeline__filters {+ > .view-switch {position: absolute;top: 0.55rem;right: 0.7rem;@@ -87,37 +87,6 @@ app-recents {}}- .recents-timeline__filters {- width: fit-content;- height: 1.9rem;- margin: 0 0 0 auto;- padding: 0.15rem;- display: flex;- align-items: center;- gap: 0.3rem;- border: 1px solid;- border-radius: $nav-pills-border-radius;- }-- .recents-filter {- min-width: 4.2rem;- height: 1.5rem;- padding: 0 0.68rem;- border: 0;- border-radius: $border-radius;- background: transparent;- font-size: $font-size-xs;- font-weight: 500;- line-height: 1;- cursor: pointer;- transition: color 0.15s ease, background-color 0.15s ease;-- &:focus-visible {- outline: 2px solid rgba($primary, 0.4);- outline-offset: 1px;- }- }-.recents-days {display: flex;flex-direction: column;@@ -164,7 +133,7 @@ app-recents {display: flex;flex-direction: column;border: 1px solid;- border-radius: $nav-tabs-border-radius;+ border-radius: $nav-pills-border-radius;text-align: left;appearance: none;cursor: pointer;@@ -283,7 +252,7 @@ app-recents {place-content: center;gap: 2rem;border: 1px dashed;- border-radius: $nav-tabs-border-radius;+ border-radius: $nav-pills-border-radius;text-align: center;margin-top: 1.125rem;@@ -306,12 +275,12 @@ app-recents {padding-left: 0.35rem;}- .recents-timeline__filters {+ .view-switch {width: 100%;}.recents-timeline--with-content {- > .recents-timeline__filters {+ > .view-switch {position: static;}@@ -321,7 +290,7 @@ app-recents {}}- .recents-filter {+ .view-switch__option {min-width: 0;flex: 1;}@@ -332,6 +301,37 @@ app-recents {}}+.view-switch {+ width: fit-content;+ height: 1.9rem;+ margin: 0 0 0 auto;+ padding: 0.15rem;+ display: flex;+ align-items: center;+ gap: 0.3rem;+ border: 1px solid;+ border-radius: $border-radius;+}++.view-switch__option {+ min-width: 4.2rem;+ height: 1.5rem;+ padding: 0 0.68rem;+ border: 0;+ border-radius: $border-radius - 0.1rem;+ background: transparent;+ font-size: $font-size-xs;+ font-weight: 500;+ line-height: 1;+ cursor: pointer;+ transition: color 0.15s ease, background-color 0.15s ease;++ &:focus-visible {+ outline: 2px solid rgba($primary, 0.4);+ outline-offset: 1px;+ }+}+@keyframes recent-card-enter {from {opacity: 0;diff --git a/frontend/src/styles/variables.scss b/frontend/src/styles/variables.scssindex 3f86675f..40449b0d 100644--- a/frontend/src/styles/variables.scss+++ b/frontend/src/styles/variables.scss@@ -103,8 +103,8 @@ $hr-color: $secondary;// --------------------------------------------------------$spacer: 0.6rem;-$border-radius-base: .375rem !default;-$border-radius: .375rem !default;+$border-radius-base: .4rem !default;+$border-radius: .4rem !default;// --------------------------------------------------------// Links@@ -176,7 +176,7 @@ $dropdown-link-color: #444;$dropdown-link-active-color: $dropdown-link-color;$dropdown-link-hover-bg: $table-bg-hover !important;$dropdown-link-active-bg: $dropdown-link-hover-bg;-$dropdown-item-padding-y: .35rem;+$dropdown-item-padding-y: .4rem;$dropdown-item-padding-x: .4rem;$dropdown-padding-y: .375rem;$dropdown-divider-margin-y: .25rem;