Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixes inaccurate memberCount in Guilds and Parties - fixes #12286 #12885

Closed
wants to merge 4 commits into from
Closed

Fixes inaccurate memberCount in Guilds and Parties - fixes #12286 #12885

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
80e70bb
Extended the recomputation of memberCount to Guilds when a user joins…
lsophie Dec 15, 2020
9cbd292
Merge remote-tracking branch 'upstream/develop' into fixMemberCount
lsophie Dec 15, 2020
aed8ae5
Cleaned up comments
lsophie Dec 15, 2020
3f7eb9b
Committing automatic lint changes
lsophie Dec 15, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
280 changes: 185 additions & 95 deletions website/client/src/components/appFooter.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,16 @@
<div class="row">
<div class="col-12 col-md-2">
<h3>
<a href="https://itunes.apple.com/us/app/habitica/id994882113?ls=1&mt=8"
target="_blank">{{ $t('mobileIOS') }}</a>
<a
href="https://itunes.apple.com/us/app/habitica/id994882113?ls=1&mt=8"
target="_blank"
>{{ $t('mobileIOS') }}</a>
</h3>
<h3>
<a href="https://play.google.com/store/apps/details?id=com.habitrpg.android.habitica"
target="_blank">{{ $t('mobileAndroid') }}</a>
<a
href="https://play.google.com/store/apps/details?id=com.habitrpg.android.habitica"
target="_blank"
>{{ $t('mobileAndroid') }}</a>
</h3>
</div>
<div class="col-12 col-md-2">
Expand All @@ -23,21 +27,27 @@
</router-link>
</li>
<li>
<a href="https://habitica.wordpress.com/"
target="_blank">{{ $t('companyBlog') }}</a>
<a
href="https://habitica.wordpress.com/"
target="_blank"
>{{ $t('companyBlog') }}</a>
</li>
<li>
<a href="http://blog.habitrpg.com/"
target="_blank">{{ $t('tumblr') }}</a>
<a
href="http://blog.habitrpg.com/"
target="_blank"
>{{ $t('tumblr') }}</a>
</li>
<li>
<router-link to="/static/faq">
{{ $t('FAQ') }}
</router-link>
</li>
<li>
<a href="http://habitica.fandom.com/wiki/Whats_New"
target="_blank">{{ $t('oldNews') }}</a>
<a
href="http://habitica.fandom.com/wiki/Whats_New"
target="_blank"
>{{ $t('oldNews') }}</a>
</li>
<!-- Commenting out merch page see https://github.com/HabitRPG/habitica/issues/12039
<li>
Expand All @@ -62,8 +72,10 @@
<h3>{{ $t('footerCommunity') }}</h3>
<ul>
<li>
<a target="_blank"
href="/static/community-guidelines">{{ $t('communityGuidelines') }}</a>
<a
target="_blank"
href="/static/community-guidelines"
>{{ $t('communityGuidelines') }}</a>
</li>
<li>
<router-link to="/hall/contributors">
Expand All @@ -76,18 +88,24 @@
</router-link>
</li>
<li>
<a href="https://docs.google.com/forms/d/e/1FAIpQLScPhrwq_7P1C6PTrI3lbvTsvqGyTNnGzp1ugi1Ml0PFee_p5g/viewform?usp=sf_link"
target="_blank">{{ $t('requestFeature') }}</a>
<a
href="https://docs.google.com/forms/d/e/1FAIpQLScPhrwq_7P1C6PTrI3lbvTsvqGyTNnGzp1ugi1Ml0PFee_p5g/viewform?usp=sf_link"
target="_blank"
>{{ $t('requestFeature') }}</a>
</li>
<li v-html="$t('communityExtensions')"></li>
<li v-html="$t('communityForum')"></li>
<li>
<a href="https://www.facebook.com/Habitica"
target="_blank">{{ $t('communityFacebook') }}</a>
<a
href="https://www.facebook.com/Habitica"
target="_blank"
>{{ $t('communityFacebook') }}</a>
</li>
<li>
<a href="https://www.instagram.com/habitica"
target="_blank">{{ $t('communityInstagram') }}</a>
<a
href="https://www.instagram.com/habitica"
target="_blank"
>{{ $t('communityInstagram') }}</a>
</li>
</ul>
</div>
Expand All @@ -97,39 +115,57 @@
<h3>{{ $t('footerDevs') }}</h3>
<ul>
<li>
<a href="/apidoc"
target="_blank">{{ $t('APIv3') }}</a>
<a
href="/apidoc"
target="_blank"
>{{ $t('APIv3') }}</a>
</li>
<li>
<a :href="getDataDisplayToolUrl"
target="_blank">{{ $t('dataDisplayTool') }}</a>
<a
:href="getDataDisplayToolUrl"
target="_blank"
>{{ $t('dataDisplayTool') }}</a>
</li>
<li>
<a href="http://habitica.fandom.com/wiki/Guidance_for_Blacksmiths"
target="_blank">{{ $t('guidanceForBlacksmiths') }}</a>
<a
href="http://habitica.fandom.com/wiki/Guidance_for_Blacksmiths"
target="_blank"
>{{ $t('guidanceForBlacksmiths') }}</a>
</li>
</ul>
</div>
<div class="col-6 social">
<h3>{{ $t('footerSocial') }}</h3>
<div class="icons">
<a class="social-circle"
href="https://twitter.com/habitica"
target="_blank">
<div class="social-icon svg-icon"
v-html="icons.twitter"></div>
<a
class="social-circle"
href="https://twitter.com/habitica"
target="_blank"
>
<div
class="social-icon svg-icon"
v-html="icons.twitter"
></div>
</a>
<a class="social-circle"
href="https://www.instagram.com/habitica/"
target="_blank">
<div class="social-icon svg-icon instagram"
v-html="icons.instagram"></div>
<a
class="social-circle"
href="https://www.instagram.com/habitica/"
target="_blank"
>
<div
class="social-icon svg-icon instagram"
v-html="icons.instagram"
></div>
</a>
<a class="social-circle"
href="https://www.facebook.com/Habitica"
target="_blank">
<div class="social-icon facebook svg-icon"
v-html="icons.facebook"></div>
<a
class="social-circle"
href="https://www.facebook.com/Habitica"
target="_blank"
>
<div
class="social-icon facebook svg-icon"
v-html="icons.facebook"
></div>
</a>
</div>
</div>
Expand All @@ -139,21 +175,31 @@
{{ $t('donateText3') }}
</div>
<div class="col-12 col-md-4">
<button v-if="user"
class="btn btn-contribute btn-front btn-flat"
@click="donate()">
<div class="svg-icon heart"
v-html="icons.heart"></div>
<button
v-if="user"
class="btn btn-contribute btn-front btn-flat"
@click="donate()"
>
<div
class="svg-icon heart"
v-html="icons.heart"
></div>
<div class="text">
{{ $t('companyDonate') }}
</div>
</button>
<div v-else
class="btn btn-contribute btn-front btn-flat">
<a href="http://habitica.fandom.com/wiki/Contributing_to_Habitica"
target="_blank">
<div class="svg-icon heart"
v-html="icons.heart"></div>
<div
v-else
class="btn btn-contribute btn-front btn-flat"
>
<a
href="http://habitica.fandom.com/wiki/Contributing_to_Habitica"
target="_blank"
>
<div
class="svg-icon heart"
v-html="icons.heart"
></div>
<div class="text">{{ $t('companyContribute') }}</div>
</a>
</div>
Expand All @@ -169,62 +215,106 @@
<div class="row">
<div class="col-12 col-md-5 text-center text-md-left">
© 2020 Habitica. All rights reserved.
<div v-if="!IS_PRODUCTION && isUserLoaded"
class="debug float-left">
<button class="btn btn-primary"
@click="debugMenuShown = !debugMenuShown">
<div
v-if="!IS_PRODUCTION && isUserLoaded"
class="debug float-left"
>
<button
class="btn btn-primary"
@click="debugMenuShown = !debugMenuShown"
>
Toggle Debug Menu
</button>
<div v-if="debugMenuShown"
class="debug-group">
<a class="btn btn-secondary"
@click="setHealthLow()">Health = 1</a>
<a class="btn btn-secondary"
@click="addMissedDay(1)">+1 Missed Day</a>
<a class="btn btn-secondary"
@click="addMissedDay(2)">+2 Missed Days</a>
<a class="btn btn-secondary"
@click="addMissedDay(8)">+8 Missed Days</a>
<a class="btn btn-secondary"
@click="addMissedDay(32)">+32 Missed Days</a>
<a class="btn btn-secondary"
@click="addTenGems()">+10 Gems</a>
<a class="btn btn-secondary"
@click="addHourglass()">+1 Mystic Hourglass</a>
<a class="btn btn-secondary"
@click="addGold()">+500GP</a>
<a class="btn btn-secondary"
@click="plusTenHealth()">+ 10HP</a>
<a class="btn btn-secondary"
@click="addMana()">+MP</a>
<a class="btn btn-secondary"
@click="addLevelsAndGold()">+Exp +GP +MP</a>
<a class="btn btn-secondary"
@click="addExp()">+Exp</a>
<a class="btn btn-secondary"
@click="addOneLevel()">+1 Level</a>
<a class="btn btn-secondary"
tooltip="+1000 to boss quests. 300 items to collection quests"
@click="addQuestProgress()">Quest Progress Up</a>
<a class="btn btn-secondary"
@click="makeAdmin()">Make Admin</a>
<a class="btn btn-secondary"
@click="openModifyInventoryModal()">Modify Inventory</a>
<div
v-if="debugMenuShown"
class="debug-group"
>
<a
class="btn btn-secondary"
@click="setHealthLow()"
>Health = 1</a>
<a
class="btn btn-secondary"
@click="addMissedDay(1)"
>+1 Missed Day</a>
<a
class="btn btn-secondary"
@click="addMissedDay(2)"
>+2 Missed Days</a>
<a
class="btn btn-secondary"
@click="addMissedDay(8)"
>+8 Missed Days</a>
<a
class="btn btn-secondary"
@click="addMissedDay(32)"
>+32 Missed Days</a>
<a
class="btn btn-secondary"
@click="addTenGems()"
>+10 Gems</a>
<a
class="btn btn-secondary"
@click="addHourglass()"
>+1 Mystic Hourglass</a>
<a
class="btn btn-secondary"
@click="addGold()"
>+500GP</a>
<a
class="btn btn-secondary"
@click="plusTenHealth()"
>+ 10HP</a>
<a
class="btn btn-secondary"
@click="addMana()"
>+MP</a>
<a
class="btn btn-secondary"
@click="addLevelsAndGold()"
>+Exp +GP +MP</a>
<a
class="btn btn-secondary"
@click="addExp()"
>+Exp</a>
<a
class="btn btn-secondary"
@click="addOneLevel()"
>+1 Level</a>
<a
class="btn btn-secondary"
tooltip="+1000 to boss quests. 300 items to collection quests"
@click="addQuestProgress()"
>Quest Progress Up</a>
<a
class="btn btn-secondary"
@click="makeAdmin()"
>Make Admin</a>
<a
class="btn btn-secondary"
@click="openModifyInventoryModal()"
>Modify Inventory</a>
</div>
</div>
</div>
<div class="col-12 col-md-2 text-center">
<div class="logo svg-icon"
v-html="icons.gryphon"></div>
<div
class="logo svg-icon"
v-html="icons.gryphon"
></div>
</div>
<div class="col-12 col-md-5 text-center text-md-right my-1">
<span class="ml-4">
<a target="_blank"
href="/static/privacy">{{ $t('privacy') }}</a>
<a
target="_blank"
href="/static/privacy"
>{{ $t('privacy') }}</a>
</span>
<span class="ml-4">
<a target="_blank"
href="/static/terms">{{ $t('terms') }}</a>
<a
target="_blank"
href="/static/terms"
>{{ $t('terms') }}</a>
</span>
</div>
</div>
Expand Down
6 changes: 3 additions & 3 deletions website/client/src/components/header/banners/giftPromo.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,21 +11,21 @@
@click="showSelectUser"
>
<div
v-once
class="svg-icon svg-gifts left-gift"
v-html="icons.gifts"
v-once
>
</div>
<div
v-once
class="announce-text"
v-html="$t('g1g1Announcement')"
v-once
>
</div>
<div
v-once
class="svg-icon svg-gifts right-gift"
v-html="icons.gifts"
v-once
>
</div>
</div>
Expand Down
Loading