Merge pull request #74 from gdsc-ncku/yeeway

fix: update event.json and Schedule.vue

src/components/ScheduleCardModal.vue

@@ -45,9 +45,12 @@
           <p class="text-black sm:text-xl text-base font-[400]">{{ description }}</p>
         </div>
         <div class="grow text-right flex justify-end items-end">
-          <a :href="link" target="_blank" class="font-bold text-xl max-sm:text-base text-white bg-primary-900 h-[50px] rounded-md p-3">
+          <a v-if="link" :href="link" target="_blank" class="font-bold text-xl max-sm:text-base text-white bg-primary-900 h-[50px] rounded-md p-3">
             即刻報名
           </a>
+          <div v-else class="font-bold text-xl max-sm:text-base text-white bg-primary-900 h-[50px] rounded-md p-3">
+            不需事前報名
+          </div>
         </div>
       </div>
     </div>

src/data/event.json

@@ -536,7 +536,7 @@
     "id": "42",
     "name": "學習歷程撰寫心法分享 | 王榮春先生",
     "activity": "升學指南",
-    "project": "學習歷程講座",
+    "project": "學習歷程特邀講座",
     "description": "本屆單車節與104人力銀行合作，除了共同協作免費線上懶人包供不論是否能前來單車節的高中生領取，亦邀請到了104人力銀行的職涯教育長 - 王榮春先生，於單車節當日舉辦演講分享學習歷程撰寫心法。",
     "date": "3/3",
     "startTime": "15:00",
@@ -2065,5 +2065,57 @@
     "location": "光復校區 榕園",
     "host": "單車節秘書部",
     "link": ""
+  },
+  {
+    "id": "160",
+    "name": "解憂茶軒-上半場",
+    "activity": "解憂茶軒",
+    "project": "解憂茶軒",
+    "description": "在 108 課綱的改制下，越來越多高中生被要求提早確定未來目標，產出豐富的學習歷程。在這條路上，總是充滿著迷惘與焦慮，同為走過課綱改制一員的我們，希望能以過來人的身份為現在的高中生指點迷津，提供一個對話平台，幫助高中生解決升學遇到的問題、生活上的煩惱。",
+    "date": "3/2",
+    "startTime": "09:00",
+    "endTime": "11:40",
+    "location": "成大歷史文物館",
+    "host": "單車節策展部",
+    "link": ""
+  },
+  {
+    "id": "161",
+    "name": "解憂茶軒-上半場",
+    "activity": "解憂茶軒",
+    "project": "解憂茶軒",
+    "description": "在 108 課綱的改制下，越來越多高中生被要求提早確定未來目標，產出豐富的學習歷程。在這條路上，總是充滿著迷惘與焦慮，同為走過課綱改制一員的我們，希望能以過來人的身份為現在的高中生指點迷津，提供一個對話平台，幫助高中生解決升學遇到的問題、生活上的煩惱。",
+    "date": "3/3",
+    "startTime": "09:00",
+    "endTime": "11:40",
+    "location": "成大歷史文物館",
+    "host": "單車節策展部",
+    "link": ""
+  },
+  {
+    "id": "162",
+    "name": "解憂茶軒-下半場",
+    "activity": "解憂茶軒",
+    "project": "解憂茶軒",
+    "description": "在 108 課綱的改制下，越來越多高中生被要求提早確定未來目標，產出豐富的學習歷程。在這條路上，總是充滿著迷惘與焦慮，同為走過課綱改制一員的我們，希望能以過來人的身份為現在的高中生指點迷津，提供一個對話平台，幫助高中生解決升學遇到的問題、生活上的煩惱。",
+    "date": "3/2",
+    "startTime": "13:00",
+    "endTime": "16:40",
+    "location": "成大歷史文物館",
+    "host": "單車節策展部",
+    "link": ""
+  },
+  {
+    "id": "163",
+    "name": "解憂茶軒-上半場",
+    "activity": "解憂茶軒",
+    "project": "解憂茶軒",
+    "description": "在 108 課綱的改制下，越來越多高中生被要求提早確定未來目標，產出豐富的學習歷程。在這條路上，總是充滿著迷惘與焦慮，同為走過課綱改制一員的我們，希望能以過來人的身份為現在的高中生指點迷津，提供一個對話平台，幫助高中生解決升學遇到的問題、生活上的煩惱。",
+    "date": "3/3",
+    "startTime": "13:00",
+    "endTime": "16:40",
+    "location": "成大歷史文物館",
+    "host": "單車節策展部",
+    "link": ""
   }
 ]

src/views/Home.vue

@@ -149,7 +149,7 @@
     <div class="text-white xl:text-2xl lg:text-base text-sm">
       <h2 class="font-bold text-white xl:text-4xl lg:text-3xl text-2xl lg:mb-12 sm:mb-10 mb-7">紀念品小舖</h2>
       <div class="*:w-max w-max sm:m-0 mx-auto mb-6">
-        <p>敬請期待！</p>
+        <p>歡迎到現場攤位進行購買！</p>
       </div>
       <RouterLink
         class="lg:flex h-16 justify-center bg-white rounded-lg mt-7 "

src/views/Souvenir.vue

@@ -1,32 +1,21 @@
 <template>
-  <!-- <div class="h-28"></div>
-  <WorkInProgress /> -->
-  <div class="h-28"></div>
-
+  <div class="h-20"></div>
+
   <div class="pt-20 pb-10 sm:px-[8.26rem] px-10 flex flex-col gap-5">
