diff --git a/src/app/app-routing.module.ts b/src/app/app-routing.module.ts index 5dfc9a2..13907e7 100644 --- a/src/app/app-routing.module.ts +++ b/src/app/app-routing.module.ts @@ -51,6 +51,14 @@ const routes: Routes = [ loadChildren: () => import('./htmlPages/nationalBulletins/nationalBulletinsPage.module').then(m => m.NaionalBulletinPageModule), canActivate: [IsCommunity] }, + { + path: 'faqs', + loadChildren: () => import('./htmlPages/featured/featuredPage.module').then(m => m.FeaturedPageModule), + }, + { + path: 'roadmap', + loadChildren: () => import('./htmlPages/featured/featuredPage.module').then(m => m.FeaturedPageModule), + }, // { // path: 'featured', // children: [ diff --git a/src/app/app.component.ts b/src/app/app.component.ts index c231801..c02f84f 100644 --- a/src/app/app.component.ts +++ b/src/app/app.component.ts @@ -405,6 +405,8 @@ export class AppComponent implements OnInit, OnDestroy { new MenuItem("", "Projects and funding Opportunities", "", "/projects", false, [], ["/projects"], {}), new MenuItem("", "Fields of Science", "", "/fields-of-science", false, [], ["/fields-of-science"], {}), new MenuItem("", "Sustainable Development Goals", "", "/sdgs", false, [], ["/sdgs"], {}), + new MenuItem("", "FAQs", "", "/faqs", false, [], ["/faqs"], {}), + new MenuItem("", "Roadmap", "", "/roadmap", false, [], ["/roadmap"], {}), ] )); this.menuItems.push( diff --git a/src/app/htmlPages/featured/featuredPage.component.ts b/src/app/htmlPages/featured/featuredPage.component.ts index 984a666..b72805d 100644 --- a/src/app/htmlPages/featured/featuredPage.component.ts +++ b/src/app/htmlPages/featured/featuredPage.component.ts @@ -1,30 +1,36 @@ import {Component} from '@angular/core'; -import {Router} from "@angular/router"; +import {ActivatedRoute, Router} from "@angular/router"; import {Subscription} from "rxjs"; import {ConfigurationService} from "../../openaireLibrary/utils/configuration/configuration.service"; import {Portal} from "../../openaireLibrary/utils/entities/adminTool/portal"; import {Page} from "../../openaireLibrary/utils/entities/adminTool/page"; +import {Breadcrumb} from "../../openaireLibrary/utils/breadcrumbs/breadcrumbs.component"; @Component({ selector: 'featured', template: `
- - - +
+ +
` }) export class FeaturedPageComponent { - // public breadcrumbs: Breadcrumb[] = [{name: 'home', route: '/'}, {name: 'about - National Bulletins'}]; + public breadcrumbs: Breadcrumb[]; public page: Page; subs: Subscription[] = []; - constructor(private config: ConfigurationService, private _router: Router) { + constructor(private config: ConfigurationService, private _router: Router, private route: ActivatedRoute) { } ngOnInit() { + this.subs.push(this.route.data.subscribe(data => { + if(data?.breadcrumbs) { + this.breadcrumbs = data.breadcrumbs; + } + })) this.subs.push(this.config.communityInformationState.subscribe((portal: Portal) => { if (portal) { let pages: Page[] = portal.pages; diff --git a/src/app/openaireLibrary b/src/app/openaireLibrary index db55273..2ef5d06 160000 --- a/src/app/openaireLibrary +++ b/src/app/openaireLibrary @@ -1 +1 @@ -Subproject commit db55273b685a7f0fc6ca7e79cd20d7cf68d6747a +Subproject commit 2ef5d069dd55b3ae366fbf8723975c98e6a8c140 diff --git a/src/assets/common-assets b/src/assets/common-assets index f15bbfa..39cb4e5 160000 --- a/src/assets/common-assets +++ b/src/assets/common-assets @@ -1 +1 @@ -Subproject commit f15bbfa7265f170e06b256f086f2acedfa3f72e0 +Subproject commit 39cb4e56d0320975fbd08fb5e9c68b87b0c82a10 diff --git a/src/assets/openaire-theme b/src/assets/openaire-theme index 468b2b0..1e06310 160000 --- a/src/assets/openaire-theme +++ b/src/assets/openaire-theme @@ -1 +1 @@ -Subproject commit 468b2b008f474c88dacc52991a5231693833f1f9 +Subproject commit 1e06310b8b2b56f131754eaded615b6cf32c5848