Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 3 additions & 4 deletions frontend/src/components/Admin/AddUser.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -32,7 +31,7 @@ interface UserCreateForm extends UserCreate {
confirm_password: string
}

const AddUser: React.FC<AddUserProps> = ({ isOpen, onClose }) => {
const AddUser = ({ isOpen, onClose }: AddUserProps) => {
const queryClient = useQueryClient()
const showToast = useCustomToast()
const {
Expand Down
7 changes: 3 additions & 4 deletions frontend/src/components/Admin/EditUser.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -37,7 +36,7 @@ interface UserUpdateForm extends UserUpdate {
confirm_password: string
}

const EditUser: React.FC<EditUserProps> = ({ user, isOpen, onClose }) => {
const EditUser = ({ user, isOpen, onClose }: EditUserProps) => {
const queryClient = useQueryClient()
const showToast = useCustomToast()

Expand Down
3 changes: 1 addition & 2 deletions frontend/src/components/Common/ActionsMenu.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand All @@ -21,7 +20,7 @@ interface ActionsMenuProps {
disabled?: boolean
}

const ActionsMenu: React.FC<ActionsMenuProps> = ({ type, value, disabled }) => {
const ActionsMenu = ({ type, value, disabled }: ActionsMenuProps) => {
const editUserModal = useDisclosure()
const deleteModal = useDisclosure()

Expand Down
2 changes: 1 addition & 1 deletion frontend/src/components/Common/DeleteAlert.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ interface DeleteProps {
onClose: () => void
}

const Delete: React.FC<DeleteProps> = ({ type, id, isOpen, onClose }) => {
const Delete = ({ type, id, isOpen, onClose }: DeleteProps) => {
const queryClient = useQueryClient()
const showToast = useCustomToast()
const cancelRef = React.useRef<HTMLButtonElement | null>(null)
Expand Down
3 changes: 1 addition & 2 deletions frontend/src/components/Common/Navbar.tsx
Original file line number Diff line number Diff line change
@@ -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"
Expand All @@ -9,7 +8,7 @@ interface NavbarProps {
type: string
}

const Navbar: React.FC<NavbarProps> = ({ type }) => {
const Navbar = ({ type }: NavbarProps) => {
const addUserModal = useDisclosure()
const addItemModal = useDisclosure()

Expand Down
3 changes: 1 addition & 2 deletions frontend/src/components/Common/NotFound.tsx
Original file line number Diff line number Diff line change
@@ -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 (
<>
<Container
Expand Down
3 changes: 1 addition & 2 deletions frontend/src/components/Common/Sidebar.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ import {
useColorModeValue,
useDisclosure,
} from "@chakra-ui/react"
import type React from "react"
import { FiLogOut, FiMenu } from "react-icons/fi"
import { useQueryClient } from "react-query"

Expand All @@ -21,7 +20,7 @@ import type { UserOut } from "../../client"
import useAuth from "../../hooks/useAuth"
import SidebarItems from "./SidebarItems"

const Sidebar: React.FC = () => {
const Sidebar = () => {
const queryClient = useQueryClient()
const bgColor = useColorModeValue("ui.white", "ui.dark")
const textColor = useColorModeValue("ui.dark", "ui.white")
Expand Down
3 changes: 1 addition & 2 deletions frontend/src/components/Common/SidebarItems.tsx
Original file line number Diff line number Diff line change
@@ -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"

Expand All @@ -16,7 +15,7 @@ interface SidebarItemsProps {
onClose?: () => void
}

const SidebarItems: React.FC<SidebarItemsProps> = ({ onClose }) => {
const SidebarItems = ({ onClose }: SidebarItemsProps) => {
const queryClient = useQueryClient()
const textColor = useColorModeValue("ui.main", "ui.white")
const bgActive = useColorModeValue("#E2E8F0", "#4A5568")
Expand Down
3 changes: 1 addition & 2 deletions frontend/src/components/Common/UserMenu.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -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 () => {
Expand Down
7 changes: 3 additions & 4 deletions frontend/src/components/Items/AddItem.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -12,19 +12,18 @@ 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 {
isOpen: boolean
onClose: () => void
}

const AddItem: React.FC<AddItemProps> = ({ isOpen, onClose }) => {
const AddItem = ({ isOpen, onClose }: AddItemProps) => {
const queryClient = useQueryClient()
const showToast = useCustomToast()
const {
Expand Down
7 changes: 3 additions & 4 deletions frontend/src/components/Items/EditItem.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand All @@ -30,7 +29,7 @@ interface EditItemProps {
onClose: () => void
}

const EditItem: React.FC<EditItemProps> = ({ item, isOpen, onClose }) => {
const EditItem = ({ item, isOpen, onClose }: EditItemProps) => {
const queryClient = useQueryClient()
const showToast = useCustomToast()
const {
Expand Down
3 changes: 1 addition & 2 deletions frontend/src/components/UserSettings/Appearance.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -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 (
Expand Down
7 changes: 3 additions & 4 deletions frontend/src/components/UserSettings/ChangePassword.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
3 changes: 1 addition & 2 deletions frontend/src/components/UserSettings/DeleteAccount.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -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 (
Expand Down
4 changes: 2 additions & 2 deletions frontend/src/components/UserSettings/DeleteConfirmation.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand All @@ -20,7 +20,7 @@ interface DeleteProps {
onClose: () => void
}

const DeleteConfirmation: React.FC<DeleteProps> = ({ isOpen, onClose }) => {
const DeleteConfirmation = ({ isOpen, onClose }: DeleteProps) => {
const queryClient = useQueryClient()
const showToast = useCustomToast()
const cancelRef = React.useRef<HTMLButtonElement | null>(null)
Expand Down
7 changes: 3 additions & 4 deletions frontend/src/components/UserSettings/UserInformation.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand Down
4 changes: 2 additions & 2 deletions frontend/src/hooks/useAuth.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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 = () => {
Expand Down