From cf7664d446a01fee1f04d6d7e6d1a1bccacbeb29 Mon Sep 17 00:00:00 2001
From: Andrey Antukh <niwi@niwi.nz>
Date: Wed, 21 Aug 2019 21:03:29 +0000
Subject: [PATCH] :recycle: Refactor main app component.

---
 frontend/src/uxbox/main.cljs    |  2 +-
 frontend/src/uxbox/main/ui.cljs | 64 ++++++++++++++++-----------------
 2 files changed, 31 insertions(+), 35 deletions(-)

diff --git a/frontend/src/uxbox/main.cljs b/frontend/src/uxbox/main.cljs
index b9bdb3ba0..d43526c91 100644
--- a/frontend/src/uxbox/main.cljs
+++ b/frontend/src/uxbox/main.cljs
@@ -69,7 +69,7 @@
     (when (:auth storage)
       (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 (mf/element modal) (dom/get-element "modal"))
     (mf/mount (loader) (dom/get-element "loader"))
diff --git a/frontend/src/uxbox/main/ui.cljs b/frontend/src/uxbox/main/ui.cljs
index 9e288c09d..a5e2b949a 100644
--- a/frontend/src/uxbox/main/ui.cljs
+++ b/frontend/src/uxbox/main/ui.cljs
@@ -11,7 +11,6 @@
    [cuerdas.core :as str]
    [lentes.core :as l]
    [potok.core :as ptk]
-   [rumext.core :as mx]
    [rumext.alpha :as mf]
    [uxbox.builtins.icons :as i]
    [uxbox.main.data.auth :refer [logout]]
@@ -81,43 +80,40 @@
 
 ;; --- Main App (Component)
 
-(mf/def app
-  :mixins [mx/reactive]
+(def route-iref
+  (-> (l/key :route)
+      (l/derive st/state)))
 
-  :init
-  (fn [own props]
-    (assoc own ::route-ref (l/derive (l/key :route) st/state)))
+(mf/defc app
+  [props]
+  (let [route (mf/deref route-iref)
+        route-id (get-in route [:data :name])]
+    (case route-id
+      :auth/login (mf/element auth/login-page)
+      :auth/register (auth/register-page)
+      :auth/recovery-request (auth/recovery-request-page)
 
-  :render
-  (fn [own props]
-    (let [route (mx/react (::route-ref own))
-          route-id (get-in route [:data :name])]
-      (case route-id
-        :auth/login (mf/element auth/login-page)
-        :auth/register (auth/register-page)
-        :auth/recovery-request (auth/recovery-request-page)
+      :auth/recovery
+      (let [token (get-in route [:params :path :token])]
+        (auth/recovery-page token))
 
-        :auth/recovery
-        (let [token (get-in route [:params :path :token])]
-          (auth/recovery-page token))
+      (:settings/profile
+       :settings/password
+       :settings/notifications)
+      (mf/element settings/settings #js {:route route})
 
-        (:settings/profile
-         :settings/password
-         :settings/notifications)
-        (mf/element settings/settings #js {:route route})
+      (:dashboard/projects
+       :dashboard/icons
+       :dashboard/images
+       :dashboard/colors)
+      (mf/element dashboard/dashboard #js {:route route})
 
-        (:dashboard/projects
-         :dashboard/icons
-         :dashboard/images
-         :dashboard/colors)
-        (mf/element dashboard/dashboard #js {:route route})
+      :workspace/page
+      (let [project-id (uuid (get-in route [:params :path :project]))
+            page-id (uuid (get-in route [:params :path :page]))]
+        [:& workspace-page {:project-id project-id
+                            :page-id page-id
+                            :key page-id}])
 
-        :workspace/page
-        (let [project-id (uuid (get-in route [:params :path :project]))
-              page-id (uuid (get-in route [:params :path :page]))]
-          [:& workspace-page {:project-id project-id
-                              :page-id page-id
-                              :key page-id}])
+      nil)))
 
-        nil
-        ))))