From e91ae9209613118b6fa2e9954d6f5dd8ff277ade Mon Sep 17 00:00:00 2001 From: Damillora Date: Sun, 11 Jul 2021 00:56:01 +0700 Subject: [PATCH] feat: update layout and shian --- assets/js/lib/nav-collapse.js | 4 ---- assets/js/lib/search.js | 17 ++++++++++++----- gulpfile.js | 2 +- partials/navigation.hbs | 33 ++++++++++++++++----------------- partials/post-card.hbs | 2 +- partials/primary-tag.hbs | 2 +- partials/site-header.hbs | 8 +++++++- tag.hbs | 6 +++--- 8 files changed, 41 insertions(+), 33 deletions(-) diff --git a/assets/js/lib/nav-collapse.js b/assets/js/lib/nav-collapse.js index 386eafe..68e0c73 100644 --- a/assets/js/lib/nav-collapse.js +++ b/assets/js/lib/nav-collapse.js @@ -5,10 +5,6 @@ function toggleMenu() { } document.querySelector("#menushow").addEventListener("click", toggleMenu); -document.querySelectorAll(".menu__nav-item").forEach(menu => - menu.addEventListener("click", toggleMenu) -); -document.getElementById("darkMode").addEventListener("click", toggleMenu); var nav = document.querySelector('.site-header'); var feed = document.querySelector('main'); diff --git a/assets/js/lib/search.js b/assets/js/lib/search.js index 7da5901..342ba8c 100644 --- a/assets/js/lib/search.js +++ b/assets/js/lib/search.js @@ -6,15 +6,19 @@ async function searchPosts(query) { var data = await fetch(apiEndpoint + queryString + query + pageString + page) var search = await data.json(); - var result = search.result.map(x => { - return ` + var result = ""; + if (search.result) { + result = search.result.map(x => { + return `

${x.title}

${x.excerpt}

`; - }).join(""); + }).join(""); + } + document.getElementById("search-count").innerHTML = search.total + " results found"; document.getElementById("search-results").innerHTML = result; } @@ -24,11 +28,14 @@ if (window.yurikoSearchEndpoint != undefined) { el.addEventListener("input", function (e) { var val = el.value; if (val !== "") { - document.getElementById("nav-menu").classList.add("menu__item--hidden") + document.getElementById("site-header").classList.add("search-enabled") + document.getElementById("nav").classList.add("hidden") searchPosts(val); } else { - document.getElementById("nav-menu").classList.remove("menu__item--hidden") + document.getElementById("site-header").classList.remove("search-enabled") + document.getElementById("nav").classList.remove("hidden") + document.getElementById("search-count").innerHTML = ``; document.getElementById("search-results").innerHTML = ``; } }); diff --git a/gulpfile.js b/gulpfile.js index b76f080..7727633 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -37,7 +37,7 @@ function js() { .pipe(livereload()); } -const cssWatcher = () => watch('assets/css/**', css); +const cssWatcher = () => watch(['assets/css/**','node_modules/@damillora/shian/dist/**'], css); const jsWatcher = () => watch('assets/js/**.js', js); const hbsWatcher = () => watch(['*.hbs', 'partials/**/*.hbs'], hbs); const watcher = parallel(cssWatcher, hbsWatcher, jsWatcher); diff --git a/partials/navigation.hbs b/partials/navigation.hbs index b1944a8..dcf7447 100644 --- a/partials/navigation.hbs +++ b/partials/navigation.hbs @@ -1,22 +1,21 @@
-