Tidyup of unused database keys and subscription handlers
This commit is contained in:
parent
c6751c1d83
commit
5ded76199f
|
@ -6,11 +6,9 @@
|
||||||
[re-frame.core :as rf]))
|
[re-frame.core :as rf]))
|
||||||
|
|
||||||
(defn local-uri? [{:keys [uri]}]
|
(defn local-uri? [{:keys [uri]}]
|
||||||
(js/console.log (str "local-uri?: received `" (str uri) "` (type " (type uri) ") as uri"))
|
|
||||||
(not (re-find #"^\w+?://" (str uri))))
|
(not (re-find #"^\w+?://" (str uri))))
|
||||||
|
|
||||||
(defn default-headers [request]
|
(defn default-headers [request]
|
||||||
(js/console.log (str "default-headers: received `" request "` as request"))
|
|
||||||
(if (local-uri? request)
|
(if (local-uri? request)
|
||||||
(-> request
|
(-> request
|
||||||
(update :headers #(merge {"x-csrf-token" js/csrfToken} %)))
|
(update :headers #(merge {"x-csrf-token" js/csrfToken} %)))
|
||||||
|
|
|
@ -38,6 +38,4 @@
|
||||||
"Other-key-customers"
|
"Other-key-customers"
|
||||||
"Power-supplier"} ;; need to be fetched from server side
|
"Power-supplier"} ;; need to be fetched from server side
|
||||||
:latitude 56
|
:latitude 56
|
||||||
:longitude -4
|
:longitude -4})
|
||||||
:map {:map-centre [56 -4]
|
|
||||||
:map-zoom 6}})
|
|
||||||
|
|
|
@ -198,11 +198,6 @@
|
||||||
(js/console.log (str "Fetching longitude" v))
|
(js/console.log (str "Fetching longitude" v))
|
||||||
v)))
|
v)))
|
||||||
|
|
||||||
(rf/reg-sub
|
|
||||||
:map
|
|
||||||
(fn [db _]
|
|
||||||
(:map db)))
|
|
||||||
|
|
||||||
(rf/reg-sub
|
(rf/reg-sub
|
||||||
:route
|
:route
|
||||||
(fn [db _]
|
(fn [db _]
|
||||||
|
|
|
@ -83,7 +83,7 @@
|
||||||
(defn map-render
|
(defn map-render
|
||||||
"Render the actual div containing the map."
|
"Render the actual div containing the map."
|
||||||
[]
|
[]
|
||||||
[:div#map {:style {:height "1000px"}}])
|
[:div#map {:style {:height "800px"}}])
|
||||||
|
|
||||||
(defn panel
|
(defn panel
|
||||||
"A reagent class for the map object."
|
"A reagent class for the map object."
|
||||||
|
|
Loading…
Reference in a new issue