krikkert/habitica
1
0
Fork 0
mirror of https://github.com/HabitRPG/habitica.git synced 2025-12-16 22:27:26 +01:00
Code Issues Packages Projects Releases Wiki Activity

Sept 7 fixes (#9022)

Browse Source 
* Fixed login incentives header

* Added achievement hover

* Removed grassy background from editing modal

* Fixed loading of other user equipment

* Prevented non admins from using habitica official

* Fixed challenge loading and leader changing on group reload

* Added community guidlines link

* Added challenge cloning

* Fixed heroes editing
This commit is contained in:
Keith Holliday
2017-09-07 13:26:53 -06:00
committed by GitHub
parent d9817be8f3
commit 3e1c128600
15 changed files with 183 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
website/client/components/userMenu/profile.vue
View File

@@ -23,7 +23,7 @@ div
.nav-item(@click='selectedPage = "profile"', :class="{active: selectedPage === 'profile'}") Profile
.nav-item(@click='selectedPage = "stats"', :class="{active: selectedPage === 'stats'}") Stats
.nav-item(@click='selectedPage = "achievements"', :class="{active: selectedPage === 'achievements'}") Achievements
.standard-page(v-show='selectedPage === "profile"', v-if='user.profile')
#userProfile.standard-page(v-show='selectedPage === "profile"', v-if='user.profile')
.row
.col-8
.header
@@ -91,17 +91,12 @@ div
#achievements.standard-page.container(v-show='selectedPage === "achievements"', v-if='user.achievements')
.row(v-for='(category, key) in achievements')
h2.col-12.text-center {{ $t(key+'Achievs') }}
.col-3.text-center(v-for='achievment in category.achievements')
.box.achievement-container(:class='{"achievement-unearned": !achievment.earned}', :data-popover-html='achievment.title + achievment.text',
popover-placement='achievPopoverPlacement',
popover-append-to-body='achievAppendToBody')
div(popover-trigger='mouseenter',
:data-popover-html='achievment.title + achievment.text',
popover-placement='achievPopoverPlacement',
popover-append-to-body='achievAppendToBody')
.achievement(:class='achievment.icon + "2x"', v-if='achievment.earned')
.counter.badge.badge-info.stack-count(v-if='achievment.optionalCount') {{achievment.optionalCount}}
.achievement.achievement-unearned(class='achievement-unearned2x', v-if='!achievment.earned')
.col-3.text-center(v-for='(achievment, key) in category.achievements')
.box.achievement-container(:id='key', :class='{"achievement-unearned": !achievment.earned}')
b-popover(:target="'#' + key", triggers="hover", placement="top", :content="achievment.title + achievment.text")
.achievement(:class='achievment.icon + "2x"', v-if='achievment.earned')
.counter.badge.badge-info.stack-count(v-if='achievment.optionalCount') {{achievment.optionalCount}}
.achievement.achievement-unearned(class='achievement-unearned2x', v-if='!achievment.earned')
hr.col-12
.row
.col-6(v-if='user.achievements.challenges')
@@ -548,6 +543,7 @@ import autoAllocate from '../../../common/script/fns/autoAllocate';
import allocate from '../../../common/script/ops/allocate';
import MemberDetails from '../memberDetails';
import bPopover from 'bootstrap-vue/lib/components/popover';
import privateMessageModal from 'client/components/private-message-modal';
import sendGemsModal from 'client/components/payments/sendGemsModal';
import markdown from 'client/directives/markdown';
@@ -573,6 +569,7 @@ export default {
sendGemsModal,
MemberDetails,
toggleSwitch,
bPopover,
},
data () {
return {
@@ -625,9 +622,13 @@ export default {
...mapState({
userLoggedIn: 'user.data',
flatGear: 'content.gear.flat',
equippedItems: 'user.data.items.gear.equipped',
costumeItems: 'user.data.items.gear.costume',
}),
equippedItems () {
return this.user.items.gear.equipped;
},
costumeItems () {
return this.user.items.gear.costume;
},
user () {
let user = this.userLoggedIn;