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
chore(frontend): enhance notification UI and apply various improvements
johaven5d830adb6714
diff --git a/frontend/src/app/app.config.ts b/frontend/src/app/app.config.tsindex 2985e443..0263c6f7 100644--- a/frontend/src/app/app.config.ts+++ b/frontend/src/app/app.config.ts@@ -30,7 +30,7 @@ export const appConfig: ApplicationConfig = {provideL10nIntl(),provideAnimations(),provideToastr({- positionClass: 'toast-top-right',+ positionClass: 'toast-top-center',preventDuplicates: false,maxOpened: 6,autoDismiss: true,diff --git a/frontend/src/app/applications/admin/components/admin-groups.component.html b/frontend/src/app/applications/admin/components/admin-groups.component.htmlindex f398de97..4ad7694d 100644--- a/frontend/src/app/applications/admin/components/admin-groups.component.html+++ b/frontend/src/app/applications/admin/components/admin-groups.component.html@@ -133,12 +133,12 @@}}@case ('createdAndModified') {- <div class="d-flex flex-column {{th.value.newly && m[th.value.newly] ? 'badge prop-newly-' + m[th.value.newly] : ''}}">- <div>{{ m.createdAt | amDateFormat }}</div>+ <span class="d-flex flex-column {{th.value.newly && m[th.value.newly] ? 'badge prop-newly-' + m[th.value.newly] : ''}}">+ <span>{{ m.createdAt | amDateFormat }}</span>@if (m.modifiedAt) {- <div>{{ m.modifiedAt | amDateFormat }}</div>+ <span>{{ m.modifiedAt | amDateFormat }}</span>}- </div>+ </span>}}</td>diff --git a/frontend/src/app/applications/admin/components/admin-users.component.html b/frontend/src/app/applications/admin/components/admin-users.component.htmlindex 2b4f0dbe..2d4b44e2 100644--- a/frontend/src/app/applications/admin/components/admin-users.component.html+++ b/frontend/src/app/applications/admin/components/admin-users.component.html@@ -139,19 +139,19 @@}@case ('currentAccess') {@if (u.currentAccess) {- <div class="d-flex justify-content-center {{th.value.newly && u[th.value.newly] ? 'badge prop-newly-' + u[th.value.newly] : ''}}"+ <span class="d-flex justify-content-center {{th.value.newly && u[th.value.newly] ? 'badge prop-newly-' + u[th.value.newly] : ''}}"(mouseover)="u.currentAccessHover = true"(focus)="u.currentAccessHover = true"(mouseleave)="u.currentAccessHover = false">@if (u.currentAccessHover) {- <div class="d-flex flex-column fs-4xs">- <div>{{ u.currentAccess | amDateFormat }}</div>- <div>{{ u.lastAccess | amDateFormat }}</div>- </div>+ <span class="d-flex flex-column fs-4xs">+ <span>{{ u.currentAccess | amDateFormat }}</span>+ <span>{{ u.lastAccess | amDateFormat }}</span>+ </span>} @else {- {{ u.hTimeAgo }}+ <span>{{ u.hTimeAgo }}</span>}- </div>+ </span>} @else {<span class="{{th.value.newly && u[th.value.newly] ? 'badge prop-newly-' + u[th.value.newly] : ''}}" l10nTranslate>never</span>}diff --git a/frontend/src/app/applications/notifications/notifications.service.ts b/frontend/src/app/applications/notifications/notifications.service.tsindex f1e60e62..229d57f8 100644--- a/frontend/src/app/applications/notifications/notifications.service.ts+++ b/frontend/src/app/applications/notifications/notifications.service.ts@@ -38,7 +38,7 @@ export class NotificationsService {if (checkLast && notifications.length) {const n = notifications[0]layoutNotification = this.layout.sendNotification(- 'info',+ 'warning',n.fromUser.fullName,this.layout.translateString(`${this.layout.translateString(n.content.event)}: <b>${n.content.element}</b>`),null,@@ -48,7 +48,7 @@ export class NotificationsService {const nbUnread = notifications.filter((n: NotificationModel) => !n.wasRead).lengthif (nbUnread) {layoutNotification = this.layout.sendNotification(- 'info',+ 'warning','Notifications',this.layout.translateString(nbUnread === 1 ? 'one_notification' : 'nb_notifications', { nb: nbUnread }))diff --git a/frontend/src/app/applications/sync/components/sync-transfers.component.html b/frontend/src/app/applications/sync/components/sync-transfers.component.htmlindex 3a70f6bb..f2d78e00 100644--- a/frontend/src/app/applications/sync/components/sync-transfers.component.html+++ b/frontend/src/app/applications/sync/components/sync-transfers.component.html@@ -96,11 +96,11 @@</div>}@case ('date') {- <div class="{{th.value.newly && t[th.value.newly] ? 'badge prop-newly-' + t[th.value.newly] : ''}}"+ <span class="{{th.value.newly && t[th.value.newly] ? 'badge prop-newly-' + t[th.value.newly] : ''}}"(mouseenter)="t.hovered = true"(mouseleave)="t.hovered = false"><span>{{ t.hovered ? t.timestamp : t.hTimeAgo }}</span>- </div>+ </span>}}</td>diff --git a/frontend/src/app/applications/users/components/user-account.component.html b/frontend/src/app/applications/users/components/user-account.component.htmlindex 52ecfdbf..d6c6e1d8 100755--- a/frontend/src/app/applications/users/components/user-account.component.html+++ b/frontend/src/app/applications/users/components/user-account.component.html@@ -42,7 +42,7 @@<div class="row g-2 align-items-center py-2 border-bottom border-secondary-subtle"><label for="" class="col-5 col-sm-4" l10nTranslate>IP Addresses</label><div class="col-7 col-sm-8 d-flex flex-wrap justify-content-end">- <span class="badge bg-success">{{ user.currentIp }}</span>+ <span class="badge bg-warning">{{ user.currentIp }}</span><span class="badge bg-secondary-alt ms-1">{{ user.lastIp }}</span></div></div>@@ -50,7 +50,7 @@<div class="row g-2 align-items-center py-2 border-bottom border-secondary-subtle"><label for="" class="col-5 col-sm-4" l10nTranslate>Connections</label><div class="col-7 col-sm-8 d-flex flex-wrap justify-content-end">- <span class="badge bg-success">{{ user.currentAccess | amDateFormat }}</span>+ <span class="badge bg-warning">{{ user.currentAccess | amDateFormat }}</span><span class="badge bg-secondary-alt ms-1">{{ user.lastAccess | amDateFormat }}</span></div></div>diff --git a/frontend/src/app/applications/users/components/user-guests.component.html b/frontend/src/app/applications/users/components/user-guests.component.htmlindex 0f28ef7f..9cab21ee 100644--- a/frontend/src/app/applications/users/components/user-guests.component.html+++ b/frontend/src/app/applications/users/components/user-guests.component.html@@ -104,19 +104,19 @@}@case ('currentAccess') {@if (u.currentAccess) {- <div class="d-flex justify-content-center {{th.value.newly && u[th.value.newly] ? 'badge prop-newly-' + u[th.value.newly] : ''}}"+ <span class="d-flex justify-content-center {{th.value.newly && u[th.value.newly] ? 'badge prop-newly-' + u[th.value.newly] : ''}}"(mouseover)="u.currentAccessHover = true"(focus)="u.currentAccessHover = true"(mouseleave)="u.currentAccessHover = false">@if (u.currentAccessHover) {- <div class="d-flex flex-column">- <div>{{ u.currentAccess | amDateFormat }}</div>- <div>{{ u.lastAccess | amDateFormat }}</div>- </div>+ <span class="d-flex flex-column">+ <span>{{ u.currentAccess | amDateFormat }}</span>+ <span>{{ u.lastAccess | amDateFormat }}</span>+ </span>} @else {- {{ u.hTimeAgo }}+ <span>{{ u.hTimeAgo }}</span>}- </div>+ </span>} @else {<span class="{{th.value.newly && u[th.value.newly] ? 'badge prop-newly-' + u[th.value.newly] : ''}}" l10nTranslate>never</span>}diff --git a/frontend/src/app/common/components/badge-permissions.component.ts b/frontend/src/app/common/components/badge-permissions.component.tsindex b7b72386..af554932 100644--- a/frontend/src/app/common/components/badge-permissions.component.ts+++ b/frontend/src/app/common/components/badge-permissions.component.ts@@ -58,7 +58,7 @@ interface FilePermissionEntry {.permission-icon {display: inline-block;- margin-right: 0.25rem;+ margin-right: 0.1rem;vertical-align: middle;}diff --git a/frontend/src/styles/components/_app.scss b/frontend/src/styles/components/_app.scssindex f2258a28..43de67d2 100755--- a/frontend/src/styles/components/_app.scss+++ b/frontend/src/styles/components/_app.scss@@ -48,12 +48,12 @@.input-group-text {background: rgba(0, 0, 0, 0.3);color: rgba(255, 255, 255, 0.8);- border: .5px solid lighten(#202a2f, 5%);+ border: .5px solid lighten($dark-dialog-tabs-bar-bg, 5%);}.form-control {background: rgba(0, 0, 0, 0.3);- border: .5px solid lighten(#202a2f, 5%);+ border: .5px solid lighten($dark-dialog-tabs-bar-bg, 5%);color: whitesmoke;&::placeholder {diff --git a/frontend/src/styles/components/_badges.scss b/frontend/src/styles/components/_badges.scssindex 1acc29e3..9d258cf2 100644--- a/frontend/src/styles/components/_badges.scss+++ b/frontend/src/styles/components/_badges.scss@@ -102,6 +102,7 @@ body.theme-dark .badge {--badge-fg: #e2e8f0;--badge-bg-full: #475569;--badge-border-full: #64748b;+ //box-shadow: inset 0 0 0 9999px rgba($sidebar-dark-apps-menu-bg, 0.8);}$badge-variants: (diff --git a/frontend/src/styles/components/_colors.scss b/frontend/src/styles/components/_colors.scssindex b9f48d18..a2480aa2 100644--- a/frontend/src/styles/components/_colors.scss+++ b/frontend/src/styles/components/_colors.scss@@ -30,7 +30,7 @@ $semantic-dark-triplets: ('primary': (bg: #1d4ed833, border: #60a5fa66, fg: #bfdbfe),'success': (bg: #16a34a33, border: #4ade8080, fg: #bbf7d0),'danger': (bg: #dc262633, border: #f8717180, fg: #fecaca),- 'warning': (bg: #f59e0b33, border: #fbbf2480, fg: #fde68a),+ 'warning': (bg: #ea580e33, border: #fb923c80, fg: #ffedd5),'info': (bg: #4f46e533, border: #818cf880, fg: #c7d2fe),'btn-info': (bg: #0f4c5a33, border: #67a8ba80, fg: #cfeaf1),'purple': (bg: #7e22ce33, border: #c084fc80, fg: #e9d5ff),diff --git a/frontend/src/styles/components/_notifications.scss b/frontend/src/styles/components/_notifications.scssindex d475dd8a..9a0f2cd5 100644--- a/frontend/src/styles/components/_notifications.scss+++ b/frontend/src/styles/components/_notifications.scss@@ -1,72 +1,102 @@-$toastr-alpha: 0.95;-$toast-icon-success-path: 'M173.898 439.404l-166.4-166.4c-9.997-9.997-9.997-26.206 0-36.204l36.203-36.204c9.997-9.998 26.207-9.998 36.204 0L192 312.69 432.095 72.596c9.997-9.997 26.207-9.997 36.204 0l36.203 36.204c9.997 9.997 9.997 26.206 0 36.204l-294.4 294.401c-9.998 9.997-26.207 9.997-36.204-.001z';-$toast-icon-error-path: 'M256 8C119 8 8 119 8 256s111 248 248 248 248-111 248-248S393 8 256 8zm121.6 313.1c4.7 4.7 4.7 12.3 0 17L338 377.6c-4.7 4.7-12.3 4.7-17 0L256 312l-65.1 65.6c-4.7 4.7-12.3 4.7-17 0L134.4 338c-4.7-4.7-4.7-12.3 0-17l65.6-65-65.6-65.1c-4.7-4.7-4.7-12.3 0-17l39.6-39.6c4.7-4.7 12.3-4.7 17 0l65 65.7 65.1-65.6c4.7-4.7 12.3-4.7 17 0l39.6 39.6c4.7 4.7 4.7 12.3 0 17L312 256l65.6 65.1z';-$toast-icon-info-path: 'M256 8C119.043 8 8 119.083 8 256c0 136.997 111.043 248 248 248s248-111.003 248-248C504 119.083 392.957 8 256 8zm0 110c23.196 0 42 18.804 42 42s-18.804 42-42 42-42-18.804-42-42 18.804-42 42-42zm56 254c0 6.627-5.373 12-12 12h-88c-6.627 0-12-5.373-12-12v-24c0-6.627 5.373-12 12-12h12v-64h-12c-6.627 0-12-5.373-12-12v-24c0-6.627 5.373-12 12-12h64c6.627 0 12 5.373 12 12v100h12c6.627 0 12 5.373 12 12v24z';-$toast-icon-warning-path: 'M569.517 440.013C587.975 472.007 564.806 512 527.94 512H48.054c-36.937 0-59.999-40.055-41.577-71.987L246.423 23.985c18.467-32.009 64.72-31.951 83.154 0l239.94 416.028zM288 354c-25.405 0-46 20.595-46 46s20.595 46 46 46 46-20.595 46-46-20.595-46-46-46zm-43.673-165.346l7.418 136c.347 6.364 5.609 11.346 11.982 11.346h48.546c6.373 0 11.635-4.982 11.982-11.346l7.418-136c.375-6.874-5.098-12.654-11.982-12.654h-63.383c-6.884 0-12.356 5.78-11.981 12.654z';-$toast-light-variants: (- success: $success,- error: $danger,- info: $info,- warning: $warning-);-$toast-dark-variants: (- success: (#16a34a4d, #4ade8080, #bbf7d0, '0 0 512 512', $toast-icon-success-path),- error: (#dc26264d, #f8717180, #fecaca, '0 0 512 512', $toast-icon-error-path),- info: (#4f46e54d, #818cf880, #c7d2fe, '0 0 512 512', $toast-icon-info-path),- warning: (#f59e0b4d, #fbbf2480, #fde68a, '0 0 576 512', $toast-icon-warning-path)-);--@mixin toast-badge-vars(- $tone,- $light-bg-mix: 84%,- $light-border-mix: 66%-) {- $light-bg: mix(rgba($white, 0.92), mix($white, $tone, $light-bg-mix), 72%);- $light-border: mix($white, $tone, $light-border-mix);-- background-color: rgba($light-bg, $toastr-alpha) !important;- border-color: $light-border !important;+.toast-container .ngx-toastr {+ --toast-accent: #{$gray};+ --toast-bg: #{rgba($white, 0.94)};+ --toast-bg-hover: #{rgba($white, 0.98)};+ --toast-border: #{rgba(mix($gray-dark, $gray-mid, 42%), 0.5)};+ --toast-title: #{$custom-color};+ --toast-message: #{mix($gray-dark, $black, 64%)};++ position: relative;+ padding: 0.56rem 1rem 0.54rem 1.6rem !important;+ border: 0.5px solid var(--toast-border, #{$gray-light}) !important;+ background-color: var(--toast-bg, #{$white}) !important;+ background-image: none !important;+ color: var(--toast-title, #{$custom-color}) !important;+ backdrop-filter: saturate(120%) blur(2px);++ &::before {+ content: '';+ position: absolute;+ left: 0.58rem;+ top: 0.52rem;+ bottom: 0.52rem;+ width: 0.34rem;+ border-radius: 999px;+ background: var(--toast-accent, #{$gray});+ }++ .toast-title {+ font-size: $font-size-sm;+ margin-top: 0 !important;+ margin-bottom: 0.5rem !important;+ line-height: 1.15;+ color: var(--toast-title) !important;+ }++ .toast-message {+ font-size: $font-size-xs;+ line-height: 1.2;+ color: var(--toast-message) !important;+ }++ &:hover {+ background-color: var(--toast-bg-hover, var(--toast-bg, #{$white})) !important;+ }}-@mixin toast-badge-dark-vars($bg, $border) {- background-color: $bg !important;- border-color: $border !important;+.ngx-toastr {+ //min-width: 250px;+ //width: auto !important}-@function toast-svg-icon($fill, $viewbox, $path) {- $svg: "url(\"data:image/svg+xml,<svg xmlns='http://www.w3.org/2000/svg' viewBox='#{$viewbox}'><path fill='#{rgba($fill, 0.999999)}' d='#{$path}'/></svg>\")";- @return escape-svg($svg);+//.toast-top-right {+// top: 5px !important;+// right: calc($sidebar-apps-icons-width + 5px) !important;+//}++.toast-container .ngx-toastr.toast-success {+ --toast-accent: #{$success};+ --toast-title: #{$success};}-.toast-title {- font-size: $font-size-sm;+.toast-container .ngx-toastr.toast-info {+ --toast-accent: #{$purple};+ --toast-title: #{$purple};}-.toast-message {- font-size: $font-size-xs;+.toast-container .ngx-toastr.toast-warning {+ --toast-accent: #{$warning};+ --toast-title: #{$warning};}-.ngx-toastr {- @include toast-badge-vars($gray, 87%, 66%);- min-width: 250px;- width: auto !important;+.toast-container .ngx-toastr.toast-error {+ --toast-accent: #{$danger};+ --toast-title: #{$danger};}-@each $variant, $tone in $toast-light-variants {- .toast-container .ngx-toastr.toast-#{$variant} {- @include toast-badge-vars($tone);- }+body.theme-dark .toast-container .ngx-toastr {+ --toast-bg: #{rgba($dark-dialog-tabs-bar-bg, 0.85)};+ --toast-bg-hover: #{rgba($dark-dialog-tabs-bar-bg, 0.95)};+ --toast-border: #{rgba(mix($gray-dark, $gray-light, 12%), 0.2)};+ --toast-message: #{$white};}-@each $variant, $values in $toast-dark-variants {- body.theme-dark .toast-container .ngx-toastr.toast-#{$variant} {- @include toast-badge-dark-vars(nth($values, 1), nth($values, 2));- color: nth($values, 3) !important;- background-image: toast-svg-icon(nth($values, 3), nth($values, 4), nth($values, 5)) !important;- }+body.theme-dark .toast-container .ngx-toastr.toast-success {+ --toast-accent: #{mix($success, $gray-light, 80%)};+ --toast-title: #{mix($success, $gray-light, 80%)};}-.toast-top-right {- top: 5px !important;- right: calc($sidebar-apps-icons-width + 5px) !important;-}\ No newline at end of file+body.theme-dark .toast-container .ngx-toastr.toast-info {+ --toast-accent: #{mix($purple, $gray-light, 80%)};+ --toast-title: #{mix($purple, $gray-light, 80%)};+}++body.theme-dark .toast-container .ngx-toastr.toast-warning {+ --toast-accent: #{mix($warning, $gray-light, 80%)};+ --toast-title: #{mix($warning, $gray-light, 80%)};+}++body.theme-dark .toast-container .ngx-toastr.toast-error {+ --toast-accent: #{mix($danger, $gray-light, 80%)};+ --toast-title: #{mix($danger, $gray-light, 80%)};+}diff --git a/frontend/src/styles/components/_theme_dark.scss b/frontend/src/styles/components/_theme_dark.scssindex 25082318..72b2dd74 100755--- a/frontend/src/styles/components/_theme_dark.scss+++ b/frontend/src/styles/components/_theme_dark.scss@@ -417,6 +417,10 @@background-color: $sidebar-dark-apps-menu-title-bg;}}++ .badge {+ box-shadow: inset 0 0 0 9999px rgba($sidebar-dark-apps-menu-bg, 0.8);+ }}.card-footer {