-
Notifications
You must be signed in to change notification settings - Fork 1.2k
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 task solution #758
Open
MariaSnegireva
wants to merge
3
commits into
mate-academy:master
Choose a base branch
from
MariaSnegireva: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 task solution #758
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit
Hold shift + click to select a range
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
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,93 +1,12 @@ | ||
/* eslint-disable jsx-a11y/control-has-associated-label */ | ||
import React from 'react'; | ||
import { TodoProvider } from './contexts/TodosContext'; | ||
import { TodoApp } from './components/TodoApp'; | ||
|
||
export const App: React.FC = () => { | ||
return ( | ||
<div className="todoapp"> | ||
<header className="header"> | ||
<h1>todos</h1> | ||
|
||
<form> | ||
<input | ||
type="text" | ||
data-cy="createTodo" | ||
className="new-todo" | ||
placeholder="What needs to be done?" | ||
/> | ||
</form> | ||
</header> | ||
|
||
<section className="main"> | ||
<input | ||
type="checkbox" | ||
id="toggle-all" | ||
className="toggle-all" | ||
data-cy="toggleAll" | ||
/> | ||
<label htmlFor="toggle-all">Mark all as complete</label> | ||
|
||
<ul className="todo-list" data-cy="todoList"> | ||
<li> | ||
<div className="view"> | ||
<input type="checkbox" className="toggle" id="toggle-view" /> | ||
<label htmlFor="toggle-view">asdfghj</label> | ||
<button type="button" className="destroy" data-cy="deleteTodo" /> | ||
</div> | ||
<input type="text" className="edit" /> | ||
</li> | ||
|
||
<li className="completed"> | ||
<div className="view"> | ||
<input type="checkbox" className="toggle" id="toggle-completed" /> | ||
<label htmlFor="toggle-completed">qwertyuio</label> | ||
<button type="button" className="destroy" data-cy="deleteTodo" /> | ||
</div> | ||
<input type="text" className="edit" /> | ||
</li> | ||
|
||
<li className="editing"> | ||
<div className="view"> | ||
<input type="checkbox" className="toggle" id="toggle-editing" /> | ||
<label htmlFor="toggle-editing">zxcvbnm</label> | ||
<button type="button" className="destroy" data-cy="deleteTodo" /> | ||
</div> | ||
<input type="text" className="edit" /> | ||
</li> | ||
|
||
<li> | ||
<div className="view"> | ||
<input type="checkbox" className="toggle" id="toggle-view2" /> | ||
<label htmlFor="toggle-view2">1234567890</label> | ||
<button type="button" className="destroy" data-cy="deleteTodo" /> | ||
</div> | ||
<input type="text" className="edit" /> | ||
</li> | ||
</ul> | ||
</section> | ||
|
||
<footer className="footer"> | ||
<span className="todo-count" data-cy="todosCounter"> | ||
3 items left | ||
</span> | ||
|
||
<ul className="filters"> | ||
<li> | ||
<a href="#/" className="selected">All</a> | ||
</li> | ||
|
||
<li> | ||
<a href="#/active">Active</a> | ||
</li> | ||
|
||
<li> | ||
<a href="#/completed">Completed</a> | ||
</li> | ||
</ul> | ||
|
||
<button type="button" className="clear-completed"> | ||
Clear completed | ||
</button> | ||
</footer> | ||
</div> | ||
<TodoProvider> | ||
<TodoApp /> | ||
</TodoProvider> | ||
); | ||
}; |
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,22 @@ | ||
import React, { useContext } from 'react'; | ||
import { TodosContext } from '../contexts/TodosContext'; | ||
|
||
export const ClearCompletedButton: React.FC = () => { | ||
const { todos, setTodos } = useContext(TodosContext); | ||
|
||
const handleClear = () => { | ||
const modifiedTodos = todos.filter(todo => !todo.completed); | ||
|
||
setTodos(modifiedTodos); | ||
}; | ||
|
||
return ( | ||
<button | ||
type="button" | ||
className="clear-completed" | ||
onClick={handleClear} | ||
> | ||
Clear completed | ||
</button> | ||
); | ||
}; |
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,18 @@ | ||
import React, { useContext } from 'react'; | ||
import { TodoCount } from './TodoCount'; | ||
import { ClearCompletedButton } from './ClearComplitedButton'; | ||
import { TodosContext } from '../contexts/TodosContext'; | ||
import { TodosFilter } from './TodosFilter'; | ||
|
||
export const Footer: React.FC = () => { | ||
const { todos } = useContext(TodosContext); | ||
const isAreCompleted = todos.filter(todo => todo.completed).length > 0; | ||
|
||
return ( | ||
<footer className="footer"> | ||
<TodoCount /> | ||
<TodosFilter /> | ||
{isAreCompleted && <ClearCompletedButton />} | ||
</footer> | ||
); | ||
}; |
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,45 @@ | ||
import React, { useContext, useState } from 'react'; | ||
import { Todo } from '../types/Todo'; | ||
import { TodosContext } from '../contexts/TodosContext'; | ||
|
||
export const Header: React.FC = () => { | ||
const [title, setTitle] = useState(''); | ||
const { todos, setTodos } = useContext(TodosContext); | ||
|
||
const handleSabmit = (event: React.FormEvent) => { | ||
event.preventDefault(); | ||
|
||
if (title.trim()) { | ||
const newTodo: Todo = { | ||
id: +(new Date()), | ||
title, | ||
completed: false, | ||
}; | ||
|
||
setTitle(''); | ||
|
||
setTodos([...todos, newTodo]); | ||
} | ||
}; | ||
|
||
const handleSetTitle = (event:React.ChangeEvent<HTMLInputElement>) => { | ||
setTitle(event.target.value); | ||
}; | ||
|
||
return ( | ||
<header className="header"> | ||
<h1>todos</h1> | ||
|
||
<form onSubmit={handleSabmit}> | ||
<input | ||
type="text" | ||
data-cy="createTodo" | ||
value={title} | ||
className="new-todo" | ||
placeholder="What needs to be done?" | ||
onChange={handleSetTitle} | ||
/> | ||
</form> | ||
</header> | ||
); | ||
}; |
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,35 @@ | ||
import React, { useContext } from 'react'; | ||
import { TodoList } from './TodoList'; | ||
import { TodosContext } from '../contexts/TodosContext'; | ||
|
||
export const Main: React.FC = () => { | ||
const { todos, setTodos } = useContext(TodosContext); | ||
|
||
const isChecked = todos.every(todo => todo.completed); | ||
|
||
const handleToggleAll = () => { | ||
const isAllCompleted = todos.every(todo => todo.completed); | ||
const modifiedTodos = todos.map(todo => ({ | ||
...todo, | ||
completed: !isAllCompleted, | ||
})); | ||
|
||
setTodos(modifiedTodos); | ||
}; | ||
|
||
return ( | ||
<section className="main"> | ||
<input | ||
type="checkbox" | ||
id="toggle-all" | ||
className="toggle-all" | ||
data-cy="toggleAll" | ||
onClick={handleToggleAll} | ||
checked={isChecked} | ||
/> | ||
<label htmlFor="toggle-all">Mark all as complete</label> | ||
|
||
<TodoList /> | ||
</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 |
---|---|---|
@@ -0,0 +1,23 @@ | ||
import React, { useContext } from 'react'; | ||
import { TodosContext } from '../contexts/TodosContext'; | ||
import { Header } from './Header'; | ||
import { Main } from './Main'; | ||
import { Footer } from './Footer'; | ||
|
||
export const TodoApp: React.FC = () => { | ||
const { todos } = useContext(TodosContext); | ||
|
||
const isContentDisplayed = todos.length > 0; | ||
|
||
return ( | ||
<div className="todoapp"> | ||
<Header /> | ||
{isContentDisplayed && ( | ||
<> | ||
<Main /> | ||
<Footer /> | ||
</> | ||
)} | ||
</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 |
---|---|---|
@@ -0,0 +1,13 @@ | ||
import React, { useContext } from 'react'; | ||
import { TodosContext } from '../contexts/TodosContext'; | ||
|
||
export const TodoCount: React.FC = () => { | ||
const { todos } = useContext(TodosContext); | ||
const todosLeft = todos.filter(todo => !todo.completed).length; | ||
|
||
return ( | ||
<span className="todo-count" data-cy="todosCounter"> | ||
{`${todosLeft} ${todosLeft === 1 ? 'item' : 'items'} left`} | ||
</span> | ||
); | ||
}; |
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,128 @@ | ||
import React, { useContext, useState, useRef } from 'react'; | ||
import { Todo } from '../types/Todo'; | ||
import { TodoStatus } from '../types/TodoStatus'; | ||
import { TodosContext } from '../contexts/TodosContext'; | ||
|
||
type Props = { | ||
todo: Todo; | ||
}; | ||
|
||
export const TodoItem: React.FC<Props> = ({ todo }) => { | ||
const { todos, setTodos } = useContext(TodosContext); | ||
const [newTitle, setNewTitle] = useState(todo.title); | ||
const [isEditing, setIsEditing] = useState(false); | ||
|
||
const { id, title, completed } = todo; | ||
|
||
const editInputRef = useRef<HTMLInputElement>(null); | ||
|
||
const handleDelete = (todoId: number) => { | ||
const filteredTodo = todos.filter(currentTodo => currentTodo.id !== todoId); | ||
|
||
setTodos(filteredTodo); | ||
}; | ||
|
||
const handleToggle = () => { | ||
const modifiedTodos = todos.map(currentTodo => { | ||
return currentTodo.id === id | ||
? { | ||
...currentTodo, | ||
completed: !currentTodo.completed, | ||
} | ||
: currentTodo; | ||
}); | ||
|
||
setTodos(modifiedTodos); | ||
}; | ||
|
||
const handleDoubleClick = () => { | ||
setIsEditing(true); | ||
|
||
setTimeout(() => { | ||
editInputRef.current?.focus(); | ||
}, 1); | ||
}; | ||
|
||
const saveChanges = (titleToSet: string) => { | ||
if (!titleToSet) { | ||
handleDelete(todo.id); | ||
} else { | ||
const modifiedTodos = todos.map(currentTodo => { | ||
if (currentTodo.id === todo.id) { | ||
return { | ||
...currentTodo, | ||
title: titleToSet, | ||
}; | ||
} | ||
|
||
return currentTodo; | ||
}); | ||
|
||
setTodos(modifiedTodos); | ||
} | ||
|
||
setIsEditing(false); | ||
}; | ||
|
||
const discardChanges = () => { | ||
setNewTitle(todo.title); | ||
setIsEditing(false); | ||
}; | ||
|
||
const handleBlur = () => { | ||
saveChanges(newTitle); | ||
}; | ||
|
||
const handleKeyUp = (event: React.KeyboardEvent<HTMLInputElement>) => { | ||
if (event.key === 'Enter') { | ||
handleBlur(); | ||
} | ||
|
||
if (event.key === 'Escape') { | ||
discardChanges(); | ||
handleBlur(); | ||
} | ||
}; | ||
|
||
let todoClassName = TodoStatus.View; | ||
|
||
if (isEditing) { | ||
todoClassName = TodoStatus.Editing; | ||
} else if (completed) { | ||
todoClassName = TodoStatus.Completed; | ||
} | ||
|
||
return ( | ||
<li className={todoClassName}> | ||
<div className="view"> | ||
<input | ||
type="checkbox" | ||
className="toggle" | ||
onChange={handleToggle} | ||
checked={todo.completed} | ||
/> | ||
<label | ||
onDoubleClick={handleDoubleClick} | ||
> | ||
{title} | ||
</label> | ||
<button | ||
type="button" | ||
aria-label="delete" | ||
className="destroy" | ||
data-cy="deleteTodo" | ||
onClick={() => handleDelete(id)} | ||
/> | ||
</div> | ||
<input | ||
type="text" | ||
className="edit" | ||
value={newTitle} | ||
onBlur={handleBlur} | ||
onKeyUp={handleKeyUp} | ||
onChange={event => setNewTitle(event.target.value)} | ||
ref={editInputRef} | ||
/> | ||
</li> | ||
); | ||
}; |
Oops, something went wrong.
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.
it's the very small component you could keep in the Footer.tsx - just FYI