Browse Source

🎨 Format with Prettier (#646)

pull/13907/head
Alejandra 1 year ago
committed by GitHub
parent
commit
2d138b4622
No known key found for this signature in database GPG Key ID: B5690EEEBB952194
  1. 173
      new-frontend/src/components/Admin/AddUser.tsx
  2. 157
      new-frontend/src/components/Admin/EditUser.tsx
  3. 88
      new-frontend/src/components/Common/ActionsMenu.tsx
  4. 93
      new-frontend/src/components/Common/DeleteAlert.tsx
  5. 34
      new-frontend/src/components/Common/Navbar.tsx
  6. 48
      new-frontend/src/components/Common/NotFound.tsx
  7. 121
      new-frontend/src/components/Common/Sidebar.tsx
  8. 47
      new-frontend/src/components/Common/SidebarItems.tsx
  9. 52
      new-frontend/src/components/Common/UserMenu.tsx
  10. 105
      new-frontend/src/components/Items/AddItem.tsx
  11. 103
      new-frontend/src/components/Items/EditItem.tsx
  12. 32
      new-frontend/src/components/UserSettings/Appearance.tsx
  13. 137
      new-frontend/src/components/UserSettings/ChangePassword.tsx
  14. 41
      new-frontend/src/components/UserSettings/DeleteAccount.tsx
  15. 99
      new-frontend/src/components/UserSettings/DeleteConfirmation.tsx
  16. 143
      new-frontend/src/components/UserSettings/UserInformation.tsx
  17. 45
      new-frontend/src/hooks/useAuth.ts
  18. 24
      new-frontend/src/hooks/useCustomToast.ts
  19. 22
      new-frontend/src/main.tsx
  20. 1
      new-frontend/src/routes/__root.tsx
  21. 27
      new-frontend/src/routes/_layout.tsx
  22. 87
      new-frontend/src/routes/_layout/admin.tsx
  23. 21
      new-frontend/src/routes/_layout/index.tsx
  24. 60
      new-frontend/src/routes/_layout/items.tsx
  25. 44
      new-frontend/src/routes/_layout/settings.tsx
  26. 131
      new-frontend/src/routes/login.tsx
  27. 87
      new-frontend/src/routes/recover-password.tsx
  28. 125
      new-frontend/src/routes/reset-password.tsx
  29. 6
      new-frontend/src/theme.tsx

173
new-frontend/src/components/Admin/AddUser.tsx

@ -1,27 +1,46 @@
import React from 'react'; import React from 'react'
import {
Button,
Checkbox,
Flex,
FormControl,
FormErrorMessage,
FormLabel,
Input,
Modal,
ModalBody,
ModalCloseButton,
ModalContent,
ModalFooter,
ModalHeader,
ModalOverlay,
} from '@chakra-ui/react'
import { SubmitHandler, useForm } from 'react-hook-form'
import { useMutation, useQueryClient } from 'react-query'
import { Button, Checkbox, Flex, FormControl, FormErrorMessage, FormLabel, Input, Modal, ModalBody, ModalCloseButton, ModalContent, ModalFooter, ModalHeader, ModalOverlay } from '@chakra-ui/react'; import { UserCreate, UsersService } from '../../client'
import { SubmitHandler, useForm } from 'react-hook-form'; import { ApiError } from '../../client/core/ApiError'
import { useMutation, useQueryClient } from 'react-query'; import useCustomToast from '../../hooks/useCustomToast'
import { UserCreate, UsersService } from '../../client';
import { ApiError } from '../../client/core/ApiError';
import useCustomToast from '../../hooks/useCustomToast';
interface AddUserProps { interface AddUserProps {
isOpen: boolean; isOpen: boolean
onClose: () => void; onClose: () => void
} }
interface UserCreateForm extends UserCreate { interface UserCreateForm extends UserCreate {
confirm_password: string; confirm_password: string
} }
const AddUser: React.FC<AddUserProps> = ({ isOpen, onClose }) => { const AddUser: React.FC<AddUserProps> = ({ isOpen, onClose }) => {
const queryClient = useQueryClient(); const queryClient = useQueryClient()
const showToast = useCustomToast(); const showToast = useCustomToast()
const { register, handleSubmit, reset, getValues, formState: { errors, isSubmitting } } = useForm<UserCreateForm>({ const {
register,
handleSubmit,
reset,
getValues,
formState: { errors, isSubmitting },
} = useForm<UserCreateForm>({
mode: 'onBlur', mode: 'onBlur',
criteriaMode: 'all', criteriaMode: 'all',
defaultValues: { defaultValues: {
@ -30,9 +49,9 @@ const AddUser: React.FC<AddUserProps> = ({ isOpen, onClose }) => {
password: '', password: '',
confirm_password: '', confirm_password: '',
is_superuser: false, is_superuser: false,
is_active: false is_active: false,
} },
}); })
const addUser = async (data: UserCreate) => { const addUser = async (data: UserCreate) => {
await UsersService.createUser({ requestBody: data }) await UsersService.createUser({ requestBody: data })
@ -40,21 +59,21 @@ 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')
} },
}); })
const onSubmit: SubmitHandler<UserCreateForm> = (data) => { const onSubmit: SubmitHandler<UserCreateForm> = (data) => {
mutation.mutate(data); mutation.mutate(data)
} }
return ( return (
@ -66,44 +85,102 @@ const AddUser: React.FC<AddUserProps> = ({ isOpen, onClose }) => {
isCentered isCentered
> >
<ModalOverlay /> <ModalOverlay />
<ModalContent as='form' onSubmit={handleSubmit(onSubmit)}> <ModalContent as="form" onSubmit={handleSubmit(onSubmit)}>
<ModalHeader>Add User</ModalHeader> <ModalHeader>Add User</ModalHeader>
<ModalCloseButton /> <ModalCloseButton />
<ModalBody pb={6} > <ModalBody pb={6}>
<FormControl isRequired isInvalid={!!errors.email}> <FormControl isRequired isInvalid={!!errors.email}>
<FormLabel htmlFor='email'>Email</FormLabel> <FormLabel htmlFor="email">Email</FormLabel>
<Input id='email' {...register('email', { required: 'Email is required', pattern: { value: /^[A-Z0-9._%+-]+@[A-Z0-9.-]+\.[A-Z]{2,4}$/i, message: 'Invalid email address' } })} placeholder='Email' type='email' /> <Input
{errors.email && <FormErrorMessage>{errors.email.message}</FormErrorMessage>} id="email"
{...register('email', {
required: 'Email is required',
pattern: {
value: /^[A-Z0-9._%+-]+@[A-Z0-9.-]+\.[A-Z]{2,4}$/i,
message: 'Invalid email address',
},
})}
placeholder="Email"
type="email"
/>
{errors.email && (
<FormErrorMessage>{errors.email.message}</FormErrorMessage>
)}
</FormControl> </FormControl>
<FormControl mt={4} isInvalid={!!errors.full_name}> <FormControl mt={4} isInvalid={!!errors.full_name}>
<FormLabel htmlFor='name'>Full name</FormLabel> <FormLabel htmlFor="name">Full name</FormLabel>
<Input id='name' {...register('full_name')} placeholder='Full name' type='text' /> <Input
{errors.full_name && <FormErrorMessage>{errors.full_name.message}</FormErrorMessage>} id="name"
{...register('full_name')}
placeholder="Full name"
type="text"
/>
{errors.full_name && (
<FormErrorMessage>{errors.full_name.message}</FormErrorMessage>
)}
</FormControl> </FormControl>
<FormControl mt={4} isRequired isInvalid={!!errors.password}> <FormControl mt={4} isRequired isInvalid={!!errors.password}>
<FormLabel htmlFor='password'>Set Password</FormLabel> <FormLabel htmlFor="password">Set Password</FormLabel>
<Input id='password' {...register('password', { required: 'Password is required', minLength: { value: 8, message: 'Password must be at least 8 characters' } })} placeholder='Password' type='password' /> <Input
{errors.password && <FormErrorMessage>{errors.password.message}</FormErrorMessage>} id="password"
{...register('password', {
required: 'Password is required',
minLength: {
value: 8,
message: 'Password must be at least 8 characters',
},
})}
placeholder="Password"
type="password"
/>
{errors.password && (
<FormErrorMessage>{errors.password.message}</FormErrorMessage>
)}
</FormControl> </FormControl>
<FormControl mt={4} isRequired isInvalid={!!errors.confirm_password}> <FormControl
<FormLabel htmlFor='confirm_password'>Confirm Password</FormLabel> mt={4}
<Input id='confirm_password' {...register('confirm_password', { isRequired
isInvalid={!!errors.confirm_password}
>
<FormLabel htmlFor="confirm_password">Confirm Password</FormLabel>
<Input
id="confirm_password"
{...register('confirm_password', {
required: 'Please confirm your password', required: 'Please confirm your password',
validate: value => value === getValues().password || 'The passwords do not match' validate: (value) =>
})} placeholder='Password' type='password' /> value === getValues().password ||
{errors.confirm_password && <FormErrorMessage>{errors.confirm_password.message}</FormErrorMessage>} 'The passwords do not match',
})}
placeholder="Password"
type="password"
/>
{errors.confirm_password && (
<FormErrorMessage>
{errors.confirm_password.message}
</FormErrorMessage>
)}
</FormControl> </FormControl>
<Flex mt={4}> <Flex mt={4}>
<FormControl> <FormControl>
<Checkbox {...register('is_superuser')} colorScheme='teal'>Is superuser?</Checkbox> <Checkbox {...register('is_superuser')} colorScheme="teal">
Is superuser?
</Checkbox>
</FormControl> </FormControl>
<FormControl> <FormControl>
<Checkbox {...register('is_active')} colorScheme='teal'>Is active?</Checkbox> <Checkbox {...register('is_active')} colorScheme="teal">
Is active?
</Checkbox>
</FormControl> </FormControl>
</Flex> </Flex>
</ModalBody> </ModalBody>
<ModalFooter gap={3}> <ModalFooter gap={3}>
<Button bg='ui.main' color='white' _hover={{ opacity: 0.8 }} type='submit' isLoading={isSubmitting}> <Button
bg="ui.main"
color="white"
_hover={{ opacity: 0.8 }}
type="submit"
isLoading={isSubmitting}
>
Save Save
</Button> </Button>
<Button onClick={onClose}>Cancel</Button> <Button onClick={onClose}>Cancel</Button>
@ -114,4 +191,4 @@ const AddUser: React.FC<AddUserProps> = ({ isOpen, onClose }) => {
) )
} }
export default AddUser; export default AddUser

157
new-frontend/src/components/Admin/EditUser.tsx

