Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Task 11 set up questions #8

Merged
merged 6 commits into from
May 24, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file added src/assets/bn-logo.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 0 additions & 1 deletion src/components/app/App.css
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
#root {
max-width: 1440px;
margin: 0 auto;
}

Expand Down
6 changes: 3 additions & 3 deletions src/components/form-footer/FormFooter.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -9,17 +9,17 @@ type Props = {
const FormFooter: FC<Props> = ({isPreviewButton = true, isLastStep = false}) => {
const navigate = useNavigate()
return (
<Row justify={'end'} className={'form-footer'}>
<Row className={'form-footer'}>
<Col>
{isPreviewButton && (
<Button type={'text'} onClick={() => navigate(-1)}
style={{marginRight: 12}}>{'Preview step'}</Button>
style={{marginRight: 16}}>{'Back'}</Button>
)}
{isLastStep && (
<Button type={'primary'} size={'large'} htmlType={'submit'}>{'Submit'}</Button>
)}
{!isLastStep && (
<Button type={'primary'} size={'large'} htmlType={'submit'}>{'Next step'}</Button>
<Button type={'primary'} htmlType={'submit'}>{'Continue'}</Button>
)}
</Col>
</Row>
Expand Down
21 changes: 21 additions & 0 deletions src/components/header/Header.scss
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
.app-header {
position: relative;
height: 100vh;
padding: 200px 56px 0 64px;
background-color: #ffffff;
Expand All @@ -25,8 +26,28 @@
}

.header-text {
display: block;
max-width: 330px;
font-weight: 500;
color: #8d8d8f;
}
}

.rights {
position: absolute;
bottom: 0;
left: 0;
width: 100%;
display: flex;
align-items: center;
gap: 7px;
padding: 31px 65px 30px 65px;

span {
font-family: "Inter Medium";
font-size: 14px;
line-height: 1.15;
color: #8d8d8f;
}
}
}
10 changes: 8 additions & 2 deletions src/components/header/Header.tsx
Original file line number Diff line number Diff line change
@@ -1,8 +1,10 @@
import { Button, Layout, Typography } from "antd";
import logo from "../../assets/logo.png"
import bnLogo from "../../assets/bn-logo.png"
import './Header.scss'
import { useNavigate } from "react-router-dom";


const {Title, Text} = Typography
const Header = () => {
const navigate = useNavigate()
Expand All @@ -13,8 +15,12 @@ const Header = () => {
<img src={logo}/>
{'Mortgage Calculator'}</Button>
<Title level={1}>{'Find your refinance options'}</Title>
<Text className={'header-text'}>{'Mortgage refinancing is when you replace your current home loan with a new one.\n' +
'This is a demo of a form submission.'}</Text>
<Text className={'header-text'}>{'Mortgage refinancing is when you replace your current home loan with a new one.'}</Text>
<Text className={'header-text'}>{'This is a demo of a form submission.'}</Text>
</div>
<div className={'rights'}>
<Text>{'created by'}</Text>
<img src={bnLogo}/>
</div>
</Layout.Sider>
);
Expand Down
46 changes: 29 additions & 17 deletions src/components/lender-card/LenderCard.scss
Original file line number Diff line number Diff line change
@@ -1,41 +1,53 @@
.lender-card {
position: relative;
width: 100%;
height: 100%;
padding: 8px;

.ant-input-affix-wrapper &:hover {
border-color: #4169f6;

.name {
color: #4169f6;
}
}

.image-container {
z-index: 0;
position: absolute;
left: 0;
top: 8px;
width: 100%;
height: 60%;
height: 64px;
margin-bottom: 16px;

img {
display: block;
width: 100%;
height: 100%;
object-fit: contain;
}
}

.content {
display: flex;
background-color: transparent;
width: 100%;
z-index: 2;
position: absolute;
bottom: 5px;
left: 5px;
display: flex;
gap: 8px;

.check-box {
width: 20px;
height: 20px;
width: 24px;
height: 24px;
display: flex;
align-items: center;
justify-content: center;
border: 1px solid #d1d1d1;
border: 1px solid #b9b9ba;
border-radius: 2px;
margin-right: 5px;
background-color: #f0f0f0;
background-color: #e7e7e9;
}

.label {
font-family: "Inter Medium";
font-size: 16px;
line-height: 1.5;
}

.name {
color: #101012;
}
}

Expand Down
54 changes: 26 additions & 28 deletions src/components/lender-card/LenderCard.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -10,38 +10,36 @@ import halifax from '../../assets/halifax.png'
const {Title, Text} = Typography

type Props = {
number: string
name: string
number: string
name: string
}

const LenderCard: FC<Props> = ({number, name}) => {
let imageUrl
switch (number) {
case '1': imageUrl = accord
break;
case '2': imageUrl = barclays
break;
case '3': imageUrl = coventry
break;
case '4': imageUrl = halifax
break;
default: imageUrl = accord
}
return (
<div className={'lender-card'}>
<div className="image-container">
<img src={imageUrl} alt="logo"/>
</div>
<div className="content">
<div className="check-box">
<Text style={{fontSize: 12}}>{number}</Text>
</div>
<Text style={{fontSize: 10}}>{name}</Text>
</div>
<div className="selected-overlay"/>

let imageUrl
switch (number) {
case '1': imageUrl = accord
break;
case '2': imageUrl = barclays
break;
case '3': imageUrl = coventry
break;
case '4': imageUrl = halifax
break;
default: imageUrl = accord
}
return (
<div className={'lender-card'}>
<div className="image-container">
<img src={imageUrl} alt="logo"/>
</div>
<div className="content">
<div className="check-box">
<Text className={'label'}>{number}</Text>
</div>
);
<Text className={'label name'}>{name}</Text>
</div>
</div>
);
};

export default LenderCard;
26 changes: 18 additions & 8 deletions src/components/radio-option-card/RadioOptionCard.scss
Original file line number Diff line number Diff line change
@@ -1,27 +1,37 @@
.radio-option-card {
position: relative;
width: 100%;
height: 100%;
display: flex;
align-items: center;

.content {
padding-left: 10px;
display: flex;
align-items: center;
background-color: transparent;
z-index: 2;
gap: 8px;

.check-box {
width: 20px;
height: 20px;
width: 24px;
height: 24px;
display: flex;
align-items: center;
justify-content: center;
border: 1px solid #d1d1d1;
border: 1px solid #b9b9ba;
border-radius: 2px;
margin-right: 8px;
background-color: #f0f0f0;
background-color: #e7e7e9;

.order {
font-family: "Inter Bold";
font-size: 12px;
line-height: 2;
}
}

.label {
font-family: "Inter Medium";
font-size: 16px;
line-height: 1.5;
color: #101012;
}
}

Expand Down
23 changes: 11 additions & 12 deletions src/components/radio-option-card/RadioOptionCard.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -5,22 +5,21 @@ import './RadioOptionCard.scss'
const {Title, Text} = Typography

type Props = {
number: string
name: string
number: string
name: string
}

const RadioOptionCard: FC<Props> = ({number, name}) => {
return (
<div className={'radio-option-card'}>
<div className="content">
<div className="check-box">
<Text style={{fontSize: 12}}>{number}</Text>
</div>
<Text style={{fontSize: 12}}>{name}</Text>
</div>
<div className="selected-overlay"/>
return (
<div className={'radio-option-card'}>
<div className="content">
<div className="check-box">
<Text className={'order'}>{number}</Text>
</div>
);
<Text className={'label'}>{name}</Text>
</div>
</div>
);
};

export default RadioOptionCard;
18 changes: 9 additions & 9 deletions src/components/step-title/StepTitle.tsx
Original file line number Diff line number Diff line change
@@ -1,18 +1,18 @@
import React, {FC} from 'react';
import {Typography} from "antd";
import './StepTitle.scss'
// import './StepTitle.scss'
type Props = {
title: string,
subtitle: string
title: string,
subtitle: string
}
const {Title, Paragraph} = Typography
const StepTitle:FC<Props> = ({title, subtitle}) => {
return (
<div className={'step-title'}>
<Title level={4}>{title}</Title>
<Paragraph style={{color: 'gray'}}>{subtitle}</Paragraph>
</div>
);
return (
<div className={'step-title'}>
<Title level={2}>{title}</Title>
<Paragraph className={'description'}>{subtitle}</Paragraph>
</div>
);
};

export default StepTitle;
18 changes: 11 additions & 7 deletions src/components/themeContext/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -24,15 +24,19 @@ export const theme : ThemeConfig = {
lineHeight: 1.71,
},
Input: {
borderRadius: 4,
colorBorder: "#B9B9BA",
colorErrorBorder: "#F6414C",
colorErrorText: "#F6414C",
fontSize: 16,
lineHeight: 24,
colorTextPlaceholder: "#A0A0A2",
paddingContentHorizontal: 16,
paddingContentVertical: 8,
colorText: "#101012",
borderRadiusLG: 4,
fontFamily: "Inter Medium",
},
DatePicker: {
colorBorder: "#B9B9BA",
colorTextPlaceholder: "#A0A0A2",
colorText: "#101012",
borderRadiusLG: 4,
fontFamily: "Inter Medium",
fontSize: 16,
}
},
token: {
Expand Down
Loading
Loading