Skip to content

Commit

Permalink
Merge pull request #146 from janog-netcon/fix-guide-page
Browse files Browse the repository at this point in the history
Fix guide page was not shown from user page
  • Loading branch information
proelbtn authored Jan 14, 2025
2 parents fee6ad5 + 8d907b9 commit 4d76536
Showing 1 changed file with 5 additions and 8 deletions.
13 changes: 5 additions & 8 deletions ui/pages/guide.vue
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,8 @@
</v-row>

<v-row>
<markdown :content="guidePage" />
<markdown v-if="language === 'ja'" :content="guidePage" />
<markdown v-if="language === 'en'" :content="guidePageEn" />
</v-row>

<config-modal
Expand All @@ -36,6 +37,7 @@
</v-container>
</template>
<script>
import { mapGetters } from 'vuex'
import orm from '~/orm'
import ConfigModal from '~/components/misc/ConfigModal'
import Markdown from '~/components/commons/Markdown'
Expand All @@ -60,20 +62,15 @@ export default {
}
},
computed: {
...mapGetters('contestInfo', ['guidePage']),
...mapGetters('contestInfo', ['guidePageEn']),
title() {
if (this.language === 'ja') {
return 'ガイド'
} else {
return 'Guide'
}
},
guidePage() {
if (this.language === "ja") {
return JSON.parse(orm.Config.find('guide_page')?.value || "\"\"")
} else {
return JSON.parse(orm.Config.find('guide_page_en')?.value || "\"\"")
}
},
configGuidePageJa() {
return orm.Config.find('guide_page')
},
Expand Down

0 comments on commit 4d76536

Please sign in to comment.