Skip to content

asdf #59

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

asdf #59

Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 25 additions & 0 deletions redux-basic/redux-basics.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
const redux = require('redux'); // load module in Node.js
const createStore = redux.createStore;
const initialState = { number: 0 }; // default state

// create identity reducer
const reducer = (state = initialState, action) => {
if (action.type == 'ADD') {
return ({ ...state, number: state.number + 1});
} else if (action.type == 'ADD_VALUE') {
return ({
...state, number: state.number + action.value
});
}
return state;
}

const store = createStore(reducer);
store.subscribe(() => {
console.log('[Subscription]', store.getState());
});

store.dispatch({ type: 'ADD' });
console.log(store.getState());
store.dispatch({ type: 'ADD_VALUE', value: 5 });
console.log(store.getState());
5 changes: 3 additions & 2 deletions src/components/Todo/Todo.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,12 @@ const Todo = (props) => {
return (
<div className="Todo">
<div
className={`text ${props.done && 'done'}`}
onClick={props.clicked}>
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>
);
};
Expand Down
14 changes: 12 additions & 2 deletions src/containers/TodoList/NewTodo/NewTodo.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
import React, { Component } from 'react';

import { connect } from 'react-redux';
import * as actionTypes from '../../../store/actions/actionTypes';
import { Redirect } from 'react-router-dom';

import './NewTodo.css';
Expand All @@ -14,6 +16,8 @@ class NewTodo extends Component {
postTodoHandler = () => {
const data =
{ title: this.state.title, content: this.state.content }
this.props.onStoreTodo(this.state.title, this.state.content);
this.setState({ submitted: true });
alert('submitted' + data.title);
// this.props.history.push('/todos');
this.props.history.goBack();
Expand All @@ -36,7 +40,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>
Expand All @@ -45,4 +49,10 @@ class NewTodo extends Component {
}
}

export default NewTodo;
const mapDispatchToProps = dispatch => {
return {
onStoreTodo: (title, content) =>
dispatch({ type: actionTypes.ADD_TODO, title: title, content: content })
};
};
export default connect(null, mapDispatchToProps)(NewTodo);
34 changes: 30 additions & 4 deletions src/containers/TodoList/RealDetail/RealDetail.js
Original file line number Diff line number Diff line change
@@ -1,28 +1,54 @@
import React, { Component } from 'react';

import { connect } from 'react-redux';
import './RealDetail.css';
import * as actionTypes from '../../../store/actions/actionTypes';

class RealDetail extends Component {
componentDidMount() {
this.props.onGetTodo(parseInt(this.props.match.params.id));
}
render() {
let content = '', title = '';
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:
Name:
</div>
<div className="right">
{this.props.selectedTodo.title}
</div>
</div>
<div className="row">
<div className="left">
Content:
Content:
</div>
<div className="right">
{this.props.selectedTodo.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);
39 changes: 30 additions & 9 deletions src/containers/TodoList/TodoList.js
Original file line number Diff line number Diff line change
@@ -1,13 +1,21 @@
import React, { Component } from 'react';

import axios from 'axios';
import Todo from '../../components/Todo/Todo';
import TodoDetail from '../../components/TodoDetail/TodoDetail';

import { withRouter } from 'react-router';
import { connect } from 'react-redux';
import { NavLink } from 'react-router-dom';

import * as actionTypes from '../../store/actions/actionTypes';
import './TodoList.css';

class TodoList extends Component {
componentDidMount() {
axios.get("/api/todo")
.then(result => console.log(result.data))
.catch(error => console.error(`Oops! Error occurred!! ${error}`))
}
state = {
todos: [
{ id: 1, title: 'SWPP', content: 'take swpp class', done: true },
Expand All @@ -18,21 +26,20 @@ class TodoList extends Component {
}

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)}
clickDetail={() => this.clickTodoHandler(td)}
clickDone={() => this.props.onToggleTodo(td.id)}
clickDelete={() => this.props.onDeleteTodo(td.id)}
/>
);
});
Expand All @@ -59,4 +66,18 @@ class TodoList extends Component {
}
}

export default TodoList;
const mapStateToProps = state => {
return {
storedTodos: state.td.todos
};
};

const mapDispatchToProps = dispatch => {
return {
onToggleTodo: (id) => dispatch({ type: actionTypes.TOGGLE_DONE, targetID: id }),
onDeleteTodo: (id) => dispatch({ type: actionTypes.DELETE_TODO, targetID: id }),
onGetAll: () => dispatch(actionCreators.getTodos()),
};
}; // don’t forget import * as actionTypes from ‘../../store/actions/actionTypes’;

export default connect(mapStateToProps, mapDispatchToProps)(withRouter(TodoList));
16 changes: 15 additions & 1 deletion src/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,22 @@ import ReactDOM from 'react-dom';
import './index.css';
import App from './App';
import * as serviceWorker from './serviceWorker';
import thunk from 'redux-thunk';
import { applyMiddleware } from 'redux';

ReactDOM.render(<App />, document.getElementById('root'));
// At index.js of project root
import { Provider } from 'react-redux';
import { createStore, comebineReducers, applyMiddleware } from 'redux';
import todoReducer from './store/reducers/todo';

const rootReducer = combineReducers({
td: todoReducer,
});
const store = createStore(rootReducer, applyMiddleware());


const store = createStore((state = {}, action) => state); // TODO
ReactDOM.render(<Provider store={store}><App /></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.
Expand Down
5 changes: 5 additions & 0 deletions src/store/actions/actionTypes.js
Original file line number Diff line number Diff line change
@@ -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';
1 change: 1 addition & 0 deletions src/store/actions/index.js
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
export { getTodos } from './todo';
14 changes: 14 additions & 0 deletions src/store/actions/todo.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
import * as actionTypes from './actionTypes';
import axios from 'axios';

export const getTodos_ = (todos) => {
return { type: actionTypes.GET_ALL, todos: todos };
};

export const getTodos = () => { // Why no argument? We’ll see later.
return dispatch => {
return axios
.get('/api/todo')
.then(res => dispatch(getTodos_(res.data)));
}
}
45 changes: 45 additions & 0 deletions src/store/reducers/todo.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,45 @@
import { ADD_TODO, DELETE_TODO, TOGGLE_DONE, GET_TODO } from '../actions/actionTypes';

const initialState = {
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
};
const reducer = (state = initialState, action) => {
switch (action.type) {
// we will handle actions via switch statement
case ADD_TODO:
// as React, do not mutate state directly, make new object
const newTodo = {
id: state.todos.length + 1, // temporary
title: action.title, content: action.content, done:false
}
return {...state, todos: state.todos.concat(newTodo)};
default:
return state;
case DELETE_TODO:
const deleted = state.todos.filter((todo) => {
return todo.id !== action.targetID;
});
return { ...state, todos: deleted };
case TOGGLE_DONE:
const modified = state.todos.map((todo) => {
if (todo.id === action.targetID) {
return { ...todo, done: !todo.done };
} else {
return { ...todo };
}
});
return { ...state, todos: modified };
case GET_TODO:
const target = {...state.todos[action.targetID - 1]}; // temporary
return { ...state, selectedTodo: target };

return state;
case GET_ALL:
return {...state, todos: action.todos };
}
}
export default reducer;