diff --git a/package.json b/package.json index 0f38547..c583f14 100644 --- a/package.json +++ b/package.json @@ -12,6 +12,8 @@ "@types/react-dom": "18.0.6", "react": "^18.2.0", "react-dom": "^18.2.0", + "react-router": "6.3.0", + "react-router-dom": "6.3.0", "react-scripts": "5.0.1", "typescript": "4.7.4", "web-vitals": "2.1.4" diff --git a/src/App.test.tsx b/src/App.test.tsx index 2a68616..171328c 100644 --- a/src/App.test.tsx +++ b/src/App.test.tsx @@ -1,3 +1,4 @@ +//export {} import React from 'react'; import { render, screen } from '@testing-library/react'; import App from './App'; diff --git a/src/App.tsx b/src/App.tsx index 9d18e93..4a1c771 100644 --- a/src/App.tsx +++ b/src/App.tsx @@ -1,7 +1,30 @@ import "./App.css"; +import TodoList from "./containers/TodoList/TodoList"; // can omit.js +import { BrowserRouter, Routes, Route, Navigate } from "react-router-dom"; +import NewTodo from "./containers/TodoList/NewTodo/NewTodo"; +import TodoDetail from "./components/TodoDetail/TodoDetail"; function App() { - return
; + return ( +
+ + + } /> + } /> + } /> + } /> + Not Found} /> + + +
+ ); } export default App; + +
; +/* actually, it uses className, not class to avoid collision btw JS class + * this syntax is compiled to React.createElement(‘div’, {className: ‘TodoList’}) + * by React Transpiler. + * ); + */ diff --git a/src/components/Todo/Todo.tsx b/src/components/Todo/Todo.tsx index cb0ff5c..1fdedf7 100644 --- a/src/components/Todo/Todo.tsx +++ b/src/components/Todo/Todo.tsx @@ -1 +1,20 @@ -export {}; +//import css +import "./Todo.css"; + +interface IProps { + title: string; + clicked?: React.MouseEventHandler; // Defined by React + done: boolean; +} + +const Todo = (props: IProps) => { + return ( +
+
+ {props.title} +
+ {props.done &&
✓
} +
+ ); +}; +export default Todo; diff --git a/src/components/TodoDetail/TodoDetail.tsx b/src/components/TodoDetail/TodoDetail.tsx index cb0ff5c..dd6fc30 100644 --- a/src/components/TodoDetail/TodoDetail.tsx +++ b/src/components/TodoDetail/TodoDetail.tsx @@ -1 +1,22 @@ -export {}; +import "./TodoDetail.css"; + +type Props = { + title: string; + content: string; +}; + +const TodoDetail = (props: Props) => { + return ( +
+
+
Name:
+
{props.title}
+
+
+
Content:
+
{props.content}
+
+
+ ); +}; +export default TodoDetail; diff --git a/src/containers/TodoList/NewTodo/NewTodo.tsx b/src/containers/TodoList/NewTodo/NewTodo.tsx index cb0ff5c..c23a5fb 100644 --- a/src/containers/TodoList/NewTodo/NewTodo.tsx +++ b/src/containers/TodoList/NewTodo/NewTodo.tsx @@ -1 +1,47 @@ -export {}; +import { useState } from "react"; +import { Navigate } from "react-router-dom"; +// import { useNavigate } from "react-router-dom"; +import "./NewTodo.css"; + +export default function NewTodo() { + const [title, setTitle] = useState(""); + const [content, setContent] = useState(""); + const [submitted, setSubmitted] = useState(false); + + // const navigate = useNavigate() + // const postTodoHandler = () => { + // const data = { title: title, content: content }; + // alert("Submitted\n" + data.title + "\n" + data.content); + // setSubmitted(true); + // navigate('/todos') + // }; + + const postTodoHandler = () => { + const data = { title: title, content: content }; + alert("Submitted\n" + data.title + "\n" + data.content); + setSubmitted(true); + }; + + if (submitted) { + return ; + } else { + return ( +
+

Add a Todo

+ + setTitle(event.target.value)} + /> + +