fix armory
This commit is contained in:
@@ -27,13 +27,14 @@ export class FrontcraftArmoryComponent implements OnInit {
|
||||
|
||||
fetch(dataLink).then(raw => raw.json().then(async (json: any[]) => {
|
||||
if (json.length < 1) return
|
||||
let min = -1
|
||||
let data
|
||||
let min = -1
|
||||
|
||||
for (let i = json.length - 1; i > 0; i--) {
|
||||
if (json[i].startTime > min && json[i].gear[0].name != "Unknown Item") {
|
||||
const start = Number.parseInt(json[i].startTime)
|
||||
if (start > min && json[i].gear[0].name != "Unknown Item") {
|
||||
min = start
|
||||
data = json[i]
|
||||
break
|
||||
}
|
||||
}
|
||||
if (!data) {
|
||||
|
||||
@@ -25,7 +25,7 @@ export class FrontcraftCharacterComponent implements OnInit{
|
||||
gear1: string[] = []
|
||||
|
||||
boss2 = { name: undefined, date: undefined }
|
||||
gear2:string[] = []
|
||||
gear2: Item[] = []
|
||||
|
||||
constructor(
|
||||
private api: IApiService,
|
||||
@@ -36,9 +36,7 @@ export class FrontcraftCharacterComponent implements OnInit{
|
||||
const param = this.name || this.route.snapshot.paramMap.get('name');
|
||||
if (!param) return
|
||||
|
||||
this.api.get('CharacterManager')
|
||||
.getCharacterByName(param)
|
||||
.then((char) => {
|
||||
const char = await this.api.get('CharacterManager').getCharacterByName(param)
|
||||
if (char) {
|
||||
this.color = getClassColor(char.class)
|
||||
this.char = char
|
||||
@@ -48,15 +46,16 @@ export class FrontcraftCharacterComponent implements OnInit{
|
||||
|
||||
this.dataLink = "https://classic.warcraftlogs.com:443/v1/parses/character/" + this.char.charactername.replace(/^\w/, c => c.toUpperCase()) + "/Gandling/EU?api_key=c698515ab4f592cdb848d80b3abe616c&metric=dps"
|
||||
|
||||
fetch(this.dataLink).then(raw => raw.json().then((json:any[]) => {
|
||||
const json: any[] = await fetch(this.dataLink).then(raw => raw.json())
|
||||
if (json.length < 1) return
|
||||
let data
|
||||
let min = -1
|
||||
|
||||
for (let i = json.length - 1; i > 0; i--) {
|
||||
if(json[i].startTime > min && json[i].gear[0].name != "Unknown Item"){
|
||||
const start = Number.parseInt(json[i].startTime)
|
||||
if (start > min && json[i].gear[0].name != "Unknown Item") {
|
||||
min = start
|
||||
data = json[i]
|
||||
break
|
||||
}
|
||||
}
|
||||
if (!data) return
|
||||
@@ -65,14 +64,10 @@ export class FrontcraftCharacterComponent implements OnInit{
|
||||
name: data.encounterName,
|
||||
date: data.startTime
|
||||
}
|
||||
this.gear2 = data.gear.map(item => {return <Item>{
|
||||
itemname: item.name,
|
||||
iconname: item.icon.replace('.jpg', ''),
|
||||
quality: item.quality.replace(/^\w/, c => c.toUpperCase()),
|
||||
url: "https://classic.wowhead.com/item="+item.id,
|
||||
}}).filter(item => item.itemname != "Unknown Item")
|
||||
}))
|
||||
|
||||
const maybeItems: (Item | undefined)[] = await Promise.all(data.gear.filter(item => item.name != "Unknown Item").map(async item => await this.api.get('ItemManager').getItem(item.name)))
|
||||
const geardata = maybeItems.filter(maybeItem => maybeItem != null)
|
||||
this.gear2 = geardata
|
||||
}
|
||||
})
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user