upgrade respo and update new states syntax

Author: tiye

calcit.cirru

@@ -28,7 +28,7 @@
   "devDependencies": {
     "feather-icons": "^4.26.0",
     "http-server": "^0.12.1",
-    "shadow-cljs": "^2.8.92",
+    "shadow-cljs": "^2.8.93",
     "source-map-support": "^0.5.16",
     "url-parse": "^1.4.7"
   }

package.json

@@ -6,17 +6,17 @@
     [mvc-works/shell-page "0.1.10"]
     [mvc-works/ws-edn "0.1.3"]
     [cumulo/recollect "0.5.0"]
-    [cumulo/reel "0.1.1"]
+    [cumulo/reel "0.2.0-a1"]
     [cumulo/util "0.1.10"]
-    [respo "0.11.5"]
+    [respo "0.12.1-a2"]
     [respo/ui "0.3.14"]
-    [respo/alerts "0.4.3"]
+    [respo/alerts "0.5.0-a2"]
     [respo/message "0.3.6"]
     [respo/feather "0.1.1"]
     [cirru/bisection-key "0.1.5"]
-    [cirru/favored-edn "0.1.2"]
+    [cirru/favored-edn "0.1.3"]
     [medley "1.3.0"]
-    [appliedscience/js-interop "0.2.4"]
+    [appliedscience/js-interop "0.2.5"]
     [org.clojure/core.incubator "0.1.4"]
   ]
   :open-file-command [

shadow-cljs.edn

@@ -1,7 +1,7 @@
 
 (ns app.client
   (:require [respo.core :refer [render! clear-cache! realize-ssr!]]
-            [respo.cursor :refer [mutate]]
+            [respo.cursor :refer [update-states]]
             [app.comp.container :refer [comp-container]]
             [cljs.reader :refer [read-string]]
             [app.schema :as schema]
@@ -32,7 +32,7 @@
 (defn dispatch! [op op-data]
   (when (and config/dev? (not= op :states)) (println "Dispatch" op op-data))
   (case op
-    :states (reset! *states ((mutate op-data) @*states))
+    :states (reset! *states (update-states @*states op-data))
     :effect/connect (connect!)
     (ws-send! {:kind :op, :op op, :data op-data})))
 

src/app/client.cljs

@@ -2,7 +2,7 @@
 (ns app.comp.container
   (:require [hsl.core :refer [hsl]]
             [respo-ui.core :as ui]
-            [respo.core :refer [defcomp <> div span action-> cursor-> button]]
+            [respo.core :refer [defcomp <> >> div span button]]
             [respo.comp.inspect :refer [comp-inspect]]
             [respo.comp.space :refer [=<]]
             [app.comp.navigation :refer [comp-navigation]]
@@ -31,7 +31,7 @@
             :background-size :contain}})
   (div
    {:style {:cursor :pointer, :line-height "32px"},
-    :on-click (action-> :effect/connect nil)}
+    :on-click (fn [e d!] (d! :effect/connect nil))}
    (<> "No connection..." {:font-family ui/font-fancy, :font-size 24}))))
 
 (defcomp
@@ -66,11 +66,11 @@
           :home (<> "Home")
           :profile (comp-profile (:user store) (:data router))
           (<> router))
-        (comp-login states))
+        (comp-login (>> states :login)))
       (comp-status-color (:color store))
       (when dev? (comp-inspect "Store" store {:bottom 0, :left 0, :max-width "100%"}))
       (comp-messages
        (get-in store [:session :messages])
        {}
-       (fn [info d! m!] (d! :session/remove-message info)))
+       (fn [info d!] (d! :session/remove-message info)))
       (when dev? (comp-reel (:reel-length store) {}))))))

src/app/comp/container.cljs

@@ -9,8 +9,6 @@
 
 (def initial-state {:username "", :password ""})
 
-(defn on-input [state k] (fn [e dispatch! mutate!] (mutate! (assoc state k (:value e)))))
-
 (defn on-submit [username password signup?]
   (fn [e dispatch!]
     (dispatch! (if signup? :user/sign-up :user/log-in) [username password])
@@ -19,7 +17,7 @@
 (defcomp
  comp-login
  (states)
- (let [state (or (:data states) initial-state)]
+ (let [cursor (:cursor states), state (or (:data states) initial-state)]
    (div
     {:style (merge ui/flex ui/center)}
     (div
@@ -32,15 +30,15 @@
         {:placeholder "Username",
          :value (:username state),
          :style ui/input,
-         :on-input (on-input state :username)}))
+         :on-input (fn [e d!] (d! cursor (assoc state :username (:value e))))}))
       (=< nil 8)
       (div
        {}
        (input
         {:placeholder "Password",
          :value (:password state),
          :style ui/input,
-         :on-input (on-input state :password)})))
+         :on-input (fn [e d!] (d! cursor (assoc state :password (:value e))))})))
      (=< nil 8)
      (div
       {:style {:text-align :right}}

src/app/comp/login.cljs

@@ -3,7 +3,7 @@
   (:require [hsl.core :refer [hsl]]
             [respo-ui.core :as ui]
             [respo.comp.space :refer [=<]]
-            [respo.core :refer [defcomp <> action-> span div]]
+            [respo.core :refer [defcomp <> span div]]
             [app.config :as config]))
 
 (defcomp
@@ -19,10 +19,10 @@
             :border-bottom (str "1px solid " (hsl 0 0 0 0.1)),
             :font-family ui/font-fancy})}
   (div
-   {:on-click (action-> :router/change {:name :home}), :style {:cursor :pointer}}
+   {:on-click (fn [e d!] (d! :router/change {:name :home})), :style {:cursor :pointer}}
    (<> (:title config/site) nil))
   (div
-   {:style {:cursor "pointer"}, :on-click (action-> :router/change {:name :profile})}
+   {:style {:cursor "pointer"}, :on-click (fn [e d!] (d! :router/change {:name :profile}))}
    (<> (if logged-in? "Me" "Guest"))
    (=< 8 nil)
    (<> count-members))))

src/app/comp/navigation.cljs

@@ -37,13 +37,13 @@
    {}
    (button
     {:style (merge ui/button),
-     :on-click (fn [e d! m!]
+     :on-click (fn [e d!]
        (js/location.replace (str js/location.origin "?time=" (.now js/Date))))}
     (<> "Refresh"))
    (=< 8 nil)
    (button
     {:style (merge ui/button {:color :red, :border-color :red}),
-     :on-click (fn [e dispatch! mutate!]
+     :on-click (fn [e dispatch!]
        (dispatch! :user/log-out nil)
        (.removeItem js/localStorage (:storage-key config/site)))}
     (<> "Log out")))))

src/app/comp/profile.cljs

@@ -0,0 +1,6 @@
+
+{} (:host |cumulo.org)
+  :uploads $ []
+    {} (:from |dist/*) (:to |/web-assets/cdn/cumulo-workflow/)
+    {} (:from |dist/{index.html,manifest.json}) (:to |/web-assets/repo/Cumulo/workflow/)
+    {} (:from |dist/{server.js,package.json}) (:to |/servers/workflow/)