diff --git a/website/client/app.vue b/website/client/app.vue
index f22655a21b..7cfd92aecf 100644
--- a/website/client/app.vue
+++ b/website/client/app.vue
@@ -84,9 +84,11 @@ export default {
return response;
}, (error) => {
if (error.response.status >= 400) {
- this.$notify({
+ this.$store.state.notificationStore.push({
title: 'Habitica',
text: error.response.data.message,
+ type: 'error',
+ timeout: true,
});
}
diff --git a/website/client/assets/images/tavern_backdrop_web_backgroundtile.png b/website/client/assets/images/tavern_backdrop_web_backgroundtile.png
index 9b638283f7..60377dafc9 100644
Binary files a/website/client/assets/images/tavern_backdrop_web_backgroundtile.png and b/website/client/assets/images/tavern_backdrop_web_backgroundtile.png differ
diff --git a/website/client/assets/svg/tier-1.svg b/website/client/assets/svg/tier-1.svg
new file mode 100644
index 0000000000..389493fdb8
--- /dev/null
+++ b/website/client/assets/svg/tier-1.svg
@@ -0,0 +1 @@
+
diff --git a/website/client/assets/svg/tier-2.svg b/website/client/assets/svg/tier-2.svg
new file mode 100644
index 0000000000..013d310797
--- /dev/null
+++ b/website/client/assets/svg/tier-2.svg
@@ -0,0 +1 @@
+
diff --git a/website/client/assets/svg/tier-3.svg b/website/client/assets/svg/tier-3.svg
new file mode 100644
index 0000000000..5650337135
--- /dev/null
+++ b/website/client/assets/svg/tier-3.svg
@@ -0,0 +1 @@
+
diff --git a/website/client/assets/svg/tier-4.svg b/website/client/assets/svg/tier-4.svg
new file mode 100644
index 0000000000..cc93d0a75c
--- /dev/null
+++ b/website/client/assets/svg/tier-4.svg
@@ -0,0 +1 @@
+
diff --git a/website/client/assets/svg/tier-5.svg b/website/client/assets/svg/tier-5.svg
new file mode 100644
index 0000000000..6936f15d1d
--- /dev/null
+++ b/website/client/assets/svg/tier-5.svg
@@ -0,0 +1 @@
+
diff --git a/website/client/assets/svg/tier-6.svg b/website/client/assets/svg/tier-6.svg
new file mode 100644
index 0000000000..cab858d84f
--- /dev/null
+++ b/website/client/assets/svg/tier-6.svg
@@ -0,0 +1 @@
+
diff --git a/website/client/assets/svg/tier-7.svg b/website/client/assets/svg/tier-7.svg
new file mode 100644
index 0000000000..e79872fd9c
--- /dev/null
+++ b/website/client/assets/svg/tier-7.svg
@@ -0,0 +1 @@
+
diff --git a/website/client/assets/svg/tier-champion-2-icon.svg b/website/client/assets/svg/tier-champion-2-icon.svg
deleted file mode 100644
index c6dc35db27..0000000000
--- a/website/client/assets/svg/tier-champion-2-icon.svg
+++ /dev/null
@@ -1,9 +0,0 @@
-
diff --git a/website/client/assets/svg/tier-champion-icon.svg b/website/client/assets/svg/tier-champion-icon.svg
deleted file mode 100644
index 299716dca1..0000000000
--- a/website/client/assets/svg/tier-champion-icon.svg
+++ /dev/null
@@ -1,9 +0,0 @@
-
diff --git a/website/client/assets/svg/tier-elite-2-icon.svg b/website/client/assets/svg/tier-elite-2-icon.svg
deleted file mode 100644
index ce281f5eb2..0000000000
--- a/website/client/assets/svg/tier-elite-2-icon.svg
+++ /dev/null
@@ -1,9 +0,0 @@
-
diff --git a/website/client/assets/svg/tier-elite-icon.svg b/website/client/assets/svg/tier-elite-icon.svg
deleted file mode 100644
index 82d6c7d15a..0000000000
--- a/website/client/assets/svg/tier-elite-icon.svg
+++ /dev/null
@@ -1,9 +0,0 @@
-
diff --git a/website/client/assets/svg/tier-friend-2-icon.svg b/website/client/assets/svg/tier-friend-2-icon.svg
deleted file mode 100644
index 507470c101..0000000000
--- a/website/client/assets/svg/tier-friend-2-icon.svg
+++ /dev/null
@@ -1,9 +0,0 @@
-
diff --git a/website/client/assets/svg/tier-friend-icon.svg b/website/client/assets/svg/tier-friend-icon.svg
deleted file mode 100644
index e792ee2486..0000000000
--- a/website/client/assets/svg/tier-friend-icon.svg
+++ /dev/null
@@ -1,9 +0,0 @@
-
diff --git a/website/client/assets/svg/tier-legendary-icon.svg b/website/client/assets/svg/tier-legendary-icon.svg
deleted file mode 100644
index 0bfaab2922..0000000000
--- a/website/client/assets/svg/tier-legendary-icon.svg
+++ /dev/null
@@ -1,9 +0,0 @@
-
diff --git a/website/client/assets/svg/tier-mod-icon.svg b/website/client/assets/svg/tier-mod-icon.svg
deleted file mode 100644
index 14d709d003..0000000000
--- a/website/client/assets/svg/tier-mod-icon.svg
+++ /dev/null
@@ -1,9 +0,0 @@
-
diff --git a/website/client/assets/svg/tier-mod.svg b/website/client/assets/svg/tier-mod.svg
new file mode 100644
index 0000000000..17c1ac4495
--- /dev/null
+++ b/website/client/assets/svg/tier-mod.svg
@@ -0,0 +1 @@
+
diff --git a/website/client/assets/svg/tier-npc-icon.svg b/website/client/assets/svg/tier-npc-icon.svg
deleted file mode 100644
index 222ef53444..0000000000
--- a/website/client/assets/svg/tier-npc-icon.svg
+++ /dev/null
@@ -1,9 +0,0 @@
-
diff --git a/website/client/assets/svg/tier-npc.svg b/website/client/assets/svg/tier-npc.svg
new file mode 100644
index 0000000000..fc80cbb842
--- /dev/null
+++ b/website/client/assets/svg/tier-npc.svg
@@ -0,0 +1 @@
+
diff --git a/website/client/assets/svg/tier-staff-icon.svg b/website/client/assets/svg/tier-staff-icon.svg
deleted file mode 100644
index 209501178f..0000000000
--- a/website/client/assets/svg/tier-staff-icon.svg
+++ /dev/null
@@ -1,9 +0,0 @@
-
diff --git a/website/client/assets/svg/tier-staff.svg b/website/client/assets/svg/tier-staff.svg
new file mode 100644
index 0000000000..1c55f0fc2e
--- /dev/null
+++ b/website/client/assets/svg/tier-staff.svg
@@ -0,0 +1 @@
+
diff --git a/website/client/components/appHeader.vue b/website/client/components/appHeader.vue
index 5ca0d51211..bf8ea145d4 100644
--- a/website/client/components/appHeader.vue
+++ b/website/client/components/appHeader.vue
@@ -1,5 +1,5 @@
-#app-header.row(:class="{'hide-header': $route.path.startsWith('/group-plans')}")
+#app-header.row(:class="{'hide-header': $route.name === 'groupPlan'}")
create-party-modal
members-modal(:hide-badge="true")
member-details(:member="user")
diff --git a/website/client/components/groups/groupPlan.vue b/website/client/components/groups/groupPlan.vue
index 47d815d66f..7585b3759f 100644
--- a/website/client/components/groups/groupPlan.vue
+++ b/website/client/components/groups/groupPlan.vue
@@ -271,14 +271,16 @@ export default {
},
mounted () {
this.activePage = this.PAGES.BENEFITS;
- this.$store.state.hideHeader = true;
+ // @TODO: have to handle this better because sub pages have hidden header
+ // @TODO: I think we can remove this
+ // this.$store.state.hideHeader = true;
// @TODO: can this be in a mixin?
this.StripeCheckout = window.StripeCheckout;
},
destroyed () {
// @TODO: going from the page back to party modal does not show
- this.$store.state.hideHeader = false;
+ // this.$store.state.hideHeader = false;
},
computed: {
newGroupIsReady () {
diff --git a/website/client/components/groups/tavern.vue b/website/client/components/groups/tavern.vue
index 03c5f07a93..019de7de94 100644
--- a/website/client/components/groups/tavern.vue
+++ b/website/client/components/groups/tavern.vue
@@ -49,10 +49,13 @@
.toggle-down(@click="sections.staff = !sections.staff", v-if="!sections.staff")
.svg-icon(v-html="icons.downIcon")
.section.row(v-if="sections.staff")
- .col-3.staff(v-for='user in staff', :class='{staff: user.type === "Staff", moderator: user.type === "Moderator", bailey: user.name === "It\'s Bailey"}')
- .title {{user.name}}
+ .col-4.staff(v-for='user in staff', :class='{staff: user.type === "Staff", moderator: user.type === "Moderator", bailey: user.name === "It\'s Bailey"}')
+ div
+ .title {{user.name}}
+ .svg-icon.staff-icon(v-html="icons.tierStaff", v-if='user.type === "Staff"')
+ .svg-icon.mod-icon(v-html="icons.tierMod", v-if='user.type === "Moderator" && user.name !== "It\'s Bailey"')
+ .svg-icon.npc-icon(v-html="icons.tierNPC", v-if='user.name === "It\'s Bailey"')
.type {{user.type}}
- .svg-icon(v-html="icons.tierChampionIcon")
.section-header
.row
@@ -99,16 +102,36 @@
.col-12
p(v-once) {{ $t('playerTiersDesc') }}
ul.tier-list
- li.tier1(v-once) {{ $t('tier1') }}
- li.tier2(v-once) {{ $t('tier2') }}
- li.tier3(v-once) {{ $t('tier3') }}
- li.tier4(v-once) {{ $t('tier4') }}
- li.tier5(v-once) {{ $t('tier5') }}
- li.tier6(v-once) {{ $t('tier6') }}
- li.tier7(v-once) {{ $t('tier7') }}
- li.moderator(v-once) {{ $t('tierModerator') }}
- li.staff(v-once) {{ $t('tierStaff') }}
- li.npc(v-once) {{ $t('tierNPC') }}
+ li.tier1(v-once)
+ | {{ $t('tier1') }}
+ .svg-icon(v-html="icons.tier1")
+ li.tier2(v-once)
+ | {{ $t('tier2') }}
+ .svg-icon(v-html="icons.tier2")
+ li.tier3(v-once)
+ | {{ $t('tier3') }}
+ .svg-icon(v-html="icons.tier3")
+ li.tier4(v-once)
+ | {{ $t('tier4') }}
+ .svg-icon(v-html="icons.tier4")
+ li.tier5(v-once)
+ | {{ $t('tier5') }}
+ .svg-icon(v-html="icons.tier5")
+ li.tier6(v-once)
+ | {{ $t('tier6') }}
+ .svg-icon(v-html="icons.tier6")
+ li.tier7(v-once)
+ | {{ $t('tier7') }}
+ .svg-icon(v-html="icons.tier7")
+ li.moderator(v-once)
+ | {{ $t('tierModerator') }}
+ .svg-icon(v-html="icons.tierMod")
+ li.staff(v-once)
+ | {{ $t('tierStaff') }}
+ .svg-icon(v-html="icons.tierStaff")
+ li.npc(v-once)
+ | {{ $t('tierNPC') }}
+ .svg-icon.npc-icon(v-html="icons.tierNPC")