diff --git a/package.json b/package.json index 262a25b..041cb59 100644 --- a/package.json +++ b/package.json @@ -5,7 +5,7 @@ "tsc": "tsc", "start": "npm run build; node lib/FrontblockAdmin.js", "build": "npm run clean; npm run build-backend; npm run build-frontend", - "build-backend": "tsc; webpack --display-error-details --config src/backend/webpack.prod.js --progress --colors; pwd; cp -r lib/PluginManager/* .", + "build-backend": "tsc; webpack --display-error-details --config src/backend/webpack.prod.js --progress --colors; cp -r lib/PluginManager/* .", "build-frontend": "npm run build-dashboard; npm run build-widget", "build-dashboard": "cd src/frontend/dashboard; npm i; npm run build; cp -r dist/* ../../../static", "build-widget": "rollup -c src/frontend/widget/rollup.config.js; mkdir -p plugins/PluginManager; cp FrontendPlugin.js plugins/PluginManager", diff --git a/src/backend/FrontblockLib.ts b/src/backend/FrontblockLib.ts index 05ab414..a389990 100644 --- a/src/backend/FrontblockLib.ts +++ b/src/backend/FrontblockLib.ts @@ -1,4 +1,5 @@ import { parseSubResponse, parseResponse } from "frontblock-generic/Types"; +import PluginManager from "./PluginManager/PluginManager"; var bsock = require('bsock') /** @@ -73,15 +74,16 @@ export class FrontblockConfigLib{ } + window['fb'] = new FrontblockConfigLib() -declare const fb +declare const fb:{PluginManager:PluginManager} window['setup'] = async() => { await Promise.all([ fb.PluginManager.installPlugin("ApiClient"), fb.PluginManager.installPlugin("HtmlSupplier"), fb.PluginManager.installPlugin("PluginManager"), - fb.PluginManager.installPlugin("PaymentManager") + fb.PluginManager.installPlugin("PaymentManager"), + fb.PluginManager.installPlugin("Wallet"), ]) location.reload(); - console.log("done") } \ No newline at end of file diff --git a/src/frontend/dashboard/src/app/dashboard/dashboard.service.ts b/src/frontend/dashboard/src/app/dashboard/dashboard.service.ts index 03d74fa..b5453c2 100644 --- a/src/frontend/dashboard/src/app/dashboard/dashboard.service.ts +++ b/src/frontend/dashboard/src/app/dashboard/dashboard.service.ts @@ -6,7 +6,10 @@ declare const fb export class DashboardService { constructor() { } - getWidgetConfigs(): Promise { + async getWidgetConfigs(): Promise { + while(!fb.PluginManager){ + await new Promise((resolve) => setTimeout(resolve, 50)) + } return fb.PluginManager.getLoadedPluginNames() } diff --git a/src/frontend/dashboard/src/app/dashboard/dashboard/dashboard.component.ts b/src/frontend/dashboard/src/app/dashboard/dashboard/dashboard.component.ts index 52ff6ad..e86df5e 100644 --- a/src/frontend/dashboard/src/app/dashboard/dashboard/dashboard.component.ts +++ b/src/frontend/dashboard/src/app/dashboard/dashboard/dashboard.component.ts @@ -41,9 +41,7 @@ export class DashboardComponent implements AfterViewInit { private injector: Injector) { } ngAfterViewInit() { - setTimeout( () => { this.loadWidgets(); - }, 250) } private async loadWidgets() {