no message
This commit is contained in:
parent
48539aac29
commit
5d00d133c4
|
@ -1,8 +1,8 @@
|
||||||
import { UnauthorizedComponent } from './unauthorized/unauthorized.component';
|
import { UnauthorizedComponent } from './unauthorized/unauthorized.component';
|
||||||
import { NgModule } from '@angular/core';
|
import { NgModule } from '@angular/core';
|
||||||
import { RouterModule, Routes } from '@angular/router';
|
import { RouterModule, Routes } from '@angular/router';
|
||||||
import { PageNotFoundComponent } from './not-found.component';
|
import { PageNotFoundComponent } from './not-found.component';
|
||||||
import { HomepageComponent } from './homepage/homepage.component';
|
import { HomepageComponent } from './homepage/homepage.component';
|
||||||
import { DynamicFormComponent } from './form/dynamic-form.component';
|
import { DynamicFormComponent } from './form/dynamic-form.component';
|
||||||
import { AuthGuard } from './guards/auth.guard';
|
import { AuthGuard } from './guards/auth.guard';
|
||||||
import { AppComponent } from './app.component';
|
import { AppComponent } from './app.component';
|
||||||
|
@ -11,30 +11,29 @@ import { ProjectListingComponent } from './projects/project-listing.component';
|
||||||
import { DataManagementPlanListingComponent } from './dmps/dmp-listing.component';
|
import { DataManagementPlanListingComponent } from './dmps/dmp-listing.component';
|
||||||
import { ProjectEditorComponent } from './projects/editor/project-editor.component';
|
import { ProjectEditorComponent } from './projects/editor/project-editor.component';
|
||||||
import { DataManagementPlanEditorComponent } from './dmps/editor/dmp-editor.component';
|
import { DataManagementPlanEditorComponent } from './dmps/editor/dmp-editor.component';
|
||||||
import { DatasetEditorComponent } from './datasets_new/editor/dataset-editor.component';
|
import { DatasetEditorComponent } from './datasets/editor/dataset-editor.component';
|
||||||
import { DatasetListingComponent } from './datasets_new/dataset-listing.component';
|
import { DatasetListingComponent } from './datasets/dataset-listing.component';
|
||||||
import { DataManagementPlanWizardComponent } from './dmp-wizard/dmp-wizard.component';
|
|
||||||
import { LoginComponent } from './login/login.component';
|
import { LoginComponent } from './login/login.component';
|
||||||
|
import { DatasetWizardComponent } from './dataset-wizard/dataset-wizard.component';
|
||||||
|
|
||||||
const appRoutes: Routes = [
|
const appRoutes: Routes = [
|
||||||
|
|
||||||
{ path: 'dynamic-form/:id', component: DynamicFormComponent, canActivate: [AuthGuard] },
|
|
||||||
{ path: 'projects', component: ProjectListingComponent, canActivate: [AuthGuard]},
|
|
||||||
{ path: 'project/:id', component: ProjectEditorComponent, canActivate: [AuthGuard]},
|
|
||||||
{ path: 'projects/new', component: ProjectEditorComponent, canActivate: [AuthGuard]},
|
|
||||||
{ path: 'dmps', component: DataManagementPlanListingComponent, canActivate: [AuthGuard]},
|
|
||||||
{ path: 'dmp/new', component: DataManagementPlanWizardComponent, canActivate: [AuthGuard]},
|
|
||||||
{ path: 'dmp/:id', component: DataManagementPlanEditorComponent, canActivate: [AuthGuard]},
|
|
||||||
{ path: 'dmps/new', component: DataManagementPlanEditorComponent, canActivate: [AuthGuard]},
|
|
||||||
{ path: 'datasets', component: DatasetListingComponent, canActivate: [AuthGuard]},
|
|
||||||
{ path: 'dataset/:id', component: DatasetEditorComponent, canActivate: [AuthGuard]},
|
|
||||||
{ path: 'datasets/new', component: DatasetEditorComponent, canActivate: [AuthGuard]},
|
|
||||||
|
|
||||||
{ path: 'login', component: LoginComponent},
|
{ path: 'dynamic-form/:id', component: DynamicFormComponent, canActivate: [AuthGuard] },
|
||||||
{ path: "unauthorized", loadChildren: './unauthorized/unauthorized.module#UnauthorizedModule' },
|
{ path: 'projects', component: ProjectListingComponent, canActivate: [AuthGuard] },
|
||||||
{ path: 'welcome', component: HomepageComponent, canActivate: [AuthGuard]},
|
{ path: 'project/:id', component: ProjectEditorComponent, canActivate: [AuthGuard] },
|
||||||
{ path: '', redirectTo: '/welcome', pathMatch: 'full' },
|
{ path: 'projects/new', component: ProjectEditorComponent, canActivate: [AuthGuard] },
|
||||||
|
{ path: 'dmps', component: DataManagementPlanListingComponent, canActivate: [AuthGuard] },
|
||||||
|
{ path: 'dmp/:id', component: DataManagementPlanEditorComponent, canActivate: [AuthGuard] },
|
||||||
|
{ path: 'dmps/new', component: DataManagementPlanEditorComponent, canActivate: [AuthGuard] },
|
||||||
|
{ path: 'datasets', component: DatasetListingComponent, canActivate: [AuthGuard] },
|
||||||
|
{ path: 'dataset/new', component: DatasetWizardComponent, canActivate: [AuthGuard] },
|
||||||
|
{ path: 'dataset/:id', component: DatasetEditorComponent, canActivate: [AuthGuard] },
|
||||||
|
{ path: 'datasets/new', component: DatasetEditorComponent, canActivate: [AuthGuard] },
|
||||||
|
|
||||||
|
{ path: 'login', component: LoginComponent },
|
||||||
|
{ path: "unauthorized", loadChildren: './unauthorized/unauthorized.module#UnauthorizedModule' },
|
||||||
|
{ path: 'welcome', component: HomepageComponent, canActivate: [AuthGuard] },
|
||||||
|
{ path: '', redirectTo: '/welcome', pathMatch: 'full' },
|
||||||
|
|
||||||
];
|
];
|
||||||
|
|
||||||
|
@ -42,10 +41,10 @@ const appRoutes: Routes = [
|
||||||
imports: [
|
imports: [
|
||||||
RouterModule.forRoot(
|
RouterModule.forRoot(
|
||||||
appRoutes
|
appRoutes
|
||||||
,{
|
, {
|
||||||
useHash: false
|
useHash: false
|
||||||
//,enableTracing: true <-- debugging purposes only
|
//,enableTracing: true <-- debugging purposes only
|
||||||
}
|
}
|
||||||
)
|
)
|
||||||
],
|
],
|
||||||
exports: [
|
exports: [
|
||||||
|
|
|
@ -1,25 +1,13 @@
|
||||||
import { UnauthorizedComponent } from './unauthorized/unauthorized.component';
|
import { UnauthorizedComponent } from './unauthorized/unauthorized.component';
|
||||||
import { PaginationService } from './form/pagination/pagination-service';
|
import { PaginationService } from './form/pagination/pagination-service';
|
||||||
import {
|
import { TableOfContentsFieldComponent } from './form/tableOfContents/table-of-content-field/table-of-content-field.component';
|
||||||
TableOfContentsFieldComponent,
|
|
||||||
} from './form/tableOfContents/table-of-content-field/table-of-content-field.component';
|
|
||||||
import { ProgressBarComponent } from './form/pprogress-bar/progress-bar.component';
|
import { ProgressBarComponent } from './form/pprogress-bar/progress-bar.component';
|
||||||
import {
|
import { TableOfContentsSectionComponent } from './form/tableOfContents/table-of-content-section/table-of-content-section.component';
|
||||||
TableOfContentsSectionComponent,
|
import { TableOfContentsGroupComponent } from './form/tableOfContents/table-of-content-group/table-of-content-group.component';
|
||||||
} from './form/tableOfContents/table-of-content-section/table-of-content-section.component';
|
import { TableOfContentsFieldSetComponent } from './form/tableOfContents/table-of-content-fieldset/table-of-content-fieldset.component';
|
||||||
import {
|
|
||||||
TableOfContentsGroupComponent,
|
|
||||||
} from './form/tableOfContents/table-of-content-group/table-of-content-group.component';
|
|
||||||
import {
|
|
||||||
TableOfContentsFieldSetComponent,
|
|
||||||
} from './form/tableOfContents/table-of-content-fieldset/table-of-content-fieldset.component';
|
|
||||||
import { TableOfContentsComponent } from './form/tableOfContents/table-of-contents.component';
|
import { TableOfContentsComponent } from './form/tableOfContents/table-of-contents.component';
|
||||||
import {
|
import { DynamicFieldRadioBoxComponent } from './form/dynamic-fields/dynamic-field-radiobox/dynamic-field-radiobox.component';
|
||||||
DynamicFieldRadioBoxComponent,
|
import { DynamicFieldBooleanDecisionComponent } from './form/dynamic-fields/dynamic-field-boolean-decision/dynamic-field-boolean-decision.component';
|
||||||
} from './form/dynamic-fields/dynamic-field-radiobox/dynamic-field-radiobox.component';
|
|
||||||
import {
|
|
||||||
DynamicFieldBooleanDecisionComponent,
|
|
||||||
} from './form/dynamic-fields/dynamic-field-boolean-decision/dynamic-field-boolean-decision.component';
|
|
||||||
import { AutocompleteRemoteComponent } from './form/dynamic-fields/dynamic-field-autocomplete/autocomplete-remote.component';
|
import { AutocompleteRemoteComponent } from './form/dynamic-fields/dynamic-field-autocomplete/autocomplete-remote.component';
|
||||||
import { DynamicFieldDropdownComponent } from './form/dynamic-fields/dynamic-field-dropdown/dynamic-field-dropdown';
|
import { DynamicFieldDropdownComponent } from './form/dynamic-fields/dynamic-field-dropdown/dynamic-field-dropdown';
|
||||||
import { DynamicFieldCheckBoxComponent } from './form/dynamic-fields/dynamic-field-checkbox/dynamic-field-checkbox';
|
import { DynamicFieldCheckBoxComponent } from './form/dynamic-fields/dynamic-field-checkbox/dynamic-field-checkbox';
|
||||||
|
@ -51,17 +39,17 @@ import { SharedModule } from './shared/shared.module';
|
||||||
import { MaterialModule } from './shared/material/material.module';
|
import { MaterialModule } from './shared/material/material.module';
|
||||||
import { AuthService } from './services/auth/auth.service';
|
import { AuthService } from './services/auth/auth.service';
|
||||||
import { ProjectListingComponent } from './projects/project-listing.component';
|
import { ProjectListingComponent } from './projects/project-listing.component';
|
||||||
import { DatasetListingComponent } from './datasets_new/dataset-listing.component';
|
|
||||||
import { DashboardService } from './services/dashboard/dashboard.service';
|
import { DashboardService } from './services/dashboard/dashboard.service';
|
||||||
import { DatasetService } from './services/dataset/dataset.service';
|
import { DatasetService } from './services/dataset/dataset.service';
|
||||||
import { BaseHttpService } from './utilities/cite-http-service-module/base-http.service';
|
import { BaseHttpService } from './utilities/cite-http-service-module/base-http.service';
|
||||||
import { DataManagementPlanListingComponent } from './dmps/dmp-listing.component';
|
import { DataManagementPlanListingComponent } from './dmps/dmp-listing.component';
|
||||||
import { ProjectEditorComponent } from './projects/editor/project-editor.component';
|
import { ProjectEditorComponent } from './projects/editor/project-editor.component';
|
||||||
import { DataManagementPlanEditorComponent } from './dmps/editor/dmp-editor.component';
|
import { DataManagementPlanEditorComponent } from './dmps/editor/dmp-editor.component';
|
||||||
import { DatasetEditorComponent } from './datasets_new/editor/dataset-editor.component';
|
|
||||||
import { DataManagementPlanWizardComponent } from './dmp-wizard/dmp-wizard.component';
|
|
||||||
import { LoginComponent } from './login/login.component';
|
import { LoginComponent } from './login/login.component';
|
||||||
import { FigurecardComponent } from './shared/components/figurecard/figurecard.component';
|
import { FigurecardComponent } from './shared/components/figurecard/figurecard.component';
|
||||||
|
import { DatasetListingComponent } from './datasets/dataset-listing.component';
|
||||||
|
import { DatasetEditorComponent } from './datasets/editor/dataset-editor.component';
|
||||||
|
import { DatasetWizardComponent } from './dataset-wizard/dataset-wizard.component';
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
@ -92,7 +80,7 @@ import { FigurecardComponent } from './shared/components/figurecard/figurecard.c
|
||||||
DynamicFieldCheckBoxComponent,
|
DynamicFieldCheckBoxComponent,
|
||||||
ProjectEditorComponent,
|
ProjectEditorComponent,
|
||||||
DataManagementPlanEditorComponent,
|
DataManagementPlanEditorComponent,
|
||||||
DataManagementPlanWizardComponent,
|
DatasetWizardComponent,
|
||||||
FigurecardComponent,
|
FigurecardComponent,
|
||||||
DatasetEditorComponent
|
DatasetEditorComponent
|
||||||
],
|
],
|
||||||
|
|
|
@ -5,13 +5,13 @@ import { FormGroup, Validators, FormBuilder } from "@angular/forms";
|
||||||
|
|
||||||
|
|
||||||
@Component({
|
@Component({
|
||||||
selector: 'app-dmp-wizard-component',
|
selector: 'app-dataset-wizard-component',
|
||||||
templateUrl: 'dmp-wizard.component.html',
|
templateUrl: 'dataset-wizard.component.html',
|
||||||
styleUrls: ['./dmp-wizard.component.scss'],
|
styleUrls: ['./dataset-wizard.component.scss'],
|
||||||
providers: [DataManagementPlanService],
|
providers: [DataManagementPlanService],
|
||||||
encapsulation: ViewEncapsulation.None
|
encapsulation: ViewEncapsulation.None
|
||||||
})
|
})
|
||||||
export class DataManagementPlanWizardComponent implements AfterViewInit {
|
export class DatasetWizardComponent implements AfterViewInit {
|
||||||
|
|
||||||
constructor(
|
constructor(
|
||||||
private dataManagementPlanService: DataManagementPlanService,
|
private dataManagementPlanService: DataManagementPlanService,
|
|
@ -3,7 +3,6 @@ import { Router, ActivatedRoute } from '@angular/router';
|
||||||
import { DashboardService } from '../../app/services/dashboard/dashboard.service';
|
import { DashboardService } from '../../app/services/dashboard/dashboard.service';
|
||||||
import { DashboardStatisticsModel } from '../models/dashboard/DashboardStatisticsModel';
|
import { DashboardStatisticsModel } from '../models/dashboard/DashboardStatisticsModel';
|
||||||
import { JsonSerializer } from '../utilities/JsonSerializer';
|
import { JsonSerializer } from '../utilities/JsonSerializer';
|
||||||
import { DatasetListingComponent } from '../../app/datasets_new/dataset-listing.component';
|
|
||||||
|
|
||||||
@Component({
|
@Component({
|
||||||
selector: 'homepage',
|
selector: 'homepage',
|
||||||
|
|
Loading…
Reference in New Issue