Merge remote-tracking branch 'origin/develop'

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: 'sdgs', loadChildren: () => import('./openaireLibrary/sdg/sdg.module').then(m => m.SdgModule)},
-	{path: 'fields-of-science', loadChildren: () => import('./fos/fos.module').then(m => m.LibFosModule), data: {extraOffset: 100}},
+	{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: 'orcid', loadChildren: () => import('./openaireLibrary/orcid/orcid.module').then(m => m.OrcidModule)},
-  {path: 'my-orcid-links', loadChildren: () => import('./orcid/my-orcid-links/myOrcidLinks.module').then(m => m.LibMyOrcidLinksModule)},
+  {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/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('./landingPages/publication/libPublication.module').then(m => m.LibPublicationModule), data: {hasQuickContact: false, hasMenuSearchBar: true}},
+  {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('./landingPages/dataset/libDataset.module').then(m => m.LibDatasetModule), data: {hasQuickContact: false, hasMenuSearchBar: true}},
+  {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('./landingPages/software/libSoftware.module').then(m => m.LibSoftwareModule), data: {hasQuickContact: false, hasMenuSearchBar: true}},
+  {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('./landingPages/orp/libOrp.module').then(m => m.LibOrpModule), data: {hasQuickContact: false, hasMenuSearchBar: true}},
+  {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('./landingPages/project/libProject.module').then(m => m.LibProjectModule), data: {hasQuickContact: false, hasMenuSearchBar: true}},
+  {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),
+    loadChildren: () => import('./openaireLibrary/landingPages/dataProvider/dataProvider.module').then(m => m.DataProviderModule),
-		data: {hasQuickContact: false, hasMenuSearchBar: true}
+		data: {hasQuickContact: false, hasMenuSearchBar: true, community: 'openaire'}
   },
   {
     path: 'search/organization',
-    loadChildren: () => import('./landingPages/organization/libOrganization.module').then(m => m.LibOrganizationModule),
+    loadChildren: () => import('./openaireLibrary/landingPages/organization/organization.module').then(m => m.OrganizationModule),
-		data: {hasQuickContact: false, hasMenuSearchBar: true}
+		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: 'reload', loadChildren: () => import('./openaireLibrary/reload/reload.module').then(m => m.ReloadModule)},
-  {path: 'user-info', loadChildren: () => import('./login/libUser.module').then(m => m.LibUserModule)},
+  {path: 'user-info', loadChildren: () => import('./openaireLibrary/login/user.module').then(m => m.UserModule)},
-  {path: 'error', component: OpenaireErrorPageComponent},
+  {path: 'error', component: ErrorPageComponent},
-  {path: '**', pathMatch: 'full', component: OpenaireErrorPageComponent}
+  {path: '**', pathMatch: 'full', component: ErrorPageComponent}
 ];
 
 @NgModule({

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 = [

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'},

explore/src/app/claims/claimsAdmin/claimsAdmin.component.ts

@@ -4,19 +4,17 @@ import {properties} from "../../../environments/environment";
 @Component({
   selector: 'openaire-claims-admin',
   template: `
-    <claims-admin *ngIf="claimsInfoURL && userInfoURL" [claimsInfoURL]=claimsInfoURL [userInfoURL]="userInfoURL">
+    <claims-admin *ngIf="claimsInfoURL" [claimsInfoURL]="claimsInfoURL">
     </claims-admin>
   `,
 })
 export class OpenaireClaimsAdminComponent implements OnInit {
   claimsInfoURL: string;
-  userInfoURL: string;
 
   constructor() {
   }
   
   public ngOnInit() {
     this.claimsInfoURL = properties.claimsInformationLink;
-    this.userInfoURL = properties.userInfoUrl;
   }
 }

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
   ]

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]

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:[

explore/src/app/claims/myClaims/myClaims.component.ts

@@ -5,20 +5,18 @@ import {properties} from "../../../environments/environment";
 @Component({
   selector: 'openaire-my-claims',
   template: `
-    <my-claims *ngIf="userInfoURL && claimsInfoURL" [claimsInfoURL]=claimsInfoURL [userInfoURL]="userInfoURL">
+    <my-claims *ngIf="claimsInfoURL" [claimsInfoURL]="claimsInfoURL">
     </my-claims>
   `
   
 })
 export class OpenaireMyClaimsComponent implements OnInit {
   claimsInfoURL: string;
-  userInfoURL: string;
 
   constructor() {
   }
   
   public ngOnInit() {
     this.claimsInfoURL = properties.claimsInformationLink;
-    this.userInfoURL = properties.userInfoUrl;
   }
 }

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
   ]

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: [
+  providers: [],
-    EmailService, PiwikService, IsRouteEnabled
-  ],
   exports: [
     ContactComponent
   ]

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,
+  providers: [
-    ZenodoCommunitiesService, CommunityService]
+    ZenodoCommunitiesService, CommunityService
+  ]
 })
 export class LibDepositModule { }

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 { }

