From e19e01d9be5e72c4e4707bac04e7427435c7f6b6 Mon Sep 17 00:00:00 2001 From: Simon Brooke Date: Mon, 2 Jul 2018 17:29:01 +0100 Subject: [PATCH] Trying to track down why we're seeing a version of the electors panel which should no longer be there. Failing. --- project.clj | 8 +++----- resources/templates/app.html | 2 +- src/cljs/youyesyet/canvasser_app/core.cljs | 6 ++++++ .../youyesyet/canvasser_app/views/building.cljs | 2 +- .../youyesyet/canvasser_app/views/elector.cljs | 4 ++-- src/cljs/youyesyet/canvasser_app/views/map.cljs | 14 ++++++++------ 6 files changed, 21 insertions(+), 15 deletions(-) diff --git a/project.clj b/project.clj index 2e6879b..702368e 100644 --- a/project.clj +++ b/project.clj @@ -77,7 +77,7 @@ :npm {:dependencies [[datatables.net "1.10.19"] [datatables.net-dt "1.10.19"] [jquery "3.3.1"] - [leaflet "1.3.1"] + [leaflet "0.7.3"] ;; old version works, new ["1.3.1"] doesn't [signature_pad "2.3.2"]] :root "resources/public/js/lib"} @@ -139,8 +139,7 @@ [lein-figwheel "0.5.9"] [org.clojure/clojurescript "1.9.495"]] :cljsbuild - {:prep-tasks [["npm" "install"]] - :builds + {:builds {:app {:source-paths ["src/cljs" "src/cljc" "env/dev/cljs"] :compiler @@ -159,8 +158,7 @@ (pjstadig.humane-test-output/activate!)]} :project/test {:resource-paths ["env/test/resources"] :cljsbuild - {:prep-tasks [["npm" "install"]] - :builds + {:builds {:test {:source-paths ["src/cljc" "src/cljs" "test/cljs"] :compiler diff --git a/resources/templates/app.html b/resources/templates/app.html index 4b14abe..3227f33 100644 --- a/resources/templates/app.html +++ b/resources/templates/app.html @@ -36,7 +36,7 @@ - + {% script "js/lib/node_modules/signature_pad/dist/signature_pad.min.js" %} {% script "js/lib/node_modules/leaflet/dist/leaflet.js" %} {% script "/js/app.js" %} diff --git a/src/cljs/youyesyet/canvasser_app/core.cljs b/src/cljs/youyesyet/canvasser_app/core.cljs index e492a35..f750122 100644 --- a/src/cljs/youyesyet/canvasser_app/core.cljs +++ b/src/cljs/youyesyet/canvasser_app/core.cljs @@ -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 diff --git a/src/cljs/youyesyet/canvasser_app/views/building.cljs b/src/cljs/youyesyet/canvasser_app/views/building.cljs index 47d9d8f..75ecc24 100644 --- a/src/cljs/youyesyet/canvasser_app/views/building.cljs +++ b/src/cljs/youyesyet/canvasser_app/views/building.cljs @@ -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)))]]])) diff --git a/src/cljs/youyesyet/canvasser_app/views/elector.cljs b/src/cljs/youyesyet/canvasser_app/views/elector.cljs index 0f94f1f..cdc3e0b 100644 --- a/src/cljs/youyesyet/canvasser_app/views/elector.cljs +++ b/src/cljs/youyesyet/canvasser_app/views/elector.cljs @@ -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")))) diff --git a/src/cljs/youyesyet/canvasser_app/views/map.cljs b/src/cljs/youyesyet/canvasser_app/views/map.cljs index c0163b2..e7a6c24 100644 --- a/src/cljs/youyesyet/canvasser_app/views/map.cljs +++ b/src/cljs/youyesyet/canvasser_app/views/map.cljs @@ -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!