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

fix achievements

Browse Source
This commit is contained in:
Matteo Pagliazzi
2019-10-12 16:41:18 +02:00
parent 07349c70bc
commit 7b4671fbf9
25 changed files with 341 additions and 149 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
website/client/src/components/achievements/achievementFooter.vue
View File

@@ -11,17 +11,25 @@
class="twitter-share-button share-button" class="twitter-share-button share-button"
:href="twitterLink" :href="twitterLink"
target="_blank" target="_blank"
><div >
class="social-icon twitter svg-icon" <div
v-html="icons.twitter" class="social-icon twitter svg-icon"
></div>{{ $t('tweet') }}</a><a v-html="icons.twitter"
></div>
{{ $t('tweet') }}
</a>
<a
class="fb-share-button share-button" class="fb-share-button share-button"
:href="facebookLink" :href="facebookLink"
target="_blank" target="_blank"
><div >
class="social-icon facebook svg-icon" <div
v-html="icons.facebook" class="social-icon facebook svg-icon"
></div>{{ $t('share') }}</a><!-- @TODO: Still want this? .col-4a.tumblr-share-button(:data-href='socialLevelLink', data-notes='none')--> v-html="icons.facebook"
></div>
{{ $t('share') }}
</a>
<!-- @TODO: Still want this? .col-4a.tumblr-share-button(:data-href='socialLevelLink', data-notes='none')-->
</div> </div>
</div> </div>
</div> </div>

7
website/client/src/components/achievements/armoireEmpty.vue
View File

@@ -8,10 +8,13 @@
<div class="modal-body"> <div class="modal-body">
<div class="row"> <div class="row">
<div class="col-6 offset-3"> <div class="col-6 offset-3">
<div class="shop_armoire"></div><p>{{ $t('armoireLastItem') }}</p><p>{{ $t('armoireNotesEmpty') }}</p> <div class="shop_armoire"></div>
<p>{{ $t('armoireLastItem') }}</p>
<p>{{ $t('armoireNotesEmpty') }}</p>
</div> </div>
</div> </div>
</div><div class="modal-footer"> </div>
<div class="modal-footer">
<div class="col-12 text-center"> <div class="col-12 text-center">
<button <button
class="btn btn-primary" class="btn btn-primary"

31
website/client/src/components/achievements/chooseClass.vue
View File

@@ -10,8 +10,10 @@
<div class="modal-body select-class"> <div class="modal-body select-class">
<h1 class="header-purple text-center"> <h1 class="header-purple text-center">
{{ $t('chooseClass') }} {{ $t('chooseClass') }}
</h1><div class="container-fluid"> </h1>
<br><div class="row"> <div class="container-fluid">
<br>
<div class="row">
<div <div
v-for="heroClass in classes" v-for="heroClass in classes"
class="col-md-3" class="col-md-3"
@@ -30,7 +32,9 @@
/> />
</div> </div>
</div> </div>
</div><br><div </div>
<br>
<div
v-for="heroClass in classes" v-for="heroClass in classes"
class="d-flex justify-content-center" class="d-flex justify-content-center"
> >
@@ -43,43 +47,50 @@
class="svg-icon align-self-center" class="svg-icon align-self-center"
v-html="icons[heroClass]" v-html="icons[heroClass]"
></div> ></div>
</div><div </div>
<div
class="class-name" class="class-name"
:class="`${heroClass}-color`" :class="`${heroClass}-color`"
> >
{{ $t(heroClass) }} {{ $t(heroClass) }}
</div> </div>
</div> </div>
</div><div v-for="heroClass in classes"> </div>
<div v-for="heroClass in classes">
<div <div
v-if="selectedClass === heroClass" v-if="selectedClass === heroClass"
class="class-explanation text-center" class="class-explanation text-center"
> >
{{ $t(`${heroClass}Text`) }} {{ $t(`${heroClass}Text`) }}
</div> </div>
</div><div </div>
<div
v-markdown="$t('chooseClassLearnMarkdown')" v-markdown="$t('chooseClassLearnMarkdown')"
class="text-center" class="text-center"
></div><div class="modal-actions text-center"> ></div>
<div class="modal-actions text-center">
<button <button
v-if="!selectedClass" v-if="!selectedClass"
class="btn btn-primary d-inline-block" class="btn btn-primary d-inline-block"
:disabled="true" :disabled="true"
> >
{{ $t('select') }} {{ $t('select') }}
</button><button </button>
<button
v-else v-else
class="btn btn-primary d-inline-block" class="btn btn-primary d-inline-block"
@click="clickSelectClass(selectedClass); close();" @click="clickSelectClass(selectedClass); close();"
> >
{{ $t('selectClass', {heroClass: $t(selectedClass)}) }} {{ $t('selectClass', {heroClass: $t(selectedClass)}) }}
</button><div class="opt-out-wrapper"> </button>
<div class="opt-out-wrapper">
<span <span
id="classOptOutBtn" id="classOptOutBtn"
class="danger" class="danger"
@click="clickDisableClasses(); close();" @click="clickDisableClasses(); close();"
>{{ $t('optOutOfClasses') }}</span> >{{ $t('optOutOfClasses') }}</span>
</div><span class="opt-out-description">{{ $t('optOutOfClassesText') }}</span> </div>
<span class="opt-out-description">{{ $t('optOutOfClassesText') }}</span>
</div> </div>
</div> </div>
</div> </div>