explore/src/app/error/errorPage.component.ts

@@ -1,12 +0,0 @@
-import { Component } from '@angular/core';
-
-@Component({
-    selector: 'openaire-error',
-    template: `
-    <error></error>
-    `
-})
-
-export class OpenaireErrorPageComponent {
-
-}

explore/src/app/fos/fos-routing.module.ts

@@ -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 { }

explore/src/app/fos/fos.component.ts

@@ -1,11 +0,0 @@
-import {Component} from "@angular/core";
-import {properties} from "../../environments/environment";
-
-@Component({
-	selector: 'explore-fos',
-	template: `
-		<fos></fos>
-	`
-})
-
-export class ExploreFosComponent {}

explore/src/app/fos/fos.module.ts

@@ -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 { }

explore/src/app/funders/funders.component.html

@@ -142,9 +142,9 @@
                   <div class="uk-card-body">
                     <!-- funder logo  -->
                     <div class="uk-card-media-top uk-margin-medium-top uk-padding-large uk-padding-remove-vertical uk-flex uk-flex-center uk-flex-middle uk-height-xsmall">
-                      <img *ngIf="funder.logoUrl; else elseBlock" [src]="funder | logoUrl" [alt]="funder.name + ' logo'" class="uk-height-max-xsmall uk-blend-multiply">
+                      <img *ngIf="funder.logoUrl; else elseBlock" [src]="funder | logoUrl" [alt]="funder.name + ' logo'" class="uk-height-max-xsmall uk-blend-multiply" loading="lazy">
                       <ng-template #elseBlock>
-                        <img src="assets/common-assets/placeholder.png" alt="OpenAIRE placeholder logo" class="uk-height-max-xsmall uk-blend-multiply">
+                        <img src="assets/common-assets/placeholder.png" alt="OpenAIRE placeholder logo" class="uk-height-max-xsmall uk-blend-multiply" loading="lazy">
                       </ng-template>
                     </div>
                     <!-- funder alias -->
@@ -168,7 +168,7 @@
                           target="_blank" [href]="'https://'+(properties.environment =='beta' || properties.environment =='development'?'beta.':'')+'monitor.openaire.eu/dashboard/'+funder.alias">
                           <span class="uk-flex uk-flex-middle">
                             <img src="assets/common-assets/common/Symbol.png" alt="OpenAIRE logo"
-                              class="uk-margin-xsmall-right" style="width: 17px; height: 17px;">
+                              class="uk-margin-xsmall-right" style="width: 17px; height: 17px;" loading="lazy">
                             <span class="monitor-dashboard-link uk-text-uppercase">Monitor Dashboard</span>
                           </span>
                         </a>
@@ -176,7 +176,7 @@
                         <span *ngIf="funder.monitorDashboard && funder.monitorDashboardStatus == 'RESTRICTED'"
                           class="uk-flex uk-flex-middle">
                           <img src="assets/common-assets/common/Symbol.png" alt="OpenAIRE logo"
-                            class="uk-margin-xsmall-right" style="width: 17px; height: 17px;">
+                            class="uk-margin-xsmall-right" style="width: 17px; height: 17px;" loading="lazy">
                           <span class="monitor-dashboard-link uk-text-uppercase uk-text-bold uk-text-small">Monitor Dashboard</span>
                           <icon class="uk-margin-xsmall-left" name="closed_access" [flex]="true" [ratio]="1"></icon>
                         </span>
@@ -211,9 +211,9 @@
                   <div class="uk-grid uk-grid-divider uk-grid-small" uk-grid>
                     <div class="uk-width-expand uk-flex uk-flex-middle">
                       <div class="uk-width-1-6 uk-flex uk-flex-middle uk-flex-center">
-                        <img *ngIf="funder.logoUrl; else elseBlock" [src]="funder | logoUrl" [alt]="funder.name + ' logo'" class="uk-height-max-xsmall uk-blend-multiply">
+                        <img *ngIf="funder.logoUrl; else elseBlock" [src]="funder | logoUrl" [alt]="funder.name + ' logo'" class="uk-height-max-xsmall uk-blend-multiply" loading="lazy">
                         <ng-template #elseBlock>
