change login screen images as per new layout (#15526)

* change login screen images as per new layout

* fix the image size and layout background color

* class naming change
This commit is contained in:
Ashish Gupta 2024-03-14 10:35:45 +05:30 committed by GitHub
parent 7718f1c560
commit 22cd2ca74e
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
15 changed files with 298 additions and 263 deletions

Binary file not shown.

Before

Width:  |  Height:  |  Size: 840 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 780 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 741 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 556 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 633 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 259 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 246 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 237 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 266 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 240 KiB

View File

@ -12,36 +12,40 @@
*/ */
import { CarouselProps } from 'antd'; import { CarouselProps } from 'antd';
import collaborationImg from '../assets/img/data-collaboration.png'; import loginClassBase from './LoginClassBase';
import discoveryImg from '../assets/img/data-discovery.png';
import governanceImg from '../assets/img/data-governance.png'; const {
import insightImg from '../assets/img/data-insights.png'; dataDiscovery,
import dataQualityImg from '../assets/img/data-qauality.png'; dataQuality,
governance,
dataInsightPlural,
dataCollaboration,
} = loginClassBase.carouselImages();
export const LOGIN_SLIDE = [ export const LOGIN_SLIDE = [
{ {
title: 'data-discovery', title: 'data-discovery',
image: discoveryImg, image: dataDiscovery,
descriptionKey: 'enables-end-to-end-metadata-management', descriptionKey: 'enables-end-to-end-metadata-management',
}, },
{ {
title: 'data-quality', title: 'data-quality',
image: dataQualityImg, image: dataQuality,
descriptionKey: 'discover-your-data-and-unlock-the-value-of-data-assets', descriptionKey: 'discover-your-data-and-unlock-the-value-of-data-assets',
}, },
{ {
title: 'governance', title: 'governance',
image: governanceImg, image: governance,
descriptionKey: 'assess-data-reliability-with-data-profiler-lineage', descriptionKey: 'assess-data-reliability-with-data-profiler-lineage',
}, },
{ {
title: 'data-insight-plural', title: 'data-insight-plural',
image: insightImg, image: dataInsightPlural,
descriptionKey: 'fosters-collaboration-among-producers-and-consumers', descriptionKey: 'fosters-collaboration-among-producers-and-consumers',
}, },
{ {
title: 'data-collaboration', title: 'data-collaboration',
image: collaborationImg, image: dataCollaboration,
descriptionKey: 'deeply-understand-table-relations-message', descriptionKey: 'deeply-understand-table-relations-message',
}, },
]; ];

View File

@ -0,0 +1,35 @@
/*
* Copyright 2024 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 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';
class LoginClassBase {
public carouselImages() {
return {
dataDiscovery: discoveryImg,
dataQuality: dataQualityImg,
governance: governanceImg,
dataInsightPlural: insightImg,
dataCollaboration: collaborationImg,
};
}
}
const loginClassBase = new LoginClassBase();
export default loginClassBase;
export { LoginClassBase };

View File

@ -190,9 +190,8 @@ const SignInPage = () => {
const onClickForgotPassword = () => history.push(ROUTES.FORGOT_PASSWORD); const onClickForgotPassword = () => history.push(ROUTES.FORGOT_PASSWORD);
return ( return (
<div className="d-flex flex-col h-full bg-white"> <Row className="h-full" data-testid="signin-page">
<Row className="flex flex-grow" data-testid="signin-page"> <Col className="bg-white" span={8}>
<Col span={8}>
<div <div
className={classNames('mt-24 text-center flex-center flex-col', { className={classNames('mt-24 text-center flex-center flex-col', {
'sso-container': !isAuthProviderBasic, 'sso-container': !isAuthProviderBasic,
@ -319,7 +318,6 @@ const SignInPage = () => {
<LoginCarousel /> <LoginCarousel />
</Col> </Col>
</Row> </Row>
</div>
); );
}; };

View File

@ -49,6 +49,7 @@
transform: translate(-50%, -50%); transform: translate(-50%, -50%);
.slick-dots.slick-dots-bottom { .slick-dots.slick-dots-bottom {
position: initial;
.slick-active { .slick-active {
button { button {
background-color: @primary-color; background-color: @primary-color;

View File

@ -11,7 +11,7 @@
* limitations under the License. * limitations under the License.
*/ */
import { Button, Divider, Form, Input, Typography } from 'antd'; import { Button, Col, Divider, Form, Input, Row, Typography } from 'antd';
import { isEmpty } from 'lodash'; import { isEmpty } from 'lodash';
import React, { useMemo } from 'react'; import React, { useMemo } from 'react';
import { useTranslation } from 'react-i18next'; import { useTranslation } from 'react-i18next';
@ -66,9 +66,8 @@ const BasicSignUp = () => {
const handleLogin = () => history.push(ROUTES.SIGNIN); const handleLogin = () => history.push(ROUTES.SIGNIN);
return ( return (
<div className="d-flex flex-col h-full bg-white"> <Row className="h-full" data-testid="signin-page">
<div className="d-flex flex-grow" data-testid="signin-page"> <Col className="bg-white" span={10}>
<div className="w-5/12">
<div className="mt-4 text-center flex-center flex-col"> <div className="mt-4 text-center flex-center flex-col">
<BrandImage height="auto" width={200} /> <BrandImage height="auto" width={200} />
<Typography.Text className="mt-8 w-80 text-xl font-medium text-grey-muted"> <Typography.Text className="mt-8 w-80 text-xl font-medium text-grey-muted">
@ -151,9 +150,7 @@ const BasicSignUp = () => {
); );
} }
if (value !== password) { if (value !== password) {
return Promise.reject( return Promise.reject(t('label.password-not-match'));
t('label.password-not-match')
);
} }
return Promise.resolve(); return Promise.resolve();
@ -194,8 +191,9 @@ const BasicSignUp = () => {
</div> </div>
) : null} ) : null}
</div> </div>
</div> </Col>
<div className="w-7/12 relative">
<Col className="relative" span={14}>
<div className="absolute inset-0"> <div className="absolute inset-0">
<img <img
alt="bg-image" alt="bg-image"
@ -206,9 +204,8 @@ const BasicSignUp = () => {
</div> </div>
<LoginCarousel /> <LoginCarousel />
</div> </Col>
</div> </Row>
</div>
); );
}; };