Penpot/penpot
0
Fork 0
mirror of https://github.com/penpot/penpot.git synced 2025-01-23 15:09:10 -05:00
Code Issues Activity

🐛 Add demo warning to login

Browse source
This commit is contained in:
Andrey Antukh 2024-03-21 11:34:55 +01:00
parent 9a0bb36a20
commit f697f32707
2 changed files with 20 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
frontend/src/app/main/ui/auth/login.cljs
View file

@ -35,6 +35,14 @@
:login-with-gitlab :login-with-gitlab
:login-with-oidc])) :login-with-oidc]))
(mf/defc demo-warning
{::mf/props :obj}
[]
[:div {:class (stl/css :banner)}
[:& context-notification
{:type :warning
:content (tr "auth.demo-warning")}]])
(defn- login-with-oidc (defn- login-with-oidc
[event provider params] [event provider params]
(dom/prevent-default event) (dom/prevent-default event)
@ -284,6 +292,9 @@
[:h1 {:class (stl/css :auth-title) [:h1 {:class (stl/css :auth-title)
:data-test "login-title"} (tr "auth.login-title")] :data-test "login-title"} (tr "auth.login-title")]
(when (contains? cf/flags :demo-warning)
[:& demo-warning])
[:hr {:class (stl/css :separator)}] [:hr {:class (stl/css :separator)}]
[:& login-methods {:params params}] [:& login-methods {:params params}]

24
frontend/src/app/main/ui/auth/register.cljs
View file

@ -18,20 +18,12 @@
[app.main.ui.components.forms :as fm] [app.main.ui.components.forms :as fm]
[app.main.ui.components.link :as lk] [app.main.ui.components.link :as lk]
[app.main.ui.icons :as i] [app.main.ui.icons :as i]
[app.main.ui.notifications.context-notification :refer [context-notification]]
[app.util.i18n :refer [tr tr-html]] [app.util.i18n :refer [tr tr-html]]
[app.util.router :as rt] [app.util.router :as rt]
[beicon.v2.core :as rx] [beicon.v2.core :as rx]
[cljs.spec.alpha :as s] [cljs.spec.alpha :as s]
[rumext.v2 :as mf])) [rumext.v2 :as mf]))
(mf/defc demo-warning
[_]
[:div {:class (stl/css :banner)}
[:& context-notification
{:type :warning
:content (tr "auth.demo-warning")}]])
;; --- PAGE: Register ;; --- PAGE: Register
(defn- validate (defn- validate
@ -86,7 +78,7 @@
(st/emit! (rt/nav :auth-register-validate {} params))) (st/emit! (rt/nav :auth-register-validate {} params)))
(mf/defc register-form (mf/defc register-form
[{:keys [params on-success-callback] :as props}] [{:keys [params on-success-callback]}]
(let [initial (mf/use-memo (mf/deps params) (constantly params)) (let [initial (mf/use-memo (mf/deps params) (constantly params))
form (fm/use-form :spec ::register-form form (fm/use-form :spec ::register-form
:validators [validate :validators [validate
@ -136,7 +128,8 @@
(mf/defc register-methods (mf/defc register-methods
[{:keys [params on-success-callback] :as props}] {::mf/props :obj}
[{:keys [params on-success-callback]}]
[:* [:*
(when login/show-alt-login-buttons? (when login/show-alt-login-buttons?
[:* [:*
@ -146,14 +139,15 @@
[:& register-form {:params params :on-success-callback on-success-callback}]]) [:& register-form {:params params :on-success-callback on-success-callback}]])
(mf/defc register-page (mf/defc register-page
[{:keys [params] :as props}] {::mf/props :obj}
[{:keys [params]}]
[:div {:class (stl/css :auth-form)} [:div {:class (stl/css :auth-form)}
[:h1 {:class (stl/css :auth-title) [:h1 {:class (stl/css :auth-title)
:data-test "registration-title"} (tr "auth.register-title")] :data-test "registration-title"} (tr "auth.register-title")]
[:div {:class (stl/css :auth-subtitle)} (tr "auth.register-subtitle")] [:div {:class (stl/css :auth-subtitle)} (tr "auth.register-subtitle")]
(when (contains? cf/flags :demo-warning) (when (contains? cf/flags :demo-warning)
[:& demo-warning]) [:& login/demo-warning])
[:& register-methods {:params params}] [:& register-methods {:params params}]
@ -212,7 +206,7 @@
::accept-newsletter-subscription]))) ::accept-newsletter-subscription])))
(mf/defc register-validate-form (mf/defc register-validate-form
[{:keys [params on-success-callback] :as props}] [{:keys [params on-success-callback]}]
(let [form (fm/use-form :spec ::register-validate-form (let [form (fm/use-form :spec ::register-validate-form
:validators [(fm/validate-not-empty :fullname (tr "auth.name.not-all-space")) :validators [(fm/validate-not-empty :fullname (tr "auth.name.not-all-space"))
(fm/validate-length :fullname fm/max-length-allowed (tr "auth.name.too-long"))] (fm/validate-length :fullname fm/max-length-allowed (tr "auth.name.too-long"))]
@ -263,7 +257,7 @@
(mf/defc register-validate-page (mf/defc register-validate-page
[{:keys [params] :as props}] [{:keys [params]}]
[:div {:class (stl/css :auth-form)} [:div {:class (stl/css :auth-form)}
[:h1 {:class (stl/css :auth-title) [:h1 {:class (stl/css :auth-title)
:data-test "register-title"} (tr "auth.register-title")] :data-test "register-title"} (tr "auth.register-title")]
@ -279,7 +273,7 @@
(tr "labels.go-back")]]]]) (tr "labels.go-back")]]]])
(mf/defc register-success-page (mf/defc register-success-page
[{:keys [params] :as props}] [{:keys [params]}]
[:div {:class (stl/css :auth-form :register-success)} [:div {:class (stl/css :auth-form :register-success)}
[:div {:class (stl/css :notification-icon)} i/icon-verify] [:div {:class (stl/css :notification-icon)} i/icon-verify]
[:div {:class (stl/css :notification-text)} (tr "auth.verification-email-sent")] [:div {:class (stl/css :notification-text)} (tr "auth.verification-email-sent")]