Lab 4 practice (redux w/ middleware)

package.json

@@ -2,12 +2,18 @@
   "name": "swppfront",
   "version": "0.1.0",
   "private": true,
+  "proxy": "http://localhost:8000",
   "dependencies": {
+    "axios": "^0.20.0",
+    "connected-react-router": "^6.8.0",
     "react": "^16.9.0",
     "react-dom": "^16.9.0",
+    "react-redux": "^7.2.1",
     "react-router": "^5.0.1",
     "react-router-dom": "^5.0.1",
-    "react-scripts": "3.1.1"
+    "react-scripts": "3.1.1",
+    "redux": "^4.0.5",
+    "redux-thunk": "^2.3.0"
   },
   "scripts": {
     "start": "react-scripts start",

src/App.js

@@ -1,15 +1,16 @@
 import React from 'react';
 import './App.css';
 
+import { ConnectedRouter } from 'connected-react-router';
 import TodoList from './containers/TodoList/TodoList';
 import RealDetail from './containers/TodoList/RealDetail/RealDetail';
 import NewTodo from './containers/TodoList/NewTodo/NewTodo';
 
-import { BrowserRouter, Route, Redirect, Switch } from 'react-router-dom';
+import { Route, Redirect, Switch } from 'react-router-dom';
 
-function App() {
+function App(props) {
   return (
-    <BrowserRouter>
+    <ConnectedRouter history={props.history}>
       <div className="App" >
         <Switch>
           <Route path='/todos' exact render={() => <TodoList title="My TODOs!" />} />
@@ -19,7 +20,7 @@ function App() {
           <Route render={() => <h1>Not Found</h1>} />
         </Switch>
       </div >
-    </BrowserRouter>
+    </ConnectedRouter>
   );
 }
 

src/components/Todo/Todo.js

@@ -6,14 +6,14 @@ const Todo = (props) => {
 
   return (
     <div className="Todo">
-      <div
-        className={`text ${props.done && 'done'}`}
-        onClick={props.clicked}>
+      <div className={`text ${props.done && 'done'}`} onClick={props.clickDetail}>
         {props.title}
       </div>
       {props.done && <div className="done-mark">&#x2713;</div>}
+      <button onClick={props.clickDone}>{props.done ? 'Undone' : 'Done'}</button>
+      <button onClick={props.clickDelete}>Delete</button>
     </div>
   );
 };
 
-export default Todo;
+export default Todo;

src/containers/TodoList/NewTodo/NewTodo.js

@@ -1,30 +1,30 @@
 import React, { Component } from 'react';
+// import { Redirect } from 'react-router-dom';
 
-import { Redirect } from 'react-router-dom';
+import { connect } from 'react-redux';
+// import * as actionTypes from '../../../store/actions/actionTypes';
+import * as actionCreators from '../../../store/actions/index';
 
 import './NewTodo.css';
 
 class NewTodo extends Component {
   state = {
     title: '',
-    content: '',
-    submitted: false
+    content: ''
+    // submitted: false
   }
 
   postTodoHandler = () => {
-    const data =
-      { title: this.state.title, content: this.state.content }
-    alert('submitted' + data.title);
-    // this.props.history.push('/todos');
+    this.props.onStoreTodo(this.state.title, this.state.content);
     this.props.history.goBack();
-    this.setState({ submitted: true });
+    // this.setState({ submitted: true });
   }
 
   render() {
-    let redirect = null;
-    if (this.state.submitted) {
-      redirect = <Redirect to='/todos' />
-    }
+    // let redirect = null;
+    // if (this.state.submitted) {
+    //   redirect = <Redirect to='/todos' />
+    // }
     return (
       <div className="NewTodo">
         <h1>Add a New Todo!</h1>
@@ -36,7 +36,7 @@ class NewTodo extends Component {
         ></input>
         <label>Content</label>
         <textarea rows="4" type="text" value={this.state.content}
-          onChange={(event) => this.setState({ content: event.target.content })}
+          onChange={(event) => this.setState({ content: event.target.value })}
         >
         </textarea>
         <button onClick={() => this.postTodoHandler()}>Submit</button>
@@ -45,4 +45,12 @@ class NewTodo extends Component {
   }
 }
 
-export default NewTodo;
+const mapDispatchToProps = (dispatch) => {
+  return {
+    onStoreTodo: (title, content) => {
+      dispatch(actionCreators.postTodo({ title: title, content: content }));
+    }
+  }
+}
+
+export default connect(null, mapDispatchToProps)(NewTodo);

src/containers/TodoList/RealDetail/RealDetail.js

@@ -1,28 +1,47 @@
 import React, { Component } from 'react';
+import { connect } from 'react-redux';
 
+import * as actionTypes from '../../../store/actions/actionTypes';
 import './RealDetail.css';
 
 class RealDetail extends Component {
+  componentDidMount() {
+    this.props.onGetTodo(parseInt(this.props.match.params.id));
+  }
+
   render() {
+    let title = '';
+    let content = '';
+    if (this.props.selectedTodo) {
+      title =  this.props.selectedTodo.title;
+      content = this.props.selectedTodo.content;
+    }
     return (
       <div className="RealDetail" >
         <div className="row">
-          <div className="left">
-            Name:
-        </div>
-          <div className="right">
-          </div>
+          <div className="left">Name:</div>
+          <div className="right">{title}</div>
         </div>
         <div className="row">
-          <div className="left">
-            Content:
-        </div>
-          <div className="right">
-          </div>
+          <div className="left">Content:</div>
+          <div className="right">{content}</div>
         </div>
       </div>
     );
   }
 };
 
-export default RealDetail;
+const mapStateToProps = (state) => {
+  return {
+    selectedTodo: state.td.selectedTodo
+  };
+};
+
+const mapDispatchToProps = (dispatch) => {
+  return {
+    onGetTodo: (id) => {
+      dispatch({ type: actionTypes.GET_TODO, targetID: id});
+    }
+  };
+};
+export default connect(mapStateToProps, mapDispatchToProps)(RealDetail);

src/containers/TodoList/TodoList.js

@@ -1,49 +1,48 @@
 import React, { Component } from 'react';
 
 import Todo from '../../components/Todo/Todo';
-import TodoDetail from '../../components/TodoDetail/TodoDetail';
 
 import { NavLink } from 'react-router-dom';
+import { withRouter } from 'react-router';
+
+import { connect } from 'react-redux';
+// import * as actionTypes from '../../store/actions/actionTypes';
+import * as actionCreators from '../../store/actions/index';
 
 import './TodoList.css';
 
 class TodoList extends Component {
-  state = {
-    todos: [
-      { id: 1, title: 'SWPP', content: 'take swpp class', done: true },
-      { id: 2, title: 'Movie', content: 'watch movie', done: false },
-      { id: 3, title: 'Dinner', content: 'eat dinner', done: false }
-    ],
-    selectedTodo: null,
+  componentDidMount() {
+    this.props.onGetAll();
   }
 
-  clickTodoHandler = (td) => {
-    if (this.state.selectedTodo === td) {
-      this.setState({ ...this.state, selectedTodo: null });
-    } else {
-      this.setState({ ...this.state, selectedTodo: td });
+  state = {
+    selectedTodo: null
+  };
+
+  clickTodoHandler = (id) => {
+    this.props.history.push('/todos/' + id);
+    this.props.onGetTodoDetail(id);
+  };
+
+  deleteTodoHandler = (td) => {
+    if (this.state.selectedTodo && td.id === this.state.selectedTodo.id) {
+      this.setState({...this.state, selectedTodo: null});
     }
-  }
+    this.props.onDeleteTodo(td.id);
+  };
 
   render() {
-    const todos = this.state.todos.map(td => {
+    const todos = this.props.storedTodos.map((td) => {
       return (
-        <Todo
-          key={td.id}
-          title={td.title}
-          done={td.done}
-          clicked={() => this.clickTodoHandler(td)}
-        />
+        <Todo key={td.id} title={td.title} done={td.done}
+          clickDetail={() => this.clickTodoHandler(td.id)}
+            // this.props.onGetTodoDetail(td.id)}
+          clickDone={() => this.props.onToggleTodo(td.id)}
+          clickDelete={() => this.deleteTodoHandler(td)} />
       );
     });
 
-    let todo = null;
-    if (this.state.selectedTodo) {
-      todo = <TodoDetail
-        title={this.state.selectedTodo.title}
-        content={this.state.selectedTodo.content}
-      />
-    }
     return (
       <div className="TodoList">
         <div className='title'>
@@ -52,11 +51,25 @@ class TodoList extends Component {
         <div className='todos'>
           {todos}
         </div>
-        {todo}
         <NavLink to='/new-todo' exact>New Todo</NavLink>
       </div>
     )
-  }
+  };
 }
 
-export default TodoList;
+const mapStateToProps = (state) => {
+  return {
+    storedTodos: state.td.todos
+  };
+};
+
+const mapDispatchToProps = (dispatch) => {
+  return {
+    onGetAll: () => dispatch(actionCreators.getTodos()),
+    onGetTodoDetail: (id) => dispatch(actionCreators.getTodoDetail(id)),
+    onToggleTodo: (id) => dispatch(actionCreators.toggleTodo(id)),
+    onDeleteTodo: (id) => dispatch(actionCreators.deleteTodo(id))
+  };
+};
+
+export default connect(mapStateToProps, mapDispatchToProps)(withRouter(TodoList));

src/index.js

@@ -4,7 +4,25 @@ import './index.css';
 import App from './App';
 import * as serviceWorker from './serviceWorker';
 
-ReactDOM.render(<App />, document.getElementById('root'));
+// Redux integration
+import { Provider } from 'react-redux';
+import { createStore, combineReducers, applyMiddleware } from 'redux';
+import thunk from 'redux-thunk';
+
+import { connectRouter, routerMiddleware } from 'connected-react-router';
+import { createBrowserHistory } from 'history';
+
+import todoReducer from './store/reducers/todo';
+
+const history = createBrowserHistory();
+const rootReducer = combineReducers({
+  td: todoReducer, router: connectRouter(history)
+});
+const store = createStore(rootReducer,
+  applyMiddleware(thunk, routerMiddleware(history)));
+
+ReactDOM.render(<Provider store={store}><App history={history} /></Provider>,
+  document.getElementById('root'));
 
 // If you want your app to work offline and load faster, you can change
 // unregister() to register() below. Note this comes with some pitfalls.

src/store/actions/actionTypes.js

@@ -0,0 +1,5 @@
+export const GET_ALL = 'GET_ALL';
+export const GET_TODO = 'GET_TODO';
+export const TOGGLE_DONE = 'TOGGLE_DONE';
+export const DELETE_TODO = 'DELETE_TODO';
+export const ADD_TODO = 'ADD_TODO';

src/store/actions/index.js

@@ -0,0 +1,7 @@
+export {
+  getTodos,
+  getTodoDetail,
+  postTodo,
+  deleteTodo,
+  toggleTodo
+} from './todo';