diff --git a/src/app/app-routing.module.ts b/src/app/app-routing.module.ts index 9cf803b..84502ff 100644 --- a/src/app/app-routing.module.ts +++ b/src/app/app-routing.module.ts @@ -11,11 +11,6 @@ const routes: Routes = [ loadChildren: () => import('./reload/libReload.module').then(m => m.LibReloadModule), data: {hasSidebar: false} }, - { - path: 'user-info', - loadChildren: () => import('./login/libUser.module').then(m => m.LibUserModule), - data: {hasSidebar: false} - }, { path: 'error', component: OpenaireErrorPageComponent, @@ -27,6 +22,11 @@ const routes: Routes = [ canActivateChild: [LoginGuard], data: {hasAdminMenu: true} }, + { + path: 'admin/user-info', + loadChildren: () => import('./login/libUser.module').then(m => m.LibUserModule), + data: {hasSidebar: false} + }, { path: 'admin/admin-tools', loadChildren: () => import('./admin-tools/portal-admin-tools-routing.module').then(m => m.PortalAdminToolsRoutingModule), diff --git a/src/app/app.component.ts b/src/app/app.component.ts index 3750c8c..7b36107 100644 --- a/src/app/app.component.ts +++ b/src/app/app.component.ts @@ -262,10 +262,9 @@ export class AppComponent implements OnInit, OnDestroy { this.userMenuItems.push(new MenuItem("monitorOptions", "Monitor portal options", "", "/admin/monitor/admin-tools/pages", false, [], [], {})); } - this.userMenuItems.push(new MenuItem("", "User information", "", "/user-info", false, [], [], {})); } if (this.stakeholder) { - + this.userMenuItems.push(new MenuItem("", "User information", "", "/" + this.stakeholder.alias + "/user-info", false, [], [], {})); this.menuItems.push({ rootItem: new MenuItem("dashboard", "Dashboard", "", "/" + this.stakeholder.alias, false, [], null, {} @@ -342,6 +341,7 @@ export class AppComponent implements OnInit, OnDestroy { } } else { if (this.isFrontPage || !this.hasAdminMenu) { + this.userMenuItems.push(new MenuItem("", "User information", "https://" + (this.properties.environment == 'beta' ? 'beta.' : '') + 'monitor.openaire.eu/user-info', '', false, [], [], {}, null, null, null, null, "_self")); this.menuHeader = { route: null, url: "https://" + (this.properties.environment == 'beta' ? 'beta.' : '') + 'monitor.openaire.eu', @@ -355,15 +355,16 @@ export class AppComponent implements OnInit, OnDestroy { }; this.menuItems.push({ rootItem: new MenuItem("about", "About", - "https://" + (this.properties.environment == 'beta' ? 'beta.' : '') + 'monitor.openaire.eu/about/learn-how', "", false, [], null, {}), + "https://" + (this.properties.environment == 'beta' ? 'beta.' : '') + 'monitor.openaire.eu/about/learn-how', "", false, [], null, {}, null, null, null, null, "_self"), items: [] }); this.menuItems.push({ rootItem: new MenuItem("browse", "Browse", - "https://" + (this.properties.environment == 'beta' ? 'beta.' : '') + 'monitor.openaire.eu/browse', "", false, [], null, {}), + "https://" + (this.properties.environment == 'beta' ? 'beta.' : '') + 'monitor.openaire.eu/browse', "", false, [], null, {}, null, null, null, null, "_self"), items: [] }); } else { + this.userMenuItems.push(new MenuItem("", "User information", "", "/admin/user-info", false, [], [], {})); this.menuHeader = { route: "/", url: null, diff --git a/src/app/general/general.component.html b/src/app/general/general.component.html index 102b7cd..fbfd343 100644 --- a/src/app/general/general.component.html +++ b/src/app/general/general.component.html @@ -20,7 +20,7 @@