From f55c8a21fd44343863bc67550f2f292042bd406e Mon Sep 17 00:00:00 2001
From: MinseoLee <mmmm@ajou.ac.kr>
Date: Sun, 10 Dec 2023 23:58:18 +0900
Subject: [PATCH] build: localhost version
---
.DS_Store | Bin 6148 -> 6148 bytes
.env | 1 +
.idea/.DS_Store | Bin 0 -> 6148 bytes
a.sh | 17 ++++++++++++
index.js | 25 ++++++++++++++++++
src/.DS_Store | Bin 6148 -> 6148 bytes
src/_app/.DS_Store | Bin 0 -> 6148 bytes
src/common/.DS_Store | Bin 6148 -> 6148 bytes
src/common/instances/AdminSocket.ts | 2 +-
src/common/instances/Socket.ts | 2 +-
src/common/utils/api.ts | 8 +++---
src/components/.DS_Store | Bin 0 -> 6148 bytes
src/contexts/.DS_Store | Bin 0 -> 6148 bytes
src/pages/.DS_Store | Bin 6148 -> 8196 bytes
.../order-page/success-page/SuccessPage.tsx | 9 ++++---
15 files changed, 55 insertions(+), 9 deletions(-)
create mode 100644 .env
create mode 100644 .idea/.DS_Store
create mode 100644 a.sh
create mode 100644 index.js
create mode 100644 src/_app/.DS_Store
create mode 100644 src/components/.DS_Store
create mode 100644 src/contexts/.DS_Store
diff --git a/.DS_Store b/.DS_Store
index 78381d2666cfdd5c8c21ad96804734f4b1560964..e8e54b05277f9e1b699281ec7692b672fb0f6139 100644
GIT binary patch
delta 648
zcmZoMXfc@JFDlHyz`)4BAi%(&AjmD4DJUeE$DpuTkYhP>JxEH3L60GwA(Np5S(?F+
z!H_|Z!IZ(2L65<N!LXnt$)~iqq=<om!Gj@~p^~APp@booA(ug)A&eoPA%~%qA(tVQ
zp_oCR!G$4_p@bokL7yR%p_n0+p$IIR%aF;C2j+uRr!u61RMs=(GbBT`<}s9j6+)Z>
zGRTp^i@~2Elp&rWfWeU=l0ly#nIVTElOdG>q*j-q6l`1(gFXWT1F@d)gL;Am?CE-t
zuNfFv8T1%38B!Qh84`2S4TF>Oa|;;2Kz$(tifnGai%U{Yei8!%0|x^GgZ95kM;*~s
zq!3V1kb$s)g@IuL!(<*78K$+qleJi+*dT^Z_F|ENF>_et7!4+Ov&hDI=Hw?sEf-*5
zVC-gKV9@&y24J_cF%&SAG9-aRC>hloK?fNa7*OQVJmUUu(&RQ)Igp(o<|<Z8TSm`o
o3=9m+48;sZ49S?v!TyHJqWBqPf&!Z)6U&E*g=aRibNuB809zJ_MgRZ+
delta 319
zcmZoMXfc@JFD$^oz`)4BAi%(ol9O&2oSdIquvw5}B{QSI<Q`TTrmK~cSFuX5*>9Ik
zTQza=DOMR6^9`#UW5Hx@Hdz6fHU<U;2EOvl6O(z^WJGfFU0jlK@{<@C7&zQ-HhO+e
zKk5jTNWm%*RFDC&9b}B?dIu22#!$de%8<m6!;s04jBE`9L(obF1_l&)WE*7+yiGo*
zPi|wAV}mkRv02(O^s6y2FfcO|GZZl-BP*|Q6fD2raMTf57U4>W>|_OYNhYQR8w<}c
KZf58B%MSpB3|Ha+
diff --git a/.env b/.env
new file mode 100644
index 0000000..ef1c1d9
--- /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
GIT binary patch
literal 6148
zcmZQzU|@7AO)+F(5MW?n;9!8zOq>i@0Z1N%F(jFwA|Odduo<Zg$qXe7nGE?1c~H4g
zYH)`DDDH$9G8yt1iWv$RkmE0ap@<=$A&nuEA%`KAp*SbqFgQ6sw*cy$-wX^4MCr@T
zcX3I|$xnhNH0^(rjye*rH-&7y1sTZh1*LNaPKGRoVg?_uZ%Y_b8HzA`wT^)Sn<^ZB
zz+zr*K2{fFQHjNU(4ZZqMnhmU1V%%E<{`icv4MjdLXVQ8Aut*Oqagqf0Z{p%0O~6+
zFfcek=>`Z5l44+FU;uXk7#SE?V45KP00xj8NGpg2X$8?BtqhDH7T651Rt83>Rz`3)
z1f&n#RAXRd0BdJp1ltS}2Ww|w1l!EOzzEUKzzDUO5!8?cnG4a*zzEUKzzDV-=DJaO
zGz3ON02Ttw5QYG#{&!_yz}5eUs2U|lLtr!nhGhsavbY4hIDslp9Nq)fwV?Vm0V)rw
xgF)3XBdA_Rh=HqOCdh!I1XLJQ-Gj7(XmC}`$iM*7I@%C`1<)ux8Uh0l0szfcU!(v4
literal 0
HcmV?d00001
diff --git a/a.sh b/a.sh
new file mode 100644
index 0000000..c593edb
--- /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 0000000..cbd73b9
--- /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
GIT binary patch
literal 6148
zcmZQzU|@7AO)+F(5MW?n;9!8zEL;p&0Z1N%F(jFwA|fF3KxX8m8wMxm=N3T4N2$>e
z7!85J9Ri@d%fb-PkjPNLP=K0$4ci$Q7~pcb`7SO=Ir&MT0z>V^@0~1@k2<2tr{I+@
z$UrU|8bG1K#*oaA&ydTI%aG5IhibP~3IhWJiafIYF=>Bb_M@pmxB-_MRCjy;xq}Pp
zjslQ77*ZMX7)lt5QQhNG#lXOTRUNXs;?~36g+ndEeT3Aay7K|Zog83yf?Su%P=V=2
zO$$)mpsPW4-y%D<9ng5gFe^77;Wm8gP~8;(au+K@0Yf4~IzuXYs9ly~U|>L!%|%K>
zA64ODg`xuC3hXLS>}Og4vVRnl7XpkBZ5-SXdXyXufzc2c4FPxvfXW92NZX#l0ZM}^
zZbk+MkQ9gjcL5kd%><|}Mo>Qhq86kTqz0rFM1!<4FoIZMd9YRnMg|tJPDXGy1Y|I%
zO9G<7+8G$ZHiP(J?F@`yn;94wA=()jA=()jp*<8vh;{}>h;{}>u<c+gMv2i77!3iW
z5MYL|1wi$`D+2?r{y#+3C^;GeqaiRXLx7RRCD_FYTq$GsAE>Sc)u#ziX;2*us*cec
r0w8H7$bg~*hz-Jw3=ANxplTmn6*Dq0fV7S_1VDi^ibq3WfI<KOqgJxk
delta 465
zcmZoMXfc=&!NZWxke8Eg7@VA+Td*;4IkU3}0|NsaLo!1?LoP!uvMd7_$bLeX&&_vn
zNy^DjVqjq42uz)Ks;p-6F%~&CDDxGILj3}ePKcR#3~3CR4Cyc%K@toM49nqWLgkUo
z-2OIi;=P8Wj+kmv;P&EDQ;=a8oXnk{TL7_0fMF7w$mA2Od`!#}Cb5Z4e#gqirYv(U
zLa2W7KUO6KQ*5#g8y};<WN$WECfk_FS!_~lZjDMuh3Y4FvB|)gYuIG#84W-Nvoe%2
zlrUs6<S-PYdW=znfq?-@7TH^&o=ZihLcE2d0^up_D!^WX`iPl<L1ANJ2;*jUj=%f>
Dzgc%)
diff --git a/src/_app/.DS_Store b/src/_app/.DS_Store
new file mode 100644
index 0000000000000000000000000000000000000000..f748ef4c4c07d27d1fff0c6d8848b497da00ad97
GIT binary patch
literal 6148
zcmZQzU|@7AO)+F(5MW?n;9!8zOq>i@0Z1N%F(jFwA|Odduo;;Q={f0!!O8i#1yH$B
zYH)`DDDK!8k{R+D@)*(>FyfCfih+RvMLsv*#U&{xKM9&}-2Y8F>WHZ(g`k>(4CHhI
zN{0;W47m*X3@Hqy3^@#`48^D^i9L^j0bNBdcDJCJlbes#HE60(-J>wLV{O!RqaiRF
z0;3^7SqLyfv~zGn=uvVs1V%$(Gz8!w04g6q4IvQi0O~U^FfcSgXpj&CBLf4t3&6<0
zzyi|*=?5@?<Um?MG)OCm25Dtr1hK$ofVDC(LbWo2yCEQb;HDr0BLi4F10w@iI|C!w
zW(EdEu+0n%j1cV%j8K~yK@C}uxe)CPj1cV%j1cWG=Z(^%Aut*O&=6pT&;p?P-<5#@
zSN|WPYLpxefzc2cmLb5%;u7rQ1gbo7cn?(9g6h)*s640+2G!<_p!ymi2Cj;kAOngL
fP+?GY57G*v!BsIMqzy6J5P${HC_Nei0}uiLDFjI?
literal 0
HcmV?d00001
diff --git a/src/common/.DS_Store b/src/common/.DS_Store
index 2f66e783d38a995667f299dd02cf0fd9cd4cd128..479665b2208fc4573bf8ed69244109858d2f412a 100644
GIT binary patch
literal 6148
zcmZQzU|@7AO)+F(5MW?n;9!8zEL;p&0Z1N%F(jFwA|fF3z-E*%Br@bNlrR+Mq(kLK
zsnHM^4S~TM0-(Ih$&k#D&ydGZ%z%`C4TF>Oa|<92XVPR~V8Eg(H{Zo2DJMS(T8Oy+
zn{?C>m&z0(RTg9*+YBn77?>H78Hzz=3bG9QR|W={3=Vfd_2uScwHqpnYM%ng!<-D6
zNTHF;kcw_MPdnI`7^-q{g$EXuSlxuhW>ohXfZWH*P{L5jP=M(!Mll8k1|(S=?m<z3
z)g4GGQ0)iD2P;D<LkUABLk@bla4iMf50}MhKavU@_QO@6+MfXO|0t$T2rxp7;oyeQ
zqvU7^jE2By2*5)CR6c+zL=f!&Y2!0AKxmK<10w?ixC_9@z`z32#0c&OFo5JhT0t~O
zD~JYZWncucz-EB8GB855GJ?AyAbsE}hJld*tet_80j!;Y5o|L910&dG1_nlmb_PbM
z&5Y0<3L`{210zH`10zH`%z2~qXb6mk05k-cA+!Lf{&!_yz}5eUs2U|lLtr!nhGhsa
zvbY4hIDso=?EVAQwV?VG*82k0!Jyil5maA8^nsLsH8Vj56eYkMh#W{OsM-ft#f%J)
SntZe&01Kf}dNc&+9|8bobfBF8
delta 317
zcmZoMXfc=|#>B)qu~2NHo}wrR0|Nsi1A_nqLq0<uLn=caLkUCi#=_-{^&lB8hGd3(
zhFpdMWZ9f_!{Frn+yVwL5VK`qV8E&_H{Zo2DJMUPfq{Wzv$FB0{)VHDxYeehsnx`-
zxF7@B0S%K^vq)KQWnf@nW=LizW++CsSA3TA)|?u!QE*v=O%T~htn!;hIfPgyHk{kc
f&cV;Y#KgH-kmEb^WPTAxP#}Q9hh=kw$Qot<UKvTa
diff --git a/src/common/instances/AdminSocket.ts b/src/common/instances/AdminSocket.ts
index 4d7d4ea..239d559 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 8c22bc8..2ea4512 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 da123be..d88d41f 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
GIT binary patch
literal 6148
zcmZQzU|@7AO)+F(5MW?n;9!8zEL;p&0Z1N%F(jFwA|fF3z-Ht#<TB_o6f<Nnq(bFJ
zsnHM^4S~TM0-(Ih!;r*~&rrfp!hoEAQyEHf(hY-?^K%Oz&S$yIz`%f0ZEn7cOHxjL
z60|^Z|2OHVBYyQMB&jdRKz54)$VqJAawd@>g&~!p2-U5E-x(MfP~>sA4^0hLH=(G(
z;to!RJcdMuGKNfsbcRH5D5ANB?Ii;P0~S>{+=NvnR+nK>iRwNBP&f%Q6f%@DBr@bN
zlrUs6lrU5>=rSZT<b(M|4EYQ>3^|w~$o7MQfq_V!IQ&7hZmfPIQa7r9!Rdk(90!RE
z#po%R{WJpu1ClHbccZAl>NX@5sP==y8x-b40W(4z$-xbwN6FC;7!85Z5P*jOsC)nw
zs36(_(#B_KfY2Zz21W)3a2J4)fq@04i4oinU;xR1w1Q}mRuB!+%D@O>fz1GGWnhGA
zWdwIaK>9#k5)cj6&cMh3*3Q5PwwZx}5o|L910zH`10&RCMraR(5u%-e5u%-e5uzRD
zyis~I1V%#u8UoA^S^!l4yD~7~>i<Jjjgq4wFd72GG6Wb|T!LMkz?Cv~|AFdSP<@&J
zl?K(ppxT@fR8K?nfs}w{nIHp-5?~HQ4x|-S?SrdgMg~YtKH3m~h0rKH8UpkW0RTV<
B!JhyC
literal 0
HcmV?d00001
diff --git a/src/contexts/.DS_Store b/src/contexts/.DS_Store
new file mode 100644
index 0000000000000000000000000000000000000000..bd4f7213cc691379f370a8474b2d9337eb93ba2d
GIT binary patch
literal 6148
zcmZQzU|@7AO)+F(5MW?n;9!8zOq>i@0Z1N%F(jFwB0M1Tz-Ht#<TB_o6f<Nnq(bFJ
zslgorpt$2<NMgumC}AjJK#spuhLW6g!{Frn+yaOfSZWv;7;vi1&3AE0%E?cHCMfrR
zla4y#SD!+X`hpB(w}8?u0}DekLn1>Fx;r^K85j_9INSx-o12f-9dLOp_OgOQDv_ZW
z-DVbj1_lNsSsZqwsK9DFk_s&LL!x7p91Vfd5Eu;s@<V_TqLqUiLXVQ8Aut*Oqagqf
z0Z{p%0BPGZI6&zJ2n~{AU}RtbcL5kd%`K=dMsPoX0VD^~3Zg+;K{QA!10#q9HUq4c
zfsug)tdkMk4FTx`H|-c08Nk{Z7{NA!#KGDb7{N9(Ffc;2GcZE5GcZDXD2x#842%%%
z42)pg!B&hCqaiRF0!Sgi3}Fj^>VH=T23-Arh^kR?Gz3ONU|5C#Ba2J0ixap~#_m5*
zT??vD6QI(dIv7+PGlJ@6gc!IgW`YbTN<f7{)jdcnhz3{1j0_AQt)mSASOAUEqaiQ=
GApigY4`)9B
literal 0
HcmV?d00001
diff --git a/src/pages/.DS_Store b/src/pages/.DS_Store
index 5bdd41fd2f7b949548db70047f450e52eff14616..f5ec330195f001af2abdc05c281efcee0193412b 100644
GIT binary patch
literal 8196
zcmZQzU|@7AO)+F(kYHe7;9!8z0^AH(0Z1N%F(jFwA_^e$7#IW?81fi&844H@8PXY2
zp>m_tXb6mkz-S1JhQMeDjE2DA3IRrlb2xC+`w-btax?@+LtsRP0H}O`w(S`lAZ>hx
z1_%w3Vqj!o0Cxcx85me#0mKOI2QYx-Kw3dGNGpg2X=PvpvA|}4wK6b5wK9UcAs~GM
zV51lrz}guY!8U`$!P*%Z!8S86FhaC5FhXr+g!WJvA=()jA=()j!M1~q93@6WU^E2K
zLI9LaxEK-{QW$a>GLif5Iq8PM$@#ej5cQG^7#J9^s>{uHaY@R_Pl664xc{4U)DgGZ
z6r$A@WFXt00CEN=Lo!1mLlHv>Vw3^Zm5TWc3=CLQ;cz2Xl~`SfMJ1~H0zmHLVaQ;}
zWGH4RVaR7FVyMLBO3C*O3=BBc;&3Y-^;lhuQ#}@Ub1~#F<TIq>i+>(}aGYXMhr_*C
z&CJcm>Q=03QQc_(3SUl!T!ut^uH*-eI$=?T!;M%~Vs#-Fm8kB6rq5i4RE9i;Qd}{w
zAP-KT7^?8N56wIrAqa9Gno2D0;{vD46oyoWB3v#M5C+FHDE*?T!{J7(X5w%qR<&5%
z$<0vAkjan^4#@&sE)_CjU|_(Z5{FxHs>T}UI8>v$7gT(LlIAEL4S^vS0?ZH>OMv?S
zt_%#g#{VIzM#<3-7!84883K$fF2OEN;7&Pq|AG42pqdWc%7Ll_b;lV&{c;E&qy*Hp
v2Y1IAA(M(=!x$MLJ$Xh3NKc-T0X&8<a03At?Ft;NmC^bi9Dk$4@C*R}6nHX(
delta 346
zcmZp1XfcprU|?W$DortDU=UznVBlbY&@5aN3&ketDT<1K<iTRP3<V5{4CxH1Iq4e<
zmoqbpOx6<=n|w-uk4ah+%={q0!`3Jutv<D3vW}p{WGO);t{RgA!{h`Z39x$hgvkj)
zQj`4zxYz>4c4pphm>eghhG0qw6l53%C+FuDFo1yq!(=^Sh)q1QVCDxQ9<~#&^;Zhk
zPu3BJ*aYYLF!8cZJ|`?Td4ezxTXUHSNYNRnA~;u#F<|m+5ltq>jg#kyNKJkq!ozl*
zNBQ}KhRF(|GL!j4k+|;{vvY6=GJ{>hAi&MQz~IWjz{0h$@H_Klei=_tpfNB(0uB_G
L44dP5<}d>QDsEM_
diff --git a/src/pages/order-page/success-page/SuccessPage.tsx b/src/pages/order-page/success-page/SuccessPage.tsx
index cda477e..6d19f74 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);
--
GitLab