andy 2 yıl önce
ebeveyn
işleme
4fb3d240cc

BIN
.DS_Store


+ 1 - 1
.gitignore

@@ -1,2 +1,2 @@
 content/
-static/img
+static/img/title

BIN
content/.DS_Store


BIN
data/.DS_Store


BIN
layouts/.DS_Store


+ 88 - 8
layouts/collection/list.html

@@ -126,13 +126,7 @@
             <div class="bhouseweb_search_img">
               <i class="fas fa-search"></i>
             </div>
-            <input
-              id="bhouseweb_search"
-              class="me-md-2"
-              type="search"
-              placeholder="搜 尋「北 歐 風」「工 業 風」「三 代 同 堂」「寵 物」"
-              aria-label="Search"
-            />
+            <input id="bhouseweb_search" class="me-md-2" type="search" placeholder="搜 尋「北 歐 風」「工 業 風」「三 代 同 堂」「寵 物」" aria-label="Search"/>
             <!-- <button class="btn btn-outline-success" type="submit">Search</button> -->
           </form>
         </div>
@@ -141,7 +135,7 @@
     <hr class="bhouseweb_loc_line" />
     <div class="bhouseweb_loc_content" style="overflow-x: hidden">
       <div class="bhouseweb_loc_sec02">
-        <div class="update_info row px-0 mx-0">
+        <div class="update_info row px-0 mx-0" id="articleList">
           {{ $paginator := .Paginate .Data.Pages }} {{ range $paginator.Pages }}
           <div class="col-12 col-sm-6 p-1">
             <div class="bhouseweb_loc_sec02_card secimg mx-0 px-0 border-0">
@@ -415,5 +409,91 @@
   <script async defer src="./js/index.js"></script> -->
   <script src="/js/cz_filter.js"></script>
     {{ partial "scripts.html" . }}
+    <script>
+      window.onload = function () {
+  document.getElementById('bhouseweb_search').value = '';
+
+  // 取得 apiData
+  let contentsData = [];
+  // let category = localStorage.getItem('category');
+
+  (function getContentsData() {
+    // 線上版網址 http://192.53.174.202:9001/api/
+    // 本地端網址 http://localhost:9001/api/
+    fetch('http://192.53.174.202:9001/api/contents?url=/collection').then(res => res.json()).then(list => {
+      contentsData = list;
+      console.log('contentsData', contentsData);
+      // filterCategory();
+    })
+  })();
+
+  let matchContent = "";
+
+  // 增加延遲(待輸入完成後再進行搜尋)
+  function delay(fn, ms) {
+    let timer = 0
+    return function (...args) {
+      clearTimeout(timer)
+      timer = setTimeout(fn.bind(this, ...args), ms || 0)
+    }
+  }
+console.log($('bhouseweb_search'));
+  // 搜尋
+  $('#bhouseweb_search').keyup(delay(function (e) {
+    console.log(1)
+    console.log('Time elapsed!', this.value);
+    // 取得輸入框的值
+    let inputVal = $('#bhouseweb_search').val();
+    matchContent = "";
+    let falseItem = [];
+    contentsData.map((item, index) => {
+      // 搜尋特定分類文章
+      // if (item.categories) {
+      //   if (item.categories.includes(category)) {
+      // 搜尋所有分類文章
+      if (item.title.includes(inputVal) || item.description.includes(inputVal)) {
+        matchContent +=  ` 
+        <div class="col-12 col-sm-6 p-1"> \
+          <div class="bhouseweb_loc_sec02_card secimg mx-0 px-0 border-0"> \
+            <a href="${item.url}"> \
+              <img \
+                alt="${item.title}" \
+                src="${item.image}" \
+                layout="responsive"> \
+              <img> \
+            <div class="slide_item_text"> \
+                <p>${item.title}</p>\
+            </div>  \
+            <div class="sec02-p-dec p-1 mt-1 text-center">\
+              <h5 class="card-title">${item.title}</h5>\
+              <p>${item.description}</p>\
+            </div>\
+            </div> \
+          </a> \
+          </div> \
+        </div>`;
+
+      } else {
+            falseItem.push(item);
+          }
+        if (falseItem.length === contentsData.length) {
+        matchContent = `
+        <div class="alert d-flex align-items-center" role="alert" style="max-width: 300px;margin: 0 auto 25px;justify-content: center;">
+          <svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" fill="currentColor" class="bi bi-exclamation-triangle-fill flex-shrink-0 me-2" style="color: #808e4c;" viewBox="0 0 16 16" role="img" aria-label="Warning:">
+            <path d="M8.982 1.566a1.13 1.13 0 0 0-1.96 0L.165 13.233c-.457.778.091 1.767.98 1.767h13.713c.889 0 1.438-.99.98-1.767L8.982 1.566zM8 5c.535 0 .954.462.9.995l-.35 3.507a.552.552 0 0 1-1.1 0L7.1 5.995A.905.905 0 0 1 8 5zm.002 6a1 1 0 1 1 0 2 1 1 0 0 1 0-2z"/>
+          </svg>
+          <div>
+            找不到符合條件的作品集
+          </div>
+        </div>
+        `;
+      }
+      //   }
+      // }
+    })
+    document.getElementById("articleList").innerHTML = matchContent;
+  }, 500));
+}
+    </script>
   </body>
 </html>

