Merge branch '2024-migrate-frontend' into main

pycontw · Jan 31, 2024 · 3a35ccf · 3a35ccf
2 parents 3f9b92c + a9f11a8
commit 3a35ccf
Show file tree

Hide file tree

Showing 14 changed files with 459 additions and 305 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -20,8 +20,8 @@ COPY store ./store
 COPY utils ./utils
 COPY nuxt.config.js tailwind.config.js .babelrc .env ./
 
-ENV ROUTER_BASE /2023/
-ENV BASE_URL http://pycontw-2023:8000
+ENV ROUTER_BASE /2024/
+ENV BASE_URL http://pycontw-2024:8000
 ENV BUILD_TARGET server
 ENV HOST 0.0.0.0
 ENV API_URL_BROWSER https://tw.pycon.org/prs

diff --git a/components/core/footer/Footer.vue b/components/core/footer/Footer.vue
@@ -6,7 +6,7 @@
             <div class="flex justify-center">
                 <div class="flex flex-col items-center">
                     <ext-link
-                        href="https://forms.gle/vLz3Xev8tUpnRqacA"
+                        href="https://forms.gle/seaori7xF4vLSSUb7"
                         class="highlight my-2"
                     >
                         {{ $t('joinUs') }}

diff --git a/configs/pageLanding.js b/configs/pageLanding.js
@@ -1,14 +1,14 @@
 export const landingButtonConfig = {
     PRIMARY_JOIN_US: {
         isExternalLink: true,
-        path: 'https://forms.gle/vLz3Xev8tUpnRqacA',
+        path: 'https://forms.gle/seaori7xF4vLSSUb7',
         textKey: 'joinUs',
         isPrimary: true,
         isLarge: true,
     },
     SECONDARY_JOIN_US: {
         isExternalLink: true,
-        path: 'https://forms.gle/vLz3Xev8tUpnRqacA',
+        path: 'https://forms.gle/seaori7xF4vLSSUb7',
         textKey: 'joinUs',
         isPrimary: false,
         isBordered: true,
@@ -18,7 +18,7 @@ export const landingButtonConfig = {
         isExternalLink: false,
         path: '/speaking/cfp',
         textKey: 'callForProposals',
-        isPrimary: false,
+        isPrimary: true,
         isBordered: true,
         isLarge: true,
     },
@@ -50,7 +50,7 @@ export const landingBulletinsConfig = [
     {
         titleI18nKey: 'hackmd.title',
         descriptionI18nKey: 'hackmd.description',
-        link: 'https://hackmd.io/@pycontw/2022',
+        link: 'https://hackmd.io/@pycontw/2023',
         isExternalLink: true,
         icon: 'HackMD.svg',
         showBulletin: false,
@@ -126,6 +126,10 @@ export const landingFooterHistoryConfig = [
         text: '2022',
         link: 'https://tw.pycon.org/2022/',
     },
+    {
+        text: '2023',
+        link: 'https://tw.pycon.org/2023/',
+    },
 ]
 
 export const landingFooterSocialConfig = [

diff --git a/configs/pageSponsors.js b/configs/pageSponsors.js
@@ -1 +1,2 @@
-export const sponsorFormLink = 'https://forms.gle/sLZRYGz9jQpeBNh79'
+export const sponsorFormLink =
+    'https://docs.google.com/forms/d/e/1FAIpQLSfUJJlrdauqiAw9kteSGkCmfIMZqFPy5w8yMU60YilevWA56g/viewform'
diff --git a/docker-compose-dev.yml b/docker-compose-dev.yml
@@ -9,8 +9,8 @@ services:
       context: .
       dockerfile: mock-server.Dockerfile
 
-  pycontw-2023:
-    container_name: pycontw-2023-frontend-dev
+  pycontw-2024:
+    container_name: pycontw-2024-frontend-dev
     build:
       context: .
       dockerfile: dev.Dockerfile
@@ -19,7 +19,7 @@ services:
       - ./node_modules:/app/node_modules:delegated
     environment:
       - BUILD_TARGET=server
-      - ROUTER_BASE=/2023/
+      - ROUTER_BASE=/2024/
       - HOST=0.0.0.0
       - BASE_URL=http://mock-server:9876
       - API_URL_BROWSER=http://0.0.0.0:9876

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -1,8 +1,8 @@
 version: '3.5'
 
 services:
-  pycontw-2023-frontend:
-    container_name: pycontw-2023-frontend
+  pycontw-2024-frontend:
+    container_name: pycontw-2024-frontend
     restart: always
     build:
       context: .
@@ -12,4 +12,4 @@ services:
 networks:
     network:
         external: true
-        name: network-2023
+        name: network-2024
diff --git a/i18n/index.i18n.js b/i18n/index.i18n.js
@@ -2,7 +2,7 @@ import { genI18nMessages } from '@/utils/i18n.utils'
 
 export default genI18nMessages({
     'en-us': {
-        pyconWelcome: 'Welcome to PyCon TW 2023',
+        pyconWelcome: 'Welcome to PyCon TW 2024',
         pyconIntro: 'PyCon Taiwan',
         achieveFirstStatLine: 'Hold',
         achieveFirstEndLine: 'years',
@@ -27,7 +27,7 @@ export default genI18nMessages({
             '"PyCon TW 2023 will definitely be held successfully!"',
     },
     'zh-hant': {
-        pyconWelcome: '歡迎來到 PyCon TW 2023',
+        pyconWelcome: '歡迎來到 PyCon TW 2024',
         pyconIntro: 'PyCon Taiwan',
         achieveFirstStatLine: '持續舉辦',
         achieveFirstEndLine: '年',

diff --git a/i18n/sponsor/index.i18n.js b/i18n/sponsor/index.i18n.js
@@ -4,10 +4,9 @@ export default genI18nMessages({
     'en-us': {
         title: 'Why Sponsorship',
         intro: [
-            'PyCon Taiwan has held over 10 annual conferences to date. Last year, we invited 5 keynote speakers, 50 general talks, {br}' +
-                'and 3 tutorials, totaling over 36 hours of technical presentations. {br}' +
-                "At the same time, our community's social media activity has also increased, with a growth of 10,600 followers, {br}" +
-                'a 45.8% increase. In addition, the podcast has been downloaded 8,560 times. ' +
+            'PyCon Taiwan has held over 12 annual conferences to date. Last year, we invited 2 keynote speakers, 27 general talks, 3 tutorials and 1 panel totaling over 36 hours of technical presentations. {br}' +
+                "At the same time, our community's social media activity has also increased, with a growth of 11,162 followers. {br}" +
+                'In addition, the podcast has been downloaded 12,000 times. ' +
                 'These statistics demonstrate the success of PyCon Taiwan.With over 150 volunteers, ' +
                 'we have brought countless technical skills and inspiration to the Python community.',
         ],
@@ -19,19 +18,19 @@ export default genI18nMessages({
             },
             {
                 achievement: 'Participants',
-                achievementNumber: '800',
+                achievementNumber: '550',
                 achievementUnit: 'People',
             },
             {
                 achievement: 'Social Media',
-                achievementNumber: '10K',
+                achievementNumber: '11K',
                 achievementUnit: 'Followers',
             },
         ],
         serviceIntro: [
             'PyCon Taiwan is driven by our members and you, our awesome sponsor partners!{br}' +
                 'Your generous support is the motivation to help us move forward.{br}' +
-                'PyConTW 2023 calls for your sponsorship to enlarge our community.',
+                'PyConTW 2024 calls for your sponsorship to enlarge our community.',
             'Meanwhile, we also provide the benefit for our sponsors below:',
         ],
         services: [
@@ -54,15 +53,15 @@ export default genI18nMessages({
             title: 'Sponsorship',
             description:
                 'Your generous support is the motivation to help us move forward. ' +
-                'PyConTW 2023 calls for your sponsorship to enlarge our community.',
+                'PyConTW 2024 calls for your sponsorship to enlarge our community.',
         },
     },
     'zh-hant': {
         title: '贊助召集令',
         intro: [
-            'PyCon Taiwan 迄今已舉辦超過 10 場年度會議。去年我們邀請 5 場主題演講、50 場一般演講以及 3 場專業課程，{br}' +
-                '總計超過 36 小時的技術演講。同時，我們的社群媒體活躍度也隨之提高，追蹤人數增加了 10,600 位，{br}' +
-                '增長了 45.8%。此外，Podcast 下載量高達 8,560 次。這些數據充分展現了 PyCon Taiwan 的成功。 {br}' +
+            'PyCon Taiwan 迄今已舉辦超過 12 場年度會議。去年我們邀請 2 場主題演講、27 場一般演講、1 場專業課程以及 1 場專業論壇，{br}' +
+                '總計超過 36 小時的技術演講。同時，我們的社群媒體活躍度也隨之提高，追蹤人數增加到了 11162 位。{br}' +
+                '此外，Podcast 下載量高達 12000次。這些數據充分展現了 PyCon Taiwan 的成功。 {br}' +
                 '我們擁有超過 150 位志工，為 Python 社群帶來了無數的技術與靈感。',
         ],
         milestone: [
@@ -73,19 +72,19 @@ export default genI18nMessages({
             },
             {
                 achievement: '參與會眾',
-                achievementNumber: '800',
+                achievementNumber: '550',
                 achievementUnit: '人以上',
             },
             {
                 achievement: '社群媒體',
-                achievementNumber: '10K',
+                achievementNumber: '11K',
                 achievementUnit: '追蹤人數',
             },
         ],
         serviceIntro: [
             '您的支持是推進 PyCon Taiwan 的強大動力。{br}' +
                 'PyCon Taiwan 在此召集您的加入，透過贊助以具體行動支持 Python 社群的成長！{br}' +
-                '透過參與 PyConTW 2023，我們也提供贊助廠商以下的服務：',
+                '透過參與 PyConTW 2024，我們也提供贊助廠商以下的服務：',
         ],
         services: [
             '接觸專業人士',
@@ -94,7 +93,7 @@ export default genI18nMessages({
             '建立人才網絡',
         ],
         summary:
-            '若想了解 PyConTW 2023 完整的贊助方案，歡迎點擊下方按鈕填寫表單留下您的聯絡資料' +
+            '若想了解 PyConTW 2024 完整的贊助方案，歡迎點擊下方按鈕填寫表單留下您的聯絡資料' +
             '索取贊助書或是直接透過贊助組信箱 {contact} 聯絡我們，讓我們了解貴單位的需求！',
         terms: {
             contact: '[email protected]',

diff --git a/nuxt.config.js b/nuxt.config.js
@@ -1,6 +1,6 @@
 import axios from 'axios'
 const DEFAULT_BASE_URL = 'https://tw.pycon.org/prs'
-const DEFAULT_ROUTER_BASE = '/2023/'
+const DEFAULT_ROUTER_BASE = '/2024/'
 const DEFAULT_BUILD_TARGET = 'static'
 const DEFAULT_VUE_DEVTOOL = false