Merge branch 'release/1.1.0'

.env

@@ -0,0 +1,3 @@
+VITE_API_URL=http://localhost:3002
+VITE_MerchantID=MS149064484
+VITE_Version=1.5

.env.dev

@@ -0,0 +1,3 @@
+VITE_API_URL=https://dev.sweettime.tw
+VITE_MerchantID=MS149064484
+VITE_Version=1.5

.env.production

@@ -0,0 +1,3 @@
+VITE_API_URL=https://sweettime.tw
+VITE_MerchantID=MS149064484
+VITE_Version=1.5

.eslintrc.cjs

@@ -7,8 +7,18 @@ module.exports = {
     'plugin:vue/vue3-essential',
     'eslint:recommended',
     '@vue/eslint-config-typescript',
-    '@vue/eslint-config-prettier/skip-formatting'
+    '@vue/eslint-config-prettier/skip-formatting',
+    'prettier'
   ],
+  plugins: ['prettier'],
+  rules: {
+    'prettier/prettier': [
+      'error',
+      {
+        endOfLine: 'auto'
+      }
+    ]
+  },
   parserOptions: {
     ecmaVersion: 'latest'
   },

.nvmrc

@@ -0,0 +1 @@
+16.20.0

CHANGELOG.md

@@ -0,0 +1,103 @@
+# Changelog
+
+All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
+
+## 1.1.0 (2023-06-11)
+
+
+### Features
+
+*  課程問答:  新增 登入樣式顯示 ([7fcd372](https://github.com/HSNM2/frontend-Vue3/commit/7fcd37260344fb263bea4e56178f42835d08f385))
+* 1. 調整課程介面樣式 2. 新增評價modal ([04ebed1](https://github.com/HSNM2/frontend-Vue3/commit/04ebed1afc25d9bec4adb6fe1448a6e4e8996804))
+* add input disabled style ([29a28b8](https://github.com/HSNM2/frontend-Vue3/commit/29a28b87754700f0965e015f8e9f76ed13041d72))
+* add setting ([1754952](https://github.com/HSNM2/frontend-Vue3/commit/1754952ba46c69fde9b85cdbe0236e89ec7b2003))
+* add useSetMinMainHieght.ts & courses feature ([e49491a](https://github.com/HSNM2/frontend-Vue3/commit/e49491a186ca8c981032c9dc966a3523788fbd1f))
+* cart-function-development ([99ee63d](https://github.com/HSNM2/frontend-Vue3/commit/99ee63d3a7a7af7c873eb79c89d820fb2f64cef1))
+* cart, order, payment site api connection ([dfc62ce](https://github.com/HSNM2/frontend-Vue3/commit/dfc62ce2e54e5c1cda382a047bdb9b771c47f4e8))
+* CKEditor-intergration ([e262d50](https://github.com/HSNM2/frontend-Vue3/commit/e262d506f946f52b38ca3fedaca9cce2573a0565))
+* course information edit function - API connection ([d12b9aa](https://github.com/HSNM2/frontend-Vue3/commit/d12b9aabca549d2eb4e230c17ab288237fd01f84))
+* course-dashboard-layout-update ([3d9dc89](https://github.com/HSNM2/frontend-Vue3/commit/3d9dc8950b6ad20c6a7321846e993c043932fe99))
+* FAQ functions API connection ([c1d6126](https://github.com/HSNM2/frontend-Vue3/commit/c1d6126c64d879e70c99eca122e7ac2b7e832d53))
+* index-layout-finish&course-provider-function-open ([6c8ad4a](https://github.com/HSNM2/frontend-Vue3/commit/6c8ad4a7c1744881498f3290bb805c68de2df83b))
+* part of index layout finish ([4f95432](https://github.com/HSNM2/frontend-Vue3/commit/4f95432072ea6b0aa1b8b171143a2dfef30bc6d9))
+* remove unused code ([13a6203](https://github.com/HSNM2/frontend-Vue3/commit/13a620304d1551f4c7a40772020846ce03362f35))
+* shopping-cart-layout-part.1 ([e8546df](https://github.com/HSNM2/frontend-Vue3/commit/e8546df4ce214f3b931086d57820c4e4515f5a80))
+* 修改border-radius class設定 ([3ce7b27](https://github.com/HSNM2/frontend-Vue3/commit/3ce7b27869de4cea48c5643a60c6e6ecac3f5d40))
+* 修改課程清單 ([cdad182](https://github.com/HSNM2/frontend-Vue3/commit/cdad1820c7761134d36766420794c068e72b7317))
+* 修改課程清單 樣式 ([c05bf8e](https://github.com/HSNM2/frontend-Vue3/commit/c05bf8e9d1dd06da142536878bbebf48838a7eac))
+* 增加 課程詳細頁面router ([6be7ba9](https://github.com/HSNM2/frontend-Vue3/commit/6be7ba90f9b87221c2dfb46bff3a707cddcfc7e2))
+* 套用樣式到 loginModal 和 RegisterModal ([a728530](https://github.com/HSNM2/frontend-Vue3/commit/a7285305da097493a476575feee57a500392ed7d))
+* 引入videojs-player 和 調整衝突樣式 ([47ca781](https://github.com/HSNM2/frontend-Vue3/commit/47ca781be8005a9bea412f4f09a060e1d327c4c1))
+* 接入講師後台課程新增，章節新增，編輯，刪除功能 ([6d54a24](https://github.com/HSNM2/frontend-Vue3/commit/6d54a243ccb3a24317226326a1e09d14b0e57a07))
+* 新增 tailwind config顏色設定; DiscoverView修改 ([0a401c8](https://github.com/HSNM2/frontend-Vue3/commit/0a401c86af6b2425f27b989a69f74563b54bf4f7))
+* 新增 video 客製化選項 ([07ed481](https://github.com/HSNM2/frontend-Vue3/commit/07ed4814c9eaa46de27cb440f9e6d4a635c7fa7f))
+* 新增*樣式 ([fc94013](https://github.com/HSNM2/frontend-Vue3/commit/fc94013f2bda74c438ab10deb67567b715a31bbf))
+* 新增auth modal ([596e9f8](https://github.com/HSNM2/frontend-Vue3/commit/596e9f8b6ea86ebde69ea05e7d0f877d843a2408))
+* 新增form樣式到Discover頁 ([0bf8198](https://github.com/HSNM2/frontend-Vue3/commit/0bf819820fb9c965700d48375effa265ed3386fe))
+* 新增不同環境檔案，新增 useErrorHandler.ts ，調整登入註冊 ([4c8ebe2](https://github.com/HSNM2/frontend-Vue3/commit/4c8ebe2650dd27529f4f2deb8b09ed7d6633c598))
+* 新增共用模組 CommonModal ([0b5babb](https://github.com/HSNM2/frontend-Vue3/commit/0b5babbc188a570d8f90093704314b2cdcdcbfb4))
+* 新增教師課程，課程內頁，章節編輯頁面 v1 ([b3ec49a](https://github.com/HSNM2/frontend-Vue3/commit/b3ec49a46dfda1010f4d8ecfd2b50b7d8685539c))
+* 新增樣式 ([14eb951](https://github.com/HSNM2/frontend-Vue3/commit/14eb951c743d17d3925b0f00c65222ede5efb928))
+* 新增版本展示 ([310a625](https://github.com/HSNM2/frontend-Vue3/commit/310a6254a8094cdb98dada3c9756f964ee2ecb1a))
+* 新增登入，註冊簡易畫面和 store ([1fb2b43](https://github.com/HSNM2/frontend-Vue3/commit/1fb2b430c536b78da06755a67cbdd89ed573bfaa))
+* 新增登入後導向功能 ([be3f533](https://github.com/HSNM2/frontend-Vue3/commit/be3f53345dd030c7f7eb048e40145b7e7bc6ca5e))
+* 新增課程介面 ([26869a3](https://github.com/HSNM2/frontend-Vue3/commit/26869a30729d2a939c8f1b7bbdb51b8b18ed6c4a))
+* 新增課程詳細頁面(切版:課前問答、課程評價) ([25e9817](https://github.com/HSNM2/frontend-Vue3/commit/25e9817ebd253e095fb9db085dd532ba423bff31))
+* 新增講師-課程資訊頁面 ([92525c9](https://github.com/HSNM2/frontend-Vue3/commit/92525c91ae4e6e8b2380bd1b6bed9295a769a921))
+* 新增講師後台 - 課程資訊頁面 - 標籤 ([568d511](https://github.com/HSNM2/frontend-Vue3/commit/568d511835d18008a036b13db78efbe491e2553e))
+* 新增講師後台 - 章節管理拖拉功能 ([9495dfa](https://github.com/HSNM2/frontend-Vue3/commit/9495dfa493cd24a8549fdb6d022af427e07c0507))
+* 新增講師後台單元v2 ([f7d6a5b](https://github.com/HSNM2/frontend-Vue3/commit/f7d6a5bbc8ebc3b5f0b2daa6853f9313723ed74c))
+* 新增講師後台單元取得資訊v1 ([9ce67a4](https://github.com/HSNM2/frontend-Vue3/commit/9ce67a46df3bfdd5acdb82e7e1ae627606995b39))
+* 新增講師後台課程刪除功能 ([167cff7](https://github.com/HSNM2/frontend-Vue3/commit/167cff7744cd57440d3c1612fc5c6fb4d44cf46d))
+* 新增講師後台課程單元上下架 ([d419ed6](https://github.com/HSNM2/frontend-Vue3/commit/d419ed6d02fd24997d94a4bda5cfc82907ad9bc1))
+* 新增講師後台進入權限 ([098f437](https://github.com/HSNM2/frontend-Vue3/commit/098f437c4e2f4125252fba031c155abc24acf87e))
+* 新增進度條 ([8bb0cf7](https://github.com/HSNM2/frontend-Vue3/commit/8bb0cf742f183c8f567b5f794e4b91e52069e438))
+* 星星評分 樣式 ([bc1a85d](https://github.com/HSNM2/frontend-Vue3/commit/bc1a85dbbdef3dd8cf0d0c5d3ae76ff2e25b8cc8))
+* 更新 router guard ([4f3f20f](https://github.com/HSNM2/frontend-Vue3/commit/4f3f20fea58570d46a3cba16984d36633b18eae1))
+* 添加講師後台 - 課程學生列表 ([d0635c6](https://github.com/HSNM2/frontend-Vue3/commit/d0635c6518ab7bcff3ae4826d44210ecbf2d3223))
+* 綁定登入註冊按鈕 ([483d74d](https://github.com/HSNM2/frontend-Vue3/commit/483d74de273fe052ab2e0c35bb6eeaf0ff838ab1))
+* 課前問答 更新 ([34996b5](https://github.com/HSNM2/frontend-Vue3/commit/34996b581d204c4798d738ca26ddd1d4bcd9736f))
+* 課程介面 章節展開樣式 ([5be3979](https://github.com/HSNM2/frontend-Vue3/commit/5be3979f647a7a0539c99dc60a9c5bca90d4fc30))
+* 課程介面串接api、影片切換 ([bdbfee8](https://github.com/HSNM2/frontend-Vue3/commit/bdbfee801bd462d4c74cf28834e79c82b2338baa))
+* 課程列表api串接 ([c11d640](https://github.com/HSNM2/frontend-Vue3/commit/c11d640dd7f2dfcb1f0601c03942d660d2f8aceb))
+* 課程詳細介面 課程大綱、常見問題展開樣式 ([5c49a79](https://github.com/HSNM2/frontend-Vue3/commit/5c49a790f96e53719c379a342ac2c7de57417fe2))
+* 課程詳細資訊 內容更新 ([b3cad83](https://github.com/HSNM2/frontend-Vue3/commit/b3cad836eea8e248817b9b12ff43bc14b737d5b4))
+* 課程詳細資訊：tag顯示、加入購物車 ([4bb57bd](https://github.com/HSNM2/frontend-Vue3/commit/4bb57bd0887ba83d4695ebb2d49e8551800dd86b))
+* 課程詳細資訊api串接 ([ec75861](https://github.com/HSNM2/frontend-Vue3/commit/ec75861d328761454a92e26a3ff4031b0c65ef8c))
+* 課程詳細頁面: 判斷是否登入 修正 ([74ebd24](https://github.com/HSNM2/frontend-Vue3/commit/74ebd24bdcffd6f6deefa4b7c4f882f01aaf7eac))
+* 課程詳細頁面：手機板固定 價格、購買按鈕 ([0491cf9](https://github.com/HSNM2/frontend-Vue3/commit/0491cf9f056ca123ee85356d6d9aaf50ed79302b))
+* 課程詳細頁面(切版:課程介紹、課程大綱、常見問題) ([9c583b5](https://github.com/HSNM2/frontend-Vue3/commit/9c583b50f075745f95adabc5770e45f0da426fd2))
+* 課程詳細頁面拆分元件 ([31cd664](https://github.com/HSNM2/frontend-Vue3/commit/31cd6649dbd0bbedfcbb027b206855fa4d91b5c2))
+* 調整getCourse api 架構 ([871aae5](https://github.com/HSNM2/frontend-Vue3/commit/871aae58ae84bd066b9f81b0552d970c313a4890))
+* 調整profile 頁面 reset ([387bfe5](https://github.com/HSNM2/frontend-Vue3/commit/387bfe554fe578cc1a482432c6af39f71bf9da52))
+* 調整合併 develop ([e0dab9e](https://github.com/HSNM2/frontend-Vue3/commit/e0dab9e350f4ebfc06d2871543ca91ae1af6aa95))
+* 調整單元新增刪除loading ([8d9ad51](https://github.com/HSNM2/frontend-Vue3/commit/8d9ad51b7e741107bcacd1bffb870e3b294a40c6))
+* 調整單元編輯資料 ([6541097](https://github.com/HSNM2/frontend-Vue3/commit/65410978c8770528ec694a42c92be75b9d950c75))
+* 調整標籤內容 ([ce4cd5b](https://github.com/HSNM2/frontend-Vue3/commit/ce4cd5bcdb37606fa5ba49bd14aadea500d7eb35))
+* 調整講師後台 - 單元編輯頁面名稱 ([1ad9122](https://github.com/HSNM2/frontend-Vue3/commit/1ad9122c2ca2903a80923a9513b951555b37136b))
+* 調整講師後台課程layout ([a650332](https://github.com/HSNM2/frontend-Vue3/commit/a650332bbc56f6c73de8e908bb63cb1d7bd8f7b8))
+* 調整講師後台章節管理編輯，刪除功能（假資料） ([1240ecd](https://github.com/HSNM2/frontend-Vue3/commit/1240ecd97f7c06f7ad6aae21e28281d75de42479))
+* 調整路由架構 ([2d4fad0](https://github.com/HSNM2/frontend-Vue3/commit/2d4fad0f8f9d4014856825c724cb9bbe1ef8a06f))
+* 調整重複引入 ([cc65db8](https://github.com/HSNM2/frontend-Vue3/commit/cc65db8933c358fd58cfa34b00e556fb0160336e))
+* 講師後台-單元新增v1 ([1e082c3](https://github.com/HSNM2/frontend-Vue3/commit/1e082c3b54e7ddaaa5635fecf8244c5e8bfd5928))
+
+
+### Bug Fixes
+
+* add faq modal input reset ([9053a7e](https://github.com/HSNM2/frontend-Vue3/commit/9053a7e8afe4c506eb71fa585707e7d5ab1d6817))
+* avatar-pic-formData-null-handle ([e238e86](https://github.com/HSNM2/frontend-Vue3/commit/e238e863023fd0a6b0188c83591e081d96d03075))
+* bug of toPaymentSite form fix ([00645fb](https://github.com/HSNM2/frontend-Vue3/commit/00645fb5fc69ca5a89d3d36844ff5974a4c317c0))
+* remove cart after payment ([f1738fa](https://github.com/HSNM2/frontend-Vue3/commit/f1738fac8d25fe2178e710344eb7f96e9c9d52c0))
+* 修正 api 路徑 ([ee2bd48](https://github.com/HSNM2/frontend-Vue3/commit/ee2bd48de58bdce030ea574cb730c54a1f430f97))
+* 修正 build 錯誤 ([9b55b1e](https://github.com/HSNM2/frontend-Vue3/commit/9b55b1e7c141119bcfa0be3f15a2fc4e26edd5bf))
+* 修正authModal 無法用 enter 登入 ([9b9ab0a](https://github.com/HSNM2/frontend-Vue3/commit/9b9ab0ae2a0484edda9321d6e315d95cb63820cd))
+* 修正build 錯誤 ([2f2ba61](https://github.com/HSNM2/frontend-Vue3/commit/2f2ba61485a574b4948517b02a2ce9c4ad0d57e7))
+* 修正build的ts錯誤 ([df58ce6](https://github.com/HSNM2/frontend-Vue3/commit/df58ce64cbe809693466744690a272613ba79a92))
+* 修正FormContext ts 錯誤 ([bc7da99](https://github.com/HSNM2/frontend-Vue3/commit/bc7da992d32aea5e3b5a2a46ef0b497411a0b29c))
+* 修正合併版版錯誤 ([b80152d](https://github.com/HSNM2/frontend-Vue3/commit/b80152d091cb200c5d1775c2f02c14a87df51bd2))
+* 修正講師單元新增取消刪除錯誤問題 ([9b1915e](https://github.com/HSNM2/frontend-Vue3/commit/9b1915ee541929eea9b753d5b9c62f1b05ba890b))
+* 移除 build 版本問題 ([1e41829](https://github.com/HSNM2/frontend-Vue3/commit/1e41829b168e4ee6672c6979a0b28a4e33a2c59e))
+* 移除defineEmit ([cda1db5](https://github.com/HSNM2/frontend-Vue3/commit/cda1db5d25a7a157d1ea307220127ffa691089c9))
+* 調整build錯誤 ([c480324](https://github.com/HSNM2/frontend-Vue3/commit/c48032498e4b518c62441ce03d5780c88c648de2))
+* 調整課程名稱編輯點選重複問題 ([9163f33](https://github.com/HSNM2/frontend-Vue3/commit/9163f33b0b37417bfe22216eb5e5b916eeb33872))
+* 調整講師後台新增單元換頁錯誤 ([bb108c1](https://github.com/HSNM2/frontend-Vue3/commit/bb108c1ca9141b8b0c3dd54a8ed871c610ea49fb))

env.d.ts

@@ -1 +1,14 @@
 /// <reference types="vite/client" />
+
+interface ImportMetaEnv {
+  readonly VITE_API_URL: string
+  readonly VITE_MerchantID: string
+  readonly VITE_Version: string
+  // 更多環境變數
+}
+
+interface ImportMeta {
+  readonly env: ImportMetaEnv
+}
+
+declare const VITE_APP_VERSION: string

index.html

@@ -1,10 +1,21 @@
 <!DOCTYPE html>
 <html lang="en">
   <head>
-    <meta charset="UTF-8">
-    <link rel="icon" href="/favicon.ico">
-    <meta name="viewport" content="width=device-width, initial-scale=1.0">
-    <title>Vite App</title>
+    <meta charset="UTF-8" />
+    <link rel="icon" href="/favicon.ico" />
+    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+    <link href="https://fonts.googleapis.com/icon?family=Material+Icons" rel="stylesheet" />
+    <link
+      href="https://fonts.googleapis.com/css2?family=Alex+Brush&display=swap"
+      rel="stylesheet"
+    />
+    <link
+      rel="stylesheet"
+      href="https://use.fontawesome.com/releases/v5.15.4/css/all.css"
+      integrity="sha384-DyZ88mC6Up2uqS4h/KRgHuoeGwBcD4Ng9SiP4dIRy0EXTlnuz47vAwmeGwVChigm"
+      crossorigin="anonymous"
+    />
+    <title>糖漬時光</title>
   </head>
   <body>
     <div id="app"></div>