diff --git a/website/client/components/appHeader.vue b/website/client/components/appHeader.vue index e209980c9b..3aebcdcb80 100644 --- a/website/client/components/appHeader.vue +++ b/website/client/components/appHeader.vue @@ -1,12 +1,18 @@ diff --git a/website/client/components/avatar.vue b/website/client/components/avatar.vue index 73e21c73f1..1865c4ad5e 100644 --- a/website/client/components/avatar.vue +++ b/website/client/components/avatar.vue @@ -3,45 +3,45 @@ .character-sprites template(v-if="!avatarOnly" v-once) // Mount Body - span(v-if="user.items.currentMount", :class="'Mount_Body_' + user.items.currentMount") + span(v-if="member.items.currentMount", :class="'Mount_Body_' + member.items.currentMount") // Buffs that cause visual changes to avatar: Snowman, Ghost, Flower, etc template(v-for="(klass, item) in visualBuffs") - span(v-if="user.stats.buffs[item]", :class="klass") + span(v-if="member.stats.buffs[item]", :class="klass") // Show flower ALL THE TIME!!! // See https://github.com/HabitRPG/habitica/issues/7133 - span(:class="'hair_flower_' + user.preferences.hair.flower") + span(:class="'hair_flower_' + member.preferences.hair.flower") // Show avatar only if not currently affected by visual buff - template(v-if!="!user.stats.buffs.snowball && !user.stats.buffs.spookySparkles && !user.stats.buffs.shinySeed && !user.stats.buffs.seafoam") - span(:class="'chair_' + user.preferences.chair") - span(:class="user.items.gear[costumeClass].back") + template(v-if!="!member.stats.buffs.snowball && !member.stats.buffs.spookySparkles && !member.stats.buffs.shinySeed && !member.stats.buffs.seafoam") + span(:class="'chair_' + member.preferences.chair") + span(:class="member.items.gear[costumeClass].back") span(:class="skinClass") - span(:class="user.preferences.size + '_shirt_' + user.preferences.shirt") - span(:class="user.preferences.size + '_' + user.items.gear[costumeClass].armor") - span(:class="user.items.gear[costumeClass].back_collar") - span(:class="user.items.gear[costumeClass].body") + span(:class="member.preferences.size + '_shirt_' + member.preferences.shirt") + span(:class="member.preferences.size + '_' + member.items.gear[costumeClass].armor") + span(:class="member.items.gear[costumeClass].back_collar") + span(:class="member.items.gear[costumeClass].body") span.head_0 template(v-for="type in ['base', 'bangs', 'mustache', 'beard']") - span(:class="'hair_' + type + '_' + user.preferences.hair[type] + '_' + user.preferences.hair.color") - span(:class="user.items.gear[costumeClass].eyewear") - span(:class="user.items.gear[costumeClass].head") - span(:class="user.items.gear[costumeClass].headAccessory") - span(:class="'hair_flower_' + user.preferences.hair.flower") - span(:class="user.items.gear[costumeClass].shield") - span(:class="user.items.gear[costumeClass].weapon") + span(:class="'hair_' + type + '_' + member.preferences.hair[type] + '_' + member.preferences.hair.color") + span(:class="member.items.gear[costumeClass].eyewear") + span(:class="member.items.gear[costumeClass].head") + span(:class="member.items.gear[costumeClass].headAccessory") + span(:class="'hair_flower_' + member.preferences.hair.flower") + span(:class="member.items.gear[costumeClass].shield") + span(:class="member.items.gear[costumeClass].weapon") // Resting - span.zzz(v-if="user.preferences.sleep") + span.zzz(v-if="member.preferences.sleep") template(v-if="!avatarOnly" v-once) // Mount Head - span(v-if="user.items.currentMount", :class="'Mount_Head_' + user.items.currentMount") + span(v-if="member.items.currentMount", :class="'Mount_Head_' + member.items.currentMount") // Pet - span.current-pet(v-if="user.items.currentPet", :class="'Pet-' + user.items.currentPet") - .class-badge.d-flex.justify-content-center(v-if="user.flags.classSelected") - .align-self-center.svg-icon(v-html="icons[user.stats.class]") + span.current-pet(v-if="member.items.currentPet", :class="'Pet-' + member.items.currentPet") + .class-badge.d-flex.justify-content-center(v-if="hasClass") + .align-self-center.svg-icon(v-html="icons[member.stats.class]")