diff --git a/resources/config.edn b/resources/config.edn index 63a2c00..21ba69e 100644 --- a/resources/config.edn +++ b/resources/config.edn @@ -38,7 +38,7 @@ :scripts {} :styles {}} :geocsv {:formatter "smeagol.extensions.geocsv/process-geocsv" - :scripts {:core {:local "vendor/node_modules/@simon_brooke/geocsv/js/geocsv.js"} + :scripts {:core {:local "vendor/node_modules/geocsv-js/js/geocsv.js"} :leaflet {:local "vendor/node_modules/leaflet/dist/leaflet.js" :remote "https://unpkg.com/leaflet@1.6.0/dist/leaflet.js"} :papaparse {:local "vendor/node_modules/papaparse/papaparse.js" diff --git a/src/smeagol/middleware.clj b/src/smeagol/middleware.clj index aa0b8e7..25df960 100644 --- a/src/smeagol/middleware.clj +++ b/src/smeagol/middleware.clj @@ -69,8 +69,12 @@ [#(wrap-internal-error % :log (fn [e] (log/error e))) #(wrap-resource % "public") smeagol-wrap-content-type - #(wrap-file % util/content-dir - {:index-files? false :prefer-handler? true}) + #(try + (wrap-file % util/content-dir + {:index-files? false :prefer-handler? true}) + (catch Exception error + (log/fatal "Could not locate content dir" util/content-dir error) + %)) wrap-not-modified]) diff --git a/src/smeagol/sanity.clj b/src/smeagol/sanity.clj index f16a127..292ec40 100644 --- a/src/smeagol/sanity.clj +++ b/src/smeagol/sanity.clj @@ -369,7 +369,7 @@ [messages] [:head [:title (as-hiccup :smeagol-not-initialised messages)] - [:link {:href "/content/stylesheet.css" :rel "stylesheet"}]]) + [:link {:href "content/stylesheet.css" :rel "stylesheet"}]]) (defn as-hiccup-header