Skip to content

Commit 3c73d7b

Browse files
committed
Merge branch 'develop' into feature/16
2 parents 6303a24 + 5ce24db commit 3c73d7b

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

52 files changed

+1298
-39
lines changed

package.json

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,12 @@
1212
"@tanstack/react-query": "^5.82.0",
1313
"axios": "^1.10.0",
1414
"clsx": "^2.1.1",
15+
"date-fns": "^4.1.0",
16+
"dayjs": "^1.11.13",
1517
"framer-motion": "^12.23.0",
1618
"next": "15.3.5",
1719
"react": "^19.0.0",
20+
"react-datepicker": "^8.4.0",
1821
"react-dom": "^19.0.0",
1922
"react-kakao-maps-sdk": "^1.2.0",
2023
"tailwind-merge": "^3.3.1",
@@ -25,6 +28,7 @@
2528
"@tailwindcss/postcss": "^4",
2629
"@types/node": "^20",
2730
"@types/react": "^19",
31+
"@types/react-datepicker": "^7.0.0",
2832
"@types/react-dom": "^19",
2933
"eslint": "^9",
3034
"eslint-config-next": "15.3.5",

pnpm-lock.yaml

Lines changed: 98 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

postcss.config.mjs

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
const config = {
2-
plugins: ["@tailwindcss/postcss"],
2+
plugins: {
3+
'@tailwindcss/postcss': {},
4+
},
35
};
46

57
export default config;
Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
import React from 'react';
2+
3+
interface IconArrowLeftProps extends React.SVGProps<SVGSVGElement> {
4+
size?: number;
5+
color?: string;
6+
}
7+
8+
const IconArrowLeft = ({
9+
size = 16,
10+
color = '#0B3B2D',
11+
...props
12+
}: IconArrowLeftProps) => (
13+
<svg
14+
xmlns="http://www.w3.org/2000/svg"
15+
width={size}
16+
height={size}
17+
viewBox="0 0 16 16"
18+
fill={color}
19+
{...props}
20+
>
21+
<path
22+
fill={color}
23+
d="m5.832 7.765 4.22-4.092c.263-.255.766-.1.766.236v8.183c0 .336-.503.491-.766.236l-4.22-4.092a.317.317 0 0 1 0-.471"
24+
></path>
25+
</svg>
26+
);
27+
28+
export default IconArrowLeft;
Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
import React from 'react';
2+
3+
interface IconArrowRightProps extends React.SVGProps<SVGSVGElement> {
4+
size?: number;
5+
color?: string;
6+
}
7+
8+
const IconArrowRight = ({
9+
size = 16,
10+
color = '#0B3B2D',
11+
...props
12+
}: IconArrowRightProps) => (
13+
<svg
14+
xmlns="http://www.w3.org/2000/svg"
15+
width={size}
16+
height={size}
17+
viewBox="0 0 16 16"
18+
fill={color}
19+
{...props}
20+
>
21+
<path
22+
fill={color}
23+
d="m10.168 7.764-4.22-4.092c-.263-.255-.766-.1-.766.236v8.183c0 .336.503.491.766.236l4.22-4.092a.317.317 0 0 0 0-.471"
24+
/>
25+
</svg>
26+
);
27+
28+
export default IconArrowRight;

src/assets/icon/check.tsx

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
import React from 'react';
2+
3+
const CheckIcon = ({ size = 24, ...props }) => (
4+
<svg
5+
xmlns='http://www.w3.org/2000/svg'
6+
width={size}
7+
height={size}
8+
fill='none'
9+
viewBox='0 0 24 24'
10+
>
11+
<circle cx='12' cy='12' r='12' fill='#121'></circle>
12+
<path
13+
stroke='#fff'
14+
strokeLinecap='round'
15+
strokeLinejoin='round'
16+
strokeWidth='1.5'
17+
d='m7.607 12.35 3.08 3.15 5.563-7.143'
18+
/>
19+
</svg>
20+
);
21+
22+
export default CheckIcon;
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
'use client';
22

33
import cn from '@lib/cn';
4-
import { ButtonProps } from './types';
4+
import { ButtonProps } from '@/types/buttonTypes';
55

66
/**
77
* 공통 Button 컴포넌트입니다.
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
'use client';
22

33
import { useId, useState } from 'react';
4-
import { InputProps } from './types';
4+
import { InputProps } from '@/types/inputTypes';
55
import OpenEyeIcon from '@assets/svg/open-eye';
66
import CloseEyeIcon from '@assets/svg/close-eye';
77
import cn from '@lib/cn';
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
'use client';
22

33
import cn from '@lib/cn';
4-
import { useModalContext } from './ModalContext';
5-
import { ModalProps } from './types';
4+
import { useModalContext } from '@/contexts/ModalContext';
5+
import { ModalProps } from '@/types/modalTypes';
66
import IconClose from '@assets/svg/close';
77

88
/**
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
'use client';
22

33
import cn from '@lib/cn';
4-
import { ModalProps } from './types';
5-
import { useModalContext } from './ModalContext';
4+
import { ModalProps } from '@/types/modalTypes';
5+
import { useModalContext } from '@/contexts/ModalContext';
66
import { createPortal } from 'react-dom';
77
import { useEffect, useState } from 'react';
88

0 commit comments

Comments
 (0)