diff --git a/frontend/src/components/Admin/AddUser.tsx b/frontend/src/components/Admin/AddUser.tsx index c275df6..52ce532 100644 --- a/frontend/src/components/Admin/AddUser.tsx +++ b/frontend/src/components/Admin/AddUser.tsx @@ -14,11 +14,10 @@ import { ModalHeader, ModalOverlay, } from "@chakra-ui/react" -import type React from "react" -import { type SubmitHandler, useForm } from "react-hook-form" +import { useForm, type SubmitHandler } from "react-hook-form" import { useMutation, useQueryClient } from "react-query" -import { type UserCreate, UsersService } from "../../client" +import { UsersService, type UserCreate } from "../../client" import type { ApiError } from "../../client/core/ApiError" import useCustomToast from "../../hooks/useCustomToast" import { emailPattern } from "../../utils" @@ -32,7 +31,7 @@ interface UserCreateForm extends UserCreate { confirm_password: string } -const AddUser: React.FC = ({ isOpen, onClose }) => { +const AddUser = ({ isOpen, onClose }: AddUserProps) => { const queryClient = useQueryClient() const showToast = useCustomToast() const { diff --git a/frontend/src/components/Admin/EditUser.tsx b/frontend/src/components/Admin/EditUser.tsx index aa4ee59..87b4a19 100644 --- a/frontend/src/components/Admin/EditUser.tsx +++ b/frontend/src/components/Admin/EditUser.tsx @@ -14,15 +14,14 @@ import { ModalHeader, ModalOverlay, } from "@chakra-ui/react" -import type React from "react" -import { type SubmitHandler, useForm } from "react-hook-form" +import { useForm, type SubmitHandler } from "react-hook-form" import { useMutation, useQueryClient } from "react-query" import { + UsersService, type ApiError, type UserOut, type UserUpdate, - UsersService, } from "../../client" import useCustomToast from "../../hooks/useCustomToast" import { emailPattern } from "../../utils" @@ -37,7 +36,7 @@ interface UserUpdateForm extends UserUpdate { confirm_password: string } -const EditUser: React.FC = ({ user, isOpen, onClose }) => { +const EditUser = ({ user, isOpen, onClose }: EditUserProps) => { const queryClient = useQueryClient() const showToast = useCustomToast() diff --git a/frontend/src/components/Common/ActionsMenu.tsx b/frontend/src/components/Common/ActionsMenu.tsx index 359ce9d..3cc2dc0 100644 --- a/frontend/src/components/Common/ActionsMenu.tsx +++ b/frontend/src/components/Common/ActionsMenu.tsx @@ -6,7 +6,6 @@ import { MenuList, useDisclosure, } from "@chakra-ui/react" -import type React from "react" import { BsThreeDotsVertical } from "react-icons/bs" import { FiEdit, FiTrash } from "react-icons/fi" @@ -21,7 +20,7 @@ interface ActionsMenuProps { disabled?: boolean } -const ActionsMenu: React.FC = ({ type, value, disabled }) => { +const ActionsMenu = ({ type, value, disabled }: ActionsMenuProps) => { const editUserModal = useDisclosure() const deleteModal = useDisclosure() diff --git a/frontend/src/components/Common/DeleteAlert.tsx b/frontend/src/components/Common/DeleteAlert.tsx index 656c0dd..c8b8e18 100644 --- a/frontend/src/components/Common/DeleteAlert.tsx +++ b/frontend/src/components/Common/DeleteAlert.tsx @@ -21,7 +21,7 @@ interface DeleteProps { onClose: () => void } -const Delete: React.FC = ({ type, id, isOpen, onClose }) => { +const Delete = ({ type, id, isOpen, onClose }: DeleteProps) => { const queryClient = useQueryClient() const showToast = useCustomToast() const cancelRef = React.useRef(null) diff --git a/frontend/src/components/Common/Navbar.tsx b/frontend/src/components/Common/Navbar.tsx index b059350..6fcd3a1 100644 --- a/frontend/src/components/Common/Navbar.tsx +++ b/frontend/src/components/Common/Navbar.tsx @@ -1,5 +1,4 @@ import { Button, Flex, Icon, useDisclosure } from "@chakra-ui/react" -import type React from "react" import { FaPlus } from "react-icons/fa" import AddUser from "../Admin/AddUser" @@ -9,7 +8,7 @@ interface NavbarProps { type: string } -const Navbar: React.FC = ({ type }) => { +const Navbar = ({ type }: NavbarProps) => { const addUserModal = useDisclosure() const addItemModal = useDisclosure() diff --git a/frontend/src/components/Common/NotFound.tsx b/frontend/src/components/Common/NotFound.tsx index 1c6019c..66ea559 100644 --- a/frontend/src/components/Common/NotFound.tsx +++ b/frontend/src/components/Common/NotFound.tsx @@ -1,8 +1,7 @@ import { Button, Container, Text } from "@chakra-ui/react" import { Link } from "@tanstack/react-router" -import type React from "react" -const NotFound: React.FC = () => { +const NotFound = () => { return ( <> { +const Sidebar = () => { const queryClient = useQueryClient() const bgColor = useColorModeValue("ui.white", "ui.dark") const textColor = useColorModeValue("ui.dark", "ui.white") diff --git a/frontend/src/components/Common/SidebarItems.tsx b/frontend/src/components/Common/SidebarItems.tsx index 1fd6909..d075b09 100644 --- a/frontend/src/components/Common/SidebarItems.tsx +++ b/frontend/src/components/Common/SidebarItems.tsx @@ -1,6 +1,5 @@ import { Box, Flex, Icon, Text, useColorModeValue } from "@chakra-ui/react" import { Link } from "@tanstack/react-router" -import type React from "react" import { FiBriefcase, FiHome, FiSettings, FiUsers } from "react-icons/fi" import { useQueryClient } from "react-query" @@ -16,7 +15,7 @@ interface SidebarItemsProps { onClose?: () => void } -const SidebarItems: React.FC = ({ onClose }) => { +const SidebarItems = ({ onClose }: SidebarItemsProps) => { const queryClient = useQueryClient() const textColor = useColorModeValue("ui.main", "ui.white") const bgActive = useColorModeValue("#E2E8F0", "#4A5568") diff --git a/frontend/src/components/Common/UserMenu.tsx b/frontend/src/components/Common/UserMenu.tsx index add861b..c767e2f 100644 --- a/frontend/src/components/Common/UserMenu.tsx +++ b/frontend/src/components/Common/UserMenu.tsx @@ -6,14 +6,13 @@ import { MenuItem, MenuList, } from "@chakra-ui/react" -import type React from "react" import { FaUserAstronaut } from "react-icons/fa" import { FiLogOut, FiUser } from "react-icons/fi" import { Link } from "@tanstack/react-router" import useAuth from "../../hooks/useAuth" -const UserMenu: React.FC = () => { +const UserMenu = () => { const { logout } = useAuth() const handleLogout = async () => { diff --git a/frontend/src/components/Items/AddItem.tsx b/frontend/src/components/Items/AddItem.tsx index 0ea3ab5..bb0e0e7 100644 --- a/frontend/src/components/Items/AddItem.tsx +++ b/frontend/src/components/Items/AddItem.tsx @@ -12,11 +12,10 @@ import { ModalHeader, ModalOverlay, } from "@chakra-ui/react" -import type React from "react" -import { type SubmitHandler, useForm } from "react-hook-form" +import { useForm, type SubmitHandler } from "react-hook-form" import { useMutation, useQueryClient } from "react-query" -import { type ApiError, type ItemCreate, ItemsService } from "../../client" +import { ItemsService, type ApiError, type ItemCreate } from "../../client" import useCustomToast from "../../hooks/useCustomToast" interface AddItemProps { @@ -24,7 +23,7 @@ interface AddItemProps { onClose: () => void } -const AddItem: React.FC = ({ isOpen, onClose }) => { +const AddItem = ({ isOpen, onClose }: AddItemProps) => { const queryClient = useQueryClient() const showToast = useCustomToast() const { diff --git a/frontend/src/components/Items/EditItem.tsx b/frontend/src/components/Items/EditItem.tsx index b1dca38..b471ad1 100644 --- a/frontend/src/components/Items/EditItem.tsx +++ b/frontend/src/components/Items/EditItem.tsx @@ -12,15 +12,14 @@ import { ModalHeader, ModalOverlay, } from "@chakra-ui/react" -import type React from "react" -import { type SubmitHandler, useForm } from "react-hook-form" +import { useForm, type SubmitHandler } from "react-hook-form" import { useMutation, useQueryClient } from "react-query" import { + ItemsService, type ApiError, type ItemOut, type ItemUpdate, - ItemsService, } from "../../client" import useCustomToast from "../../hooks/useCustomToast" @@ -30,7 +29,7 @@ interface EditItemProps { onClose: () => void } -const EditItem: React.FC = ({ item, isOpen, onClose }) => { +const EditItem = ({ item, isOpen, onClose }: EditItemProps) => { const queryClient = useQueryClient() const showToast = useCustomToast() const { diff --git a/frontend/src/components/UserSettings/Appearance.tsx b/frontend/src/components/UserSettings/Appearance.tsx index aa690c7..a2bb1c0 100644 --- a/frontend/src/components/UserSettings/Appearance.tsx +++ b/frontend/src/components/UserSettings/Appearance.tsx @@ -7,9 +7,8 @@ import { Stack, useColorMode, } from "@chakra-ui/react" -import type React from "react" -const Appearance: React.FC = () => { +const Appearance = () => { const { colorMode, toggleColorMode } = useColorMode() return ( diff --git a/frontend/src/components/UserSettings/ChangePassword.tsx b/frontend/src/components/UserSettings/ChangePassword.tsx index 5b28b09..f634c2a 100644 --- a/frontend/src/components/UserSettings/ChangePassword.tsx +++ b/frontend/src/components/UserSettings/ChangePassword.tsx @@ -9,18 +9,17 @@ import { Input, useColorModeValue, } from "@chakra-ui/react" -import type React from "react" -import { type SubmitHandler, useForm } from "react-hook-form" +import { useForm, type SubmitHandler } from "react-hook-form" import { useMutation } from "react-query" -import { type ApiError, type UpdatePassword, UsersService } from "../../client" +import { UsersService, type ApiError, type UpdatePassword } from "../../client" import useCustomToast from "../../hooks/useCustomToast" interface UpdatePasswordForm extends UpdatePassword { confirm_password: string } -const ChangePassword: React.FC = () => { +const ChangePassword = () => { const color = useColorModeValue("inherit", "ui.white") const showToast = useCustomToast() const { diff --git a/frontend/src/components/UserSettings/DeleteAccount.tsx b/frontend/src/components/UserSettings/DeleteAccount.tsx index d048c7e..7ca3b92 100644 --- a/frontend/src/components/UserSettings/DeleteAccount.tsx +++ b/frontend/src/components/UserSettings/DeleteAccount.tsx @@ -5,11 +5,10 @@ import { Text, useDisclosure, } from "@chakra-ui/react" -import type React from "react" import DeleteConfirmation from "./DeleteConfirmation" -const DeleteAccount: React.FC = () => { +const DeleteAccount = () => { const confirmationModal = useDisclosure() return ( diff --git a/frontend/src/components/UserSettings/DeleteConfirmation.tsx b/frontend/src/components/UserSettings/DeleteConfirmation.tsx index 1a78111..fca251b 100644 --- a/frontend/src/components/UserSettings/DeleteConfirmation.tsx +++ b/frontend/src/components/UserSettings/DeleteConfirmation.tsx @@ -11,7 +11,7 @@ import React from "react" import { useForm } from "react-hook-form" import { useMutation, useQueryClient } from "react-query" -import { type ApiError, type UserOut, UsersService } from "../../client" +import { UsersService, type ApiError, type UserOut } from "../../client" import useAuth from "../../hooks/useAuth" import useCustomToast from "../../hooks/useCustomToast" @@ -20,7 +20,7 @@ interface DeleteProps { onClose: () => void } -const DeleteConfirmation: React.FC = ({ isOpen, onClose }) => { +const DeleteConfirmation = ({ isOpen, onClose }: DeleteProps) => { const queryClient = useQueryClient() const showToast = useCustomToast() const cancelRef = React.useRef(null) diff --git a/frontend/src/components/UserSettings/UserInformation.tsx b/frontend/src/components/UserSettings/UserInformation.tsx index 8466d6c..2cf9165 100644 --- a/frontend/src/components/UserSettings/UserInformation.tsx +++ b/frontend/src/components/UserSettings/UserInformation.tsx @@ -11,22 +11,21 @@ import { Text, useColorModeValue, } from "@chakra-ui/react" -import type React from "react" import { useState } from "react" -import { type SubmitHandler, useForm } from "react-hook-form" +import { useForm, type SubmitHandler } from "react-hook-form" import { useMutation, useQueryClient } from "react-query" import { + UsersService, type ApiError, type UserOut, type UserUpdateMe, - UsersService, } from "../../client" import useAuth from "../../hooks/useAuth" import useCustomToast from "../../hooks/useCustomToast" import { emailPattern } from "../../utils" -const UserInformation: React.FC = () => { +const UserInformation = () => { const queryClient = useQueryClient() const color = useColorModeValue("inherit", "ui.white") const showToast = useCustomToast() diff --git a/frontend/src/hooks/useAuth.ts b/frontend/src/hooks/useAuth.ts index 309a0ab..e358c1e 100644 --- a/frontend/src/hooks/useAuth.ts +++ b/frontend/src/hooks/useAuth.ts @@ -2,10 +2,10 @@ import { useNavigate } from "@tanstack/react-router" import { useQuery } from "react-query" import { - type Body_login_login_access_token as AccessToken, LoginService, - type UserOut, UsersService, + type Body_login_login_access_token as AccessToken, + type UserOut, } from "../client" const isLoggedIn = () => {