nitowa/fb-admin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

working plugin import

Browse Source
This commit is contained in:
peter
2019-09-17 18:26:27 +02:00
parent e1340d6350
commit 0035b7463a
17 changed files with 425 additions and 294 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/backend/Admin.ts
+163 -134
View File
@@ -3,28 +3,25 @@ import * as Logger from 'log4js'
import * as Knex from 'knex'
import * as Path from 'path'
import { FrontblockApiClient, FrontblockApiConf } from 'frontblock';
import { getLogger } from 'frontblock-generic/Types';
import { AdminBase, NotificationSeverity } from 'frontblock-generic/Admin';
import { IFrontblockApiClient } from 'frontblock-generic/Api';
import { Plugin } from 'frontblock-generic/Plugin';
import { socketioRPC } from 'frontblock-generic/RPC';
import { GitUpdater, RepoFolderStatus } from './GitUpdater';
import { getLogger, SubscriptionResponse, Coin, AccountMap, TransactionMap } from 'frontblock-generic/Types';
import { AdminBase, NotificationSeverity, TableDefiniton } from 'frontblock-generic/Admin';
import { IFrontblockApiClient, FrontblockApi } from 'frontblock-generic/Api';
import { Plugin, RPCExporter } from 'frontblock-generic/Plugin';
const logger:Logger.Logger = getLogger("admin", 'debug')
export type AdminConf = { httpPort: number}
export type AdminConf = {
httpPort: number,
apiConf: FrontblockApiConf
dbConf:Knex.Config,
eventBusConf: { [topic in string]: NotificationSeverity}
}
export class FrontblockAdmin extends AdminBase<AdminConf>{
private pluginUpdaters:{[name in string]:GitUpdater} = {}
constructor(runningPlugins: Plugin[] = []){
super(runningPlugins)
this.initialize().then(() => this.makeKnex(this.getConfigKey('dbConf'))).then(() => logger.debug("Admin initialization finished"))
}
getDefaultConfig(): { apiConf: FrontblockApiConf; } & AdminConf & { dbConf:Knex.Config; eventBusConf: { [topic in string]: NotificationSeverity}} {
public apiClient: IFrontblockApiClient = this.makeApiClient(this.getConfigKey("apiConf"))
getDefaultConfig(): AdminConf {
return {
httpPort: 8080,
eventBusConf: {
@@ -45,131 +42,163 @@ export class FrontblockAdmin extends AdminBase<AdminConf>{
}
}
}
constructor(runningPlugins: Plugin[] = []){
super(runningPlugins)
this.initialize().then(() => this.makeKnex(this.getConfigKey('dbConf'))).then(() => logger.debug("Admin initialization finished"))
}
initApis(socket){
const quit = async(uid:string) => {return await this.quit(this.getConfigKey('apiConf').apiKey, uid) }
const exporter:RPCExporter = {
name: 'ApiClient',
exportRPCs: () => {
return [{
name: "subscribe",
func: async <C extends Coin>(coin: C, account: AccountMap[C]) => { return await this.subscribe(this.getConfigKey('apiConf').apiKey, coin, account)},
type: 'call',
visibility: 'private'
},{
name: "subsume",
func: async <C extends Coin>(coin: C, account: AccountMap[C], callback: (tx: TransactionMap[C]) => void) => { return await this.subsume(this.getConfigKey('apiConf').apiKey, coin, account, callback)},
type: 'hook',
unhook: quit,
visibility: 'private'
},{
name: 'unsubscribe',
func: async(uid:string) => { return await this.unsubscribe(this.getConfigKey('apiConf').apiKey, uid) },
type: 'call',
visibility: 'private'
},{
name: 'consume',
func: async<C extends Coin>(uid: string, callback: (tx: TransactionMap[C]) => void) => {return await this.consume(this.getConfigKey('apiConf').apiKey, uid, callback)},
type: 'hook',
unhook: quit,
visibility: 'private'
},{
name: 'quit',
func: quit,
type: 'call',
visibility: 'private'
},{
name: "getSubscriptions",
func: async() => { return await this.getSubscriptions() },
type: "call",
visibility: "private"
},{
name: "getConsumers",
func: async() => { return await this.getConsumers() },
type: "call",
visibility: "private"
}]
}
}
super.initApis(socket, [exporter])
}
async getConsumers(): Promise<SubscriptionResponse[]> {
const records = await this.knex.select('*').from('consumers')
return records.map(r => JSON.parse(r.JSON))
}
async getSubscriptions(): Promise<SubscriptionResponse[]> {
const records = await this.knex.select('*').from('subscriptions')
return records.map(r => JSON.parse(r.JSON))
}
private subscribe:FrontblockApi['subscribe'] = async (apiKey, coin, account) => {
const res = await this.apiClient.subscribe(apiKey, coin, account)
if(res instanceof SubscriptionResponse){
await this.insert('subscriptions', [{uuid: res.uid, coin:coin, JSON: JSON.stringify(res)}], "apiclient", "Info")
}
return res
}
private consume:FrontblockApi['consume'] = async (apikey, uuid, callback) => {
const res = await this.apiClient.consume(apikey, uuid, callback)
if(res instanceof SubscriptionResponse){
await this.insert('consumers', [{uuid: res.uid, coin:undefined, JSON: JSON.stringify(res)}], "apiclient", "Info")
}
return res
}
private unsubscribe:FrontblockApi['unsubscribe'] = async (apikey, uuid) => {
const res = await this.apiClient.unsubscribe(apikey, uuid)
await this.knex('subscriptions')
.where('uuid', uuid)
.del()
return res
}
private quit:FrontblockApi['quit'] = async (apikey, uuid) => {
const res = await this.apiClient.quit(apikey, uuid)
await this.knex('consumers')
.where('uuid', uuid)
.del()
return res
}
private subsume:FrontblockApi['subsume'] = async (apikey, coin, account, callback) => {
const res = await this.apiClient.subsume(apikey, coin, account, callback)
if(res instanceof SubscriptionResponse){
await Promise.all([
this.insert('consumers', [{
uuid: res.uid,
coin:coin,
JSON: JSON.stringify(res)
}], "apiclient", "Info"),
this.insert('subscriptions', [{
uuid: res.uid,
coin:coin,
JSON: JSON.stringify(new SubscriptionResponse(res.message!))
}], "apiclient", "Info")
])
}
return res
}
setConfig(conf:AdminConf & { dbConf: Knex.Config; eventBusConf: {[x in string]:NotificationSeverity} }):AdminConf & { dbConf: Knex.Config; eventBusConf: {[x in string]:NotificationSeverity} }{
const currConf = this.getConfig()
if(JSON.stringify(currConf.apiConf) !== JSON.stringify(conf.apiConf)){
this.makeApiClient(conf.apiConf)
}
return super.setConfig(conf)
}
setConfigKey(key: string, value: any):AdminConf & { dbConf: Knex.Config; eventBusConf: {[x in string]:NotificationSeverity} }{
if(key === 'apiConf'){
this.makeApiClient(value)
}
return super.setConfigKey(key, value)
}
getTableDefinitions(): TableDefiniton[] {
return [
...super.getTableDefinitions(),
{
name: 'subscriptions',
tableBuilder: function (table) {
table.string('uuid').primary();
table.string('coin');
table.string('JSON');
}
},{
name: 'consumers',
tableBuilder: function (table) {
table.string('uuid').primary();
table.string('coin');
table.string('JSON');
}
}]
}
protected makeApiClient(conf: FrontblockApiConf): IFrontblockApiClient {
if(this.apiClient) this.apiClient.disconnect()
this.apiClient = new FrontblockApiClient(conf)
this.apiClient.connect()
return this.apiClient
}
exportRPCs():socketioRPC[]{
return [
...super.exportRPCs(),
{
name: 'installPlugin',
func: async (name:string, force = false) => {return await this.installPlugin(name, force)},
type: 'call',
visibility: 'private'
},{
name: 'startPlugin',
func: async (name:string) => {return await this.startPlugin(name)},
type: 'call',
visibility: 'private'
},{
name: 'updatePlugin',
func: async (name) => {return await this.updatePlugin(name)},
type: 'call',
visibility: 'private'
},{
name: 'setPluginVersion',
func: async (name, tag) => {return await this.setPluginVersion(name, tag)},
type: 'call',
visibility: 'private'
},{
name: 'getLoadedPluginNames',
func: async () => {return await this.getPlugins().map(p => p.name)},
type: 'call',
visibility: 'private'
},{
name: 'selfUpdate',
type:'call',
func: async (force: boolean) => {return await this.selfUpdate(force)},
visibility: 'private'
},
]
}
private async selfUpdate(force:boolean = false){
const updater = new GitUpdater("./dist")
let status = await updater.getStatus()
if(force || !status.remote || !status.remote.includes("fb-dist/admin") || !status.exists || status.empty || !status.currentTag){
logger.warn("Cloning fb-dist/admin into ./dist ..."+(force?" USING FORCE!":""))
status = await updater.cloneRepo("https://gitea.frontblock.me/fb-dist/admin.git", force)
this.destroy()
const installer = require("./Installer").installAdmin
installer(this.getPlugins())
}
return status
}
async installPlugin(name: string, force:boolean = false):Promise<RepoFolderStatus>{
logger.warn("Cloning fb-dist/"+name+".git into ./plugins/"+name+" ..."+(force?" USING FORCE!":""))
this.pluginUpdaters[name] = new GitUpdater("./plugins/"+name)
const status = await this.pluginUpdaters[name].cloneRepo("https://gitea.frontblock.me/fb-dist/"+name.toLowerCase()+".git", force)
return status
}
async startPlugin(name:string):Promise<boolean>{
if(!this.pluginUpdaters[name]) return false
const status = await this.pluginUpdaters[name].getStatus()
if(!status.exists || status.empty || !status.tags || status.tags.length === 0){
if(status.currentTag && !status.latestTag){
//git glitches sometimes if you check immediately after clone
logger.warn("re-fetching tag for "+name+"...")
return await this.startPlugin(name)
}
logger.error("Bad repo status", name, status)
return false
}
/* if(this.loadedPlugins[name]){
logger.error("Plugin", name, "is already started")
return false
}
*/
let str = "../plugins/"+name+"/Plugin"
const pluginClass = await eval('require')(str)
const pluginObj = new pluginClass.default()
await pluginObj.start()
this.addPlugin(pluginObj)
return true
}
async updatePlugin(name:string):Promise<boolean>{
if(!this.pluginUpdaters[name]) return false
const status = await this.pluginUpdaters[name].getStatus()
if(!status.exists || status.empty || !status.tags || status.tags.length === 0){
logger.error("Bad repo status", name, status)
return false
}
if(status.currentTag == status.latestTag){
logger.warn(name, "already at latest tag")
return false
}
/*
if(this.loadedPlugins[name]){
logger.error("Plugin", name, "is running. Stop it first")
return false
}
*/
this.pluginUpdaters[name].checkoutTag(status.latestTag!)
return true
}
async setPluginVersion(pluginName:string, tag:string):Promise<RepoFolderStatus>{
const status = await this.pluginUpdaters[pluginName].getStatus()
if(!status.exists || !status.tags || status.tags.length === 0 || !status.tags.includes(tag)){
logger.error("Bad repo status", pluginName, status)
return status
}
return await this.pluginUpdaters[pluginName].checkoutTag(tag)
}
}
process.on( 'SIGINT', function() {
src/backend/webpack.prod.js
+1 -3
View File
@@ -68,9 +68,7 @@ module.exports = [{
]
},
externals:{
"./Installer": "./Installer"
},
externals:["./Installer"],
optimization: {
minimize: false
},
src/frontend/angular.json
+7 -5
View File
@@ -15,8 +15,10 @@
"prefix": "app",
"architect": {
"build": {
"builder": "@angular-devkit/build-angular:browser",
"builder": "@angular-builders/custom-webpack:browser",
"options": {
"customWebpackConfig": {"path": "./custom-webpack.config.js"},
"outputPath": "dist",
"index": "src/index.html",
"main": "src/main.ts",
@@ -78,7 +80,7 @@
}
},
"serve": {
"builder": "@angular-devkit/build-angular:dev-server",
"builder": "@angular-builders/custom-webpack:dev-server",
"tsConfig": "tsconfig.app.json",
"options": {
"browserTarget": "dashboard:build"
@@ -99,7 +101,7 @@
}
},
"test": {
"builder": "@angular-devkit/build-angular:karma",
"builder": "@angular-builders/custom-webpack:karma",
"options": {
"main": "src/test.ts",
"polyfills": "src/polyfills.ts",
@@ -116,7 +118,7 @@
}
},
"lint": {
"builder": "@angular-devkit/build-angular:tslint",
"builder": "@angular-builders/custom-webpack:tslint",
"options": {
"tsConfig": [
"tsconfig.app.json",
@@ -130,7 +132,7 @@
}
},
"e2e": {
"builder": "@angular-devkit/build-angular:protractor",
"builder": "@angular-builders/custom-webpack:protractor",
"options": {
"protractorConfig": "e2e/protractor.conf.js",
"devServerTarget": "dashboard:serve"
src/frontend/package-lock.json
Generated
+13 -39
View File
@@ -4795,9 +4795,9 @@
}
},
"frontblock": {
"version": "0.14.9",
"resolved": "https://registry.npmjs.org/frontblock/-/frontblock-0.14.9.tgz",
"integrity": "sha512-iEjOdJ92pxg18Y9mVfjfRYzuAfxXElREoDfz8FFPaNvbO3mPv+8Y2m3jtTo8FoOpFGgA+jwOw40nT1iWKRS72A==",
"version": "0.15.1",
"resolved": "https://registry.npmjs.org/frontblock/-/frontblock-0.15.1.tgz",
"integrity": "sha512-nRSoAT5HZhJmYkCdX8YGya+YTnvzw0W7eG0ISr+HBUO5u4hjmnHwwA1U7VewbTNokan9JvA7TF6/QijLeSCCVA==",
"requires": {
"@angular/common": "^8.2.1",
"@angular/core": "^8.2.1",
@@ -4806,7 +4806,7 @@
"@angular/router": "^8.2.1",
"@clr/angular": "^2.1.1",
"@types/node": "^11.13.10",
"frontblock-generic": "^0.33.7",
"frontblock-generic": "^0.34.0",
"fs": "0.0.1-security",
"knex": "^0.19.2",
"log4js": "^4.3.1",
@@ -4820,52 +4820,26 @@
"version": "11.13.20",
"resolved": "https://registry.npmjs.org/@types/node/-/node-11.13.20.tgz",
"integrity": "sha512-JE0UpLWZTV1sGcaj0hN+Q0760OEjpgyFJ06DOMVW6qKBducKdJQaIw0TGL6ccj7VXRduIOHLWQi+tHwulZJHVQ=="
},
"frontblock-generic": {
"version": "0.33.12",
"resolved": "https://registry.npmjs.org/frontblock-generic/-/frontblock-generic-0.33.12.tgz",
"integrity": "sha512-6tQIIdqzsJxqPefxWXBfGs02ux3zKCAqyruFThlUiMxBnPPaqS13R6m74yH/lgpIDom1aPf+vwASiRUI3+5dXw==",
"requires": {
"@types/lowdb": "^1.0.9",
"@types/node": "^12.7.1",
"bsock": "^0.1.9",
"express": "^4.17.1",
"fs": "0.0.1-security",
"http": "0.0.0",
"key-file-storage": "^2.2.4",
"knex": "^0.19.2",
"log4js": "^4.2.0",
"lowdb": "^1.0.0",
"minimist": "^1.2.0",
"path": "^0.12.7",
"uuid": "^3.3.2"
},
"dependencies": {
"@types/node": {
"version": "12.7.5",
"resolved": "https://registry.npmjs.org/@types/node/-/node-12.7.5.tgz",
"integrity": "sha512-9fq4jZVhPNW8r+UYKnxF1e2HkDWOWKM5bC2/7c9wPV835I0aOrVbS/Hw/pWPk2uKrNXQqg9Z959Kz+IYDd5p3w=="
}
}
},
"minimist": {
"version": "1.2.0",
"resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz",
"integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ="
}
}
},
"frontblock-generic": {
"version": "0.23.0",
"resolved": "https://registry.npmjs.org/frontblock-generic/-/frontblock-generic-0.23.0.tgz",
"integrity": "sha512-5KukScUCAsomGP9xMp6gQjA5xKBMfctTSQhIoaoxEkXpXoX9F2pjlYIkfP11NYNSsk2gVf3xg7VIhhSzhizy/A==",
"version": "0.34.1",
"resolved": "https://registry.npmjs.org/frontblock-generic/-/frontblock-generic-0.34.1.tgz",
"integrity": "sha512-BiVUzpJSFV3FbnpdP3mxQTi1ivzlA9BXNrVp6rjuvNuxJYK1JIcd7Lhfaw1xR5v9XRPCBVVgksH37zfMUAPMjg==",
"requires": {
"@types/lowdb": "^1.0.9",
"@types/node": "^12.7.1",
"bsock": "^0.1.9",
"express": "^4.17.1",
"fs": "0.0.1-security",
"http": "0.0.0",
"key-file-storage": "^2.2.4",
"knex": "^0.19.2",
"log4js": "^4.2.0",
"lowdb": "^1.0.0",
"minimist": "^1.2.0",
"path": "^0.12.7",
"uuid": "^3.3.2"
},
"dependencies": {
src/frontend/package.json
+4 -4
View File
@@ -7,13 +7,13 @@
"start-prodlike": "npm run build-assets && ng serve --aot=false --optimization=false --proxy-config proxy.conf.json --configuration=prodlike",
"build": "rm -f src/assets/*.js; ng build --prod --aot=false --optimization=false --build-optimizer=false",
"build-assets": "npm run copy-frontends; npm run deep-clean-plugins",
"update-frontblock": "rm -rf node_modules/frontblock*; npm install",
"get-submodules": "git submodule update --init && git submodule foreach git checkout master",
"copy-frontends": "for module in $(git config --file .gitmodules --get-regexp path | awk '{ print $2 }'); do npm i --prefix $module && npm run --prefix $module build && cp $module/dist/FrontendPlugin.js ./src/assets/$(basename $module).js; done",
"deep-clean-plugins": "for module in $(git config --file .gitmodules --get-regexp path | awk '{ print $2 }'); do rm -rf $module/node_modules; done",
"test": "ng test",
"lint": "ng lint",
"e2e": "ng e2e"
"e2e": "ng e2e",
"update-frontblock": "npm remove frontblock frontblock-generic; npm install frontblock-generic@latest frontblock@latest"
},
"private": true,
"dependencies": {
@@ -32,8 +32,8 @@
"@webcomponents/custom-elements": "^1.0.0",
"btc-hdkey": "0.0.17",
"coinselect": "^3.1.11",
"frontblock": "latest",
"frontblock-generic": "^0.23.0",
"frontblock": "^0.15.1",
"frontblock-generic": "^0.34.1",
"key-file-storage": "^2.2.4",
"node-fetch": "^2.6.0",
"rxjs": "~6.5.2",
src/frontend/src/app/apiclient/module.ts
+9 -4
View File
@@ -10,6 +10,7 @@ import { ClarityModule } from '@clr/angular';
import { FormsModule } from '@angular/forms';
import {FrontendPlugin, SidebarEntries, SidebarEntry} from 'frontblock-generic/Plugin'
import { ApiclientWidgetComponent } from './apiclient-widget.component';
@NgModule({
imports: [
@@ -27,14 +28,14 @@ import {FrontendPlugin, SidebarEntries, SidebarEntry} from 'frontblock-generic/P
ApiclientConsumptionComponent,
ApiclientSubscriptionComponent,
ApiclientFormComponent,
ApiclientWidgetComponent
],
entryComponents: [
ApiclientFormComponent,
ApiclientWidgetComponent
]
})
export class ApiclientModule implements FrontendPlugin{
export class ApiclientModule implements FrontendPlugin<typeof ApiclientFormComponent, typeof ApiclientWidgetComponent>{
getSidebarEntry(): SidebarEntry | SidebarEntries {
return {
icon: "terminal",
@@ -50,7 +51,11 @@ export class ApiclientModule implements FrontendPlugin{
}
}
getSettingsComponentClassName(): any{
getSettingsComponent(): typeof ApiclientFormComponent{
return ApiclientFormComponent
}
getWidget(): typeof ApiclientWidgetComponent{
return ApiclientWidgetComponent
}
}
src/frontend/src/app/app-routing.module.ts
+3
View File
@@ -5,6 +5,9 @@ import { ErrorDisplayComponent } from './error-display/error-display.component';
import { SettingsComponent } from './settings/settings.component';
const routes: Routes = [{
path: "apiclient",
loadChildren: () => import('./apiclient/module').then(mod => mod.ApiclientModule)
},{
path: "pluginmanager",
loadChildren: () => import('./pluginmanager/module').then(mod => mod.PluginmanagerModule)
},{
src/frontend/src/app/dynamic-loader/dynamic-loader.component.ts
+7 -4
View File
@@ -86,6 +86,7 @@ export class DynamicLoaderComponent implements AfterViewInit {
private async installWidget(pluginName: string) {
let module;
if (!angularCore.isDevMode()){
console.log("Loading "+pluginName+" from backend")
module = await SystemJS.import("plugins/" + pluginName + ".js");
}else{
if(environment.loadLocal){
@@ -97,16 +98,18 @@ export class DynamicLoaderComponent implements AfterViewInit {
}
}
const plugin:FrontendPlugin = new module['PluginModule']()
this.injectPlugin(plugin)
this.compileModule(plugin)
this.injectPlugin(module)
this.compileModule(module)
}
compileModule(module:any){
}
injectPlugin(plugin:FrontendPlugin):void{
injectPlugin(module:any):void{
const plugin:FrontendPlugin = new module['PluginModule']()
if(!plugin.getSidebarEntry) return
const entry: SidebarEntries | SidebarEntry = plugin.getSidebarEntry()
const rc = this.router.config
src/frontend/src/app/header-bar/header-bar.component.html
+11 -11
View File
@@ -1,17 +1,17 @@
<clr-header class="header header-1">
<clr-header class="header header-7">
<div class="branding">
<span class="title">Frontblock</span>
<a class="nav-link" [routerLink]="'home'">
<img src="assets/logo_real.png" class="clr-icon" />
<span class="title">&nbsp;&nbsp;Frontblock</span>
</a>
</div>
<div class="header-actions">
<a class="nav-link nav-icon-text">
<clr-icon shape="bug"></clr-icon>
<span class="nav-text">ALPHA {{devmode}}</span>
</a>
</div>
<div class="header-actions">
<a [routerLink]="'settings'" class="nav-link nav-icon" aria-label="settings">
<clr-icon shape="cog"></clr-icon>
<div class="header-actions" style="z-index:2">
<a class="nav-link nav-icon" aria-label="bell" routerLinkActive="active" [routerLink]="'notifications'">
<clr-icon class="has-badge" shape="bell"> </clr-icon>
</a>
<a class="nav-link nav-icon" routerLinkActive="active" [routerLink]="'settings'">
<clr-icon class="" shape="cog" ></clr-icon>
</a>
</div>
</clr-header>
src/frontend/src/app/home/home.component.html
+1 -1
View File
@@ -1 +1 @@
<p>home works!</p>
<ng-container #dynamicWidgets></ng-container>
src/frontend/src/app/home/home.component.ts
+24 -4
View File
@@ -1,15 +1,35 @@
import { Component, OnInit } from '@angular/core';
import { Component, OnInit, ViewChild, ViewContainerRef, Injector, ComponentFactoryResolver, AfterViewInit } from '@angular/core';
import { FrontendPlugin } from 'frontblock-generic/Plugin';
import { ApiclientModule } from '../apiclient/module';
@Component({
selector: 'app-home',
templateUrl: './home.component.html',
styleUrls: ['./home.component.scss']
})
export class HomeComponent implements OnInit {
export class HomeComponent implements AfterViewInit {
constructor() { }
@ViewChild('dynamicWidgets', {read: ViewContainerRef, static: false})
settingsContainer: ViewContainerRef
constructor(
private componentFactoryResolver: ComponentFactoryResolver,
private injector: Injector
) { }
ngAfterViewInit() {
this.injectModule(new ApiclientModule())
ngOnInit() {
}
injectModule(module:FrontendPlugin<any>) {
if(!module.getSettingsComponent) return
//@ts-ignore
const factory = this.componentFactoryResolver.resolveComponentFactory(module.getWidget())
const component = factory.create(this.injector)
setTimeout(() => this.settingsContainer.insert(component.hostView), 1)
}
}
src/frontend/src/app/knex-config/knex-config.component.ts
+10
View File
@@ -136,6 +136,16 @@ export class KnexConfigComponent implements OnInit{
}
async ngOnInit(){
await new Promise((resolve, reject)=>{
let awaitAdmin: { (): void; (...args: any[]): void; }
(awaitAdmin = () => {
if(fb.Admin != null){
resolve()
}
setTimeout(awaitAdmin,25)
})()
})
const c = await fb.Admin.getConfig()
this.conf = c.dbConf
src/frontend/src/app/settings/settings.component.ts
+6 -4
View File
@@ -1,5 +1,6 @@
import { Component, ViewChild, ViewContainerRef, ComponentFactoryResolver, Injector, AfterViewInit } from '@angular/core';
import { ApiclientModule } from '../apiclient/module'
import { FrontendPlugin } from 'frontblock-generic/Plugin';
@Component({
selector: 'app-settings',
@@ -9,7 +10,7 @@ import { ApiclientModule } from '../apiclient/module'
export class SettingsComponent implements AfterViewInit {
ngAfterViewInit(): void {
this.injectModule(new ApiclientModule())
this.injectModule(new ApiclientModule())
// this.injectModule(new ApiclientModule())
}
@ViewChild('dynamicSettings', {read: ViewContainerRef, static: false})
@@ -21,10 +22,11 @@ export class SettingsComponent implements AfterViewInit {
) {
}
injectModule(module:any) {
const factory = this.componentFactoryResolver.resolveComponentFactory(module.getSettingsComponentClassName())
injectModule(module:FrontendPlugin<any>) {
if(!module.getSettingsComponent) return
const factory = this.componentFactoryResolver.resolveComponentFactory(module.getSettingsComponent())
const component = factory.create(this.injector)
setTimeout(() => this.settingsContainer.insert(component.hostView), 1)
}
}
src/frontend/src/app/sidebar/sidebar.component.ts
+4 -1
View File
@@ -1,5 +1,6 @@
import { Component, OnInit } from '@angular/core';
import { SidebarEntries, SidebarEntry } from 'frontblock-generic/Plugin';
import { ApiclientModule } from '../apiclient/module';
@Component({
selector: 'sidebar',
@@ -12,7 +13,9 @@ export class SidebarComponent implements OnInit {
entries:SidebarEntry[] = []
multientires:SidebarEntries[] = [{
multientires:SidebarEntries[] = [
<SidebarEntries> new ApiclientModule().getSidebarEntry(),
{
icon: "bundle",
text: "Update Manager",
parentRoute: "pluginmanager",
src/frontend/src/app/subnav/subnav.component.html
+12 -6
View File
@@ -1,11 +1,17 @@
<!--
<nav class="subnav">
<ul class="nav">
<li class="nav-item">
<a class="nav-link" routerLinkActive="active" [routerLink]="'home'">Dashboard</a>
&nbsp;
<a class="nav-link" routerLinkActive="active" [routerLink]="'notifications'">Notifications</a>
&nbsp;
<a class="nav-link" routerLinkActive="active" [routerLink]="'settings'">Settings</a>
<a class="header-nav" routerLinkActive="active" [routerLink]="'home'">
<clr-icon class="is-solid" shape="home" size="24"></clr-icon>
</a>
<a class="header-nav" routerLinkActive="active" [routerLink]="'settings'">
<clr-icon class="is-solid" shape="cog" size="24"></clr-icon>
</a>
<a class="header-nav" routerLinkActive="active" [routerLink]="'notifications'">
<clr-icon class="is-solid has-badge" shape="bell" size="24"></clr-icon>
</a>
</li>
</ul>
</nav>
</nav>
-->