♻️ Refactor main app component.

This commit is contained in:
Andrey Antukh 2019-08-21 21:03:29 +00:00
parent ccc6eaf4b0
commit cf7664d446
2 changed files with 31 additions and 35 deletions

View file

@ -69,7 +69,7 @@
(when (:auth storage) (when (:auth storage)
(st/emit! (udu/fetch-profile))) (st/emit! (udu/fetch-profile)))
(mf/mount (ui/app) (dom/get-element "app")) (mf/mount (mf/element ui/app) (dom/get-element "app"))
(mf/mount (lightbox) (dom/get-element "lightbox")) (mf/mount (lightbox) (dom/get-element "lightbox"))
(mf/mount (mf/element modal) (dom/get-element "modal")) (mf/mount (mf/element modal) (dom/get-element "modal"))
(mf/mount (loader) (dom/get-element "loader")) (mf/mount (loader) (dom/get-element "loader"))

View file

@ -11,7 +11,6 @@
[cuerdas.core :as str] [cuerdas.core :as str]
[lentes.core :as l] [lentes.core :as l]
[potok.core :as ptk] [potok.core :as ptk]
[rumext.core :as mx]
[rumext.alpha :as mf] [rumext.alpha :as mf]
[uxbox.builtins.icons :as i] [uxbox.builtins.icons :as i]
[uxbox.main.data.auth :refer [logout]] [uxbox.main.data.auth :refer [logout]]
@ -81,16 +80,13 @@
;; --- Main App (Component) ;; --- Main App (Component)
(mf/def app (def route-iref
:mixins [mx/reactive] (-> (l/key :route)
(l/derive st/state)))
:init (mf/defc app
(fn [own props] [props]
(assoc own ::route-ref (l/derive (l/key :route) st/state))) (let [route (mf/deref route-iref)
:render
(fn [own props]
(let [route (mx/react (::route-ref own))
route-id (get-in route [:data :name])] route-id (get-in route [:data :name])]
(case route-id (case route-id
:auth/login (mf/element auth/login-page) :auth/login (mf/element auth/login-page)
@ -119,5 +115,5 @@
:page-id page-id :page-id page-id
:key page-id}]) :key page-id}])
nil nil)))
))))