MaDgIK
/
openaire-library
13
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

[Library|Trunk] 

dashboard:
	keep only modules for common pages, without import  routing module
	remove routing modules


git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@57949 d315682c-612b-4755-9ff5-7f18f6832af3
This commit is contained in:
argiro.kokogiannaki 2019-12-23 16:34:51 +00:00
parent 89fe8e71b8
commit d88d36d1e3
20 changed files with 16 additions and 164 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
dashboard/divId/divIds-routing.module.ts
View File

@ -1,13 +0,0 @@
import { NgModule } from '@angular/core';
import {RouterModule} from '@angular/router';
import {DivIdsComponent} from './divIds.component';
import {AdminLoginGuard} from "../../login/adminLoginGuard.guard";
@NgModule({
imports: [
RouterModule.forChild([
{ path: '', canActivate: [AdminLoginGuard], component: DivIdsComponent}
])
]
})
export class DivIdsRoutingModule { }

3
dashboard/divId/divIds.module.ts
View File

@ -4,7 +4,6 @@ import {CommonModule} from '@angular/common';
import {FormsModule, ReactiveFormsModule} from '@angular/forms';
import {AlertModalModule} from '../../utils/modal/alertModal.module';
import {DivIdsComponent} from './divIds.component';
import {DivIdsRoutingModule} from './divIds-routing.module';
import {AdminLoginGuard} from "../../login/adminLoginGuard.guard";
import {AdminToolServiceModule} from "../../services/adminToolService.module";
import {InputModule} from "../sharedComponents/input/input.module";
@ -18,7 +17,7 @@ import {MatChipsModule} from '@angular/material/chips';
@NgModule({
imports: [
CommonModule, RouterModule, FormsModule,
AlertModalModule, ReactiveFormsModule, DivIdsRoutingModule, AdminToolServiceModule, InputModule, MatAutocompleteModule, MatFormFieldModule, MatChipsModule,
AlertModalModule, ReactiveFormsModule, AdminToolServiceModule, InputModule, MatAutocompleteModule, MatFormFieldModule, MatChipsModule,
MatCheckboxModule
],
declarations: [DivIdsComponent],

14
dashboard/divhelpcontent/div-help-contents-routing.module.ts
View File

@ -1,14 +0,0 @@
import { NgModule } from '@angular/core';
import {RouterModule} from '@angular/router';
import {IsCommunity} from '../../connect/communityGuard/isCommunity.guard';
import {ConnectAdminLoginGuard} from '../../connect/communityGuard/connectAdminLoginGuard.guard';
import {DivHelpContentsComponent} from './div-help-contents.component';
@NgModule({
imports: [
RouterModule.forChild([
{ path: '', canActivate: [IsCommunity, ConnectAdminLoginGuard], component: DivHelpContentsComponent}
])
]
})
export class DivHelpContentsRoutingModule { }

5
dashboard/divhelpcontent/div-help-contents.module.ts
View File

@ -1,11 +1,10 @@
import { NgModule } from '@angular/core';
import {NgModule} from '@angular/core';
import {RouterModule} from '@angular/router';
import {CommonModule} from '@angular/common';
import {IsCommunity} from '../../connect/communityGuard/isCommunity.guard';
import {ConnectAdminLoginGuard} from '../../connect/communityGuard/connectAdminLoginGuard.guard';
import {FormsModule, ReactiveFormsModule} from '@angular/forms';
import {AlertModalModule} from '../../utils/modal/alertModal.module';
import {DivHelpContentsRoutingModule} from './div-help-contents-routing.module';
import {SafeHtmlPipeModule} from '../../utils/pipes/safeHTMLPipe.module';
import {DivHelpContentsComponent} from './div-help-contents.component';
import {MatSlideToggleModule} from '@angular/material';
@ -15,7 +14,7 @@ import {InputModule} from "../sharedComponents/input/input.module";
@NgModule({
imports: [
CommonModule, RouterModule, FormsModule, SafeHtmlPipeModule,
AlertModalModule, ReactiveFormsModule, DivHelpContentsRoutingModule, MatSlideToggleModule, AdminToolServiceModule, InputModule
AlertModalModule, ReactiveFormsModule, MatSlideToggleModule, AdminToolServiceModule, InputModule
],
declarations: [
DivHelpContentsComponent

14
dashboard/divhelpcontent/edit-div-help-content-routing.module.ts
View File

@ -1,14 +0,0 @@
import { NgModule } from '@angular/core';
import {RouterModule} from '@angular/router';
import {IsCommunity} from '../../connect/communityGuard/isCommunity.guard';
import {ConnectAdminLoginGuard} from '../../connect/communityGuard/connectAdminLoginGuard.guard';
import {EditDivHelpContentComponent} from './edit-div-help-content.component';
@NgModule({
imports: [
RouterModule.forChild([
{ path: '', canActivate: [IsCommunity, ConnectAdminLoginGuard], component: EditDivHelpContentComponent}
])
]
})
export class EditDivHelpContentRoutingModule { }

3
dashboard/divhelpcontent/edit-div-help-content.module.ts
View File

@ -3,7 +3,6 @@ import {RouterModule} from '@angular/router';
import {CommonModule} from '@angular/common';
import {IsCommunity} from '../../connect/communityGuard/isCommunity.guard';
import {ConnectAdminLoginGuard} from '../../connect/communityGuard/connectAdminLoginGuard.guard';
import {EditDivHelpContentRoutingModule} from './edit-div-help-content-routing.module';
import {EditDivHelpContentComponent} from './edit-div-help-content.component';
import {DivHelpContentFormModule} from './div-help-content-form.module';
import {AdminToolServiceModule} from "../../services/adminToolService.module";
@ -11,7 +10,7 @@ import {AdminToolServiceModule} from "../../services/adminToolService.module";
@NgModule({
imports: [
CommonModule, RouterModule,
DivHelpContentFormModule, EditDivHelpContentRoutingModule, AdminToolServiceModule
DivHelpContentFormModule, AdminToolServiceModule
],
declarations: [
EditDivHelpContentComponent

14
dashboard/divhelpcontent/new-div-help-content-routing.module.ts
View File

@ -1,14 +0,0 @@
import { NgModule } from '@angular/core';
import {RouterModule} from '@angular/router';
import {IsCommunity} from '../../connect/communityGuard/isCommunity.guard';
import {ConnectAdminLoginGuard} from '../../connect/communityGuard/connectAdminLoginGuard.guard';
import {NewDivHelpContentComponent} from './new-div-help-content.component';
@NgModule({
imports: [
RouterModule.forChild([
{ path: '', canActivate: [IsCommunity, ConnectAdminLoginGuard], component: NewDivHelpContentComponent}
])
]
})
export class NewDivHelpContentRoutingModule { }

5
dashboard/divhelpcontent/new-div-help-content.module.ts
View File

@ -1,9 +1,8 @@
import { NgModule } from '@angular/core';
import {NgModule} from '@angular/core';
import {RouterModule} from '@angular/router';
import {CommonModule} from '@angular/common';
import {IsCommunity} from '../../connect/communityGuard/isCommunity.guard';
import {ConnectAdminLoginGuard} from '../../connect/communityGuard/connectAdminLoginGuard.guard';
import {NewDivHelpContentRoutingModule} from './new-div-help-content-routing.module';
import {NewDivHelpContentComponent} from './new-div-help-content.component';
import {DivHelpContentFormModule} from './div-help-content-form.module';
import {AdminToolServiceModule} from "../../services/adminToolService.module";
@ -11,7 +10,7 @@ import {AdminToolServiceModule} from "../../services/adminToolService.module";
@NgModule({
imports: [
CommonModule, RouterModule,
DivHelpContentFormModule, NewDivHelpContentRoutingModule, AdminToolServiceModule
DivHelpContentFormModule, AdminToolServiceModule
],
declarations: [
NewDivHelpContentComponent

14
dashboard/entity/entities-routing.module.ts
View File

@ -1,14 +0,0 @@
import { NgModule } from '@angular/core';
import {RouterModule} from '@angular/router';
import {ConnectAdminLoginGuard} from '../../connect/communityGuard/connectAdminLoginGuard.guard';
import {EntitiesComponent} from './entities.component';
import {IsCommunityOrAdmin} from '../../connect/communityGuard/isCommunityOrAdmin';
@NgModule({
imports: [
RouterModule.forChild([
{ path: '', canActivate: [], component: EntitiesComponent}
])
]
})
export class EntitiesRoutingModule { }

3
dashboard/entity/entities.module.ts
View File

@ -4,7 +4,6 @@ import {CommonModule} from '@angular/common';
import {EntitiesComponent} from './entities.component';
import {FormsModule, ReactiveFormsModule} from '@angular/forms';
import {AlertModalModule} from '../../utils/modal/alertModal.module';
import {EntitiesRoutingModule} from './entities-routing.module';
import {MatSlideToggleModule} from '@angular/material';
import {IsCommunityOrAdmin} from '../../connect/communityGuard/isCommunityOrAdmin';
import {AdminToolServiceModule} from "../../services/adminToolService.module";
@ -13,7 +12,7 @@ import {InputModule} from "../sharedComponents/input/input.module";
@NgModule({
imports: [
CommonModule, RouterModule, FormsModule, AdminToolServiceModule,
AlertModalModule, ReactiveFormsModule, EntitiesRoutingModule, MatSlideToggleModule, InputModule
AlertModalModule, ReactiveFormsModule, MatSlideToggleModule, InputModule
],
declarations: [EntitiesComponent],
providers: [IsCommunityOrAdmin],

14
dashboard/helpTexts/edit-page-help-content-routing.module.ts
View File

@ -1,14 +0,0 @@
import { NgModule } from '@angular/core';
import {RouterModule} from '@angular/router';
import {IsCommunity} from '../../connect/communityGuard/isCommunity.guard';
import {ConnectAdminLoginGuard} from '../../connect/communityGuard/connectAdminLoginGuard.guard';
import {EditPageHelpContentComponent} from './edit-page-help-content.component';
@NgModule({
imports: [
RouterModule.forChild([
{ path: '', canActivate: [IsCommunity, ConnectAdminLoginGuard], component: EditPageHelpContentComponent}
])
]
})
export class EditPageHelpContentRoutingModule { }

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

@ -1,9 +1,8 @@
import { NgModule } from '@angular/core';
import {NgModule} from '@angular/core';
import {RouterModule} from '@angular/router';
import {CommonModule} from '@angular/common';
import {IsCommunity} from '../../connect/communityGuard/isCommunity.guard';
import {ConnectAdminLoginGuard} from '../../connect/communityGuard/connectAdminLoginGuard.guard';
import {EditPageHelpContentRoutingModule} from './edit-page-help-content-routing.module';
import {EditPageHelpContentComponent} from './edit-page-help-content.component';
import {PageHelpContentFormModule} from './page-help-content-form.module';
import {AdminToolServiceModule} from "../../services/adminToolService.module";
@ -11,7 +10,7 @@ import {AdminToolServiceModule} from "../../services/adminToolService.module";
@NgModule({
imports: [
CommonModule, RouterModule,
PageHelpContentFormModule, EditPageHelpContentRoutingModule, AdminToolServiceModule
PageHelpContentFormModule, AdminToolServiceModule
],
declarations: [
EditPageHelpContentComponent

14
dashboard/helpTexts/new-page-help-content-routing.module.ts
View File

@ -1,14 +0,0 @@
import { NgModule } from '@angular/core';
import {RouterModule} from '@angular/router';
import {IsCommunity} from '../../connect/communityGuard/isCommunity.guard';
import {ConnectAdminLoginGuard} from '../../connect/communityGuard/connectAdminLoginGuard.guard';
import {NewPageHelpContentComponent} from './new-page-help-content.component';
@NgModule({
imports: [
RouterModule.forChild([
{ path: '', canActivate: [IsCommunity, ConnectAdminLoginGuard], component: NewPageHelpContentComponent}
])
]
})
export class NewPageHelpContentRoutingModule { }

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

@ -1,17 +1,16 @@
import { NgModule } from '@angular/core';
import {NgModule} from '@angular/core';
import {RouterModule} from '@angular/router';
import {CommonModule} from '@angular/common';
import {IsCommunity} from '../../connect/communityGuard/isCommunity.guard';
import {ConnectAdminLoginGuard} from '../../connect/communityGuard/connectAdminLoginGuard.guard';
import {NewPageHelpContentComponent} from './new-page-help-content.component';
import {NewPageHelpContentRoutingModule} from './new-page-help-content-routing.module';
import {PageHelpContentFormModule} from './page-help-content-form.module';
import {AdminToolServiceModule} from "../../services/adminToolService.module";
@NgModule({
imports: [
CommonModule, RouterModule,
PageHelpContentFormModule, NewPageHelpContentRoutingModule, AdminToolServiceModule
PageHelpContentFormModule, AdminToolServiceModule
],
declarations: [
NewPageHelpContentComponent

14
dashboard/helpTexts/page-help-contents-routing.module.ts
View File

@ -1,14 +0,0 @@
import { NgModule } from '@angular/core';
import {RouterModule} from '@angular/router';
import {IsCommunity} from '../../connect/communityGuard/isCommunity.guard';
import {ConnectAdminLoginGuard} from '../../connect/communityGuard/connectAdminLoginGuard.guard';
import {PageHelpContentsComponent} from './page-help-contents.component';
@NgModule({
imports: [
RouterModule.forChild([
{ path: '', canActivate: [IsCommunity, ConnectAdminLoginGuard], component: PageHelpContentsComponent}
])
]
})
export class PageHelpContentsRoutingModule { }

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

@ -1,11 +1,10 @@
import { NgModule } from '@angular/core';
import {NgModule} from '@angular/core';
import {RouterModule} from '@angular/router';
import {CommonModule} from '@angular/common';
import {IsCommunity} from '../../connect/communityGuard/isCommunity.guard';
import {ConnectAdminLoginGuard} from '../../connect/communityGuard/connectAdminLoginGuard.guard';
import {FormsModule, ReactiveFormsModule} from '@angular/forms';
import {AlertModalModule} from '../../utils/modal/alertModal.module';
import {PageHelpContentsRoutingModule} from './page-help-contents-routing.module';
import {PageHelpContentsComponent} from './page-help-contents.component';
import {SafeHtmlPipeModule} from '../../utils/pipes/safeHTMLPipe.module';
import {MatSlideToggleModule} from '@angular/material';
@ -15,7 +14,7 @@ import {InputModule} from "../sharedComponents/input/input.module";
@NgModule({
imports: [
CommonModule, RouterModule, FormsModule, SafeHtmlPipeModule,
AlertModalModule, ReactiveFormsModule, PageHelpContentsRoutingModule, MatSlideToggleModule, AdminToolServiceModule, InputModule
AlertModalModule, ReactiveFormsModule, MatSlideToggleModule, AdminToolServiceModule, InputModule
],
declarations: [
PageHelpContentsComponent

14
dashboard/page/pages-routing.module.ts
View File

@ -1,14 +0,0 @@
import { NgModule } from '@angular/core';
import {RouterModule} from '@angular/router';
import {ConnectAdminLoginGuard} from '../../connect/communityGuard/connectAdminLoginGuard.guard';
import {PagesComponent} from './pages.component';
import {IsCommunityOrAdmin} from '../../connect/communityGuard/isCommunityOrAdmin';
@NgModule({
imports: [
RouterModule.forChild([
{ path: '', canActivate: [IsCommunityOrAdmin, ConnectAdminLoginGuard], component: PagesComponent}
])
]
})
export class PagesRoutingModule { }

5
dashboard/page/pages.module.ts
View File

@ -1,11 +1,10 @@
import { NgModule } from '@angular/core';
import {NgModule} from '@angular/core';
import {RouterModule} from '@angular/router';
import {CommonModule} from '@angular/common';
import {ConnectAdminLoginGuard} from '../../connect/communityGuard/connectAdminLoginGuard.guard';
import {FormsModule, ReactiveFormsModule} from '@angular/forms';
import {AlertModalModule} from '../../utils/modal/alertModal.module';
import {PagesComponent} from './pages.component';
import {PagesRoutingModule} from './pages-routing.module';
import {MatAutocompleteModule, MatChipsModule, MatFormFieldModule, MatSlideToggleModule} from '@angular/material';
import {IsCommunityOrAdmin} from '../../connect/communityGuard/isCommunityOrAdmin';
import {AdminToolServiceModule} from "../../services/adminToolService.module";
@ -13,7 +12,7 @@ import {InputModule} from "../sharedComponents/input/input.module";
@NgModule({
imports: [
CommonModule, RouterModule, FormsModule, AlertModalModule, ReactiveFormsModule, PagesRoutingModule, MatSlideToggleModule, AdminToolServiceModule, InputModule,
CommonModule, RouterModule, FormsModule, AlertModalModule, ReactiveFormsModule, MatSlideToggleModule, AdminToolServiceModule, InputModule,
MatAutocompleteModule, MatFormFieldModule, MatChipsModule
],
declarations: [PagesComponent],

13
dashboard/portal/communities-routing.module.ts
View File

@ -1,13 +0,0 @@
import { NgModule } from '@angular/core';
import {RouterModule} from '@angular/router';
import {CommunitiesComponent} from './communities.component';
import {AdminLoginGuard} from '../../login/adminLoginGuard.guard';
@NgModule({
imports: [
RouterModule.forChild([
{ path: '', canActivate: [AdminLoginGuard], component: CommunitiesComponent}
])
]
})
export class CommunitiesRoutingModule { }

3
dashboard/portal/communities.module.ts
View File

@ -1,7 +1,6 @@
import { NgModule } from '@angular/core';
import { CommonModule } from '@angular/common';
import {CommunitiesComponent} from './communities.component';
import {CommunitiesRoutingModule} from './communities-routing.module';
import {RouterModule} from '@angular/router';
import {FormsModule, ReactiveFormsModule} from '@angular/forms';
import {AlertModalModule} from '../../utils/modal/alertModal.module';
@ -13,7 +12,7 @@ import {InputModule} from "../sharedComponents/input/input.module";
imports: [
CommonModule, FormsModule, AlertModalModule,
ReactiveFormsModule,
CommunitiesRoutingModule, RouterModule, AdminToolServiceModule, InputModule
RouterModule, AdminToolServiceModule, InputModule
],
declarations: [CommunitiesComponent],
providers: [AdminLoginGuard],