From dedf1f9f6e2f74cc1b36cbfc566d05c3a50d163b Mon Sep 17 00:00:00 2001 From: Phil Date: Sat, 9 Jun 2018 12:16:34 +0200 Subject: Implemented GNS and fixed UI issues --- src/app/api.service.ts | 21 ++++++-- src/app/app-routing.module.ts | 8 ++- src/app/app.component.html | 24 +++++++-- src/app/app.module.ts | 10 ++-- .../create-identity/create-identity.component.html | 10 ++-- .../create-identity/create-identity.component.ts | 6 ++- src/app/error-message/error-message.component.html | 25 ++++++++- src/app/gns-page/gns-page.component.html | 47 +++++++++++++++++ src/app/gns-page/gns-page.component.spec.ts | 25 +++++++++ src/app/gns-page/gns-page.component.ts | 57 ++++++++++++++++++++ src/app/heroes/heroes.component.html | 4 -- src/app/heroes/heroes.component.scss | 0 src/app/heroes/heroes.component.spec.ts | 25 --------- src/app/heroes/heroes.component.ts | 20 ------- src/app/identity-page/identity-page.component.html | 61 ++++++++++++++-------- src/app/identity-page/identity-page.component.ts | 31 ++++++++--- src/app/messages.service.ts | 39 ++++++++++++++ .../namestore-page/namestore-page.component.html | 3 ++ .../namestore-page.component.spec.ts | 25 +++++++++ src/app/namestore-page/namestore-page.component.ts | 14 +++++ .../peerstore-page/peerstore-page.component.html | 3 ++ .../peerstore-page.component.spec.ts | 25 +++++++++ src/app/peerstore-page/peerstore-page.component.ts | 14 +++++ src/index.html | 2 +- src/scss/base/_body.scss | 4 +- src/scss/components/_alert.scss | 31 +++++++++++ src/scss/components/_badge.scss | 11 ++++ src/scss/components/_button.scss | 30 +++++++++-- src/scss/components/_error.scss | 9 ---- src/scss/components/_footer.scss | 6 +++ src/scss/components/_header.scss | 7 +++ src/scss/components/_input.scss | 27 ++++------ src/scss/components/_link.scss | 2 +- src/scss/components/_progressbar.scss | 0 src/scss/components/_spinner.scss | 15 ++++++ src/scss/components/_table.scss | 6 +-- src/scss/main.scss | 18 +++++-- src/scss/objects/_type.scss | 7 +++ src/scss/settings/_colors.scss | 40 ++++++++++++-- src/scss/settings/_type.scss | 56 ++++++++++++++++++++ src/styles.scss | 49 +---------------- 41 files changed, 631 insertions(+), 186 deletions(-) create mode 100644 src/app/gns-page/gns-page.component.html create mode 100644 src/app/gns-page/gns-page.component.spec.ts create mode 100644 src/app/gns-page/gns-page.component.ts delete mode 100644 src/app/heroes/heroes.component.html delete mode 100644 src/app/heroes/heroes.component.scss delete mode 100644 src/app/heroes/heroes.component.spec.ts delete mode 100644 src/app/heroes/heroes.component.ts create mode 100644 src/app/namestore-page/namestore-page.component.html create mode 100644 src/app/namestore-page/namestore-page.component.spec.ts create mode 100644 src/app/namestore-page/namestore-page.component.ts create mode 100644 src/app/peerstore-page/peerstore-page.component.html create mode 100644 src/app/peerstore-page/peerstore-page.component.spec.ts create mode 100644 src/app/peerstore-page/peerstore-page.component.ts create mode 100644 src/scss/components/_alert.scss create mode 100644 src/scss/components/_badge.scss delete mode 100644 src/scss/components/_error.scss create mode 100644 src/scss/components/_footer.scss create mode 100644 src/scss/components/_header.scss create mode 100644 src/scss/components/_progressbar.scss create mode 100644 src/scss/components/_spinner.scss diff --git a/src/app/api.service.ts b/src/app/api.service.ts index 9756bd4..579939d 100644 --- a/src/app/api.service.ts +++ b/src/app/api.service.ts @@ -12,11 +12,14 @@ import { MessagesService } from './messages.service'; export class ApiService { apis: RestAPI[] = [ {name: 'Identity API', desc: 'This is the identity API', link: 'identity'}, - {name: 'Rest API 2', desc: '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.', link: 'rest_api2'}, - {name: 'Rest API 3', desc: '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.', link: 'rest_api3'} + {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 identityURL = 'http://localhost:7776/identity'; // URL to GNUnet identity web api + private restURL = 'http://localhost:7776/' + private identityURL = this.restURL+'identity'; + private gnsURL = this.restURL+'gns'; constructor(private http: HttpClient, private messages:MessagesService) { } @@ -62,6 +65,18 @@ export class ApiService { catchError(this.handleError('changeIdentity', [])) ); } + + searchNameSystem (url: string): Observable{ + this.messages.dismissError(); + return this.http.get(this.gnsURL+'/'+url) + .pipe( + tap(json => this.handleJSON(json)), + catchError(this.handleError('searchNameSystem', [])) + ); + } + + + /** * Handle Http operation that failed. * Let the app continue. diff --git a/src/app/app-routing.module.ts b/src/app/app-routing.module.ts index 5d38c0f..82a9d64 100644 --- a/src/app/app-routing.module.ts +++ b/src/app/app-routing.module.ts @@ -4,12 +4,18 @@ import { RouterModule, Routes } from '@angular/router'; 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'; const routes: Routes = [ { path: '', component: MainPageComponent }, { path: 'apis', component: RestApisComponent }, - { path: 'identity', component: IdentityPageComponent } + { path: 'identity', component: IdentityPageComponent }, + { path: 'gns', component: GnsPageComponent }, + { path: 'peerstore', component: PeerstorePageComponent }, + { path: 'namestore', component: NamestorePageComponent } ]; @NgModule({ diff --git a/src/app/app.component.html b/src/app/app.component.html index c13abbe..7f098f2 100644 --- a/src/app/app.component.html +++ b/src/app/app.component.html @@ -1,5 +1,5 @@ -
+
@@ -14,6 +14,15 @@
  • Identity
  • +
  • + GNS +
  • +
  • + Namestore +
  • +
  • + Peerstore +
  • @@ -21,16 +30,23 @@
    -
    +
    -