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 15:02:13 UTC

[incubator-dlab] branch project_grid updated (698ab89 -> 1d3c4ae)

This is an automated email from the ASF dual-hosted git repository.

ankovalyshyn pushed a change to branch project_grid
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git.


    from 698ab89  fixed dialog style files
     new b4670d6  added creation stepper; interface
     new f41f08d  added service with methods to get and create project
     new dd29b03  rebuild stepper styles
     new 1d3c4ae  added base projects list component

The 4 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 .../administration/project/create-project/index.ts | 38 --------------------
 .../webapp/src/app/administration/project/index.ts | 12 ++++---
 .../project-form.component.html}                   | 38 +++++++++++++-------
 .../project-form.component.scss}                   |  0
 .../project-form.component.ts}                     | 32 ++++++++++++++---
 .../administration/project/project-list/data.ts    | 16 +++++++++
 .../project-list/project-list.component.html}      |  4 ++-
 .../project-list.component.scss}                   |  0
 .../project-list.component.ts}                     | 41 ++++++++++-----------
 .../administration/project/project.component.html  |  4 +--
 .../administration/project/project.component.ts    | 10 ++++--
 .../resources/webapp/src/app/core/core.module.ts   |  2 ++
 .../services/applicationServiceFacade.service.ts   | 15 ++++++++
 .../webapp/src/app/core/services/index.ts          |  1 +
 .../{manageUngit.service.ts => project.service.ts} | 16 ++++-----
 .../webapp/src/assets/styles/_dialogs.scss         | 40 ++++++++++-----------
 .../resources/webapp/src/assets/styles/_theme.scss | 42 ++++++++++++++++++++++
 17 files changed, 194 insertions(+), 117 deletions(-)
 delete mode 100644 services/self-service/src/main/resources/webapp/src/app/administration/project/create-project/index.ts
 rename services/self-service/src/main/resources/webapp/src/app/administration/project/{create-project/create-project.component.html => project-form/project-form.component.html} (50%)
 rename services/self-service/src/main/resources/webapp/src/app/administration/project/{create-project/create-project.component.scss => project-form/project-form.component.scss} (100%)
 copy services/self-service/src/main/resources/webapp/src/app/administration/project/{create-project/create-project.component.ts => project-form/project-form.component.ts} (55%)
 create mode 100644 services/self-service/src/main/resources/webapp/src/app/administration/project/project-list/data.ts
 copy services/self-service/src/main/resources/webapp/src/app/{layout/layout.component.html => administration/project/project-list/project-list.component.html} (96%)
 copy services/self-service/src/main/resources/webapp/src/app/administration/project/{project.component.scss => project-list/project-list.component.scss} (100%)
 rename services/self-service/src/main/resources/webapp/src/app/administration/project/{create-project/create-project.component.ts => project-list/project-list.component.ts} (56%)
 copy services/self-service/src/main/resources/webapp/src/app/core/services/{manageUngit.service.ts => project.service.ts} (87%)


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@dlab.apache.org
For additional commands, e-mail: commits-help@dlab.apache.org


[incubator-dlab] 02/04: added service with methods to get and create project

Posted by an...@apache.org.
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 f41f08d6dbbbae507a8a0701ab14b0a9a7eb049d
Author: Andriana Kovalyshyn <An...@epam.com>
AuthorDate: Tue May 21 17:58:24 2019 +0300

    added service with methods to get and create project
---
 .../resources/webapp/src/app/core/core.module.ts   |  2 +
 .../services/applicationServiceFacade.service.ts   | 15 +++++++
 .../webapp/src/app/core/services/index.ts          |  1 +
 .../src/app/core/services/project.service.ts       | 46 ++++++++++++++++++++++
 4 files changed, 64 insertions(+)

diff --git a/services/self-service/src/main/resources/webapp/src/app/core/core.module.ts b/services/self-service/src/main/resources/webapp/src/app/core/core.module.ts
index 9d073a2..afb2ce1 100644
--- a/services/self-service/src/main/resources/webapp/src/app/core/core.module.ts
+++ b/services/self-service/src/main/resources/webapp/src/app/core/core.module.ts
@@ -37,6 +37,7 @@ import { ManageEnvironmentsService } from './services/managementEnvironments.ser
 import { RolesGroupsService } from './services/rolesManagement.service';
 import { DataengineConfigurationService } from './services/dataengineConfiguration.service';
 import { StorageService } from './services/storage.service';