-                          <img src="assets/common-assets/placeholder.png" alt="OpenAIRE placeholder logo" class="uk-height-max-xsmall uk-blend-multiply">
+                          <img src="assets/common-assets/placeholder.png" alt="OpenAIRE placeholder logo" class="uk-height-max-xsmall uk-blend-multiply" loading="lazy">
                         </ng-template>
                       </div>
                       <div class="uk-width-expand uk-margin-medium-left">
@@ -234,14 +234,14 @@
                               target="_blank" [href]="'https://'+(properties.environment =='beta' || properties.environment =='development'?'beta.':'')+'monitor.openaire.eu/dashboard/'+funder.alias">
                               <span class="uk-flex uk-flex-middle">
                                 <img src="assets/common-assets/common/Symbol.png" alt="OpenAIRE logo"
-                                  class="uk-margin-xsmall-right" style="width: 17px; height: 17px;">
+                                  class="uk-margin-xsmall-right" style="width: 17px; height: 17px;" loading="lazy">
                                 <span class="monitor-dashboard-link uk-text-uppercase">Monitor Dashboard</span>
                               </span>
                             </a>
                             <span *ngIf="funder.monitorDashboard && funder.monitorDashboardStatus == 'RESTRICTED'"
                               class="uk-flex uk-flex-middle">
                               <img src="assets/common-assets/common/Symbol.png" alt="OpenAIRE logo"
-                                class="uk-margin-xsmall-right" style="width: 17px; height: 17px;">
+                                class="uk-margin-xsmall-right" style="width: 17px; height: 17px;" loading="lazy">
                               <span class="monitor-dashboard-link uk-text-uppercase uk-text-bold uk-text-small">Monitor Dashboard</span>
                               <icon class="uk-margin-xsmall-left" name="closed_access" [flex]="true" [ratio]="1"></icon>
                             </span>

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: [
+  providers: [],
-    PiwikService, IsRouteEnabled
-  ],
   exports: [
     FundersComponent
   ]

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"
       ]
     ]

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:[
+  providers:[],
-    PreviousRouteRecorder
-    ],
   exports: [
     HomeComponent
      ]

explore/src/app/landingPages/dataProvider/dataProvider-routing.module.ts

@@ -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 { }

explore/src/app/landingPages/dataProvider/dataProvider.component.ts

@@ -1,17 +0,0 @@
-import {Component} from '@angular/core';
-
-@Component({
-    selector: 'openaire-dataprovider',
-    template: `<dataprovider></dataprovider>`,
- })
-export class OpenaireDataProviderComponent{
-  constructor (  ) {
-
-  }
-
-  ngOnInit() {
-}
-
-
-
-}

explore/src/app/landingPages/dataProvider/libDataProvider.module.ts

@@ -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 { }

explore/src/app/landingPages/dataset/dataset-routing.module.ts

@@ -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 { }

explore/src/app/landingPages/dataset/dataset.component.ts

@@ -1,7 +0,0 @@
-import {Component} from '@angular/core';
-
-@Component({
-    selector: 'openaire-dataset',
-    template: `<result-landing type="dataset"></result-landing>`,
- })
-export class OpenaireDatasetComponent{}

explore/src/app/landingPages/dataset/libDataset.module.ts

@@ -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 { }

explore/src/app/landingPages/organization/libOrganization.module.ts

@@ -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 { }

explore/src/app/landingPages/organization/organization-routing.module.ts

@@ -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 { }

explore/src/app/landingPages/organization/organization.component.ts

@@ -1,17 +0,0 @@
-import {Component} from '@angular/core';
-
-@Component({
-    selector: 'openaire-organization',
-    template: `<organization></organization>`,
- })
-export class OpenaireOrganizationComponent{
-  constructor (  ) {
-
-  }
-
-  ngOnInit() {
-}
-
-
-
-}

explore/src/app/landingPages/orp/libOrp.module.ts

@@ -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 { }

explore/src/app/landingPages/orp/orp-routing.module.ts

@@ -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 { }

explore/src/app/landingPages/orp/orp.component.ts

@@ -1,7 +0,0 @@
-import {Component} from '@angular/core';
-
-@Component({
-    selector: 'openaire-orp',
-    template: `<result-landing type="orp"></result-landing>`,
- })
-export class OpenaireOrpComponent{}

explore/src/app/landingPages/project/libProject.module.ts

@@ -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 { }

explore/src/app/landingPages/project/project-routing.module.ts

