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 index c70b377fb6c..f75e4e88fbc 100644 Binary files a/openmetadata-ui/src/main/resources/ui/src/assets/img/login-bg.png and b/openmetadata-ui/src/main/resources/ui/src/assets/img/login-bg.png differ diff --git a/openmetadata-ui/src/main/resources/ui/src/assets/img/login-screen/collaboration/collaboration-main.png b/openmetadata-ui/src/main/resources/ui/src/assets/img/login-screen/collaboration/collaboration-main.png new file mode 100644 index 00000000000..4bcd324f6cb Binary files /dev/null and b/openmetadata-ui/src/main/resources/ui/src/assets/img/login-screen/collaboration/collaboration-main.png differ diff --git a/openmetadata-ui/src/main/resources/ui/src/assets/img/login-screen/collaboration/collaboration-menu.png b/openmetadata-ui/src/main/resources/ui/src/assets/img/login-screen/collaboration/collaboration-menu.png new file mode 100644 index 00000000000..5d72ec609c6 Binary files /dev/null and b/openmetadata-ui/src/main/resources/ui/src/assets/img/login-screen/collaboration/collaboration-menu.png differ diff --git a/openmetadata-ui/src/main/resources/ui/src/assets/img/login-screen/collaboration/collaboration-tabs.png b/openmetadata-ui/src/main/resources/ui/src/assets/img/login-screen/collaboration/collaboration-tabs.png new file mode 100644 index 00000000000..629f45628de Binary files /dev/null and b/openmetadata-ui/src/main/resources/ui/src/assets/img/login-screen/collaboration/collaboration-tabs.png differ diff --git a/openmetadata-ui/src/main/resources/ui/src/assets/img/login-screen/data-collaboration.png b/openmetadata-ui/src/main/resources/ui/src/assets/img/login-screen/data-collaboration.png deleted file mode 100644 index 9d1fdcb0e3d..00000000000 Binary files a/openmetadata-ui/src/main/resources/ui/src/assets/img/login-screen/data-collaboration.png and /dev/null differ diff --git a/openmetadata-ui/src/main/resources/ui/src/assets/img/login-screen/data-discovery.png b/openmetadata-ui/src/main/resources/ui/src/assets/img/login-screen/data-discovery.png deleted file mode 100644 index 055c724fe28..00000000000 Binary files a/openmetadata-ui/src/main/resources/ui/src/assets/img/login-screen/data-discovery.png and /dev/null differ diff --git a/openmetadata-ui/src/main/resources/ui/src/assets/img/login-screen/data-governance.png b/openmetadata-ui/src/main/resources/ui/src/assets/img/login-screen/data-governance.png deleted file mode 100644 index 875ad2c9e20..00000000000 Binary files a/openmetadata-ui/src/main/resources/ui/src/assets/img/login-screen/data-governance.png and /dev/null differ diff --git a/openmetadata-ui/src/main/resources/ui/src/assets/img/login-screen/data-insights.png b/openmetadata-ui/src/main/resources/ui/src/assets/img/login-screen/data-insights.png deleted file mode 100644 index fd20a40586a..00000000000 Binary files a/openmetadata-ui/src/main/resources/ui/src/assets/img/login-screen/data-insights.png and /dev/null differ diff --git a/openmetadata-ui/src/main/resources/ui/src/assets/img/login-screen/data-quality.png b/openmetadata-ui/src/main/resources/ui/src/assets/img/login-screen/data-quality.png deleted file mode 100644 index 8e8af4840ac..00000000000 Binary files a/openmetadata-ui/src/main/resources/ui/src/assets/img/login-screen/data-quality.png and /dev/null differ diff --git a/openmetadata-ui/src/main/resources/ui/src/assets/img/login-screen/discovery/discovery-data-asset.png b/openmetadata-ui/src/main/resources/ui/src/assets/img/login-screen/discovery/discovery-data-asset.png new file mode 100644 index 00000000000..2577da948f9 Binary files /dev/null and b/openmetadata-ui/src/main/resources/ui/src/assets/img/login-screen/discovery/discovery-data-asset.png differ diff --git a/openmetadata-ui/src/main/resources/ui/src/assets/img/login-screen/discovery/discovery-language.png b/openmetadata-ui/src/main/resources/ui/src/assets/img/login-screen/discovery/discovery-language.png new file mode 100644 index 00000000000..9871b4d5e2c Binary files /dev/null and b/openmetadata-ui/src/main/resources/ui/src/assets/img/login-screen/discovery/discovery-language.png differ diff --git a/openmetadata-ui/src/main/resources/ui/src/assets/img/login-screen/discovery/discovery-main.png b/openmetadata-ui/src/main/resources/ui/src/assets/img/login-screen/discovery/discovery-main.png new file mode 100644 index 00000000000..ba89ef818e3 Binary files /dev/null and b/openmetadata-ui/src/main/resources/ui/src/assets/img/login-screen/discovery/discovery-main.png differ diff --git a/openmetadata-ui/src/main/resources/ui/src/assets/img/login-screen/governance/governance-items.png b/openmetadata-ui/src/main/resources/ui/src/assets/img/login-screen/governance/governance-items.png new file mode 100644 index 00000000000..80f883cf6af Binary files /dev/null and b/openmetadata-ui/src/main/resources/ui/src/assets/img/login-screen/governance/governance-items.png differ diff --git a/openmetadata-ui/src/main/resources/ui/src/assets/img/login-screen/governance/governance-list.png b/openmetadata-ui/src/main/resources/ui/src/assets/img/login-screen/governance/governance-list.png new file mode 100644 index 00000000000..3d1e3e3330c Binary files /dev/null and b/openmetadata-ui/src/main/resources/ui/src/assets/img/login-screen/governance/governance-list.png differ diff --git a/openmetadata-ui/src/main/resources/ui/src/assets/img/login-screen/governance/governance-main.png b/openmetadata-ui/src/main/resources/ui/src/assets/img/login-screen/governance/governance-main.png new file mode 100644 index 00000000000..c62b917e0a3 Binary files /dev/null and b/openmetadata-ui/src/main/resources/ui/src/assets/img/login-screen/governance/governance-main.png differ diff --git a/openmetadata-ui/src/main/resources/ui/src/assets/img/login-screen/governance/governance-reviewer.png b/openmetadata-ui/src/main/resources/ui/src/assets/img/login-screen/governance/governance-reviewer.png new file mode 100644 index 00000000000..868cf6cfce6 Binary files /dev/null and b/openmetadata-ui/src/main/resources/ui/src/assets/img/login-screen/governance/governance-reviewer.png differ diff --git a/openmetadata-ui/src/main/resources/ui/src/assets/img/login-screen/observability/observability-main.png b/openmetadata-ui/src/main/resources/ui/src/assets/img/login-screen/observability/observability-main.png new file mode 100644 index 00000000000..44bb94a1479 Binary files /dev/null and b/openmetadata-ui/src/main/resources/ui/src/assets/img/login-screen/observability/observability-main.png differ diff --git a/openmetadata-ui/src/main/resources/ui/src/assets/img/login-screen/observability/observability-testcase.png b/openmetadata-ui/src/main/resources/ui/src/assets/img/login-screen/observability/observability-testcase.png new file mode 100644 index 00000000000..f9158ae01c7 Binary files /dev/null and b/openmetadata-ui/src/main/resources/ui/src/assets/img/login-screen/observability/observability-testcase.png differ diff --git a/openmetadata-ui/src/main/resources/ui/src/constants/Login.constants.ts b/openmetadata-ui/src/main/resources/ui/src/constants/Login.constants.ts deleted file mode 100644 index 49613635510..00000000000 --- a/openmetadata-ui/src/main/resources/ui/src/constants/Login.constants.ts +++ /dev/null @@ -1,60 +0,0 @@ -/* - * Copyright 2022 Collate. - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0 - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -import { kebabCase, map } from 'lodash'; -import loginClassBase from './LoginClassBase'; - -const { - dataDiscovery, - dataQuality, - governance, - dataInsightPlural, - dataCollaboration, - ...rest -} = loginClassBase.carouselImages(); - -export const LOGIN_SLIDE = [ - { - title: 'data-discovery', - image: dataDiscovery, - descriptionKey: 'enables-end-to-end-metadata-management', - }, - { - title: 'data-quality', - image: dataQuality, - descriptionKey: 'discover-your-data-and-unlock-the-value-of-data-assets', - }, - { - title: 'governance', - image: governance, - descriptionKey: 'assess-data-reliability-with-data-profiler-lineage', - }, - ...(dataInsightPlural - ? [ - { - title: 'data-insight-plural', - image: dataInsightPlural, - descriptionKey: 'fosters-collaboration-among-producers-and-consumers', - }, - ] - : map(rest, (item, key) => ({ - title: kebabCase(key), - image: item, - descriptionKey: kebabCase(key) + '-description', - }))), - { - title: 'data-collaboration', - image: dataCollaboration, - descriptionKey: 'deeply-understand-table-relations-message', - }, -]; 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 77e3c15e4b0..415c1c860eb 100644 --- a/openmetadata-ui/src/main/resources/ui/src/constants/LoginClassBase.ts +++ b/openmetadata-ui/src/main/resources/ui/src/constants/LoginClassBase.ts @@ -10,22 +10,90 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - -import collaborationImg from '../assets/img/login-screen/data-collaboration.png'; -import discoveryImg from '../assets/img/login-screen/data-discovery.png'; -import governanceImg from '../assets/img/login-screen/data-governance.png'; -import insightImg from '../assets/img/login-screen/data-insights.png'; -import dataQualityImg from '../assets/img/login-screen/data-quality.png'; +import collaborationImg from '../assets/img/login-screen/collaboration/collaboration-main.png'; +import collaborationMenu from '../assets/img/login-screen/collaboration/collaboration-menu.png'; +import collaborationTabs from '../assets/img/login-screen/collaboration/collaboration-tabs.png'; +import discoveryDataAssets from '../assets/img/login-screen/discovery/discovery-data-asset.png'; +import discoveryLanguage from '../assets/img/login-screen/discovery/discovery-language.png'; +import discoveryImg from '../assets/img/login-screen/discovery/discovery-main.png'; +import governanceItems from '../assets/img/login-screen/governance/governance-items.png'; +import governanceList from '../assets/img/login-screen/governance/governance-list.png'; +import governanceImg from '../assets/img/login-screen/governance/governance-main.png'; +import governanceReviewer from '../assets/img/login-screen/governance/governance-reviewer.png'; +import dataObservabilityImg from '../assets/img/login-screen/observability/observability-main.png'; +import observabilityTestcase from '../assets/img/login-screen/observability/observability-testcase.png'; class LoginClassBase { - public carouselImages(): Record { - return { - dataDiscovery: discoveryImg, - dataQuality: dataQualityImg, - governance: governanceImg, - dataInsightPlural: insightImg, - dataCollaboration: collaborationImg, - }; + public getLoginCarouselContent() { + const carouselContent = [ + { + title: 'governance', + image: governanceImg, + descriptionKey: 'assess-data-reliability-with-data-profiler-lineage', + width: '500px', + 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', + }, + }, + { + title: 'data-collaboration', + image: collaborationImg, + descriptionKey: 'deeply-understand-table-relations-message', + width: '350px', + image1: { + image: collaborationTabs, + width: '200px', + position: 'collab-top-left', + }, + image2: { + image: collaborationMenu, + width: '200px', + position: 'collab-middle-right', + }, + }, + { + title: 'data-observability', + image: dataObservabilityImg, + descriptionKey: + 'discover-your-data-and-unlock-the-value-of-data-assets', + width: '370px', + image1: { + image: observabilityTestcase, + width: '250px', + position: 'observability-bottom-right', + }, + }, + { + title: 'data-discovery', + image: discoveryImg, + descriptionKey: 'enables-end-to-end-metadata-management', + width: '500px', + image1: { + image: discoveryLanguage, + width: '130px', + position: 'discovery-top-right', + }, + image2: { + image: discoveryDataAssets, + width: '130px', + position: 'discovery-middle-right', + }, + }, + ]; + + return carouselContent; } } 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 954f665b977..2028350474c 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 @@ -1521,6 +1521,7 @@ "week": "Woche", "weekly-usage": "Wöchentliche Verwendung", "weight": "Gewichtung", + "welcome-to": "Velkommen til", "whats-new": "Neuigkeiten", "whats-new-version": "Änderungen in ({{version}})", "widget": "Widget", 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 2af8d17e3f9..a27c6a870fe 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 @@ -1521,6 +1521,7 @@ "week": "Week", "weekly-usage": "Weekly Usage", "weight": "Weight", + "welcome-to": "Welcome to", "whats-new": "What's New", "whats-new-version": "What's New ({{version}})", "widget": "Widget", 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 51b66546de1..ddf57ebdb12 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 @@ -1521,6 +1521,7 @@ "week": "Semana", "weekly-usage": "Uso semanal", "weight": "Peso", + "welcome-to": "Bienvenido a", "whats-new": "Novedades", "whats-new-version": "Qué hay de nuevo ({{version}})", "widget": "Widget", 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 71c2248193b..925c2817933 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 @@ -1521,6 +1521,7 @@ "week": "Semaine", "weekly-usage": "Utilisation Hebdomadaire", "weight": "Poids", + "welcome-to": "Bienvenue à", "whats-new": "Nouveautés", "whats-new-version": "Nouveautés ({{version}})", "widget": "Widget", 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 16fab50a0c3..bde868c9858 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 @@ -1521,6 +1521,7 @@ "week": "Semana", "weekly-usage": "Uso semanal", "weight": "Peso", + "welcome-to": "Benvido a", "whats-new": "Novidades", "whats-new-version": "Novidades ({{version}})", "widget": "Widget", 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 acda8de38bb..48165e5a881 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 @@ -1521,6 +1521,7 @@ "week": "שבוע", "weekly-usage": "שימוש שבועי", "weight": "משקל", + "welcome-to": "ברוך הבא ל־", "whats-new": "מה חדש", "whats-new-version": "מה חדש ({{version}})", "widget": "ווידג'ט", 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 5a78779ef2b..f4c38d9f31b 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 @@ -1521,6 +1521,7 @@ "week": "週", "weekly-usage": "Weekly Usage", "weight": "重み", + "welcome-to": "ようこそ", "whats-new": "最新情報", "whats-new-version": "What's New ({{version}})", "widget": "Widget", 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 09d1e0da14e..a2969e64e23 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 @@ -1521,6 +1521,7 @@ "week": "주", "weekly-usage": "주간 사용량", "weight": "가중치", + "welcome-to": "환영합니다", "whats-new": "새로운 소식", "whats-new-version": "새로운 소식 ({{version}})", "widget": "위젯", 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 7e1694f2aa1..19be9d93d6e 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 @@ -1521,6 +1521,7 @@ "week": "आठवडा", "weekly-usage": "साप्ताहिक वापर", "weight": "वजन", + "welcome-to": "आपले स्वागत आहे", "whats-new": "नवीन काय आहे", "whats-new-version": "नवीन काय आहे ({{version}})", "widget": "विजेट", 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 10c8f40bc3a..6693bd8e444 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 @@ -1521,6 +1521,7 @@ "week": "Week", "weekly-usage": "Wekelijks gebruik", "weight": "Gewicht", + "welcome-to": "Welkom bij", "whats-new": "Wat is nieuw", "whats-new-version": "Wat is nieuw ({{version}})", "widget": "Widget", 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 4490456f591..a8e97720695 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 @@ -1521,6 +1521,7 @@ "week": "هفته", "weekly-usage": "استفاده هفتگی", "weight": "وزن", + "welcome-to": "خوش آمدید به", "whats-new": "چه چیز جدید است", "whats-new-version": "چه چیز جدید است ({{version}})", "widget": "ویجت", 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 097d565072c..bef99d54565 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 @@ -1521,6 +1521,7 @@ "week": "Semana", "weekly-usage": "Uso Semanal", "weight": "Peso", + "welcome-to": "Bem-vindo ao", "whats-new": "Novidades", "whats-new-version": "Novidades ({{version}})", "widget": "Widget", 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 b6fb15ce0db..4d59325ae48 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 @@ -1521,6 +1521,7 @@ "week": "Semana", "weekly-usage": "Uso Semanal", "weight": "Peso", + "welcome-to": "Bem-vindo a", "whats-new": "Novidades", "whats-new-version": "Novidades ({{version}})", "widget": "Widget", 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 f0dad7e1197..1edf413b487 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 @@ -1521,6 +1521,7 @@ "week": "Неделя", "weekly-usage": "Еженедельное использование", "weight": "Вес", + "welcome-to": "Добро пожаловать в", "whats-new": "Новости", "whats-new-version": "What's New ({{version}})", "widget": "Widget", 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 b266c1bff13..17378c874c6 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 @@ -1521,6 +1521,7 @@ "week": "สัปดาห์", "weekly-usage": "การใช้งานรายสัปดาห์", "weight": "น้ำหนัก", + "welcome-to": "ยินดีต้อนรับสู่", "whats-new": "สิ่งที่ใหม่", "whats-new-version": "สิ่งที่ใหม่ ({{version}})", "widget": "วิดเจ็ต", 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 b0ade1656ce..e3669a4336c 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 @@ -1521,6 +1521,7 @@ "week": "周", "weekly-usage": "周使用率", "weight": "权重", + "welcome-to": "欢迎来到", "whats-new": "最新消息", "whats-new-version": "最新消息 ({{version}})", "widget": "Widget", diff --git a/openmetadata-ui/src/main/resources/ui/src/pages/LoginPage/LoginCarousel.test.tsx b/openmetadata-ui/src/main/resources/ui/src/pages/LoginPage/LoginCarousel.test.tsx index b6ad32e03d9..7f60272b399 100644 --- a/openmetadata-ui/src/main/resources/ui/src/pages/LoginPage/LoginCarousel.test.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/pages/LoginPage/LoginCarousel.test.tsx @@ -14,9 +14,11 @@ import { act, render, screen } from '@testing-library/react'; import React from 'react'; import { MemoryRouter } from 'react-router-dom'; -import { LOGIN_SLIDE } from '../../constants/Login.constants'; +import loginClassBase from '../../constants/LoginClassBase'; import LoginCarousel from './LoginCarousel'; +const LOGIN_SLIDE = loginClassBase.getLoginCarouselContent(); + describe('Test LoginCarousel component', () => { it('renders the carousel container', () => { render(); 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 a25f2e9af22..f7f77d55699 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 @@ -14,33 +14,75 @@ import { Carousel, Typography } from 'antd'; import { t } from 'i18next'; import { uniqueId } from 'lodash'; -import React from 'react'; -import { LOGIN_SLIDE } from '../../constants/Login.constants'; +import React, { useState } from 'react'; +import loginClassBase from '../../constants/LoginClassBase'; const LoginCarousel = () => { + const [currentIndex, setCurrentIndex] = useState(0); + const carouselContent = loginClassBase.getLoginCarouselContent(); + return (
- - {LOGIN_SLIDE.map((data) => ( + setCurrentIndex(next)} + easing="ease-in-out" + effect="fade"> + {carouselContent.map((data, idx) => (
- + key={uniqueId() + '-' + currentIndex + '-' + idx}> + {t(`label.${data.title}`)}

{t(`message.${data.descriptionKey}`)}

- slider +
+ slider + {data.image1 && ( + slider + )} + {data.image2 && ( + slider + )} + {data.image3 && ( + slider + )} +
))} 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 9ce28cfa0f5..bae3b77fd59 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 @@ -11,7 +11,7 @@ * limitations under the License. */ -import { Button, Col, Divider, Form, Input, Row, Typography } from 'antd'; +import { Button, Col, Form, Input, Row, Typography } from 'antd'; import classNames from 'classnames'; import React, { useEffect, useMemo, useState } from 'react'; import { useTranslation } from 'react-i18next'; @@ -33,6 +33,7 @@ import { EMAIL_REG_EX } from '../../constants/regex.constants'; import { AuthProvider } from '../../generated/settings/settings'; import { useAlertStore } from '../../hooks/useAlertStore'; import { useApplicationStore } from '../../hooks/useApplicationStore'; +import brandClassBase from '../../utils/BrandData/BrandClassBase'; import './login.style.less'; import LoginCarousel from './LoginCarousel'; @@ -46,6 +47,8 @@ const SignInPage = () => { const { t } = useTranslation(); + const brandName = brandClassBase.getPageTitle(); + const { isAuthProviderBasic, isAuthProviderLDAP } = useMemo(() => { return { isAuthProviderBasic: @@ -166,16 +169,16 @@ const SignInPage = () => { return ( <> - - + +
- - - {t('message.om-description')}{' '} - + + + {t('label.welcome-to')} {brandName} + {alert && (
{ }), }, ]}> - + + + {t('label.password')} + + + {t('label.forgot-password')} + +
+ } name="password" requiredMark={false} rules={[{ required: true }]}> -
- +
+ + {t('message.new-to-the-platform')} + + +
)} )} @@ -271,11 +277,11 @@ const SignInPage = () => { )}
- +
Login Background diff --git a/openmetadata-ui/src/main/resources/ui/src/pages/LoginPage/login.style.less b/openmetadata-ui/src/main/resources/ui/src/pages/LoginPage/login.style.less index cf8b1576deb..bfe593b2c37 100644 --- a/openmetadata-ui/src/main/resources/ui/src/pages/LoginPage/login.style.less +++ b/openmetadata-ui/src/main/resources/ui/src/pages/LoginPage/login.style.less @@ -13,6 +13,120 @@ @import (reference) url('./../../styles/variables.less'); +.login-form-container { + background-color: @grey-100; + padding: @size-lg; + padding-left: 0; + height: 100vh; + display: flex; + align-items: center; + justify-content: flex-start; + + @media screen and (max-width: 1024px) { + padding: @size-md; + justify-content: center; + } + + .form-carousel-container { + position: fixed; + right: @size-md; + top: @size-md; + width: calc(58.33% - @size-md * 2); + height: calc(100vh - @size-md * 2); + overflow: hidden; + + @media screen and (max-width: 1024px) { + display: none; + } + } + + .form-item { + background-color: @white; + border-radius: @border-radius-lg; + box-shadow: 0px 24px 48px -12px rgba(10, 13, 18, 0.18); + display: flex; + flex-direction: column; + align-items: center; + justify-content: center; + margin: @size-2xl; + padding: @size-xl @size-2xl; + text-align: center; + height: auto; + max-width: 500px; + margin-left: @size-2xl; + + @media screen and (max-width: 1200px) { + margin: @size-md; + padding: @size-lg; + width: 100%; + } + + @media screen and (max-width: 1024px) { + margin: 0 auto; + } + + @media screen and (max-width: 768px) { + min-width: 320px; + } + + .header-text { + font-size: 28px; + font-weight: 700; + color: @grey-800; + margin-top: @size-xl; + margin-bottom: 0px; + + @media screen and (max-width: 768px) { + font-size: 24px; + margin-top: @size-lg; + } + } + + label { + color: @grey-text; + font-weight: 600; + } + + .input-field { + padding: @size-sm @size-md; + border-radius: @border-radius-xs; + border: 1px solid @grey-22; + background-color: @grey-23 !important; + } + + .input-field::placeholder { + color: @grey-24; + } + + #password, + #confirmPassword, + .input-field:focus { + background-color: @grey-23; + } + + .label-flex { + width: 380px; + display: flex; + justify-content: space-between; + align-items: center; + + @media screen and (max-width: 768px) { + width: 100%; + } + } + + @media screen and (min-width: 1600px) { + margin: auto; + } + } + + .carousel-header { + color: @white; + font-weight: 700; + font-size: 42px; + } +} + .ant-form-item-explain-error { text-align: left; } @@ -28,20 +142,59 @@ } .login-form { margin-top: 3rem; - width: 334px; + width: 380px; + + @media screen and (max-width: 1024px) { + width: 100%; + max-width: 380px; + margin: 2rem auto 0; + } + .error-alert { border-color: #fbb4ae; } } .login-alert { margin-top: 1rem; - width: 334px; } .carousal-description { - width: 750px; + width: 600px; text-align: center; margin: 16px auto; padding: 0 48px; + color: @grey-200; + font-size: @size-md; +} + +@keyframes fadeIn { + from { + opacity: 0; + } + to { + opacity: 1; + } +} + +@keyframes slideInFromLeft { + from { + opacity: 0; + transform: translateX(-50px); + } + to { + opacity: 1; + transform: translateX(0); + } +} + +@keyframes slideInFromRight { + from { + opacity: 0; + transform: translateX(50px); + } + to { + opacity: 1; + transform: translateX(0); + } } .carousal-container { @@ -52,21 +205,187 @@ left: 50%; transform: translate(-50%, -50%); - .slick-dots.slick-dots-bottom { - position: initial; - .slick-active { - button { - background-color: @primary-color; - width: inherit; - border-radius: 5px; + .image-container { + position: relative; + z-index: 8; + top: 10px; + + .governance-top-left { + position: absolute; + top: -12px; + left: 16%; + animation: slideInFromLeft 1.5s ease-in-out; + + @media screen and (min-width: 1700px) { + left: 22%; + } + + @media screen and (max-width: 1400px) { + left: 10%; + } + + @media screen and (max-width: 1200px) { + left: 5%; } } - button { - background-color: @primary-color; - opacity: 0.7; - height: 10px; - width: 10px; - border-radius: 50%; + + .governance-middle-right { + position: absolute; + top: 50%; + right: 16%; + animation: slideInFromRight 1.5s ease-in-out; + + @media screen and (min-width: 1700px) { + right: 22%; + } + + @media screen and (max-width: 1400px) { + right: 10%; + } + + @media screen and (max-width: 1200px) { + right: 5%; + } + } + + .governance-bottom-right { + position: absolute; + bottom: -4%; + right: 16%; + animation: slideInFromRight 1.5s ease-in-out; + + @media screen and (min-width: 1700px) { + right: 22%; + } + + @media screen and (max-width: 1400px) { + right: 10%; + } + + @media screen and (max-width: 1200px) { + right: 5%; + } + } + + .collab-top-left { + position: absolute; + top: -20px; + left: 23%; + animation: slideInFromLeft 1.5s ease-in-out; + + @media screen and (min-width: 1700px) { + left: 30%; + } + + @media screen and (max-width: 1400px) { + left: 20%; + } + + @media screen and (max-width: 1200px) { + left: 16%; + } + } + + .collab-middle-right { + position: absolute; + top: 44%; + right: 20%; + animation: slideInFromRight 1.5s ease-in-out; + + @media screen and (min-width: 1700px) { + right: 30%; + } + + @media screen and (max-width: 1400px) { + right: 16%; + } + + @media screen and (max-width: 1200px) { + right: 12%; + } + } + + .observability-bottom-right { + position: absolute; + bottom: -26px; + right: 22%; + animation: slideInFromRight 1.5s ease-in-out; + + @media screen and (min-width: 1700px) { + right: 28%; + } + + @media screen and (max-width: 1400px) { + right: 18%; + } + + @media screen and (max-width: 1200px) { + right: 16%; + } + } + + .discovery-top-right { + position: absolute; + top: -16px; + right: 16%; + animation: slideInFromRight 1.5s ease-in-out; + + @media screen and (min-width: 1700px) { + right: 22%; + } + + @media screen and (max-width: 1300px) { + right: 10%; + } + } + + .discovery-middle-right { + position: absolute; + top: 40%; + right: 16%; + animation: slideInFromRight 1.5s ease-in-out; + + @media screen and (min-width: 1700px) { + right: 22%; + } + + @media screen and (max-width: 1300px) { + right: 10%; + } + } + + .ai-top-right { + position: absolute; + top: 12px; + right: 20%; + animation: slideInFromRight 1.5s ease-in-out; + + @media screen and (min-width: 1700px) { + right: 28%; + } + + @media screen and (max-width: 1300px) { + right: 14%; + } + } + + .ai-bottom-right { + position: absolute; + bottom: -28px; + right: 16%; + animation: slideInFromRight 1.5s ease-in-out; + + @media screen and (min-width: 1700px) { + right: 22%; + } + + @media screen and (max-width: 1300px) { + right: 12%; + } + } + + img { + animation: fadeIn 1s ease-in-out; } } } diff --git a/openmetadata-ui/src/main/resources/ui/src/pages/SignUp/BasicSignup.component.tsx b/openmetadata-ui/src/main/resources/ui/src/pages/SignUp/BasicSignup.component.tsx index 303c9c5f723..3fbab26d65f 100644 --- a/openmetadata-ui/src/main/resources/ui/src/pages/SignUp/BasicSignup.component.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/pages/SignUp/BasicSignup.component.tsx @@ -11,7 +11,7 @@ * limitations under the License. */ -import { Button, Col, Divider, Form, Input, Row, Typography } from 'antd'; +import { Button, Col, Form, Input, Row, Typography } from 'antd'; import { isEmpty } from 'lodash'; import React, { useMemo } from 'react'; import { useTranslation } from 'react-i18next'; @@ -75,11 +75,11 @@ const BasicSignUp = () => { return ( <> - - -
- - + + +
+ + {t('message.om-description')} @@ -109,6 +109,7 @@ const BasicSignUp = () => { rules={[{ whitespace: true, required: true }]}> { name="lastName" rules={[{ whitespace: true, required: true }]}> { name="email" rules={[{ type: 'email', required: true }]}> { ]}> { ]}> - - - - {t('label.or-lowercase')} - - -
{t('message.already-a-user')} @@ -214,7 +216,7 @@ const BasicSignUp = () => {
- +