diff --git a/openmetadata-ui/src/main/resources/ui/src/assets/img/forgot-password.png b/openmetadata-ui/src/main/resources/ui/src/assets/img/forgot-password.png new file mode 100644 index 00000000000..83e70c6b241 Binary files /dev/null and b/openmetadata-ui/src/main/resources/ui/src/assets/img/forgot-password.png differ diff --git a/openmetadata-ui/src/main/resources/ui/src/assets/img/login-bg.png b/openmetadata-ui/src/main/resources/ui/src/assets/img/login-bg.png deleted file mode 100644 index f75e4e88fbc..00000000000 Binary files a/openmetadata-ui/src/main/resources/ui/src/assets/img/login-bg.png and /dev/null differ diff --git a/openmetadata-ui/src/main/resources/ui/src/constants/LoginClassBase.ts b/openmetadata-ui/src/main/resources/ui/src/constants/LoginClassBase.ts index 415c1c860eb..cb18336813b 100644 --- a/openmetadata-ui/src/main/resources/ui/src/constants/LoginClassBase.ts +++ b/openmetadata-ui/src/main/resources/ui/src/constants/LoginClassBase.ts @@ -30,20 +30,17 @@ class LoginClassBase { title: 'governance', image: governanceImg, descriptionKey: 'assess-data-reliability-with-data-profiler-lineage', - width: '500px', + imgClass: 'governance-image', image1: { image: governanceList, - width: '120px', position: 'governance-top-left', }, image2: { image: governanceItems, - width: '160px', position: 'governance-middle-right', }, image3: { image: governanceReviewer, - width: '220px', position: 'governance-bottom-right', }, }, @@ -51,15 +48,13 @@ class LoginClassBase { title: 'data-collaboration', image: collaborationImg, descriptionKey: 'deeply-understand-table-relations-message', - width: '350px', + imgClass: 'collaboration-image', image1: { image: collaborationTabs, - width: '200px', position: 'collab-top-left', }, image2: { image: collaborationMenu, - width: '200px', position: 'collab-middle-right', }, }, @@ -68,10 +63,9 @@ class LoginClassBase { image: dataObservabilityImg, descriptionKey: 'discover-your-data-and-unlock-the-value-of-data-assets', - width: '370px', + imgClass: 'observability-image', image1: { image: observabilityTestcase, - width: '250px', position: 'observability-bottom-right', }, }, @@ -79,15 +73,13 @@ class LoginClassBase { title: 'data-discovery', image: discoveryImg, descriptionKey: 'enables-end-to-end-metadata-management', - width: '500px', + imgClass: 'discovery-image', image1: { image: discoveryLanguage, - width: '130px', position: 'discovery-top-right', }, image2: { image: discoveryDataAssets, - width: '130px', position: 'discovery-middle-right', }, }, diff --git a/openmetadata-ui/src/main/resources/ui/src/locale/languages/de-de.json b/openmetadata-ui/src/main/resources/ui/src/locale/languages/de-de.json index 2028350474c..8ac83ce080c 100644 --- a/openmetadata-ui/src/main/resources/ui/src/locale/languages/de-de.json +++ b/openmetadata-ui/src/main/resources/ui/src/locale/languages/de-de.json @@ -593,6 +593,7 @@ "foreign": "Fremd", "foreign-key": "Fremdschlüssel", "forgot-password": "Passwort vergessen", + "forgot-your-password": "Glemt passordet ditt?", "format": "Format", "fqn-uppercase": "FQN", "frequently-joined-column-plural": "Häufig verwendete Spalten in Verknüpfungen", diff --git a/openmetadata-ui/src/main/resources/ui/src/locale/languages/en-us.json b/openmetadata-ui/src/main/resources/ui/src/locale/languages/en-us.json index a27c6a870fe..03734e7ffef 100644 --- a/openmetadata-ui/src/main/resources/ui/src/locale/languages/en-us.json +++ b/openmetadata-ui/src/main/resources/ui/src/locale/languages/en-us.json @@ -593,6 +593,7 @@ "foreign": "Foreign", "foreign-key": "Foreign Key", "forgot-password": "Forgot Password", + "forgot-your-password": "Forgot your password?", "format": "Format", "fqn-uppercase": "FQN", "frequently-joined-column-plural": "Frequently Joined Columns", @@ -1710,7 +1711,7 @@ "enter-interval": "Enter interval", "enter-test-case-name": "Enter test case name", "enter-test-suite-name": "Enter test suite name", - "enter-your-registered-email": "Enter your registered email to receive password reset link", + "enter-your-registered-email": "Enter your registered email to get a password reset link.", "entity-already-exists": "{{entity}} already exists.", "entity-are-not-available": "{{entity}} are not available", "entity-customize-description": "Customize {{entity}} detail page with choice of your widget and tabs which is more useful for your use case.", diff --git a/openmetadata-ui/src/main/resources/ui/src/locale/languages/es-es.json b/openmetadata-ui/src/main/resources/ui/src/locale/languages/es-es.json index ddf57ebdb12..01361199a20 100644 --- a/openmetadata-ui/src/main/resources/ui/src/locale/languages/es-es.json +++ b/openmetadata-ui/src/main/resources/ui/src/locale/languages/es-es.json @@ -593,6 +593,7 @@ "foreign": "Foráneo", "foreign-key": "Llave Foránea", "forgot-password": "Olvidé mi contraseña", + "forgot-your-password": "¿Olvidaste tu contraseña?", "format": "Format", "fqn-uppercase": "FQN", "frequently-joined-column-plural": "Columnas frecuentemente unidas", diff --git a/openmetadata-ui/src/main/resources/ui/src/locale/languages/fr-fr.json b/openmetadata-ui/src/main/resources/ui/src/locale/languages/fr-fr.json index 925c2817933..10231763229 100644 --- a/openmetadata-ui/src/main/resources/ui/src/locale/languages/fr-fr.json +++ b/openmetadata-ui/src/main/resources/ui/src/locale/languages/fr-fr.json @@ -593,6 +593,7 @@ "foreign": "Étranger", "foreign-key": "Clé Étrangère", "forgot-password": "Mot de passe oublié", + "forgot-your-password": "Mot de passe oublié?", "format": "Format", "fqn-uppercase": "FQN", "frequently-joined-column-plural": "Colonnes fréquemment utilisées dans les jointures", diff --git a/openmetadata-ui/src/main/resources/ui/src/locale/languages/gl-es.json b/openmetadata-ui/src/main/resources/ui/src/locale/languages/gl-es.json index bde868c9858..de3c798ed19 100644 --- a/openmetadata-ui/src/main/resources/ui/src/locale/languages/gl-es.json +++ b/openmetadata-ui/src/main/resources/ui/src/locale/languages/gl-es.json @@ -593,6 +593,7 @@ "foreign": "Estranxeiro", "foreign-key": "Clave foránea", "forgot-password": "Esqueciches o contrasinal", + "forgot-your-password": "Esqueciches o teu contrasinal?", "format": "Formato", "fqn-uppercase": "FQN", "frequently-joined-column-plural": "Columnas frecuentemente unidas", diff --git a/openmetadata-ui/src/main/resources/ui/src/locale/languages/he-he.json b/openmetadata-ui/src/main/resources/ui/src/locale/languages/he-he.json index 48165e5a881..df81b432ace 100644 --- a/openmetadata-ui/src/main/resources/ui/src/locale/languages/he-he.json +++ b/openmetadata-ui/src/main/resources/ui/src/locale/languages/he-he.json @@ -593,6 +593,7 @@ "foreign": "זר", "foreign-key": "מפתח זר", "forgot-password": "שכחת סיסמה", + "forgot-your-password": "שכחת את הסיסמה?", "format": "Format", "fqn-uppercase": "FQN", "frequently-joined-column-plural": "עמודות הצטרפות תדירות", diff --git a/openmetadata-ui/src/main/resources/ui/src/locale/languages/ja-jp.json b/openmetadata-ui/src/main/resources/ui/src/locale/languages/ja-jp.json index f4c38d9f31b..9282a1e4d40 100644 --- a/openmetadata-ui/src/main/resources/ui/src/locale/languages/ja-jp.json +++ b/openmetadata-ui/src/main/resources/ui/src/locale/languages/ja-jp.json @@ -593,6 +593,7 @@ "foreign": "外部キー", "foreign-key": "外部キー", "forgot-password": "パスワードを忘れた場合はこちら", + "forgot-your-password": "パスワードをお忘れですか？", "format": "Format", "fqn-uppercase": "FQN", "frequently-joined-column-plural": "よく結合されるカラム", diff --git a/openmetadata-ui/src/main/resources/ui/src/locale/languages/ko-kr.json b/openmetadata-ui/src/main/resources/ui/src/locale/languages/ko-kr.json index a2969e64e23..623786e4925 100644 --- a/openmetadata-ui/src/main/resources/ui/src/locale/languages/ko-kr.json +++ b/openmetadata-ui/src/main/resources/ui/src/locale/languages/ko-kr.json @@ -593,6 +593,7 @@ "foreign": "외래", "foreign-key": "외래 키", "forgot-password": "비밀번호 찾기", + "forgot-your-password": "비밀번호를 잊으셨나요?", "format": "형식", "fqn-uppercase": "FQN", "frequently-joined-column-plural": "자주 조인되는 열들", diff --git a/openmetadata-ui/src/main/resources/ui/src/locale/languages/mr-in.json b/openmetadata-ui/src/main/resources/ui/src/locale/languages/mr-in.json index 19be9d93d6e..172d3d0e396 100644 --- a/openmetadata-ui/src/main/resources/ui/src/locale/languages/mr-in.json +++ b/openmetadata-ui/src/main/resources/ui/src/locale/languages/mr-in.json @@ -593,6 +593,7 @@ "foreign": "परदेशी", "foreign-key": "विदेशी की", "forgot-password": "पासवर्ड विसरलात", + "forgot-your-password": "तुमचा पासवर्ड विसरलात का?", "format": "स्वरूप", "fqn-uppercase": "FQN", "frequently-joined-column-plural": "वारंवार सामील केलेले स्तंभ", diff --git a/openmetadata-ui/src/main/resources/ui/src/locale/languages/nl-nl.json b/openmetadata-ui/src/main/resources/ui/src/locale/languages/nl-nl.json index 6693bd8e444..091608cda20 100644 --- a/openmetadata-ui/src/main/resources/ui/src/locale/languages/nl-nl.json +++ b/openmetadata-ui/src/main/resources/ui/src/locale/languages/nl-nl.json @@ -593,6 +593,7 @@ "foreign": "Buitenlands", "foreign-key": "Vreemde sleutel", "forgot-password": "Wachtwoord vergeten", + "forgot-your-password": "Wachtwoord vergeten?", "format": "Format", "fqn-uppercase": "VZV", "frequently-joined-column-plural": "Vaak gejoinde kolommen", diff --git a/openmetadata-ui/src/main/resources/ui/src/locale/languages/pr-pr.json b/openmetadata-ui/src/main/resources/ui/src/locale/languages/pr-pr.json index a8e97720695..ed4c3696d44 100644 --- a/openmetadata-ui/src/main/resources/ui/src/locale/languages/pr-pr.json +++ b/openmetadata-ui/src/main/resources/ui/src/locale/languages/pr-pr.json @@ -593,6 +593,7 @@ "foreign": "خارجی", "foreign-key": "کلید خارجی", "forgot-password": "فراموشی رمز عبور", + "forgot-your-password": "رمز عبور خود را فراموش کرده‌اید؟", "format": "قالب", "fqn-uppercase": "FQN", "frequently-joined-column-plural": "ستون‌های به‌طور مکرر پیوسته", diff --git a/openmetadata-ui/src/main/resources/ui/src/locale/languages/pt-br.json b/openmetadata-ui/src/main/resources/ui/src/locale/languages/pt-br.json index ee51364b86f..feac03a9b24 100644 --- a/openmetadata-ui/src/main/resources/ui/src/locale/languages/pt-br.json +++ b/openmetadata-ui/src/main/resources/ui/src/locale/languages/pt-br.json @@ -593,6 +593,7 @@ "foreign": "Estrangeiro", "foreign-key": "Chave Estrangeira", "forgot-password": "Esqueceu a Senha", + "forgot-your-password": "Esqueceu sua senha?", "format": "Formatar", "fqn-uppercase": "FQN", "frequently-joined-column-plural": "Colunas Frequentemente Unidas", diff --git a/openmetadata-ui/src/main/resources/ui/src/locale/languages/pt-pt.json b/openmetadata-ui/src/main/resources/ui/src/locale/languages/pt-pt.json index 4d59325ae48..65f64bfa858 100644 --- a/openmetadata-ui/src/main/resources/ui/src/locale/languages/pt-pt.json +++ b/openmetadata-ui/src/main/resources/ui/src/locale/languages/pt-pt.json @@ -593,6 +593,7 @@ "foreign": "Estrangeiro", "foreign-key": "Chave Estrangeira", "forgot-password": "Esqueceu a Senha", + "forgot-your-password": "Esqueceste a tua palavra-passe?", "format": "Format", "fqn-uppercase": "FQN", "frequently-joined-column-plural": "Colunas Frequentemente Unidas", diff --git a/openmetadata-ui/src/main/resources/ui/src/locale/languages/ru-ru.json b/openmetadata-ui/src/main/resources/ui/src/locale/languages/ru-ru.json index 1edf413b487..2be04311212 100644 --- a/openmetadata-ui/src/main/resources/ui/src/locale/languages/ru-ru.json +++ b/openmetadata-ui/src/main/resources/ui/src/locale/languages/ru-ru.json @@ -593,6 +593,7 @@ "foreign": "Внешний", "foreign-key": "Внешний ключ", "forgot-password": "Забыл пароль", + "forgot-your-password": "Забыли пароль?", "format": "Format", "fqn-uppercase": "FQN", "frequently-joined-column-plural": "Часто соединяемые столбцы", diff --git a/openmetadata-ui/src/main/resources/ui/src/locale/languages/th-th.json b/openmetadata-ui/src/main/resources/ui/src/locale/languages/th-th.json index 17378c874c6..8928375ef73 100644 --- a/openmetadata-ui/src/main/resources/ui/src/locale/languages/th-th.json +++ b/openmetadata-ui/src/main/resources/ui/src/locale/languages/th-th.json @@ -593,6 +593,7 @@ "foreign": "ต่างประเทศ", "foreign-key": "คีย์ต่างประเทศ", "forgot-password": "ลืมรหัสผ่าน", + "forgot-your-password": "ลืมรหัสผ่านของคุณหรือไม่?", "format": "รูปแบบ", "fqn-uppercase": "FQN", "frequently-joined-column-plural": "คอลัมน์ที่เข้าร่วมบ่อย", diff --git a/openmetadata-ui/src/main/resources/ui/src/locale/languages/tr-tr.json b/openmetadata-ui/src/main/resources/ui/src/locale/languages/tr-tr.json index 1ce556fc0f2..bfe52c3e3f1 100644 --- a/openmetadata-ui/src/main/resources/ui/src/locale/languages/tr-tr.json +++ b/openmetadata-ui/src/main/resources/ui/src/locale/languages/tr-tr.json @@ -593,6 +593,7 @@ "foreign": "Yabancı", "foreign-key": "Yabancı Anahtar", "forgot-password": "Şifremi Unuttum", + "forgot-your-password": "Forgot your password?", "format": "Biçim", "fqn-uppercase": "FQN", "frequently-joined-column-plural": "Sık Birleştirilen Sütunlar", diff --git a/openmetadata-ui/src/main/resources/ui/src/locale/languages/zh-cn.json b/openmetadata-ui/src/main/resources/ui/src/locale/languages/zh-cn.json index e3669a4336c..3f04020857b 100644 --- a/openmetadata-ui/src/main/resources/ui/src/locale/languages/zh-cn.json +++ b/openmetadata-ui/src/main/resources/ui/src/locale/languages/zh-cn.json @@ -593,6 +593,7 @@ "foreign": "外键", "foreign-key": "外键", "forgot-password": "忘记密码", + "forgot-your-password": "忘记密码了？", "format": "Format", "fqn-uppercase": "FQN", "frequently-joined-column-plural": "经常连接查询的列 (Frequently Joined Column)", diff --git a/openmetadata-ui/src/main/resources/ui/src/pages/ForgotPassword/ForgotPassword.component.tsx b/openmetadata-ui/src/main/resources/ui/src/pages/ForgotPassword/ForgotPassword.component.tsx index 2b6672a3011..74870dc1e87 100644 --- a/openmetadata-ui/src/main/resources/ui/src/pages/ForgotPassword/ForgotPassword.component.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/pages/ForgotPassword/ForgotPassword.component.tsx @@ -11,11 +11,12 @@ * limitations under the License. */ -import { Button, Card, Col, Divider, Form, Input, Row, Typography } from 'antd'; +import { Button, Card, Col, Form, Input, Row, Typography } from 'antd'; import { AxiosError } from 'axios'; import React, { useCallback, useState } from 'react'; import { useTranslation } from 'react-i18next'; import { useHistory } from 'react-router-dom'; +import bgImg from '../../assets/img/forgot-password.png'; import AlertBar from '../../components/AlertBar/AlertBar'; import { useBasicAuth } from '../../components/Auth/AuthProviders/BasicAuthProvider'; import BrandImage from '../../components/common/BrandImage/BrandImage'; @@ -62,6 +63,14 @@ const ForgotPassword = () => {
+
+ bg-image +
{ style={{ maxWidth: '430px' }}> - + - - + + + {t('label.forgot-your-password')} + + {t('message.enter-your-registered-email')} @@ -104,26 +121,29 @@ const ForgotPassword = () => { }), }, ]}> - + - - - - {t('label.or-lowercase')} - - - + diff --git a/openmetadata-ui/src/main/resources/ui/src/pages/ForgotPassword/forgot-password.styles.less b/openmetadata-ui/src/main/resources/ui/src/pages/ForgotPassword/forgot-password.styles.less index caec2156658..2c7e194e428 100644 --- a/openmetadata-ui/src/main/resources/ui/src/pages/ForgotPassword/forgot-password.styles.less +++ b/openmetadata-ui/src/main/resources/ui/src/pages/ForgotPassword/forgot-password.styles.less @@ -14,6 +14,36 @@ @import (reference) url('../../styles/variables.less'); .forgot-password-container { + display: flex; + justify-content: center; + align-items: center; + + .ant-card-bordered { + box-shadow: 0px 24px 48px -12px rgba(10, 13, 18, 0.18); + border: none; + border-radius: 20px; + + label { + color: @grey-text; + font-weight: 600; + + @media screen and (min-width: 1650px) { + font-size: 20px; + } + } + + .input-field { + padding: @size-sm @size-md; + border-radius: @border-radius-xs; + border: 1px solid @grey-22; + background-color: @grey-23 !important; + + @media screen and (min-width: 1650px) { + padding: @size-md @size-lg; + } + } + } + .success-alert { border-color: #a9dcb5; } diff --git a/openmetadata-ui/src/main/resources/ui/src/pages/LoginPage/LoginCarousel.tsx b/openmetadata-ui/src/main/resources/ui/src/pages/LoginPage/LoginCarousel.tsx index f7f77d55699..a0b2e18fa81 100644 --- a/openmetadata-ui/src/main/resources/ui/src/pages/LoginPage/LoginCarousel.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/pages/LoginPage/LoginCarousel.tsx @@ -46,20 +46,17 @@ const LoginCarousel = () => {
slider {data.image1 && ( slider )} {data.image2 && ( @@ -67,9 +64,7 @@ const LoginCarousel = () => { alt="slider" className={data.image2.position} key={`img2-${currentIndex}-${idx}`} - loading="lazy" src={data.image2.image} - width={data.image2.width} /> )} {data.image3 && ( @@ -77,9 +72,7 @@ const LoginCarousel = () => { alt="slider" className={data.image3.position} key={`img3-${currentIndex}-${idx}`} - loading="lazy" src={data.image3.image} - width={data.image3.width} /> )}
diff --git a/openmetadata-ui/src/main/resources/ui/src/pages/LoginPage/SignInPage.test.tsx b/openmetadata-ui/src/main/resources/ui/src/pages/LoginPage/SignInPage.test.tsx index e1277d3fdad..5eea36175dc 100644 --- a/openmetadata-ui/src/main/resources/ui/src/pages/LoginPage/SignInPage.test.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/pages/LoginPage/SignInPage.test.tsx @@ -74,11 +74,9 @@ describe('Test SignInPage Component', () => { wrapper: MemoryRouter, }); const signInPage = await findByTestId(container, 'signin-page'); - const bgImg = await findByTestId(container, 'bg-image'); const LoginCarousel = await findByText(container, /LoginCarousel/i); expect(signInPage).toBeInTheDocument(); - expect(bgImg).toBeInTheDocument(); expect(LoginCarousel).toBeInTheDocument(); }); diff --git a/openmetadata-ui/src/main/resources/ui/src/pages/LoginPage/SignInPage.tsx b/openmetadata-ui/src/main/resources/ui/src/pages/LoginPage/SignInPage.tsx index 763a2a0d419..6cad29beb3f 100644 --- a/openmetadata-ui/src/main/resources/ui/src/pages/LoginPage/SignInPage.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/pages/LoginPage/SignInPage.tsx @@ -21,7 +21,6 @@ import IconCognito from '../../assets/img/icon-aws-cognito.png'; import IconAzure from '../../assets/img/icon-azure.png'; import IconGoogle from '../../assets/img/icon-google.png'; import IconOkta from '../../assets/img/icon-okta.png'; -import loginBG from '../../assets/img/login-bg.png'; import AlertBar from '../../components/AlertBar/AlertBar'; import { useBasicAuth } from '../../components/Auth/AuthProviders/BasicAuthProvider'; import BrandImage from '../../components/common/BrandImage/BrandImage'; @@ -226,6 +225,7 @@ const SignInPage = () => { {t('label.password')} {t('label.forgot-password')} @@ -243,7 +243,7 @@ const SignInPage = () => { -
+
{t('message.already-a-user')} @@ -221,15 +220,6 @@ const BasicSignUp = () => { -
- bg-image -
-