Compare commits
No commits in common. "eba0dbe7c2b2857535211160773aa950880ff412" and "0c61609774d1418944979a24dfb54324170c39ec" have entirely different histories.
eba0dbe7c2
...
0c61609774
6
deps.edn
6
deps.edn
@ -9,11 +9,7 @@
|
|||||||
ring-logger/ring-logger {:mvn/version "1.1.1"}
|
ring-logger/ring-logger {:mvn/version "1.1.1"}
|
||||||
ring/ring-core {:mvn/version "1.14.2"}
|
ring/ring-core {:mvn/version "1.14.2"}
|
||||||
ring/ring-json {:mvn/version "0.5.1"}
|
ring/ring-json {:mvn/version "0.5.1"}
|
||||||
ring/ring-jetty-adapter {:mvn/version "1.14.2"}
|
ring/ring-jetty-adapter {:mvn/version "1.14.2"}}
|
||||||
dev.data-star.clojure/sdk {:mvn/version "1.0.0-RC3"}
|
|
||||||
dev.data-star.clojure/ring {:mvn/version "1.0.0-RC3"}
|
|
||||||
datastar/expressions {:git/url "https://github.com/outskirtslabs/datastar-expressions/"
|
|
||||||
:git/sha "53efc7093be1ba33b331b4a27884be8925d8bdce"}}
|
|
||||||
:paths [:clj-paths :resource-paths]
|
:paths [:clj-paths :resource-paths]
|
||||||
:aliases
|
:aliases
|
||||||
{:repl {:extra-paths ["src/dev"]
|
{:repl {:extra-paths ["src/dev"]
|
||||||
|
|||||||
@ -6,11 +6,12 @@
|
|||||||
[compojure.core :refer [context defroutes DELETE GET let-routes PATCH POST]]
|
[compojure.core :refer [context defroutes DELETE GET let-routes PATCH POST]]
|
||||||
[compojure.route :as route]
|
[compojure.route :as route]
|
||||||
[hiccup2.core :as h]
|
[hiccup2.core :as h]
|
||||||
[ring.middleware.json :refer [wrap-json-body]]
|
[ring.middleware.content-type :refer [wrap-content-type]]
|
||||||
[starfederation.datastar.clojure.adapter.common :refer [on-open]]
|
[ring.middleware.json :as rmjson]
|
||||||
[starfederation.datastar.clojure.adapter.ring :refer [->sse-response]]
|
[ring.middleware.not-modified :refer [wrap-not-modified]]
|
||||||
[starfederation.datastar.clojure.api :as d*]
|
[ring.middleware.params :refer [wrap-params]]
|
||||||
[starfederation.datastar.clojure.expressions :refer [->expr]]))
|
[ring.middleware.resource :refer [wrap-resource]]
|
||||||
|
[ring.util.response :refer [response]]))
|
||||||
|
|
||||||
(comment
|
(comment
|
||||||
(do
|
(do
|
||||||
@ -19,137 +20,120 @@
|
|||||||
|
|
||||||
(remove-tap printer))
|
(remove-tap printer))
|
||||||
|
|
||||||
|
(defn get-todos [_]
|
||||||
|
(let [res (db/get-all-todos)]
|
||||||
|
(response res)))
|
||||||
|
|
||||||
|
(defn get-todo [id _]
|
||||||
|
(let [res (db/get-todo id)]
|
||||||
|
(response res)))
|
||||||
|
|
||||||
|
(defn add-todo [req]
|
||||||
|
(db/add-todo! (-> req :body :title))
|
||||||
|
{:status 201})
|
||||||
|
|
||||||
|
(defn update-todo [id {{:keys [done]} :body}]
|
||||||
|
(db/set-todo-done! id done))
|
||||||
|
|
||||||
|
(defn delete-todo [id]
|
||||||
|
(db/delete-todo! id)
|
||||||
|
{:status 204})
|
||||||
|
|
||||||
(defn page-template [view]
|
(defn page-template [view]
|
||||||
(str
|
(-> [:html
|
||||||
(h/html
|
[:head
|
||||||
(h/raw "<!DOCTYPE html>")
|
[:script {:src "https://cdn.jsdelivr.net/npm/htmx.org@2.0.7/dist/htmx.min.js"}]]
|
||||||
[:html
|
[:body view]]
|
||||||
[:head
|
h/html
|
||||||
[:script {:src "https://cdn.jsdelivr.net/gh/starfederation/datastar@1.0.0-RC.5/bundles/datastar.js"
|
str))
|
||||||
:type "module"
|
|
||||||
:defer true}]
|
|
||||||
[:link {:rel "icon"
|
|
||||||
:type "imaage/x-icon"
|
|
||||||
:href "https://data-star.dev/cdn-cgi/image/format=auto,width=24/static/images/rocket-48x48-4c739bfaffe86a6ffcc3a6d77e3c5547730f03d74c11aa460209596d1811f7a3.png"}]]
|
|
||||||
[:body view]])))
|
|
||||||
|
|
||||||
(defn todos-fragment []
|
(def hx-app {:hx-swap "outerHTML"
|
||||||
(let [todos (db/get-all-todos)]
|
:hx-target "#app"})
|
||||||
(h/html
|
|
||||||
[:div {:id "todos"}
|
|
||||||
[:div {:data-computed-show-toggle-display "($showComplete ? 'hide' : 'show') + ' done'"}]
|
|
||||||
[:ul
|
|
||||||
(for [{id :id
|
|
||||||
done :todo/done?
|
|
||||||
title :todo/title} todos]
|
|
||||||
[:li {:data-show (->expr (or (not ~done)
|
|
||||||
$showComplete))}
|
|
||||||
[:span {:style (str "text-decoration: " (if done "line-through" "none"))}
|
|
||||||
title]
|
|
||||||
[:input {:type "checkbox"
|
|
||||||
:checked done
|
|
||||||
:data-on-click (str "@patch('/sse/todo/" id "/" (when done "un") "set')")
|
|
||||||
:style "margin-right: 0.25rem;"}]
|
|
||||||
(when done
|
|
||||||
[:button {:data-on-click (->expr (@delete ~(str "/sse/todo/" id)))}
|
|
||||||
"X"])])]
|
|
||||||
[:div
|
|
||||||
[:p "settings"]
|
|
||||||
[:button {:data-on-click "$showComplete = !$showComplete"
|
|
||||||
:data-text "$showToggleDisplay"
|
|
||||||
:style "margin-right: 0.25rem;"}]
|
|
||||||
[:button {:data-on-click "$debugMode = !$debugMode"}
|
|
||||||
"toggle debug"]]])))
|
|
||||||
|
|
||||||
(defn create-todo-fragment []
|
(defn render-app [{:keys [show-complete]
|
||||||
(h/html
|
:or {show-complete true}
|
||||||
[:div {:id "create-box"
|
:as opts}]
|
||||||
:style "margin-top: 2rem;"}
|
(-> (let [todos (db/get-all-todos)
|
||||||
[:label "Make a todo: "]
|
complete-toggle (if show-complete "hide" "show")]
|
||||||
[:input {:name "title"
|
[:div {:id "app"}
|
||||||
:data-bind "title"
|
[:ul
|
||||||
:style "margin-right: 0.25rem;"}]
|
(for [{id :id
|
||||||
[:button {:data-on-click (->expr (@post "/sse/todo/create-todo"))}
|
done :todo/done?
|
||||||
"submit"]]))
|
title :todo/title} todos
|
||||||
|
:when (or show-complete (not done))]
|
||||||
|
[:li
|
||||||
|
[:span {:style (str "text-decoration: " (if done "line-through" "none"))}
|
||||||
|
title]
|
||||||
|
[:input (merge hx-app
|
||||||
|
{:type "checkbox"
|
||||||
|
:checked done
|
||||||
|
:hx-patch (format "/htmx/todo/%s/%s?opts=%s"
|
||||||
|
id
|
||||||
|
(if done "unset" "set")
|
||||||
|
(json/write-str opts))})]])]
|
||||||
|
[:div
|
||||||
|
[:p "settings"]
|
||||||
|
[:button (merge hx-app
|
||||||
|
{:hx-get (format "/htmx/todo/?opts=%s"
|
||||||
|
(-> opts
|
||||||
|
(update :show-complete not)
|
||||||
|
json/write-str))})
|
||||||
|
complete-toggle " done"]]])
|
||||||
|
h/html))
|
||||||
|
|
||||||
(defn app-fragment []
|
;; im gonna regert this
|
||||||
(h/html
|
(defn DRY [req]
|
||||||
[:div {:data-signals #json{:showComplete true
|
(-> req
|
||||||
:debugMode false
|
:params
|
||||||
:title ""}}]
|
(get "opts" "{}")
|
||||||
[:pre {:data-json-signals "true"
|
json/read-json
|
||||||
:data-show "$debugMode"}]
|
render-app
|
||||||
[:div {:id "app"}
|
str))
|
||||||
(todos-fragment)
|
|
||||||
(create-todo-fragment)]))
|
|
||||||
|
|
||||||
(defn refresh-todos! [sse]
|
(defroutes api-routes
|
||||||
(d*/patch-elements! sse
|
|
||||||
(str (todos-fragment))
|
|
||||||
#:d*.elements{:selector "#todos"
|
|
||||||
:patch-mode "replace"}))
|
|
||||||
|
|
||||||
(defroutes approutes
|
|
||||||
(GET "/" []
|
(GET "/" []
|
||||||
(fn [_ respond _]
|
(wrap-params
|
||||||
(-> (app-fragment)
|
#(-> % :params
|
||||||
page-template
|
(get "opts" "{}")
|
||||||
respond)))
|
json/read-json
|
||||||
|
render-app
|
||||||
|
page-template)))
|
||||||
|
(-> (context "/api/v1" []
|
||||||
|
(context "/todo" []
|
||||||
|
(GET "/" [] get-todos)
|
||||||
|
(POST "/" [] add-todo)
|
||||||
|
(context ["/:id", :id #"[0-9]+"] [id]
|
||||||
|
(let-routes [id (read-string id)]
|
||||||
|
(GET "/" [] (partial get-todo id))
|
||||||
|
(PATCH "/" [] (partial update-todo id))
|
||||||
|
(DELETE "/" [] (delete-todo id)))))
|
||||||
|
|
||||||
(wrap-json-body
|
(GET "/example/math/:x/:y" [x y]
|
||||||
(context "/sse/todo" []
|
(->> (+ (parse-long x)
|
||||||
(GET "/" []
|
(parse-long y))
|
||||||
(fn [req respond _]
|
(hash-map :result)
|
||||||
(respond
|
response)))
|
||||||
(->sse-response req
|
(rmjson/wrap-json-body {:keywords? true})
|
||||||
{on-open (fn [sse]
|
(rmjson/wrap-json-response))
|
||||||
(d*/with-open-sse sse
|
|
||||||
(refresh-todos! sse)))}))))
|
|
||||||
(POST "/create-todo" []
|
|
||||||
(fn [req respond _]
|
|
||||||
(let [title (-> req :body :title)]
|
|
||||||
(tap> title)
|
|
||||||
(when title
|
|
||||||
(db/add-todo! title))
|
|
||||||
(respond
|
|
||||||
(->sse-response req
|
|
||||||
{on-open (fn [sse]
|
|
||||||
(d*/with-open-sse sse
|
|
||||||
(refresh-todos! sse)
|
|
||||||
(d*/patch-signals! sse
|
|
||||||
#json{:title ""})))})))))
|
|
||||||
|
|
||||||
|
(wrap-params
|
||||||
|
(context "/htmx/todo" []
|
||||||
|
(GET "/" [] DRY)
|
||||||
|
(POST "/" [] add-todo)
|
||||||
(context ["/:id", :id #"[0-9]+"] [id]
|
(context ["/:id", :id #"[0-9]+"] [id]
|
||||||
(let-routes [id (read-string id)]
|
(let-routes [id (read-string id)]
|
||||||
(PATCH "/set" []
|
(PATCH "/set" [] (do (db/set-todo-done! id true)
|
||||||
(fn [req respond _]
|
DRY))
|
||||||
(db/set-todo-done! id true)
|
(PATCH "/unset" [] (do (db/set-todo-done! id false)
|
||||||
(respond
|
DRY))
|
||||||
(->sse-response req
|
(DELETE "/" [] (do (delete-todo id)
|
||||||
{on-open (fn [sse]
|
DRY))))))
|
||||||
(d*/with-open-sse sse
|
|
||||||
(refresh-todos! sse)))}))))
|
|
||||||
(PATCH "/unset" []
|
|
||||||
(fn [req respond _]
|
|
||||||
(db/set-todo-done! id false)
|
|
||||||
(respond
|
|
||||||
(->sse-response
|
|
||||||
req
|
|
||||||
{on-open (fn [sse]
|
|
||||||
(d*/with-open-sse sse
|
|
||||||
(refresh-todos! sse)))}))))
|
|
||||||
(DELETE "/" []
|
|
||||||
(db/delete-todo! id)
|
|
||||||
(fn [req respond _]
|
|
||||||
(respond
|
|
||||||
(->sse-response
|
|
||||||
req
|
|
||||||
{on-open
|
|
||||||
(fn [sse]
|
|
||||||
(d*/with-open-sse sse
|
|
||||||
(refresh-todos! sse)))})))))))
|
|
||||||
{:keywords? true})
|
|
||||||
(route/not-found (str (h/html [:h2 "Not Found"]))))
|
(route/not-found (str (h/html [:h2 "Not Found"]))))
|
||||||
|
|
||||||
(def app #'approutes)
|
(def app
|
||||||
|
(-> #'api-routes
|
||||||
|
(wrap-resource "public")
|
||||||
|
wrap-content-type
|
||||||
|
wrap-not-modified)) ;; files from resources/public are served
|
||||||
|
|
||||||
|
|||||||
@ -6,10 +6,7 @@
|
|||||||
(def port 1738)
|
(def port 1738)
|
||||||
|
|
||||||
(defn make-server [opts]
|
(defn make-server [opts]
|
||||||
(run-jetty #'core/app (merge {:join? false,
|
(run-jetty #'core/app (merge {:join? false, :port port} opts)))
|
||||||
:port port,
|
|
||||||
:async? true}
|
|
||||||
opts)))
|
|
||||||
|
|
||||||
(defn -main [& _args]
|
(defn -main [& _args]
|
||||||
(make-server {}))
|
(make-server {}))
|
||||||
|
|||||||
@ -1 +0,0 @@
|
|||||||
{json clojure.data.json/write-str}
|
|
||||||
Loading…
x
Reference in New Issue
Block a user