From bf6df15cda1ca6b7131433f34daf36271ad020b7 Mon Sep 17 00:00:00 2001 From: rosemcc Date: Tue, 14 Dec 2021 13:16:08 +1300 Subject: [PATCH 01/13] delete unused components --- .../components/shared/app.shared.module.ts | 5 ---- .../confirm-dialog.component.html | 9 ------- .../confirm-dialog.component.scss | 0 .../confirm-dialog.component.ts | 22 ---------------- .../error-dialog/error-dialog.component.html | 3 --- .../error-dialog/error-dialog.component.scss | 0 .../error-dialog/error-dialog.component.ts | 26 ------------------- 7 files changed, 65 deletions(-) delete mode 100644 research-hub-web/src/app/components/shared/confirm-dialog/confirm-dialog.component.html delete mode 100644 research-hub-web/src/app/components/shared/confirm-dialog/confirm-dialog.component.scss delete mode 100644 research-hub-web/src/app/components/shared/confirm-dialog/confirm-dialog.component.ts delete mode 100644 research-hub-web/src/app/components/shared/error-dialog/error-dialog.component.html delete mode 100644 research-hub-web/src/app/components/shared/error-dialog/error-dialog.component.scss delete mode 100644 research-hub-web/src/app/components/shared/error-dialog/error-dialog.component.ts diff --git a/research-hub-web/src/app/components/shared/app.shared.module.ts b/research-hub-web/src/app/components/shared/app.shared.module.ts index f41ea7947..efdd679d8 100644 --- a/research-hub-web/src/app/components/shared/app.shared.module.ts +++ b/research-hub-web/src/app/components/shared/app.shared.module.ts @@ -3,8 +3,6 @@ import { CommonModule } from '@angular/common'; import { FlexLayoutModule } from '@angular/flex-layout'; import { FormsModule, ReactiveFormsModule } from '@angular/forms'; import { MaterialModule } from '@app/app.material.module'; -import { ErrorDialogComponent } from './error-dialog/error-dialog.component'; -import { ConfirmDialogComponent } from './confirm-dialog/confirm-dialog.component'; import { HumanCasePipe } from '@pipes/human-case.pipe'; import { ContentTypeDisplayNamePipe } from '@pipes/content-type-display-name.pipe'; import { CollectionListComponent } from './collection-list/collection-list.component'; @@ -39,8 +37,6 @@ import { ExpandablePagePartComponent } from './body-media/expandable-page-part/e MarkdownModule.forRoot() ], declarations: [ - ErrorDialogComponent, - ConfirmDialogComponent, HumanCasePipe, ContentTypeDisplayNamePipe, CollectionListComponent, @@ -60,7 +56,6 @@ import { ExpandablePagePartComponent } from './body-media/expandable-page-part/e FormsModule, ReactiveFormsModule, MaterialModule, - ErrorDialogComponent, HumanCasePipe, ContentTypeDisplayNamePipe, CollectionListComponent, diff --git a/research-hub-web/src/app/components/shared/confirm-dialog/confirm-dialog.component.html b/research-hub-web/src/app/components/shared/confirm-dialog/confirm-dialog.component.html deleted file mode 100644 index a19d25edf..000000000 --- a/research-hub-web/src/app/components/shared/confirm-dialog/confirm-dialog.component.html +++ /dev/null @@ -1,9 +0,0 @@ -

{{title}}

- -

{{message}}

-
- - - - diff --git a/research-hub-web/src/app/components/shared/confirm-dialog/confirm-dialog.component.scss b/research-hub-web/src/app/components/shared/confirm-dialog/confirm-dialog.component.scss deleted file mode 100644 index e69de29bb..000000000 diff --git a/research-hub-web/src/app/components/shared/confirm-dialog/confirm-dialog.component.ts b/research-hub-web/src/app/components/shared/confirm-dialog/confirm-dialog.component.ts deleted file mode 100644 index c4305785c..000000000 --- a/research-hub-web/src/app/components/shared/confirm-dialog/confirm-dialog.component.ts +++ /dev/null @@ -1,22 +0,0 @@ -import {Component, Inject} from '@angular/core'; -import {MAT_DIALOG_DATA, MatDialogRef} from '@angular/material/dialog'; - -@Component({ - selector: 'app-confirm-dialog', - templateUrl: './confirm-dialog.component.html', - styleUrls: ['./confirm-dialog.component.scss'] -}) -export class ConfirmDialogComponent { - - public title: string; - public message: string; - - constructor(public dialogRef: MatDialogRef, @Inject(MAT_DIALOG_DATA) public data: any) { - this.title = data.title; - this.message = data.message; - } - - onNoClick(): void { - this.dialogRef.close(); - } -} diff --git a/research-hub-web/src/app/components/shared/error-dialog/error-dialog.component.html b/research-hub-web/src/app/components/shared/error-dialog/error-dialog.component.html deleted file mode 100644 index 56c198109..000000000 --- a/research-hub-web/src/app/components/shared/error-dialog/error-dialog.component.html +++ /dev/null @@ -1,3 +0,0 @@ -

{{title}}

-{{message}} - diff --git a/research-hub-web/src/app/components/shared/error-dialog/error-dialog.component.scss b/research-hub-web/src/app/components/shared/error-dialog/error-dialog.component.scss deleted file mode 100644 index e69de29bb..000000000 diff --git a/research-hub-web/src/app/components/shared/error-dialog/error-dialog.component.ts b/research-hub-web/src/app/components/shared/error-dialog/error-dialog.component.ts deleted file mode 100644 index 5466d3911..000000000 --- a/research-hub-web/src/app/components/shared/error-dialog/error-dialog.component.ts +++ /dev/null @@ -1,26 +0,0 @@ -import {Component, Inject, OnInit} from '@angular/core'; -import {MAT_DIALOG_DATA, MatDialogRef} from '@angular/material/dialog'; - -@Component({ - selector: 'app-error-dialog', - templateUrl: './error-dialog.component.html', - styleUrls: ['./error-dialog.component.scss'] -}) -export class ErrorDialogComponent implements OnInit { - - public title: string; - public message: string; - public closeButtonName: string; - private timeout: number; - - constructor(public dialogRef: MatDialogRef, @Inject(MAT_DIALOG_DATA) public data: any) { - this.title = data.title; - this.message = data.message; - this.closeButtonName = data.closeButtonName; - this.timeout = data.timeout; - } - - ngOnInit() { - if (this.timeout) { setTimeout(() => { this.dialogRef.close() }, this.timeout)} - } -} From 04c254211d537b7ff081f5096d23eb6c7704ab8b Mon Sep 17 00:00:00 2001 From: rosemcc Date: Tue, 14 Dec 2021 17:08:30 +1300 Subject: [PATCH 02/13] show external links icons --- .../blocks-embedded-entry.component.html | 2 +- research-hub-web/src/styles.scss | 35 +++++++++++++------ 2 files changed, 25 insertions(+), 12 deletions(-) diff --git a/research-hub-web/src/app/components/shared/body-media/blocks-embedded-entry/blocks-embedded-entry.component.html b/research-hub-web/src/app/components/shared/body-media/blocks-embedded-entry/blocks-embedded-entry.component.html index 44670add0..fbe4b2272 100644 --- a/research-hub-web/src/app/components/shared/body-media/blocks-embedded-entry/blocks-embedded-entry.component.html +++ b/research-hub-web/src/app/components/shared/body-media/blocks-embedded-entry/blocks-embedded-entry.component.html @@ -24,7 +24,7 @@ -
+