Merge branch 'develop' into feature/36

src/cljs/youyesyet/core.cljs

@@ -71,11 +71,16 @@
    :map #'map-page
    })
 
-(defn page []
+(defn page
+  "Render the single page of the app, taking the current panel from
+  the :page key in the state map."
+  []
   [:div
-  [:header
-   [ui/navbar]]
-   [(pages @(rf/subscribe [:page]))]])
+   [:header
+    [ui/navbar]]
+   (let [content (pages @(rf/subscribe [:page]))]
+     (if content [content]
+       [:div.error (str "No content in page " :page)]))])
 
 ;; -------------------------
 ;; Routes

src/cljs/youyesyet/handlers.cljs

@@ -34,9 +34,10 @@
 
 
 (reg-event-db
-  :set-active-page
-  (fn [db [_ page]]
-    (assoc db :page page)))
+ :set-active-page
+ (fn [db [_ page]]
+   (if page
+     (assoc db :page page))))
 
 
 (reg-event-db