@@ -7,14 +7,17 @@

                  [thheller/shadow-cljs "2.6.7"]

                  [fulcrologic/fulcro "2.6.3"]

-                                        ; Only required if you use server

+                 ;; Only required if you use server

                  [http-kit "2.3.0"]

                  [ring/ring-core "1.7.0" :exclusions [commons-codec]]

                  [bk/ring-gzip "0.3.0"]

                  [bidi "2.1.4"]

-                                        ; only required if you want to use this for tests

-                 [fulcrologic/fulcro-spec "2.1.1" :scope "test" :exclusions [fulcrologic/fulcro]]]

+                 ;; only required if you want to use this for tests

+                 [fulcrologic/fulcro-spec "2.1.1" :scope "test" :exclusions [fulcrologic/fulcro]]

+

+                 [binaryage/dirac "RELEASE"]

+                 ]

   :uberjar-name "fulcro_cljdoc.jar"

@@ -39,10 +42,10 @@

                                          [devcards "0.2.6" :exclusions [cljsjs/react cljsjs/react-dom]]]

                           :repl-options

                           {:init-ns shadow.user

-                           :nrepl-middleware

-                           [shadow.cljs.devtools.server.nrepl/cljs-load-file

-                            shadow.cljs.devtools.server.nrepl/cljs-eval

-                            shadow.cljs.devtools.server.nrepl/cljs-select]}}

+                           :nrepl-middleware [shadow.cljs.devtools.server.nrepl/cljs-load-file

+                                              shadow.cljs.devtools.server.nrepl/cljs-eval

+                                              shadow.cljs.devtools.server.nrepl/cljs-select

+                                              dirac.nrepl/middleware]}}

              :dev        [:cljs

                           {:source-paths ["src/dev" "src/main" "src/cards"]

                            :jvm-opts     ["-XX:-OmitStackTraceInFastThrow" "-client" "-XX:+TieredCompilation" "-XX:TieredStopAtLevel=1"

@@ -79,3 +79,4 @@

   (shadow-api/watch :main)

   (shadow-api/watch :cards)

   (shadow-api/watch :test))

+

@@ -2,62 +2,112 @@

   (:require

    [fulcro.client.mutations :as m]

    [garden.core :as g]

+   [garden.selectors :as gs]

    [fulcro-css.css :as css]

    [fulcro.client.util :as util]

    [fulcro.client.data-fetch :as df]

-   #?(:cljs [fulcro.client.localized-dom :as dom] :clj [fulcro.client.localized-dom-server :as dom])

+   [clojure.string]

+   #?(:cljs [fulcro.client.dom :as dom!]

+      :clj [fulcro.client.dom-server :as dom!])

+   #?(:cljs [fulcro.client.localized-dom :as dom]

+      :clj [fulcro.client.localized-dom-server :as dom])

    [fulcro-cljdoc.api.mutations :as api]

    [fulcro.client.primitives :as prim :refer [defsc]]

    [fulcro.i18n :as i18n :refer [tr trf]]))

-(defn ensure-seq [m-seq]

+(defn ensure-seq 

   "make sure that m-seq is a seq, otherwise seqify it"

+  [m-seq]

   (if (seq? m-seq)

     m-seq

     [m-seq]))

 (defsc Sidebar [this {items :items}]

-  (dom/ul (map #(apply (comp dom/li

-                             dom/a)

-                       %)

-               (ensure-seq items))))

+  {:css [[:.sidebar {:display :block

+                     :color "rgb(63,63,63)"

+                     :background "rgb(197,199,168)"

+                     :border-right "double 5px #88a"

+                     :height "100vh"

+                     :min-width "9em"

+                     :text-align "right"

+                     :width "12.5vw"}]]}

+  (dom/nav :.sidebar

+           (dom/ul (map #(apply (comp dom/li

+                                      dom/a)

+                                %)

+                        (ensure-seq items)))))

 (def ui-sidebar (prim/factory Sidebar))

+(defn h* [{level :level :as props} & children]

+  (apply (case level

+           1 dom/h1

+           2 dom/h2

+           3 dom/h3

+           4 dom/h4

+           5 dom/h5

+           6 dom/h6)

+         (dissoc props :level)

+         children))

+

+(defsc Header [this {title :title}]

+  {:css [[:header {:text-shadow "0 0 0.1em rgb(63,63,63), 0 0 0.2em #fff"}]

+         [:h1 {:font-size "1.5em"}]]}

+  (dom/header

+   (h* {:level 1} title)

+   (prim/children this)))

+

+(def ui-header (prim/factory Header))

+

 ;; The main UI of your application

 (defsc Layout [this props]

   {:css [[:.container {:display :flex}]

-         [:main :.sidebar

+         [:main (gs/> :.container :nav)

           {:padding "1em 1.5em"

-           :vertical-scroll :auto}]

+           :scroll-y :auto}]

+         [(gs/> :.container :nav)

+          {:padding-top "5em"}]

+         [:$content {}]

          [:main     {:background "rgb(63,63,63)"

                      :color "rgb(197,199,168)"

                      :height "100vh"

                      :flex-grow 1}]

-         [:.sidebar {:display :block

-                     :color "rgb(63,63,63)"

-                     :background "rgb(197,199,168)"

-                     :border-right "double 5px #88a"

-                     :height "100vh"

-                     :min-width "25vw"

-                     :max-width "33vw"}]]}

-  (let [children (prim/children props)]

-    (let [names (map #(do [{:href "#"} (name %)])

-                     (keys (ns-publics 'fulcro-cljdoc.ui.root)))

-          out (dom/div :.container

-                       (dom/nav :.sidebar (ui-sidebar {:items names}))

-                       (dom/main 

-                        children))]

+         [:header {:border-bottom "double 5px #88a"

+                   :margin "0 -1.5em"

+                   :margin-bottom "0.75em"

+                   :padding-bottom "1em"

+                   :padding-left "1.5em"}]]

+   :css-include [Sidebar Header]}

+  (let [children (prim/children this)

+        sidebar (util/first-node Sidebar children)

+        header (util/first-node Header children)

+        others (filter #(and (not= sidebar %)

+                             (not= header %))

+                       children)]

+    (let [out (dom/div :.container

+                       sidebar

+                       (dom/main

+                        header

+                        (dom/section :$content others)))]

       out)))

 (def layout (prim/factory Layout))

 (defsc Root [this props]

   {:css-include [Layout]}

-  (println "hi")

-  ;; (css/upsert-css "root-css" Root)

-  (layout 

-   (ui-sidebar)

-   (dom/div "hi")))

-

-#?(:cljs (css/upsert-css "root-css" Layout))

-;; (dom/style {:dangerouslySetInnerHTML {:__html (g/css (css/get-css Root))}})

+  (let [publics (ns-publics 'fulcro-cljdoc.ui.root)

+        names (map #(do [{:href "#"}

+                         (name %)])

+                   (sort-by (comp clojure.string/lower-case

+                                  name)

+                            (keys publics)))]

+    (layout {}

+            (ui-sidebar {:items names})

+            (ui-header {:title "Hi there"})

+            (dom/div {}

+                     "hello world"

+                     (:doc

+                      (meta

+                       (get publics

+                            (symbol "ensure-seq"))))))))

+

+#?(:cljs (css/upsert-css "root-css" Root))