Browse Source

🎨 Format with Biome (#1097)

pull/13907/head
Alejandra 1 year ago
committed by GitHub
parent
commit
94a2037f8a
No known key found for this signature in database GPG Key ID: B5690EEEBB952194
  1. 8
      frontend/modify-openapi-operationids.js
  2. 58
      frontend/src/components/Admin/AddUser.tsx
  3. 51
      frontend/src/components/Admin/EditUser.tsx
  4. 18
      frontend/src/components/Common/ActionsMenu.tsx
  5. 32
      frontend/src/components/Common/DeleteAlert.tsx
  6. 14
      frontend/src/components/Common/Navbar.tsx
  7. 6
      frontend/src/components/Common/NotFound.tsx
  8. 28
      frontend/src/components/Common/Sidebar.tsx
  9. 28
      frontend/src/components/Common/SidebarItems.tsx
  10. 14
      frontend/src/components/Common/UserMenu.tsx
  11. 34
      frontend/src/components/Items/AddItem.tsx
  12. 35
      frontend/src/components/Items/EditItem.tsx
  13. 4
      frontend/src/components/UserSettings/Appearance.tsx
  14. 38
      frontend/src/components/UserSettings/ChangePassword.tsx
  15. 6
      frontend/src/components/UserSettings/DeleteAccount.tsx
  16. 30
      frontend/src/components/UserSettings/DeleteConfirmation.tsx
  17. 54
      frontend/src/components/UserSettings/UserInformation.tsx
  18. 22
      frontend/src/hooks/useAuth.ts
  19. 8
      frontend/src/hooks/useCustomToast.ts
  20. 22
      frontend/src/main.tsx
  21. 10
      frontend/src/routes/__root.tsx
  22. 14
      frontend/src/routes/_layout.tsx
  23. 38
      frontend/src/routes/_layout/admin.tsx
  24. 12
      frontend/src/routes/_layout/index.tsx
  25. 32
      frontend/src/routes/_layout/items.tsx
  26. 30
      frontend/src/routes/_layout/settings.tsx
  27. 42
      frontend/src/routes/login.tsx
  28. 28
      frontend/src/routes/recover-password.tsx
  29. 44
      frontend/src/routes/reset-password.tsx
  30. 32
      frontend/src/theme.tsx
  31. 6
      frontend/vite.config.ts

8
frontend/modify-openapi-operationids.js

@ -1,4 +1,4 @@
import * as fs from 'fs' import * as fs from "node:fs"
async function modifyOpenAPIFile(filePath) { async function modifyOpenAPIFile(filePath) {
try { try {
@ -26,11 +26,11 @@ async function modifyOpenAPIFile(filePath) {
filePath, filePath,
JSON.stringify(openapiContent, null, 2), JSON.stringify(openapiContent, null, 2),
) )
console.log('File successfully modified') console.log("File successfully modified")
} catch (err) { } catch (err) {
console.error('Error:', err) console.error("Error:", err)
} }
} }
const filePath = './openapi.json' const filePath = "./openapi.json"
modifyOpenAPIFile(filePath) modifyOpenAPIFile(filePath)

58
frontend/src/components/Admin/AddUser.tsx

