From b7c9d37ef20d985b59932fd21c4ac9bd985e33f6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adina=20=C8=9Aeudan?= Date: Mon, 14 Dec 2020 22:24:27 +0200 Subject: [PATCH] Empty project --- apps/red-ui/src/app/app.module.ts | 2 - .../icon-button/icon-button.component.html | 9 +- .../icon-button/icon-button.component.ts | 3 +- .../dictionary-listing-screen.component.html | 2 +- .../dictionary-overview-screen.component.html | 2 +- .../rules-screen/rules-screen.component.html | 2 +- .../project-overview-empty.component.html | 21 -- .../project-overview-empty.component.scss | 9 - .../project-overview-empty.component.ts | 17 -- .../project-listing-screen.component.html | 2 +- .../project-overview-screen.component.html | 270 +++++++++--------- apps/red-ui/src/assets/i18n/en.json | 5 +- .../src/assets/styles/red-page-layout.scss | 23 ++ 13 files changed, 181 insertions(+), 186 deletions(-) delete mode 100644 apps/red-ui/src/app/screens/empty-states/project-overview-empty/project-overview-empty.component.html delete mode 100644 apps/red-ui/src/app/screens/empty-states/project-overview-empty/project-overview-empty.component.scss delete mode 100644 apps/red-ui/src/app/screens/empty-states/project-overview-empty/project-overview-empty.component.ts diff --git a/apps/red-ui/src/app/app.module.ts b/apps/red-ui/src/app/app.module.ts index 253ffde75..e398193a7 100644 --- a/apps/red-ui/src/app/app.module.ts +++ b/apps/red-ui/src/app/app.module.ts @@ -68,7 +68,6 @@ import { TableColNameComponent } from './components/table-col-name/table-col-nam import { ProjectDetailsComponent } from './screens/project-overview-screen/project-details/project-details.component'; import { PageIndicatorComponent } from './screens/file/page-indicator/page-indicator.component'; import { NeedsWorkBadgeComponent } from './components/needs-work-badge/needs-work-badge.component'; -import { ProjectOverviewEmptyComponent } from './screens/empty-states/project-overview-empty/project-overview-empty.component'; import { ProjectListingEmptyComponent } from './screens/empty-states/project-listing-empty/project-listing-empty.component'; import { AnnotationActionsComponent } from './screens/file/annotation-actions/annotation-actions.component'; import { ProjectListingDetailsComponent } from './screens/project-listing-screen/project-listing-details/project-listing-details.component'; @@ -264,7 +263,6 @@ const matImports = [ ProjectDetailsComponent, PageIndicatorComponent, NeedsWorkBadgeComponent, - ProjectOverviewEmptyComponent, ProjectListingEmptyComponent, AnnotationActionsComponent, ProjectListingEmptyComponent, diff --git a/apps/red-ui/src/app/components/buttons/icon-button/icon-button.component.html b/apps/red-ui/src/app/components/buttons/icon-button/icon-button.component.html index b6f760eec..5f7c9657f 100644 --- a/apps/red-ui/src/app/components/buttons/icon-button/icon-button.component.html +++ b/apps/red-ui/src/app/components/buttons/icon-button/icon-button.component.html @@ -1,4 +1,11 @@ - diff --git a/apps/red-ui/src/app/components/buttons/icon-button/icon-button.component.ts b/apps/red-ui/src/app/components/buttons/icon-button/icon-button.component.ts index acbc8958b..3dd79bc13 100644 --- a/apps/red-ui/src/app/components/buttons/icon-button/icon-button.component.ts +++ b/apps/red-ui/src/app/components/buttons/icon-button/icon-button.component.ts @@ -9,9 +9,8 @@ export class IconButtonComponent implements OnInit { @Input() icon: string; @Input() text: string; @Input() showDot = false; - @Input() primary = false; @Input() disabled = false; - @Input() type: 'default' | 'show-bg' = 'default'; + @Input() type: 'default' | 'show-bg' | 'primary' = 'default'; @Output() action = new EventEmitter(); constructor() {} diff --git a/apps/red-ui/src/app/screens/admin/dictionary-listing-screen/dictionary-listing-screen.component.html b/apps/red-ui/src/app/screens/admin/dictionary-listing-screen/dictionary-listing-screen.component.html index 355b01d23..59c630664 100644 --- a/apps/red-ui/src/app/screens/admin/dictionary-listing-screen/dictionary-listing-screen.component.html +++ b/apps/red-ui/src/app/screens/admin/dictionary-listing-screen/dictionary-listing-screen.component.html @@ -15,7 +15,7 @@ icon="red:plus" (action)="openAddEditDictionaryDialog()" text="dictionary-listing.add-new" - [primary]="true" + type="primary" >
diff --git a/apps/red-ui/src/app/screens/admin/rules-screen/rules-screen.component.html b/apps/red-ui/src/app/screens/admin/rules-screen/rules-screen.component.html index 1a5d45b49..11ab85c1e 100644 --- a/apps/red-ui/src/app/screens/admin/rules-screen/rules-screen.component.html +++ b/apps/red-ui/src/app/screens/admin/rules-screen/rules-screen.component.html @@ -52,7 +52,7 @@ icon="red:check" (action)="save()" text="rules-screen.save-changes" - [primary]="true" + type="primary" >
diff --git a/apps/red-ui/src/app/screens/empty-states/project-overview-empty/project-overview-empty.component.html b/apps/red-ui/src/app/screens/empty-states/project-overview-empty/project-overview-empty.component.html deleted file mode 100644 index f005459fd..000000000 --- a/apps/red-ui/src/app/screens/empty-states/project-overview-empty/project-overview-empty.component.html +++ /dev/null @@ -1,21 +0,0 @@ -
-
- -
-
- - - - - -
-
diff --git a/apps/red-ui/src/app/screens/empty-states/project-overview-empty/project-overview-empty.component.scss b/apps/red-ui/src/app/screens/empty-states/project-overview-empty/project-overview-empty.component.scss deleted file mode 100644 index 450d3794e..000000000 --- a/apps/red-ui/src/app/screens/empty-states/project-overview-empty/project-overview-empty.component.scss +++ /dev/null @@ -1,9 +0,0 @@ -.file-upload-input { - display: none; -} - -.close-btn { - position: absolute; - top: 10px; - right: 14px; -} diff --git a/apps/red-ui/src/app/screens/empty-states/project-overview-empty/project-overview-empty.component.ts b/apps/red-ui/src/app/screens/empty-states/project-overview-empty/project-overview-empty.component.ts deleted file mode 100644 index 2a5b282c2..000000000 --- a/apps/red-ui/src/app/screens/empty-states/project-overview-empty/project-overview-empty.component.ts +++ /dev/null @@ -1,17 +0,0 @@ -import { Component, EventEmitter, Output } from '@angular/core'; -import { AppStateService } from '../../../state/app-state.service'; - -@Component({ - selector: 'redaction-project-overview-empty', - templateUrl: './project-overview-empty.component.html', - styleUrls: ['./project-overview-empty.component.scss'] -}) -export class ProjectOverviewEmptyComponent { - @Output() uploadFiles = new EventEmitter(); - - constructor(public appStateService: AppStateService) {} - - handleFileUploadEvent($event: Event) { - this.uploadFiles.emit(($event.target as HTMLInputElement).files); - } -} diff --git a/apps/red-ui/src/app/screens/project-listing-screen/project-listing-screen.component.html b/apps/red-ui/src/app/screens/project-listing-screen/project-listing-screen.component.html index 3e01d8411..ca927b0bd 100644 --- a/apps/red-ui/src/app/screens/project-listing-screen/project-listing-screen.component.html +++ b/apps/red-ui/src/app/screens/project-listing-screen/project-listing-screen.component.html @@ -33,7 +33,7 @@ icon="red:plus" (action)="openAddProjectDialog()" text="project-listing.add-new" - [primary]="true" + type="primary" > diff --git a/apps/red-ui/src/app/screens/project-overview-screen/project-overview-screen.component.html b/apps/red-ui/src/app/screens/project-overview-screen/project-overview-screen.component.html index 23c176b20..93ca31757 100644 --- a/apps/red-ui/src/app/screens/project-overview-screen/project-overview-screen.component.html +++ b/apps/red-ui/src/app/screens/project-overview-screen/project-overview-screen.component.html @@ -1,5 +1,4 @@ - -
+
-
-
-
- - +
+ +
+ + +
+ + +
+
+
+ + +
+ + + {{ 'project-overview.table-header.title' | translate: { length: displayedFiles.length || 0 } }} + + +
- - {{ 'project-overview.table-header.title' | translate: { length: displayedFiles.length || 0 } }} - +
+ +
- -
+ -
- -
+ - + - + - + - + +
+
- +
- -
-
+
+
+
+
+ +
-
- -
-
-
-
- -
- -
-
-
- {{ fileStatus.filename }} +
+
+
+ {{ fileStatus.filename }} +
+
-
-
-
-
- {{ fileStatus.added | date: 'd MMM. yyyy, hh:mm a' }} +
+
+ {{ fileStatus.added | date: 'd MMM. yyyy, hh:mm a' }} +
-
- -
- -
- -
- -
-
- -
- -
-
- - {{ fileStatus.numberOfPages }} + +
+
-
-
-
-
-
- +
+ +
+
+ +
-
- +
+
+ + {{ fileStatus.numberOfPages }} +
+
+ +
+
+
+
+ +
+ + +
+
-
-
+
@@ -276,3 +286,5 @@ + + diff --git a/apps/red-ui/src/assets/i18n/en.json b/apps/red-ui/src/assets/i18n/en.json index 3eb999dc7..c4b2c9ae5 100644 --- a/apps/red-ui/src/assets/i18n/en.json +++ b/apps/red-ui/src/assets/i18n/en.json @@ -159,6 +159,10 @@ "collapse": "Hide Details" }, "project-overview": { + "no-data": { + "title": "There are no documents yet.", + "action": "Upload Document" + }, "search": "Document name...", "header-actions": { "edit": "Edit", @@ -172,7 +176,6 @@ "under-approval": "For Approval", "approve": "Approve", "under-review": "Under Review", - "no-files": "Project is empty!", "no-files-match": "No File match your current filters", "upload-files": "Drop files anywhere for upload!", "upload-files-btn": "Upload Files", diff --git a/apps/red-ui/src/assets/styles/red-page-layout.scss b/apps/red-ui/src/assets/styles/red-page-layout.scss index d675eca94..9267eff66 100644 --- a/apps/red-ui/src/assets/styles/red-page-layout.scss +++ b/apps/red-ui/src/assets/styles/red-page-layout.scss @@ -81,6 +81,29 @@ body { width: 100%; height: 4px; } + + .no-data { + display: flex; + flex-direction: column; + align-items: center; + padding-top: 120px; + @include inset-shadow; + + > mat-icon { + height: 60px; + width: 60px; + opacity: 0.1; + } + + .heading-l { + color: $grey-7; + } + + > mat-icon, + .heading-l { + margin-bottom: 24px; + } + } } .right-container {