@@ -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 { }

explore/src/app/landingPages/project/project.component.ts

@@ -1,17 +0,0 @@
-import {Component} from '@angular/core';
-
-@Component({
-    selector: 'openaire-project',
-    template: `<project></project>`,
- })
-export class OpenaireProjectComponent{
-  constructor (  ) {
-
-  }
-
-  ngOnInit() {
-}
-
-
-
-}

explore/src/app/landingPages/publication/libPublication.module.ts

@@ -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 { }

explore/src/app/landingPages/publication/publication-routing.module.ts

@@ -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 { }

explore/src/app/landingPages/publication/publication.component.ts

@@ -1,8 +0,0 @@
-import {Component} from '@angular/core';
-
-@Component({
-  selector: 'openaire-publication',
-  template: `
-    <result-landing type="publication"></result-landing>`,
-})
-export class OpenairePublicationComponent {}

explore/src/app/landingPages/result/libResult.module.ts

@@ -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 { }

explore/src/app/landingPages/result/result-routing.module.ts

@@ -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 { }

explore/src/app/landingPages/result/result.component.ts

@@ -1,7 +0,0 @@
-import {Component} from '@angular/core';
-
-@Component({
-    selector: 'openaire-publication',
-    template: `<result-landing type="result"></result-landing>`,
- })
-export class OpenaireResultComponent{}

explore/src/app/landingPages/software/libSoftware.module.ts

@@ -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 { }

explore/src/app/landingPages/software/software-routing.module.ts

@@ -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 { }

explore/src/app/landingPages/software/software.component.ts

@@ -1,7 +0,0 @@
-import {Component} from '@angular/core';
-
-@Component({
-    selector: 'openaire-software',
-    template: `<result-landing type="software"></result-landing>`,
- })
-export class OpenaireSoftwareComponent{}

explore/src/app/login/libUser.module.ts

@@ -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 { }

explore/src/app/login/user-routing.module.ts

@@ -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 { }

explore/src/app/login/user.component.ts

@@ -1,10 +0,0 @@
-import {Component} from '@angular/core';
-
-@Component({
-    selector: 'openaire-user',
-    template: `<user></user>`
-  })
-
-export class OpenaireUserComponent {
-
-}

explore/src/app/orcid/my-orcid-links/myOrcidLinks-routing.module.ts

@@ -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 { }

explore/src/app/orcid/my-orcid-links/myOrcidLinks.component.ts

@@ -1,16 +0,0 @@
-import {Component} from '@angular/core';
-
-@Component({
-  selector: 'openaire-my-orcid-links',
-  template: `
-    <my-orcid-links></my-orcid-links>   
-  `
-})
-
-export class OpenaireMyOrcidLinksComponent {
-
-  constructor() {}
-
-  public ngOnInit() {}
-}
-

explore/src/app/orcid/my-orcid-links/myOrcidLinks.module.ts

@@ -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 { }

explore/src/app/orcid/orcid-routing.module.ts

@@ -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 { }

explore/src/app/orcid/orcid.component.ts

@@ -1,10 +0,0 @@
-import { Component } from '@angular/core';
-
-@Component({
-  selector: 'openaire-orcid',
-  template: `
-    <orcid></orcid>
-  `
-})
-
-export class OpenaireOrcidComponent {}

explore/src/app/orcid/orcid.module.ts

@@ -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 { }

explore/src/app/orcid/recommend-orcid-links/searchRecommendedResultsForOrcid-routing.module.ts

@@ -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 { }

explore/src/app/orcid/recommend-orcid-links/searchRecommendedResultsForOrcid.component.ts

@@ -1,16 +0,0 @@
-import {Component} from '@angular/core';
-
-@Component({
-  selector: 'openaire-search-recommended-results-for-orcid',
-  template: `
-    <search-recommended-results-for-orcid></search-recommended-results-for-orcid>
-  `
-})
-
-export class OpenaireSearchRecommendedResultsForOrcidComponent {
-
-  constructor() {}
-
-  public ngOnInit() {}
-}
-

explore/src/app/orcid/recommend-orcid-links/searchRecommendedResultsForOrcid.module.ts

@@ -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 { }

explore/src/app/reload/libReload.module.ts

@@ -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 {
-}

explore/src/app/sdg/sdg-routing.module.ts

@@ -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 { }

explore/src/app/sdg/sdg.component.ts

