diff --git a/src/app/app-routing.module.ts b/src/app/app-routing.module.ts index d203abd..4fe88af 100644 --- a/src/app/app-routing.module.ts +++ b/src/app/app-routing.module.ts @@ -75,9 +75,13 @@ const routes: Routes = [ {path: 'user-policy', loadChildren: () => import('./user-policy/user-policy.module').then(m => m.UserPolicyModule)}, {path: 'participate', loadChildren: () => import('./claims/claims.module').then(m => m.ClaimsModule), canActivate: [HasConsentGuard]}, { - path: '', + path: 'national', loadChildren: () => import('./national/national.module').then(m => m.NationalModule) }, + { + path: '', + loadChildren: () => import('./home/home.module').then(m => m.HomeModule) + }, {path: 'orcid', loadChildren: () => import('./orcid/orcid.module').then(m => m.LibOrcidModule), canActivate: [HasConsentGuard]}, {path: 'my-orcid-links', loadChildren: () => import('./orcid/my-orcid-links/myOrcidLinks.module').then(m => m.LibMyOrcidLinksModule), canActivate: [HasConsentGuard]}, {path: 'orcid-discover-links', loadChildren: () => import('./orcid/discover-links/discover-links.module').then(m => m.DiscoverLinksModule), canActivate: [HasConsentGuard]}, diff --git a/src/app/app.component.ts b/src/app/app.component.ts index a2ac935..d4b97bc 100644 --- a/src/app/app.component.ts +++ b/src/app/app.component.ts @@ -190,7 +190,8 @@ export class AppComponent extends ResearcherBaseComponent implements OnInit, Aft initialize() { this.menuItems = [ - new MenuItem("national", this.stakeholderUtils.entities.country + ' ' + this.stakeholderUtils.entities.stakeholder, "", "/", false, [], null, {}, null, null, null), + new MenuItem("home", "Home", "", "/", false, [], null, {}, null, null, null), + new MenuItem("national", this.stakeholderUtils.entities.country + ' ' + this.stakeholderUtils.entities.stakeholder, "", "/national", false, [], null, {}, null, null, null), new MenuItem("rpo", this.stakeholderUtils.entities.organization + ' ' + this.stakeholderUtils.entities.stakeholders, "", "/rpo", false, [], null, {}, null, null, null, "/rpo"), new MenuItem("rfo", this.stakeholderUtils.entities.funder + ' ' + this.stakeholderUtils.entities.stakeholders, "", "/rfo", false, [], null, {}, null, null, null, "/rfo"), new MenuItem("researcher", "Researcher Monitors", "", "/researcher", false, [], null, {}, null, null, null, "/researcher"), diff --git a/src/app/contact/contact.component.ts b/src/app/contact/contact.component.ts index 3b3c0de..74d2068 100644 --- a/src/app/contact/contact.component.ts +++ b/src/app/contact/contact.component.ts @@ -17,7 +17,6 @@ import {FullScreenModalComponent} from "../openaireLibrary/utils/modal/full-scre export class ContactComponent extends BaseComponent implements OnInit { @Input() public page: boolean = true; - public url: string = null; public sending = false; public contactForm: UntypedFormGroup; @ViewChild('modal') modal; @@ -38,7 +37,6 @@ export class ContactComponent extends BaseComponent implements OnInit { if(this.page) { this.title = 'Contact us'; this.description = 'Contact us'; - this.url = this.properties.domain + this.properties.baseLink + this._router.url; this.setMetadata(); } this.reset(); diff --git a/src/app/home/home.component.html b/src/app/home/home.component.html new file mode 100644 index 0000000..1ef2528 --- /dev/null +++ b/src/app/home/home.component.html @@ -0,0 +1,199 @@ +
+
+
+

+ Empowering 100% Open Access in Irish Scholarly Research +

+
+
+ Enhance your approach to Open Science. Explore insights thoughtfully designed to support your + strategy and contribute to the future of Irish Open Science. Our current pilot phase, aimed at + enhancing data integrity and broadening functionality, continues until June 2024. +
+ Take a look +
+

+ +

+ +
+
+
+
+
+
+
+
Tailored Monitoring
+
+ Explore role-specific insights through our diverse dashboard types, driving priorities with + precision and efficiency. +
+
+
+
Benchmarking & Evaluation
+
+ Effectively measure your progress against community standards and assess the impact of your Open + Science initiatives. +
+
+
+
Evidence-based decision
+
+ Leverage a wealth of information to make informed choices that advance your objectives. +
+
+
+
Collaboration Catalyst
+
+ Transform complex data into valuable insights, fostering collaborations and partnerships. +
+
+
+
+
+
+
+

All in one platform

+
+
+
+
National Monitor
+

Explore Ireland’s Research Overview

+
+ Dive into the National Dashboard for a comprehensive view of Ireland’s Open Access landscape or explore our other four types of tailor-made dashboards.
+
+ + National Monitor + + +
+
+
+
+
+
+
+
Research Performing Organisations Monitors
+
+ + + +
+
+
+
+
+
Researchers monitors
+
+ + + +
+
+
+
+
+
Research Funding Organisations Monitors
+
+ + + +
+
+
+
+
+
Repositories Monitors
+
+ + + +
+
+
+
+
+
+
+
+
+

+ Enhancing data quality through user engagement +

+
+ We encourage active participation from our users to refine and improve the data quality on our platform. Collaborate with us, utilize the tools provided, and contribute to shaping a robust Open Access environment. +
+ Learn More +
+
+
+
+
Add to ORCID
+
+ Sync and enhanced your ORCID record. +
+
+ + Add to ORCID + + +
+
+
+
+
+
Link your research
+
+ Connect research results with projects, research communities, or other research outcomes. +
+
+ + Link + + +
+
+
+
+
+
Upload DOIs
+
+ Obtain detailed information about your publications. +
+
+ + Upload DOIs + + +
+
+
+
+
+
+
+
+
+
+ + + +
+
+

We Value Your Feedback.

+
Your insights and feedback are crucial. Reach out with questions, comments, or to collaborate on data quality.
+
+
+ Contact us +
+
+
+ diff --git a/src/app/home/home.component.less b/src/app/home/home.component.less new file mode 100644 index 0000000..6af7e34 --- /dev/null +++ b/src/app/home/home.component.less @@ -0,0 +1,96 @@ +@import (reference) "~src/assets/extend-theme/less/_import-variables"; + +.hero { + background-image: url("~/src/assets/irish-assets/home/logo-shadow.png"); + background-position: center -100%; + background-repeat: no-repeat; +} + +@media (max-width: @breakpoint-small-max) { + .hero { + background-position: center bottom; + } +} + +.national-monitor { + position: relative; + + img { + position: relative; + } + + &::before { + content: 'National OA Monitor'; + position: absolute; + top: 10px; + left: 50%; + transform: translate(-50%, -50%); + white-space: nowrap; + mix-blend-mode: overlay; + } +} + +.title { + width: 350px; + + &::after { + content: ''; + background-image: url("~/src/assets/irish-assets/home/dot.svg"); + background-size: contain; + width: 45px; + height: 45px; + display: inline-flex; + transform: translateY(50%); + } +} + +.uk-card { + border-radius: 14px; +} + +.country:not(:hover) .uk-button-primary { + background-color: @country-color; + color: @global-inverse-color; +} + +.funder:not(:hover) .uk-button-primary { + background: @funder-color; + color: @global-inverse-color; +} + +.organization:not(:hover) .uk-button-primary { + background-color: @organization-color; + color: @global-inverse-color; +} + +.researcher:not(:hover) .uk-button-primary { + background-color: @researcher-color; + color: @global-inverse-color; +} + +.datasource:not(:hover) .uk-button-primary { + background-color: @datasource-color; + color: @global-inverse-color; +} + + +@curator-image-size: 80px; + +.curators { + + img { + width: @curator-image-size; + height: @curator-image-size; + object-fit: cover; + border-radius: 18px; + + &:nth-child(2) { + transform: rotate(-10deg); + object-position: left; + } + + &:last-child { + transform: rotate(10deg); + } + } +} diff --git a/src/app/home/home.component.ts b/src/app/home/home.component.ts new file mode 100644 index 0000000..b904e7d --- /dev/null +++ b/src/app/home/home.component.ts @@ -0,0 +1,39 @@ +import {ChangeDetectorRef, Component, OnInit} from "@angular/core"; +import {BaseComponent} from "../openaireLibrary/sharedComponents/base/base.component"; +import {ActivatedRoute, Router} from "@angular/router"; +import {PiwikService} from "../openaireLibrary/utils/piwik/piwik.service"; +import {Meta, Title} from "@angular/platform-browser"; +import {SEOService} from "../openaireLibrary/sharedComponents/SEO/SEO.service"; +import {LayoutService} from "../openaireLibrary/dashboard/sharedComponents/sidebar/layout.service"; + +@Component({ + selector: 'home', + templateUrl: 'home.component.html', + styleUrls: ['home.component.less'] +}) +export class HomeComponent extends BaseComponent implements OnInit { + title: string = 'OA Monitor Ireland'; + description: string = 'OA Monitor Ireland'; + isMobile: boolean = false; + + constructor( + protected _route: ActivatedRoute, + protected _piwikService: PiwikService, + protected _meta: Meta, + protected seoService: SEOService, + protected _title: Title, + protected _router: Router, + private layoutService: LayoutService, + private cdr: ChangeDetectorRef + ) { + super(); + } + + ngOnInit() { + this.setMetadata(); + this.subscriptions.push(this.layoutService.isMobile.subscribe(isMobile => { + this.isMobile = isMobile; + this.cdr.detectChanges(); + })); + } +} diff --git a/src/app/home/home.module.ts b/src/app/home/home.module.ts new file mode 100644 index 0000000..c51cc4a --- /dev/null +++ b/src/app/home/home.module.ts @@ -0,0 +1,17 @@ +import {NgModule} from "@angular/core"; +import {CommonModule} from "@angular/common"; +import {RouterModule} from "@angular/router"; +import {HomeComponent} from "./home.component"; +import {IconsModule} from "../openaireLibrary/utils/icons/icons.module"; +import {Schema2jsonldModule} from "../openaireLibrary/sharedComponents/schema2jsonld/schema2jsonld.module"; + +@NgModule({ + imports: [CommonModule, RouterModule.forChild([ + {path: '', component: HomeComponent} + ]), IconsModule, Schema2jsonldModule], + declarations: [HomeComponent], + exports: [HomeComponent] +}) +export class HomeModule { + +} diff --git a/src/app/national/national.component.ts b/src/app/national/national.component.ts index de0d01f..68c682e 100644 --- a/src/app/national/national.component.ts +++ b/src/app/national/national.component.ts @@ -35,10 +35,10 @@ import {ConfigurationService} from "../openaireLibrary/utils/configuration/confi
diff --git a/src/app/openaireLibrary b/src/app/openaireLibrary index 75ecd0d..d2aa282 160000 --- a/src/app/openaireLibrary +++ b/src/app/openaireLibrary @@ -1 +1 @@ -Subproject commit 75ecd0da5e85a144ccdd7df8831c862c7705e044 +Subproject commit d2aa28225a816fd2773f7a502b0f38272285ccc7 diff --git a/src/app/resources/how-it-works/the-five-monitors.component.html b/src/app/resources/how-it-works/the-five-monitors.component.html index ff1ff08..80d9acb 100644 --- a/src/app/resources/how-it-works/the-five-monitors.component.html +++ b/src/app/resources/how-it-works/the-five-monitors.component.html @@ -11,21 +11,31 @@
-
-
- {{entities.country}} {{entities.stakeholder}} +
+
+
+ {{entities.country}} {{entities.stakeholder}} +
-
- Research Performing Organisation ({{entities.organization}}) +
+
+ Research Performing Organisation ({{entities.organization}}) +
-
- Research Funding Organisation ({{entities.funder}}) +
+
+ Research Funding Organisation ({{entities.funder}}) +
-
- Researcher +
+
+ Researcher +
-
- {{entities.datasource}} +
+
+ {{entities.datasource}} +
diff --git a/src/app/resources/how-it-works/the-five-monitors.component.less b/src/app/resources/how-it-works/the-five-monitors.component.less index 9117faa..d6006e5 100644 --- a/src/app/resources/how-it-works/the-five-monitors.component.less +++ b/src/app/resources/how-it-works/the-five-monitors.component.less @@ -5,7 +5,6 @@ } .five-boxes { - grid-gap: 20px; transform: translateY(-50%); } diff --git a/src/app/resources/methodology/methodological-approach.component.ts b/src/app/resources/methodology/methodological-approach.component.ts index 101e55c..7fa3666 100644 --- a/src/app/resources/methodology/methodological-approach.component.ts +++ b/src/app/resources/methodology/methodological-approach.component.ts @@ -108,7 +108,7 @@ import {SEOService} from "../../openaireLibrary/sharedComponents/SEO/SEO.service
OpenAIRE pipeline + src="assets/irish-assets/openaire-pipeline.png" alt="OpenAIRE pipeline" loading="lazy">
Figure 1: Seemless Integration with to OpenAIRE & EOSC
diff --git a/src/app/search/searchPages/simple/searchDataproviders.component.ts b/src/app/search/searchPages/simple/searchDataproviders.component.ts index 31ca830..c9c2041 100644 --- a/src/app/search/searchPages/simple/searchDataproviders.component.ts +++ b/src/app/search/searchPages/simple/searchDataproviders.component.ts @@ -6,13 +6,13 @@ import {CustomFilterService} from "../../../openaireLibrary/shared/customFilter. @Component({ selector: 'monitor-search-dataproviders', template: ` -
-
+
+
Advanced search
+ [searchInputClass]="'inner background'" (searchEmitter)="search()" class="uk-width-xlarge@l uk-width-large@m uk-width-1-1">
-
+
Advanced search
+ [searchInputClass]="'inner background'" (searchEmitter)="search()" class="uk-width-xlarge@l uk-width-large@m uk-width-1-1">
-
+
Advanced search
+ [searchInputClass]="'inner background'" (searchEmitter)="search()" class="uk-width-xlarge@l uk-width-large@m uk-width-1-1">
-
+
Advanced search diff --git a/src/app/shared/browse-stakeholders/browse-stakeholders.component.html b/src/app/shared/browse-stakeholders/browse-stakeholders.component.html index 1d32591..da75c1e 100644 --- a/src/app/shared/browse-stakeholders/browse-stakeholders.component.html +++ b/src/app/shared/browse-stakeholders/browse-stakeholders.component.html @@ -10,15 +10,17 @@
-
- - +
+
+ + +
diff --git a/src/assets/extend-theme/less/background.less b/src/assets/extend-theme/less/background.less index 48e0b55..89565d7 100644 --- a/src/assets/extend-theme/less/background.less +++ b/src/assets/extend-theme/less/background.less @@ -1,2 +1,3 @@ @background-primary-background-gradient: none; +@background-secondary-background: @primary-dark-color; @background-muted-background: @table-color; diff --git a/src/assets/extend-theme/less/banner.less b/src/assets/extend-theme/less/banner.less index 6624cb1..3d05b32 100644 --- a/src/assets/extend-theme/less/banner.less +++ b/src/assets/extend-theme/less/banner.less @@ -49,7 +49,7 @@ } } - a { + a:extend(.uk-text-truncate) { text-transform: uppercase; text-decoration: none; } diff --git a/src/assets/extend-theme/less/color.less b/src/assets/extend-theme/less/color.less index 546358b..8fe998c 100644 --- a/src/assets/extend-theme/less/color.less +++ b/src/assets/extend-theme/less/color.less @@ -14,3 +14,4 @@ @country-color: @primary-dark-color; @datasource-color: #66264D; @researcher-color: #0647A6; + diff --git a/src/assets/irish-assets/home/card-bg.svg b/src/assets/irish-assets/home/card-bg.svg new file mode 100644 index 0000000..7087510 --- /dev/null +++ b/src/assets/irish-assets/home/card-bg.svg @@ -0,0 +1,39 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/assets/irish-assets/home/dashboard-mobile.png b/src/assets/irish-assets/home/dashboard-mobile.png new file mode 100644 index 0000000..66d8f91 Binary files /dev/null and b/src/assets/irish-assets/home/dashboard-mobile.png differ diff --git a/src/assets/irish-assets/home/dashboard.png b/src/assets/irish-assets/home/dashboard.png new file mode 100644 index 0000000..6a60116 Binary files /dev/null and b/src/assets/irish-assets/home/dashboard.png differ diff --git a/src/assets/irish-assets/home/dot.svg b/src/assets/irish-assets/home/dot.svg new file mode 100644 index 0000000..4f44fd1 --- /dev/null +++ b/src/assets/irish-assets/home/dot.svg @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/src/assets/irish-assets/home/logo-shadow.png b/src/assets/irish-assets/home/logo-shadow.png new file mode 100644 index 0000000..71837e7 Binary files /dev/null and b/src/assets/irish-assets/home/logo-shadow.png differ diff --git a/src/assets/irish-assets/openaire-pipeline.png b/src/assets/irish-assets/openaire-pipeline.png new file mode 100644 index 0000000..77c30b0 Binary files /dev/null and b/src/assets/irish-assets/openaire-pipeline.png differ diff --git a/src/assets/openaire pipeline.jpg b/src/assets/openaire pipeline.jpg deleted file mode 100644 index 208fe97..0000000 Binary files a/src/assets/openaire pipeline.jpg and /dev/null differ diff --git a/src/assets/openaire-theme b/src/assets/openaire-theme index 52eca9a..419d7e2 160000 --- a/src/assets/openaire-theme +++ b/src/assets/openaire-theme @@ -1 +1 @@ -Subproject commit 52eca9abe84c941a7e78a5690f273d8c8e3194f9 +Subproject commit 419d7e200b60639ebcb9660c0e77b06a02504caa