From 0c9a06789a7ac2a6acf397327feb0f44ee3969fb Mon Sep 17 00:00:00 2001
From: Andrey Antukh <niwi@niwi.nz>
Date: Thu, 10 Mar 2022 17:45:20 +0100
Subject: [PATCH] :paperclip: Add correct copys and icons to login page

---
 .../resources/images/icons/brand-gitlab.svg   | 11 +-------
 .../resources/images/icons/brand-openid.svg   |  1 +
 .../resources/styles/main/layouts/login.scss  |  1 +
 frontend/src/app/main/ui/auth/login.cljs      | 28 ++++++++-----------
 frontend/src/app/main/ui/icons.cljs           |  4 +++
 frontend/translations/ar.po                   |  4 ---
 frontend/translations/ca.po                   |  4 ---
 frontend/translations/da.po                   |  4 ---
 frontend/translations/de.po                   |  4 ---
 frontend/translations/el.po                   |  4 ---
 frontend/translations/en.po                   |  4 ---
 frontend/translations/es.po                   |  4 ---
 frontend/translations/fr.po                   |  4 ---
 frontend/translations/he.po                   |  4 ---
 frontend/translations/id.po                   |  4 ---
 frontend/translations/pt_BR.po                |  4 ---
 frontend/translations/ro.po                   |  4 ---
 frontend/translations/ru.po                   |  4 ---
 frontend/translations/tr.po                   |  4 ---
 frontend/translations/zh_CN.po                |  4 ---
 frontend/translations/zh_Hant.po              |  4 ---
 21 files changed, 19 insertions(+), 90 deletions(-)
 create mode 100644 frontend/resources/images/icons/brand-openid.svg

diff --git a/frontend/resources/images/icons/brand-gitlab.svg b/frontend/resources/images/icons/brand-gitlab.svg
index 8dc42e8153..04993577bd 100644
--- a/frontend/resources/images/icons/brand-gitlab.svg
+++ b/frontend/resources/images/icons/brand-gitlab.svg
@@ -1,10 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="128" height="128" viewBox="0 0 13.1072 13.10542" preserveAspectRatio="xMinYMin meet">
-    <path d="M6.5534 13.1502l2.41333-7.42742H4.14l2.41334 7.42743z" fill="#e24329"/>
-    <path d="M6.5534 13.15016L4.14 5.72273H.75783l5.79556 7.42743z" fill="#fc6d26"/>
-    <path d="M.75783 5.72273L.02446 7.97991a.49964.49964 0 00.18147.5586l6.34746 4.6117L.75777 5.72278z" fill="#fca326"/>
-    <path d="M.75783 5.72278H4.14L2.68654 1.24927c-.0748-.2302-.40045-.23015-.4752 0L.75783 5.72278z" fill="#e24329"/>
-    <path d="M6.5534 13.15016l2.41333-7.42743h3.38223l-5.79562 7.42743z" fill="#fc6d26"/>
-    <path d="M12.34896 5.72273l.73336 2.25718" fill="#fca326"/>
-    <path d="M12.34896 5.72278H8.96673l1.45351-4.47351c.0748-.2302.40045-.23015.4752 0l1.45352 4.47351z" fill="#e24329"/>
-    <path d="M12.34937 5.72273l.73337 2.25718a.49964.49964 0 01-.18147.5586l-6.34746 4.6117 5.79561-7.42742z" fill="#fca326"/>
-</svg>
+<svg viewBox="3658.551 302.026 20 17.949" width="20" height="17.949" xmlns="http://www.w3.org/2000/svg" style="-webkit-print-color-adjust:exact"><path d="m3668.55 319.974 3.685-11.043h-7.364l3.68 11.043ZM3659.71 308.932l-1.122 3.355a.733.733 0 0 0 .277.83l9.685 6.857-8.84-11.042ZM3659.71 308.931h5.16l-2.22-6.65c-.114-.34-.61-.34-.727 0l-2.213 6.65Z" style="fill:#fff"/><path d="m3677.396 308.932 1.118 3.355a.733.733 0 0 1-.276.83l-9.688 6.857 8.846-11.042ZM3677.396 308.931h-5.16l2.216-6.65c.114-.34.61-.34.727 0l2.217 6.65ZM3668.55 319.974l3.685-11.042h5.16l-8.845 11.042ZM3668.55 319.974l-8.84-11.042h5.16l3.68 11.042Z" style="fill:#fff"/></svg>
\ No newline at end of file
diff --git a/frontend/resources/images/icons/brand-openid.svg b/frontend/resources/images/icons/brand-openid.svg
new file mode 100644
index 0000000000..a335b66642
--- /dev/null
+++ b/frontend/resources/images/icons/brand-openid.svg
@@ -0,0 +1 @@
+<svg viewBox="7437 302 20.011 18.182" width="20.011" height="18.182" xmlns="http://www.w3.org/2000/svg" style="-webkit-print-color-adjust:exact"><path d="M7455.039 309.1c-1.9-1.183-4.555-1.918-7.46-1.918-5.845 0-10.579 2.922-10.579 6.526 0 3.3 3.945 6.007 9.055 6.473v-1.9c-3.442-.43-6.024-2.313-6.024-4.573 0-2.564 3.37-4.662 7.549-4.662 2.08 0 3.962.52 5.325 1.363l-1.937 1.202h6.043v-3.73l-1.972 1.22Zm-8.984-5.146v16.227l3.03-1.9V302l-3.03 1.954Z" style="fill:#fff;fill-opacity:1"/></svg>
\ No newline at end of file
diff --git a/frontend/resources/styles/main/layouts/login.scss b/frontend/resources/styles/main/layouts/login.scss
index 5743434852..ced6782130 100644
--- a/frontend/resources/styles/main/layouts/login.scss
+++ b/frontend/resources/styles/main/layouts/login.scss
@@ -200,3 +200,4 @@
     margin: 0 $size-2;
   }
 }
