From 632fccec5dba2df6817a62938986771100fe437c Mon Sep 17 00:00:00 2001 From: Andrey Antukh Date: Thu, 22 Sep 2016 22:26:10 +0300 Subject: [PATCH] Cosmetic improvement to app main component. --- src/uxbox/main/ui.cljs | 32 ++++++++++++-------------------- 1 file changed, 12 insertions(+), 20 deletions(-) diff --git a/src/uxbox/main/ui.cljs b/src/uxbox/main/ui.cljs index 9bc97129b..9761f9ea4 100644 --- a/src/uxbox/main/ui.cljs +++ b/src/uxbox/main/ui.cljs @@ -74,8 +74,16 @@ ;; --- Main App (Component) -(defn app-render +(defn app-will-mount [own] + (when @st/auth-ref + (rs/emit! (udu/fetch-profile))) + own) + +(mx/defc app + {:will-mount app-will-mount + :mixins [mx/reactive]} + [] (let [route (mx/react route-ref) auth (mx/react st/auth-ref) location (:id route) @@ -101,19 +109,6 @@ nil )))) -(defn app-will-mount - [own] - (when @st/auth-ref - (rs/emit! (udu/fetch-profile))) - own) - -(def app - (mx/component - {:render app-render - :will-mount app-will-mount - :mixins [mx/reactive] - :name "app"})) - ;; --- Routes (def routes @@ -137,9 +132,6 @@ (defn init [] - (let [app-dom (gdom/getElement "app") - lightbox-dom (gdom/getElement "lightbox") - loader-dom (gdom/getElement "loader")] - (rum/mount (app) app-dom) - (rum/mount (lightbox) lightbox-dom) - (rum/mount (loader) loader-dom))) + (mx/mount (app) (dom/get-element "app")) + (mx/mount (lightbox) (dom/get-element "lightbox")) + (mx/mount (loader) (dom/get-element "loader")))