|
@@ -3,6 +3,7 @@
|
|
|
[frontend.rum :refer [adapt-class]]
|
|
|
[frontend.modules.shortcut.core :as shortcut]
|
|
|
[frontend.handler.user :as user]
|
|
|
+ [frontend.handler.route :as route-handler]
|
|
|
[cljs-bean.core :as bean]
|
|
|
[frontend.handler.notification :as notification]
|
|
|
[frontend.state :as state]
|
|
@@ -41,7 +42,9 @@
|
|
|
(when session
|
|
|
(user/login-callback session)
|
|
|
(notification/show! (str "Hi, " username " :)") :success)
|
|
|
- (state/close-modal!)))
|
|
|
+ (state/close-modal!)
|
|
|
+ (when (= :user-login (state/get-current-route))
|
|
|
+ (route-handler/redirect! {:to :home}))))
|
|
|
[])
|
|
|
|
|
|
nil))
|
|
@@ -72,15 +75,19 @@
|
|
|
user' (bean/->clj user)]
|
|
|
(user-pane sign-out! user')))))]))
|
|
|
|
|
|
-(rum/defcs page <
|
|
|
+(rum/defcs modal-inner <
|
|
|
shortcut/disable-all-shortcuts
|
|
|
[_state]
|
|
|
(page-impl))
|
|
|
|
|
|
+(rum/defc page
|
|
|
+ []
|
|
|
+ [:div.pt-10 (page-impl)])
|
|
|
+
|
|
|
(defn open-login-modal!
|
|
|
[]
|
|
|
(state/set-modal!
|
|
|
- (fn [_close] (page))
|
|
|
+ (fn [_close] (modal-inner))
|
|
|
{:close-btn? true
|
|
|
:label "user-login"
|
|
|
:close-backdrop? false
|