@ -1,60 +1,80 @@
import React from 'react'; import React from 'react'
import {
Button,
Checkbox,
Flex,
FormControl,
FormErrorMessage,
FormLabel,
Input,
Modal,
ModalBody,
ModalCloseButton,
ModalContent,
ModalFooter,
ModalHeader,
ModalOverlay,
} from '@chakra-ui/react'
import { SubmitHandler, useForm } from 'react-hook-form'
import { useMutation, useQueryClient } from 'react-query'
import { Button, Checkbox, Flex, FormControl, FormErrorMessage, FormLabel, Input, Modal, ModalBody, ModalCloseButton, ModalContent, ModalFooter, ModalHeader, ModalOverlay } from '@chakra-ui/react'; import { ApiError, UserOut, UserUpdate, UsersService } from '../../client'
import { SubmitHandler, useForm } from 'react-hook-form'; import useCustomToast from '../../hooks/useCustomToast'
import { useMutation, useQueryClient } from 'react-query';
import { ApiError, UserOut, UserUpdate, UsersService } from '../../client';
import useCustomToast from '../../hooks/useCustomToast';
interface EditUserProps { interface EditUserProps {
user: UserOut; user: UserOut
isOpen: boolean; isOpen: boolean
onClose: () => void; onClose: () => void
} }
interface UserUpdateForm extends UserUpdate { interface UserUpdateForm extends UserUpdate {
confirm_password: string; confirm_password: string
} }
const EditUser: React.FC<EditUserProps> = ({ user, isOpen, onClose }) => { const EditUser: React.FC<EditUserProps> = ({ user, isOpen, onClose }) => {
const queryClient = useQueryClient(); const queryClient = useQueryClient()
const showToast = useCustomToast(); const showToast = useCustomToast()
const { register, handleSubmit, reset, getValues, formState: { errors, isSubmitting, isDirty } } = useForm<UserUpdateForm>({ const {
register,
handleSubmit,
reset,
getValues,
formState: { errors, isSubmitting, isDirty },
} = useForm<UserUpdateForm>({
mode: 'onBlur', mode: 'onBlur',
criteriaMode: 'all', criteriaMode: 'all',
defaultValues: user defaultValues: user,
}); })
const updateUser = async (data: UserUpdateForm) => { const updateUser = async (data: UserUpdateForm) => {
await UsersService.updateUser({ userId: user.id, requestBody: data }); await UsersService.updateUser({ userId: user.id, requestBody: data })
} }
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 === '') {
delete data.password; delete data.password
} }
mutation.mutate(data) mutation.mutate(data)
} }
const onCancel = () => { const onCancel = () => {
reset(); reset()
onClose(); onClose()
} }
return ( return (
@ -66,43 +86,90 @@ const EditUser: React.FC<EditUserProps> = ({ user, isOpen, onClose }) => {
isCentered isCentered
> >
<ModalOverlay /> <ModalOverlay />
<ModalContent as='form' onSubmit={handleSubmit(onSubmit)}> <ModalContent as="form" onSubmit={handleSubmit(onSubmit)}>
<ModalHeader>Edit User</ModalHeader> <ModalHeader>Edit User</ModalHeader>
<ModalCloseButton /> <ModalCloseButton />
<ModalBody pb={6}> <ModalBody pb={6}>
<FormControl isInvalid={!!errors.email}> <FormControl isInvalid={!!errors.email}>
<FormLabel htmlFor='email'>Email</FormLabel> <FormLabel htmlFor="email">Email</FormLabel>
<Input id='email' {...register('email', { required: 'Email is required', pattern: { value: /^[A-Z0-9._%+-]+@[A-Z0-9.-]+\.[A-Z]{2,4}$/i, message: 'Invalid email address' } })} placeholder='Email' type='email' /> <Input
{errors.email && <FormErrorMessage>{errors.email.message}</FormErrorMessage>} id="email"
{...register('email', {
required: 'Email is required',
pattern: {
value: /^[A-Z0-9._%+-]+@[A-Z0-9.-]+\.[A-Z]{2,4}$/i,
message: 'Invalid email address',
},
})}
placeholder="Email"
type="email"
/>
{errors.email && (
<FormErrorMessage>{errors.email.message}</FormErrorMessage>
)}
</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 id='password' {...register('password', { minLength: { value: 8, message: 'Password must be at least 8 characters' } })} placeholder='••••••••' type='password' /> <Input
{errors.password && <FormErrorMessage>{errors.password.message}</FormErrorMessage>} id="password"
{...register('password', {
minLength: {
value: 8,
message: 'Password must be at least 8 characters',
},
})}
placeholder="Password"
type="password"
/>
{errors.password && (
<FormErrorMessage>{errors.password.message}</FormErrorMessage>
)}
</FormControl> </FormControl>
<FormControl mt={4} isInvalid={!!errors.confirm_password}> <FormControl mt={4} isInvalid={!!errors.confirm_password}>
<FormLabel htmlFor='confirm_password'>Confirm Password</FormLabel> <FormLabel htmlFor="confirm_password">Confirm Password</FormLabel>
<Input id='confirm_password' {...register('confirm_password', { <Input
validate: value => value === getValues().password || 'The passwords do not match' id="confirm_password"
})} placeholder='••••••••' type='password' /> {...register('confirm_password', {
{errors.confirm_password && <FormErrorMessage>{errors.confirm_password.message}</FormErrorMessage>} validate: (value) =>
value === getValues().password ||
'The passwords do not match',
})}
placeholder="Password"
type="password"
/>
{errors.confirm_password && (
<FormErrorMessage>
{errors.confirm_password.message}
</FormErrorMessage>
)}
</FormControl> </FormControl>
<Flex> <Flex>
<FormControl mt={4}> <FormControl mt={4}>
<Checkbox {...register('is_superuser')} colorScheme='teal'>Is superuser?</Checkbox> <Checkbox {...register('is_superuser')} colorScheme="teal">
Is superuser?
</Checkbox>
</FormControl> </FormControl>
<FormControl mt={4}> <FormControl mt={4}>
<Checkbox {...register('is_active')} colorScheme='teal'>Is active?</Checkbox> <Checkbox {...register('is_active')} colorScheme="teal">
Is active?
</Checkbox>
</FormControl> </FormControl>
</Flex> </Flex>
</ModalBody> </ModalBody>
<ModalFooter gap={3}> <ModalFooter gap={3}>
<Button bg='ui.main' color='white' _hover={{ opacity: 0.8 }} type='submit' isLoading={isSubmitting} isDisabled={!isDirty}> <Button
bg="ui.main"
color="white"
_hover={{ opacity: 0.8 }}
type="submit"
isLoading={isSubmitting}
isDisabled={!isDirty}
>
Save Save
</Button> </Button>
<Button onClick={onCancel}>Cancel</Button> <Button onClick={onCancel}>Cancel</Button>
@ -113,4 +180,4 @@ const EditUser: React.FC<EditUserProps> = ({ user, isOpen, onClose }) => {
) )
} }
export default EditUser; export default EditUser

88
new-frontend/src/components/Common/ActionsMenu.tsx

@ -1,42 +1,76 @@
import React from 'react'; import React from 'react'
import {
import { Button, Menu, MenuButton, MenuItem, MenuList, useDisclosure } from '@chakra-ui/react'; Button,
import { BsThreeDotsVertical } from 'react-icons/bs'; Menu,
import { FiEdit, FiTrash } from 'react-icons/fi'; MenuButton,
MenuItem,
import EditUser from '../Admin/EditUser'; MenuList,
import EditItem from '../Items/EditItem'; useDisclosure,
import Delete from './DeleteAlert'; } from '@chakra-ui/react'
import { ItemOut, UserOut } from '../../client'; import { BsThreeDotsVertical } from 'react-icons/bs'
import { FiEdit, FiTrash } from 'react-icons/fi'
import EditUser from '../Admin/EditUser'
import EditItem from '../Items/EditItem'
import Delete from './DeleteAlert'
import { ItemOut, UserOut } from '../../client'
interface ActionsMenuProps { interface ActionsMenuProps {
type: string; type: string
value: ItemOut | UserOut; value: ItemOut | UserOut
disabled?: boolean; disabled?: boolean
} }
const ActionsMenu: React.FC<ActionsMenuProps> = ({ type, value, disabled }) => { const ActionsMenu: React.FC<ActionsMenuProps> = ({ type, value, disabled }) => {
const editUserModal = useDisclosure(); const editUserModal = useDisclosure()
const deleteModal = useDisclosure(); const deleteModal = useDisclosure()
return ( return (
<> <>
<Menu> <Menu>
<MenuButton isDisabled={disabled} as={Button} rightIcon={<BsThreeDotsVertical />} variant='unstyled'> <MenuButton
</MenuButton> isDisabled={disabled}
as={Button}
rightIcon={<BsThreeDotsVertical />}
variant="unstyled"
></MenuButton>
<MenuList> <MenuList>
<MenuItem onClick={editUserModal.onOpen} icon={<FiEdit fontSize='16px' />}>Edit {type}</MenuItem> <MenuItem
<MenuItem onClick={deleteModal.onOpen} icon={<FiTrash fontSize='16px' />} color='ui.danger'>Delete {type}</MenuItem> onClick={editUserModal.onOpen}
icon={<FiEdit fontSize="16px" />}
>
Edit {type}
</MenuItem>
<MenuItem
onClick={deleteModal.onOpen}
icon={<FiTrash fontSize="16px" />}
color="ui.danger"
>
Delete {type}
</MenuItem>
</MenuList> </MenuList>
{ {type === 'User' ? (
type === 'User' ? <EditUser user={value as UserOut} isOpen={editUserModal.isOpen} onClose={editUserModal.onClose} /> <EditUser
: <EditItem item={value as ItemOut} isOpen={editUserModal.isOpen} onClose={editUserModal.onClose} /> user={value as UserOut}
} isOpen={editUserModal.isOpen}
<Delete type={type} id={value.id} isOpen={deleteModal.isOpen} onClose={deleteModal.onClose} /> onClose={editUserModal.onClose}
/>
) : (
<EditItem
item={value as ItemOut}
isOpen={editUserModal.isOpen}
onClose={editUserModal.onClose}
/>
)}
<Delete
type={type}
id={value.id}
isOpen={deleteModal.isOpen}
onClose={deleteModal.onClose}
/>
</Menu> </Menu>
</> </>
); )
}; }
export default ActionsMenu; export default ActionsMenu

93
new-frontend/src/components/Common/DeleteAlert.tsx

