From e3a3d15bab9b8697d5e0fb1730ec479f2f8b1a7b Mon Sep 17 00:00:00 2001 From: peter Date: Fri, 19 Jul 2019 22:48:23 +0200 Subject: [PATCH] werks on my machine --- conf/PaymentManager | 2 +- package-lock.json | 49 +++++++++++------------------------------- src/FrontblockAdmin.ts | 4 ++-- 3 files changed, 16 insertions(+), 39 deletions(-) diff --git a/conf/PaymentManager b/conf/PaymentManager index 500907c..d19b91b 100644 --- a/conf/PaymentManager +++ b/conf/PaymentManager @@ -1 +1 @@ -{"apiHost":"api.testnet.frontblock.me","apiPort":10001} +{"apiHost":"localhost","apiPort":10001} diff --git a/package-lock.json b/package-lock.json index 150db96..d6ab285 100644 --- a/package-lock.json +++ b/package-lock.json @@ -4906,9 +4906,9 @@ } }, "lodash": { - "version": "4.17.11", - "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.11.tgz", - "integrity": "sha512-cQKh8igo5QUhZ7lg38DYWAxMvjSAKG0A8wGSVimP07SIUEK2UO+arSRKbRZWtelMtN5V0Hkwh5ryOto/SshYIg==" + "version": "4.17.15", + "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.15.tgz", + "integrity": "sha512-8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A==" }, "lodash.sortby": { "version": "4.7.0", @@ -5181,9 +5181,9 @@ } }, "mixin-deep": { - "version": "1.3.1", - "resolved": "https://registry.npmjs.org/mixin-deep/-/mixin-deep-1.3.1.tgz", - "integrity": "sha512-8ZItLHeEgaqEvd5lYBXfm4EZSFCX29Jb9K+lAHhDKzReKBQKj3R+7NOF6tjqYi9t4oI8VUfaWITJQm86wnXGNQ==", + "version": "1.3.2", + "resolved": "https://registry.npmjs.org/mixin-deep/-/mixin-deep-1.3.2.tgz", + "integrity": "sha512-WRoDn//mXBiJ1H40rqa3vH0toePwSsGb45iInWlTySa+Uu4k3tYUSxa2v1KqAiLtvlrSzaExqS1gtk96A9zvEA==", "dev": true, "requires": { "for-in": "^1.0.2", @@ -6405,9 +6405,9 @@ "dev": true }, "set-value": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/set-value/-/set-value-2.0.0.tgz", - "integrity": "sha512-hw0yxk9GT/Hr5yJEYnHNKYXkIA8mVJgd9ditYZCe16ZczcaELYYcfvaXesNACk2O8O0nTiPQcQhGUQj8JLzeeg==", + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/set-value/-/set-value-2.0.1.tgz", + "integrity": "sha512-JxHc1weCN68wRY0fhCoXpyK55m/XPHafOmK4UWD7m2CI14GMcFypt4w/0+NV5f/ZMby2F6S2wwA7fgynh9gWSw==", "dev": true, "requires": { "extend-shallow": "^2.0.1", @@ -7333,38 +7333,15 @@ } }, "union-value": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/union-value/-/union-value-1.0.0.tgz", - "integrity": "sha1-XHHDTLW61dzr4+oM0IIHulqhrqQ=", + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/union-value/-/union-value-1.0.1.tgz", + "integrity": "sha512-tJfXmxMeWYnczCVs7XAEvIV7ieppALdyepWMkHkwciRpZraG/xwT+s2JN8+pr1+8jCRf80FFzvr+MpQeeoF4Xg==", "dev": true, "requires": { "arr-union": "^3.1.0", "get-value": "^2.0.6", "is-extendable": "^0.1.1", - "set-value": "^0.4.3" - }, - "dependencies": { - "extend-shallow": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz", - "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", - "dev": true, - "requires": { - "is-extendable": "^0.1.0" - } - }, - "set-value": { - "version": "0.4.3", - "resolved": "https://registry.npmjs.org/set-value/-/set-value-0.4.3.tgz", - "integrity": "sha1-fbCPnT0i3H945Trzw79GZuzfzPE=", - "dev": true, - "requires": { - "extend-shallow": "^2.0.1", - "is-extendable": "^0.1.1", - "is-plain-object": "^2.0.1", - "to-object-path": "^0.3.0" - } - } + "set-value": "^2.0.1" } }, "unique-filename": { diff --git a/src/FrontblockAdmin.ts b/src/FrontblockAdmin.ts index 9be7dea..73f043f 100644 --- a/src/FrontblockAdmin.ts +++ b/src/FrontblockAdmin.ts @@ -7,9 +7,9 @@ import { FrontblockApiConf } from "frontblock/FrontblockApiClient" type pluginEntry = {pluginPath:string, conf?:any} const pluginList:pluginEntry[] = [ - { pluginPath: '../../paymentmanager/static/Plugin', conf:{ apiHost: /*'localhost'*/'api.testnet.frontblock.me', apiPort: 10001 } }, + { pluginPath: '../../paymentmanager/static/Plugin', conf:{ apiHost: 'localhost' /*/ 'api.testnet.frontblock.me' */, apiPort: 10001 } }, { pluginPath: '../../htmlsupplier/static/Plugin' }, - { pluginPath: 'frontblock/FrontblockApiClient', conf:{ apiHost: /*'localhost'*/'api.testnet.frontblock.me', apiPort: 10001 } } + { pluginPath: 'frontblock/FrontblockApiClient', conf:{ apiHost: 'localhost' /*/ 'api.testnet.frontblock.me' */, apiPort: 10001 } } ] const express = require('express')