diff --git a/frontend/eslint.config.ts b/frontend/eslint.config.ts index f463af9..754c8ba 100644 --- a/frontend/eslint.config.ts +++ b/frontend/eslint.config.ts @@ -81,8 +81,6 @@ export default [ 'jsx-a11y/click-events-have-key-events': 'off', 'jsx-a11y/no-static-element-interactions': 'off', 'jsx-a11y/no-noninteractive-element-interactions': 'off', - '@stylistic/indent': 'off', - '@stylistic/jsx-one-expression-per-line': 'off', }, }, { @@ -96,6 +94,7 @@ export default [ '**/*.test.tsx', '**/__tests__/**', '**/tests/**', + '__mocks__/**', ], rules: { 'import/no-extraneous-dependencies': [ diff --git a/frontend/package.json b/frontend/package.json index edf086b..4b1b79c 100644 --- a/frontend/package.json +++ b/frontend/package.json @@ -35,7 +35,7 @@ "@types/jest": "30.0.0", "@types/react": "19.1.9", "@types/react-dom": "19.1.7", - "@typescript-eslint/parser": "8.39.0", + "@typescript-eslint/parser": "8.42.0", "eslint": "9.34.0", "eslint-config-ksv741": "0.2.0", "identity-obj-proxy": "3.0.0", @@ -45,5 +45,14 @@ "openapi-typescript": "7.9.1", "ts-node": "10.9.2", "typescript": "5.9.2" + }, + "overrides": { + "@stylistic/eslint-plugin": "5.3.1", + "typescript-eslint": "8.42.0" + }, + "msw": { + "workerDirectory": [ + "public" + ] } } diff --git a/frontend/src/entity/expenses/item/ui/AddExpenseItemForm/AddExpenseItemForm.ui.tsx b/frontend/src/entity/expenses/item/ui/AddExpenseItemForm/AddExpenseItemForm.ui.tsx index cd0b2f5..f1611ee 100644 --- a/frontend/src/entity/expenses/item/ui/AddExpenseItemForm/AddExpenseItemForm.ui.tsx +++ b/frontend/src/entity/expenses/item/ui/AddExpenseItemForm/AddExpenseItemForm.ui.tsx @@ -3,7 +3,7 @@ import { Input } from '@/shared/ui/Input'; import classes from './AddExpenseItemForm.module.css'; import type { - FC, + FC, FormEventHandler, FormHTMLAttributes, RefObject, diff --git a/frontend/src/entity/expenses/item/ui/EditExpenseItemForm/EditExpenseItemForm.test.tsx b/frontend/src/entity/expenses/item/ui/EditExpenseItemForm/EditExpenseItemForm.test.tsx index 2b45485..1f2a749 100644 --- a/frontend/src/entity/expenses/item/ui/EditExpenseItemForm/EditExpenseItemForm.test.tsx +++ b/frontend/src/entity/expenses/item/ui/EditExpenseItemForm/EditExpenseItemForm.test.tsx @@ -58,7 +58,7 @@ describe('Test EditExpenseItemForm', () => { test('should inputs have default value', () => { const { - titleInputElem, + titleInputElem, descriptionInputElem, dateInputElem, amountInputElem, diff --git a/frontend/src/entity/expenses/item/ui/EditExpenseItemForm/EditExpenseItemForm.ui.tsx b/frontend/src/entity/expenses/item/ui/EditExpenseItemForm/EditExpenseItemForm.ui.tsx index 7dc32e2..e2d9d7a 100644 --- a/frontend/src/entity/expenses/item/ui/EditExpenseItemForm/EditExpenseItemForm.ui.tsx +++ b/frontend/src/entity/expenses/item/ui/EditExpenseItemForm/EditExpenseItemForm.ui.tsx @@ -4,7 +4,7 @@ import classes from './EditExpenseItemForm.module.css'; import type { ExpenseListItem } from '../../types'; import type { - FC, + FC, FormEventHandler, FormHTMLAttributes, RefObject, diff --git a/frontend/src/entity/expenses/list/ui/DeleteExpensesListForm/ui/DeleteExpensesListForm.ui.tsx b/frontend/src/entity/expenses/list/ui/DeleteExpensesListForm/ui/DeleteExpensesListForm.ui.tsx index 1f67993..51d1bf8 100644 --- a/frontend/src/entity/expenses/list/ui/DeleteExpensesListForm/ui/DeleteExpensesListForm.ui.tsx +++ b/frontend/src/entity/expenses/list/ui/DeleteExpensesListForm/ui/DeleteExpensesListForm.ui.tsx @@ -1,6 +1,9 @@ import type { ExpenseList } from '@/entity/expenses/list'; import type { - FC, FormEventHandler, FormHTMLAttributes, RefObject, + FC, + FormEventHandler, + FormHTMLAttributes, + RefObject, } from 'react'; type BaseFormProps = Omit, 'onSubmit'>; @@ -34,7 +37,9 @@ const DeleteExpensesListForm: FC = (props) => { Вы действительно хотите удалить список расходов {' '} - {`"${list.title}"`} + + {`"${list.title}"`} + {' '} ? @@ -47,7 +52,9 @@ const DeleteExpensesListForm: FC = (props) => { В нем содержится {' '} - {list.items?.length} + + {list.items?.length} + {' '} расходов diff --git a/frontend/src/features/auth/LogoutButton/ui/LogoutButton.ui.tsx b/frontend/src/features/auth/LogoutButton/ui/LogoutButton.ui.tsx index 341452a..088ebd6 100644 --- a/frontend/src/features/auth/LogoutButton/ui/LogoutButton.ui.tsx +++ b/frontend/src/features/auth/LogoutButton/ui/LogoutButton.ui.tsx @@ -3,8 +3,8 @@ import { useLogout } from '@/entity/account'; const LogoutButton = () => { const { mutate: logout, isPending } = useLogout(); - const onClickHandler = async () => { - await logout(); + const onClickHandler = () => { + logout(); }; return ( diff --git a/frontend/src/features/expenses/items/EditExpenseItemButton/ui/EditExpenseItemButton.ui.tsx b/frontend/src/features/expenses/items/EditExpenseItemButton/ui/EditExpenseItemButton.ui.tsx index c57b9f2..53cfb1f 100644 --- a/frontend/src/features/expenses/items/EditExpenseItemButton/ui/EditExpenseItemButton.ui.tsx +++ b/frontend/src/features/expenses/items/EditExpenseItemButton/ui/EditExpenseItemButton.ui.tsx @@ -31,15 +31,15 @@ const EditExpenseItemButton: FC = (props) => { return ( <> - + diff --git a/frontend/src/features/expenses/list/EditExpensesListButton/ui/EditExpensesListButton.ui.tsx b/frontend/src/features/expenses/list/EditExpensesListButton/ui/EditExpensesListButton.ui.tsx index 9fdaf15..317e640 100644 --- a/frontend/src/features/expenses/list/EditExpensesListButton/ui/EditExpensesListButton.ui.tsx +++ b/frontend/src/features/expenses/list/EditExpensesListButton/ui/EditExpensesListButton.ui.tsx @@ -24,9 +24,9 @@ const EditExpensesListButton: FC = (props) => { return ( <> - + diff --git a/frontend/src/widgets/expenses/ExpenseItemsTable/ui/ExpenseItemsTable.ui.tsx b/frontend/src/widgets/expenses/ExpenseItemsTable/ui/ExpenseItemsTable.ui.tsx index 4bbb988..1b38d4d 100644 --- a/frontend/src/widgets/expenses/ExpenseItemsTable/ui/ExpenseItemsTable.ui.tsx +++ b/frontend/src/widgets/expenses/ExpenseItemsTable/ui/ExpenseItemsTable.ui.tsx @@ -16,63 +16,63 @@ const ExpenseItemsTable: FC = (props) => { return ( - - + + - + - + - + - + - + - + - - + + - {items?.map((item) => ( - - + {items?.map((item) => ( + + - + - + - + - + - + - + - - - ))} + + + + ))}
Идентификатор
ИдентификаторНазваниеНазваниеОписаниеОписаниеДатаДатаСуммаСуммаВалютаВалютаКоличествоКоличествоДействия
Действия
- {item.id} -
+ {item.id} + - {item.title} - + {item.title} + - {item.description} - + {item.description} + - {item.date} - + {item.date} + - {item.amount} - + {item.amount} + - {item.currency} - + {item.currency} + - {item.count} - + {item.count} + - + + - -
);