diff --git a/explore/src/app/app-routing.module.ts b/explore/src/app/app-routing.module.ts index b3b1988e..4b8bf50d 100644 --- a/explore/src/app/app-routing.module.ts +++ b/explore/src/app/app-routing.module.ts @@ -1,35 +1,36 @@ import {NgModule} from '@angular/core'; import {RouterModule, Routes} from '@angular/router'; -import {OpenaireErrorPageComponent} from './error/errorPage.component'; import {PageURLResolverComponent} from "./openaireLibrary/utils/pageURLResolver.component"; +import {SdgModule} from "./openaireLibrary/sdg/sdg.module"; +import {ErrorPageComponent} from "./openaireLibrary/error/errorPage.component"; const routes: Routes = [ // Other Pages {path: '', loadChildren: () => import('./home/home.module').then(m => m.HomeModule), data: {hasStickyHeaderOnMobile: true}}, {path: 'home', redirectTo: '', pathMatch: 'full'}, - {path: 'sdgs', loadChildren: () => import('./sdg/sdg.module').then(m => m.LibSdgModule)}, - {path: 'fields-of-science', loadChildren: () => import('./fos/fos.module').then(m => m.LibFosModule), data: {extraOffset: 100}}, + {path: 'sdgs', loadChildren: () => import('./openaireLibrary/sdg/sdg.module').then(m => m.SdgModule)}, + {path: 'fields-of-science', loadChildren: () => import('./openaireLibrary/fos/fos.module').then(m => m.FosModule), data: {extraOffset: 100}}, {path: 'funders', loadChildren: () => import('./funders/funders.module').then(m => m.FundersModule)}, {path: 'contact-us', loadChildren: () => import('./contact/contact.module').then(m => m.ContactModule), data: {hasQuickContact: false}}, // ORCID Pages - {path: 'orcid', loadChildren: () => import('./orcid/orcid.module').then(m => m.LibOrcidModule)}, - {path: 'my-orcid-links', loadChildren: () => import('./orcid/my-orcid-links/myOrcidLinks.module').then(m => m.LibMyOrcidLinksModule)}, + {path: 'orcid', loadChildren: () => import('./openaireLibrary/orcid/orcid.module').then(m => m.OrcidModule)}, + {path: 'my-orcid-links', loadChildren: () => import('./openaireLibrary/orcid/my-orcid-links/myOrcidLinks.module').then(m => m.MyOrcidLinksModule)}, // Landing Pages - {path: 'search/result', loadChildren: () => import('./landingPages/result/libResult.module').then(m => m.LibResultModule), data: {hasQuickContact: false, hasMenuSearchBar: true}}, - {path: 'search/publication', loadChildren: () => import('./landingPages/publication/libPublication.module').then(m => m.LibPublicationModule), data: {hasQuickContact: false, hasMenuSearchBar: true}}, - {path: 'search/dataset', loadChildren: () => import('./landingPages/dataset/libDataset.module').then(m => m.LibDatasetModule), data: {hasQuickContact: false, hasMenuSearchBar: true}}, - {path: 'search/software', loadChildren: () => import('./landingPages/software/libSoftware.module').then(m => m.LibSoftwareModule), data: {hasQuickContact: false, hasMenuSearchBar: true}}, - {path: 'search/other', loadChildren: () => import('./landingPages/orp/libOrp.module').then(m => m.LibOrpModule), data: {hasQuickContact: false, hasMenuSearchBar: true}}, - {path: 'search/project', loadChildren: () => import('./landingPages/project/libProject.module').then(m => m.LibProjectModule), data: {hasQuickContact: false, hasMenuSearchBar: true}}, + {path: 'search/result', loadChildren: () => import('./openaireLibrary/landingPages/result/resultLanding.module').then(m => m.ResultLandingModule), data: {hasQuickContact: false, hasMenuSearchBar: true, type: 'result', community: 'openaire'}}, + {path: 'search/publication', loadChildren: () => import('./openaireLibrary/landingPages/result/resultLanding.module').then(m => m.ResultLandingModule), data: {hasQuickContact: false, hasMenuSearchBar: true, type: 'publication', community: 'openaire'}}, + {path: 'search/dataset', loadChildren: () => import('./openaireLibrary/landingPages/result/resultLanding.module').then(m => m.ResultLandingModule), data: {hasQuickContact: false, hasMenuSearchBar: true, type: 'dataset', community: 'openaire'}}, + {path: 'search/software', loadChildren: () => import('./openaireLibrary/landingPages/result/resultLanding.module').then(m => m.ResultLandingModule), data: {hasQuickContact: false, hasMenuSearchBar: true, type: 'software', community: 'openaire'}}, + {path: 'search/other', loadChildren: () => import('./openaireLibrary/landingPages/result/resultLanding.module').then(m => m.ResultLandingModule), data: {hasQuickContact: false, hasMenuSearchBar: true, type: 'orp', community: 'openaire'}}, + {path: 'search/project', loadChildren: () => import('./openaireLibrary/landingPages/project/project.module').then(m => m.ProjectModule), data: {hasQuickContact: false, hasMenuSearchBar: true, community: 'openaire'}}, { path: 'search/dataprovider', - loadChildren: () => import('././landingPages/dataProvider/libDataProvider.module').then(m => m.LibDataProviderModule), - data: {hasQuickContact: false, hasMenuSearchBar: true} + loadChildren: () => import('./openaireLibrary/landingPages/dataProvider/dataProvider.module').then(m => m.DataProviderModule), + data: {hasQuickContact: false, hasMenuSearchBar: true, community: 'openaire'} }, { path: 'search/organization', - loadChildren: () => import('./landingPages/organization/libOrganization.module').then(m => m.LibOrganizationModule), - data: {hasQuickContact: false, hasMenuSearchBar: true} + loadChildren: () => import('./openaireLibrary/landingPages/organization/organization.module').then(m => m.OrganizationModule), + data: {hasQuickContact: false, hasMenuSearchBar: true, community: 'openaire'} }, // Search Pages @@ -99,10 +100,10 @@ const routes: Routes = [ }, // { path: 'claims-project-manager', loadChildren: './claims/claimsByToken/claimsByToken.module#LibClaimsByTokenModule'}, // help pages - do not exist in Admin portal/api/db - {path: 'reload', loadChildren: () => import('./reload/libReload.module').then(m => m.LibReloadModule)}, - {path: 'user-info', loadChildren: () => import('./login/libUser.module').then(m => m.LibUserModule)}, - {path: 'error', component: OpenaireErrorPageComponent}, - {path: '**', pathMatch: 'full', component: OpenaireErrorPageComponent} + {path: 'reload', loadChildren: () => import('./openaireLibrary/reload/reload.module').then(m => m.ReloadModule)}, + {path: 'user-info', loadChildren: () => import('./openaireLibrary/login/user.module').then(m => m.UserModule)}, + {path: 'error', component: ErrorPageComponent}, + {path: '**', pathMatch: 'full', component: ErrorPageComponent} ]; @NgModule({ diff --git a/explore/src/app/app.component.ts b/explore/src/app/app.component.ts index ff1ddfd6..1bfb88cf 100644 --- a/explore/src/app/app.component.ts +++ b/explore/src/app/app.component.ts @@ -193,7 +193,9 @@ export class AppComponent implements AfterViewInit { buildMenu() { this.userMenuItems = []; this.userMenuItems.push(new MenuItem("", "My profile", "", "", false, [], [], {})); - this.userMenuItems.push(new MenuItem("", "My ORCID links", "", "/my-orcid-links", false, [], [""], {})); + if(this.properties.environment != "beta") { + this.userMenuItems.push(new MenuItem("", "My ORCID links", "", "/my-orcid-links", false, [], [""], {})); + } this.userMenuItems.push(new MenuItem("", "My links", "", "/myclaims", false, [], ["/myclaims"], {})); let researchOutcomesMenu = new MenuItem("", OpenaireEntities.RESULTS, "", "/search/find/research-outcomes", false, [], ["/search/find/research-outcomes"], {}); researchOutcomesMenu.items = [ diff --git a/explore/src/app/app.module.ts b/explore/src/app/app.module.ts index 6d95092c..16371cb7 100755 --- a/explore/src/app/app.module.ts +++ b/explore/src/app/app.module.ts @@ -9,7 +9,6 @@ import {NavigationBarModule} from './openaireLibrary/sharedComponents/navigation import {CookieLawModule} from './openaireLibrary/sharedComponents/cookie-law/cookie-law.module'; import {BottomModule} from './openaireLibrary/sharedComponents/bottom.module'; import {ErrorModule} from './openaireLibrary/error/error.module'; -import {OpenaireErrorPageComponent} from './error/errorPage.component'; import {AppRoutingModule} from './app-routing.module'; import {HttpInterceptorService} from "./openaireLibrary/http-interceptor.service"; import {PageURLResolverModule} from "./openaireLibrary/utils/pageURLResolver.module"; @@ -36,7 +35,7 @@ import {LoadingModule} from "./openaireLibrary/utils/loading/loading.module"; QuickContactModule, AlertModalModule, LoadingModule ], - declarations: [AppComponent, OpenaireErrorPageComponent], + declarations: [AppComponent], exports: [AppComponent], providers: [ {provide: APP_ID, useValue: 'explore'}, diff --git a/explore/src/app/claims/claimsAdmin/claimsAdmin.component.ts b/explore/src/app/claims/claimsAdmin/claimsAdmin.component.ts index 23f4e19b..f0e62128 100644 --- a/explore/src/app/claims/claimsAdmin/claimsAdmin.component.ts +++ b/explore/src/app/claims/claimsAdmin/claimsAdmin.component.ts @@ -4,19 +4,17 @@ import {properties} from "../../../environments/environment"; @Component({ selector: 'openaire-claims-admin', template: ` - + `, }) export class OpenaireClaimsAdminComponent implements OnInit { claimsInfoURL: string; - userInfoURL: string; - + constructor() { } public ngOnInit() { this.claimsInfoURL = properties.claimsInformationLink; - this.userInfoURL = properties.userInfoUrl; } } diff --git a/explore/src/app/claims/claimsAdmin/claimsAdmin.module.ts b/explore/src/app/claims/claimsAdmin/claimsAdmin.module.ts index 2e155ce7..9557f899 100644 --- a/explore/src/app/claims/claimsAdmin/claimsAdmin.module.ts +++ b/explore/src/app/claims/claimsAdmin/claimsAdmin.module.ts @@ -5,9 +5,6 @@ import { OpenaireClaimsAdminComponent } from './claimsAdmin.component'; import { ClaimsAdminRoutingModule } from './claimsAdmin-routing.module'; import{ClaimsAdminModule } from '../../openaireLibrary/claims/claimsAdmin/claimsAdmin.module'; import{ ClaimsCuratorGuard} from '../../openaireLibrary/login/claimsCuratorGuard.guard'; -import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard'; -import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard'; - @NgModule({ imports: [ @@ -15,7 +12,7 @@ import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard'; ClaimsAdminRoutingModule, ClaimsAdminModule ], - providers:[ClaimsCuratorGuard, PreviousRouteRecorder,IsRouteEnabled], + providers:[ClaimsCuratorGuard], declarations: [ OpenaireClaimsAdminComponent ] diff --git a/explore/src/app/claims/directLinking/directLinking.module.ts b/explore/src/app/claims/directLinking/directLinking.module.ts index 8c9f752b..5d868817 100644 --- a/explore/src/app/claims/directLinking/directLinking.module.ts +++ b/explore/src/app/claims/directLinking/directLinking.module.ts @@ -4,15 +4,12 @@ import { SharedModule } from '../../openaireLibrary/shared/shared.module'; import { OpenaireDirectLinkingComponent } from './directLinking.component'; import{ DirectLinkingModule} from '../../openaireLibrary/claims/directLinking/directLinking.module'; import {DirectLinkingRoutingModule} from './directLinking-routing.module'; -import {LoginGuard} from '../../openaireLibrary/login/loginGuard.guard'; -import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard'; -import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard'; @NgModule({ imports: [ SharedModule, DirectLinkingModule, DirectLinkingRoutingModule ], - providers:[LoginGuard, PreviousRouteRecorder, IsRouteEnabled], + providers:[], declarations: [ OpenaireDirectLinkingComponent ], exports:[OpenaireDirectLinkingComponent] diff --git a/explore/src/app/claims/linking/linkingGeneric.module.ts b/explore/src/app/claims/linking/linkingGeneric.module.ts index c9911f63..d96698f8 100644 --- a/explore/src/app/claims/linking/linkingGeneric.module.ts +++ b/explore/src/app/claims/linking/linkingGeneric.module.ts @@ -4,15 +4,12 @@ import { SharedModule } from '../../openaireLibrary/shared/shared.module'; import {OpenaireLinkingComponent} from './linkingGeneric.component'; import {LinkingRoutingModule} from './linking-routing.module'; import{ LinkingGenericModule} from '../../openaireLibrary/claims/linking/linkingGeneric.module'; -import {LoginGuard} from '../../openaireLibrary/login/loginGuard.guard'; -import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard'; -import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard'; @NgModule({ imports: [ SharedModule, LinkingRoutingModule, LinkingGenericModule ], - providers:[LoginGuard, PreviousRouteRecorder, IsRouteEnabled], + providers:[], declarations: [ OpenaireLinkingComponent ], exports:[ diff --git a/explore/src/app/claims/myClaims/myClaims.component.ts b/explore/src/app/claims/myClaims/myClaims.component.ts index da297ff1..69131901 100644 --- a/explore/src/app/claims/myClaims/myClaims.component.ts +++ b/explore/src/app/claims/myClaims/myClaims.component.ts @@ -5,20 +5,18 @@ import {properties} from "../../../environments/environment"; @Component({ selector: 'openaire-my-claims', template: ` - + ` }) export class OpenaireMyClaimsComponent implements OnInit { claimsInfoURL: string; - userInfoURL: string; - + constructor() { } public ngOnInit() { this.claimsInfoURL = properties.claimsInformationLink; - this.userInfoURL = properties.userInfoUrl; } } diff --git a/explore/src/app/claims/myClaims/myClaims.module.ts b/explore/src/app/claims/myClaims/myClaims.module.ts index c36ec56e..89648a75 100644 --- a/explore/src/app/claims/myClaims/myClaims.module.ts +++ b/explore/src/app/claims/myClaims/myClaims.module.ts @@ -4,10 +4,6 @@ import { SharedModule } from '../../openaireLibrary/shared/shared.module'; import { OpenaireMyClaimsComponent } from './myClaims.component'; import { MyClaimsRoutingModule } from './myClaims-routing.module'; import{ MyClaimsModule} from '../../openaireLibrary/claims/myClaims/myClaims.module'; -import {LoginGuard} from '../../openaireLibrary/login/loginGuard.guard'; -import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard'; -import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard'; - @NgModule({ imports: [ @@ -16,7 +12,7 @@ import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard'; MyClaimsModule ], - providers:[LoginGuard, PreviousRouteRecorder, IsRouteEnabled], + providers:[], declarations: [ OpenaireMyClaimsComponent ] diff --git a/explore/src/app/contact/contact.module.ts b/explore/src/app/contact/contact.module.ts index 3e5b0f26..0aec009d 100644 --- a/explore/src/app/contact/contact.module.ts +++ b/explore/src/app/contact/contact.module.ts @@ -4,11 +4,8 @@ import {RouterModule} from '@angular/router'; import {ContactComponent} from './contact.component'; import {ContactRoutingModule} from "./contact-routing.module"; -import {EmailService} from "../openaireLibrary/utils/email/email.service"; import {AlertModalModule} from "../openaireLibrary/utils/modal/alertModal.module"; -import {PiwikService} from "../openaireLibrary/utils/piwik/piwik.service"; import {HelperModule} from "../openaireLibrary/utils/helper/helper.module"; -import {IsRouteEnabled} from "../openaireLibrary/error/isRouteEnabled.guard"; import {Schema2jsonldModule} from "../openaireLibrary/sharedComponents/schema2jsonld/schema2jsonld.module"; import {SEOServiceModule} from "../openaireLibrary/sharedComponents/SEO/SEOService.module"; import {ContactUsModule} from "../openaireLibrary/contact-us/contact-us.module"; @@ -25,9 +22,7 @@ import {LoadingModule} from "../openaireLibrary/utils/loading/loading.module"; declarations: [ ContactComponent ], - providers: [ - EmailService, PiwikService, IsRouteEnabled - ], + providers: [], exports: [ ContactComponent ] diff --git a/explore/src/app/deposit/deposit.module.ts b/explore/src/app/deposit/deposit.module.ts index 79e96a68..23acd51f 100644 --- a/explore/src/app/deposit/deposit.module.ts +++ b/explore/src/app/deposit/deposit.module.ts @@ -2,10 +2,6 @@ import { NgModule } from '@angular/core'; import { CommonModule } from '@angular/common'; import { FormsModule } from '@angular/forms'; - -import {PreviousRouteRecorder} from '../openaireLibrary/utils/piwik/previousRouteRecorder.guard'; -import {IsRouteEnabled} from '../openaireLibrary/error/isRouteEnabled.guard'; - import {OpenaireDepositComponent} from "./deposit.component"; import {DepositRoutingModule} from "./deposit-routing.module"; import {DepositFirstPageModule} from "../openaireLibrary/deposit/depositFirstPage.module"; @@ -24,7 +20,8 @@ import {CommunityService} from "../openaireLibrary/connect/community/community.s exports: [ OpenaireDepositComponent, ], - providers: [PreviousRouteRecorder, IsRouteEnabled, - ZenodoCommunitiesService, CommunityService] + providers: [ + ZenodoCommunitiesService, CommunityService + ] }) export class LibDepositModule { } diff --git a/explore/src/app/deposit/searchDataprovidersToDeposit.module.ts b/explore/src/app/deposit/searchDataprovidersToDeposit.module.ts index b1647561..5bf0101a 100644 --- a/explore/src/app/deposit/searchDataprovidersToDeposit.module.ts +++ b/explore/src/app/deposit/searchDataprovidersToDeposit.module.ts @@ -6,16 +6,14 @@ import { OpenaireSearchDataprovidersToDepositComponent } from './searchDataprovi import {SearchDataprovidersToDepositRoutingModule} from './searchDataprovidersToDeposit-routing.module'; import {SearchDataprovidersToDepositModule} from '../openaireLibrary/deposit/searchDataprovidersToDeposit.module'; -import {PreviousRouteRecorder} from '../openaireLibrary/utils/piwik/previousRouteRecorder.guard'; -import {IsRouteEnabled} from '../openaireLibrary/error/isRouteEnabled.guard'; import {ZenodoCommunitiesServiceModule} from '../openaireLibrary/connect/zenodoCommunities/zenodo-communitiesService.module'; import {CommunityService} from '../openaireLibrary/connect/community/community.service'; @NgModule({ imports: [ CommonModule, FormsModule, - SearchDataprovidersToDepositModule, SearchDataprovidersToDepositRoutingModule, + SearchDataprovidersToDepositModule, ZenodoCommunitiesServiceModule ], declarations: [ @@ -24,6 +22,6 @@ import {CommunityService} from '../openaireLibrary/connect/community/community.s exports: [ OpenaireSearchDataprovidersToDepositComponent, ], - providers: [PreviousRouteRecorder, IsRouteEnabled, CommunityService] + providers: [CommunityService] }) export class LibSearchDataprovidersToDepositModule { } diff --git a/explore/src/app/error/errorPage.component.ts b/explore/src/app/error/errorPage.component.ts deleted file mode 100644 index 52073bcc..00000000 --- a/explore/src/app/error/errorPage.component.ts +++ /dev/null @@ -1,12 +0,0 @@ -import { Component } from '@angular/core'; - -@Component({ - selector: 'openaire-error', - template: ` - - ` -}) - -export class OpenaireErrorPageComponent { - -} diff --git a/explore/src/app/fos/fos-routing.module.ts b/explore/src/app/fos/fos-routing.module.ts deleted file mode 100644 index f5d36cd6..00000000 --- a/explore/src/app/fos/fos-routing.module.ts +++ /dev/null @@ -1,17 +0,0 @@ -import {NgModule} from "@angular/core"; -import {RouterModule} from "@angular/router"; -import {PreviousRouteRecorder} from "../openaireLibrary/utils/piwik/previousRouteRecorder.guard"; -import {ExploreFosComponent} from "./fos.component"; - -@NgModule({ - imports: [ - RouterModule.forChild([ - { - path: '', - component: ExploreFosComponent, - canDeactivate: [PreviousRouteRecorder] - } - ]) - ] -}) -export class LibFosRoutingModule { } \ No newline at end of file diff --git a/explore/src/app/fos/fos.component.ts b/explore/src/app/fos/fos.component.ts deleted file mode 100644 index 4c85da4f..00000000 --- a/explore/src/app/fos/fos.component.ts +++ /dev/null @@ -1,11 +0,0 @@ -import {Component} from "@angular/core"; -import {properties} from "../../environments/environment"; - -@Component({ - selector: 'explore-fos', - template: ` - - ` -}) - -export class ExploreFosComponent {} diff --git a/explore/src/app/fos/fos.module.ts b/explore/src/app/fos/fos.module.ts deleted file mode 100644 index bf657703..00000000 --- a/explore/src/app/fos/fos.module.ts +++ /dev/null @@ -1,26 +0,0 @@ -import {CommonModule} from "@angular/common"; -import {NgModule} from "@angular/core"; -import {PreviousRouteRecorder} from "../openaireLibrary/utils/piwik/previousRouteRecorder.guard"; -import {LibFosRoutingModule} from "./fos-routing.module"; -import {FosRoutingModule} from "../openaireLibrary/fos/fos-routing.module"; -import {FosModule} from "../openaireLibrary/fos/fos.module"; -import {ExploreFosComponent} from "./fos.component"; - -@NgModule({ - imports: [ - CommonModule, - LibFosRoutingModule, - FosRoutingModule, - FosModule - ], - declarations: [ - ExploreFosComponent - ], - exports: [ - ExploreFosComponent - ], - providers: [ - PreviousRouteRecorder - ] -}) -export class LibFosModule { } \ No newline at end of file diff --git a/explore/src/app/funders/funders.component.html b/explore/src/app/funders/funders.component.html index 0fac80e9..24667eab 100644 --- a/explore/src/app/funders/funders.component.html +++ b/explore/src/app/funders/funders.component.html @@ -142,9 +142,9 @@
- + - OpenAIRE placeholder logo + OpenAIRE placeholder logo
@@ -168,7 +168,7 @@ target="_blank" [href]="'https://'+(properties.environment =='beta' || properties.environment =='development'?'beta.':'')+'monitor.openaire.eu/dashboard/'+funder.alias"> OpenAIRE logo + class="uk-margin-xsmall-right" style="width: 17px; height: 17px;" loading="lazy"> Monitor Dashboard @@ -176,7 +176,7 @@ OpenAIRE logo + class="uk-margin-xsmall-right" style="width: 17px; height: 17px;" loading="lazy"> Monitor Dashboard @@ -211,9 +211,9 @@
- + - OpenAIRE placeholder logo + OpenAIRE placeholder logo
@@ -234,14 +234,14 @@ target="_blank" [href]="'https://'+(properties.environment =='beta' || properties.environment =='development'?'beta.':'')+'monitor.openaire.eu/dashboard/'+funder.alias"> OpenAIRE logo + class="uk-margin-xsmall-right" style="width: 17px; height: 17px;" loading="lazy"> Monitor Dashboard OpenAIRE logo + class="uk-margin-xsmall-right" style="width: 17px; height: 17px;" loading="lazy"> Monitor Dashboard diff --git a/explore/src/app/funders/funders.module.ts b/explore/src/app/funders/funders.module.ts index e95a5a5f..0f84d4aa 100644 --- a/explore/src/app/funders/funders.module.ts +++ b/explore/src/app/funders/funders.module.ts @@ -5,8 +5,6 @@ import {RouterModule} from '@angular/router'; import {FundersComponent} from './funders.component'; import {FundersRoutingModule} from "./funders-routing.module"; import {AlertModalModule} from "../openaireLibrary/utils/modal/alertModal.module"; -import {PiwikService} from "../openaireLibrary/utils/piwik/piwik.service"; -import {IsRouteEnabled} from "../openaireLibrary/error/isRouteEnabled.guard"; import {Schema2jsonldModule} from "../openaireLibrary/sharedComponents/schema2jsonld/schema2jsonld.module"; import {SEOServiceModule} from "../openaireLibrary/sharedComponents/SEO/SEOService.module"; import {BreadcrumbsModule} from "../openaireLibrary/utils/breadcrumbs/breadcrumbs.module"; @@ -33,9 +31,7 @@ import {GroupedRequestsServiceModule} from "../openaireLibrary/services/groupedR declarations: [ FundersComponent ], - providers: [ - PiwikService, IsRouteEnabled - ], + providers: [], exports: [ FundersComponent ] diff --git a/explore/src/app/home/home.component.ts b/explore/src/app/home/home.component.ts index 8749c77b..be441449 100644 --- a/explore/src/app/home/home.component.ts +++ b/explore/src/app/home/home.component.ts @@ -36,84 +36,29 @@ export class HomeComponent implements OnInit, OnDestroy, AfterViewInit { public logos = { "publication": [ [ - // "logo-pubmed.png", - // "logo-arxiv.png", - // "logo-base.png", - // "logo-scielo.png", - // "logo-la-referencia.png", - // "logo-soar.png", - // "logo-repec.png", - // "logo-core.png", - // "logo-zenodo.png", - // "logo-narcis.png" "publications.png" ], [ - // "logo-unpaywall.png", - // "logo-elsevier.png", - // "logo-spring-nature.png", - // "logo-frontiers.png", - // "logo-opencitations.png", - // "logo-doaj.png", - // "logo-microsoft.png", - // "logo-plos.png", - // "logo-f1000.png", - // "logo-copernicus.png" "publications2.png" ] ], "software": [ [ - // "logo-software-heritage.png", - // "logo-github.png", - // "logo-doecode.png", - // "logo-bitbucket.png", - // "logo-elixir-bio-tools.png", - // "logo-google-code.png", - // "logo-sourceforge.png", - // "logo-zenodo.png" "software.png" ] ], "dataset": [ [ - // "logo-scholexplorer.png", - // "logo-zenodo.png", - // "logo-pangea.png", - // "logo-figshare.png", - // "logo-protocols.png", - // "logo-opentrials.png", - // "logo-kaggle.png", - // "logo-reactome.png", - // "logo-easy.png", - // "logo-dryad.png" "datasets.png" ] ], "persistent": [ [ - // "logo-re3data.png", - // "logo-orcid.png", - // "logo-opendoar.png", - // "logo-grid.png", - // "logo-fairsharing.png", - // "logo-ror.png", - // "logo-datacite.png", - // "logo-crossref.png" "pids.png" ] ], "funder": [ [ - // "logo-european-commision.png", - // "logo-nsf.png", - // "logo-nhmrc.png", - // "logo-sfi.png", - // "logo-nwo.png", - // "logo-welcome-trust.png", - // "logo-fct.png", - // "logo-gsrt.png", - // "logo-fnsnf.png" "funders.png" ] ] diff --git a/explore/src/app/home/home.module.ts b/explore/src/app/home/home.module.ts index 0116ef4e..a7df1f99 100644 --- a/explore/src/app/home/home.module.ts +++ b/explore/src/app/home/home.module.ts @@ -10,12 +10,10 @@ import { DataProvidersServiceModule} from '../openaireLibrary/services/dataProvi import { SearchResearchResultsServiceModule} from '../openaireLibrary/services/searchResearchResultsService.module'; import { ProjectsServiceModule} from '../openaireLibrary/services/projectsService.module'; import { OrganizationsServiceModule} from '../openaireLibrary/services/organizationsService.module'; -import { PiwikServiceModule} from '../openaireLibrary/utils/piwik/piwikService.module'; import {HelperModule} from '../openaireLibrary/utils/helper/helper.module'; import {RefineFieldResultsServiceModule} from '../openaireLibrary/services/refineFieldResultsService.module'; -import {PreviousRouteRecorder} from '../openaireLibrary/utils/piwik/previousRouteRecorder.guard'; import { SEOServiceModule } from '../openaireLibrary/sharedComponents/SEO/SEOService.module'; import {OtherPortalsModule} from "../openaireLibrary/sharedComponents/other-portals/other-portals.module"; @@ -32,21 +30,18 @@ import {SliderUtilsModule} from "../openaireLibrary/sharedComponents/slider-util @NgModule({ imports: [ + HomeRoutingModule, CommonModule, FormsModule, RouterModule, RefineFieldResultsServiceModule, DataProvidersServiceModule, SearchResearchResultsServiceModule, ProjectsServiceModule, OrganizationsServiceModule, - PiwikServiceModule, - HomeRoutingModule, HelperModule, SEOServiceModule, OtherPortalsModule, EntitiesSelectionModule, QuickSelectionsModule, IconsModule, NumbersModule, AdvancedSearchInputModule, InputModule, SearchInputModule, SliderUtilsModule ], declarations: [ HomeComponent ], - providers:[ - PreviousRouteRecorder - ], + providers:[], exports: [ HomeComponent ] diff --git a/explore/src/app/landingPages/dataProvider/dataProvider-routing.module.ts b/explore/src/app/landingPages/dataProvider/dataProvider-routing.module.ts deleted file mode 100644 index c6155835..00000000 --- a/explore/src/app/landingPages/dataProvider/dataProvider-routing.module.ts +++ /dev/null @@ -1,18 +0,0 @@ -import { NgModule } from '@angular/core'; -import { RouterModule } from '@angular/router'; - -import { OpenaireDataProviderComponent } from './dataProvider.component'; -import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard'; -import {properties} from "../../../environments/environment"; - - -@NgModule({ - imports: [ - RouterModule.forChild([ - { path: '', component: OpenaireDataProviderComponent, data: { - redirect: properties.errorLink, community : 'openaire' - },canDeactivate: [PreviousRouteRecorder] } - ]) -] -}) -export class DataProviderRoutingModule { } diff --git a/explore/src/app/landingPages/dataProvider/dataProvider.component.ts b/explore/src/app/landingPages/dataProvider/dataProvider.component.ts deleted file mode 100644 index 70fdcd58..00000000 --- a/explore/src/app/landingPages/dataProvider/dataProvider.component.ts +++ /dev/null @@ -1,17 +0,0 @@ -import {Component} from '@angular/core'; - -@Component({ - selector: 'openaire-dataprovider', - template: ``, - }) -export class OpenaireDataProviderComponent{ - constructor ( ) { - - } - - ngOnInit() { -} - - - -} diff --git a/explore/src/app/landingPages/dataProvider/libDataProvider.module.ts b/explore/src/app/landingPages/dataProvider/libDataProvider.module.ts deleted file mode 100644 index 3cefefe1..00000000 --- a/explore/src/app/landingPages/dataProvider/libDataProvider.module.ts +++ /dev/null @@ -1,13 +0,0 @@ -import { NgModule} from '@angular/core'; -import { DataProviderModule } from '../../openaireLibrary/landingPages/dataProvider/dataProvider.module'; -import { OpenaireDataProviderComponent } from './dataProvider.component'; -import {DataProviderRoutingModule} from './dataProvider-routing.module'; -import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard'; - -@NgModule({ - imports: [DataProviderModule, DataProviderRoutingModule], - declarations:[OpenaireDataProviderComponent], - providers:[ PreviousRouteRecorder], - exports:[OpenaireDataProviderComponent] -}) -export class LibDataProviderModule { } diff --git a/explore/src/app/landingPages/dataset/dataset-routing.module.ts b/explore/src/app/landingPages/dataset/dataset-routing.module.ts deleted file mode 100644 index 643183ef..00000000 --- a/explore/src/app/landingPages/dataset/dataset-routing.module.ts +++ /dev/null @@ -1,17 +0,0 @@ -import { NgModule } from '@angular/core'; -import { RouterModule } from '@angular/router'; -import { OpenaireDatasetComponent } from './dataset.component'; -import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard'; -import {properties} from "../../../environments/environment"; - - -@NgModule({ - imports: [ - RouterModule.forChild([ - { path: '', component: OpenaireDatasetComponent, data: { - redirect: properties.errorLink, community : 'openaire' - },canDeactivate: [PreviousRouteRecorder] } - ]) -] -}) -export class DatasetRoutingModule { } diff --git a/explore/src/app/landingPages/dataset/dataset.component.ts b/explore/src/app/landingPages/dataset/dataset.component.ts deleted file mode 100644 index 892493f4..00000000 --- a/explore/src/app/landingPages/dataset/dataset.component.ts +++ /dev/null @@ -1,7 +0,0 @@ -import {Component} from '@angular/core'; - -@Component({ - selector: 'openaire-dataset', - template: ``, - }) -export class OpenaireDatasetComponent{} diff --git a/explore/src/app/landingPages/dataset/libDataset.module.ts b/explore/src/app/landingPages/dataset/libDataset.module.ts deleted file mode 100644 index e29bae2b..00000000 --- a/explore/src/app/landingPages/dataset/libDataset.module.ts +++ /dev/null @@ -1,12 +0,0 @@ -import { NgModule} from '@angular/core'; -import { OpenaireDatasetComponent } from './dataset.component'; -import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard'; -import {DatasetRoutingModule} from './dataset-routing.module'; -import {ResultLandingModule} from "../../openaireLibrary/landingPages/result/resultLanding.module"; - @NgModule({ - imports: [DatasetRoutingModule, ResultLandingModule], - declarations:[OpenaireDatasetComponent], - providers:[PreviousRouteRecorder], - exports:[OpenaireDatasetComponent] -}) -export class LibDatasetModule { } diff --git a/explore/src/app/landingPages/organization/libOrganization.module.ts b/explore/src/app/landingPages/organization/libOrganization.module.ts deleted file mode 100644 index ed43d01e..00000000 --- a/explore/src/app/landingPages/organization/libOrganization.module.ts +++ /dev/null @@ -1,13 +0,0 @@ -import { NgModule} from '@angular/core'; -import { OrganizationModule } from '../../openaireLibrary/landingPages/organization/organization.module'; -import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard'; -import { OpenaireOrganizationComponent } from './organization.component'; -import {OrganizationRoutingModule} from './organization-routing.module'; - -@NgModule({ - imports: [OrganizationModule, OrganizationRoutingModule], - declarations:[OpenaireOrganizationComponent], - providers:[ PreviousRouteRecorder], - exports:[OpenaireOrganizationComponent] -}) -export class LibOrganizationModule { } diff --git a/explore/src/app/landingPages/organization/organization-routing.module.ts b/explore/src/app/landingPages/organization/organization-routing.module.ts deleted file mode 100644 index 70f8f0c1..00000000 --- a/explore/src/app/landingPages/organization/organization-routing.module.ts +++ /dev/null @@ -1,19 +0,0 @@ -import { NgModule } from '@angular/core'; -import { RouterModule } from '@angular/router'; - -import { OpenaireOrganizationComponent } from './organization.component'; -import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard'; -import {properties} from "../../../environments/environment"; - - - -@NgModule({ - imports: [ - RouterModule.forChild([ - { path: '', component: OpenaireOrganizationComponent, data: { - redirect: properties.errorLink, community : 'openaire' - },canDeactivate: [PreviousRouteRecorder] } - ]) -] -}) -export class OrganizationRoutingModule { } diff --git a/explore/src/app/landingPages/organization/organization.component.ts b/explore/src/app/landingPages/organization/organization.component.ts deleted file mode 100644 index 467b895e..00000000 --- a/explore/src/app/landingPages/organization/organization.component.ts +++ /dev/null @@ -1,17 +0,0 @@ -import {Component} from '@angular/core'; - -@Component({ - selector: 'openaire-organization', - template: ``, - }) -export class OpenaireOrganizationComponent{ - constructor ( ) { - - } - - ngOnInit() { -} - - - -} diff --git a/explore/src/app/landingPages/orp/libOrp.module.ts b/explore/src/app/landingPages/orp/libOrp.module.ts deleted file mode 100644 index 02c5ef75..00000000 --- a/explore/src/app/landingPages/orp/libOrp.module.ts +++ /dev/null @@ -1,12 +0,0 @@ -import { NgModule} from '@angular/core'; -import { OpenaireOrpComponent } from './orp.component'; -import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard'; -import {OrpRoutingModule} from './orp-routing.module'; -import {ResultLandingModule} from "../../openaireLibrary/landingPages/result/resultLanding.module"; - @NgModule({ - imports: [OrpRoutingModule, ResultLandingModule], - declarations:[OpenaireOrpComponent], - providers:[ PreviousRouteRecorder], - exports:[OpenaireOrpComponent] -}) -export class LibOrpModule { } diff --git a/explore/src/app/landingPages/orp/orp-routing.module.ts b/explore/src/app/landingPages/orp/orp-routing.module.ts deleted file mode 100644 index fb399309..00000000 --- a/explore/src/app/landingPages/orp/orp-routing.module.ts +++ /dev/null @@ -1,18 +0,0 @@ -import { NgModule } from '@angular/core'; -import { RouterModule } from '@angular/router'; - -import { OpenaireOrpComponent } from './orp.component'; -import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard'; -import {properties} from "../../../environments/environment"; - - -@NgModule({ - imports: [ - RouterModule.forChild([ - { path: '', component: OpenaireOrpComponent, data: { - redirect: properties.errorLink, community : 'openaire' - },canDeactivate: [PreviousRouteRecorder] } - ]) -] -}) -export class OrpRoutingModule { } diff --git a/explore/src/app/landingPages/orp/orp.component.ts b/explore/src/app/landingPages/orp/orp.component.ts deleted file mode 100644 index 1b5ff4de..00000000 --- a/explore/src/app/landingPages/orp/orp.component.ts +++ /dev/null @@ -1,7 +0,0 @@ -import {Component} from '@angular/core'; - -@Component({ - selector: 'openaire-orp', - template: ``, - }) -export class OpenaireOrpComponent{} diff --git a/explore/src/app/landingPages/project/libProject.module.ts b/explore/src/app/landingPages/project/libProject.module.ts deleted file mode 100644 index f68204c5..00000000 --- a/explore/src/app/landingPages/project/libProject.module.ts +++ /dev/null @@ -1,13 +0,0 @@ -import { NgModule} from '@angular/core'; -import { ProjectModule } from '../../openaireLibrary/landingPages/project/project.module'; -import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard'; -import { OpenaireProjectComponent } from './project.component'; -import {ProjectRoutingModule} from './project-routing.module'; - -@NgModule({ - imports: [ProjectModule, ProjectRoutingModule], - declarations:[OpenaireProjectComponent], - providers:[ PreviousRouteRecorder], - exports:[OpenaireProjectComponent] -}) -export class LibProjectModule { } diff --git a/explore/src/app/landingPages/project/project-routing.module.ts b/explore/src/app/landingPages/project/project-routing.module.ts deleted file mode 100644 index db65850e..00000000 --- a/explore/src/app/landingPages/project/project-routing.module.ts +++ /dev/null @@ -1,17 +0,0 @@ -import { NgModule } from '@angular/core'; -import { RouterModule } from '@angular/router'; - -import { OpenaireProjectComponent } from './project.component'; -import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard'; -import {properties} from "../../../environments/environment"; - -@NgModule({ - imports: [ - RouterModule.forChild([ - { path: '', component: OpenaireProjectComponent, data: { - redirect: properties.errorLink, community : 'openaire' - },canDeactivate: [PreviousRouteRecorder] } - ]) - ] -}) -export class ProjectRoutingModule { } diff --git a/explore/src/app/landingPages/project/project.component.ts b/explore/src/app/landingPages/project/project.component.ts deleted file mode 100644 index a3964dae..00000000 --- a/explore/src/app/landingPages/project/project.component.ts +++ /dev/null @@ -1,17 +0,0 @@ -import {Component} from '@angular/core'; - -@Component({ - selector: 'openaire-project', - template: ``, - }) -export class OpenaireProjectComponent{ - constructor ( ) { - - } - - ngOnInit() { -} - - - -} diff --git a/explore/src/app/landingPages/publication/libPublication.module.ts b/explore/src/app/landingPages/publication/libPublication.module.ts deleted file mode 100644 index b94b9adf..00000000 --- a/explore/src/app/landingPages/publication/libPublication.module.ts +++ /dev/null @@ -1,13 +0,0 @@ -import { NgModule} from '@angular/core'; -import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard'; -import { OpenairePublicationComponent } from './publication.component'; -import {PublicationRoutingModule} from './publication-routing.module'; -import {ResultLandingModule} from "../../openaireLibrary/landingPages/result/resultLanding.module"; - -@NgModule({ - imports: [PublicationRoutingModule, ResultLandingModule], - declarations:[OpenairePublicationComponent], - providers:[ PreviousRouteRecorder], - exports:[OpenairePublicationComponent] -}) -export class LibPublicationModule { } diff --git a/explore/src/app/landingPages/publication/publication-routing.module.ts b/explore/src/app/landingPages/publication/publication-routing.module.ts deleted file mode 100644 index dbccb6d4..00000000 --- a/explore/src/app/landingPages/publication/publication-routing.module.ts +++ /dev/null @@ -1,17 +0,0 @@ -import { NgModule } from '@angular/core'; -import { RouterModule } from '@angular/router'; - -import {OpenairePublicationComponent } from './publication.component'; -import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard'; -import {properties} from "../../../environments/environment"; - -@NgModule({ - imports: [ - RouterModule.forChild([ - { path: '', component: OpenairePublicationComponent, data: { - redirect: properties.errorLink, community : 'openaire' - },canDeactivate: [PreviousRouteRecorder] } - ]) -] -}) -export class PublicationRoutingModule { } diff --git a/explore/src/app/landingPages/publication/publication.component.ts b/explore/src/app/landingPages/publication/publication.component.ts deleted file mode 100644 index e82ff254..00000000 --- a/explore/src/app/landingPages/publication/publication.component.ts +++ /dev/null @@ -1,8 +0,0 @@ -import {Component} from '@angular/core'; - -@Component({ - selector: 'openaire-publication', - template: ` - `, -}) -export class OpenairePublicationComponent {} diff --git a/explore/src/app/landingPages/result/libResult.module.ts b/explore/src/app/landingPages/result/libResult.module.ts deleted file mode 100644 index 39be4780..00000000 --- a/explore/src/app/landingPages/result/libResult.module.ts +++ /dev/null @@ -1,13 +0,0 @@ -import {NgModule} from '@angular/core'; -import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard'; -import {OpenaireResultComponent} from './result.component'; -import {ResultRoutingModule} from './result-routing.module'; -import {ResultLandingModule} from "../../openaireLibrary/landingPages/result/resultLanding.module"; - -@NgModule({ - imports: [ResultRoutingModule, ResultLandingModule], - declarations:[OpenaireResultComponent], - providers:[PreviousRouteRecorder], - exports:[OpenaireResultComponent] -}) -export class LibResultModule { } diff --git a/explore/src/app/landingPages/result/result-routing.module.ts b/explore/src/app/landingPages/result/result-routing.module.ts deleted file mode 100644 index 666fcc64..00000000 --- a/explore/src/app/landingPages/result/result-routing.module.ts +++ /dev/null @@ -1,18 +0,0 @@ -import { NgModule } from '@angular/core'; -import { RouterModule } from '@angular/router'; - -import {OpenaireResultComponent } from './result.component'; -import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard'; -import {properties} from "../../../environments/environment"; - - -@NgModule({ - imports: [ - RouterModule.forChild([ - { path: '', component: OpenaireResultComponent, data: { - redirect: properties.errorLink, community : 'openaire' - },canDeactivate: [PreviousRouteRecorder] } - ]) -] -}) -export class ResultRoutingModule { } diff --git a/explore/src/app/landingPages/result/result.component.ts b/explore/src/app/landingPages/result/result.component.ts deleted file mode 100644 index 860e4010..00000000 --- a/explore/src/app/landingPages/result/result.component.ts +++ /dev/null @@ -1,7 +0,0 @@ -import {Component} from '@angular/core'; - -@Component({ - selector: 'openaire-publication', - template: ``, - }) -export class OpenaireResultComponent{} diff --git a/explore/src/app/landingPages/software/libSoftware.module.ts b/explore/src/app/landingPages/software/libSoftware.module.ts deleted file mode 100644 index 04a89717..00000000 --- a/explore/src/app/landingPages/software/libSoftware.module.ts +++ /dev/null @@ -1,13 +0,0 @@ -import { NgModule} from '@angular/core'; - -import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard'; -import { OpenaireSoftwareComponent } from './software.component'; -import {SoftwareRoutingModule} from './software-routing.module'; -import {ResultLandingModule} from "../../openaireLibrary/landingPages/result/resultLanding.module"; -@NgModule({ - imports: [SoftwareRoutingModule, ResultLandingModule], - declarations:[OpenaireSoftwareComponent], - providers:[PreviousRouteRecorder], - exports:[OpenaireSoftwareComponent] -}) -export class LibSoftwareModule { } diff --git a/explore/src/app/landingPages/software/software-routing.module.ts b/explore/src/app/landingPages/software/software-routing.module.ts deleted file mode 100644 index daa33916..00000000 --- a/explore/src/app/landingPages/software/software-routing.module.ts +++ /dev/null @@ -1,14 +0,0 @@ -import { NgModule } from '@angular/core'; -import { RouterModule } from '@angular/router'; - -import {OpenaireSoftwareComponent } from './software.component'; -import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard'; - -@NgModule({ - imports: [ - RouterModule.forChild([ - { path: '', component: OpenaireSoftwareComponent, canDeactivate: [PreviousRouteRecorder] } - ]) -] -}) -export class SoftwareRoutingModule { } diff --git a/explore/src/app/landingPages/software/software.component.ts b/explore/src/app/landingPages/software/software.component.ts deleted file mode 100644 index 17d10ef3..00000000 --- a/explore/src/app/landingPages/software/software.component.ts +++ /dev/null @@ -1,7 +0,0 @@ -import {Component} from '@angular/core'; - -@Component({ - selector: 'openaire-software', - template: ``, - }) -export class OpenaireSoftwareComponent{} diff --git a/explore/src/app/login/libUser.module.ts b/explore/src/app/login/libUser.module.ts deleted file mode 100644 index b1040ceb..00000000 --- a/explore/src/app/login/libUser.module.ts +++ /dev/null @@ -1,23 +0,0 @@ -import { NgModule} from '@angular/core'; -import { CommonModule } from '@angular/common'; -import { FormsModule } from '@angular/forms'; - -import {OpenaireUserComponent } from './user.component'; -import { UserRoutingModule } from './user-routing.module'; -import { UserModule} from '../openaireLibrary/login/user.module'; - -import {PreviousRouteRecorder} from '../openaireLibrary/utils/piwik/previousRouteRecorder.guard'; - -@NgModule({ - imports: [ - CommonModule, FormsModule, - UserRoutingModule, UserModule - - ], - providers:[PreviousRouteRecorder], - declarations: [ -OpenaireUserComponent - -] -}) -export class LibUserModule { } diff --git a/explore/src/app/login/user-routing.module.ts b/explore/src/app/login/user-routing.module.ts deleted file mode 100644 index 1a8ad90c..00000000 --- a/explore/src/app/login/user-routing.module.ts +++ /dev/null @@ -1,15 +0,0 @@ -import { NgModule } from '@angular/core'; -import { RouterModule } from '@angular/router'; - -import {OpenaireUserComponent } from './user.component'; -import {PreviousRouteRecorder} from '../openaireLibrary/utils/piwik/previousRouteRecorder.guard'; - -@NgModule({ - imports: [ - RouterModule.forChild([ - { path: '', component: OpenaireUserComponent, canDeactivate: [PreviousRouteRecorder]}, - - ]) - ] -}) -export class UserRoutingModule { } diff --git a/explore/src/app/login/user.component.ts b/explore/src/app/login/user.component.ts deleted file mode 100644 index 4e9f00d0..00000000 --- a/explore/src/app/login/user.component.ts +++ /dev/null @@ -1,10 +0,0 @@ -import {Component} from '@angular/core'; - -@Component({ - selector: 'openaire-user', - template: `` - }) - -export class OpenaireUserComponent { - -} diff --git a/explore/src/app/orcid/my-orcid-links/myOrcidLinks-routing.module.ts b/explore/src/app/orcid/my-orcid-links/myOrcidLinks-routing.module.ts deleted file mode 100644 index 232b8c5e..00000000 --- a/explore/src/app/orcid/my-orcid-links/myOrcidLinks-routing.module.ts +++ /dev/null @@ -1,21 +0,0 @@ -import { NgModule } from '@angular/core'; -import { RouterModule } from '@angular/router'; -import {PreviousRouteRecorder} from "../../openaireLibrary/utils/piwik/previousRouteRecorder.guard"; -import {OpenaireMyOrcidLinksComponent} from "./myOrcidLinks.component"; -import {LoginGuard} from "../../openaireLibrary/login/loginGuard.guard"; -import {properties} from "../../../environments/environment"; - -@NgModule({ - imports: [ - RouterModule.forChild([ - { path: '', component: OpenaireMyOrcidLinksComponent, - canActivate: [LoginGuard], data: { - redirect: properties.errorLink, community : 'openaire' - }, - canDeactivate: [PreviousRouteRecorder] - } - - ]) - ] -}) -export class MyOrcidLinksRoutingModule { } diff --git a/explore/src/app/orcid/my-orcid-links/myOrcidLinks.component.ts b/explore/src/app/orcid/my-orcid-links/myOrcidLinks.component.ts deleted file mode 100644 index 71975443..00000000 --- a/explore/src/app/orcid/my-orcid-links/myOrcidLinks.component.ts +++ /dev/null @@ -1,16 +0,0 @@ -import {Component} from '@angular/core'; - -@Component({ - selector: 'openaire-my-orcid-links', - template: ` - - ` -}) - -export class OpenaireMyOrcidLinksComponent { - - constructor() {} - - public ngOnInit() {} -} - diff --git a/explore/src/app/orcid/my-orcid-links/myOrcidLinks.module.ts b/explore/src/app/orcid/my-orcid-links/myOrcidLinks.module.ts deleted file mode 100644 index ace58ca7..00000000 --- a/explore/src/app/orcid/my-orcid-links/myOrcidLinks.module.ts +++ /dev/null @@ -1,24 +0,0 @@ -import { NgModule } from '@angular/core'; -import { CommonModule } from '@angular/common'; -import { FormsModule } from '@angular/forms'; -import {PreviousRouteRecorder} from "../../openaireLibrary/utils/piwik/previousRouteRecorder.guard"; -import {OpenaireMyOrcidLinksComponent} from './myOrcidLinks.component'; -import {MyOrcidLinksModule} from "../../openaireLibrary/orcid/my-orcid-links/myOrcidLinks.module"; -import {MyOrcidLinksRoutingModule} from "./myOrcidLinks-routing.module"; -import {LoginGuard} from "../../openaireLibrary/login/loginGuard.guard"; - -@NgModule({ - imports: [ - CommonModule, FormsModule, - MyOrcidLinksModule, - MyOrcidLinksRoutingModule - ], - declarations: [ - OpenaireMyOrcidLinksComponent - ], - exports: [ - OpenaireMyOrcidLinksComponent - ], - providers: [PreviousRouteRecorder, LoginGuard] -}) -export class LibMyOrcidLinksModule { } diff --git a/explore/src/app/orcid/orcid-routing.module.ts b/explore/src/app/orcid/orcid-routing.module.ts deleted file mode 100644 index a2cb0053..00000000 --- a/explore/src/app/orcid/orcid-routing.module.ts +++ /dev/null @@ -1,21 +0,0 @@ -import { NgModule } from '@angular/core'; -import { RouterModule } from '@angular/router'; - -import {OpenaireOrcidComponent} from './orcid.component'; -import {PreviousRouteRecorder} from "../openaireLibrary/utils/piwik/previousRouteRecorder.guard"; -import {LoginGuard} from "../openaireLibrary/login/loginGuard.guard"; -import {properties} from "../../environments/environment"; - -@NgModule({ - imports: [ - RouterModule.forChild([ - { path: '', component: OpenaireOrcidComponent, - canActivate: [LoginGuard], data: { - redirect: properties.errorLink, community : 'openaire' - }, - canDeactivate: [PreviousRouteRecorder] } - - ]) - ] -}) -export class OrcidRoutingModule { } diff --git a/explore/src/app/orcid/orcid.component.ts b/explore/src/app/orcid/orcid.component.ts deleted file mode 100644 index 65976b8a..00000000 --- a/explore/src/app/orcid/orcid.component.ts +++ /dev/null @@ -1,10 +0,0 @@ -import { Component } from '@angular/core'; - -@Component({ - selector: 'openaire-orcid', - template: ` - - ` -}) - -export class OpenaireOrcidComponent {} \ No newline at end of file diff --git a/explore/src/app/orcid/orcid.module.ts b/explore/src/app/orcid/orcid.module.ts deleted file mode 100644 index fb566187..00000000 --- a/explore/src/app/orcid/orcid.module.ts +++ /dev/null @@ -1,24 +0,0 @@ -import { NgModule } from '@angular/core'; -import { CommonModule } from '@angular/common'; - -import {OpenaireOrcidComponent} from './orcid.component'; -import {OrcidRoutingModule} from './orcid-routing.module'; -import {PreviousRouteRecorder} from "../openaireLibrary/utils/piwik/previousRouteRecorder.guard"; -import {FormsModule} from "@angular/forms"; -import {OrcidModule} from "../openaireLibrary/orcid/orcid.module"; -import {LoginGuard} from "../openaireLibrary/login/loginGuard.guard"; - -@NgModule({ - imports: [ - CommonModule, FormsModule, - OrcidModule, OrcidRoutingModule - ], - declarations: [ - OpenaireOrcidComponent - ], - providers: [PreviousRouteRecorder, LoginGuard], - exports: [ - OpenaireOrcidComponent - ] -}) -export class LibOrcidModule { } diff --git a/explore/src/app/orcid/recommend-orcid-links/searchRecommendedResultsForOrcid-routing.module.ts b/explore/src/app/orcid/recommend-orcid-links/searchRecommendedResultsForOrcid-routing.module.ts deleted file mode 100644 index c48b4ecc..00000000 --- a/explore/src/app/orcid/recommend-orcid-links/searchRecommendedResultsForOrcid-routing.module.ts +++ /dev/null @@ -1,24 +0,0 @@ -import { NgModule } from '@angular/core'; -import { RouterModule } from '@angular/router'; -import {IsRouteEnabled} from "../../openaireLibrary/error/isRouteEnabled.guard"; -import {PreviousRouteRecorder} from "../../openaireLibrary/utils/piwik/previousRouteRecorder.guard"; -import {OpenaireSearchRecommendedResultsForOrcidComponent} from "./searchRecommendedResultsForOrcid.component"; -import {FreeGuard} from "../../openaireLibrary/login/freeGuard.guard"; -import {LoginGuard} from "../../openaireLibrary/login/loginGuard.guard"; -import {properties} from "../../../environments/environment"; - -@NgModule({ - imports: [ - RouterModule.forChild([ - // { path: '', component: OpenaireSearchMyResultsInOrcidComponent, canActivate: [IsRouteEnabled], data: { - { path: '', component: OpenaireSearchRecommendedResultsForOrcidComponent, - canActivate: [LoginGuard], data: { - redirect: properties.errorLink, community : 'openaire' - }, - canDeactivate: [PreviousRouteRecorder] - } - - ]) - ] -}) -export class SearchRecommendedResultsForOrcidRoutingModule { } diff --git a/explore/src/app/orcid/recommend-orcid-links/searchRecommendedResultsForOrcid.component.ts b/explore/src/app/orcid/recommend-orcid-links/searchRecommendedResultsForOrcid.component.ts deleted file mode 100644 index 8e11400e..00000000 --- a/explore/src/app/orcid/recommend-orcid-links/searchRecommendedResultsForOrcid.component.ts +++ /dev/null @@ -1,16 +0,0 @@ -import {Component} from '@angular/core'; - -@Component({ - selector: 'openaire-search-recommended-results-for-orcid', - template: ` - - ` -}) - -export class OpenaireSearchRecommendedResultsForOrcidComponent { - - constructor() {} - - public ngOnInit() {} -} - diff --git a/explore/src/app/orcid/recommend-orcid-links/searchRecommendedResultsForOrcid.module.ts b/explore/src/app/orcid/recommend-orcid-links/searchRecommendedResultsForOrcid.module.ts deleted file mode 100644 index 0ee0dcc3..00000000 --- a/explore/src/app/orcid/recommend-orcid-links/searchRecommendedResultsForOrcid.module.ts +++ /dev/null @@ -1,27 +0,0 @@ -import { NgModule } from '@angular/core'; -import { CommonModule } from '@angular/common'; -import { FormsModule } from '@angular/forms'; -import {OpenaireSearchRecommendedResultsForOrcidComponent} from "./searchRecommendedResultsForOrcid.component"; -import {PreviousRouteRecorder} from "../../openaireLibrary/utils/piwik/previousRouteRecorder.guard"; -import {IsRouteEnabled} from "../../openaireLibrary/error/isRouteEnabled.guard"; -import {SearchRecommendedResultsForOrcidModule} from "../../openaireLibrary/orcid/recommend-orcid-links/searchRecommendedResultsForOrcid.module"; -import {SearchRecommendedResultsForOrcidRoutingModule} from "./searchRecommendedResultsForOrcid-routing.module"; -import {FreeGuard} from "../../openaireLibrary/login/freeGuard.guard"; -import {LoginGuard} from "../../openaireLibrary/login/loginGuard.guard"; - -@NgModule({ - imports: [ - CommonModule, FormsModule, - SearchRecommendedResultsForOrcidModule, - SearchRecommendedResultsForOrcidRoutingModule - ], - declarations: [ - OpenaireSearchRecommendedResultsForOrcidComponent - ], - exports: [ - OpenaireSearchRecommendedResultsForOrcidComponent - ], - // providers: [PreviousRouteRecorder, IsRouteEnabled] - providers: [PreviousRouteRecorder, LoginGuard] -}) -export class LibSearchRecommendedResultsForOrcidModule { } diff --git a/explore/src/app/reload/libReload.module.ts b/explore/src/app/reload/libReload.module.ts deleted file mode 100644 index d33a6e82..00000000 --- a/explore/src/app/reload/libReload.module.ts +++ /dev/null @@ -1,18 +0,0 @@ -import {NgModule} from '@angular/core'; -import {CommonModule} from '@angular/common'; -import {FormsModule} from '@angular/forms'; -import {RouterModule} from '@angular/router'; - -import {ReloadModule} from '../openaireLibrary/reload/reload.module'; - - -@NgModule({ - imports: [ - CommonModule, FormsModule, RouterModule, ReloadModule - ], - declarations: [], - providers: [], - exports: [] -}) -export class LibReloadModule { -} diff --git a/explore/src/app/sdg/sdg-routing.module.ts b/explore/src/app/sdg/sdg-routing.module.ts deleted file mode 100644 index 2634df2c..00000000 --- a/explore/src/app/sdg/sdg-routing.module.ts +++ /dev/null @@ -1,17 +0,0 @@ -import {NgModule} from "@angular/core"; -import {RouterModule} from "@angular/router"; -import {PreviousRouteRecorder} from "../openaireLibrary/utils/piwik/previousRouteRecorder.guard"; -import {ExploreSdgComponent} from "./sdg.component"; - -@NgModule({ - imports: [ - RouterModule.forChild([ - { - path: '', - component: ExploreSdgComponent, - canDeactivate: [PreviousRouteRecorder] - } - ]) - ] -}) -export class LibSdgRoutingModule { } \ No newline at end of file diff --git a/explore/src/app/sdg/sdg.component.ts b/explore/src/app/sdg/sdg.component.ts deleted file mode 100644 index 2f78b9e7..00000000 --- a/explore/src/app/sdg/sdg.component.ts +++ /dev/null @@ -1,10 +0,0 @@ -import {Component} from "@angular/core"; -import {properties} from "../../environments/environment"; - -@Component({ - selector: 'explore-sdg', - template: ` - - ` -}) -export class ExploreSdgComponent {} diff --git a/explore/src/app/sdg/sdg.module.ts b/explore/src/app/sdg/sdg.module.ts deleted file mode 100644 index dcded98a..00000000 --- a/explore/src/app/sdg/sdg.module.ts +++ /dev/null @@ -1,26 +0,0 @@ -import {CommonModule} from "@angular/common"; -import {NgModule} from "@angular/core"; -import {PreviousRouteRecorder} from "../openaireLibrary/utils/piwik/previousRouteRecorder.guard"; -import {LibSdgRoutingModule} from "./sdg-routing.module"; -import {SdgRoutingModule} from "../openaireLibrary/sdg/sdg-routing.module"; -import {SdgModule} from "../openaireLibrary/sdg/sdg.module"; -import {ExploreSdgComponent} from "./sdg.component"; - -@NgModule({ - imports: [ - CommonModule, - LibSdgRoutingModule, - SdgRoutingModule, - SdgModule - ], - declarations: [ - ExploreSdgComponent - ], - exports: [ - ExploreSdgComponent - ], - providers: [ - PreviousRouteRecorder - ] -}) -export class LibSdgModule { } \ No newline at end of file diff --git a/explore/src/app/searchPages/advanced/advancedSearchOrganizations.module.ts b/explore/src/app/searchPages/advanced/advancedSearchOrganizations.module.ts index b14b2c53..13d560f1 100644 --- a/explore/src/app/searchPages/advanced/advancedSearchOrganizations.module.ts +++ b/explore/src/app/searchPages/advanced/advancedSearchOrganizations.module.ts @@ -9,10 +9,9 @@ import {SearchOrganizationsModule} from "../../openaireLibrary/searchPages/searc @NgModule({ imports: [ + AdvancedSearchOrganizationsRoutingModule, CommonModule, FormsModule, - SearchOrganizationsModule, - AdvancedSearchOrganizationsRoutingModule - + SearchOrganizationsModule ], declarations: [ OpenaireAdvancedSearchOrganizationsComponent diff --git a/explore/src/app/searchPages/advanced/advancedSearchProjects.module.ts b/explore/src/app/searchPages/advanced/advancedSearchProjects.module.ts index aad0d692..f14c6228 100644 --- a/explore/src/app/searchPages/advanced/advancedSearchProjects.module.ts +++ b/explore/src/app/searchPages/advanced/advancedSearchProjects.module.ts @@ -8,10 +8,9 @@ import {SearchProjectsModule} from "../../openaireLibrary/searchPages/searchProj @NgModule({ imports: [ + AdvancedSearchProjectsRoutingModule, CommonModule, FormsModule, - SearchProjectsModule, - AdvancedSearchProjectsRoutingModule - + SearchProjectsModule ], declarations: [ OpenaireAdvancedSearchProjectsComponent diff --git a/explore/src/app/searchPages/advanced/searchResearchResults.module.ts b/explore/src/app/searchPages/advanced/searchResearchResults.module.ts index 9462486c..3d216071 100644 --- a/explore/src/app/searchPages/advanced/searchResearchResults.module.ts +++ b/explore/src/app/searchPages/advanced/searchResearchResults.module.ts @@ -5,7 +5,6 @@ import { FormsModule } from '@angular/forms'; import{ SearchResearchResultsRoutingModule} from './searchResearchResults-routing.module'; import{OpenaireSearchResearchResultsComponent} from './searchResearchResults.component'; -import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard'; import {SearchResearchResultsModule} from "../../openaireLibrary/searchPages/searchResearchResults.module"; @NgModule({ @@ -17,7 +16,7 @@ import {SearchResearchResultsModule} from "../../openaireLibrary/searchPages/sea declarations: [ OpenaireSearchResearchResultsComponent ], - providers:[PreviousRouteRecorder], + providers:[], exports: [ OpenaireSearchResearchResultsComponent ] diff --git a/explore/src/app/searchPages/dataProviders/compatibleDataProviders.module.ts b/explore/src/app/searchPages/dataProviders/compatibleDataProviders.module.ts index 6232991c..33037524 100644 --- a/explore/src/app/searchPages/dataProviders/compatibleDataProviders.module.ts +++ b/explore/src/app/searchPages/dataProviders/compatibleDataProviders.module.ts @@ -5,8 +5,6 @@ import { FormsModule } from '@angular/forms'; import{ CompatibleDataProvidersRoutingModule} from './compatibleDataProviders-routing.module'; import{OpenaireSearchCompatibleDataprovidersComponent} from './compatibleDataProviders.component'; -import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard'; - import {SearchDataProvidersModule} from "../../openaireLibrary/searchPages/searchDataProviders.module"; @NgModule({ @@ -18,7 +16,7 @@ import {SearchDataProvidersModule} from "../../openaireLibrary/searchPages/searc declarations: [ OpenaireSearchCompatibleDataprovidersComponent ], - providers:[PreviousRouteRecorder], + providers:[], exports: [ OpenaireSearchCompatibleDataprovidersComponent ] diff --git a/explore/src/app/searchPages/dataProviders/entityRegistries.module.ts b/explore/src/app/searchPages/dataProviders/entityRegistries.module.ts index 2fa4b58c..c9f143fe 100644 --- a/explore/src/app/searchPages/dataProviders/entityRegistries.module.ts +++ b/explore/src/app/searchPages/dataProviders/entityRegistries.module.ts @@ -4,7 +4,6 @@ import { FormsModule } from '@angular/forms'; import{ EntityRegistriesRoutingModule} from './entityRegistries-routing.module'; import{OpenaireSearchEntityRegistriesComponent} from './entityRegistries.component'; -import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard'; import {SearchDataProvidersModule} from "../../openaireLibrary/searchPages/searchDataProviders.module"; @@ -17,7 +16,7 @@ import {SearchDataProvidersModule} from "../../openaireLibrary/searchPages/searc declarations: [ OpenaireSearchEntityRegistriesComponent ], - providers:[PreviousRouteRecorder], + providers:[], exports: [ OpenaireSearchEntityRegistriesComponent ] diff --git a/explore/src/app/searchPages/dataProviders/journals.module.ts b/explore/src/app/searchPages/dataProviders/journals.module.ts index 072aacf8..1db3b814 100644 --- a/explore/src/app/searchPages/dataProviders/journals.module.ts +++ b/explore/src/app/searchPages/dataProviders/journals.module.ts @@ -4,7 +4,6 @@ import { FormsModule } from '@angular/forms'; import{ JournalsRoutingModule} from './journals-routing.module'; import{OpenaireSearchJournalsComponent} from './journals.component'; -import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard'; import {SearchDataProvidersModule} from "../../openaireLibrary/searchPages/searchDataProviders.module"; @NgModule({ imports: [ @@ -14,7 +13,7 @@ import {SearchDataProvidersModule} from "../../openaireLibrary/searchPages/searc declarations: [ OpenaireSearchJournalsComponent ], - providers:[PreviousRouteRecorder], + providers:[], exports: [ OpenaireSearchJournalsComponent ] diff --git a/explore/src/app/searchPages/simple/searchDataProviders.module.ts b/explore/src/app/searchPages/simple/searchDataProviders.module.ts index b27cf5af..85af92f6 100644 --- a/explore/src/app/searchPages/simple/searchDataProviders.module.ts +++ b/explore/src/app/searchPages/simple/searchDataProviders.module.ts @@ -3,7 +3,6 @@ import { CommonModule } from '@angular/common'; import { FormsModule } from '@angular/forms'; import {OpenaireSearchDataprovidersComponent} from './searchDataproviders.component'; import{ SearchDataProvidersRoutingModule} from './searchDataProviders-routing.module'; -import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard'; import {SearchDataProvidersModule} from '../../openaireLibrary/searchPages/searchDataProviders.module'; @NgModule({ imports: [ @@ -14,7 +13,7 @@ SearchDataProvidersModule, SearchDataProvidersRoutingModule declarations: [ OpenaireSearchDataprovidersComponent ], - providers:[PreviousRouteRecorder], + providers:[], exports: [ OpenaireSearchDataprovidersComponent ] diff --git a/explore/src/app/searchPages/simple/searchOrganizations.module.ts b/explore/src/app/searchPages/simple/searchOrganizations.module.ts index 9218a4ab..0450a4ea 100644 --- a/explore/src/app/searchPages/simple/searchOrganizations.module.ts +++ b/explore/src/app/searchPages/simple/searchOrganizations.module.ts @@ -5,7 +5,6 @@ import { FormsModule } from '@angular/forms'; import{ SearchOrganizationsRoutingModule} from './searchOrganizations-routing.module'; import{OpenaireSearchOrganizationsComponent} from './searchOrganizations.component'; -import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard'; import {SearchOrganizationsModule} from "../../openaireLibrary/searchPages/searchOrganizations.module"; @@ -18,7 +17,7 @@ import {SearchOrganizationsModule} from "../../openaireLibrary/searchPages/searc declarations: [ OpenaireSearchOrganizationsComponent ], - providers:[PreviousRouteRecorder], + providers:[], exports: [ OpenaireSearchOrganizationsComponent ] diff --git a/explore/src/app/searchPages/simple/searchProjects.module.ts b/explore/src/app/searchPages/simple/searchProjects.module.ts index 8b746aa4..47223420 100644 --- a/explore/src/app/searchPages/simple/searchProjects.module.ts +++ b/explore/src/app/searchPages/simple/searchProjects.module.ts @@ -5,7 +5,6 @@ import { FormsModule } from '@angular/forms'; import{ SearchProjectsRoutingModule} from './searchProjects-routing.module'; import{OpenaireSearchProjectsComponent} from './searchProjects.component'; -import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard'; import { SearchProjectsModule} from '../../openaireLibrary/searchPages/searchProjects.module'; @NgModule({ imports: [ @@ -15,7 +14,7 @@ import { SearchProjectsModule} from '../../openaireLibrary/searchPages/searchPro declarations: [ OpenaireSearchProjectsComponent ], - providers:[PreviousRouteRecorder], + providers:[], exports: [ OpenaireSearchProjectsComponent ] diff --git a/explore/src/app/searchPages/simple/searchResearchResults.module.ts b/explore/src/app/searchPages/simple/searchResearchResults.module.ts index b1d52c78..24fd7dab 100644 --- a/explore/src/app/searchPages/simple/searchResearchResults.module.ts +++ b/explore/src/app/searchPages/simple/searchResearchResults.module.ts @@ -5,7 +5,6 @@ import { FormsModule } from '@angular/forms'; import{ SearchResearchResultsRoutingModule} from './searchResearchResults-routing.module'; import{OpenaireSearchResearchResultsComponent} from './searchResearchResults.component'; -import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard'; import {SearchResearchResultsModule} from "../../openaireLibrary/searchPages/searchResearchResults.module"; @NgModule({ @@ -17,7 +16,7 @@ import {SearchResearchResultsModule} from "../../openaireLibrary/searchPages/sea declarations: [ OpenaireSearchResearchResultsComponent ], - providers:[PreviousRouteRecorder], + providers:[], exports: [ OpenaireSearchResearchResultsComponent ] diff --git a/explore/src/assets/ExploreLogos/datasets.png b/explore/src/assets/ExploreLogos/datasets.png index bfe7b3fb..c11289b4 100644 Binary files a/explore/src/assets/ExploreLogos/datasets.png and b/explore/src/assets/ExploreLogos/datasets.png differ diff --git a/explore/src/assets/ExploreLogos/funders.png b/explore/src/assets/ExploreLogos/funders.png index e06fb016..8e19f423 100644 Binary files a/explore/src/assets/ExploreLogos/funders.png and b/explore/src/assets/ExploreLogos/funders.png differ diff --git a/explore/src/assets/ExploreLogos/pids.png b/explore/src/assets/ExploreLogos/pids.png index c4248c2d..8ff577cb 100644 Binary files a/explore/src/assets/ExploreLogos/pids.png and b/explore/src/assets/ExploreLogos/pids.png differ diff --git a/explore/src/assets/ExploreLogos/publications.png b/explore/src/assets/ExploreLogos/publications.png index 22de1a12..1ebaf6d8 100644 Binary files a/explore/src/assets/ExploreLogos/publications.png and b/explore/src/assets/ExploreLogos/publications.png differ diff --git a/explore/src/assets/ExploreLogos/publications2.png b/explore/src/assets/ExploreLogos/publications2.png index d889d5cc..7fc816e8 100644 Binary files a/explore/src/assets/ExploreLogos/publications2.png and b/explore/src/assets/ExploreLogos/publications2.png differ diff --git a/explore/src/assets/ExploreLogos/software.png b/explore/src/assets/ExploreLogos/software.png index 2bcac348..64307221 100644 Binary files a/explore/src/assets/ExploreLogos/software.png and b/explore/src/assets/ExploreLogos/software.png differ diff --git a/explore/src/assets/ask-explore.svg b/explore/src/assets/ask-explore.svg deleted file mode 100644 index c1a04931..00000000 --- a/explore/src/assets/ask-explore.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/explore/src/assets/curved-bottom.svg b/explore/src/assets/curved-bottom.svg deleted file mode 100644 index b4742be8..00000000 --- a/explore/src/assets/curved-bottom.svg +++ /dev/null @@ -1 +0,0 @@ - diff --git a/explore/src/assets/explore-assets/funders/funders.png b/explore/src/assets/explore-assets/funders/funders.png index 0ff764f5..697d7d92 100644 Binary files a/explore/src/assets/explore-assets/funders/funders.png and b/explore/src/assets/explore-assets/funders/funders.png differ diff --git a/explore/src/assets/explore-assets/funders/logos/ARC.png b/explore/src/assets/explore-assets/funders/logos/ARC.png index 3b46f9bb..f05896c1 100644 Binary files a/explore/src/assets/explore-assets/funders/logos/ARC.png and b/explore/src/assets/explore-assets/funders/logos/ARC.png differ diff --git a/explore/src/assets/explore-assets/funders/logos/ASAP.png b/explore/src/assets/explore-assets/funders/logos/ASAP.png index 96ccfd25..d79d75ac 100644 Binary files a/explore/src/assets/explore-assets/funders/logos/ASAP.png and b/explore/src/assets/explore-assets/funders/logos/ASAP.png differ diff --git a/explore/src/assets/explore-assets/funders/logos/CIHR.png b/explore/src/assets/explore-assets/funders/logos/CIHR.png index ad3b65fb..2294f0de 100644 Binary files a/explore/src/assets/explore-assets/funders/logos/CIHR.png and b/explore/src/assets/explore-assets/funders/logos/CIHR.png differ diff --git a/explore/src/assets/explore-assets/funders/logos/EEA.png b/explore/src/assets/explore-assets/funders/logos/EEA.png index e2c9d290..7f4bcfa7 100644 Binary files a/explore/src/assets/explore-assets/funders/logos/EEA.png and b/explore/src/assets/explore-assets/funders/logos/EEA.png differ diff --git a/explore/src/assets/explore-assets/funders/logos/INCa.png b/explore/src/assets/explore-assets/funders/logos/INCa.png index 8ca6f31a..436b0306 100644 Binary files a/explore/src/assets/explore-assets/funders/logos/INCa.png and b/explore/src/assets/explore-assets/funders/logos/INCa.png differ diff --git a/explore/src/assets/explore-assets/funders/logos/NHMRC.png b/explore/src/assets/explore-assets/funders/logos/NHMRC.png index 12177452..798e6842 100644 Binary files a/explore/src/assets/explore-assets/funders/logos/NHMRC.png and b/explore/src/assets/explore-assets/funders/logos/NHMRC.png differ diff --git a/explore/src/assets/explore-assets/funders/logos/NIH.png b/explore/src/assets/explore-assets/funders/logos/NIH.png index be2451af..ce6faab6 100644 Binary files a/explore/src/assets/explore-assets/funders/logos/NIH.png and b/explore/src/assets/explore-assets/funders/logos/NIH.png differ diff --git a/explore/src/assets/explore-assets/funders/logos/NSERC.png b/explore/src/assets/explore-assets/funders/logos/NSERC.png index fddb3ac8..c001193c 100644 Binary files a/explore/src/assets/explore-assets/funders/logos/NSERC.png and b/explore/src/assets/explore-assets/funders/logos/NSERC.png differ diff --git a/explore/src/assets/explore-assets/funders/logos/NSF.png b/explore/src/assets/explore-assets/funders/logos/NSF.png index ac7704db..1ef4553a 100644 Binary files a/explore/src/assets/explore-assets/funders/logos/NSF.png and b/explore/src/assets/explore-assets/funders/logos/NSF.png differ diff --git a/explore/src/assets/explore-assets/funders/logos/SSHRC.png b/explore/src/assets/explore-assets/funders/logos/SSHRC.png index 6b3c52ce..9912b615 100644 Binary files a/explore/src/assets/explore-assets/funders/logos/SSHRC.png and b/explore/src/assets/explore-assets/funders/logos/SSHRC.png differ diff --git a/explore/src/assets/explore-assets/funders/logos/TARA.png b/explore/src/assets/explore-assets/funders/logos/TARA.png index fe3336b5..eef93af3 100644 Binary files a/explore/src/assets/explore-assets/funders/logos/TARA.png and b/explore/src/assets/explore-assets/funders/logos/TARA.png differ diff --git a/explore/src/assets/explore-assets/funders/logos/UKRI.png b/explore/src/assets/explore-assets/funders/logos/UKRI.png index 9d9b596f..cc34a1dc 100644 Binary files a/explore/src/assets/explore-assets/funders/logos/UKRI.png and b/explore/src/assets/explore-assets/funders/logos/UKRI.png differ diff --git a/explore/src/assets/explore-assets/funders/logos/WT.png b/explore/src/assets/explore-assets/funders/logos/WT.png index 52149df8..6f593bdf 100644 Binary files a/explore/src/assets/explore-assets/funders/logos/WT.png and b/explore/src/assets/explore-assets/funders/logos/WT.png differ diff --git a/explore/src/assets/explore-assets/graph.png b/explore/src/assets/explore-assets/graph.png deleted file mode 100644 index d49ce712..00000000 Binary files a/explore/src/assets/explore-assets/graph.png and /dev/null differ diff --git a/explore/src/assets/explore-assets/home/1.png b/explore/src/assets/explore-assets/home/1.png index 12ca2ce8..f587c425 100644 Binary files a/explore/src/assets/explore-assets/home/1.png and b/explore/src/assets/explore-assets/home/1.png differ diff --git a/explore/src/assets/explore-assets/home/2.png b/explore/src/assets/explore-assets/home/2.png index 7b5e06e7..c5f0ad5f 100644 Binary files a/explore/src/assets/explore-assets/home/2.png and b/explore/src/assets/explore-assets/home/2.png differ diff --git a/explore/src/assets/explore-assets/home/3.png b/explore/src/assets/explore-assets/home/3.png index bbbc0fb9..88cbb8be 100644 Binary files a/explore/src/assets/explore-assets/home/3.png and b/explore/src/assets/explore-assets/home/3.png differ diff --git a/explore/src/assets/explore-assets/home/4.png b/explore/src/assets/explore-assets/home/4.png index 22c3a9b5..f9d88fa1 100644 Binary files a/explore/src/assets/explore-assets/home/4.png and b/explore/src/assets/explore-assets/home/4.png differ diff --git a/explore/src/assets/explore-assets/home/explore.jpg b/explore/src/assets/explore-assets/home/explore.jpg index 9291f895..f9374079 100644 Binary files a/explore/src/assets/explore-assets/home/explore.jpg and b/explore/src/assets/explore-assets/home/explore.jpg differ diff --git a/explore/src/assets/explore-assets/home/tablet.png b/explore/src/assets/explore-assets/home/tablet.png index 37826a4a..2621a7ae 100644 Binary files a/explore/src/assets/explore-assets/home/tablet.png and b/explore/src/assets/explore-assets/home/tablet.png differ diff --git a/explore/src/assets/explore-assets/trello-2.svg b/explore/src/assets/explore-assets/trello-2.svg deleted file mode 100644 index 6a5e682a..00000000 --- a/explore/src/assets/explore-assets/trello-2.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/explore/src/assets/explore-assets/trello-sc.png b/explore/src/assets/explore-assets/trello-sc.png deleted file mode 100644 index d4330f7d..00000000 Binary files a/explore/src/assets/explore-assets/trello-sc.png and /dev/null differ diff --git a/explore/src/assets/explore-assets/trello.svg b/explore/src/assets/explore-assets/trello.svg deleted file mode 100644 index cf47fb37..00000000 --- a/explore/src/assets/explore-assets/trello.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/explore/src/assets/explore-banner.png b/explore/src/assets/explore-banner.png deleted file mode 100644 index 6fd5da96..00000000 Binary files a/explore/src/assets/explore-banner.png and /dev/null differ diff --git a/explore/src/assets/explore.svg b/explore/src/assets/explore.svg deleted file mode 100644 index c41bb4d3..00000000 --- a/explore/src/assets/explore.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/explore/src/assets/home.jpg b/explore/src/assets/home.jpg deleted file mode 100644 index b0fae781..00000000 Binary files a/explore/src/assets/home.jpg and /dev/null differ diff --git a/explore/src/assets/link.svg b/explore/src/assets/link.svg deleted file mode 100644 index d8e54c36..00000000 --- a/explore/src/assets/link.svg +++ /dev/null @@ -1 +0,0 @@ -Asset 82 \ No newline at end of file diff --git a/explore/src/assets/lock.svg b/explore/src/assets/lock.svg deleted file mode 100644 index 3e7671d8..00000000 --- a/explore/src/assets/lock.svg +++ /dev/null @@ -1 +0,0 @@ - diff --git a/explore/src/assets/logo-large-explore.png b/explore/src/assets/logo-large-explore.png deleted file mode 100644 index d225e6f4..00000000 Binary files a/explore/src/assets/logo-large-explore.png and /dev/null differ diff --git a/explore/src/assets/logo-small-explore.png b/explore/src/assets/logo-small-explore.png deleted file mode 100644 index 20a16039..00000000 Binary files a/explore/src/assets/logo-small-explore.png and /dev/null differ diff --git a/explore/src/assets/share.svg b/explore/src/assets/share.svg deleted file mode 100644 index f6c165b8..00000000 --- a/explore/src/assets/share.svg +++ /dev/null @@ -1 +0,0 @@ -Asset 83 \ No newline at end of file diff --git a/explore/src/assets/sky_bw3.png b/explore/src/assets/sky_bw3.png deleted file mode 100644 index efff4140..00000000 Binary files a/explore/src/assets/sky_bw3.png and /dev/null differ diff --git a/explore/src/assets/trello-2.svg b/explore/src/assets/trello-2.svg deleted file mode 100644 index 6a5e682a..00000000 --- a/explore/src/assets/trello-2.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/explore/src/assets/trello-sc.png b/explore/src/assets/trello-sc.png deleted file mode 100644 index d4330f7d..00000000 Binary files a/explore/src/assets/trello-sc.png and /dev/null differ diff --git a/explore/src/assets/trello.svg b/explore/src/assets/trello.svg deleted file mode 100644 index cf47fb37..00000000 --- a/explore/src/assets/trello.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/explore/src/assets/Εxplore-sub.jpg b/explore/src/assets/Εxplore-sub.jpg deleted file mode 100644 index 78d4e8d9..00000000 Binary files a/explore/src/assets/Εxplore-sub.jpg and /dev/null differ diff --git a/explore/src/environments/environment.test.ts b/explore/src/environments/environment.test.ts index 8c3d48cd..bbfea56f 100644 --- a/explore/src/environments/environment.test.ts +++ b/explore/src/environments/environment.test.ts @@ -14,7 +14,7 @@ let props: EnvProperties = { baseLink : "", errorLink: '/error', myOrcidLinksPage: "/my-orcid-links", - footerGrantText: "OpenAIRE has received funding from the European Union's Horizon 2020 research and innovation programme under grant agreements No. 777541 and 101017452", + footerGrantText: "OpenAIRE has received funding from a series of EU funded projects.", piwikSiteId: "109" }; diff --git a/explore/src/environments/environment.ts b/explore/src/environments/environment.ts index d9747fbf..df57cab5 100644 --- a/explore/src/environments/environment.ts +++ b/explore/src/environments/environment.ts @@ -66,9 +66,6 @@ let props: EnvProperties = { piwikBaseUrl: "https://analytics.openaire.eu/piwik.php?idsite=", piwikSiteId: "6", - loginUrl: "http://mpagasas.di.uoa.gr:19080/login-service/openid_connect_login", - userInfoUrl: "http://mpagasas.di.uoa.gr:19080/login-service/userInfo", - logoutUrl: "http://mpagasas.di.uoa.gr:19080/login-service/openid_logout", cookieDomain: ".di.uoa.gr", feedbackmail: "kostis30fylloy@gmail.com", diff --git a/services/cache/mecache/cache.js b/services/cache/mecache/cache.js index cb86e64c..a525742e 100644 --- a/services/cache/mecache/cache.js +++ b/services/cache/mecache/cache.js @@ -116,6 +116,10 @@ app.get('/metrics', (req, res) => { res.end(register.metrics()); }); +app.get('/info', (req, res) => { + res.status(200).send(getResponse(200, {size:lruCache.size, keys: Array.from(lruCache.keys())})); +}); + app.get('/get', cache(), cors(), (req, res) => { setTimeout(() => { const url = (req.query) ? req.query.url : null; diff --git a/services/utils-service/uploadService.js b/services/utils-service/uploadService.js index c26704a5..4b9361e8 100644 --- a/services/utils-service/uploadService.js +++ b/services/utils-service/uploadService.js @@ -104,10 +104,7 @@ app.get('/explore/home', async function (req, res) { try { // Make requests to multiple APIs let requests= [ - searchServiceAPIUrl + 'publications/count?format=json', - searchServiceAPIUrl + 'datasets/count?format=json', - searchServiceAPIUrl + 'software/count?format=json', - searchServiceAPIUrl + 'other/count?format=json', + "http://localhost:" + properties.get('port') + "/portals/countResults", searchServiceAPIUrl +'results/?fields=relfunder&sf=relfunder&format=json&size=0', searchServiceAPIUrl + 'datasources/count?format=json', searchServiceAPIUrl + 'resources2/?format=json&size=0&type=organizations&fq=(reldatasourcecompatibilityid exact driver or reldatasourcecompatibilityid exact driver-openaire2.0 or reldatasourcecompatibilityid exact openaire2.0 or reldatasourcecompatibilityid exact openaire3.0 or reldatasourcecompatibilityid exact openaire4.0 or reldatasourcecompatibilityid exact openaire-cris_1.1 or reldatasourcecompatibilityid exact openaire2.0_data or reldatasourcecompatibilityid exact hostedBy or relproject=*)', @@ -121,26 +118,24 @@ app.get('/explore/home', async function (req, res) { const allRequestsSuccessful = dataResponses.every((response) => response.status === 200); // Combine the data const aggregatedData = { - publications: dataResponses[0].data.total, - datasets: dataResponses[1].data.total, - software: dataResponses[2].data.total, - other: dataResponses[3].data.total, - results: dataResponses[4].data.meta.total, - /*resultFunders:resultRES.data.refineResults.relfunder.length,*/ - datasources: dataResponses[5].data.total, - organizations: dataResponses[6].data.meta.total, - projects:dataResponses[7].data.meta.total, - /*projectFunders:projectsRES.data.refineResults.funder.length,*/ - funders: parseNoOfFunders(dataResponses[4].data, dataResponses[7].data), - datasetsInterlinked:dataResponses[8].data.meta.total, - softwareInterlinked:dataResponses[9].data.meta.total, + publications: dataResponses[0].data.publications, + datasets: dataResponses[0].data.datasets, + software: dataResponses[0].data.software, + other: dataResponses[0].data.other, + results: dataResponses[1].data.meta.total, + datasources: dataResponses[2].data.total, + organizations: dataResponses[3].data.meta.total, + projects:dataResponses[4].data.meta.total, + funders: parseNoOfFunders(dataResponses[1].data, dataResponses[4].data), + datasetsInterlinked:dataResponses[5].data.meta.total, + softwareInterlinked:dataResponses[6].data.meta.total, success:allRequestsSuccessful }; // Send the aggregated data as the response res.status(allRequestsSuccessful?200:207).json(aggregatedData); } catch (error) { - console.error('Error fetching data:', error.message); + console.error('Error fetching data:', error); res.status(500).send('Internal Server Error'); } }); @@ -178,6 +173,47 @@ app.get('/explore/search', async function (req, res) { } }); +app.get('/portals/countResults', async function (req, res) { + const field = req.query.field; + let allowedFields = ["communityid"]; + if(field && allowedFields.indexOf(field) ==-1){ + res.status(405).send('Not allowed request'); + return; + } + const value = req.query.value; + const params = field && value?(encodeURI("&fq=" + field + "=" + value)):""; + let aggregatedData = {}; + + try { + // Make requests to multiple APIs + let requests= [ + searchServiceAPIUrl +'publications/count?format=json' + params, + searchServiceAPIUrl +'datasets/count?format=json' + params, + searchServiceAPIUrl +'software/count?format=json' + params, + searchServiceAPIUrl +'other/count?format=json' + params + ] + const dataPromises = requests.map((url) => axios.get( url)); + const dataResponses = await Promise.all(dataPromises); + // Determine if all additional requests were successful + const allRequestsSuccessful = dataResponses.every((response) => response.status === 200); + // Combine the data + aggregatedData = { + publications: dataResponses[0].data.total, + datasets: dataResponses[1].data.total, + software: dataResponses[2].data.total, + other:dataResponses[3].data.total, + success:allRequestsSuccessful + + }; + + // Send the aggregated data as the response + res.status(allRequestsSuccessful?200:207).json(aggregatedData); + } catch (error) { + console.log(aggregatedData) + console.error('Error fetching data:', error); + res.status(500).send('Internal Server Error'); + } +}); app.get('/explore/funders', async function (req, res) { let aggregatedData = {}; try {