bugs

jtjun · Jun 19, 2019 · c69903d · c69903d
1 parent 7607944
commit c69903d
Show file tree

Hide file tree

Showing 7 changed files with 10 additions and 6 deletions.
diff --git a/frontend/src/components/organisms/PaymentList/index.js b/frontend/src/components/organisms/PaymentList/index.js
@@ -15,7 +15,7 @@ const PaymentList = ({ paymentlist, roomurl }) => (
         {
           paymentlist && paymentlist.map(
             ({ forWhat, fromWho, total }, idx) => (
-              <ListItem key={idx} title={`${forWhat}${fromWho}`} description={total} linkTo={`/room/:${roomurl}/payment_list/${forWhat}`} />
+              <ListItem key={idx} title={`${forWhat}${fromWho}`} description={total} linkTo={`/room/${roomurl}/payment_list/${forWhat}`} />
             )
           )
         }

diff --git a/frontend/src/components/pages/RoomPage/index.js b/frontend/src/components/pages/RoomPage/index.js
@@ -59,9 +59,6 @@ const RoomPage = props => {
         (<PaymentList />) :
         (members && <MemberList />)
       }
-      <Block transparent>
-        <a>로그아웃</a>
-      </Block>
     </div>
   )
 }

diff --git a/frontend/src/components/pages/SignUpPage/index.js b/frontend/src/components/pages/SignUpPage/index.js
@@ -1,12 +1,13 @@
 import React from 'react'
 import { Link } from 'react-router-dom'
 
-import { Block } from 'components'
+import { Block, Header } from 'components'
 import { SignUpForm } from 'containers'
 
 const SignUpPage = (props) => {
   return (
     <div>
+      <Header />
       <Block>
         <h1>Dutch Broomstick</h1>
         <SignUpForm />

diff --git a/frontend/src/components/pages/UserInfoPage/index.js b/frontend/src/components/pages/UserInfoPage/index.js
@@ -2,11 +2,12 @@
 
 import React from 'react'
 import { UserInfoForm } from 'containers'
-import { Block } from 'components'
+import { Block, Header } from 'components'
 
 const UserInfoPage = (props) => {
   return (
       <div>
+        <Header />
         <Block>
           <h1>개인정보 변경</h1>
           <UserInfoForm />

diff --git a/frontend/src/services/simplifier/index.js b/frontend/src/services/simplifier/index.js
@@ -32,6 +32,7 @@ export const getSimplifiedGraph = debts => {
   const indice = members.slice()  // 배열 복사
   while (indice.length) {
     const first = indice[0], last = indice[indice.length - 1]
+    if(debts[first] === 0) break;
     const amount = Math.min(
       debts[first], -debts[last]
     )

diff --git a/frontend/src/store/payment/sagas.js b/frontend/src/store/payment/sagas.js
@@ -1,4 +1,5 @@
 import { fork, takeEvery, put } from 'redux-saga/effects'
+import { push, replace } from 'connected-react-router'
 import api from 'services/api'
 
 import * as actions from './actions'
@@ -7,6 +8,7 @@ function* createRequest({ room, payment }) {
   try {
     const newPayment = yield api.post(`/rooms/${room.url}/layers/0/payments/`, { ...payment })
     yield put(actions.paymentCreateSuccess(room, newPayment))
+    yield put(replace(`/room/${room.url}/`))
   } catch(e) {
     yield put(actions.paymentCreateFailed(yield e.response.json()))
   }

diff --git a/frontend/src/store/user/sagas.js b/frontend/src/store/user/sagas.js
@@ -1,3 +1,4 @@
+import { push, replace } from 'connected-react-router'
 import { fork, takeEvery, put } from 'redux-saga/effects'
 import api from 'services/api'
 
@@ -54,6 +55,7 @@ function* userInfoChangeRequest({ username, password, default_nickname, default_
       console.log(username , password, default_nickname, default_account)
       const response = yield api.put(`/users/${username}/`, { username, password, default_nickname, default_account }, { token })
       yield put(userInfoChangeSuccess(password, default_nickname, default_account))
+      yield put(replace(`/`))
     } catch (e){
       yield put(userInfoChangeFailed(yield e.response.json()))
     }