Merge branch 'master' of https://github.com/jtjun/DutchBroomstick

frontend/src/components/organisms/RoomSettingForm/index.js

@@ -6,8 +6,7 @@ const RoomSettingForm = props => {
   const { handleSubmit } = props;
   return (
     <form onSubmit={handleSubmit}>
-        <Button type="button">Add Layer</Button>
-        <Button type="button">Delete Room</Button>
+        <Button type="submit">Delete Room</Button>
     </form>
   );
 };

frontend/src/components/pages/RoomPage/index.js

@@ -4,7 +4,8 @@ import PropTypes from 'prop-types'
 import { Block, Button, Graph, List, ListItem, Header } from 'components'
 import { MemberList, PaymentList } from 'containers'
 import { getMemberDebtList, getSimplifiedGraph } from 'services/simplifier'
-
+import { Link } from 'react-router-dom'
+
 const RoomPage = props => {
   const { room, members, showPayment, onClickMember, onToggle } = props
   if (!room) return <Block transparent>Loading...</Block>
@@ -38,6 +39,9 @@ const RoomPage = props => {
       <Block transparent>
         <a>로그아웃</a>
       </Block>
+      <Block>
+        <Link to={`/room/${room.url}/setting/`}>button</Link>
+      </Block>
     </div>
   )
 }

frontend/src/components/pages/RoomSettingPage/index.js

@@ -8,9 +8,9 @@ const RoomSettingPage = (props) => {
   console.log(props)
   return (
       <div>
-        <h1>{props.roomname}</h1>
         <Block>
-          <RoomSettingForm />
+        <h1>{props.roomname}</h1>
+          <RoomSettingForm initialValues={{url: props.url}} />
         </Block>
       </div>
   )

frontend/src/containers/RoomPage.js

@@ -27,9 +27,6 @@ class RoomPageContainer extends React.Component {
     return <RoomPage {...this.props} />
   }
 
-  componentWillUnmount() {
-    // this.props.onLeave()
-  }
 }
 
 const mapStateToProps = state => ({

frontend/src/containers/RoomSettingForm.js

@@ -13,6 +13,6 @@ const RoomSettingFormContainer = props => {
 export default reduxForm({
     form: 'RoomSetting',
     onSubmit(values, dispatch) {
-        dispatch(roomSettingRequest())
+        dispatch(roomSettingRequest({url: values.url}))
     }
 })(RoomSettingFormContainer)

frontend/src/containers/RoomSettingPage.js

@@ -4,8 +4,7 @@ import { RoomSettingPage } from 'components'
 import { Redirect } from 'react-router-dom'
 
 const RoomSettingPageContainer = (props) => {
-
-
+
   if( !props.roomname ){
     return(
       <Redirect to="/user/"/>
@@ -17,11 +16,11 @@ const RoomSettingPageContainer = (props) => {
     )
   }
 
-
 }
 
 const mapStateToProps = (state) => ({
-    roomname : state.room.room.roomname,
+    roomname: state.room.room.roomname,
+    url: state.room.room.url,
 })
 
 export default connect(mapStateToProps)(RoomSettingPageContainer)

frontend/src/store/room/actions.js

@@ -23,9 +23,19 @@ export const entranceRequest = () => ({
 })
 
 export const ROOM_SETTING_REQUEST = "ROOM_SETTING_REQUEST"
+export const ROOM_DELETE_SUCCESS = "ROOM_DELETE_SUCCESS"
+export const ROOM_DELETE_FAILED = "ROOM_DELETE_FAILED"
 
-export const roomSettingRequest = () => ({
+
+export const roomSettingRequest = ( {url} ) => ({
     type: ROOM_SETTING_REQUEST,
+    url,
+})
+export const roomDeleteSuccess = () => ({
+  type: ROOM_DELETE_SUCCESS,
+})
+export const roomDeleteFailed = () => ({
+  type: ROOM_DELETE_FAILED,
 })
 
 

frontend/src/store/room/reducer.js

@@ -55,6 +55,21 @@ const roomReducer = (state = initialState, action) => {
           action.room,
         ],
       }
+
+    /*
+    case actions.ROOM_SETTING_REQUEST:
+      return{
+        ...initialState,
+      }
+    case action.ROOM_DELETE_SUCCESS:
+      return{
+        ...initialState,
+      }
+    case action.ROOM_DELETE_FAILED:
+      return{
+        ...initialState,
+      }
+    */
     case actions.ROOM_LIST_SUCCESS:
       return {
         ...state,

frontend/src/store/room/sagas.js

@@ -67,9 +67,26 @@ function* watchRoomGetRequest() {
 }
 
 
+/* Room Delete Request */
+function* deleteRequest( { url } ) {
+
+  try {
+    const room = yield api.delete(`/rooms/${url}/`)
+    yield put(actions.roomDeleteSuccess())
+  } catch(e) {
+    yield put(actions.roomDeleteFailed(e))
+  }
+
+}
+
+function* watchRoomSettingRequest() {
+  yield takeEvery(actions.ROOM_SETTING_REQUEST, deleteRequest)
+}
+
 export default function* () {
   yield fork(watchCreatePageRequest)
   yield fork(watchRoomListRequest)
   yield fork(watchRoomGetRequest)
+  yield fork(watchRoomSettingRequest)
 }