refactoring ns; alpha release

package.json

@@ -24,6 +24,6 @@
   "license": "MIT",
   "devDependencies": {
     "http-server": "^0.12.3",
-    "shadow-cljs": "^2.10.13"
+    "shadow-cljs": "^2.10.14"
   }
 }

release.edn

@@ -1,4 +1,4 @@
-{:version "0.6.0-a2"
+{:version "0.6.1-a1"
  :group-id "cumulo"
  :artifact-id "recollect"
  :skip-tag true

shadow-cljs.edn

@@ -3,9 +3,9 @@
   :cache-blockers #{cumulo-util.build}
   :dependencies [
     [mvc-works/hsl "0.1.2"]
-    [mvc-works/shell-page "0.1.13"]
+    [mvc-works/shell-page "0.1.14"]
     [respo "0.12.3"]
-    [respo/ui "0.3.15-a1"]
+    [respo/ui "0.3.15"]
     [cumulo/util "0.1.12"]
     [cumulo/caches "0.0.1"]
     [respo/value "0.3.0"]
@@ -20,9 +20,9 @@
     :client {
       :target :browser, :output-dir "target/", :asset-path "."
       :modules {
-        :client {:init-fn recollect.main/main!}
+        :client {:init-fn recollect.app.main/main!}
       }
-      :devtools {:after-load recollect.main/reload!}
+      :devtools {:after-load recollect.app.main/reload!}
       :compiler-options {:infer-externs :auto}
       :release {
         :output-dir "dist/", :module-hash-names 8
@@ -34,12 +34,12 @@
       :devtools {:after-load recollect.test/main!}
     }
     :page {
-      :target :node-script, :output-to "target/page.js", :main recollect.page/main!
-      :devtools {:after-load recollect.page/main!}
+      :target :node-script, :output-to "target/page.js", :main recollect.app.page/main!
+      :devtools {:after-load recollect.app.page/main!}
     }
     :upload {
-      :target :node-script, :output-to "target/upload.js", :main recollect.upload/main!
-      :devtools {:after-load recollect.upload/main!}
+      :target :node-script, :output-to "target/upload.js", :main recollect.app.upload/main!
+      :devtools {:after-load recollect.app.upload/main!}
     }
   }
 }

src/recollect/comp/container.cljs → src/recollect/app/comp/container.cljs

@@ -1,10 +1,10 @@
 
-(ns recollect.comp.container
+(ns recollect.app.comp.container
   (:require [hsl.core :refer [hsl]]
             [respo-ui.core :as ui]
             [respo.core :refer [defcomp >> <> span div]]
             [respo.comp.space :refer [=<]]
-            [recollect.comp.panel :refer [comp-panel]]
+            [recollect.app.comp.panel :refer [comp-panel]]
             [respo-value.comp.value :refer [comp-value]]))
 
 (defcomp

src/recollect/comp/panel.cljs → src/recollect/app/comp/panel.cljs

@@ -1,5 +1,5 @@
 
-(ns recollect.comp.panel
+(ns recollect.app.comp.panel
   (:require [hsl.core :refer [hsl]]
             [respo-ui.core :as ui]
             [respo.core :refer [defcomp <> span div]]

src/recollect/config.cljs → src/recollect/app/config.cljs

@@ -1,5 +1,5 @@
 
-(ns recollect.config )
+(ns recollect.app.config )
 
 (def cdn?
   (cond

src/recollect/main.cljs → src/recollect/app/main.cljs

@@ -1,14 +1,14 @@
 
-(ns recollect.main
+(ns recollect.app.main
   (:require [respo.core :refer [render! clear-cache! realize-ssr!]]
-            [recollect.comp.container :refer [comp-container]]
+            [recollect.app.comp.container :refer [comp-container]]
             [cljs.reader :refer [read-string]]
-            [recollect.twig.container :refer [twig-container]]
+            [recollect.app.twig.container :refer [twig-container]]
             [recollect.diff :refer [diff-twig]]
             [recollect.patch :refer [patch-twig]]
-            [recollect.updater :refer [updater]]
+            [recollect.app.updater :refer [updater]]
             [recollect.schema :as schema]
-            [recollect.config :as config]
+            [recollect.app.config :as config]
             [recollect.twig :refer [clear-twig-caches!]]))
 
 (defonce *client-store (atom schema/store))

src/recollect/page.cljs → src/recollect/app/page.cljs

@@ -1,11 +1,11 @@
 
-(ns recollect.page
+(ns recollect.app.page
   (:require [respo.render.html :refer [make-string]]
             [shell-page.core :refer [make-page spit slurp]]
-            [recollect.comp.container :refer [comp-container]]
+            [recollect.app.comp.container :refer [comp-container]]
             [recollect.schema :as schema]
             [cljs.reader :refer [read-string]]
-            [recollect.config :as config]
+            [recollect.app.config :as config]
             [cumulo-util.build :refer [get-ip!]])
   (:require-macros [clojure.core.strint :refer [<<]]))
 
@@ -18,7 +18,7 @@
    (merge
     base-info
     {:styles [(<< "http://~(get-ip!):8100/main.css") "/entry/main.css"],
-     :scripts [{:src "/client.js", :defer? true}],
+     :scripts [{:src "/client.js", :type :script, :defer? true}],
      :inline-styles []})))
 
 (defn prod-page []
@@ -31,7 +31,11 @@
      (merge
       base-info
       {:styles [(:release-ui config/site)],
-       :scripts (map (fn [x] {:src (-> x :output-name prefix-cdn), :defer? true}) assets),
+       :scripts (->> assets
+                     (map
+                      (fn [x]
+                        {:type :script, :src (-> x :output-name prefix-cdn), :defer? true}))
+                     vec),
        :ssr "respo-ssr",
        :inline-styles [(slurp "./entry/main.css")]}))))
 

src/recollect/app/twig/card.cljs

@@ -0,0 +1,4 @@
+
+(ns recollect.app.twig.card (:require [recollect.twig :refer [deftwig]]))
+
+(deftwig twig-card (user date) {:user user, :date date})

src/recollect/app/twig/container.cljs

@@ -0,0 +1,8 @@
+
+(ns recollect.app.twig.container
+  (:require [recollect.app.twig.card :refer [twig-card]] [recollect.twig :refer [deftwig]]))
+
+(deftwig
+ twig-container
+ (store)
+ (merge store {:card (twig-card (:user store) (:date store))}))

src/recollect/updater.cljs → src/recollect/app/updater.cljs

@@ -1,5 +1,5 @@
 
-(ns recollect.updater (:require [respo.cursor :refer [update-states]]))
+(ns recollect.app.updater (:require [respo.cursor :refer [update-states]]))
 
 (defn updater [store op op-data]
   (case op

src/recollect/upload.cljs → src/recollect/app/upload.cljs

@@ -1,5 +1,5 @@
 
-(ns recollect.upload
+(ns recollect.app.upload
   (:require ["child_process" :as cp]
             [recollect.config :as config]
             [cumulo-util.file :refer [sh!]])