diff --git a/website/client/assets/svg/bronze-guild-badge-large.svg b/website/client/assets/svg/bronze-guild-badge-large.svg
new file mode 100644
index 0000000000..402a92b27d
--- /dev/null
+++ b/website/client/assets/svg/bronze-guild-badge-large.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/website/client/assets/svg/bronze-guild-badge-small.svg b/website/client/assets/svg/bronze-guild-badge-small.svg
new file mode 100644
index 0000000000..e56964f50c
--- /dev/null
+++ b/website/client/assets/svg/bronze-guild-badge-small.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/website/client/assets/svg/bronze-guild-badge.svg b/website/client/assets/svg/bronze-guild-badge.svg
deleted file mode 100644
index 0f7b7078ff..0000000000
--- a/website/client/assets/svg/bronze-guild-badge.svg
+++ /dev/null
@@ -1,18 +0,0 @@
-
diff --git a/website/client/assets/svg/gold-guild-badge-large.svg b/website/client/assets/svg/gold-guild-badge-large.svg
new file mode 100644
index 0000000000..0256cd4e18
--- /dev/null
+++ b/website/client/assets/svg/gold-guild-badge-large.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/website/client/assets/svg/gold-guild-badge-small.svg b/website/client/assets/svg/gold-guild-badge-small.svg
new file mode 100644
index 0000000000..fb31ea3a71
--- /dev/null
+++ b/website/client/assets/svg/gold-guild-badge-small.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/website/client/assets/svg/gold-guild-badge.svg b/website/client/assets/svg/gold-guild-badge.svg
deleted file mode 100755
index 26665b7cd1..0000000000
--- a/website/client/assets/svg/gold-guild-badge.svg
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
diff --git a/website/client/assets/svg/silver-guild-badge-large.svg b/website/client/assets/svg/silver-guild-badge-large.svg
new file mode 100644
index 0000000000..a2062e2893
--- /dev/null
+++ b/website/client/assets/svg/silver-guild-badge-large.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/website/client/assets/svg/silver-guild-badge-small.svg b/website/client/assets/svg/silver-guild-badge-small.svg
new file mode 100644
index 0000000000..6d8eef88f5
--- /dev/null
+++ b/website/client/assets/svg/silver-guild-badge-small.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/website/client/assets/svg/silver-guild-badge.svg b/website/client/assets/svg/silver-guild-badge.svg
deleted file mode 100644
index 57d88255c3..0000000000
--- a/website/client/assets/svg/silver-guild-badge.svg
+++ /dev/null
@@ -1,18 +0,0 @@
-
diff --git a/website/client/components/achievements/achievementAvatar.vue b/website/client/components/achievements/achievementAvatar.vue
new file mode 100644
index 0000000000..8020b6eb7c
--- /dev/null
+++ b/website/client/components/achievements/achievementAvatar.vue
@@ -0,0 +1,35 @@
+
+.container-fluid
+ .row
+ .col-4(style='padding:0')
+ div(:class='achievementClass')
+ .col-4(style='padding:0')
+ .herobox(:style="`${margin}em`")
+ .character-sprites
+ //- +generatedAvatar({sleep: false})
+ avatar(:member='user')
+ .col-4
+ div(:class='achievementClass' style='margin: 2em auto')
+
+
+
diff --git a/website/client/components/achievements/achievementFooter.vue b/website/client/components/achievements/achievementFooter.vue
new file mode 100644
index 0000000000..74386a06b1
--- /dev/null
+++ b/website/client/components/achievements/achievementFooter.vue
@@ -0,0 +1,28 @@
+
+.modal-footer(style='margin-top:0', ng-init='loadWidgets()')
+ .container-fluid
+ .row.text-center
+ .col-4
+ a.twitter-share-button(:href='twitterLink') {{ $t('tweet') }}
+ .col-4
+ .fb-share-button(:data-href='achievementLink', data-layout='button')
+ .col-4
+ a.tumblr-share-button(:data-href='achievementLink', data-notes='none')
+
+
+
diff --git a/website/client/components/achievements/contributor.vue b/website/client/components/achievements/contributor.vue
index 027177ccc2..8187f510f0 100644
--- a/website/client/components/achievements/contributor.vue
+++ b/website/client/components/achievements/contributor.vue
@@ -1,14 +1,15 @@
- b-modal#testing(:title="$t('guildReminderTitle')", size='lg', :hide-footer="true")
+ b-modal#contributor(:title="$t('guildReminderTitle')", size='lg', :hide-footer="true")
.modal-content(style='min-width:28em')
.modal-body.text-center
h3(style='margin-bottom:0') {{ $t('modalContribAchievement') }}
// @TODO: +achievementAvatar('boot',0)
+ achievement-avatar
| {{ $t('contribModal', {name: user.profile.name, level: user.contributor.level}) }}
a(:href="$t('conRewardsURL')", target='_blank') {{ $t('contribLink') }}
br
button.btn.btn-primary(style='margin-top:1em' @click='close()') {{ $t('huzzah') }}
- // @TODO: +achievementFooter
+ achievement-footer
diff --git a/website/client/components/groups/publicGuildItem.vue b/website/client/components/groups/publicGuildItem.vue
index 2505447d26..022ba87a82 100644
--- a/website/client/components/groups/publicGuildItem.vue
+++ b/website/client/components/groups/publicGuildItem.vue
@@ -112,9 +112,9 @@ import { mapState } from 'client/libs/store';
import groupUtilities from 'client/mixins/groupsUtilities';
import findIndex from 'lodash/findIndex';
import gemIcon from 'assets/svg/gem.svg';
-import goldGuildBadgeIcon from 'assets/svg/gold-guild-badge.svg';
-import silverGuildBadgeIcon from 'assets/svg/silver-guild-badge.svg';
-import bronzeGuildBadgeIcon from 'assets/svg/bronze-guild-badge.svg';
+import goldGuildBadgeIcon from 'assets/svg/gold-guild-badge-large.svg';
+import silverGuildBadgeIcon from 'assets/svg/silver-guild-badge-large.svg';
+import bronzeGuildBadgeIcon from 'assets/svg/bronze-guild-badge-large.svg';
export default {
mixins: [groupUtilities],
diff --git a/website/client/components/groups/sidebar.vue b/website/client/components/groups/sidebar.vue
index ccc0e6c243..1352c781c3 100644
--- a/website/client/components/groups/sidebar.vue
+++ b/website/client/components/groups/sidebar.vue
@@ -46,52 +46,60 @@ export default {
categoryFilters: [],
categoryOptions: [
{
- label: 'habiticaOfficial',
- key: 'official',
+ label: 'habitica_official',
+ key: 'habitica_official',
},
{
- label: 'animals',
- key: 'animals',
+ label: 'academics',
+ key: 'academics',
},
{
- label: 'artDesign',
- key: 'art_design',
+ label: 'advocacy_causes',
+ key: 'advocacy_causes',
},
{
- label: 'booksWriting',
- key: 'books_writing',
+ label: 'creativity',
+ key: 'creativity',
},
{
- label: 'comicsHobbies',
- key: 'comics_hobbies',
+ label: 'entertainment',
+ key: 'entertainment',
},
{
- label: 'diyCrafts',
- key: 'diy_crafts',
+ label: 'finance',
+ key: 'finance',
},
{
- label: 'education',
- key: 'education',
- },
- {
- label: 'foodCooking',
- key: 'food_cooking',
- },
- {
- label: 'healthFitness',
+ label: 'health_fitness',
key: 'health_fitness',
},
{
- label: 'music',
- key: 'music',
+ label: 'hobbies_occupations',
+ key: 'hobbies_occupations',
},
{
- label: 'relationship',
- key: 'relationship',
+ label: 'location_based',
+ key: 'location_based',
},
{
- label: 'scienceTech',
- key: 'science_tech ',
+ label: 'mental_health',
+ key: 'mental_health ',
+ },
+ {
+ label: 'organization',
+ key: 'organization ',
+ },
+ {
+ label: 'Recovery + Support Groups',
+ key: 'recovery_support_groups ',
+ },
+ {
+ label: 'spirituality',
+ key: 'spirituality ',
+ },
+ {
+ label: 'time_management',
+ key: 'time_management',
},
],
roleFilters: [],
diff --git a/website/client/components/groups/tavern.vue b/website/client/components/groups/tavern.vue
index c7ed03b4f9..c8e2af96a8 100644
--- a/website/client/components/groups/tavern.vue
+++ b/website/client/components/groups/tavern.vue
@@ -10,9 +10,10 @@
h3(v-once) {{ $t('tavernChat') }}
.row
- textarea(placeholder="Type a message to Habiticans here", v-model='newMessage', @keydown='updateCarretPosition')
+ textarea(placeholder="Friendly reminder: this is an all-ages chat, so please keep content and language appropriate! Consult the Community Guidelines in the sidebar if you have questions.", v-model='newMessage', @keydown='updateCarretPosition')
autocomplete(:text='newMessage', v-on:select="selectedAutocomplete", :coords='coords', :groupId='groupId')
button.btn.btn-secondary.send-chat.float-right(v-once, @click='sendMessage()') {{ $t('send') }}
+ button.btn.btn-secondary.float-left(v-once, @click='fetchRecentMessages()') {{ $t('fetchRecentMessages') }}
.row.community-guidelines(v-if='!communityGuidelinesAccepted')
div.col-8(v-once) {{ $t('communityGuidelinesIntro') }}
@@ -66,23 +67,23 @@
li
a(href='/static/community-guidelines', v-once) {{ $t('communityGuidelinesLink') }}
li
- a(href='/groups/guilds/f2db2a7f-13c5-454d-b3ee-ea1f5089e601', v-once) {{ $t('lookingForGroup') }}
+ router-link(to="/groups/guild/f2db2a7f-13c5-454d-b3ee-ea1f5089e601") {{ $t('lookingForGroup') }}
li
a(href='/static/faq', v-once) {{ $t('faq') }}
li
a(href='', v-html="$t('glossary')")
li
- a(href='http://habitica.wikia.com/wiki/Wiki', v-once) {{ $t('wiki') }}
+ a(href='http://habitica.wikia.com/wiki/Habitica_Wiki', v-once) {{ $t('wiki') }}
li
a(href='https://oldgods.net/habitrpg/habitrpg_user_data_display.html', v-once) {{ $t('dataDisplayTool') }}
li
- a(href='/groups/guilds/a29da26b-37de-4a71-b0c6-48e72a900dac', v-once) {{ $t('reportProblem') }}
+ router-link(to="/groups/guild/a29da26b-37de-4a71-b0c6-48e72a900dac") {{ $t('reportProblem') }}
li
a(href='https://trello.com/c/odmhIqyW/440-read-first-table-of-contents', v-once) {{ $t('requestFeature') }}
li
a(href='', v-html="$t('communityForum')")
li
- a(href='/groups/guilds/5481ccf3-5d2d-48a9-a871-70a7380cee5a', v-once) {{ $t('askQuestionGuild') }}
+ router-link(to="/groups/guild/5481ccf3-5d2d-48a9-a871-70a7380cee5a") {{ $t('askQuestionGuild') }}
.section-header
.row
@@ -478,6 +479,9 @@ export default {
this.group.chat.unshift(response.message);
this.newMessage = '';
},
+ async fetchRecentMessages () {
+ this.group = await this.$store.dispatch('guilds:getGroup', {groupId: TAVERN_ID});
+ },
},
};
diff --git a/website/client/components/notifications.vue b/website/client/components/notifications.vue
index 79073f4efd..48a3ad269a 100644
--- a/website/client/components/notifications.vue
+++ b/website/client/components/notifications.vue
@@ -1,5 +1,6 @@
div
+ yesterdaily-model(:yesterDailies='yesterDailies')
new-stuff
death
low-health
@@ -20,12 +21,15 @@ div
diff --git a/website/client/components/yesterdailyModel.vue b/website/client/components/yesterdailyModel.vue
new file mode 100644
index 0000000000..b2555e40dc
--- /dev/null
+++ b/website/client/components/yesterdailyModel.vue
@@ -0,0 +1,46 @@
+
+ b-modal#yesterdaily(:title="$t('armoireText')", size='lg', :hide-footer="true")
+ .modal-header
+ .shop_armoire.pull-right
+ .modal-body
+ task-column.col-6.offset-3(
+ v-if='tasksByType && tasksByType[column]'
+ v-for="column in ['daily']",
+ :type="column",
+ :key="column",
+ :taskListOverride='tasksByType[column]',
+ :isUser='true')
+ .modal-footer.text-center
+ button.btn.btn-primary(@click='close()') Start My Day
+
+
+
diff --git a/website/client/mixins/groupsUtilities.js b/website/client/mixins/groupsUtilities.js
index dea0dbf489..c4acd3027a 100644
--- a/website/client/mixins/groupsUtilities.js
+++ b/website/client/mixins/groupsUtilities.js
@@ -28,6 +28,8 @@ export default {
let isLeader = true;
let correctSize = true;
+ if (group._id === this.$store.state.constants.TAVERN_ID) return false;
+
if (search) {
passedSearch = group.name.toLowerCase().indexOf(search.toLowerCase()) >= 0;
}
diff --git a/website/common/locales/en/newClient.json b/website/common/locales/en/newClient.json
index 1f717e2fec..53189da793 100644
--- a/website/common/locales/en/newClient.json
+++ b/website/common/locales/en/newClient.json
@@ -259,5 +259,20 @@
"onward": "Onward!",
"tavernChat": "Tavern Chat",
"partyChatPlaceholder": "Type message to Party members here",
- "done": "Done"
+ "done": "Done",
+ "habitica_official": "Habitica Official",
+ "academics": "Academics",
+ "advocacy_causes": "Advocacy & Causes",
+ "creativity": "Creativity",
+ "entertainment": "Entertainment",
+ "finance": "Finance",
+ "health_fitness": "Health + Fitness",
+ "hobbies_occupations": "Hobbies + Occupations",
+ "location_based": "Location-based",
+ "mental_health": "Mental Health + Self-Care",
+ "getting_organized": "Getting Organized",
+ "self_improvement": "Self-Improvement",
+ "spirituality": "Spirituality",
+ "time_management": "Time-Management + Accountability",
+ "recovery_support_groups": "Recovery + Support Groups"
}