diff --git a/frontend/src/app/main/ui/auth.cljs b/frontend/src/app/main/ui/auth.cljs index 5f821fab9e..e52cbff034 100644 --- a/frontend/src/app/main/ui/auth.cljs +++ b/frontend/src/app/main/ui/auth.cljs @@ -10,9 +10,9 @@ [app.common.data.macros :as dm] [app.main.data.auth :as da] [app.main.store :as st] - [app.main.ui.auth.login :refer [login-page]] + [app.main.ui.auth.login :refer [login-page*]] [app.main.ui.auth.recovery :refer [recovery-page*]] - [app.main.ui.auth.recovery-request :refer [recovery-request-page]] + [app.main.ui.auth.recovery-request :refer [recovery-request-page*]] [app.main.ui.auth.register :refer [register-page* register-success-page* register-validate-page* terms-register*]] [app.main.ui.icons :as deprecated-icon] [app.util.dom :as dom] @@ -63,10 +63,10 @@ [:> register-validate-page* {:params params}] :auth-login - [:& login-page {:params params}] + [:> login-page* {:params params}] :auth-recovery-request - [:& recovery-request-page] + [:> recovery-request-page*] :auth-recovery [:> recovery-page* {:params params}]) diff --git a/frontend/src/app/main/ui/auth/login.cljs b/frontend/src/app/main/ui/auth/login.cljs index 1cee0b0192..8b87825eed 100644 --- a/frontend/src/app/main/ui/auth/login.cljs +++ b/frontend/src/app/main/ui/auth/login.cljs @@ -259,8 +259,8 @@ (contains? cf/flags :login-with-ldap)) [:> login-form* props])]) -(mf/defc login-page - [{:keys [params] :as props}] +(mf/defc login-page* + [{:keys [params]}] (let [go-register (mf/use-fn #(st/emit! (rt/nav :auth-register params)))] diff --git a/frontend/src/app/main/ui/auth/recovery_request.cljs b/frontend/src/app/main/ui/auth/recovery_request.cljs index 3233df8a30..78caa421ff 100644 --- a/frontend/src/app/main/ui/auth/recovery_request.cljs +++ b/frontend/src/app/main/ui/auth/recovery_request.cljs @@ -22,8 +22,8 @@ [:map {:title "RecoverRequestForm"} [:email ::sm/email]]) -(mf/defc recovery-form - [{:keys [on-success-callback] :as props}] +(mf/defc recovery-form* + [{:keys [on-success-callback]}] (let [form (fm/use-form :schema schema:recovery-request-form :initial {}) submitted (mf/use-state false) @@ -86,8 +86,8 @@ ;; --- Recovery Request Page -(mf/defc recovery-request-page - [{:keys [params on-success-callback go-back-callback] :as props}] +(mf/defc recovery-request-page* + [{:keys [params on-success-callback go-back-callback]}] (let [default-go-back #(st/emit! (rt/nav :auth-login)) go-back (or go-back-callback default-go-back)] [:div {:class (stl/css :auth-form-wrapper)} @@ -95,7 +95,7 @@ [:div {:class (stl/css :auth-subtitle)} (tr "auth.recovery-request-subtitle")] [:hr {:class (stl/css :separator)}] - [:& recovery-form {:params params :on-success-callback on-success-callback}] + [:> recovery-form* {:params params :on-success-callback on-success-callback}] [:hr {:class (stl/css :separator)}] [:div {:class (stl/css :go-back)} [:> lk/link* {:action go-back @@ -104,8 +104,7 @@ (tr "labels.go-back")]]])) -(mf/defc recovery-sent-page - {::mf/props :obj} +(mf/defc recovery-sent-page* [{:keys [email]}] [:div {:class (stl/css :auth-form-wrapper :register-success)} [:div {:class (stl/css :auth-title-wrapper)} diff --git a/frontend/src/app/main/ui/static.cljs b/frontend/src/app/main/ui/static.cljs index 02069fc147..cdc839ef79 100644 --- a/frontend/src/app/main/ui/static.cljs +++ b/frontend/src/app/main/ui/static.cljs @@ -21,7 +21,7 @@ [app.main.router :as rt] [app.main.store :as st] [app.main.ui.auth.login :refer [login-dialog*]] - [app.main.ui.auth.recovery-request :refer [recovery-request-page recovery-sent-page]] + [app.main.ui.auth.recovery-request :refer [recovery-request-page* recovery-sent-page*]] [app.main.ui.auth.register :as register] [app.main.ui.dashboard.sidebar :refer [sidebar*]] [app.main.ui.ds.buttons.button :refer [button*]] @@ -201,12 +201,12 @@ [:> register/register-success-page* {:params {:email @user-email :hide-logo true}}]] :recovery-request - [:& recovery-request-page {:go-back-callback set-section-login - :on-success-callback recovery-email-sent}] + [:> recovery-request-page* {:go-back-callback set-section-login + :on-success-callback recovery-email-sent}] :recovery-email-sent [:div {:class (stl/css :form-container)} - [:& recovery-sent-page {:email @user-email}]])]]])) + [:> recovery-sent-page* {:email @user-email}]])]]])) (mf/defc request-dialog* [{:keys [title content button-text on-button-click cancel-text on-close]}] diff --git a/frontend/src/app/main/ui/viewer/login.cljs b/frontend/src/app/main/ui/viewer/login.cljs index 635c236681..0371714419 100644 --- a/frontend/src/app/main/ui/viewer/login.cljs +++ b/frontend/src/app/main/ui/viewer/login.cljs @@ -11,7 +11,7 @@ [app.main.data.modal :as modal] [app.main.store :as st] [app.main.ui.auth.login :refer [login-dialog*]] - [app.main.ui.auth.recovery-request :refer [recovery-request-page]] + [app.main.ui.auth.recovery-request :refer [recovery-request-page*]] [app.main.ui.auth.register :refer [register-methods* register-success-page* terms-register* register-validate-form*]] [app.main.ui.icons :as deprecated-icon] [app.util.dom :as dom] @@ -113,8 +113,8 @@ (tr "labels.go-back")]]]] :recovery-request - [:& recovery-request-page {:go-back-callback go-back-to-login - :on-success-callback success-email-sent}] + [:> recovery-request-page* {:go-back-callback go-back-to-login + :on-success-callback success-email-sent}] :email-sent [:div {:class (stl/css :form-container)} [:> register-success-page* {:params {:email @user-email}}]])