Browse Source

update knexconfig

master
peter 1 year ago
parent
commit
3e32408f59

+ 1
- 0
angular.json View File

@@ -67,6 +67,7 @@
67 67
             },
68 68
 
69 69
             "prodlike": {
70
+              "tsConfig": "tsconfig.prod.json",
70 71
               "fileReplacements": [
71 72
                 {
72 73
                   "replace": "src/environments/environment.ts",

+ 1
- 1
package.json View File

@@ -6,7 +6,7 @@
6 6
     "start": "ng serve --aot=false --optimization=false --proxy-config proxy.conf.json ",
7 7
     "start-prodlike": "npm run build-assets && ng serve --aot=false --optimization=false --proxy-config proxy.conf.json --configuration=prodlike",
8 8
     "build": "rm -f src/assets/*.js; ng build --prod --aot=false --optimization=false --build-optimizer=false",
9
-    "build-assets": "npm run get-submodules; npm run copy-frontends; npm run deep-clean-plugins",
9
+    "build-assets": "npm run copy-frontends; npm run deep-clean-plugins",
10 10
     "update-frontblock": "rm -rf node_modules/frontblock*; npm install",
11 11
     "get-submodules": "git submodule update --init && git submodule foreach git checkout master",
12 12
     "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",

+ 1
- 1
src/app/apiclient

@@ -1 +1 @@
1
-Subproject commit 2c6ffd7bf6e7c8cbd80c48980ee2ee33b34cbfd2
1
+Subproject commit 9c23bbf0b2a71d8193f2d413c4a88f9528480193

+ 3
- 2
src/app/dynamic-loader/dynamic-loader.component.ts View File

@@ -22,6 +22,7 @@ import * as btcHdkey from "btc-hdkey"
22 22
 import * as bitcoinjslib from "bitcoinjs-lib"
23 23
 import * as fetch from "node-fetch"
24 24
 import * as coinselect from "coinselect/accumulative"
25
+import * as knexComponent from '../knex-config/knex-config.component'
25 26
 
26 27
 SystemJS.set('@clr/angular', SystemJS.newModule(clarityModule));
27 28
 SystemJS.set('@angular/router', SystemJS.newModule(angularRouter));
@@ -39,7 +40,7 @@ SystemJS.set('btc-hdkey', SystemJS.newModule(btcHdkey))
39 40
 SystemJS.set('bitcoinjs-lib', SystemJS.newModule(bitcoinjslib))
40 41
 SystemJS.set('node-fetch', SystemJS.newModule(fetch))
41 42
 SystemJS.set('coinselect/accumulative', SystemJS.newModule(coinselect))
42
-
43
+SystemJS.set('knexconfig', SystemJS.newModule(knexComponent))
43 44
 
44 45
 SystemJS.config({ meta: { '*': { authorization: true } } });
45 46
 /** --------- */
@@ -52,7 +53,7 @@ import { environment } from "../../environments/environment"
52 53
 
53 54
 const fb = environment.production ? window["fb"] : {
54 55
   UpdateManager: {
55
-    getLoadedPluginNames: () => ["ApiClient", "Wallet"]
56
+    getLoadedPluginNames: () => ["ApiClient"]
56 57
   }
57 58
 }
58 59
 

+ 1
- 0
src/app/knex-config/knex-config.component.html View File

@@ -0,0 +1 @@
1
+<p>knex-config works!</p>

+ 0
- 0
src/app/knex-config/knex-config.component.scss View File


+ 25
- 0
src/app/knex-config/knex-config.component.spec.ts View File

@@ -0,0 +1,25 @@
1
+import { async, ComponentFixture, TestBed } from '@angular/core/testing';
2
+
3
+import { KnexConfigComponent } from './knex-config.component';
4
+
5
+describe('KnexConfigComponent', () => {
6
+  let component: KnexConfigComponent;
7
+  let fixture: ComponentFixture<KnexConfigComponent>;
8
+
9
+  beforeEach(async(() => {
10
+    TestBed.configureTestingModule({
11
+      declarations: [ KnexConfigComponent ]
12
+    })
13
+    .compileComponents();
14
+  }));
15
+
16
+  beforeEach(() => {
17
+    fixture = TestBed.createComponent(KnexConfigComponent);
18
+    component = fixture.componentInstance;
19
+    fixture.detectChanges();
20
+  });
21
+
22
+  it('should create', () => {
23
+    expect(component).toBeTruthy();
24
+  });
25
+});

+ 15
- 0
src/app/knex-config/knex-config.component.ts View File

@@ -0,0 +1,15 @@
1
+import { Component, OnInit } from '@angular/core';
2
+
3
+@Component({
4
+  selector: 'knex-config',
5
+  templateUrl: './knex-config.component.html',
6
+  styleUrls: ['./knex-config.component.scss']
7
+})
8
+export class KnexConfigComponent implements OnInit {
9
+
10
+  constructor() { }
11
+
12
+  ngOnInit() {
13
+  }
14
+
15
+}

+ 1
- 1
src/app/pluginmanager/plugins.component.ts View File

@@ -49,7 +49,7 @@ declare const fb
49 49
                         
50 50
                         <clr-dg-row-detail *clrIfExpanded>
51 51
                             <button *ngIf="line.status === 'Stopped'" class="btn btn-icon btn-success-outline" (click)="start(line.name)"><clr-icon shape="play"></clr-icon></button>
52
-                            <button *ngIf="line.status === 'Running'" class="btn btn-icon btn-warning-outline" (click)="stop(line.name)"><clr-icon shape="pause"></clr-icon></button>
52
+                            <button *ngIf="line.status === 'Running'" class="btn btn-icon btn-warning-outline" (click)="stop(line.name)"><clr-icon shape="stop"></clr-icon></button>
53 53
                             <button *ngIf="line.status === 'Stopped'" class="btn btn-icon btn-danger-outline" (click)="delete(line.name)"><clr-icon shape="trash"></clr-icon></button>
54 54
                             <button *ngIf="line.status === 'Available'" class="btn btn-icon btn-info-outline" (click)="showConfirmation(line.name)"><clr-icon shape="download"></clr-icon></button>
55 55
                             <button *ngIf="line.available !== line.installed && line.status === 'Stopped'" class="btn btn-icon btn-outline " (click)="showConfirmation(line.name)">

+ 3
- 1
tsconfig.app.json View File

@@ -12,6 +12,8 @@
12 12
     "src/test.ts",
13 13
     "src/**/*.spec.ts",
14 14
     "src/app/**/*/node_modules/**/*",
15
-    "src/app/**/*/dist/**/*"
15
+    "src/app/**/*/dist/**/*",
16
+    "src/app/**/*/backend/**/*",
17
+    "src/app/apiclient/*.ts"
16 18
   ]
17 19
 }

+ 1
- 0
tsconfig.prod.json View File

@@ -11,6 +11,7 @@
11 11
       "src/app/**/*/dist/**/*",
12 12
       "src/app/**/*/backend/**/*",
13 13
       "src/app/**/*/frontend/**/*",
14
+      "src/app/apiclient/**/*",
14 15
     ]
15 16
   }
16 17
   

Loading…
Cancel
Save