+ 17 - 18
layouts/room_planner/room_planner.html

@@ -89,7 +89,7 @@
 
       <div class="room-planner-process-box">
         <img class="room-planner-process-box_line_01 img-fluid" src="/img/blog/Vector01.png" alt="">
-        <div class="container">
+        <div class="container px-0">
           <div class="row px-0 mx-0 justify-content-between">
             <div class="col-6 col-md-auto">
               <div>
@@ -279,7 +279,7 @@
                         <hr class="dotted">
                         <div class="room-planner-process-main-content-left-step-item d-flex">
                           <div>
-                            <div class="step-qa-circle-q me-2">
+                            <div class="step-qa-circle-q me-2 d-flex justify-content-center align-items-center">
                               <span class="step-qa-q">Q</span>
                             </div>
                           </div>
@@ -290,7 +290,7 @@
                         </div>
                         <div class="room-planner-process-main-content-left-step-item d-flex mt-3">
                           <div>
-                            <div style="background:#F6DC63;" class="step-qa-circle-q me-2">
+                            <div style="background:#F6DC63;" class="step-qa-circle-q me-2 d-flex justify-content-center align-items-center">
                               <span style="color:#736357;" class="step-qa-q">A</span>
                             </div>
                           </div>
@@ -320,7 +320,7 @@
                         <hr class="dotted">
                         <div class="room-planner-process-main-content-left-step-item d-flex">
                           <div>
-                            <div class="step-qa-circle-q me-2">
+                            <div class="step-qa-circle-q me-2 d-flex justify-content-center align-items-center">
                               <span class="step-qa-q">Q</span>
                             </div>
                           </div>
@@ -331,7 +331,7 @@
                         </div>
                         <div class="d-flex mt-3">
                           <div>
-                            <div style="background:#F6DC63;" class="step-qa-circle-q me-2">
+                            <div style="background:#F6DC63;" class="step-qa-circle-q me-2 d-flex justify-content-center align-items-center">
                               <span style="color:#736357;" class="step-qa-q">A</span>
                             </div>
                           </div>
@@ -476,7 +476,7 @@
                         <hr class="dotted">
                         <div class="room-planner-process-main-content-left-step-item d-flex">
                           <div>
-                            <div class="step-qa-circle-q me-2">
+                            <div class="step-qa-circle-q me-2 d-flex justify-content-center align-items-center">
                               <span class="step-qa-q">Q</span>
                             </div>
                           </div>
@@ -487,7 +487,7 @@
                         </div>
                         <div class="d-flex mt-3">
                           <div>
-                            <div style="background:#F6DC63;" class="step-qa-circle-q me-2">
+                            <div style="background:#F6DC63;" class="step-qa-circle-q me-2 d-flex justify-content-center align-items-center">
                               <span style="color:#736357;" class="step-qa-q">A</span>
                             </div>
                           </div>
