MaDgIK
/
monitor-dashboard
13
0
Fork 0
Code Issues Pull Requests Projects Releases 17 Wiki Activity

Add user-info in dashboards and admin and change url to monitor in error pages. General change container-small to container

This commit is contained in:
Konstantinos Triantafyllou 2022-06-29 14:35:21 +03:00
parent ea80aea320
commit d67c19a913
8 changed files with 20 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/app/app-routing.module.ts
View File

@ -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),

9
src/app/app.component.ts
View File

@ -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,

2
src/app/general/general.component.html
View File

@ -20,7 +20,7 @@
</div>
</div>
<div inner>
<div *ngIf="stakeholder" class="uk-section uk-container uk-container-small">
<div *ngIf="stakeholder" class="uk-section uk-container">
<div class="uk-position-relative" style="min-height: 60vh">
<div [class.hidden]="loading">
<edit-stakeholder #editStakeholderComponent [disableAlias]="true"></edit-stakeholder>

5
src/app/monitor/monitor-routing.module.ts
View File

@ -46,6 +46,11 @@ import {OpenaireErrorPageComponent} from "../error/errorPage.component";
component: OpenaireErrorPageComponent,
data: {hasSidebar: false}
},
{
path: ':stakeholder/user-info',
loadChildren: () => import('../login/libUser.module').then(m => m.LibUserModule),
data: {hasSidebar: false}
},
{
path: ':stakeholder/:topic',
component: MonitorComponent,

2
src/app/openaireLibrary

@ -1 +1 @@
Subproject commit 4625ebf9674e4ffd185bcbee050737b99f690cc4
Subproject commit 13ef1734063f5331eaad586cf874a5b0f3f30521

2
src/assets/common-assets

@ -1 +1 @@
Subproject commit 1c7b42284c58024e7d51cb0ae7c5c27f997c646d
Subproject commit 65cbf342bc890aff15a8831711f69d9b35e6f85d

2
src/assets/dashboard-theme

@ -1 +1 @@
Subproject commit d2afff99f1b7fd5e2f143191dc836bba56bdb8ca
Subproject commit 8818983564cb9e9232979af27fa568c18fa4eba8

2
src/assets/openaire-theme

@ -1 +1 @@
Subproject commit 5edc3ac713d4e2b78ad81d060c0c3f8a1ce3fafe
Subproject commit 8c4585873a56165631bee6b9d33d11fe83fc897c