Resources now working.

src/clj/geocsv/handler serves resources.clj

@@ -0,0 +1,40 @@
+(ns geocsv.handler
+  (:require [compojure.core :refer [routes wrap-routes]]
+            [geocsv.env :refer [defaults]]
+            [geocsv.middleware :as middleware]
+            [geocsv.layout :refer [error-page]]
+            [geocsv.routes.home :refer [home-routes]]
+            [geocsv.routes.json :refer [json-routes]]
+            [reitit.ring :as ring]
+            [ring.middleware.content-type :refer [wrap-content-type]]
+            [ring.middleware.webjars :refer [wrap-webjars]]
+            [mount.core :as mount]))
+
+(mount/defstate init-app
+  :start ((or (:init defaults) (fn [])))
+  :stop  ((or (:stop defaults) (fn []))))
+
+(mount/defstate app-routes
+  :start
+  (ring/ring-handler
+    (ring/router
+      [(home-routes)
+;;        (-> #'json-routes
+;;            (wrap-routes middleware/wrap-csrf)
+;;            (wrap-routes middleware/wrap-formats))
+       ])
+    (ring/routes
+      (ring/create-resource-handler
+        {:path "/"})
+      (wrap-content-type
+        (wrap-webjars (constantly nil)))
+      (ring/create-default-handler
+        {:not-found
+         (constantly (error-page {:status 404, :title "404 - Page not found"}))
+         :method-not-allowed
+         (constantly (error-page {:status 405, :title "405 - Not allowed"}))
+         :not-acceptable
+         (constantly (error-page {:status 406, :title "406 - Not acceptable"}))}))))
+
+(defn app []
+  (middleware/wrap-base #'app-routes))

src/clj/geocsv/handler.clj

@@ -22,13 +22,14 @@
   (routes
     (-> #'home-routes
         (wrap-routes middleware/wrap-csrf)
-        (wrap-routes middleware/wrap-formats))
+        (wrap-routes middleware/wrap-formats)
+        wrap-webjars)
     (-> #'rest-routes
         (wrap-routes middleware/wrap-csrf)
         (wrap-routes middleware/wrap-formats))
-    (ring/create-resource-handler
-         {:path "/"})
-;;    (route/resources "/")
+;;     (ring/create-resource-handler
+;;          {:path "/"})
+   (route/resources "/")
     (route/not-found
       (:body
         (error-page {:status 404

src/clj/geocsv/routes/resources.clj

@@ -1,14 +0,0 @@
-(ns geocsv.routes.resources
-  "Serve resources for geocsv."
-  (:require [adl-support.core :as ac]
-            [adl-support.rest-support :as ar]
-            [clojure.core.memoize :as memo]
-            [clojure.java.io :as io]
-            [clojure.string :as s]
-            [clojure.tools.logging :as log]
-            [compojure.core :refer [defroutes GET POST]]
-            [csv2edn.csv2edn :refer :all]
-            [noir.response :as nresponse]
-            [noir.util.route :as route]
-            [ring.util.http-response :as response]
-            ))

src/cljs/geocsv/core.cljs

@@ -3,6 +3,7 @@
     [day8.re-frame.http-fx]
     [reagent.core :as r]
     [re-frame.core :as rf]
+    [geocsv.gis :as gis]
     [geocsv.views.map :as mv]
     [goog.events :as events]
     [goog.history.EventType :as HistoryEventType]
@@ -11,7 +12,7 @@
     [geocsv.events]
     [reitit.core :as reitit]
     [reitit.frontend.easy :as rfe]
-    [clojure.string :as string])
+    [clojure.string :as s])
   (:import goog.History))
 
 (defn nav-link [uri title page]
@@ -39,7 +40,31 @@
 
 (defn about-page []
   [:section.section>div.container>div.content
-   [:img {:src "/img/warning_clojure.png"}]])
+   [:img {:src "/img/warning_clojure.png"}]
+   (when-let [images @(rf/subscribe [:available-pin-images])]
+     [:div
+      [:h2 "The following pin images are available on this server"]
+      (apply
+        vector
+        (cons
+          :ol
+          (map
+            #(vector
+               :ol
+               [:img
+                {:src
+                 (str
+                   "img/map-pins/"
+                   (s/capitalize
+                   (s/replace
+                     (s/lower-case
+                       (str %))
+                     #"[^a-z0-9]" "-"))
+                   "-pin.png")
+                   :alt %}]
+               " "
+               %)
+            (sort images))))])])
 
 (defn home-page []
   [:section.section>div.container>div.content

src/cljs/geocsv/gis.cljs

@@ -81,7 +81,7 @@
     (if
       (available category)
       (str category "-pin")
-      "unknown-pin")))
+      "Unknown-pin")))
 
 (defn popup-content
   "Appropriate content for the popup of a map pin for this `record`."