diff --git a/frontend/src/components/Admin/AddUser.tsx b/frontend/src/components/Admin/AddUser.tsx index 00bb58271c..8ded725b31 100644 --- a/frontend/src/components/Admin/AddUser.tsx +++ b/frontend/src/components/Admin/AddUser.tsx @@ -14,8 +14,8 @@ import { ModalHeader, ModalOverlay, } from "@chakra-ui/react" -import { type SubmitHandler, useForm } from "react-hook-form" import { useMutation, useQueryClient } from "@tanstack/react-query" +import { type SubmitHandler, useForm } from "react-hook-form" import { type UserCreate, UsersService } from "../../client" import type { ApiError } from "../../client/core/ApiError" diff --git a/frontend/src/components/Admin/EditUser.tsx b/frontend/src/components/Admin/EditUser.tsx index 4fae324977..ffba135e9c 100644 --- a/frontend/src/components/Admin/EditUser.tsx +++ b/frontend/src/components/Admin/EditUser.tsx @@ -14,8 +14,8 @@ import { ModalHeader, ModalOverlay, } from "@chakra-ui/react" -import { type SubmitHandler, useForm } from "react-hook-form" import { useMutation, useQueryClient } from "@tanstack/react-query" +import { type SubmitHandler, useForm } from "react-hook-form" import { type ApiError, diff --git a/frontend/src/components/Common/DeleteAlert.tsx b/frontend/src/components/Common/DeleteAlert.tsx index 15e8cf7bea..c89d1412ff 100644 --- a/frontend/src/components/Common/DeleteAlert.tsx +++ b/frontend/src/components/Common/DeleteAlert.tsx @@ -7,9 +7,9 @@ import { AlertDialogOverlay, Button, } from "@chakra-ui/react" +import { useMutation, useQueryClient } from "@tanstack/react-query" import React from "react" import { useForm } from "react-hook-form" -import { useMutation, useQueryClient } from "@tanstack/react-query" import { ItemsService, UsersService } from "../../client" import useCustomToast from "../../hooks/useCustomToast" diff --git a/frontend/src/components/Common/Sidebar.tsx b/frontend/src/components/Common/Sidebar.tsx index 636283dcfc..7582fb4748 100644 --- a/frontend/src/components/Common/Sidebar.tsx +++ b/frontend/src/components/Common/Sidebar.tsx @@ -12,8 +12,8 @@ import { useColorModeValue, useDisclosure, } from "@chakra-ui/react" -import { FiLogOut, FiMenu } from "react-icons/fi" import { useQueryClient } from "@tanstack/react-query" +import { FiLogOut, FiMenu } from "react-icons/fi" import Logo from "../../assets/images/fastapi-logo.svg" import type { UserPublic } from "../../client" diff --git a/frontend/src/components/Common/SidebarItems.tsx b/frontend/src/components/Common/SidebarItems.tsx index 8202a60d5f..929e8f785e 100644 --- a/frontend/src/components/Common/SidebarItems.tsx +++ b/frontend/src/components/Common/SidebarItems.tsx @@ -1,7 +1,7 @@ import { Box, Flex, Icon, Text, useColorModeValue } from "@chakra-ui/react" +import { useQueryClient } from "@tanstack/react-query" import { Link } from "@tanstack/react-router" import { FiBriefcase, FiHome, FiSettings, FiUsers } from "react-icons/fi" -import { useQueryClient } from "@tanstack/react-query" import type { UserPublic } from "../../client" diff --git a/frontend/src/components/Items/AddItem.tsx b/frontend/src/components/Items/AddItem.tsx index dfd5bf44ab..21cc06d4e8 100644 --- a/frontend/src/components/Items/AddItem.tsx +++ b/frontend/src/components/Items/AddItem.tsx @@ -12,8 +12,8 @@ import { ModalHeader, ModalOverlay, } from "@chakra-ui/react" -import { type SubmitHandler, useForm } from "react-hook-form" import { useMutation, useQueryClient } from "@tanstack/react-query" +import { type SubmitHandler, useForm } from "react-hook-form" import { type ApiError, type ItemCreate, ItemsService } from "../../client" import useCustomToast from "../../hooks/useCustomToast" diff --git a/frontend/src/components/Items/EditItem.tsx b/frontend/src/components/Items/EditItem.tsx index f925f9ff8b..6bbe79acef 100644 --- a/frontend/src/components/Items/EditItem.tsx +++ b/frontend/src/components/Items/EditItem.tsx @@ -12,8 +12,8 @@ import { ModalHeader, ModalOverlay, } from "@chakra-ui/react" -import { type SubmitHandler, useForm } from "react-hook-form" import { useMutation, useQueryClient } from "@tanstack/react-query" +import { type SubmitHandler, useForm } from "react-hook-form" import { type ApiError, diff --git a/frontend/src/components/UserSettings/ChangePassword.tsx b/frontend/src/components/UserSettings/ChangePassword.tsx index 0b084560d9..d7137c54bf 100644 --- a/frontend/src/components/UserSettings/ChangePassword.tsx +++ b/frontend/src/components/UserSettings/ChangePassword.tsx @@ -9,8 +9,8 @@ import { Input, useColorModeValue, } from "@chakra-ui/react" -import { type SubmitHandler, useForm } from "react-hook-form" import { useMutation } from "@tanstack/react-query" +import { type SubmitHandler, useForm } from "react-hook-form" import { type ApiError, type UpdatePassword, UsersService } from "../../client" import useCustomToast from "../../hooks/useCustomToast" diff --git a/frontend/src/components/UserSettings/DeleteConfirmation.tsx b/frontend/src/components/UserSettings/DeleteConfirmation.tsx index d79a7d67c9..f55145193a 100644 --- a/frontend/src/components/UserSettings/DeleteConfirmation.tsx +++ b/frontend/src/components/UserSettings/DeleteConfirmation.tsx @@ -7,9 +7,9 @@ import { AlertDialogOverlay, Button, } from "@chakra-ui/react" +import { useMutation, useQueryClient } from "@tanstack/react-query" import React from "react" import { useForm } from "react-hook-form" -import { useMutation, useQueryClient } from "@tanstack/react-query" import { type ApiError, type UserPublic, UsersService } from "../../client" import useAuth from "../../hooks/useAuth" diff --git a/frontend/src/components/UserSettings/UserInformation.tsx b/frontend/src/components/UserSettings/UserInformation.tsx index 422d1dfd6a..abd9c5c17e 100644 --- a/frontend/src/components/UserSettings/UserInformation.tsx +++ b/frontend/src/components/UserSettings/UserInformation.tsx @@ -11,9 +11,9 @@ import { Text, useColorModeValue, } from "@chakra-ui/react" +import { useMutation, useQueryClient } from "@tanstack/react-query" import { useState } from "react" import { type SubmitHandler, useForm } from "react-hook-form" -import { useMutation, useQueryClient } from "@tanstack/react-query" import { type ApiError, diff --git a/frontend/src/hooks/useAuth.ts b/frontend/src/hooks/useAuth.ts index 8f8d0a6db6..8730b72e3f 100644 --- a/frontend/src/hooks/useAuth.ts +++ b/frontend/src/hooks/useAuth.ts @@ -1,6 +1,6 @@ +import { useMutation, useQuery } from "@tanstack/react-query" import { useNavigate } from "@tanstack/react-router" import { useState } from "react" -import { useMutation, useQuery } from "@tanstack/react-query" import { type Body_login_login_access_token as AccessToken, diff --git a/frontend/src/main.tsx b/frontend/src/main.tsx index a479e96de9..afc904538b 100644 --- a/frontend/src/main.tsx +++ b/frontend/src/main.tsx @@ -1,7 +1,7 @@ import { ChakraProvider } from "@chakra-ui/react" +import { QueryClient, QueryClientProvider } from "@tanstack/react-query" import { RouterProvider, createRouter } from "@tanstack/react-router" import ReactDOM from "react-dom/client" -import { QueryClient, QueryClientProvider } from "@tanstack/react-query" import { routeTree } from "./routeTree.gen" import { StrictMode } from "react" diff --git a/frontend/src/routes/_layout/admin.tsx b/frontend/src/routes/_layout/admin.tsx index 5e5715d0ec..e785ddf70e 100644 --- a/frontend/src/routes/_layout/admin.tsx +++ b/frontend/src/routes/_layout/admin.tsx @@ -13,8 +13,8 @@ import { Thead, Tr, } from "@chakra-ui/react" -import { createFileRoute } from "@tanstack/react-router" import { useQuery, useQueryClient } from "@tanstack/react-query" +import { createFileRoute } from "@tanstack/react-router" import { type UserPublic, UsersService } from "../../client" import ActionsMenu from "../../components/Common/ActionsMenu" diff --git a/frontend/src/routes/_layout/index.tsx b/frontend/src/routes/_layout/index.tsx index 7c48a7921b..f9160102f2 100644 --- a/frontend/src/routes/_layout/index.tsx +++ b/frontend/src/routes/_layout/index.tsx @@ -1,6 +1,6 @@ import { Box, Container, Text } from "@chakra-ui/react" -import { createFileRoute } from "@tanstack/react-router" import { useQueryClient } from "@tanstack/react-query" +import { createFileRoute } from "@tanstack/react-router" import type { UserPublic } from "../../client" diff --git a/frontend/src/routes/_layout/items.tsx b/frontend/src/routes/_layout/items.tsx index 3e4650b729..165e9e5d39 100644 --- a/frontend/src/routes/_layout/items.tsx +++ b/frontend/src/routes/_layout/items.tsx @@ -11,8 +11,8 @@ import { Thead, Tr, } from "@chakra-ui/react" -import { createFileRoute } from "@tanstack/react-router" import { useQuery } from "@tanstack/react-query" +import { createFileRoute } from "@tanstack/react-router" import { ItemsService } from "../../client" import ActionsMenu from "../../components/Common/ActionsMenu" diff --git a/frontend/src/routes/_layout/settings.tsx b/frontend/src/routes/_layout/settings.tsx index 232fa7209e..68266c6b9a 100644 --- a/frontend/src/routes/_layout/settings.tsx +++ b/frontend/src/routes/_layout/settings.tsx @@ -7,8 +7,8 @@ import { TabPanels, Tabs, } from "@chakra-ui/react" -import { createFileRoute } from "@tanstack/react-router" import { useQueryClient } from "@tanstack/react-query" +import { createFileRoute } from "@tanstack/react-router" import type { UserPublic } from "../../client" import Appearance from "../../components/UserSettings/Appearance" diff --git a/frontend/src/routes/reset-password.tsx b/frontend/src/routes/reset-password.tsx index 5f3e0331ce..767451eaae 100644 --- a/frontend/src/routes/reset-password.tsx +++ b/frontend/src/routes/reset-password.tsx @@ -8,9 +8,9 @@ import { Input, Text, } from "@chakra-ui/react" +import { useMutation } from "@tanstack/react-query" import { createFileRoute, redirect, useNavigate } from "@tanstack/react-router" import { type SubmitHandler, useForm } from "react-hook-form" -import { useMutation } from "@tanstack/react-query" import { type ApiError, LoginService, type NewPassword } from "../client" import { isLoggedIn } from "../hooks/useAuth"