Skip to content

Commit 5e27c5e

Browse files
kaizumakikaizumaki
authored
Merge pull request #616 from codeforjapan/feature/logo-zhgoyu-support
feat: 台灣華語のロゴに対応
2 parents 7ef57a5 + 8d02a9a commit 5e27c5e

File tree

11 files changed

+53
-13
lines changed

11 files changed

+53
-13
lines changed

‎src/assets/svgs/header_logo-zhtw.svg‎

Lines changed: 5 additions & 0 deletions
Loading

‎src/assets/svgs/prj_logo-zhtw.svg‎

Lines changed: 12 additions & 0 deletions
Loading

‎src/layouts/background.vue‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,8 @@
44
<div class="loader">Loading</div>
55
</v-overlay>
66
<v-app-bar fixed app class="bar" elevation="0">
7-
<header-logo />
7+
<header-logo-zhtw v-if="$root.$i18n.locale === 'zh-goyu'" />
8+
<header-logo v-else />
89
<AppLanguageSelector />
910
</v-app-bar>
1011
<v-content class="LayerContent">
@@ -17,6 +18,7 @@
1718
import Vue from 'vue'
1819
import AppLanguageSelector from '@/components/AppLanguageSelector.vue'
1920
import HeaderLogo from '@/assets/svgs/header_logo.svg'
21+
import HeaderLogoZhtw from '@/assets/svgs/header_logo-zhtw.svg'
2022
2123
type DataType = {
2224
loading: boolean
@@ -26,6 +28,7 @@ export default Vue.extend({
2628
components: {
2729
AppLanguageSelector,
2830
HeaderLogo,
31+
HeaderLogoZhtw,
2932
},
3033
data(): DataType {
3134
return {

‎src/layouts/classes.vue‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,8 @@
6464
<div class="loader">Loading</div>
6565
</v-overlay>
6666
<v-app-bar fixed app class="bar" elevation="0" extension-height="83">
67-
<HeaderLogo />
67+
<header-logo-zhtw v-if="$root.$i18n.locale === 'zh-goyu'" />
68+
<header-logo v-else />
6869
<AppLanguageSelector />
6970
<v-spacer />
7071
<div class="classes-buttons">
@@ -100,6 +101,7 @@
100101
import Vue from 'vue'
101102
import AppLanguageSelector from '@/components/AppLanguageSelector.vue'
102103
import HeaderLogo from '@/assets/svgs/header_logo.svg'
104+
import HeaderLogoZhtw from '@/assets/svgs/header_logo-zhtw.svg'
103105
import CalendarBar from '@/components/CalendarBar.vue'
104106
import BaseDialog from '@/components/BaseDialog.vue'
105107
import BaseActionButton from '@/components/BaseActionButton.vue'
@@ -120,6 +122,7 @@ export default Vue.extend({
120122
CalendarBar,
121123
BaseDialog,
122124
HeaderLogo,
125+
HeaderLogoZhtw,
123126
BaseActionButton,
124127
},
125128
middleware: 'checkClassData',

‎src/layouts/default.vue‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,8 @@
44
<div class="loader">Loading</div>
55
</v-overlay>
66
<v-app-bar fixed app class="bar" elevation="0">
7-
<HeaderLogo />
7+
<header-logo-zhtw v-if="$root.$i18n.locale === 'zh-goyu'" />
8+
<header-logo v-else />
89
<AppLanguageSelector />
910
</v-app-bar>
1011
<v-content class="content">
@@ -19,6 +20,7 @@
1920
import Vue from 'vue'
2021
import AppLanguageSelector from '@/components/AppLanguageSelector.vue'
2122
import HeaderLogo from '@/assets/svgs/header_logo.svg'
23+
import HeaderLogoZhtw from '@/assets/svgs/header_logo-zhtw.svg'
2224
2325
type LocalData = {
2426
loading: boolean
@@ -28,6 +30,7 @@ export default Vue.extend({
2830
components: {
2931
AppLanguageSelector,
3032
HeaderLogo,
33+
HeaderLogoZhtw,
3134
},
3235
data(): LocalData {
3336
return {

‎src/layouts/lesson.vue‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,8 @@
44
<div class="loader">Loading</div>
55
</v-overlay>
66
<v-app-bar fixed app class="bar" elevation="0">
7-
<HeaderLogo />
7+
<header-logo-zhtw v-if="$root.$i18n.locale === 'zh-goyu'" />
8+
<header-logo v-else />
89
<AppLanguageSelector />
910
<v-spacer />
1011
<v-btn outlined rounded color="#0071C2" @click="back">
@@ -25,6 +26,7 @@
2526
import Vue from 'vue'
2627
import AppLanguageSelector from '@/components/AppLanguageSelector.vue'
2728
import HeaderLogo from '@/assets/svgs/header_logo.svg'
29+
import HeaderLogoZhtw from '@/assets/svgs/header_logo-zhtw.svg'
2830
// import { vxm } from '@/store'
2931
3032
type LocalData = {
@@ -36,6 +38,7 @@ export default Vue.extend({
3638
components: {
3739
AppLanguageSelector,
3840
HeaderLogo,
41+
HeaderLogoZhtw,
3942
},
4043
data(): LocalData {
4144
return {

‎src/layouts/protected.vue‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,8 @@
5757
<div class="loader">Loading</div>
5858
</v-overlay>
5959
<v-app-bar fixed app class="bar" elevation="0" extension-height="83">
60-
<HeaderLogo />
60+
<header-logo-zhtw v-if="$root.$i18n.locale === 'zh-goyu'" />
61+
<header-logo v-else />
6162
<AppLanguageSelector />
6263
<v-spacer />
6364
<div class="admin-buttons">
@@ -104,6 +105,7 @@ import Vue from 'vue'
104105
import { vxm } from '@/store'
105106
import AppLanguageSelector from '@/components/AppLanguageSelector.vue'
106107
import HeaderLogo from '@/assets/svgs/header_logo.svg'
108+
import HeaderLogoZhtw from '@/assets/svgs/header_logo-zhtw.svg'
107109
import CalendarBar from '@/components/CalendarBar.vue'
108110
import BaseDialog from '@/components/BaseDialog.vue'
109111
import BaseActionButton from '@/components/BaseActionButton.vue'
@@ -121,6 +123,7 @@ export default Vue.extend({
121123
CalendarBar,
122124
BaseDialog,
123125
HeaderLogo,
126+
HeaderLogoZhtw,
124127
BaseActionButton,
125128
},
126129
middleware: ['authenticated', 'checkClassData'],

‎src/layouts/simple.vue‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,8 @@
44
<div class="loader">Loading</div>
55
</v-overlay>
66
<v-app-bar fixed app class="bar" elevation="0">
7-
<HeaderLogo />
7+
<header-logo-zhtw v-if="$root.$i18n.locale === 'zh-goyu'" />
8+
<header-logo v-else />
89
<AppLanguageSelector />
910
<v-spacer />
1011
<v-btn outlined rounded color="#0071C2" @click="$router.back()">
@@ -24,13 +25,14 @@
2425
import Vue from 'vue'
2526
import AppLanguageSelector from '@/components/AppLanguageSelector.vue'
2627
import HeaderLogo from '@/assets/svgs/header_logo.svg'
28+
import HeaderLogoZhtw from '@/assets/svgs/header_logo-zhtw.svg'
2729
2830
type LocalData = {
2931
loading: boolean
3032
}
3133
3234
export default Vue.extend({
33-
components: { AppLanguageSelector, HeaderLogo },
35+
components: { AppLanguageSelector, HeaderLogo, HeaderLogoZhtw },
3436
data(): LocalData {
3537
return {
3638
loading: true,

‎src/pages/classes/terms.vue‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
<template>
22
<div class="MainPage">
33
<div class="Logo-outer">
4-
<prj-logo class="Logo" />
4+
<prj-logo-zhtw v-if="$root.$i18n.locale === 'zh-goyu'" class="Logo" />
5+
<prj-logo v-else class="Logo" />
56
</div>
67
<div class="PolicyText-outer">
78
<p>
@@ -41,10 +42,11 @@
4142
<script lang="ts">
4243
import Vue from 'vue'
4344
import PrjLogo from '~/assets/svgs/prj_logo.svg'
45+
import PrjLogoZhtw from '~/assets/svgs/prj_logo-zhtw.svg'
4446
import BaseActionButton from '~/components/BaseActionButton.vue'
4547
4648
export default Vue.extend({
47-
components: { PrjLogo, BaseActionButton },
49+
components: { PrjLogo, PrjLogoZhtw, BaseActionButton },
4850
layout: 'simple',
4951
data() {
5052
return {

‎src/pages/terms.vue‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
<template>
22
<div class="MainPage">
33
<div class="Logo-outer">
4-
<prj-logo class="Logo" />
4+
<prj-logo-zhtw v-if="$root.$i18n.locale === 'zh-goyu'" class="Logo" />
5+
<prj-logo v-else class="Logo" />
56
</div>
67
<div class="PolicyText-outer">
78
<p>
@@ -290,9 +291,10 @@
290291
<script lang="ts">
291292
import Vue from 'vue'
292293
import PrjLogo from '@/assets/svgs/prj_logo.svg'
294+
import PrjLogoZhtw from '@/assets/svgs/prj_logo-zhtw.svg'
293295
294296
export default Vue.extend({
295-
components: { PrjLogo },
297+
components: { PrjLogo, PrjLogoZhtw },
296298
layout: 'simple',
297299
})
298300
</script>

0 commit comments

Comments
 (0)