yrtria/azerothcore-armory
1
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Activity Actions

feat(character-header): add guild link

Browse source
This commit is contained in:
Axel Cocat 2022-02-26 13:41:39 +01:00
parent 6ebaccc020
commit 08bb89568d
3 changed files with 16 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/armory/controllers/CharacterController.ts
View file

@ -19,6 +19,7 @@ interface ICharacterData {
facialStyle: number; facialStyle: number;
playerFlags: number; playerFlags: number;
online: number; online: number;
guild: string;
} }
interface IEquipmentData { interface IEquipmentData {
@ -278,6 +279,7 @@ export class CharacterController {
class: ClassDisplayName[charData.class], class: ClassDisplayName[charData.class],
level: charData.level, level: charData.level,
online: charData.online === 1, online: charData.online === 1,
guild: charData.guild,
}; };
} }
@ -286,10 +288,12 @@ export class CharacterController {
} }
private async getCharacterData(realm: IRealmConfig, character: string | number): Promise<ICharacterData> { private async getCharacterData(realm: IRealmConfig, character: string | number): Promise<ICharacterData> {
const where = typeof character === "string" ? "LOWER(name) = LOWER(?)" : "guid = ?"; const where = typeof character === "string" ? "LOWER(`characters`.`name`) = LOWER(?)" : "`characters`.`guid` = ?";
const [rows, fields] = await this.armory.getCharactersDb(realm.name).query(` const [rows, fields] = await this.armory.getCharactersDb(realm.name).query(`
SELECT \`guid\`, \`name\`, \`race\`, \`class\`, \`gender\`, \`level\`, \`skin\`, \`face\`, \`hairStyle\`, \`hairColor\`, \`facialStyle\`, \`playerFlags\`, \`online\` SELECT \`characters\`.\`guid\`, \`characters\`.\`name\`, \`race\`, \`class\`, \`gender\`, \`level\`, \`skin\`, \`face\`, \`hairStyle\`, \`hairColor\`, \`facialStyle\`, \`playerFlags\`, \`online\`, \`guild\`.\`name\` AS \`guild\`
FROM \`characters\` FROM \`characters\`
LEFT JOIN \`guild_member\` ON \`guild_member\`.\`guid\` = \`characters\`.\`guid\`
LEFT JOIN \`guild\` ON \`guild\`.\`guildid\` = \`guild_member\`.\`guildid\`
LEFT JOIN \`${realm.authDatabase}\`.\`account_access\` ON \`account_access\`.\`id\` = \`characters\`.\`account\` LEFT JOIN \`${realm.authDatabase}\`.\`account_access\` ON \`account_access\`.\`id\` = \`characters\`.\`account\`
WHERE WHERE
${where} ${where}

4
static/css/armory.css
View file

@ -2,3 +2,7 @@ html {
/* Removes the vertical scrollbar caused by Bulma */ /* Removes the vertical scrollbar caused by Bulma */
overflow-y: auto; overflow-y: auto;
} }
.char-name.title {
margin-bottom: 0px;
}

13
static/partials/character-header.html
View file

@ -7,17 +7,16 @@
<br> <br>
<br> <br>
<div class="char-name"> <div class="char-name title is-size-3">{{name}}</div>
<span class="char-name">{{name}}</span> {{#if guild}}
</div> <a class="guild-name title is-size-4" href="/guild/{{guild}}">&lt;{{guild}}&gt;</a>
<div> {{/if}}
<div class="is-size-5">
Level <span class="char-level">{{level}}</span> Level <span class="char-level">{{level}}</span>
<span class="char-race">{{race}}</span> <span class="char-race">{{race}}</span>
<span class="char-class">{{class}}</span> <span class="char-class">{{class}}</span>
</div> </div>
<div> <div class="char-realm">{{realm}}</div>
<span class="char-realm">{{realm}}</span>
</div>
<div> <div>
{{#if online}} {{#if online}}
Online 🟢 Online 🟢