-    <h1 class="text-[#3A3A3A] font-bold text-center sm:text-5xl text-[2rem]">單車節限定紀念品</h1>
-    <div class="w-full flex flex-wrap justify-start gap-[3.12rem]">
-      <div v-for="(d, di) in data" class="sm:w-[calc(33%_-_2.08rem)] w-[21.375rem] h-[17.625rem]">
-        <div class="text-center text-xl text-bold mb-3">{{ d.name }}</div>
-        <div class="w-full text-nowrap overflow-x-hidden scroll-smooth" :ref="elements[di]">
-          <img class="mx-[0.87rem] rounded-[0.3125rem] bg-[#D9D9D9] h-36 w-[11.75rem] inline cursor-pointer" v-for="(l, li) in d.img" :src="l" @click="change(di, li)()">
-        </div>
-        <!-- <div class="flex w-32 gap-2 mx-auto my-3">
-          <div class="p flex-1 h-[0.3125rem] rounded-[0.15625rem] cursor-pointer" v-for="i of 3" :data-select="select[di] === i - 1" @click="change(di, i - 1)()"></div>
+    <h1 class="mb-4 text-content font-bold text-center sm:text-5xl text-[2rem]">單車節限定紀念品</h1>
 
-          <div class="p flex-1 h-[0.3125rem] rounded-[0.15625rem] cursor-pointer" :data-select="select[di] === 0" @click="change(di, 0)()"></div>
-          <div class="p flex-1 h-[0.3125rem] rounded-[0.15625rem] cursor-pointer" :data-select="select[di] === 1" @click="change(di, 1)()"></div>
-          <div class="p flex-1 h-[0.3125rem] rounded-[0.15625rem] cursor-pointer" :data-select="select[di] === 2" @click="change(di, 2)()"></div>
-        </div> -->
-        <!-- <div class="text-primary-900 text-xs text-center my-2">{{ d.designConcept }}</div>
-        <div class="text-xs text-center">{{ d.context }}</div> -->
+    <div class="w-full flex flex-col justify-center gap-12">
+      <div v-for="(item, item_id) in data" class="w-full">
+        <div class="text-center text-2xl text-bold mb-3 text-content">{{ item.name }}</div>
+        <div class="w-full flex flex-wrap justify-center gap-4" :ref="elements[item_id]">
+          <img class="rounded-md bg-[#D9D9D9] h-36 w-[11.75rem]" v-for="(link, link_id) in item.img" :src="link">
+        </div>
       </div>
     </div>
   </div>
 </template>
 
 <script setup>
-import WorkInProgress from '../components/WorkInProgress.vue';
 import { ref } from "vue";
 
 const data = [

src/views/info/Map.vue

@@ -1,15 +1,10 @@
 <template>
-  <WorkInProgress />
 
-  <!--
-  <a href="file/example.png" download="單車17-攤位地圖.png" class="underline text-content text-xl flex items-center">
+  <a href="/2024_bike_festival_map.jpg" download="單車17-攤位地圖.png" class="underline text-content text-xl flex items-center">
     點此下載（PNG）
     <svg class="ml-2" xmlns="http://www.w3.org/2000/svg" width="20" height="17" viewBox="0 0 20 17" fill="none"><path d="M0 10H2V15H18V10H20V15C20 16.11 19.11 17 18 17H2C0.9 17 0 16.11 0 15V10ZM10 13L15.55 7.54L14.13 6.13L11 9.25V0H9V9.25L5.88 6.13L4.46 7.55L10 13Z" fill="#5A5A5A" /></svg>
   </a>
-  <img src="" alt="攤位地圖" class="w-full bg-gray-500 my-20"/>
-  -->
+  <img src="/2024_bike_festival_map.webp" alt="攤位地圖" class="w-full bg-gray-500 my-10"/>
+
 </template>
 
-<script setup>
-import WorkInProgress from '@/components/WorkInProgress.vue'
-</script>

src/views/info/Schedule.vue

@@ -192,12 +192,12 @@ const cardWidth = 155; // Width of each card
 const dateList = ref(["3/2", "3/3"]);
 
 const projectList = ref([
-  "舞台活動",
+  "主舞台〈曦瓣〉",
   "傑出校友生涯講座",
   "What Matters Most 工作坊",
   "校園論壇",
   "教授面試技巧演講",
-  "學習歷程講座",
+  "學習歷程特邀講座",
   "申請入學經驗談",
   "科系體驗坊",
   "系館導覽",
@@ -212,12 +212,12 @@ const projectElementList = ref(null);
 const cardTransformList = ref([0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]);
 
 const projectColorList = ref({
-  舞台活動: null,
+  "主舞台〈曦瓣〉": null,
   傑出校友生涯講座: "#FF5C0045",
   "What Matters Most 工作坊": "#FF5C0045",
   校園論壇: "#FF5C0045",
   教授面試技巧演講: "#9CDAF7",
-  學習歷程講座: "#9CDAF7",
+  學習歷程特邀講座: "#9CDAF7",
   申請入學經驗談: "#9CDAF7",
   科系體驗坊: "#FFEAA0",
   系館導覽: "#FFEAA0",
@@ -234,7 +234,7 @@ const showTutorial = ref(true);
   schema :
   {
     "2024/3/2" : {
-      "舞台活動" : [event1, event2, ...],
+      "主舞台〈曦瓣〉" : [event1, event2, ...],
       "傑出校友生涯講座" : [event1, event2, ...],
       ...
     },