fix: #2 #3 #5 일부 버그 수정

swm-backstage · Aug 16, 2024 · 0df473b · 0df473b
1 parent 7e283ba
commit 0df473b
Show file tree

Hide file tree

Showing 6 changed files with 18 additions and 12 deletions.
diff --git a/src/event/eventInfo/EventInfo.jsx b/src/event/eventInfo/EventInfo.jsx
@@ -66,8 +66,12 @@ export default function EventInfo(){
 
     useEffect(() => {
         const fetchData = async () => {
+            const now = new Date();
+            const kstNow = new Date(now.getTime() + 9 * 60 * 60 * 1000);
+            const formattedDateTime = kstNow.toISOString().split('.')[0];
+
             Promise.all([
-                getBillList(eventId, "2000-01-01T00:00:00", "first", 20),
+                getBillList(eventId, formattedDateTime, "first", 20),
                 getEventInfo(eventId)
             ]).then(([billResponse, eventResponse]) => {
                 setBillData(billResponse);

diff --git a/src/event/eventMain/EventMain.mock.jsx b/src/event/eventMain/EventMain.mock.jsx
@@ -1,10 +1,10 @@
 export const mockForClubAlert = [
-    {
-        id: 1,
-        type: "toast",
-        content: "[구현 안됨]\n현재 납부하지 않은 회비가 1건 있습니다. \n - MT 비용",
-        color: "#FF4E4E"
-    }
+    // {
+    //     id: 1,
+    //     type: "toast",
+    //     content: "[구현 안됨]\n현재 납부하지 않은 회비가 1건 있습니다. \n - MT 비용",
+    //     color: "#FF4E4E"
+    // }
 ]
 
 export const mockForEventList = {

diff --git a/src/event/eventTotal/EventTotal.jsx b/src/event/eventTotal/EventTotal.jsx
@@ -77,8 +77,9 @@ export default function EventTotal() {
     useEffect(() => {
         const fetchData = async () => {
             const now = new Date();
-            const formattedDateTime = now.toISOString().split('.')[0];
-
+            const kstNow = new Date(now.getTime() + 9 * 60 * 60 * 1000);
+            const formattedDateTime = kstNow.toISOString().split('.')[0];
+
             const response = await getAllBillList(params.clubId, formattedDateTime, "first", 20);
             setTotalData(response);
         }

diff --git a/src/event/eventUnclassified/components/UnclassifiedLog.jsx b/src/event/eventUnclassified/components/UnclassifiedLog.jsx
@@ -74,7 +74,7 @@ export default function UnclassifiedLog({e}) {
             <ElementLog onClick={() => setShowModal(true)}>
                 <ElementLeft>
                     {
-                        e.amount >= 0 ? (
+                        e.status === "FEE" ? (
                             <CircleForType $color={colorSet.deposit}>입</CircleForType>
                         ) : (
                             <CircleForType $color={colorSet.withdraw}>출</CircleForType>

diff --git a/src/landingPage/styles/ServiceInfo.styles.js b/src/landingPage/styles/ServiceInfo.styles.js
@@ -25,7 +25,7 @@ export const EnterForm = styled.form`
 `;
 
 export const InputBox = styled.input`
-  width: 20rem;
+  width: 15rem;
   height: 3rem;
   padding: 0 1rem;
   border: none;

diff --git a/src/server/event.js b/src/server/event.js
@@ -26,7 +26,8 @@ export async function getEventInfo(eventId) {
 export async function getEventsUnfinished(clubId){
     try {
         const now = new Date();
-        const formattedDateTime = now.toISOString().split('T')[0];
+        const kstNow = new Date(now.getTime() + 9 * 60 * 60 * 1000);
+        const formattedDateTime = kstNow.toISOString().split('T')[0];
 
         const response = await axiosInstance.get(
             `/api/v1/events/funding?clubId=${clubId}&now=${formattedDateTime}`);