From b5d7042aa4daed98d280c104766cf4bda0405564 Mon Sep 17 00:00:00 2001 From: peter Date: Mon, 12 Aug 2019 18:00:42 +0200 Subject: [PATCH] fix widget --- package-lock.json | 47 +++++++ package.json | 4 + .../apiclient-consumptions.component.ts | 5 +- .../apiclient-subscriptions.component.ts | 5 +- src/frontend/widget/rollup.config.js | 3 + .../widget/widget/a-nested.component.ts | 2 +- .../apiclient-consumptions.component.ts | 89 ++++++++++++ .../apiclient-settings-form.component.ts | 129 ++++++++++++++++++ .../apiclient-subscriptions.component.ts | 86 ++++++++++++ src/frontend/widget/widget/component.ts | 35 ++--- src/frontend/widget/widget/module.ts | 29 ++-- 11 files changed, 397 insertions(+), 37 deletions(-) create mode 100644 src/frontend/widget/widget/apiclient-consumptions.component.ts create mode 100644 src/frontend/widget/widget/apiclient-settings-form.component.ts create mode 100644 src/frontend/widget/widget/apiclient-subscriptions.component.ts diff --git a/package-lock.json b/package-lock.json index e05713b..7c03032 100644 --- a/package-lock.json +++ b/package-lock.json @@ -20,6 +20,14 @@ "tslib": "^1.9.0" } }, + "@angular/forms": { + "version": "8.2.1", + "resolved": "https://registry.npmjs.org/@angular/forms/-/forms-8.2.1.tgz", + "integrity": "sha512-KcB652QBup+VWKDZICtpznr0a+v82oG0BowWetfkMgZAQj655uEMkkEtCTnfWnft4MLYlRr9ZoxQXc575TcZmA==", + "requires": { + "tslib": "^1.9.0" + } + }, "@angular/platform-browser": { "version": "8.2.1", "resolved": "https://registry.npmjs.org/@angular/platform-browser/-/platform-browser-8.2.1.tgz", @@ -248,6 +256,14 @@ "to-fast-properties": "^2.0.0" } }, + "@clr/angular": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/@clr/angular/-/angular-2.1.1.tgz", + "integrity": "sha512-poC81C0xlv4zOr1dGYnpiF3sQKuxOH0a0KD9V9yizu7qQRfcbt6fM1S1RQKh2BPAlMY2xX1jsYOpJEPjZ6MG+g==", + "requires": { + "tslib": "^1.9.0" + } + }, "@cnakazawa/watch": { "version": "1.0.3", "resolved": "https://registry.npmjs.org/@cnakazawa/watch/-/watch-1.0.3.tgz", @@ -3857,6 +3873,32 @@ } } }, + "frontblock": { + "version": "0.9.9", + "resolved": "https://registry.npmjs.org/frontblock/-/frontblock-0.9.9.tgz", + "integrity": "sha512-bGRbyNcvUsyIXoZj4VxBFog98WFi2crhaNb5XYGZJekrRvXGr5moqQV5I/ySSHKsu2gdg2BhmNdqxa+DzERu+Q==", + "requires": { + "@angular/common": "^8.2.1", + "@angular/core": "^8.2.1", + "@angular/router": "^8.2.1", + "@types/node": "^11.13.10", + "angular": "^1.7.8", + "bip39": "^3.0.2", + "bitcoinjs-lib": "^5.0.4", + "bsock": "^0.1.9", + "express": "^4.16.4", + "frontblock-generic": "^0.22.0", + "hdkey": "^1.1.1", + "key-file-storage": "^2.2.1", + "log4js": "^4.3.1", + "minimist": "^1.2.0", + "node-fetch": "^2.5.0", + "rollup": "^0.55.1", + "rxjs": "^6.5.2", + "rxjs-compat": "^6.5.2", + "uuid": "^3.3.2" + } + }, "frontblock-generic": { "version": "0.22.0", "resolved": "https://registry.npmjs.org/frontblock-generic/-/frontblock-generic-0.22.0.tgz", @@ -8983,6 +9025,11 @@ "resolved": "https://registry.npmjs.org/rollup/-/rollup-0.55.5.tgz", "integrity": "sha512-2hke9NOy332kxvnmMQOgl7DHm94zihNyYJNd8ZLWo4U0EjFvjUkeWa0+ge+70bTg+mY0xJ7NUsf5kIhDtrGrtA==" }, + "rollup-plugin-node-externals": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/rollup-plugin-node-externals/-/rollup-plugin-node-externals-2.0.0.tgz", + "integrity": "sha512-LGaPL1j8TxxVk/uZRdJ/rB58RlN/2kz7CXDWoVQdaRbFtkaBx9OWEgMI+mMJy/mbfBtn7E6fdDGo3zj7nRtirg==" + }, "rollup-plugin-node-resolve": { "version": "3.4.0", "resolved": "https://registry.npmjs.org/rollup-plugin-node-resolve/-/rollup-plugin-node-resolve-3.4.0.tgz", diff --git a/package.json b/package.json index 4e957ea..77ec884 100644 --- a/package.json +++ b/package.json @@ -22,8 +22,10 @@ "dependencies": { "@angular/common": "^8.2.1", "@angular/core": "^8.2.1", + "@angular/forms": "^8.2.1", "@angular/platform-browser": "^8.2.1", "@angular/router": "^8.2.1", + "@clr/angular": "^2.1.1", "@uirouter/angularjs": "^1.0.5", "adm-zip": "^0.4.13", "angular": "^1.7.8", @@ -33,6 +35,7 @@ "bsock": "^0.1.9", "easy-unzip": "^1.1.0", "express": "^4.16.4", + "frontblock": "^0.9.9", "frontblock-generic": "latest", "hdkey": "^1.1.1", "http": "0.0.0", @@ -42,6 +45,7 @@ "minimist": "^1.2.0", "node-fetch": "^2.6.0", "rollup": "^0.55.1", + "rollup-plugin-node-externals": "^2.0.0", "rxjs": "^6.5.2", "rxjs-compat": "^6.5.2", "socket.io": "^2.2.0", diff --git a/src/frontend/dashboard/src/app/apiclient-dev/apiclient-consumptions.component.ts b/src/frontend/dashboard/src/app/apiclient-dev/apiclient-consumptions.component.ts index 6d4cb29..e9e3193 100644 --- a/src/frontend/dashboard/src/app/apiclient-dev/apiclient-consumptions.component.ts +++ b/src/frontend/dashboard/src/app/apiclient-dev/apiclient-consumptions.component.ts @@ -13,7 +13,7 @@ declare const fb
Consumptions
- + {{entry.message}} @@ -73,6 +73,9 @@ export class ApiclientConsumptionComponent implements OnInit { async load(){ this.loading = true this.entries = await fb.ApiClient.getConsumptions() + if(this.entries.length === 0){ + this.alerts.push({ severity: "warning", message: "0 results were returned"}) + } this.loading = false this.actionName = "refresh" } diff --git a/src/frontend/dashboard/src/app/apiclient-dev/apiclient-subscriptions.component.ts b/src/frontend/dashboard/src/app/apiclient-dev/apiclient-subscriptions.component.ts index 036758e..13b6524 100644 --- a/src/frontend/dashboard/src/app/apiclient-dev/apiclient-subscriptions.component.ts +++ b/src/frontend/dashboard/src/app/apiclient-dev/apiclient-subscriptions.component.ts @@ -14,7 +14,7 @@ declare const fb Subscriptions - + {{entry.message}} @@ -70,6 +70,9 @@ export class ApiclientSubscriptionComponent implements OnInit { async load(){ this.loading = true this.entries = await fb.ApiClient.getSubscriptions() + if(this.entries.length === 0){ + this.alerts.push({ severity: "warning", message: "0 results were returned"}) + } this.loading = false this.actionName = "refresh" } diff --git a/src/frontend/widget/rollup.config.js b/src/frontend/widget/rollup.config.js index aab22b6..2b21f16 100644 --- a/src/frontend/widget/rollup.config.js +++ b/src/frontend/widget/rollup.config.js @@ -1,5 +1,6 @@ import resolve from 'rollup-plugin-node-resolve'; import typescript from 'rollup-plugin-typescript2'; +import externals from 'rollup-plugin-node-externals' export default { input: 'src/frontend/widget/main.ts', @@ -20,6 +21,8 @@ export default { }) ], external: [ + "frontblock", + "frontblock-generic", 'plugins-core', '@angular/core', '@angular/common', diff --git a/src/frontend/widget/widget/a-nested.component.ts b/src/frontend/widget/widget/a-nested.component.ts index e8ea730..4634db3 100644 --- a/src/frontend/widget/widget/a-nested.component.ts +++ b/src/frontend/widget/widget/a-nested.component.ts @@ -12,4 +12,4 @@ export class ANestedComponent implements OnInit { ngOnInit() { } -} +} \ No newline at end of file diff --git a/src/frontend/widget/widget/apiclient-consumptions.component.ts b/src/frontend/widget/widget/apiclient-consumptions.component.ts new file mode 100644 index 0000000..7d6068f --- /dev/null +++ b/src/frontend/widget/widget/apiclient-consumptions.component.ts @@ -0,0 +1,89 @@ +import { Component, OnInit } from '@angular/core'; + + +declare const fb + +@Component({ + selector: 'consumptions', + template: ` +
+
+ Consumptions +
+ + + + {{entry.message}} + + + + +
+ +
+
+
+ + + + + + + + + + + + + + + + + +
UUIDExpiryCreation
{{line.uid}}{{line.expiry}}{{line.created}}
+
+
+
+ + +
+
+ ` +}) +export class ApiclientConsumptionComponent implements OnInit { + loading:boolean = false + actionName:string = "load" + entries:any[] = [{ + uid: "1231", + message: "", + result: "Success" + }] + alerts: { + severity: "danger" | "warning" | "success" + message: string + }[] = [] + + constructor() { } + + ngOnInit() { } + + async load(){ + this.loading = true + this.entries = await fb.ApiClient.getConsumptions() + if(this.entries.length === 0){ + this.alerts.push({ severity: "warning", message: "0 results were returned"}) + } + this.loading = false + this.actionName = "refresh" + } + + async quit(uid:string){ + const r = await fb.ApiClient.quit(uid) + if(r.uid != null){ + this.alerts.push({ severity: "success", message: "Quit consuming "+uid}) + this.load() + }else{ + this.alerts.push({ severity: "danger", message: "Error "+r.message}) + } + } +} diff --git a/src/frontend/widget/widget/apiclient-settings-form.component.ts b/src/frontend/widget/widget/apiclient-settings-form.component.ts new file mode 100644 index 0000000..7b01a81 --- /dev/null +++ b/src/frontend/widget/widget/apiclient-settings-form.component.ts @@ -0,0 +1,129 @@ +import { Component, OnInit } from '@angular/core'; + +declare const fb + +@Component({ + selector: 'settings', + template: ` +
+
+ Settings +
+
+
+
+ + + We need your first name for legal compliance + + + + + + + We need your first name for legal compliance + + + + + + This field is required! + + + + + + + + + + + Valid range 1024 - 65536 + + + + +
+
+
+
+ + + + + +
+
+ ` +}) +export class ApiclientFormComponent implements OnInit { + testnet:boolean = true + saving:boolean = false + advanced:boolean = false + data = { + apiHost: "api.testnet.frontblock.me", + apiPort: 10001, + tls: false, + apiKey: "" + } + + constructor() { } + + ngOnInit() { } + + setAdvanced(){ this.advanced = true } + + checkData():boolean{ + return ( + typeof this.data.apiPort === "number" && + typeof this.data.apiHost === "string" && + typeof this.data.tls === "boolean" && + typeof this.data.apiKey === "string" + ) + } + + updateTestnet(){ + if(this.testnet){ + this.data.apiHost = "api.testnet.frontblock.me" + this.data.apiPort = 10001 + }else{ + this.data.apiHost = "api.frontblock.me" + this.data.apiPort = 10000 + } + } + + updatePort(obj){ + switch (this.data.apiHost) { + case "api.testnet.frontblock.me": + this.data.apiPort = 10001 + break; + case "api.frontblock.me": + this.data.apiPort = 10000 + break; + + default: + console.warn("A non-standard api host was chosen: "+this.data.apiPort) + break; + } + console.log(this.data) + } + + async save(){ + this.saving = true; + if(typeof this.data.apiPort === "string") + this.data.apiPort = parseInt(this.data.apiPort) + + if(this.checkData()){ + const conf = await fb.ApiClient.setConfig(this.data) + console.log(conf) + }else{ + //show error in gui + console.error("bad data :(") + } + this.saving = false + } +} diff --git a/src/frontend/widget/widget/apiclient-subscriptions.component.ts b/src/frontend/widget/widget/apiclient-subscriptions.component.ts new file mode 100644 index 0000000..a8cedf4 --- /dev/null +++ b/src/frontend/widget/widget/apiclient-subscriptions.component.ts @@ -0,0 +1,86 @@ +import { Component, OnInit } from '@angular/core'; + +declare const fb + +@Component({ + selector: 'subscriptions', + template: ` +
+
+ Subscriptions +
+ + + + + {{entry.message}} + + + + +
+ +
+
+
+ + + + + + + + + + + + + + + + + +
UUIDExpiryCreation
{{line.uid}}{{line.expiry}}{{line.created}}
+
+
+
+ + +
+
+ ` +}) +export class ApiclientSubscriptionComponent implements OnInit { + loading:boolean = false + actionName:string = "load" + entries:any[] = [] + alerts: { + severity: "danger" | "warning" | "success" + message: string + }[] = [] + + constructor() { } + + ngOnInit() { } + + async load(){ + this.loading = true + this.entries = await fb.ApiClient.getSubscriptions() + if(this.entries.length === 0){ + this.alerts.push({ severity: "warning", message: "0 results were returned"}) + } + this.loading = false + this.actionName = "refresh" + } + + async quit(uid:string){ + const r = await fb.ApiClient.unsubscribe(uid) + if(r.uid != null){ + this.alerts.push({ severity: "success", message: "Stopped subscription "+uid}) + this.load() + }else{ + this.alerts.push({ severity: "danger", message: "Error "+r.message}) + } + } + +} diff --git a/src/frontend/widget/widget/component.ts b/src/frontend/widget/widget/component.ts index 566b08c..28102b9 100644 --- a/src/frontend/widget/widget/component.ts +++ b/src/frontend/widget/widget/component.ts @@ -1,29 +1,20 @@ - import { Component, OnInit } from '@angular/core'; -declare const fb @Component({ - selector: 'PLUGINMANAGER', //!!!! + selector: 'apiclient', //!!!! template: `
-
-
-
- Plugin manager -
-
-
- Block -
-
- ${Object.keys(fb.PluginManager).join("
")} - -
-
-
- - -
-
+
+ +
+
+
+
+ +
+
+
+
+
` diff --git a/src/frontend/widget/widget/module.ts b/src/frontend/widget/widget/module.ts index 93e82f7..ee2dc80 100644 --- a/src/frontend/widget/widget/module.ts +++ b/src/frontend/widget/widget/module.ts @@ -1,16 +1,25 @@ import { NgModule } from '@angular/core'; import { CommonModule } from '@angular/common'; import { PluginComponent } from './component'; -import { ANestedComponent } from './a-nested.component'; import { RouterModule } from '@angular/router'; -import { FrontendPlugin, SidebarEntries } from 'frontblock-generic/Plugin'; +import { ApiclientFormComponent } from './apiclient-settings-form.component'; +import { ApiclientConsumptionComponent } from './apiclient-consumptions.component'; +import { ApiclientSubscriptionComponent } from './apiclient-subscriptions.component'; +import { FrontendPlugin, SidebarEntry } from 'frontblock-generic/Plugin'; +import { ANestedComponent } from './a-nested.component'; @NgModule({ - imports: [CommonModule, RouterModule.forChild([{path: "debug", component: PluginComponent}])], + imports: [ + CommonModule, + RouterModule.forChild([{path: "pluginmanager", component: PluginComponent}]), + ], exports: [RouterModule], declarations: [ PluginComponent, - ANestedComponent +// ANestedComponent, + ApiclientFormComponent, + ApiclientConsumptionComponent, + ApiclientSubscriptionComponent ], entryComponents: [PluginComponent], providers: [{ @@ -19,15 +28,11 @@ import { FrontendPlugin, SidebarEntries } from 'frontblock-generic/Plugin'; }] }) export class PluginModule implements FrontendPlugin{ - getSidebarEntry(): SidebarEntries { + getSidebarEntry(): SidebarEntry { return { - icon: 'cog', - text: 'Plugin Manager', - parentRoute: 'pluginmanager', - links: [{ - route: 'debug', - text: 'DEBUG' - }] + icon: "wrench", + route: "pluginmanager", + text: "Plugin manager", } } }