Skip to content
This repository was archived by the owner on May 1, 2025. It is now read-only.
Open
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
2 changes: 2 additions & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,11 @@
"@types/react-dom": "18.0.6",
"react": "^18.2.0",
"react-dom": "^18.2.0",
"react-redux": "^8.0.4",
"react-router": "6.3.0",
"react-router-dom": "6.3.0",
"react-scripts": "5.0.1",
"redux": "^4.2.0",
"typescript": "4.7.4",
"web-vitals": "2.1.4"
},
Expand Down
8 changes: 6 additions & 2 deletions src/components/Todo/Todo.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,17 +2,21 @@ import "./Todo.css";

interface IProps {
title: string;
clicked?: React.MouseEventHandler<HTMLDivElement>; // Defined by React
clickDetail?: React.MouseEventHandler<HTMLDivElement>; // Defined by React
clickDone?: () => void;
clickDelete?: () => void;
done: boolean;
}

const Todo = (props: IProps) => {
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>
);
};
Expand Down
22 changes: 15 additions & 7 deletions src/components/TodoDetail/TodoDetail.tsx
Original file line number Diff line number Diff line change
@@ -1,20 +1,28 @@
import "./TodoDetail.css";
import { useEffect } from "react";
import { useDispatch, useSelector } from "react-redux";
import { useParams } from "react-router";
import { AppDispatch } from "../../store";
import { selectTodo, fetchTodo } from "../../store/slices/todo";

