From 2ce488027a70e78750976e31ccf4e2ec9775a512 Mon Sep 17 00:00:00 2001 From: Argiro Kokogiannaki Date: Mon, 23 Dec 2019 16:36:53 +0000 Subject: [PATCH] [Monitor_Dashboard|Trunk] create routing modules for amdin pages (entities, pages, portals, helptexts) rename home component to manage stakeholders git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-monitor-portal/trunk/monitor_dashboard@57950 d315682c-612b-4755-9ff5-7f18f6832af3 --- src/app/app-routing.module.ts | 22 +++++++++---------- src/app/app.module.ts | 2 +- .../div-help-contents-routing.module.ts | 14 ++++++++++++ .../div-help-contents.module.ts | 15 +++++++++++++ .../edit-div-help-content-routing.module.ts | 15 +++++++++++++ .../edit-div-help-content.module.ts | 15 +++++++++++++ .../new-div-help-content-routing.module.ts | 14 ++++++++++++ .../new-div-help-content.module.ts | 16 ++++++++++++++ src/app/classes/classes-routing.module.ts | 14 ++++++++++++ src/app/classes/classes.module.ts | 15 +++++++++++++ src/app/entities/entities-routing.module.ts | 13 +++++++++++ src/app/entities/entities.module.ts | 14 ++++++++++++ .../edit-page-help-content-routing.module.ts | 15 +++++++++++++ .../edit-page-help-content.module.ts | 16 ++++++++++++++ .../new-page-help-content-routing.module.ts | 15 +++++++++++++ .../helpTexts/new-page-help-content.module.ts | 17 ++++++++++++++ .../page-help-contents-routing.module.ts | 14 ++++++++++++ .../helpTexts/page-help-contents.module.ts | 14 ++++++++++++ .../manageStakeholders-routing.module.ts} | 6 ++--- .../manageStakeholders.component.html} | 0 .../manageStakeholders.component.ts} | 7 +++--- .../manageStakeholders.module.ts} | 12 +++++----- src/app/pages/pages-routing.module.ts | 14 ++++++++++++ src/app/pages/pages.module.ts | 15 +++++++++++++ src/app/portals/portals-routing.module.ts | 13 +++++++++++ src/app/portals/portals.module.ts | 16 ++++++++++++++ src/app/topic/indicators.component.ts | 3 ++- 27 files changed, 321 insertions(+), 25 deletions(-) create mode 100644 src/app/classHelpTexts/div-help-contents-routing.module.ts create mode 100644 src/app/classHelpTexts/div-help-contents.module.ts create mode 100644 src/app/classHelpTexts/edit-div-help-content-routing.module.ts create mode 100644 src/app/classHelpTexts/edit-div-help-content.module.ts create mode 100644 src/app/classHelpTexts/new-div-help-content-routing.module.ts create mode 100644 src/app/classHelpTexts/new-div-help-content.module.ts create mode 100644 src/app/classes/classes-routing.module.ts create mode 100644 src/app/classes/classes.module.ts create mode 100644 src/app/entities/entities-routing.module.ts create mode 100644 src/app/entities/entities.module.ts create mode 100644 src/app/helpTexts/edit-page-help-content-routing.module.ts create mode 100644 src/app/helpTexts/edit-page-help-content.module.ts create mode 100644 src/app/helpTexts/new-page-help-content-routing.module.ts create mode 100644 src/app/helpTexts/new-page-help-content.module.ts create mode 100644 src/app/helpTexts/page-help-contents-routing.module.ts create mode 100644 src/app/helpTexts/page-help-contents.module.ts rename src/app/{home/home-routing.module.ts => manageStakeholders/manageStakeholders-routing.module.ts} (73%) rename src/app/{home/home.component.html => manageStakeholders/manageStakeholders.component.html} (100%) rename src/app/{home/home.component.ts => manageStakeholders/manageStakeholders.component.ts} (97%) rename src/app/{home/home.module.ts => manageStakeholders/manageStakeholders.module.ts} (72%) create mode 100644 src/app/pages/pages-routing.module.ts create mode 100644 src/app/pages/pages.module.ts create mode 100644 src/app/portals/portals-routing.module.ts create mode 100644 src/app/portals/portals.module.ts diff --git a/src/app/app-routing.module.ts b/src/app/app-routing.module.ts index 9c1ce77..6dccb4e 100644 --- a/src/app/app-routing.module.ts +++ b/src/app/app-routing.module.ts @@ -25,7 +25,7 @@ const routes: Routes = [ }, { path: 'admin', - loadChildren: './home/home.module#HomeModule', + loadChildren: './manageStakeholders/manageStakeholders.module#ManageStakeholdersModule', resolve: {envSpecific: EnvironmentSpecificResolver}, data: {hasAdminMenu: true} }, @@ -45,61 +45,61 @@ const routes: Routes = [ /* Library paths*/ { path: 'portals', - loadChildren: './openaireLibrary/dashboard/portal/communities.module#CommunitiesModule', + loadChildren: './portals/portals.module#PortalsModule', resolve: { envSpecific: EnvironmentSpecificResolver }, data: {hasAdminMenu: true} }, { path: 'entities', - loadChildren: './openaireLibrary/dashboard/entity/entities.module#EntitiesModule', + loadChildren: './entities/entities.module#MonitorEntitiesModule', resolve: { envSpecific: EnvironmentSpecificResolver }, data: {hasAdminMenu: true} }, { path: 'classes', - loadChildren: './openaireLibrary/dashboard/divId/divIds.module#DivIdsModule', + loadChildren: './classes/classes.module#ClassesModule', resolve: { envSpecific: EnvironmentSpecificResolver }, data: {hasAdminMenu: true} }, { path: 'classContents', - loadChildren: './openaireLibrary/dashboard/divhelpcontent/div-help-contents.module#DivHelpContentsModule', + loadChildren: './classHelpTexts/div-help-contents.module#MonitorDivHelpContentsModule', resolve: { envSpecific: EnvironmentSpecificResolver }, data: {hasAdminMenu: true} }, { path: 'classContents/new', - loadChildren: './openaireLibrary/dashboard/divhelpcontent/new-div-help-content.module#NewDivHelpContentModule', + loadChildren: './classHelpTexts/new-div-help-content.module#MonitorNewDivHelpContentModule', resolve: { envSpecific: EnvironmentSpecificResolver }, data: {hasAdminMenu: true} }, { path: 'classContents/edit', - loadChildren: './openaireLibrary/dashboard/divhelpcontent/edit-div-help-content.module#EditDivHelpContentModule', + loadChildren: './classHelpTexts/edit-div-help-content.module#MonitorEditDivHelpContentModule', resolve: { envSpecific: EnvironmentSpecificResolver }, data: {hasAdminMenu: true} }, { path: 'helptexts', - loadChildren: './openaireLibrary/dashboard/helpTexts/page-help-contents.module#PageHelpContentsModule', + loadChildren: './helpTexts/page-help-contents.module#MonitorPageHelpContentsModule', resolve: { envSpecific: EnvironmentSpecificResolver }, data: {hasAdminMenu: true} }, { path: 'helptexts/new', - loadChildren: './openaireLibrary/dashboard/helpTexts/new-page-help-content.module#NewPageHelpContentModule', + loadChildren: './helpTexts/new-page-help-content.module#MonitorNewPageHelpContentModule', resolve: { envSpecific: EnvironmentSpecificResolver }, data: {hasAdminMenu: true} }, { path: 'helptexts/edit', - loadChildren: './openaireLibrary/dashboard/helpTexts/edit-page-help-content.module#EditPageHelpContentModule', + loadChildren: './helpTexts/edit-page-help-content.module#MonitorEditPageHelpContentModule', resolve: { envSpecific: EnvironmentSpecificResolver }, data: {hasAdminMenu: true} }, { path: 'pages', - loadChildren: './openaireLibrary/dashboard/page/pages.module#PagesModule', + loadChildren: './pages/pages.module#MonitorPagesModule', resolve: { envSpecific: EnvironmentSpecificResolver }, data: {hasAdminMenu: true} }, diff --git a/src/app/app.module.ts b/src/app/app.module.ts index a89333e..88ffb94 100755 --- a/src/app/app.module.ts +++ b/src/app/app.module.ts @@ -8,7 +8,6 @@ import {AppComponent} from './app.component'; import {OpenaireErrorPageComponent} from './error/errorPage.component'; import {AppRoutingModule} from './app-routing.module'; -import {SharedModule} from './shared/shared.module'; import {CookieLawModule} from './openaireLibrary/sharedComponents/cookie-law/cookie-law.module'; import {BottomModule} from './openaireLibrary/sharedComponents/bottom.module'; import {ErrorModule} from './openaireLibrary/error/error.module'; @@ -18,6 +17,7 @@ import {EnvironmentSpecificResolver} from './openaireLibrary/utils/properties/en import {SubscribeModule} from './utils/subscribe/subscribe.module'; import {UserMiniModule} from "./openaireLibrary/login/userMiniModule.module"; import {SideBarModule} from "./openaireLibrary/dashboard/sharedComponents/sidebar/sideBar.module"; +import {SharedModule} from "./openaireLibrary/shared/shared.module"; @NgModule({ diff --git a/src/app/classHelpTexts/div-help-contents-routing.module.ts b/src/app/classHelpTexts/div-help-contents-routing.module.ts new file mode 100644 index 0000000..05b3642 --- /dev/null +++ b/src/app/classHelpTexts/div-help-contents-routing.module.ts @@ -0,0 +1,14 @@ +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"; + +@NgModule({ + imports: [ + RouterModule.forChild([ + { path: '', canActivate: [IsCommunity, ConnectAdminLoginGuard], component: DivHelpContentsComponent} + ]) + ] +}) +export class DivHelpContentsRoutingModule { } diff --git a/src/app/classHelpTexts/div-help-contents.module.ts b/src/app/classHelpTexts/div-help-contents.module.ts new file mode 100644 index 0000000..0a3e61d --- /dev/null +++ b/src/app/classHelpTexts/div-help-contents.module.ts @@ -0,0 +1,15 @@ +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"; + +@NgModule({ + imports: [ + CommonModule, DivHelpContentsRoutingModule, DivHelpContentsModule + ], + + providers: [IsCommunity, ConnectAdminLoginGuard], +}) +export class MonitorDivHelpContentsModule { } diff --git a/src/app/classHelpTexts/edit-div-help-content-routing.module.ts b/src/app/classHelpTexts/edit-div-help-content-routing.module.ts new file mode 100644 index 0000000..ebc41cb --- /dev/null +++ b/src/app/classHelpTexts/edit-div-help-content-routing.module.ts @@ -0,0 +1,15 @@ +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"; + + +@NgModule({ + imports: [ + RouterModule.forChild([ + { path: '', canActivate: [IsCommunity, ConnectAdminLoginGuard], component: EditDivHelpContentComponent} + ]) + ] +}) +export class EditDivHelpContentRoutingModule { } diff --git a/src/app/classHelpTexts/edit-div-help-content.module.ts b/src/app/classHelpTexts/edit-div-help-content.module.ts new file mode 100644 index 0000000..0a95337 --- /dev/null +++ b/src/app/classHelpTexts/edit-div-help-content.module.ts @@ -0,0 +1,15 @@ +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 {IsCommunity} from "../openaireLibrary/connect/communityGuard/isCommunity.guard"; +import {ConnectAdminLoginGuard} from "../openaireLibrary/connect/communityGuard/connectAdminLoginGuard.guard"; + +@NgModule({ + imports: [ + CommonModule, EditDivHelpContentRoutingModule, EditDivHelpContentModule + ], + providers: [IsCommunity, ConnectAdminLoginGuard], +}) +export class MonitorEditDivHelpContentModule { } diff --git a/src/app/classHelpTexts/new-div-help-content-routing.module.ts b/src/app/classHelpTexts/new-div-help-content-routing.module.ts new file mode 100644 index 0000000..1e0499f --- /dev/null +++ b/src/app/classHelpTexts/new-div-help-content-routing.module.ts @@ -0,0 +1,14 @@ +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"; + +@NgModule({ + imports: [ + RouterModule.forChild([ + { path: '', canActivate: [IsCommunity, ConnectAdminLoginGuard], component: NewDivHelpContentComponent} + ]) + ] +}) +export class NewDivHelpContentRoutingModule { } diff --git a/src/app/classHelpTexts/new-div-help-content.module.ts b/src/app/classHelpTexts/new-div-help-content.module.ts new file mode 100644 index 0000000..e8a87e5 --- /dev/null +++ b/src/app/classHelpTexts/new-div-help-content.module.ts @@ -0,0 +1,16 @@ +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"; + + +@NgModule({ + imports: [ + CommonModule, NewDivHelpContentRoutingModule, NewDivHelpContentModule + ], + providers: [IsCommunity, ConnectAdminLoginGuard], +}) +export class MonitorNewDivHelpContentModule { } diff --git a/src/app/classes/classes-routing.module.ts b/src/app/classes/classes-routing.module.ts new file mode 100644 index 0000000..315324a --- /dev/null +++ b/src/app/classes/classes-routing.module.ts @@ -0,0 +1,14 @@ +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/classes/classes.module.ts b/src/app/classes/classes.module.ts new file mode 100644 index 0000000..b97596b --- /dev/null +++ b/src/app/classes/classes.module.ts @@ -0,0 +1,15 @@ +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/entities/entities-routing.module.ts b/src/app/entities/entities-routing.module.ts new file mode 100644 index 0000000..5340279 --- /dev/null +++ b/src/app/entities/entities-routing.module.ts @@ -0,0 +1,13 @@ +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/entities/entities.module.ts b/src/app/entities/entities.module.ts new file mode 100644 index 0000000..96b28dd --- /dev/null +++ b/src/app/entities/entities.module.ts @@ -0,0 +1,14 @@ +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/helpTexts/edit-page-help-content-routing.module.ts b/src/app/helpTexts/edit-page-help-content-routing.module.ts new file mode 100644 index 0000000..6bad64a --- /dev/null +++ b/src/app/helpTexts/edit-page-help-content-routing.module.ts @@ -0,0 +1,15 @@ +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"; + + +@NgModule({ + imports: [ + RouterModule.forChild([ + { path: '', canActivate: [IsCommunity, ConnectAdminLoginGuard], component: EditPageHelpContentComponent} + ]) + ] +}) +export class EditPageHelpContentRoutingModule { } diff --git a/src/app/helpTexts/edit-page-help-content.module.ts b/src/app/helpTexts/edit-page-help-content.module.ts new file mode 100644 index 0000000..aa623ae --- /dev/null +++ b/src/app/helpTexts/edit-page-help-content.module.ts @@ -0,0 +1,16 @@ +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"; + +@NgModule({ + imports: [ + CommonModule, RouterModule, + EditPageHelpContentRoutingModule, EditPageHelpContentModule + ], + providers: [IsCommunity, ConnectAdminLoginGuard] +}) +export class MonitorEditPageHelpContentModule { } diff --git a/src/app/helpTexts/new-page-help-content-routing.module.ts b/src/app/helpTexts/new-page-help-content-routing.module.ts new file mode 100644 index 0000000..df354d5 --- /dev/null +++ b/src/app/helpTexts/new-page-help-content-routing.module.ts @@ -0,0 +1,15 @@ +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"; + + +@NgModule({ + imports: [ + RouterModule.forChild([ + { path: '', canActivate: [IsCommunity, ConnectAdminLoginGuard], component: NewPageHelpContentComponent} + ]) + ] +}) +export class NewPageHelpContentRoutingModule { } diff --git a/src/app/helpTexts/new-page-help-content.module.ts b/src/app/helpTexts/new-page-help-content.module.ts new file mode 100644 index 0000000..54e273e --- /dev/null +++ b/src/app/helpTexts/new-page-help-content.module.ts @@ -0,0 +1,17 @@ +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"; + + +@NgModule({ + imports: [ + CommonModule, RouterModule, + NewPageHelpContentRoutingModule, NewPageHelpContentModule + ], + providers: [IsCommunity, ConnectAdminLoginGuard], +}) +export class MonitorNewPageHelpContentModule { } diff --git a/src/app/helpTexts/page-help-contents-routing.module.ts b/src/app/helpTexts/page-help-contents-routing.module.ts new file mode 100644 index 0000000..aed60fb --- /dev/null +++ b/src/app/helpTexts/page-help-contents-routing.module.ts @@ -0,0 +1,14 @@ +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"; + +@NgModule({ + imports: [ + RouterModule.forChild([ + { path: '', canActivate: [IsCommunity, ConnectAdminLoginGuard], component: PageHelpContentsComponent} + ]) + ] +}) +export class PageHelpContentsRoutingModule { } diff --git a/src/app/helpTexts/page-help-contents.module.ts b/src/app/helpTexts/page-help-contents.module.ts new file mode 100644 index 0000000..505d890 --- /dev/null +++ b/src/app/helpTexts/page-help-contents.module.ts @@ -0,0 +1,14 @@ +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"; + +@NgModule({ + imports: [ + CommonModule, PageHelpContentsRoutingModule, PageHelpContentsModule + ], + providers: [IsCommunity, ConnectAdminLoginGuard], + }) +export class MonitorPageHelpContentsModule { } diff --git a/src/app/home/home-routing.module.ts b/src/app/manageStakeholders/manageStakeholders-routing.module.ts similarity index 73% rename from src/app/home/home-routing.module.ts rename to src/app/manageStakeholders/manageStakeholders-routing.module.ts index 3b13521..3084ca6 100644 --- a/src/app/home/home-routing.module.ts +++ b/src/app/manageStakeholders/manageStakeholders-routing.module.ts @@ -2,14 +2,14 @@ import {NgModule} from '@angular/core'; import {RouterModule} from '@angular/router'; import {FreeGuard} from '../openaireLibrary/login/freeGuard.guard'; import {PreviousRouteRecorder} from '../openaireLibrary/utils/piwik/previousRouteRecorder.guard'; -import {HomeComponent} from "./home.component"; +import {ManageStakeholdersComponent} from "./manageStakeholders.component"; @NgModule({ imports: [ RouterModule.forChild([ { path: '', - component: HomeComponent, + component: ManageStakeholdersComponent, canActivate: [FreeGuard], canDeactivate: [PreviousRouteRecorder], data: {hasSidebar: true} @@ -17,5 +17,5 @@ import {HomeComponent} from "./home.component"; ]) ] }) -export class HomeRoutingModule { +export class ManageStakeholdersRoutingModule { } diff --git a/src/app/home/home.component.html b/src/app/manageStakeholders/manageStakeholders.component.html similarity index 100% rename from src/app/home/home.component.html rename to src/app/manageStakeholders/manageStakeholders.component.html diff --git a/src/app/home/home.component.ts b/src/app/manageStakeholders/manageStakeholders.component.ts similarity index 97% rename from src/app/home/home.component.ts rename to src/app/manageStakeholders/manageStakeholders.component.ts index de12153..70875e6 100644 --- a/src/app/home/home.component.ts +++ b/src/app/manageStakeholders/manageStakeholders.component.ts @@ -4,17 +4,18 @@ import {EnvProperties} from "../openaireLibrary/utils/properties/env-properties" import {EnvironmentSpecificService} from "../openaireLibrary/utils/properties/environment-specific.service"; import {Stakeholder} from "../utils/entities/stakeholder"; import {Subscriber, zip} from "rxjs"; -import {Option, StakeholderUtils} from "../utils/indicator-utils"; +import {StakeholderUtils} from "../utils/indicator-utils"; import {FormBuilder, FormGroup, Validators} from "@angular/forms"; import {AlertModal} from "../openaireLibrary/utils/modal/alert"; import {StakeholderCreator} from "../utils/entities/stakeholderCreator"; import {LayoutService} from "../openaireLibrary/dashboard/sharedComponents/sidebar/layout.service"; +import {Option} from "../openaireLibrary/dashboard/sharedComponents/input/input.component"; @Component({ selector: 'home', - templateUrl: "./home.component.html" + templateUrl: "./manageStakeholders.component.html" }) -export class HomeComponent implements OnInit, OnDestroy { +export class ManageStakeholdersComponent implements OnInit, OnDestroy { public properties: EnvProperties; public loading: boolean = true; diff --git a/src/app/home/home.module.ts b/src/app/manageStakeholders/manageStakeholders.module.ts similarity index 72% rename from src/app/home/home.module.ts rename to src/app/manageStakeholders/manageStakeholders.module.ts index 38338dc..a6462bf 100644 --- a/src/app/home/home.module.ts +++ b/src/app/manageStakeholders/manageStakeholders.module.ts @@ -1,6 +1,6 @@ import {NgModule} from "@angular/core"; -import {HomeComponent} from "./home.component"; -import {HomeRoutingModule} from "./home-routing.module"; +import {ManageStakeholdersComponent} from "./manageStakeholders.component"; +import {ManageStakeholdersRoutingModule} from "./manageStakeholders-routing.module"; import {FreeGuard} from "../openaireLibrary/login/freeGuard.guard"; import {PreviousRouteRecorder} from "../openaireLibrary/utils/piwik/previousRouteRecorder.guard"; import {CommonModule} from "@angular/common"; @@ -11,9 +11,9 @@ import {AlertModalModule} from "../openaireLibrary/utils/modal/alertModal.module import {ReactiveFormsModule} from "@angular/forms"; @NgModule({ - declarations: [HomeComponent], + declarations: [ManageStakeholdersComponent], imports: [ - HomeRoutingModule, + ManageStakeholdersRoutingModule, CommonModule, RouterModule, InputModule, @@ -24,8 +24,8 @@ import {ReactiveFormsModule} from "@angular/forms"; providers: [ FreeGuard, PreviousRouteRecorder, ], - exports: [HomeComponent] + exports: [ManageStakeholdersComponent] }) -export class HomeModule { +export class ManageStakeholdersModule { } diff --git a/src/app/pages/pages-routing.module.ts b/src/app/pages/pages-routing.module.ts new file mode 100644 index 0000000..d30eb8e --- /dev/null +++ b/src/app/pages/pages-routing.module.ts @@ -0,0 +1,14 @@ +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"; + +@NgModule({ + imports: [ + RouterModule.forChild([ + { path: '', canActivate: [IsCommunityOrAdmin, ConnectAdminLoginGuard], component: PagesComponent} + ]) + ] +}) +export class PagesRoutingModule { } diff --git a/src/app/pages/pages.module.ts b/src/app/pages/pages.module.ts new file mode 100644 index 0000000..f2f7808 --- /dev/null +++ b/src/app/pages/pages.module.ts @@ -0,0 +1,15 @@ +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"; + +@NgModule({ + imports: [ + CommonModule, PagesRoutingModule, PagesModule + ], + providers: [IsCommunityOrAdmin, ConnectAdminLoginGuard], + +}) +export class MonitorPagesModule { } diff --git a/src/app/portals/portals-routing.module.ts b/src/app/portals/portals-routing.module.ts new file mode 100644 index 0000000..6ba4153 --- /dev/null +++ b/src/app/portals/portals-routing.module.ts @@ -0,0 +1,13 @@ +import { NgModule } from '@angular/core'; +import {RouterModule} from '@angular/router'; +import {CommunitiesComponent} from "../openaireLibrary/dashboard/portal/communities.component"; +import {AdminLoginGuard} from "../openaireLibrary/login/adminLoginGuard.guard"; + +@NgModule({ + imports: [ + RouterModule.forChild([ + { path: '', canActivate: [AdminLoginGuard], component: CommunitiesComponent} + ]) + ] +}) +export class PortalsRoutingModule { } diff --git a/src/app/portals/portals.module.ts b/src/app/portals/portals.module.ts new file mode 100644 index 0000000..0379f96 --- /dev/null +++ b/src/app/portals/portals.module.ts @@ -0,0 +1,16 @@ +import {NgModule} from '@angular/core'; +import {CommonModule} from '@angular/common'; +import {CommunitiesModule} from "../openaireLibrary/dashboard/portal/communities.module"; +import {AdminLoginGuard} from "../openaireLibrary/login/adminLoginGuard.guard"; +import {PortalsRoutingModule} from "./portals-routing.module"; + +@NgModule({ + imports: [ + CommonModule, CommunitiesModule, PortalsRoutingModule + ], + declarations: [], + providers: [AdminLoginGuard], + exports: [] +}) +export class PortalsModule { +} diff --git a/src/app/topic/indicators.component.ts b/src/app/topic/indicators.component.ts index 974cb4c..3af0aa0 100644 --- a/src/app/topic/indicators.component.ts +++ b/src/app/topic/indicators.component.ts @@ -1,6 +1,6 @@ import {AfterViewInit, Component, Input, OnChanges, OnDestroy, OnInit, SimpleChanges, ViewChild} from "@angular/core"; import {Indicator, IndicatorPath, Stakeholder} from "../utils/entities/stakeholder"; -import {IndicatorUtils, Option} from "../utils/indicator-utils"; +import {IndicatorUtils} from "../utils/indicator-utils"; import {FormArray, FormBuilder, FormControl, FormGroup, Validators} from "@angular/forms"; import {AlertModal} from "../openaireLibrary/utils/modal/alert"; import {StatisticsService} from "../utils/services/statistics.service"; @@ -10,6 +10,7 @@ import {StakeholderService} from "../services/stakeholder.service"; import {EnvProperties} from "../openaireLibrary/utils/properties/env-properties"; import {Subscriber} from "rxjs"; import {LayoutService} from "../openaireLibrary/dashboard/sharedComponents/sidebar/layout.service"; +import {Option} from "../openaireLibrary/dashboard/sharedComponents/input/input.component"; declare var UIkit;