17
website/client/src/components/achievements/contributor.vue
View File

@@ -8,19 +8,26 @@
<div class="modal-body"> <div class="modal-body">
<div class="col-12"> <div class="col-12">
<achievement-avatar class="avatar" /> <achievement-avatar class="avatar" />
</div><div class="col-6 offset-3 text-center"> </div>
{{ $t('contribModal', {name: user.profile.name, level: user.contributor.level}) }}<br><a <div class="col-6 offset-3 text-center">
{{ $t('contribModal', {name: user.profile.name, level: user.contributor.level}) }}
<br>
<a
:href="$t('conRewardsURL')" :href="$t('conRewardsURL')"
target="_blank" target="_blank"
>{{ $t('contribLink') }}</a><br><button >{{ $t('contribLink') }}</a>
<br>
<button
class="btn btn-primary" class="btn btn-primary"
style="margin-top:1em" style="margin-top:1em"
@click="close()" @click="close()"
> >
{{ $t('huzzah') }} {{ $t('huzzah') }}
</button><br> </button>
<br>
</div> </div>
</div><achievement-footer /> </div>
<achievement-footer />
</b-modal> </b-modal>
</template> </template>

23
website/client/src/components/achievements/death.vue
View File

@@ -15,7 +15,8 @@
:tooltip="$t('health')" :tooltip="$t('health')"
> >
<span class="glyphicon glyphicon-heart"></span> <span class="glyphicon glyphicon-heart"></span>
</div><div </div>
<div
class="meter health" class="meter health"
:tooltip="Math.round(user.stats.hp * 100) / 100" :tooltip="Math.round(user.stats.hp * 100) / 100"
> >
@@ -23,28 +24,36 @@
class="bar" class="bar"
:style="barStyle" :style="barStyle"
></div> ></div>
</div><!-- span.meter-text.value| {{Math.ceil(user.stats.hp)}} / {{maxHealth}}--><avatar </div>
<!-- span.meter-text.value| {{Math.ceil(user.stats.hp)}} / {{maxHealth}}-->
<avatar
:member="user" :member="user"
:sleep="true" :sleep="true"
:avatar-only="true" :avatar-only="true"
:with-background="true" :with-background="true"
/><!-- @TOOD: Sleep +generatedAvatar({sleep:true})--><span class="knockout"></span> />
<!-- @TOOD: Sleep +generatedAvatar({sleep:true})-->
<span class="knockout"></span>
</div> </div>
</div><div class="col-6 offset-3"> </div>
<div class="col-6 offset-3">
<h4 class="dont-despair"> <h4 class="dont-despair">
{{ $t('dontDespair') }} {{ $t('dontDespair') }}
</h4><p class="death-penalty"> </h4>
<p class="death-penalty">
{{ $t('deathPenaltyDetails') }} {{ $t('deathPenaltyDetails') }}
</p> </p>
</div> </div>
</div><div class="modal-footer"> </div>
<div class="modal-footer">
<div class="col-12 text-center"> <div class="col-12 text-center">
<button <button
class="btn btn-danger" class="btn btn-danger"
@click="revive()" @click="revive()"
> >
{{ $t('refillHealthTryAgain') }} {{ $t('refillHealthTryAgain') }}
</button><h4 </button>
<h4
class="text-center" class="text-center"
v-html="$t('dyingOftenTips')" v-html="$t('dyingOftenTips')"
></h4> ></h4>

10
website/client/src/components/achievements/dropsEnabled.vue
View File

@@ -7,9 +7,15 @@
> >
<div class="modal-body"> <div class="modal-body">
<div class="col-6 offset-3 text-center"> <div class="col-6 offset-3 text-center">
<p></p><div class="item-drop-icon Pet_Egg_Wolf"></div><span v-html="firstDropText"></span></p><p></p><div class="item-drop-icon Pet_Currency_Gem"></div><span v-html="$t('useGems')"></span></p> <p></p>
<div class="item-drop-icon Pet_Egg_Wolf"></div>
<span v-html="firstDropText"></span>
<p></p>
<div class="item-drop-icon Pet_Currency_Gem"></div>
<span v-html="$t('useGems')"></span>
</div> </div>
</div><div class="modal-footer"> </div>
<div class="modal-footer">
<div class="col-12 text-center"> <div class="col-12 text-center">
<button <button
class="btn btn-primary" class="btn btn-primary"

9
website/client/src/components/achievements/genericAchievement.vue
View File

