From 5a6163e4d4ac3a4921564a97983ec1ad27cc3013 Mon Sep 17 00:00:00 2001
From: mysper <anthony.a3203@gmail.com>
Date: Tue, 19 Jan 2021 18:03:41 +0800
Subject: [PATCH 1/5] [add] add url for each link

---
 src/components/CFP/IntrodContainer.vue | 31 +++++++++++++++++++-------
 1 file changed, 23 insertions(+), 8 deletions(-)

diff --git a/src/components/CFP/IntrodContainer.vue b/src/components/CFP/IntrodContainer.vue
index cae7920..15dea85 100644
--- a/src/components/CFP/IntrodContainer.vue
+++ b/src/components/CFP/IntrodContainer.vue
@@ -32,17 +32,17 @@
                 <div class="thumbnails">
                     <table class="img-table">
                         <tr>
-                            <td class="td-width">
+                            <td class="td-width" onclick="window.location.href='/2020'">
                                 <img class="cfp-img" src="@/assets/images/cfp/2020.png" />
                                 <p class="tag">SITCON 2020<br /></p>
                                 <p class="tag sub">#define</p>
                             </td>
-                            <td class="td-width">
+                            <td class="td-width" onclick="window.location.href='/2019'">
                                 <img class="cfp-img" src="@/assets/images/cfp/2019.png" />
                                 <p class="tag">SITCON 2019<br /></p>
                                 <p class="tag sub">開箱演算法</p>
                             </td>
-                            <td class="td-width">
+                            <td class="td-width" onclick="window.location.href='/2018'">
                                 <img class="cfp-img" src="@/assets/images/cfp/2018.png" />
                                 <p class="tag">SITCON 2018<br /></p>
                                 <p class="small-tag">POPULAR COMPUTER SCIENCE</p>
@@ -64,8 +64,14 @@
                     </p>
                 </div>
                 <div>
-                    <button class="buttons"><h3>SITCON 論壇</h3></button>
-                    <button class="buttons"><h3>會議記錄</h3></button>
+                    <button
+                        class="buttons"
+                        onclick="window.location.href='https://groups.google.com/g/sitcon-general'"
+                    ><h3>SITCON 論壇</h3></button>
+                    <button
+                        class="buttons"
+                        onclick="window.location.href='https://hackmd.io/@SITCON/SITCON2021'"
+                    ><h3>會議記錄</h3></button>
                 </div>
             </div>
             
@@ -101,9 +107,15 @@
                             詳細時程請見
                         </p>
                         <div class="button-post">
-                            <button class="buttons"><h3>投稿資訊</h3></button>
+                            <button
+                                class="buttons"
+                                onclick="window.location.href='/news'"
+                            ><h3>投稿資訊</h3></button>
                             <!-- NOTE: this button's hover won't work because paper.png is too big -->
-                            <button class="buttons"><h3>不用說了，快讓我投稿！</h3></button>
+                            <button
+                                class="buttons"
+                                onclick="window.location.href='https://forms.gle/XoXJSD2P8dL8X8s2A'"
+                            ><h3>不用說了，快讓我投稿！</h3></button>
                         </div>
                     </div>
                 </div>
@@ -122,7 +134,10 @@
                         <a class="context-hyperlink" href="mailto:contact@sitcon.org">contact@sitcon.org</a>
                     </p>
                     <div>
-                        <button class="buttons"><h3>個人贊助方案</h3></button>
+                        <button
+                            class="buttons"
+                            onclick="window.location.href='http://bit.ly/donatesitcon2021'"
+                        ><h3>個人贊助方案</h3></button>
                     </div>
                 </div>
                 <!-- second part -->

From a382d89e045f1e8621e6a83555b5f31b62de64b1 Mon Sep 17 00:00:00 2001
From: Denny Huang <denny0223@gmail.com>
Date: Tue, 19 Jan 2021 21:05:29 +0800
Subject: [PATCH 2/5] Fix json-ld

---
 template/ga.html | 18 ++++--------------
 1 file changed, 4 insertions(+), 14 deletions(-)

diff --git a/template/ga.html b/template/ga.html
index 66fae17..3e4411a 100644
--- a/template/ga.html
+++ b/template/ga.html
@@ -36,21 +36,12 @@
     "offers": [
       {
       "@type": "Offer",
-        "name": "個人贊助票",
+        "name": "個人小額贊助方案",
         "url": "https://sitcon.kktix.cc/events/sitcon2020-individual-sponsor",
-        "price": "1000",
-        "priceCurrency": "TWD",
-        "availability": "http://schema.org/InStock",
-        "validFrom": "2019-10-14T00:00+08:00"
-      },
-      {
-      "@type": "Offer",
-        "name": "個人贊助票（純粹贊助）",
-        "url": "https://sitcon.kktix.cc/events/sitcon2021-individual-sponsor1",
         "price": "500",
         "priceCurrency": "TWD",
         "availability": "http://schema.org/InStock",
-        "validFrom": "2019-10-14T00:00+08:00"
+        "validFrom": "2020-12-01T00:00+08:00"
       }
     ],
     "performer": {
@@ -64,8 +55,7 @@
         "https://twitter.com/sitcontw"
       ]
     },
-    "eventStatus": "EventRescheduled",
-    "previousStartDate": "2021-05-29T08:30+08:00"
+    "eventStatus": "EventScheduled"
   }
 </script>
 <script>
@@ -95,4 +85,4 @@
     }
     gtag('js', new Date());
     gtag('config', 'UA-34467841-1');
