Skip to content

Commit ca6a88e

Browse files
Park-min-hyoungPark-min-hyoung
committed
Merge branch 'dev' into feat/map-certificaiton-update
2 parents dfd7e00 + 1f38424 commit ca6a88e

91 files changed

Lines changed: 2443 additions & 170 deletions

File tree

Some content is hidden

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

‎components.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
"tsx": true,
66
"tailwind": {
77
"config": "tailwind.config.ts",
8-
"css": "src/styles/index.css",
8+
"css": "src/index.css",
99
"baseColor": "slate",
1010
"cssVariables": true,
1111
"prefix": ""
@@ -18,4 +18,4 @@
1818
"hooks": "@/hooks"
1919
},
2020
"iconLibrary": "lucide"
21-
}
21+
}

‎index.html‎

Lines changed: 23 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,23 @@
1-
<!doctype html>
2-
<html lang="en">
3-
<head>
4-
<meta charset="UTF-8" />
5-
<link rel="icon" type="image/svg+xml" href="/vite.svg" />
6-
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
7-
<title>Check Locatiion</title>
8-
</head>
9-
<body>
10-
<div id="root"></div>
11-
<script type="module" src="/src/main.tsx"></script>
12-
<script
13-
type="text/javascript"
14-
src="//dapi.kakao.com/v2/maps/sdk.js?appkey=%VITE_KAKAO_API%&libraries=services,clusterer"
15-
></script>
16-
</body>
17-
</html>
1+
<!doctype html>
2+
<html lang="en">
3+
<head>
4+
<meta charset="UTF-8" />
5+
<link rel="icon" type="image/svg+xml" href="/vite.svg" />
6+
<link href="/dist/styles.css" rel="stylesheet" />
7+
<link
8+
rel="stylesheet"
9+
href="https://cdn.jsdelivr.net/gh/orioncactus/pretendard@v1.3.9/dist/web/static/pretendard.min.css"
10+
/>
11+
12+
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
13+
<title>Check Locatiion</title>
14+
</head>
15+
<body>
16+
<div id="root"></div>
17+
<script type="module" src="/src/main.tsx"></script>
18+
<script
19+
type="text/javascript"
20+
src="//dapi.kakao.com/v2/maps/sdk.js?appkey=%VITE_KAKAO_API%&libraries=services,clusterer"
21+
></script>
22+
</body>
23+
</html>

‎package.json‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
"storybook": "storybook dev -p 6006",
2222
"build-storybook": "storybook build",
2323
"test": "jest --coverage=false --watchAll=false",
24-
"prepare": "husky install"
24+
"prepare": "husky"
2525
},
2626
"lint-staged": {
2727
"**/*.{ts,tsx,mdx}": [
@@ -31,14 +31,17 @@
3131
},
3232
"dependencies": {
3333
"@radix-ui/react-popover": "^1.1.6",
34+
"@radix-ui/react-progress": "^1.1.2",
3435
"@radix-ui/react-slot": "^1.1.1",
3536
"@tanstack/react-query": "^5.65.0",
3637
"axios": "^1.7.9",
3738
"class-variance-authority": "^0.7.1",
3839
"clsx": "^2.1.1",
40+
"date-fns": "^4.1.0",
3941
"es-toolkit": "^1.31.0",
4042
"lucide-react": "^0.473.0",
4143
"react": "^18.3.1",
44+
"react-calendar": "^5.1.0",
4245
"react-dom": "^18.3.1",
4346
"react-error-boundary": "^5.0.0",
4447
"react-helmet-async": "^2.0.5",
@@ -70,7 +73,10 @@
7073
"@typescript-eslint/parser": "^7.18.0",
7174
"@vitejs/plugin-react-swc": "^3.7.2",
7275
"autoprefixer": "^10.4.20",
76+
"class-variance-authority": "^0.7.1",
77+
"clsx": "^2.1.1",
7378
"cssnano": "^7.0.6",
79+
"es-toolkit": "^1.32.0",
7480
"eslint": "^8.57.0",
7581
"eslint-config-prettier": "^9.1.0",
7682
"eslint-config-react-app": "^7.0.1",

0 commit comments

Comments
 (0)