Penpot/penpot
0
Fork 0
mirror of https://github.com/penpot/penpot.git synced 2025-04-16 00:41:25 -05:00
Code Issues Activity

✨ Minor fixes on login and register page structure

Browse source
This commit is contained in:
Andrey Antukh 2022-03-10 08:39:59 +01:00
parent 2d76364b09
commit a7e77c3ea6
4 changed files with 36 additions and 36 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -121,9 +121,10 @@
:label (tr "auth.password")}]]
[:div.buttons-stack
[:& fm/submit-button
{:label (tr "auth.login-submit")
:data-test "login-submit"}]
(when (contains? @cf/flags :login)
[:& fm/submit-button
{:label (tr "auth.login-submit")
:data-test "login-submit"}])
(when (contains? @cf/flags :login-with-ldap)
[:& fm/submit-button
@ -152,7 +153,14 @@
{:on-click #(login-with-oauth % :github params)}
[:img.logo
{:src "/images/icons/brand-github.svg"}]
(tr "auth.login-with-github-submit")])])
(tr "auth.login-with-github-submit")])
(when cf/oidc-client-id
[:a.btn-primary.btn-large.btn-github-auth
{:on-click #(login-with-oauth % :oidc params)}
[:img.logo
{:src "/images/icons/brand-github.svg"}]
(tr "auth.login-with-oidc-submit")])])
(mf/defc login-button-oidc
[{:keys [params] :as props}]
@ -178,25 +186,23 @@
[:div.buttons
[:& login-buttons {:params params}]]
[:span.separator
[:span.line]
[:span.text (tr "labels.or")]
[:span.line]]])
(when (or (contains? @cf/flags :login)
(contains? @cf/flags :login-with-ldap))
[:span.separator
[:span.line]
[:span.text (tr "labels.or")]
[:span.line]])])
[:& login-form {:params params}]
(when (or (contains? @cf/flags :login)
(contains? @cf/flags :login-with-ldap))
[:& login-form {:params params}])
(when cf/oidc-client-id
[:div.links
[:& login-button-oidc]])
[:span.separator
[:span.line]]
[:div.links
[:div.link-entry
[:a {:on-click #(st/emit! (rt/nav :auth-recovery-request))
:data-test "forgot-password"}
(tr "auth.forgot-password")]]
(when (contains? @cf/flags :login)
[:div.link-entry
[:a {:on-click #(st/emit! (rt/nav :auth-recovery-request))
:data-test "forgot-password"}
(tr "auth.forgot-password")]])
(when (contains? @cf/flags :registration)
[:div.link-entry

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

@ -131,21 +131,15 @@
[:div.buttons
[:& login/login-buttons {:params params}]]
[:span.separator
[:span.line]
[:span.text (tr "labels.or")]
[:span.line]]])
(when (or (contains? @cf/flags :login)
(contains? @cf/flags :login-with-ldap))
[:span.separator
[:span.line]
[:span.text (tr "labels.or")]
[:span.line]])])
[:& register-form {:params params}]
(when cf/oidc-client-id
[:div.links
[:& login/login-button-oidc]])
[:span.separator
[:span.line]]
[:div.links
[:div.link-entry
[:span (tr "auth.already-have-account") " "]

4
frontend/translations/en.po
View file

@ -83,7 +83,7 @@ msgstr "Login with LDAP"
#: src/app/main/ui/auth/login.cljs
msgid "auth.login-with-oidc-submit"
msgstr "Login with OpenID (SSO)"
msgstr "OpenID Connect"
#: src/app/main/ui/auth/recovery.cljs
msgid "auth.new-password"
@ -1235,7 +1235,7 @@ msgid "labels.continue-with"
msgstr "Continue with"
msgid "labels.or"
msgstr "or email"
msgstr "or"
#: src/app/main/ui/dashboard/team.cljs, src/app/main/ui/dashboard/team.cljs
msgid "labels.owner"

4
frontend/translations/es.po
View file

@ -85,7 +85,7 @@ msgstr "Entrar con LDAP"
#: src/app/main/ui/auth/login.cljs
msgid "auth.login-with-oidc-submit"
msgstr "Entrar con OpenID (SSO)"
msgstr "OpenID Connect"
#: src/app/main/ui/auth/recovery.cljs
msgid "auth.new-password"
@ -1236,7 +1236,7 @@ msgid "labels.continue-with"
msgstr "Continúa con"
msgid "labels.or"
msgstr "o email"
msgstr "o"
#: src/app/main/ui/dashboard/team.cljs, src/app/main/ui/dashboard/team.cljs
msgid "labels.owner"