Skip to content

Commit 7961b82

Browse files
authored
Merge pull request #95 from Duri-Salon/hotfix/salon
�[hotfix] auth페이지 수정
2 parents 0f3efa5 + c0d402e commit 7961b82

File tree

3 files changed

+63
-23
lines changed

3 files changed

+63
-23
lines changed

apps/duri/src/pages/Auth/index.tsx

Lines changed: 28 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ import { useEffect } from 'react';
22
import { useNavigate, useSearchParams } from 'react-router-dom';
33

44
import {
5+
Doori,
56
DuriDog,
67
Flex,
78
MobileLayout,
@@ -34,11 +35,11 @@ const AuthPage = () => {
3435
}, [data, error]);
3536

3637
return (
37-
<MobileLayout>
38+
<RelativeMobileLayout>
3839
<Container direction="column">
3940
{/** 로고 */}
4041
<DuriDog width={169} height={143} />
41-
<Flex direction="column" margin="24px 0 0 0">
42+
<Flex direction="column">
4243
<Text typo="Heading">두리묭실로</Text>
4344
<Text typo="Heading">쉽고 빠르게 예약해요!</Text>
4445
<Text
@@ -68,25 +69,47 @@ const AuthPage = () => {
6869
</Text>
6970
</Contact>
7071
</Container>
71-
</MobileLayout>
72+
<AuthWrapper>
73+
<Doori color={theme.palette.White} height={40} />
74+
<Text typo="Body1" colorCode={theme.palette.White}>
75+
두리묭실 입장 중...
76+
</Text>
77+
</AuthWrapper>
78+
</RelativeMobileLayout>
7279
);
7380
};
7481

82+
const RelativeMobileLayout = styled(MobileLayout)`
83+
position: relative;
84+
`;
85+
86+
const AuthWrapper = styled(Flex)`
87+
position: absolute;
88+
top: 0;
89+
left: 0;
90+
width: 100%;
91+
height: 100%;
92+
background-color: rgba(0, 0, 0, 0.5);
93+
flex-direction: column;
94+
gap: 16px;
95+
`;
96+
7597
const Container = styled(Flex)`
7698
flex-grow: 1;
7799
position: relative;
78100
`;
79101

80-
const LoginButton = styled.button`
102+
const LoginButton = styled.div`
81103
width: 60px;
82104
height: 60px;
83105
margin-top: 20px;
84106
`;
85107

86-
const Contact = styled(Flex)`
108+
const Contact = styled.div`
87109
position: absolute;
88110
bottom: 50px;
89111
height: fit-content;
112+
text-decoration: none;
90113
`;
91114

92115
export default AuthPage;

apps/salon/src/pages/Auth/index.tsx

Lines changed: 35 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@ import { useEffect } from 'react';
22
import { useNavigate, useSearchParams } from 'react-router-dom';
33

44
import {
5+
Doori,
6+
DuriDog,
57
Flex,
68
MobileLayout,
79
NaverLogo,
@@ -33,14 +35,18 @@ const AuthPage = () => {
3335
}, [data, error]);
3436

3537
return (
36-
<MobileLayout>
38+
<RelativeMobileLayout>
3739
<Container direction="column">
3840
{/** 로고 */}
39-
<Logo src="/images/logo.png" />
40-
<Flex direction="column" margin="24px 0 0 0">
41+
<DuriDog width={169} height={143} />
42+
<Flex direction="column">
4143
<Text typo="Heading">두리묭실로</Text>
4244
<Text typo="Heading">쉽고 빠르게 예약해요!</Text>
43-
<Text typo="Body3" colorCode={theme.palette.Gray300}>
45+
<Text
46+
typo="Body3"
47+
colorCode={theme.palette.Gray300}
48+
margin="8px 0 0 0"
49+
>
4450
최저가 예약부터 근처 미용샵까지
4551
</Text>
4652
</Flex>
@@ -63,27 +69,47 @@ const AuthPage = () => {
6369
</Text>
6470
</Contact>
6571
</Container>
66-
</MobileLayout>
72+
<AuthWrapper>
73+
<Doori color={theme.palette.White} height={40} />
74+
<Text typo="Body1" colorCode={theme.palette.White}>
75+
두리묭실 입장 중...
76+
</Text>
77+
</AuthWrapper>
78+
</RelativeMobileLayout>
6779
);
6880
};
6981

82+
const RelativeMobileLayout = styled(MobileLayout)`
83+
position: relative;
84+
`;
85+
86+
const AuthWrapper = styled(Flex)`
87+
position: absolute;
88+
top: 0;
89+
left: 0;
90+
width: 100%;
91+
height: 100%;
92+
background-color: rgba(0, 0, 0, 0.5);
93+
flex-direction: column;
94+
gap: 16px;
95+
`;
96+
7097
const Container = styled(Flex)`
7198
flex-grow: 1;
7299
position: relative;
73100
`;
74101

75-
const Logo = styled.img``;
76-
77-
const LoginButton = styled.button`
102+
const LoginButton = styled.div`
78103
width: 60px;
79104
height: 60px;
80105
margin-top: 20px;
81106
`;
82107

83-
const Contact = styled(Flex)`
108+
const Contact = styled.div`
84109
position: absolute;
85110
bottom: 50px;
86111
height: fit-content;
112+
text-decoration: none;
87113
`;
88114

89115
export default AuthPage;

apps/salon/src/pages/Home/index.tsx

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -26,14 +26,12 @@ import {
2626
useGetGroomersList,
2727
useGetHomeQuotationRequest,
2828
useGetHomeShopInfo,
29-
useGetRecentDaysIncome,
3029
useModal,
3130
usePutGroomingComplete,
3231
usePutGroomingNoshow,
3332
} from '@duri-fe/utils';
3433
import styled from '@emotion/styled';
3534
import { RadioButton } from '@salon/components/home/RadioButton';
36-
import { RecentIncomeStatistic } from '@salon/components/income/RecentIncomeStatistic';
3735
import { DetailRequest } from '@salon/components/quotation/DetailRequest';
3836
import useGroomerStore from '@salon/stores/groomerStore';
3937

@@ -69,7 +67,6 @@ const Home = () => {
6967
useGetDailySchedule();
7068
const { data: quotationRequestData, isPending: quotationRequestPending } =
7169
useGetHomeQuotationRequest();
72-
const { data: recentDaysIncomeData } = useGetRecentDaysIncome({});
7370
const { mutateAsync: putGroomingComplete } = usePutGroomingComplete();
7471
const { mutateAsync: putGroomingNoshow } = usePutGroomingNoshow();
7572

@@ -304,12 +301,6 @@ const Home = () => {
304301
)}
305302
</NewRequestWrapper>
306303

307-
{recentDaysIncomeData && (
308-
<RecentIncomeStatistic
309-
incomeMonthList={recentDaysIncomeData.incomeMonthList}
310-
/>
311-
)}
312-
313304
<SalonNavbar />
314305

315306
<BottomSheet {...bottomSheetProps}>

0 commit comments

Comments
 (0)