This commit is contained in:
peter
2020-03-08 17:33:51 +01:00
parent b2707bb88f
commit 111656b9b4
14 changed files with 5010 additions and 13757 deletions
+4554 -8042
View File
File diff suppressed because it is too large Load Diff
+3 -3
View File
@@ -13,7 +13,7 @@
"ng": "ng",
"conventional-changelog": "conventional-changelog",
"start": "ng serve",
"build": "ng build --aot",
"build": "ng build",
"build:prod": "npm run build -- --prod --aot",
"test": "ng test",
"test:coverage": "rimraf coverage && npm run test -- --code-coverage",
@@ -44,7 +44,7 @@
"@nebular/auth": "4.4.0",
"@nebular/eva-icons": "4.4.0",
"@nebular/security": "4.4.0",
"@nebular/theme": "4.4.0",
"@nebular/theme": "^4.4.0",
"@swimlane/ngx-charts": "^10.0.0",
"angular-tree-component": "7.2.0",
"angular2-chartjs": "0.4.1",
@@ -109,6 +109,6 @@
"ts-node": "3.2.2",
"tslint": "^5.7.0",
"tslint-language-service": "^0.9.9",
"typescript": "3.4.5"
"typescript": "^3.5.1"
}
}
+11 -4
View File
@@ -3,8 +3,9 @@
* Copyright Akveo. All Rights Reserved.
* Licensed under the MIT License. See License.txt in the project root for license information.
*/
import { Component, OnInit } from '@angular/core';
import { Component, OnInit, Inject, PLATFORM_ID, APP_ID } from '@angular/core';
import { ApiService } from './frontcraft/services/login-api';
import { isPlatformBrowser } from '@angular/common';
@Component({
selector: 'ngx-app',
@@ -12,11 +13,17 @@ import { ApiService } from './frontcraft/services/login-api';
})
export class AppComponent implements OnInit {
constructor(private loginSvc: ApiService) {
constructor(
private loginSvc: ApiService,
@Inject(PLATFORM_ID) private platformId: Object,
@Inject(APP_ID) private appId: string
) {
if(!isPlatformBrowser(platformId)){
global['window'] = {}
}
}
ngOnInit(): void {
window['s'] = this.loginSvc
}
}
@@ -39,7 +39,7 @@ export class FrontcraftRaidComponent implements OnInit, OnDestroy{
tokens:{},
tier: 'null'
}
tokens = {}
tokens: {[itemname in string]: (Character & SRToken & Item)[]} = {}
displayedtokens = {}
search = ""
uuid
@@ -51,7 +51,6 @@ export class FrontcraftRaidComponent implements OnInit, OnDestroy{
private dialogService : NbDialogService,
private toast: NbToastrService
){
window['r'] = this
router.events.subscribe(event => {
if (event instanceof NavigationStart) {
this.ngOnDestroy()
@@ -163,7 +162,6 @@ export class FrontcraftRaidComponent implements OnInit, OnDestroy{
const raiddata = await raidManager.getRaidData(<any>{
id: param
})
console.log(raiddata);
this.display(raiddata)