submission (attendance)

package.json

@@ -2,12 +2,19 @@
   "name": "swppfront",
   "version": "0.1.0",
   "private": true,
+  "proxy": "http://localhost:8000",
   "dependencies": {
+    "axios": "^0.20.0",
+    "connected-react-router": "^6.8.0",
+    "history": "^5.0.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

@@ -6,10 +6,11 @@ import RealDetail from './containers/TodoList/RealDetail/RealDetail';
 import NewTodo from './containers/TodoList/NewTodo/NewTodo';
 
 import { BrowserRouter, Route, Redirect, Switch } from 'react-router-dom';
+import { ConnectedRouter } from 'connected-react-router';
 
-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

@@ -8,10 +8,12 @@ const Todo = (props) => {
     <div className="Todo">
       <div
         className={`text ${props.done && 'done'}`}
-        onClick={props.clicked}>
+        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>
   );
 };

src/containers/TodoList/NewTodo/NewTodo.js

@@ -3,28 +3,21 @@ import React, { Component } from 'react';
 import { Redirect } from 'react-router-dom';
 
 import './NewTodo.css';
+import { connect } from 'react-redux';
+import * as actionCreators from '../../../store/actions/todo';
+
 
 class NewTodo extends Component {
   state = {
     title: '',
     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.history.goBack();
-    this.setState({ submitted: true });
-  }
+      this.props.onStoreTodo(this.state.title, this.state.content);
+  };
 
   render() {
-    let redirect = null;
-    if (this.state.submitted) {
-      redirect = <Redirect to='/todos' />
-    }
     return (
       <div className="NewTodo">
         <h1>Add a New Todo!</h1>
@@ -36,7 +29,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 +38,11 @@ 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,51 @@
 import React, { Component } from 'react';
-
+import * as actionCreators from '../../../store/actions/index';
 import './RealDetail.css';
+import { connect } from 'react-redux';
 
 class RealDetail extends Component {
+    componentDidMount() {
+    // it’s safe to get state after component mounted. Note: id is given as string.
+    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">
+              {title}
           </div>
         </div>
         <div className="row">
           <div className="left">
             Content:
         </div>
           <div className="right">
+              {content}
           </div>
         </div>
       </div>
     );
   }
+}
+const mapStateToProps = state => {
+    return {
+        selectedTodo: state.td.selectedTodo,
+    };
 };
 
-export default RealDetail;
+const mapDispatchToProps = dispatch => {
+    return {
+        onGetTodo: id =>
+            dispatch(actionCreators.getTodo(id)),
+    }
+};
+export default connect(mapStateToProps, mapDispatchToProps)(RealDetail);

src/containers/TodoList/TodoList.js

@@ -4,46 +4,50 @@ import Todo from '../../components/Todo/Todo';
 import TodoDetail from '../../components/TodoDetail/TodoDetail';
 
 import { NavLink } from 'react-router-dom';
+import * as actionCreators from '../../store/actions/index';
 
 import './TodoList.css';
+import { connect } from 'react-redux';
+import { withRouter } from 'react-router';
+const mapStateToProps = state => {
+  return {
+    storedTodos: state.td.todos
+  };
+};
+const mapDispatchToProps = dispatch => {
+  return {
+    onToggleTodo: (id) =>
+        dispatch(actionCreators.toggleTodo(id)),
+    onDeleteTodo: (id) =>
+        dispatch(actionCreators.deleteTodo(id)),
+    onGetAll: () =>
+        dispatch(actionCreators.getTodos())
+  };
+};
 
 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 });
-    }
-  }
+    this.props.history.push('/todos/' + 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)}
+            key={td.id}
+            title={td.title}
+            done={td.done}
+            clickDetail={() => this.clickTodoHandler(td)}
+            clickDone={() => this.props.onToggleTodo(td.id)}
+            clickDelete={() => this.props.onDeleteTodo(td.id)}
         />
       );
     });
 
-    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 +56,10 @@ class TodoList extends Component {
         <div className='todos'>
           {todos}
         </div>
-        {todo}
         <NavLink to='/new-todo' exact>New Todo</NavLink>
       </div>
     )
   }
 }
 
-export default TodoList;
+export default connect(mapStateToProps, mapDispatchToProps)(TodoList);

src/index.js

@@ -3,8 +3,36 @@ import ReactDOM from 'react-dom';
 import './index.css';
 import App from './App';
 import * as serviceWorker from './serviceWorker';
+import {Provider} from 'react-redux';
+import {createStore, combineReducers, applyMiddleware, compose} from 'redux';
+import todoReducer from './store/reducers/todo';
+import thunk from 'redux-thunk';
+import {connectRouter, routerMiddleware} from 'connected-react-router';
+import {createBrowserHistory} from 'history';
 
-ReactDOM.render(<App />, document.getElementById('root'));
+const history = createBrowserHistory();
+const rootReducer = combineReducers({
+    /* in this case, we have only single reducer,
+    * but we can merge reducers by using combineReducers for bigger project */
+    td: todoReducer,
+    router: connectRouter(history),
+});
+const logger = store => {
+    return next => {
+        return action => {
+            console.log('[Middleware] Dispatching', action);
+            const result = next(action);
+            console.log('[Middleware] Next State', store.getState());
+            return result;
+        };
+    };
+};
+const composeEnhancers = window.__REDUX_DEVTOOLS_EXTENSION_COMPOSE__ || compose;
+const store = createStore(rootReducer,
+    composeEnhancers(
+        applyMiddleware(logger, 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,6 @@
+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,
+    postTodo,
+    deleteTodo,
+    toggleTodo,
+    getTodo
+} from './todo';

src/store/actions/todo.js

@@ -0,0 +1,75 @@
+import * as actionTypes from './actionTypes';
+import axios from 'axios';
+
+import { push } from 'connected-react-router';
+
+export const getTodos_ = (todos) => {
+    return { type: actionTypes.GET_ALL, todos: todos };
+};
+
+export const getTodos = () => {
+    return dispatch => {
+        return axios.get('/api/todo')
+            .then(res => dispatch(getTodos_(res.data)));
+    };
+};
+
+export const getTodo_ = (todo) => {
+    return { type: actionTypes.GET_TODO, target: todo };
+};
+
+export const getTodo = (id) => {
+    return dispatch => {
+        return axios.get('/api/todo/' + id)
+            .then(res => {
+                dispatch(getTodo_(res.data))
+            });
+    };
+};
+
+export const postTodo_ = (td) => {
+    return {
+        type: actionTypes.ADD_TODO,
+        id: td.id,
+        title: td.title,
+        content: td.content,
+    };
+};
+
+export const postTodo = (td) => {
+    return (dispatch) => {
+        return axios.post('/api/todo/', td)
+            .then(res => {
+                dispatch(postTodo_(res.data));
+                dispatch(push('/todos/'));
+            });
+    };
+};
+
+export const deleteTodo_ = (id) => {
+    return {
+        type: actionTypes.DELETE_TODO,
+        targetID: id
+    };
+};
+
+export const deleteTodo = (id) => {
+    return dispatch => {
+        return axios.delete('/api/todo/' + id)
+            .then(res => dispatch(deleteTodo_(id)));
+    };
+};
+
+export const toggleTodo_ = (id) => {
+    return {
+        type: actionTypes.TOGGLE_DONE,
+        targetID: id
+    };
+};
+
+export const toggleTodo = (id) => {
+    return dispatch => {
+        return axios.put('/api/todo/' + id)
+            .then(res => dispatch(toggleTodo_(id)));
+    };
+};