@@ -1,10 +0,0 @@
-import {Component} from "@angular/core";
-import {properties} from "../../environments/environment";
-
-@Component({
-	selector: 'explore-sdg',
-	template: `
-		<sdg></sdg>
-	`
-})
-export class ExploreSdgComponent {}

explore/src/app/sdg/sdg.module.ts

@@ -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 { }

explore/src/app/searchPages/advanced/advancedSearchOrganizations.module.ts

@@ -9,10 +9,9 @@ import {SearchOrganizationsModule} from "../../openaireLibrary/searchPages/searc
 
 @NgModule({
   imports: [
+    AdvancedSearchOrganizationsRoutingModule,
     CommonModule, FormsModule,
-    SearchOrganizationsModule,
+    SearchOrganizationsModule
-   AdvancedSearchOrganizationsRoutingModule
-
   ],
   declarations: [
     OpenaireAdvancedSearchOrganizationsComponent

explore/src/app/searchPages/advanced/advancedSearchProjects.module.ts

@@ -8,10 +8,9 @@ import {SearchProjectsModule} from "../../openaireLibrary/searchPages/searchProj
 
 @NgModule({
   imports: [
+    AdvancedSearchProjectsRoutingModule,
     CommonModule, FormsModule,
-    SearchProjectsModule,
+    SearchProjectsModule
-    AdvancedSearchProjectsRoutingModule
-
   ],
   declarations: [
     OpenaireAdvancedSearchProjectsComponent

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
      ]

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
      ]

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
      ]

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
      ]

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
      ]

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
      ]

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
      ]

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
      ]

explore/src/assets/ask-explore.svg

@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 70.876 70.876"><defs><style>.a{fill:#fff;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:10;stroke-width:3px;}.a,.b{stroke:#d95f2d;}.b{fill:#d95f2d;stroke-width:2px;}</style></defs><g transform="translate(-1000.9 -961.038)"><g transform="translate(1002.4 962.538)"><path class="a" d="M1036.338,1914.9a33.938,33.938,0,1,1-33.938,33.938A33.923,33.923,0,0,1,1036.338,1914.9Z" transform="translate(-1002.4 -1914.9)"/></g><path class="b" d="M1033.929,975.9a10.839,10.839,0,0,0-10.829,10.829.839.839,0,0,0,1.675.112h0a9.154,9.154,0,1,1,18.308,0,10.223,10.223,0,0,1-3.238,7.256,58.886,58.886,0,0,1-6.475,5.359.8.8,0,0,0-.335.67v6.587a.839.839,0,1,0,1.674.112h0v-6.252a53.715,53.715,0,0,0,6.252-5.247,12.159,12.159,0,0,0,3.684-8.373A10.66,10.66,0,0,0,1033.929,975.9Z" transform="translate(2.409 0.327)"/><circle class="b" cx="1.675" cy="1.675" r="1.675" transform="translate(1034.663 1013.514)"/></g></svg>

explore/src/assets/curved-bottom.svg

@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="1367" height="90.052" viewBox="0 0 1367 90.052"><defs><style>.a{fill:#fafafa;}.b{fill: #f4f4f4;}</style></defs><g transform="translate(11962 8145.052)"><rect class="a" width="1367" height="90" transform="translate(-11962 -8145)"/><path class="b" d="M1367,5S1215.409-18.052,965.38-18.052,590.781,18,350.769,18,0-10.052,0-10.052v-13H1367Z" transform="translate(-11962 -8122)"/></g></svg>

explore/src/assets/explore-assets/trello-2.svg

@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="27" height="27" viewBox="0 0 27 27"><defs><style>.a{fill:#0079bf;}.b{fill:#fff;}</style></defs><g transform="translate(-14 -14)"><g transform="translate(14 14)"><circle class="a" cx="13.5" cy="13.5" r="13.5"/></g><path class="b" d="M50.538,39.5H41.07a1.559,1.559,0,0,0-1.57,1.57v9.443a1.559,1.559,0,0,0,1.57,1.57h9.443a1.559,1.559,0,0,0,1.57-1.57V41.07A1.522,1.522,0,0,0,50.538,39.5Zm-5.558,9.88a.747.747,0,0,1-.746.746H41.893a.747.747,0,0,1-.746-.746V42.227a.747.747,0,0,1,.746-.746h2.341a.747.747,0,0,1,.746.746Zm5.481-3.139a.747.747,0,0,1-.746.746H47.374a.747.747,0,0,1-.746-.746V42.227a.747.747,0,0,1,.746-.746h2.341a.747.747,0,0,1,.746.746Z" transform="translate(-18.305 -18.305)"/></g></svg>