-</script>
\ No newline at end of file
+</script>

From e7c8ec7bba00b7521ca4ec7168356e1c674e8d44 Mon Sep 17 00:00:00 2001
From: mysper <anthony.a3203@gmail.com>
Date: Tue, 19 Jan 2021 21:09:41 +0800
Subject: [PATCH 3/5] [fix] corruct link url

---
 package.json                 | 4 ++--
 public/index.html            | 3 ++-
 src/components/CFP/Intro.vue | 2 +-
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/package.json b/package.json
index 5d4011d..0376a63 100644
--- a/package.json
+++ b/package.json
@@ -4,7 +4,7 @@
   "private": true,
   "scripts": {
     "serve": "vue-cli-service serve",
-    "build": "vue-cli-service build && mv ./dist/2021/* ./dist && rm -rf 2021",
+    "build": "vue-cli-service build && mv ./dist/2021/* ./dist && rm -rf 2021 && mv ./dist/app.html ./dist/index.html",
     "lint": "vue-cli-service lint"
   },
   "dependencies": {
@@ -34,4 +34,4 @@
     "vue-cli-plugin-prerender-spa": "~1.1.6",
     "vue-template-compiler": "^2.6.11"
   }
-}
+}
\ No newline at end of file
diff --git a/public/index.html b/public/index.html
index 72ec4a8..c9c50d9 100644
--- a/public/index.html
+++ b/public/index.html
@@ -13,10 +13,11 @@
   <meta property="og:site_name" content="SITCON 2021 學生計算機年會 | Students' Information Technology Conference" />
   <link rel="icon" href="<%= BASE_URL %>sitcon-logo.png">
   <title>SITCON 學生計算機年會 2021</title>
+  <noscript>{{{ %GA_TEMPLATE% }}}</noscript>
 </head>
 
 <body>
-  <noscript>{{{ %GA_TEMPLATE% }}}</noscript>
+
   <noscript>
     <strong>We're sorry but <%= htmlWebpackPlugin.options.title %> doesn't work properly without JavaScript enabled.
         Please enable it to continue.</strong>
diff --git a/src/components/CFP/Intro.vue b/src/components/CFP/Intro.vue
index 8f13078..9cd3725 100644
--- a/src/components/CFP/Intro.vue
+++ b/src/components/CFP/Intro.vue
@@ -109,7 +109,7 @@
                         <div class="button-post">
                             <button
                                 class="buttons"
-                                onclick="window.location.href='/cfp/news'"
+                                onclick="window.location.href='/2021/cfp/news'"
                             ><h3>投稿資訊</h3></button>
                             <!-- NOTE: this button's hover won't work because paper.png is too big -->
                             <button

From 99bb68c18b1dc5f4ac60ff338aa39e3b6cc18fa2 Mon Sep 17 00:00:00 2001
From: mysper <anthony.a3203@gmail.com>
Date: Tue, 19 Jan 2021 21:38:53 +0800
Subject: [PATCH 4/5] [fix] revise the link url

---
 src/components/news/Header.vue | 2 +-
 src/router/index.ts            | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/components/news/Header.vue b/src/components/news/Header.vue
index a4b8e1a..240ce2a 100644
--- a/src/components/news/Header.vue
+++ b/src/components/news/Header.vue
@@ -2,7 +2,7 @@
   <header>
     <div class="top-bar">
       <div class="return-wrapper">
-        <a class="shape-wrapper diamond" href="/cfp"
+        <a class="shape-wrapper diamond" href="/2021/cfp"
           ><span class="text-wrapper">返回</span></a
         >
       </div>
diff --git a/src/router/index.ts b/src/router/index.ts
index d9f00c0..27050d5 100644
--- a/src/router/index.ts
+++ b/src/router/index.ts
@@ -10,7 +10,7 @@ export const routes: RouteConfig[] = [
   {
     path: '/',
     name: 'Home',
-    redirect: '/cfp',
+    component: CFP,
     meta: {
       index: 0,
       label: 'SITCON 2021',

From bee4e443eaf500c7d698e6bc6b46e2a625b66677 Mon Sep 17 00:00:00 2001
From: mysper <anthony.a3203@gmail.com>
Date: Tue, 19 Jan 2021 21:48:24 +0800
Subject: [PATCH 5/5] [optimize] resize the first box

---
 src/components/CFP/Intro.vue | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/components/CFP/Intro.vue b/src/components/CFP/Intro.vue
index 9cd3725..2f4b234 100644
--- a/src/components/CFP/Intro.vue
+++ b/src/components/CFP/Intro.vue
@@ -16,8 +16,8 @@
             <!-- src="@/assets/images/cfp/Background.svg" -->
             <!-- first part -->
             <img src="@/assets/images/cfp/Path 740.svg" class="SITCON-text-path"/>
-            <svg width="890" height="900" class="first-box">
-              <rect width="1000" height="1000" style="fill:#ffffff;" />
+            <svg width="1200" height="1000" class="first-box">
+              <rect width="1200" height="1000" style="fill:#ffffff;" />
             </svg>
             <div class="box-back">
                 <h1>關於 SITCON</h1>
@@ -109,7 +109,7 @@
                         <div class="button-post">
                             <button
                                 class="buttons"
-                                onclick="window.location.href='/2021/cfp/news'"
+                                onclick="window.location.href='/cfp/news'"
                             ><h3>投稿資訊</h3></button>
                             <!-- NOTE: this button's hover won't work because paper.png is too big -->
                             <button