Skip to content

Commit cf72458

Browse files
committed
merge conflict resolve
2 parents 7d0b155 + d58013f commit cf72458

24 files changed

+1003
-633
lines changed

.gitignore

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ node_modules
1111
dist
1212
dist-ssr
1313
*.local
14+
.env.production
1415

1516
# Editor directories and files
1617
.vscode/*
@@ -22,3 +23,7 @@ dist-ssr
2223
*.njsproj
2324
*.sln
2425
*.sw?
26+
27+
# Vite HTTPS 인증서 관련 파일
28+
certs/
29+
*.pem

package-lock.json

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

package.json

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
2222
"devDependencies": {
2323
"@eslint/js": "^9.17.0",
2424
"@types/axios": "^0.9.36",
25+
"@types/node": "^22.13.13",
2526
"@types/react": "^18.3.18",
2627
"@types/react-dom": "^18.3.5",
2728
"@vitejs/plugin-react": "^4.3.4",
@@ -36,6 +37,7 @@
3637
"prettier-plugin-tailwindcss": "^0.6.11",
3738
"typescript": "~5.6.2",
3839
"typescript-eslint": "^8.22.0",
39-
"vite": "^6.0.5"
40+
"vite": "^6.0.5",
41+
"vite-plugin-mkcert": "^1.17.8"
4042
}
4143
}

public/image/home_banner1_lg.png

469 KB
Loading

public/image/home_banner1_md.png

375 KB
Loading

public/image/home_banner1_sm.png

363 KB
Loading

public/image/home_banner2_lg.png

140 KB
Loading

public/image/home_banner2_md.png

135 KB
Loading

public/image/home_banner2_sm.png

134 KB
Loading

public/image/home_banner3_lg.png

43.8 KB
Loading

0 commit comments

Comments
 (0)