Skip to content

Commit 7d0b155

Browse files
committed
merge dev
2 parents ec28dfe + c0ab6e3 commit 7d0b155

File tree

3 files changed

+15
-16
lines changed

3 files changed

+15
-16
lines changed

src/pages/Home.tsx

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
import { useNavigate } from "react-router-dom";
22
import Banner from "@/components/Banner";
3-
import PrimaryButton from "@/components/button/PrimaryButton";
43
import NavBar from "@/components/NavBar";
54
import StrokeBanner from "@/components/StrokeBanner";
65
import SubTitle from "@/components/SubTitle";
@@ -15,7 +14,7 @@ const Home = () => {
1514
};
1615

1716
return (
18-
<div className="flex w-[360px] flex-col bg-white md:w-[375px] lg:w-[500px]">
17+
<div className="flex flex-col bg-white w-[360px] md:w-[375px] lg:w-[500px]">
1918
<header>
2019
<NavBar />
2120
</header>
@@ -26,7 +25,7 @@ const Home = () => {
2625
</section>
2726

2827
<section className="mt-5 w-full" aria-label="빠른 대화">
29-
<div className="w-full px-[20px] py-[13px]">
28+
<div className="px-[20px] py-[13px] w-full">
3029
<SubTitle mode="빠른대화" />
3130
</div>
3231
<div className="px-5 py-3">
@@ -35,7 +34,7 @@ const Home = () => {
3534
</section>
3635

3736
<section aria-label="친구 목록">
38-
<div className="w-full px-[20px] py-[21px]">
37+
<div className="px-[20px] py-[21px] w-full">
3938
<SubTitle mode="친구목록" />
4039
</div>
4140
<div className="flex justify-center pb-[127px]">

tsconfig.app.json

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,12 @@
44
"paths": {
55
"@/*": ["*"],
66
"@/components/*": ["components/*"],
7+
"@/hooks/*": ["hooks/*"],
8+
"@/store/*": ["store/*"],
9+
"@/types/*": ["types/*"],
710
"@/utils/*": ["utils/*"],
8-
"@/store/*" : ["store/*"],
11+
"@/constant/*": ["constant/*"],
12+
913
},
1014
"tsBuildInfoFile": "./node_modules/.tmp/tsconfig.app.tsbuildinfo",
1115
"target": "ES2020",

vite.config.ts

Lines changed: 7 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -3,35 +3,31 @@ import react from "@vitejs/plugin-react";
33
import tailwindcss from "@tailwindcss/vite";
44
import { defineConfig } from "vite";
55

6-
// https://vite.dev/config/
6+
// vite에서 @/store/useAuthStore와 같은 절대 경로를 사용하려면,
7+
// vite.config.ts 파일에서 alias 설정을 추가해야 합니다.(tsconfig.json을 인식하지 못함)
8+
79
export default defineConfig({
810
plugins: [react(), tailwindcss()],
911
resolve: {
1012
alias: [
1113
{ find: "@/", replacement: path.resolve(__dirname, "src") },
14+
{ find: "@/api", replacement: path.resolve(__dirname, "src/api") },
1215
{
1316
find: "@/components",
1417
replacement: path.resolve(__dirname, "src/components")
1518
},
19+
{ find: "@/hooks", replacement: path.resolve(__dirname, "src/hooks") },
1620
{
1721
find: "@/pages",
1822
replacement: path.resolve(__dirname, "src/pages")
1923
},
20-
{ find: "@/hooks", replacement: path.resolve(__dirname, "src/hooks") },
21-
{ find: "@/utils", replacement: path.resolve(__dirname, "src/utils") },
24+
{ find: "@/store", replacement: path.resolve(__dirname, "src/store") },
2225
{ find: "@/types", replacement: path.resolve(__dirname, "src/types") },
26+
{ find: "@/utils", replacement: path.resolve(__dirname, "src/utils") },
2327
{
2428
find: "@/constants",
2529
replacement: path.resolve(__dirname, "src/constants")
2630
},
27-
{
28-
find: "@/store",
29-
replacement: path.resolve(__dirname, "src/store")
30-
},
31-
{
32-
find: "@/api",
33-
replacement: path.resolve(__dirname, "src/api")
34-
}
3531
]
3632
}
3733
});

0 commit comments

Comments
 (0)