Trying to track down why we're seeing a version of the electors panel

which should no longer be there. Failing.

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

resources/templates/app.html

@@ -36,7 +36,7 @@
 <!-- ATTENTION \/ -->
 <!-- ATTENTION /\ -->
 <!-- Leaflet -->
-<link rel="stylesheet" href="js/lib/leaflet/dist/leaflet.css" />
+<link rel="stylesheet" href="js/lib/node_modules/leaflet/dist/leaflet.css" />
 {% 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" %}

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

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)))]]]))

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"))))

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")
+                    {:iconAnchor [16 41]
-                     :shadowUrl "img/map-pins/shadow_pin.png"
                      :iconSize [32 42]
+                     :iconUrl (str "img/map-pins/" (pin-image address) ".png")
+                     :riseOnHover true
+                     :shadowAnchor [16 23]
                      :shadowSize [57 24]
-                     :iconAnchor [16 41]
+                     :shadowUrl "img/map-pins/shadow_pin.png"}))
-                     :shadowAnchor [16 23]}))
         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!