/ - Diff - D-Net - D-Net project tracking tool

         "build": "ng build",
         "build:client-and-server-bundles": "ng build --prod --sourceMap --stats-json=true --base-href /dashboard/ && ng run ng-universal-demo:server:production",
         "build:client-and-server-bundles-beta": "ng build --configuration=beta --sourceMap --stats-json=true --base-href /dashboard/ && ng run ng-universal-demo:server:beta",
         "build:client-and-server-bundles-dev": "ng build --configuration=development --sourceMap --stats-json=true --base-href /dashboard/ && ng run ng-universal-demo:server:development",
         "build:client-and-server-bundles-dev": "ng build --configuration=development --sourceMap --stats-json=true && ng run ng-universal-demo:server:development",
         "build:prerender": "npm run build:client-and-server-bundles && npm run webpack:server && npm run generate:prerender",
         "build:ssr": "npm run build:client-and-server-bundles  && npm run webpack:server",
         "build:prerender-beta": "npm run build:client-and-server-bundles-beta && npm run webpack:server && npm run generate:prerender",

             loadChildren: '../openaireLibrary/dashboard/entity/entities.module#EntitiesModule',
             pathMatch: 'full'
           },
+          {
          /* {
             path: 'classContents',
             loadChildren: '../openaireLibrary/dashboard/divhelpcontent/div-help-contents.module#DivHelpContentsModule'
           },
-...
             path: 'pageContents/edit',
             loadChildren: '../openaireLibrary/dashboard/helpTexts/edit-page-help-content.module#EditPageHelpContentModule',
             pathMatch: 'full'
+          }
           }*/
         ])
+      ]
     })

     import {NavigationBarModule} from './openaireLibrary/sharedComponents/navigationBar.module';
     import {EnvironmentSpecificResolver} from './openaireLibrary/utils/properties/environmentSpecificResolver';
     import {UserMiniModule} from "./openaireLibrary/login/userMiniModule.module";
     import {SideBarModule} from "./openaireLibrary/dashboard/sharedComponents/sidebar/sideBar.module";
     import {SharedModule} from "./openaireLibrary/shared/shared.module";
     import {Schema2jsonldModule} from "./openaireLibrary/sharedComponents/schema2jsonld/schema2jsonld.module";
