Merge branch 'dev' into prod

crazwade · Jun 27, 2024 · 67966e2 · 67966e2
2 parents b050ae4 + 157b701
commit 67966e2
Show file tree

Hide file tree

Showing 5 changed files with 56 additions and 33 deletions.
diff --git a/src/components/ItemList.vue b/src/components/ItemList.vue
@@ -1,12 +1,17 @@
 <template>
-  <el-row v-for="(list, listIndex) in data" :key="listIndex">
-    <el-col :span="24">
-      <div class=" flex items-start text-[#21325e]">
-        <div class="ml-[0.8rem] font-extrabold text-3xl">．</div>
-        <div class="flex-grow flex-shrink-1 text-sm leading-6 my-[0.2rem]">{{ list }}</div>
-      </div>
-    </el-col>
-  </el-row>
+  <ol style="list-style-type: circle;" class="pl-[2rem]">
+    <template v-for="(list, listIndex) in data" :key="listIndex">
+      <li>
+        <el-row class="py-[4px]">
+          <el-col :span="24">
+            <div class="flex items-start text-[#21325e]">
+              <div class="flex-grow flex-shrink-1 text-[15px] leading-6 my-[0.2rem]">{{ list }}</div>
+            </div>
+          </el-col>
+        </el-row>
+      </li>
+    </template>
+  </ol>
 </template>
 
 <script setup lang='ts'>

diff --git a/src/lang/en.json b/src/lang/en.json
@@ -97,17 +97,20 @@
         "JavaScript(ES6)",
         "RESTful API",
         "Socket.io",
+        "Axios",
+        "Swagger",
         "Element-Plus",
         "Tailwind CSS",
         "ESLint",
         "Pinia",
         "Figma"
       ],
       "content": [
-        "Collaborated with cross-functional teams, including backend engineers, graphic designers, and project managers",
-        "Executed production based on specifications and collaborated with backend engineers to discuss API structures, meeting interface integration requirements",
-        "In large-scale projects, focusing on middleware tasks. Responsible for creating API interfaces, converting data types, and handling functions for API requests and payloads between frontend and backend",
-        "Proficient in writing logic layer code based on frontend UX and integrating UI components"
+        "Proficient in Vue.js, TypeScript, and Tailwind CSS for web application development",
+        "Collaborated with cross-functional teams and created more than 10 projects（e.q. middleware management system, front-end information website, internal back-end log viewing system...）",
+        "Reduced development deployment time by 30% and minimized manual deployment errors through the use of GitLab CI/CD automation",
+        "Enforced consistent coding style using ESLint, resulting in improved code readability and maintainability",
+        "In large-scale projects, focusing on middleware tasks. Responsible for creating API interfaces, converting data types, and handling functions for API requests and payloads between frontend and backend"
       ],
       "link": "https://www.sakawa.com.tw/"
     },
@@ -218,5 +221,6 @@
       ],
       "link": "https://crazwade.github.io/CSR/dist/"
     }
-  ]
+  ],
+  "updating": "Updating... coming soon..."
 }
diff --git a/src/lang/zh.json b/src/lang/zh.json
@@ -97,17 +97,20 @@
         "JavaScript(ES6)",
         "RESTful API",
         "Socket.io",
+        "Axios",
+        "Swagger",
         "Element-Plus",
         "Tailwind CSS",
         "ESLint",
         "Pinia",
         "Figma"
       ],
       "content": [
-        "跨部門團隊合作，成員包括後端工程師、美術設計師和專案經理",
-        "依照規格書執行製作並與後端工程師討論 API 結構，以滿足對接頁面的需求",
-        "在大型專案中，專注於中介層製作。負責建立 API 接口、轉換資料類型，並處理畫面端和後端 API 之間的請求和資料傳輸功能",
-        "具有依前端 UX 撰寫邏輯層程式和整併畫面元件的能力"
+        "前端團隊主要使用 Vue.js 框架搭配 TypeScript / Tailwind CSS 來開發",
+        "具有跨部門團隊合作經驗，與後端工程師、美術設計師和專案經理團隊合作超過10個專案（e.q. 中台管理系統、前台資訊網站、內部後端log查看系統...）",
+        "使用 GitLab CI/CD 開發自動化部屬減少 30% 開發部署時間以及降低手動部署的失誤率",
+        "使用 ESLint 確保 codeing style 降低閱讀成本",
+        "在大型專案中，專注於中介層製作。負責建立 API 接口、轉換資料類型，並處理畫面端和後端 API 之間的請求和資料傳輸功能"
       ],
       "link": "https://www.sakawa.com.tw/"
     },
@@ -218,5 +221,6 @@
       ],
       "link": "https://crazwade.github.io/CSR/dist/"
     }
-  ]
+  ],
+  "updating": "功能調整更新中"
 }
diff --git a/src/view/ControlArea/ControlArea.vue b/src/view/ControlArea/ControlArea.vue
@@ -15,26 +15,35 @@
     :title="$t('setting.title')"
     :before-close="handleClose"
   >
-  <div class="dialogLabel">
-    <span>{{ $t('setting.lang') }}:</span>
-    <el-switch
-      v-model="currentValue"
-      size="large"
-      active-text="English"
-      inactive-text="中文"
-    />
-  </div>
-  <div class="dialogLabel">
-    <span>{{ $t('setting.pdf') }}:</span>
-    <el-button @click="exportPDF">Export</el-button>
-  </div>
+    <div class="dialogLabel">
+      <span>{{ $t('setting.lang') }}:</span>
+      <div class="w-fit">
+        <el-switch
+          v-model="currentValue"
+          size="large"
+          active-text="English"
+          inactive-text="中文"
+        />
+      </div>
+    </div>
+    <div class="dialogLabel">
+      <span>{{ $t('setting.pdf') }}:</span>
+      <el-button @click="exportPDF">Export</el-button>
+    </div>
+  </el-dialog>
+  <el-dialog
+    v-model='dialogAlertVisible'
+    :title="$t('setting.title')"
+  >
+    {{ $t('updating') }}
   </el-dialog>
 </template>
 
 <script setup lang='ts'>
 import { ref, computed } from 'vue';
 
 const dialogVisible = ref(false);
+const dialogAlertVisible = ref(false);
 
 const props = defineProps<{
   modelValue: boolean;
@@ -60,7 +69,8 @@ const handleClose = () => {
 };
 
 const exportPDF = () => {
-  emits('exportPDF');
+  dialogAlertVisible.value = true;
+  // emits('exportPDF');
 };
 </script>
 

diff --git a/src/view/MainContent/components/MyInfo.vue b/src/view/MainContent/components/MyInfo.vue
@@ -8,7 +8,7 @@
             <div class="text-2xl font-semibold text-[#8bb0e4] pl-1">{{ $t('info.title') }}</div>
             <div class="text-base pl-1">{{ $t('info.degree') }}</div>
           </div>
-          <div class="flex flex-row 768px:flex-col">
+          <div class="flex flex-wrap flex-row 768px:flex-col">
             <SocialLink :socialItems="socialItems" />
           </div>
         </div>