simon/youyesyet
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Downgraded to Clojure 1.8; and, some minor refactoring

Browse source 
Clojure 1.9 was causing some problems for my tooling.
This commit is contained in:
Simon Brooke 2018-07-28 16:22:42 +01:00
parent 9433f8cc67
commit 3a8b3dbbfa
4 changed files with 21 additions and 44 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
project.clj
View file

@ -26,7 +26,7 @@
[metosin/ring-http-response "0.9.0"]
[migratus "1.0.8"]
[mount "0.1.12"]
[org.clojure/clojure "1.9.0"]
[org.clojure/clojure "1.8.0"]
[org.clojure/clojurescript "1.10.339" :scope "provided"]
[org.clojure/core.memoize "0.7.1"]
[org.clojure/tools.cli "0.3.7"]
@ -59,6 +59,7 @@
[lein-cljsbuild "1.1.7"]
[lein-codox "0.10.4"]
[lein-cprop "1.0.3"]
[lein-kibit "0.1.6"]
[lein-less "1.7.5"]
[lein-npm "0.6.2"]
[lein-release "1.1.3"]

13
src/clj/youyesyet/routes/rest.clj
View file

@ -82,14 +82,11 @@
`longitude`, or `locality`. Returns a block of data for that locality"
[request]
(let
[{latitude :latitude longitude :longitude locality :locality}
(keywordize-keys (:params request))
here (if locality
(coerce-to-number locality)
(l/locality
(coerce-to-number latitude)
(coerce-to-number longitude)))]
(in-get-local-data here)))
[m (massage-params request)
here (or (:locality m) (l/locality (:latitude m) (:longitude m)))]
(valid-user-or-forbid
(in-get-local-data here)
request)))
(defn last-visit-by-current-user

8
src/cljs/youyesyet/canvasser_app/handlers.cljs
View file

@ -264,11 +264,11 @@
(reg-event-db
;; TODO: should try again
:bad-options
(fn [db _]
(fn [db [_ response]]
(js/console.log "Failed to fetch options")
(assoc
(remove-from-feedback db :fetch-options)
:error (cons :fetch-options (:error db)))))
:error (:response response))))
(reg-event-fx
@ -303,11 +303,11 @@
(reg-event-db
;; TODO: should try again
:bad-issues
(fn [db _]
(fn [db [_ response]]
(js/console.log "Failed to fetch issues")
(assoc
(remove-from-feedback db :fetch-issues)
:error (cons :fetch-issues (:error db)))))
:error (:response response))))
(reg-event-db

41
youyesyet.adl.xml
View file

@ -72,7 +72,7 @@ version="0.1.1">
<key>
<property required="true" type="integer" name="id"
column="id" immutable="true" distinct="system">
<prompt prompt="id" locale="en_GB.UTF-8"/>
<generator action="native"/>
</property>
</key>
<property size="64" required="true" type="string" name="name"
@ -107,9 +107,6 @@ version="0.1.1">
</field>
</list>
<form properties="listed" name="Elector">
<field property="id">
<prompt prompt="id" locale="en_GB.UTF-8"/>
</field>
<field property="name">
<prompt prompt="Name" locale="en_GB.UTF-8"/>
</field>
@ -174,7 +171,7 @@ version="0.1.1">
<key>
<property required="true" type="integer" name="id"
column="id" immutable="true" distinct="system">
<prompt prompt="id" locale="en_GB.UTF-8"/>
<generator action="native"/>
</property>
</key>
<property required="true" type="entity" name="address_id"
@ -221,7 +218,7 @@ version="0.1.1">
<key>
<property required="true" type="integer" name="id"
column="id" immutable="true" distinct="system">
<prompt prompt="id" locale="en_GB.UTF-8"/>
<generator action="native"/>
</property>
</key>
<property required="true" type="string" name="address"
@ -257,6 +254,7 @@ version="0.1.1">
don't think it will ever appear in the user interface; it's
an implementation detail, not of interest to
users.</documentation>
<generator action="native"/>
</property>
<list properties="listed" name="Addresses">
<field property="address">
@ -270,9 +268,6 @@ version="0.1.1">
</field>
</list>
<form properties="listed" name="Address">
<field property="id">
<prompt prompt="id" locale="en_GB.UTF-8"/>
</field>
<field property="address">
<prompt prompt="Address" locale="en_GB.UTF-8"/>
</field>
@ -312,7 +307,7 @@ version="0.1.1">
<key>
<property required="true" type="integer" name="id"
column="id" distinct="system">
<prompt prompt="id" locale="en_GB.UTF-8"/>
<generator action="native"/>
</property>
</key>
<!-- TODO: should visit be keyed against dwelling rather than address? -->
@ -350,9 +345,6 @@ version="0.1.1">
</field>
</list>
<form properties="listed" name="Visit">
<field property="id">
<prompt prompt="id" locale="en_GB.UTF-8"/>
</field>
<field property="address_id">
<prompt prompt="Address" locale="en_GB.UTF-8"/>
</field>
@ -381,7 +373,6 @@ version="0.1.1">
<key>
<property required="true" type="string" name="id" column="id"
size="32" distinct="all" immutable="true">
<prompt prompt="id" locale="en_GB.UTF-8"/>
</property>
</key>
<property name="request-token-uri" type="string" size="256"
@ -556,7 +547,7 @@ version="0.1.1">
<key>
<property type="integer" name="id" column="id"
distinct="system" immutable="true">
<prompt prompt="id" locale="en_GB.UTF-8"/>
<generator action="native"/>
</property>
</key>
<property required="true" type="string" name="username"
@ -633,9 +624,6 @@ version="0.1.1">
</field>
</list>
<form properties="listed" name="Canvasser">
<field property="id">
<prompt prompt="id" locale="en_GB.UTF-8"/>
</field>
<field property="username">
<prompt prompt="username" locale="en_GB.UTF-8"/>
</field>
@ -684,7 +672,7 @@ version="0.1.1">
<key>
<property required="true" type="integer" name="id"
column="id" distinct="system" immutable="true">
<prompt prompt="id" locale="en_GB.UTF-8"/>
<generator action="native"/>
</property>
</key>
<property required="true" type="entity" name="elector_id"
@ -724,9 +712,6 @@ version="0.1.1">
</field>
</list>
<form properties="listed" name="Followuprequest">
<field property="id">
<prompt prompt="id" locale="en_GB.UTF-8"/>
</field>
<field property="elector_id">
<prompt prompt="elector_id" locale="en_GB.UTF-8"/>
</field>
@ -793,7 +778,7 @@ version="0.1.1">
<key>
<property type="integer" name="id" column="id"
distinct="system" immutable="true">
<prompt prompt="id" locale="en_GB.UTF-8"/>
<generator action="native"/>
</property>
</key>
<property required="true" type="string" name="name"
@ -835,9 +820,6 @@ version="0.1.1">
</field>
</list>
<form properties="listed" name="Team">
<field property="id">
<prompt prompt="id" locale="en_GB.UTF-8"/>
</field>
<field property="name">
<prompt prompt="name" locale="en_GB.UTF-8"/>
</field>
@ -938,7 +920,7 @@ version="0.1.1">
<key>
<property required="true" type="integer" name="id"
column="id" immutable="true" distinct="system">
<prompt prompt="id" locale="en_GB.UTF-8"/>
<generator action="native"/>
</property>
</key>
<property required="true" type="string" name="name"
@ -972,7 +954,7 @@ version="0.1.1">
<key>
<property required="true" type="integer" name="id"
column="id" distinct="system" immutable="true">
<prompt prompt="id" locale="en_GB.UTF-8"/>
<generator action="native"/>
</property>
</key>
<property required="true" type="entity" name="request_id"
@ -1010,9 +992,6 @@ version="0.1.1">
</field>
</list>
<form properties="listed" name="Followupaction">
<field property="id">
<prompt prompt="id" locale="en_GB.UTF-8"/>
</field>
<field property="request_id">
<prompt prompt="request_id" locale="en_GB.UTF-8"/>
</field>