-
diff --git a/src/frontend/dashboard/src/app/apiclient-dev/apiclient-settings-form.component.ts b/src/frontend/dashboard/src/app/ApiClient/apiclient-settings-form.component.ts
similarity index 93%
rename from src/frontend/dashboard/src/app/apiclient-dev/apiclient-settings-form.component.ts
rename to src/frontend/dashboard/src/app/ApiClient/apiclient-settings-form.component.ts
index e955b2a..c9105e5 100644
--- a/src/frontend/dashboard/src/app/apiclient-dev/apiclient-settings-form.component.ts
+++ b/src/frontend/dashboard/src/app/ApiClient/apiclient-settings-form.component.ts
@@ -1,10 +1,23 @@
import { Component, OnInit } from '@angular/core';
import { fbind } from 'q';
import { FrontblockApiConf } from 'frontblock';
+import { environment } from "../../environments/environment"
-
-declare const fb
-
+let fb
+if(environment.production){
+ fb = window["fb"]
+}else{
+ fb = {
+ ApiClient : {
+ setConfig: async () => {
+ await new Promise((resolve, reject) => {
+ setTimeout(() => {
+ resolve('Promise A win!');
+ }, 500)
+ })}
+ }
+ }
+}
@Component({
selector: 'settings',
template: `
diff --git a/src/frontend/dashboard/src/app/apiclient-dev/apiclient-subscriptions.component.ts b/src/frontend/dashboard/src/app/ApiClient/apiclient-subscriptions.component.ts
similarity index 73%
rename from src/frontend/dashboard/src/app/apiclient-dev/apiclient-subscriptions.component.ts
rename to src/frontend/dashboard/src/app/ApiClient/apiclient-subscriptions.component.ts
index 13b6524..3d6fd25 100644
--- a/src/frontend/dashboard/src/app/apiclient-dev/apiclient-subscriptions.component.ts
+++ b/src/frontend/dashboard/src/app/ApiClient/apiclient-subscriptions.component.ts
@@ -2,9 +2,41 @@ import { Component, OnInit } from '@angular/core';
import { fbind } from 'q';
import { FrontblockApiConf } from 'frontblock';
import { SubscriptionResponse, SuccessResponse, ErrorResponse, parseResponse } from 'frontblock-generic/Types.js';
+import { environment } from "../../environments/environment"
+let fb
+if(environment.production){
+ fb = window["fb"]
+}else{
+ fb = {
+ ApiClient : {
+ setConfig: async () => {
+ await new Promise((resolve, reject) => {
+ setTimeout(() => {
+ resolve('Promise A win!');
+ }, 500)
+ })
+ },
+ getConsumptions: async () => {
+ return await new Promise((resolve, reject) => {
+ setTimeout(() => {
+ resolve([new SubscriptionResponse("654", "321"), new SubscriptionResponse("456", "123")]);
+ }, 500)
+ })
+ },
+ getSubscriptions: async () => {
+ return await new Promise((resolve, reject) => {
+ setTimeout(() => {
+ resolve([new SubscriptionResponse("321"), new SubscriptionResponse("123")]);
+ }, 500)
+ })
+ },
+ unsubscribe: (uid) => new SuccessResponse(),
+ quit: (uid) => new SuccessResponse()
-declare const fb
+ }
+ }
+}
@Component({
selector: 'subscriptions',
diff --git a/src/frontend/dashboard/src/app/ApiClient/module.ts b/src/frontend/dashboard/src/app/ApiClient/module.ts
new file mode 100644
index 0000000..1d26dcc
--- /dev/null
+++ b/src/frontend/dashboard/src/app/ApiClient/module.ts
@@ -0,0 +1,41 @@
+import { NgModule } from '@angular/core';
+import { CommonModule } from '@angular/common';
+import { RouterModule } from '@angular/router';
+
+import { ApiclientDevComponent as ApiclientComponent } from './apiclient-dev.component';
+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 { ClarityModule } from '@clr/angular';
+import { FormsModule } from '@angular/forms';
+
+
+@NgModule({
+ imports: [
+ FormsModule,
+ ClarityModule,
+
+ CommonModule,
+ RouterModule.forChild([
+ {path: "apiclient", component: ApiclientComponent},
+ ]),
+ ],
+ exports: [RouterModule],
+ declarations: [
+ ApiclientComponent,
+ ApiclientFormComponent,
+ ApiclientConsumptionComponent,
+ ApiclientSubscriptionComponent
+ ]
+})
+export class PluginModule implements FrontendPlugin{
+ getSidebarEntry(): SidebarEntry {
+ return {
+ icon: "key",
+ route: "apiclient",
+ text: "Api client",
+ }
+ }
+}
diff --git a/src/frontend/dashboard/src/app/pluginmanager-dev/pluginmanager-dev.component.ts b/src/frontend/dashboard/src/app/PluginManager/debug.component.ts
similarity index 91%
rename from src/frontend/dashboard/src/app/pluginmanager-dev/pluginmanager-dev.component.ts
rename to src/frontend/dashboard/src/app/PluginManager/debug.component.ts
index d12e8e4..b57dc70 100644
--- a/src/frontend/dashboard/src/app/pluginmanager-dev/pluginmanager-dev.component.ts
+++ b/src/frontend/dashboard/src/app/PluginManager/debug.component.ts
@@ -2,7 +2,7 @@ import { Component, OnInit } from '@angular/core';
import { SidebarEntry } from 'frontblock-generic/Plugin';
declare const fb
@Component({
- selector: 'pluginmanager', //!!!!
+ selector: 'debug', //!!!!
template: `
@@ -30,7 +30,7 @@ declare const fb
`
})
-export class PluginmanagerDevComponent implements OnInit {
+export class PluginmanagerDEBUG implements OnInit {
constructor() { }
diff --git a/src/frontend/dashboard/src/app/PluginManager/module.ts b/src/frontend/dashboard/src/app/PluginManager/module.ts
new file mode 100644
index 0000000..49dd6cb
--- /dev/null
+++ b/src/frontend/dashboard/src/app/PluginManager/module.ts
@@ -0,0 +1,45 @@
+import { NgModule } from '@angular/core';
+import { CommonModule } from '@angular/common';
+import { RouterModule } from '@angular/router';
+
+import { PluginmanagerDEBUG } from './debug.component';
+import { PluginsComponent } from './plugins.component';
+
+import { FrontendPlugin, SidebarEntries } from 'frontblock-generic/Plugin';
+import { ClarityModule } from '@clr/angular';
+import { FormsModule } from '@angular/forms';
+
+
+@NgModule({
+ imports: [
+ FormsModule,
+ ClarityModule,
+
+ CommonModule,
+ RouterModule.forChild([
+ {path: "debug", component: PluginmanagerDEBUG},
+ {path: "plugins", component: PluginsComponent}
+ ]),
+ ],
+ exports: [RouterModule],
+ declarations: [
+ PluginmanagerDEBUG,
+ PluginsComponent
+ ]
+})
+export class PluginModule implements FrontendPlugin{
+ getSidebarEntry(): SidebarEntries {
+ return {
+ icon: "plugin",
+ text: "Plugin manager",
+ parentRoute: "pluginmanager",
+ links: [{
+ route: "debug",
+ text: "DEBUG"
+ },{
+ route: "plugins",
+ text: "Plugins"
+ }]
+ }
+ }
+}
diff --git a/src/frontend/dashboard/src/app/PluginManager/plugins.component.ts b/src/frontend/dashboard/src/app/PluginManager/plugins.component.ts
new file mode 100644
index 0000000..9e08b15
--- /dev/null
+++ b/src/frontend/dashboard/src/app/PluginManager/plugins.component.ts
@@ -0,0 +1,116 @@
+import { Component, OnInit } from '@angular/core';
+import { SidebarEntry } from 'frontblock-generic/Plugin';
+declare const fb
+@Component({
+ selector: 'plugins', //!!!!
+ template: `
+
+
+
+
+
+
{{updateCandidate}} But not much to say...
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{entry.name}}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ `
+})
+export class PluginsComponent implements OnInit {
+ plugins = [{
+ name: "test",
+ available: "0.0.1",
+ installed: "0.0.1",
+ status: "Running"
+ },{
+ name: "test II: Return of test",
+ available: "0.0.1",
+ installed: "0.0.1",
+ status: "Available"
+ },{
+ name: "test 3",
+ available: "0.0.2",
+ installed: "0.0.1",
+ status: "Stopped"
+ },]
+
+ updatepending = true
+ updateCandidate = ""
+
+ constructor() { }
+
+ start(name){
+ this.plugins.find((el) => el.name === name).status = "Running"
+ }
+
+ stop(name){
+ this.plugins.find((el) => el.name === name).status = "Stopped"
+ }
+
+ delete(name){
+ this.plugins.find((el) => el.name === name).status = "Available"
+ }
+
+ showConfirmation(name){
+ this.updateCandidate = name
+ this.updatepending = !this.updatepending
+ }
+
+ download(name){
+ let plugin = this.plugins.find((el) => el.name === name)
+ plugin.status = "Stopped"
+ plugin.installed = plugin.available
+ this.updatepending = !this.updatepending
+ }
+
+ cancelModal(){
+ this.updateCandidate = ""
+ this.updatepending = !this.updatepending
+ }
+
+ ngOnInit() { }
+
+}
+
diff --git a/src/frontend/dashboard/src/app/app-routing.module.ts b/src/frontend/dashboard/src/app/app-routing.module.ts
index efabd45..1a1b3b6 100644
--- a/src/frontend/dashboard/src/app/app-routing.module.ts
+++ b/src/frontend/dashboard/src/app/app-routing.module.ts
@@ -2,17 +2,9 @@ import { NgModule } from '@angular/core';
import { Routes, RouterModule, Route } from '@angular/router';
import { HomeComponent } from './home/home.component';
import { ErrorDisplayComponent } from './error-display/error-display.component';
-import { PluginmanagerDevComponent } from './pluginmanager-dev/pluginmanager-dev.component';
-import { ApiclientDevComponent } from './apiclient-dev/apiclient-dev.component';
-
+import { environment } from 'src/environments/environment';
const routes: Routes = [{
- path: "dev/pluginmanager",
- component: PluginmanagerDevComponent
-},{
- path: "dev/apiclient",
- component: ApiclientDevComponent
-},{
path: "",
component: HomeComponent
},{
diff --git a/src/frontend/dashboard/src/app/app.component.html b/src/frontend/dashboard/src/app/app.component.html
index 505b10f..709f08f 100644
--- a/src/frontend/dashboard/src/app/app.component.html
+++ b/src/frontend/dashboard/src/app/app.component.html
@@ -1,4 +1,8 @@
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/frontend/dashboard/src/app/app.component.ts b/src/frontend/dashboard/src/app/app.component.ts
index 3bdc925..bd819cd 100644
--- a/src/frontend/dashboard/src/app/app.component.ts
+++ b/src/frontend/dashboard/src/app/app.component.ts
@@ -1,10 +1,30 @@
-import { Component } from '@angular/core';
+import { Component, ChangeDetectorRef, NgZone, ViewChild, OnInit, AfterContentInit } from '@angular/core';
+import { SidebarComponent } from './sidebar/sidebar.component';
+import { SidebarEntryService } from './sidebar-entry-service.service';
@Component({
selector: 'app-root',
templateUrl: './app.component.html',
styleUrls: ['./app.component.scss']
})
-export class AppComponent {
+export class AppComponent implements AfterContentInit {
title = 'dashboard';
+
+ @ViewChild(SidebarComponent, {static: false})
+ sidebar: SidebarComponent
+
+ constructor(private zone:NgZone, private sidebarService: SidebarEntryService){
+ window["refresh"] = () => zone.run(()=>{ /*this triggers an angular reload*/})
+ }
+
+ ngAfterContentInit(){
+ const _this = this;
+ (function awaitSidebar(){
+ if(_this.sidebar != null){
+ _this.sidebarService.setSidebar(_this.sidebar)
+ return
+ }
+ setTimeout(awaitSidebar,25)
+ })()
+ }
}
diff --git a/src/frontend/dashboard/src/app/app.module.ts b/src/frontend/dashboard/src/app/app.module.ts
index c660b3f..ed68130 100644
--- a/src/frontend/dashboard/src/app/app.module.ts
+++ b/src/frontend/dashboard/src/app/app.module.ts
@@ -1,57 +1,51 @@
-import { BrowserModule } from '@angular/platform-browser';
-import { NgModule, ANALYZE_FOR_ENTRY_COMPONENTS, ModuleWithProviders } from '@angular/core';
-import { HttpClientModule } from '@angular/common/http';
-import { AppRoutingModule, getRoutes } from './app-routing.module';
+import { NgModule } from '@angular/core';
+import { AppRoutingModule } from './app-routing.module';
+
import { ClarityModule } from '@clr/angular';
import { BrowserAnimationsModule } from "@angular/platform-browser/animations";
+import { BrowserModule } from '@angular/platform-browser';
+import { FormsModule } from '@angular/forms';
import { COMPILER_OPTIONS, CompilerFactory, Compiler } from '@angular/core';
import { JitCompilerFactory } from '@angular/platform-browser-dynamic';
-import { FormsModule } from '@angular/forms';
+
import { AppComponent } from './app.component';
import { SidebarComponent } from './sidebar/sidebar.component';
-import { MainComponent } from './main/main.component';
+import { MainComponent } from './content-area/main.component';
import { DynamicLoaderComponent } from './dynamic-loader/dynamic-loader.component';
import { HomeComponent } from './home/home.component';
import { ErrorDisplayComponent } from './error-display/error-display.component';
-import { PluginmanagerDevComponent } from './pluginmanager-dev/pluginmanager-dev.component';
import { HeaderBarComponent } from './header-bar/header-bar.component';
-import { ApiclientDevComponent } from './apiclient-dev/apiclient-dev.component';
-import { ApiclientFormComponent } from './apiclient-dev/apiclient-settings-form.component';
-import { ApiclientConsumptionComponent } from './apiclient-dev/apiclient-consumptions.component';
-import { ApiclientSubscriptionComponent } from './apiclient-dev/apiclient-subscriptions.component';
+import { SubnavComponent } from './subnav/subnav.component';
+
+import { environment } from 'src/environments/environment';
export function createCompiler(fn: CompilerFactory): Compiler {
return fn.createCompiler();
}
-const entryComps = []
+const declarations = [
+ AppComponent,
+
+ SidebarComponent,
+ MainComponent,
+ DynamicLoaderComponent,
+ HomeComponent,
+ HeaderBarComponent,
+ ErrorDisplayComponent,
+ SubnavComponent,
+]
@NgModule({
- declarations: [
- AppComponent,
- SidebarComponent,
- MainComponent,
- DynamicLoaderComponent,
- HomeComponent,
- ErrorDisplayComponent,
- PluginmanagerDevComponent,
- HeaderBarComponent,
- ApiclientDevComponent,
- ApiclientFormComponent,
- ApiclientConsumptionComponent,
- ApiclientSubscriptionComponent
-
- ],
+ declarations: declarations,
imports: [
FormsModule,
BrowserModule,
BrowserAnimationsModule,
ClarityModule,
- HttpClientModule,
- AppRoutingModule
+ AppRoutingModule,
],
- entryComponents: entryComps,
+ entryComponents: [],
providers: [
{
provide: COMPILER_OPTIONS,
diff --git a/src/frontend/dashboard/src/app/main/main.component.html b/src/frontend/dashboard/src/app/content-area/main.component.html
similarity index 100%
rename from src/frontend/dashboard/src/app/main/main.component.html
rename to src/frontend/dashboard/src/app/content-area/main.component.html
diff --git a/src/frontend/dashboard/src/app/main/main.component.scss b/src/frontend/dashboard/src/app/content-area/main.component.scss
similarity index 100%
rename from src/frontend/dashboard/src/app/main/main.component.scss
rename to src/frontend/dashboard/src/app/content-area/main.component.scss
diff --git a/src/frontend/dashboard/src/app/main/main.component.spec.ts b/src/frontend/dashboard/src/app/content-area/main.component.spec.ts
similarity index 100%
rename from src/frontend/dashboard/src/app/main/main.component.spec.ts
rename to src/frontend/dashboard/src/app/content-area/main.component.spec.ts
diff --git a/src/frontend/dashboard/src/app/main/main.component.ts b/src/frontend/dashboard/src/app/content-area/main.component.ts
similarity index 92%
rename from src/frontend/dashboard/src/app/main/main.component.ts
rename to src/frontend/dashboard/src/app/content-area/main.component.ts
index cc59f55..cb8fe25 100644
--- a/src/frontend/dashboard/src/app/main/main.component.ts
+++ b/src/frontend/dashboard/src/app/content-area/main.component.ts
@@ -1,7 +1,7 @@
import { Component, OnInit, ViewContainerRef, ViewChild } from '@angular/core';
@Component({
- selector: 'app-main',
+ selector: 'content-area',
templateUrl: './main.component.html',
styleUrls: ['./main.component.scss']
})
diff --git a/src/frontend/dashboard/src/app/dynamic-loader/apiclient-dev/apiclient-dev.component.ts b/src/frontend/dashboard/src/app/dynamic-loader/apiclient-dev/apiclient-dev.component.ts
deleted file mode 100644
index ca8b2de..0000000
--- a/src/frontend/dashboard/src/app/dynamic-loader/apiclient-dev/apiclient-dev.component.ts
+++ /dev/null
@@ -1,26 +0,0 @@
-import { Component, OnInit } from '@angular/core';
-import { SidebarEntry } from 'frontblock-generic/Plugin';
-declare const fb
-@Component({
- selector: 'apiclient', //!!!!
- template: `
-
- `
-})
-export class ApiclientDevComponent implements OnInit {
-
- constructor() { }
-
- ngOnInit() { }
-
-}
-
-export const sidebarEntry:SidebarEntry = {
- icon: "wrench",
- route: "dev/apiclient",
- text: "DEV ApiClient",
-}
diff --git a/src/frontend/dashboard/src/app/dynamic-loader/apiclient-dev/apiclient-settings-form.component.ts b/src/frontend/dashboard/src/app/dynamic-loader/apiclient-dev/apiclient-settings-form.component.ts
deleted file mode 100644
index 25fd5af..0000000
--- a/src/frontend/dashboard/src/app/dynamic-loader/apiclient-dev/apiclient-settings-form.component.ts
+++ /dev/null
@@ -1,135 +0,0 @@
-import { Component, OnInit } from '@angular/core';
-import { fbind } from 'q';
-import { FrontblockApiConf } from 'frontblock';
-
-
-declare const fb
-
-@Component({
- selector: 'settings',
- template: `
-
- `
-})
-export class ApiclientFormComponent implements OnInit {
- testnet:boolean = true
- saving:boolean = false
- advanced:boolean = false
- data:FrontblockApiConf = {
- 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/dashboard/src/app/dynamic-loader/dynamic-loader.component.html b/src/frontend/dashboard/src/app/dynamic-loader/dynamic-loader.component.html
index 306971d..070e254 100644
--- a/src/frontend/dashboard/src/app/dynamic-loader/dynamic-loader.component.html
+++ b/src/frontend/dashboard/src/app/dynamic-loader/dynamic-loader.component.html
@@ -1,4 +1,3 @@
\ No newline at end of file
diff --git a/src/frontend/dashboard/src/app/dynamic-loader/dynamic-loader.component.ts b/src/frontend/dashboard/src/app/dynamic-loader/dynamic-loader.component.ts
index 964a24e..92f438b 100644
--- a/src/frontend/dashboard/src/app/dynamic-loader/dynamic-loader.component.ts
+++ b/src/frontend/dashboard/src/app/dynamic-loader/dynamic-loader.component.ts
@@ -5,7 +5,6 @@
*/
import { System } from 'systemjs';
declare const SystemJS: System;
-declare const fb
import * as angularRouter from '@angular/router';
import * as angularCore from '@angular/core';
@@ -13,47 +12,76 @@ import * as angularCommon from '@angular/common';
import * as angularCommonHttp from '@angular/common/http';
import * as angularForms from '@angular/forms';
import * as angularAnimations from '@angular/animations';
+//import * as angularAnimationsBrowser from '@angular/animations/browser'
import * as angularPlatformBrowser from '@angular/platform-browser';
import * as angularPlatformBrowserDynamic from '@angular/platform-browser-dynamic';
+import * as clarityModule from '@clr/angular';
+import * as frontblockGenericTypes from 'frontblock-generic/Types.js'
+//import * as browserAnimationsModule from "@angular/platform-browser/animations";
+SystemJS.set('@clr/angular', SystemJS.newModule(clarityModule));
SystemJS.set('@angular/router', SystemJS.newModule(angularRouter));
SystemJS.set('@angular/core', SystemJS.newModule(angularCore));
SystemJS.set('@angular/common', SystemJS.newModule(angularCommon));
SystemJS.set('@angular/common/http', SystemJS.newModule(angularCommonHttp));
SystemJS.set('@angular/forms', SystemJS.newModule(angularForms));
SystemJS.set('@angular/animations', SystemJS.newModule(angularAnimations));
+//SystemJS.set('@angular/animations/browser', SystemJS.newModule(angularAnimationsBrowser));
SystemJS.set('@angular/platform-browser', SystemJS.newModule(angularPlatformBrowser));
+//SystemJS.set('@angular/platform-browser/animations', SystemJS.newModule(browserAnimationsModule));
SystemJS.set('@angular/platform-browser-dynamic', SystemJS.newModule(angularPlatformBrowserDynamic));
+SystemJS.set('frontblock-generic/Types', SystemJS.newModule(frontblockGenericTypes));
SystemJS.config({ meta: { '*': { authorization: true } } });
/** --------- */
-import { AfterViewInit, Component, ViewContainerRef, ViewChild } from '@angular/core';
+import { AfterViewInit, Component, Input, ViewChild } from '@angular/core';
import { SidebarComponent } from '../sidebar/sidebar.component';
-import { MainComponent } from '../main/main.component';
import { Router } from '@angular/router';
import { FrontendPlugin, SidebarEntries, SidebarEntry } from "frontblock-generic/Plugin"
+import { SidebarEntryService } from '../sidebar-entry-service.service';
+import { environment } from "../../environments/environment"
+
+
+let fb
+if(environment.production){
+ fb = window["fb"]
+}else{
+
+ fb = {
+ PluginManager : {
+ getLoadedPluginNames: () => ["ApiClient", "PluginManager"]
+ }
+ }
+}
@Component({
- selector: 'app-dynamic-loader',
+ selector: 'dynamic-loader',
templateUrl: './dynamic-loader.component.html',
styleUrls: ['./dynamic-loader.component.scss']
})
export class DynamicLoaderComponent implements AfterViewInit {
-
- @ViewChild(SidebarComponent, {static: false})
- sidebar: SidebarComponent
- @ViewChild(MainComponent, {read: ViewContainerRef, static: false})
- maincontent: ViewContainerRef
+ sidebar:SidebarComponent
constructor(
private router: Router,
- ) { }
+ private sidebarService:SidebarEntryService
+ ) {
+ }
ngAfterViewInit() {
- this.loadWidgets()
+ const _this = this;
+ (function awaitSidebar(){
+ const sb = _this.sidebarService.getSidebar()
+ if(sb != null){
+ _this.sidebar = sb
+ _this.loadWidgets()
+ return
+ }
+ setTimeout(awaitSidebar,25)
+ })()
}
private async loadWidgets(){
@@ -65,7 +93,12 @@ export class DynamicLoaderComponent implements AfterViewInit {
}
private async installWidget(pluginName:string){
- const module: FrontendPlugin = await SystemJS.import("plugins/"+pluginName+".js");
+ let module: FrontendPlugin
+ if(environment.production)
+ module = await SystemJS.import("plugins/"+pluginName+".js");
+ else
+ module = await import("../"+pluginName+"/module")
+
const plugin = new module['PluginModule']()
const entry:SidebarEntries | SidebarEntry = plugin.getSidebarEntry()
const rc = this.router.config
@@ -94,8 +127,6 @@ export class DynamicLoaderComponent implements AfterViewInit {
path: m.parentRoute,
loadChildren: async () => module['PluginModule']
})
-
- console.log(this.sidebar.multientires)
break;
}
this.router.resetConfig(rc)
diff --git a/src/frontend/dashboard/src/app/header-bar/header-bar.component.html b/src/frontend/dashboard/src/app/header-bar/header-bar.component.html
index 67c5368..382d068 100644
--- a/src/frontend/dashboard/src/app/header-bar/header-bar.component.html
+++ b/src/frontend/dashboard/src/app/header-bar/header-bar.component.html
@@ -10,10 +10,3 @@