@@ -8,15 +8,18 @@
<div class="modal-body"> <div class="modal-body">
<div class="col-12"> <div class="col-12">
<achievement-avatar class="avatar" /> <achievement-avatar class="avatar" />
</div><div class="col-6 offset-3 text-center"> </div>
<p v-html="data.modalText"></p><button <div class="col-6 offset-3 text-center">
<p v-html="data.modalText"></p>
<button
class="btn btn-primary" class="btn btn-primary"
@click="close()" @click="close()"
> >
{{ $t('huzzah') }} {{ $t('huzzah') }}
</button> </button>
</div> </div>
</div><achievement-footer /> </div>
<achievement-footer />
</b-modal> </b-modal>
</template> </template>

13
website/client/src/components/achievements/invitedFriend.vue
View File

@@ -7,16 +7,21 @@
> >
<div class="modal-body"> <div class="modal-body">
<div class="col-12"> <div class="col-12">
<!-- @TODO: +achievementAvatar('friends',0)--><achievement-avatar class="avatar" /> <!-- @TODO: +achievementAvatar('friends',0)-->
</div><div class="col-6 offset-3 text-center"> <achievement-avatar class="avatar" />
<p>{{ $t('invitedFriendText') }}</p><br><button </div>
<div class="col-6 offset-3 text-center">
<p>{{ $t('invitedFriendText') }}</p>
<br>
<button
class="btn btn-primary" class="btn btn-primary"
@click="close()" @click="close()"
> >
{{ $t('huzzah') }} {{ $t('huzzah') }}
</button> </button>
</div> </div>
</div><achievement-footer /> </div>
<achievement-footer />
</b-modal> </b-modal>
</template> </template>

13
website/client/src/components/achievements/joinedChallenge.vue
View File

@@ -7,16 +7,21 @@
> >
<div class="modal-body"> <div class="modal-body">
<div class="col-12"> <div class="col-12">
<!-- @TODO: +achievementAvatar('challenge',0)--><achievement-avatar class="avatar" /> <!-- @TODO: +achievementAvatar('challenge',0)-->
</div><div class="col-6 offset-3 text-center"> <achievement-avatar class="avatar" />
<p>{{ $t('joinedChallengeText') }}</p><br><button </div>
<div class="col-6 offset-3 text-center">
<p>{{ $t('joinedChallengeText') }}</p>
<br>
<button
class="btn btn-primary" class="btn btn-primary"
@click="close()" @click="close()"
> >
{{ $t('huzzah') }} {{ $t('huzzah') }}
</button> </button>
</div> </div>
</div><achievement-footer /> </div>
<achievement-footer />
</b-modal> </b-modal>
</template> </template>

13
website/client/src/components/achievements/joinedGuild.vue
View File

@@ -7,16 +7,21 @@
> >
<div class="modal-body"> <div class="modal-body">
<div class="col-12"> <div class="col-12">
<!-- @TODO: +achievementAvatar('guild',0)--><achievement-avatar class="avatar" /> <!-- @TODO: +achievementAvatar('guild',0)-->
</div><div class="col-6 offset-3 text-center"> <achievement-avatar class="avatar" />
<p>{{ $t('joinedGuildText') }}</p><br><button </div>
<div class="col-6 offset-3 text-center">
<p>{{ $t('joinedGuildText') }}</p>
<br>
<button
class="btn btn-primary" class="btn btn-primary"
@click="close()" @click="close()"
> >
{{ $t('huzzah') }} {{ $t('huzzah') }}
</button> </button>
</div> </div>
</div><achievement-footer /> </div>
<achievement-footer />
</b-modal> </b-modal>
</template> </template>

9
website/client/src/components/achievements/justAddWater.vue
View File

@@ -8,15 +8,18 @@
<div class="modal-body"> <div class="modal-body">
<div class="col-12"> <div class="col-12">
<achievement-avatar class="avatar" /> <achievement-avatar class="avatar" />
</div><div class="col-6 offset-3 text-center"> </div>
<p>{{ $t('achievementJustAddWaterModalText') }}</p><button <div class="col-6 offset-3 text-center">
<p>{{ $t('achievementJustAddWaterModalText') }}</p>
<button
class="btn btn-primary" class="btn btn-primary"
@click="close()" @click="close()"
> >
{{ $t('huzzah') }} {{ $t('huzzah') }}
</button> </button>
</div> </div>
</div><achievement-footer /> </div>
<achievement-footer />
</b-modal> </b-modal>
</template> </template>

44
website/client/src/components/achievements/levelUp.vue
View File

