diff --git a/README.md b/README.md index de04acf53..2c37a0b3e 100644 --- a/README.md +++ b/README.md @@ -16,7 +16,7 @@ A [Serverless Framework](https://www.serverless.com/) ([AWS Lambda](https://aws. ### 4. [terraform/](terraform/) Terraform infrastructure as code to create the Research Hub AWS infrastructure. -### 4. [subhub-link-checker/](subhub-link-checker/) +### 5. [subhub-link-checker/](subhub-link-checker/) A [Contentful App Framework app](https://www.contentful.com/developers/docs/extensibility/app-framework/) that checks to prevent cyclical content references in SubHubs. ## Deployment CI/CD is achieved via the monorepo's [Jenkinsfile](Jenkinsfile) which is triggered when code is pushed to one of 4 Git branches (`sandbox`, `dev`, `test`, `prod`) corresponding to environments across the three [UoA AWS accounts](http://aws.auckland.ac.nz/) (`sandbox`, `nonprod`, `prod`). diff --git a/research-hub-web/src/app/components/articles/article/article.component.html b/research-hub-web/src/app/components/articles/article/article.component.html index ec0e1a370..8bb705641 100644 --- a/research-hub-web/src/app/components/articles/article/article.component.html +++ b/research-hub-web/src/app/components/articles/article/article.component.html @@ -46,6 +46,7 @@
diff --git a/research-hub-web/src/app/components/cards/cards-common.scss b/research-hub-web/src/app/components/cards/cards-common.scss index 0f633bd81..3b5b149da 100644 --- a/research-hub-web/src/app/components/cards/cards-common.scss +++ b/research-hub-web/src/app/components/cards/cards-common.scss @@ -19,7 +19,7 @@ */ .mat-card-title { line-height: 20px; - a { + span { color: $dark-grey; &:hover { border-bottom: solid 2px $dark-grey; diff --git a/research-hub-web/src/app/components/cards/contact-card/contact-card.component.html b/research-hub-web/src/app/components/cards/contact-card/contact-card.component.html index eac0e3335..54191f042 100644 --- a/research-hub-web/src/app/components/cards/contact-card/contact-card.component.html +++ b/research-hub-web/src/app/components/cards/contact-card/contact-card.component.html @@ -4,9 +4,10 @@
- + {{ person.name }} + {{ person.name }} diff --git a/research-hub-web/src/app/components/cards/contact-card/contact-card.component.ts b/research-hub-web/src/app/components/cards/contact-card/contact-card.component.ts index e115709a8..1df2ca6d1 100644 --- a/research-hub-web/src/app/components/cards/contact-card/contact-card.component.ts +++ b/research-hub-web/src/app/components/cards/contact-card/contact-card.component.ts @@ -15,7 +15,7 @@ export class ContactCardComponent { constructor() { } public navigateTo(url: string) { - location.href = url; + window.open(url, "_blank"); } } diff --git a/research-hub-web/src/app/components/cards/document-card/document-card.component.html b/research-hub-web/src/app/components/cards/document-card/document-card.component.html index e145f4d92..76d1d3a95 100644 --- a/research-hub-web/src/app/components/cards/document-card/document-card.component.html +++ b/research-hub-web/src/app/components/cards/document-card/document-card.component.html @@ -6,12 +6,8 @@
- - {{ document.title }} + + {{ document.title }} diff --git a/research-hub-web/src/app/components/cards/document-card/document-card.component.ts b/research-hub-web/src/app/components/cards/document-card/document-card.component.ts index c689543c0..ccc797bbd 100644 --- a/research-hub-web/src/app/components/cards/document-card/document-card.component.ts +++ b/research-hub-web/src/app/components/cards/document-card/document-card.component.ts @@ -15,6 +15,6 @@ export class DocumentCardComponent { constructor() { } public navigateTo(url: Maybe | undefined) { - if (url) location.href = url; + if (url) window.open(url, "_blank"); } } diff --git a/research-hub-web/src/app/components/cards/org-unit-card/org-unit-card.component.html b/research-hub-web/src/app/components/cards/org-unit-card/org-unit-card.component.html index ed8b21e55..2e8b72cc2 100644 --- a/research-hub-web/src/app/components/cards/org-unit-card/org-unit-card.component.html +++ b/research-hub-web/src/app/components/cards/org-unit-card/org-unit-card.component.html @@ -4,7 +4,7 @@
- + {{ orgUnit.name }} , {{ orgUnit.maoriName }} diff --git a/research-hub-web/src/app/components/cards/org-unit-card/org-unit-card.component.ts b/research-hub-web/src/app/components/cards/org-unit-card/org-unit-card.component.ts index 856be0409..7b9b63ba0 100644 --- a/research-hub-web/src/app/components/cards/org-unit-card/org-unit-card.component.ts +++ b/research-hub-web/src/app/components/cards/org-unit-card/org-unit-card.component.ts @@ -15,7 +15,7 @@ export class OrgUnitCardComponent { constructor() { } public navigateTo(url: string) { - location.href = url; + window.open(url, "_blank"); } } diff --git a/research-hub-web/src/app/components/cards/standard-card/standard-card.component.html b/research-hub-web/src/app/components/cards/standard-card/standard-card.component.html index 3cbe5862a..e76ea1c00 100644 --- a/research-hub-web/src/app/components/cards/standard-card/standard-card.component.html +++ b/research-hub-web/src/app/components/cards/standard-card/standard-card.component.html @@ -25,13 +25,15 @@ contentItem.slug ]" > - {{ contentItem.title }} + {{ contentItem.title }} +   + + lock + + -   - - lock - +

{{ contentItem.summary }}

diff --git a/research-hub-web/src/app/components/cards/standard-card/standard-card.component.scss b/research-hub-web/src/app/components/cards/standard-card/standard-card.component.scss index 2cebf4b66..b399b15e2 100644 --- a/research-hub-web/src/app/components/cards/standard-card/standard-card.component.scss +++ b/research-hub-web/src/app/components/cards/standard-card/standard-card.component.scss @@ -7,7 +7,7 @@ background: rgb(255, 255, 255); } .mat-card-title { - >a { + span { color: white; &:hover { border-bottom: solid 2px white; @@ -28,6 +28,7 @@ mat-icon { font-size: 16px; height: 16px; width: 16px; + color: $dark-grey; } img { diff --git a/research-hub-web/src/app/components/layout/search-bar/search-bar.component.html b/research-hub-web/src/app/components/layout/search-bar/search-bar.component.html index 70b3f612c..cc3aa978e 100644 --- a/research-hub-web/src/app/components/layout/search-bar/search-bar.component.html +++ b/research-hub-web/src/app/components/layout/search-bar/search-bar.component.html @@ -35,7 +35,8 @@ id="search" #searchBox type="search" - (keydown.enter)="search()" + #trigger="matAutocompleteTrigger" + (keydown.enter)="search(); trigger.closePanel()" placeholder="Search for anything" [matAutocomplete]="auto" [formControl]="searchText" diff --git a/research-hub-web/src/app/components/layout/search-bar/search-bar.component.ts b/research-hub-web/src/app/components/layout/search-bar/search-bar.component.ts index 98d678e3c..313356804 100644 --- a/research-hub-web/src/app/components/layout/search-bar/search-bar.component.ts +++ b/research-hub-web/src/app/components/layout/search-bar/search-bar.component.ts @@ -16,7 +16,7 @@ import { filter, map, startWith } from 'rxjs/operators'; export class SearchBarComponent implements OnInit, OnDestroy { @ViewChild('searchBarContainer') searchBarContainer: ElementRef; @ViewChild('searchBox') searchBox: ElementRef; - @ViewChild('filterContent') filterContent: ElementRef + @ViewChild('filterContent') filterContent: ElementRef; public searchText: FormControl = new FormControl(); public activeFilters: SearchFilters; 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/body-media/blocks-embedded-asset/blocks-embedded-asset.component.html b/research-hub-web/src/app/components/shared/body-media/blocks-embedded-asset/blocks-embedded-asset.component.html index b1ca6b1bc..d5bd86049 100644 --- a/research-hub-web/src/app/components/shared/body-media/blocks-embedded-asset/blocks-embedded-asset.component.html +++ b/research-hub-web/src/app/components/shared/body-media/blocks-embedded-asset/blocks-embedded-asset.component.html @@ -2,7 +2,7 @@
- + {{ contentItem.title }} @@ -15,7 +15,7 @@
- + {{ contentItem.title }}
{{ contentItem.title }}  — {{ contentItem.description @@ -43,7 +43,7 @@
- + {{ contentItem.title }} 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 bf2193283..39d6d6008 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 @@ -22,7 +22,7 @@ -
+
- - - 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)} - } -} diff --git a/research-hub-web/src/styles.scss b/research-hub-web/src/styles.scss index afec68205..09d99429b 100644 --- a/research-hub-web/src/styles.scss +++ b/research-hub-web/src/styles.scss @@ -134,20 +134,33 @@ a { color: $link-light-bg-color; font-family: $font-family; } - -// show icon for external links -// page below is good for checking -// http://localhost:4200/research-impact/planning-for-impact -// a:not([href^="/"]):after { -// font-family: "Material Icons"; -// content: " \e895"; -// font-size: 0.8em; -// } - span { font-family: $font-family; } +/** +* External Links Icon +* Show the icon for any anchor tags in the main-content area where: +* - href does not start with '/' (our domain) +* - href does not contain @ (emails) +* - do not apply to those with .standard-button class +* - do not apply to descendents of element app-blocks-embedded-asset +* - do not apply to link cards or funding application docs +* - show the mail icon for email links within rich text +*/ +#main-content a:not([href^="/"]):not([href*="//research-hub"]):not([href*="@"]):not([href^="tel"]):not(.standard-button):not(app-blocks-embedded-asset *):not(.link-card *):not(.application-doc *):not(.banner-container-home *):after { + font-family: "Material Icons"; + content: " \e895"; + font-size: 0.8em; + color: $dark-grey; +} +ngx-contentful-rich-text a[href^="mailto"]:after { + font-family: "Material Icons"; + content: " \e0e1"; + font-size: 0.8em; + color: $dark-grey; +} + /* * app-markdown related styles */ @@ -168,7 +181,7 @@ span { } /* - * Gloabl styles and Material overrides + * Global styles and Material overrides */ mat-chip.mat-chip { font-size: mat-font-size($app-chips-typography, button);