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

[Monitor Dashboard|Trunk] 

Admin tool pages: 
	updates after migration
	css updates after theme change



git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-monitor-portal/trunk/monitor_dashboard@59725 d315682c-612b-4755-9ff5-7f18f6832af3
This commit is contained in:
Argiro Kokogiannaki 2020-10-30 13:59:37 +00:00
parent fe47322863
commit d83f8ca0b2
22 changed files with 64 additions and 65 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -39,8 +39,10 @@ export class AppComponent implements OnInit, OnDestroy {
logoUrl: null,
logoSmallUrl: null,
position: 'center',
badge: false
badge: false,
stickyAnimation : false
};
userMenuItems: MenuItem[] = [new MenuItem("", "My profile", "", "", false, [], [], {})];
adminMenuItems: MenuItem[] = [];
stakeholder: Stakeholder = null;
@ -219,7 +221,8 @@ export class AppComponent implements OnInit, OnDestroy {
logoUrl: null,
logoSmallUrl: null,
position: 'center',
badge: false
badge: false,
stickyAnimation: false
};
if (this.isAdmin()) {
this.menuItems.push({
@ -239,7 +242,8 @@ export class AppComponent implements OnInit, OnDestroy {
logoUrl: null,
logoSmallUrl: null,
position: 'center',
badge: false
badge: false,
stickyAnimation: false
};
this.menuItems.push({
rootItem: new MenuItem("", "Dashboard",
@ -274,7 +278,8 @@ export class AppComponent implements OnInit, OnDestroy {
logoUrl: 'assets/common-assets/logo-large-monitor.png',
logoSmallUrl: "assets/common-assets/logo-small-monitor.png",
position: 'left',
badge: true
badge: true,
stickyAnimation: false
};
//TODO monitor menu items?
@ -286,22 +291,23 @@ export class AppComponent implements OnInit, OnDestroy {
logoUrl: null,
logoSmallUrl: null,
position: 'center',
badge: false
badge: false,
stickyAnimation: false
};
this.adminMenuItems = [];
this.specialSideBarMenuItem = null;
this.adminMenuItems.push(new MenuItem("stakeholders", "Manage profiles", "", "/admin", false, [], [], {}, "<i uk-icon=\"cog\"></i>"));
/*let adminOptions = new MenuItem("adminOptions", "Admin Options", "", "", false, [], [], {})
/*let adminOptions = new MenuItem("adminOptions", "Admin Options", "", null, false, [], [], {})
adminOptions.items.push(new MenuItem("pages", "Pages", "", "/pages", false, [], [], {}));
adminOptions.items.push(new MenuItem("portals", "Portals", "", "/portals", false, [], [], {}));
adminOptions.items.push(new MenuItem("entities", "Entities", "", "/entities", false, [], [], {}));
adminOptions.items.push(new MenuItem("classes", "Class help texts", "", "/classes", false, [], [], {}));
this.adminMenuItems.push(adminOptions);
let monitorOptions = new MenuItem("monitorOptions", "Monitor Options", "", "", false, [], [], {})
monitorOptions.items.push(new MenuItem("pages", "Pages", "", "/pages", false, [], [], {communityId: 'openaire'}));
monitorOptions.items.push(new MenuItem("entities", "Entities", "", "/entities", false, [], [], {communityId: 'openaire'}));
monitorOptions.items.push(new MenuItem("classes", "Class help texts", "", "/classContents", false, [], [], {communityId: 'openaire'}));
monitorOptions.items.push(new MenuItem("helptexts", "Help texts", "", "/helptexts", false, [], [], {communityId: 'openaire'}));
let monitorOptions = new MenuItem("monitorOptions", "Monitor Options", "", null, false, [], [], {})
monitorOptions.items.push(new MenuItem("pages", "Pages", "", "/pages", false, [], [], {communityId: 'monitor'}));
monitorOptions.items.push(new MenuItem("entities", "Entities", "", "/entities", false, [], [], {communityId: 'monitor'}));
monitorOptions.items.push(new MenuItem("classes", "Class help texts", "", "/classContents", false, [], [], {communityId: 'monitor'}));
monitorOptions.items.push(new MenuItem("helptexts", "Help texts", "", "/helptexts", false, [], [], {communityId: 'monitor'}));
this.adminMenuItems.push(monitorOptions);*/
}

5
src/app/classHelpTexts/div-help-contents-routing.module.ts
View File

@ -1,13 +1,12 @@
import { NgModule } from '@angular/core';
import {RouterModule} from '@angular/router';
import {IsCommunity} from "../openaireLibrary/connect/communityGuard/isCommunity.guard";
import {ConnectAdminLoginGuard} from "../openaireLibrary/connect/communityGuard/connectAdminLoginGuard.guard";
import {DivHelpContentsComponent} from "../openaireLibrary/dashboard/divhelpcontent/div-help-contents.component";
import {AdminDashboardGuard} from "../utils/adminDashboard.guard";
@NgModule({
imports: [
RouterModule.forChild([
{ path: '', canActivate: [IsCommunity, ConnectAdminLoginGuard], component: DivHelpContentsComponent}
{ path: '', canActivate: [ AdminDashboardGuard], component: DivHelpContentsComponent}
])
]
})

5
src/app/classHelpTexts/div-help-contents.module.ts
View File

@ -2,14 +2,13 @@ import {NgModule} from '@angular/core';
import {CommonModule} from '@angular/common';
import {DivHelpContentsRoutingModule} from './div-help-contents-routing.module';
import {DivHelpContentsModule} from "../openaireLibrary/dashboard/divhelpcontent/div-help-contents.module";
import {IsCommunity} from "../openaireLibrary/connect/communityGuard/isCommunity.guard";
import {ConnectAdminLoginGuard} from "../openaireLibrary/connect/communityGuard/connectAdminLoginGuard.guard";
import {AdminDashboardGuard} from "../utils/adminDashboard.guard";
@NgModule({
imports: [
CommonModule, DivHelpContentsRoutingModule, DivHelpContentsModule
],
providers: [IsCommunity, ConnectAdminLoginGuard],
providers: [AdminDashboardGuard],
})
export class MonitorDivHelpContentsModule { }

5
src/app/classHelpTexts/edit-div-help-content-routing.module.ts
View File

@ -1,14 +1,13 @@
import { NgModule } from '@angular/core';
import {RouterModule} from '@angular/router';
import {IsCommunity} from "../openaireLibrary/connect/communityGuard/isCommunity.guard";
import {ConnectAdminLoginGuard} from "../openaireLibrary/connect/communityGuard/connectAdminLoginGuard.guard";
import {EditDivHelpContentComponent} from "../openaireLibrary/dashboard/divhelpcontent/edit-div-help-content.component";
import {AdminDashboardGuard} from "../utils/adminDashboard.guard";
@NgModule({
imports: [
RouterModule.forChild([
{ path: '', canActivate: [IsCommunity, ConnectAdminLoginGuard], component: EditDivHelpContentComponent}
{ path: '', canActivate: [AdminDashboardGuard], component: EditDivHelpContentComponent}
])
]
})

5
src/app/classHelpTexts/edit-div-help-content.module.ts
View File

@ -3,13 +3,12 @@ import {CommonModule} from '@angular/common';
import {EditDivHelpContentRoutingModule} from './edit-div-help-content-routing.module';
import {EditDivHelpContentModule} from "../openaireLibrary/dashboard/divhelpcontent/edit-div-help-content.module";
import {IsCommunity} from "../openaireLibrary/connect/communityGuard/isCommunity.guard";
import {ConnectAdminLoginGuard} from "../openaireLibrary/connect/communityGuard/connectAdminLoginGuard.guard";
import {AdminDashboardGuard} from "../utils/adminDashboard.guard";
@NgModule({
imports: [
CommonModule, EditDivHelpContentRoutingModule, EditDivHelpContentModule
],
providers: [IsCommunity, ConnectAdminLoginGuard],
providers: [AdminDashboardGuard],
})
export class MonitorEditDivHelpContentModule { }

5
src/app/classHelpTexts/new-div-help-content-routing.module.ts
View File

@ -1,13 +1,12 @@
import { NgModule } from '@angular/core';
import {RouterModule} from '@angular/router';
import {IsCommunity} from "../openaireLibrary/connect/communityGuard/isCommunity.guard";
import {ConnectAdminLoginGuard} from "../openaireLibrary/connect/communityGuard/connectAdminLoginGuard.guard";
import {NewDivHelpContentComponent} from "../openaireLibrary/dashboard/divhelpcontent/new-div-help-content.component";
import {AdminDashboardGuard} from "../utils/adminDashboard.guard";
@NgModule({
imports: [
RouterModule.forChild([
{ path: '', canActivate: [IsCommunity, ConnectAdminLoginGuard], component: NewDivHelpContentComponent}
{ path: '', canActivate: [AdminDashboardGuard], component: NewDivHelpContentComponent}
])
]
})

6
src/app/classHelpTexts/new-div-help-content.module.ts
View File

@ -1,16 +1,14 @@
import { NgModule } from '@angular/core';
import {RouterModule} from '@angular/router';
import {CommonModule} from '@angular/common';
import {NewDivHelpContentRoutingModule} from "./new-div-help-content-routing.module";
import {NewDivHelpContentModule} from "../openaireLibrary/dashboard/divhelpcontent/new-div-help-content.module";
import {ConnectAdminLoginGuard} from "../openaireLibrary/connect/communityGuard/connectAdminLoginGuard.guard";
import {IsCommunity} from "../openaireLibrary/connect/communityGuard/isCommunity.guard";
import {AdminDashboardGuard} from "../utils/adminDashboard.guard";
@NgModule({
imports: [
CommonModule, NewDivHelpContentRoutingModule, NewDivHelpContentModule
],
providers: [IsCommunity, ConnectAdminLoginGuard],
providers: [AdminDashboardGuard],
})
export class MonitorNewDivHelpContentModule { }

5
src/app/helpTexts/edit-page-help-content-routing.module.ts
View File

@ -1,14 +1,13 @@
import { NgModule } from '@angular/core';
import {RouterModule} from '@angular/router';
import {IsCommunity} from "../openaireLibrary/connect/communityGuard/isCommunity.guard";
import {ConnectAdminLoginGuard} from "../openaireLibrary/connect/communityGuard/connectAdminLoginGuard.guard";
import {EditPageHelpContentComponent} from "../openaireLibrary/dashboard/helpTexts/edit-page-help-content.component";
import {AdminDashboardGuard} from "../utils/adminDashboard.guard";
@NgModule({
imports: [
RouterModule.forChild([
{ path: '', canActivate: [IsCommunity, ConnectAdminLoginGuard], component: EditPageHelpContentComponent}
{ path: '', canActivate: [AdminDashboardGuard], component: EditPageHelpContentComponent}
])
]
})

5
src/app/helpTexts/edit-page-help-content.module.ts
View File

@ -1,16 +1,15 @@
import { NgModule } from '@angular/core';
import {RouterModule} from '@angular/router';
import {CommonModule} from '@angular/common';
import {IsCommunity} from "../openaireLibrary/connect/communityGuard/isCommunity.guard";
import {ConnectAdminLoginGuard} from "../openaireLibrary/connect/communityGuard/connectAdminLoginGuard.guard";
import {EditPageHelpContentRoutingModule} from "./edit-page-help-content-routing.module";
import {EditPageHelpContentModule} from "../openaireLibrary/dashboard/helpTexts/edit-page-help-content.module";
import {AdminDashboardGuard} from "../utils/adminDashboard.guard";
@NgModule({
imports: [
CommonModule, RouterModule,
EditPageHelpContentRoutingModule, EditPageHelpContentModule
],
providers: [IsCommunity, ConnectAdminLoginGuard]
providers: [AdminDashboardGuard]
})
export class MonitorEditPageHelpContentModule { }

5
src/app/helpTexts/new-page-help-content-routing.module.ts
View File

@ -1,14 +1,13 @@
import { NgModule } from '@angular/core';
import {RouterModule} from '@angular/router';
import {IsCommunity} from "../openaireLibrary/connect/communityGuard/isCommunity.guard";
import {ConnectAdminLoginGuard} from "../openaireLibrary/connect/communityGuard/connectAdminLoginGuard.guard";
import {NewPageHelpContentComponent} from "../openaireLibrary/dashboard/helpTexts/new-page-help-content.component";
import {AdminDashboardGuard} from "../utils/adminDashboard.guard";
@NgModule({
imports: [
RouterModule.forChild([
{ path: '', canActivate: [IsCommunity, ConnectAdminLoginGuard], component: NewPageHelpContentComponent}
{ path: '', canActivate: [AdminDashboardGuard], component: NewPageHelpContentComponent}
])
]
})

5
src/app/helpTexts/new-page-help-content.module.ts
View File

@ -1,10 +1,9 @@
import { NgModule } from '@angular/core';
import {RouterModule} from '@angular/router';
import {CommonModule} from '@angular/common';
import {IsCommunity} from "../openaireLibrary/connect/communityGuard/isCommunity.guard";
import {ConnectAdminLoginGuard} from "../openaireLibrary/connect/communityGuard/connectAdminLoginGuard.guard";
import {NewPageHelpContentRoutingModule} from "./new-page-help-content-routing.module";
import {NewPageHelpContentModule} from "../openaireLibrary/dashboard/helpTexts/new-page-help-content.module";
import {AdminDashboardGuard} from "../utils/adminDashboard.guard";
@NgModule({
@ -12,6 +11,6 @@ import {NewPageHelpContentModule} from "../openaireLibrary/dashboard/helpTexts/n
CommonModule, RouterModule,
NewPageHelpContentRoutingModule, NewPageHelpContentModule
],
providers: [IsCommunity, ConnectAdminLoginGuard],
providers: [ AdminDashboardGuard],
})
export class MonitorNewPageHelpContentModule { }

5
src/app/helpTexts/page-help-contents-routing.module.ts
View File

@ -1,13 +1,12 @@
import { NgModule } from '@angular/core';
import {RouterModule} from '@angular/router';
import {IsCommunity} from "../openaireLibrary/connect/communityGuard/isCommunity.guard";
import {ConnectAdminLoginGuard} from "../openaireLibrary/connect/communityGuard/connectAdminLoginGuard.guard";
import {PageHelpContentsComponent} from "../openaireLibrary/dashboard/helpTexts/page-help-contents.component";
import {AdminDashboardGuard} from "../utils/adminDashboard.guard";
@NgModule({
imports: [
RouterModule.forChild([
{ path: '', canActivate: [IsCommunity, ConnectAdminLoginGuard], component: PageHelpContentsComponent}
{ path: '', canActivate: [AdminDashboardGuard], component: PageHelpContentsComponent}
])
]
})

5
src/app/helpTexts/page-help-contents.module.ts
View File

@ -2,13 +2,12 @@ import {NgModule} from '@angular/core';
import {CommonModule} from '@angular/common';
import {PageHelpContentsRoutingModule} from './page-help-contents-routing.module';
import {PageHelpContentsModule} from "../openaireLibrary/dashboard/helpTexts/page-help-contents.module";
import {IsCommunity} from "../openaireLibrary/connect/communityGuard/isCommunity.guard";
import {ConnectAdminLoginGuard} from "../openaireLibrary/connect/communityGuard/connectAdminLoginGuard.guard";
import {AdminDashboardGuard} from "../utils/adminDashboard.guard";
@NgModule({
imports: [
CommonModule, PageHelpContentsRoutingModule, PageHelpContentsModule
],
providers: [IsCommunity, ConnectAdminLoginGuard],
providers: [AdminDashboardGuard],
})
export class MonitorPageHelpContentsModule { }

6
src/app/manageStakeholders/manageStakeholders.component.html
View File

@ -102,9 +102,9 @@
</div>
</div>
</div>
<div class="uk-padding-small uk-padding-remove-top">
<div class="uk-padding-small">
<a class="" [routerLink]="stakeholder.alias">
<div class="uk-flex uk-flex-center" uk-grid>
<div class="uk-flex uk-flex-center">
{{stakeholder.name}}
</div>
</a>
@ -117,7 +117,7 @@
<div *ngIf="!loading">
<div class="uk-card uk-card-default clickable" (click)="editStakeholder(null, isDefault)">
<div class="uk-card-body">
<div uk-grid>
<div>
<div class="uk-width-1-1">
{{text}}
</div>

4
src/app/pages/pages-routing.module.ts
View File

@ -1,13 +1,13 @@
import { NgModule } from '@angular/core';
import {RouterModule} from '@angular/router';
import {PagesComponent} from "../openaireLibrary/dashboard/page/pages.component";
import {ConnectAdminLoginGuard} from "../openaireLibrary/connect/communityGuard/connectAdminLoginGuard.guard";
import {IsCommunityOrAdmin} from "../openaireLibrary/connect/communityGuard/isCommunityOrAdmin";
import {AdminDashboardGuard} from "../utils/adminDashboard.guard";
@NgModule({
imports: [
RouterModule.forChild([
{ path: '', canActivate: [IsCommunityOrAdmin, ConnectAdminLoginGuard], component: PagesComponent}
{ path: '', canActivate: [IsCommunityOrAdmin, AdminDashboardGuard], component: PagesComponent}
])
]
})

4
src/app/pages/pages.module.ts
View File

@ -2,14 +2,14 @@ import {NgModule} from '@angular/core';
import {CommonModule} from '@angular/common';
import {PagesRoutingModule} from './pages-routing.module';
import {IsCommunityOrAdmin} from "../openaireLibrary/connect/communityGuard/isCommunityOrAdmin";
import {ConnectAdminLoginGuard} from "../openaireLibrary/connect/communityGuard/connectAdminLoginGuard.guard";
import {PagesModule} from "../openaireLibrary/dashboard/page/pages.module";
import {AdminDashboardGuard} from "../utils/adminDashboard.guard";
@NgModule({
imports: [
CommonModule, PagesRoutingModule, PagesModule
],
providers: [IsCommunityOrAdmin, ConnectAdminLoginGuard],
providers: [IsCommunityOrAdmin, AdminDashboardGuard],
})
export class MonitorPagesModule { }

4
src/app/portals/portals-routing.module.ts
View File

@ -1,12 +1,12 @@
import { NgModule } from '@angular/core';
import {RouterModule} from '@angular/router';
import {CommunitiesComponent} from "../openaireLibrary/dashboard/portal/communities.component";
import {PortalsComponent} from "../openaireLibrary/dashboard/portal/portals.component";
import {AdminLoginGuard} from "../openaireLibrary/login/adminLoginGuard.guard";
@NgModule({
imports: [
RouterModule.forChild([
{ path: '', canActivate: [AdminLoginGuard], component: CommunitiesComponent}
{ path: '', canActivate: [AdminLoginGuard], component: PortalsComponent}
])
]
})

4
src/app/portals/portals.module.ts
View File

@ -1,12 +1,12 @@
import {NgModule} from '@angular/core';
import {CommonModule} from '@angular/common';
import {CommunitiesModule} from "../openaireLibrary/dashboard/portal/communities.module";
import {PortalModule} from "../openaireLibrary/dashboard/portal/portals.module";
import {AdminLoginGuard} from "../openaireLibrary/login/adminLoginGuard.guard";
import {PortalsRoutingModule} from "./portals-routing.module";
@NgModule({
imports: [
CommonModule, CommunitiesModule, PortalsRoutingModule
CommonModule, PortalModule, PortalsRoutingModule
],
declarations: [],
providers: [AdminLoginGuard],

6
src/assets/dashboard-theme/structure.css
View File

@ -36,15 +36,15 @@
left: calc(var(--sidebar-width) + 0px);
}
#sidebar_main .menu_section > ul > li > a {
#sidebar_main .menu_section > ul > li > a, #sidebar_main .menu_section > ul > li > ul > li > a {
font-size: var(--sidebar-font-size);
color: rgba(0, 0, 0, .7);
}
#sidebar_main .menu_section > ul > li > a:hover{
#sidebar_main .menu_section > ul > li > a:hover, #sidebar_main .menu_section > ul > li > ul > li > a:hover{
color: var(--secondary-color);
}
#sidebar_main .menu_section > ul li.current_section > a {
#sidebar_main .menu_section > ul li.current_section > a, #sidebar_main .menu_section > ul li.current_section > ul > li.current_section > a {
color: var(--primary-color);
}

5
src/assets/new.css
View File

@ -280,6 +280,11 @@ li.selectedVisibility::before {
width: 800px;
}
.tm-header .uk-navbar-container{
background-color: var(--background-color) !important;
box-shadow: none !important;
}
.visibilityMenuIcon{
border-right: 1px solid var(--secondary-color);
border-bottom: 1px solid var(--secondary-color);

2
src/environments/environment.beta.ts
View File

@ -59,7 +59,7 @@ export let properties: EnvProperties = {
monitorServiceAPIURL: "https://beta.services.openaire.eu/uoa-monitor-service/",
adminToolsAPIURL: "https://beta.services.openaire.eu/uoa-admin-tools",
adminToolsAPIURL: "https://beta.services.openaire.eu/uoa-monitor-service/",
adminToolsCommunity: "monitor",
datasourcesAPI: "https://beta.services.openaire.eu/openaire/ds/search/",

5
src/environments/environment.ts
View File

@ -7,6 +7,7 @@ import {EnvProperties} from "../app/openaireLibrary/utils/properties/env-propert
export let properties: EnvProperties = {
environment: "development",
adminToolsPortalType: "monitor",
isDashboard: true,
enablePiwikTrack: false,
useCache: false,
@ -53,7 +54,7 @@ export let properties: EnvProperties = {
loginUrl: "http://mpagasas.di.uoa.gr:8180/dnet-login/openid_connect_login",
userInfoUrl: "http://mpagasas.di.uoa.gr:8080/dnet-openaire-users-1.0.0-SNAPSHOT/api/users/getUserInfo?accessToken=",
logoutUrl: 'http://mpagasas.di.uoa.gr:8180/dnet-login/openid_logout',
/* loginUrl: "http://dl170.madgik.di.uoa.gr:8180/dnet-login/openid_connect_login",
/*loginUrl: "http://dl170.madgik.di.uoa.gr:8180/dnet-login/openid_connect_login",
userInfoUrl: "http://dl170.madgik.di.uoa.gr:8180/dnet-openaire-users-1.0.0-SNAPSHOT/api/users/getUserInfo?accessToken=",
logoutUrl: "https://aai.openaire.eu/proxy/saml2/idp/SingleLogoutService.php?ReturnTo=",*/
cookieDomain: ".di.uoa.gr",
@ -62,7 +63,7 @@ export let properties: EnvProperties = {
// monitorServiceAPIURL: "https://beta.services.openaire.eu/uoa-monitor-service",
monitorServiceAPIURL: "http://duffy.di.uoa.gr:8080/uoa-monitor-service",
adminToolsAPIURL: "http://mpagasas.di.uoa.gr:8080/uoa-admin-tools",
adminToolsAPIURL: "http://duffy.di.uoa.gr:8080/uoa-monitor-service/",
adminToolsCommunity: "monitor",
datasourcesAPI: "https://beta.services.openaire.eu/openaire/ds/search/",