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

Use sidebar section component in tavern.

Browse Source
This commit is contained in:
Marvin Rabe
2018-05-01 20:13:46 +02:00
parent 45df73e4be
commit 05c43d1f9d
2 changed files with 30 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
website/client/components/groups/group.vue
View File

@@ -309,7 +309,7 @@ export default {
questSidebarSection, questSidebarSection,
communityGuidelines, communityGuidelines,
sidebarSection, sidebarSection,
userLink userLink,
}, },
directives: { directives: {
markdown: markdownDirective, markdown: markdownDirective,

93
website/client/components/groups/tavern.vue
View File

@@ -102,18 +102,9 @@
li(v-once) {{ $t('sleepBullet4') }} li(v-once) {{ $t('sleepBullet4') }}
button.btn.btn-secondary.pause-button(v-if='!user.preferences.sleep', @click='toggleSleep()', v-once) {{ $t('pauseDailies') }} button.btn.btn-secondary.pause-button(v-if='!user.preferences.sleep', @click='toggleSleep()', v-once) {{ $t('pauseDailies') }}
button.btn.btn-secondary.pause-button(v-if='user.preferences.sleep', @click='toggleSleep()', v-once) {{ $t('unpauseDailies') }} button.btn.btn-secondary.pause-button(v-if='user.preferences.sleep', @click='toggleSleep()', v-once) {{ $t('unpauseDailies') }}
.px-3
.below-header-sections sidebar-section(:title="$t('staffAndModerators')")
.section-header
.row .row
.col-10
h3(v-once) {{ $t('staffAndModerators') }}
.col-2
.toggle-up(@click="sections.staff = !sections.staff", v-if="sections.staff")
.svg-icon(v-html="icons.upIcon")
.toggle-down(@click="sections.staff = !sections.staff", v-if="!sections.staff")
.svg-icon(v-html="icons.downIcon")
.section.row(v-if="sections.staff")
.col-4.staff(v-for='user in staff', :class='{staff: user.type === "Staff", moderator: user.type === "Moderator", bailey: user.name === "It\'s Bailey"}') .col-4.staff(v-for='user in staff', :class='{staff: user.type === "Staff", moderator: user.type === "Moderator", bailey: user.name === "It\'s Bailey"}')
div div
a.title(@click="viewStaffProfile(user.uuid)") {{user.name}} a.title(@click="viewStaffProfile(user.uuid)") {{user.name}}
@@ -122,50 +113,33 @@
.svg-icon.npc-icon(v-html="icons.tierNPC", v-if='user.name === "It\'s Bailey"') .svg-icon.npc-icon(v-html="icons.tierNPC", v-if='user.name === "It\'s Bailey"')
.type {{user.type}} .type {{user.type}}
.section-header sidebar-section(:title="$t('helpfulLinks')")
.row ul
.col-10 li
h3(v-once) {{ $t('helpfulLinks') }} a(href='', @click.prevent='modForm()') {{ $t('contactForm') }}
.col-2 li
.toggle-up(@click="sections.helpfulLinks = !sections.helpfulLinks", v-if="sections.helpfulLinks") router-link(to='/static/community-guidelines', v-once) {{ $t('communityGuidelinesLink') }}
.svg-icon(v-html="icons.upIcon") li
.toggle-down(@click="sections.helpfulLinks = !sections.helpfulLinks", v-if="!sections.helpfulLinks") router-link(to="/groups/guild/f2db2a7f-13c5-454d-b3ee-ea1f5089e601") {{ $t('lookingForGroup') }}
.svg-icon(v-html="icons.downIcon") li
.section.row(v-if="sections.helpfulLinks") router-link(to='/static/faq', v-once) {{ $t('faq') }}
ul li
li a(href='', v-html="$t('glossary')")
a(href='', @click.prevent='modForm()') {{ $t('contactForm') }} li
li a(href='http://habitica.wikia.com/wiki/Habitica_Wiki', v-once) {{ $t('wiki') }}
router-link(to='/static/community-guidelines', v-once) {{ $t('communityGuidelinesLink') }} li
li a(href='https://oldgods.net/habitrpg/habitrpg_user_data_display.html', v-once) {{ $t('dataDisplayTool') }}
router-link(to="/groups/guild/f2db2a7f-13c5-454d-b3ee-ea1f5089e601") {{ $t('lookingForGroup') }} li
li router-link(to="/groups/guild/a29da26b-37de-4a71-b0c6-48e72a900dac") {{ $t('reportProblem') }}
router-link(to='/static/faq', v-once) {{ $t('faq') }} li
li a(href='https://trello.com/c/odmhIqyW/440-read-first-table-of-contents', v-once) {{ $t('requestFeature') }}
a(href='', v-html="$t('glossary')") li
li a(href='', v-html="$t('communityForum')")
a(href='http://habitica.wikia.com/wiki/Habitica_Wiki', v-once) {{ $t('wiki') }} li
li router-link(to="/groups/guild/5481ccf3-5d2d-48a9-a871-70a7380cee5a") {{ $t('askQuestionGuild') }}
a(href='https://oldgods.net/habitrpg/habitrpg_user_data_display.html', v-once) {{ $t('dataDisplayTool') }}
li
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
router-link(to="/groups/guild/5481ccf3-5d2d-48a9-a871-70a7380cee5a") {{ $t('askQuestionGuild') }}
.section-header sidebar-section(:title="$t('playerTiers')",:last='true')
.row .row
.col-10
h3(v-once) {{ $t('playerTiers') }}
.col-2
.toggle-up(@click="sections.playerTiers = !sections.playerTiers", v-if="sections.playerTiers")
.svg-icon(v-html="icons.upIcon")
.toggle-down(@click="sections.playerTiers = !sections.playerTiers", v-if="!sections.playerTiers")
.svg-icon(v-html="icons.downIcon")
.section.row(v-if="sections.playerTiers")
.col-12 .col-12
p(v-once) {{ $t('playerTiersDesc') }} p(v-once) {{ $t('playerTiersDesc') }}
ul.tier-list ul.tier-list
@@ -267,10 +241,6 @@
width: 100%; width: 100%;
} }
.section-header {
margin-top: 2em;
}
.grassy-meadow-backdrop { .grassy-meadow-backdrop {
background-image: url('~assets/images/npc/#{$npc_tavern_flavor}/tavern_background.png'); background-image: url('~assets/images/npc/#{$npc_tavern_flavor}/tavern_background.png');
background-repeat: repeat-x; background-repeat: repeat-x;
@@ -525,17 +495,16 @@ import autocomplete from '../chat/autoComplete';
import communityGuidelines from './communityGuidelines'; import communityGuidelines from './communityGuidelines';
import worldBossInfoModal from '../world-boss/worldBossInfoModal'; import worldBossInfoModal from '../world-boss/worldBossInfoModal';
import worldBossRageModal from '../world-boss/worldBossRageModal'; import worldBossRageModal from '../world-boss/worldBossRageModal';
import sidebarSection from '../sidebarSection';
import challengeIcon from 'assets/svg/challenge.svg'; import challengeIcon from 'assets/svg/challenge.svg';
import chevronIcon from 'assets/svg/chevron-red.svg'; import chevronIcon from 'assets/svg/chevron-red.svg';
import downIcon from 'assets/svg/down.svg';
import gemIcon from 'assets/svg/gem.svg'; import gemIcon from 'assets/svg/gem.svg';
import healthIcon from 'assets/svg/health.svg'; import healthIcon from 'assets/svg/health.svg';
import informationIconRed from 'assets/svg/information-red.svg'; import informationIconRed from 'assets/svg/information-red.svg';
import questBackground from 'assets/svg/quest-background-border.svg'; import questBackground from 'assets/svg/quest-background-border.svg';
import rageIcon from 'assets/svg/rage.svg'; import rageIcon from 'assets/svg/rage.svg';
import swordIcon from 'assets/svg/sword.svg'; import swordIcon from 'assets/svg/sword.svg';
import upIcon from 'assets/svg/up.svg';
import tier1 from 'assets/svg/tier-1.svg'; import tier1 from 'assets/svg/tier-1.svg';
import tier2 from 'assets/svg/tier-2.svg'; import tier2 from 'assets/svg/tier-2.svg';
@@ -557,6 +526,7 @@ export default {
communityGuidelines, communityGuidelines,
worldBossInfoModal, worldBossInfoModal,
worldBossRageModal, worldBossRageModal,
sidebarSection,
}, },
data () { data () {
return { return {
@@ -564,7 +534,6 @@ export default {
icons: Object.freeze({ icons: Object.freeze({
challengeIcon, challengeIcon,
chevronIcon, chevronIcon,
downIcon,
gem: gemIcon, gem: gemIcon,
healthIcon, healthIcon,
informationIcon: informationIconRed, informationIcon: informationIconRed,
@@ -581,15 +550,11 @@ export default {
tierMod, tierMod,
tierNPC, tierNPC,
tierStaff, tierStaff,
upIcon,
}), }),
group: { group: {
chat: [], chat: [],
}, },
sections: { sections: {
staff: true,
helpfulLinks: true,
playerTiers: true,
worldBoss: true, worldBoss: true,
}, },
staff: [ staff: [