diff --git a/bases/do-blog/src/com/oly/static_sites/do_blog/core.cljs b/bases/do-blog/src/com/oly/static_sites/do_blog/core.cljs index d80e82c..9965ddf 100644 --- a/bases/do-blog/src/com/oly/static_sites/do_blog/core.cljs +++ b/bases/do-blog/src/com/oly/static_sites/do_blog/core.cljs @@ -17,6 +17,7 @@ [tick.locale-en-us] ;; [cljsjs.js-joda-timezone] ;; [henryw374.js-joda-locale_en-us] + [com.oly.static-sites.do-blog.pages.components.core :refer [ui-tags title-text-image article-list-author-media-flipped]] [com.oly.static-sites.do-blog.pages.helpers.database :refer [state document conn schema latest-article search-articles]] ;; [com.oly.static-sites.ui-hiccup.interface :refer [board square]] @@ -123,12 +124,11 @@ (defn ui-search [search] [:div - - [:input.w-100.center.input-reset.ba.b--black-20.pa2.mb2 {:type "text" :placeholder "Search" :on-change (fn [evt] + (swap! state assoc :search {:active true}) (swap! state assoc :search {:terms (-> evt .-target .-value)}))}]]) (defn ui-sidebar [{:keys [sidebar body]}] @@ -159,7 +159,9 @@ content]) (defn layout [content] - (let [org-index (r/cursor state [:index])] + (let [search (r/cursor state [:search :terms]) + active-search (r/cursor state [:search :active]) + org-index (r/cursor state [:index])] (fn [content] [:<> [:link {:rel "stylesheet" :href "https://unpkg.com/tachyons@4.12.0/css/tachyons.min.css"}] @@ -174,7 +176,11 @@ .r0{transition: all 3s; transform-style: preserve-3d; transform-origin: top left; transform: rotate3d(0,1,0,0deg); backface-visibility: visible;}"] [:div.font.h-100 [ui-sidebar - {:body content + {:body [:div (when (true? @active-search) + [article-list-author-media-flipped + "Articles" + (search-articles {:search @search})]) + content] :sidebar [:div [profile-card {:name "Oly" :tagline "Earthling, Software Engineer" :img-src "/images/default/me.png"}] [:ul.list.pl0.measure.center @@ -310,6 +316,8 @@ (fn [] @update (prn "render") + (swap! state assoc :search {:active false}) + (when (-> @current-page :data :init) ((-> @current-page :data :init) nil) ((-> @current-page :data :init) (-> @current-page :parameters :path :path))) diff --git a/readme.org b/readme.org index ac1908f..1296875 100644 --- a/readme.org +++ b/readme.org @@ -1,9 +1,13 @@ +#+TITLE: Various static sites + clj -Mshadow-cljs-run watch app npx shadow-cljs server npx tailwindcss -i ./development/resources/public/css/tailwind-styles.css -o ./development/resources/public/css/styles.css --watch +clj -M:blog:shadow-cljs-run watch blog +docker build -t europe-west2-docker.pkg.dev/blog-9d51d/blog/caddy . -clj -M:blog::shadow-cljs-run watch blog +docker push europe-west2-docker.pkg.dev/blog-9d51d/blog/caddy