You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@dlab.apache.org by an...@apache.org on 2019/05/21 10:36:49 UTC
[incubator-dlab] 01/02: added base create project form
This is an automated email from the ASF dual-hosted git repository.
ankovalyshyn pushed a commit to branch project_grid
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
commit 419c202f078e185f29011742e838090659e1a800
Author: Andriana Kovalyshyn <An...@epam.com>
AuthorDate: Tue May 21 13:30:54 2019 +0300
added base create project form
---
.../create-project/create-project.component.html | 44 ++++++++++++++++++++++
.../create-project.component.scss} | 18 +--------
.../create-project.component.ts} | 32 +++++++++++++---
.../project/{ => create-project}/index.ts | 17 ++++-----
.../webapp/src/app/administration/project/index.ts | 2 +
.../administration/project/project.component.html | 14 ++++++-
.../administration/project/project.component.ts | 4 ++
7 files changed, 98 insertions(+), 33 deletions(-)
diff --git a/services/self-service/src/main/resources/webapp/src/app/administration/project/create-project/create-project.component.html b/services/self-service/src/main/resources/webapp/src/app/administration/project/create-project/create-project.component.html
new file mode 100644
index 0000000..94e26f4
--- /dev/null
+++ b/services/self-service/src/main/resources/webapp/src/app/administration/project/create-project/create-project.component.html
@@ -0,0 +1,44 @@
+<!--
+ ~ Licensed to the Apache Software Foundation (ASF) under one
+ ~ or more contributor license agreements. See the NOTICE file
+ ~ distributed with this work for additional information
+ ~ regarding copyright ownership. The ASF licenses this file
+ ~ to you under the Apache License, Version 2.0 (the
+ ~ "License"); you may not use this file except in compliance
+ ~ with the License. You may obtain a copy of the License at
+ ~
+ ~ http://www.apache.org/licenses/LICENSE-2.0
+ ~
+ ~ Unless required by applicable law or agreed to in writing,
+ ~ software distributed under the License is distributed on an
+ ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ ~ KIND, either express or implied. See the License for the
+ ~ specific language governing permissions and limitations
+ ~ under the License.
+ -->
+
+<div>
+ <form [formGroup]="projectForm" novalidate>
+ <mat-horizontal-stepper #stepper class="stepper ani">
+ <mat-step>
+ <ng-template matStepLabel>Project</ng-template>
+ Step 1
+ <div class="control-group">
+ <label class="label">Project name</label>
+ <div class="control">
+ <input type="text" formControlName="project_name" placeholder="Enter project name">
+ <input type="text" formControlName="endpoint_name" placeholder="Enter endpoint name">
+ </div>
+ </div>
+ </mat-step>
+ <mat-step>
+ <ng-template matStepLabel>Users</ng-template>
+ Step 2
+
+ <button mat-raised-button type="button" class="butt action" (click)="reset()">Clear</button>
+ <button mat-raised-button type="button" class="butt" [disabled]="!projectForm.valid" (click)="createProject(projectForm.value)">Create</button>
+ </mat-step>
+ </mat-horizontal-stepper>
+ </form>
+ <mat-divider></mat-divider>
+</div>
\ No newline at end of file
diff --git a/services/self-service/src/main/resources/webapp/src/app/administration/project/project.component.ts b/services/self-service/src/main/resources/webapp/src/app/administration/project/create-project/create-project.component.scss
similarity index 74%
copy from services/self-service/src/main/resources/webapp/src/app/administration/project/project.component.ts
copy to services/self-service/src/main/resources/webapp/src/app/administration/project/create-project/create-project.component.scss
index 75c222f..7220975 100644
--- a/services/self-service/src/main/resources/webapp/src/app/administration/project/project.component.ts
+++ b/services/self-service/src/main/resources/webapp/src/app/administration/project/create-project/create-project.component.scss
@@ -15,20 +15,4 @@
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- */
-
-import { Component, OnInit } from '@angular/core';
-
-@Component({
- selector: 'dlab-project',
- templateUrl: './project.component.html',
- styleUrls: ['./project.component.scss']
-})
-export class ProjectComponent implements OnInit {
-
- constructor() { }
-
- ngOnInit() {
- }
-
-}
+ */
\ No newline at end of file
diff --git a/services/self-service/src/main/resources/webapp/src/app/administration/project/project.component.ts b/services/self-service/src/main/resources/webapp/src/app/administration/project/create-project/create-project.component.ts
similarity index 53%
copy from services/self-service/src/main/resources/webapp/src/app/administration/project/project.component.ts
copy to services/self-service/src/main/resources/webapp/src/app/administration/project/create-project/create-project.component.ts
index 75c222f..7b91265 100644
--- a/services/self-service/src/main/resources/webapp/src/app/administration/project/project.component.ts
+++ b/services/self-service/src/main/resources/webapp/src/app/administration/project/create-project/create-project.component.ts
@@ -17,18 +17,38 @@
* under the License.
*/
-import { Component, OnInit } from '@angular/core';
+ import { Component, OnInit } from '@angular/core';
+ import { FormGroup, FormBuilder, Validators } from '@angular/forms';
@Component({
- selector: 'dlab-project',
- templateUrl: './project.component.html',
- styleUrls: ['./project.component.scss']
+ selector: 'create-project',
+ templateUrl: './create-project.component.html',
+ styleUrls: ['./create-project.component.scss']
})
-export class ProjectComponent implements OnInit {
+export class CreateProjectComponent implements OnInit {
- constructor() { }
+ public projectForm: FormGroup;
+ constructor(
+ private _fb: FormBuilder,
+ ) { }
ngOnInit() {
+ this.initFormModel();
}
+ public createProject(data) {
+ console.log(data);
+ }
+
+ public reset() {
+ this.initFormModel()
+ }
+
+ private initFormModel(): void {
+ this.projectForm = this._fb.group({
+ 'project_name': ['', Validators.required],
+ 'endpoint_name': ['', Validators.required],
+ 'users_list': ['']
+ });
+ }
}
diff --git a/services/self-service/src/main/resources/webapp/src/app/administration/project/index.ts b/services/self-service/src/main/resources/webapp/src/app/administration/project/create-project/index.ts
similarity index 72%
copy from services/self-service/src/main/resources/webapp/src/app/administration/project/index.ts
copy to services/self-service/src/main/resources/webapp/src/app/administration/project/create-project/index.ts
index 6b8e0f4..5a7e62b 100644
--- a/services/self-service/src/main/resources/webapp/src/app/administration/project/index.ts
+++ b/services/self-service/src/main/resources/webapp/src/app/administration/project/create-project/index.ts
@@ -19,21 +19,20 @@
import { NgModule } from '@angular/core';
import { CommonModule } from '@angular/common';
-import { FormsModule } from '@angular/forms';
+import { FormsModule, ReactiveFormsModule } from '@angular/forms';
-import { MaterialModule } from '../../shared/material.module';
-import { FormControlsModule } from '../../shared/form-controls';
+import { MaterialModule } from '../../../shared/material.module';
-import { ProjectComponent } from './project.component';
+import { CreateProjectComponent } from './create-project.component';
@NgModule({
imports: [
CommonModule,
FormsModule,
- MaterialModule,
- FormControlsModule,
+ ReactiveFormsModule,
+ MaterialModule
],
- declarations: [ProjectComponent],
- exports: [ProjectComponent]
+ declarations: [CreateProjectComponent],
+ exports: [CreateProjectComponent]
})
-export class ProjectModule { }
\ No newline at end of file
+export class CreateProjectModule { }
\ No newline at end of file
diff --git a/services/self-service/src/main/resources/webapp/src/app/administration/project/index.ts b/services/self-service/src/main/resources/webapp/src/app/administration/project/index.ts
index 6b8e0f4..b6d413f 100644
--- a/services/self-service/src/main/resources/webapp/src/app/administration/project/index.ts
+++ b/services/self-service/src/main/resources/webapp/src/app/administration/project/index.ts
@@ -25,6 +25,7 @@ import { MaterialModule } from '../../shared/material.module';
import { FormControlsModule } from '../../shared/form-controls';
import { ProjectComponent } from './project.component';
+import { CreateProjectModule } from './create-project';
@NgModule({
imports: [
@@ -32,6 +33,7 @@ import { ProjectComponent } from './project.component';
FormsModule,
MaterialModule,
FormControlsModule,
+ CreateProjectModule
],
declarations: [ProjectComponent],
exports: [ProjectComponent]
diff --git a/services/self-service/src/main/resources/webapp/src/app/administration/project/project.component.html b/services/self-service/src/main/resources/webapp/src/app/administration/project/project.component.html
index 4d4b0d8..41eaf79 100644
--- a/services/self-service/src/main/resources/webapp/src/app/administration/project/project.component.html
+++ b/services/self-service/src/main/resources/webapp/src/app/administration/project/project.component.html
@@ -16,4 +16,16 @@
~ specific language governing permissions and limitations
~ under the License.
-->
-
+
+<div class="sub-nav base-retreat">
+ <div>
+ <button mat-raised-button class="butt butt-create"
+ (click)="createProject()">
+ <i class="material-icons">add</i>Create new
+ </button>
+ </div>
+ <div></div>
+</div>
+
+<create-project></create-project>
+
diff --git a/services/self-service/src/main/resources/webapp/src/app/administration/project/project.component.ts b/services/self-service/src/main/resources/webapp/src/app/administration/project/project.component.ts
index 75c222f..aacc32f 100644
--- a/services/self-service/src/main/resources/webapp/src/app/administration/project/project.component.ts
+++ b/services/self-service/src/main/resources/webapp/src/app/administration/project/project.component.ts
@@ -31,4 +31,8 @@ export class ProjectComponent implements OnInit {
ngOnInit() {
}
+ createProject() {
+ console.log('çreate');
+
+ }
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@dlab.apache.org
For additional commands, e-mail: commits-help@dlab.apache.org