Trying to track down why we're seeing a version of the electors panel
which should no longer be there. Failing.
This commit is contained in:
parent
16af040537
commit
e19e01d9be
6 changed files with 21 additions and 15 deletions
|
|
@ -15,8 +15,10 @@
|
|||
[youyesyet.canvasser-app.ui-utils :as ui]
|
||||
[youyesyet.canvasser-app.views.about :as about]
|
||||
[youyesyet.canvasser-app.views.building :as building]
|
||||
[youyesyet.canvasser-app.views.elector :as elector]
|
||||
[youyesyet.canvasser-app.views.electors :as electors]
|
||||
[youyesyet.canvasser-app.views.followup :as followup]
|
||||
[youyesyet.canvasser-app.views.gdpr :as gdpr]
|
||||
[youyesyet.canvasser-app.views.issue :as issue]
|
||||
[youyesyet.canvasser-app.views.issues :as issues]
|
||||
[youyesyet.canvasser-app.views.map :as maps])
|
||||
|
|
@ -57,6 +59,9 @@
|
|||
(defn electors-page []
|
||||
(electors/panel))
|
||||
|
||||
(defn elector-page []
|
||||
(elector/panel))
|
||||
|
||||
(defn followup-page []
|
||||
(followup/panel))
|
||||
|
||||
|
|
@ -72,6 +77,7 @@
|
|||
(def pages
|
||||
{:about #'about-page
|
||||
:building #'building-page
|
||||
:elector #'elector-page
|
||||
:electors #'electors-page
|
||||
:followup #'followup-page
|
||||
:issues #'issues-page
|
||||
|
|
|
|||
|
|
@ -48,7 +48,7 @@
|
|||
[dwelling]
|
||||
(ui/big-link
|
||||
(:sub-address dwelling)
|
||||
:target (str "#/electors/" (:id dwelling))) )
|
||||
:target (str "#electors/" (:id dwelling))) )
|
||||
(sort
|
||||
#(< (:sub-address %1) (:sub-address %2))
|
||||
(:dwellings address)))]]]))
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
(ns ^{:doc "Canvasser app single elector panel."
|
||||
:author "Simon Brooke"}
|
||||
youyesyet.canvasser-app.views.electors
|
||||
youyesyet.canvasser-app.views.elector
|
||||
(:require [reagent.core :refer [atom]]
|
||||
[re-frame.core :refer [reg-sub subscribe dispatch]]
|
||||
[youyesyet.canvasser-app.ui-utils :as ui]))
|
||||
|
|
@ -99,6 +99,6 @@
|
|||
#(option-row elector %)
|
||||
options)
|
||||
;; issues row
|
||||
(issues-row elector)]]
|
||||
(issue-row elector)]]
|
||||
(ui/back-link)]]
|
||||
(ui/error-panel "No address selected"))))
|
||||
|
|
|
|||
|
|
@ -97,19 +97,21 @@
|
|||
lng (:longitude address)
|
||||
pin (.icon js/L
|
||||
(clj->js
|
||||
{:iconUrl (str "img/map-pins/" (pin-image address) ".png")
|
||||
:shadowUrl "img/map-pins/shadow_pin.png"
|
||||
{:iconAnchor [16 41]
|
||||
:iconSize [32 42]
|
||||
:iconUrl (str "img/map-pins/" (pin-image address) ".png")
|
||||
:riseOnHover true
|
||||
:shadowAnchor [16 23]
|
||||
:shadowSize [57 24]
|
||||
:iconAnchor [16 41]
|
||||
:shadowAnchor [16 23]}))
|
||||
:shadowUrl "img/map-pins/shadow_pin.png"}))
|
||||
marker (.marker js/L
|
||||
(.latLng js/L lat lng)
|
||||
(clj->js {:icon pin
|
||||
:title (:address address)}))
|
||||
]
|
||||
(.on marker "click" (fn [_] (map-pin-click-handler (str (:id address)))))
|
||||
(.addTo marker view)))
|
||||
|
||||
(.on (.addTo marker view) "click" (fn [_] (map-pin-click-handler (str (:id address)))))
|
||||
))
|
||||
|
||||
|
||||
;; My gods mapbox is user-hostile!
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue