From a7e77c3ea6edb7426ed9711ab291ab52daf8855e Mon Sep 17 00:00:00 2001
From: Andrey Antukh <niwi@niwi.nz>
Date: Thu, 10 Mar 2022 08:39:59 +0100
Subject: [PATCH] :sparkles: Minor fixes on login and register page structure

---
 frontend/src/app/main/ui/auth/login.cljs    | 46 ++++++++++++---------
 frontend/src/app/main/ui/auth/register.cljs | 18 +++-----
 frontend/translations/en.po                 |  4 +-
 frontend/translations/es.po                 |  4 +-
 4 files changed, 36 insertions(+), 36 deletions(-)

diff --git a/frontend/src/app/main/ui/auth/login.cljs b/frontend/src/app/main/ui/auth/login.cljs
index 39166ee59..e5f5890f9 100644
--- a/frontend/src/app/main/ui/auth/login.cljs
+++ b/frontend/src/app/main/ui/auth/login.cljs
@@ -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
diff --git a/frontend/src/app/main/ui/auth/register.cljs b/frontend/src/app/main/ui/auth/register.cljs
index 5030bbefa..9cb0ed293 100644
--- a/frontend/src/app/main/ui/auth/register.cljs
+++ b/frontend/src/app/main/ui/auth/register.cljs
@@ -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") " "]
diff --git a/frontend/translations/en.po b/frontend/translations/en.po
index 60397b970..362b922d6 100644
--- a/frontend/translations/en.po
+++ b/frontend/translations/en.po
@@ -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"
diff --git a/frontend/translations/es.po b/frontend/translations/es.po
index f444b8c8d..2768f54dd 100644
--- a/frontend/translations/es.po
+++ b/frontend/translations/es.po
@@ -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"