Skip to content
Open
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
15 changes: 15 additions & 0 deletions src/GlobalStyle.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,19 @@ import PretendardExtraBold from './assets/fonts/Pretendard/Pretendard-ExtraBold.

const GlobalStyle = createGlobalStyle`

html {
font-size: 62.5%;
}

*{
box-sizing: border-box;
}

ul,ol,li{
padding: 0;
list-style: none;
}

@font-face {
font-family: 'Pretendard';
font-weight: 200;
Expand Down Expand Up @@ -44,6 +57,8 @@ const GlobalStyle = createGlobalStyle`
body {
font-family: 'Pretendard','SUIT',serif;



}
`;

Expand Down
2 changes: 1 addition & 1 deletion src/apis/axiosinstance.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import axios, { AxiosResponse, AxiosError } from 'axios';

const axiosInstance = axios.create({
baseURL: 'https://flexrate.online',
baseURL: import.meta.env.VITE_APP_BASE_URL,
headers: {
'Content-Type': 'application/json',
},
Expand Down
Binary file added src/assets/imgs/flexrateExplain.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed src/assets/imgs/notification.png
Binary file not shown.
2 changes: 2 additions & 0 deletions src/assets/svgs/0_index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import GreenCheckIcon from './GreenCheckIcon.svg?react';
import CircleCheckIcon from './CircleCheckIcon.svg?react';
import CircleCheckColor from './CircleCheckColor.svg?react';
import EditIcon from './EditIcon.svg?react';
import GraphMonk from './GraphMock.svg?react';

export {
HiddenIcon,
Expand All @@ -12,4 +13,5 @@ export {
CircleCheckIcon,
CircleCheckColor,
EditIcon,
GraphMonk,
};
3 changes: 3 additions & 0 deletions src/assets/svgs/GraphMock.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
7 changes: 3 additions & 4 deletions src/components/CoachMarksComs/Tooltip2.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -41,10 +41,9 @@ const Tooltip2 = () => {
return (
<TooltipContainer $directionIndex={1}>
<S.TooltipText>
<div>나의 대출 내역을 바탕으로</div>
<div>입력한 정보를 바탕으로 산출된</div>
<div>
<S.PointColorText>대출금 상환 및 납입 정보</S.PointColorText>를
알려드려요!
<S.PointColorText>맞춤형 대출 상품</S.PointColorText> 이에요!
</div>
</S.TooltipText>
<S.TooltipFooter>
Expand Down Expand Up @@ -99,7 +98,7 @@ const TooltipContainer = styled.span<TooltipProps>`
padding: 20px;
position: absolute;
z-index: 20;
bottom: -10rem;
bottom: -15rem;
left: 20rem;

&::after {
Expand Down
45 changes: 22 additions & 23 deletions src/components/DashboardComs/DashHeader.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,15 @@ const Title = styled.div<{ $borderColor: string }>`
border-left: 2px solid ${(props) => props.$borderColor};
padding-left: 8px;
`;

const StSubTitle = styled.p`
color: #8e9cb0;
font-family: Pretendard;
font-size: 10px;
font-style: normal;
font-weight: 600;
line-height: normal;
`;
const Bold = styled.span`
color: black;
font-size: 16px;
Expand All @@ -72,16 +81,6 @@ const Bold = styled.span`
const BoldGreen = styled(Bold)`
color: #63c393;
`;
const Box = styled.span<{ $backgroundColor: string }>`
//color background color prop으로
font-size: 10px;
font-weight: 700;
line-height: 12px;
border-radius: 5px;
background-color: ${(props) => props.$backgroundColor};
color: ${(props) => props.color};
padding: 3px 5px;
`;

const DashHeader = () => {
const [coachMark, setCoachMark] = useRecoilState(CoachMarkStage);
Expand Down Expand Up @@ -109,32 +108,32 @@ const DashHeader = () => {
<div>
<BoldGreen>Flexrate</BoldGreen>
<Bold>신용대출</Bold>
<Box color="#682A1A" $backgroundColor="#f6e5df">
{`${data.loan_request / 10000}만원`}
</Box>
<Box color="#682A1A" $backgroundColor="#f6e5df">
{`${data.loan_repay_term * 12}개월`}
</Box>
</div>
<StSubTitle>
입력하신 금융 정보를 모두 고려하여 추천된 대출상품이에요.
</StSubTitle>
</Container>
<Container>
<div>
<Title $borderColor="#60C5C5">다음 달 대출금 상환 날짜</Title>
<Title $borderColor="#60C5C5">나의 대출 금리</Title>
</div>
<div>
<Bold>2024년 1월 19일</Bold>
<Box color="#406969" $backgroundColor="#E0F2F3">
D-31일 남았어요
</Box>
<Bold>{12}%</Bold>
</div>
<StSubTitle>
입력하신 금융 정보를 모두 고려하여 추천된 대출 금리예요.
</StSubTitle>
</Container>
<LastContainer>
<div>
<Title $borderColor="#4D81BF">금리 갱신 회차</Title>
<Title $borderColor="#4D81BF">나의 대출 가능 한도</Title>
</div>
<div>
<Bold>{data.changes.length}회차</Bold>
<Bold>{300}만원</Bold>
</div>
<StSubTitle>
입력하신 금융 정보를 기반으로 산출된 대출 한도예요.
</StSubTitle>
</LastContainer>
{isVisible && <Tooltip2 />}
</DashHeaderWrapper>
Expand Down
Loading