From 110f07f7e3121f73d2fe7dcff110f854a6e29941 Mon Sep 17 00:00:00 2001 From: "konstantina.galouni" Date: Fri, 7 Jul 2023 13:06:08 +0300 Subject: [PATCH] [Aggregator | develop]: app-routing.module.ts: Set in landing routes data: {hasMenuSearchBar: true} to show search bar in menu & Rearrange routes for search pages - new redesign. | environments/: Added property "searchLinkToAll". --- src/app/app-routing.module.ts | 46 ++++++++++------------------ src/app/openaireLibrary | 2 +- src/assets/common-assets | 2 +- src/assets/openaire-theme | 2 +- src/environments/environment.beta.ts | 1 + src/environments/environment.prod.ts | 1 + src/environments/environment.ts | 3 +- 7 files changed, 24 insertions(+), 33 deletions(-) diff --git a/src/app/app-routing.module.ts b/src/app/app-routing.module.ts index 6676213..599ed74 100644 --- a/src/app/app-routing.module.ts +++ b/src/app/app-routing.module.ts @@ -2,68 +2,56 @@ import {NgModule} from '@angular/core'; import {Router, RouterModule, Routes} from '@angular/router'; import {OpenaireErrorPageComponent} from './error/errorPage.component'; import {ConfigurationService} from "./openaireLibrary/utils/configuration/configuration.service"; +import {PageURLResolverComponent} from "./openaireLibrary/utils/pageURLResolver.component"; const routes: Routes = [ {path: '', loadChildren: () => import('./home/home.module').then(m => m.HomeModule)}, { path: 'search/result', - loadChildren: () => import('./landingPages/result/libResult.module').then(m => m.LibResultModule), data: { showHeader: true} + loadChildren: () => import('./landingPages/result/libResult.module').then(m => m.LibResultModule), data: { showHeader: true, hasMenuSearchBar: true} }, { path: 'search/publication', - loadChildren: () => import('./landingPages/publication/libPublication.module').then(m => m.LibPublicationModule), data: { showHeader: true} + loadChildren: () => import('./landingPages/publication/libPublication.module').then(m => m.LibPublicationModule), data: { showHeader: true, hasMenuSearchBar: true} }, { path: 'search/dataset', - loadChildren: () => import('./landingPages/dataset/libDataset.module').then(m => m.LibDatasetModule), data: { showHeader: true} + loadChildren: () => import('./landingPages/dataset/libDataset.module').then(m => m.LibDatasetModule), data: { showHeader: true, hasMenuSearchBar: true} }, { path: 'search/software', - loadChildren: () => import('./landingPages/software/libSoftware.module').then(m => m.LibSoftwareModule), data: { showHeader: true} + loadChildren: () => import('./landingPages/software/libSoftware.module').then(m => m.LibSoftwareModule), data: { showHeader: true, hasMenuSearchBar: true} }, { path: 'search/other', - loadChildren: () => import('./landingPages/orp/libOrp.module').then(m => m.LibOrpModule), data: { showHeader: true} + loadChildren: () => import('./landingPages/orp/libOrp.module').then(m => m.LibOrpModule), data: { showHeader: true, hasMenuSearchBar: true} }, { path: 'search/project', - loadChildren: () => import('./landingPages/project/libProject.module').then(m => m.LibProjectModule), data: { showHeader: true} + loadChildren: () => import('./landingPages/project/libProject.module').then(m => m.LibProjectModule), data: { showHeader: true, hasMenuSearchBar: true} }, { path: 'search/dataprovider', - loadChildren: () => import('./landingPages/dataProvider/libDataProvider.module').then(m => m.LibDataProviderModule), data: { showHeader: true} + loadChildren: () => import('./landingPages/dataProvider/libDataProvider.module').then(m => m.LibDataProviderModule), data: { showHeader: true, hasMenuSearchBar: true} }, { path: 'search/service', - loadChildren: () => import('./landingPages/service/libService.module').then(m => m.LibServiceModule), data: { showHeader: true} + loadChildren: () => import('./landingPages/service/libService.module').then(m => m.LibServiceModule), data: { showHeader: true, hasMenuSearchBar: true} }, { path: 'search/organization', - loadChildren: () => import('./landingPages/organization/libOrganization.module').then(m => m.LibOrganizationModule), data: { showHeader: true} + loadChildren: () => import('./landingPages/organization/libOrganization.module').then(m => m.LibOrganizationModule), data: { showHeader: true, hasMenuSearchBar: true} }, + // Search Pages { - path: 'search/find', - loadChildren: () => import('./searchPages/find/libSearch.module').then(m => m.LibMainSearchModule) + path: 'search/find', loadChildren: () => import('./searchPages/find/libSearch.module').then(m => m.LibMainSearchModule) }, + {path: 'search/find/publications', component: PageURLResolverComponent}, + {path: 'search/find/datasets', component: PageURLResolverComponent}, + {path: 'search/find/software', component: PageURLResolverComponent}, + {path: 'search/find/other', component: PageURLResolverComponent}, { - path: 'search/find/research-outcomes', - loadChildren: () => import('./searchPages/simple/searchResearchResults.module').then(m => m.OpenaireSearchResearchResultsModule) - }, - { - path: 'search/find/projects', - loadChildren: () => import('./searchPages/simple/searchProjects.module').then(m => m.LibSearchProjectsModule) - }, - { - path: 'search/find/dataproviders', - loadChildren: () => import('./searchPages/simple/searchDataProviders.module').then(m => m.LibSearchDataProvidersModule) - }, - { - path: 'search/find/services', - loadChildren: () => import('./searchPages/simple/searchServices.module').then(m => m.LibSearchServicesModule) - }, - { - path: 'search/find/organizations', - loadChildren: () => import('./searchPages/simple/searchOrganizations.module').then(m => m.LibSearchOrganizationsModule) + path: 'search/find/:entity', loadChildren: () => import('./searchPages/find/libSearch.module').then(m => m.LibMainSearchModule) }, { path: 'search/advanced/research-outcomes', diff --git a/src/app/openaireLibrary b/src/app/openaireLibrary index 1ec8477..110c854 160000 --- a/src/app/openaireLibrary +++ b/src/app/openaireLibrary @@ -1 +1 @@ -Subproject commit 1ec84770535c7f691d6eb7d2b0a99c6aec4bcd65 +Subproject commit 110c854523199f24143bb7d0e56e8815c6808319 diff --git a/src/assets/common-assets b/src/assets/common-assets index 39cb4e5..63c54c7 160000 --- a/src/assets/common-assets +++ b/src/assets/common-assets @@ -1 +1 @@ -Subproject commit 39cb4e56d0320975fbd08fb5e9c68b87b0c82a10 +Subproject commit 63c54c7db30bd6fbad6867656a8cb12e319e2f66 diff --git a/src/assets/openaire-theme b/src/assets/openaire-theme index 1e06310..66c6aae 160000 --- a/src/assets/openaire-theme +++ b/src/assets/openaire-theme @@ -1 +1 @@ -Subproject commit 1e06310b8b2b56f131754eaded615b6cf32c5848 +Subproject commit 66c6aae50223b0b378156e217ea3572e266eedc3 diff --git a/src/environments/environment.beta.ts b/src/environments/environment.beta.ts index 8888a2f..8dfde6c 100644 --- a/src/environments/environment.beta.ts +++ b/src/environments/environment.beta.ts @@ -86,6 +86,7 @@ export let properties: EnvProperties = { searchLinkToOrp: "/search/other?orpId=", searchLinkToOrganization: "/search/organization?organizationId=", + searchLinkToAll: "/search/find/", searchLinkToPublications: "/search/find/publications", searchLinkToDataProviders: "/search/find/dataproviders", searchLinkToServices: "/search/find/services", diff --git a/src/environments/environment.prod.ts b/src/environments/environment.prod.ts index e68e44b..b1e4e50 100644 --- a/src/environments/environment.prod.ts +++ b/src/environments/environment.prod.ts @@ -101,6 +101,7 @@ export let properties: EnvProperties = { searchLinkToJournals: "/search/journals", searchLinkToResults: "/search/find/research-outcomes", + searchLinkToAll: "/search/find/", searchLinkToAdvancedPublications: "/search/advanced/publications", searchLinkToAdvancedProjects: "/search/advanced/projects", searchLinkToAdvancedDatasets: "/search/advanced/datasets", diff --git a/src/environments/environment.ts b/src/environments/environment.ts index 11e9fd0..778bc92 100644 --- a/src/environments/environment.ts +++ b/src/environments/environment.ts @@ -90,7 +90,8 @@ export let properties: EnvProperties = { searchLinkToSoftwareLanding: "/search/software?softwareId=", searchLinkToOrp: "/search/other?orpId=", searchLinkToOrganization: "/search/organization?organizationId=", - + + searchLinkToAll: "/search/find/", searchLinkToPublications: "/search/find/publications", searchLinkToDataProviders: "/search/find/dataproviders", searchLinkToServices: "/search/find/services",