Kai/habitica
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat(event): Spring Fling 2018

Browse Source
This commit is contained in:
SabreCat
2018-03-20 21:30:43 +00:00
parent 67e750a81c
commit a84ea8b1b7
78 changed files with 492 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files
website/client/components/avatar.vue
-1
View File
@@ -21,7 +21,6 @@
span(:class="member.preferences.size + '_shirt_' + member.preferences.shirt")
span.head_0
span(:class="member.preferences.size + '_' + getGearClass('armor')")
span.head_0
span(:class="getGearClass('back_collar')")
span(:class="getGearClass('body')")
template(v-for="type in ['bangs', 'base', 'mustache', 'beard']")
website/client/components/shops/market/index.vue
+2 -2
View File
@@ -295,7 +295,7 @@
.content {
display: flex;
flex-direction: column;
z-index: 1; // Always cover background.
z-index: 1; // Always cover background.
}
.npc {
@@ -467,7 +467,7 @@ export default {
},
async mounted () {
const worldState = await this.$store.dispatch('worldState:getWorldState');
this.broken = worldState.worldBoss.extra.worldDmg.market;
this.broken = worldState && worldState.worldBoss && worldState.worldBoss.extra && worldState.worldBoss.extra.worldDmg && worldState.worldBoss.extra.worldDmg.market;
},
computed: {
...mapState({
website/client/components/shops/quests/index.vue
+1 -1
View File
@@ -400,7 +400,7 @@ export default {
},
async mounted () {
const worldState = await this.$store.dispatch('worldState:getWorldState');
this.broken = worldState.worldBoss.extra.worldDmg.quests;
this.broken = worldState && worldState.worldBoss && worldState.worldBoss.extra && worldState.worldBoss.extra.worldDmg && worldState.worldBoss.extra.worldDmg.quests;
},
computed: {
...mapState({
website/client/components/shops/seasonal/index.vue
+2 -3
View File
@@ -23,8 +23,7 @@
)
.standard-page
div.featuredItems
.background(:class="{opened: seasonal.opened && !broken, broken: broken}")
.background(:class="{cracked: broken, broken: broken}")
.background(:class="{opened: seasonal.opened}")
div.npc
div.featured-label
span.rectangle
@@ -373,7 +372,7 @@
},
async mounted () {
const worldState = await this.$store.dispatch('worldState:getWorldState');
this.broken = worldState.worldBoss.extra.worldDmg.seasonalShop;
this.broken = worldState && worldState.worldBoss && worldState.worldBoss.extra && worldState.worldBoss.extra.worldDmg && worldState.worldBoss.extra.worldDmg.seasonalShop;
},
computed: {
...mapState({