Skip to content

Commit

Permalink
Merge pull request #19 in PROD/datahubenterprise from ~TISANGUL/datah…
Browse files Browse the repository at this point in the history
…ubenterprise:DHFPROD-3030 to develop

* commit '99822b12eab361a8d3478a0495bcf16d600141bb':
  added antd layout for home page
  added space in the footer area to make copyright statement visible, made icon image smaller and moved sign in div element a liitle up
  DHFPROD-3030 Add policy information to Explorer Login view
  • Loading branch information
Bruce An authored and Bruce An committed Aug 19, 2019
2 parents 9c237b7 + 99822b1 commit 709d612
Show file tree
Hide file tree
Showing 2 changed files with 59 additions and 15 deletions.
36 changes: 33 additions & 3 deletions web/src/main/explorer-ui/src/pages/Home.module.scss
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,44 @@
position: absolute;
margin-top: -150px;
right: 70px;

}

.container {
min-height: 90vh;
background: transparent;
position: relative;
}

.footer {
position: relative;
background: transparent;
}

.grid{
margin-top: 240px;
margin-top: 180px;
}

.title{
font-size: 40px;
text-align: middle;
}
}

.copyright {
position: relative;
width: 100%;
text-align: center;
}

.copyright a {
color: inherit;
text-decoration: underline;
}

.policy {
line-height: 1.2;
}

.policy a {
color: inherit;
text-decoration: underline;
}
38 changes: 26 additions & 12 deletions web/src/main/explorer-ui/src/pages/Home.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,23 +2,37 @@ import React from 'react';
import LoginForm from '../components/login-form/login-form';
import DatahubIcon from '../components/datahub-icon/datahub-icon';
import styles from './Home.module.scss';
import { Row, Col, Typography } from 'antd';
import { Layout, Row, Col, Typography } from 'antd';

const { Title } = Typography;
const { Title, Text } = Typography;

const Home: React.FC = () => {
const { Content, Footer } = Layout;
return (
<>
<Layout className={styles.container}>
<Content>
<div className={styles.icon}>
<DatahubIcon size={890} fill='lightgrey' view='0 0 55 55'/>
</div>
<Row className={styles.grid}>
<Col span={12} offset={3}>
<Title level={2}>Sign In</Title>
<LoginForm />
</Col>
</Row>
</>
<DatahubIcon size={760} fill='lightgrey' view='0 0 55 55' />
</div>
<Row className={styles.grid}>
<Col span={12} offset={3}>
<Title level={2}>Sign In</Title>
<LoginForm />
<div className={styles.policy}>
<Text type="secondary">
We're committed to processing your personal data in{<br />}
compliance with our <a href="https://www.marklogic.com/privacy/" target="_blank">Privacy Statement</a> while providing{<br />}
you with transparent notice about our practices.</Text>
</div>
</Col>
</Row>
</Content>
<Footer className={styles.footer}>
<div className={styles.copyright}>
<Text type="secondary">Copyright @ 2019 MarkLogic Corporation. All Rights Reserved | <a href="https://s3-us-west-2.amazonaws.com/marklogic-services-resources/legal/ServiceTerms.pdf" target="_blank">Terms and Conditions</a> | <a href="https://www.marklogic.com/privacy/" target="_blank">Policies</a></Text>
</div>
</Footer>
</Layout>
);
}

Expand Down

0 comments on commit 709d612

Please sign in to comment.