Merge pull request #501 from tyuchx/feature/modify_fa_page

feat: enable financial aid pages
pycontw · Apr 1, 2024 · c06f5de · c06f5de
2 parents d8521cd + bc6d837
commit c06f5de
Show file tree

Hide file tree

Showing 3 changed files with 56 additions and 25 deletions.
diff --git a/i18n/registration/financial-aid.i18n.js b/i18n/registration/financial-aid.i18n.js
@@ -17,27 +17,36 @@ export default genI18nMessages({
             {
                 title: 'Eligibility',
                 content:
-                    'The financial aid program is open to all contributors, attendees, students,' +
+                    'The financial aid program is open to all contributors, attendees, students, ' +
                     'and speakers and aims to provide assistance to ' +
                     'those who otherwise might not be able to attend the conference.',
             },
             {
                 title: 'Auxiliary Items',
                 content:
-                    'The Financial Aid accepts conference fees and travel compensation but may be reduced based on the number of applicants.',
+                    'The financial aid auxiliary items encompass conference fees, ' +
+                    'travel grants, transit provisions including Taiwan High Speed Rail ' +
+                    'and Taiwan Railway passes, economy-class airfare to/from ' +
+                    'any Taiwanese airport, and accommodation expenses.',
             },
             {
                 title: 'Reimbursement',
                 content:
-                    'PyCon TW will e-mail you the discount code for registration ' +
-                    'if your application is accepted.',
-            },
-            {
-                title: 'Deadline',
-                content:
-                    'The Financial Aid Program will be closed on July 1st (15:30 UTC).',
+                    'Once your financial aid application is accepted, you will receive a ' +
+                    'discount code via email for conference registration. After registering, ' +
+                    'you can seek reimbursement for approved travel expenses by submitting ' +
+                    'your receipt at the reception desk of the venue. We will process your ' +
+                    'reimbursement promptly, ensuring you are reimbursed for your ' +
+                    'approved travel costs.',
             },
         ],
+        applicationDeadline: 'Timeline',
+        DeadlineContent: [
+            '2024-03-24 23:59 (AoE) Financial aid application opens.',
+            '2024-06-17 23:59 (AoE) Financial aid application closes.',
+            '2024-06-23 23:59 (AoE) Financial aid application review results announcement.',
+            '2024-09-21 18:00 (AoE) Disbursement sessions at PyCon TW.',
+        ],
         applicationHowTo: 'Application Process',
         remarkTitle: 'Remarks',
         remarkContent: [
@@ -77,18 +86,26 @@ export default genI18nMessages({
             },
             {
                 title: '補助項目',
-                content: '大會門票及交通補助（補助金額依審核結果決定）',
+                content:
+                    '我們提供多項補助項目，包括大會門票交通補助（補助金額依審核結果決定）' +
+                    '交通補助涵蓋高鐵和台鐵費用，而機票費用則涵蓋經濟艙的飛機票。此外，' +
+                    '我們也提供住宿費用的補助。',
             },
             {
                 title: '領取方式',
                 content:
-                    '大會將寄送 KKTIX 優惠碼，請至 KKTIX 上使用優惠碼購票。',
-            },
-            {
-                title: '受理期限',
-                content: '即日起至 2023 年 7 月  1 日 23:30 （台北時間）截止。',
+                    '一旦您的 FA 申請被接受，我們會通過電子郵件給您發送會議註冊的折扣碼。註冊後，' +
+                    '您就有資格報銷已批准的差旅費用。只需將旅行費用收據副本提交到會場的接待處，' +
+                    '我們將根據您提供的收據為您進行報銷，確保您獲得已批准的旅行費用的退款。',
             },
         ],
+        applicationDeadline: '財務補助時程',
+        DeadlineContent: [
+            '2024-03-24 23:59 (台北時間) 開始接受財務補助',
+            '2024-06-17 23:59 (台北時間) 財務補助申請截止',
+            '2024-06-23 23:59 (台北時間) 財務補助審查結果通知',
+            '2024-09-21 18:00 (台北時間) 大會當場支付',
+        ],
         applicationHowTo: '申請流程',
         remarkTitle: '備註',
         remarkContent: [

diff --git a/pages/registration/financial-aid.vue b/pages/registration/financial-aid.vue
@@ -1,8 +1,10 @@
 <template>
     <i18n-page-wrapper>
         <core-h1 :title="$t('title')"></core-h1>
-        <p class="intro">{{ $t('intro') }}</p>
-        <div class="container">
+        <div class="mb-[50px]">
+            <i18n path="intro" tag="div"></i18n>
+        </div>
+        <div>
             <two-col-wrapper
                 v-for="(field, i) in $t('plainTextFields')"
                 :key="`financial_plain_text_field_${i}`"
@@ -24,6 +26,22 @@
                 </template>
             </two-col-wrapper>
 
+            <two-col-wrapper>
+                <template #default>
+                    <p>{{ $t('applicationDeadline') }}</p>
+                </template>
+                <template #right-col>
+                    <ul class="list-disc">
+                        <li
+                            v-for="(content, i) in $t('DeadlineContent')"
+                            :key="`application_deadline_content_${i}`"
+                        >
+                            {{ content }}
+                        </li>
+                    </ul>
+                </template>
+            </two-col-wrapper>
+
             <two-col-wrapper class="spacing">
                 <template #default>
                     <p>{{ $t('remarkTitle') }}</p>
@@ -33,7 +51,7 @@
                         <i18n path="fillFormProcess" tag="li">
                             <template #form>
                                 <ext-link
-                                    href="https://lihi1.com/433eL"
+                                    href="https://forms.gle/PBu5k6HHNanEkCd47"
                                     highlight
                                     underline
                                     >{{ $t('form') }}</ext-link
@@ -139,11 +157,7 @@ export default {
 }
 
 .bg-img {
-    @apply mt-4 bg-contain bg-left bg-no-repeat pt-20 lg:pt-52;
-}
-
-.container {
-    @apply mx-auto w-full lg:w-9/12;
+    @apply mt-4 bg-contain bg-left bg-no-repeat pt-40 lg:pt-52;
 }
 
 .spacing {

diff --git a/store/index.js b/store/index.js
@@ -17,7 +17,7 @@ export const state = () => ({
         showAboutStaffPage: false,
         showSchedulePage: false,
         showSponsorPage: true,
-        showRegistrationPage: false,
+        showRegistrationPage: true,
         showEventOverviewPage: true,
         showEventsPage: false,
         showConferencePage: false,
@@ -28,7 +28,7 @@ export const state = () => ({
         aboutHideItems: ['apacCommunity'], // ['pycontw', 'apacCommunity', 'history', 'community', 'codeOfConduct']
         eventsHideItems: [], // ['sprints', 'openSpaces', 'jobs']
         conferenceHideItems: [], // ['keynotes', 'talks', 'tutorials', 'panelDiscussion']
-        registrationHideItems: [], // ['tickets', 'financialAid']
+        registrationHideItems: ['tickets'], // ['tickets', 'financialAid']
         venueHideItems: [], // ['venueInfo', 'accommodation']
     },
 })