diff --git a/package.json b/package.json index 1fcfabb..6eb04bb 100644 --- a/package.json +++ b/package.json @@ -44,7 +44,6 @@ "@nguniversal/module-map-ngfactory-loader": "^6.0.0", "@types/express": "^4.16.1", "angular-datatables": "^4.4.1", - "citation-js": "^0.3.4", "clipboard": "^1.5.16", "core-js": "^2.4.1", "datatables.net": "^1.10.19", @@ -57,7 +56,6 @@ "prom-client": "^11.3.0", "ts-md5": "^1.2.0", "tslib": "^1.9.0", - "wikidata-sdk": "^5.2.9", "zone.js": "^0.8.26" }, "devDependencies": { diff --git a/src/app/admin-tool/admin-tool-routing.module.ts b/src/app/admin-tool/admin-tool-routing.module.ts index 5e53487..d8decc7 100644 --- a/src/app/admin-tool/admin-tool-routing.module.ts +++ b/src/app/admin-tool/admin-tool-routing.module.ts @@ -10,166 +10,171 @@ import {AdminDashboardGuard} from "../utils/adminDashboard.guard"; {path: '', redirectTo: '/admin', pathMatch: 'full'}, { path: 'portals', - loadChildren: './portals/portals.module#PortalsModule', + loadChildren: '../openaireLibrary/dashboard/portal/portals.module#PortalsModule', canActivate:[AdminLoginGuard], resolve: { envSpecific: EnvironmentSpecificResolver }, data: {hasAdminMenu: true} }, { path: 'entities', - loadChildren: './entities/entities.module#MonitorEntitiesModule', + loadChildren: '../openaireLibrary/dashboard/entity/entities.module#EntitiesModule', + canActivate:[AdminLoginGuard], + resolve: { envSpecific: EnvironmentSpecificResolver }, + data: {hasAdminMenu: true} + }, + { + path: 'classes', + loadChildren: '../openaireLibrary/dashboard/divId/divIds.module#DivIdsModule', canActivate:[AdminLoginGuard], resolve: { envSpecific: EnvironmentSpecificResolver }, data: {hasAdminMenu: true} }, - { path: 'classContents', - loadChildren: './classHelpTexts/div-help-contents.module#MonitorDivHelpContentsModule', + loadChildren: '../openaireLibrary/dashboard/divhelpcontent/div-help-contents.module#DivHelpContentsModule', canActivate:[AdminLoginGuard], resolve: { envSpecific: EnvironmentSpecificResolver }, data: {hasAdminMenu: true} }, { path: 'classContents/new', - loadChildren: './classHelpTexts/new-div-help-content.module#MonitorNewDivHelpContentModule', + loadChildren: '../openaireLibrary/dashboard/divhelpcontent/new-div-help-content.module#NewDivHelpContentModule', canActivate:[AdminLoginGuard], resolve: { envSpecific: EnvironmentSpecificResolver }, data: {hasAdminMenu: true} }, { path: 'classContents/edit', - loadChildren: './classHelpTexts/edit-div-help-content.module#MonitorEditDivHelpContentModule', + loadChildren: '../openaireLibrary/dashboard/divhelpcontent/edit-div-help-content.module#EditDivHelpContentModule', canActivate:[AdminLoginGuard], resolve: { envSpecific: EnvironmentSpecificResolver }, data: {hasAdminMenu: true} }, { path: 'helptexts', - loadChildren: './helpTexts/page-help-contents.module#MonitorPageHelpContentsModule', + loadChildren: '../openaireLibrary/dashboard/helpTexts/page-help-contents.module#PageHelpContentsModule', canActivate:[AdminLoginGuard], resolve: { envSpecific: EnvironmentSpecificResolver }, data: {hasAdminMenu: true} }, { path: 'helptexts/new', - loadChildren: './helpTexts/new-page-help-content.module#MonitorNewPageHelpContentModule', + loadChildren: '../openaireLibrary/dashboard/helpTexts/new-page-help-content.module#NewPageHelpContentModule', canActivate:[AdminLoginGuard], resolve: { envSpecific: EnvironmentSpecificResolver }, data: {hasAdminMenu: true} }, { path: 'helptexts/edit', - loadChildren: './helpTexts/edit-page-help-content.module#MonitorEditPageHelpContentModule', + loadChildren: '../openaireLibrary/dashboard/helpTexts/edit-page-help-content.module#EditPageHelpContentModule', canActivate:[AdminLoginGuard], resolve: { envSpecific: EnvironmentSpecificResolver }, data: {hasAdminMenu: true} }, { path: 'pages', - loadChildren: './pages/pages.module#MonitorPagesModule', + loadChildren: '../openaireLibrary/dashboard/page/pages.module#PagesModule', canActivate:[AdminLoginGuard], resolve: { envSpecific: EnvironmentSpecificResolver }, data: {hasAdminMenu: true} }, { path: 'pageContents', - loadChildren: './helpTexts/page-help-contents.module#MonitorPageHelpContentsModule', + loadChildren: '../openaireLibrary/dashboard/helpTexts/page-help-contents.module#PageHelpContentsModule', canActivate:[AdminLoginGuard], resolve: { envSpecific: EnvironmentSpecificResolver }, data: {hasAdminMenu: true} }, { path: 'pageContents/new', - loadChildren: './helpTexts/new-page-help-content.module#MonitorNewPageHelpContentModule', + loadChildren: '../openaireLibrary/dashboard/helpTexts/new-page-help-content.module#NewPageHelpContentModule', canActivate:[AdminLoginGuard], resolve: { envSpecific: EnvironmentSpecificResolver }, data: {hasAdminMenu: true} }, { path: 'pageContents/edit', - loadChildren: './helpTexts/edit-page-help-content.module#MonitorEditPageHelpContentModule', + loadChildren: '../openaireLibrary/dashboard/helpTexts/edit-page-help-content.module#EditPageHelpContentModule', canActivate:[AdminLoginGuard], resolve: { envSpecific: EnvironmentSpecificResolver }, data: {hasAdminMenu: true} }, - // stakeholder: - + // stakeholder: { path: ':stakeholder/entities', - loadChildren: './entities/entities.module#MonitorEntitiesModule', + loadChildren: '../openaireLibrary/dashboard/entity/entities.module#EntitiesModule', canActivate:[AdminDashboardGuard], resolve: { envSpecific: EnvironmentSpecificResolver }, data: {hasAdminMenu: true} }, { path: ':stakeholder/classContents', - loadChildren: './classHelpTexts/div-help-contents.module#MonitorDivHelpContentsModule', + loadChildren: '../openaireLibrary/dashboard/divhelpcontent/div-help-contents.module#DivHelpContentsModule', canActivate:[AdminDashboardGuard], resolve: { envSpecific: EnvironmentSpecificResolver }, data: {hasAdminMenu: true} }, { path: ':stakeholder/classContents/new', - loadChildren: './classHelpTexts/new-div-help-content.module#MonitorNewDivHelpContentModule', + loadChildren: '../openaireLibrary/dashboard/divhelpcontent/new-div-help-content.module#NewDivHelpContentModule', canActivate:[AdminDashboardGuard], resolve: { envSpecific: EnvironmentSpecificResolver }, data: {hasAdminMenu: true} }, { path: ':stakeholder/classContents/edit', - loadChildren: './classHelpTexts/edit-div-help-content.module#MonitorEditDivHelpContentModule', + loadChildren: '../openaireLibrary/dashboard/divhelpcontent/edit-div-help-content.module#EditDivHelpContentModule', canActivate:[AdminDashboardGuard], resolve: { envSpecific: EnvironmentSpecificResolver }, data: {hasAdminMenu: true} }, { path: ':stakeholder/helptexts', - loadChildren: './helpTexts/page-help-contents.module#MonitorPageHelpContentsModule', + loadChildren: '../openaireLibrary/dashboard/helpTexts/page-help-contents.module#PageHelpContentsModule', canActivate:[AdminDashboardGuard], resolve: { envSpecific: EnvironmentSpecificResolver }, data: {hasAdminMenu: true} }, { path: ':stakeholder/helptexts/new', - loadChildren: './helpTexts/new-page-help-content.module#MonitorNewPageHelpContentModule', + loadChildren: '../openaireLibrary/dashboard/helpTexts/new-page-help-content.module#NewPageHelpContentModule', canActivate:[AdminDashboardGuard], resolve: { envSpecific: EnvironmentSpecificResolver }, data: {hasAdminMenu: true} }, { path: ':stakeholder/helptexts/edit', - loadChildren: './helpTexts/edit-page-help-content.module#MonitorEditPageHelpContentModule', + loadChildren: '../openaireLibrary/dashboard/helpTexts/edit-page-help-content.module#EditPageHelpContentModule', canActivate:[AdminDashboardGuard], resolve: { envSpecific: EnvironmentSpecificResolver }, data: {hasAdminMenu: true} }, { path: ':stakeholder/pages', - loadChildren: './pages/pages.module#MonitorPagesModule', + loadChildren: '../openaireLibrary/dashboard/page/pages.module#PagesModule', canActivate:[AdminDashboardGuard], resolve: { envSpecific: EnvironmentSpecificResolver }, data: {hasAdminMenu: true} }, { path: ':stakeholder/pageContents', - loadChildren: './helpTexts/page-help-contents.module#MonitorPageHelpContentsModule', + loadChildren: '../openaireLibrary/dashboard/helpTexts/page-help-contents.module#PageHelpContentsModule', canActivate:[AdminDashboardGuard], resolve: { envSpecific: EnvironmentSpecificResolver }, data: {hasAdminMenu: true} }, { path: ':stakeholder/pageContents/new', - loadChildren: './helpTexts/new-page-help-content.module#MonitorNewPageHelpContentModule', + loadChildren: '../openaireLibrary/dashboard/helpTexts/new-page-help-content.module#NewPageHelpContentModule', canActivate:[AdminDashboardGuard], resolve: { envSpecific: EnvironmentSpecificResolver }, data: {hasAdminMenu: true} }, { path: ':stakeholder/pageContents/edit', - loadChildren: './helpTexts/edit-page-help-content.module#MonitorEditPageHelpContentModule', + loadChildren: '../openaireLibrary/dashboard/helpTexts/edit-page-help-content.module#EditPageHelpContentModule', canActivate:[AdminDashboardGuard], resolve: { envSpecific: EnvironmentSpecificResolver }, data: {hasAdminMenu: true} diff --git a/src/app/admin-tool/classHelpTexts/div-help-contents-routing.module.ts b/src/app/admin-tool/classHelpTexts/div-help-contents-routing.module.ts deleted file mode 100644 index e5d61ce..0000000 --- a/src/app/admin-tool/classHelpTexts/div-help-contents-routing.module.ts +++ /dev/null @@ -1,13 +0,0 @@ -import { NgModule } from '@angular/core'; -import {RouterModule} from '@angular/router'; -import {DivHelpContentsComponent} from "../../openaireLibrary/dashboard/divhelpcontent/div-help-contents.component"; -import {AdminDashboardGuard} from "../../utils/adminDashboard.guard"; - -@NgModule({ - imports: [ - RouterModule.forChild([ - { path: '', canActivate: [ AdminDashboardGuard], component: DivHelpContentsComponent} - ]) - ] -}) -export class DivHelpContentsRoutingModule { } diff --git a/src/app/admin-tool/classHelpTexts/div-help-contents.module.ts b/src/app/admin-tool/classHelpTexts/div-help-contents.module.ts deleted file mode 100644 index d8244b1..0000000 --- a/src/app/admin-tool/classHelpTexts/div-help-contents.module.ts +++ /dev/null @@ -1,13 +0,0 @@ -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"; - -@NgModule({ - imports: [ - CommonModule, DivHelpContentsRoutingModule, DivHelpContentsModule - ], - - providers: [], -}) -export class MonitorDivHelpContentsModule { } diff --git a/src/app/admin-tool/classHelpTexts/edit-div-help-content-routing.module.ts b/src/app/admin-tool/classHelpTexts/edit-div-help-content-routing.module.ts deleted file mode 100644 index a15dae4..0000000 --- a/src/app/admin-tool/classHelpTexts/edit-div-help-content-routing.module.ts +++ /dev/null @@ -1,14 +0,0 @@ -import { NgModule } from '@angular/core'; -import {RouterModule} from '@angular/router'; -import {EditDivHelpContentComponent} from "../../openaireLibrary/dashboard/divhelpcontent/edit-div-help-content.component"; -import {AdminDashboardGuard} from "../../utils/adminDashboard.guard"; - - -@NgModule({ - imports: [ - RouterModule.forChild([ - { path: '', canActivate: [AdminDashboardGuard], component: EditDivHelpContentComponent} - ]) - ] -}) -export class EditDivHelpContentRoutingModule { } diff --git a/src/app/admin-tool/classHelpTexts/edit-div-help-content.module.ts b/src/app/admin-tool/classHelpTexts/edit-div-help-content.module.ts deleted file mode 100644 index 5069940..0000000 --- a/src/app/admin-tool/classHelpTexts/edit-div-help-content.module.ts +++ /dev/null @@ -1,14 +0,0 @@ -import {NgModule} from '@angular/core'; -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 {AdminDashboardGuard} from "../../utils/adminDashboard.guard"; - -@NgModule({ - imports: [ - CommonModule, EditDivHelpContentRoutingModule, EditDivHelpContentModule - ], - providers: [AdminDashboardGuard], -}) -export class MonitorEditDivHelpContentModule { } diff --git a/src/app/admin-tool/classHelpTexts/new-div-help-content-routing.module.ts b/src/app/admin-tool/classHelpTexts/new-div-help-content-routing.module.ts deleted file mode 100644 index fdf09d3..0000000 --- a/src/app/admin-tool/classHelpTexts/new-div-help-content-routing.module.ts +++ /dev/null @@ -1,13 +0,0 @@ -import { NgModule } from '@angular/core'; -import {RouterModule} from '@angular/router'; -import {NewDivHelpContentComponent} from "../../openaireLibrary/dashboard/divhelpcontent/new-div-help-content.component"; -import {AdminDashboardGuard} from "../../utils/adminDashboard.guard"; - -@NgModule({ - imports: [ - RouterModule.forChild([ - { path: '', canActivate: [AdminDashboardGuard], component: NewDivHelpContentComponent} - ]) - ] -}) -export class NewDivHelpContentRoutingModule { } diff --git a/src/app/admin-tool/classHelpTexts/new-div-help-content.module.ts b/src/app/admin-tool/classHelpTexts/new-div-help-content.module.ts deleted file mode 100644 index 4627846..0000000 --- a/src/app/admin-tool/classHelpTexts/new-div-help-content.module.ts +++ /dev/null @@ -1,14 +0,0 @@ -import { NgModule } from '@angular/core'; -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 {AdminDashboardGuard} from "../../utils/adminDashboard.guard"; - - -@NgModule({ - imports: [ - CommonModule, NewDivHelpContentRoutingModule, NewDivHelpContentModule - ], - providers: [AdminDashboardGuard], -}) -export class MonitorNewDivHelpContentModule { } diff --git a/src/app/admin-tool/classes/classes-routing.module.ts b/src/app/admin-tool/classes/classes-routing.module.ts deleted file mode 100644 index 3cffb7c..0000000 --- a/src/app/admin-tool/classes/classes-routing.module.ts +++ /dev/null @@ -1,14 +0,0 @@ -import { NgModule } from '@angular/core'; -import {RouterModule} from '@angular/router'; -import {AdminLoginGuard} from "../../openaireLibrary/login/adminLoginGuard.guard"; -import {DivIdsComponent} from "../../openaireLibrary/dashboard/divId/divIds.component"; - - -@NgModule({ - imports: [ - RouterModule.forChild([ - { path: '', canActivate: [AdminLoginGuard], component: DivIdsComponent} - ]) - ] -}) -export class ClassesRoutingModule { } diff --git a/src/app/admin-tool/classes/classes.module.ts b/src/app/admin-tool/classes/classes.module.ts deleted file mode 100644 index 1345f31..0000000 --- a/src/app/admin-tool/classes/classes.module.ts +++ /dev/null @@ -1,15 +0,0 @@ -import { NgModule } from '@angular/core'; -import {ClassesRoutingModule} from "./classes-routing.module"; -import {AdminLoginGuard} from "../../openaireLibrary/login/adminLoginGuard.guard"; -import {DivIdsModule} from "../../openaireLibrary/dashboard/divId/divIds.module"; -import {CommonModule} from "@angular/common"; - - - -@NgModule({ - imports: [ - CommonModule, ClassesRoutingModule, DivIdsModule - ], - providers: [AdminLoginGuard], -}) -export class ClassesModule { } diff --git a/src/app/admin-tool/entities/entities-routing.module.ts b/src/app/admin-tool/entities/entities-routing.module.ts deleted file mode 100644 index b455805..0000000 --- a/src/app/admin-tool/entities/entities-routing.module.ts +++ /dev/null @@ -1,13 +0,0 @@ -import { NgModule } from '@angular/core'; -import {RouterModule} from '@angular/router'; -import {AdminLoginGuard} from "../../openaireLibrary/login/adminLoginGuard.guard"; -import {EntitiesComponent} from "../../openaireLibrary/dashboard/entity/entities.component"; - -@NgModule({ - imports: [ - RouterModule.forChild([ - { path: '', canActivate: [AdminLoginGuard], component: EntitiesComponent} - ]) - ] -}) -export class EntitiesRoutingModule { } diff --git a/src/app/admin-tool/entities/entities.module.ts b/src/app/admin-tool/entities/entities.module.ts deleted file mode 100644 index f17341d..0000000 --- a/src/app/admin-tool/entities/entities.module.ts +++ /dev/null @@ -1,14 +0,0 @@ -import {NgModule} from '@angular/core'; -import {CommonModule} from '@angular/common'; -import {EntitiesRoutingModule} from "./entities-routing.module"; -import {AdminLoginGuard} from "../../openaireLibrary/login/adminLoginGuard.guard"; -import {EntitiesModule} from "../../openaireLibrary/dashboard/entity/entities.module"; - -@NgModule({ - imports: [ - CommonModule, EntitiesModule, EntitiesRoutingModule - ], - providers: [AdminLoginGuard], -}) -export class MonitorEntitiesModule { -} diff --git a/src/app/admin-tool/helpTexts/edit-page-help-content-routing.module.ts b/src/app/admin-tool/helpTexts/edit-page-help-content-routing.module.ts deleted file mode 100644 index a6fa2aa..0000000 --- a/src/app/admin-tool/helpTexts/edit-page-help-content-routing.module.ts +++ /dev/null @@ -1,13 +0,0 @@ -import {NgModule} from '@angular/core'; -import {RouterModule} from '@angular/router'; -import {EditPageHelpContentComponent} from "../../openaireLibrary/dashboard/helpTexts/edit-page-help-content.component"; - - -@NgModule({ - imports: [ - RouterModule.forChild([ - { path: '', component: EditPageHelpContentComponent} - ]) - ] -}) -export class EditPageHelpContentRoutingModule { } diff --git a/src/app/admin-tool/helpTexts/edit-page-help-content.module.ts b/src/app/admin-tool/helpTexts/edit-page-help-content.module.ts deleted file mode 100644 index ba49268..0000000 --- a/src/app/admin-tool/helpTexts/edit-page-help-content.module.ts +++ /dev/null @@ -1,14 +0,0 @@ -import { NgModule } from '@angular/core'; -import {RouterModule} from '@angular/router'; -import {CommonModule} from '@angular/common'; -import {EditPageHelpContentRoutingModule} from "./edit-page-help-content-routing.module"; -import {EditPageHelpContentModule} from "../../openaireLibrary/dashboard/helpTexts/edit-page-help-content.module"; - -@NgModule({ - imports: [ - CommonModule, RouterModule, - EditPageHelpContentRoutingModule, EditPageHelpContentModule - ], - providers: [] -}) -export class MonitorEditPageHelpContentModule { } diff --git a/src/app/admin-tool/helpTexts/new-page-help-content-routing.module.ts b/src/app/admin-tool/helpTexts/new-page-help-content-routing.module.ts deleted file mode 100644 index 6e8ca5d..0000000 --- a/src/app/admin-tool/helpTexts/new-page-help-content-routing.module.ts +++ /dev/null @@ -1,13 +0,0 @@ -import {NgModule} from '@angular/core'; -import {RouterModule} from '@angular/router'; -import {NewPageHelpContentComponent} from "../../openaireLibrary/dashboard/helpTexts/new-page-help-content.component"; - - -@NgModule({ - imports: [ - RouterModule.forChild([ - { path: '', component: NewPageHelpContentComponent} - ]) - ] -}) -export class NewPageHelpContentRoutingModule { } diff --git a/src/app/admin-tool/helpTexts/new-page-help-content.module.ts b/src/app/admin-tool/helpTexts/new-page-help-content.module.ts deleted file mode 100644 index 563c435..0000000 --- a/src/app/admin-tool/helpTexts/new-page-help-content.module.ts +++ /dev/null @@ -1,15 +0,0 @@ -import { NgModule } from '@angular/core'; -import {RouterModule} from '@angular/router'; -import {CommonModule} from '@angular/common'; -import {NewPageHelpContentRoutingModule} from "./new-page-help-content-routing.module"; -import {NewPageHelpContentModule} from "../../openaireLibrary/dashboard/helpTexts/new-page-help-content.module"; - - -@NgModule({ - imports: [ - CommonModule, RouterModule, - NewPageHelpContentRoutingModule, NewPageHelpContentModule - ], - providers: [], -}) -export class MonitorNewPageHelpContentModule { } diff --git a/src/app/admin-tool/helpTexts/page-help-contents-routing.module.ts b/src/app/admin-tool/helpTexts/page-help-contents-routing.module.ts deleted file mode 100644 index c9a65bb..0000000 --- a/src/app/admin-tool/helpTexts/page-help-contents-routing.module.ts +++ /dev/null @@ -1,12 +0,0 @@ -import { NgModule } from '@angular/core'; -import {RouterModule} from '@angular/router'; -import {PageHelpContentsComponent} from "../../openaireLibrary/dashboard/helpTexts/page-help-contents.component"; - -@NgModule({ - imports: [ - RouterModule.forChild([ - { path: '', component: PageHelpContentsComponent} - ]) - ] -}) -export class PageHelpContentsRoutingModule { } diff --git a/src/app/admin-tool/helpTexts/page-help-contents.module.ts b/src/app/admin-tool/helpTexts/page-help-contents.module.ts deleted file mode 100644 index 53a85fe..0000000 --- a/src/app/admin-tool/helpTexts/page-help-contents.module.ts +++ /dev/null @@ -1,12 +0,0 @@ -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"; - -@NgModule({ - imports: [ - CommonModule, PageHelpContentsRoutingModule, PageHelpContentsModule - ], - providers: [], - }) -export class MonitorPageHelpContentsModule { } diff --git a/src/app/admin-tool/pages/pages-routing.module.ts b/src/app/admin-tool/pages/pages-routing.module.ts deleted file mode 100644 index a28e80e..0000000 --- a/src/app/admin-tool/pages/pages-routing.module.ts +++ /dev/null @@ -1,14 +0,0 @@ -import { NgModule } from '@angular/core'; -import {RouterModule} from '@angular/router'; -import {PagesComponent} from "../../openaireLibrary/dashboard/page/pages.component"; -import {IsCommunityOrAdmin} from "../../openaireLibrary/connect/communityGuard/isCommunityOrAdmin"; -import {LoginGuard} from "../../openaireLibrary/login/loginGuard.guard"; - -@NgModule({ - imports: [ - RouterModule.forChild([ - { path: '', canActivate: [LoginGuard,IsCommunityOrAdmin], component: PagesComponent} - ]) - ] -}) -export class PagesRoutingModule { } diff --git a/src/app/admin-tool/pages/pages.module.ts b/src/app/admin-tool/pages/pages.module.ts deleted file mode 100644 index fdb5ba3..0000000 --- a/src/app/admin-tool/pages/pages.module.ts +++ /dev/null @@ -1,15 +0,0 @@ -import {NgModule} from '@angular/core'; -import {CommonModule} from '@angular/common'; -import {PagesRoutingModule} from './pages-routing.module'; -import {IsCommunityOrAdmin} from "../../openaireLibrary/connect/communityGuard/isCommunityOrAdmin"; -import {PagesModule} from "../../openaireLibrary/dashboard/page/pages.module"; -import {LoginGuard} from "../../openaireLibrary/login/loginGuard.guard"; - -@NgModule({ - imports: [ - CommonModule, PagesRoutingModule, PagesModule - ], - providers: [LoginGuard,IsCommunityOrAdmin], - -}) -export class MonitorPagesModule { } diff --git a/src/app/admin-tool/portals/portals-routing.module.ts b/src/app/admin-tool/portals/portals-routing.module.ts deleted file mode 100644 index 334740e..0000000 --- a/src/app/admin-tool/portals/portals-routing.module.ts +++ /dev/null @@ -1,13 +0,0 @@ -import { NgModule } from '@angular/core'; -import {RouterModule} from '@angular/router'; -import {PortalsComponent} from "../../openaireLibrary/dashboard/portal/portals.component"; -import {AdminLoginGuard} from "../../openaireLibrary/login/adminLoginGuard.guard"; - -@NgModule({ - imports: [ - RouterModule.forChild([ - { path: '', component: PortalsComponent} - ]) - ] -}) -export class PortalsRoutingModule { } diff --git a/src/app/admin-tool/portals/portals.module.ts b/src/app/admin-tool/portals/portals.module.ts deleted file mode 100644 index f878a24..0000000 --- a/src/app/admin-tool/portals/portals.module.ts +++ /dev/null @@ -1,15 +0,0 @@ -import {NgModule} from '@angular/core'; -import {CommonModule} from '@angular/common'; -import {PortalModule} from "../../openaireLibrary/dashboard/portal/portals.module"; -import {PortalsRoutingModule} from "./portals-routing.module"; - -@NgModule({ - imports: [ - CommonModule, PortalModule, PortalsRoutingModule - ], - declarations: [], - providers: [], - exports: [] -}) -export class PortalsModule { -} diff --git a/src/app/app.component.ts b/src/app/app.component.ts index 1993ac2..4e72503 100644 --- a/src/app/app.component.ts +++ b/src/app/app.component.ts @@ -247,6 +247,11 @@ export class AppComponent implements OnInit, OnDestroy { this.userMenuItems.push(new MenuItem("", "Manage profiles", "", "/admin", false, [], [], {})); } + if(Session.isPortalAdministrator(this.user) ) { + this.userMenuItems.push( new MenuItem("adminOptions", "Super Admin options","", "/admin-tools/portals", false, [], [], {})); + this.userMenuItems.push(new MenuItem("monitorOptions", "Monitor portal options","", "/admin-tools/pages", false, [], [], {communityId: 'monitor'})); + + } this.userMenuItems.push(new MenuItem("", "User information", "", "/user-info", false, [], [], {})); } if (this.stakeholder) { @@ -327,12 +332,7 @@ export class AppComponent implements OnInit, OnDestroy { this.adminMenuItems.push(new MenuItem("indicators", "Indicators", "", "/admin/" + this.stakeholder.alias + '/indicators', false, [], [], {}, "")); this.adminMenuItems.push(new MenuItem("users", "Users", "", "/admin/" + this.stakeholder.alias + "/users", false, [], [], {}, "")); if(Session.isPortalAdministrator(this.user) ) { - let monitorOptions = new MenuItem("monitorOptions", "Monitor Options", "", "", false, [], [], {}); - monitorOptions.items.push(new MenuItem("pages", "Pages", "", "/admin-tools/" + this.stakeholder.alias + "/pages", false, [], [], {communityId:this.stakeholder.alias})); - monitorOptions.items.push(new MenuItem("entities", "Entities", "","/admin-tools/" + this.stakeholder.alias + "/entities", false, [], [], {communityId:this.stakeholder.alias})); - // monitorOptions.items.push(new MenuItem("classes", "Class help texts", "","/admin-tools/" + this.stakeholder.alias + "/classContents", false, [], [], {})); - monitorOptions.items.push(new MenuItem("helptexts", "Help texts", "","/admin-tools/" + this.stakeholder.alias + "/helptexts", false, [], [], {communityId:this.stakeholder.alias})); - this.adminMenuItems.push(monitorOptions); + this.adminMenuItems.push(new MenuItem("monitorOptions", "Pages & Entities", "", "/admin-tools/" + this.stakeholder.alias + "/pages", false, [], [], {communityId:this.stakeholder.alias})); } this.specialSideBarMenuItem = new MenuItem("back", "Manage profiles", "", "/admin", false, [], null, {}); this.specialSideBarMenuItem.icon = '' + arrow_left.data + ''; // ''; @@ -379,20 +379,20 @@ export class AppComponent implements OnInit, OnDestroy { this.adminMenuItems = []; this.specialSideBarMenuItem = null; this.adminMenuItems.push(new MenuItem("stakeholders", "Manage profiles", "", "/admin", false, [], [], {}, "")); - if(Session.isPortalAdministrator(this.user) ) { - let adminOptions = new MenuItem("adminOptions", "Admin Options", "", "", false, [], [], {}) - adminOptions.items.push(new MenuItem("pages", "Pages", "", "/admin-tools/pages", false, [], [], {})); - adminOptions.items.push(new MenuItem("portals", "Portals", "", "/admin-tools/portals", false, [], [], {})); - adminOptions.items.push(new MenuItem("entities", "Entities", "", "/admin-tools/entities", false, [], [], {})); - // adminOptions.items.push(new MenuItem("classes", "Class help texts", "", "/admin-tools/classes", false, [], [], {})); - this.adminMenuItems.push(adminOptions); - let monitorOptions = new MenuItem("monitorOptions", "Monitor Options", "", "", false, [], [], {}); - monitorOptions.items.push(new MenuItem("pages", "Pages", "", "/admin-tools/pages", false, [], [], {communityId: 'monitor'})); - monitorOptions.items.push(new MenuItem("entities", "Entities", "", "/admin-tools/entities", false, [], [], {communityId: 'monitor'})); - // monitorOptions.items.push(new MenuItem("classes", "Class help texts", "", "/admin-tools/classContents", false, [], [], {communityId: 'monitor'})); - monitorOptions.items.push(new MenuItem("helptexts", "Help texts", "", "/admin-tools/helptexts", false, [], [], {communityId: 'monitor'})); - this.adminMenuItems.push(monitorOptions); - } +// if(Session.isPortalAdministrator(this.user) ) { +// let adminOptions = new MenuItem("adminOptions", "Admin Options","", "/admin-tools/admin-pages", false, [], [], {}); +// /* adminOptions.items.push(new MenuItem("pages", "Pages", "", "/admin-tools/pages", false, [], [], {})); +// adminOptions.items.push(new MenuItem("portals", "Portals", "", "/admin-tools/portals", false, [], [], {})); +// adminOptions.items.push(new MenuItem("entities", "Entities", "", "/admin-tools/entities", false, [], [], {})); +// // adminOptions.items.push(new MenuItem("classes", "Class help texts", "", "/admin-tools/classes", false, [], [], {}));*/ +// this.adminMenuItems.push(adminOptions); +// let monitorOptions = new MenuItem("monitorOptions", "Monitor Options","", "/admin-tools/admin-pages", false, [], [], {communityId: 'monitor'}); +// /* monitorOptions.items.push(new MenuItem("pages", "Pages", "", "/admin-tools/pages", false, [], [], {communityId: 'monitor'})); +// monitorOptions.items.push(new MenuItem("entities", "Entities", "", "/admin-tools/entities", false, [], [], {communityId: 'monitor'})); +// // monitorOptions.items.push(new MenuItem("classes", "Class help texts", "", "/admin-tools/classContents", false, [], [], {communityId: 'monitor'})); +// monitorOptions.items.push(new MenuItem("helptexts", "Help texts", "", "/admin-tools/helptexts", false, [], [], {communityId: 'monitor'}));*/ +// this.adminMenuItems.push(monitorOptions); +// } } } diff --git a/src/app/monitor/monitor.component.html b/src/app/monitor/monitor.component.html index eecba8c..a57e616 100644 --- a/src/app/monitor/monitor.component.html +++ b/src/app/monitor/monitor.component.html @@ -253,7 +253,7 @@ applied to a chart, that chart will appear grayed-out.