@@ -76,7 +76,7 @@

 (defclass history-style []

   {:list-style-type :none

    :padding 0}

-  [:li

+  [(s/> :li :.input)

    {:font-weight :bold

     :background-color (colorscheme :light0-soft)

     :padding-bottom :0.4rem

@@ -18,12 +18,6 @@

               :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])]

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

@@ -39,7 +33,9 @@

                    "th")]

         (str n suffix)))

-(def join-lines (partial string/join \newline))

+(defn- join-lines

+    [coll]

+    (string/join \newline coll))

 (defn- comma-separated

     [coll]

@@ -49,33 +45,41 @@

     [s]

     (when s (str "(" s ")")))

-(defn spell-panel [spell-id]

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

+(defn spell-panel [spell]

       [:article {:class (styles/spell-panel)}

-       [:h1 (:name @spell)]

+       [:h1 (:name spell)]

        [:div

         [:span.level

-         (-> @spell :level ordinal)

+         (-> spell :level ordinal)

          " level"]

         [:span.school

          "school of "

-         (-> @spell (get-in [:school :name]))]]

+         (-> spell (get-in [:school :name]))]]

        [:ul {:class (styles/property-list)}

         ; Refactor these so that we get the "name" from the keyword by replacing

         ; '-' and '_' and capitalizing

         [:li [:span "Casting Time"]

-             [:span (-> @spell :casting_time)]]

+             [:span (-> spell :casting_time)]]

         [:li [:span "Range"]

-             [:span (-> @spell :range)]]

+             [:span (-> spell :range)]]

         [:li [:span "Components"]

-             [:span (comma-separated (-> @spell :components))]

-             [:span (parenthesize (-> @spell :material))]]

+             [:span (comma-separated (-> spell :components))]

+             [:span (parenthesize (-> spell :material))]]

         [:li [:span "Duration"]

-             [:span (-> @spell :duration)]]]

-       [:section.description (-> @spell :desc join-lines)]

+             [:span (-> spell :duration)]]]

+       [:section.description (-> spell :desc join-lines)]

        [:section.higher-level

         [:span "At higher levels"]

-        [:span (-> @spell :higher_level join-lines)]]]))

+        [:span (-> spell :higher_level join-lines)]]])

+

+(defn history []

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

+    (into

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

+     (map #(vector :li

+                   [:div.input (:input %)]

+                   [:div.output (-> % :output spell-panel)])

+          @history))))

 (defn main-panel []

   [:div {:class (styles/screen)}