Merge pull request #131 from 100-hours-a-week/feature/settlement

Feature/settlement
100-hours-a-week · Oct 1, 2024 · 3c9710f · 3c9710f
2 parents 49789e1 + bf4e38b
commit 3c9710f
Show file tree

Hide file tree

Showing 6 changed files with 570 additions and 5 deletions.
diff --git a/travelday-fe/src/App.js b/travelday-fe/src/App.js
@@ -28,7 +28,7 @@ import PrivacyPage from './pages/mainPage/privacyPage';
 import ChatPage from './pages/chatPage/chatPage';
 import ChatTest from './pages/chatPage/chatTest';
 import ChatListPage from './pages/chatPage/chatListPage';
-import ExpenseSettlement from './components/schedulePage/settlement';
+import ExpenseSettlement from "./components/schedulePage/settlement";
 
 import "./firebase.js";
 

diff --git a/...src/components/schedulePage/settlement.js → ...ponents/schedulePage/ExpenseSettlement.js b/...src/components/schedulePage/settlement.js → ...ponents/schedulePage/ExpenseSettlement.js
diff --git a/travelday-fe/src/components/schedulePage/scheduleTab.jsx b/travelday-fe/src/components/schedulePage/scheduleTab.jsx
@@ -4,7 +4,7 @@ import ScheduleDetailList from "./scheduleDetailList";
 import StickyBox from 'react-sticky-box';
 import styled from "styled-components";
 import ChatPage from "../../pages/chatPage/chatPage";
-import Settlement from "./settlement";
+import SettlementList from "./settlementList";
 const items = (travelRoomId,startDate,endDate) => [
     {
         label:"일정 보기",
@@ -25,7 +25,8 @@ const items = (travelRoomId,startDate,endDate) => [
     {
         label:"정산 하기",
         key:"정산",
-        children: <Settlement travelRoomId={travelRoomId}/>
+        children: <SettlementList travelRoomId={travelRoomId}/>
+
     }
 ]
 console.table(items)
@@ -83,4 +84,4 @@ const StyledTabs = styled(Tabs)`
     .ant-tabs-ink-bar {
         background: #000000;
     }
-`;
+`;