diff --git a/.DS_Store b/.DS_Store
index 78381d2666cfdd5c8c21ad96804734f4b1560964..e8e54b05277f9e1b699281ec7692b672fb0f6139 100644
Binary files a/.DS_Store and b/.DS_Store differ
diff --git a/.env b/.env
new file mode 100644
index 0000000000000000000000000000000000000000..ef1c1d9d1fb25e6af49cb78940a5b1f268956d92
--- /dev/null
+++ b/.env
@@ -0,0 +1 @@
+NODE_ENV="production"
diff --git a/.idea/.DS_Store b/.idea/.DS_Store
new file mode 100644
index 0000000000000000000000000000000000000000..77469ec625d3603c404f953b80714661182b46f4
Binary files /dev/null and b/.idea/.DS_Store differ
diff --git a/a.sh b/a.sh
new file mode 100644
index 0000000000000000000000000000000000000000..c593edb937e8c8b9c2029a9554a8c4865741a152
--- /dev/null
+++ b/a.sh
@@ -0,0 +1,17 @@
+RED='\033[0;31m'
+GREEN='\033[0;32m'
+NC='\033[0m'
+
+emails=$(git log --pretty=format:'%ae' | sort | uniq)
+
+for email in $emails; do
+ total_additions=$(git log --author="$email" --pretty=tformat: --numstat | grep -v 'package-lock.json' | awk '{sum += $1} END {print sum}')
+ total_deletions=$(git log --author="$email" --pretty=tformat: --numstat | grep -v 'package-lock.json' | awk '{sum += $2} END {print sum}')
+ commit_count=$(git log --author="$email" --pretty=oneline | grep -v 'package-lock.json' | wc -l)
+
+ echo "${NC}Email\t\t:\t$email"
+ echo "${NC}Commit counts\t: $commit_count"
+ echo "${GREEN}Added Lines\t:\t$total_additions"
+ echo "${RED}Deleted Lines\t:\t$total_deletions"
+ echo
+done
diff --git a/index.js b/index.js
new file mode 100644
index 0000000000000000000000000000000000000000..cbd73b96d48da2915cf60156475409455b45692f
--- /dev/null
+++ b/index.js
@@ -0,0 +1,25 @@
+const express = require('express');
+const { createProxyMiddleware } = require('http-proxy-middleware');
+const path = require('path');
+
+const app = express();
+
+// API 요청을 위한 프록시 설정
+// app.use('/api', createProxyMiddleware({
+// target: 'http://localhost:8080',
+// changeOrigin: true,
+// // secure: true
+// }));
+
+// 정적 파일 제공
+app.use(express.static(path.join(__dirname, 'build')));
+
+// 모든 나머지 요청을 index.html로 리디렉트
+app.get('*', (req, res) => {
+ res.sendFile(path.join(__dirname, 'build', 'index.html'));
+});
+
+// const PORT = process.env.PORT || 3000;
+app.listen(80, () => {
+ console.log(`Server is running on port 80`);
+});
diff --git a/src/.DS_Store b/src/.DS_Store
index 2cc92dee4cdf0823b3273f01282332e15298544f..aa598164cb3b795f5a8528ac36c914fd73f0f13f 100644
Binary files a/src/.DS_Store and b/src/.DS_Store differ
diff --git a/src/_app/.DS_Store b/src/_app/.DS_Store
new file mode 100644
index 0000000000000000000000000000000000000000..f748ef4c4c07d27d1fff0c6d8848b497da00ad97
Binary files /dev/null and b/src/_app/.DS_Store differ
diff --git a/src/common/.DS_Store b/src/common/.DS_Store
index 2f66e783d38a995667f299dd02cf0fd9cd4cd128..479665b2208fc4573bf8ed69244109858d2f412a 100644
Binary files a/src/common/.DS_Store and b/src/common/.DS_Store differ
diff --git a/src/common/instances/AdminSocket.ts b/src/common/instances/AdminSocket.ts
index 4d7d4ea5b19815c25410f176c78e070c7a1357a8..239d559899bcbbf3215dacc5d7c4e4511df9ae7a 100644
--- a/src/common/instances/AdminSocket.ts
+++ b/src/common/instances/AdminSocket.ts
@@ -5,7 +5,7 @@ import logger from "../utils/logger";
class AdminSocket {
- private ioInstance = io(`${SOCKET_URL}/admin`, { withCredentials: true });
+ private ioInstance = io(`${SOCKET_URL}/api/admin`, { withCredentials: true });
constructor() {
this.ioInstance.on('connect', () => {
diff --git a/src/common/instances/Socket.ts b/src/common/instances/Socket.ts
index 8c22bc85cbdace613edb3daf55be57e3c275b6ff..2ea45120b37445969062660981c0ae55dd714ead 100644
--- a/src/common/instances/Socket.ts
+++ b/src/common/instances/Socket.ts
@@ -5,7 +5,7 @@ import logger from "../utils/logger";
class Socket {
- private ioInstance = io(SOCKET_URL, { withCredentials: true });
+ private ioInstance = io(SOCKET_URL + '/api', { withCredentials: true });
constructor() {
this.ioInstance.on('connect', () => {
diff --git a/src/common/utils/api.ts b/src/common/utils/api.ts
index da123bee97f4161073db15982c486d5d338bd2a3..d88d41f0d9a84f7f2d392c7f3450bd5f3801e237 100644
--- a/src/common/utils/api.ts
+++ b/src/common/utils/api.ts
@@ -17,12 +17,12 @@ const DEV_API_URL = 'http://localhost:8080';
const PROD_API_URL = 'https://ajou-eats-api.seunglab.dev';
const DEV_SOCKET_URL = 'ws://localhost:8080';
-const PROD_SOCKET_URL = 'wss://ajou-eats-api.seunglab.dev';
+// const PROD_SOCKET_URL = 'wss://ajou-eats-api.seunglab.dev';
// const API_URL = process.env.NODE_ENV === 'production' ? PROD_API_URL : DEV_API_URL;
-const API_URL = PROD_API_URL;
+const API_URL = DEV_API_URL;
// const SOCKET_URL = process.env.NODE_ENV === 'production' ? PROD_SOCKET_URL : DEV_SOCKET_URL;
-const SOCKET_URL = PROD_SOCKET_URL;
+const SOCKET_URL = DEV_SOCKET_URL;
/**
* @name fetchData
@@ -42,7 +42,7 @@ async function fetchData<T> (
let status;
try {
- request = await fetch(`/api${url}`, {
+ request = await fetch(`${API_URL}/api${url}`, {
method,
headers: {
'Content-Type': 'application/json',
diff --git a/src/components/.DS_Store b/src/components/.DS_Store
new file mode 100644
index 0000000000000000000000000000000000000000..1d93a4fe4a05b204e6e7ab4368a82f7fb905ea4c
Binary files /dev/null and b/src/components/.DS_Store differ
diff --git a/src/contexts/.DS_Store b/src/contexts/.DS_Store
new file mode 100644
index 0000000000000000000000000000000000000000..bd4f7213cc691379f370a8474b2d9337eb93ba2d
Binary files /dev/null and b/src/contexts/.DS_Store differ
diff --git a/src/pages/.DS_Store b/src/pages/.DS_Store
index 5bdd41fd2f7b949548db70047f450e52eff14616..f5ec330195f001af2abdc05c281efcee0193412b 100644
Binary files a/src/pages/.DS_Store and b/src/pages/.DS_Store differ
diff --git a/src/pages/order-page/success-page/SuccessPage.tsx b/src/pages/order-page/success-page/SuccessPage.tsx
index cda477eeb9e722f601ec16fd467e62ff6b302d3e..6d19f74ce43dc7d097f89a3b8f47df66c28c566f 100644
--- a/src/pages/order-page/success-page/SuccessPage.tsx
+++ b/src/pages/order-page/success-page/SuccessPage.tsx
@@ -1,6 +1,7 @@
import { useEffect } from "react";
import { useLocation } from "react-router-dom";
+import { FETCH_METHOD, fetchData } from "../../../common/utils/api";
import { getQueryStrings } from "../../../common/utils/query";
import ExitButton from "../module/ExitButton";
@@ -12,14 +13,16 @@ const SuccessPage: GFC = ({ connector }) => {
const location = useLocation();
useEffect(() => {
- if (!location.search || !connector.current) return;
-
void (async () => {
try {
- await connector.current!.post<OrderApprovePostModel>('/order/approve', {
+ await fetchData<OrderApprovePostModel>('/order/approve', FETCH_METHOD.POST,{
pg_token: getQueryStrings(location.search, 'pg_token'),
payment_id: localStorage.getItem('payment_id'),
});
+ // await connector.current!.post<OrderApprovePostModel>('/order/approve', {
+ // pg_token: getQueryStrings(location.search, 'pg_token'),
+ // payment_id: localStorage.getItem('payment_id'),
+ // });
} catch (e) {
alert("결제에 실패하였습니다");
console.error(e);