@@ -7,39 +7,53 @@
:hide-header="true" :hide-header="true"
> >
<div class="modal-body text-center"> <div class="modal-body text-center">
<h2>{{ $t('reachedLevel', {level: user.stats.lvl}) }}</h2><avatar <h2>{{ $t('reachedLevel', {level: user.stats.lvl}) }}</h2>
<avatar
class="avatar" class="avatar"
:member="user" :member="user"
/><p class="text"> />
<p class="text">
{{ $t('levelup') }} {{ $t('levelup') }}
</p><button </p>
<button
class="btn btn-primary" class="btn btn-primary"
@click="close()" @click="close()"
> >
{{ $t('onwards') }} {{ $t('onwards') }}
</button><br><!-- @TODO: Keep this? .checkboxinput(type='checkbox', v-model= </button>
<br>
<!-- @TODO: Keep this? .checkboxinput(type='checkbox', v-model=
'user.preferences.suppressModals.levelUp', @change='changeLevelupSuppress()') 'user.preferences.suppressModals.levelUp', @change='changeLevelupSuppress()')
label(style='display:inline-block') {{ $t('dontShowAgain') }} label(style='display:inline-block') {{ $t('dontShowAgain') }}
--> -->
</div><div class="container-fluid share-buttons"> </div>
<div class="container-fluid share-buttons">
<div class="row"> <div class="row">
<div class="col-12 text-center"> <div class="col-12 text-center">
<a <a
class="twitter-share-button share-button" class="twitter-share-button share-button"
:href="twitterLink" :href="twitterLink"
target="_blank" target="_blank"
><div >
class="social-icon twitter svg-icon" <div
v-html="icons.twitter" class="social-icon twitter svg-icon"
></div>{{ $t('tweet') }}</a><a v-html="icons.twitter"
></div>
{{ $t('tweet') }}
</a>
<a
class="fb-share-button share-button" class="fb-share-button share-button"
:href="facebookLink" :href="facebookLink"
target="_blank" target="_blank"
><div >
class="social-icon facebook svg-icon" <div
v-html="icons.facebook" class="social-icon facebook svg-icon"
></div>{{ $t('share') }}</a> v-html="icons.facebook"
</div><!-- @TODO: Still want this? .col-4a.tumblr-share-button(:data-href='socialLevelLink', data-notes='none')--> ></div>
{{ $t('share') }}
</a>
</div>
<!-- @TODO: Still want this? .col-4a.tumblr-share-button(:data-href='socialLevelLink', data-notes='none')-->
</div> </div>
</div> </div>
</b-modal> </b-modal>

30
website/client/src/components/achievements/login-incentives.vue
View File

@@ -13,7 +13,8 @@
> >
{{ $t('unlockedReward', {reward: data.rewardText}) }} {{ $t('unlockedReward', {reward: data.rewardText}) }}
</h3> </h3>
</div><div class="row reward-row"> </div>
<div class="row reward-row">
<div class="col-12"> <div class="col-12">
<avatar <avatar
class="avatar" class="avatar"
@@ -21,7 +22,8 @@
:avatar-only="true" :avatar-only="true"
:with-background="true" :with-background="true"
/> />
</div><div </div>
<div
v-if="nextReward" v-if="nextReward"
class="text-center col-12" class="text-center col-12"
> >
@@ -32,48 +34,56 @@
<div <div
v-if="nextReward.rewardKey.length === 1" v-if="nextReward.rewardKey.length === 1"
:class="nextReward.rewardKey[0]" :class="nextReward.rewardKey[0]"
></div><div ></div>
<div
v-for="reward in nextReward.rewardKey" v-for="reward in nextReward.rewardKey"
v-if="nextReward.rewardKey.length > 1" v-if="nextReward.rewardKey.length > 1"
class="reward" class="reward"
:class="reward" :class="reward"
></div> ></div>
</div><div </div>
<div
v-if="data.rewardText" v-if="data.rewardText"
class="reward-wrap" class="reward-wrap"
> >
<div <div
v-if="data.rewardKey.length === 1" v-if="data.rewardKey.length === 1"
:class="data.rewardKey[0]" :class="data.rewardKey[0]"
></div><div ></div>
<div
v-for="reward in data.rewardKey" v-for="reward in data.rewardKey"
v-if="data.rewardKey.length > 1" v-if="data.rewardKey.length > 1"
class="reward" class="reward"
:class="reward" :class="reward"
></div> ></div>
</div> </div>
</div><div </div>
<div
v-if="data && data.nextRewardAt" v-if="data && data.nextRewardAt"
class="col-12 text-center" class="col-12 text-center"
> >
<h4>{{ $t('countLeft', {count: data.nextRewardAt - user.loginIncentives}) }}</h4> <h4>{{ $t('countLeft', {count: data.nextRewardAt - user.loginIncentives}) }}</h4>
</div> </div>
</div><div class="row"> </div>
<div class="row">
<div <div
v-if="data.rewardText" v-if="data.rewardText"
class="col-12 text-center" class="col-12 text-center"
> >
<p>{{ $t('earnedRewardForDevotion', {reward: data.rewardText}) }}</p> <p>{{ $t('earnedRewardForDevotion', {reward: data.rewardText}) }}</p>
</div><div class="col-12 text-center"> </div>
<div class="col-12 text-center">
<p>{{ $t('incentivesDescription') }}</p> <p>{{ $t('incentivesDescription') }}</p>
</div><div </div>
<div
v-if="data && data.nextRewardAt" v-if="data && data.nextRewardAt"
class="col-12 text-center" class="col-12 text-center"
> >
<h3>{{ $t('nextRewardUnlocksIn', {numberOfCheckinsLeft: data.nextRewardAt - user.loginIncentives}) }}</h3> <h3>{{ $t('nextRewardUnlocksIn', {numberOfCheckinsLeft: data.nextRewardAt - user.loginIncentives}) }}</h3>
</div> </div>
</div> </div>
</div><div class="modal-footer"> </div>
<div class="modal-footer">
<div class="col-12 text-center"> <div class="col-12 text-center">
<button <button
class="btn btn-primary" class="btn btn-primary"

