-
Notifications
You must be signed in to change notification settings - Fork 2.7k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
Showing
6 changed files
with
173 additions
and
37 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,61 +1,119 @@ | ||
import './App.scss'; | ||
|
||
// import usersFromServer from './api/users'; | ||
// import todosFromServer from './api/todos'; | ||
import usersFromServer from './api/users'; | ||
import todosFromServer from './api/todos'; | ||
import { useState } from 'react'; | ||
import { FormData, Todo } from './types'; | ||
import { TodoList } from './components/TodoList'; | ||
import { getNewTodoId } from './services'; | ||
|
||
const initialForm: FormData = { | ||
title: '', | ||
userId: 0, | ||
}; | ||
|
||
export const App = () => { | ||
const [todos, setTodos] = useState<Todo[]>(todosFromServer); | ||
const [formData, setFormData] = useState(initialForm); | ||
const [isTitleError, setIsTitleError] = useState(false); | ||
const [isUserError, setIsUserError] = useState(false); | ||
|
||
const { title, userId } = formData; | ||
|
||
const isDisabledAdd = !title.trim() || !userId; | ||
|
||
const reset = () => { | ||
setFormData({ ...initialForm }); | ||
}; | ||
|
||
const handleAddTodo = (inputData: FormData) => { | ||
const newTodo = { | ||
...inputData, | ||
id: getNewTodoId(todos), | ||
completed: false, | ||
}; | ||
|
||
setTodos(currentTodos => [...currentTodos, newTodo]); | ||
}; | ||
|
||
const handleTitleChange = (event: React.ChangeEvent<HTMLInputElement>) => { | ||
setFormData(prevData => ({ | ||
...prevData, | ||
title: event.target.value, | ||
})); | ||
setIsTitleError(false); | ||
}; | ||
|
||
const handleUserChange = (event: React.ChangeEvent<HTMLSelectElement>) => { | ||
setFormData(prevData => ({ | ||
...prevData, | ||
userId: +event.target.value, | ||
})); | ||
setIsUserError(false); | ||
}; | ||
|
||
const handleSubmit = (event: React.FormEvent) => { | ||
event.preventDefault(); | ||
if (isDisabledAdd) { | ||
setIsTitleError(!title); | ||
setIsUserError(!userId); | ||
|
||
return; | ||
} | ||
|
||
handleAddTodo(formData); | ||
reset(); | ||
}; | ||
|
||
return ( | ||
<div className="App"> | ||
<h1>Add todo form</h1> | ||
|
||
<form action="/api/todos" method="POST"> | ||
<form onSubmit={handleSubmit}> | ||
<div className="field"> | ||
<input type="text" data-cy="titleInput" /> | ||
<span className="error">Please enter a title</span> | ||
<label className="label" htmlFor="title"> | ||
Title: | ||
</label> | ||
<input | ||
id="title" | ||
type="text" | ||
data-cy="titleInput" | ||
placeholder="Enter title" | ||
value={title} | ||
onChange={handleTitleChange} | ||
/> | ||
{isTitleError && <span className="error">Please enter a title</span>} | ||
</div> | ||
|
||
<div className="field"> | ||
<select data-cy="userSelect"> | ||
<label className="label" htmlFor="user"> | ||
User: | ||
</label> | ||
<select | ||
id="user" | ||
data-cy="userSelect" | ||
value={userId} | ||
onChange={handleUserChange} | ||
> | ||
<option value="0" disabled> | ||
Choose a user | ||
</option> | ||
{usersFromServer.map(user => ( | ||
<option key={user.id} value={user.id}> | ||
{user.name} | ||
</option> | ||
))} | ||
</select> | ||
|
||
<span className="error">Please choose a user</span> | ||
{isUserError && <span className="error">Please choose a user</span>} | ||
</div> | ||
|
||
<button type="submit" data-cy="submitButton"> | ||
Add | ||
</button> | ||
</form> | ||
|
||
<section className="TodoList"> | ||
<article data-id="1" className="TodoInfo TodoInfo--completed"> | ||
<h2 className="TodoInfo__title">delectus aut autem</h2> | ||
|
||
<a className="UserInfo" href="mailto:Sincere@april.biz"> | ||
Leanne Graham | ||
</a> | ||
</article> | ||
|
||
<article data-id="15" className="TodoInfo TodoInfo--completed"> | ||
<h2 className="TodoInfo__title">delectus aut autem</h2> | ||
|
||
<a className="UserInfo" href="mailto:Sincere@april.biz"> | ||
Leanne Graham | ||
</a> | ||
</article> | ||
|
||
<article data-id="2" className="TodoInfo"> | ||
<h2 className="TodoInfo__title"> | ||
quis ut nam facilis et officia qui | ||
</h2> | ||
|
||
<a className="UserInfo" href="mailto:Julianne.OConner@kory.org"> | ||
Patricia Lebsack | ||
</a> | ||
</article> | ||
</section> | ||
<TodoList todos={todos} /> | ||
</div> | ||
); | ||
}; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1 +1,27 @@ | ||
export const TodoInfo = () => {}; | ||
import { getUserById } from '../../services'; | ||
import { Todo } from '../../types'; | ||
import { UserInfo } from '../UserInfo'; | ||
|
||
import classNames from 'classnames'; | ||
|
||
type Props = { | ||
todo: Todo; | ||
}; | ||
|
||
export const TodoInfo: React.FC<Props> = ({ todo }) => { | ||
const user = getUserById(todo.userId); | ||
|
||
return ( | ||
<article | ||
data-id={todo.id} | ||
className={classNames('TodoInfo', { | ||
'TodoInfo--completed': todo.completed, | ||
})} | ||
key={todo.id} | ||
> | ||
<h2 className="TodoInfo__title">{todo.title}</h2> | ||
|
||
{user && <UserInfo user={user} />} | ||
</article> | ||
); | ||
}; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1 +1,16 @@ | ||
export const TodoList = () => {}; | ||
import { Todo } from '../../types'; | ||
import { TodoInfo } from '../TodoInfo'; | ||
|
||
type Props = { | ||
todos: Todo[]; | ||
}; | ||
|
||
export const TodoList: React.FC<Props> = ({ todos }) => { | ||
return ( | ||
<section className="TodoList"> | ||
{todos.map(todo => ( | ||
<TodoInfo todo={todo} key={todo.id} /> | ||
))} | ||
</section> | ||
); | ||
}; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1 +1,13 @@ | ||
export const UserInfo = () => {}; | ||
import { User } from '../../types'; | ||
|
||
type Props = { | ||
user: User; | ||
}; | ||
|
||
export const UserInfo: React.FC<Props> = ({ user }) => { | ||
return ( | ||
<a className="UserInfo" href={`mailto:${user.email}`}> | ||
{user.name} | ||
</a> | ||
); | ||
}; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,10 @@ | ||
import { Todo, User } from './types'; | ||
import usersFromServer from './api/users'; | ||
|
||
export const getUserById = (userId: number): User | null => { | ||
return usersFromServer.find(user => user.id === userId) || null; | ||
}; | ||
|
||
export const getNewTodoId = (todoList: Todo[]) => { | ||
return Math.max(...todoList.map(todo => todo.id)) + 1; | ||
}; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,15 @@ | ||
export interface Todo { | ||
id: number; | ||
title: string; | ||
completed: boolean; | ||
userId: number; | ||
} | ||
|
||
export interface User { | ||
id: number; | ||
name: string; | ||
username: string; | ||
email: string; | ||
} | ||
|
||
export type FormData = Omit<Todo, 'id' | 'completed'>; |