@ -1,4 +1,3 @@
import React from 'react'
import { import {
Button, Button,
Checkbox, Checkbox,
@ -14,13 +13,14 @@ import {
ModalFooter, ModalFooter,
ModalHeader, ModalHeader,
ModalOverlay, ModalOverlay,
} from '@chakra-ui/react' } from "@chakra-ui/react"
import { SubmitHandler, useForm } from 'react-hook-form' import type React from "react"
import { useMutation, useQueryClient } from 'react-query' import { type SubmitHandler, useForm } from "react-hook-form"
import { useMutation, useQueryClient } from "react-query"
import { UserCreate, UsersService } from '../../client' import { type UserCreate, UsersService } from "../../client"
import { ApiError } from '../../client/core/ApiError' import type { ApiError } from "../../client/core/ApiError"
import useCustomToast from '../../hooks/useCustomToast' import useCustomToast from "../../hooks/useCustomToast"
interface AddUserProps { interface AddUserProps {
isOpen: boolean isOpen: boolean
@ -41,13 +41,13 @@ const AddUser: React.FC<AddUserProps> = ({ isOpen, onClose }) => {
getValues, getValues,
formState: { errors, isSubmitting }, formState: { errors, isSubmitting },
} = useForm<UserCreateForm>({ } = useForm<UserCreateForm>({
mode: 'onBlur', mode: "onBlur",
criteriaMode: 'all', criteriaMode: "all",
defaultValues: { defaultValues: {
email: '', email: "",
full_name: '', full_name: "",
password: '', password: "",
confirm_password: '', confirm_password: "",
is_superuser: false, is_superuser: false,
is_active: false, is_active: false,
}, },
@ -59,16 +59,16 @@ const AddUser: React.FC<AddUserProps> = ({ isOpen, onClose }) => {
const mutation = useMutation(addUser, { const mutation = useMutation(addUser, {
onSuccess: () => { onSuccess: () => {
showToast('Success!', 'User created successfully.', 'success') showToast("Success!", "User created successfully.", "success")
reset() reset()
onClose() onClose()
}, },
onError: (err: ApiError) => { onError: (err: ApiError) => {
const errDetail = err.body?.detail const errDetail = err.body?.detail
showToast('Something went wrong.', `${errDetail}`, 'error') showToast("Something went wrong.", `${errDetail}`, "error")
}, },
onSettled: () => { onSettled: () => {
queryClient.invalidateQueries('users') queryClient.invalidateQueries("users")
}, },
}) })
@ -81,7 +81,7 @@ const AddUser: React.FC<AddUserProps> = ({ isOpen, onClose }) => {
<Modal <Modal
isOpen={isOpen} isOpen={isOpen}
onClose={onClose} onClose={onClose}
size={{ base: 'sm', md: 'md' }} size={{ base: "sm", md: "md" }}
isCentered isCentered
> >
<ModalOverlay /> <ModalOverlay />
@ -93,11 +93,11 @@ const AddUser: React.FC<AddUserProps> = ({ isOpen, onClose }) => {
<FormLabel htmlFor="email">Email</FormLabel> <FormLabel htmlFor="email">Email</FormLabel>
<Input <Input
id="email" id="email"
{...register('email', { {...register("email", {
required: 'Email is required', required: "Email is required",
pattern: { pattern: {
value: /^[A-Z0-9._%+-]+@[A-Z0-9.-]+\.[A-Z]{2,4}$/i, value: /^[A-Z0-9._%+-]+@[A-Z0-9.-]+\.[A-Z]{2,4}$/i,
message: 'Invalid email address', message: "Invalid email address",
}, },
})} })}
placeholder="Email" placeholder="Email"
@ -111,7 +111,7 @@ const AddUser: React.FC<AddUserProps> = ({ isOpen, onClose }) => {
<FormLabel htmlFor="name">Full name</FormLabel> <FormLabel htmlFor="name">Full name</FormLabel>
<Input <Input
id="name" id="name"
{...register('full_name')} {...register("full_name")}
placeholder="Full name" placeholder="Full name"
type="text" type="text"
/> />
@ -123,11 +123,11 @@ const AddUser: React.FC<AddUserProps> = ({ isOpen, onClose }) => {
<FormLabel htmlFor="password">Set Password</FormLabel> <FormLabel htmlFor="password">Set Password</FormLabel>
<Input <Input
id="password" id="password"
{...register('password', { {...register("password", {
required: 'Password is required', required: "Password is required",
minLength: { minLength: {
value: 8, value: 8,
message: 'Password must be at least 8 characters', message: "Password must be at least 8 characters",
}, },
})} })}
placeholder="Password" placeholder="Password"
@ -145,11 +145,11 @@ const AddUser: React.FC<AddUserProps> = ({ isOpen, onClose }) => {
<FormLabel htmlFor="confirm_password">Confirm Password</FormLabel> <FormLabel htmlFor="confirm_password">Confirm Password</FormLabel>
<Input <Input
id="confirm_password" id="confirm_password"
{...register('confirm_password', { {...register("confirm_password", {
required: 'Please confirm your password', required: "Please confirm your password",
validate: (value) => validate: (value) =>
value === getValues().password || value === getValues().password ||
'The passwords do not match', "The passwords do not match",
})} })}
placeholder="Password" placeholder="Password"
type="password" type="password"
@ -162,12 +162,12 @@ const AddUser: React.FC<AddUserProps> = ({ isOpen, onClose }) => {
</FormControl> </FormControl>
<Flex mt={4}> <Flex mt={4}>
<FormControl> <FormControl>
<Checkbox {...register('is_superuser')} colorScheme="teal"> <Checkbox {...register("is_superuser")} colorScheme="teal">
Is superuser? Is superuser?
</Checkbox> </Checkbox>
</FormControl> </FormControl>
<FormControl> <FormControl>
<Checkbox {...register('is_active')} colorScheme="teal"> <Checkbox {...register("is_active")} colorScheme="teal">
Is active? Is active?
</Checkbox> </Checkbox>
</FormControl> </FormControl>

51
frontend/src/components/Admin/EditUser.tsx

@ -1,4 +1,3 @@
import React from 'react'
import { import {
Button, Button,
Checkbox, Checkbox,
@ -14,12 +13,18 @@ import {
ModalFooter, ModalFooter,
ModalHeader, ModalHeader,
ModalOverlay, ModalOverlay,
} from '@chakra-ui/react' } from "@chakra-ui/react"
import { SubmitHandler, useForm } from 'react-hook-form' import type React from "react"
import { useMutation, useQueryClient } from 'react-query' import { type SubmitHandler, useForm } from "react-hook-form"
import { useMutation, useQueryClient } from "react-query"
import { ApiError, UserOut, UserUpdate, UsersService } from '../../client' import {
import useCustomToast from '../../hooks/useCustomToast' type ApiError,
type UserOut,
type UserUpdate,
UsersService,
} from "../../client"
import useCustomToast from "../../hooks/useCustomToast"
interface EditUserProps { interface EditUserProps {
user: UserOut user: UserOut
@ -42,8 +47,8 @@ const EditUser: React.FC<EditUserProps> = ({ user, isOpen, onClose }) => {
getValues, getValues,
formState: { errors, isSubmitting, isDirty }, formState: { errors, isSubmitting, isDirty },
} = useForm<UserUpdateForm>({ } = useForm<UserUpdateForm>({
mode: 'onBlur', mode: "onBlur",
criteriaMode: 'all', criteriaMode: "all",
defaultValues: user, defaultValues: user,
}) })
@ -53,20 +58,20 @@ const EditUser: React.FC<EditUserProps> = ({ user, isOpen, onClose }) => {
const mutation = useMutation(updateUser, { const mutation = useMutation(updateUser, {
onSuccess: () => { onSuccess: () => {
showToast('Success!', 'User updated successfully.', 'success') showToast("Success!", "User updated successfully.", "success")
onClose() onClose()
}, },
onError: (err: ApiError) => { onError: (err: ApiError) => {
const errDetail = err.body?.detail const errDetail = err.body?.detail
showToast('Something went wrong.', `${errDetail}`, 'error') showToast("Something went wrong.", `${errDetail}`, "error")
}, },
onSettled: () => { onSettled: () => {
queryClient.invalidateQueries('users') queryClient.invalidateQueries("users")
}, },
}) })
const onSubmit: SubmitHandler<UserUpdateForm> = async (data) => { const onSubmit: SubmitHandler<UserUpdateForm> = async (data) => {
if (data.password === '') { if (data.password === "") {
data.password = undefined data.password = undefined
} }
mutation.mutate(data) mutation.mutate(data)
@ -82,7 +87,7 @@ const EditUser: React.FC<EditUserProps> = ({ user, isOpen, onClose }) => {
<Modal <Modal
isOpen={isOpen} isOpen={isOpen}
onClose={onClose} onClose={onClose}
size={{ base: 'sm', md: 'md' }} size={{ base: "sm", md: "md" }}
isCentered isCentered
> >
<ModalOverlay /> <ModalOverlay />
@ -94,11 +99,11 @@ const EditUser: React.FC<EditUserProps> = ({ user, isOpen, onClose }) => {
<FormLabel htmlFor="email">Email</FormLabel> <FormLabel htmlFor="email">Email</FormLabel>
<Input <Input
id="email" id="email"
{...register('email', { {...register("email", {
required: 'Email is required', required: "Email is required",
pattern: { pattern: {
value: /^[A-Z0-9._%+-]+@[A-Z0-9.-]+\.[A-Z]{2,4}$/i, value: /^[A-Z0-9._%+-]+@[A-Z0-9.-]+\.[A-Z]{2,4}$/i,
message: 'Invalid email address', message: "Invalid email address",
}, },
})} })}
placeholder="Email" placeholder="Email"
@ -110,16 +115,16 @@ const EditUser: React.FC<EditUserProps> = ({ user, isOpen, onClose }) => {
</FormControl> </FormControl>
<FormControl mt={4}> <FormControl mt={4}>
<FormLabel htmlFor="name">Full name</FormLabel> <FormLabel htmlFor="name">Full name</FormLabel>
<Input id="name" {...register('full_name')} type="text" /> <Input id="name" {...register("full_name")} type="text" />
</FormControl> </FormControl>
<FormControl mt={4} isInvalid={!!errors.password}> <FormControl mt={4} isInvalid={!!errors.password}>
<FormLabel htmlFor="password">Set Password</FormLabel> <FormLabel htmlFor="password">Set Password</FormLabel>
<Input <Input
id="password" id="password"
{...register('password', { {...register("password", {
minLength: { minLength: {
value: 8, value: 8,
message: 'Password must be at least 8 characters', message: "Password must be at least 8 characters",
}, },
})} })}
placeholder="Password" placeholder="Password"
@ -133,10 +138,10 @@ const EditUser: React.FC<EditUserProps> = ({ user, isOpen, onClose }) => {
<FormLabel htmlFor="confirm_password">Confirm Password</FormLabel> <FormLabel htmlFor="confirm_password">Confirm Password</FormLabel>
<Input <Input
id="confirm_password" id="confirm_password"
{...register('confirm_password', { {...register("confirm_password", {
validate: (value) => validate: (value) =>
value === getValues().password || value === getValues().password ||
'The passwords do not match', "The passwords do not match",
})} })}
placeholder="Password" placeholder="Password"
type="password" type="password"
@ -149,12 +154,12 @@ const EditUser: React.FC<EditUserProps> = ({ user, isOpen, onClose }) => {
</FormControl> </FormControl>
<Flex> <Flex>
<FormControl mt={4}> <FormControl mt={4}>
<Checkbox {...register('is_superuser')} colorScheme="teal"> <Checkbox {...register("is_superuser")} colorScheme="teal">
Is superuser? Is superuser?
</Checkbox> </Checkbox>
</FormControl> </FormControl>
<FormControl mt={4}> <FormControl mt={4}>
<Checkbox {...register('is_active')} colorScheme="teal"> <Checkbox {...register("is_active")} colorScheme="teal">
Is active? Is active?
</Checkbox> </Checkbox>
</FormControl> </FormControl>

18
frontend/src/components/Common/ActionsMenu.tsx

@ -1,4 +1,3 @@
import React from 'react'
import { import {
Button, Button,
Menu, Menu,
@ -6,14 +5,15 @@ import {
MenuItem, MenuItem,
MenuList, MenuList,
useDisclosure, useDisclosure,
} from '@chakra-ui/react' } from "@chakra-ui/react"
import { BsThreeDotsVertical } from 'react-icons/bs' import type React from "react"
import { FiEdit, FiTrash } from 'react-icons/fi' import { BsThreeDotsVertical } from "react-icons/bs"
import { FiEdit, FiTrash } from "react-icons/fi"
import EditUser from '../Admin/EditUser' import type { ItemOut, UserOut } from "../../client"
import EditItem from '../Items/EditItem' import EditUser from "../Admin/EditUser"
import Delete from './DeleteAlert' import EditItem from "../Items/EditItem"
import { ItemOut, UserOut } from '../../client' import Delete from "./DeleteAlert"
interface ActionsMenuProps { interface ActionsMenuProps {
type: string type: string
@ -49,7 +49,7 @@ const ActionsMenu: React.FC<ActionsMenuProps> = ({ type, value, disabled }) => {
Delete {type} Delete {type}
</MenuItem> </MenuItem>
</MenuList> </MenuList>
{type === 'User' ? ( {type === "User" ? (
<EditUser <EditUser
user={value as UserOut} user={value as UserOut}
isOpen={editUserModal.isOpen} isOpen={editUserModal.isOpen}

32
frontend/src/components/Common/DeleteAlert.tsx

@ -1,4 +1,3 @@
import React from 'react'
import { import {
AlertDialog, AlertDialog,
AlertDialogBody, AlertDialogBody,
@ -7,12 +6,13 @@ import {
AlertDialogHeader, AlertDialogHeader,
AlertDialogOverlay, AlertDialogOverlay,
Button, Button,
} from '@chakra-ui/react' } from "@chakra-ui/react"
import { useForm } from 'react-hook-form' import React from "react"
import { useMutation, useQueryClient } from 'react-query' import { useForm } from "react-hook-form"
import { useMutation, useQueryClient } from "react-query"
import { ItemsService, UsersService } from '../../client' import { ItemsService, UsersService } from "../../client"
import useCustomToast from '../../hooks/useCustomToast' import useCustomToast from "../../hooks/useCustomToast"
interface DeleteProps { interface DeleteProps {
type: string type: string
@ -31,9 +31,9 @@ const Delete: React.FC<DeleteProps> = ({ type, id, isOpen, onClose }) => {
} = useForm() } = useForm()
const deleteEntity = async (id: number) => { const deleteEntity = async (id: number) => {
if (type === 'Item') { if (type === "Item") {
await ItemsService.deleteItem({ id: id }) await ItemsService.deleteItem({ id: id })
} else if (type === 'User') { } else if (type === "User") {
await UsersService.deleteUser({ userId: id }) await UsersService.deleteUser({ userId: id })
} else { } else {
throw new Error(`Unexpected type: ${type}`) throw new Error(`Unexpected type: ${type}`)
@ -43,21 +43,21 @@ const Delete: React.FC<DeleteProps> = ({ type, id, isOpen, onClose }) => {
const mutation = useMutation(deleteEntity, { const mutation = useMutation(deleteEntity, {
onSuccess: () => { onSuccess: () => {
showToast( showToast(
'Success', "Success",
`The ${type.toLowerCase()} was deleted successfully.`, `The ${type.toLowerCase()} was deleted successfully.`,
'success', "success",
) )
onClose() onClose()
}, },
onError: () => { onError: () => {
showToast( showToast(
'An error occurred.', "An error occurred.",
`An error occurred while deleting the ${type.toLowerCase()}.`, `An error occurred while deleting the ${type.toLowerCase()}.`,
'error', "error",
) )
}, },
onSettled: () => { onSettled: () => {
queryClient.invalidateQueries(type === 'Item' ? 'items' : 'users') queryClient.invalidateQueries(type === "Item" ? "items" : "users")
}, },
}) })
@ -71,7 +71,7 @@ const Delete: React.FC<DeleteProps> = ({ type, id, isOpen, onClose }) => {
isOpen={isOpen} isOpen={isOpen}
onClose={onClose} onClose={onClose}
leastDestructiveRef={cancelRef} leastDestructiveRef={cancelRef}
size={{ base: 'sm', md: 'md' }} size={{ base: "sm", md: "md" }}
isCentered isCentered
> >
<AlertDialogOverlay> <AlertDialogOverlay>
@ -79,9 +79,9 @@ const Delete: React.FC<DeleteProps> = ({ type, id, isOpen, onClose }) => {
<AlertDialogHeader>Delete {type}</AlertDialogHeader> <AlertDialogHeader>Delete {type}</AlertDialogHeader>
<AlertDialogBody> <AlertDialogBody>
{type === 'User' && ( {type === "User" && (
<span> <span>
All items associated with this user will also be{' '} All items associated with this user will also be{" "}
<strong>permantly deleted. </strong> <strong>permantly deleted. </strong>
</span> </span>
)} )}

14
frontend/src/components/Common/Navbar.tsx

@ -1,9 +1,9 @@
import React from 'react' import { Button, Flex, Icon, useDisclosure } from "@chakra-ui/react"
import { Button, Flex, Icon, useDisclosure } from '@chakra-ui/react' import type React from "react"
import { FaPlus } from 'react-icons/fa' import { FaPlus } from "react-icons/fa"
import AddUser from '../Admin/AddUser' import AddUser from "../Admin/AddUser"
import AddItem from '../Items/AddItem' import AddItem from "../Items/AddItem"
interface NavbarProps { interface NavbarProps {
type: string type: string
@ -26,8 +26,8 @@ const Navbar: React.FC<NavbarProps> = ({ type }) => {
<Button <Button
variant="primary" variant="primary"
gap={1} gap={1}
fontSize={{ base: 'sm', md: 'inherit' }} fontSize={{ base: "sm", md: "inherit" }}
onClick={type === 'User' ? addUserModal.onOpen : addItemModal.onOpen} onClick={type === "User" ? addUserModal.onOpen : addItemModal.onOpen}
> >
<Icon as={FaPlus} /> Add {type} <Icon as={FaPlus} /> Add {type}
</Button> </Button>

6
frontend/src/components/Common/NotFound.tsx

@ -1,6 +1,6 @@
import React from 'react' import { Button, Container, Text } from "@chakra-ui/react"
import { Button, Container, Text } from '@chakra-ui/react' import { Link } from "@tanstack/react-router"
import { Link } from '@tanstack/react-router' import type React from "react"
const NotFound: React.FC = () => { const NotFound: React.FC = () => {
return ( return (

28
frontend/src/components/Common/Sidebar.tsx

@ -1,4 +1,3 @@
import React from 'react'
import { import {
Box, Box,
Drawer, Drawer,
@ -12,21 +11,22 @@ import {
Text, Text,
useColorModeValue, useColorModeValue,
useDisclosure, useDisclosure,
} from '@chakra-ui/react' } from "@chakra-ui/react"
import { FiLogOut, FiMenu } from 'react-icons/fi' import type React from "react"
import { useQueryClient } from 'react-query' import { FiLogOut, FiMenu } from "react-icons/fi"
import { useQueryClient } from "react-query"
import Logo from '../../assets/images/fastapi-logo.svg' import Logo from "../../assets/images/fastapi-logo.svg"
import { UserOut } from '../../client' import type { UserOut } from "../../client"
import useAuth from '../../hooks/useAuth' import useAuth from "../../hooks/useAuth"
import SidebarItems from './SidebarItems' import SidebarItems from "./SidebarItems"
const Sidebar: React.FC = () => { const Sidebar: React.FC = () => {
const queryClient = useQueryClient() const queryClient = useQueryClient()
const bgColor = useColorModeValue('ui.white', 'ui.dark') const bgColor = useColorModeValue("ui.white", "ui.dark")
const textColor = useColorModeValue('ui.dark', 'ui.white') const textColor = useColorModeValue("ui.dark", "ui.white")
const secBgColor = useColorModeValue('ui.secondary', 'ui.darkSlate') const secBgColor = useColorModeValue("ui.secondary", "ui.darkSlate")
const currentUser = queryClient.getQueryData<UserOut>('currentUser') const currentUser = queryClient.getQueryData<UserOut>("currentUser")
const { isOpen, onOpen, onClose } = useDisclosure() const { isOpen, onOpen, onClose } = useDisclosure()
const { logout } = useAuth() const { logout } = useAuth()
@ -39,7 +39,7 @@ const Sidebar: React.FC = () => {
{/* Mobile */} {/* Mobile */}
<IconButton <IconButton
onClick={onOpen} onClick={onOpen}
display={{ base: 'flex', md: 'none' }} display={{ base: "flex", md: "none" }}
aria-label="Open Menu" aria-label="Open Menu"
position="absolute" position="absolute"
fontSize="20px" fontSize="20px"
@ -84,7 +84,7 @@ const Sidebar: React.FC = () => {
h="100vh" h="100vh"
position="sticky" position="sticky"
top="0" top="0"
display={{ base: 'none', md: 'flex' }} display={{ base: "none", md: "flex" }}
> >
<Flex <Flex
flexDir="column" flexDir="column"

28
frontend/src/components/Common/SidebarItems.tsx

@ -1,15 +1,15 @@
import React from 'react' import { Box, Flex, Icon, Text, useColorModeValue } from "@chakra-ui/react"
import { Box, Flex, Icon, Text, useColorModeValue } from '@chakra-ui/react' import { Link } from "@tanstack/react-router"
import { FiBriefcase, FiHome, FiSettings, FiUsers } from 'react-icons/fi' import type React from "react"
import { Link } from '@tanstack/react-router' import { FiBriefcase, FiHome, FiSettings, FiUsers } from "react-icons/fi"
import { useQueryClient } from 'react-query' import { useQueryClient } from "react-query"
import { UserOut } from '../../client' import type { UserOut } from "../../client"
const items = [ const items = [
{ icon: FiHome, title: 'Dashboard', path: '/' }, { icon: FiHome, title: "Dashboard", path: "/" },
{ icon: FiBriefcase, title: 'Items', path: '/items' }, { icon: FiBriefcase, title: "Items", path: "/items" },
{ icon: FiSettings, title: 'User Settings', path: '/settings' }, { icon: FiSettings, title: "User Settings", path: "/settings" },
] ]
interface SidebarItemsProps { interface SidebarItemsProps {
@ -18,12 +18,12 @@ interface SidebarItemsProps {
const SidebarItems: React.FC<SidebarItemsProps> = ({ onClose }) => { const SidebarItems: React.FC<SidebarItemsProps> = ({ onClose }) => {
const queryClient = useQueryClient() const queryClient = useQueryClient()
const textColor = useColorModeValue('ui.main', 'ui.white') const textColor = useColorModeValue("ui.main", "ui.white")
const bgActive = useColorModeValue('#E2E8F0', '#4A5568') const bgActive = useColorModeValue("#E2E8F0", "#4A5568")
const currentUser = queryClient.getQueryData<UserOut>('currentUser') const currentUser = queryClient.getQueryData<UserOut>("currentUser")
const finalItems = currentUser?.is_superuser const finalItems = currentUser?.is_superuser
? [...items, { icon: FiUsers, title: 'Admin', path: '/admin' }] ? [...items, { icon: FiUsers, title: "Admin", path: "/admin" }]
: items : items
const listItems = finalItems.map((item) => ( const listItems = finalItems.map((item) => (
@ -36,7 +36,7 @@ const SidebarItems: React.FC<SidebarItemsProps> = ({ onClose }) => {
activeProps={{ activeProps={{
style: { style: {
background: bgActive, background: bgActive,
borderRadius: '12px', borderRadius: "12px",
}, },
}} }}
color={textColor} color={textColor}

14
frontend/src/components/Common/UserMenu.tsx

@ -1,4 +1,3 @@
import React from 'react'
import { import {
Box, Box,
IconButton, IconButton,
@ -6,12 +5,13 @@ import {
MenuButton, MenuButton,
MenuItem, MenuItem,
MenuList, MenuList,
} from '@chakra-ui/react' } from "@chakra-ui/react"
import { FaUserAstronaut } from 'react-icons/fa' import type React from "react"
import { FiLogOut, FiUser } from 'react-icons/fi' import { FaUserAstronaut } from "react-icons/fa"
import { FiLogOut, FiUser } from "react-icons/fi"
import useAuth from '../../hooks/useAuth' import { Link } from "@tanstack/react-router"
import { Link } from '@tanstack/react-router' import useAuth from "../../hooks/useAuth"
const UserMenu: React.FC = () => { const UserMenu: React.FC = () => {
const { logout } = useAuth() const { logout } = useAuth()
@ -24,7 +24,7 @@ const UserMenu: React.FC = () => {
<> <>
{/* Desktop */} {/* Desktop */}
<Box <Box
display={{ base: 'none', md: 'block' }} display={{ base: "none", md: "block" }}
position="fixed" position="fixed"
top={4} top={4}
right={4} right={4}

34
frontend/src/components/Items/AddItem.tsx

@ -1,4 +1,3 @@
import React from 'react'
import { import {
Button, Button,
FormControl, FormControl,
@ -12,12 +11,13 @@ import {
ModalFooter, ModalFooter,
ModalHeader, ModalHeader,
ModalOverlay, ModalOverlay,
} from '@chakra-ui/react' } from "@chakra-ui/react"
import { SubmitHandler, useForm } from 'react-hook-form' import type React from "react"
import { useMutation, useQueryClient } from 'react-query' import { type SubmitHandler, useForm } from "react-hook-form"
import { useMutation, useQueryClient } from "react-query"
import { ApiError, ItemCreate, ItemsService } from '../../client' import { type ApiError, type ItemCreate, ItemsService } from "../../client"
import useCustomToast from '../../hooks/useCustomToast' import useCustomToast from "../../hooks/useCustomToast"
interface AddItemProps { interface AddItemProps {
isOpen: boolean isOpen: boolean
@ -33,11 +33,11 @@ const AddItem: React.FC<AddItemProps> = ({ isOpen, onClose }) => {
reset, reset,
formState: { errors, isSubmitting }, formState: { errors, isSubmitting },
} = useForm<ItemCreate>({ } = useForm<ItemCreate>({
mode: 'onBlur', mode: "onBlur",
criteriaMode: 'all', criteriaMode: "all",
defaultValues: { defaultValues: {
title: '', title: "",
description: '', description: "",
}, },
}) })
@ -47,16 +47,16 @@ const AddItem: React.FC<AddItemProps> = ({ isOpen, onClose }) => {
const mutation = useMutation(addItem, { const mutation = useMutation(addItem, {
onSuccess: () => { onSuccess: () => {
showToast('Success!', 'Item created successfully.', 'success') showToast("Success!", "Item created successfully.", "success")
reset() reset()
onClose() onClose()
}, },
onError: (err: ApiError) => { onError: (err: ApiError) => {
const errDetail = err.body?.detail const errDetail = err.body?.detail
showToast('Something went wrong.', `${errDetail}`, 'error') showToast("Something went wrong.", `${errDetail}`, "error")
}, },
onSettled: () => { onSettled: () => {
queryClient.invalidateQueries('items') queryClient.invalidateQueries("items")
}, },
}) })
@ -69,7 +69,7 @@ const AddItem: React.FC<AddItemProps> = ({ isOpen, onClose }) => {
<Modal <Modal
isOpen={isOpen} isOpen={isOpen}
onClose={onClose} onClose={onClose}
size={{ base: 'sm', md: 'md' }} size={{ base: "sm", md: "md" }}
isCentered isCentered
> >
<ModalOverlay /> <ModalOverlay />
@ -81,8 +81,8 @@ const AddItem: React.FC<AddItemProps> = ({ isOpen, onClose }) => {
<FormLabel htmlFor="title">Title</FormLabel> <FormLabel htmlFor="title">Title</FormLabel>
<Input <Input
id="title" id="title"
{...register('title', { {...register("title", {
required: 'Title is required.', required: "Title is required.",
})} })}
placeholder="Title" placeholder="Title"
type="text" type="text"
@ -95,7 +95,7 @@ const AddItem: React.FC<AddItemProps> = ({ isOpen, onClose }) => {
<FormLabel htmlFor="description">Description</FormLabel> <FormLabel htmlFor="description">Description</FormLabel>
<Input <Input
id="description" id="description"
{...register('description')} {...register("description")}
placeholder="Description" placeholder="Description"
type="text" type="text"
/> />

35
frontend/src/components/Items/EditItem.tsx

@ -1,4 +1,3 @@
import React from 'react'
import { import {
Button, Button,
FormControl, FormControl,
@ -12,12 +11,18 @@ import {
ModalFooter, ModalFooter,
ModalHeader, ModalHeader,
ModalOverlay, ModalOverlay,
} from '@chakra-ui/react' } from "@chakra-ui/react"
import { SubmitHandler, useForm } from 'react-hook-form' import type React from "react"
import { type SubmitHandler, useForm } from "react-hook-form"
import { useMutation, useQueryClient } from 'react-query' import { useMutation, useQueryClient } from "react-query"
import { ApiError, ItemOut, ItemUpdate, ItemsService } from '../../client' import {
import useCustomToast from '../../hooks/useCustomToast' type ApiError,
type ItemOut,
type ItemUpdate,
ItemsService,
} from "../../client"
import useCustomToast from "../../hooks/useCustomToast"
interface EditItemProps { interface EditItemProps {
item: ItemOut item: ItemOut
@ -34,8 +39,8 @@ const EditItem: React.FC<EditItemProps> = ({ item, isOpen, onClose }) => {
reset, reset,
formState: { isSubmitting, errors, isDirty }, formState: { isSubmitting, errors, isDirty },
} = useForm<ItemUpdate>({ } = useForm<ItemUpdate>({
mode: 'onBlur', mode: "onBlur",
criteriaMode: 'all', criteriaMode: "all",
defaultValues: item, defaultValues: item,
}) })
@ -45,15 +50,15 @@ const EditItem: React.FC<EditItemProps> = ({ item, isOpen, onClose }) => {
const mutation = useMutation(updateItem, { const mutation = useMutation(updateItem, {
onSuccess: () => { onSuccess: () => {
showToast('Success!', 'Item updated successfully.', 'success') showToast("Success!", "Item updated successfully.", "success")
onClose() onClose()
}, },
onError: (err: ApiError) => { onError: (err: ApiError) => {
const errDetail = err.body?.detail const errDetail = err.body?.detail
showToast('Something went wrong.', `${errDetail}`, 'error') showToast("Something went wrong.", `${errDetail}`, "error")
}, },
onSettled: () => { onSettled: () => {
queryClient.invalidateQueries('items') queryClient.invalidateQueries("items")
}, },
}) })
@ -71,7 +76,7 @@ const EditItem: React.FC<EditItemProps> = ({ item, isOpen, onClose }) => {
<Modal <Modal
isOpen={isOpen} isOpen={isOpen}
onClose={onClose} onClose={onClose}
size={{ base: 'sm', md: 'md' }} size={{ base: "sm", md: "md" }}
isCentered isCentered
> >
<ModalOverlay /> <ModalOverlay />
@ -83,8 +88,8 @@ const EditItem: React.FC<EditItemProps> = ({ item, isOpen, onClose }) => {
<FormLabel htmlFor="title">Title</FormLabel> <FormLabel htmlFor="title">Title</FormLabel>
<Input <Input
id="title" id="title"
{...register('title', { {...register("title", {
required: 'Title is required', required: "Title is required",
})} })}
type="text" type="text"
/> />
@ -96,7 +101,7 @@ const EditItem: React.FC<EditItemProps> = ({ item, isOpen, onClose }) => {
<FormLabel htmlFor="description">Description</FormLabel> <FormLabel htmlFor="description">Description</FormLabel>
<Input <Input
id="description" id="description"
{...register('description')} {...register("description")}
placeholder="Description" placeholder="Description"
type="text" type="text"
/> />

4
frontend/src/components/UserSettings/Appearance.tsx

@ -1,4 +1,3 @@
import React from 'react'
import { import {
Badge, Badge,
Container, Container,
@ -7,7 +6,8 @@ import {
RadioGroup, RadioGroup,
Stack, Stack,
useColorMode, useColorMode,
} from '@chakra-ui/react' } from "@chakra-ui/react"
import type React from "react"
const Appearance: React.FC = () => { const Appearance: React.FC = () => {
const { colorMode, toggleColorMode } = useColorMode() const { colorMode, toggleColorMode } = useColorMode()

38
frontend/src/components/UserSettings/ChangePassword.tsx

@ -1,4 +1,3 @@
import React from 'react'
import { import {
Box, Box,
Button, Button,
@ -9,19 +8,20 @@ import {
Heading, Heading,
Input, Input,
useColorModeValue, useColorModeValue,
} from '@chakra-ui/react' } from "@chakra-ui/react"
import { SubmitHandler, useForm } from 'react-hook-form' import type React from "react"
import { useMutation } from 'react-query' import { type SubmitHandler, useForm } from "react-hook-form"
import { useMutation } from "react-query"
import { ApiError, UpdatePassword, UsersService } from '../../client' import { type ApiError, type UpdatePassword, UsersService } from "../../client"
import useCustomToast from '../../hooks/useCustomToast' import useCustomToast from "../../hooks/useCustomToast"
interface UpdatePasswordForm extends UpdatePassword { interface UpdatePasswordForm extends UpdatePassword {
confirm_password: string confirm_password: string
} }
const ChangePassword: React.FC = () => { const ChangePassword: React.FC = () => {
const color = useColorModeValue('inherit', 'ui.white') const color = useColorModeValue("inherit", "ui.white")
const showToast = useCustomToast() const showToast = useCustomToast()
const { const {
register, register,
@ -30,8 +30,8 @@ const ChangePassword: React.FC = () => {
getValues, getValues,
formState: { errors, isSubmitting }, formState: { errors, isSubmitting },
} = useForm<UpdatePasswordForm>({ } = useForm<UpdatePasswordForm>({
mode: 'onBlur', mode: "onBlur",
criteriaMode: 'all', criteriaMode: "all",
}) })
const UpdatePassword = async (data: UpdatePassword) => { const UpdatePassword = async (data: UpdatePassword) => {
@ -40,12 +40,12 @@ const ChangePassword: React.FC = () => {
const mutation = useMutation(UpdatePassword, { const mutation = useMutation(UpdatePassword, {
onSuccess: () => { onSuccess: () => {
showToast('Success!', 'Password updated.', 'success') showToast("Success!", "Password updated.", "success")
reset() reset()
}, },
onError: (err: ApiError) => { onError: (err: ApiError) => {
const errDetail = err.body?.detail const errDetail = err.body?.detail
showToast('Something went wrong.', `${errDetail}`, 'error') showToast("Something went wrong.", `${errDetail}`, "error")
}, },
}) })
@ -59,14 +59,14 @@ const ChangePassword: React.FC = () => {
<Heading size="sm" py={4}> <Heading size="sm" py={4}>
Change Password Change Password
</Heading> </Heading>
<Box w={{ sm: 'full', md: '50%' }}> <Box w={{ sm: "full", md: "50%" }}>
<FormControl isRequired isInvalid={!!errors.current_password}> <FormControl isRequired isInvalid={!!errors.current_password}>
<FormLabel color={color} htmlFor="current_password"> <FormLabel color={color} htmlFor="current_password">
Current password Current password
</FormLabel> </FormLabel>
<Input <Input
id="current_password" id="current_password"
{...register('current_password')} {...register("current_password")}
placeholder="Password" placeholder="Password"
type="password" type="password"
/> />
@ -80,11 +80,11 @@ const ChangePassword: React.FC = () => {
<FormLabel htmlFor="password">Set Password</FormLabel> <FormLabel htmlFor="password">Set Password</FormLabel>
<Input <Input
id="password" id="password"
{...register('new_password', { {...register("new_password", {
required: 'Password is required', required: "Password is required",
minLength: { minLength: {
value: 8, value: 8,
message: 'Password must be at least 8 characters', message: "Password must be at least 8 characters",
}, },
})} })}
placeholder="Password" placeholder="Password"
@ -98,11 +98,11 @@ const ChangePassword: React.FC = () => {
<FormLabel htmlFor="confirm_password">Confirm Password</FormLabel> <FormLabel htmlFor="confirm_password">Confirm Password</FormLabel>
<Input <Input
id="confirm_password" id="confirm_password"
{...register('confirm_password', { {...register("confirm_password", {
required: 'Please confirm your password', required: "Please confirm your password",
validate: (value) => validate: (value) =>
value === getValues().new_password || value === getValues().new_password ||
'The passwords do not match', "The passwords do not match",
})} })}
placeholder="Password" placeholder="Password"
type="password" type="password"

6
frontend/src/components/UserSettings/DeleteAccount.tsx

@ -1,13 +1,13 @@
import React from 'react'
import { import {
Button, Button,
Container, Container,
Heading, Heading,
Text, Text,
useDisclosure, useDisclosure,
} from '@chakra-ui/react' } from "@chakra-ui/react"
import type React from "react"
import DeleteConfirmation from './DeleteConfirmation' import DeleteConfirmation from "./DeleteConfirmation"
const DeleteAccount: React.FC = () => { const DeleteAccount: React.FC = () => {
const confirmationModal = useDisclosure() const confirmationModal = useDisclosure()

30
frontend/src/components/UserSettings/DeleteConfirmation.tsx

@ -1,4 +1,3 @@
import React from 'react'
import { import {
AlertDialog, AlertDialog,
AlertDialogBody, AlertDialogBody,
@ -7,13 +6,14 @@ import {
AlertDialogHeader, AlertDialogHeader,
AlertDialogOverlay, AlertDialogOverlay,
Button, Button,
} from '@chakra-ui/react' } from "@chakra-ui/react"
import { useForm } from 'react-hook-form' import React from "react"
import { useMutation, useQueryClient } from 'react-query' import { useForm } from "react-hook-form"
import { useMutation, useQueryClient } from "react-query"
import { ApiError, UserOut, UsersService } from '../../client' import { type ApiError, type UserOut, UsersService } from "../../client"
import useAuth from '../../hooks/useAuth' import useAuth from "../../hooks/useAuth"
import useCustomToast from '../../hooks/useCustomToast' import useCustomToast from "../../hooks/useCustomToast"
interface DeleteProps { interface DeleteProps {
isOpen: boolean isOpen: boolean
@ -28,7 +28,7 @@ const DeleteConfirmation: React.FC<DeleteProps> = ({ isOpen, onClose }) => {
handleSubmit, handleSubmit,
formState: { isSubmitting }, formState: { isSubmitting },
} = useForm() } = useForm()
const currentUser = queryClient.getQueryData<UserOut>('currentUser') const currentUser = queryClient.getQueryData<UserOut>("currentUser")
const { logout } = useAuth() const { logout } = useAuth()
const deleteCurrentUser = async (id: number) => { const deleteCurrentUser = async (id: number) => {
@ -38,19 +38,19 @@ const DeleteConfirmation: React.FC<DeleteProps> = ({ isOpen, onClose }) => {
const mutation = useMutation(deleteCurrentUser, { const mutation = useMutation(deleteCurrentUser, {
onSuccess: () => { onSuccess: () => {
showToast( showToast(
'Success', "Success",
'Your account has been successfully deleted.', "Your account has been successfully deleted.",
'success', "success",
) )
logout() logout()
onClose() onClose()
}, },
onError: (err: ApiError) => { onError: (err: ApiError) => {
const errDetail = err.body?.detail const errDetail = err.body?.detail
showToast('Something went wrong.', `${errDetail}`, 'error') showToast("Something went wrong.", `${errDetail}`, "error")
}, },
onSettled: () => { onSettled: () => {
queryClient.invalidateQueries('currentUser') queryClient.invalidateQueries("currentUser")
}, },
}) })
@ -64,7 +64,7 @@ const DeleteConfirmation: React.FC<DeleteProps> = ({ isOpen, onClose }) => {
isOpen={isOpen} isOpen={isOpen}
onClose={onClose} onClose={onClose}
leastDestructiveRef={cancelRef} leastDestructiveRef={cancelRef}
size={{ base: 'sm', md: 'md' }} size={{ base: "sm", md: "md" }}
isCentered isCentered
> >
<AlertDialogOverlay> <AlertDialogOverlay>
@ -72,7 +72,7 @@ const DeleteConfirmation: React.FC<DeleteProps> = ({ isOpen, onClose }) => {
<AlertDialogHeader>Confirmation Required</AlertDialogHeader> <AlertDialogHeader>Confirmation Required</AlertDialogHeader>
<AlertDialogBody> <AlertDialogBody>
All your account data will be{' '} All your account data will be{" "}
<strong>permanently deleted.</strong> If you are sure, please <strong>permanently deleted.</strong> If you are sure, please
click <strong>"Confirm"</strong> to proceed. This action cannot be click <strong>"Confirm"</strong> to proceed. This action cannot be
undone. undone.

54
frontend/src/components/UserSettings/UserInformation.tsx

@ -1,4 +1,3 @@
import React, { useState } from 'react'
import { import {
Box, Box,
Button, Button,
@ -11,17 +10,24 @@ import {
Input, Input,
Text, Text,
useColorModeValue, useColorModeValue,
} from '@chakra-ui/react' } from "@chakra-ui/react"
import { SubmitHandler, useForm } from 'react-hook-form' import type React from "react"
import { useMutation, useQueryClient } from 'react-query' import { useState } from "react"
import { type SubmitHandler, useForm } from "react-hook-form"
import { useMutation, useQueryClient } from "react-query"
import { ApiError, UserOut, UserUpdateMe, UsersService } from '../../client' import {
import useAuth from '../../hooks/useAuth' type ApiError,
import useCustomToast from '../../hooks/useCustomToast' type UserOut,
type UserUpdateMe,
UsersService,
} from "../../client"
import useAuth from "../../hooks/useAuth"
import useCustomToast from "../../hooks/useCustomToast"
const UserInformation: React.FC = () => { const UserInformation: React.FC = () => {
const queryClient = useQueryClient() const queryClient = useQueryClient()
const color = useColorModeValue('inherit', 'ui.white') const color = useColorModeValue("inherit", "ui.white")
const showToast = useCustomToast() const showToast = useCustomToast()
const [editMode, setEditMode] = useState(false) const [editMode, setEditMode] = useState(false)
const { user: currentUser } = useAuth() const { user: currentUser } = useAuth()
@ -32,8 +38,8 @@ const UserInformation: React.FC = () => {
getValues, getValues,
formState: { isSubmitting, errors, isDirty }, formState: { isSubmitting, errors, isDirty },
} = useForm<UserOut>({ } = useForm<UserOut>({
mode: 'onBlur', mode: "onBlur",
criteriaMode: 'all', criteriaMode: "all",
defaultValues: { defaultValues: {
full_name: currentUser?.full_name, full_name: currentUser?.full_name,
email: currentUser?.email, email: currentUser?.email,
@ -50,15 +56,15 @@ const UserInformation: React.FC = () => {
const mutation = useMutation(updateInfo, { const mutation = useMutation(updateInfo, {
onSuccess: () => { onSuccess: () => {
showToast('Success!', 'User updated successfully.', 'success') showToast("Success!", "User updated successfully.", "success")
}, },
onError: (err: ApiError) => { onError: (err: ApiError) => {
const errDetail = err.body?.detail const errDetail = err.body?.detail
showToast('Something went wrong.', `${errDetail}`, 'error') showToast("Something went wrong.", `${errDetail}`, "error")
}, },
onSettled: () => { onSettled: () => {
queryClient.invalidateQueries('users') queryClient.invalidateQueries("users")
queryClient.invalidateQueries('currentUser') queryClient.invalidateQueries("currentUser")
}, },
}) })
@ -77,7 +83,7 @@ const UserInformation: React.FC = () => {
<Heading size="sm" py={4}> <Heading size="sm" py={4}>
User Information User Information
</Heading> </Heading>
<Box w={{ sm: 'full', md: '50%' }}> <Box w={{ sm: "full", md: "50%" }}>
<FormControl> <FormControl>
<FormLabel color={color} htmlFor="name"> <FormLabel color={color} htmlFor="name">
Full name Full name
@ -85,7 +91,7 @@ const UserInformation: React.FC = () => {
{editMode ? ( {editMode ? (
<Input <Input
id="name" id="name"
{...register('full_name', { maxLength: 30 })} {...register("full_name", { maxLength: 30 })}
type="text" type="text"
size="md" size="md"
/> />
@ -93,9 +99,9 @@ const UserInformation: React.FC = () => {
<Text <Text
size="md" size="md"
py={2} py={2}
color={!currentUser?.full_name ? 'gray.400' : 'inherit'} color={!currentUser?.full_name ? "gray.400" : "inherit"}
> >
{currentUser?.full_name || 'N/A'} {currentUser?.full_name || "N/A"}
</Text> </Text>
)} )}
</FormControl> </FormControl>
@ -106,11 +112,11 @@ const UserInformation: React.FC = () => {
{editMode ? ( {editMode ? (
<Input <Input
id="email" id="email"
{...register('email', { {...register("email", {
required: 'Email is required', required: "Email is required",
pattern: { pattern: {
value: /^[A-Z0-9._%+-]+@[A-Z0-9.-]+\.[A-Z]{2,4}$/i, value: /^[A-Z0-9._%+-]+@[A-Z0-9.-]+\.[A-Z]{2,4}$/i,
message: 'Invalid email address', message: "Invalid email address",
}, },
})} })}
type="email" type="email"
@ -129,11 +135,11 @@ const UserInformation: React.FC = () => {
<Button <Button
variant="primary" variant="primary"
onClick={toggleEditMode} onClick={toggleEditMode}
type={editMode ? 'button' : 'submit'} type={editMode ? "button" : "submit"}
isLoading={editMode ? isSubmitting : false} isLoading={editMode ? isSubmitting : false}
isDisabled={editMode ? !isDirty || !getValues('email') : false} isDisabled={editMode ? !isDirty || !getValues("email") : false}
> >
{editMode ? 'Save' : 'Edit'} {editMode ? "Save" : "Edit"}
</Button> </Button>
{editMode && ( {editMode && (
<Button onClick={onCancel} isDisabled={isSubmitting}> <Button onClick={onCancel} isDisabled={isSubmitting}>

22
frontend/src/hooks/useAuth.ts

@ -1,21 +1,21 @@
import { useQuery } from 'react-query' import { useNavigate } from "@tanstack/react-router"
import { useNavigate } from '@tanstack/react-router' import { useQuery } from "react-query"
import { import {
Body_login_login_access_token as AccessToken, type Body_login_login_access_token as AccessToken,
LoginService, LoginService,
UserOut, type UserOut,
UsersService, UsersService,
} from '../client' } from "../client"
const isLoggedIn = () => { const isLoggedIn = () => {
return localStorage.getItem('access_token') !== null return localStorage.getItem("access_token") !== null
} }
const useAuth = () => { const useAuth = () => {
const navigate = useNavigate() const navigate = useNavigate()
const { data: user, isLoading } = useQuery<UserOut | null, Error>( const { data: user, isLoading } = useQuery<UserOut | null, Error>(
'currentUser', "currentUser",
UsersService.readUserMe, UsersService.readUserMe,
{ {
enabled: isLoggedIn(), enabled: isLoggedIn(),
@ -26,13 +26,13 @@ const useAuth = () => {
const response = await LoginService.loginAccessToken({ const response = await LoginService.loginAccessToken({
formData: data, formData: data,
}) })
localStorage.setItem('access_token', response.access_token) localStorage.setItem("access_token", response.access_token)
navigate({ to: '/' }) navigate({ to: "/" })
} }
const logout = () => { const logout = () => {
localStorage.removeItem('access_token') localStorage.removeItem("access_token")
navigate({ to: '/login' }) navigate({ to: "/login" })
} }
return { login, logout, user, isLoading } return { login, logout, user, isLoading }

8
frontend/src/hooks/useCustomToast.ts

@ -1,17 +1,17 @@
import { useCallback } from 'react' import { useToast } from "@chakra-ui/react"
import { useToast } from '@chakra-ui/react' import { useCallback } from "react"
const useCustomToast = () => { const useCustomToast = () => {
const toast = useToast() const toast = useToast()
const showToast = useCallback( const showToast = useCallback(
(title: string, description: string, status: 'success' | 'error') => { (title: string, description: string, status: "success" | "error") => {
toast({ toast({
title, title,
description, description,
status, status,
isClosable: true, isClosable: true,
position: 'bottom-right', position: "bottom-right",
}) })
}, },
[toast], [toast],

22
frontend/src/main.tsx

@ -1,28 +1,28 @@
import ReactDOM from 'react-dom/client' import { ChakraProvider } from "@chakra-ui/react"
import { ChakraProvider } from '@chakra-ui/react' import { RouterProvider, createRouter } from "@tanstack/react-router"
import { QueryClient, QueryClientProvider } from 'react-query' import ReactDOM from "react-dom/client"
import { RouterProvider, createRouter } from '@tanstack/react-router' import { QueryClient, QueryClientProvider } from "react-query"
import { routeTree } from './routeTree.gen' import { routeTree } from "./routeTree.gen"
import { OpenAPI } from './client' import { StrictMode } from "react"
import theme from './theme' import { OpenAPI } from "./client"
import { StrictMode } from 'react' import theme from "./theme"
OpenAPI.BASE = import.meta.env.VITE_API_URL OpenAPI.BASE = import.meta.env.VITE_API_URL
OpenAPI.TOKEN = async () => { OpenAPI.TOKEN = async () => {
return localStorage.getItem('access_token') || '' return localStorage.getItem("access_token") || ""
} }
const queryClient = new QueryClient() const queryClient = new QueryClient()
const router = createRouter({ routeTree }) const router = createRouter({ routeTree })
declare module '@tanstack/react-router' { declare module "@tanstack/react-router" {
interface Register { interface Register {
router: typeof router router: typeof router
} }
} }
ReactDOM.createRoot(document.getElementById('root')!).render( ReactDOM.createRoot(document.getElementById("root")!).render(
<StrictMode> <StrictMode>
<ChakraProvider theme={theme}> <ChakraProvider theme={theme}>
<QueryClientProvider client={queryClient}> <QueryClientProvider client={queryClient}>

10
frontend/src/routes/__root.tsx

@ -1,13 +1,13 @@
import React, { Suspense } from 'react' import { Outlet, createRootRoute } from "@tanstack/react-router"
import { createRootRoute, Outlet } from '@tanstack/react-router' import React, { Suspense } from "react"
import NotFound from '../components/Common/NotFound' import NotFound from "../components/Common/NotFound"
const TanStackRouterDevtools = const TanStackRouterDevtools =
process.env.NODE_ENV === 'production' process.env.NODE_ENV === "production"
? () => null ? () => null
: React.lazy(() => : React.lazy(() =>
import('@tanstack/router-devtools').then((res) => ({ import("@tanstack/router-devtools").then((res) => ({
default: res.TanStackRouterDevtools, default: res.TanStackRouterDevtools,
})), })),
) )

14
frontend/src/routes/_layout.tsx

@ -1,16 +1,16 @@
import { Flex, Spinner } from '@chakra-ui/react' import { Flex, Spinner } from "@chakra-ui/react"
import { Outlet, createFileRoute, redirect } from '@tanstack/react-router' import { Outlet, createFileRoute, redirect } from "@tanstack/react-router"
import Sidebar from '../components/Common/Sidebar' import Sidebar from "../components/Common/Sidebar"
import UserMenu from '../components/Common/UserMenu' import UserMenu from "../components/Common/UserMenu"
import useAuth, { isLoggedIn } from '../hooks/useAuth' import useAuth, { isLoggedIn } from "../hooks/useAuth"
export const Route = createFileRoute('/_layout')({ export const Route = createFileRoute("/_layout")({
component: Layout, component: Layout,
beforeLoad: async () => { beforeLoad: async () => {
if (!isLoggedIn()) { if (!isLoggedIn()) {
throw redirect({ throw redirect({
to: '/login', to: "/login",
}) })
} }
}, },

38
frontend/src/routes/_layout/admin.tsx

@ -12,33 +12,33 @@ import {
Th, Th,
Thead, Thead,
Tr, Tr,
} from '@chakra-ui/react' } from "@chakra-ui/react"
import { createFileRoute } from '@tanstack/react-router' import { createFileRoute } from "@tanstack/react-router"
import { useQuery, useQueryClient } from 'react-query' import { useQuery, useQueryClient } from "react-query"
import { ApiError, UserOut, UsersService } from '../../client' import { type ApiError, type UserOut, UsersService } from "../../client"
import ActionsMenu from '../../components/Common/ActionsMenu' import ActionsMenu from "../../components/Common/ActionsMenu"
import Navbar from '../../components/Common/Navbar' import Navbar from "../../components/Common/Navbar"
import useCustomToast from '../../hooks/useCustomToast' import useCustomToast from "../../hooks/useCustomToast"
export const Route = createFileRoute('/_layout/admin')({ export const Route = createFileRoute("/_layout/admin")({
component: Admin, component: Admin,
}) })
function Admin() { function Admin() {
const queryClient = useQueryClient() const queryClient = useQueryClient()
const showToast = useCustomToast() const showToast = useCustomToast()
const currentUser = queryClient.getQueryData<UserOut>('currentUser') const currentUser = queryClient.getQueryData<UserOut>("currentUser")
const { const {
data: users, data: users,
isLoading, isLoading,
isError, isError,
error, error,
} = useQuery('users', () => UsersService.readUsers({})) } = useQuery("users", () => UsersService.readUsers({}))
if (isError) { if (isError) {
const errDetail = (error as ApiError).body?.detail const errDetail = (error as ApiError).body?.detail
showToast('Something went wrong.', `${errDetail}`, 'error') showToast("Something went wrong.", `${errDetail}`, "error")
} }
return ( return (
@ -53,14 +53,14 @@ function Admin() {
<Container maxW="full"> <Container maxW="full">
<Heading <Heading
size="lg" size="lg"
textAlign={{ base: 'center', md: 'left' }} textAlign={{ base: "center", md: "left" }}
pt={12} pt={12}
> >
User Management User Management
</Heading> </Heading>
<Navbar type={'User'} /> <Navbar type={"User"} />
<TableContainer> <TableContainer>
<Table fontSize="md" size={{ base: 'sm', md: 'md' }}> <Table fontSize="md" size={{ base: "sm", md: "md" }}>
<Thead> <Thead>
<Tr> <Tr>
<Th>Full name</Th> <Th>Full name</Th>
@ -73,8 +73,8 @@ function Admin() {
<Tbody> <Tbody>
{users.data.map((user) => ( {users.data.map((user) => (
<Tr key={user.id}> <Tr key={user.id}>
<Td color={!user.full_name ? 'gray.400' : 'inherit'}> <Td color={!user.full_name ? "gray.400" : "inherit"}>
{user.full_name || 'N/A'} {user.full_name || "N/A"}
{currentUser?.id === user.id && ( {currentUser?.id === user.id && (
<Badge ml="1" colorScheme="teal"> <Badge ml="1" colorScheme="teal">
You You
@ -82,17 +82,17 @@ function Admin() {
)} )}
</Td> </Td>
<Td>{user.email}</Td> <Td>{user.email}</Td>
<Td>{user.is_superuser ? 'Superuser' : 'User'}</Td> <Td>{user.is_superuser ? "Superuser" : "User"}</Td>
<Td> <Td>
<Flex gap={2}> <Flex gap={2}>
<Box <Box
w="2" w="2"
h="2" h="2"
borderRadius="50%" borderRadius="50%"
bg={user.is_active ? 'ui.success' : 'ui.danger'} bg={user.is_active ? "ui.success" : "ui.danger"}
alignSelf="center" alignSelf="center"
/> />
{user.is_active ? 'Active' : 'Inactive'} {user.is_active ? "Active" : "Inactive"}
</Flex> </Flex>
</Td> </Td>
<Td> <Td>

12
frontend/src/routes/_layout/index.tsx

@ -1,17 +1,17 @@
import { Box, Container, Text } from '@chakra-ui/react' import { Box, Container, Text } from "@chakra-ui/react"
import { useQueryClient } from 'react-query' import { createFileRoute } from "@tanstack/react-router"
import { createFileRoute } from '@tanstack/react-router' import { useQueryClient } from "react-query"
import { UserOut } from '../../client' import type { UserOut } from "../../client"
export const Route = createFileRoute('/_layout/')({ export const Route = createFileRoute("/_layout/")({
component: Dashboard, component: Dashboard,
}) })
function Dashboard() { function Dashboard() {
const queryClient = useQueryClient() const queryClient = useQueryClient()
const currentUser = queryClient.getQueryData<UserOut>('currentUser') const currentUser = queryClient.getQueryData<UserOut>("currentUser")
return ( return (
<> <>

32
frontend/src/routes/_layout/items.tsx

@ -10,16 +10,16 @@ import {
Th, Th,
Thead, Thead,
Tr, Tr,
} from '@chakra-ui/react' } from "@chakra-ui/react"
import { createFileRoute } from '@tanstack/react-router' import { createFileRoute } from "@tanstack/react-router"
import { useQuery } from 'react-query' import { useQuery } from "react-query"
import { ApiError, ItemsService } from '../../client' import { type ApiError, ItemsService } from "../../client"
import ActionsMenu from '../../components/Common/ActionsMenu' import ActionsMenu from "../../components/Common/ActionsMenu"
import Navbar from '../../components/Common/Navbar' import Navbar from "../../components/Common/Navbar"
import useCustomToast from '../../hooks/useCustomToast' import useCustomToast from "../../hooks/useCustomToast"
export const Route = createFileRoute('/_layout/items')({ export const Route = createFileRoute("/_layout/items")({
component: Items, component: Items,
}) })
@ -30,11 +30,11 @@ function Items() {
isLoading, isLoading,
isError, isError,
error, error,
} = useQuery('items', () => ItemsService.readItems({})) } = useQuery("items", () => ItemsService.readItems({}))
if (isError) { if (isError) {
const errDetail = (error as ApiError).body?.detail const errDetail = (error as ApiError).body?.detail
showToast('Something went wrong.', `${errDetail}`, 'error') showToast("Something went wrong.", `${errDetail}`, "error")
} }
return ( return (
@ -49,14 +49,14 @@ function Items() {
<Container maxW="full"> <Container maxW="full">
<Heading <Heading
size="lg" size="lg"
textAlign={{ base: 'center', md: 'left' }} textAlign={{ base: "center", md: "left" }}
pt={12} pt={12}
> >
Items Management Items Management
</Heading> </Heading>
<Navbar type={'Item'} /> <Navbar type={"Item"} />
<TableContainer> <TableContainer>
<Table size={{ base: 'sm', md: 'md' }}> <Table size={{ base: "sm", md: "md" }}>
<Thead> <Thead>
<Tr> <Tr>
<Th>ID</Th> <Th>ID</Th>
@ -70,11 +70,11 @@ function Items() {
<Tr key={item.id}> <Tr key={item.id}>
<Td>{item.id}</Td> <Td>{item.id}</Td>
<Td>{item.title}</Td> <Td>{item.title}</Td>
<Td color={!item.description ? 'gray.400' : 'inherit'}> <Td color={!item.description ? "gray.400" : "inherit"}>
{item.description || 'N/A'} {item.description || "N/A"}
</Td> </Td>
<Td> <Td>
<ActionsMenu type={'Item'} value={item} /> <ActionsMenu type={"Item"} value={item} />
</Td> </Td>
</Tr> </Tr>
))} ))}

30
frontend/src/routes/_layout/settings.tsx

@ -6,37 +6,37 @@ import {
TabPanel, TabPanel,
TabPanels, TabPanels,
Tabs, Tabs,
} from '@chakra-ui/react' } from "@chakra-ui/react"
import { createFileRoute } from '@tanstack/react-router' import { createFileRoute } from "@tanstack/react-router"
import { useQueryClient } from 'react-query' import { useQueryClient } from "react-query"
import { UserOut } from '../../client' import type { UserOut } from "../../client"
import Appearance from '../../components/UserSettings/Appearance' import Appearance from "../../components/UserSettings/Appearance"
import ChangePassword from '../../components/UserSettings/ChangePassword' import ChangePassword from "../../components/UserSettings/ChangePassword"
import DeleteAccount from '../../components/UserSettings/DeleteAccount' import DeleteAccount from "../../components/UserSettings/DeleteAccount"
import UserInformation from '../../components/UserSettings/UserInformation' import UserInformation from "../../components/UserSettings/UserInformation"
const tabsConfig = [ const tabsConfig = [
{ title: 'My profile', component: UserInformation }, { title: "My profile", component: UserInformation },
{ title: 'Password', component: ChangePassword }, { title: "Password", component: ChangePassword },
{ title: 'Appearance', component: Appearance }, { title: "Appearance", component: Appearance },
{ title: 'Danger zone', component: DeleteAccount }, { title: "Danger zone", component: DeleteAccount },
] ]
export const Route = createFileRoute('/_layout/settings')({ export const Route = createFileRoute("/_layout/settings")({
component: UserSettings, component: UserSettings,
}) })
function UserSettings() { function UserSettings() {
const queryClient = useQueryClient() const queryClient = useQueryClient()
const currentUser = queryClient.getQueryData<UserOut>('currentUser') const currentUser = queryClient.getQueryData<UserOut>("currentUser")
const finalTabs = currentUser?.is_superuser const finalTabs = currentUser?.is_superuser
? tabsConfig.slice(0, 3) ? tabsConfig.slice(0, 3)
: tabsConfig : tabsConfig
return ( return (
<Container maxW="full"> <Container maxW="full">
<Heading size="lg" textAlign={{ base: 'center', md: 'left' }} py={12}> <Heading size="lg" textAlign={{ base: "center", md: "left" }} py={12}>
User Settings User Settings
</Heading> </Heading>
<Tabs variant="enclosed"> <Tabs variant="enclosed">

42
frontend/src/routes/login.tsx

@ -1,5 +1,4 @@
import React from 'react' import { ViewIcon, ViewOffIcon } from "@chakra-ui/icons"
import { ViewIcon, ViewOffIcon } from '@chakra-ui/icons'
import { import {
Button, Button,
Center, Center,
@ -13,25 +12,26 @@ import {
InputRightElement, InputRightElement,
Link, Link,
useBoolean, useBoolean,
} from '@chakra-ui/react' } from "@chakra-ui/react"
import { import {
Link as RouterLink, Link as RouterLink,
createFileRoute, createFileRoute,
redirect, redirect,
} from '@tanstack/react-router' } from "@tanstack/react-router"
import { SubmitHandler, useForm } from 'react-hook-form' import React from "react"
import { type SubmitHandler, useForm } from "react-hook-form"
import Logo from '../assets/images/fastapi-logo.svg' import Logo from "../assets/images/fastapi-logo.svg"
import { ApiError } from '../client' import type { ApiError } from "../client"
import { Body_login_login_access_token as AccessToken } from '../client/models/Body_login_login_access_token' import type { Body_login_login_access_token as AccessToken } from "../client/models/Body_login_login_access_token"
import useAuth, { isLoggedIn } from '../hooks/useAuth' import useAuth, { isLoggedIn } from "../hooks/useAuth"
export const Route = createFileRoute('/login')({ export const Route = createFileRoute("/login")({
component: Login, component: Login,
beforeLoad: async () => { beforeLoad: async () => {
if (isLoggedIn()) { if (isLoggedIn()) {
throw redirect({ throw redirect({
to: '/', to: "/",
}) })
} }
}, },
@ -46,11 +46,11 @@ function Login() {
handleSubmit, handleSubmit,
formState: { errors, isSubmitting }, formState: { errors, isSubmitting },
} = useForm<AccessToken>({ } = useForm<AccessToken>({
mode: 'onBlur', mode: "onBlur",
criteriaMode: 'all', criteriaMode: "all",
defaultValues: { defaultValues: {
username: '', username: "",
password: '', password: "",
}, },
}) })
@ -86,10 +86,10 @@ function Login() {
<FormControl id="username" isInvalid={!!errors.username || !!error}> <FormControl id="username" isInvalid={!!errors.username || !!error}>
<Input <Input
id="username" id="username"
{...register('username', { {...register("username", {
pattern: { pattern: {
value: /^[A-Z0-9._%+-]+@[A-Z0-9.-]+\.[A-Z]{2,4}$/i, value: /^[A-Z0-9._%+-]+@[A-Z0-9.-]+\.[A-Z]{2,4}$/i,
message: 'Invalid email address', message: "Invalid email address",
}, },
})} })}
placeholder="Email" placeholder="Email"
@ -102,19 +102,19 @@ function Login() {
<FormControl id="password" isInvalid={!!error}> <FormControl id="password" isInvalid={!!error}>
<InputGroup> <InputGroup>
<Input <Input
{...register('password')} {...register("password")}
type={show ? 'text' : 'password'} type={show ? "text" : "password"}
placeholder="Password" placeholder="Password"
/> />
<InputRightElement <InputRightElement
color="gray.400" color="gray.400"
_hover={{ _hover={{
cursor: 'pointer', cursor: "pointer",
}} }}
> >
<Icon <Icon
onClick={setShow.toggle} onClick={setShow.toggle}
aria-label={show ? 'Hide password' : 'Show password'} aria-label={show ? "Hide password" : "Show password"}
> >
{show ? <ViewOffIcon /> : <ViewIcon />} {show ? <ViewOffIcon /> : <ViewIcon />}
</Icon> </Icon>

28
frontend/src/routes/recover-password.tsx

@ -6,24 +6,24 @@ import {
Heading, Heading,
Input, Input,
Text, Text,
} from '@chakra-ui/react' } from "@chakra-ui/react"
import { createFileRoute, redirect } from '@tanstack/react-router' import { createFileRoute, redirect } from "@tanstack/react-router"
import { SubmitHandler, useForm } from 'react-hook-form' import { type SubmitHandler, useForm } from "react-hook-form"
import { LoginService } from '../client' import { LoginService } from "../client"
import useCustomToast from '../hooks/useCustomToast' import { isLoggedIn } from "../hooks/useAuth"
import { isLoggedIn } from '../hooks/useAuth' import useCustomToast from "../hooks/useCustomToast"
interface FormData { interface FormData {
email: string email: string
} }
export const Route = createFileRoute('/recover-password')({ export const Route = createFileRoute("/recover-password")({
component: RecoverPassword, component: RecoverPassword,
beforeLoad: async () => { beforeLoad: async () => {
if (isLoggedIn()) { if (isLoggedIn()) {
throw redirect({ throw redirect({
to: '/', to: "/",
}) })
} }
}, },
@ -42,9 +42,9 @@ function RecoverPassword() {
email: data.email, email: data.email,
}) })
showToast( showToast(
'Email sent.', "Email sent.",
'We sent an email with a link to get back into your account.', "We sent an email with a link to get back into your account.",
'success', "success",
) )
} }
@ -68,11 +68,11 @@ function RecoverPassword() {
<FormControl isInvalid={!!errors.email}> <FormControl isInvalid={!!errors.email}>
<Input <Input
id="email" id="email"
{...register('email', { {...register("email", {
required: 'Email is required', required: "Email is required",
pattern: { pattern: {
value: /^[A-Z0-9._%+-]+@[A-Z0-9.-]+\.[A-Z]{2,4}$/i, value: /^[A-Z0-9._%+-]+@[A-Z0-9.-]+\.[A-Z]{2,4}$/i,
message: 'Invalid email address', message: "Invalid email address",
}, },
})} })}
placeholder="Email" placeholder="Email"

44
frontend/src/routes/reset-password.tsx

@ -7,25 +7,25 @@ import {
Heading, Heading,
Input, Input,
Text, Text,
} from '@chakra-ui/react' } from "@chakra-ui/react"
import { createFileRoute, redirect, useNavigate } from '@tanstack/react-router' import { createFileRoute, redirect, useNavigate } from "@tanstack/react-router"
import { SubmitHandler, useForm } from 'react-hook-form' import { type SubmitHandler, useForm } from "react-hook-form"
import { useMutation } from 'react-query' import { useMutation } from "react-query"
import { ApiError, LoginService, NewPassword } from '../client' import { type ApiError, LoginService, type NewPassword } from "../client"
import { isLoggedIn } from '../hooks/useAuth' import { isLoggedIn } from "../hooks/useAuth"
import useCustomToast from '../hooks/useCustomToast' import useCustomToast from "../hooks/useCustomToast"
interface NewPasswordForm extends NewPassword { interface NewPasswordForm extends NewPassword {
confirm_password: string confirm_password: string
} }
export const Route = createFileRoute('/reset-password')({ export const Route = createFileRoute("/reset-password")({
component: ResetPassword, component: ResetPassword,
beforeLoad: async () => { beforeLoad: async () => {
if (isLoggedIn()) { if (isLoggedIn()) {
throw redirect({ throw redirect({
to: '/', to: "/",
}) })
} }
}, },
@ -39,17 +39,17 @@ function ResetPassword() {
reset, reset,
formState: { errors }, formState: { errors },
} = useForm<NewPasswordForm>({ } = useForm<NewPasswordForm>({
mode: 'onBlur', mode: "onBlur",
criteriaMode: 'all', criteriaMode: "all",
defaultValues: { defaultValues: {
new_password: '', new_password: "",
}, },
}) })
const showToast = useCustomToast() const showToast = useCustomToast()
const navigate = useNavigate() const navigate = useNavigate()
const resetPassword = async (data: NewPassword) => { const resetPassword = async (data: NewPassword) => {
const token = new URLSearchParams(window.location.search).get('token') const token = new URLSearchParams(window.location.search).get("token")
if (!token) return if (!token) return
await LoginService.resetPassword({ await LoginService.resetPassword({
requestBody: { new_password: data.new_password, token: token }, requestBody: { new_password: data.new_password, token: token },
@ -58,13 +58,13 @@ function ResetPassword() {
const mutation = useMutation(resetPassword, { const mutation = useMutation(resetPassword, {
onSuccess: () => { onSuccess: () => {
showToast('Success!', 'Password updated.', 'success') showToast("Success!", "Password updated.", "success")
reset() reset()
navigate({ to: '/login' }) navigate({ to: "/login" })
}, },
onError: (err: ApiError) => { onError: (err: ApiError) => {
const errDetail = err.body?.detail const errDetail = err.body?.detail
showToast('Something went wrong.', `${errDetail}`, 'error') showToast("Something went wrong.", `${errDetail}`, "error")
}, },
}) })
@ -93,11 +93,11 @@ function ResetPassword() {
<FormLabel htmlFor="password">Set Password</FormLabel> <FormLabel htmlFor="password">Set Password</FormLabel>
<Input <Input
id="password" id="password"
{...register('new_password', { {...register("new_password", {
required: 'Password is required', required: "Password is required",
minLength: { minLength: {
value: 8, value: 8,
message: 'Password must be at least 8 characters', message: "Password must be at least 8 characters",
}, },
})} })}
placeholder="Password" placeholder="Password"
@ -111,11 +111,11 @@ function ResetPassword() {
<FormLabel htmlFor="confirm_password">Confirm Password</FormLabel> <FormLabel htmlFor="confirm_password">Confirm Password</FormLabel>
<Input <Input
id="confirm_password" id="confirm_password"
{...register('confirm_password', { {...register("confirm_password", {
required: 'Please confirm your password', required: "Please confirm your password",
validate: (value) => validate: (value) =>
value === getValues().new_password || value === getValues().new_password ||
'The passwords do not match', "The passwords do not match",
})} })}
placeholder="Password" placeholder="Password"
type="password" type="password"

32
frontend/src/theme.tsx

@ -1,31 +1,31 @@
import { extendTheme } from '@chakra-ui/react' import { extendTheme } from "@chakra-ui/react"
const disabledStyles = { const disabledStyles = {
_disabled: { _disabled: {
backgroundColor: 'ui.main', backgroundColor: "ui.main",
}, },
} }
const theme = extendTheme({ const theme = extendTheme({
colors: { colors: {
ui: { ui: {
main: '#009688', main: "#009688",
secondary: '#EDF2F7', secondary: "#EDF2F7",
success: '#48BB78', success: "#48BB78",
danger: '#E53E3E', danger: "#E53E3E",
white: '#FFFFFF', white: "#FFFFFF",
dark: '#1A202C', dark: "#1A202C",
darkSlate: '#252D3D', darkSlate: "#252D3D",
}, },
}, },
components: { components: {
Button: { Button: {
variants: { variants: {
primary: { primary: {
backgroundColor: 'ui.main', backgroundColor: "ui.main",
color: 'ui.white', color: "ui.white",
_hover: { _hover: {
backgroundColor: '#00766C', backgroundColor: "#00766C",
}, },
_disabled: { _disabled: {
...disabledStyles, ...disabledStyles,
@ -35,10 +35,10 @@ const theme = extendTheme({
}, },
}, },
danger: { danger: {
backgroundColor: 'ui.danger', backgroundColor: "ui.danger",
color: 'ui.white', color: "ui.white",
_hover: { _hover: {
backgroundColor: '#E32727', backgroundColor: "#E32727",
}, },
}, },
}, },
@ -48,7 +48,7 @@ const theme = extendTheme({
enclosed: { enclosed: {
tab: { tab: {
_selected: { _selected: {
color: 'ui.main', color: "ui.main",
}, },
}, },
}, },

6
frontend/vite.config.ts

@ -1,6 +1,6 @@
import react from '@vitejs/plugin-react-swc' import { TanStackRouterVite } from "@tanstack/router-vite-plugin"
import { TanStackRouterVite } from '@tanstack/router-vite-plugin' import react from "@vitejs/plugin-react-swc"
import { defineConfig } from 'vite' import { defineConfig } from "vite"
// https://vitejs.dev/config/ // https://vitejs.dev/config/
export default defineConfig({ export default defineConfig({

Loading…
Cancel
Save