9
website/client/src/components/achievements/lostMasterclasser.vue
View File

@@ -8,15 +8,18 @@
<div class="modal-body"> <div class="modal-body">
<div class="col-12"> <div class="col-12">
<achievement-avatar class="avatar" /> <achievement-avatar class="avatar" />
</div><div class="col-6 offset-3 text-center"> </div>
<p>{{ $t('achievementLostMasterclasserModalText') }}</p><button <div class="col-6 offset-3 text-center">
<p>{{ $t('achievementLostMasterclasserModalText') }}</p>
<button
class="btn btn-primary" class="btn btn-primary"
@click="close()" @click="close()"
> >
{{ $t('huzzah') }} {{ $t('huzzah') }}
</button> </button>
</div> </div>
</div><achievement-footer /> </div>
<achievement-footer />
</b-modal> </b-modal>
</template> </template>

32
website/client/src/components/achievements/lowHealth.vue
View File

@@ -12,37 +12,49 @@
:tooltip="$t('health')" :tooltip="$t('health')"
> >
<span class="glyphicon glyphicon-heart"></span> <span class="glyphicon glyphicon-heart"></span>
</div><div </div>
<div
class="meter health" class="meter health"
:tooltip="Math.round(user.stats.hp * 100) / 100" :tooltip="Math.round(user.stats.hp * 100) / 100"
> >
<div <div
class="bar" class="bar"
:style="barStyle" :style="barStyle"
></div><span class="meter-text value">{{ healthLeft }}</span> ></div>
<span class="meter-text value">{{ healthLeft }}</span>
</div> </div>
</div><div class="col-12"> </div>
<div class="col-12">
<avatar <avatar
:member="user" :member="user"
:avatar-only="true" :avatar-only="true"
:with-background="true" :with-background="true"
/> />
</div><div class="col-12"> </div>
<p>{{ $t('losingHealthWarning2') }}</p><h4>{{ $t('toRegainHealth') }}</h4><ul> <div class="col-12">
<p>{{ $t('losingHealthWarning2') }}</p>
<h4>{{ $t('toRegainHealth') }}</h4>
<ul>
<li class="spaced"> <li class="spaced">
{{ $t('lowHealthTips1') }} {{ $t('lowHealthTips1') }}
</li><li class="spaced"> </li>
<li class="spaced">
{{ $t('lowHealthTips2') }} {{ $t('lowHealthTips2') }}
</li> </li>
</ul><h4>{{ $t('losingHealthQuickly') }}</h4><ul> </ul>
<h4>{{ $t('losingHealthQuickly') }}</h4>
<ul>
<li class="spaced"> <li class="spaced">
{{ $t('lowHealthTips3') }} {{ $t('lowHealthTips3') }}
</li><li class="spaced"> </li>
<li class="spaced">
{{ $t('lowHealthTips4') }} {{ $t('lowHealthTips4') }}
</li> </li>
</ul><h4>{{ $t('goodLuck') }}</h4> </ul>
<h4>{{ $t('goodLuck') }}</h4>
</div> </div>
</div><div class="modal-footer"> </div>
<div class="modal-footer">
<div class="col-12 text-center"> <div class="col-12 text-center">
<button <button
class="btn btn-primary" class="btn btn-primary"

9
website/client/src/components/achievements/mindOverMatter.vue
View File

@@ -8,15 +8,18 @@
<div class="modal-body"> <div class="modal-body">
<div class="col-12"> <div class="col-12">
<achievement-avatar class="avatar" /> <achievement-avatar class="avatar" />
</div><div class="col-6 offset-3 text-center"> </div>
<p>{{ $t('achievementMindOverMatterModalText') }}</p><button <div class="col-6 offset-3 text-center">
<p>{{ $t('achievementMindOverMatterModalText') }}</p>
<button
class="btn btn-primary" class="btn btn-primary"
@click="close()" @click="close()"
> >
{{ $t('huzzah') }} {{ $t('huzzah') }}
</button> </button>
</div> </div>
</div><achievement-footer /> </div>
<achievement-footer />
</b-modal> </b-modal>
</template> </template>

9
website/client/src/components/achievements/newStuff.vue
View File

