From 49bb22627ee8eb7c9770fc262e6d4cc743e616bc Mon Sep 17 00:00:00 2001 From: Nikolaos Laskaris Date: Tue, 14 Nov 2017 11:36:21 +0200 Subject: [PATCH] -- --- dmp-frontend/package-lock.json | 5 ++ dmp-frontend/package.json | 1 + dmp-frontend/src/app/app-routing.module.ts | 2 + dmp-frontend/src/app/app.module.ts | 8 +-- .../app/datasets/dataset-routing.module.ts | 22 ------- .../src/app/dmps/dmp-routing.module.ts | 21 ------- dmp-frontend/src/app/dmps/dmp.component.ts | 4 +- dmp-frontend/src/app/dmps/dmps.html | 61 +++++++++---------- .../app/projects/project-routing.module.ts | 22 ------- 9 files changed, 41 insertions(+), 105 deletions(-) delete mode 100644 dmp-frontend/src/app/datasets/dataset-routing.module.ts delete mode 100644 dmp-frontend/src/app/dmps/dmp-routing.module.ts delete mode 100644 dmp-frontend/src/app/projects/project-routing.module.ts diff --git a/dmp-frontend/package-lock.json b/dmp-frontend/package-lock.json index 862ae0bf5..553b276b5 100644 --- a/dmp-frontend/package-lock.json +++ b/dmp-frontend/package-lock.json @@ -6821,6 +6821,11 @@ "utila": "0.4.0" } }, + "primeng": { + "version": "5.0.0-rc.0", + "resolved": "https://registry.npmjs.org/primeng/-/primeng-5.0.0-rc.0.tgz", + "integrity": "sha1-fb5YXppO84emPfSyyR3VbeXpJVI=" + }, "process": { "version": "0.11.10", "resolved": "https://registry.npmjs.org/process/-/process-0.11.10.tgz", diff --git a/dmp-frontend/package.json b/dmp-frontend/package.json index 449ec6187..7002d5fa5 100644 --- a/dmp-frontend/package.json +++ b/dmp-frontend/package.json @@ -38,6 +38,7 @@ "ng2-datepicker": "^2.1.3", "ng4-loading-spinner": "^1.0.27", "ngx-webstorage": "^1.8.0", + "primeng": "^5.0.0-rc.0", "rxjs": "^5.4.2", "zone.js": "^0.8.17" }, diff --git a/dmp-frontend/src/app/app-routing.module.ts b/dmp-frontend/src/app/app-routing.module.ts index 8e57a602c..d8ede8ba6 100644 --- a/dmp-frontend/src/app/app-routing.module.ts +++ b/dmp-frontend/src/app/app-routing.module.ts @@ -12,7 +12,9 @@ import { UserWorkspaceComponent } from './user-workspace/user-workspace.componen import { MainSignInComponent } from './login/main-sign-in/main-sign-in.component'; const appRoutes: Routes = [ + //{ path: 'dynamic-form/:id', component: DynamicFormComponent, canActivate: [AuthGuard] }, { path: 'dynamic-form', component: DynamicFormComponent, canActivate: [AuthGuard] }, + //{ path: 'dataset', component: DatasetsComponent }, { path: 'login', component: MainSignInComponent}, { path: 'projects', component: ProjectsComponent}, { path: 'dmps', component: DmpComponent}, diff --git a/dmp-frontend/src/app/app.module.ts b/dmp-frontend/src/app/app.module.ts index 7504a0c34..e690aa807 100644 --- a/dmp-frontend/src/app/app.module.ts +++ b/dmp-frontend/src/app/app.module.ts @@ -49,17 +49,16 @@ import { CommonModule } from '@angular/common'; import { DatasetTableFilterPipe } from './pipes/dataset-table-filter.pipe'; import { DatasetStatusFilterPipe } from './pipes/dataset-status-filter.pipe'; import { DatasetsComponent } from './datasets/dataset.component'; -import { DatasetRoutingModule } from './datasets/dataset-routing.module'; + import { DmpComponent } from './dmps/dmp.component'; import { DmpTableFilterPipe } from './pipes/dmp-table-filter.pipe'; import { DmpStatusFilterPipe } from './pipes/dmp-status-filter.pipe'; import { DmpVersionFilterPipe } from './pipes/dmp-version-filter.pipe'; -import { DmpRoutingModule } from './dmps/dmp-routing.module'; + import { ProjectTableFilterPipe } from './pipes/project-table-filter.pipe'; import { ProjectsComponent } from './projects/projects.component'; -import { ProjectRoutingModule } from './projects/project-routing.module'; import { ProjectDetailComponent } from './projects/project.detail'; import { ModalComponent } from './modal/modal.component'; import { NgDatepickerModule } from 'ng2-datepicker'; @@ -109,10 +108,7 @@ import { Ng4LoadingSpinnerModule } from 'ng4-loading-spinner'; HttpModule, HttpClientModule, TabModule, - DmpRoutingModule, CommonModule, - DatasetRoutingModule, - ProjectRoutingModule, AppRoutingModule, AngularDraggableModule, DataTableModule, diff --git a/dmp-frontend/src/app/datasets/dataset-routing.module.ts b/dmp-frontend/src/app/datasets/dataset-routing.module.ts deleted file mode 100644 index 36b74623e..000000000 --- a/dmp-frontend/src/app/datasets/dataset-routing.module.ts +++ /dev/null @@ -1,22 +0,0 @@ -import { NgModule } from '@angular/core'; -import { RouterModule, Routes } from '@angular/router'; - -import { DatasetsComponent } from './dataset.component'; -//import { ProjectDetailComponent } from './project.detail'; -import { DynamicFormComponent } from '../form/dynamic-form.component'; -import { AuthGuard } from '../guards/auth.guard'; - -const datasetsRoutes: Routes = [ - { path: 'dataset', component: DatasetsComponent }, - { path: 'dynamic-form/:id', component: DynamicFormComponent, canActivate: [AuthGuard] } -]; - -@NgModule({ - imports: [ - RouterModule.forChild(datasetsRoutes) - ], - exports: [ - RouterModule - ] -}) -export class DatasetRoutingModule { } \ No newline at end of file diff --git a/dmp-frontend/src/app/dmps/dmp-routing.module.ts b/dmp-frontend/src/app/dmps/dmp-routing.module.ts deleted file mode 100644 index 6508ef00d..000000000 --- a/dmp-frontend/src/app/dmps/dmp-routing.module.ts +++ /dev/null @@ -1,21 +0,0 @@ -import { NgModule } from '@angular/core'; -import { RouterModule, Routes } from '@angular/router'; - -import { DmpComponent } from './dmp.component'; -import { DynamicFormComponent } from '../form/dynamic-form.component'; -import { AuthGuard } from '../guards/auth.guard'; - -const projectsRoutes: Routes = [ - //{ path: 'tabs/dmps', component: DmpComponent }, - { path: 'dynamic-form/:id', component: DynamicFormComponent, canActivate: [AuthGuard] } -]; - -@NgModule({ - imports: [ - RouterModule.forChild(projectsRoutes) - ], - exports: [ - RouterModule - ] -}) -export class DmpRoutingModule { } \ No newline at end of file diff --git a/dmp-frontend/src/app/dmps/dmp.component.ts b/dmp-frontend/src/app/dmps/dmp.component.ts index 587493cc9..e6ad711fc 100644 --- a/dmp-frontend/src/app/dmps/dmp.component.ts +++ b/dmp-frontend/src/app/dmps/dmp.component.ts @@ -46,8 +46,8 @@ export class DmpComponent implements OnInit{ public sortOrder = "asc"; //visibility rules for containers - tableVisible: boolean = true; - editorVisible: boolean = true; + //tableVisible: boolean = true; + //editorVisible: boolean = true; // for tableIds diff --git a/dmp-frontend/src/app/dmps/dmps.html b/dmp-frontend/src/app/dmps/dmps.html index dee78a60f..f9270f95b 100644 --- a/dmp-frontend/src/app/dmps/dmps.html +++ b/dmp-frontend/src/app/dmps/dmps.html @@ -1,5 +1,3 @@ - - @@ -188,41 +186,40 @@ - -
- - -
+ +
+ +
+ - + - - + + - - + + - - \ No newline at end of file + + \ No newline at end of file diff --git a/dmp-frontend/src/app/projects/project-routing.module.ts b/dmp-frontend/src/app/projects/project-routing.module.ts deleted file mode 100644 index 4cd05d95f..000000000 --- a/dmp-frontend/src/app/projects/project-routing.module.ts +++ /dev/null @@ -1,22 +0,0 @@ -import { NgModule } from '@angular/core'; -import { RouterModule, Routes } from '@angular/router'; - -import { ProjectsComponent } from './projects.component'; -import { ProjectDetailComponent } from './project.detail'; -import { DynamicFormComponent } from '../form/dynamic-form.component'; -import { AuthGuard } from '../guards/auth.guard'; - -const projectsRoutes: Routes = [ - // { path: 'tabs/projects', component: ProjectsComponent }, // canActivate: [AuthGuard] - { path: 'dynamic-form/:id', component: DynamicFormComponent, canActivate: [AuthGuard] } -]; - -@NgModule({ - imports: [ - RouterModule.forChild(projectsRoutes) - ], - exports: [ - RouterModule - ] -}) -export class ProjectRoutingModule { } \ No newline at end of file