-...
     import {ErrorInterceptorService} from "./openaireLibrary/error-interceptor.service";
     import {AdminLoginGuard} from "./openaireLibrary/login/adminLoginGuard.guard";
     import {AdminDashboardGuard} from "./utils/adminDashboard.guard";
     import {LoginGuard} from "./openaireLibrary/login/loginGuard.guard";
     @NgModule({
-...
       declarations: [AppComponent, OpenaireErrorPageComponent],
       exports: [AppComponent],
       providers: [
         EnvironmentSpecificResolver, AdminLoginGuard, AdminDashboardGuard,
         EnvironmentSpecificResolver, AdminLoginGuard, AdminDashboardGuard, LoginGuard,
+        {
           provide: HTTP_INTERCEPTORS,
           useClass: HttpInterceptorService,

modules/uoa-monitor-portal/trunk/monitor_dashboard/src/app/admin-stakeholder/admin-stakeholder-routing.module.ts
1	1	import {NgModule} from "@angular/core";
2	2	import {RouterModule} from "@angular/router";
3		import {ConnectRIGuard} from "../openaireLibrary/connect/communityGuard/connectRIGuard.guard";
4		import {EnvironmentSpecificResolver} from "../openaireLibrary/utils/properties/environmentSpecificResolver";
5	3
6	4	@NgModule({
7	5	imports: [RouterModule.forChild([

     import {Injectable} from '@angular/core';
     import {ActivatedRouteSnapshot, CanActivate, Router, RouterStateSnapshot} from '@angular/router';
     import {
       ActivatedRouteSnapshot,
       CanActivate,
       CanActivateChild,
       Router,
       RouterStateSnapshot,
       UrlTree
     } from '@angular/router';
     import {Observable} from 'rxjs/Observable';
     import {map, take, tap} from "rxjs/operators";
-...
     @Injectable()
     export class AdminDashboardGuard implements CanActivate {
     export class AdminDashboardGuard implements CanActivate, CanActivateChild {
       constructor(private router: Router,
                   private stakeholderService: StakeholderService,
-...
       canActivate(route: ActivatedRouteSnapshot, state: RouterStateSnapshot): Observable<boolean> | boolean {
         return this.check(state.url, route.params.stakeholder);
+      }
       canActivateChild(childRoute: ActivatedRouteSnapshot, state: RouterStateSnapshot): Observable<boolean | UrlTree> | Promise<boolean | UrlTree> | boolean | UrlTree {
         return this.check(state.url, childRoute.params.stakeholder);
+      }
+    }

     import {RouterModule} from '@angular/router';
     import {PreviousRouteRecorder} from '../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
     import {ManageStakeholdersComponent} from "./manageStakeholders.component";
     import {LoginGuard} from "../openaireLibrary/login/loginGuard.guard";
     @NgModule({
       imports: [
-...
+          {
             path: '',
             component: ManageStakeholdersComponent,
             canActivate: [LoginGuard],
             canDeactivate: [PreviousRouteRecorder],
             data: {hasSidebar: true}
+          }

     import {IconsModule} from "../openaireLibrary/utils/icons/icons.module";
     import {IconsService} from "../openaireLibrary/utils/icons/icons.service";
     import {add, bullet, earth, group, lock, search} from "../openaireLibrary/utils/icons/icons";
     import {LoginGuard} from "../openaireLibrary/login/loginGuard.guard";
     import {PageContentModule} from "../openaireLibrary/dashboard/sharedComponents/page-content/page-content.module";
     @NgModule({
-...
         PageContentModule
       ],
       providers: [
         LoginGuard, PreviousRouteRecorder,
         PreviousRouteRecorder,
       ],
       exports: [ManageStakeholdersComponent]
     })

     import {NgModule} from '@angular/core';
     import {RouterModule} from '@angular/router';
     import {PreviousRouteRecorder} from '../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
     import {AdminDashboardGuard} from "../utils/adminDashboard.guard";
     import {UsersComponent} from "./users.component";
     @NgModule({
-...
+          {
             path: '',
             component: UsersComponent,
             canActivate: [AdminDashboardGuard],
             canDeactivate: [PreviousRouteRecorder]
+          }
         ])

     import {UsersComponent} from "./users.component";
     import {CommonModule} from "@angular/common";
     import {UsersRoutingModule} from "./users-routing.module";
     import {AdminDashboardGuard} from "../utils/adminDashboard.guard";
     import {LoadingModule} from "../openaireLibrary/utils/loading/loading.module";
     import {PageContentModule} from "../openaireLibrary/dashboard/sharedComponents/page-content/page-content.module";
     import {RoleUsersModule} from "../openaireLibrary/dashboard/users/role-users/role-users.module";
-...
     @NgModule({
       imports: [CommonModule, UsersRoutingModule, LoadingModule, PageContentModule, RoleUsersModule, RouterModule],
       declarations: [UsersComponent],
       exports: [UsersComponent],
       providers: [AdminDashboardGuard]
       exports: [UsersComponent]
     })
     export class UsersModule {}
     export class UsersModule {
+    }

     import {LoadingModule} from "../openaireLibrary/utils/loading/loading.module";
     import {AlertModalModule} from "../openaireLibrary/utils/modal/alertModal.module";
     import {ReactiveFormsModule} from "@angular/forms";
     import {AdminDashboardGuard} from "../utils/adminDashboard.guard";
     import {EditStakeholderModule} from "./edit-stakeholder/edit-stakeholder.module";
     import {PageContentModule} from "../openaireLibrary/dashboard/sharedComponents/page-content/page-content.module";
-...
         PageContentModule
       ],
       providers: [
         AdminDashboardGuard, PreviousRouteRecorder,
         PreviousRouteRecorder,
       ],
       exports: [GeneralComponent]
     })

     import {RouterModule} from '@angular/router';
     import {PreviousRouteRecorder} from '../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
     import {GeneralComponent} from "./general.component";
     import {AdminDashboardGuard} from "../utils/adminDashboard.guard";
     @NgModule({
       imports: [
-...
+          {
             path: '',
             component: GeneralComponent,
             canActivate: [AdminDashboardGuard],
             canDeactivate: [PreviousRouteRecorder],
             data: {hasSidebar: true}
+          }

     import {AlertModalModule} from "../openaireLibrary/utils/modal/alertModal.module";
     import {InputModule} from "../openaireLibrary/sharedComponents/input/input.module";
     import {ClickModule} from "../openaireLibrary/utils/click/click.module";
     import {AdminDashboardGuard} from "../utils/adminDashboard.guard";
     import {IconsService} from "../openaireLibrary/utils/icons/icons.service";
     import {
       preview,
-...
     import {IconsModule} from "../openaireLibrary/utils/icons/icons.module";
     import {PageContentModule} from "../openaireLibrary/dashboard/sharedComponents/page-content/page-content.module";
     import {LoadingModule} from "../openaireLibrary/utils/loading/loading.module";
     import {NotifyFormModule} from "../openaireLibrary/notifications/notify-form/notify-form.module";
     @NgModule({
       imports: [
         CommonModule, TopicRoutingModule, ClickModule, RouterModule, FormsModule, AlertModalModule,
         ReactiveFormsModule, InputModule, IconsModule, PageContentModule, LoadingModule
         ReactiveFormsModule, InputModule, IconsModule, PageContentModule, LoadingModule, NotifyFormModule
       ],
       declarations: [
         TopicComponent, IndicatorsComponent
       ],
       providers: [
         AdminDashboardGuard, PreviousRouteRecorder,
         PreviousRouteRecorder,
         PiwikService
       ],
       exports: [

     import {PreviousRouteRecorder} from '../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
     import {TopicComponent} from "./topic.component";
     import {CanExitGuard} from "../openaireLibrary/utils/can-exit.guard";
     import {AdminDashboardGuard} from "../utils/adminDashboard.guard";
     @NgModule({
       imports: [
-...
+          {
             path: '',
             component: TopicComponent,
             canActivate: [AdminDashboardGuard],
             canDeactivate: [PreviousRouteRecorder, CanExitGuard]
+          }
         ])

     import {OpenaireErrorPageComponent} from './error/errorPage.component';
     import {AdminLoginGuard} from "./openaireLibrary/login/adminLoginGuard.guard";
     import {AdminDashboardGuard} from "./utils/adminDashboard.guard";
     import {LoginGuard} from "./openaireLibrary/login/loginGuard.guard";
     const routes: Routes = [
+      {
-...
+      {
         path: 'admin',
         loadChildren: './manageStakeholders/manageStakeholders.module#ManageStakeholdersModule',
         data: {hasAdminMenu: true}
         data: {hasAdminMenu: true},
         canActivateChild: [LoginGuard]
       },
+      {
         path: 'admin/admin-tools',
         loadChildren: './admin-tools/portal-admin-tools-routing.module#PortalAdminToolsRoutingModule',
         canActivate: [AdminLoginGuard],
         canActivateChild: [AdminLoginGuard],
         data: {hasAdminMenu: true}
       },
+      {
         path: 'admin/monitor/admin-tools',
         loadChildren: './admin-tools/admin-tools-routing.module#AdminToolsRoutingModule',
         canActivate: [AdminLoginGuard],
         canActivateChild: [AdminLoginGuard],
         data: {hasAdminMenu: true, portal: 'monitor'}
       },
+      {
         path: 'admin/:stakeholder',
         loadChildren: './admin-stakeholder/admin-stakeholder-routing.module#AdminStakeholderRoutingModule',
         canActivateChild: [AdminDashboardGuard]
       },
       {path: 'theme', loadChildren: './openaireLibrary/utils/theme/theme.module#ThemeModule'},
+      {

       csvLimit: 2000,
       pagingLimit: 20,
       resultsPerPage: 10,
       baseLink: "/dashboard",
       baseLink: "/",
       domain: "http://mpagasas.di.uoa.gr:4600",
       searchLinkToResult: "/search/result?id=",
       searchLinkToPublication: "/search/publication?articleId=",

Project

General

Profile

D-Net

Revision 60538

Added by Konstantinos Triantafyllou over 3 years ago