@@ -12,17 +12,20 @@
class="static-view" class="static-view"
v-html="html" v-html="html"
></div> ></div>
</div><div class="modal-footer"> </div>
<div class="modal-footer">
<a <a
class="btn btn-info" class="btn btn-info"
href="http://habitica.fandom.com/wiki/Whats_New" href="http://habitica.fandom.com/wiki/Whats_New"
target="_blank" target="_blank"
>{{ this.$t('newsArchive') }}</a><button >{{ this.$t('newsArchive') }}</a>
<button
class="btn btn-secondary" class="btn btn-secondary"
@click="tellMeLater()" @click="tellMeLater()"
> >
{{ this.$t('tellMeLater') }} {{ this.$t('tellMeLater') }}
</button><button </button>
<button
class="btn btn-warning" class="btn btn-warning"
@click="dismissAlert();" @click="dismissAlert();"
> >

12
website/client/src/components/achievements/questCompleted.vue
View File

@@ -13,15 +13,19 @@
<div <div
class="quest" class="quest"
:class="`quest_${user.party.quest.completed}`" :class="`quest_${user.party.quest.completed}`"
></div><p ></div>
<p
v-if="questData.completion && typeof questData.completion === 'function'" v-if="questData.completion && typeof questData.completion === 'function'"
v-html="questData.completion()" v-html="questData.completion()"
></p><div class="quest-rewards text-center"> ></p>
<div class="quest-rewards text-center">
<h3 v-once> <h3 v-once>
{{ $t('paymentYouReceived') }} {{ $t('paymentYouReceived') }}
</h3><questDialogDrops :item="questData" /> </h3>
<questDialogDrops :item="questData" />
</div> </div>
</div><div class="modal-footer"> </div>
<div class="modal-footer">
<button <button
class="btn btn-primary" class="btn btn-primary"
@click="setQuestCompleted()" @click="setQuestCompleted()"

8
website/client/src/components/achievements/rebirthEnabled.vue
View File

@@ -7,9 +7,13 @@
> >
<div class="modal-body"> <div class="modal-body">
<div class="col-12"> <div class="col-12">
<div class="rebirth_orb"></div><p><span>{{ $t('rebirthUnlock') }}</span></p> <div class="rebirth_orb"></div>
<p>
<span>{{ $t('rebirthUnlock') }}</span>
</p>
</div> </div>
</div><div class="modal-footer"> </div>
<div class="modal-footer">
<div class="col-12 text-center"> <div class="col-12 text-center">
<button <button
class="btn btn-primary" class="btn btn-primary"

26
website/client/src/components/achievements/streak.vue
View File

@@ -7,26 +7,38 @@
> >
<div class="modal-body"> <div class="modal-body">
<div class="col-12"> <div class="col-12">
<!-- @TODO: +achievementAvatar('thermometer',2.5)--><achievement-avatar class="avatar" /> <!-- @TODO: +achievementAvatar('thermometer',2.5)-->
</div><div class="col-6 offset-3 text-center"> <achievement-avatar class="avatar" />
</div>
<div class="col-6 offset-3 text-center">
<h3 v-if="user.achievements.streak === 1"> <h3 v-if="user.achievements.streak === 1">
{{ $t('firstStreakAchievement') }} {{ $t('firstStreakAchievement') }}
</h3><h3 v-if="user.achievements.streak > 1"> </h3>
<h3
v-if="user.achievements.streak > 1"
>
{{ $t('streakAchievementCount', {streaks: user.achievements.streak}) }} {{ $t('streakAchievementCount', {streaks: user.achievements.streak}) }}
</h3><p>{{ $t('twentyOneDays') }}</p><p>{{ $t('dontBreakStreak') }}</p><br><button </h3>
<p>{{ $t('twentyOneDays') }}</p>
<p>{{ $t('dontBreakStreak') }}</p>
<br>
<button
class="btn btn-primary" class="btn btn-primary"
@click="close()" @click="close()"
> >
{{ $t('dontStop') }} {{ $t('dontStop') }}
</button><div class="checkbox"> </button>
<div class="checkbox">
<input <input
v-model="user.preferences.suppressModals.streak" v-model="user.preferences.suppressModals.streak"
type="checkbox" type="checkbox"
@change="suppressModals" @change="suppressModals"
><label>{{ $t('dontShowAgain') }}</label> >
<label>{{ $t('dontShowAgain') }}</label>
</div> </div>
</div> </div>
</div><achievement-footer /> </div>
<achievement-footer />
</b-modal> </b-modal>
</template> </template>

11
website/client/src/components/achievements/testing.vue
View File

@@ -6,8 +6,12 @@
:hide-footer="true" :hide-footer="true"
> >
<div class="modal-body text-center"> <div class="modal-body text-center">
<br><div class="scene_guilds"></div><br><h4>{{ $t('guildReminderText1') }}</h4> <br>
</div><div class="modal-footer"> <div class="scene_guilds"></div>
<br>
<h4>{{ $t('guildReminderText1') }}</h4>
</div>
<div class="modal-footer">
<div class="container-fluid"> <div class="container-fluid">
<div class="row"> <div class="row">
<div class="col-6 text-center"> <div class="col-6 text-center">
@@ -17,7 +21,8 @@
> >
{{ $t('guildReminderDismiss') }} {{ $t('guildReminderDismiss') }}
</button> </button>
</div><div </div>
<div
class="col-6 text-center" class="col-6 text-center"
@click="close()" @click="close()"
> >

