simon/smeagol
1
0
Fork 0
mirror of https://github.com/journeyman-cc/smeagol.git synced 2026-04-12 18:05:06 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'origin/develop' into develop

Browse source
This commit is contained in:
Simon Brooke 2020-02-27 11:05:08 +00:00
commit 2336e9dc2a
No known key found for this signature in database
GPG key ID: A7A4F18D1D4DF987
5 changed files with 18 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

3
project.clj
View file

@ -57,8 +57,9 @@
[vega-lite "4.1.1"] [vega-lite "4.1.1"]
[mermaid "8.4.6"] [mermaid "8.4.6"]
[photoswipe "4.1.3"] [photoswipe "4.1.3"]
[showdown "1.9.1"]
[tablesort "5.2.0"] [tablesort "5.2.0"]
[geocsv-js "simon-brooke/geocsv-js#80e5198"]] [geocsv-js "simon-brooke/geocsv-js#3a34ba7"]]
:root "resources/public/vendor"} :root "resources/public/vendor"}
:docker {:image-name "simonbrooke/smeagol" :docker {:image-name "simonbrooke/smeagol"

6
resources/config.edn
View file

@ -38,11 +38,13 @@
:scripts {} :scripts {}
:styles {}} :styles {}}
:geocsv {:formatter "smeagol.extensions.geocsv/process-geocsv" :geocsv {:formatter "smeagol.extensions.geocsv/process-geocsv"
:scripts {:core {:local "vendor/node_modules/geocsv-js/js/geocsv.js"} :scripts {:core {:local "vendor/node_modules/@simon_brooke/geocsv/js/geocsv.js"}
:leaflet {:local "vendor/node_modules/leaflet/dist/leaflet.js" :leaflet {:local "vendor/node_modules/leaflet/dist/leaflet.js"
:remote "https://unpkg.com/leaflet@1.6.0/dist/leaflet.js"} :remote "https://unpkg.com/leaflet@1.6.0/dist/leaflet.js"}
:papaparse {:local "vendor/node_modules/papaparse/papaparse.js" :papaparse {:local "vendor/node_modules/papaparse/papaparse.js"
:remote "https://cdnjs.cloudflare.com/ajax/libs/PapaParse/5.1.0/papaparse.min.js"}} :remote "https://cdnjs.cloudflare.com/ajax/libs/PapaParse/5.1.0/papaparse.min.js"}
:showdown {:local "vendor/node_modules/showdown/bin/showdown.js"
:remote "https://cdnjs.cloudflare.com/ajax/libs/showdown/1.9.1/showdown.min.js"}}
:styles {:leaflet {:local "vendor/node_modules/leaflet/dist/leaflet.css" :styles {:leaflet {:local "vendor/node_modules/leaflet/dist/leaflet.css"
:remote "https://unpkg.com/leaflet@1.6.0/dist/leaflet.css"}} :remote "https://unpkg.com/leaflet@1.6.0/dist/leaflet.css"}}
:icon-url-base "map-pin/"} :icon-url-base "map-pin/"}

4
src/smeagol/extensions/geocsv.clj
View file

@ -21,7 +21,7 @@
;;;; ;;;;
;;;; You should have received a copy of the GNU General Public License ;;;; You should have received a copy of the GNU General Public License
;;;; along with this program; if not, write to the Free Software ;;;; along with this program; if not, write to the Free Software
;;;; Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, ;;;; Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
;;;; USA. ;;;; USA.
;;;; ;;;;
;;;; Copyright (C) 2017 Simon Brooke ;;;; Copyright (C) 2017 Simon Brooke
@ -48,7 +48,7 @@
GeoCSV.setIconUrlBase( \"" GeoCSV.setIconUrlBase( \""
(-> config :formatters :geocsv :icon-url-base) "\"); (-> config :formatters :geocsv :icon-url-base) "\");
GeoCSV.initialiseMapElement(\"geocsv-" index "\", GeoCSV.initialiseMapElement(\"geocsv-" index "\",
document.getElementById(\"geocsv-" index "\").innerText.trim()); // local-links here! document.getElementById(\"geocsv-" index "\").innerText.trim().replace(/\\[\\[([^\\[\\]]*)\\]\\]/, \"<a href='wiki?page=$1'>$1</a>\"));
}}; }};
//]] //]]
</script> </script>

16
src/smeagol/finder.clj
View file

@ -108,14 +108,14 @@
(response/file-response s) (response/file-response s)
s))) s)))
(find-image "froboz.jpg" "resources/public/img/Unknown-pin.png" ;; (find-image "froboz.jpg" "resources/public/img/Unknown-pin.png"
[;; TODO: should map over the configured ;; [;; TODO: should map over the configured
;; thumbnail paths in ascending order ;; ;; thumbnail paths in ascending order
;; by size - for map pins, smaller images are ;; ;; by size - for map pins, smaller images are
;; better. ;; ;; better.
(fs/file upload-dir "map-pin") ;; (fs/file upload-dir "map-pin")
(fs/file upload-dir "small") ;; (fs/file upload-dir "small")
(fs/file upload-dir "med")]) ;; (fs/file upload-dir "med")])

4
src/smeagol/util.clj
View file

@ -129,11 +129,11 @@
(do (do
(log/error (log/error
"In `smeagol.util/local-url `" file-path "` is not a servable resource.") "In `smeagol.util/local-url `" file-path "` is not a servable resource.")
(str "404-not-found?path=" file-path)))) file-path)))
(catch Exception any (catch Exception any
(log/error (log/error
"In `smeagol.util/local-url `" file-path "` is not a servable resource:" any) "In `smeagol.util/local-url `" file-path "` is not a servable resource:" any)
(str "404-not-found?path=" file-path)))) file-path)))
;; (local-url? "vendor/node_modules/photoswipe/dist/photoswipe.min.js") ;; (local-url? "vendor/node_modules/photoswipe/dist/photoswipe.min.js")
;; (local-url? "/home/simon/workspace/smeagol/resources/public/vendor/node_modules/photoswipe/dist/photoswipe.min.js") ;; (local-url? "/home/simon/workspace/smeagol/resources/public/vendor/node_modules/photoswipe/dist/photoswipe.min.js")