@ -1,50 +1,68 @@
import React from 'react'; import React from 'react'
import {
AlertDialog,
AlertDialogBody,
AlertDialogContent,
AlertDialogFooter,
AlertDialogHeader,
AlertDialogOverlay,
Button,
} from '@chakra-ui/react'
import { useForm } from 'react-hook-form'
import { useMutation, useQueryClient } from 'react-query'
import { AlertDialog, AlertDialogBody, AlertDialogContent, AlertDialogFooter, AlertDialogHeader, AlertDialogOverlay, Button } from '@chakra-ui/react'; import { ItemsService, UsersService } from '../../client'
import { useForm } from 'react-hook-form'; import useCustomToast from '../../hooks/useCustomToast'
import { useMutation, useQueryClient } from 'react-query';
import { ItemsService, UsersService } from '../../client';
import useCustomToast from '../../hooks/useCustomToast';
interface DeleteProps { interface DeleteProps {
type: string; type: string
id: number id: number
isOpen: boolean; isOpen: boolean
onClose: () => void; onClose: () => void
} }
const Delete: React.FC<DeleteProps> = ({ type, id, isOpen, onClose }) => { const Delete: React.FC<DeleteProps> = ({ type, id, isOpen, onClose }) => {
const queryClient = useQueryClient(); const queryClient = useQueryClient()
const showToast = useCustomToast(); const showToast = useCustomToast()
const cancelRef = React.useRef<HTMLButtonElement | null>(null); const cancelRef = React.useRef<HTMLButtonElement | null>(null)
const { handleSubmit, formState: { isSubmitting } } = useForm(); const {
handleSubmit,
formState: { isSubmitting },
} = 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}`)
} }
} }
const mutation = useMutation(deleteEntity, { const mutation = useMutation(deleteEntity, {
onSuccess: () => { onSuccess: () => {
showToast('Success', `The ${type.toLowerCase()} was deleted successfully.`, 'success'); showToast(
onClose(); 'Success',
`The ${type.toLowerCase()} was deleted successfully.`,
'success',
)
onClose()
}, },
onError: () => { onError: () => {
showToast('An error occurred.', `An error occurred while deleting the ${type.toLowerCase()}.`, 'error'); showToast(
'An error occurred.',
`An error occurred while deleting the ${type.toLowerCase()}.`,
'error',
)
}, },
onSettled: () => { onSettled: () => {
queryClient.invalidateQueries(type === 'Item' ? 'items' : 'users'); queryClient.invalidateQueries(type === 'Item' ? 'items' : 'users')
} },
}) })
const onSubmit = async () => { const onSubmit = async () => {
mutation.mutate(id); mutation.mutate(id)
} }
return ( return (
@ -57,21 +75,34 @@ const Delete: React.FC<DeleteProps> = ({ type, id, isOpen, onClose }) => {
isCentered isCentered
> >
<AlertDialogOverlay> <AlertDialogOverlay>
<AlertDialogContent as='form' onSubmit={handleSubmit(onSubmit)}> <AlertDialogContent as="form" onSubmit={handleSubmit(onSubmit)}>
<AlertDialogHeader> <AlertDialogHeader>Delete {type}</AlertDialogHeader>
Delete {type}
</AlertDialogHeader>
<AlertDialogBody> <AlertDialogBody>
{type === 'User' && <span>All items associated with this user will also be <strong>permantly deleted. </strong></span>} {type === 'User' && (
<span>
All items associated with this user will also be{' '}
<strong>permantly deleted. </strong>
</span>
)}
Are you sure? You will not be able to undo this action. Are you sure? You will not be able to undo this action.
</AlertDialogBody> </AlertDialogBody>
<AlertDialogFooter gap={3}> <AlertDialogFooter gap={3}>
<Button bg='ui.danger' color='white' _hover={{ opacity: 0.8 }} type='submit' isLoading={isSubmitting}> <Button
bg="ui.danger"
color="white"
_hover={{ opacity: 0.8 }}
type="submit"
isLoading={isSubmitting}
>
Delete Delete
</Button> </Button>
<Button ref={cancelRef} onClick={onClose} isDisabled={isSubmitting}> <Button
ref={cancelRef}
onClick={onClose}
isDisabled={isSubmitting}
>
Cancel Cancel
</Button> </Button>
</AlertDialogFooter> </AlertDialogFooter>
@ -82,4 +113,4 @@ const Delete: React.FC<DeleteProps> = ({ type, id, isOpen, onClose }) => {
) )
} }
export default Delete; export default Delete

34
new-frontend/src/components/Common/Navbar.tsx

@ -1,18 +1,17 @@
import React from 'react'; import React from 'react'
import { Button, Flex, Icon, useDisclosure } from '@chakra-ui/react'
import { FaPlus } from 'react-icons/fa'
import { Button, Flex, Icon, useDisclosure } from '@chakra-ui/react'; import AddUser from '../Admin/AddUser'
import { FaPlus } from 'react-icons/fa'; import AddItem from '../Items/AddItem'
import AddUser from '../Admin/AddUser';
import AddItem from '../Items/AddItem';
interface NavbarProps { interface NavbarProps {
type: string; type: string
} }
const Navbar: React.FC<NavbarProps> = ({ type }) => { const Navbar: React.FC<NavbarProps> = ({ type }) => {
const addUserModal = useDisclosure(); const addUserModal = useDisclosure()
const addItemModal = useDisclosure(); const addItemModal = useDisclosure()
return ( return (
<> <>
@ -24,14 +23,21 @@ const Navbar: React.FC<NavbarProps> = ({ type }) => {
</InputLeftElement> </InputLeftElement>
<Input type='text' placeholder='Search' fontSize={{ base: 'sm', md: 'inherit' }} borderRadius='8px' /> <Input type='text' placeholder='Search' fontSize={{ base: 'sm', md: 'inherit' }} borderRadius='8px' />
</InputGroup> */} </InputGroup> */}
<Button bg='ui.main' color='white' _hover={{ opacity: 0.8 }} gap={1} fontSize={{ base: 'sm', md: 'inherit' }} onClick={type === 'User' ? addUserModal.onOpen : addItemModal.onOpen}> <Button
bg="ui.main"
color="white"
_hover={{ opacity: 0.8 }}
gap={1}
fontSize={{ base: 'sm', md: 'inherit' }}
onClick={type === 'User' ? addUserModal.onOpen : addItemModal.onOpen}
>
<Icon as={FaPlus} /> Add {type} <Icon as={FaPlus} /> Add {type}
</Button> </Button>
<AddUser isOpen={addUserModal.isOpen} onClose={addUserModal.onClose} /> <AddUser isOpen={addUserModal.isOpen} onClose={addUserModal.onClose} />
<AddItem isOpen={addItemModal.isOpen} onClose={addItemModal.onClose} /> <AddItem isOpen={addItemModal.isOpen} onClose={addItemModal.onClose} />
</Flex > </Flex>
</> </>
); )
}; }
export default Navbar; export default Navbar

48
new-frontend/src/components/Common/NotFound.tsx

@ -1,22 +1,42 @@
import { Button, Container, Text } from '@chakra-ui/react'; import React from 'react'
import { Link } from '@tanstack/react-router'; import { Button, Container, Text } from '@chakra-ui/react'
import { Link } from '@tanstack/react-router'
const NotFound: React.FC = () => { const NotFound: React.FC = () => {
return ( return (
<> <>
<Container h='100vh' <Container
alignItems='stretch' h="100vh"
justifyContent='center' textAlign='center' maxW='sm' centerContent> alignItems="stretch"
<Text fontSize='8xl' color='ui.main' fontWeight='bold' lineHeight='1' mb={4}>404</Text> justifyContent="center"
<Text fontSize='md'>Oops!</Text> textAlign="center"
<Text fontSize='md'>Page not found.</Text> maxW="sm"
<Button as={Link} to='/' color='ui.main' borderColor='ui.main' variant='outline' mt={4}>Go back</Button> centerContent
>
<Text
fontSize="8xl"
color="ui.main"
fontWeight="bold"
lineHeight="1"
mb={4}
>
404
</Text>
<Text fontSize="md">Oops!</Text>
<Text fontSize="md">Page not found.</Text>
<Button
as={Link}
to="/"
color="ui.main"
borderColor="ui.main"
variant="outline"
mt={4}
>
Go back
</Button>
</Container> </Container>
</> </>
); )
} }
export default NotFound; export default NotFound

121
new-frontend/src/components/Common/Sidebar.tsx

@ -1,70 +1,117 @@
import React from 'react'; import React from 'react'
import {
Box,
Drawer,
DrawerBody,
DrawerCloseButton,
DrawerContent,
DrawerOverlay,
Flex,
IconButton,
Image,
Text,
useColorModeValue,
useDisclosure,
} from '@chakra-ui/react'
import { FiLogOut, FiMenu } from 'react-icons/fi'
import { useQueryClient } from 'react-query'
import { Box, Drawer, DrawerBody, DrawerCloseButton, DrawerContent, DrawerOverlay, Flex, IconButton, Image, Text, useColorModeValue, useDisclosure } from '@chakra-ui/react'; import Logo from '../../assets/images/fastapi-logo.svg'
import { FiLogOut, FiMenu } from 'react-icons/fi'; import { UserOut } from '../../client'
import { useQueryClient } from 'react-query'; import useAuth from '../../hooks/useAuth'
import SidebarItems from './SidebarItems'
import Logo from '../../assets/images/fastapi-logo.svg';
import { UserOut } from '../../client';
import useAuth from '../../hooks/useAuth';
import SidebarItems from './SidebarItems';
const Sidebar: React.FC = () => { const Sidebar: React.FC = () => {
const queryClient = useQueryClient(); const queryClient = useQueryClient()
const bgColor = useColorModeValue('white', '#1a202c'); const bgColor = useColorModeValue('white', '#1a202c')
const textColor = useColorModeValue('gray', 'white'); const textColor = useColorModeValue('gray', 'white')
const secBgColor = useColorModeValue('ui.secondary', '#252d3d'); const secBgColor = useColorModeValue('ui.secondary', '#252d3d')
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()
const handleLogout = async () => { const handleLogout = async () => {
logout() logout()
}; }
return ( return (
<> <>
{/* Mobile */} {/* Mobile */}
<IconButton onClick={onOpen} display={{ base: 'flex', md: 'none' }} aria-label='Open Menu' position='absolute' fontSize='20px' m={4} icon={<FiMenu />} /> <IconButton
<Drawer isOpen={isOpen} placement='left' onClose={onClose}> onClick={onOpen}
display={{ base: 'flex', md: 'none' }}
aria-label="Open Menu"
position="absolute"
fontSize="20px"
m={4}
icon={<FiMenu />}
/>
<Drawer isOpen={isOpen} placement="left" onClose={onClose}>
<DrawerOverlay /> <DrawerOverlay />
<DrawerContent maxW='250px'> <DrawerContent maxW="250px">
<DrawerCloseButton /> <DrawerCloseButton />
<DrawerBody py={8}> <DrawerBody py={8}>
<Flex flexDir='column' justify='space-between'> <Flex flexDir="column" justify="space-between">
<Box> <Box>
<Image src={Logo} alt='logo' p={6} /> <Image src={Logo} alt="logo" p={6} />
<SidebarItems onClose={onClose} /> <SidebarItems onClose={onClose} />
<Flex as='button' onClick={handleLogout} p={2} color='ui.danger' fontWeight='bold' alignItems='center'> <Flex
as="button"
onClick={handleLogout}
p={2}
color="ui.danger"
fontWeight="bold"
alignItems="center"
>
<FiLogOut /> <FiLogOut />
<Text ml={2}>Log out</Text> <Text ml={2}>Log out</Text>
</Flex> </Flex>
</Box> </Box>
{ {currentUser?.email && (
currentUser?.email && <Text color={textColor} noOfLines={2} fontSize="sm" p={2}>
<Text color={textColor} noOfLines={2} fontSize='sm' p={2}>Logged in as: {currentUser.email}</Text> Logged in as: {currentUser.email}
} </Text>
)}
</Flex> </Flex>
</DrawerBody> </DrawerBody>
</DrawerContent> </DrawerContent>
</Drawer> </Drawer>
{/* Desktop */} {/* Desktop */}
<Box bg={bgColor} p={3} h='100vh' position='sticky' top='0' display={{ base: 'none', md: 'flex' }}> <Box
<Flex flexDir='column' justify='space-between' bg={secBgColor} p={4} borderRadius={12}> bg={bgColor}
p={3}
h="100vh"
position="sticky"
top="0"
display={{ base: 'none', md: 'flex' }}
>
<Flex
flexDir="column"
justify="space-between"
bg={secBgColor}
p={4}
borderRadius={12}
>
<Box> <Box>
<Image src={Logo} alt='Logo' w='180px' maxW='2xs' p={6} /> <Image src={Logo} alt="Logo" w="180px" maxW="2xs" p={6} />
<SidebarItems /> <SidebarItems />
</Box> </Box>
{ {currentUser?.email && (
currentUser?.email && <Text
<Text color={textColor} noOfLines={2} fontSize='sm' p={2} maxW='180px'>Logged in as: {currentUser.email}</Text> color={textColor}
} noOfLines={2}
fontSize="sm"
p={2}
maxW="180px"
>
Logged in as: {currentUser.email}
</Text>
)}
</Flex> </Flex>
</Box> </Box>
</> </>
); )
} }
export default Sidebar; export default Sidebar

47
new-frontend/src/components/Common/SidebarItems.tsx

@ -1,36 +1,36 @@
import React from 'react'; import React from 'react'
import { Box, Flex, Icon, Text, useColorModeValue } from '@chakra-ui/react'
import { FiBriefcase, FiHome, FiSettings, FiUsers } from 'react-icons/fi'
import { Link } from '@tanstack/react-router'
import { useQueryClient } from 'react-query'
import { Box, Flex, Icon, Text, useColorModeValue } from '@chakra-ui/react'; import { UserOut } from '../../client'
import { FiBriefcase, FiHome, FiSettings, FiUsers } from 'react-icons/fi';
import { Link } from '@tanstack/react-router';
import { useQueryClient } from 'react-query';
import { 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 {
onClose?: () => void; onClose?: () => void
} }
const SidebarItems: React.FC<SidebarItemsProps> = ({ onClose }) => { const SidebarItems: React.FC<SidebarItemsProps> = ({ onClose }) => {
const queryClient = useQueryClient(); const queryClient = useQueryClient()
const textColor = useColorModeValue('ui.main', '#E2E8F0'); const textColor = useColorModeValue('ui.main', '#E2E8F0')
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 ? [...items, { icon: FiUsers, title: 'Admin', path: '/admin' }] : items; const finalItems = currentUser?.is_superuser
? [...items, { icon: FiUsers, title: 'Admin', path: '/admin' }]
: items
const listItems = finalItems.map((item) => ( const listItems = finalItems.map((item) => (
<Flex <Flex
as={Link} as={Link}
to={item.path} to={item.path}
w='100%' w="100%"
p={2} p={2}
key={item.title} key={item.title}
activeProps={{ activeProps={{
@ -42,19 +42,16 @@ const SidebarItems: React.FC<SidebarItemsProps> = ({ onClose }) => {
color={textColor} color={textColor}
onClick={onClose} onClick={onClose}
> >
<Icon as={item.icon} alignSelf='center' /> <Icon as={item.icon} alignSelf="center" />
<Text ml={2}>{item.title}</Text> <Text ml={2}>{item.title}</Text>
</Flex> </Flex>
)); ))
return ( return (
<> <>
<Box> <Box>{listItems}</Box>
{listItems}
</Box>
</> </>
); )
}; }
export default SidebarItems; export default SidebarItems

52
new-frontend/src/components/Common/UserMenu.tsx

@ -1,43 +1,59 @@
import React from 'react'; import React from 'react'
import {
Box,
IconButton,
Menu,
MenuButton,
MenuItem,
MenuList,
} from '@chakra-ui/react'
import { FaUserAstronaut } from 'react-icons/fa'
import { FiLogOut, FiUser } from 'react-icons/fi'
import { Box, IconButton, Menu, MenuButton, MenuItem, MenuList } from '@chakra-ui/react'; import useAuth from '../../hooks/useAuth'
import { FaUserAstronaut } from 'react-icons/fa'; import { Link } from '@tanstack/react-router'
import { FiLogOut, FiUser } from 'react-icons/fi';
import useAuth from '../../hooks/useAuth';
import { Link } from '@tanstack/react-router';
const UserMenu: React.FC = () => { const UserMenu: React.FC = () => {
const { logout } = useAuth(); const { logout } = useAuth()
const handleLogout = async () => { const handleLogout = async () => {
logout() logout()
}; }
return ( return (
<> <>
{/* Desktop */} {/* Desktop */}
<Box display={{ base: 'none', md: 'block' }} position='fixed' top={4} right={4}> <Box
display={{ base: 'none', md: 'block' }}
position="fixed"
top={4}
right={4}
>
<Menu> <Menu>
<MenuButton <MenuButton
as={IconButton} as={IconButton}
aria-label='Options' aria-label="Options"
icon={<FaUserAstronaut color='white' fontSize='18px' />} icon={<FaUserAstronaut color="white" fontSize="18px" />}
bg='ui.main' bg="ui.main"
isRound isRound
/> />
<MenuList> <MenuList>
<MenuItem icon={<FiUser fontSize='18px' />} as={Link} to='settings'> <MenuItem icon={<FiUser fontSize="18px" />} as={Link} to="settings">
My profile My profile
</MenuItem> </MenuItem>
<MenuItem icon={<FiLogOut fontSize='18px' />} onClick={handleLogout} color='ui.danger' fontWeight='bold'> <MenuItem
icon={<FiLogOut fontSize="18px" />}
onClick={handleLogout}
color="ui.danger"
fontWeight="bold"
>
Log out Log out
</MenuItem> </MenuItem>
</MenuList> </MenuList>
</Menu> </Menu>
</Box> </Box>
</> </>
); )
}; }
export default UserMenu; export default UserMenu

105
new-frontend/src/components/Items/AddItem.tsx

@ -1,28 +1,45 @@
import React from 'react'; import React from 'react'
import {
Button,
FormControl,
FormErrorMessage,
FormLabel,
Input,
Modal,
ModalBody,
ModalCloseButton,
ModalContent,
ModalFooter,
ModalHeader,
ModalOverlay,
} from '@chakra-ui/react'
import { SubmitHandler, useForm } from 'react-hook-form'
import { useMutation, useQueryClient } from 'react-query'
import { Button, FormControl, FormErrorMessage, FormLabel, Input, Modal, ModalBody, ModalCloseButton, ModalContent, ModalFooter, ModalHeader, ModalOverlay } from '@chakra-ui/react'; import { ApiError, ItemCreate, ItemsService } from '../../client'
import { SubmitHandler, useForm } from 'react-hook-form'; import useCustomToast from '../../hooks/useCustomToast'
import { useMutation, useQueryClient } from 'react-query';
import { ApiError, ItemCreate, ItemsService } from '../../client';
import useCustomToast from '../../hooks/useCustomToast';
interface AddItemProps { interface AddItemProps {
isOpen: boolean; isOpen: boolean
onClose: () => void; onClose: () => void
} }
const AddItem: React.FC<AddItemProps> = ({ isOpen, onClose }) => { const AddItem: React.FC<AddItemProps> = ({ isOpen, onClose }) => {
const queryClient = useQueryClient(); const queryClient = useQueryClient()
const showToast = useCustomToast(); const showToast = useCustomToast()
const { register, handleSubmit, reset, formState: { errors, isSubmitting } } = useForm<ItemCreate>({ const {
register,
handleSubmit,
reset,
formState: { errors, isSubmitting },
} = useForm<ItemCreate>({
mode: 'onBlur', mode: 'onBlur',
criteriaMode: 'all', criteriaMode: 'all',
defaultValues: { defaultValues: {
title: '', title: '',
description: '', description: '',
}, },
}); })
const addItem = async (data: ItemCreate) => { const addItem = async (data: ItemCreate) => {
await ItemsService.createItem({ requestBody: data }) await ItemsService.createItem({ requestBody: data })
@ -30,21 +47,21 @@ 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')
} },
}); })
const onSubmit: SubmitHandler<ItemCreate> = (data) => { const onSubmit: SubmitHandler<ItemCreate> = (data) => {
mutation.mutate(data); mutation.mutate(data)
} }
return ( return (
@ -56,43 +73,51 @@ const AddItem: React.FC<AddItemProps> = ({ isOpen, onClose }) => {
isCentered isCentered
> >
<ModalOverlay /> <ModalOverlay />
<ModalContent as='form' onSubmit={handleSubmit(onSubmit)}> <ModalContent as="form" onSubmit={handleSubmit(onSubmit)}>
<ModalHeader>Add Item</ModalHeader> <ModalHeader>Add Item</ModalHeader>
<ModalCloseButton /> <ModalCloseButton />
<ModalBody pb={6}> <ModalBody pb={6}>
<FormControl isRequired isInvalid={!!errors.title}> <FormControl isRequired isInvalid={!!errors.title}>
<FormLabel htmlFor='title'>Title</FormLabel> <FormLabel htmlFor="title">Title</FormLabel>
<Input <Input
id='title' id="title"
{...register('title', { required: 'Title is required.' })} {...register('title', {
placeholder='Title' required: 'Title is required.',
type='text' })}
placeholder="Title"
type="text"
/> />
{errors.title && <FormErrorMessage>{errors.title.message}</FormErrorMessage>} {errors.title && (
<FormErrorMessage>{errors.title.message}</FormErrorMessage>
)}
</FormControl> </FormControl>
<FormControl mt={4}> <FormControl mt={4}>
<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"
/> />
</FormControl> </FormControl>
</ModalBody> </ModalBody>
<ModalFooter gap={3}> <ModalFooter gap={3}>
<Button bg='ui.main' color='white' _hover={{ opacity: 0.8 }} type='submit' isLoading={isSubmitting}> <Button
bg="ui.main"
color="white"
_hover={{ opacity: 0.8 }}
type="submit"
isLoading={isSubmitting}
>
Save Save
</Button> </Button>
<Button onClick={onClose}> <Button onClick={onClose}>Cancel</Button>
Cancel
</Button>
</ModalFooter> </ModalFooter>
</ModalContent> </ModalContent>
</Modal> </Modal>
</> </>
); )
}; }
export default AddItem; export default AddItem

103
new-frontend/src/components/Items/EditItem.tsx

@ -1,52 +1,69 @@
import React from 'react'; import React from 'react'
import {
Button,
FormControl,
FormErrorMessage,
FormLabel,
Input,
Modal,
ModalBody,
ModalCloseButton,
ModalContent,
ModalFooter,
ModalHeader,
ModalOverlay,
} from '@chakra-ui/react'
import { SubmitHandler, useForm } from 'react-hook-form'
import { Button, FormControl, FormErrorMessage, FormLabel, Input, Modal, ModalBody, ModalCloseButton, ModalContent, ModalFooter, ModalHeader, ModalOverlay } from '@chakra-ui/react'; import { useMutation, useQueryClient } from 'react-query'
import { SubmitHandler, useForm } from 'react-hook-form'; import { ApiError, ItemOut, ItemUpdate, ItemsService } from '../../client'
import useCustomToast from '../../hooks/useCustomToast'
import { useMutation, useQueryClient } from 'react-query';
import { ApiError, ItemOut, ItemUpdate, ItemsService } from '../../client';
import useCustomToast from '../../hooks/useCustomToast';
interface EditItemProps { interface EditItemProps {
item: ItemOut; item: ItemOut
isOpen: boolean; isOpen: boolean
onClose: () => void; onClose: () => void
} }
const EditItem: React.FC<EditItemProps> = ({ item, isOpen, onClose }) => { const EditItem: React.FC<EditItemProps> = ({ item, isOpen, onClose }) => {
const queryClient = useQueryClient(); const queryClient = useQueryClient()
const showToast = useCustomToast(); const showToast = useCustomToast()
const { register, handleSubmit, reset, formState: { isSubmitting, errors, isDirty } } = useForm<ItemUpdate>({ const {
register,
handleSubmit,
reset,
formState: { isSubmitting, errors, isDirty },
} = useForm<ItemUpdate>({
mode: 'onBlur', mode: 'onBlur',
criteriaMode: 'all', criteriaMode: 'all',
defaultValues: item defaultValues: item,
}); })
const updateItem = async (data: ItemUpdate) => { const updateItem = async (data: ItemUpdate) => {
await ItemsService.updateItem({ id: item.id, requestBody: data }); await ItemsService.updateItem({ id: item.id, requestBody: data })
} }
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')
} },
}); })
const onSubmit: SubmitHandler<ItemUpdate> = async (data) => { const onSubmit: SubmitHandler<ItemUpdate> = async (data) => {
mutation.mutate(data) mutation.mutate(data)
} }
const onCancel = () => { const onCancel = () => {
reset(); reset()
onClose(); onClose()
} }
return ( return (
@ -58,22 +75,42 @@ const EditItem: React.FC<EditItemProps> = ({ item, isOpen, onClose }) => {
isCentered isCentered
> >
<ModalOverlay /> <ModalOverlay />
<ModalContent as='form' onSubmit={handleSubmit(onSubmit)}> <ModalContent as="form" onSubmit={handleSubmit(onSubmit)}>
<ModalHeader>Edit Item</ModalHeader> <ModalHeader>Edit Item</ModalHeader>
<ModalCloseButton /> <ModalCloseButton />
<ModalBody pb={6}> <ModalBody pb={6}>
<FormControl isInvalid={!!errors.title}> <FormControl isInvalid={!!errors.title}>
<FormLabel htmlFor='title'>Title</FormLabel> <FormLabel htmlFor="title">Title</FormLabel>
<Input id='title' {...register('title', { required: 'Title is required' })} type='text' /> <Input
{errors.title && <FormErrorMessage>{errors.title.message}</FormErrorMessage>} id="title"
{...register('title', {
required: 'Title is required',
})}
type="text"
/>
{errors.title && (
<FormErrorMessage>{errors.title.message}</FormErrorMessage>
)}
</FormControl> </FormControl>
<FormControl mt={4}> <FormControl mt={4}>
<FormLabel htmlFor='description'>Description</FormLabel> <FormLabel htmlFor="description">Description</FormLabel>
<Input id='description' {...register('description')} placeholder='Description' type='text' /> <Input
id="description"
{...register('description')}
placeholder="Description"
type="text"
/>
</FormControl> </FormControl>
</ModalBody> </ModalBody>
<ModalFooter gap={3}> <ModalFooter gap={3}>
<Button bg='ui.main' color='white' _hover={{ opacity: 0.8 }} type='submit' isLoading={isSubmitting} isDisabled={!isDirty}> <Button
bg="ui.main"
color="white"
_hover={{ opacity: 0.8 }}
type="submit"
isLoading={isSubmitting}
isDisabled={!isDirty}
>
Save Save
</Button> </Button>
<Button onClick={onCancel}>Cancel</Button> <Button onClick={onCancel}>Cancel</Button>
@ -84,4 +121,4 @@ const EditItem: React.FC<EditItemProps> = ({ item, isOpen, onClose }) => {
) )
} }
export default EditItem; export default EditItem

32
new-frontend/src/components/UserSettings/Appearance.tsx

@ -1,29 +1,39 @@
import React from 'react'; import React from 'react'
import {
import { Badge, Container, Heading, Radio, RadioGroup, Stack, useColorMode } from '@chakra-ui/react'; Badge,
Container,
Heading,
Radio,
RadioGroup,
Stack,
useColorMode,
} from '@chakra-ui/react'
const Appearance: React.FC = () => { const Appearance: React.FC = () => {
const { colorMode, toggleColorMode } = useColorMode(); const { colorMode, toggleColorMode } = useColorMode()
return ( return (
<> <>
<Container maxW='full'> <Container maxW="full">
<Heading size='sm' py={4}> <Heading size="sm" py={4}>
Appearance Appearance
</Heading> </Heading>
<RadioGroup onChange={toggleColorMode} value={colorMode}> <RadioGroup onChange={toggleColorMode} value={colorMode}>
<Stack> <Stack>
{/* TODO: Add system default option */} {/* TODO: Add system default option */}
<Radio value='light' colorScheme='teal'> <Radio value="light" colorScheme="teal">
Light mode<Badge ml='1' colorScheme='teal'>Default</Badge> Light mode
<Badge ml="1" colorScheme="teal">
Default
</Badge>
</Radio> </Radio>
<Radio value='dark' colorScheme='teal'> <Radio value="dark" colorScheme="teal">
Dark mode Dark mode
</Radio> </Radio>
</Stack> </Stack>
</RadioGroup> </RadioGroup>
</Container> </Container>
</> </>
); )
} }
export default Appearance; export default Appearance

137
new-frontend/src/components/UserSettings/ChangePassword.tsx

@ -1,23 +1,38 @@
import React from 'react'; import React from 'react'
import {
Box,
Button,
Container,
FormControl,
FormErrorMessage,
FormLabel,
Heading,
Input,
useColorModeValue,
} from '@chakra-ui/react'
import { SubmitHandler, useForm } from 'react-hook-form'
import { useMutation } from 'react-query'
import { Box, Button, Container, FormControl, FormErrorMessage, FormLabel, Heading, Input, useColorModeValue } from '@chakra-ui/react'; import { ApiError, UpdatePassword, UsersService } from '../../client'
import { SubmitHandler, useForm } from 'react-hook-form'; import useCustomToast from '../../hooks/useCustomToast'
import { useMutation } from 'react-query';
import { ApiError, UpdatePassword, UsersService } from '../../client';
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('gray.700', 'white'); const color = useColorModeValue('gray.700', 'white')
const showToast = useCustomToast(); const showToast = useCustomToast()
const { register, handleSubmit, reset, getValues, formState: { errors, isSubmitting } } = useForm<UpdatePasswordForm>({ const {
register,
handleSubmit,
reset,
getValues,
formState: { errors, isSubmitting },
} = useForm<UpdatePasswordForm>({
mode: 'onBlur', mode: 'onBlur',
criteriaMode: 'all' criteriaMode: 'all',
}); })
const UpdatePassword = async (data: UpdatePassword) => { const UpdatePassword = async (data: UpdatePassword) => {
await UsersService.updatePasswordMe({ requestBody: data }) await UsersService.updatePasswordMe({ requestBody: data })
@ -25,50 +40,98 @@ 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')
} },
}) })
const onSubmit: SubmitHandler<UpdatePasswordForm> = async (data) => { const onSubmit: SubmitHandler<UpdatePasswordForm> = async (data) => {
mutation.mutate(data); mutation.mutate(data)
} }
return ( return (
<> <>
<Container maxW='full' as='form' onSubmit={handleSubmit(onSubmit)}> <Container maxW="full" as="form" onSubmit={handleSubmit(onSubmit)}>
<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'>Current password</FormLabel> <FormLabel color={color} htmlFor="current_password">
<Input id='current_password' {...register('current_password', { required: 'Password is required', minLength: { value: 8, message: 'Password must be at least 8 characters' } })} placeholder='Password' type='password' /> Current password
{errors.current_password && <FormErrorMessage>{errors.current_password.message}</FormErrorMessage>} </FormLabel>
<Input
id="current_password"
{...register('current_password', {
required: 'Password is required',
minLength: {
value: 8,
message: 'Password must be at least 8 characters',
},
})}
placeholder="Password"
type="password"
/>
{errors.current_password && (
<FormErrorMessage>
{errors.current_password.message}
</FormErrorMessage>
)}
</FormControl> </FormControl>
<FormControl mt={4} isRequired isInvalid={!!errors.new_password}> <FormControl mt={4} isRequired isInvalid={!!errors.new_password}>
<FormLabel htmlFor='password'>Set Password</FormLabel> <FormLabel htmlFor="password">Set Password</FormLabel>
<Input id='password' {...register('new_password', { required: 'Password is required', minLength: { value: 8, message: 'Password must be at least 8 characters' } })} placeholder='Password' type='password' /> <Input
{errors.new_password && <FormErrorMessage>{errors.new_password.message}</FormErrorMessage>} id="password"
{...register('new_password', {
required: 'Password is required',
minLength: {
value: 8,
message: 'Password must be at least 8 characters',
},
})}
placeholder="Password"
type="password"
/>
{errors.new_password && (
<FormErrorMessage>{errors.new_password.message}</FormErrorMessage>
)}
</FormControl> </FormControl>
<FormControl mt={4} isRequired isInvalid={!!errors.confirm_password}> <FormControl mt={4} isRequired isInvalid={!!errors.confirm_password}>
<FormLabel htmlFor='confirm_password'>Confirm Password</FormLabel> <FormLabel htmlFor="confirm_password">Confirm Password</FormLabel>
<Input id='confirm_password' {...register('confirm_password', { <Input
id="confirm_password"
{...register('confirm_password', {
required: 'Please confirm your password', required: 'Please confirm your password',
validate: value => value === getValues().new_password || 'The passwords do not match' validate: (value) =>
})} placeholder='Password' type='password' /> value === getValues().new_password ||
{errors.confirm_password && <FormErrorMessage>{errors.confirm_password.message}</FormErrorMessage>} 'The passwords do not match',
})}
placeholder="Password"
type="password"
/>
{errors.confirm_password && (
<FormErrorMessage>
{errors.confirm_password.message}
</FormErrorMessage>
)}
</FormControl> </FormControl>
<Button bg='ui.main' color='white' _hover={{ opacity: 0.8 }} mt={4} type='submit' isLoading={isSubmitting}> <Button
bg="ui.main"
color="white"
_hover={{ opacity: 0.8 }}
mt={4}
type="submit"
isLoading={isSubmitting}
>
Save Save
</Button> </Button>
</Box> </Box>
</ Container> </Container>
</> </>
); )
} }
export default ChangePassword; export default ChangePassword

41
new-frontend/src/components/UserSettings/DeleteAccount.tsx

@ -1,27 +1,42 @@
import React from 'react'; import React from 'react'
import {
Button,
Container,
Heading,
Text,
useDisclosure,
} from '@chakra-ui/react'
import { Button, Container, Heading, Text, useDisclosure } from '@chakra-ui/react'; import DeleteConfirmation from './DeleteConfirmation'
import DeleteConfirmation from './DeleteConfirmation';
const DeleteAccount: React.FC = () => { const DeleteAccount: React.FC = () => {
const confirmationModal = useDisclosure(); const confirmationModal = useDisclosure()
return ( return (
<> <>
<Container maxW='full'> <Container maxW="full">
<Heading size='sm' py={4}> <Heading size="sm" py={4}>
Delete Account Delete Account
</Heading> </Heading>
<Text> <Text>
Are you sure you want to delete your account? This action cannot be undone. Are you sure you want to delete your account? This action cannot be
undone.
</Text> </Text>
<Button bg='ui.danger' color='white' _hover={{ opacity: 0.8 }} mt={4} onClick={confirmationModal.onOpen}> <Button
bg="ui.danger"
color="white"
_hover={{ opacity: 0.8 }}
mt={4}
onClick={confirmationModal.onOpen}
>
Delete Delete
</Button> </Button>
<DeleteConfirmation isOpen={confirmationModal.isOpen} onClose={confirmationModal.onClose} /> <DeleteConfirmation
</ Container> isOpen={confirmationModal.isOpen}
onClose={confirmationModal.onClose}
/>
</Container>
</> </>
); )
} }
export default DeleteAccount; export default DeleteAccount

99
new-frontend/src/components/UserSettings/DeleteConfirmation.tsx

@ -1,48 +1,61 @@
import React from 'react'; import React from 'react'
import {
import { AlertDialog, AlertDialogBody, AlertDialogContent, AlertDialogFooter, AlertDialogHeader, AlertDialogOverlay, Button } from '@chakra-ui/react'; AlertDialog,
import { useForm } from 'react-hook-form'; AlertDialogBody,
import { useMutation, useQueryClient } from 'react-query'; AlertDialogContent,
AlertDialogFooter,
import { ApiError, UserOut, UsersService } from '../../client'; AlertDialogHeader,
import useAuth from '../../hooks/useAuth'; AlertDialogOverlay,
import useCustomToast from '../../hooks/useCustomToast'; Button,
} from '@chakra-ui/react'
import { useForm } from 'react-hook-form'
import { useMutation, useQueryClient } from 'react-query'
import { ApiError, UserOut, UsersService } from '../../client'
import useAuth from '../../hooks/useAuth'
import useCustomToast from '../../hooks/useCustomToast'
interface DeleteProps { interface DeleteProps {
isOpen: boolean; isOpen: boolean
onClose: () => void; onClose: () => void
} }
const DeleteConfirmation: React.FC<DeleteProps> = ({ isOpen, onClose }) => { const DeleteConfirmation: React.FC<DeleteProps> = ({ isOpen, onClose }) => {
const queryClient = useQueryClient(); const queryClient = useQueryClient()
const showToast = useCustomToast(); const showToast = useCustomToast()
const cancelRef = React.useRef<HTMLButtonElement | null>(null); const cancelRef = React.useRef<HTMLButtonElement | null>(null)
const { handleSubmit, formState: { isSubmitting } } = useForm(); const {
const currentUser = queryClient.getQueryData<UserOut>('currentUser'); handleSubmit,
const { logout } = useAuth(); formState: { isSubmitting },
} = useForm()
const currentUser = queryClient.getQueryData<UserOut>('currentUser')
const { logout } = useAuth()
const deleteCurrentUser = async (id: number) => { const deleteCurrentUser = async (id: number) => {
await UsersService.deleteUser({ userId: id }); await UsersService.deleteUser({ userId: id })
} }
const mutation = useMutation(deleteCurrentUser, { const mutation = useMutation(deleteCurrentUser, {
onSuccess: () => { onSuccess: () => {
showToast('Success', 'Your account has been successfully deleted.', 'success'); showToast(
logout(); 'Success',
onClose(); 'Your account has been successfully deleted.',
'success',
)
logout()
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')
} },
}) })
const onSubmit = async () => { const onSubmit = async () => {
mutation.mutate(currentUser!.id); mutation.mutate(currentUser!.id)
} }
return ( return (
@ -55,32 +68,38 @@ const DeleteConfirmation: React.FC<DeleteProps> = ({ isOpen, onClose }) => {
isCentered isCentered
> >
<AlertDialogOverlay> <AlertDialogOverlay>
<AlertDialogContent as='form' onSubmit={handleSubmit(onSubmit)}> <AlertDialogContent as="form" onSubmit={handleSubmit(onSubmit)}>
<AlertDialogHeader> <AlertDialogHeader>Confirmation Required</AlertDialogHeader>
Confirmation Required
</AlertDialogHeader>
<AlertDialogBody> <AlertDialogBody>
All your account data will be <strong>permanently deleted.</strong> If you are sure, please click <strong>'Confirm'</strong> to proceed. All your account data will be{' '}
<strong>permanently deleted.</strong> If you are sure, please
click <strong>'Confirm'</strong> to proceed.
</AlertDialogBody> </AlertDialogBody>
<AlertDialogFooter gap={3}> <AlertDialogFooter gap={3}>
<Button bg='ui.danger' color='white' _hover={{ opacity: 0.8 }} type='submit' isLoading={isSubmitting}> <Button
bg="ui.danger"
color="white"
_hover={{ opacity: 0.8 }}
type="submit"
isLoading={isSubmitting}
>
Confirm Confirm
</Button> </Button>
<Button ref={cancelRef} onClick={onClose} isDisabled={isSubmitting}> <Button
ref={cancelRef}
onClick={onClose}
isDisabled={isSubmitting}
>
Cancel Cancel
</Button> </Button>
</AlertDialogFooter> </AlertDialogFooter>
</AlertDialogContent> </AlertDialogContent>
</AlertDialogOverlay> </AlertDialogOverlay>
</AlertDialog > </AlertDialog>
</> </>
) )
} }
export default DeleteConfirmation; export default DeleteConfirmation

143
new-frontend/src/components/UserSettings/UserInformation.tsx

@ -1,29 +1,47 @@
import React, { useState } from 'react'; import React, { useState } from 'react'
import {
Box,
Button,
Container,
Flex,
FormControl,
FormErrorMessage,
FormLabel,
Heading,
Input,
Text,
useColorModeValue,
} from '@chakra-ui/react'
import { SubmitHandler, useForm } from 'react-hook-form'
import { useMutation, useQueryClient } from 'react-query'
import { Box, Button, Container, Flex, FormControl, FormErrorMessage, FormLabel, Heading, Input, Text, useColorModeValue } from '@chakra-ui/react'; import { ApiError, UserOut, UserUpdateMe, UsersService } from '../../client'
import { SubmitHandler, useForm } from 'react-hook-form'; import useAuth from '../../hooks/useAuth'
import { useMutation, useQueryClient } from 'react-query'; import useCustomToast from '../../hooks/useCustomToast'
import { ApiError, UserOut, 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('gray.700', 'white'); const color = useColorModeValue('gray.700', '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()
const { register, handleSubmit, reset, formState: { isSubmitting, errors, isDirty } } = useForm<UserOut>({ const {
mode: 'onBlur', criteriaMode: 'all', defaultValues: { register,
handleSubmit,
reset,
formState: { isSubmitting, errors, isDirty },
} = useForm<UserOut>({
mode: 'onBlur',
criteriaMode: 'all',
defaultValues: {
full_name: currentUser?.full_name, full_name: currentUser?.full_name,
email: currentUser?.email email: currentUser?.email,
} },
}) })
const toggleEditMode = () => { const toggleEditMode = () => {
setEditMode(!editMode); setEditMode(!editMode)
}; }
const updateInfo = async (data: UserUpdateMe) => { const updateInfo = async (data: UserUpdateMe) => {
await UsersService.updateUserMe({ requestBody: data }) await UsersService.updateUserMe({ requestBody: data })
@ -31,59 +49,81 @@ 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')
} },
}); })
const onSubmit: SubmitHandler<UserUpdateMe> = async (data) => { const onSubmit: SubmitHandler<UserUpdateMe> = async (data) => {
mutation.mutate(data) mutation.mutate(data)
} }
const onCancel = () => { const onCancel = () => {
reset(); reset()
toggleEditMode(); toggleEditMode()
} }
return ( return (
<> <>
<Container maxW='full' as='form' onSubmit={handleSubmit(onSubmit)}> <Container maxW="full" as="form" onSubmit={handleSubmit(onSubmit)}>
<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'>Full name</FormLabel> <FormLabel color={color} htmlFor="name">
{ Full name
editMode ? </FormLabel>
<Input id='name' {...register('full_name', { maxLength: 30 })} type='text' size='md' /> : {editMode ? (
<Text size='md' py={2}> <Input
id="name"
{...register('full_name', { maxLength: 30 })}
type="text"
size="md"
/>
) : (
<Text size="md" py={2}>
{currentUser?.full_name || 'N/A'} {currentUser?.full_name || 'N/A'}
</Text> </Text>
} )}
</FormControl> </FormControl>
<FormControl mt={4} isInvalid={!!errors.email}> <FormControl mt={4} isInvalid={!!errors.email}>
<FormLabel color={color} htmlFor='email'>Email</FormLabel> <FormLabel color={color} htmlFor="email">
{ Email
editMode ? </FormLabel>
<Input id='email' {...register('email', { required: 'Email is required', pattern: { value: /^[A-Z0-9._%+-]+@[A-Z0-9.-]+\.[A-Z]{2,4}$/i, message: 'Invalid email address' } })} type='text' size='md' /> : {editMode ? (
<Text size='md' py={2}> <Input
id="email"
{...register('email', {
required: 'Email is required',
pattern: {
value: /^[A-Z0-9._%+-]+@[A-Z0-9.-]+\.[A-Z]{2,4}$/i,
message: 'Invalid email address',
},
})}
type="text"
size="md"
/>
) : (
<Text size="md" py={2}>
{currentUser!.email} {currentUser!.email}
</Text> </Text>
} )}
{errors.email && <FormErrorMessage>{errors.email.message}</FormErrorMessage>} {errors.email && (
<FormErrorMessage>{errors.email.message}</FormErrorMessage>
)}
</FormControl> </FormControl>
<Flex mt={4} gap={3}> <Flex mt={4} gap={3}>
<Button <Button
bg='ui.main' bg="ui.main"
color='white' color="white"
_hover={{ opacity: 0.8 }} _hover={{ opacity: 0.8 }}
onClick={toggleEditMode} onClick={toggleEditMode}
type={editMode ? 'button' : 'submit'} type={editMode ? 'button' : 'submit'}
@ -92,15 +132,16 @@ const UserInformation: React.FC = () => {
> >
{editMode ? 'Save' : 'Edit'} {editMode ? 'Save' : 'Edit'}
</Button> </Button>
{editMode && {editMode && (
<Button onClick={onCancel} isDisabled={isSubmitting}> <Button onClick={onCancel} isDisabled={isSubmitting}>
Cancel Cancel
</Button>} </Button>
)}
</Flex> </Flex>
</Box> </Box>
</ Container> </Container>
</> </>
); )
} }
export default UserInformation; export default UserInformation

45
new-frontend/src/hooks/useAuth.ts

@ -1,33 +1,42 @@
import { useQuery } from 'react-query'; import { useQuery } from 'react-query'
import { useNavigate } from '@tanstack/react-router'; import { useNavigate } from '@tanstack/react-router'
import { Body_login_login_access_token as AccessToken, LoginService, UserOut, UsersService } from '../client'; import {
Body_login_login_access_token as AccessToken,
LoginService,
UserOut,
UsersService,
} 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>('currentUser', UsersService.readUserMe, { const { data: user, isLoading } = useQuery<UserOut | null, Error>(
'currentUser',
UsersService.readUserMe,
{
enabled: isLoggedIn(), enabled: isLoggedIn(),
}); },
)
const login = async (data: AccessToken) => { const login = async (data: AccessToken) => {
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 }
} }
export { isLoggedIn }; export { isLoggedIn }
export default useAuth; export default useAuth

24
new-frontend/src/hooks/useCustomToast.ts

@ -1,21 +1,23 @@
import { useCallback } from 'react'; import { useCallback } from 'react'
import { useToast } from '@chakra-ui/react'
import { useToast } from '@chakra-ui/react';
const useCustomToast = () => { const useCustomToast = () => {
const toast = useToast(); const toast = useToast()
const showToast = useCallback((title: string, description: string, status: 'success' | 'error') => { const showToast = useCallback(
(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],
)
return showToast; return showToast
}; }
export default useCustomToast; export default useCustomToast

22
new-frontend/src/main.tsx

@ -1,19 +1,19 @@
import ReactDOM from 'react-dom/client'; import ReactDOM from 'react-dom/client'
import { ChakraProvider } from '@chakra-ui/react'; import { ChakraProvider } from '@chakra-ui/react'
import { QueryClient, QueryClientProvider } from 'react-query'; import { QueryClient, QueryClientProvider } from 'react-query'
import { RouterProvider, createRouter } from '@tanstack/react-router' import { RouterProvider, createRouter } from '@tanstack/react-router'
import { routeTree } from './routeTree.gen' import { routeTree } from './routeTree.gen'
import { OpenAPI } from './client'; import { OpenAPI } from './client'
import theme from './theme'; import theme from './theme'
import { StrictMode } from 'react'; import { StrictMode } from 'react'
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' {
@ -29,5 +29,5 @@ ReactDOM.createRoot(document.getElementById('root')!).render(
<RouterProvider router={router} /> <RouterProvider router={router} />
</QueryClientProvider> </QueryClientProvider>
</ChakraProvider> </ChakraProvider>
</StrictMode> </StrictMode>,
); )

1
new-frontend/src/routes/__root.tsx

@ -1,5 +1,6 @@
import { createRootRoute, Outlet } from '@tanstack/react-router' import { createRootRoute, Outlet } from '@tanstack/react-router'
import { TanStackRouterDevtools } from '@tanstack/router-devtools' import { TanStackRouterDevtools } from '@tanstack/router-devtools'
import NotFound from '../components/Common/NotFound' import NotFound from '../components/Common/NotFound'
export const Route = createRootRoute({ export const Route = createRootRoute({

27
new-frontend/src/routes/_layout.tsx

@ -1,10 +1,9 @@
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 UserMenu from '../components/Common/UserMenu';
import useAuth, { isLoggedIn } from '../hooks/useAuth';
import Sidebar from '../components/Common/Sidebar'
import UserMenu from '../components/Common/UserMenu'
import useAuth, { isLoggedIn } from '../hooks/useAuth'
export const Route = createFileRoute('/_layout')({ export const Route = createFileRoute('/_layout')({
component: Layout, component: Layout,
@ -14,25 +13,25 @@ export const Route = createFileRoute('/_layout')({
to: '/login', to: '/login',
}) })
} }
} },
}) })
function Layout() { function Layout() {
const { isLoading } = useAuth(); const { isLoading } = useAuth()
return ( return (
<Flex maxW='large' h='auto' position='relative'> <Flex maxW="large" h="auto" position="relative">
<Sidebar /> <Sidebar />
{isLoading ? ( {isLoading ? (
<Flex justify='center' align='center' height='100vh' width='full'> <Flex justify="center" align="center" height="100vh" width="full">
<Spinner size='xl' color='ui.main' /> <Spinner size="xl" color="ui.main" />
</Flex> </Flex>
) : ( ) : (
<Outlet /> <Outlet />
)} )}
<UserMenu /> <UserMenu />
</Flex> </Flex>
); )
}; }
export default Layout; export default Layout

87
new-frontend/src/routes/_layout/admin.tsx

@ -1,43 +1,66 @@
import { Badge, Box, Container, Flex, Heading, Spinner, Table, TableContainer, Tbody, Td, Th, Thead, Tr } from '@chakra-ui/react'; import {
import { createFileRoute } from '@tanstack/react-router'; Badge,
import { useQuery, useQueryClient } from 'react-query'; Box,
Container,
Flex,
Heading,
Spinner,
Table,
TableContainer,
Tbody,
Td,
Th,
Thead,
Tr,
} from '@chakra-ui/react'
import { createFileRoute } from '@tanstack/react-router'
import { useQuery, useQueryClient } from 'react-query'
import { ApiError, UserOut, UsersService } from '../../client'; import { ApiError, 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 { data: users, isLoading, isError, error } = useQuery('users', () => UsersService.readUsers({})) const {
data: users,
isLoading,
isError,
error,
} = 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 (
<> <>
{isLoading ? ( {isLoading ? (
// TODO: Add skeleton // TODO: Add skeleton
<Flex justify='center' align='center' height='100vh' width='full'> <Flex justify="center" align="center" height="100vh" width="full">
<Spinner size='xl' color='ui.main' /> <Spinner size="xl" color="ui.main" />
</Flex> </Flex>
) : ( ) : (
users && users && (
<Container maxW='full'> <Container maxW="full">
<Heading size='lg' textAlign={{ base: 'center', md: 'left' }} pt={12}> <Heading
size="lg"
textAlign={{ base: 'center', md: 'left' }}
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>
@ -50,23 +73,34 @@ 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.600' : 'inherit'}>{user.full_name || 'N/A'}{currentUser?.id === user.id && <Badge ml='1' colorScheme='teal'>You</Badge>}</Td> <Td color={!user.full_name ? 'gray.600' : 'inherit'}>
{user.full_name || 'N/A'}
{currentUser?.id === user.id && (
<Badge ml="1" colorScheme="teal">
You
</Badge>
)}
</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>
<ActionsMenu type='User' value={user} disabled={currentUser?.id === user.id ? true : false} /> <ActionsMenu
type="User"
value={user}
disabled={currentUser?.id === user.id ? true : false}
/>
</Td> </Td>
</Tr> </Tr>
))} ))}
@ -74,9 +108,10 @@ function Admin() {
</Table> </Table>
</TableContainer> </TableContainer>
</Container> </Container>
)
)} )}
</> </>
) )
} }
export default Admin; export default Admin

21
new-frontend/src/routes/_layout/index.tsx

@ -1,27 +1,28 @@
import { Container, Text } from '@chakra-ui/react'
import { useQueryClient } from 'react-query'
import { createFileRoute } from '@tanstack/react-router'
import { Container, Text } from '@chakra-ui/react'; import { UserOut } from '../../client'
import { useQueryClient } from 'react-query';
import { createFileRoute } from '@tanstack/react-router';
import { 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 (
<> <>
<Container maxW='full' pt={12}> <Container maxW="full" pt={12}>
<Text fontSize='2xl'>Hi, {currentUser?.full_name || currentUser?.email} 👋🏼</Text> <Text fontSize="2xl">
Hi, {currentUser?.full_name || currentUser?.email} 👋🏼
</Text>
<Text>Welcome back, nice to see you again!</Text> <Text>Welcome back, nice to see you again!</Text>
</Container> </Container>
</> </>
) )
} }
export default Dashboard; export default Dashboard

60
new-frontend/src/routes/_layout/items.tsx

@ -1,36 +1,57 @@
import { Container, Flex, Heading, Spinner, Table, TableContainer, Tbody, Td, Th, Thead, Tr } from '@chakra-ui/react'; import {
import { createFileRoute } from '@tanstack/react-router'; Container,
import { useQuery } from 'react-query'; Flex,
Heading,
Spinner,
Table,
TableContainer,
Tbody,
Td,
Th,
Thead,
Tr,
} from '@chakra-ui/react'
import { createFileRoute } from '@tanstack/react-router'
import { useQuery } from 'react-query'
import { ApiError, ItemsService } from '../../client'; import { 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,
}) })
function Items() { function Items() {
const showToast = useCustomToast(); const showToast = useCustomToast()
const { data: items, isLoading, isError, error } = useQuery('items', () => ItemsService.readItems({})) const {
data: items,
isLoading,
isError,
error,
} = 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 (
<> <>
{isLoading ? ( {isLoading ? (
// TODO: Add skeleton // TODO: Add skeleton
<Flex justify='center' align='center' height='100vh' width='full'> <Flex justify="center" align="center" height="100vh" width="full">
<Spinner size='xl' color='ui.main' /> <Spinner size="xl" color="ui.main" />
</Flex> </Flex>
) : ( ) : (
items && items && (
<Container maxW='full'> <Container maxW="full">
<Heading size='lg' textAlign={{ base: 'center', md: 'left' }} pt={12}> <Heading
size="lg"
textAlign={{ base: 'center', md: 'left' }}
pt={12}
>
Items Management Items Management
</Heading> </Heading>
<Navbar type={'Item'} /> <Navbar type={'Item'} />
@ -49,7 +70,9 @@ 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.600' : 'inherit'}>{item.description || 'N/A'}</Td> <Td color={!item.description ? 'gray.600' : 'inherit'}>
{item.description || 'N/A'}
</Td>
<Td> <Td>
<ActionsMenu type={'Item'} value={item} /> <ActionsMenu type={'Item'} value={item} />
</Td> </Td>
@ -59,9 +82,10 @@ function Items() {
</Table> </Table>
</TableContainer> </TableContainer>
</Container> </Container>
)
)} )}
</> </>
) )
} }
export default Items; export default Items

44
new-frontend/src/routes/_layout/settings.tsx

@ -1,35 +1,45 @@
import { Container, Heading, Tab, TabList, TabPanel, TabPanels, Tabs } from '@chakra-ui/react'; import {
import { createFileRoute } from '@tanstack/react-router'; Container,
import { useQueryClient } from 'react-query'; Heading,
Tab,
TabList,
TabPanel,
TabPanels,
Tabs,
} from '@chakra-ui/react'
import { createFileRoute } from '@tanstack/react-router'
import { useQueryClient } from 'react-query'
import { UserOut } from '../../client'; import { 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 ? tabsConfig.slice(0, 3) : tabsConfig; const finalTabs = currentUser?.is_superuser
? tabsConfig.slice(0, 3)
: 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">
<TabList> <TabList>
{finalTabs.map((tab, index) => ( {finalTabs.map((tab, index) => (
<Tab key={index}>{tab.title}</Tab> <Tab key={index}>{tab.title}</Tab>
@ -44,7 +54,7 @@ function UserSettings() {
</TabPanels> </TabPanels>
</Tabs> </Tabs>
</Container> </Container>
); )
} }
export default UserSettings; export default UserSettings

131
new-frontend/src/routes/login.tsx

@ -1,14 +1,30 @@
import React from 'react'; import React from 'react'
import { ViewIcon, ViewOffIcon } from '@chakra-ui/icons'
import {
Button,
Center,
Container,
FormControl,
FormErrorMessage,
Icon,
Image,
Input,
InputGroup,
InputRightElement,
Link,
useBoolean,
} from '@chakra-ui/react'
import {
Link as RouterLink,
createFileRoute,
redirect,
} from '@tanstack/react-router'
import { SubmitHandler, useForm } from 'react-hook-form'
import { ViewIcon, ViewOffIcon } from '@chakra-ui/icons'; import Logo from '../assets/images/fastapi-logo.svg'
import { Button, Center, Container, FormControl, FormErrorMessage, Icon, Image, Input, InputGroup, InputRightElement, Link, useBoolean } from '@chakra-ui/react'; import { ApiError } from '../client'
import { Link as RouterLink, createFileRoute, redirect } from '@tanstack/react-router'; import { Body_login_login_access_token as AccessToken } from '../client/models/Body_login_login_access_token'
import { SubmitHandler, useForm } from 'react-hook-form'; import useAuth, { isLoggedIn } from '../hooks/useAuth'
import Logo from '../assets/images/fastapi-logo.svg';
import { ApiError } from '../client';
import { Body_login_login_access_token as AccessToken } from '../client/models/Body_login_login_access_token';
import useAuth, { isLoggedIn } from '../hooks/useAuth';
export const Route = createFileRoute('/login')({ export const Route = createFileRoute('/login')({
component: Login, component: Login,
@ -18,82 +34,111 @@ export const Route = createFileRoute('/login')({
to: '/', to: '/',
}) })
} }
} },
}) })
function Login() { function Login() {
const [show, setShow] = useBoolean(); const [show, setShow] = useBoolean()
const { login } = useAuth(); const { login } = useAuth()
const [error, setError] = React.useState<string | null>(null); const [error, setError] = React.useState<string | null>(null)
const { register, handleSubmit, formState: { errors, isSubmitting } } = useForm<AccessToken>({ const {
register,
handleSubmit,
formState: { errors, isSubmitting },
} = useForm<AccessToken>({
mode: 'onBlur', mode: 'onBlur',
criteriaMode: 'all', criteriaMode: 'all',
defaultValues: { defaultValues: {
username: '', username: '',
password: '' password: '',
} },
}); })
const onSubmit: SubmitHandler<AccessToken> = async (data) => { const onSubmit: SubmitHandler<AccessToken> = async (data) => {
try { try {
await login(data); await login(data)
} catch (err) { } catch (err) {
const errDetail = (err as ApiError).body.detail; const errDetail = (err as ApiError).body.detail
setError(errDetail) setError(errDetail)
} }
}; }
return ( return (
<> <>
<Container <Container
as='form' as="form"
onSubmit={handleSubmit(onSubmit)} onSubmit={handleSubmit(onSubmit)}
h='100vh' h="100vh"
maxW='sm' maxW="sm"
alignItems='stretch' alignItems="stretch"
justifyContent='center' justifyContent="center"
gap={4} gap={4}
centerContent centerContent
> >
<Image src={Logo} alt='FastAPI logo' height='auto' maxW='2xs' alignSelf='center' mb={4} /> <Image
<FormControl id='username' isInvalid={!!errors.username || !!error}> src={Logo}
<Input id='username' {...register('username', { pattern: { value: /^[A-Z0-9._%+-]+@[A-Z0-9.-]+\.[A-Z]{2,4}$/i, message: 'Invalid email address' } })} placeholder='Email' type='text' /> alt="FastAPI logo"
{errors.username && <FormErrorMessage>{errors.username.message}</FormErrorMessage>} height="auto"
maxW="2xs"
alignSelf="center"
mb={4}
/>
<FormControl id="username" isInvalid={!!errors.username || !!error}>
<Input
id="username"
{...register('username', {
pattern: {
value: /^[A-Z0-9._%+-]+@[A-Z0-9.-]+\.[A-Z]{2,4}$/i,
message: 'Invalid email address',
},
})}
placeholder="Email"
type="text"
/>
{errors.username && (
<FormErrorMessage>{errors.username.message}</FormErrorMessage>
)}
</FormControl> </FormControl>
<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 onClick={setShow.toggle} aria-label={show ? 'Hide password' : 'Show password'}> <Icon
onClick={setShow.toggle}
aria-label={show ? 'Hide password' : 'Show password'}
>
{show ? <ViewOffIcon /> : <ViewIcon />} {show ? <ViewOffIcon /> : <ViewIcon />}
</Icon> </Icon>
</InputRightElement> </InputRightElement>
</InputGroup> </InputGroup>
{error && <FormErrorMessage> {error && <FormErrorMessage>{error}</FormErrorMessage>}
{error}
</FormErrorMessage>}
</FormControl> </FormControl>
<Center> <Center>
<Link as={RouterLink} to='/recover-password' color='blue.500'> <Link as={RouterLink} to="/recover-password" color="blue.500">
Forgot password? Forgot password?
</Link> </Link>
</Center> </Center>
<Button bg='ui.main' color='white' _hover={{ opacity: 0.8 }} type='submit' isLoading={isSubmitting}> <Button
bg="ui.main"
color="white"
_hover={{ opacity: 0.8 }}
type="submit"
isLoading={isSubmitting}
>
Log In Log In
</Button> </Button>
</Container> </Container>
</> </>
); )
}; }
export default Login; export default Login

87
new-frontend/src/routes/recover-password.tsx

@ -1,13 +1,21 @@
import { Button, Container, FormControl, FormErrorMessage, Heading, Input, Text } from '@chakra-ui/react'; import {
import { createFileRoute, redirect } from '@tanstack/react-router'; Button,
import { SubmitHandler, useForm } from 'react-hook-form'; Container,
FormControl,
FormErrorMessage,
Heading,
Input,
Text,
} from '@chakra-ui/react'
import { createFileRoute, redirect } from '@tanstack/react-router'
import { SubmitHandler, useForm } from 'react-hook-form'
import { LoginService } from '../client'; import { LoginService } from '../client'
import useCustomToast from '../hooks/useCustomToast'; import useCustomToast from '../hooks/useCustomToast'
import { isLoggedIn } from '../hooks/useAuth'; import { isLoggedIn } from '../hooks/useAuth'
interface FormData { interface FormData {
email: string; email: string
} }
export const Route = createFileRoute('/recover-password')({ export const Route = createFileRoute('/recover-password')({
@ -18,46 +26,73 @@ export const Route = createFileRoute('/recover-password')({
to: '/', to: '/',
}) })
} }
} },
}) })
function RecoverPassword() { function RecoverPassword() {
const { register, handleSubmit, formState: { errors, isSubmitting } } = useForm<FormData>(); const {
const showToast = useCustomToast(); register,
handleSubmit,
formState: { errors, isSubmitting },
} = useForm<FormData>()
const showToast = useCustomToast()
const onSubmit: SubmitHandler<FormData> = async (data) => { const onSubmit: SubmitHandler<FormData> = async (data) => {
await LoginService.recoverPassword({ await LoginService.recoverPassword({
email: data.email, email: data.email,
}); })
showToast('Email sent.', 'We sent an email with a link to get back into your account.', 'success'); showToast(
}; 'Email sent.',
'We sent an email with a link to get back into your account.',
'success',
)
}
return ( return (
<Container <Container
as='form' as="form"
onSubmit={handleSubmit(onSubmit)} onSubmit={handleSubmit(onSubmit)}
h='100vh' h="100vh"
maxW='sm' maxW="sm"
alignItems='stretch' alignItems="stretch"
justifyContent='center' justifyContent="center"
gap={4} gap={4}
centerContent centerContent
> >
<Heading size='xl' color='ui.main' textAlign='center' mb={2}> <Heading size="xl" color="ui.main" textAlign="center" mb={2}>
Password Recovery Password Recovery
</Heading> </Heading>
<Text align='center'> <Text align="center">
A password recovery email will be sent to the registered account. A password recovery email will be sent to the registered account.
</Text> </Text>
<FormControl isInvalid={!!errors.email}> <FormControl isInvalid={!!errors.email}>
<Input id='email' {...register('email', { required: 'Email is required', pattern: { value: /^[A-Z0-9._%+-]+@[A-Z0-9.-]+\.[A-Z]{2,4}$/i, message: 'Invalid email address' } })} placeholder='Email' type='email' /> <Input
{errors.email && <FormErrorMessage>{errors.email.message}</FormErrorMessage>} id="email"
{...register('email', {
required: 'Email is required',
pattern: {
value: /^[A-Z0-9._%+-]+@[A-Z0-9.-]+\.[A-Z]{2,4}$/i,
message: 'Invalid email address',
},
})}
placeholder="Email"
type="email"
/>
{errors.email && (
<FormErrorMessage>{errors.email.message}</FormErrorMessage>
)}
</FormControl> </FormControl>
<Button bg='ui.main' color='white' _hover={{ opacity: 0.8 }} type='submit' isLoading={isSubmitting}> <Button
bg="ui.main"
color="white"
_hover={{ opacity: 0.8 }}
type="submit"
isLoading={isSubmitting}
>
Continue Continue
</Button> </Button>
</Container> </Container>
); )
}; }
export default RecoverPassword; export default RecoverPassword

125
new-frontend/src/routes/reset-password.tsx

@ -1,15 +1,23 @@
import {
Button,
Container,
FormControl,
FormErrorMessage,
FormLabel,
Heading,
Input,
Text,
} from '@chakra-ui/react'
import { createFileRoute, redirect } from '@tanstack/react-router'
import { SubmitHandler, useForm } from 'react-hook-form'
import { useMutation } from 'react-query'
import { Button, Container, FormControl, FormErrorMessage, FormLabel, Heading, Input, Text } from '@chakra-ui/react'; import { ApiError, LoginService, NewPassword } from '../client'
import { createFileRoute, redirect } from '@tanstack/react-router'; import { isLoggedIn } from '../hooks/useAuth'
import { SubmitHandler, useForm } from 'react-hook-form'; import useCustomToast from '../hooks/useCustomToast'
import { useMutation } from 'react-query';
import { ApiError, LoginService, NewPassword } from '../client';
import { isLoggedIn } from '../hooks/useAuth';
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')({
@ -20,76 +28,107 @@ export const Route = createFileRoute('/reset-password')({
to: '/', to: '/',
}) })
} }
} },
}) })
function ResetPassword() { function ResetPassword() {
const { register, handleSubmit, getValues, formState: { errors } } = useForm<NewPasswordForm>({ const {
register,
handleSubmit,
getValues,
formState: { errors },
} = useForm<NewPasswordForm>({
mode: 'onBlur', mode: 'onBlur',
criteriaMode: 'all', criteriaMode: 'all',
defaultValues: { defaultValues: {
new_password: '', new_password: '',
} },
}); })
const showToast = useCustomToast(); const showToast = useCustomToast()
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')
await LoginService.resetPassword({ await LoginService.resetPassword({
requestBody: { new_password: data.new_password, token: token! } requestBody: { new_password: data.new_password, token: token! },
}); })
} }
const mutation = useMutation(resetPassword, { const mutation = useMutation(resetPassword, {
onSuccess: () => { onSuccess: () => {
showToast('Success!', 'Password updated.', 'success'); showToast('Success!', 'Password updated.', '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')
} },
}) })
const onSubmit: SubmitHandler<NewPasswordForm> = async (data) => { const onSubmit: SubmitHandler<NewPasswordForm> = async (data) => {
mutation.mutate(data); mutation.mutate(data)
}; }
return ( return (
<Container <Container
as='form' as="form"
onSubmit={handleSubmit(onSubmit)} onSubmit={handleSubmit(onSubmit)}
h='100vh' h="100vh"
maxW='sm' maxW="sm"
alignItems='stretch' alignItems="stretch"
justifyContent='center' justifyContent="center"
gap={4} gap={4}
centerContent centerContent
> >
<Heading size='xl' color='ui.main' textAlign='center' mb={2}> <Heading size="xl" color="ui.main" textAlign="center" mb={2}>
Reset Password Reset Password
</Heading> </Heading>
<Text textAlign='center'> <Text textAlign="center">
Please enter your new password and confirm it to reset your password. Please enter your new password and confirm it to reset your password.
</Text> </Text>
<FormControl mt={4} isInvalid={!!errors.new_password}> <FormControl mt={4} isInvalid={!!errors.new_password}>
<FormLabel htmlFor='password'>Set Password</FormLabel> <FormLabel htmlFor="password">Set Password</FormLabel>
<Input id='password' {...register('new_password', { required: 'Password is required', minLength: { value: 8, message: 'Password must be at least 8 characters' } })} placeholder='Password' type='password' /> <Input
{errors.new_password && <FormErrorMessage>{errors.new_password.message}</FormErrorMessage>} id="password"
{...register('new_password', {
required: 'Password is required',
minLength: {
value: 8,
message: 'Password must be at least 8 characters',
},
})}
placeholder="Password"
type="password"
/>
{errors.new_password && (
<FormErrorMessage>{errors.new_password.message}</FormErrorMessage>
)}
</FormControl> </FormControl>
<FormControl mt={4} isInvalid={!!errors.confirm_password}> <FormControl mt={4} isInvalid={!!errors.confirm_password}>
<FormLabel htmlFor='confirm_password'>Confirm Password</FormLabel> <FormLabel htmlFor="confirm_password">Confirm Password</FormLabel>
<Input id='confirm_password' {...register('confirm_password', { <Input
id="confirm_password"
{...register('confirm_password', {
required: 'Please confirm your password', required: 'Please confirm your password',
validate: value => value === getValues().new_password || 'The passwords do not match' validate: (value) =>
})} placeholder='Password' type='password' /> value === getValues().new_password ||
{errors.confirm_password && <FormErrorMessage>{errors.confirm_password.message}</FormErrorMessage>} 'The passwords do not match',
})}
placeholder="Password"
type="password"
/>
{errors.confirm_password && (
<FormErrorMessage>{errors.confirm_password.message}</FormErrorMessage>
)}
</FormControl> </FormControl>
<Button bg='ui.main' color='white' _hover={{ opacity: 0.8 }} type='submit'> <Button
bg="ui.main"
color="white"
_hover={{ opacity: 0.8 }}
type="submit"
>
Reset Password Reset Password
</Button> </Button>
</Container> </Container>
); )
}; }
export default ResetPassword; export default ResetPassword

6
new-frontend/src/theme.tsx

@ -7,7 +7,7 @@ const theme = extendTheme({
secondary: '#EDF2F7', secondary: '#EDF2F7',
success: '#48BB78', success: '#48BB78',
danger: '#E53E3E', danger: '#E53E3E',
} },
}, },
components: { components: {
Tabs: { Tabs: {
@ -22,6 +22,6 @@ const theme = extendTheme({
}, },
}, },
}, },
}); })
export default theme; export default theme

Loading…
Cancel
Save