14
website/client/src/components/achievements/testingletiant.vue
View File

@@ -5,9 +5,14 @@
size="lg" size="lg"
:hide-footer="true" :hide-footer="true"
> >
<div class="modal-content"></div><div class="modal-body text-center"> <div class="modal-content"></div>
<br><div class="scene_guilds"></div><br><h4>{{ $t('guildReminderText2') }}</h4> <div class="modal-body text-center">
</div><div class="modal-footer"> <br>
<div class="scene_guilds"></div>
<br>
<h4>{{ $t('guildReminderText2') }}</h4>
</div>
<div class="modal-footer">
<div class="container-fluid"> <div class="container-fluid">
<div class="row"> <div class="row">
<div class="col-6 text-center"> <div class="col-6 text-center">
@@ -17,7 +22,8 @@
> >
{{ $t('guildReminderDismiss') }} {{ $t('guildReminderDismiss') }}
</button> </button>
</div><div class="col-6 text-center"> </div>
<div class="col-6 text-center">
<div <div
class="btn btn-primary" class="btn btn-primary"
@click="takeMethere()" @click="takeMethere()"

49
website/client/src/components/achievements/ultimateGear.vue
View File

@@ -7,42 +7,63 @@
> >
<div class="modal-body"> <div class="modal-body">
<div class="col-12"> <div class="col-12">
<!-- @TODO: +achievementAvatar('armor',2.5)--><achievement-avatar class="avatar" /> <!-- @TODO: +achievementAvatar('armor',2.5)-->
</div><div class="col-12 text-center"> <achievement-avatar class="avatar" />
<p>{{ $t('gearAchievement') }}</p><br><table class="multi-achievement"> </div>
<div class="col-12 text-center">
<p>{{ $t('gearAchievement') }}</p>
<br>
<table class="multi-achievement">
<tr> <tr>
<td <td
v-if="user.achievements.ultimateGearSets.healer" v-if="user.achievements.ultimateGearSets.healer"
class="multi-achievement" class="multi-achievement"
> >
<div class="achievement-ultimate-healer2x multi-achievement"></div>{{ $t('healer') }} <div class="achievement-ultimate-healer2x multi-achievement"></div>
</td><td {{ $t('healer') }}
</td>
<td
v-if="user.achievements.ultimateGearSets.wizard" v-if="user.achievements.ultimateGearSets.wizard"
class="multi-achievement" class="multi-achievement"
> >
<div class="achievement-ultimate-mage2x multi-achievement"></div>{{ $t('mage') }} <div class="achievement-ultimate-mage2x multi-achievement"></div>
</td><td {{ $t('mage') }}
</td>
<td
v-if="user.achievements.ultimateGearSets.rogue" v-if="user.achievements.ultimateGearSets.rogue"
class="multi-achievement" class="multi-achievement"
> >
<div class="achievement-ultimate-rogue2x multi-achievement"></div>{{ $t('rogue') }} <div class="achievement-ultimate-rogue2x multi-achievement"></div>
</td><td {{ $t('rogue') }}
</td>
<td
v-if="user.achievements.ultimateGearSets.warrior" v-if="user.achievements.ultimateGearSets.warrior"
class="multi-achievement" class="multi-achievement"
> >
<div class="achievement-ultimate-warrior2x multi-achievement"></div>{{ $t('warrior') }} <div class="achievement-ultimate-warrior2x multi-achievement"></div>
{{ $t('warrior') }}
</td> </td>
</tr> </tr>
</table><br><div v-if="!(user.achievements.ultimateGearSets.healer && user.achievements.ultimateGearSets.wizard && user.achievements.ultimateGearSets.rogue && user.achievements.ultimateGearSets.warrior)"> </table>
<p v-html="$t('moreGearAchievements')"></p><br> <br>
</div><div class="shop_armoire"></div><p v-html="$t('armoireUnlocked')"></p><br><button <div
v-if="!(user.achievements.ultimateGearSets.healer && user.achievements.ultimateGearSets.wizard && user.achievements.ultimateGearSets.rogue && user.achievements.ultimateGearSets.warrior)"
>
<p v-html="$t('moreGearAchievements')"></p>
<br>
</div>
<div class="shop_armoire"></div>
<p v-html="$t('armoireUnlocked')"></p>
<br>
<button
class="btn btn-primary" class="btn btn-primary"
@click="close()" @click="close()"
> >
{{ $t('huzzah') }} {{ $t('huzzah') }}
</button> </button>
</div> </div>
</div><achievement-footer /> </div>
<achievement-footer />
</b-modal> </b-modal>
</template> </template>

42
website/client/src/components/achievements/welcome.vue
View File

