diff --git a/dmp-frontend/src/app/app-routing.module.ts b/dmp-frontend/src/app/app-routing.module.ts index 7fd32336b..a767b1eb3 100644 --- a/dmp-frontend/src/app/app-routing.module.ts +++ b/dmp-frontend/src/app/app-routing.module.ts @@ -1,122 +1,120 @@ -import { UnauthorizedComponent } from './unauthorized/unauthorized.component'; import { NgModule } from '@angular/core'; import { RouterModule, Routes } from '@angular/router'; import { HomepageComponent } from './homepage/homepage.component'; import { AuthGuard } from './shared/guards/auth.guard'; -import { LoginComponent } from './user-management/login/login.component'; import { WelcomepageComponent } from './welcomepage/welcomepage.component'; import { B2AccessLoginComponent } from './user-management/login/b2access/b2access-login.component'; const appRoutes: Routes = [ - { - path: 'datasets', - loadChildren: './datasets/dataset.module#DatasetModule', - data: { - breadcrumb: true - }, - canActivate: [AuthGuard] - }, - { - path: 'about', - loadChildren: './about/about.module#AboutModule', - data: { - breadcrumb: true - }, - canActivate: [AuthGuard] - }, - { - path: 'projects', - loadChildren: './projects/projects.module#ProjectsModule', - data: { - breadcrumb: true - }, - canActivate: [AuthGuard] - }, - { - path: "dmps", - loadChildren: './dmps/dmps.module#DataManagementPlanModule', - data: { - breadcrumb: true - }, - canActivate: [AuthGuard] - }, - { - path: "dmp-profiles", - loadChildren: './dmp-profiles/dmp-profile.module#DataManagamentPlanProfileModule', - data: { - breadcrumb: true - }, - canActivate: [AuthGuard] - }, - { - path: 'form', - loadChildren: './dataset-profile-form/dataset-profile.module#DatasetProfileModule', - data: { - breadcrumb: true - }, - canActivate: [AuthGuard] - }, - { - path: 'home', - component: HomepageComponent, - data: { - breadcrumb: false - }, - canActivate: [AuthGuard] - }, - { - path: '', - redirectTo: '/welcome', - data: { - breadcrumbs: false - }, - pathMatch: 'full' - }, - { - path: "unauthorized", - loadChildren: './unauthorized/unauthorized.module#UnauthorizedModule', - data: { - breadcrumb: true - }, - }, - { - path: "users", - loadChildren: './users/users.module#UsersModule' - }, - { - path: "datasetsProfiles", - loadChildren: './datasets-admin-listing/dataset-admin.module#DatasetAdminModule', - data: { - breadcrumb: true - }, - }, - { - path: "welcome", - component: WelcomepageComponent, - data: { - breadcrumb: false - }, - }, - { - path: "api/oauth/authorized/b2access", - component: B2AccessLoginComponent, - data: { - }, - } + { + path: 'datasets', + loadChildren: './datasets/dataset.module#DatasetModule', + data: { + breadcrumb: true + }, + canActivate: [AuthGuard] + }, + { + path: 'about', + loadChildren: './about/about.module#AboutModule', + data: { + breadcrumb: true + }, + canActivate: [AuthGuard] + }, + { + path: 'projects', + loadChildren: './projects/projects.module#ProjectsModule', + data: { + breadcrumb: true + }, + canActivate: [AuthGuard] + }, + { + path: "dmps", + loadChildren: './dmps/dmps.module#DataManagementPlanModule', + data: { + breadcrumb: true + }, + canActivate: [AuthGuard] + }, + { + path: "dmp-profiles", + loadChildren: './dmp-profiles/dmp-profile.module#DataManagamentPlanProfileModule', + data: { + breadcrumb: true + }, + canActivate: [AuthGuard] + }, + { + path: 'form', + loadChildren: './dataset-profile-form/dataset-profile.module#DatasetProfileModule', + data: { + breadcrumb: true + }, + canActivate: [AuthGuard] + }, + { + path: 'home', + component: HomepageComponent, + data: { + breadcrumb: false + }, + canActivate: [AuthGuard] + }, + { + path: '', + redirectTo: '/welcome', + data: { + breadcrumbs: false + }, + pathMatch: 'full' + }, + { + path: "unauthorized", + loadChildren: './unauthorized/unauthorized.module#UnauthorizedModule', + data: { + breadcrumb: true + }, + }, + { + path: "users", + loadChildren: './users/users.module#UsersModule' + }, + { + path: "datasetsProfiles", + loadChildren: './datasets-admin-listing/dataset-admin.module#DatasetAdminModule', + data: { + breadcrumb: true + }, + }, + { + path: "welcome", + component: WelcomepageComponent, + data: { + breadcrumb: false + }, + }, + { + path: "api/oauth/authorized/b2access", + component: B2AccessLoginComponent, + data: { + }, + } ]; @NgModule({ - imports: [ - RouterModule.forRoot( - appRoutes - , { - useHash: false - } - ) - ], - exports: [ - RouterModule - ] + imports: [ + RouterModule.forRoot( + appRoutes + , { + useHash: false + } + ) + ], + exports: [ + RouterModule + ] }) export class AppRoutingModule { } diff --git a/dmp-frontend/src/app/dmps/editor/dmp-editor.component.html b/dmp-frontend/src/app/dmps/editor/dmp-editor.component.html index 493dd281d..8eb65f4e3 100644 --- a/dmp-frontend/src/app/dmps/editor/dmp-editor.component.html +++ b/dmp-frontend/src/app/dmps/editor/dmp-editor.component.html @@ -1,150 +1,145 @@