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

5주차 코드리뷰 피드백 반영 #46

Merged
merged 3 commits into from
Oct 8, 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
24 changes: 12 additions & 12 deletions src/app/routes/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -16,66 +16,66 @@ import MyPage from '@/pages/siniddo/mypage';

const router = createBrowserRouter([
{
path: RouterPath.root,
path: RouterPath.ROOT,
element: <MainPage />,
},
{
path: RouterPath.register,
path: RouterPath.REGISTER,
element: <RegisterPage />,
},
{
path: RouterPath.mypage,
path: RouterPath.MYPAGE,
element: <MyPage />,
},
{
path: RouterPath.serviceHistory,
path: RouterPath.SERVICE_HISTORY,
element: <ServiceHistoryPage />,
},
{
path: RouterPath.helloCall,
path: RouterPath.HELLO_CALL,
children: [
{
index: true,
element: <HelloCallListPage />,
},
{
path: RouterPath.helloCallService,
path: RouterPath.HELLO_CALL_SERVICE,
element: <HelloCallServicePage />,
},
{
path: RouterPath.helloCallReport,
path: RouterPath.HELLO_CALL_REPORT,
element: <HelloCallReportPage />,
},
],
},
{
path: RouterPath.seniorRegister,
path: RouterPath.SENIOR_REGISTER,
element: <SeniorRegisterPage />,
},
{
path: RouterPath.callBackList,
path: RouterPath.CALL_BACK_LIST,
children: [
{
index: true,
element: <CallBackListPage />,
},
{
path: RouterPath.callBackDetail,
path: RouterPath.CALL_BACK_DETAIL,
children: [
{
index: true,
element: <CallBackDetailPage />,
},
{
path: RouterPath.callBackGuidLine,
path: RouterPath.CALL_BACK_GUID_LINE,
element: <SiniddoGuideLinePage />,
},
],
},
],
},
{
path: RouterPath.siniddoReview,
path: RouterPath.SINIDDO_REVIEW,
element: <SiniddoReviewPage />,
},
]);
Expand Down
26 changes: 13 additions & 13 deletions src/app/routes/path.ts
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
export const RouterPath = {
root: '/',
login: '/login',
register: '/register',
mypage: `/mypage`,
serviceHistory: `/service-history`,
helloCallService: 'service',
helloCallReport: 'report',
helloCall: `/hello-call`,
callBackList: '/call-back',
callBackDetail: ':callBackId',
callBackGuidLine: ':guideLineId',
seniorRegister: `/senior-register`,
siniddoReview: `/siniddo-review`,
ROOT: '/',
LOGIN: '/login',
REGISTER: '/register',
MYPAGE: `/mypage`,
SERVICE_HISTORY: `/service-history`,
HELLO_CALL_SERVICE: 'service',
HELLO_CALL_REPORT: 'report',
HELLO_CALL: `/hello-call`,
CALL_BACK_LIST: '/call-back',
CALL_BACK_DETAIL: ':callBackId',
CALL_BACK_GUID_LINE: ':guideLineId',
SENIOR_REGISTER: `/senior-register`,
SINIDDO_REVIEW: `/siniddo-review`,
};
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,13 @@ import { BasicButton } from '@/shared/components/common/button';
import styled from '@emotion/styled';

type Props = {
handleClcik: () => void;
handleClick: () => void;
};

export const PreAcceptMenu = ({ handleClcik }: Props) => {
export const PreAcceptMenu = ({ handleClick }: Props) => {
return (
<Wrapper>
<BasicButton onClick={handleClcik}>전화걸기 및 수락하기</BasicButton>
<BasicButton onClick={handleClick}>전화걸기 및 수락하기</BasicButton>
</Wrapper>
);
};
Expand Down
5 changes: 2 additions & 3 deletions src/shared/components/common/button/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,8 @@ export const BasicButton = styled.button<Props>`

font-size: var(--font-size-md);
font-weight: 300;

transition: background-color 0.3s ease;
transition: color 0.3s ease;
transition: 0.3s ease;
transition-property: background-color, color;

&:hover {
background-color: #e3e8ef;
Expand Down
18 changes: 17 additions & 1 deletion src/shared/theme/global/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,23 @@ export const globalStyle = css`
font-family: 'Pretendard-Regular';
src: url('https://fastly.jsdelivr.net/gh/Project-Noonnu/[email protected]/Pretendard-Regular.woff')
format('woff');
font-weight: 400, 700, 900;
font-weight: 400;
font-style: normal;
}

@font-face {
font-family: 'Pretendard-Regular';
src: url('https://fastly.jsdelivr.net/gh/Project-Noonnu/[email protected]/Pretendard-Regular.woff')
format('woff');
font-weight: 700;
font-style: normal;
}

@font-face {
font-family: 'Pretendard-Regular';
src: url('https://fastly.jsdelivr.net/gh/Project-Noonnu/[email protected]/Pretendard-Regular.woff')
format('woff');
font-weight: 900;
font-style: normal;
}

Expand Down