Skip to content

Commit 5922e1a

Browse files
committed
Merge branch 'dev' of https://github.com/MBTips/FE-MBTips into fix/header-component-border-수정
2 parents a69237a + 2572afa commit 5922e1a

File tree

5 files changed

+66
-49
lines changed

5 files changed

+66
-49
lines changed

.github/PULL_REQUEST_TEMPLATE.md

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
# Pull requests
2+
### ✅ 작업한 내용
3+
- [x]
4+
5+
### :1234: 이슈 번호
6+
-
7+
8+
### ❗️PR Point
9+
- 없음
10+
11+
### 📸 스크린샷

package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44
"version": "0.0.0",
55
"type": "module",
66
"scripts": {
7-
"dev": "vite",
8-
"build": "tsc -b && vite build",
7+
"dev": "vite --mode development",
8+
"build": "vite build --mode production",
99
"lint": "eslint .",
1010
"preview": "vite preview"
1111
},

src/App.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import KaKaoLogin from "@/pages/KaKaoLogin";
1111
import MbtiTestIntro from "@/pages/MbtiTestIntro";
1212
import MbtiTestQuestions from "@/pages/MbtiTestQuestions";
1313
import MbtiTestResult from "@/pages/MbtiTestResult";
14-
import CenteredLayout from "./components/CenteredLayout";
14+
import CenteredLayout from "@/components/CenteredLayout";
1515

1616
const App = () => {
1717
return (

src/components/CenteredLayout.tsx

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,12 @@
1-
import { ReactNode } from 'react';
1+
import { ReactNode } from "react";
22

33
interface CenteredLayoutProps {
44
children: ReactNode;
55
}
66

77
const CenteredLayout = ({ children }: CenteredLayoutProps) => (
8-
<div className="flex justify-center w-screen">
9-
<div className="w-full flex justify-center">
10-
{children}
11-
</div>
8+
<div className="flex min-h-screen w-screen justify-center bg-gray-50">
9+
<div className="flex w-full justify-center bg-gray-50">{children}</div>
1210
</div>
1311
);
1412

vite.config.ts

Lines changed: 49 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -3,48 +3,56 @@ import react from "@vitejs/plugin-react";
33
import tailwindcss from "@tailwindcss/vite";
44
import { defineConfig } from "vite";
55
import fs from "fs";
6+
67
// vite에서 @/store/useAuthStore와 같은 절대 경로를 사용하려면,
78
// vite.config.ts 파일에서 alias 설정을 추가해야 합니다.
8-
export default defineConfig({
9-
server: {
10-
https: {
11-
key: fs.readFileSync("./certs/key.pem"),
12-
cert: fs.readFileSync("./certs/cert.pem")
9+
10+
export default defineConfig(({ mode }: { mode: string }) => {
11+
const isProduction = mode === "production";
12+
13+
return {
14+
server: {
15+
https: isProduction
16+
? undefined // 배포 환경에서는 HTTPS를 비활성화 (Nginx가 처리)
17+
: {
18+
key: fs.readFileSync("./certs/key.pem"),
19+
cert: fs.readFileSync("./certs/cert.pem")
20+
}
21+
},
22+
plugins: [react(), tailwindcss()],
23+
resolve: {
24+
alias: [
25+
{ find: "@/", replacement: path.resolve(__dirname, "src") },
26+
{ find: "@/api", replacement: path.resolve(__dirname, "src/api") },
27+
{
28+
find: "@/api",
29+
replacement: path.resolve(__dirname, "src/api")
30+
},
31+
{
32+
find: "@/components",
33+
replacement: path.resolve(__dirname, "src/components")
34+
},
35+
{ find: "@/hooks", replacement: path.resolve(__dirname, "src/hooks") },
36+
{
37+
find: "@/pages",
38+
replacement: path.resolve(__dirname, "src/pages")
39+
},
40+
{ find: "@/store", replacement: path.resolve(__dirname, "src/store") },
41+
{ find: "@/types", replacement: path.resolve(__dirname, "src/types") },
42+
{ find: "@/utils", replacement: path.resolve(__dirname, "src/utils") },
43+
{
44+
find: "@/constants",
45+
replacement: path.resolve(__dirname, "src/constants")
46+
},
47+
{
48+
find: "@/store",
49+
replacement: path.resolve(__dirname, "src/store")
50+
},
51+
{
52+
find: "@/api",
53+
replacement: path.resolve(__dirname, "src/api")
54+
}
55+
]
1356
}
14-
},
15-
plugins: [react(), tailwindcss()],
16-
resolve: {
17-
alias: [
18-
{ find: "@/", replacement: path.resolve(__dirname, "src") },
19-
{ find: "@/api", replacement: path.resolve(__dirname, "src/api") },
20-
{
21-
find: "@/api",
22-
replacement: path.resolve(__dirname, "src/api")
23-
},
24-
{
25-
find: "@/components",
26-
replacement: path.resolve(__dirname, "src/components")
27-
},
28-
{ find: "@/hooks", replacement: path.resolve(__dirname, "src/hooks") },
29-
{
30-
find: "@/pages",
31-
replacement: path.resolve(__dirname, "src/pages")
32-
},
33-
{ find: "@/store", replacement: path.resolve(__dirname, "src/store") },
34-
{ find: "@/types", replacement: path.resolve(__dirname, "src/types") },
35-
{ find: "@/utils", replacement: path.resolve(__dirname, "src/utils") },
36-
{
37-
find: "@/constants",
38-
replacement: path.resolve(__dirname, "src/constants")
39-
},
40-
{
41-
find: "@/store",
42-
replacement: path.resolve(__dirname, "src/store")
43-
},
44-
{
45-
find: "@/api",
46-
replacement: path.resolve(__dirname, "src/api")
47-
}
48-
]
49-
}
57+
};
5058
});

0 commit comments

Comments
 (0)