20 files changed, 286 insertions, 289 deletions

diff --git a/src/app/api.service.ts b/src/app/api.service.ts
index a70eee1..b659198 100644
--- a/src/app/api.service.ts
+++ b/src/app/api.service.ts
@@ -11,14 +11,14 @@
    WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
    Affero General Public License for more details.
-  
+
    You should have received a copy of the GNU Affero General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.
    */
 /**
  * @author Philippe Buschmann
  * @file src/app/api.service.ts
- * @brief 
+ * @brief
  *
  */
 
@@ -34,12 +34,6 @@ import { MessagesService } from './messages.service';
   providedIn: 'root'
 })
 export class ApiService {
-  apis: RestAPI[] = [
-    {name: 'Identity API', desc: 'This is the identity API', link: 'identity'},
-    {name: 'GNS API', desc: 'This is the gns API', link: 'gns'},
-    {name: 'Namestore API', desc: 'This is the namestore API', link: 'namestore'},
-    {name: 'Peerstore API', desc: 'This is the peerstore API', link: 'peerstore'},
-  ];
 
   private restURL = 'http://localhost:7776/'
   private identityURL = this.restURL+'identity';
@@ -48,10 +42,6 @@ export class ApiService {
   constructor(private http: HttpClient,
               private messages:MessagesService) { }
 
-  getAPIs(): Observable<RestAPI[]> {
-    return of(this.apis);
-  }
-
   getIdentities (): Observable<IdentityAPI[]>{
     return this.http.get<IdentityAPI[]>(this.identityURL)
     .pipe(
diff --git a/src/app/app-routing.module.ts b/src/app/app-routing.module.ts
index 7943788..e8e156d 100644
--- a/src/app/app-routing.module.ts
+++ b/src/app/app-routing.module.ts
@@ -11,35 +11,38 @@
    WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
    Affero General Public License for more details.
-  
+
    You should have received a copy of the GNU Affero General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.
    */
 /**
  * @author Philippe Buschmann
  * @file src/app/app-routing.module.ts
- * @brief 
+ * @brief
  *
  */
 
 import { NgModule } from '@angular/core';
-import { RouterModule, Routes } from '@angular/router';
+import { RouterModule, Routes, Router, ActivatedRoute, NavigationEnd } from '@angular/router';
+
+import { filter } from 'rxjs/operators';
 
 import { RestApisComponent } from './rest-apis/rest-apis.component';
 import { MainPageComponent } from './main-page/main-page.component';
 import { IdentityPageComponent } from './identity-page/identity-page.component';
-import { GnsPageComponent } from './gns-page/gns-page.component';
 import { PeerstorePageComponent } from './peerstore-page/peerstore-page.component';
 import { NamestorePageComponent } from './namestore-page/namestore-page.component';
+import { ErrorPageComponent } from './error-page/error-page.component';
 
+import { MessagesService } from './messages.service';
 
 const routes: Routes = [
   { path: '', component: MainPageComponent },
   { path: 'apis', component: RestApisComponent },
   { path: 'identity', component: IdentityPageComponent },
-  { path: 'gns', component: GnsPageComponent },
   { path: 'peerstore', component: PeerstorePageComponent },
-  { path: 'namestore', component: NamestorePageComponent }
+  { path: 'namestore', component: NamestorePageComponent },
+  { path: '**', component: ErrorPageComponent }
 ];
 
 @NgModule({
@@ -47,4 +50,14 @@ const routes: Routes = [
   exports: [ RouterModule ]
 })
 export class AppRoutingModule {
+  constructor(private router: Router,
+              private messages: MessagesService) {
+    router.events.pipe(filter(event => event instanceof NavigationEnd))
+    .subscribe((route: ActivatedRoute) => {
+      this.messages.dismissError();
+      this.messages.dismissSuccess();
+      this.messages.dismissWarning();
+      this.messages.dismissInformation();
+    });
+  }
 }
diff --git a/src/app/app.component.html b/src/app/app.component.html
index 7f098f2..a4a6a27 100644
--- a/src/app/app.component.html
+++ b/src/app/app.component.html
@@ -1,33 +1,27 @@
 <!--The content below is only a placeholder and can be replaced.-->
 <header class="c-header u-p-x2">
- <div class="o-container o-container--size-small">
-   <div class="o-media o-media--middle">
-     <div class="o-media__fixed">
-       <img src="svg/logo.svg"> GNUnet API
-     </div>
-     <div class="o-media__fluid u-text-right">
-       <nav>
-         <ul class="o-list o-list--inline o-list--gutter-x4">
-           <li class="o-list__item">
-             <a routerLink="/" class="c-link">Main Page</a>
-           </li>
-           <li class="o-list__item">
-             <a routerLink="identity" class="c-link">Identity</a>
-           </li>
-           <li class="o-list__item">
-             <a routerLink="gns" class="c-link">GNS</a>
-           </li>
-           <li class="o-list__item">
-             <a routerLink="namestore" class="c-link">Namestore</a>
-           </li>
-           <li class="o-list__item">
-             <a routerLink="peerstore" class="c-link">Peerstore</a>
-           </li>
-         </ul>
-       </nav>
-     </div>
-   </div>
- </div>
+  <div class="o-container o-container--size-small">
+    <div class="o-media o-media--middle">
+      <div class="o-media__fixed">
+        <img class="u-align-middle" src="https://gnunet.org/sites/default/files/transparent_0_0.png" width="40px">
+        &nbsp;<span class="o-type-22 u-align-middle">GNUnet Web UI</span>
+      </div>
+      <div class="o-media__fluid u-text-right">
+        <nav>
+          <ul class="o-list o-list--inline o-list--gutter-x4">
+            <li class="o-list__item" *ngFor="let item of this.menu">
+              <div *ngIf="item.id === active" class="u-p-x1 u-bgcolor-primary u-color-contrary">
+                <a routerLink="{{item.link}}" class="c-link">{{item.name}}</a>
+              </div>
+              <div *ngIf="item.id !== active" class="u-p-x1">
+                <a routerLink="{{item.link}}" class="c-link">{{item.name}}</a>
+              </div>
+            </li>
+          </ul>
+        </nav>
+      </div>
+    </div>
+  </div>
 </header>
 
 <main class="u-mv-x2 o-container">
@@ -35,22 +29,24 @@
   <router-outlet></router-outlet>
 </main>
 
-<footer class="c-footer u-p-x2">
- <div class="o-container o-container--size-small">
-   <div class="o-media o-media--middle">
-     <div class="o-media__fixed">
-       <ul class="o-list o-list--inline o-list--gutter-x4">
-         <li class="o-list__item">
-           <a routerLink="/" class="c-link">Impressum</a>
-         </li>
-         <li class="o-list__item">
-           <a routerLink="/" class="c-link">Documentation</a>
-         </li>
-       </ul>
-     </div>
-     <div class="o-media__fluid u-text-right">
-       Copyright things
-     </div>
-   </div>
- </div>
-</footer>
+<div class="c-footer-fixed"><div>
+
+  <footer class="c-footer u-p-x2">
+    <div class="o-container o-container--size-small">
+      <div class="o-media o-media--middle">
+        <div class="o-media__fixed">
+          <ul class="o-list o-list--inline o-list--gutter-x4">
+            <li class="o-list__item">
+              <a routerLink="/" class="c-link">Impressum</a>
+            </li>
+            <li class="o-list__item">
+              <a routerLink="/" class="c-link">Documentation</a>
+            </li>
+          </ul>
+        </div>
+        <div class="o-media__fluid u-text-right">
+          Placeholder
+        </div>
+      </div>
+    </div>
+  </footer>
diff --git a/src/app/app.component.ts b/src/app/app.component.ts
index cb12491..5ee4946 100644
--- a/src/app/app.component.ts
+++ b/src/app/app.component.ts
@@ -23,14 +23,37 @@
  */
 
 import { Component } from '@angular/core';
+import { Router, ActivatedRoute, NavigationEnd } from '@angular/router';
+
+
+import { filter } from 'rxjs/operators';
 
 @Component({
   selector: 'app-root',
-  templateUrl: './app.component.html',
-  //styleUrls: ['./../scss/main.scss']
+  templateUrl: './app.component.html'
 })
 
 
 export class AppComponent {
-  title = '';
+
+  private active: number = 0;
+
+  menu : any[] = [
+    {id:0, name: 'Main', link: ''},
+    {id:1, name: 'Identities', link: 'identity'},
+    {id:2, name: 'Names', link: 'namestore'},
+    {id:3, name: 'Peers', link: 'peerstore'},
+  ];
+
+  constructor(private router: Router) {
+    router.events.pipe(filter(event => event instanceof NavigationEnd))
+    .subscribe((route: ActivatedRoute) => {
+      let index = this.menu.find(x => {
+        let url = '/'+x.link;
+        return url == route.url+'';
+      });
+      this.active = this.menu.indexOf(index);
+    });
+  }
+
 }
diff --git a/src/app/app.module.ts b/src/app/app.module.ts
index edec9cc..e88a0d6 100644
--- a/src/app/app.module.ts
+++ b/src/app/app.module.ts
@@ -11,14 +11,14 @@
    WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
    Affero General Public License for more details.
-  
+
    You should have received a copy of the GNU Affero General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.
    */
 /**
  * @author Philippe Buschmann
  * @file src/app/app.module.ts
- * @brief 
+ * @brief
  *
  */
 
@@ -35,9 +35,9 @@ import { IdentityPageComponent } from './identity-page/identity-page.component';
 import { CreateIdentityComponent } from './create-identity/create-identity.component';
 import { MyFilterPipe } from './filter.pipe';
 import { ErrorMessageComponent } from './error-message/error-message.component';
-import { GnsPageComponent } from './gns-page/gns-page.component';
 import { NamestorePageComponent } from './namestore-page/namestore-page.component';
 import { PeerstorePageComponent } from './peerstore-page/peerstore-page.component';
+import { ErrorPageComponent } from './error-page/error-page.component';
 
 @NgModule({
   declarations: [
@@ -48,9 +48,9 @@ import { PeerstorePageComponent } from './peerstore-page/peerstore-page.componen
     CreateIdentityComponent,
     MyFilterPipe,
     ErrorMessageComponent,
-    GnsPageComponent,
     NamestorePageComponent,
-    PeerstorePageComponent
+    PeerstorePageComponent,
+    ErrorPageComponent
   ],
   imports: [
     BrowserModule,
diff --git a/src/app/create-identity/create-identity.component.html b/src/app/create-identity/create-identity.component.html
index d2e27fe..e1bfa3d 100644
--- a/src/app/create-identity/create-identity.component.html
+++ b/src/app/create-identity/create-identity.component.html
@@ -1,7 +1,8 @@
-<div class="c-card u-p-x3">
-  <div class="o-type-20 u-pb-x1" >Create new identity</div>
+<div class="c-card c-card--no-padding u-p-x3">
+  <h1 class="o-type-22 u-pb-x1 u-color-primary-light" >Create new identity</h1>
   <div class="o-list o-list--inline">
-    <input [(ngModel)]="this.input_text" type="text" class="o-list__item c-input" placeholder="Identity Name"/>
+    <p class="u-color-grey">Identity Name:</p>
+    <input [(ngModel)]="this.input_text" type="text" class="o-list__item c-input" placeholder="e.g. Testname, ..."/>
     <a class="o-list__item c-button" (click)="onClick()"><i class="fa fa-plus"></i></a>
     <div *ngIf="!is_free" class="o-list__item c-spinner"></div>
   </div>
diff --git a/src/app/create-identity/create-identity.component.ts b/src/app/create-identity/create-identity.component.ts
index c71239a..61224a0 100644
--- a/src/app/create-identity/create-identity.component.ts
+++ b/src/app/create-identity/create-identity.component.ts
@@ -11,14 +11,14 @@
    WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
    Affero General Public License for more details.
-  
+
    You should have received a copy of the GNU Affero General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.
    */
 /**
  * @author Philippe Buschmann
  * @file src/app/create-identity/create-identity.component.ts
- * @brief 
+ * @brief
  *
  */
 
@@ -34,9 +34,9 @@ import { MessagesService } from '../messages.service';
 })
 export class CreateIdentityComponent implements OnInit {
 
-  private input_text: string = '';
+  input_text: string = '';
   private json: any = {'name':''};
-  private is_free:boolean = true;
+  is_free:boolean = true;
 
   constructor(private apiService: ApiService,
               private message: MessagesService,
diff --git a/src/app/error-page/error-page.component.html b/src/app/error-page/error-page.component.html
new file mode 100644
index 0000000..a433358
--- /dev/null
+++ b/src/app/error-page/error-page.component.html
@@ -0,0 +1,3 @@
+<h1 class="u-color-primary o-type-80 u-m-x7">404 Not Found</h1>
+<p class="o-type-28 u-m-x7">This page is currently not available.</p>
+<a class="o-type-28 u-m-x7" routerLink="/">Return to Main Page</a>
diff --git a/src/app/gns-page/gns-page.component.spec.ts b/src/app/error-page/error-page.component.spec.ts
index 48c9d8e..057ee70 100644
--- a/src/app/gns-page/gns-page.component.spec.ts
+++ b/src/app/error-page/error-page.component.spec.ts
@@ -11,34 +11,34 @@
    WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
    Affero General Public License for more details.
-  
+
    You should have received a copy of the GNU Affero General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.
    */
 /**
  * @author Philippe Buschmann
- * @file src/app/gns-page/gns-page.component.spec.ts
- * @brief 
+ * @file src/app/error-page/error-page.component.spec.ts
+ * @brief
  *
  */
 
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 
-import { GnsPageComponent } from './gns-page.component';
+import { ErrorPageComponent } from './error-page.component';
 
-describe('GnsPageComponent', () => {
-  let component: GnsPageComponent;
-  let fixture: ComponentFixture<GnsPageComponent>;
+describe('ErrorPageComponent', () => {
+  let component: ErrorPageComponent;
+  let fixture: ComponentFixture<ErrorPageComponent>;
 
   beforeEach(async(() => {
     TestBed.configureTestingModule({
-      declarations: [ GnsPageComponent ]
+      declarations: [ ErrorPageComponent ]
     })
     .compileComponents();
   }));
 
   beforeEach(() => {
-    fixture = TestBed.createComponent(GnsPageComponent);
+    fixture = TestBed.createComponent(ErrorPageComponent);
     component = fixture.componentInstance;
     fixture.detectChanges();
   });
diff --git a/src/app/error-page/error-page.component.ts b/src/app/error-page/error-page.component.ts
new file mode 100644
index 0000000..92cb9b5
--- /dev/null
+++ b/src/app/error-page/error-page.component.ts
@@ -0,0 +1,38 @@
+/*
+   This file is part of GNUnet.
+   Copyright (C) 2012-2015 GNUnet e.V.
+
+   GNUnet is free software: you can redistribute it and/or modify it
+   under the terms of the GNU Affero General Public License as published
+   by the Free Software Foundation, either version 3 of the License,
+   or (at your option) any later version.
+
+   GNUnet is distributed in the hope that it will be useful, but
+   WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Affero General Public License for more details.
+
+   You should have received a copy of the GNU Affero General Public License
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.
+   */
+/**
+ * @author Philippe Buschmann
+ * @file src/app/error-page/error-page.component.ts
+ * @brief
+ *
+ */
+
+ import { Component, OnInit } from '@angular/core';
+
+@Component({
+  selector: 'app-error-page',
+  templateUrl: './error-page.component.html'
+})
+export class ErrorPageComponent implements OnInit {
+
+  constructor() { }
+
+  ngOnInit() {
+  }
+
+}
diff --git a/src/app/gns-page/gns-page.component.html b/src/app/gns-page/gns-page.component.html
deleted file mode 100644
index 47e5102..0000000
--- a/src/app/gns-page/gns-page.component.html
+++ /dev/null
@@ -1,47 +0,0 @@
-<div class="o-grid">
-  <div class="o-grid__col u-1/3">
-    <div class="c-card u-p-x3 u-mr-x2">
-      <div class="o-type-20 u-pb-x1" >Search for namesystem</div>
-      <div class="">
-        Name:<br>
-        <input class="c-input u-2/2" placeholder="Name" [(ngModel)]="gns_name" /><br><br>
-        Record Type (optional):<br>
-        <select class="c-input c-input--select u-2/2" [(ngModel)]="gns_recordtype" name="record_type">
-          <option [value]="0">ANY</option>
-          <option [value]="65536">PKEY</option>
-          <option [value]="65537">NICK</option>
-          <option [value]="65538">LEHO</option>
-          <option [value]="65539">VPN</option>
-          <option [value]="65540">GNS2DNS</option>
-          <option [value]="65541">BOX</option>
-          <option [value]="65542">PLACE</option>
-          <option [value]="65543">PHONE</option>
-          <option [value]="65544">ID_ATTR</option>
-          <option [value]="65545">ID_TOKEN</option>
-          <option [value]="65546">ID_TOKEN_METADATA</option>
-          <option [value]="65547">CREDENTIAL</option>
-          <option [value]="65548">POLICY</option>
-          <option [value]="65549">ATTRIBUTE</option>
-          <option [value]="65550">ABE_KEY</option>
-          <option [value]="65551">ABE_MASTER</option>
-        </select><br><br>
-        Search in:<br>
-        <div class="">
-          <input type="radio" name="options" [(ngModel)]="gns_options" [value]="0"> local namestore, then DHT<br>
-          <input type="radio" name="options" [(ngModel)]="gns_options" [value]="1"> local namestore only<br>
-          <input type="radio" name="options" [(ngModel)]="gns_options" [value]="2"> local namestore only for rightmost label, for others in DHT
-        </div><br>
-        Zone key (optional):<br>
-        <input *ngIf="display_zonekey" class="c-input u-2/2" placeholder="Zone Key" [(ngModel)]="gns_zonekey" (input)="toggleEgo()"/><br><br>
-        <div *ngIf="display_ego">Ego identifier (optional):<br>
-        <input class="c-input u-2/2" placeholder="Ego" [(ngModel)]="gns_ego" (input)="toggleZonekey()" /><br></div>
-        <div class="u-text-right"><a class="c-button u-mt-x2" (click)="onSearch()">Search</a></div>
-      </div>
-    </div>
-  </div>
-  <div class="o-grid__col u-2/3">
-    <div class="c-card u-p-x3">
-      {{gns_response}}
-    </div>
-  </div>
-</div>
diff --git a/src/app/gns-page/gns-page.component.ts b/src/app/gns-page/gns-page.component.ts
deleted file mode 100644
index 8147dcf..0000000
--- a/src/app/gns-page/gns-page.component.ts
+++ /dev/null
@@ -1,81 +0,0 @@
-/*
-   This file is part of GNUnet.
-   Copyright (C) 2012-2015 GNUnet e.V.
-
-   GNUnet is free software: you can redistribute it and/or modify it
-   under the terms of the GNU Affero General Public License as published
-   by the Free Software Foundation, either version 3 of the License,
-   or (at your option) any later version.
-
-   GNUnet is distributed in the hope that it will be useful, but
-   WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Affero General Public License for more details.
-  
-   You should have received a copy of the GNU Affero General Public License
-   along with this program.  If not, see <http://www.gnu.org/licenses/>.
-   */
-/**
- * @author Philippe Buschmann
- * @file src/app/gns-page/gns-page.component.ts
- * @brief 
- *
- */
-
-import { Component, OnInit } from '@angular/core';
-import { ApiService } from '../api.service';
-
-@Component({
-  selector: 'gns-page',
-  templateUrl: './gns-page.component.html'
-})
-export class GnsPageComponent implements OnInit {
-
-  private gns_name:string;
-  private gns_recordtype:number = 0;
-  private gns_options:number = 0;
-  private gns_zonekey:string = '';
-  private display_ego: boolean = true;
-  private display_zonekey: boolean = true;
-  private gns_ego:string = '';
-  private gns_response:any =[];
-
-  private url: string;
-
-  constructor(private apiService:ApiService) { }
-
-  ngOnInit() {
-  }
-
-  onSearch(){
-    this.url = '?name='+this.gns_name;
-    if(this.gns_recordtype != null){
-      this.url += '&record_type='+this.gns_recordtype;
-    }
-    if(this.gns_options != null){
-      this.url += '&options='+this.gns_options;
-    }
-    if(this.gns_zonekey != null && this.gns_zonekey != ''){
-      this.url += '&pkey='+this.gns_zonekey;
-    }
-    if(this.gns_ego != null && this.gns_ego != ''){
-      this.url += '&ego='+this.gns_ego;
-    }
-    console.log(this.url);
-    this.apiService.searchNameSystem(this.url).subscribe(data => {
-      this.gns_response = data;
-    });
-  }
-
-  toggleEgo(){
-    if(this.gns_zonekey == ''){ this.display_ego = true; }
-    else { this.display_ego = false; }
-  }
-
-  toggleZonekey(){
-    if(this.gns_ego == ''){ this.display_zonekey = true; }
-    else { this.display_zonekey = false; }
-  }
-
-
-}
diff --git a/src/app/identity-page/identity-page.component.html b/src/app/identity-page/identity-page.component.html
index 4eeb8da..fe72dc1 100644
--- a/src/app/identity-page/identity-page.component.html
+++ b/src/app/identity-page/identity-page.component.html
@@ -1,51 +1,38 @@
 <div *ngIf="is_displayed">
-<div class="o-grid">
-  <div class="o-grid__col u-1/2">
-    <create-identity-component></create-identity-component>
-  </div>
-  <div class="o-grid__col u-1/2">
-    <div class="c-card c-card--no-padding u-p-x3">
-      <div class="o-type-20 u-pb-x1" >Search</div>
-      <div class="">
-        <input #myInput class="c-input u-2/2" placeholder="Search" [(ngModel)]="name" (input)="filterItem(myInput.value)"/>
+  <div class="o-grid">
+    <create-identity-component class="o-grid__col u-1/2"></create-identity-component>
+    <div class="o-grid__col u-1/2">
+      <div class="c-card c-card--no-padding u-p-x3">
+        <h1 class="o-type-22 u-pb-x1 u-color-primary-light" >Search</h1>
+        <div class="">
+          <p class="u-color-grey">Search Input:</p>
+          <input #myInput class="c-input u-2/2" placeholder="e.g. Name, ID, ..." [(ngModel)]="name" (input)="filterItem(myInput.value)"/>
+        </div>
       </div>
     </div>
   </div>
-</div>
-
-<div class="c-card u-mt-x2">
-  <table class=" u-2/2 c-table">
-    <tr>
-      <th class="u-text-center">Type</th>
-      <th>Name</th>
-      <th>ID</th>
-      <th class="u-text-center">Rename</th>
-      <th class="u-text-center">Delete</th>
-    </tr>
-    <tr *ngIf="request">
-      <td class="u-text-center"><div class="c-spinner"></div></td>
-      <td class="u-text-center"><div class="c-spinner"></div></td>
-      <td class="u-text-center"><div class="c-spinner"></div></td>
-      <td class="u-text-center"><div class="c-spinner"></div></td>
-      <td class="u-text-center"><div class="c-spinner"></div></td>
-    </tr>
-    <tr *ngFor="let identity of filteredItems">
-      <td class="u-text-center"><span class="fa fa-user o-type-20" *ngIf="identity.type == 'ego'"></span></td>
-      <td>
-        <span class="">{{identity.name}}</span>
-      </td>
-      <td>{{identity.id}}</td>
-      <td class="u-text-center"><a class="c-button c-button--rename" (click)="onClickRename(identity)"><i class="fa fa-pencil"></i></a></td>
-      <td class="u-text-center"><a class="c-button c-button--danger" (click)="onClickDelete(identity)"><i class="fa fa-trash"></i></a></td>
-    </tr>
-  </table>
-</div>
-</div>
 
+  <div *ngIf="request" class="u-text-center u-m-x3">
+    <div class="c-spinner"></div>
+  </div>
+  <div class="u-mv-x1" *ngFor="let identity of filteredItems">
+    <div class="c-card c-card--no-padding u-p-x1">
+      <div class="o-grid">
+        <div class="o-grid__col u-1/12"><div class="c-circle" [ngStyle]="{'background-color': returnHSL(identity.id)}">{{identity.name | slice:0:1 | uppercase}}</div></div>
+        <div class="o-grid__col u-9/12">
+          <p class="u-color-grey">Public Key: <span class="">{{identity.id}}</span></p>
+          <span class="o-type-20">{{identity.name}}</span>
+        </div>
+        <div class="o-grid__col u-1/12"><p class="u-color-grey">Rename</p><a class="c-button c-button--rename" (click)="onClickRename(identity)"><i class="fa fa-pencil"></i></a></div>
+        <div class="o-grid__col u-1/12"><p class="u-color-grey">Delete</p><a class="c-button c-button--danger" (click)="onClickDelete(identity)"><i class="fa fa-trash"></i></a></div>
+      </div>
+    </div>
+  </div>
+  </div>
 
 <div class="c-card u-p-x3 u-mt-x2" *ngIf="this.rename">
-  <div class="o-type-20 u-pb-x1" >Rename</div>
-  <div class="u-color-grey">ID: <span>{{changeIdentity.id}}</span></div>
+  <h1 class="o-type-22 u-pb-x1 u-color-primary-light" >Rename</h1>
+  <div class="u-color-grey">Public Key: <span>{{changeIdentity.id}}</span></div>
   <div>
     <span class="u-mr-x2"><span class="u-mr-x3">Name: </span><input class="c-input" placeholder="Change Name" [(ngModel)]="changeIdentity.name"/></span>
     <a class="c-button" (click)="onRename(changeIdentity)">Rename</a>
@@ -54,8 +41,8 @@
 </div>
 
 <div class="c-card u-p-x3 u-mt-x2" *ngIf="this.delete">
-  <div class="o-type-20 u-pb-x1" >Rename</div>
-  <div >ID: <span>{{changeIdentity.id}}</span></div>
+  <h1 class="o-type-22 u-pb-x1 u-color-primary-light" >Delete</h1>
+  <div >Public Key: <span>{{changeIdentity.id}}</span></div>
   <div >Name: <span>{{changeIdentity.name}}</span></div>
   <div>
     <a class="c-button" (click)="onDelete(changeIdentity.id)">Delete</a>
diff --git a/src/app/identity-page/identity-page.component.ts b/src/app/identity-page/identity-page.component.ts
index b193d5e..f347f44 100644
--- a/src/app/identity-page/identity-page.component.ts
+++ b/src/app/identity-page/identity-page.component.ts
@@ -11,14 +11,14 @@
    WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
    Affero General Public License for more details.
-  
+
    You should have received a copy of the GNU Affero General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.
    */
 /**
  * @author Philippe Buschmann
  * @file src/app/identity-page/identity-page.component.ts
- * @brief 
+ * @brief
  *
  */
 
@@ -112,4 +112,20 @@ export class IdentityPageComponent implements OnInit {
     });
   }
 
+  intFromHash(str:string): number{
+    let hash: number = 0;
+    for (var i = 0; i < str.length; i++) {
+       hash = str.charCodeAt(i) + ((hash << 5)-hash);
+       hash = hash & hash;
+    }
+    return (Math.abs(hash)/4294967295);
+  }
+
+  returnHSL(id:string): string{
+    return "hsl(" + 360 * this.intFromHash(id) + ',' +
+    (90 + 70 * this.intFromHash(id)) + '%,' +
+    (85 + 10 * this.intFromHash(id)) + '%)';
+  }
+
+
 }
diff --git a/src/app/main-page/main-page.component.html b/src/app/main-page/main-page.component.html
index e7cd074..cd09fb7 100644
--- a/src/app/main-page/main-page.component.html
+++ b/src/app/main-page/main-page.component.html
@@ -1,11 +1,12 @@
-<div class="c-card">
-  <h1 class="u-text-center u-pb-x3 o-type-35">
+<div class="">
+  <h1 class="u-color-primary u-pv-x3 o-type-50">
     GNUnet Web User Interface
   </h1>
-  <p>
-    Lorem ipsum dolor sit amet consectetur adipiscing elit sed, diam dictum inceptos nostra mus enim id scelerisque, nam congue ligula penatibus dui arcu cubilia. Placerat dapibus felis euismod ligula pellentesque facilisi magna eu curae ridiculus arcu venenatis, ad justo auctor mollis faucibus viverra odio netus lectus risus vitae. Quisque morbi dapibus mollis ut cursus leo nascetur vitae aliquet venenatis per sociosqu, vivamus pulvinar risus nunc libero feugiat auctor gravida commodo proin.
-
-    Luctus magnis mi odio cursus ut pharetra pretium congue mattis, sagittis taciti iaculis mollis gravida fringilla facilisi faucibus, tincidunt consequat eu fusce arcu potenti proin sapien. Taciti sem placerat fringilla a fusce pretium nunc praesent habitant, sociosqu maecenas conubia mollis aliquam aliquet curae ad, mauris arcu urna pellentesque laoreet inceptos suscipit nullam. Curabitur molestie class gravida donec nisl cum urna integer, sodales etiam placerat vivamus scelerisque sollicitudin.
+  <p class="u-pb-x2 o-type-28">
+    Welcome to the GNUnet Web User Interface!<br>
+  </p>
+  <p class="u-pb-x2 o-type-28">
+    This is an alternative to the graphical interface <span class="c-markdown">gnunet-gtk</span> and the command line tools.
   </p>
 </div>
-<app-rest-apis class="u-text-center"></app-rest-apis>
+<app-rest-apis></app-rest-apis>
diff --git a/src/app/namestore-page/namestore-page.component.html b/src/app/namestore-page/namestore-page.component.html
index f235c16..3d9bf09 100644
--- a/src/app/namestore-page/namestore-page.component.html
+++ b/src/app/namestore-page/namestore-page.component.html
@@ -1,3 +1,35 @@
-<p>
-  namestore-page works!
-</p>
+
+<div class="c-card u-p-x3">
+  <h1 class="o-type-22 u-pb-x1 u-color-primary-light" >Search Namesystem</h1>
+  <div class="o-list o-list--inline">
+    <div class="o-list__item">
+      <p class="u-color-grey">Name:</p>
+      <input class="c-input u-2/2" placeholder="Name" [(ngModel)]="gns_name" />
+    </div>
+    <div class="o-list__item">
+      <p class="u-color-grey">Record Type (optional):</p>
+      <select class="c-input c-input--select u-2/2" [(ngModel)]="gns_recordtype" name="record_type">
+        <option [value]="0">ANY</option>
+        <option [value]="65536">PKEY</option>
+        <option [value]="65537">NICK</option>
+        <option [value]="65538">LEHO</option>
+        <option [value]="65539">VPN</option>
+        <option [value]="65540">GNS2DNS</option>
+        <option [value]="65541">BOX</option>
+        <option [value]="65542">PLACE</option>
+        <option [value]="65543">PHONE</option>
+        <option [value]="65544">ID_ATTR</option>
+        <option [value]="65545">ID_TOKEN</option>
+        <option [value]="65546">ID_TOKEN_METADATA</option>
+        <option [value]="65547">CREDENTIAL</option>
+        <option [value]="65548">POLICY</option>
+        <option [value]="65549">ATTRIBUTE</option>
+        <option [value]="65550">ABE_KEY</option>
+        <option [value]="65551">ABE_MASTER</option>
+      </select>
+    </div>
+    <div class="o-list__item u-align-bottom">
+      <div class="u-text-right"><a class="c-button u-mt-x2" (click)="onSearch()">Search</a></div>
+    </div>
+  </div>
+</div>
diff --git a/src/app/namestore-page/namestore-page.component.ts b/src/app/namestore-page/namestore-page.component.ts
index 0369542..fc3c501 100644
--- a/src/app/namestore-page/namestore-page.component.ts
+++ b/src/app/namestore-page/namestore-page.component.ts
@@ -11,18 +11,19 @@
    WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
    Affero General Public License for more details.
-  
+
    You should have received a copy of the GNU Affero General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.
    */
 /**
  * @author Philippe Buschmann
  * @file src/app/namestore-page/namestore-page.component.ts
- * @brief 
+ * @brief
  *
  */
 
 import { Component, OnInit } from '@angular/core';
+import { ApiService } from '../api.service';
 
 @Component({
   selector: 'app-namestore-page',
@@ -30,9 +31,28 @@ import { Component, OnInit } from '@angular/core';
 })
 export class NamestorePageComponent implements OnInit {
 
-  constructor() { }
+  gns_name:string;
+  gns_recordtype:number = 0;
+  private gns_response:any =[];
+
+  private url: string;
+
+  constructor(private apiService:ApiService) { }
 
   ngOnInit() {
   }
 
+  onSearch(){
+    this.url = '?name='+this.gns_name;
+    if(this.gns_recordtype != null){
+      this.url += '&record_type='+this.gns_recordtype;
+    }
+    console.log(this.url);
+    this.apiService.searchNameSystem(this.url).subscribe(data => {
+      this.gns_response = data;
+      console.log(data);
+
+    });
+  }
+
 }
diff --git a/src/app/rest-api.ts b/src/app/rest-api.ts
index e401986..8d5c30b 100644
--- a/src/app/rest-api.ts
+++ b/src/app/rest-api.ts
@@ -11,14 +11,14 @@
    WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
    Affero General Public License for more details.
-  
+
    You should have received a copy of the GNU Affero General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.
    */
 /**
  * @author Philippe Buschmann
  * @file src/app/rest-api.ts
- * @brief 
+ * @brief
  *
  */
 
diff --git a/src/app/rest-apis/rest-apis.component.html b/src/app/rest-apis/rest-apis.component.html
index 6081599..e9c99e5 100644
--- a/src/app/rest-apis/rest-apis.component.html
+++ b/src/app/rest-apis/rest-apis.component.html
@@ -1,9 +1,15 @@
 <div class="o-grid u-pt-x2 ">
-    <div class="o-grid__col u-1/4" *ngFor="let api of apis">
-      <div class="c-card">
-        <h1 class="o-type-28">{{api.name}}</h1>
+    <div class="o-grid__col o-grid--gutter-x2 u-mv-x1 u-1/1" *ngFor="let api of apis">
+      <div routerLink="{{api.link}}" class="c-card c-card--clickable">
+        <h1 class="u-color-primary-light o-type-28">{{api.name}}</h1>
         <br>
-        {{api.desc}} ...<a routerLink="{{api.link}}">Read more</a>
+        <div class="o-media">
+          <div class="o-media__fluid u-align-middle">
+            <p class=" o-type-20">{{api.desc}}</p>
+          </div>
+          <div class="o-media__fixed u-text-right u-align-middle">
+          </div>
+        </div>
       </div>
     </div>
   </div>
diff --git a/src/app/rest-apis/rest-apis.component.ts b/src/app/rest-apis/rest-apis.component.ts
index 8c95b23..72ff3bf 100644
--- a/src/app/rest-apis/rest-apis.component.ts
+++ b/src/app/rest-apis/rest-apis.component.ts
@@ -11,14 +11,14 @@
    WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
    Affero General Public License for more details.
-  
+
    You should have received a copy of the GNU Affero General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.
    */
 /**
  * @author Philippe Buschmann
  * @file src/app/rest-apis/rest-apis.component.ts
- * @brief 
+ * @brief
  *
  */
 
@@ -31,16 +31,15 @@ import { ApiService } from '../api.service';
 })
 export class RestApisComponent implements OnInit {
 
-  apis: RestAPI[];
+  apis: RestAPI[] = [
+    {name: 'Manage Identities', desc: 'Create new identities, edit their names and delete them!', link: 'identity'},
+    {name: 'Maintain Names', desc: 'Do things!', link: 'namestore'},
+    {name: 'Handle Peers', desc: 'Do things!', link: 'peerstore'},
+  ];
 
   constructor(private apiService: ApiService) { }
 
-  getAPIs(): void {
-    this.apiService.getAPIs().subscribe(apis => this.apis = apis);
-  }
-
   ngOnInit() {
-    this.getAPIs();
   }
 
 }