@@ -596,7 +596,7 @@
                         <hr class="dotted">
                         <div class="room-planner-process-main-content-left-step-item d-flex">
                           <div>
-                            <div class="step-qa-circle-q me-2">
+                            <div class="step-qa-circle-q me-2 d-flex justify-content-center align-items-center">
                               <span class="step-qa-q">Q</span>
                             </div>
                           </div>
@@ -607,7 +607,7 @@
                         </div>
                         <div class="room-planner-process-main-content-left-step-item d-flex mt-3">
                           <div>
-                            <div style="background:#F6DC63;" class="step-qa-circle-q me-2">
+                            <div style="background:#F6DC63;" class="step-qa-circle-q me-2 d-flex justify-content-center align-items-center">
                               <span style="color:#736357;" class="step-qa-q">A</span>
                             </div>
                           </div>
@@ -666,7 +666,6 @@
           <img style="position:absolute; right:-30px; bottom:-30px;" src="/img/room_planner/ruler2.png" alt=""
             width="77">
         </div>
-
         <div class="room-planner-process-main-content mt-100 container-fluid">
           <div class="row px-0 mx-0">
             <div class="col-lg-4 ps-0 pe-0">
@@ -713,7 +712,7 @@
                     <hr class="dotted">
                     <div class="room-planner-process-main-content-left-step-item d-flex">
                       <div>
-                        <div class="step-qa-circle-q me-2">
+                        <div class="step-qa-circle-q me-2 d-flex justify-content-center align-items-center">
                           <span class="step-qa-q">Q</span>
                         </div>
                       </div>
@@ -724,7 +723,7 @@
                     </div>
                     <div class="room-planner-process-main-content-left-step-item d-flex mt-3">
                       <div>
-                        <div style="background:#F6DC63;" class="step-qa-circle-q me-2">
+                        <div style="background:#F6DC63;" class="step-qa-circle-q me-2 d-flex justify-content-center align-items-center">
                           <span style="color:#736357;" class="step-qa-q">A</span>
                         </div>
                       </div>
@@ -754,7 +753,7 @@
                     <hr class="dotted">
                     <div class="room-planner-process-main-content-left-step-item d-flex">
                       <div>
-                        <div class="step-qa-circle-q me-2">
+                        <div class="step-qa-circle-q me-2 d-flex justify-content-center align-items-center">
                           <span class="step-qa-q">Q</span>
                         </div>
                       </div>
@@ -765,7 +764,7 @@
                     </div>
                     <div class="d-flex mt-3">
                       <div>
-                        <div style="background:#F6DC63;" class="step-qa-circle-q me-2">
+                        <div style="background:#F6DC63;" class="step-qa-circle-q me-2 d-flex justify-content-center align-items-center">
                           <span style="color:#736357;" class="step-qa-q">A</span>
                         </div>
                       </div>
@@ -805,7 +804,7 @@
                     <hr class="dotted">
                     <div class="room-planner-process-main-content-left-step-item d-flex">
                       <div>
-                        <div class="step-qa-circle-q me-2">
+                        <div class="step-qa-circle-q me-2 d-flex justify-content-center align-items-center">
                           <span class="step-qa-q">Q</span>
                         </div>
                       </div>
@@ -816,7 +815,7 @@
                     </div>
                     <div class="room-planner-process-main-content-left-step-item d-flex mt-3">
                       <div>
-                        <div style="background:#F6DC63;" class="step-qa-circle-q me-2">
+                        <div style="background:#F6DC63;" class="step-qa-circle-q me-2 d-flex justify-content-center align-items-center">
                           <span style="color:#736357;" class="step-qa-q">A</span>
                         </div>
                       </div>
@@ -1012,7 +1011,7 @@
                     <hr class="dotted">
                     <div class="room-planner-process-main-content-left-step-item d-flex">
                       <div>
-                        <div class="step-qa-circle-q me-2">
+                        <div class="step-qa-circle-q me-2 d-flex justify-content-center align-items-center">
                           <span class="step-qa-q">Q</span>
                         </div>
                       </div>