+import { ProjectService } from './services/project.service';
 
 import { MatDialogRef, MAT_DIALOG_DATA } from '@angular/material';
 
@@ -71,6 +72,7 @@ export class CoreModule {
         ApplicationServiceFacade,
         DataengineConfigurationService,
         StorageService,
+        ProjectService,
 
         { provide: MatDialogRef, useValue: {} },
         { provide: MAT_DIALOG_DATA, useValue: [] }
diff --git a/services/self-service/src/main/resources/webapp/src/app/core/services/applicationServiceFacade.service.ts b/services/self-service/src/main/resources/webapp/src/app/core/services/applicationServiceFacade.service.ts
index 79ae239..3d1fced 100644
--- a/services/self-service/src/main/resources/webapp/src/app/core/services/applicationServiceFacade.service.ts
+++ b/services/self-service/src/main/resources/webapp/src/app/core/services/applicationServiceFacade.service.ts
@@ -68,6 +68,7 @@ export class ApplicationServiceFacade {
   private static readonly BILLING = 'billing';
   private static readonly DOWNLOAD_REPORT = 'download_report';
   private static readonly SETTINGS = 'settings';
+  private static readonly PROJECT = 'project';
   private accessTokenKey: string = 'access_token';
   private requestRegistry: Dictionary<string>;
 
@@ -521,6 +522,17 @@ export class ApplicationServiceFacade {
       null);
   }
 
+  public buildCreateProject(): Observable<any> {
+    return this.buildRequest(RequestMethod.Post,
+      this.requestRegistry.Item(ApplicationServiceFacade.PROJECT),
+      null);
+  }
+  public buildGetProjectsList(): Observable<any> {
+    return this.buildRequest(RequestMethod.Get,
+      this.requestRegistry.Item(ApplicationServiceFacade.PROJECT),
+      null);
+  }
+
   private setupRegistry(): void {
     this.requestRegistry = new Dictionary<string>();
 
@@ -593,6 +605,9 @@ export class ApplicationServiceFacade {
     // billing report
     this.requestRegistry.Add(ApplicationServiceFacade.BILLING, '/api/billing/report');
     this.requestRegistry.Add(ApplicationServiceFacade.DOWNLOAD_REPORT, '/api/billing/report/download');
+
+    // project
+    this.requestRegistry.Add(ApplicationServiceFacade.PROJECT, '/api/project');
   }
 
   private buildRequest(method: RequestMethod, url: string, body: any, opt?) {
diff --git a/services/self-service/src/main/resources/webapp/src/app/core/services/index.ts b/services/self-service/src/main/resources/webapp/src/app/core/services/index.ts
index 4937cdd..1bf598c 100644
--- a/services/self-service/src/main/resources/webapp/src/app/core/services/index.ts
+++ b/services/self-service/src/main/resources/webapp/src/app/core/services/index.ts
@@ -35,3 +35,4 @@ export * from './managementEnvironments.service';
 export * from './rolesManagement.service';
 export * from './dataengineConfiguration.service';
 export * from './storage.service';
+export * from './project.service';
diff --git a/services/self-service/src/main/resources/webapp/src/app/core/services/project.service.ts b/services/self-service/src/main/resources/webapp/src/app/core/services/project.service.ts
new file mode 100644
index 0000000..c15f126
--- /dev/null
+++ b/services/self-service/src/main/resources/webapp/src/app/core/services/project.service.ts
@@ -0,0 +1,46 @@
+/*
+ * 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.
+ */
+
+import { Injectable } from '@angular/core';
+import { Observable } from 'rxjs';
+import { map, catchError } from 'rxjs/operators';
+
+import { ApplicationServiceFacade } from './applicationServiceFacade.service';
+import { ErrorUtils } from '../util';
+
+@Injectable()
+export class ProjectService {
+  constructor(private applicationServiceFacade: ApplicationServiceFacade) { }
+
+  public createProject(): Observable<{}> {
+    return this.applicationServiceFacade
+      .buildCreateProject()
+      .pipe(
+        map(response => response),
+        catchError(ErrorUtils.handleServiceError));
+  }
+  
+  public getProjectsList(): Observable<{}> {
+    return this.applicationServiceFacade
+      .buildGetProjectsList()
+      .pipe(
+        map(response => response),
+        catchError(ErrorUtils.handleServiceError));
+  }
+}
\ No newline at end of file


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@dlab.apache.org
For additional commands, e-mail: commits-help@dlab.apache.org


[incubator-dlab] 03/04: rebuild stepper styles

Posted by an...@apache.org.
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 dd29b03a14402ff59fcdddc0d71d437ebbce3795
Author: Andriana Kovalyshyn <An...@epam.com>
AuthorDate: Tue May 21 17:59:17 2019 +0300

    rebuild stepper styles
---
 .../webapp/src/assets/styles/_dialogs.scss         | 40 ++++++++++-----------
 .../resources/webapp/src/assets/styles/_theme.scss | 42 ++++++++++++++++++++++
 2 files changed, 62 insertions(+), 20 deletions(-)

diff --git a/services/self-service/src/main/resources/webapp/src/assets/styles/_dialogs.scss b/services/self-service/src/main/resources/webapp/src/assets/styles/_dialogs.scss
index c148da0..4a21f02 100644
--- a/services/self-service/src/main/resources/webapp/src/assets/styles/_dialogs.scss
+++ b/services/self-service/src/main/resources/webapp/src/assets/styles/_dialogs.scss
@@ -174,23 +174,23 @@ mat-dialog-container {
   padding: 25px 30px 35px;
 }
 
-.modal-content {
-  display: block;
-  position: relative;
-  background-color: #fff;
-  -webkit-background-clip: padding-box;
-  background-clip: padding-box;
-  border: 1px solid rgba(0,0,0,.2);
-  border-radius: 3px;
-  outline: 0;
-  -webkit-box-shadow: 0 3px 9px rgba(0,0,0,.5);
-  box-shadow: 0 3px 9px rgba(0,0,0,.5);
-  .danger_color {
-    padding-left: 5px;
-    font-size: 12px;
-    display: inline-block;
-    font-family: 'Open Sans', sans-serif;
-    font-weight: 300;
-    border-color: #d9534f !important;
-  }
-}
\ No newline at end of file
+// .modal-content {
+//   display: block;
+//   position: relative;
+//   background-color: #fff;
+//   -webkit-background-clip: padding-box;
+//   background-clip: padding-box;
+//   border: 1px solid rgba(0,0,0,.2);
+//   border-radius: 3px;
+//   outline: 0;
+//   -webkit-box-shadow: 0 3px 9px rgba(0,0,0,.5);
+//   box-shadow: 0 3px 9px rgba(0,0,0,.5);
+//   .danger_color {
+//     padding-left: 5px;
+//     font-size: 12px;
+//     display: inline-block;
+//     font-family: 'Open Sans', sans-serif;
+//     font-weight: 300;
+//     border-color: #d9534f !important;
+//   }
+// }
\ No newline at end of file
diff --git a/services/self-service/src/main/resources/webapp/src/assets/styles/_theme.scss b/services/self-service/src/main/resources/webapp/src/assets/styles/_theme.scss
index df0b5db..f52f2d9 100644
--- a/services/self-service/src/main/resources/webapp/src/assets/styles/_theme.scss
+++ b/services/self-service/src/main/resources/webapp/src/assets/styles/_theme.scss
@@ -258,6 +258,48 @@
   }
 }
 
+mat-horizontal-stepper {
+  .mat-step-header {
+    .mat-step-icon {
+      background-color: #36afd5;
+    }
+    .mat-step-label {
+      font-family: 'Open Sans', sans-serif;
+      font-size: 16px;
+      font-weight: 300;
+    }
+  }
+  &.stepper {
+    height: 190px;
+    margin-top: 10px;
+    .inner-step {
+      height: 70px;
+      padding: 5px;
+      display: flex;
+      justify-content: center;
+      flex-direction: column;
+      text-align: center;
+      input {
+        width: 490px;
+        align-self: center;
+      }
+      .caret {
+        i {
+          margin-top: 3px;
+        }
+      }
+    }
+    .text-center {
+      button {
+        &:not(:last-child) {
+          margin-right: 5px;
+        }
+      }
+    }
+  }
+}
+
+
 .dashboard_table {
   &.reporting {
     .dropdown-multiselect {


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@dlab.apache.org
For additional commands, e-mail: commits-help@dlab.apache.org


[incubator-dlab] 01/04: added creation stepper; interface

Posted by an...@apache.org.
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 b4670d655f1bb9cff1a61630f48f363ad3e3ebe6
Author: Andriana Kovalyshyn <An...@epam.com>
AuthorDate: Tue May 21 17:56:47 2019 +0300

    added creation stepper; interface
---
 .../administration/project/create-project/index.ts | 38 ----------------------
 .../project-form.component.html}                   | 38 ++++++++++++++--------
 .../project-form.component.scss}                   |  0
 .../project-form.component.ts}                     | 32 +++++++++++++++---
 4 files changed, 52 insertions(+), 56 deletions(-)

diff --git a/services/self-service/src/main/resources/webapp/src/app/administration/project/create-project/index.ts b/services/self-service/src/main/resources/webapp/src/app/administration/project/create-project/index.ts
deleted file mode 100644
index 5a7e62b..0000000
--- a/services/self-service/src/main/resources/webapp/src/app/administration/project/create-project/index.ts
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * 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.
- */
-
-import { NgModule } from '@angular/core';
-import { CommonModule } from '@angular/common';
-import { FormsModule, ReactiveFormsModule } from '@angular/forms';
-
-import { MaterialModule } from '../../../shared/material.module';
-
-import { CreateProjectComponent } from './create-project.component';
-
-@NgModule({
-  imports: [
-    CommonModule,
-    FormsModule,
-    ReactiveFormsModule,
-    MaterialModule
-  ],
-  declarations: [CreateProjectComponent],
-  exports: [CreateProjectComponent]
-})
-export class CreateProjectModule { }
\ No newline at end of file
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/project-form/project-form.component.html
similarity index 50%
rename from services/self-service/src/main/resources/webapp/src/app/administration/project/create-project/create-project.component.html
rename to services/self-service/src/main/resources/webapp/src/app/administration/project/project-form/project-form.component.html
index 94e26f4..e5244d7 100644
--- 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/project-form/project-form.component.html
@@ -17,28 +17,40 @@
   ~ under the License.
   -->
 
-<div>
+<mat-card class="base-retreat">
   <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 class="inner-step">
+          <div class="control-group">
+            <label class="label">Project name</label>
+            <div class="control">
+              <input type="text" formControlName="project_name" placeholder="Enter project name">
+            </div>
+          </div>
+          <div class="control-group">
+            <label class="label">Endpoint name</label>
+            <div class="control">
+              <input type="text" formControlName="endpoint_name" placeholder="Enter endpoint name">
+            </div>
+          </div>
+          <div class="control-group">
+            <label class="label">Project tag</label>
+            <div class="control">
+              <input type="text" formControlName="project_tag" placeholder="Enter project name">
+            </div>
           </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>
+        <div class="inner-step">
+
+          <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>
+        </div>
       </mat-step>
     </mat-horizontal-stepper>
   </form>
-  <mat-divider></mat-divider>
-</div>
\ No newline at end of file
+</mat-card>
\ No newline at end of file
diff --git a/services/self-service/src/main/resources/webapp/src/app/administration/project/create-project/create-project.component.scss b/services/self-service/src/main/resources/webapp/src/app/administration/project/project-form/project-form.component.scss
similarity index 100%
rename from services/self-service/src/main/resources/webapp/src/app/administration/project/create-project/create-project.component.scss
rename to services/self-service/src/main/resources/webapp/src/app/administration/project/project-form/project-form.component.scss
diff --git a/services/self-service/src/main/resources/webapp/src/app/administration/project/create-project/create-project.component.ts b/services/self-service/src/main/resources/webapp/src/app/administration/project/project-form/project-form.component.ts
similarity index 55%
rename from services/self-service/src/main/resources/webapp/src/app/administration/project/create-project/create-project.component.ts
rename to services/self-service/src/main/resources/webapp/src/app/administration/project/project-form/project-form.component.ts
index 7b91265..b5a0861 100644
--- a/services/self-service/src/main/resources/webapp/src/app/administration/project/create-project/create-project.component.ts
+++ b/services/self-service/src/main/resources/webapp/src/app/administration/project/project-form/project-form.component.ts
@@ -19,17 +19,23 @@
 
  import { Component, OnInit } from '@angular/core';
  import { FormGroup, FormBuilder, Validators } from '@angular/forms';
+ import { ToastrService } from 'ngx-toastr';
+
+ import { ProjectService } from '../../../core/services';
+ import { Project } from '../project.component';
 
 @Component({
-  selector: 'create-project',
-  templateUrl: './create-project.component.html',
-  styleUrls: ['./create-project.component.scss']
+  selector: 'project-form',
+  templateUrl: './project-form.component.html',
+  styleUrls: ['./project-form.component.scss']
 })
-export class CreateProjectComponent implements OnInit {
+export class ProjectFormComponent implements OnInit {
 
   public projectForm: FormGroup;
   constructor(
+    public toastr: ToastrService,
     private _fb: FormBuilder,
+    private projectService: ProjectService
   ) { }
 
   ngOnInit() {
@@ -38,6 +44,11 @@ export class CreateProjectComponent implements OnInit {
 
   public createProject(data) {
     console.log(data);
+
+    this.projectService.createProject().subscribe(response => {
+      response && this.toastr.success('Project created successfully!', 'Success!');
+      this.reset();
+    }, error => this.toastr.error(error.message || 'Project creation failed!', 'Oops!'));
   }
 
   public reset() {
@@ -48,7 +59,18 @@ export class CreateProjectComponent implements OnInit {
     this.projectForm = this._fb.group({
       'project_name': ['', Validators.required],
       'endpoint_name': ['', Validators.required],
-      'users_list': ['']
+      'project_tag': [[], Validators.required],
+      'users_list': ['dlab-']
+    });
+  }
+
+  public editSpecificProject(item: Project) {
+
+    this.projectForm = this._fb.group({
+      'project_name': [item.project_name, Validators.required],
+      'endpoint_name': [item.endpoint_name,Validators.required],
+      'project_tag': [item.project_tag, Validators.required],
+      'users_list': [item.users_list, Validators.required]
     });
   }
 }


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@dlab.apache.org
For additional commands, e-mail: commits-help@dlab.apache.org


[incubator-dlab] 04/04: added base projects list component

Posted by an...@apache.org.
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 1d3c4ae8175336d402abadcf2d21d3c40afd8749
Author: Andriana Kovalyshyn <An...@epam.com>
AuthorDate: Tue May 21 18:01:52 2019 +0300

    added base projects list component
---
 .../webapp/src/app/administration/project/index.ts | 12 +++++----
 .../administration/project/project-list/data.ts    | 16 ++++++++++++
 .../project-list.component.html}                   | 15 +++--------
 .../project-list.component.scss}                   | 22 +---------------
 .../project-list.component.ts}                     | 29 +++++++++++++++-------
 .../administration/project/project.component.html  |  4 +--
 .../administration/project/project.component.ts    | 10 ++++++--
 7 files changed, 57 insertions(+), 51 deletions(-)

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 b6d413f..f04584c 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
@@ -19,23 +19,25 @@
 
 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 { ProjectFormComponent } from './project-form/project-form.component';
+import { ProjectListComponent } from './project-list/project-list.component';
+
 import { ProjectComponent } from './project.component';
-import { CreateProjectModule } from './create-project';
 
 @NgModule({
   imports: [
     CommonModule,
     FormsModule,
+    ReactiveFormsModule,
     MaterialModule,
-    FormControlsModule,
-    CreateProjectModule
+    FormControlsModule
   ],
-  declarations: [ProjectComponent],
+  declarations: [ProjectComponent, ProjectFormComponent, ProjectListComponent],
   exports: [ProjectComponent]
 })
 export class ProjectModule { }
\ No newline at end of file
diff --git a/services/self-service/src/main/resources/webapp/src/app/administration/project/project-list/data.ts b/services/self-service/src/main/resources/webapp/src/app/administration/project/project-list/data.ts
new file mode 100644
index 0000000..bef6b72
--- /dev/null
+++ b/services/self-service/src/main/resources/webapp/src/app/administration/project/project-list/data.ts
@@ -0,0 +1,16 @@
+export const data = {
+  projects: [
+    {
+      'project_name': 'Test-project-1',
+      'endpoint_name': 'test-endpoint',
+      'project_tag': 'dlab-test-project-1',
+      'users_list': ['user_1@example.com', 'user2@example.com']
+    },
+    {
+      'project_name': 'Test-project-2',
+      'endpoint_name': 'test-endpoint',
+      'project_tag': 'dlab-test-project-1',
+      'users_list': ['user_1@example.com', 'user2@example.com']
+    }
+  ]
+}
\ No newline at end of file
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-list/project-list.component.html
similarity index 76%
copy from services/self-service/src/main/resources/webapp/src/app/administration/project/project.component.html
copy to services/self-service/src/main/resources/webapp/src/app/administration/project/project-list/project-list.component.html
index 41eaf79..3e890d6 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-list/project-list.component.html
@@ -17,15 +17,6 @@
   ~ 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>
-
+<p>
+  project-list works!
+</p>
\ 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/project-list/project-list.component.scss
similarity index 70%
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/project-list/project-list.component.scss
index aacc32f..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/project-list/project-list.component.scss
@@ -15,24 +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() {
-  }
-
-  createProject() {
-    console.log('çreate');
-    
-  }
-}
+ */
\ 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/project-list/project-list.component.ts
similarity index 51%
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/project-list/project-list.component.ts
index aacc32f..f974ab6 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-list/project-list.component.ts
@@ -17,22 +17,33 @@
  * under the License.
  */
 
-import { Component, OnInit } from '@angular/core';
+ import { Component, OnInit } from '@angular/core';
+ import { ToastrService } from 'ngx-toastr';
 
+ import { ProjectService } from '../../../core/services';
+ import { Project } from '../project.component';
+
+ import { data } from './data';
+ 
 @Component({
-  selector: 'dlab-project',
-  templateUrl: './project.component.html',
-  styleUrls: ['./project.component.scss']
+  selector: 'project-list',
+  templateUrl: './project-list.component.html',
+  styleUrls: ['./project-list.component.scss']
 })
-export class ProjectComponent implements OnInit {
+export class ProjectListComponent implements OnInit {
 
-  constructor() { }
+  projectsList: Project[];
+  constructor(
+    public toastr: ToastrService,
+    private projectService: ProjectService) { }
 
   ngOnInit() {
+    this.getProjectsList();
   }
 
-  createProject() {
-    console.log('çreate');
-    
+  getProjectsList() {
+    this.projectService.getProjectsList().subscribe(
+      (response: Project[]) => this.projectsList = response,
+      error => this.toastr.error(error.message || 'Receiving list failed!', 'Oops!'));
   }
 }
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 41eaf79..9434da0 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
@@ -27,5 +27,5 @@
   <div></div>
 </div>
 
-<create-project></create-project>
-
+<project-form></project-form>
+<project-list></project-list>
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 aacc32f..727e46b 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
@@ -19,6 +19,13 @@
 
 import { Component, OnInit } from '@angular/core';
 
+export interface Project {
+  project_name: string;
+  endpoint_name: string;
+  project_tag: string;
+  users_list: string[];
+}
+
 @Component({
   selector: 'dlab-project',
   templateUrl: './project.component.html',
@@ -32,7 +39,6 @@ export class ProjectComponent implements OnInit {
   }
 
   createProject() {
-    console.log('çreate');
-    
+    console.log('create');
   }
 }


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@dlab.apache.org
For additional commands, e-mail: commits-help@dlab.apache.org