create-fesd-app 1.0.17 → 1.0.19

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "create-fesd-app",
-  "version": "1.0.17",
+  "version": "1.0.19",
   "type": "module",
   "scripts": {
     "dev": "vite",
@@ -24,7 +24,7 @@
   "dependencies": {
     "@tailwindcss/postcss": "^4.1.10",
     "@tailwindcss/vite": "^4.1.10",
-    "@xwadex/fesd": "0.0.40",
+    "@xwadex/fesd": "0.0.42",
     "ansi-colors": "^4.1.3",
     "chalk": "^5.3.0",
     "clsx": "^2.1.1",

package/src/assets/css/base/_reset.sass

@@ -20,6 +20,9 @@ time, mark, audio, video
   font-size: 100%
   font: inherit
   vertical-align: baseline
+// html
+//   @media (min-resolution: 1.5dppx) 
+//     font-size: 66.7% !important
 
 /* HTML5 display-role reset for older browsers */
 article, aside, details, figcaption, figure, 

package/src/assets/css/layouts/_cookiePolicy.sass

@@ -421,4 +421,48 @@
           margin-top: 5px
           padding: 15px 20px
           background: #fff
-          border-radius: 5px
+          border-radius: 5px
+
+.cookie-disagree
+  position: relative
+  .disagree-inner
+    padding: 25px
+    position: absolute
+    width: 100%
+    height: 100%
+    background: rgba(#000,.8)
+    color: #fff
+    z-index: 10
+    top: 0
+    left: 0
+    display: flex
+    flex-direction: column
+    align-items: center
+    justify-content: center
+    text-align: center
+  .title
+    font-size: px(20)
+    font-weight: 500
+    line-height: 1.6
+    letter-spacing: .5px
+  .en
+    font-weight: 700
+  .text 
+    margin-top: 30px
+    font-size: px(14)
+    font-weight: 400
+    line-height: 1.8
+    letter-spacing: .5px
+  .icon
+    margin-bottom: 15px
+    border: 1px solid rgba(255, 255, 255, 0.20)
+    width: 50px
+    height: 50px
+    border-radius: 100%
+    display: flex
+    justify-content: center
+    align-items: center
+  [data-cookie-open]
+    text-decoration: underline
+    cursor: pointer
+  

package/src/assets/js/apps/index/page.js

@@ -31,6 +31,7 @@ const swiperHandler = {};
 swiperHandler.banner = function () {
   const bannerEvents = {
     ...bannerConfig,
+    autoplay: false,
     init() {
       console.log('swiper init!!');
     },
@@ -163,8 +164,7 @@ const test = () => {
 methods.toBackend({ test });
 
 $(async () => {
-
-  console.log(cn("px-3 px-5 px-6"));
+  // console.log(cn("px-3 px-5 px-6"));
   // common Init
   common.inits()
   // plugins Init

package/src/assets/js/commons/cookies/cookiePolicy.js

@@ -223,13 +223,14 @@ cookieAdvanced.switchState = () => {
     if (isSyncing) return
     isSyncing = true
 
-    const $step1Switch = $(`[t4-id='step1'] input[type="checkbox"][data-name='${parent}']:not(.disabled)`)
     const key = $(this).data("name")
     const parent = $(this).data("parent")
     const val = $(this).prop('checked') ? 0 : 1
+    const $step1Switch = $(`[t4-id='step1'] input[type="checkbox"][data-name='${parent}']:not(.disabled)`)
     const total = $($step2contentSwitch).length
     const checked = $($step2contentSwitch).filter(':checked').length
     
+
     // 改變 cookieNewObj 的值
     cookieNewObj[parent].list[key].close = val
 
@@ -255,7 +256,6 @@ cookieAdvanced.switchState = () => {
   $(document).off("change.step2top").on("change.step2top", $step2topSwitch, function () {
     if (isSyncing) return
     isSyncing = true
-
     const $this = $(this)
     const key = $this.data("name")
     const isChecked = $this.prop("checked")
@@ -305,19 +305,18 @@ cookieAdvanced.cookieSaveFn = () => {
 
 // 點擊方法
 cookieAdvanced.clickEvent = () => {
-  const $settingBtn = $(".cookie-setting-btn")
   const $settingBlock = $(".cookie-setting")
 
   // 打開進階版 cookie 介面
-  $settingBtn.on("click", () => cookieSetting.openEvent($settingBlock));
-  // 綁定按鈕
-  $("[data-cookie-all]").on('click', cookieSetting.enableAll)
+  $(document).on("click",".cookie-setting-btn", () => cookieSetting.openEvent($settingBlock));
+  // 全開
+  $(document).on('click',"[data-cookie-all]", cookieSetting.enableAll)
   // 儲存
-  $("[data-cookie-save]").on('click', cookieAdvanced.cookieSaveFn)
+  $(document).on('click',"[data-cookie-save]", cookieAdvanced.cookieSaveFn)
   // 關閉視窗
-  $("[data-cookie-close]").on('click', () => cookieSetting.closeEvent($settingBlock))
+  $(document).on('click',"[data-cookie-close]", () => cookieSetting.closeEvent($settingBlock))
   // 我拒絕
-  $("[data-cookie-reject]").on('click', function() {
+  $(document).on('click',"[data-cookie-reject]", function() {
     cookieSetting.rejectAll()
     cookieAdvanced.cookieSaveFn()
   })
@@ -360,59 +359,46 @@ cookieSetting.rejectAll = () => {
   $('.main-option:not([data-name="required"]),.list-option:not([data-name="required"])').removeClass("checked")
   cookieNewObj.close = 1
   Object.keys(cookieNewObj).forEach(data => {
-    cookieNewObj[data].close = 1
+    cookieNewObj[data].close == 1
   })
 }
 
 // 判斷該分類底下細項按鈕狀態
 cookieSetting.hasAnyListItemsOpen = (key) => {
-  const targetList = cookieNewObj[key]?.list;
+  const category = cookieNewObj[key];
+  if (!category) return false;
+
+  const targetList = category.list;
+
+  // 沒有子 list，就看自己這一層
   if (!targetList) {
-    if (cookieNewObj[key].close == 0) {
-      return true;
-    } else {
-      return false; 
-    }
+    return category.close === 0;
   }
-  const childKeys = Object.keys(targetList);
-  const isOpen = childKeys.some(childKey => {
-    return targetList[childKey]?.close === 0;
-  });
-  return isOpen;
+
+  // 有子 list，就看子項目有沒有任何一個是 open
+  return Object.values(targetList).some(item => item?.close === 0);
+};
+
+cookieSetting.isCategoryChecked = (key) => {
+  if (key === "required") return true;
+  return cookieSetting.hasAnyListItemsOpen(key);
+};
+
+// 共用：產生 step 元件用的 getter
+const createStepElement = (templateFn) => {
+  return (opt, index) => {
+    const isDisabled = opt.disabled ? "disabled" : "";
+    const isChecked = () =>
+      cookieSetting.isCategoryChecked(opt.key) ? "checked" : "";
+
+    return templateFn(opt, index, isDisabled, isChecked);
+  };
 };
 
 // step 1 結構
-cookieElements.getStep1Element = (opt, index) => {
-  const isDisabled = opt.disabled ? "disabled" : ""
-  const isChecked = () => {
-    if (opt.key == "required") {
-      return "checked"
-    } else {
-      if (cookieSetting.hasAnyListItemsOpen(opt.key)) {
-        return "checked"
-      } else {
-        return ""
-      }
-    }
-  }
-  return cookieStep1El(opt, index, isDisabled, isChecked)
-}
+cookieElements.getStep1Element = createStepElement(cookieStep1El);
 // step 2 上面結構
-cookieElements.getStep2TopElement = (opt, index) => {
-  const isDisabled = opt.disabled ? "disabled" : ""
-  const isChecked = () => {
-    if (opt.key == "required") {
-      return "checked"
-    } else {
-      if (cookieSetting.hasAnyListItemsOpen(opt.key)) {
-        return "checked"
-      } else {
-        return ""
-      }
-    }
-  }
-  return cookieStep2TittleEl(opt, index, isDisabled, isChecked)
-}
+cookieElements.getStep2TopElement = createStepElement(cookieStep2TittleEl);
 
 // 頁籤
 cookieSetting.goToTab = (el = true) => {

package/src/pages/ajax/ajax_igDemo.pug

@@ -3,4 +3,3 @@ modern-modal(data-modal-id="video-ig-template" video-template data-modal-templat
   //- 純展示使用, 後端那邊會有自己的 ajax 燈箱結構
   //- 以下可自行修改, 放 ig 嵌入碼
   <blockquote class="instagram-media" data-instgrm-captioned data-instgrm-permalink="https://www.instagram.com/reel/DQjpC_7kWHb/?utm_source=ig_embed&amp;utm_campaign=loading" data-instgrm-version="14" style=" background:#FFF; border:0; border-radius:3px; box-shadow:0 0 1px 0 rgba(0,0,0,0.5),0 1px 10px 0 rgba(0,0,0,0.15); margin: 1px; max-width:540px; min-width:326px; padding:0; width:99.375%; width:-webkit-calc(100% - 2px); width:calc(100% - 2px);"><div style="padding:16px;"> <a href="https://www.instagram.com/reel/DQjpC_7kWHb/?utm_source=ig_embed&amp;utm_campaign=loading" style=" background:#FFFFFF; line-height:0; padding:0 0; text-align:center; text-decoration:none; width:100%;" target="_blank"> <div style=" display: flex; flex-direction: row; align-items: center;"> <div style="background-color: #F4F4F4; border-radius: 50%; flex-grow: 0; height: 40px; margin-right: 14px; width: 40px;"></div> <div style="display: flex; flex-direction: column; flex-grow: 1; justify-content: center;"> <div style=" background-color: #F4F4F4; border-radius: 4px; flex-grow: 0; height: 14px; margin-bottom: 6px; width: 100px;"></div> <div style=" background-color: #F4F4F4; border-radius: 4px; flex-grow: 0; height: 14px; width: 60px;"></div></div></div><div style="padding: 19% 0;"></div> <div style="display:block; height:50px; margin:0 auto 12px; width:50px;"><svg width="50px" height="50px" viewBox="0 0 60 60" version="1.1" xmlns="https://www.w3.org/2000/svg" xmlns:xlink="https://www.w3.org/1999/xlink"><g stroke="none" stroke-width="1" fill="none" fill-rule="evenodd"><g transform="translate(-511.000000, -20.000000)" fill="#000000"><g><path d="M556.869,30.41 C554.814,30.41 553.148,32.076 553.148,34.131 C553.148,36.186 554.814,37.852 556.869,37.852 C558.924,37.852 560.59,36.186 560.59,34.131 C560.59,32.076 558.924,30.41 556.869,30.41 M541,60.657 C535.114,60.657 530.342,55.887 530.342,50 C530.342,44.114 535.114,39.342 541,39.342 C546.887,39.342 551.658,44.114 551.658,50 C551.658,55.887 546.887,60.657 541,60.657 M541,33.886 C532.1,33.886 524.886,41.1 524.886,50 C524.886,58.899 532.1,66.113 541,66.113 C549.9,66.113 557.115,58.899 557.115,50 C557.115,41.1 549.9,33.886 541,33.886 M565.378,62.101 C565.244,65.022 564.756,66.606 564.346,67.663 C563.803,69.06 563.154,70.057 562.106,71.106 C561.058,72.155 560.06,72.803 558.662,73.347 C557.607,73.757 556.021,74.244 553.102,74.378 C549.944,74.521 548.997,74.552 541,74.552 C533.003,74.552 532.056,74.521 528.898,74.378 C525.979,74.244 524.393,73.757 523.338,73.347 C521.94,72.803 520.942,72.155 519.894,71.106 C518.846,70.057 518.197,69.06 517.654,67.663 C517.244,66.606 516.755,65.022 516.623,62.101 C516.479,58.943 516.448,57.996 516.448,50 C516.448,42.003 516.479,41.056 516.623,37.899 C516.755,34.978 517.244,33.391 517.654,32.338 C518.197,30.938 518.846,29.942 519.894,28.894 C520.942,27.846 521.94,27.196 523.338,26.654 C524.393,26.244 525.979,25.756 528.898,25.623 C532.057,25.479 533.004,25.448 541,25.448 C548.997,25.448 549.943,25.479 553.102,25.623 C556.021,25.756 557.607,26.244 558.662,26.654 C560.06,27.196 561.058,27.846 562.106,28.894 C563.154,29.942 563.803,30.938 564.346,32.338 C564.756,33.391 565.244,34.978 565.378,37.899 C565.522,41.056 565.552,42.003 565.552,50 C565.552,57.996 565.522,58.943 565.378,62.101 M570.82,37.631 C570.674,34.438 570.167,32.258 569.425,30.349 C568.659,28.377 567.633,26.702 565.965,25.035 C564.297,23.368 562.623,22.342 560.652,21.575 C558.743,20.834 556.562,20.326 553.369,20.18 C550.169,20.033 549.148,20 541,20 C532.853,20 531.831,20.033 528.631,20.18 C525.438,20.326 523.257,20.834 521.349,21.575 C519.376,22.342 517.703,23.368 516.035,25.035 C514.368,26.702 513.342,28.377 512.574,30.349 C511.834,32.258 511.326,34.438 511.181,37.631 C511.035,40.831 511,41.851 511,50 C511,58.147 511.035,59.17 511.181,62.369 C511.326,65.562 511.834,67.743 512.574,69.651 C513.342,71.625 514.368,73.296 516.035,74.965 C517.703,76.634 519.376,77.658 521.349,78.425 C523.257,79.167 525.438,79.673 528.631,79.82 C531.831,79.965 532.853,80.001 541,80.001 C549.148,80.001 550.169,79.965 553.369,79.82 C556.562,79.673 558.743,79.167 560.652,78.425 C562.623,77.658 564.297,76.634 565.965,74.965 C567.633,73.296 568.659,71.625 569.425,69.651 C570.167,67.743 570.674,65.562 570.82,62.369 C570.966,59.17 571,58.147 571,50 C571,41.851 570.966,40.831 570.82,37.631"></path></g></g></g></svg></div><div style="padding-top: 8px;"> <div style=" color:#3897f0; font-family:Arial,sans-serif; font-size:14px; font-style:normal; font-weight:550; line-height:18px;">在 Instagram 查看這則貼文</div></div><div style="padding: 12.5% 0;"></div> <div style="display: flex; flex-direction: row; margin-bottom: 14px; align-items: center;"><div> <div style="background-color: #F4F4F4; border-radius: 50%; height: 12.5px; width: 12.5px; transform: translateX(0px) translateY(7px);"></div> <div style="background-color: #F4F4F4; height: 12.5px; transform: rotate(-45deg) translateX(3px) translateY(1px); width: 12.5px; flex-grow: 0; margin-right: 14px; margin-left: 2px;"></div> <div style="background-color: #F4F4F4; border-radius: 50%; height: 12.5px; width: 12.5px; transform: translateX(9px) translateY(-18px);"></div></div><div style="margin-left: 8px;"> <div style=" background-color: #F4F4F4; border-radius: 50%; flex-grow: 0; height: 20px; width: 20px;"></div> <div style=" width: 0; height: 0; border-top: 2px solid transparent; border-left: 6px solid #f4f4f4; border-bottom: 2px solid transparent; transform: translateX(16px) translateY(-4px) rotate(30deg)"></div></div><div style="margin-left: auto;"> <div style=" width: 0px; border-top: 8px solid #F4F4F4; border-right: 8px solid transparent; transform: translateY(16px);"></div> <div style=" background-color: #F4F4F4; flex-grow: 0; height: 12px; width: 16px; transform: translateY(-4px);"></div> <div style=" width: 0; height: 0; border-top: 8px solid #F4F4F4; border-left: 8px solid transparent; transform: translateY(-4px) translateX(8px);"></div></div></div> <div style="display: flex; flex-direction: column; flex-grow: 1; justify-content: center; margin-bottom: 24px;"> <div style=" background-color: #F4F4F4; border-radius: 4px; flex-grow: 0; height: 14px; margin-bottom: 6px; width: 224px;"></div> <div style=" background-color: #F4F4F4; border-radius: 4px; flex-grow: 0; height: 14px; width: 144px;"></div></div></a><p style=" color:#c9c8cd; font-family:Arial,sans-serif; font-size:14px; line-height:17px; margin-bottom:0; margin-top:8px; overflow:hidden; padding:8px 0 7px; text-align:center; text-overflow:ellipsis; white-space:nowrap;"><a href="https://www.instagram.com/reel/DQjpC_7kWHb/?utm_source=ig_embed&amp;utm_campaign=loading" style=" color:#c9c8cd; font-family:Arial,sans-serif; font-size:14px; font-style:normal; font-weight:normal; line-height:17px; text-decoration:none;" target="_blank">જ⁀➴♡*⋆꒰ঌ𝙊𝙉𝙀𝘿𝙊𝙊𝙍 𝘾𝙊𝙇𝙊𝙈𝘽𝙄𝘼໒꒱⋆*♡Ꙭ̮*.｡★*ﾟ（@boynextdoor_colombia）分享的貼文</a></p></div></blockquote>
-<script async src="//www.instagram.com/embed.js"></script>

package/src/pages/index.pug

@@ -9,12 +9,26 @@ block content
     // Swiper
     .swiper
       .swiper-wrapper
-        .swiper-slide
+        .swiper-slide.cookie-disagree
           .homeWelcome
             h2 FESD
             .subSlogan
               span Front-End Suite Design Framework
               p Designer Learning & Support
+          .disagree-inner
+            .icon 
+              svg(xmlns="http://www.w3.org/2000/svg" width="7" height="25" viewBox="0 0 7 25" fill="none")
+                path(d="M0 0H6.96277L5.77128 16.1948H1.22872L0 0ZM0 22.0304C0 21.1556 0.322695 20.442 0.968085 19.8895C1.6383 19.337 2.48227 19.0608 3.5 19.0608C4.51773 19.0608 5.34929 19.337 5.99468 19.8895C6.66489 20.442 7 21.1556 7 22.0304C7 22.9052 6.66489 23.6188 5.99468 24.1713C5.34929 24.7238 4.51773 25 3.5 25C2.48227 25 1.6383 24.7238 0.968085 24.1713C0.322695 23.6188 0 22.9052 0 22.0304Z" fill="white")
+            .title.ch 由於未授權 Cookie 使用，影片無法播放
+            .title.en The video can’t be played due to unauthorized use of cookies.
+            .text 
+              .box
+                span 您可前往 
+                span(data-cookie-open) Cookie 偏好設定
+                span  進行修改
+              .box
+                span Modify your 
+                span(data-cookie-open) cookie preferences.
         .swiper-slide
           .media-box
             video(src="https://cdn.wdd.idv.tw/video/chappie_Video1.mp4" muted playsinline)
@@ -79,7 +93,7 @@ block content
       h3 Video4 👇
       .row
         .grid
-          .photo-box(video-target video-id="5bMdjkfvONE" video-type="youtube")
+          .photo-box(video-target="video-ig-template" video-target-route="./ajax/ajax_igDemo.html" video-id="../../public/assets/img/banner.jpg" video-type="instagram")
             picture
               source(srcset="https://cdn.wdd.idv.tw/image/video-cover01.webp" type="image/webp")
               source(srcset="https://cdn.wdd.idv.tw/image/video-cover01.jpg" type="image/jpeg")