Minor presentational cleanup.
This commit is contained in:
parent
f27106a996
commit
1c2c8bc238
|
|
@ -2,6 +2,8 @@
|
|||
|
||||
A wee tool to show comma-separated value data on a map.
|
||||
|
||||
[](https://clojars.org/geocsv)
|
||||
|
||||
The CSV file must have
|
||||
|
||||
* column names in the first row;
|
||||
|
|
@ -48,11 +50,11 @@ Nothing, of course, stops you from specifying multiple arguments in the query pa
|
|||
|
||||
## Not yet working
|
||||
|
||||
GeoCSV is at an early stage of development, and some features are not yet working.
|
||||
**geocsv** is at an early stage of development, and some features are not yet working.
|
||||
|
||||
### Missing map pin images
|
||||
|
||||
At the current stage of development, if no appropriate image exists in the `resources/public/img/map-pins` folder, that's your problem. **TODO:** I intend at some point to make missing pin images default to `unknown-pin.png`, which does exist.
|
||||
At the current stage of development, if no appropriate image exists in the `resources/public/img/map-pins` folder, that's your problem. See [issue #4](https://github.com/simon-brooke/geocsv/issues/4). If you fancy adding some more, I'll happily accept a pull request.
|
||||
|
||||
## Prerequisites
|
||||
|
||||
|
|
|
|||
|
|
@ -2,6 +2,8 @@
|
|||
|
||||
A wee tool to show comma-separated value data on a map.
|
||||
|
||||
[](https://clojars.org/geocsv)
|
||||
|
||||
The CSV file must have
|
||||
|
||||
* column names in the first row;
|
||||
|
|
@ -48,11 +50,11 @@ Nothing, of course, stops you from specifying multiple arguments in the query pa
|
|||
|
||||
## Not yet working
|
||||
|
||||
GeoCSV is at an early stage of development, and some features are not yet working.
|
||||
**geocsv** is at an early stage of development, and some features are not yet working.
|
||||
|
||||
### Missing map pin images
|
||||
|
||||
At the current stage of development, if no appropriate image exists in the `resources/public/img/map-pins` folder, that's your problem. **TODO:** I intend at some point to make missing pin images default to `unknown-pin.png`, which does exist.
|
||||
At the current stage of development, if no appropriate image exists in the `resources/public/img/map-pins` folder, that's your problem. See [issue #4](https://github.com/simon-brooke/geocsv/issues/4). If you fancy adding some more, I'll happily accept a pull request.
|
||||
|
||||
## Prerequisites
|
||||
|
||||
|
|
|
|||
|
|
@ -1,9 +1,9 @@
|
|||
<!DOCTYPE html>
|
||||
<html>
|
||||
<head>
|
||||
<meta charset="UTF-8"/>
|
||||
<meta name="viewport" content="width=device-width, initial-scale=1">
|
||||
<title>Welcome to geocsv</title>
|
||||
<meta charset="UTF-8"/>
|
||||
<meta name="viewport" content="width=device-width, initial-scale=1">
|
||||
<title>Welcome to geocsv</title>
|
||||
</head>
|
||||
<body>
|
||||
|
||||
|
|
@ -12,17 +12,26 @@
|
|||
<div class="container is-fluid">
|
||||
<div class="content">
|
||||
<h4 class="title">Welcome to geocsv</h4>
|
||||
<p>If you're seeing this message, that means you haven't yet compiled your ClojureScript!</p>
|
||||
<p>Please run <code>lein figwheel</code> to start the ClojureScript compiler and reload the page.</p>
|
||||
<h4>For better ClojureScript development experience in Chrome follow these steps:</h4>
|
||||
<ul>
|
||||
<li>Open DevTools
|
||||
<li>Go to Settings ("three dots" icon in the upper right corner of DevTools > Menu > Settings F1 > General > Console)
|
||||
<li>Check-in "Enable custom formatters"
|
||||
<li>Close DevTools
|
||||
<li>Open DevTools
|
||||
</ul>
|
||||
<p>See <a href="http://www.luminusweb.net/docs/clojurescript.md">ClojureScript</a> documentation for further details.</p>
|
||||
<div class="splash-screen">
|
||||
<div class="sk-fading-circle">
|
||||
<div class="sk-circle1 sk-circle"></div>
|
||||
<div class="sk-circle2 sk-circle"></div>
|
||||
<div class="sk-circle3 sk-circle"></div>
|
||||
<div class="sk-circle4 sk-circle"></div>
|
||||
<div class="sk-circle5 sk-circle"></div>
|
||||
<div class="sk-circle6 sk-circle"></div>
|
||||
<div class="sk-circle7 sk-circle"></div>
|
||||
<div class="sk-circle8 sk-circle"></div>
|
||||
<div class="sk-circle9 sk-circle"></div>
|
||||
<div class="sk-circle10 sk-circle"></div>
|
||||
<div class="sk-circle11 sk-circle"></div>
|
||||
<div class="sk-circle12 sk-circle"></div>
|
||||
</div>
|
||||
</div>
|
||||
<p class="footer">
|
||||
You Yes Yet is loading.
|
||||
You must enable JavaScript to use the <b>geocsv</b> app.
|
||||
</p>
|
||||
</div>
|
||||
</div>
|
||||
</section>
|
||||
|
|
@ -33,6 +42,7 @@
|
|||
<footer>
|
||||
<div id="credits">
|
||||
<div>
|
||||
{% if version %}Version {{version}} ||{% endif %}
|
||||
<img height="16" width="16" alt="Luminus" src="{{servlet-context}}/img/credits/luminus-logo.png"/>Built with <a href="http://www.luminusweb.net/">LuminusWeb</a> ||
|
||||
<img height="16" width="16" alt="Clojure" src="{{servlet-context}}/img/credits/clojure-icon.gif"/> Powered by <a href="http://clojure.org">Clojure</a> ||
|
||||
<img height="16" width="16" alt="GitHub" src="{{servlet-context}}/img/credits/github-logo-transparent.png"/>Find me/fork me on <a href="https://github.com/simon-brooke/geocsv">Github</a> ||
|
||||
|
|
@ -47,9 +57,10 @@
|
|||
{% style "/assets/material-icons/css/material-icons.min.css" %}
|
||||
{% style "/css/screen.css" %}
|
||||
{% style "/css/geocsv.css" %}
|
||||
{% style "/css/spinner.css" %}
|
||||
|
||||
<script type="text/javascript">
|
||||
var csrfToken = "{{csrf-token}}";
|
||||
var csrfToken = "{{csrf-token}}";
|
||||
</script>
|
||||
<!-- scripts and styles -->
|
||||
<!-- ATTENTION \/ -->
|
||||
|
|
|
|||
Binary file not shown.
|
Before Width: | Height: | Size: 1.1 KiB After Width: | Height: | Size: 3.8 KiB |
BIN
resources/public/favicon.xcf
Normal file
BIN
resources/public/favicon.xcf
Normal file
Binary file not shown.
Binary file not shown.
|
Before Width: | Height: | Size: 333 B After Width: | Height: | Size: 1.8 KiB |
|
|
@ -16,10 +16,10 @@
|
|||
height="317.00851"
|
||||
id="svg2"
|
||||
sodipodi:version="0.32"
|
||||
inkscape:version="0.91 r13725"
|
||||
inkscape:version="0.92.3 (2405546, 2018-03-11)"
|
||||
sodipodi:docname="basic_map_pin.svg"
|
||||
inkscape:output_extension="org.inkscape.output.svg.inkscape"
|
||||
inkscape:export-filename="/home/simon/workspace/youyesyet/resources/public/img/map-pins/basic_map_pin.png"
|
||||
inkscape:export-filename="/home/simon/workspace/geocsv/resources/public/img/map-pins/basic_map_pin.png"
|
||||
inkscape:export-xdpi="11.98"
|
||||
inkscape:export-ydpi="11.98"
|
||||
version="1.1">
|
||||
|
|
@ -70,13 +70,13 @@
|
|||
inkscape:pageopacity="0.0"
|
||||
inkscape:pageshadow="2"
|
||||
inkscape:zoom="0.98994949"
|
||||
inkscape:cx="-144.01361"
|
||||
inkscape:cy="86.04423"
|
||||
inkscape:cx="-560.19646"
|
||||
inkscape:cy="82.00362"
|
||||
inkscape:document-units="px"
|
||||
inkscape:current-layer="layer1"
|
||||
showgrid="true"
|
||||
inkscape:window-width="1920"
|
||||
inkscape:window-height="1031"
|
||||
inkscape:window-height="1016"
|
||||
inkscape:window-x="0"
|
||||
inkscape:window-y="27"
|
||||
fit-margin-top="0"
|
||||
|
|
|
|||
|
Before Width: | Height: | Size: 5.1 KiB After Width: | Height: | Size: 5.1 KiB |
|
|
@ -1,40 +0,0 @@
|
|||
(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))
|
||||
|
|
@ -22,6 +22,7 @@
|
|||
template
|
||||
(assoc params
|
||||
:page template
|
||||
:version (System/getProperty "geocsv.version")
|
||||
:csrf-token *anti-forgery-token*)))
|
||||
"text/html; charset=utf-8"))
|
||||
|
||||
|
|
|
|||
|
|
@ -27,8 +27,7 @@
|
|||
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
|
||||
|
||||
(def default-db
|
||||
{:page :home
|
||||
:available-pin-images #{"Planning-authority"
|
||||
{:available-pin-images #{"Planning-authority"
|
||||
"Landowner"
|
||||
"Unknown"
|
||||
"Anchor-customer"
|
||||
|
|
@ -38,4 +37,6 @@
|
|||
"Other-key-customers"
|
||||
"Power-supplier"} ;; need to be fetched from server side
|
||||
:latitude 56
|
||||
:longitude -4})
|
||||
:longitude -4
|
||||
:page :home
|
||||
:zoom 1})
|
||||
|
|
|
|||
Loading…
Reference in a new issue