From 73fbe68b9fa204dbbd262fbba7cd1d622909a573 Mon Sep 17 00:00:00 2001 From: andres Date: Sat, 17 Aug 2024 17:39:15 +0200 Subject: [PATCH] chore: optimize imports --- src/app/App.tsx | 8 ++++---- src/app/app-reducer.ts | 4 ++-- src/app/store.ts | 10 +++++----- src/components/ErrorSnackbar/ErrorSnackbar.tsx | 4 ++-- src/features/Login/Login.tsx | 4 ++-- src/features/Login/auth-reducer.ts | 6 +++--- src/features/TodolistsList/Todolist/Task/Task.tsx | 4 ++-- src/features/TodolistsList/Todolist/Todolist.tsx | 8 ++++---- src/features/TodolistsList/TodolistsList.tsx | 8 ++++---- src/features/TodolistsList/tasks-reducer.test.ts | 2 +- src/features/TodolistsList/tasks-reducer.ts | 9 ++++----- src/features/TodolistsList/todolists-reducer.ts | 8 ++++---- .../TodolistsList/todolists-tasks-reducer.test.ts | 2 +- src/hooks/useAppDispatch.ts | 2 +- src/index.tsx | 2 +- src/utils/error-utils.ts | 4 ++-- tsconfig.json | 1 + 17 files changed, 43 insertions(+), 43 deletions(-) diff --git a/src/app/App.tsx b/src/app/App.tsx index 37bc8fd..6bbcf22 100644 --- a/src/app/App.tsx +++ b/src/app/App.tsx @@ -1,13 +1,13 @@ import React, { useCallback, useEffect } from 'react' import './App.css' -import { TodolistsList } from '../features/TodolistsList/TodolistsList' -import { ErrorSnackbar } from '../components/ErrorSnackbar/ErrorSnackbar' +import { TodolistsList } from 'features/TodolistsList/TodolistsList' +import { ErrorSnackbar } from 'components/ErrorSnackbar/ErrorSnackbar' import { useDispatch, useSelector } from 'react-redux' import { AppRootStateType } from './store' import { initializeAppTC, RequestStatusType } from './app-reducer' import { BrowserRouter, Route, Routes } from 'react-router-dom' -import { Login } from '../features/Login/Login' -import { logoutTC } from '../features/Login/auth-reducer' +import { Login } from 'features/Login/Login' +import { logoutTC } from 'features/Login/auth-reducer' import { AppBar, Button, diff --git a/src/app/app-reducer.ts b/src/app/app-reducer.ts index afa6bac..a8e72c3 100644 --- a/src/app/app-reducer.ts +++ b/src/app/app-reducer.ts @@ -1,6 +1,6 @@ import { Dispatch } from 'redux' -import { authAPI } from '../api/todolists-api' -import { setIsLoggedInAC } from '../features/Login/auth-reducer' +import { authAPI } from 'api/todolists-api' +import { setIsLoggedInAC } from 'features/Login/auth-reducer' const initialState: InitialStateType = { status: 'idle', diff --git a/src/app/store.ts b/src/app/store.ts index 77a059d..ffaaaed 100644 --- a/src/app/store.ts +++ b/src/app/store.ts @@ -1,9 +1,9 @@ -import { tasksReducer } from '../features/TodolistsList/tasks-reducer' -import { todolistsReducer } from '../features/TodolistsList/todolists-reducer' -import { applyMiddleware, combineReducers, createStore } from 'redux' -import thunkMiddleware, { ThunkAction, ThunkDispatch } from 'redux-thunk' +import { tasksReducer } from 'features/TodolistsList/tasks-reducer' +import { todolistsReducer } from 'features/TodolistsList/todolists-reducer' +import { combineReducers } from 'redux' +import { ThunkAction, ThunkDispatch } from 'redux-thunk' import { appReducer } from './app-reducer' -import { authReducer } from '../features/Login/auth-reducer' +import { authReducer } from 'features/Login/auth-reducer' import { configureStore, UnknownAction } from '@reduxjs/toolkit' const rootReducer = combineReducers({ diff --git a/src/components/ErrorSnackbar/ErrorSnackbar.tsx b/src/components/ErrorSnackbar/ErrorSnackbar.tsx index 31a8279..84daf35 100644 --- a/src/components/ErrorSnackbar/ErrorSnackbar.tsx +++ b/src/components/ErrorSnackbar/ErrorSnackbar.tsx @@ -1,7 +1,7 @@ import React from 'react' import { useDispatch, useSelector } from 'react-redux' -import { AppRootStateType } from '../../app/store' -import { setAppErrorAC } from '../../app/app-reducer' +import { AppRootStateType } from 'app/store' +import { setAppErrorAC } from 'app/app-reducer' import { AlertProps, Snackbar } from '@mui/material' import MuiAlert from '@mui/material/Alert' diff --git a/src/features/Login/Login.tsx b/src/features/Login/Login.tsx index e8e7567..48d2193 100644 --- a/src/features/Login/Login.tsx +++ b/src/features/Login/Login.tsx @@ -2,9 +2,9 @@ import React from 'react' import { useFormik } from 'formik' import { useSelector } from 'react-redux' import { loginTC } from './auth-reducer' -import { AppRootStateType } from '../../app/store' +import { AppRootStateType } from 'app/store' import { Navigate } from 'react-router-dom' -import { useAppDispatch } from '../../hooks/useAppDispatch' +import { useAppDispatch } from 'hooks/useAppDispatch' import { Button, Checkbox, diff --git a/src/features/Login/auth-reducer.ts b/src/features/Login/auth-reducer.ts index 70d0f09..36622e2 100644 --- a/src/features/Login/auth-reducer.ts +++ b/src/features/Login/auth-reducer.ts @@ -3,12 +3,12 @@ import { SetAppErrorActionType, setAppStatusAC, SetAppStatusActionType, -} from '../../app/app-reducer' -import { authAPI, LoginParamsType } from '../../api/todolists-api' +} from 'app/app-reducer' +import { authAPI, LoginParamsType } from 'api/todolists-api' import { handleServerAppError, handleServerNetworkError, -} from '../../utils/error-utils' +} from 'utils/error-utils' const initialState: InitialStateType = { isLoggedIn: false, diff --git a/src/features/TodolistsList/Todolist/Task/Task.tsx b/src/features/TodolistsList/Todolist/Task/Task.tsx index 3025a35..9cf9ab7 100644 --- a/src/features/TodolistsList/Todolist/Task/Task.tsx +++ b/src/features/TodolistsList/Todolist/Task/Task.tsx @@ -1,8 +1,8 @@ import React, { ChangeEvent, useCallback } from 'react' import { Checkbox, IconButton } from '@mui/material' -import { EditableSpan } from '../../../../components/EditableSpan/EditableSpan' +import { EditableSpan } from 'components/EditableSpan/EditableSpan' import { Delete } from '@mui/icons-material' -import { TaskStatuses, TaskType } from '../../../../api/todolists-api' +import { TaskStatuses, TaskType } from 'api/todolists-api' type TaskPropsType = { task: TaskType diff --git a/src/features/TodolistsList/Todolist/Todolist.tsx b/src/features/TodolistsList/Todolist/Todolist.tsx index a3c4228..cdcda5a 100644 --- a/src/features/TodolistsList/Todolist/Todolist.tsx +++ b/src/features/TodolistsList/Todolist/Todolist.tsx @@ -1,11 +1,11 @@ import React, { useCallback, useEffect } from 'react' -import { AddItemForm } from '../../../components/AddItemForm/AddItemForm' -import { EditableSpan } from '../../../components/EditableSpan/EditableSpan' +import { AddItemForm } from 'components/AddItemForm/AddItemForm' +import { EditableSpan } from 'components/EditableSpan/EditableSpan' import { Task } from './Task/Task' -import { TaskStatuses, TaskType } from '../../../api/todolists-api' +import { TaskStatuses, TaskType } from 'api/todolists-api' import { FilterValuesType, TodolistDomainType } from '../todolists-reducer' import { fetchTasksTC } from '../tasks-reducer' -import { useAppDispatch } from '../../../hooks/useAppDispatch' +import { useAppDispatch } from 'hooks/useAppDispatch' import { Button, IconButton } from '@mui/material' import { Delete } from '@mui/icons-material' diff --git a/src/features/TodolistsList/TodolistsList.tsx b/src/features/TodolistsList/TodolistsList.tsx index af42540..e5c829a 100644 --- a/src/features/TodolistsList/TodolistsList.tsx +++ b/src/features/TodolistsList/TodolistsList.tsx @@ -1,6 +1,6 @@ import React, { useCallback, useEffect } from 'react' import { useSelector } from 'react-redux' -import { AppRootStateType } from '../../app/store' +import { AppRootStateType } from 'app/store' import { addTodolistTC, changeTodolistFilterAC, @@ -16,12 +16,12 @@ import { TasksStateType, updateTaskTC, } from './tasks-reducer' -import { TaskStatuses } from '../../api/todolists-api' +import { TaskStatuses } from 'api/todolists-api' import { Grid, Paper } from '@mui/material' -import { AddItemForm } from '../../components/AddItemForm/AddItemForm' +import { AddItemForm } from 'components/AddItemForm/AddItemForm' import { Todolist } from './Todolist/Todolist' import { Navigate } from 'react-router-dom' -import { useAppDispatch } from '../../hooks/useAppDispatch' +import { useAppDispatch } from 'hooks/useAppDispatch' type PropsType = { demo?: boolean diff --git a/src/features/TodolistsList/tasks-reducer.test.ts b/src/features/TodolistsList/tasks-reducer.test.ts index cabfa84..ca96885 100644 --- a/src/features/TodolistsList/tasks-reducer.test.ts +++ b/src/features/TodolistsList/tasks-reducer.test.ts @@ -12,7 +12,7 @@ import { removeTodolistAC, setTodolistsAC, } from './todolists-reducer' -import { TaskPriorities, TaskStatuses } from '../../api/todolists-api' +import { TaskPriorities, TaskStatuses } from 'api/todolists-api' let startState: TasksStateType = {} beforeEach(() => { diff --git a/src/features/TodolistsList/tasks-reducer.ts b/src/features/TodolistsList/tasks-reducer.ts index 7fe5eac..6030374 100644 --- a/src/features/TodolistsList/tasks-reducer.ts +++ b/src/features/TodolistsList/tasks-reducer.ts @@ -9,19 +9,18 @@ import { TaskType, todolistsAPI, UpdateTaskModelType, -} from '../../api/todolists-api' +} from 'api/todolists-api' import { Dispatch } from 'redux' -import { AppRootStateType } from '../../app/store' +import { AppRootStateType } from 'app/store' import { - setAppErrorAC, SetAppErrorActionType, setAppStatusAC, SetAppStatusActionType, -} from '../../app/app-reducer' +} from 'app/app-reducer' import { handleServerAppError, handleServerNetworkError, -} from '../../utils/error-utils' +} from 'utils/error-utils' const initialState: TasksStateType = {} diff --git a/src/features/TodolistsList/todolists-reducer.ts b/src/features/TodolistsList/todolists-reducer.ts index 1464c37..d30fde5 100644 --- a/src/features/TodolistsList/todolists-reducer.ts +++ b/src/features/TodolistsList/todolists-reducer.ts @@ -1,13 +1,13 @@ -import { todolistsAPI, TodolistType } from '../../api/todolists-api' +import { todolistsAPI, TodolistType } from 'api/todolists-api' import { Dispatch } from 'redux' import { RequestStatusType, SetAppErrorActionType, setAppStatusAC, SetAppStatusActionType, -} from '../../app/app-reducer' -import { handleServerNetworkError } from '../../utils/error-utils' -import { AppThunk } from '../../app/store' +} from 'app/app-reducer' +import { handleServerNetworkError } from 'utils/error-utils' +import { AppThunk } from 'app/store' const initialState: Array = [] diff --git a/src/features/TodolistsList/todolists-tasks-reducer.test.ts b/src/features/TodolistsList/todolists-tasks-reducer.test.ts index c72f25d..6a8a335 100644 --- a/src/features/TodolistsList/todolists-tasks-reducer.test.ts +++ b/src/features/TodolistsList/todolists-tasks-reducer.test.ts @@ -4,7 +4,7 @@ import { todolistsReducer, } from './todolists-reducer' import { tasksReducer, TasksStateType } from './tasks-reducer' -import { TodolistType } from '../../api/todolists-api' +import { TodolistType } from 'api/todolists-api' test('ids should be equals', () => { const startTasksState: TasksStateType = {} diff --git a/src/hooks/useAppDispatch.ts b/src/hooks/useAppDispatch.ts index 1d57203..8947002 100644 --- a/src/hooks/useAppDispatch.ts +++ b/src/hooks/useAppDispatch.ts @@ -1,5 +1,5 @@ import { useDispatch } from 'react-redux' -import { AppDispatch } from '../app/store' +import { AppDispatch } from 'app/store' // export const useAppDispatch: () => AppDispatch = useDispatch export const useAppDispatch = () => useDispatch() diff --git a/src/index.tsx b/src/index.tsx index b987053..8be5513 100644 --- a/src/index.tsx +++ b/src/index.tsx @@ -2,7 +2,7 @@ import React from 'react' import { createRoot } from 'react-dom/client' import './index.css' import App from './app/App' -import { store } from './app/store' +import { store } from 'app/store' import { Provider } from 'react-redux' const root = createRoot(document.getElementById('root') as HTMLElement) diff --git a/src/utils/error-utils.ts b/src/utils/error-utils.ts index b9a963e..4917c83 100644 --- a/src/utils/error-utils.ts +++ b/src/utils/error-utils.ts @@ -3,8 +3,8 @@ import { SetAppErrorActionType, setAppStatusAC, SetAppStatusActionType, -} from '../app/app-reducer' -import { ResponseType } from '../api/todolists-api' +} from 'app/app-reducer' +import { ResponseType } from 'api/todolists-api' import { Dispatch } from 'redux' export const handleServerAppError = ( diff --git a/tsconfig.json b/tsconfig.json index af10394..2b99637 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -1,5 +1,6 @@ { "compilerOptions": { + "baseUrl": "src", "target": "es5", "lib": ["dom", "dom.iterable", "esnext"], "allowJs": true,