+
diff --git a/frontend/src/app/main/ui/auth/login.cljs b/frontend/src/app/main/ui/auth/login.cljs
index e5f5890f99..41e2c7e712 100644
--- a/frontend/src/app/main/ui/auth/login.cljs
+++ b/frontend/src/app/main/ui/auth/login.cljs
@@ -25,7 +25,8 @@
 (def show-alt-login-buttons?
   (or cf/google-client-id
       cf/gitlab-client-id
-      cf/github-client-id))
+      cf/github-client-id
+      cf/oidc-client-id))
 
 (s/def ::email ::us/email)
 (s/def ::password ::us/not-empty-string)
@@ -137,29 +138,25 @@
    (when cf/google-client-id
      [:a.btn-primary.btn-large.btn-google-auth
       {:on-click #(login-with-oauth % :google params)}
-      [:img.logo
-       {:src "/images/icons/brand-google.svg"}]
+      [:span.logo i/brand-google]
       (tr "auth.login-with-google-submit")])
 
-   (when cf/gitlab-client-id
-     [:a.btn-primary.btn-large.btn-gitlab-auth
-      {:on-click #(login-with-oauth % :gitlab params)}
-      [:img.logo
-       {:src "/images/icons/brand-gitlab.svg"}]
-      (tr "auth.login-with-gitlab-submit")])
-
    (when cf/github-client-id
      [:a.btn-primary.btn-large.btn-github-auth
       {:on-click #(login-with-oauth % :github params)}
-      [:img.logo
-       {:src "/images/icons/brand-github.svg"}]
+      [:span.logo i/brand-github]
       (tr "auth.login-with-github-submit")])
 
-    (when cf/oidc-client-id
+   (when cf/gitlab-client-id
+     [:a.btn-primary.btn-large.btn-gitlab-auth
+      {:on-click #(login-with-oauth % :gitlab params)}
+      [:span.logo i/brand-gitlab]
+      (tr "auth.login-with-gitlab-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"}]
+      [:span.logo i/brand-openid]
       (tr "auth.login-with-oidc-submit")])])
 
 (mf/defc login-button-oidc
@@ -174,7 +171,6 @@
   [:div.generic-form.login-form
    [:div.form-container
     [:h1 {:data-test "login-title"} (tr "auth.login-title")]
-    [:div.subtitle (tr "auth.login-subtitle")]
 
     (when show-alt-login-buttons?
       [:*
diff --git a/frontend/src/app/main/ui/icons.cljs b/frontend/src/app/main/ui/icons.cljs
index db8a4ead53..d6ff5f0daf 100644
--- a/frontend/src/app/main/ui/icons.cljs
+++ b/frontend/src/app/main/ui/icons.cljs
@@ -170,6 +170,10 @@
 (def uppercase (icon-xref :uppercase))
 (def user (icon-xref :user))
 
+(def brand-openid (icon-xref :brand-openid))
+(def brand-github (icon-xref :brand-github))
+(def brand-gitlab (icon-xref :brand-gitlab))
+(def brand-google (icon-xref :brand-google))
 
 (def loader-pencil
   (mf/html
diff --git a/frontend/translations/ar.po b/frontend/translations/ar.po
index e042e8d6dd..c1af242ae8 100644
--- a/frontend/translations/ar.po
+++ b/frontend/translations/ar.po
@@ -56,10 +56,6 @@ msgstr "تسجيل الدخول هنا"
 msgid "auth.login-submit"
 msgstr "تسجيل الدخول"
 
-#: src/app/main/ui/auth/login.cljs
-msgid "auth.login-subtitle"
-msgstr "أدخل التفاصيل أدناه"
-
 #: src/app/main/ui/auth/login.cljs
 msgid "auth.login-title"
 msgstr "سعيد برؤيتك مجددا!"
diff --git a/frontend/translations/ca.po b/frontend/translations/ca.po
index af65d41fe1..c960744f7c 100644
--- a/frontend/translations/ca.po
+++ b/frontend/translations/ca.po
@@ -59,10 +59,6 @@ msgstr "Inicieu la sessió aquí"
 msgid "auth.login-submit"
 msgstr "Entra"
 
-#: src/app/main/ui/auth/login.cljs
-msgid "auth.login-subtitle"
-msgstr "Introduïu les vostres dades a continuació"
-
 #: src/app/main/ui/auth/login.cljs
 msgid "auth.login-title"
 msgstr "Ens agrada tornar a veure-vos!"
diff --git a/frontend/translations/da.po b/frontend/translations/da.po
index 16ebcb64d0..9f09c8dbd5 100644
--- a/frontend/translations/da.po
+++ b/frontend/translations/da.po
@@ -59,10 +59,6 @@ msgstr "Log på her"
 msgid "auth.login-submit"
 msgstr "Log på"
 
-#: src/app/main/ui/auth/login.cljs
-msgid "auth.login-subtitle"
-msgstr "Indtast dine oplysninger nedenunder"
-
 #: src/app/main/ui/auth/login.cljs
 msgid "auth.login-title"
 msgstr "Fedt at se dig igen!"
diff --git a/frontend/translations/de.po b/frontend/translations/de.po
index beafaf1319..d2dd6c2b97 100644
--- a/frontend/translations/de.po
+++ b/frontend/translations/de.po
@@ -59,10 +59,6 @@ msgstr "Hier einloggen"
 msgid "auth.login-submit"
 msgstr "Anmelden"
 
-#: src/app/main/ui/auth/login.cljs
-msgid "auth.login-subtitle"
-msgstr "Geben Sie unten Ihre Daten ein"
-
 #: src/app/main/ui/auth/login.cljs
 msgid "auth.login-title"
 msgstr "Schön, Sie wiederzusehen!"
diff --git a/frontend/translations/el.po b/frontend/translations/el.po
index f3100b1c49..582c5da77b 100644
--- a/frontend/translations/el.po
+++ b/frontend/translations/el.po
@@ -54,10 +54,6 @@ msgstr "Συνδεθείτε εδώ"
 msgid "auth.login-submit"
 msgstr "Συνδεθείτε"
 
-#: src/app/main/ui/auth/login.cljs
-msgid "auth.login-subtitle"
-msgstr "Εισαγάγετε τα στοιχεία σας παρακάτω"
-
 #: src/app/main/ui/auth/login.cljs
 msgid "auth.login-title"
 msgstr "Χαίρομαι που σας ξαναδώ"
diff --git a/frontend/translations/en.po b/frontend/translations/en.po
index 362b922d69..6eacdf3a18 100644
--- a/frontend/translations/en.po
+++ b/frontend/translations/en.po
@@ -57,10 +57,6 @@ msgstr "Login here"
 msgid "auth.login-submit"
 msgstr "Login"
 
-#: src/app/main/ui/auth/login.cljs
-msgid "auth.login-subtitle"
-msgstr "Enter your details below"
-
 #: src/app/main/ui/auth/login.cljs
 msgid "auth.login-title"
 msgstr "Great to see you again!"
diff --git a/frontend/translations/es.po b/frontend/translations/es.po
index 2768f54ddf..9638816428 100644
--- a/frontend/translations/es.po
+++ b/frontend/translations/es.po
@@ -59,10 +59,6 @@ msgstr "Entra aquí"
 msgid "auth.login-submit"
 msgstr "Entrar"
 
-#: src/app/main/ui/auth/login.cljs
-msgid "auth.login-subtitle"
-msgstr "Introduce tus datos aquí"
-
 #: src/app/main/ui/auth/login.cljs
 msgid "auth.login-title"
 msgstr "¡Un placer verte de nuevo!"
diff --git a/frontend/translations/fr.po b/frontend/translations/fr.po
index 69fc424656..88c306d11c 100644
--- a/frontend/translations/fr.po
+++ b/frontend/translations/fr.po
@@ -59,10 +59,6 @@ msgstr "Se connecter ici"
 msgid "auth.login-submit"
 msgstr "Se connecter"
 
-#: src/app/main/ui/auth/login.cljs
-msgid "auth.login-subtitle"
-msgstr "Entrez vos informations ci‑dessous"
-
 #: src/app/main/ui/auth/login.cljs
 msgid "auth.login-title"
 msgstr "Ravi de vous revoir !"
diff --git a/frontend/translations/he.po b/frontend/translations/he.po
index 5d3be3b379..2aa0f8b376 100644
--- a/frontend/translations/he.po
+++ b/frontend/translations/he.po
@@ -56,10 +56,6 @@ msgstr "כניסה מכאן"
 msgid "auth.login-submit"
 msgstr "כניסה"
 
-#: src/app/main/ui/auth/login.cljs
-msgid "auth.login-subtitle"
-msgstr "נא למלא את הפרטים שלך להלן"
-
 #: src/app/main/ui/auth/login.cljs
 msgid "auth.login-title"
 msgstr "שמחים לראות אותך שוב!"
diff --git a/frontend/translations/id.po b/frontend/translations/id.po
index f9380e1778..adc798da59 100644
--- a/frontend/translations/id.po
+++ b/frontend/translations/id.po
@@ -63,10 +63,6 @@ msgstr "Masuk disini"
 msgid "auth.login-submit"
 msgstr "Masuk"
 
-#: src/app/main/ui/auth/login.cljs
-msgid "auth.login-subtitle"
-msgstr "Masukkan detail anda di bawah ini"
-
 #: src/app/main/ui/auth/login.cljs
 msgid "auth.login-title"
 msgstr "Senang bertemu denganmu lagi!"
diff --git a/frontend/translations/pt_BR.po b/frontend/translations/pt_BR.po
index cd0442519e..54a936db91 100644
--- a/frontend/translations/pt_BR.po
+++ b/frontend/translations/pt_BR.po
@@ -59,10 +59,6 @@ msgstr "Entrar aqui"
 msgid "auth.login-submit"
 msgstr "Entrar"
 
-#: src/app/main/ui/auth/login.cljs
-msgid "auth.login-subtitle"
-msgstr "Insira seus dados abaixo"
-
 #: src/app/main/ui/auth/login.cljs
 msgid "auth.login-title"
 msgstr "Bom te ver de novo!"
diff --git a/frontend/translations/ro.po b/frontend/translations/ro.po
index 26c1f7e93e..14f72441b3 100644
--- a/frontend/translations/ro.po
+++ b/frontend/translations/ro.po
@@ -60,10 +60,6 @@ msgstr "Conectează-te"
 msgid "auth.login-submit"
 msgstr "Intră în cont"
 
-#: src/app/main/ui/auth/login.cljs
-msgid "auth.login-subtitle"
-msgstr "Introduceți detaliile dvs. mai jos"
-
 #: src/app/main/ui/auth/login.cljs
 msgid "auth.login-title"
 msgstr "Mă bucur să te văd din nou!"
diff --git a/frontend/translations/ru.po b/frontend/translations/ru.po
index c8c118ca54..dac4374a02 100644
--- a/frontend/translations/ru.po
+++ b/frontend/translations/ru.po
@@ -48,10 +48,6 @@ msgstr "Войти здесь"
 msgid "auth.login-submit"
 msgstr "Вход"
 
-#: src/app/main/ui/auth/login.cljs
-msgid "auth.login-subtitle"
-msgstr "Введите информацию о себе ниже"
-
 #: src/app/main/ui/auth/login.cljs
 msgid "auth.login-title"
 msgstr "Рады видеть Вас снова!"
diff --git a/frontend/translations/tr.po b/frontend/translations/tr.po
index bb1120a81b..33a992d25d 100644
--- a/frontend/translations/tr.po
+++ b/frontend/translations/tr.po
@@ -59,10 +59,6 @@ msgstr "Buradan oturum açın"
 msgid "auth.login-submit"
 msgstr "Oturum aç"
 
-#: src/app/main/ui/auth/login.cljs
-msgid "auth.login-subtitle"
-msgstr "Bilgilerini aşağıdaki alana gir"
-
 #: src/app/main/ui/auth/login.cljs
 msgid "auth.login-title"
 msgstr "Seni tekrar görmek süper!"
diff --git a/frontend/translations/zh_CN.po b/frontend/translations/zh_CN.po
index 43cfecabd2..b29c3026b7 100644
--- a/frontend/translations/zh_CN.po
+++ b/frontend/translations/zh_CN.po
@@ -55,10 +55,6 @@ msgstr "在这里登录"
 msgid "auth.login-submit"
 msgstr "登录"
 
-#: src/app/main/ui/auth/login.cljs
-msgid "auth.login-subtitle"
-msgstr "请在下面输入你的详细信息"
-
 #: src/app/main/ui/auth/login.cljs
 msgid "auth.login-title"
 msgstr "很高兴又见到你！"
diff --git a/frontend/translations/zh_Hant.po b/frontend/translations/zh_Hant.po
index dcfd8e9bc4..9627b07e1c 100644
--- a/frontend/translations/zh_Hant.po
+++ b/frontend/translations/zh_Hant.po
@@ -55,10 +55,6 @@ msgstr "在此登入"
 msgid "auth.login-submit"
 msgstr "登入"
 
-#: src/app/main/ui/auth/login.cljs
-msgid "auth.login-subtitle"
-msgstr "在下方輸入您的詳細資訊"
-
 #: src/app/main/ui/auth/login.cljs
 msgid "auth.login-title"
 msgstr "很高興再次見到你！"