#47, #48, #49, #50: MY MONSTER IT LIVES

Most of the forms of the admin user interface render and sort-of work. It needs polish - but it's a huge leap forward!

src/clj/youyesyet/handler.clj

@@ -6,7 +6,8 @@
             [youyesyet.routes.authenticated :refer [authenticated-routes]]
             [youyesyet.routes.home :refer [home-routes]]
             [youyesyet.routes.oauth :refer [oauth-routes]]
-            [youyesyet.routes.auto-json-routes :refer [auto-rest-routes]]
+            [youyesyet.routes.auto-json :refer [auto-rest-routes]]
+            [youyesyet.routes.auto :refer [auto-selmer-routes]]
             [compojure.route :as route]
             [youyesyet.env :refer [defaults]]
             [mount.core :as mount]
@@ -67,6 +68,9 @@
     (-> #'auto-rest-routes
         (wrap-routes middleware/wrap-csrf)
         (wrap-routes middleware/wrap-formats))
+    (-> #'auto-selmer-routes
+        (wrap-routes middleware/wrap-csrf)
+        (wrap-routes middleware/wrap-formats))
     #'oauth-routes
     #'authenticated-routes
     (route/not-found
@@ -75,5 +79,5 @@
                      :title "page not found"})))))
 
 
-(def app #'app-routes)
-  ;;(middleware/wrap-base #'app-routes))
+(def app ;; #'app-routes)
+  (middleware/wrap-base #'app-routes))

src/clj/youyesyet/routes/auto.clj

@@ -1,6 +1,6 @@
 (ns
  youyesyet.routes.auto
- "User interface routes for Youyesyet auto-generated by [Application Description Language framework](https://github.com/simon-brooke/adl) at 20180610T214425.631Z"
+ "User interface routes for Youyesyet auto-generated by [Application Description Language framework](https://github.com/simon-brooke/adl) at 20180611T180322.460Z"
  (:require
   [noir.response :as nresponse]
   [noir.util.route :as route]
@@ -8,6 +8,7 @@
   [ring.util.http-response :as response]
   [clojure.java.io :as io]
   [hugsql.core :as hugsql]
+  [youyesyet.layout :as l]
   [youyesyet.db.core :as db]
   [youyesyet.routes.manual :as m]))
 
@@ -19,13 +20,13 @@
   n
   (str "auto/" n)))
 
-(def resolve-template (memoise raw-resolve-template))
+(def resolve-template (memoize raw-resolve-template))
 
 (defn
  index
  [r]
- (layout/render
-  (resolve-template "application-index")
+ (l/render
+  (resolve-template "application-index.html")
   {:title "Administrative menu"}))
 
 (defn
@@ -33,16 +34,18 @@
  [r]
  (let
   [p (:form-params r)]
-  (layout/render
+  (l/render
    (resolve-template "list-electors-Electors.html")
-   {:title "Electors", :params p, :records (db/search-elector p)})))
+   {:title "Electors",
+    :params p,
+    :records (db/search-strings-elector p)})))
 
 (defn
  form-electors-Elector
  [r]
  (let
   [p (:form-params r)]
-  (layout/render
+  (l/render
    (resolve-template "form-electors-Elector.html")
    {:title "Elector", :params p, :record (db/get-elector p)})))
 
@@ -51,16 +54,18 @@
  [r]
  (let
   [p (:form-params r)]
-  (layout/render
+  (l/render
    (resolve-template "list-genders-Genders.html")
-   {:title "Genders", :params p, :records (db/search-gender p)})))
+   {:title "Genders",
+    :params p,
+    :records (db/search-strings-gender p)})))
 
 (defn
  form-genders-Gender
  [r]
  (let
   [p (:form-params r)]
-  (layout/render
+  (l/render
    (resolve-template "form-genders-Gender.html")
    {:title "Gender", :params p, :record (db/get-gender p)})))
 
@@ -69,16 +74,18 @@
  [r]
  (let
   [p (:form-params r)]
-  (layout/render
+  (l/render
    (resolve-template "list-dwellings-Dwellings.html")
-   {:title "Dwellings", :params p, :records (db/search-dwelling p)})))
+   {:title "Dwellings",
+    :params p,
+    :records (db/search-strings-dwelling p)})))
 
 (defn
  form-dwellings-Dwelling
  [r]
  (let
   [p (:form-params r)]
-  (layout/render
+  (l/render
    (resolve-template "form-dwellings-Dwelling.html")
    {:title "Dwelling", :params p, :record (db/get-dwelling p)})))
 
@@ -87,16 +94,18 @@
  [r]
  (let
   [p (:form-params r)]
-  (layout/render
+  (l/render
    (resolve-template "list-addresses-Addresses.html")
-   {:title "Addresses", :params p, :records (db/search-address p)})))
+   {:title "Addresses",
+    :params p,
+    :records (db/search-strings-address p)})))
 
 (defn
  form-addresses-Address
  [r]
  (let
   [p (:form-params r)]
-  (layout/render
+  (l/render
    (resolve-template "form-addresses-Address.html")
    {:title "Address", :params p, :record (db/get-address p)})))
 
@@ -105,16 +114,16 @@
  [r]
  (let
   [p (:form-params r)]
-  (layout/render
+  (l/render
    (resolve-template "list-visits-Visits.html")
-   {:title "Visits", :params p, :records (db/search-visit p)})))
+   {:title "Visits", :params p, :records (db/search-strings-visit p)})))
 
 (defn
  form-visits-Visit
  [r]
  (let
   [p (:form-params r)]
-  (layout/render
+  (l/render
    (resolve-template "form-visits-Visit.html")
    {:title "Visit", :params p, :record (db/get-visit p)})))
 
@@ -123,18 +132,18 @@
  [r]
  (let
   [p (:form-params r)]
-  (layout/render
+  (l/render
    (resolve-template "list-authorities-Authorities.html")
    {:title "Authorities",
     :params p,
-    :records (db/search-authority p)})))
+    :records (db/search-strings-authority p)})))
 
 (defn
  form-authorities-Authority
  [r]
  (let
   [p (:form-params r)]
-  (layout/render
+  (l/render
    (resolve-template "form-authorities-Authority.html")
    {:title "Authority", :params p, :record (db/get-authority p)})))
 
@@ -143,16 +152,16 @@
  [r]
  (let
   [p (:form-params r)]
-  (layout/render
+  (l/render
    (resolve-template "list-issues-Issues.html")
-   {:title "Issues", :params p, :records (db/search-issue p)})))
+   {:title "Issues", :params p, :records (db/search-strings-issue p)})))
 
 (defn
  form-issues-Issue
  [r]
  (let
   [p (:form-params r)]
-  (layout/render
+  (l/render
    (resolve-template "form-issues-Issue.html")
    {:title "Issue", :params p, :record (db/get-issue p)})))
 
@@ -161,16 +170,18 @@
  [r]
  (let
   [p (:form-params r)]
-  (layout/render
+  (l/render
    (resolve-template "list-intentions-Intentions.html")
-   {:title "Intentions", :params p, :records (db/search-intention p)})))
+   {:title "Intentions",
+    :params p,
+    :records (db/search-strings-intention p)})))
 
 (defn
  form-intentions-Intention
  [r]
  (let
   [p (:form-params r)]
-  (layout/render
+  (l/render
    (resolve-template "form-intentions-Intention.html")
    {:title "Intention", :params p, :record (db/get-intention p)})))
 
@@ -179,16 +190,18 @@
  [r]
  (let
   [p (:form-params r)]
-  (layout/render
+  (l/render
    (resolve-template "list-canvassers-Canvassers.html")
-   {:title "Canvassers", :params p, :records (db/search-canvasser p)})))
+   {:title "Canvassers",
+    :params p,
+    :records (db/search-strings-canvasser p)})))
 
 (defn
  form-canvassers-Canvasser
  [r]
  (let
   [p (:form-params r)]
-  (layout/render
+  (l/render
    (resolve-template "form-canvassers-Canvasser.html")
    {:title "Canvasser", :params p, :record (db/get-canvasser p)})))
 
@@ -197,18 +210,18 @@
  [r]
  (let
   [p (:form-params r)]
-  (layout/render
+  (l/render
    (resolve-template "list-followuprequests-Followuprequests.html")
    {:title "Followuprequests",
     :params p,
-    :records (db/search-followuprequest p)})))
+    :records (db/search-strings-followuprequest p)})))
 
 (defn
  form-followuprequests-Followuprequest
  [r]
  (let
   [p (:form-params r)]
-  (layout/render
+  (l/render
    (resolve-template "form-followuprequests-Followuprequest.html")
    {:title "Followuprequest",
     :params p,
@@ -219,16 +232,16 @@
  [r]
  (let
   [p (:form-params r)]
-  (layout/render
+  (l/render
    (resolve-template "list-roles-Roles.html")
-   {:title "Roles", :params p, :records (db/search-role p)})))
+   {:title "Roles", :params p, :records (db/search-strings-role p)})))
 
 (defn
  form-roles-Role
  [r]
  (let
   [p (:form-params r)]
-  (layout/render
+  (l/render
    (resolve-template "form-roles-Role.html")
    {:title "Role", :params p, :record (db/get-role p)})))
 
@@ -237,16 +250,16 @@
  [r]
  (let
   [p (:form-params r)]
-  (layout/render
+  (l/render
    (resolve-template "list-teams-Teams.html")
-   {:title "Teams", :params p, :records (db/search-team p)})))
+   {:title "Teams", :params p, :records (db/search-strings-team p)})))
 
 (defn
  form-teams-Team
  [r]
  (let
   [p (:form-params r)]
-  (layout/render
+  (l/render
    (resolve-template "form-teams-Team.html")
    {:title "Team", :params p, :record (db/get-team p)})))
 
@@ -255,16 +268,18 @@
  [r]
  (let
   [p (:form-params r)]
-  (layout/render
+  (l/render
    (resolve-template "list-districts-Districts.html")
-   {:title "Districts", :params p, :records (db/search-district p)})))
+   {:title "Districts",
+    :params p,
+    :records (db/search-strings-district p)})))
 
 (defn
  form-districts-District
  [r]
  (let
   [p (:form-params r)]
-  (layout/render
+  (l/render
    (resolve-template "form-districts-District.html")
    {:title "District", :params p, :record (db/get-district p)})))
 
@@ -273,18 +288,18 @@
  [r]
  (let
   [p (:form-params r)]
-  (layout/render
+  (l/render
    (resolve-template "list-followupactions-Followupactions.html")
    {:title "Followupactions",
     :params p,
-    :records (db/search-followupaction p)})))
+    :records (db/search-strings-followupaction p)})))
 
 (defn
  form-followupactions-Followupaction
  [r]
  (let
   [p (:form-params r)]
-  (layout/render
+  (l/render
    (resolve-template "form-followupactions-Followupaction.html")
    {:title "Followupaction",
     :params p,
@@ -295,16 +310,18 @@
  [r]
  (let
   [p (:form-params r)]
-  (layout/render
+  (l/render
    (resolve-template "list-options-Options.html")
-   {:title "Options", :params p, :records (db/search-option p)})))
+   {:title "Options",
+    :params p,
+    :records (db/search-strings-option p)})))
 
 (defn
  form-options-Option
  [r]
  (let
   [p (:form-params r)]
-  (layout/render
+  (l/render
    (resolve-template "form-options-Option.html")
    {:title "Option", :params p, :record (db/get-option p)})))
 
@@ -313,18 +330,18 @@
  [r]
  (let
   [p (:form-params r)]
-  (layout/render
+  (l/render
    (resolve-template "list-followupmethods-Followupmethods.html")
    {:title "Followupmethods",
     :params p,
-    :records (db/search-followupmethod p)})))
+    :records (db/search-strings-followupmethod p)})))
 
 (defn
  form-followupmethods-Followupmethod
  [r]
  (let
   [p (:form-params r)]
-  (layout/render
+  (l/render
    (resolve-template "form-followupmethods-Followupmethod.html")
    {:title "Followupmethod",
     :params p,
@@ -334,14 +351,21 @@
  raw-resolve-handler
  "Prefer the manually-written version of the handler with name `n`, if it exists, to the automatically generated one"
  [n]
- (let
-  [s (symbol (str "m." n))]
-  (if (bound? s) (eval s) (eval (symbol n)))))
+ (try
+  (eval (symbol (str "youyesyet" ".routes.manual/" n)))
+  (catch
+   Exception
+   _
+   (eval (symbol (str "youyesyet" ".routes.auto/" n))))))
 
 (def resolve-handler (memoize raw-resolve-handler))
 
 (defroutes
  auto-selmer-routes
+ (GET
+  "/index"
+  request
+  (route/restricted (apply (resolve-handler "index") (list request))))
  (GET
   "/form-addresses-Address"
   request

src/clj/youyesyet/routes/manual.clj

@@ -1,5 +1,5 @@
 (ns
- youyesyet.routes.auto
+ youyesyet.routes.manual
  "Manual overrides for auto-generated routes"
  (:require
   [noir.response :as nresponse]