Skip to content

Commit e19d74e

Browse files
authored
Merge pull request #1196 from AlisProject/add_wiz
Add pr item to article page.
2 parents 9213923 + c161313 commit e19d74e

File tree

3 files changed

+13
-6
lines changed

3 files changed

+13
-6
lines changed

app/components/atoms/ArticleEvent.vue

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,12 @@
1111
<div class="area-link-button">
1212
<app-button class="official-article">
1313
<nuxt-link :to="`/tag/${eventInfo.key}`">
14-
ゲーム情報
14+
記事一覧
1515
</nuxt-link>
1616
</app-button>
1717
<app-button class="official-site">
1818
<a :href="eventInfo.officialPageUrl" target="_blank">
19-
ゲームを始める <i class="fas fa-external-link-alt" />
19+
{{ eventInfo.officialPageButtonName }} <i class="fas fa-external-link-alt" />
2020
</a>
2121
</app-button>
2222
</div>
@@ -45,7 +45,7 @@ export default {
4545
},
4646
computed: {
4747
eventInfo() {
48-
return this.eventsInfo.find((eventInfo) => eventInfo.key === 'クリプトモン')
48+
return this.eventsInfo.find((eventInfo) => eventInfo.key === 'Wizardia')
4949
},
5050
eventInfoStyle() {
5151
return {

app/components/pages/ArticleDetailV2.vue

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,11 +37,16 @@
3737
/>
3838
<article-supporters :article="article" />
3939
<article-sub-infos-v2 :article="article" />
40-
<article-registration v-if="isShowRegistration && !loggedIn" />
40+
<article-event
41+
v-if="article.tags.includes('Wizardia')"
42+
:tags="article.tags"
43+
:topic="article.topic"
44+
/>
45+
<article-registration v-else-if="isShowRegistration && !loggedIn" />
4146
<author-info
4247
:user="article.userInfo"
4348
class="area-authr-info"
44-
:class="{ 'is-logged-in': loggedIn }"
49+
:class="{ 'is-logged-in': loggedIn && !article.tags.includes('Wizardia') }"
4550
/>
4651
<user-article-popular-card-list
4752
v-if="userPopularArticles.articles.length > 0"
@@ -79,6 +84,7 @@ import AuthorInfo from '../atoms/AuthorInfo'
7984
import AuthorHeaderInfo from '../atoms/AuthorHeaderInfo'
8085
import UserArticlePopularCardList from '../organisms/UserArticlePopularCardList'
8186
import ArticleTags from '../molecules/ArticleTags'
87+
import ArticleEvent from '../atoms/ArticleEvent'
8288
import ArticleRegistration from '../organisms/ArticleRegistration'
8389
import ArticleRegistrationFooter from '../organisms/ArticleRegistrationFooter'
8490
import ArticleDetailPaypart from '../organisms/ArticleDetailPaypart'
@@ -100,6 +106,7 @@ export default {
100106
AuthorHeaderInfo,
101107
UserArticlePopularCardList,
102108
ArticleTags,
109+
ArticleEvent,
103110
ArticleRegistration,
104111
ArticleRegistrationFooter,
105112
ArticleDetailPaypart,

app/store/modules/article.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -770,7 +770,7 @@ const state = () => ({
770770
telegramUrl: 'https://t.me/wizardia',
771771
discordUrl: 'https://discord.gg/wizardia',
772772
officialArticleUrl: '/Wizardia/articles/2jDzxBA00qv8',
773-
officialArticleButtonName: '基礎情報',
773+
officialArticleButtonName: 'ゲーム情報',
774774
officialPageUrl: 'https://wizardia.io/tournaments',
775775
officialPageButtonName: 'ゲームを始める'
776776
}

0 commit comments

Comments
 (0)