diff --git a/src/app/app-routing.module.ts b/src/app/app-routing.module.ts
index add61d9..12f5327 100644
--- a/src/app/app-routing.module.ts
+++ b/src/app/app-routing.module.ts
@@ -1,5 +1,5 @@
import {NgModule} from '@angular/core';
-import {Routes, RouterModule} from '@angular/router';
+import {Routes, RouterModule, PreloadAllModules} from '@angular/router';
import {OpenaireErrorPageComponent} from './error/errorPage.component';
const routes: Routes = [
@@ -96,7 +96,11 @@ const routes: Routes = [
];
@NgModule({
- imports: [RouterModule.forRoot(routes)],
+ imports: [RouterModule.forRoot(routes, {
+ preloadingStrategy: PreloadAllModules,
+ onSameUrlNavigation: "reload",
+ relativeLinkResolution: 'corrected'
+ })],
exports: [RouterModule]
})
export class AppRoutingModule {
diff --git a/src/app/app.component.ts b/src/app/app.component.ts
index dc73dcc..e8d42d7 100644
--- a/src/app/app.component.ts
+++ b/src/app/app.component.ts
@@ -11,6 +11,7 @@ import {ConnectHelper} from "./openaireLibrary/connect/connectHelper";
import {ConfigurationService} from "./openaireLibrary/utils/configuration/configuration.service";
import {Subscriber} from "rxjs";
import {DOCUMENT} from "@angular/common";
+import {SmoothScroll} from "./openaireLibrary/utils/smooth-scroll";
@Component({
selector: 'app-root',
@@ -53,21 +54,15 @@ export class AppComponent {
agg: AggregatorInfo = null;
subscriptions = [];
- constructor(private userManagementService: UserManagementService, private configurationService: ConfigurationService, @Inject(DOCUMENT) private document, private rendererFactory: RendererFactory2) {
+ constructor(private userManagementService: UserManagementService,
+ private configurationService: ConfigurationService, private smoothScroll: SmoothScroll,
+ @Inject(DOCUMENT) private document, private rendererFactory: RendererFactory2) {
this.id = ConnectHelper.getCommunityFromDomain(this.properties.domain);
this.agg = PortalAggregators.getFilterInfoByMenuId(this.id);
this.setStyles();
this.configurationService.initStaticCommunityInformation(PortalAggregators.getCommunityInfoByMenuId(this.id));
}
- ngOnDestroy() {
- this.subscriptions.forEach(subscription => {
- if (subscription instanceof Subscriber) {
- subscription.unsubscribe();
- }
- });
- this.configurationService.clearSubscriptions();
- this.userManagementService.clearSubscriptions();
- }
+
ngOnInit() {
if (typeof document !== 'undefined') {
this.isClient = true;
@@ -97,6 +92,17 @@ export class AppComponent {
}));
}
+ ngOnDestroy() {
+ this.subscriptions.forEach(subscription => {
+ if (subscription instanceof Subscriber) {
+ subscription.unsubscribe();
+ }
+ });
+ this.configurationService.clearSubscriptions();
+ this.userManagementService.clearSubscriptions();
+ this.smoothScroll.clearSubscriptions();
+ }
+
private buildMenu() {
this.menuItems = [
{rootItem: new MenuItem("home", "Home", "", "/", false, [], null, {}), items: []},
diff --git a/src/index.beta.html b/src/index.beta.html
index 996a849..314d39f 100644
--- a/src/index.beta.html
+++ b/src/index.beta.html
@@ -41,21 +41,17 @@
Search OpenAIRE
-
-
-
-
-
-
-
-
+
+
+
+
+