@@ -1023,7 +1022,7 @@
                     </div>
                     <div class="d-flex mt-3">
                       <div>
-                        <div style="background:#F6DC63;" class="step-qa-circle-q me-2">
+                        <div style="background:#F6DC63;" class="step-qa-circle-q me-2 d-flex justify-content-center align-items-center">
                           <span style="color:#736357;" class="step-qa-q">A</span>
                         </div>
                       </div>

BIN
resources/.DS_Store


BIN
resources/_gen/.DS_Store


BIN
static/.DS_Store


BIN
static/img/.DS_Store


+ 3 - 0
static/img/room_planner/mb_line01.svg

@@ -0,0 +1,3 @@
+<svg width="102" height="3" viewBox="0 0 102 3" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M1 1.5H101" stroke="#78B142" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" stroke-dasharray="1 5"/>
+</svg>

+ 3 - 0
static/img/room_planner/mb_line02.svg

@@ -0,0 +1,3 @@
+<svg width="176" height="61" viewBox="0 0 176 61" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M175 1V17.1368C175 19.8982 172.761 22.1368 170 22.1368H6C3.23858 22.1368 1 24.3753 1 27.1368V60" stroke="#78B142" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" stroke-dasharray="1 5"/>
+</svg>

BIN
themes/.DS_Store


Dosya farkı çok büyük olduğundan ihmal edildi
+ 188 - 25
themes/hugo-universal-theme-master/static/css/style.bhouse.css


Dosya farkı çok büyük olduğundan ihmal edildi
+ 0 - 0
themes/hugo-universal-theme-master/static/css/style.bhouse.css.map


+ 219 - 30
themes/hugo-universal-theme-master/static/css/style.bhouse.scss

