From 5995dd235d85e46255be7564fc88a4120a44863d Mon Sep 17 00:00:00 2001 From: Keith Holliday Date: Wed, 9 Aug 2017 10:56:48 -0600 Subject: [PATCH] New client more updates (#8934) * Added api token to page * Fixed wiki link * Added categoires * Removed extra create challenge button. Add prize model and user balance deduction * Added pending filter * Added member sort * Added confirmation for leaving * Filtered tavern * Added redirect to newly created guild * Made guild links routerlinks * Fixed wiki link and added fetch recent messages * Show backgrounds only on edit. Fixed glasses equip * Added link to register page * Added yesterdailies * Added achievement footer * Update guild badges * Added avatar to achievement avatar component * More guild crests updates * Achievement footer and avatar added * Added notification read * Removed duplicate string --- .../assets/svg/bronze-guild-badge-large.svg | 1 + .../assets/svg/bronze-guild-badge-small.svg | 1 + .../client/assets/svg/bronze-guild-badge.svg | 18 --- .../assets/svg/gold-guild-badge-large.svg | 1 + .../assets/svg/gold-guild-badge-small.svg | 1 + .../client/assets/svg/gold-guild-badge.svg | 10 -- .../assets/svg/silver-guild-badge-large.svg | 1 + .../assets/svg/silver-guild-badge-small.svg | 1 + .../client/assets/svg/silver-guild-badge.svg | 18 --- .../achievements/achievementAvatar.vue | 35 ++++++ .../achievements/achievementFooter.vue | 28 +++++ .../components/achievements/contributor.vue | 11 +- .../components/achievements/invitedFriend.vue | 11 +- .../achievements/joinedChallenge.vue | 11 +- .../components/achievements/joinedGuild.vue | 12 +- .../components/achievements/rebirth.vue | 11 +- .../client/components/achievements/streak.vue | 11 +- .../components/achievements/ultimateGear.vue | 11 +- .../components/achievements/wonChallenge.vue | 27 +++-- website/client/components/appHeader.vue | 2 +- website/client/components/appMenu.vue | 2 +- website/client/components/avatar.vue | 80 ++++++------- .../components/challenges/challengeModal.vue | 79 ++++--------- .../components/challenges/groupChallenges.vue | 1 - .../components/challenges/myChallenges.vue | 6 +- .../client/components/challenges/sidebar.vue | 74 +++--------- website/client/components/creatorIntro.vue | 5 +- .../components/groups/groupFormModal.vue | 67 ++++++----- website/client/components/groups/guild.vue | 28 ++--- .../client/components/groups/membersModal.vue | 34 +++++- .../components/groups/publicGuildItem.vue | 6 +- website/client/components/groups/sidebar.vue | 62 ++++++----- website/client/components/groups/tavern.vue | 14 ++- website/client/components/notifications.vue | 105 ++++++------------ website/client/components/settings/api.vue | 7 +- website/client/components/static/front.vue | 2 +- website/client/components/static/home.vue | 30 ----- .../client/components/yesterdailyModel.vue | 46 ++++++++ website/client/mixins/groupsUtilities.js | 2 + website/common/locales/en/newClient.json | 17 ++- 40 files changed, 468 insertions(+), 421 deletions(-) create mode 100644 website/client/assets/svg/bronze-guild-badge-large.svg create mode 100644 website/client/assets/svg/bronze-guild-badge-small.svg delete mode 100644 website/client/assets/svg/bronze-guild-badge.svg create mode 100644 website/client/assets/svg/gold-guild-badge-large.svg create mode 100644 website/client/assets/svg/gold-guild-badge-small.svg delete mode 100755 website/client/assets/svg/gold-guild-badge.svg create mode 100644 website/client/assets/svg/silver-guild-badge-large.svg create mode 100644 website/client/assets/svg/silver-guild-badge-small.svg delete mode 100644 website/client/assets/svg/silver-guild-badge.svg create mode 100644 website/client/components/achievements/achievementAvatar.vue create mode 100644 website/client/components/achievements/achievementFooter.vue delete mode 100644 website/client/components/static/home.vue create mode 100644 website/client/components/yesterdailyModel.vue 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 @@ +Bronze_Large \ 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 @@ +Bronze_Small \ 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 @@ +Gold_Large \ 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 @@ +Gold_Small \ 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 @@ - - -gold-guild-badge - - - - - - - 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 @@ +Silver_Large \ 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 @@ +Silver_Small \ 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 @@ + + + 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 @@ + + + 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 @@ 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 @@ 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 @@ + + + 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" }