@@ -8,34 +8,54 @@
<div class="modal-body container-fluid"> <div class="modal-body container-fluid">
<div class="row"> <div class="row">
<div class="col-4 col-centered"> <div class="col-4 col-centered">
<span style="display:flex"><h1>&#9312;</h1><h3 style="margin:auto auto auto .5em">{{ $t('welcome1') }}</h3></span><div <span style="display:flex">
<h1>&#9312;</h1>
<h3 style="margin:auto auto auto .5em">{{ $t('welcome1') }}</h3>
</span>
<div
class="welcome_basic_avatars" class="welcome_basic_avatars"
style="margin: 1.5em auto 1.5em" style="margin: 1.5em auto 1.5em"
></div><h4>{{ $t('welcome1notes') }}</h4> ></div>
</div><div class="col-4 col-centered"> <h4>{{ $t('welcome1notes') }}</h4>
<span style="display:flex"><h1>&#9313;</h1><h3 style="margin:.3em auto auto .5em">{{ $t('welcome2') }}</h3></span><div </div>
<div class="col-4 col-centered">
<span style="display:flex">
<h1>&#9313;</h1>
<h3 style="margin:.3em auto auto .5em">{{ $t('welcome2') }}</h3>
</span>
<div
class="welcome_sample_tasks" class="welcome_sample_tasks"
style="margin: 2.5em auto 1.5em" style="margin: 2.5em auto 1.5em"
></div><h4>{{ $t('welcome2notes') }}</h4> ></div>
</div><div class="col-4 col-centered"> <h4>{{ $t('welcome2notes') }}</h4>
<span style="display:flex"><h1>&#9314;</h1><h3 style="margin:auto auto auto .5em">{{ $t('welcome3') }}</h3></span><div </div>
<div class="col-4 col-centered">
<span style="display:flex">
<h1>&#9314;</h1>
<h3 style="margin:auto auto auto .5em">{{ $t('welcome3') }}</h3>
</span>
<div
class="welcome_promo_party" class="welcome_promo_party"
style="margin: 1em auto 1em" style="margin: 1em auto 1em"
></div><h4>{{ $t('welcome3notes') }}</h4> ></div>
<h4>{{ $t('welcome3notes') }}</h4>
</div> </div>
</div> </div>
</div><div </div>
<div
class="modal-footer text-center" class="modal-footer text-center"
style="margin-top:0" style="margin-top:0"
> >
<div class="col-3"></div><div class="col-6"> <div class="col-3"></div>
<div class="col-6">
<button <button
class="btn btn-primary btn-lg flex-column" class="btn btn-primary btn-lg flex-column"
@click="ready()" @click="ready()"
> >
{{ $t('imReady') }} {{ $t('imReady') }}
</button> </button>
</div><div class="col-3"></div> </div>
<div class="col-3"></div>
</div> </div>
</b-modal> </b-modal>
</template> </template>

26
website/client/src/components/achievements/wonChallenge.vue
View File

@@ -6,31 +6,40 @@
:hide-footer="true" :hide-footer="true"
> >
<div class="modal-body text-center"> <div class="modal-body text-center">
<h4 v-markdown="user.achievements.challenges[user.achievements.challenges.length - 1]"></h4><div class="row"> <h4 v-markdown="user.achievements.challenges[user.achievements.challenges.length - 1]"></h4>
<div class="row">
<div class="col-4"> <div class="col-4">
<div class="achievement-karaoke-2x"></div> <div class="achievement-karaoke-2x"></div>
</div><div class="col-4"> </div>
<!-- @TODO: +generatedAvatar({sleep: false})--><avatar <div class="col-4">
<!-- @TODO: +generatedAvatar({sleep: false})-->
<avatar
class="avatar" class="avatar"
:member="user" :member="user"
:avatar-only="true" :avatar-only="true"
/> />
</div><div class="col-4"> </div>
<div class="col-4">
<div class="achievement-karaoke-2x"></div> <div class="achievement-karaoke-2x"></div>
</div> </div>
</div><p>{{ $t('congratulations') }}</p><br><button </div>
<p>{{ $t('congratulations') }}</p>
<br>
<button
class="btn btn-primary" class="btn btn-primary"
@click="close()" @click="close()"
> >
{{ $t('hurray') }} {{ $t('hurray') }}
</button> </button>
</div><div class="modal-footer"> </div>
<div class="modal-footer">
<div class="col-3"> <div class="col-3">
<a <a
class="twitter-share-button" class="twitter-share-button"
href="https://twitter.com/intent/tweet?text=#{tweet}&via=habitica&url=#{env.BASE_URL}/social/won-challenge&count=none" href="https://twitter.com/intent/tweet?text=#{tweet}&via=habitica&url=#{env.BASE_URL}/social/won-challenge&count=none"
>{{ $t('tweet') }}</a> >{{ $t('tweet') }}</a>
</div><div </div>
<div
class="col-4" class="col-4"
style="margin-left:.8em" style="margin-left:.8em"
> >
@@ -39,7 +48,8 @@
data-href="#{env.BASE_URL}/social/won-challenge" data-href="#{env.BASE_URL}/social/won-challenge"
data-layout="button" data-layout="button"
></div> ></div>
</div><div </div>
<div
class="col-4" class="col-4"
style="margin-left:.8em" style="margin-left:.8em"
> >