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

Merge branch 'feature/37' into develop

Browse source
This commit is contained in:
Simon Brooke 2017-03-29 06:40:19 +01:00
parent 92ad75da92 72b4f058ed
commit c1b9e97849
2 changed files with 13 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
src/cljs/youyesyet/core.cljs
View file

@ -71,11 +71,16 @@
:map #'map-page :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 [:div
[:header [:header
[ui/navbar]] [ui/navbar]]
[(pages @(rf/subscribe [:page]))]]) (let [content (pages @(rf/subscribe [:page]))]
(if content [content]
[:div.error (str "No content in page " :page)]))])
;; ------------------------- ;; -------------------------
;; Routes ;; Routes

7
src/cljs/youyesyet/handlers.cljs
View file

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