From 4f4ea14536d6406e61a88e615cb93058c28edf8b Mon Sep 17 00:00:00 2001 From: Timo Date: Fri, 11 Dec 2020 11:04:46 +0200 Subject: [PATCH] minor Ui fixes --- apps/red-ui/src/app/icons/icons.module.ts | 1 + .../dictionary-overview-screen.component.scss | 4 ---- .../base-screen/base-screen.component.html | 11 +++++++++++ .../base-screen/base-screen.component.ts | 18 +++++++++++++++++- .../service/file-drop-overlay.service.ts | 6 ++++-- .../upload-status-overlay.component.scss | 4 ---- apps/red-ui/src/assets/config/config.json | 2 +- apps/red-ui/src/assets/i18n/en.json | 3 ++- .../src/assets/icons/general/back-arrow.svg | 9 +++++++++ .../src/assets/styles/red-breadcrumbs.scss | 11 +++++++++++ .../red-ui/src/assets/styles/red-controls.scss | 4 ++++ 11 files changed, 60 insertions(+), 13 deletions(-) create mode 100644 apps/red-ui/src/assets/icons/general/back-arrow.svg diff --git a/apps/red-ui/src/app/icons/icons.module.ts b/apps/red-ui/src/app/icons/icons.module.ts index 8f3a5b189..f7a9696b5 100644 --- a/apps/red-ui/src/app/icons/icons.module.ts +++ b/apps/red-ui/src/app/icons/icons.module.ts @@ -18,6 +18,7 @@ export class IconsModule { 'arrow-right', 'assign', 'assign-me', + 'back-arrow', 'calendar', 'check', 'close', diff --git a/apps/red-ui/src/app/screens/admin/dictionary-overview-screen/dictionary-overview-screen.component.scss b/apps/red-ui/src/app/screens/admin/dictionary-overview-screen/dictionary-overview-screen.component.scss index f7d9ce007..035108650 100644 --- a/apps/red-ui/src/app/screens/admin/dictionary-overview-screen/dictionary-overview-screen.component.scss +++ b/apps/red-ui/src/app/screens/admin/dictionary-overview-screen/dictionary-overview-screen.component.scss @@ -73,10 +73,6 @@ mat-icon { max-width: 14px; margin-left: 8px; - - &.transform-180 { - transform: rotate(180deg); - } } } } diff --git a/apps/red-ui/src/app/screens/base-screen/base-screen.component.html b/apps/red-ui/src/app/screens/base-screen/base-screen.component.html index 05c5b4433..7209002fc 100644 --- a/apps/red-ui/src/app/screens/base-screen/base-screen.component.html +++ b/apps/red-ui/src/app/screens/base-screen/base-screen.component.html @@ -25,8 +25,19 @@ routerLink="/ui/projects" translate="top-bar.navigation-items.projects" routerLinkActive="active" + *ngIf="projectsView" [routerLinkActiveOptions]="{ exact: true }" > + + + {{ 'top-bar.navigation-items.back-to-projects' | translate }} + { + this._projectsView = this._router.url.indexOf('/ui/projects') === 0; + }); + } get user() { return this._userService.user; } + get projectsView() { + return this._projectsView; + } + + get settingsView() { + return !this._projectsView; + } + logout() { this._userService.logout(); } diff --git a/apps/red-ui/src/app/upload/file-drop/service/file-drop-overlay.service.ts b/apps/red-ui/src/app/upload/file-drop/service/file-drop-overlay.service.ts index 26dde1793..69c2526c9 100644 --- a/apps/red-ui/src/app/upload/file-drop/service/file-drop-overlay.service.ts +++ b/apps/red-ui/src/app/upload/file-drop/service/file-drop-overlay.service.ts @@ -35,8 +35,10 @@ export class FileDropOverlayService { e.preventDefault(); e.stopPropagation(); if (e.toElement == null && e.relatedTarget == null) { - this._mouseIn = false; - this.closeFileDropOverlay(); + setTimeout(() => { + this._mouseIn = false; + this.closeFileDropOverlay(); + }, 250); } return false; }; diff --git a/apps/red-ui/src/app/upload/upload-status-dialog/upload-status-overlay.component.scss b/apps/red-ui/src/app/upload/upload-status-dialog/upload-status-overlay.component.scss index 3877a22e3..c9edc8fa9 100644 --- a/apps/red-ui/src/app/upload/upload-status-dialog/upload-status-overlay.component.scss +++ b/apps/red-ui/src/app/upload/upload-status-dialog/upload-status-overlay.component.scss @@ -34,10 +34,6 @@ section { padding-left: 8px; padding-right: 8px; - &.transform-180 { - transform: rotate(180deg); - } - mat-icon { width: 10px; } diff --git a/apps/red-ui/src/assets/config/config.json b/apps/red-ui/src/assets/config/config.json index d447e7e9e..bfcb40971 100644 --- a/apps/red-ui/src/assets/config/config.json +++ b/apps/red-ui/src/assets/config/config.json @@ -1,5 +1,5 @@ { "OAUTH_URL": "https://redkc-staging.iqser.cloud/auth/realms/redaction", "OAUTH_CLIENT_ID": "redaction", - "API_URL": "https://redapi-staging.iqser.cloud" + "API_URL": "https://timo-redaction-dev.iqser.cloud" } diff --git a/apps/red-ui/src/assets/i18n/en.json b/apps/red-ui/src/assets/i18n/en.json index f1fe91c61..a795cc2fc 100644 --- a/apps/red-ui/src/assets/i18n/en.json +++ b/apps/red-ui/src/assets/i18n/en.json @@ -39,9 +39,10 @@ "top-bar": { "navigation-items": { "projects": "Projects", + "back-to-projects": "Back to Projects", "my-account": { "children": { - "admin": "Management", + "admin": "Settings", "language": { "label": "Language", "english": "English", diff --git a/apps/red-ui/src/assets/icons/general/back-arrow.svg b/apps/red-ui/src/assets/icons/general/back-arrow.svg new file mode 100644 index 000000000..5dbf99f08 --- /dev/null +++ b/apps/red-ui/src/assets/icons/general/back-arrow.svg @@ -0,0 +1,9 @@ + + + + + diff --git a/apps/red-ui/src/assets/styles/red-breadcrumbs.scss b/apps/red-ui/src/assets/styles/red-breadcrumbs.scss index 5d70ef063..8ce4eb5be 100644 --- a/apps/red-ui/src/assets/styles/red-breadcrumbs.scss +++ b/apps/red-ui/src/assets/styles/red-breadcrumbs.scss @@ -13,6 +13,17 @@ width: fit-content; white-space: nowrap; + &.back-to-projects { + display: flex !important; + justify-content: center; + align-items: center; + + mat-icon { + margin-right: 4px; + color: $primary; + } + } + &:last-child { @include line-clamp(1); } diff --git a/apps/red-ui/src/assets/styles/red-controls.scss b/apps/red-ui/src/assets/styles/red-controls.scss index f8ac880d9..461f5a222 100644 --- a/apps/red-ui/src/assets/styles/red-controls.scss +++ b/apps/red-ui/src/assets/styles/red-controls.scss @@ -36,3 +36,7 @@ width: 10px; height: 10px; } + +.transform-180 { + transform: rotate(180deg); +}