-
Notifications
You must be signed in to change notification settings - Fork 2.7k
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
add solution #2918
Open
myuriy81
wants to merge
1
commit into
mate-academy:master
Choose a base branch
from
myuriy81:develop
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
add solution #2918
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
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,126 @@ | ||
import { useState } from 'react'; | ||
import './App.scss'; | ||
import usersFromServer from './api/users'; | ||
import todosFromServer from './api/todos'; | ||
import { TodoList } from './components/TodoList'; | ||
import { Todo } from './types/Todo'; | ||
|
||
// import usersFromServer from './api/users'; | ||
// import todosFromServer from './api/todos'; | ||
const findUserById = (userId: number) => { | ||
return usersFromServer.find(user => user.id === userId); | ||
}; | ||
|
||
const getPreparedTodos = () => { | ||
return todosFromServer.map(todo => { | ||
return { | ||
...todo, | ||
user: findUserById(todo.userId) || null, | ||
}; | ||
}); | ||
}; | ||
|
||
export const App = () => { | ||
const [todos, setTodos] = useState<Todo[]>(getPreparedTodos()); | ||
const [selectedUserId, setSelectedUserId] = useState(0); | ||
const [title, setTitle] = useState(''); | ||
const [titleInputError, setTitleInputError] = useState(false); | ||
const [userSelectError, setUserSelectError] = useState(false); | ||
|
||
const reset = () => { | ||
setTitle(''); | ||
setSelectedUserId(0); | ||
setTitleInputError(false); | ||
setUserSelectError(false); | ||
}; | ||
|
||
function handleSubmit(event: React.FormEvent<HTMLFormElement>): void { | ||
event.preventDefault(); | ||
|
||
setTitleInputError(!title); | ||
setUserSelectError(!selectedUserId); | ||
|
||
if (!title || !selectedUserId) { | ||
return; | ||
} | ||
|
||
setTodos(currentTodos => { | ||
const newId = Math.max(...currentTodos.map(todo => todo.id)) + 1; | ||
|
||
const user = findUserById(selectedUserId); | ||
|
||
const newTodo: Todo = { | ||
id: newId, | ||
title: title, | ||
userId: selectedUserId, | ||
completed: false, | ||
user: user || null, | ||
}; | ||
|
||
return [...currentTodos, newTodo]; | ||
}); | ||
|
||
reset(); | ||
} | ||
|
||
function handleTitleInput(event: React.ChangeEvent<HTMLInputElement>): void { | ||
setTitle(event.target.value.trimStart()); | ||
setTitleInputError(false); | ||
} | ||
|
||
function handleUserSelect(event: React.ChangeEvent<HTMLSelectElement>): void { | ||
setSelectedUserId(Number(event.target.value)); | ||
setUserSelectError(false); | ||
} | ||
|
||
return ( | ||
<div className="App"> | ||
<h1>Add todo form</h1> | ||
|
||
<form action="/api/todos" method="POST"> | ||
<form action="/api/todos" method="POST" onSubmit={handleSubmit}> | ||
<div className="field"> | ||
<input type="text" data-cy="titleInput" /> | ||
<span className="error">Please enter a title</span> | ||
<label htmlFor="titleInput">Title: </label> | ||
<input | ||
type="text" | ||
id="titleInput" | ||
data-cy="titleInput" | ||
value={title} | ||
onChange={handleTitleInput} | ||
placeholder="title" | ||
/> | ||
{titleInputError && ( | ||
<span className="error">Please enter a title</span> | ||
)} | ||
</div> | ||
|
||
<div className="field"> | ||
<select data-cy="userSelect"> | ||
<label htmlFor="userSelect">User: </label> | ||
<select | ||
id="userSelect" | ||
data-cy="userSelect" | ||
onChange={handleUserSelect} | ||
value={selectedUserId} | ||
> | ||
<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> | ||
{userSelectError && ( | ||
<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,23 @@ | ||
export const TodoInfo = () => {}; | ||
import React from 'react'; | ||
import { Todo } from '../../types/Todo'; | ||
import { UserInfo } from '../UserInfo'; | ||
import classNames from 'classnames'; | ||
|
||
interface Props { | ||
todo: Todo; | ||
} | ||
|
||
export const TodoInfo: React.FC<Props> = ({ todo }) => { | ||
return ( | ||
<article | ||
data-id={todo.id} | ||
className={classNames('TodoInfo', { | ||
'TodoInfo--completed': todo.completed, | ||
})} | ||
> | ||
<h2 className="TodoInfo__title">{todo.title}</h2> | ||
|
||
{todo.user && <UserInfo user={todo.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,17 @@ | ||
export const TodoList = () => {}; | ||
import React from 'react'; | ||
import { Todo } from '../../types/Todo'; | ||
import { TodoInfo } from '../TodoInfo'; | ||
|
||
interface Props { | ||
todos: Todo[]; | ||
} | ||
|
||
export const TodoList: React.FC<Props> = ({ todos }) => { | ||
return ( | ||
<section className="TodoList"> | ||
{todos.map(todo => ( | ||
<TodoInfo key={todo.id} todo={todo} /> | ||
))} | ||
</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,14 @@ | ||
export const UserInfo = () => {}; | ||
import React from 'react'; | ||
import { User } from '../../types/User'; | ||
|
||
interface 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,8 @@ | ||
import { User } from './User'; | ||
export interface Todo { | ||
id: number; | ||
title: string; | ||
completed: boolean; | ||
userId: number; | ||
user: User | null; | ||
} |
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,6 @@ | ||
export interface User { | ||
id: number; | ||
name: string; | ||
username: string; | ||
email: string; | ||
} |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The
getPreparedTodos
function usesmap
to transformtodosFromServer
. Sincemap
is a non-mutating method, there is no need to create a copy of the array. You can directly return the result ofmap
without wrapping it in another array. This aligns with the checklist item: "If you are using a non-mutating array method, you don't need to create a copy of the array."