@@ -1,4 +1,6 @@

 (ns dm.db)

 (def default-db

-  {:name "re-frame"})

+  {:name "DMR"

+   :cmdline {:current ""

+             :history []}})

\ No newline at end of file

@@ -1,5 +1,6 @@

 (ns dm.events

   (:require

+   [clojure.string :refer [trim]]

    [re-frame.core :as re-frame]

    [dm.db :as db]

    [day8.re-frame.tracing :refer-macros [fn-traced]]

@@ -9,3 +10,19 @@

  ::initialize-db

  (fn-traced [_ _]

    db/default-db))

+

+(re-frame/reg-event-db

+ ::update-cmdline

+ (fn-traced [db [_ current]]

+  (assoc-in db [:cmdline :current] current)))

+

+(re-frame/reg-event-db

+ ::submit-cmd

+ (fn-traced [db _]

+  (let [cmdline (-> db (get-in [:cmdline :current]) trim)

+        not-empty? #(not (empty? %))]

+    ; TODO replace this with a "->when" macro so that we

+    ; don't always have to prefix with a conditional

+    (cond-> db

+     true (update-in [:cmdline :current] (constantly nil))

+     (not-empty? cmdline) (update-in [:cmdline :history] conj cmdline)))))

\ No newline at end of file

@@ -2,27 +2,100 @@

   (:require-macros

     [garden.def :refer [defcssfn]])

   (:require

-    [spade.core   :refer [defglobal defclass]]

-    [garden.units :refer [deg px]]

-    [garden.color :refer [rgba]]))

+    [spade.core   :refer [defglobal defclass]]))

-(defcssfn linear-gradient

- ([c1 p1 c2 p2]

-  [[c1 p1] [c2 p2]])

- ([dir c1 p1 c2 p2]

-  [dir [c1 p1] [c2 p2]]))

+(def gruvbox-colors

+  {:dark0-hard       :#1d2021

+   :dark0            :#282828

+   :dark0-soft       :#32302f

+   :dark1            :#3c3836

+   :dark2            :#504945

+   :dark3            :#665c54

+   :dark4            :#7c6f64

+

+   :gray-245         :#928374

+   :gray-244         :#928374

+

+   :light0-hard      :#f9f5d7

+   :light0           :#fbf1c7

+   :light0-soft      :#f2e5bc

+   :light1           :#ebdbb2

+   :light2           :#d5c4a1

+   :light3           :#bdae93

+   :light4           :#a89984

+

+   :bright-red       :#fb4934

+   :bright-green     :#b8bb26

+   :bright-yellow    :#fabd2f

+   :bright-blue      :#83a598

+   :bright-purple    :#d3869b

+   :bright-aqua      :#8ec07c

+   :bright-orange    :#fe8019

+

+   :neutral-red      :#cc241d

+   :neutral-green    :#98971a

+   :neutral-yellow   :#d79921

+   :neutral-blue     :#458588

+   :neutral-purple   :#b16286

+   :neutral-aqua     :#689d6a

+   :neutral-orange   :#d65d0e

+

+   :faded-red        :#9d0006

+   :faded-green      :#79740e

+   :faded-yellow     :#b57614

+   :faded-blue       :#076678

+   :faded-purple     :#8f3f71

+   :faded-aqua       :#427b58

+   :faded-orange     :#af3a03})

+

+; TODO: put this in an atom and put it in the appstate

+(def colorscheme gruvbox-colors)

+

+(defcssfn calc)

+

+(def mono-font ["Source Code Pro" "monospace"])

 (defglobal defaults

   [:body

-   {:color               :red

-    :background-color    :#ddd

-    :background-image    [(linear-gradient :white (px 2) :transparent (px 2))

-                          (linear-gradient (deg 90) :white (px 2) :transparent (px 2))

-                          (linear-gradient (rgba 255 255 255 0.3) (px 1) :transparent (px 1))

-                          (linear-gradient (deg 90) (rgba 255 255 255 0.3) (px 1) :transparent (px 1))]

-    :background-size     [[(px 100) (px 100)] [(px 100) (px 100)] [(px 20) (px 20)] [(px 20) (px 20)]]

-    :background-position [[(px -2) (px -2)] [(px -2) (px -2)] [(px -1) (px -1)] [(px -1) (px -1)]]}])

-

-(defclass level1

-  []

-  {:color :green})

+   {

+    :color (colorscheme :dark1)

+    :font-family mono-font

+    :font-size :100%

+    :line-height :1.2rem

+    :background-color    (colorscheme :light0-hard)

+   }])

+

+(defclass history-style []

+  {:list-style-type :none

+   :padding 0}

+  [:li

+   {:font-weight :bold

+    :background-color (colorscheme :light0-soft)

+    :padding-bottom :0.4rem

+    :margin-bottom :0.4rem}])

+

+(defclass prompt-style []

+  {:background-color (colorscheme :light0-soft)

+   :font-family mono-font

+   ;:font-weight :bold

+   :margin "1.4rem 0 0.5rem"

+   :padding-left :0.4rem

+   :position :relative

+   :white-space :nowrap}

+  [:&:before {:content "'λ '"}]

+  [:input

+   {:background :none

+    :border :none

+    :font-family mono-font

+    :font-weight :bold

+    :font-size :100%

+    :color (colorscheme :dark1)

+    :height :1.2rem

+    :margin-bottom 0

+    :margin-left 0

+    :margin-right 0

+    :margin-top 0

+    :padding 0

+    :width (calc "100% - 2ch")}

+   [:&:focus

+    {:outline :none}]])

\ No newline at end of file

@@ -6,3 +6,13 @@

  ::name

  (fn [db]

    (:name db)))

+

+(re-frame/reg-sub

+ ::cmdline

+ (fn [db]

+   (get-in db [:cmdline :current])))

+

+(re-frame/reg-sub

+ ::cmd-history

+ (fn [db]

+   (get-in db [:cmdline :history])))

@@ -3,12 +3,29 @@

    [re-frame.core :as re-frame]

    [dm.styles :as styles]

    [dm.subs :as subs]

-   ))

+   [dm.events :as events]))

-(defn main-panel []

+(defn prompt []

+  (let [cmdline (re-frame/subscribe [::subs/cmdline])

+        update-cmdline #(re-frame/dispatch

+                        [::events/update-cmdline (-> % .-target .-value)])

+        submit-cmd #((.preventDefault %)

+                     (re-frame/dispatch [::events/submit-cmd]))]

+  [:form {:class (styles/prompt-style)

+          :on-submit submit-cmd}

+   [:input {:value @cmdline

+            :on-change update-cmdline

+            :type "text"}]]))

+

+(defn history []

+  (let [history (re-frame/subscribe [::subs/cmd-history])]

+    (into

+     [:ul {:class (styles/history-style)}]

+     (map #(vector :li %) @history))))

+

+(defn title []

   (let [name (re-frame/subscribe [::subs/name])]

-    [:div

-     [:h1

-      {:class (styles/level1)}

-      "Hello from " @name]

-     ]))

+    [:h1 "Welcome to " @name]))

+

+(defn main-panel []

+  [:div (title) (history) (prompt)])

\ No newline at end of file