@@ -25,6 +25,7 @@

   (cond

    (= "Open Game License" cmdline) (db :license)

    (= "spells" cmdline) (vals spells)

+   (= "items" cmdline) (vals equipment)

    (contains? spells cmd) (spells cmd)

    (contains? equipment cmd) (equipment cmd)

    :else {:err (str "Unknown command '" cmdline "'")})))

@@ -142,13 +142,16 @@

                      :margin-right :0.5rem}]])

 (defclass item-list-panel []

-    {})

+    {}

+    title-style)

+

 (defclass error-message []

     {:background-color (colorscheme :faded-red)

      :color (colorscheme :light0-hard)}

     (content-before "Error: "))

+

 (defclass property-list []

     {:padding-left 0

      :margin-top :0.5rem

@@ -159,6 +162,13 @@

                               :margin-right :0.5rem}

      (content-after ":")])

+(defclass property-table []

+    {:border-spacing 0}

+    [:td :th {:padding 0

+              :padding-left :2ch}

+     (s/& s/first-child) {:padding-left 0}]

+    [:tr [(s/& (s/nth-child :2n+1)) {:background-color (colorscheme :light0-soft)}]])

+

 (defclass prompt-style []

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

    :font-family mono-font

@@ -50,7 +50,12 @@

     [& elements]

     (string/join " " (filter identity elements)))

-(defn- property-list    [& props]

+(defn- with-default [default x]

+  (if (nil? x) default x))

+

+(defn- third [coll] (nth coll 2))

+

+(defn- property-list [& props]

     (into

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

      (->> props

@@ -61,8 +66,23 @@

                  [:span (first %)]

                  [:span (second %)])))))

-(defn- license-notice

-    [x]

+(defn- zip [& colls] (apply map vector colls))

+

+(defn- property-table [items & props]

+  (let [pprops (partition 3 props)

+        headings (map first pprops)

+        attrs (map second pprops)

+        getters (map third pprops)]

+    (println headings)

+    [:table {:class (styles/property-table)}

+      [:thead (for [[attr heading] (zip attrs headings)] [:th attr heading])]

+      [:tbody

+       (for [item items]

+         [:tr

+          (for [[attr f] (zip attrs getters)]

+            [:td attr (->> item f (with-default "-"))])])]]))

+    

+(defn- license-notice [x]

     (let [l (x :license-notice)]

       (when l

         [:section.license-notice

@@ -196,8 +216,19 @@

      (for [spell (sort-by :name spells)]

         [:li [:span (spell :name)][:span (-> spell short-spell-description parenthesize)]])]])

-(defn item-list-panel [_]

-    [:article {:class (styles/item-list-panel)}])

+(defn equipment-list-panel [items]

+  [:article {:class (styles/item-list-panel)}

+   (heading "Items")

+   (property-table items

+     :Name

+       {}

+       :name

+     :Cost

+       {:align :right}

+       cost

+     :Weight

+       {:align :right}

+       weight)])

 (defn error-message

     [{e :err}]

@@ -209,6 +240,7 @@

 (def is-spell? #(some-> % :url (string/starts-with? "/api/spells")))

 (def is-spell-list? #(some-> % first is-spell?))

 (def is-equipment? #(some-> % :url (string/starts-with? "/api/equipment")))

+(def is-equipment-list? #(some-> % first is-equipment?))

 (def is-weapon? #(and (is-equipment? %) (-> % :equipment_category :index (= "weapon"))))

 (def is-error? #(contains? % :err))

@@ -217,6 +249,7 @@

     [:div.output

      (cond

       (is-license? x) (license-panel x)

+      (is-equipment-list? x) (equipment-list-panel x)

       (is-spell-list? x) (spell-list-panel x)

       (is-spell? x) (spell-panel x)

       (is-weapon? x) (weapon-panel x)