@@ -1577,6 +1577,7 @@ input[type="search"]::-webkit-search-cancel-button {
 
 /* 成家故事作品集內頁-simple_korean_style_hous end */
 
+/* 成家設計服務-room_planner start */
 /* 成家設計服務-room_planner start */
 .f-78B142-20 {
   color: #78b142;
@@ -1657,11 +1658,11 @@ input[type="search"]::-webkit-search-cancel-button {
     border-radius: 2%;
     color: #000;
     font-family: NSJP-500;
-    background: linear-gradient(#fff 50%, #e0ee79 100%);
+    background: linear-gradient(#f0f6dd 50%, #e0ee79 100%);
   }
 }
 .room-planner-service-no {
-  font-family: NSJP-500;
+  font-family: "Quicksand", sans-serif;
   font-size: 36px;
   color: #649e2e;
 }
@@ -1858,7 +1859,7 @@ input[type="search"]::-webkit-search-cancel-button {
     width: 60%;
     margin: 0 auto;
     position: relative;
-
+  
     @media screen and (max-width: 1199px) {
       width: 65%;
     }
@@ -1868,9 +1869,13 @@ input[type="search"]::-webkit-search-cancel-button {
     }
     .room-planner-process-box_line_01 {
       position: absolute;
-      width: 48vw;
+      width: 46vw;
       top: 40px;
-      right: 100px;
+      right:100px;
+      @media screen and (min-width: 2500px) {
+      
+        right:200px;
+      }
       @media screen and (max-width: $table) {
         width: 60vw;
       }
@@ -1890,12 +1895,13 @@ input[type="search"]::-webkit-search-cancel-button {
       .room-planner-process-box_mb_line {
         display: none;
         background-repeat: no-repeat;
-        background-image: url(/img/blog/mobile_line_01.png);
+        background-size: contain;
+        background-image: url(/img/room_planner/mb_line01.svg);
         width: 40vw;
         position: absolute;
         top: 32%;
         left: 60%;
-        height: 6px;
+        height: 3px;
         z-index: 10px;
         @media screen and (max-width: 767px) {
           display: block;
@@ -1905,7 +1911,7 @@ input[type="search"]::-webkit-search-cancel-button {
         display: none;
         background-repeat: no-repeat;
         background-size: contain;
-        background-image: url(/img/room_planner/mb_line_02.png);
+        background-image: url(/img/room_planner/mb_line02.svg);
         width: 100%;
         position: absolute;
         top: 90%;
@@ -2132,13 +2138,27 @@ input[type="search"]::-webkit-search-cancel-button {
   }
   .main-content-bg-line {
     position: absolute;
-    top: -95px;
+    @media screen and (min-width: 2500px) {
+      right: -60px;
+      top: -100px;
+      width:18.5vw ;
+      height: 1950px;
+      object-fit: cover;
+    }
+    @media screen and (max-width: 1921px) {
+      right: -60px;
+      top: -75px;
+      width:24vw;
+    }
+    @media screen and (max-width: 1441px) {
+      top: -95px;
     right: -90px;
     z-index: -5;
     width: 34.7vw;
-    @media screen and (max-width: 1200px) {
-      width: 36vw;
     }
+    // @media screen and (max-width: 1200px) {
+    //   width: 36vw;
+    // }
   }
   .bg01-hand {
     margin-top: -100px;
@@ -2150,39 +2170,154 @@ input[type="search"]::-webkit-search-cancel-button {
     bottom: -130px;
   }
   .step2 {
-    margin-top: -50px;
-    @media screen and (max-width: 1200px) {
+    @media screen and (min-width: 2500px) {
+      width: 75%;
+      margin-top: -130px;
+      margin-left: 130px;
+    }
+    @media screen and (max-width: 1921px) {
+      width: 90%;
+      margin-top: -130px;
+    
+    }
+    @media screen and (max-width: 1441px) {
       margin-top: -30px;
     }
   }
   .step1-0 {
-    width: 40%;
+   
+    @media screen and (min-width: 2500px) {
+      width: 30%;
+      margin-top: -100px;
+      margin-left: 200px;
+    }
+    // 1920
+    @media screen and (max-width: 1921px) {
+      width: 40%;
+      margin-top: -30px;
+      margin-left: 100px;
+    }
+    @media screen and (max-width: 1441px) {
+      width: 40%;
+      margin-left: 0px;
+      margin-top: 0px;
+    }
   }
   .step1-1 {
-    width: 90%;
-    margin-left: 30px;
+    @media screen and (min-width: 2500px) {
+      width: 60%;
+      margin-top: -50px;
+      margin-left: 250px;
+    }
+   
+    @media screen and (max-width: 1921px) {
+      width: 80%;
+      margin-top: -80px;
+      margin-left: 80px;
+    }
+    @media screen and (max-width: 1441px) {
+      width: 90%;
+      margin-left: 30px;
+      margin-top: 0px;
+    }
   }
   .step3 {
-    width: 90%;
-    margin-top: 30px;
+    
+    @media screen and (min-width: 2500px) {
+      width: 75%;
+      margin-top: -120px;
+      margin-left: 120px;
+    }
+    @media screen and (max-width: 1921px) {
+      width: 80%;
+      margin-top: -50px;
+      margin-left: 60px;
+    }
+
+    @media screen and (max-width: 1441px) {
+      width: 90%;
+      margin-top: 30px;
+      margin-left: 0px;
+    }
+   
   }
   .step4 {
-    width: 60%;
-    margin-right: 50px;
-    margin-top: -30px;
+    @media screen and (min-width: 2500px) {
+      width: 40%;
+      margin-top: 50px;
+      margin-right: 50px;
+    }
+    @media screen and (max-width: 1921px) {
+      width: 50%;
+      margin-top: -100px;
+      margin-right: 80px;
+    }
+    @media screen and (max-width: 1441px) {
+      width: 60%;
+      margin-right: 50px;
+      margin-top: -30px;
+    }
   }
   .step5 {
-    margin-top: 30px;
+    @media screen and (min-width: 2500px) {
+      width: 80%;
+      margin-top: -130px;
+      margin-left: 120px;
+    }
+  
+    @media screen and (max-width: 1921px) {
+      width: 90%;
+      margin-top: -100px;
+      margin-left: 50px;
+    }
+    // @media screen and (min-width: 1441px) {
+    //   width: 90%;
+    //   margin-top: -100px;
+    // }
+    @media screen and (max-width: 1441px) {
+      margin-top: 50px;
+    }
+   
   }
   .step5-2 {
-    margin-right: 70px;
-    margin-top: -50px;
+    @media screen and (min-width: 2500px) {
+      width: 30%;
+      margin-right: -30px;
+      margin-top: -100px;
+     
+    }
+    @media screen and (max-width: 1441px) {
+      margin-right: 80px;
+      margin-top: -80px;
+    }
+
+    @media screen and (max-width: 1921px) {
+      margin-right: 0px;
+      margin-top: -80px;
+    }
   }
   .meihaochengjia {
-    width: 130px;
+
     position: absolute;
-    right: 30px;
-    top: 20px;
+    @media screen and (min-width: 2500px) {
+      width: 130px;
+      position: absolute;
+      right: 50px;
+      top: -10px;
+    }
+   
+    @media screen and (max-width: 1921px) {
+      width: 130px;
+    position: absolute;
+      right: 50px;
+      top: 20px;
+    }
+    @media screen and (max-width: 1441px) {
+      width: 130px;
+      position: absolute;
+      right: 30px;
+      top: 50px;
+    }
   }
   .room-planner-process-main-box {
     width: 95%;
@@ -2286,6 +2421,21 @@ input[type="search"]::-webkit-search-cancel-button {
     animation-iteration-count: infinite;
     animation-direction: alternate;
     animation-timing-function: ease-in-out;
+    @media screen and (min-width: 2560px) {
+     top:40px;
+      right: 170px;
+     
+    }
+    @media screen and (max-width: 1921px) {
+      bottom: -15px;
+      right: 170px;
+  
+    }
+    @media screen and (max-width: 1441px) {
+      bottom: -30px;
+      right: 170px;
+     
+    }
   }
   .room-planner-process-main-star-line {
     position: absolute;
@@ -2297,6 +2447,21 @@ input[type="search"]::-webkit-search-cancel-button {
     animation-iteration-count: infinite;
     animation-direction: alternate;
     animation-timing-function: ease-in-out;
+    @media screen and (min-width: 2560px) {
+      top:50px;
+      right: 40px;
+     
+    }
+    @media screen and (max-width: 1921px) {
+      bottom: -15px;
+      right: 15px;
+     
+    }
+    @media screen and (max-width: 1441px) {
+      bottom: -40px;
+      right: 15px;
+     
+    }
   }
   .room-planner-process-main-star-yellow {
     position: absolute;
@@ -2307,8 +2472,23 @@ input[type="search"]::-webkit-search-cancel-button {
     animation-delay: 0;
     animation-iteration-count: infinite;
     animation-direction: alternate-reverse;
-
     animation-timing-function: linear;
+    @media screen and (min-width: 2560px) {
+     top:-15px;
+      right: 15px;
+     
+    }
+    @media screen and (max-width: 1921px) {
+       top: 5px;
+      right: 5px;
+     
+    }
+    @media screen and (max-width: 1441px) {
+      right: -15px;
+      top: 50px;
+     
+    }
+  
   }
 }
 .room-planner-process-main-content-step-img {
@@ -2316,6 +2496,10 @@ input[type="search"]::-webkit-search-cancel-button {
 }
 
 .room-planner-process-main-content-step-4-6img {
+  @media screen and (min-width: 2500px) {
+    margin-top: 200px;
+   
+  }
   margin-top: 380px;
 }
 .stepbox {
@@ -2655,10 +2839,15 @@ input[type="search"]::-webkit-search-cancel-button {
 }
 
 .hover_up {
-  transition: 0.3s;
+  // transition: 0.3s;
   cursor: pointer;
   &:hover {
-    transform: translate(0, -20px) !important;
+    animation: float 1.5s ease-out infinite;
+  }
+}
+@keyframes float {
+  50% {
+     transform: translate(0, -20px);
   }
 }
 

Bu fark içinde çok fazla dosya değişikliği olduğu için bazı dosyalar gösterilmiyor