task complete

README.md

@@ -13,9 +13,10 @@ using the Redux. It should look and work identically, so use the same markup.
 - implement `features/todos` storing an array of todos;
 - load the todos in the `App` on page load (don't use Redux Thunk for now);
 - `useAppSelector` already aware of `RootState` so you can write selectors in your
-components (no need to write them in the store file)
+ components (no need to write them in the store file)
 
 ## Instructions
+
 - Install Prettier Extention and use this [VSCode settings](https://mate-academy.github.io/fe-program/tools/vscode/settings.json) to enable format on save.
-- Replace `<your_account>` with your Github username in the [DEMO LINK](https://<your_account>.github.io/react_redux-list-of-todos/)
+- Replace `<your_account>` with your Github username in the [DEMO LINK](https://boikoua.github.io/react_redux-list-of-todos/)
 - Follow the [React task guideline](https://github.com/mate-academy/react_task-guideline#react-tasks-guideline)

package.json

@@ -18,7 +18,7 @@
  },
  "devDependencies": {
  "@cypress/react18": "^2.0.1",
- "@mate-academy/scripts": "^1.8.5",
+ "@mate-academy/scripts": "^1.9.12",
  "@mate-academy/students-ts-config": "*",
  "@mate-academy/stylelint-config": "*",
  "@types/node": "^20.14.10",

src/App.tsx

@@ -1,26 +1,72 @@
 import 'bulma/css/bulma.css';
 import '@fortawesome/fontawesome-free/css/all.css';
 import { Loader, TodoFilter, TodoList, TodoModal } from './components';
+import { useEffect, useState } from 'react';
+import { getTodos } from './api';
+import { StatusType } from './types/Status';
+import { useDispatch } from 'react-redux';
+import { setTodos } from './features/todos';
+import { setStatus } from './features/filter';
+import { useAppSelector } from './app/hooks';
 
-export const App = () => (
- <>
- <div className="section">
- <div className="container">
- <div className="box">
- <h1 className="title">Todos:</h1>
+export const App = () => {
+ const dispatch = useDispatch();
+ const todos = useAppSelector(state => state.todos);
+ const { query, status } = useAppSelector(state => state.filter);
+ const selectTodo = useAppSelector(state => state.currentTodo);
 
- <div className="block">
- <TodoFilter />
- </div>
+ const [isLoading, setIsLoading] = useState(false);
+
+ useEffect(() => {
+ setIsLoading(true);
+
+ getTodos()
+ .then(todosFromServer => {
+ dispatch(setTodos(todosFromServer));
+ })
+ .catch(error => {
+ throw new Error(error);
+ })
+ .finally(() => {
+ setIsLoading(false);
+ dispatch(setStatus('all'));
+ });
+ }, [dispatch]);
+
+ const preparedTodos = todos
+ .filter(todo => todo.title.toLowerCase().includes(query.toLowerCase()))
+ .filter(todo => {
+ switch (status) {
+ case StatusType.Active:
+ return !todo.completed;
+
+ case StatusType.Completed:
+ return todo.completed;
+
+ default:
+ return true;
+ }
+ });
+
+ return (
+ <>
+ <div className="section">
+ <div className="container">
+ <div className="box">
+ <h1 className="title">Todos:</h1>
+
+ <div className="block">
+ <TodoFilter />
+ </div>
 
- <div className="block">
- <Loader />
- <TodoList />
+  <div className="block">
+  {isLoading ? <Loader /> : <TodoList todos={preparedTodos} />}
+ </div>
  </div>
  </div>
  </div>
- </div>
 
- <TodoModal />
- </>
-);
+ {selectTodo && <TodoModal />}
+ </>
+ );
+};

src/app/hooks.ts

@@ -0,0 +1,4 @@
+import { TypedUseSelectorHook, useSelector } from 'react-redux';
+import { RootState } from './store';
+
+export const useAppSelector: TypedUseSelectorHook<RootState> = useSelector;

src/app/store.ts

@@ -1,6 +1,13 @@
 import { combineSlices, configureStore } from '@reduxjs/toolkit';
+import todosReducer from '../features/todos';
+import filterReducer from '../features/filter';
+import currentTodoReducer from '../features/currentTodo';
 
-const rootReducer = combineSlices();
+const rootReducer = combineSlices({
+ todos: todosReducer,
+ filter: filterReducer,
+ currentTodo: currentTodoReducer,
+});
 
 export const store = configureStore({
  reducer: rootReducer,

src/components/TodoFilter/TodoFilter.tsx

@@ -1,17 +1,44 @@
 import React from 'react';
+import { Status, StatusType } from '../../types/Status';
+import { useDispatch } from 'react-redux';
+import { setQuery, setStatus } from '../../features/filter';
+import { useAppSelector } from '../../app/hooks';
+
+export const TodoFilter = () => {
+ const dispatch = useDispatch();
+ const { status, query } = useAppSelector(state => state.filter);
+
+ const showOptions = Object.values(StatusType).map(stat => (
+ <option key={stat} value={stat}>
+ {stat[0].toUpperCase() + stat.slice(1)}
+ </option>
+ ));
+
+ const handleChangeStatus = (event: React.ChangeEvent<HTMLSelectElement>) => {
+ dispatch(setStatus(event.target.value as Status));
+ };
+
+ const handleChangeSearch = (event: React.ChangeEvent<HTMLInputElement>) => {
+ dispatch(setQuery(event.target.value));
+ };
+
+ const handleClearSearch = () => {
+ dispatch(setQuery(''));
+ };
 
-export const TodoFilter: React.FC = () => {
  return (
  <form
  className="field has-addons"
  onSubmit={event => event.preventDefault()}
  >
  <p className="control">
  <span className="select">
- <select data-cy="statusSelect">
- <option value="all">All</option>
- <option value="active">Active</option>
- <option value="completed">Completed</option>
+ <select
+ data-cy="statusSelect"
+ value={status}
+ onChange={handleChangeStatus}
+ >
+ {showOptions}
  </select>
  </span>
  </p>
@@ -22,19 +49,24 @@ export const TodoFilter: React.FC = () => {
  type="text"
  className="input"
  placeholder="Search..."
+ value={query}
+ onChange={handleChangeSearch}
  />
  <span className="icon is-left">
  <i className="fas fa-magnifying-glass" />
  </span>
 
- <span className="icon is-right" style={{ pointerEvents: 'all' }}>
- {/* eslint-disable-next-line jsx-a11y/control-has-associated-label */}
- <button
- data-cy="clearSearchButton"
- type="button"
- className="delete"
- />
- </span>
+ {!!query.length && (
+ <span className="icon is-right" style={{ pointerEvents: 'all' }}>
+ {/* eslint-disable-next-line jsx-a11y/control-has-associated-label */}
+ <button
+ data-cy="clearSearchButton"
+ type="button"
+ className="delete"
+ onClick={handleClearSearch}
+ />
+ </span>
+ )}
  </p>
  </form>
  );

src/components/TodoItem/TodoItem.tsx

@@ -0,0 +1,57 @@
+import cn from 'classnames';
+import { Todo } from '../../types/Todo';
+import { useAppSelector } from '../../app/hooks';
+
+type Props = {
+ todo: Todo;
+ onSelect: (todo: Todo) => void;
+};
+
+export const TodoItem: React.FC<Props> = ({ todo, onSelect }) => {
+ const { id, title, completed } = todo;
+ const currentTodo = useAppSelector(state => state.currentTodo);
+
+ const handleSelectTodo = () => {
+ onSelect(todo);
+ };
+
+ return (
+ <tr data-cy="todo">
+ <td className="is-vcentered">{id}</td>
+ <td className="is-vcentered">
+ {completed ? (
+ <span className="icon" data-cy="iconCompleted">
+ <i className="fas fa-check" />
+ </span>
+ ) : (
+ ''
+ )}
+ </td>
+
+ <td className="is-vcentered is-expanded">
+ <p
+ className={cn({
+ 'has-text-danger': !completed,
+ 'has-text-success': completed,
+ })}
+ >
+ {title}
+ </p>
+ </td>
+
+ <td className="has-text-right is-vcentered">
+ <button data-cy="selectButton" className="button" type="button">
+ {id === currentTodo?.id ? (
+ <span className="icon">
+ <i className="far fa-eye-slash" />
+ </span>
+ ) : (
+ <span className="icon" onClick={handleSelectTodo}>
+ <i className="far fa-eye" />
+ </span>
+ )}
+ </button>
+ </td>
+ </tr>
+ );
+};

src/components/TodoItem/index.ts

@@ -0,0 +1 @@
+export * from './TodoItem';