🚧 Initial work on password recovery and register refactor.

frontend/src/uxbox/main/ui.cljs

@@ -2,6 +2,9 @@
 ;; License, v. 2.0. If a copy of the MPL was not distributed with this
 ;; file, You can obtain one at http://mozilla.org/MPL/2.0/.
 ;;
+;; This Source Code Form is "Incompatible With Secondary Licenses", as
+;; defined by the Mozilla Public License, v. 2.0.
+;;
 ;; Copyright (c) 2015-2017 Juan de la Cruz <delacruzgarciajuan@gmail.com>
 ;; Copyright (c) 2015-2019 Andrey Antukh <niwi@niwi.nz>
 
@@ -16,7 +19,11 @@
    [uxbox.main.data.auth :refer [logout]]
    [uxbox.main.data.projects :as dp]
    [uxbox.main.store :as st]
-   [uxbox.main.ui.auth :as auth]
+   [uxbox.main.ui.login :refer [login-page]]
+   [uxbox.main.ui.profile.register :refer [profile-register-page]]
+   [uxbox.main.ui.profile.recovery-request :refer [profile-recovery-request-page]]
+   [uxbox.main.ui.profile.recovery :refer [profile-recovery-page]]
+
    [uxbox.main.ui.dashboard :as dashboard]
    [uxbox.main.ui.settings :as settings]
    [uxbox.main.ui.shapes]
@@ -29,14 +36,18 @@
    [uxbox.util.router :as rt]
    [uxbox.util.timers :as ts]))
 
+(def route-iref
+  (-> (l/key :route)
+      (l/derive st/state)))
+
 ;; --- Routes
 
 (def routes
-  [["/auth"
-    ["/login" :auth/login]
-    ["/register" :auth/register]
-    ["/recovery/request" :auth/recovery-request]
-    ["/recovery/token/:token" :auth/recovery]]
+  [["/login" :login]
+   ["/profile"
+    ["/register" :profile-register]
+    ["/recovery/request" :profile-recovery-request]
+    ["/recovery" :profile-recovery]]
 
    ["/settings"
     ["/profile" :settings/profile]
@@ -51,58 +62,15 @@
 
    ["/workspace/:file-id" :workspace]])
 
-;; --- Error Handling
-
-(defn- on-error
-  "A default error handler."
-  [{:keys [type code] :as error}]
-  (reset! st/loader false)
-  (cond
-    (and (map? error)
-         (= :validation type)
-         (= :spec-validation code))
-    (do
-      (println "============ SERVER RESPONSE ERROR ================")
-      (println (:explain error))
-      (println "============ END SERVER RESPONSE ERROR ================"))
-
-    ;; Unauthorized or Auth timeout
-    (and (map? error)
-         (= :authentication type)
-         (= :unauthorized code))
-    (ts/schedule 0 #(st/emit! (rt/nav :auth/login)))
-
-    ;; Network error
-    (and (map? error)
-         (= :unexpected type)
-         (= :abort code))
-    (ts/schedule 100 #(st/emit! (uum/error (tr "errors.network"))))
-
-    ;; Something else
-    :else
-    (do
-      (js/console.error error)
-      (ts/schedule 100 #(st/emit! (uum/error (tr "errors.generic")))))))
-
-(set! st/*on-error* on-error)
-
-;; --- Main App (Component)
-
-(def route-iref
-  (-> (l/key :route)
-      (l/derive st/state)))
-
 (mf/defc app
   [props]
   (let [route (mf/deref route-iref)]
     (case (get-in route [:data :name])
-      :auth/login (mf/element auth/login-page)
-      :auth/register (mf/element auth/register-page)
+      :login (mf/element login-page)
 
-      ;; :auth/recovery-request (auth/recovery-request-page)
-      ;; :auth/recovery
-      ;; (let [token (get-in route [:params :path :token])]
-      ;;   (auth/recovery-page token))
+      :profile-register (mf/element profile-register-page)
+      :profile-recovery-request (mf/element profile-recovery-request-page)
+      :profile-recovery (mf/element profile-recovery-page)
 
       (:settings/profile
        :settings/password
@@ -125,3 +93,37 @@
                                  :key file-id}])
       nil)))
 
+;; --- Error Handling
+
+(defn- on-error
+  "A default error handler."
+  [{:keys [type code] :as error}]
+  (reset! st/loader false)
+  (cond
+    (and (map? error)
+         (= :validation type)
+         (= :spec-validation code))
+    (do
+      (println "============ SERVER RESPONSE ERROR ================")
+      (println (:explain error))
+      (println "============ END SERVER RESPONSE ERROR ================"))
+
+    ;; Unauthorized or Auth timeout
+    (and (map? error)
+         (= :authentication type)
+         (= :unauthorized code))
+    (ts/schedule 0 #(st/emit! (rt/nav :login)))
+
+    ;; Network error
+    (and (map? error)
+         (= :unexpected type)
+         (= :abort code))
+    (ts/schedule 100 #(st/emit! (uum/error (tr "errors.network"))))
+
+    ;; Something else
+    :else
+    (do
+      (js/console.error error)
+      (ts/schedule 100 #(st/emit! (uum/error (tr "errors.generic")))))))
+
+(set! st/*on-error* on-error)