Merge branch 'codeforjapan:development' into feature/movieSelector

Author: JQinglong

nuxt.config.js

@@ -5,7 +5,7 @@ const environment = process.env.NODE_ENV || 'development'
 
 export default {
   telemetry: false,
-  ssr: false,
+  ssr: true,
   srcDir: 'src',
   /*
    ** Headers of the page

src/assets/locales/zh_TW.json

@@ -58,7 +58,7 @@
         "agree": "我同意使用條款"
       },
       "buttons": {
-        "agree": "前往註冊",
+        "agree": "繼續註冊",
         "disagree": "不同意"
       }
     },

src/components/BaseInputField.vue

@@ -142,7 +142,7 @@ export default Vue.extend({
   },
   computed: {
     prependIconColor(): string {
-      const classIdPattern = /^[あ-ん]{6}$/
+      const classIdPattern = /^[あ-んa-zㄅ-ㄩ]{6}$/
       if (this.type === 'classId') {
         if (!this.value || !classIdPattern.test(this.value)) return '#C01B61'
       }
@@ -162,7 +162,7 @@ export default Vue.extend({
       return '#BDBDBD'
     },
     textFieldColor(): string {
-      const classIdPattern = /^[あ-ん]{6}$/
+      const classIdPattern = /^[あ-んa-zㄅ-ㄩ]{6}$/
       if (this.type === 'classId') {
         if (!this.value || !classIdPattern.test(this.value)) return '#C01B61'
       }
@@ -179,7 +179,7 @@ export default Vue.extend({
       return '#0071C2'
     },
     prependIcon(): string {
-      const classIdPattern = /^[あ-ん]{6}$/
+      const classIdPattern = /^[あ-んa-zㄅ-ㄩ]{6}$/
       if (this.type === 'classId') {
         if (!this.value || !classIdPattern.test(this.value))
           return 'mdi-alert-circle'

src/pages/index.vue

@@ -21,7 +21,7 @@
           color="#FFDB6C"
           width="56px"
           height="56px"
-          :disabled="!/^[あ-ん]{6}$/.test(classId)"
+          :disabled="!/^[あ-んa-zㄅ-ㄩ]{6}$/.test(classId)"
           :loading="loading"
           @click="loginToClass"
         >

src/pages/user/agree.vue

@@ -287,7 +287,7 @@
       <p style="text-align: right">以上</p>
     </div>
     <label class="Checkbox-label">
-      利用規約に同意します
+      {{ $t('common.agree_terms.checkbox.agree') }}
       <input
         v-model="toggle"
         type="checkbox"
@@ -301,13 +301,13 @@
       :is-disabled="!isCheck"
       class="Button"
       theme="primary"
-      text="登録へ進む"
+      :text="$t('common.agree_terms.buttons.agree')"
       @click="$router.push(localePath('/user/signup'))"
     />
     <base-action-button
       class="Button"
       theme="border"
-      text="同意しない"
+      :text="$t('common.agree_terms.buttons.disagree')"
       @click="$router.push(localePath('/'))"
     />
   </div>