diff --git a/apps/red-ui/src/app/app-routing.module.ts b/apps/red-ui/src/app/app-routing.module.ts index 016bece60..f66bf7d55 100644 --- a/apps/red-ui/src/app/app-routing.module.ts +++ b/apps/red-ui/src/app/app-routing.module.ts @@ -1,6 +1,6 @@ import { AuthErrorComponent } from '@components/auth-error/auth-error.component'; import { AuthGuard } from './modules/auth/auth.guard'; -import { CompositeRouteGuard } from '@guards/composite-route.guard'; +import { CompositeRouteGuard, CustomRouteReuseStrategy } from '@iqser/common-ui'; import { RedRoleGuard } from './modules/auth/red-role.guard'; import { BaseScreenComponent } from '@components/base-screen/base-screen.component'; import { RouteReuseStrategy, RouterModule } from '@angular/router'; @@ -8,7 +8,6 @@ import { NgModule } from '@angular/core'; import { DownloadsListScreenComponent } from '@components/downloads-list-screen/downloads-list-screen.component'; import { AppStateGuard } from '@state/app-state.guard'; import { UserProfileScreenComponent } from '@components/user-profile/user-profile-screen.component'; -import { CustomRouteReuseStrategy } from '@utils/custom-route-reuse.strategy'; const routes = [ { diff --git a/apps/red-ui/src/app/app.module.ts b/apps/red-ui/src/app/app.module.ts index c55cb1263..853650195 100644 --- a/apps/red-ui/src/app/app.module.ts +++ b/apps/red-ui/src/app/app.module.ts @@ -14,7 +14,6 @@ import { ToastrModule } from 'ngx-toastr'; import { ServiceWorkerModule } from '@angular/service-worker'; import { environment } from '@environments/environment'; import { AuthModule } from './modules/auth/auth.module'; -import { LogoComponent } from '@components/logo/logo.component'; import { AuthErrorComponent } from '@components/auth-error/auth-error.component'; import { ToastComponent } from '@components/toast/toast.component'; import { HttpCacheInterceptor } from '@redaction/red-cache'; @@ -55,15 +54,7 @@ function cleanupBaseUrl(baseUrl: string) { const screens = [BaseScreenComponent, DownloadsListScreenComponent, UserProfileScreenComponent]; -const components = [ - AppComponent, - LogoComponent, - AuthErrorComponent, - ToastComponent, - NotificationsComponent, - SpotlightSearchComponent, - ...screens -]; +const components = [AppComponent, AuthErrorComponent, ToastComponent, NotificationsComponent, SpotlightSearchComponent, ...screens]; @NgModule({ declarations: [...components], diff --git a/apps/red-ui/src/app/components/base-screen/base-screen.component.html b/apps/red-ui/src/app/components/base-screen/base-screen.component.html index 7a9ca807c..30abc60e1 100644 --- a/apps/red-ui/src/app/components/base-screen/base-screen.component.html +++ b/apps/red-ui/src/app/components/base-screen/base-screen.component.html @@ -1,87 +1,105 @@ -
-
-
+
+
-
- - - {{ 'top-bar.navigation-items.back' | translate }} +
+ + + + + + +
+ +
+ + + {{ 'top-bar.navigation-items.back' | translate }} + + + + + + + + + {{ appStateService.activeDossier.dossierName }} - - + - - - - - {{ activeDossier.dossierName }} - - - - - - - - {{ activeFile.filename }} - - - -
- -
- - - -
{{ titleService.getTitle() }}
-
- -
-
- - - -
- - - - - - - - - -
+ + {{ appStateService.activeFile.filename }} + + +
+ +
+ + + +
{{ titleService.getTitle() }}
+
+ +
+
+ + + +
+ + + + + + + + +
-
diff --git a/apps/red-ui/src/app/components/base-screen/base-screen.component.scss b/apps/red-ui/src/app/components/base-screen/base-screen.component.scss index 784045e90..e16ff23d4 100644 --- a/apps/red-ui/src/app/components/base-screen/base-screen.component.scss +++ b/apps/red-ui/src/app/components/base-screen/base-screen.component.scss @@ -1,39 +1,3 @@ -@use 'variables'; - -.dev-mode { - background-color: variables.$primary; - color: variables.$white; - font-size: 22px; - line-height: 16px; - text-align: center; - position: fixed; - top: 0; - z-index: 100; - right: 0; - height: 61px; - word-break: break-all; - display: flex; - justify-content: center; - align-items: center; - font-family: monospace; - width: 24px; - font-weight: bold; -} - -.menu-placeholder { - display: flex; - flex: 2; -} - -.buttons { - display: flex; - margin-right: 8px; - - > *:not(:last-child) { - margin-right: 2px; - } -} - redaction-spotlight-search { margin-right: 16px !important; } diff --git a/apps/red-ui/src/app/components/downloads-list-screen/downloads-list-screen.component.html b/apps/red-ui/src/app/components/downloads-list-screen/downloads-list-screen.component.html index 6f8dc3f51..dcf854c45 100644 --- a/apps/red-ui/src/app/components/downloads-list-screen/downloads-list-screen.component.html +++ b/apps/red-ui/src/app/components/downloads-list-screen/downloads-list-screen.component.html @@ -1,10 +1,7 @@
- + -
+
diff --git a/apps/red-ui/src/app/components/logo/logo.component.scss b/apps/red-ui/src/app/components/logo/logo.component.scss deleted file mode 100644 index fa91fa7e1..000000000 --- a/apps/red-ui/src/app/components/logo/logo.component.scss +++ /dev/null @@ -1,10 +0,0 @@ -@use 'variables'; - -:host { - color: variables.$primary; -} - -mat-icon { - width: 28px; - height: 28px; -} diff --git a/apps/red-ui/src/app/components/logo/logo.component.ts b/apps/red-ui/src/app/components/logo/logo.component.ts deleted file mode 100644 index fa4f478b7..000000000 --- a/apps/red-ui/src/app/components/logo/logo.component.ts +++ /dev/null @@ -1,8 +0,0 @@ -import { Component } from '@angular/core'; - -@Component({ - selector: 'redaction-logo', - templateUrl: './logo.component.html', - styleUrls: ['./logo.component.scss'] -}) -export class LogoComponent {} diff --git a/apps/red-ui/src/app/components/spotlight-search/spotlight-search.component.html b/apps/red-ui/src/app/components/spotlight-search/spotlight-search.component.html index 4031594a4..d0c1caa37 100644 --- a/apps/red-ui/src/app/components/spotlight-search/spotlight-search.component.html +++ b/apps/red-ui/src/app/components/spotlight-search/spotlight-search.component.html @@ -4,7 +4,7 @@ [placeholder]="placeholder" > - +
-
+
-
+
diff --git a/apps/red-ui/src/app/modules/admin/screens/dictionary-listing/dictionary-listing-screen.component.html b/apps/red-ui/src/app/modules/admin/screens/dictionary-listing/dictionary-listing-screen.component.html index b54ae5350..60a8fa173 100644 --- a/apps/red-ui/src/app/modules/admin/screens/dictionary-listing/dictionary-listing-screen.component.html +++ b/apps/red-ui/src/app/modules/admin/screens/dictionary-listing/dictionary-listing-screen.component.html @@ -14,7 +14,7 @@
-
+
@@ -71,7 +71,7 @@ *ngIf="currentUser.isAdmin" [label]="'dictionary-listing.add-new' | translate" [type]="iconButtonTypes.primary" - icon="red:plus" + icon="iqser:plus" >
diff --git a/apps/red-ui/src/app/modules/admin/screens/dictionary-overview/dictionary-overview-screen.component.html b/apps/red-ui/src/app/modules/admin/screens/dictionary-overview/dictionary-overview-screen.component.html index cb4d76dfa..8d5b0c877 100644 --- a/apps/red-ui/src/app/modules/admin/screens/dictionary-overview/dictionary-overview-screen.component.html +++ b/apps/red-ui/src/app/modules/admin/screens/dictionary-overview/dictionary-overview-screen.component.html @@ -48,7 +48,7 @@
-
+
diff --git a/apps/red-ui/src/app/modules/admin/screens/digital-signature/digital-signature-screen.component.html b/apps/red-ui/src/app/modules/admin/screens/digital-signature/digital-signature-screen.component.html index 1dc0a9cfc..3d9649b9e 100644 --- a/apps/red-ui/src/app/modules/admin/screens/digital-signature/digital-signature-screen.component.html +++ b/apps/red-ui/src/app/modules/admin/screens/digital-signature/digital-signature-screen.component.html @@ -4,13 +4,13 @@
- + > -
+
@@ -78,16 +78,16 @@ (action)="saveDigitalSignature()" [disabled]="digitalSignatureForm.invalid" [label]="'digital-signature-screen.action.save' | translate" - icon="iqser:check" [type]="iconButtonTypes.primary" + icon="iqser:check" >
-
+
@@ -59,7 +59,7 @@ *ngIf="currentUser.isAdmin" [label]="'dossier-attributes-listing.add-new' | translate" [type]="iconButtonTypes.primary" - icon="red:plus" + icon="iqser:plus" >
diff --git a/apps/red-ui/src/app/modules/admin/screens/dossier-template-listing/dossier-templates-listing-screen.component.html b/apps/red-ui/src/app/modules/admin/screens/dossier-template-listing/dossier-templates-listing-screen.component.html index cd4d5bc2a..955f8ba3d 100644 --- a/apps/red-ui/src/app/modules/admin/screens/dossier-template-listing/dossier-templates-listing-screen.component.html +++ b/apps/red-ui/src/app/modules/admin/screens/dossier-template-listing/dossier-templates-listing-screen.component.html @@ -4,13 +4,13 @@
- + > -
+
diff --git a/apps/red-ui/src/app/modules/admin/screens/file-attributes-listing/file-attributes-listing-screen.component.html b/apps/red-ui/src/app/modules/admin/screens/file-attributes-listing/file-attributes-listing-screen.component.html index 61635162f..38309e225 100644 --- a/apps/red-ui/src/app/modules/admin/screens/file-attributes-listing/file-attributes-listing-screen.component.html +++ b/apps/red-ui/src/app/modules/admin/screens/file-attributes-listing/file-attributes-listing-screen.component.html @@ -14,7 +14,7 @@
-
+
@@ -69,7 +69,7 @@ *ngIf="currentUser.isAdmin" [label]="'file-attributes-listing.add-new' | translate" [type]="iconButtonTypes.primary" - icon="red:plus" + icon="iqser:plus" >
diff --git a/apps/red-ui/src/app/modules/admin/screens/general-config/general-config-screen.component.html b/apps/red-ui/src/app/modules/admin/screens/general-config/general-config-screen.component.html index 069c6b61f..43bb6a793 100644 --- a/apps/red-ui/src/app/modules/admin/screens/general-config/general-config-screen.component.html +++ b/apps/red-ui/src/app/modules/admin/screens/general-config/general-config-screen.component.html @@ -19,7 +19,7 @@
-
+
@@ -40,17 +40,17 @@
- +
diff --git a/apps/red-ui/src/app/modules/admin/screens/license-information/license-information-screen.component.html b/apps/red-ui/src/app/modules/admin/screens/license-information/license-information-screen.component.html index 8d7b308b4..fc6bbaa71 100644 --- a/apps/red-ui/src/app/modules/admin/screens/license-information/license-information-screen.component.html +++ b/apps/red-ui/src/app/modules/admin/screens/license-information/license-information-screen.component.html @@ -4,14 +4,14 @@
- + > -
+
diff --git a/apps/red-ui/src/app/modules/admin/screens/license-information/license-information-screen.component.ts b/apps/red-ui/src/app/modules/admin/screens/license-information/license-information-screen.component.ts index f915e14dc..e62d97347 100644 --- a/apps/red-ui/src/app/modules/admin/screens/license-information/license-information-screen.component.ts +++ b/apps/red-ui/src/app/modules/admin/screens/license-information/license-information-screen.component.ts @@ -3,8 +3,7 @@ import { LicenseReport, LicenseReportControllerService } from '@redaction/red-ui import { ConfigService } from '@services/config.service'; import * as moment from 'moment'; import { TranslateService } from '@ngx-translate/core'; -import { IconButtonTypes, LoadingService } from '@iqser/common-ui'; -import { ButtonConfig } from '@shared/components/page-header/models/button-config.model'; +import { ButtonConfig, IconButtonTypes, LoadingService } from '@iqser/common-ui'; import { marker as _ } from '@biesbjerg/ngx-translate-extract-marker'; import { UserService } from '@services/user.service'; import { RouterHistoryService } from '@services/router-history.service'; diff --git a/apps/red-ui/src/app/modules/admin/screens/reports/reports-screen.component.html b/apps/red-ui/src/app/modules/admin/screens/reports/reports-screen.component.html index f0650b3c3..0b430d297 100644 --- a/apps/red-ui/src/app/modules/admin/screens/reports/reports-screen.component.html +++ b/apps/red-ui/src/app/modules/admin/screens/reports/reports-screen.component.html @@ -14,7 +14,7 @@
-
+
diff --git a/apps/red-ui/src/app/modules/admin/screens/rules/rules-screen.component.html b/apps/red-ui/src/app/modules/admin/screens/rules/rules-screen.component.html index 8a048ec50..faea56034 100644 --- a/apps/red-ui/src/app/modules/admin/screens/rules/rules-screen.component.html +++ b/apps/red-ui/src/app/modules/admin/screens/rules/rules-screen.component.html @@ -14,7 +14,7 @@
-
+
@@ -26,8 +26,8 @@
diff --git a/apps/red-ui/src/app/modules/admin/screens/trash/trash-screen.component.html b/apps/red-ui/src/app/modules/admin/screens/trash/trash-screen.component.html index 772400920..9e4443463 100644 --- a/apps/red-ui/src/app/modules/admin/screens/trash/trash-screen.component.html +++ b/apps/red-ui/src/app/modules/admin/screens/trash/trash-screen.component.html @@ -1,13 +1,13 @@
- + > -
+
-
+
-
+
diff --git a/apps/red-ui/src/app/modules/dossier/components/comments/comments.component.html b/apps/red-ui/src/app/modules/dossier/components/comments/comments.component.html index e284ee1c3..66a41824e 100644 --- a/apps/red-ui/src/app/modules/dossier/components/comments/comments.component.html +++ b/apps/red-ui/src/app/modules/dossier/components/comments/comments.component.html @@ -25,7 +25,7 @@ *ngIf="permissionsService.canAddComment()" [placeholder]="'comments.add-comment' | translate" autocomplete="off" - icon="red:collapse" + icon="iqser:collapse" width="full" > diff --git a/apps/red-ui/src/app/modules/dossier/components/file-workload/file-workload.component.html b/apps/red-ui/src/app/modules/dossier/components/file-workload/file-workload.component.html index 806818f86..8b6714ac2 100644 --- a/apps/red-ui/src/app/modules/dossier/components/file-workload/file-workload.component.html +++ b/apps/red-ui/src/app/modules/dossier/components/file-workload/file-workload.component.html @@ -32,7 +32,7 @@
- +
diff --git a/apps/red-ui/src/app/modules/dossier/components/file-workload/file-workload.component.scss b/apps/red-ui/src/app/modules/dossier/components/file-workload/file-workload.component.scss index f96c2b1fd..7636f6bec 100644 --- a/apps/red-ui/src/app/modules/dossier/components/file-workload/file-workload.component.scss +++ b/apps/red-ui/src/app/modules/dossier/components/file-workload/file-workload.component.scss @@ -19,7 +19,7 @@ height: 14px; width: 14px; - &.red-white { + &.primary-white { padding-right: 8px; } } diff --git a/apps/red-ui/src/app/modules/dossier/components/file-workload/file-workload.component.ts b/apps/red-ui/src/app/modules/dossier/components/file-workload/file-workload.component.ts index 5370f44ed..3b86ddd81 100644 --- a/apps/red-ui/src/app/modules/dossier/components/file-workload/file-workload.component.ts +++ b/apps/red-ui/src/app/modules/dossier/components/file-workload/file-workload.component.ts @@ -8,7 +8,7 @@ import { FileDataModel } from '@models/file/file-data.model'; import { PermissionsService } from '@services/permissions.service'; import { WebViewerInstance } from '@pdftron/webviewer'; import { BehaviorSubject, combineLatest, Observable } from 'rxjs'; -import { map, tap } from 'rxjs/operators'; +import { map } from 'rxjs/operators'; const COMMAND_KEY_ARRAY = ['ArrowLeft', 'ArrowRight', 'ArrowUp', 'ArrowDown', 'Escape']; const ALL_HOTKEY_ARRAY = ['ArrowLeft', 'ArrowRight', 'ArrowUp', 'ArrowDown']; @@ -43,10 +43,10 @@ export class FileWorkloadComponent { @Output() readonly actionPerformed = new EventEmitter(); displayedPages: number[] = []; pagesPanelActive = true; + readonly displayedAnnotations$: Observable>; private _annotations$ = new BehaviorSubject([]); @ViewChild('annotationsElement') private readonly _annotationsElement: ElementRef; @ViewChild('quickNavigation') private readonly _quickNavigationElement: ElementRef; - readonly displayedAnnotations$: Observable>; constructor( private readonly _permissionsService: PermissionsService, diff --git a/apps/red-ui/src/app/modules/dossier/dialogs/remove-annotations-dialog/remove-annotations-dialog.component.scss b/apps/red-ui/src/app/modules/dossier/dialogs/remove-annotations-dialog/remove-annotations-dialog.component.scss index 9e8bcdbe3..f54f398c1 100644 --- a/apps/red-ui/src/app/modules/dossier/dialogs/remove-annotations-dialog/remove-annotations-dialog.component.scss +++ b/apps/red-ui/src/app/modules/dossier/dialogs/remove-annotations-dialog/remove-annotations-dialog.component.scss @@ -1,3 +1,5 @@ +@use 'variables'; + .content-wrapper { padding-top: 20px; padding-bottom: 8px; @@ -8,3 +10,14 @@ ul { padding-top: 4px; } } + +.default-table { + border-collapse: collapse; + + th, + td { + padding: 8px; + text-align: left; + border: 1px solid variables.$separator; + } +} diff --git a/apps/red-ui/src/app/modules/dossier/dossiers-routing.module.ts b/apps/red-ui/src/app/modules/dossier/dossiers-routing.module.ts index 33a456ffe..b582d05c2 100644 --- a/apps/red-ui/src/app/modules/dossier/dossiers-routing.module.ts +++ b/apps/red-ui/src/app/modules/dossier/dossiers-routing.module.ts @@ -1,6 +1,6 @@ import { NgModule } from '@angular/core'; import { RouterModule, Routes } from '@angular/router'; -import { CompositeRouteGuard } from '@guards/composite-route.guard'; +import { CompositeRouteGuard } from '@iqser/common-ui'; import { AuthGuard } from '../auth/auth.guard'; import { RedRoleGuard } from '../auth/red-role.guard'; import { AppStateGuard } from '@state/app-state.guard'; diff --git a/apps/red-ui/src/app/modules/dossier/screens/dossier-overview/components/dossier-details-stats/dossier-details-stats.component.scss b/apps/red-ui/src/app/modules/dossier/screens/dossier-overview/components/dossier-details-stats/dossier-details-stats.component.scss index a4e86e553..7f225ce33 100644 --- a/apps/red-ui/src/app/modules/dossier/screens/dossier-overview/components/dossier-details-stats/dossier-details-stats.component.scss +++ b/apps/red-ui/src/app/modules/dossier/screens/dossier-overview/components/dossier-details-stats/dossier-details-stats.component.scss @@ -1,5 +1,5 @@ @use 'variables'; -@use 'red-components'; +@use 'common-components'; @use 'common-texts'; :host { diff --git a/apps/red-ui/src/app/modules/dossier/screens/dossier-overview/components/dossier-details/dossier-details.component.html b/apps/red-ui/src/app/modules/dossier/screens/dossier-overview/components/dossier-details/dossier-details.component.html index 100418d86..0444ba767 100644 --- a/apps/red-ui/src/app/modules/dossier/screens/dossier-overview/components/dossier-details/dossier-details.component.html +++ b/apps/red-ui/src/app/modules/dossier/screens/dossier-overview/components/dossier-details/dossier-details.component.html @@ -83,7 +83,7 @@ diff --git a/apps/red-ui/src/app/modules/dossier/screens/dossier-overview/screen/dossier-overview-screen.component.html b/apps/red-ui/src/app/modules/dossier/screens/dossier-overview/screen/dossier-overview-screen.component.html index 00c4bdde3..7dc4f46f6 100644 --- a/apps/red-ui/src/app/modules/dossier/screens/dossier-overview/screen/dossier-overview-screen.component.html +++ b/apps/red-ui/src/app/modules/dossier/screens/dossier-overview/screen/dossier-overview-screen.component.html @@ -1,8 +1,7 @@
- @@ -30,11 +29,11 @@ icon="red:upload" tooltipPosition="below" > - +
-
+
- +
-
+
-
+
- + >
-
+
- -
diff --git a/apps/red-ui/src/app/modules/shared/components/hidden-action/hidden-action.component.scss b/apps/red-ui/src/app/modules/shared/components/hidden-action/hidden-action.component.scss deleted file mode 100644 index e69de29bb..000000000 diff --git a/apps/red-ui/src/app/modules/shared/components/hidden-action/hidden-action.component.ts b/apps/red-ui/src/app/modules/shared/components/hidden-action/hidden-action.component.ts deleted file mode 100644 index c524ee4b1..000000000 --- a/apps/red-ui/src/app/modules/shared/components/hidden-action/hidden-action.component.ts +++ /dev/null @@ -1,25 +0,0 @@ -import { Component, EventEmitter, Input, Output } from '@angular/core'; - -@Component({ - selector: 'redaction-hidden-action', - templateUrl: './hidden-action.component.html', - styleUrls: ['./hidden-action.component.scss'] -}) -export class HiddenActionComponent { - @Input() requiredClicks = 4; - @Output() action = new EventEmitter(); - private _clickCount = 0; - private _clickCountTimeout: any; - - countActions() { - this._clickCount += 1; - if (this._clickCount === this.requiredClicks) { - this._clickCount = 0; - this.action.emit(); - } - clearTimeout(this._clickCountTimeout); - this._clickCountTimeout = setTimeout(() => { - this._clickCount = 0; - }, 1000); - } -} diff --git a/apps/red-ui/src/app/modules/shared/components/initials-avatar/initials-avatar.component.ts b/apps/red-ui/src/app/modules/shared/components/initials-avatar/initials-avatar.component.ts index 288f70a62..181e306ef 100644 --- a/apps/red-ui/src/app/modules/shared/components/initials-avatar/initials-avatar.component.ts +++ b/apps/red-ui/src/app/modules/shared/components/initials-avatar/initials-avatar.component.ts @@ -44,7 +44,7 @@ export class InitialsAvatarComponent extends AutoUnsubscribe implements OnChange private get _colorClass() { if (this._isCurrentUser) { - return 'red-white'; + return 'primary-white'; } if (this.disabled) { return 'inactive'; @@ -65,7 +65,7 @@ export class InitialsAvatarComponent extends AutoUnsubscribe implements OnChange if (isSystemUser) { this.displayName = 'System'; this.initials = 'SY'; - this.colorClass = 'red-white red'; + this.colorClass = 'primary-white primary'; return; } diff --git a/apps/red-ui/src/app/modules/shared/components/page-header/models/action-config.model.ts b/apps/red-ui/src/app/modules/shared/components/page-header/models/action-config.model.ts deleted file mode 100644 index 311e3fc05..000000000 --- a/apps/red-ui/src/app/modules/shared/components/page-header/models/action-config.model.ts +++ /dev/null @@ -1,5 +0,0 @@ -import { BaseHeaderConfig } from './base-config.model'; - -export interface ActionConfig extends BaseHeaderConfig { - readonly action: ($event: MouseEvent) => void; -} diff --git a/apps/red-ui/src/app/modules/shared/components/page-header/models/base-config.model.ts b/apps/red-ui/src/app/modules/shared/components/page-header/models/base-config.model.ts deleted file mode 100644 index 970891c10..000000000 --- a/apps/red-ui/src/app/modules/shared/components/page-header/models/base-config.model.ts +++ /dev/null @@ -1,5 +0,0 @@ -export interface BaseHeaderConfig { - readonly label: string; - readonly icon?: string; - readonly hide?: boolean; -} diff --git a/apps/red-ui/src/app/modules/shared/components/page-header/models/button-config.model.ts b/apps/red-ui/src/app/modules/shared/components/page-header/models/button-config.model.ts deleted file mode 100644 index 73a37f31d..000000000 --- a/apps/red-ui/src/app/modules/shared/components/page-header/models/button-config.model.ts +++ /dev/null @@ -1,6 +0,0 @@ -import { IconButtonType } from '@iqser/common-ui'; -import { ActionConfig } from '@shared/components/page-header/models/action-config.model'; - -export interface ButtonConfig extends ActionConfig { - readonly type?: IconButtonType; -} diff --git a/apps/red-ui/src/app/modules/shared/components/page-header/models/search-positions.type.ts b/apps/red-ui/src/app/modules/shared/components/page-header/models/search-positions.type.ts deleted file mode 100644 index 2b6314c43..000000000 --- a/apps/red-ui/src/app/modules/shared/components/page-header/models/search-positions.type.ts +++ /dev/null @@ -1,6 +0,0 @@ -export const SearchPositions = { - beforeFilters: 'beforeFilters', - afterFilters: 'afterFilters' -} as const; - -export type SearchPosition = keyof typeof SearchPositions; diff --git a/apps/red-ui/src/app/modules/shared/components/page-header/page-header.component.html b/apps/red-ui/src/app/modules/shared/components/page-header/page-header.component.html deleted file mode 100644 index 829a4b248..000000000 --- a/apps/red-ui/src/app/modules/shared/components/page-header/page-header.component.html +++ /dev/null @@ -1,64 +0,0 @@ -
-
{{ pageLabel }}
- -
-
- - - - - - - - - -
-
- -
- - - - - - - - - - - - - - -
-
- - - - diff --git a/apps/red-ui/src/app/modules/shared/components/page-header/page-header.component.scss b/apps/red-ui/src/app/modules/shared/components/page-header/page-header.component.scss deleted file mode 100644 index ffe60a1b5..000000000 --- a/apps/red-ui/src/app/modules/shared/components/page-header/page-header.component.scss +++ /dev/null @@ -1,5 +0,0 @@ -@import '../../../../../assets/styles/variables'; - -.ml-6 { - margin-left: 6px; -} diff --git a/apps/red-ui/src/app/modules/shared/components/page-header/page-header.component.ts b/apps/red-ui/src/app/modules/shared/components/page-header/page-header.component.ts deleted file mode 100644 index 2465429d6..000000000 --- a/apps/red-ui/src/app/modules/shared/components/page-header/page-header.component.ts +++ /dev/null @@ -1,54 +0,0 @@ -import { Component, EventEmitter, Input, Optional, Output, TemplateRef } from '@angular/core'; -import { ActionConfig } from '@shared/components/page-header/models/action-config.model'; -import { ButtonConfig } from '@shared/components/page-header/models/button-config.model'; -import { FilterService, IconButtonTypes, IListable, SearchService } from '@iqser/common-ui'; -import { distinctUntilChanged, map } from 'rxjs/operators'; -import { combineLatest, Observable, of } from 'rxjs'; -import { SearchPosition, SearchPositions } from '@shared/components/page-header/models/search-positions.type'; -import { IFileAttributeConfig } from '@redaction/red-ui-http'; - -@Component({ - selector: 'redaction-page-header', - templateUrl: './page-header.component.html', - styleUrls: ['./page-header.component.scss'] -}) -export class PageHeaderComponent { - readonly searchPositions = SearchPositions; - readonly iconButtonTypes = IconButtonTypes; - - @Input() pageLabel: string; - @Input() showCloseButton: boolean; - @Input() actionConfigs: readonly ActionConfig[]; - @Input() buttonConfigs: readonly ButtonConfig[]; - @Input() fileAttributeConfigs: readonly IFileAttributeConfig[]; - @Input() viewModeSelection: TemplateRef; - @Input() searchPlaceholder: string; - @Input() searchWidth: number | 'full'; - @Input() searchPosition: SearchPosition = SearchPositions.afterFilters; - @Output() readonly closeAction = new EventEmitter(); - - readonly filters$ = this.filterService?.filterGroups$.pipe(map(all => all.filter(f => f.icon))); - readonly showResetFilters$ = this._showResetFilters$; - - constructor(@Optional() readonly filterService: FilterService, @Optional() readonly searchService: SearchService) {} - - get _showResetFilters$(): Observable { - if (!this.filterService) { - return of(false); - } - - return combineLatest([this.filterService.showResetFilters$, this.searchService.valueChanges$]).pipe( - map(([showResetFilters, searchValue]) => showResetFilters || !!searchValue), - distinctUntilChanged() - ); - } - - resetFilters(): void { - this.filterService.reset(); - this.searchService.reset(); - } - - trackByLabel(index: number, item: K): string { - return item.label; - } -} diff --git a/apps/red-ui/src/app/modules/shared/components/team-members/team-members.component.html b/apps/red-ui/src/app/modules/shared/components/team-members/team-members.component.html index 07e3d5f33..08e777a4a 100644 --- a/apps/red-ui/src/app/modules/shared/components/team-members/team-members.component.html +++ b/apps/red-ui/src/app/modules/shared/components/team-members/team-members.component.html @@ -20,9 +20,9 @@ [class.large-spacing]="largeSpacing" [size]="32" [tooltip]="'dossier-details.assign-members' | translate" - class="member" - icon="red:plus" [type]="circleButtonTypes.primary" + class="member" + icon="iqser:plus" >
diff --git a/apps/red-ui/src/app/modules/shared/shared.module.ts b/apps/red-ui/src/app/modules/shared/shared.module.ts index 6545ecbbb..34b12e6ce 100644 --- a/apps/red-ui/src/app/modules/shared/shared.module.ts +++ b/apps/red-ui/src/app/modules/shared/shared.module.ts @@ -11,7 +11,6 @@ import { FormsModule, ReactiveFormsModule } from '@angular/forms'; import { AnnotationIconComponent } from './components/annotation-icon/annotation-icon.component'; import { SimpleDoughnutChartComponent } from './components/simple-doughnut-chart/simple-doughnut-chart.component'; import { DictionaryAnnotationIconComponent } from './components/dictionary-annotation-icon/dictionary-annotation-icon.component'; -import { HiddenActionComponent } from './components/hidden-action/hidden-action.component'; import { ConfirmationDialogComponent } from './dialogs/confirmation-dialog/confirmation-dialog.component'; import { CommonUiModule } from '@iqser/common-ui'; import { DateAdapter, MAT_DATE_FORMATS, MAT_DATE_LOCALE } from '@angular/material/core'; @@ -22,7 +21,6 @@ import { DictionaryManagerComponent } from './components/dictionary-manager/dict import { SideNavComponent } from './components/side-nav/side-nav.component'; import { MonacoEditorModule } from '@materia-ui/ngx-monaco-editor'; import { AssignUserDropdownComponent } from './components/assign-user-dropdown/assign-user-dropdown.component'; -import { PageHeaderComponent } from './components/page-header/page-header.component'; import { DatePipe } from './pipes/date.pipe'; import { LongPressDirective } from './directives/long-press.directive'; import { NamePipe } from './pipes/name.pipe'; @@ -37,13 +35,11 @@ const components = [ AnnotationIconComponent, SimpleDoughnutChartComponent, DictionaryAnnotationIconComponent, - HiddenActionComponent, ConfirmationDialogComponent, SelectComponent, SideNavComponent, DictionaryManagerComponent, AssignUserDropdownComponent, - PageHeaderComponent, TypeFilterComponent, TeamMembersComponent, diff --git a/apps/red-ui/src/app/modules/upload-download/upload-status-overlay/upload-status-overlay.component.html b/apps/red-ui/src/app/modules/upload-download/upload-status-overlay/upload-status-overlay.component.html index 662ba83cd..bd1d61b02 100644 --- a/apps/red-ui/src/app/modules/upload-download/upload-status-overlay/upload-status-overlay.component.html +++ b/apps/red-ui/src/app/modules/upload-download/upload-status-overlay/upload-status-overlay.component.html @@ -3,7 +3,7 @@
{{ 'upload-status.dialog.title' | translate: { len: uploadService.files.length } }}
- +
@@ -43,16 +43,16 @@ (action)="uploadItem(model)" *ngIf="model.error && !model.sizeError" [tooltip]="'upload-status.dialog.actions.re-upload' | translate" + [type]="circleButtonTypes.dark" icon="iqser:refresh" tooltipPosition="before" - [type]="circleButtonTypes.dark" >
diff --git a/apps/red-ui/src/app/utils/custom-route-reuse.strategy.ts b/apps/red-ui/src/app/utils/custom-route-reuse.strategy.ts deleted file mode 100644 index 392a6d27d..000000000 --- a/apps/red-ui/src/app/utils/custom-route-reuse.strategy.ts +++ /dev/null @@ -1,83 +0,0 @@ -import { ActivatedRouteSnapshot, DetachedRouteHandle, RouteReuseStrategy } from '@angular/router'; -import { Debounce } from '@iqser/common-ui'; - -export interface OnAttach { - ngOnAttach(previousRoute: ActivatedRouteSnapshot); -} - -export interface OnDetach { - ngOnDetach(); -} - -interface RouteStorageObject { - handle: DetachedRouteHandle; - previousRoute: ActivatedRouteSnapshot; -} - -export class CustomRouteReuseStrategy implements RouteReuseStrategy { - private _storedRoutes: { [key: string]: RouteStorageObject } = {}; - - private static _removeTooltips(): void { - while (document.getElementsByTagName('mat-tooltip-component').length > 0) { - document.getElementsByTagName('mat-tooltip-component')[0].remove(); - } - } - - shouldDetach(route: ActivatedRouteSnapshot): boolean { - return !!route.routeConfig.data?.reuse && !!this._getKey(route); - } - - store(route: ActivatedRouteSnapshot, handle: DetachedRouteHandle): void { - if (handle === null) { - return; - } - CustomRouteReuseStrategy._removeTooltips(); - - const element: any = handle; - - if (element?.componentRef?.instance?.ngOnDetach) { - this._onDetach(element.componentRef?.instance); - } - - this._storedRoutes[this._getKey(route)] = { - handle: element as DetachedRouteHandle, - previousRoute: route - }; - } - - shouldAttach(route: ActivatedRouteSnapshot): boolean { - return !!this._storedRoutes[this._getKey(route)]; - } - - retrieve(route: ActivatedRouteSnapshot): DetachedRouteHandle { - const key = this._getKey(route); - const element: any = this._storedRoutes[key]?.handle; - - if (element?.componentRef?.instance?.ngOnAttach) { - this._onAttach(element.componentRef?.instance, this._storedRoutes[key].previousRoute); - } - - return element as DetachedRouteHandle; - } - - shouldReuseRoute(future: ActivatedRouteSnapshot, current: ActivatedRouteSnapshot): boolean { - return future.routeConfig === current.routeConfig || this._getKey(future) === this._getKey(current); - } - - private _getKey(route: ActivatedRouteSnapshot): string { - return route.pathFromRoot - .map((el: ActivatedRouteSnapshot) => (el.routeConfig ? el.routeConfig.path + JSON.stringify(el.params) : '')) - .filter(str => str.length > 0) - .join(''); - } - - @Debounce() - private _onAttach(instance: OnAttach, previousRoute?: ActivatedRouteSnapshot) { - instance.ngOnAttach(previousRoute); - } - - @Debounce() - private _onDetach(instance: OnDetach) { - instance.ngOnDetach(); - } -} diff --git a/apps/red-ui/src/app/utils/index.ts b/apps/red-ui/src/app/utils/index.ts index 15c2674bb..3ddc348a7 100644 --- a/apps/red-ui/src/app/utils/index.ts +++ b/apps/red-ui/src/app/utils/index.ts @@ -4,7 +4,6 @@ export * from './sorters/super-type-sorter'; export * from './api-path-interceptor'; export * from './configuration.initializer'; -export * from './custom-route-reuse.strategy'; export * from './date-inputs-utils'; export * from './file-download-utils'; export * from './file-drop-utils'; diff --git a/apps/red-ui/src/assets/font/Inter-VariableFont.ttf b/apps/red-ui/src/assets/font/Inter-VariableFont.ttf deleted file mode 100644 index 32a79990a..000000000 Binary files a/apps/red-ui/src/assets/font/Inter-VariableFont.ttf and /dev/null differ diff --git a/apps/red-ui/src/assets/font/OpenSans-ExtraBold.ttf b/apps/red-ui/src/assets/font/OpenSans-ExtraBold.ttf deleted file mode 100644 index 67fcf0fb2..000000000 Binary files a/apps/red-ui/src/assets/font/OpenSans-ExtraBold.ttf and /dev/null differ diff --git a/apps/red-ui/src/assets/icons/general/arrow-right.svg b/apps/red-ui/src/assets/icons/general/arrow-right.svg deleted file mode 100644 index a413e5866..000000000 --- a/apps/red-ui/src/assets/icons/general/arrow-right.svg +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - diff --git a/apps/red-ui/src/assets/icons/general/collapse.svg b/apps/red-ui/src/assets/icons/general/collapse.svg deleted file mode 100644 index 21d8036b4..000000000 --- a/apps/red-ui/src/assets/icons/general/collapse.svg +++ /dev/null @@ -1,18 +0,0 @@ - - - - - - - - - - - - - - - diff --git a/apps/red-ui/src/assets/icons/general/expand.svg b/apps/red-ui/src/assets/icons/general/expand.svg deleted file mode 100644 index 5fbf68105..000000000 --- a/apps/red-ui/src/assets/icons/general/expand.svg +++ /dev/null @@ -1,20 +0,0 @@ - - - - - - - - - - - - - - - diff --git a/apps/red-ui/src/assets/icons/general/plus.svg b/apps/red-ui/src/assets/icons/general/plus.svg deleted file mode 100644 index ec0b73a69..000000000 --- a/apps/red-ui/src/assets/icons/general/plus.svg +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - diff --git a/apps/red-ui/src/assets/icons/general/radio-indeterminate.svg b/apps/red-ui/src/assets/icons/general/radio-indeterminate.svg deleted file mode 100644 index 35c8b8249..000000000 --- a/apps/red-ui/src/assets/icons/general/radio-indeterminate.svg +++ /dev/null @@ -1,15 +0,0 @@ - - - - - - - - - - - - diff --git a/apps/red-ui/src/assets/icons/general/radio-selected.svg b/apps/red-ui/src/assets/icons/general/radio-selected.svg deleted file mode 100644 index cfef08cf4..000000000 --- a/apps/red-ui/src/assets/icons/general/radio-selected.svg +++ /dev/null @@ -1,17 +0,0 @@ - - - - - - - - - - - - - - diff --git a/apps/red-ui/src/assets/icons/general/status-collapse.svg b/apps/red-ui/src/assets/icons/general/status-collapse.svg deleted file mode 100644 index 24559afe8..000000000 --- a/apps/red-ui/src/assets/icons/general/status-collapse.svg +++ /dev/null @@ -1,41 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/apps/red-ui/src/assets/icons/general/status-expand.svg b/apps/red-ui/src/assets/icons/general/status-expand.svg deleted file mode 100644 index b09e5dfe5..000000000 --- a/apps/red-ui/src/assets/icons/general/status-expand.svg +++ /dev/null @@ -1,58 +0,0 @@ - - - - - - - - - - - - - - - - - - - Description - - - - - - - - - - - - - - - - - - - - - - - diff --git a/apps/red-ui/src/assets/styles/red-autocomplete.scss b/apps/red-ui/src/assets/styles/red-autocomplete.scss deleted file mode 100644 index ac9e3a872..000000000 --- a/apps/red-ui/src/assets/styles/red-autocomplete.scss +++ /dev/null @@ -1,9 +0,0 @@ -@use 'common-mixins'; - -.mat-autocomplete-panel { - @include common-mixins.scroll-bar; - - .mat-option { - font-size: inherit; - } -} diff --git a/apps/red-ui/src/assets/styles/red-breadcrumbs.scss b/apps/red-ui/src/assets/styles/red-breadcrumbs.scss deleted file mode 100644 index 6e5ff85ab..000000000 --- a/apps/red-ui/src/assets/styles/red-breadcrumbs.scss +++ /dev/null @@ -1,42 +0,0 @@ -@use 'variables'; -@use 'common-mixins'; - -.breadcrumbs-container { - display: flex; - align-items: center; - - > *:not(:last-child) { - margin-right: 6px; - } - - mat-icon { - width: 16px; - min-width: 16px; - } -} - -.breadcrumb { - text-decoration: none; - color: variables.$accent; - font-weight: 600; - width: fit-content; - white-space: nowrap; - - &.back { - display: flex !important; - justify-content: center; - align-items: center; - - mat-icon { - margin-right: 8px; - } - } - - &:last-child { - @include common-mixins.line-clamp(1); - } - - &.active { - color: variables.$primary; - } -} diff --git a/apps/red-ui/src/assets/styles/red-checkbox.scss b/apps/red-ui/src/assets/styles/red-checkbox.scss deleted file mode 100644 index effac2e87..000000000 --- a/apps/red-ui/src/assets/styles/red-checkbox.scss +++ /dev/null @@ -1,37 +0,0 @@ -@use 'variables'; - -.mat-checkbox .mat-checkbox-frame { - border: 1px solid variables.$grey-5; -} - -.mat-checkbox-indeterminate.mat-accent .mat-checkbox-background, -.mat-checkbox-checked.mat-accent .mat-checkbox-background { - margin-top: 1px; - margin-left: 1px; - width: 18px; - height: 18px; -} - -.mat-checkbox-layout { - align-items: center !important; - - .mat-checkbox-inner-container { - margin-left: 0; - } - - .mat-checkbox-label { - font-size: 13px; - color: variables.$accent; - - display: flex; - align-items: center; - - > *:not(:last-child) { - margin-right: 8px; - } - } -} - -.mat-checkbox.error .mat-checkbox-label { - color: variables.$primary; -} diff --git a/apps/red-ui/src/assets/styles/red-components.scss b/apps/red-ui/src/assets/styles/red-components.scss index df392fb85..5e43e1b88 100644 --- a/apps/red-ui/src/assets/styles/red-components.scss +++ b/apps/red-ui/src/assets/styles/red-components.scss @@ -1,97 +1,6 @@ @use 'variables'; @use 'common-mixins'; -.oval, -.square { - font-weight: 600; - display: flex; - justify-content: center; - align-items: center; - height: 24px; - width: 24px; - min-width: 24px; - font-size: 10px; - line-height: 12px; - text-align: center; - text-transform: uppercase; - border: none; - box-sizing: border-box; - - &.large { - height: 32px; - width: 32px; - font-size: 13px; - } - - &.gray-dark { - background-color: variables.$grey-6; - } - - &.gray-red { - background-color: variables.$grey-6; - color: variables.$primary; - } - - &.lightgray-dark { - background-color: variables.$grey-4; - } - - &.lightgray-red { - background-color: variables.$grey-4; - color: variables.$primary; - } - - &.darkgray-white { - background-color: variables.$accent; - color: variables.$white; - } - - &.lightgray-white { - background-color: variables.$grey-5; - color: variables.$white; - } - - &.red-white { - background-color: variables.$primary; - color: variables.$white; - } - - &.white-dark { - border: 1px solid variables.$grey-4; - } - - &.inactive { - background-color: variables.$grey-6; - color: variables.$grey-7; - } -} - -.oval { - border-radius: 50%; -} - -.stats-subtitle { - display: flex; - - > div { - display: flex; - justify-content: center; - align-items: center; - width: fit-content; - - mat-icon { - width: 10px; - height: 10px; - line-height: 13px; - margin-right: 6px; - } - - &:not(:last-child) { - margin-right: 12px; - } - } -} - .pill { padding: 2px 5px; border-radius: 9px; @@ -183,11 +92,3 @@ stroke: variables.$primary; background-color: variables.$primary; } - -.overlay-shadow { - @include common-mixins.inset-shadow; - position: fixed; - width: 100%; - height: 4px; - z-index: 2; -} diff --git a/apps/red-ui/src/assets/styles/red-controls.scss b/apps/red-ui/src/assets/styles/red-controls.scss deleted file mode 100644 index a25881cc2..000000000 --- a/apps/red-ui/src/assets/styles/red-controls.scss +++ /dev/null @@ -1,49 +0,0 @@ -@use 'variables'; - -.btn-group { - display: flex; - flex-direction: row; - - .btn-group-btn { - cursor: pointer; - color: variables.$accent; - background: variables.$white; - font-family: Inter, sans-serif; - font-size: 13px; - line-height: 14px; - padding: 10px 14px; - transition: color 0.25s ease-in-out; - outline: none; - border: none; - - &:hover { - color: variables.$black; - } - - &.active { - color: variables.$light; - background: variables.$primary; - border-radius: 17px; - } - - &.active:hover { - color: variables.$grey-3; - } - } -} - -.icon-10 { - width: 10px; - height: 10px; -} - -.noselect { - -webkit-touch-callout: none; /* iOS Safari */ - -webkit-user-select: none; /* Safari */ - -khtml-user-select: none; /* Konqueror HTML */ - -moz-user-select: none; /* Old versions of Firefox */ - -ms-user-select: none; /* Internet Explorer/Edge */ - user-select: none; - /* Non-prefixed version, currently - supported by Chrome, Edge, Opera and Firefox */ -} diff --git a/apps/red-ui/src/assets/styles/red-fonts.scss b/apps/red-ui/src/assets/styles/red-fonts.scss deleted file mode 100644 index dcc2676fe..000000000 --- a/apps/red-ui/src/assets/styles/red-fonts.scss +++ /dev/null @@ -1,36 +0,0 @@ -/* inter-regular - latin */ - -@font-face { - font-family: 'OpenSans Extrabold'; - src: url('../font/OpenSans-ExtraBold.ttf') format('truetype'); -} - -@font-face { - font-family: 'Inter'; - font-weight: 300; - src: url('../font/Inter-VariableFont.ttf') format('truetype'); -} - -@font-face { - font-family: 'Inter'; - font-weight: 400; - src: url('../font/Inter-VariableFont.ttf') format('truetype'); -} - -@font-face { - font-family: 'Inter'; - font-weight: 500; - src: url('../font/Inter-VariableFont.ttf') format('truetype'); -} - -@font-face { - font-family: 'Inter'; - font-weight: 600; - src: url('../font/Inter-VariableFont.ttf') format('truetype'); -} - -@font-face { - font-family: 'Inter'; - font-weight: 700; - src: url('../font/Inter-VariableFont.ttf') format('truetype'); -} diff --git a/apps/red-ui/src/assets/styles/red-help-mode.scss b/apps/red-ui/src/assets/styles/red-help-mode.scss deleted file mode 100644 index 35a068059..000000000 --- a/apps/red-ui/src/assets/styles/red-help-mode.scss +++ /dev/null @@ -1,30 +0,0 @@ -@use 'variables'; - -.help-mode-on-mouse-over { - z-index: 100; - position: absolute; - top: -5px; - left: -5px; - width: 100%; - height: 100%; - padding-right: 5px; - padding-bottom: 10px; - transition: all 0.25s; -} - -.help-highlight, -.help-mode-on-mouse-over:hover { - background: rgba(92, 229, 148, 0.5); - box-shadow: 0 0 0 2px variables.$green-2 inset; - cursor: help; -} - -.help-mode-on-mouse-over-filters, -.help-mode-on-mouse-over-quick-filters, -.help-mode-on-mouse-over-new-dossier { - padding-right: 10px; -} - -.help-mode-on-mouse-over-notifications { - padding-left: 4px; -} diff --git a/apps/red-ui/src/assets/styles/red-list.scss b/apps/red-ui/src/assets/styles/red-list.scss deleted file mode 100644 index a628aa996..000000000 --- a/apps/red-ui/src/assets/styles/red-list.scss +++ /dev/null @@ -1,12 +0,0 @@ -@use 'variables'; - -.mat-list-item { - color: variables.$accent !important; - font-size: 13px !important; - line-height: 16px !important; -} - -.list-50vh { - overflow-y: scroll; - max-height: 50vh; -} diff --git a/apps/red-ui/src/assets/styles/red-loading.scss b/apps/red-ui/src/assets/styles/red-loading.scss deleted file mode 100644 index ac53e50bc..000000000 --- a/apps/red-ui/src/assets/styles/red-loading.scss +++ /dev/null @@ -1,23 +0,0 @@ -.loading:after { - content: '.'; - animation: dots 1s steps(5, end) infinite; -} - -@keyframes dots { - 0%, - 20% { - color: rgba(40, 50, 65, 0); - text-shadow: 0.25em 0 0 rgba(40, 50, 65, 0), 0.5em 0 0 rgba(40, 50, 65, 0); - } - 40% { - color: #283241; - text-shadow: 0.25em 0 0 rgba(40, 50, 65, 0), 0.5em 0 0 rgba(40, 50, 65, 0); - } - 60% { - text-shadow: 0.25em 0 0 #283241, 0.5em 0 0 rgba(40, 50, 65, 0); - } - 80%, - 100% { - text-shadow: 0.25em 0 0 #283241, 0.5em 0 0 #283241; - } -} diff --git a/apps/red-ui/src/assets/styles/red-menu.scss b/apps/red-ui/src/assets/styles/red-menu.scss deleted file mode 100644 index 9ceace30e..000000000 --- a/apps/red-ui/src/assets/styles/red-menu.scss +++ /dev/null @@ -1,63 +0,0 @@ -@use 'variables'; -@use 'common-mixins'; - -.mat-menu-panel { - border-radius: 8px !important; - box-shadow: 0 2px 6px 0 rgba(40, 50, 65, 0.3); - max-width: none !important; - min-width: 180px !important; - margin-top: 10px; - @include common-mixins.scroll-bar; - - .mat-menu-content:not(:empty) { - padding-top: 8px; - padding-bottom: 24px; - } - - &.padding-bottom-0 .mat-menu-content:not(:empty) { - padding-bottom: 0; - } - - &.padding-bottom-8 .mat-menu-content:not(:empty) { - padding-bottom: 8px; - } - - .mat-menu-item { - font-size: 13px; - color: variables.$accent; - padding: 0 8px; - margin: 0 8px 2px 8px; - border-radius: 4px; - width: -webkit-fill-available; - - display: flex; - align-items: center; - - > *:not(:last-child) { - margin-right: 8px; - } - - .arrow-wrapper { - width: 16px; - text-align: center; - - mat-icon { - width: 16px; - height: 16px; - margin: 0; - } - } - - &.padding-left { - padding-left: 56px; - } - - &:last-of-type { - margin-bottom: 0; - } - - &:hover { - background-color: rgba(variables.$primary, 0.1); - } - } -} diff --git a/apps/red-ui/src/assets/styles/red-page-layout.scss b/apps/red-ui/src/assets/styles/red-page-layout.scss deleted file mode 100644 index 98c0b3c7f..000000000 --- a/apps/red-ui/src/assets/styles/red-page-layout.scss +++ /dev/null @@ -1,387 +0,0 @@ -@use 'variables'; -@use 'common-mixins'; - -html, -body { - margin: 0; - padding: 0; - height: 100vh; - font-family: 'Inter', sans-serif; - color: variables.$accent; - font-size: 13px; - line-height: 16px; -} - -section.settings { - display: flex; - - .page-header, - .red-content-inner { - width: calc(100vw - 200px); - } - - redaction-admin-side-nav { - height: calc(100vh - 61px); - } -} - -.page-header { - display: flex; - justify-content: space-between; - align-items: center; - padding: 0 24px; - height: 50px; - width: 100vw; - box-sizing: border-box; - background-color: variables.$white; - border-bottom: 1px solid variables.$separator; - - .filters { - display: flex; - align-items: center; - - > *:not(:last-child) { - margin-right: 2px; - } - - > div:first-child { - margin-right: 8px; - } - - form { - margin-left: 6px; - - .iqser-input-group { - width: 250px; - } - } - - .reset-filters { - margin-left: 12px; - color: variables.$primary; - cursor: pointer; - } - } - - .actions { - display: flex; - align-items: center; - justify-content: flex-end; - - > *:not(:last-child) { - margin-right: 2px; - } - } -} - -.fullscreen { - .page-header { - position: absolute; - top: 0; - } - - .red-content-inner { - height: calc(100% - 50px); - } - - .overlay-shadow { - top: 50px; - } -} - -.red-content-inner { - display: flex; - flex-direction: row; - position: absolute; - bottom: 0; - width: 100%; - height: calc(100% - 111px); - transition: height ease-in-out 0.2s; -} - -.content-container { - overflow: hidden; - position: relative; - width: 100%; - - .dialog { - border-radius: 8px; - margin-top: 40px; - margin-bottom: 70px; - background-color: variables.$white; - max-width: 650px; - height: fit-content; - box-shadow: 0 1px 5px 0 rgba(40, 50, 65, 0.19); - position: unset; - - .heading-l { - margin-bottom: 16px; - } - - .dialog-content { - display: flex; - - .dialog-content-left { - min-width: 300px; - margin-right: 64px; - } - - .link-action { - margin-top: 8px; - } - } - } - - @media only screen and (max-width: 1600px) { - .user-column { - justify-content: center; - align-items: center; - - redaction-initials-avatar .username { - display: none; - } - } - } -} - -.right-container { - border-left: 1px solid variables.$grey-4; - box-sizing: border-box; - background: variables.$white; - overflow: hidden; - transition: width ease-in-out 0.2s, min-width ease-in-out 0.2s; - - &:hover { - overflow-y: auto; - @include common-mixins.scroll-bar; - } - - .collapsed-wrapper { - display: none; - } - - &.collapsed { - padding-left: 0 !important; - padding-right: 0 !important; - width: 60px !important; - min-width: 60px !important; - display: flex; - - div:not(.collapsed-wrapper) { - display: none; - } - - .collapsed-wrapper { - display: flex; - flex-direction: column; - align-items: center; - width: 60px; - - div { - display: initial; - } - - .all-caps-label { - transform: rotate(90deg) translateX(50%); - white-space: nowrap; - margin-top: 10px; - } - } - } -} - -.flex { - display: flex !important; -} - -.flex-end { - display: flex; - justify-content: flex-end; -} - -.flex-center { - display: flex; - justify-content: center; -} - -.flex-align-items-center { - display: flex; - align-items: center; -} - -.flex-1 { - flex: 1; -} - -.flex-2 { - flex: 2; -} - -.mt-5 { - margin-top: 5px; -} - -.mt-8 { - margin-top: 8px; -} - -.mt-16 { - margin-top: 16px !important; -} - -.mt-20 { - margin-top: 20px; -} - -.mt-24 { - margin-top: 24px; -} - -.mt-32 { - margin-top: 32px; -} - -.mb-6 { - margin-bottom: 6px; -} - -.mb-8 { - margin-bottom: 8px !important; -} - -.mb-12 { - margin-bottom: 12px !important; -} - -.ml-8 { - margin-left: 8px; -} - -.ml-14 { - margin-left: 14px; -} - -.ml-16 { - margin-left: 16px; -} - -.mr-24 { - margin-right: 24px; -} - -.pb-24 { - padding-bottom: 24px; -} - -.pb-32 { - padding-bottom: 32px; -} - -.w-100 { - min-width: 100px !important; - width: 100px !important; -} - -.break-20 { - height: 20px; - background: transparent; - display: block; -} - -.detail-row { - opacity: 1; - font-family: Inter, sans-serif; - font-size: 14px; - letter-spacing: 0; - line-height: 14px; - padding: 4px; -} - -.red-top-bar { - height: 61px; - width: 100vw; - max-height: 61px; - display: flex; - flex-direction: column; - - .top-bar-row { - height: 60px; - display: flex; - justify-content: space-between; - padding: 0 24px; - - .center { - display: flex; - align-items: center; - justify-content: center; - margin: 0 50px; - } - - .app-name { - font-family: 'OpenSans Extrabold', sans-serif; - margin-left: 10px; - height: 20px; - font-size: 13px; - font-weight: 800; - letter-spacing: 0; - line-height: 20px; - white-space: nowrap; - } - - .menu { - display: flex; - align-items: center; - overflow: hidden; - - &.right { - justify-content: flex-end; - } - } - } - - .divider { - height: 1px; - opacity: 0.15; - background-color: variables.$accent; - } -} - -.hidden { - display: none !important; -} - -.not-visible { - visibility: hidden; -} - -.pointer { - cursor: pointer; -} - -.mr-4 { - margin-right: 4px !important; -} - -.mr-8 { - margin-right: 8px !important; -} - -.mr-16 { - margin-right: 16px; -} - -.mr-34 { - margin-right: 34px; -} - -.fit-content { - width: fit-content; -} - -.d-flex { - display: flex; -} - -.cdk-overlay-container { - z-index: 800; -} diff --git a/apps/red-ui/src/assets/styles/red-progress-bar.scss b/apps/red-ui/src/assets/styles/red-progress-bar.scss deleted file mode 100644 index ebc09d45e..000000000 --- a/apps/red-ui/src/assets/styles/red-progress-bar.scss +++ /dev/null @@ -1,16 +0,0 @@ -@use 'variables'; - -.mat-progress-bar { - height: 6px; - border-radius: 3px; - - .mat-progress-bar-buffer { - background-color: variables.$grey-4; - } - - &.green { - .mat-progress-bar-fill::after { - background-color: variables.$green-2; - } - } -} diff --git a/apps/red-ui/src/assets/styles/red-select.scss b/apps/red-ui/src/assets/styles/red-select.scss deleted file mode 100644 index 794f5ed6e..000000000 --- a/apps/red-ui/src/assets/styles/red-select.scss +++ /dev/null @@ -1,23 +0,0 @@ -@use 'variables'; -@use 'common-mixins'; - -.mat-select-panel { - @include common-mixins.scroll-bar; - - .mat-option { - &:hover:not(.mat-option-disabled), - &:focus:not(.mat-option-disabled) { - background-color: variables.$grey-6; - } - - &.mat-selected:not(.mat-option-multiple) { - background-color: rgba(variables.$primary, 0.2); - color: variables.$accent; - } - } -} - -.mat-form-field.no-label .mat-form-field-infix { - padding: 0 !important; - border-top: 0 !important; -} diff --git a/apps/red-ui/src/assets/styles/red-slider.scss b/apps/red-ui/src/assets/styles/red-slider.scss deleted file mode 100644 index 7bb1b099a..000000000 --- a/apps/red-ui/src/assets/styles/red-slider.scss +++ /dev/null @@ -1,50 +0,0 @@ -@use 'variables'; - -.mat-slider-horizontal { - width: 140px; - height: 32px !important; - - .mat-slider-wrapper { - left: 0 !important; - top: 16px !important; - } - - .mat-slider-track-wrapper, - .mat-slider-track-fill { - height: 6px !important; - border-radius: 3px; - } - - // For disabled state - .mat-slider-track-fill { - background-color: variables.$primary; - } - - .mat-slider-track-background { - height: 4px !important; - margin-top: 1px; - border-radius: 3px; - background-color: variables.$grey-4 !important; - } - - .mat-slider-focus-ring { - display: none; - } -} - -.mat-slider-thumb { - width: 16px !important; - height: 16px !important; - border-width: 0 !important; - background-color: variables.$primary !important; -} - -.mat-slider:not(.mat-slider-disabled):not(.mat-slider-sliding) .mat-slider-thumb { - transform: scale(1) !important; -} - -.mat-slider-horizontal.mat-slider-disabled { - .mat-slider-thumb { - transform: translateX(-3px); - } -} diff --git a/apps/red-ui/src/assets/styles/red-tables.scss b/apps/red-ui/src/assets/styles/red-tables.scss deleted file mode 100644 index d6165357b..000000000 --- a/apps/red-ui/src/assets/styles/red-tables.scss +++ /dev/null @@ -1,23 +0,0 @@ -@use 'variables'; - -.default-table { - border-collapse: collapse; - - th, - td { - padding: 8px; - text-align: left; - border: 1px solid variables.$separator; - } -} - -.table-header-actions { - display: flex; - flex: 1; - align-items: center; - justify-content: flex-end; - - > *:not(:last-child) { - margin-right: 10px; - } -} diff --git a/apps/red-ui/src/assets/styles/red-tabs.scss b/apps/red-ui/src/assets/styles/red-tabs.scss deleted file mode 100644 index d7f6675a9..000000000 --- a/apps/red-ui/src/assets/styles/red-tabs.scss +++ /dev/null @@ -1,29 +0,0 @@ -@use 'variables'; - -.red-tab { - &:not(:last-child) { - margin-right: 2px; - } - - height: 30px; - line-height: 30px; - padding: 0 14px; - border-radius: 17px; - transition: background-color 0.2s; - cursor: pointer; - - &:not(.disabled):not(.active):hover { - background-color: variables.$grey-6; - } - - &.active { - background-color: rgba(variables.$primary, 0.1); - font-weight: 600; - color: variables.$primary; - } - - &.disabled { - color: rgba(variables.$accent, 0.3); - cursor: not-allowed; - } -} diff --git a/apps/red-ui/src/assets/styles/red-theme.scss b/apps/red-ui/src/assets/styles/red-theme.scss index 7b489a8af..fcc44fbd7 100644 --- a/apps/red-ui/src/assets/styles/red-theme.scss +++ b/apps/red-ui/src/assets/styles/red-theme.scss @@ -1,23 +1,4 @@ -@use 'red-fonts'; @use '~ngx-toastr/toastr'; @use 'red-material-theme'; -@use 'red-page-layout'; -@use 'red-select'; -@use 'red-autocomplete'; -@use 'red-list'; -@use 'red-checkbox'; -@use 'red-toggle'; -@use 'red-toggle-button'; -@use 'red-menu'; -@use 'red-tables'; @use 'red-components'; -@use 'red-controls'; -@use 'red-toasts'; -@use 'red-tooltips'; -@use 'red-breadcrumbs'; @use 'red-editor'; -@use 'red-slider'; -@use 'red-loading'; -@use 'red-progress-bar'; -@use 'red-tabs'; -@use 'red-help-mode'; diff --git a/apps/red-ui/src/assets/styles/red-toasts.scss b/apps/red-ui/src/assets/styles/red-toasts.scss deleted file mode 100644 index 4e7520593..000000000 --- a/apps/red-ui/src/assets/styles/red-toasts.scss +++ /dev/null @@ -1,110 +0,0 @@ -@use 'variables'; - -$toast-width: 400px; - -.toast-container .ngx-toastr, -.inline-dialog-toast { - padding: 11px 16px; - border-radius: 8px; - background-image: none; - font-family: Inter, sans-serif; - font-size: 13px; - line-height: 18px; - width: $toast-width; - display: flex; - justify-content: space-between; - align-items: center; - box-shadow: none; - - > *:not(:last-child) { - margin-right: 10px; - } - - &:hover { - box-shadow: none; - } - - .actions-wrapper { - margin-top: 24px; - display: flex; - - > *:not(:last-child) { - margin-right: 24px; - } - - a { - font-size: 11px; - font-weight: 600; - line-height: 14px; - color: variables.$accent; - text-transform: uppercase; - cursor: pointer; - } - } -} - -.toast-top-right { - top: 128px; - right: calc(50% - #{$toast-width} / 2); -} - -.toast-file-preview { - top: 160px; - right: 405px; -} - -.toast-close-button { - position: initial; - opacity: 1; - text-shadow: none; - - mat-icon { - width: 10px; - } - - &:hover { - opacity: 1; - } -} - -.toast-warning, -.toast-success { - .toast-message { - color: variables.$accent; - } - - .toast-close-button { - color: variables.$accent; - } -} - -.toast-error, -.toast-info { - .toast-close-button:hover { - color: variables.$white; - } -} - -.toast-success { - background-color: variables.$green-2; -} - -.toast-error { - background-color: variables.$primary; - color: variables.$white; -} - -.toast-warning { - background-color: variables.$yellow-2; - color: variables.$accent; -} - -.toast-info { - background-color: variables.$accent; -} - -.inline-dialog-toast { - width: calc(100% - 96px); - margin-left: 32px; - margin-top: 14px; -} diff --git a/apps/red-ui/src/assets/styles/red-toggle-button.scss b/apps/red-ui/src/assets/styles/red-toggle-button.scss deleted file mode 100644 index 808f4f61c..000000000 --- a/apps/red-ui/src/assets/styles/red-toggle-button.scss +++ /dev/null @@ -1,23 +0,0 @@ -@use 'variables'; - -.mat-button-toggle-standalone, -.mat-button-toggle-group { - box-shadow: none; - border-radius: 100px !important; - width: fit-content; - - .mat-button-toggle:not(.mat-button-toggle-checked) { - .mat-button-toggle-button { - background: variables.$grey-6; - color: variables.$grey-7; - } - } -} - -.mat-button-toggle-disabled { - .mat-button-toggle-button { - cursor: not-allowed !important; - } - - outline: none; -} diff --git a/apps/red-ui/src/assets/styles/red-toggle.scss b/apps/red-ui/src/assets/styles/red-toggle.scss deleted file mode 100644 index 270388615..000000000 --- a/apps/red-ui/src/assets/styles/red-toggle.scss +++ /dev/null @@ -1,42 +0,0 @@ -@use 'variables'; - -.mat-slide-toggle { - .mat-slide-toggle-bar { - height: 16px !important; - width: 30px !important; - border-radius: 16px !important; - background-color: variables.$grey-4; - } - - .mat-slide-toggle-thumb-container { - top: 2px !important; - left: 2px !important; - height: 12px !important; - width: 12px !important; - } - - .mat-slide-toggle-thumb { - height: 12px !important; - width: 12px !important; - box-shadow: none; - background-color: variables.$grey-2; - } - - .mat-ripple { - display: none; - } - - &.mat-primary.mat-checked { - .mat-slide-toggle-bar { - background-color: variables.$primary; - } - - .mat-slide-toggle-thumb { - background-color: variables.$white; - } - - .mat-slide-toggle-thumb-container { - transform: translate3d(14px, 0, 0); - } - } -} diff --git a/apps/red-ui/src/assets/styles/red-tooltips.scss b/apps/red-ui/src/assets/styles/red-tooltips.scss deleted file mode 100644 index 84a8655ef..000000000 --- a/apps/red-ui/src/assets/styles/red-tooltips.scss +++ /dev/null @@ -1,62 +0,0 @@ -@use 'variables'; - -.mat-tooltip { - background-color: variables.$accent; - border-radius: 3px !important; - padding: 10px; - margin: 12px !important; - font-size: 11px; - line-height: 14px; - color: variables.$white !important; - position: relative; - overflow: visible !important; - text-align: center; - - //&:after { - // content: ''; - // position: absolute; - // left: 50%; - // margin-left: -5px; - // width: 0; - // height: 0; - // z-index: 3000; - // border-left: solid 5px transparent; - // border-right: solid 5px transparent; - // border-top: solid 6px $accent; - //} - - &.small { - max-width: 160px; - } - - &.warn { - background-color: variables.$yellow-2; - color: variables.$accent !important; - - //&:after { - // border-top: solid 6px $yellow-2; - //} - } -} - -// -//.mat-tooltip[style*='transform-origin: center top']:after { -// top: -6px; -// transform: rotate(180deg); -//} -// -//.mat-tooltip[style*='transform-origin: center bottom']:after { -// top: 100%; -//} -// -//.mat-tooltip[style*='transform-origin: right center']:after { -// top: 50%; -// left: 100%; -// transform: rotate(-90deg) translateY(3px) translateX(3px); -//} -// -//.mat-tooltip[style*='transform-origin: left center']:after { -// top: 50%; -// left: 0; -// transform: rotate(90deg) translateY(3px) translateX(-3px); -//} diff --git a/apps/red-ui/src/styles.scss b/apps/red-ui/src/styles.scss index 17cb7360b..91c598cbb 100644 --- a/apps/red-ui/src/styles.scss +++ b/apps/red-ui/src/styles.scss @@ -16,6 +16,8 @@ $iqser-btn-bg: vars.$btn-bg, $iqser-warn: vars.$warn, $iqser-white: vars.$white, + $iqser-black: vars.$black, + $iqser-light: vars.$light, $iqser-separator: vars.$separator, $iqser-quick-filter-border: vars.$quick-filter-border, $iqser-grey-2: vars.$grey-2, @@ -23,6 +25,11 @@ $iqser-grey-4: vars.$grey-4, $iqser-grey-5: vars.$grey-5, $iqser-grey-6: vars.$grey-6, + $iqser-grey-7: vars.$grey-7, + $iqser-green-1: vars.$green-1, + $iqser-green-2: vars.$green-2, + $iqser-yellow-1: vars.$yellow-1, + $iqser-yellow-2: vars.$yellow-2, $iqser-helpmode-primary: vars.$green-2 ); diff --git a/libs/common-ui b/libs/common-ui index 25d66040d..5eda852e9 160000 --- a/libs/common-ui +++ b/libs/common-ui @@ -1 +1 @@ -Subproject commit 25d66040d01d06520a4497d88395903b95121e3b +Subproject commit 5eda852e94ea98a48d8f5354b7ae7f31be94d575 diff --git a/package.json b/package.json index ddb3241e5..71ad9e49a 100644 --- a/package.json +++ b/package.json @@ -1,12 +1,12 @@ { "name": "redaction", - "version": "2.246.0", + "version": "2.248.0", "private": true, "license": "MIT", "scripts": { "build": "nx build", "build-lint-all": "ng lint --project=red-ui-http --fix && ng lint --project=red-ui --fix && ng lint --project=common-ui --fix && ng build --project=red-ui --configuration production --base-href /ui/", - "build-paligo-styles": "mkdir -p dist/paligo-styles && sass --load-path=. paligo-styles/style.scss > dist/paligo-styles/redacto-theme.css && cp -r apps/red-ui/src/assets/font dist/paligo-styles/fonts", + "build-paligo-styles": "mkdir -p dist/paligo-styles && sass --load-path=. paligo-styles/style.scss > dist/paligo-styles/redacto-theme.css && cp -r libs/common-ui/src/assets/font dist/paligo-styles/fonts", "i18n:extract": "ngx-translate-extract --input ./apps/red-ui/src ./libs/common-ui/src --output apps/red-ui/src/assets/i18n/en.json --clean --sort --format namespaced-json && prettier apps/red-ui/src/assets/i18n/*.json --write", "postinstall": "ngcc --properties es2015 browser module main", "lint": "ng lint --project=red-ui-http --fix && ng lint --project=red-ui --fix && ng lint --project=common-ui --fix", diff --git a/paligo-theme.tar.gz b/paligo-theme.tar.gz index f80405cc9..2c121ff6e 100644 Binary files a/paligo-theme.tar.gz and b/paligo-theme.tar.gz differ diff --git a/paligo-theme/paligo-styles/redacto-theme.css b/paligo-theme/paligo-styles/redacto-theme.css index f7dd59d9d..64ea093c4 100644 --- a/paligo-theme/paligo-styles/redacto-theme.css +++ b/paligo-theme/paligo-styles/redacto-theme.css @@ -332,6 +332,8 @@ li.searchresultitem { --iqser-btn-bg: #f0f1f4; --iqser-warn: #fdbd00; --iqser-white: white; + --iqser-black: black; + --iqser-light: white; --iqser-separator: rgba(226, 228, 233, 0.9); --iqser-quick-filter-border: #d3d5da; --iqser-grey-2: #f4f5f7; @@ -339,6 +341,11 @@ li.searchresultitem { --iqser-grey-4: #e2e4e9; --iqser-grey-5: #d3d5da; --iqser-grey-6: #f0f1f4; + --iqser-grey-7: #9398a0; + --iqser-green-1: #00ff00; + --iqser-green-2: #5ce594; + --iqser-yellow-1: #ffb83b; + --iqser-yellow-2: #fdbd00; --iqser-helpmode-primary: green; }