type Props = {
title: string;
content: string;
};
const TodoDetail = () => {
const { id } = useParams();
const dispatch = useDispatch<AppDispatch>();
const todoState = useSelector(selectTodo);

useEffect(() => {
dispatch(fetchTodo(Number(id)));
}, [id]);

const TodoDetail = (props: Props) => {
return (
<div className="TodoDetail">
<div className="row">
<div className="left">Name:</div>
<div className="right">{props.title}</div>
<div className="right">{todoState.selectedTodo?.title}</div>
</div>
<div className="row">
<div className="left">Content:</div>
<div className="right">{props.content}</div>
<div className="right">{todoState.selectedTodo?.content}</div>
</div>
</div>
);
Expand Down
4 changes: 4 additions & 0 deletions src/containers/TodoList/NewTodo/NewTodo.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@ import { useState } from "react";
import { Navigate } from "react-router-dom";
// import { useNavigate } from "react-router-dom";
import "./NewTodo.css";
import { useDispatch } from "react-redux";
import { todoActions } from "../../../store/slices/todo";

export default function NewTodo() {
const [title, setTitle] = useState<string>("");
Expand All @@ -16,9 +18,11 @@ export default function NewTodo() {
// navigate('/todos')
// };

const dispatch = useDispatch();
const postTodoHandler = () => {
const data = { title: title, content: content };
alert("Submitted\n" + data.title + "\n" + data.content);
dispatch(todoActions.addTodo(data));
setSubmitted(true);
};

Expand Down
58 changes: 38 additions & 20 deletions src/containers/TodoList/TodoList.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,12 @@ import { NavLink } from "react-router-dom";
import Todo from "../../components/Todo/Todo";
import TodoDetail from "../../components/TodoDetail/TodoDetail";
import "./TodoList.css";
import { NavLink, useNavigate } from "react-router-dom";
import { useDispatch, useSelector } from "react-redux";
import {fetchTodos, selectTodo, todoActions} from "../../store/slices/todo";
import {useEffect} from "react";
import axios from 'axios';
import {AppDispatch} from "../../store";

interface IProps {
title: string;
Expand All @@ -11,44 +17,56 @@ interface IProps {
type TodoType = { id: number; title: string; content: string; done: boolean };

export default function TodoList(props: IProps) {
const dispatch = useDispatch<AppDispatch>();
const { title } = props;
const [selectedTodo, setSelectedTodo] = useState<TodoType | null>(null);
const todoState = useSelector(selectTodo);
// const [selectedTodo, setSelectedTodo] = useState<TodoType | null>(null);

const [todos, setTodos] = useState<TodoType[]>([
{ 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 },
]);
// const [todos, setTodos] = useState<TodoType[]>([
// { 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 },
// ]);
const navigate = useNavigate()

const clickTodoHandler = (td: TodoType) => {
if (selectedTodo === td) {
setSelectedTodo(null);
} else {
setSelectedTodo(td);
}
navigate('/todos/' + td.id);
};

const todoDetail = useMemo(() => {
return selectedTodo ? (
<TodoDetail title={selectedTodo.title} content={selectedTodo.content} />
) : null;
}, [selectedTodo]);
// const todoDetail = useMemo(() => {
// return selectedTodo ? (
// <TodoDetail title={selectedTodo.title} content={selectedTodo.content} />
// ) : null;
// }, [selectedTodo]);
useEffect(() => {
dispatch(fetchTodos())
// eslint-disable-next-line react-hooks/exhaustive-deps
},[]);


useEffect(() => { axios.get('/api/todo/')
.then(result => console.log(result))
.catch(e => console.log(e));
});

return (
<div className="TodoList">
<div className="title">{title}</div>
<div className="todos">
{todos.map((td) => {
{todoState.todos.map((td) => {
return (
<Todo
key={`${td.id}_todo`}
// key={`${td.id}_todo`}
title={td.title}
done={td.done}
clicked={() => clickTodoHandler(td)}
// clicked={() => clickTodoHandler(td)}
clickDetail={() => clickTodoHandler(td)}
clickDone={() => dispatch(todoActions.toggleDone({targetId: td.id}))}
clickDelete={() => dispatch(todoActions.deleteTodo({targetId: td.id}))}
/>
);
})}
{todoDetail}
{/* {todoDetail} */}
<NavLink to="/new-todo" >New Todo</NavLink>
</div>
</div>
Expand Down
8 changes: 6 additions & 2 deletions src/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,16 @@ import React from 'react';
import ReactDOM from 'react-dom/client';
import './index.css';
import App from './App';
import { Provider } from "react-redux";
import { store } from "./store";

const root = ReactDOM.createRoot(
document.getElementById('root') as HTMLElement
document.getElementById("root") as HTMLElement
);
root.render(
<React.StrictMode>
<App />
<Provider store={store}>
<App />
</Provider>
</React.StrictMode>
);
11 changes: 11 additions & 0 deletions src/store/index.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
import { configureStore } from "@reduxjs/toolkit";
import todoReducer from "./slices/todo";

export const store = configureStore({
reducer: {
todo: todoReducer,
},
});

export type RootState = ReturnType<typeof store.getState>;
export type AppDispatch = typeof store.dispatch;
111 changes: 111 additions & 0 deletions src/store/slices/todo.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,111 @@
import {createAsyncThunk, createSlice, PayloadAction} from "@reduxjs/toolkit";
import axios from "axios";
import {RootState} from "..";

export interface TodoType {
id: number;
title: string;
content: string;
done: boolean;
}

export interface TodoState {
todos: TodoType[];
selectedTodo: TodoType | null;
}

const initialState: TodoState = {
todos: [],
selectedTodo: null,
};

export const fetchTodos = createAsyncThunk("todo/fetchTodos", async () => {
const response = await axios.get<TodoType[]>("/api/todo/");
return response.data;
});

export const fetchTodo = createAsyncThunk(
"todo/fetchTodo",
async (id: TodoType["id"], { dispatch }) => {
const response = await axios.get(`/api/todo/${id}/`);
return response.data ?? null;
}
);

export const postTodo = createAsyncThunk(
"todo/postTodo",
async (td: Pick<TodoType, "title" | "content">, { dispatch }) => {
const response = await axios.post("/api/todo/", td);
dispatch(todoActions.addTodo(response.data));
}
);

export const deleteTodo = createAsyncThunk(
"todo/deleteTodo",
async (id: TodoType["id"], { dispatch }) => {
await axios.delete(`/api/todo/${id}/`);
dispatch(todoActions.deleteTodo({ targetId: id }));
}
);

export const toggleDone = createAsyncThunk(
"todo/toggleDone",
async (id: TodoType["id"], { dispatch }) => {
await axios.put(`/api/todo/${id}/`);
dispatch(todoActions.toggleDone({ targetId: id }));
}
);

export const todoSlice = createSlice({
name: "todo",
initialState,
reducers: {
getAll: (state, action: PayloadAction<{ todos: TodoType[] }>) => {},
getTodo: (state, action: PayloadAction<{ targetId: number }>) => {
const target = state.todos.find(
(td) => td.id === action.payload.targetId
);
state.selectedTodo = target ?? null;
},
toggleDone: (state, action: PayloadAction<{ targetId: number }>) => {
const todo = state.todos.find(
(value) => value.id === action.payload.targetId
);
if (todo) {
todo.done = !todo.done;
}
},
deleteTodo: (state, action: PayloadAction<{ targetId: number }>) => {
state.todos = state.todos.filter((todo) => {
return todo.id !== action.payload.targetId;
});
},
addTodo: (state, action: PayloadAction<{ title: string; content: string }>) => {
const newTodo = {
id: state.todos[state.todos.length - 1].id + 1, // temporary
title: action.payload.title,
content: action.payload.content,
done: false,
};
state.todos.push(newTodo);
},
},
extraReducers: (builder) => {
// Add reducers for additional action types here, and handle loading state as needed
builder.addCase(fetchTodos.fulfilled, (state, action) => {
// Add user to the state array
state.todos = action.payload;
});
builder.addCase(fetchTodo.fulfilled, (state, action) => {
state.selectedTodo = action.payload;
});
builder.addCase(postTodo.rejected, (_state, action) => {
console.error(action.error);
});
},
});

export const todoActions = todoSlice.actions;
export const selectTodo = (state: RootState) => state.todo;

export default todoSlice.reducer;
Loading