+ {error && {error}} diff --git a/components/If/if.component.tsx b/components/If/if.component.tsx new file mode 100644 index 0000000..1e461c8 --- /dev/null +++ b/components/If/if.component.tsx @@ -0,0 +1,6 @@ +import { ReactElement, ReactNode } from 'react'; + +export const If = ({ condition, children }: { condition: boolean; children: ReactElement }) => { + if (condition) return children; + return null; +}; diff --git a/components/LateralMenu/index.tsx b/components/LateralMenu/index.tsx new file mode 100644 index 0000000..cda7833 --- /dev/null +++ b/components/LateralMenu/index.tsx @@ -0,0 +1,164 @@ +import React, { ReactNode, ReactText } from 'react'; +import { + IconButton, + Box, + CloseButton, + Flex, + Icon, + useColorModeValue, + Button, + Link, + Drawer, + DrawerContent, + Text, + useDisclosure, + BoxProps, + FlexProps, + Badge, +} from '@chakra-ui/react'; +import { FiHome, FiPower, FiTrendingUp, FiTrendingDown, FiMenu } from 'react-icons/fi'; +import { IconType } from 'react-icons'; +import Image from 'next/image'; + +interface LinkItemProps { + name: string; + icon: IconType; + link: string; +} +const LinkItems: Array = [ + { name: 'Início', icon: FiHome, link: '/' }, + { name: 'Criar receita', icon: FiTrendingUp, link: '/bill?type=INCOME' }, + { name: 'Criar despesa', icon: FiTrendingDown, link: '/bill?type=EXPENSE' }, + { + name: 'Sair', + icon: FiPower, + link: '/logout', + }, +]; + +export const LateralMenu = ({ children }: { children: ReactNode }) => { + const { isOpen, onOpen, onClose } = useDisclosure(); + return ( + + onClose} display={{ base: 'none', md: 'block' }} /> + + + + + + {/* mobilenav */} + + + {children} + + + ); +}; + +interface SidebarProps extends BoxProps { + onClose: () => void; +} + +const SidebarContent = ({ onClose, ...rest }: SidebarProps) => { + return ( + + + + + + Beta + + + + + {LinkItems.map(({ name, icon, link }) => ( + + {name} + + ))} + + ); +}; + +interface NavItemProps extends FlexProps { + icon: IconType; + children: ReactText; + link: string; +} +const NavItem = ({ icon, link, children, ...rest }: NavItemProps) => { + return ( + + + {icon && ( + + )} + {children} + + + ); +}; + +interface MobileProps extends FlexProps { + onOpen: () => void; +} +const MobileNav = ({ onOpen, ...rest }: MobileProps) => { + return ( + + } /> + + + + + + Beta + + + + + ); +}; diff --git a/components/Modal/index.tsx b/components/Modal/index.tsx new file mode 100644 index 0000000..36ee630 --- /dev/null +++ b/components/Modal/index.tsx @@ -0,0 +1,18 @@ +import { Modal as ModalChakra, ModalOverlay, ModalContent, ModalBody } from '@chakra-ui/react'; + +interface ModalInterface { + onClose: () => void; + isOpen: boolean; + children: React.ReactElement; +} + +export const Modal = ({ onClose, isOpen, children }: ModalInterface) => { + return ( + + + + {children} + + + ); +}; diff --git a/components/MoneyInput/index.tsx b/components/MoneyInput/index.tsx index cf40d71..106183b 100644 --- a/components/MoneyInput/index.tsx +++ b/components/MoneyInput/index.tsx @@ -2,13 +2,11 @@ import { FormControl, FormLabel, FormErrorMessage, - NumberInputProps, NumberInput, NumberInputField, - NumberInputStepper, - NumberIncrementStepper, - NumberDecrementStepper, FormControlProps, + InputLeftAddon, + InputGroup, } from '@chakra-ui/react'; import { forwardRef, LegacyRef } from 'react'; @@ -19,18 +17,17 @@ type MoneyInputProps = FormControlProps & { }; export const MoneyInput = forwardRef( - ({ name, label, error, ...rest }: MoneyInputProps, ref) => { + ({ name, label, error, isRequired, ...rest }: MoneyInputProps, ref) => { return ( {label && {label}} - }> - - - - - - + + R$ + + } borderLeftRadius={0} /> + + {error && {error}} ); diff --git a/components/RadioCard/radio-card.component.tsx b/components/RadioCard/radio-card.component.tsx new file mode 100644 index 0000000..7c9f6c4 --- /dev/null +++ b/components/RadioCard/radio-card.component.tsx @@ -0,0 +1,34 @@ +import { Box, useRadio } from '@chakra-ui/react'; + +export const RadioCard = props => { + const { getInputProps, getCheckboxProps } = useRadio(props); + + const input = getInputProps(); + const checkbox = getCheckboxProps(); + + return ( + + + + {props.children} + + + ); +}; diff --git a/components/index.ts b/components/index.ts index 0653a6d..16b44ae 100644 --- a/components/index.ts +++ b/components/index.ts @@ -1,4 +1,9 @@ export * from './MoneyInput'; export * from './Input'; export * from './Select'; -export * from './DatePicker'; +export * from './DatePicker/date-picker.component'; +export * from './Modal'; +export * from './LateralMenu'; +export * from './Box'; +export * from './RadioCard/radio-card.component'; +export * from './If/if.component'; diff --git a/configs/Firebase.ts b/configs/Firebase.ts index 9829e38..8c5d3a9 100644 --- a/configs/Firebase.ts +++ b/configs/Firebase.ts @@ -16,6 +16,9 @@ if (!firebase.apps.length) { } else { firebase.app(); } + export default firebase; export const firestore = firebase.firestore(); export const auth = firebase.auth(); + +export const googleProvider = new firebase.auth.GoogleAuthProvider(); diff --git a/configs/theme.tsx b/configs/theme.tsx index 4a365e4..3a4bc4a 100644 --- a/configs/theme.tsx +++ b/configs/theme.tsx @@ -5,6 +5,8 @@ const config: ThemeConfig = { useSystemColorMode: false, }; -const theme = extendTheme({ config }); +const theme = extendTheme({ + config, +}); export default theme; diff --git a/hoc/withLateralMenu.tsx b/hoc/withLateralMenu.tsx new file mode 100644 index 0000000..7bdc016 --- /dev/null +++ b/hoc/withLateralMenu.tsx @@ -0,0 +1,11 @@ +import { LateralMenu } from '@Components/LateralMenu'; + +const withLateralMenu = Children => { + return props => ( + + + + ); +}; + +export default withLateralMenu; diff --git a/modules/Authentication/container/FormForgotPassword/index.tsx b/modules/Authentication/container/FormForgotPassword/index.tsx deleted file mode 100644 index 28dcdeb..0000000 --- a/modules/Authentication/container/FormForgotPassword/index.tsx +++ /dev/null @@ -1,65 +0,0 @@ -import { useForm } from 'react-hook-form'; -import { Button } from '@chakra-ui/button'; -import { Flex, Box, useToast } from '@chakra-ui/react'; -import { useRouter } from 'next/router'; - -import AuthenticationService from '@Authentication/services/AuthenticationService'; -import { Input } from '@Components'; - -const FormForgotPassword = () => { - const toast = useToast(); - - const { - handleSubmit, - register, - formState: { errors, isSubmitting }, - } = useForm(); - const Router = useRouter(); - - const onSubmit = async values => { - try { - const haveSentMail = await AuthenticationService.forgotPassword(values?.email); - if (haveSentMail) { - toast({ - description: 'An e-mail with password recovery link has been sent!', - status: 'success', - }); - - Router.replace('/'); - } - } catch (err) { - toast({ - description: err.message, - status: 'error', - }); - } - }; - - return ( - -

- - - -

- - Send - - Router.back()}> - Back - -

- -

- - ); -}; - -export default FormForgotPassword; diff --git a/modules/Authentication/container/FormLogin/form-login.container.tsx b/modules/Authentication/container/FormLogin/form-login.container.tsx new file mode 100644 index 0000000..daee7e1 --- /dev/null +++ b/modules/Authentication/container/FormLogin/form-login.container.tsx @@ -0,0 +1,53 @@ +import { Button } from '@chakra-ui/button'; +import { Flex, Box, useToast, Text, Spacer, Image, AbsoluteCenter } from '@chakra-ui/react'; +import { useRouter } from 'next/router'; +import { useEffect } from 'react'; +import { FcGoogle } from 'react-icons/fc'; + +import { signInWithGoogle } from '@Authentication/services/authentication.service'; +import { useUser } from '@Modules/Authentication/context/UserContext'; + +export const FormLoginContainer = () => { + const toast = useToast(); + const router = useRouter(); + const { userId, setUserId } = useUser(); + + useEffect(() => { + if (userId) { + router.push('/'); + } + }, [router, userId]); + + const onLoginWithGoogle = async () => { + try { + const uid = await signInWithGoogle(); + + if (uid) { + setUserId(uid); + router.push('/'); + } + } catch (err) { + toast({ + description: err.message, + status: 'error', + }); + } + }; + + return ( + + + + + Desbrave o caminho para a estabilidade financeira e saia do vermelho. + + + + + + Login com Google + + + + ); +}; diff --git a/modules/Authentication/container/FormLogin/index.tsx b/modules/Authentication/container/FormLogin/index.tsx deleted file mode 100644 index ce5ed91..0000000 --- a/modules/Authentication/container/FormLogin/index.tsx +++ /dev/null @@ -1,90 +0,0 @@ -import { useForm } from 'react-hook-form'; -import { Button } from '@chakra-ui/button'; -import { Flex, Box, useToast } from '@chakra-ui/react'; -import { useRouter } from 'next/router'; -import Link from 'next/link'; -import { useEffect } from 'react'; - -import AuthenticationService from '@Authentication/services/AuthenticationService'; -import User from '@Authentication/interfaces/User.interface'; -import { useUser } from '@Modules/Authentication/context/UserContext'; -import { Input } from '@Components'; - -const FormLogin = () => { - const toast = useToast(); - const { - handleSubmit, - register, - formState: { errors, isSubmitting }, - } = useForm(); - const Router = useRouter(); - const { userId, setUserId } = useUser(); - - useEffect(() => { - if (userId) { - Router.replace('/'); - } - }, [userId]); - - const onSubmit = async values => { - try { - const { uid } = (await AuthenticationService.signIn(values?.email, values?.password)) as User; - if (uid) { - setUserId(uid); - Router.replace('/'); - } - } catch (err) { - toast({ - description: err.message, - status: 'error', - }); - } - }; - - return ( - -

- - - - - -

- - Login - - - Register - - - - Forgot password - - - - - Register - - -

- -

- - ); -}; - -export default FormLogin; diff --git a/modules/Authentication/container/FormSignUp/index.tsx b/modules/Authentication/container/FormSignUp/index.tsx deleted file mode 100644 index 8e47736..0000000 --- a/modules/Authentication/container/FormSignUp/index.tsx +++ /dev/null @@ -1,70 +0,0 @@ -import { useForm } from 'react-hook-form'; -import { Button } from '@chakra-ui/button'; -import { useToast, Flex, Box } from '@chakra-ui/react'; -import { useRouter } from 'next/router'; - -import { Input } from '@Components'; -import { auth } from '@Configs/Firebase'; -import { useUser } from '@Modules/Authentication/context/UserContext'; - -const FormSignUp = () => { - const { - handleSubmit, - register, - formState: { errors, isSubmitting }, - } = useForm(); - const Router = useRouter(); - const toast = useToast(); - const { setUserId } = useUser(); - - const onSubmit = async values => { - try { - const { user } = await auth.createUserWithEmailAndPassword(values.email, values.password); - - localStorage.setItem('USER_UID', user.uid); - setUserId(user.uid); - Router.replace('/'); - - toast({ - description: 'User successful created!', - status: 'success', - }); - } catch (error) { - console.error(error); - } - }; - - return ( - -

- - - - - -

- - Register - -

- -

- - ); -}; - -export default FormSignUp; diff --git a/modules/Authentication/context/UserContext.tsx b/modules/Authentication/context/UserContext.tsx index 77f2142..df6a3a6 100644 --- a/modules/Authentication/context/UserContext.tsx +++ b/modules/Authentication/context/UserContext.tsx @@ -15,11 +15,6 @@ interface UserProviderProps { children: React.ReactNode; } -const formatAuthUser = user => ({ - uid: user.uid, - email: user.email, -}); - export const UserProvider = ({ children }: UserProviderProps) => { const [userId, setUserId] = useState(null); const [user, setUser] = useState(null); @@ -31,9 +26,7 @@ export const UserProvider = ({ children }: UserProviderProps) => { return; } - // var formattedUser = formatAuthUser(authState); setUserId(authState.uid); - // setUser(formatAuthUser); }; useEffect(() => { diff --git a/modules/Authentication/services/AuthenticationService.ts b/modules/Authentication/services/AuthenticationService.ts deleted file mode 100644 index 9de8d30..0000000 --- a/modules/Authentication/services/AuthenticationService.ts +++ /dev/null @@ -1,29 +0,0 @@ -import { auth } from '@Configs/Firebase'; - -import User from '../interfaces/User.interface'; - -export default class AuthenticationService { - constructor() {} - - static signIn(email: string, password: string): Promise { - return auth.signInWithEmailAndPassword(email, password).then( - ({ user }) => - ({ - uid: user.uid, - } as User) - ); - } - - static signUp(email: string, password: string): Promise { - return auth.createUserWithEmailAndPassword(email, password).then( - ({ user }) => - ({ - uid: user.uid, - } as User) - ); - } - - static forgotPassword(email: string): Promise { - return auth.sendPasswordResetEmail(email).then(_ => true); - } -} diff --git a/modules/Authentication/services/authentication.service.ts b/modules/Authentication/services/authentication.service.ts new file mode 100644 index 0000000..5452137 --- /dev/null +++ b/modules/Authentication/services/authentication.service.ts @@ -0,0 +1,28 @@ +import { auth, firestore, googleProvider } from '@Configs/Firebase'; + +interface IGoogleProviderProfile { + email?: string; + family_name?: string; + given_name?: string; + granted_scopes?: string; + id?: string; + locale?: string; + name?: string; + picture?: string; +} + +export const signInWithGoogle = () => { + return auth.signInWithPopup(googleProvider).then(({ additionalUserInfo, user }) => { + if (additionalUserInfo.isNewUser) { + const profile = additionalUserInfo.profile as IGoogleProviderProfile; + + firestore.collection('user').add({ + email: profile?.email, + name: `${profile?.given_name} ${profile?.family_name}`, + locale: profile?.locale, + image: profile?.picture, + }); + } + return user.uid; + }); +}; diff --git a/modules/BaseModule/components/Bubble/index.tsx b/modules/BaseModule/components/Bubble/index.tsx new file mode 100644 index 0000000..14968c2 --- /dev/null +++ b/modules/BaseModule/components/Bubble/index.tsx @@ -0,0 +1,62 @@ +import React from 'react'; +import { FieldErrors, FieldValues, UseFormRegister } from 'react-hook-form'; + +import { Input, Select } from '@Components'; +import SelectOption from '@Modules/BaseModule/interfaces/SelectOption'; + +import { BubbleEnum, BUBBLE_TYPES } from '../../constants/Bubble'; + +interface BubbleInterface { + type: BubbleEnum; + name: string; + label: string; + register: UseFormRegister; + errors: FieldErrors; + required?: boolean; + props?: object; + options?: SelectOption[]; + value?: (string | number | readonly string[]) & string; +} + +const Bubble = ({ + type, + name, + label, + register, + errors, + required = false, + options = [], + value, + props = {}, +}: BubbleInterface) => { + switch (type) { + case BUBBLE_TYPES.INPUT: + return ( + + ); + + case BUBBLE_TYPES.SELECT: + return ( + + ); + + default: + return <>; + } +}; + +export default Bubble; diff --git a/modules/BaseModule/constants/Bubble.ts b/modules/BaseModule/constants/Bubble.ts new file mode 100644 index 0000000..c547777 --- /dev/null +++ b/modules/BaseModule/constants/Bubble.ts @@ -0,0 +1,6 @@ +export const BUBBLE_TYPES = { + INPUT: 'INPUT', + SELECT: 'SELECT', +}; + +export type BubbleEnum = keyof typeof BUBBLE_TYPES; diff --git a/modules/BaseModule/container/BaseForm/index.tsx b/modules/BaseModule/container/BaseForm/index.tsx new file mode 100644 index 0000000..0bf8709 --- /dev/null +++ b/modules/BaseModule/container/BaseForm/index.tsx @@ -0,0 +1,82 @@ +import React, { useCallback, useEffect } from 'react'; +import { useForm } from 'react-hook-form'; +import { Button } from '@chakra-ui/button'; +import { Flex } from '@chakra-ui/react'; +import { yupResolver } from '@hookform/resolvers/yup'; +import * as Yup from 'yup'; + +import BaseField from '@Modules/BaseModule/interfaces/BaseField'; +import renderFields from '@Modules/BaseModule/shared/renderFields'; + +interface BaseFormInterface { + id?: string | number; + fetch?: (id: string | number) => Promise; + fields: BaseField[]; + onSubmit: (element: T) => T | Promise | Promise; + submitLabel?: string; + schema: Yup.AnyObjectSchema; +} + +const BaseForm = ({ + id, + fetch, + onSubmit, + fields, + submitLabel = 'Submit', + schema, +}: BaseFormInterface) => { + const { + handleSubmit, + register, + setValue, + formState: { errors, isSubmitting }, + } = useForm({ + resolver: yupResolver(schema), + }); + + const wrapperOnSubmit = values => { + const element = values as T; + + onSubmit(element); + }; + + const fetchData = useCallback( + async (id): Promise => { + if (id && !!fetch) { + const model = await fetch(id); + + if (model) { + fields.forEach(({ name }) => { + if (model[name]) { + setValue(name, model[name]); + } + }); + } + + return model; + } + }, + [fetch, fields, setValue] + ); + + useEffect(() => { + if (id) { + fetchData(id); + } + }, [fetchData, id]); + + return ( +

+ + {renderFields(fields, errors, register)} + + + {submitLabel} + + +

+ ); +}; + +export { BaseForm }; +export default BaseForm; diff --git a/modules/BaseModule/container/BaseList/index.tsx b/modules/BaseModule/container/BaseList/index.tsx new file mode 100644 index 0000000..416013e --- /dev/null +++ b/modules/BaseModule/container/BaseList/index.tsx @@ -0,0 +1,115 @@ +import React, { useEffect, useMemo, useState } from 'react'; +import { Box, Table, Thead, Tbody, Tr, Th, Td, Spinner, Button } from '@chakra-ui/react'; + +import { Modal } from '@Components'; + +const MODAL_TYPES = { + EDIT_MODAL: 'EDIT_MODAL', + DELETE_MODAL: 'DELETE_MODAL', +}; + +interface BaseHeader { + label: string; + field: string; +} + +interface BaseListInterface { + headers: BaseHeader[]; + items: T[]; + isLoading: boolean; + optionsEnabled?: boolean; + onDeleteItem?: (id: string | number) => void; + onCloseOption?: () => void; + editComponent?: (id: string | number) => React.ReactElement; +} + +const BaseList = ({ + headers, + items, + isLoading, + optionsEnabled = false, + editComponent, + onCloseOption, + onDeleteItem, +}: BaseListInterface) => { + const [modalType, setModalType] = useState(null); + const [id, setId] = useState(); + + useEffect(() => { + if (!modalType) { + onCloseOption(); + } + }, [modalType]); + + const handleOpenModalWithId = (id, type) => { + setId(id); + setModalType(type); + }; + + const tableItems = useMemo(() => { + const fields = headers.map(({ field }) => field); + + return items.map((item: T, index) => ( + + {fields.map(field => { + if (!item[field]) return; + return {item[field]}; + })} + {optionsEnabled && ( + + handleOpenModalWithId(item.id, MODAL_TYPES.EDIT_MODAL)}>Edit + handleOpenModalWithId(item.id, MODAL_TYPES.DELETE_MODAL)}>Delete + + )} + + )); + }, [headers, items, optionsEnabled]); + + const modalContent = useMemo(() => { + switch (modalType) { + case MODAL_TYPES.DELETE_MODAL: + return ( + <> +

Are you sure about this action?

+ onDeleteItem(id)}>Yes, I'm + setModalType(null)}>Cancel + + ); + + case MODAL_TYPES.EDIT_MODAL: + return <>{editComponent(id)}; + + default: + return <>; + } + }, [editComponent, id, modalType]); + + return ( + <> + setModalType(null)}> + {modalContent} + + + + + + {headers.map(({ label }) => ( + + ))} + {optionsEnabled && } + + + + <> + {isLoading && } + {!isLoading && tableItems} + + +

{label}	Options

+ + + ); +}; + +export { BaseList }; +export default BaseList; diff --git a/modules/BaseModule/hooks/useIsMobile.tsx b/modules/BaseModule/hooks/useIsMobile.tsx new file mode 100644 index 0000000..70a9c3f --- /dev/null +++ b/modules/BaseModule/hooks/useIsMobile.tsx @@ -0,0 +1,14 @@ +import { useState, useEffect } from 'react'; + +export const useIsMobile = () => { + const [width, setWidth] = useState(0); + + useEffect(() => { + const handleWindowSizeChange = () => setWidth(window.innerWidth); + handleWindowSizeChange(); + window.addEventListener('resize', handleWindowSizeChange); + return () => window.removeEventListener('resize', handleWindowSizeChange); + }, []); + + return width <= 576; +}; diff --git a/modules/BaseModule/interfaces/BaseField.ts b/modules/BaseModule/interfaces/BaseField.ts new file mode 100644 index 0000000..a2cb787 --- /dev/null +++ b/modules/BaseModule/interfaces/BaseField.ts @@ -0,0 +1,11 @@ +import { BubbleEnum } from '@Modules/BaseModule/constants/Bubble'; + +import SelectOption from './SelectOption'; + +export default interface BaseField { + name: string; + type: BubbleEnum; + label: string; + options?: SelectOption[]; + value?: (string | number | readonly string[]) & string; +} diff --git a/modules/BaseModule/interfaces/SelectOption.ts b/modules/BaseModule/interfaces/SelectOption.ts new file mode 100644 index 0000000..3a585d5 --- /dev/null +++ b/modules/BaseModule/interfaces/SelectOption.ts @@ -0,0 +1,4 @@ +export default interface SelectOption { + label: string; + value: string | number; +} diff --git a/modules/BaseModule/shared/renderFields.tsx b/modules/BaseModule/shared/renderFields.tsx new file mode 100644 index 0000000..88c29a2 --- /dev/null +++ b/modules/BaseModule/shared/renderFields.tsx @@ -0,0 +1,20 @@ +import React from 'react'; + +import Bubble from '../components/Bubble'; +import BaseField from '../interfaces/BaseField'; + +const renderFields = (fields: BaseField[], errors, register) => + fields.map(({ name, type, label, options, value }) => ( + + )); + +export default renderFields; diff --git a/modules/Bill/components/BillFilters/index.tsx b/modules/Bill/components/BillFilters/index.tsx index 461409c..a43ce2c 100644 --- a/modules/Bill/components/BillFilters/index.tsx +++ b/modules/Bill/components/BillFilters/index.tsx @@ -3,6 +3,7 @@ import { useForm } from 'react-hook-form'; import { Flex, Spacer, Box } from '@chakra-ui/react'; import { Select } from '@Components/Select'; +import { MONTHS_DICT } from '@Modules/Bill/constants/BillConsts'; type BillFiltersType = { year?: number; @@ -16,21 +17,6 @@ interface BillFiltersProps { to: number; } -const MONTHS_DICT = { - 0: 'Janeiro', - 1: 'Fevereiro', - 2: 'Março', - 3: 'Abril', - 4: 'Maio', - 5: 'Junho', - 6: 'Julho', - 7: 'Agosto', - 8: 'Setembro', - 9: 'Outubro', - 10: 'Novembro', - 11: 'Dezembro', -}; - const BillFilters = ({ filters, onChange, from, to }: BillFiltersProps) => { const { handleSubmit, @@ -77,7 +63,7 @@ const BillFilters = ({ filters, onChange, from, to }: BillFiltersProps) => { } return finalMonths; - }, [filters.year]); + }, []); return ( @@ -85,7 +71,7 @@ const BillFilters = ({ filters, onChange, from, to }: BillFiltersProps) => { { void; + onDeleteBill: (billId: string) => void; +} + +export const BillItem = ({ bill, onCopyBill, onDeleteBill }: BillItemProps) => { + const router = useRouter(); + const [loadings, setLoadings] = useState({ + changingStatus: null, + deleting: false, + }); + + const formatValue = value => { + return `R$${Number(value).toFixed(2).replace('.', ',')}`; + }; + + const formatDate = value => { + const date = new Date(value).toLocaleString('pt-BR').substr(0, 10); + return `${date}`; + }; + + const billValue = useMemo(() => { + const typesScheme = { + [BillTypes.EXPENSE]: 'red', + [BillTypes.INCOME]: 'green', + }; + + const icon = { + [BillTypes.EXPENSE]: , + [BillTypes.INCOME]: , + }; + + return ( + + {icon[bill.type] ?? <>} {formatValue(bill.value)} + + ); + }, [bill]); + + const changeBillStatus = async status => { + setLoadings({ + ...loadings, + changingStatus: status, + }); + + await billsCollection.doc(bill.id).update({ + status, + }); + + setLoadings({ + ...loadings, + changingStatus: null, + }); + }; + + const isExpiring = useMemo(() => { + const currentDate = new Date(); + + currentDate.setDate(currentDate.getDate() + 5); + + return ( + currentDate.getTime() - bill.dueDate >= 0 && bill.status !== BillStatus.PAID && bill.type === BillTypes.EXPENSE + ); + }, [bill.dueDate, bill.status, bill.type]); + + const isPassDueDate = useMemo(() => { + return new Date(bill.dueDate) < new Date() && bill.status !== BillStatus.PAID && bill.type === BillTypes.EXPENSE; + }, [bill.dueDate, bill.status, bill.type]); + + const billSituation = useMemo(() => { + if (isPassDueDate) { + return ( + + + + + Conta vencida + + + + ); + } + + if (isExpiring) { + return ( + + + + + Prestes a expirar + + + + ); + } + }, [isExpiring, isPassDueDate]); + + const itemBorderColor = useMemo(() => { + if (isPassDueDate) return 'red.500'; + if (isExpiring) return 'yellow.500'; + + return ''; + }, [isExpiring, isPassDueDate]); + + const billStatusColor = useMemo(() => { + let color = 'yellow'; + + if (bill.status === BillStatus.NOT_PAID) { + color = 'red'; + } + + if (bill.status === BillStatus.PAID) { + color = 'green'; + } + + return color; + }, [bill.status]); + + return ( + + {billSituation} + + + + + + {bill.name} + + + Vencimento {formatDate(bill.dueDate)} + + + + {bill.description && ( + + {bill.description} + + )} + +

{billValue}

+ + + + + + } + variant="outline" + size="sm" + w="fit-content" + mr={5} + colorScheme={billStatusColor} + > + {textsBillStatus[bill.status]} + + + + + + + } + justifyContent="flex-start" + fontWeight="normal" + fontSize="sm" + onClick={() => changeBillStatus(BillStatus.NOT_PAID)} + isLoading={loadings?.changingStatus === BillStatus.NOT_PAID} + colorScheme="red" + > + Não pago + + + } + justifyContent="flex-start" + fontWeight="normal" + fontSize="sm" + onClick={() => changeBillStatus(BillStatus.PAID)} + isLoading={loadings?.changingStatus === BillStatus.PAID} + colorScheme="green" + > + Pago + + + } + justifyContent="flex-start" + fontWeight="normal" + fontSize="sm" + onClick={() => changeBillStatus(BillStatus.PENDING)} + isLoading={loadings?.changingStatus === BillStatus.PENDING} + colorScheme="yellow" + > + Pendente + + + + + + + + + } + variant="outline" + size="sm" + w="fit-content" + /> + + + + + + } + justifyContent="flex-start" + fontWeight="normal" + fontSize="sm" + onClick={() => router.replace(`/bill/${bill.id}`)} + > + Editar conta + + } + justifyContent="flex-start" + fontWeight="normal" + fontSize="sm" + onClick={() => onCopyBill(bill.id)} + > + Copiar conta + + + } + justifyContent="flex-start" + fontWeight="normal" + colorScheme="red" + fontSize="sm" + onClick={() => onDeleteBill(bill.id)} + > + Deletar conta + + + + + + + + + ); +}; diff --git a/modules/Bill/components/BillItem/index.tsx b/modules/Bill/components/BillItem/index.tsx deleted file mode 100644 index 60db723..0000000 --- a/modules/Bill/components/BillItem/index.tsx +++ /dev/null @@ -1,161 +0,0 @@ -import { useState, useMemo } from 'react'; -import { useRouter } from 'next/router'; -import { Button, IconButton, Box, Text, Tag, Flex, Stack, Spacer } from '@chakra-ui/react'; -import { EditIcon, DeleteIcon, ArrowUpIcon, ArrowDownIcon } from '@chakra-ui/icons'; - -import { BillTypes, BillStatus } from '@Modules/Bill/constants/Types'; -import { Bill } from '@Modules/Bill/interfaces/Bill.interface'; -import { billsCollection } from '@Modules/Bill/constants/FirestoreCollections'; - -interface BillItemProps { - bill: Bill; -} - -export default function BillItem({ bill }: BillItemProps) { - const router = useRouter(); - const [loadings, setLoadings] = useState({ - changingStatus: null, - deleting: false, - }); - - const formatValue = value => { - return `R$${Number(value).toFixed(2).replace('.', ',')}`; - }; - - const formatDate = value => { - const date = new Date(value).toLocaleString('pt-BR').substr(0, 10); - return `${date}`; - }; - - const billValue = useMemo(() => { - const typesScheme = { - [BillTypes.EXPENSE]: 'red', - [BillTypes.INCOME]: 'green', - }; - - const icon = { - [BillTypes.EXPENSE]: , - [BillTypes.INCOME]: , - }; - - return ( - - {icon[bill.type] ?? <>} {formatValue(bill.value)} - - ); - }, [bill]); - - const changeBillStatus = async status => { - setLoadings({ - ...loadings, - changingStatus: status, - }); - - await billsCollection.doc(bill.id).update({ - status, - }); - - setLoadings({ - ...loadings, - changingStatus: null, - }); - }; - - const deleteBill = async () => { - setLoadings({ - ...loadings, - deleting: true, - }); - - await billsCollection.doc(bill.id).delete(); - - setLoadings({ - ...loadings, - changingStatus: false, - }); - }; - - return ( - - - - - - {bill.name} - - - Due date {formatDate(bill.dueDate)} - - - - {bill.description && ( - - {bill.description} - - )} - -

{billValue}

- - - Created at {formatDate(bill.createdAt)} - - - - - - changeBillStatus(BillStatus.PENDING)} - isLoading={loadings?.changingStatus === BillStatus.PENDING} - colorScheme="yellow" - > - Pending - - - changeBillStatus(BillStatus.PAID)} - isLoading={loadings?.changingStatus === BillStatus.PAID} - colorScheme="green" - marginTop="5px" - > - Paid - - - changeBillStatus(BillStatus.NOT_PAID)} - isLoading={loadings?.changingStatus === BillStatus.NOT_PAID} - colorScheme="red" - marginTop="5px" - > - Not paid - - - - } - onClick={() => router.push(`/bill/${bill.id}`)} - variant="outline" - size="sm" - /> - - deleteBill()} - icon={} - variant="outline" - marginLeft="10px" - size="sm" - /> - - - - ); -} diff --git a/modules/Bill/components/CopyBill/copy-bill.component.tsx b/modules/Bill/components/CopyBill/copy-bill.component.tsx new file mode 100644 index 0000000..ed348e6 --- /dev/null +++ b/modules/Bill/components/CopyBill/copy-bill.component.tsx @@ -0,0 +1,148 @@ +import React, { useMemo, useEffect } from 'react'; +import { Button } from '@chakra-ui/button'; +import { useForm } from 'react-hook-form'; +import { + ModalOverlay, + ModalContent, + ModalHeader, + ModalCloseButton, + ModalBody, + ModalFooter, + Flex, + Spacer, + Box, + useToast, +} from '@chakra-ui/react'; + +import { Select } from '@Components/Select'; +import { MONTHS_DICT, TO_YEAR, FROM_YEAR } from '@Modules/Bill/constants/BillConsts'; +import { Modal } from '@Components/Modal'; +import { billsCollection } from '@Modules/Bill/constants/FirestoreCollections'; +import { Bill } from '@Modules/Bill/interfaces/Bill.interface'; +import { BillStatus } from '@Modules/Bill/constants/Types'; + +export const CopyBill = ({ isOpen, onClose, billId }) => { + const { + handleSubmit, + register, + formState: { errors, isSubmitting }, + setValue, + watch, + } = useForm(); + + const toast = useToast(); + + useEffect(() => { + setValue('month', new Date().getMonth()); + setValue('year', new Date().getFullYear()); + }, [setValue]); + + const years = useMemo(() => { + const finalYears = []; + + if (FROM_YEAR > TO_YEAR) { + throw new Error('From must be lower than to'); + } + + if (TO_YEAR - FROM_YEAR <= 0) { + throw new Error('To minus from must be over 0'); + } + + for (let yearCount = 0; yearCount <= TO_YEAR - FROM_YEAR; yearCount++) { + finalYears.push({ + label: `${FROM_YEAR + yearCount}`, + to: FROM_YEAR + yearCount, + }); + } + + return finalYears; + }, []); + + const months = useMemo(() => { + const finalMonths = []; + + for (let monthCount = 0; monthCount <= 11; monthCount++) { + finalMonths.push({ + label: `${MONTHS_DICT[monthCount]}`, + value: monthCount, + }); + } + + return finalMonths; + }, []); + + const month = watch('month', false); + const year = watch('year', false); + + const onSubmit = async values => { + const billDoc = await billsCollection.doc(billId).get(); + if (billDoc.exists) { + const billData = billDoc.data() as Bill; + + const day = new Date(billData.dueDate).getDay(); + const newDueDate = new Date(values.year, values.month, day); + + try { + await billsCollection.add({ + ...billData, + status: BillStatus.PENDING, + dueDate: newDueDate.getTime(), + createdAt: new Date().getTime(), + }); + + onClose(); + + toast({ + description: 'Conta copiada com sucesso!', + status: 'success', + }); + } catch (error) { + console.error(error); + } + } + }; + + return ( + + <> + + + Copiar conta + + + + setValue('year', +select.target.value)} + error={errors.year?.message} + mb={2} + /> + + setValue('month', +select.target.value)} + error={errors.month?.message} + /> + + Você tem certeza que deseja copiar essa conta para o mês de {month}/{year}? + + + + + Cancelar + + + Copiar conta + + + + + + ); +}; diff --git a/modules/Bill/components/DeleteBill/delete-bill.component.tsx b/modules/Bill/components/DeleteBill/delete-bill.component.tsx new file mode 100644 index 0000000..6d4983d --- /dev/null +++ b/modules/Bill/components/DeleteBill/delete-bill.component.tsx @@ -0,0 +1,105 @@ +import React, { useEffect, useState, useCallback } from 'react'; +import { Button } from '@chakra-ui/button'; +import { + ModalOverlay, + ModalContent, + ModalHeader, + ModalCloseButton, + ModalBody, + ModalFooter, + useToast, +} from '@chakra-ui/react'; + +import { Modal } from '@Components/Modal'; +import { billsCollection, billsRecurrenceCollection } from '@Modules/Bill/constants/FirestoreCollections'; +import { Bill } from '@Modules/Bill/interfaces/Bill.interface'; +import { BillStatus } from '@Modules/Bill/constants/Types'; + +export const DeleteBill = ({ isOpen, onClose, billId }) => { + const toast = useToast(); + const [isRecurrence, setIsRecurrence] = useState(false); + + const checkRecurrence = useCallback(async () => { + if (!billId) return; + + const hasRecurrence = await (await billsRecurrenceCollection.where('bills', 'array-contains', billId)).get(); + + setIsRecurrence(!hasRecurrence.empty); + }, [billId]); + + useEffect(() => { + checkRecurrence(); + }, [checkRecurrence]); + const deleteBill = async (deleteRecurrence = false) => { + try { + if (deleteRecurrence) { + const recurrenceDoc = ( + await (await billsRecurrenceCollection.where('bills', 'array-contains', billId).limit(1)).get() + )?.docs[0]; + + let execution = [billsRecurrenceCollection.doc(recurrenceDoc.id).delete()]; + + recurrenceDoc.data().bills.forEach(id => billsCollection.doc(id).delete()); + + await Promise.all(execution); + + return toast({ + description: 'Conta e recorrências deletadas com sucesso!', + status: 'success', + }); + } + + await billsCollection.doc(billId).delete(); + toast({ + description: 'Conta deletada com sucesso!', + status: 'success', + }); + } catch (error) { + console.error(error); + } finally { + onClose(); + } + }; + + return ( + + <> + + + Deletar conta + + + {isRecurrence + ? 'Você deseja deletar somente esta conta ou toda recorrência?' + : 'Deseja realmente deletar esta conta?'} + + + + {isRecurrence ? ( + <> + + Cancelar + + deleteBill()}> + Deletar conta + + deleteBill(true)}> + Deletar recorrência + + + ) : ( + <> + + Cancelar + + deleteBill()}> + Deletar conta + + + )} + + + + + ); +}; diff --git a/modules/Bill/components/StateMonth/index.tsx b/modules/Bill/components/StateMonth/index.tsx deleted file mode 100644 index c4ad655..0000000 --- a/modules/Bill/components/StateMonth/index.tsx +++ /dev/null @@ -1,56 +0,0 @@ -import { useMemo } from 'react'; -import { Stat, StatLabel, StatNumber, Box, Flex } from '@chakra-ui/react'; - -import { Bill } from '@Modules/Bill/interfaces/Bill.interface'; -import { BillTypes } from '@Modules/Bill/constants/Types'; - -interface StateMonthProps { - bills: Bill[]; -} - -export default function StateMonth({ bills }: StateMonthProps) { - const formatValue = value => { - return `R$${Number(value).toFixed(2).replace('.', ',')}`; - }; - - const income = useMemo(() => { - const reduceRevenue = - bills.filter(bill => bill.type === BillTypes.INCOME).reduce((prev, current) => (prev += current.value), 0) ?? 0; - return formatValue(reduceRevenue); - }, [bills]); - - const expense = useMemo(() => { - const reduceExpense = - bills.filter(bill => bill.type === BillTypes.EXPENSE).reduce((prev, current) => (prev += current.value), 0) ?? 0; - return formatValue(reduceExpense); - }, [bills]); - - const balance = useMemo(() => { - const reduceRevenue = - bills.filter(bill => bill.type === BillTypes.INCOME).reduce((prev, current) => (prev += current.value), 0) ?? 0; - const reduceExpense = - bills.filter(bill => bill.type === BillTypes.EXPENSE).reduce((prev, current) => (prev += current.value), 0) ?? 0; - return formatValue(reduceRevenue - reduceExpense); - }, [bills]); - - return ( - - - - Income - {income} - - - - Expense - {expense} - - - - Balance - {balance} - - - - ); -} diff --git a/modules/Bill/components/StatsMonth/stats-month.component.tsx b/modules/Bill/components/StatsMonth/stats-month.component.tsx new file mode 100644 index 0000000..15f76c8 --- /dev/null +++ b/modules/Bill/components/StatsMonth/stats-month.component.tsx @@ -0,0 +1,57 @@ +import { Stat, StatLabel, StatNumber, Box, Grid, GridItem, Skeleton } from '@chakra-ui/react'; + +interface StateMonthProps { + income?: number; + expense?: number; + balance?: number; + isLoaded: boolean; +} + +export const StatsMonth = ({ income, expense, balance, isLoaded }: StateMonthProps) => { + const formatValue = value => { + return `R$${Number(value).toFixed(2).replace('.', ',')}`; + }; + + return ( + + + + + + Receita + + + {formatValue(income)} + + + + + + + + + + Despesas + + + {formatValue(expense)} + + + + + + + + + + Restante + + + {formatValue(balance)} + + + + + + ); +}; diff --git a/modules/Bill/constants/BillConsts.ts b/modules/Bill/constants/BillConsts.ts new file mode 100644 index 0000000..5733c12 --- /dev/null +++ b/modules/Bill/constants/BillConsts.ts @@ -0,0 +1,22 @@ +export const MONTHS_DICT = { + 0: 'Janeiro', + 1: 'Fevereiro', + 2: 'Março', + 3: 'Abril', + 4: 'Maio', + 5: 'Junho', + 6: 'Julho', + 7: 'Agosto', + 8: 'Setembro', + 9: 'Outubro', + 10: 'Novembro', + 11: 'Dezembro', +}; + +export const FROM_YEAR = 2020; + +export const TO_YEAR = 2024; + +export const defaultRequiredMessage = { + required: 'Este campo é obrigatório!', +}; diff --git a/modules/Bill/constants/FirestoreCollections.ts b/modules/Bill/constants/FirestoreCollections.ts index 02cde81..694a38d 100644 --- a/modules/Bill/constants/FirestoreCollections.ts +++ b/modules/Bill/constants/FirestoreCollections.ts @@ -1,3 +1,5 @@ import { firestore } from '@Configs/Firebase'; export const billsCollection = firestore.collection('bills'); + +export const billsRecurrenceCollection = firestore.collection('bills-recurrence'); diff --git a/modules/Bill/constants/Types.ts b/modules/Bill/constants/Types.ts index 88b4641..b6abd8a 100644 --- a/modules/Bill/constants/Types.ts +++ b/modules/Bill/constants/Types.ts @@ -1,6 +1,8 @@ export const BillTypes = { EXPENSE: 'EXPENSE', INCOME: 'INCOME', + REPEATED_INCOME: 'REPEATED_INCOME', + REPEATED_EXPENSE: 'REPEATED_EXPENSE', }; export const BillStatus = { diff --git a/modules/Bill/container/FormBill/form-bill.container.tsx b/modules/Bill/container/FormBill/form-bill.container.tsx new file mode 100644 index 0000000..6816481 --- /dev/null +++ b/modules/Bill/container/FormBill/form-bill.container.tsx @@ -0,0 +1,329 @@ +import React, { useEffect, useMemo, useState } from 'react'; +import { useRouter } from 'next/router'; +import { useForm, Controller } from 'react-hook-form'; +import { Button } from '@chakra-ui/button'; +import { useToast, Flex, Text, Switch } from '@chakra-ui/react'; + +import { billsCollection, billsRecurrenceCollection } from '@Modules/Bill/constants/FirestoreCollections'; +import { Bill } from '@Modules/Bill/interfaces/Bill.interface'; +import { BillTypes, BillStatus } from '@Modules/Bill/constants/Types'; +import { Input, MoneyInput, Select, DatePicker, Box, If } from '@Components'; +import { useUser } from '@Modules/Authentication/context/UserContext'; +import { defaultRequiredMessage, TO_YEAR } from '@Modules/Bill/constants/BillConsts'; + +const types = [ + { + label: 'Despesa', + value: BillTypes.EXPENSE, + }, + { + label: 'Receita', + value: BillTypes.INCOME, + }, +]; + +const recurrenceTypes = [ + { + label: 'Cada mês', + value: 'EVERY_MONTH', + }, + // TODO: every year recurrence + // { + // label: 'Cada ano', + // value: 'EVERY_YEAR', + // }, +]; + +const categoriesExpense = [ + { + label: '💳 Cartão de crédito', + value: 'CREDIT_CARD', + }, + { + label: '💰 Investimento', + value: 'INVESTING', + }, + { + label: '💸 Fixo', + value: 'FIXED', + }, + { + label: '🔁 Flexível', + value: 'FLEX', + }, + { + label: '💲 Outro', + value: 'OTHER', + }, +]; + +interface FormBillProps { + billId?: string; +} + +export const FormBillContainer = ({ billId }: FormBillProps) => { + const { + handleSubmit, + register, + setValue, + control, + watch, + formState: { errors, isSubmitting }, + } = useForm(); + + const router = useRouter(); + const toast = useToast(); + const { userId } = useUser(); + + const [foundBill, setFoundBill] = useState(); + + useEffect(() => { + try { + const queryBillType = router.query?.type as keyof typeof BillTypes; + setValue('type', queryBillType); + } catch (error) { + console.error(error); + } + }, [router.query.type, setValue]); + + useEffect(() => { + setValue('category', categoriesExpense[0].value); + }, [setValue]); + + const onSubmit = async values => { + if (!userId) return; + + const dueDate = new Date(values.dueDate); + dueDate.setHours(3, 0, 0, 0); + + const bill: Bill = { + name: values.name, + description: values.description ?? '', + value: +values.value, + dueDate: dueDate.getTime(), + status: billId ? foundBill?.status : BillStatus.PENDING, + type: values.type, + createdAt: new Date().getTime(), + userId, + category: values.type === BillTypes.EXPENSE ? values.category : '', + }; + + try { + if (billId) { + await billsCollection.doc(billId).update(bill); + } else { + if (values.recurrence) { + let billsToAdd = [billsCollection.add(bill)]; + let endOcurrence = new Date(values.recurrenceDueDate); + let indexOcurrence = new Date(); + indexOcurrence.setDate(endOcurrence.getDate()); + + const billDateDay = new Date(bill.dueDate).getDate(); + while (endOcurrence >= indexOcurrence) { + indexOcurrence.setMonth(indexOcurrence.getMonth() + 1); + + billsToAdd.push( + billsCollection.add({ + ...bill, + dueDate: new Date(indexOcurrence.getFullYear(), indexOcurrence.getMonth(), billDateDay).getTime(), + }) + ); + } + + const addedBills = await Promise.all(billsToAdd); + + await billsRecurrenceCollection.add({ + type: values.recurrenceType, + ends_in: values.recurrenceDueDate, + bills: addedBills.map(({ id }) => id), + }); + + router.push('/'); + return toast({ + description: 'Conta e recorrências criados com sucesso!', + status: 'success', + }); + } + + await billsCollection.add(bill); + } + toast({ + description: 'Conta criada com sucesso!', + status: 'success', + }); + + router.push('/'); + } catch (error) { + console.error(error); + } + }; + + useEffect(() => { + const findBill = async () => { + if (!billId) return; + + const billDoc = await billsCollection.doc(billId).get(); + if (billDoc.exists) { + setFoundBill({ id: billDoc.id, ...billDoc.data() } as Bill); + } else { + router.push('/'); + toast({ + description: 'Conta não encontrada!', + status: 'error', + }); + } + }; + + findBill(); + }, [billId, router, toast]); + + useEffect(() => { + setValue('name', foundBill?.name); + setValue('description', foundBill?.description); + setValue('dueDate', foundBill?.dueDate); + setValue('type', foundBill?.type); + setValue('value', String(foundBill?.value)); + setValue('type', foundBill?.type); + setValue('category', foundBill?.category); + }, [foundBill, setValue]); + + const billType = watch('type', false); + const billRecurrence = watch('recurrence', false); + + const title = useMemo(() => { + const prefix = billId ? 'Editar' : 'Criar nova'; + if (router.query.type) { + const foundType = types.find(type => type.value === router.query.type); + + if (!foundType) return `${prefix} conta`; + + return `${prefix} ${foundType.label.toLocaleLowerCase()}`; + } + + return `${prefix} conta`; + }, [billId, router.query.type]); + + return ( + +

+ +

+ + + + ( + field.onChange(date)} + selected={field.value} + defaultValue={new Date().getTime()} + style={{ marginBottom: '10px' }} + error={errors.dueDate?.message} + /> + )} + /> + + + + + + + + + + + + + + Recorrência + + + + + + Contas reccorentes serão criadas com a frequência que você determinar. + + + + + + + ( + field.onChange(date)} + selected={field.value} + defaultValue={new Date().getTime()} + minDate={new Date(new Date().getFullYear(), new Date().getMonth() + 1, 1)} + maxDate={new Date(TO_YEAR, 11, 31)} + /> + )} + /> + + + + + {billId ? 'Editar' : 'Criar'} + + + + + ); +}; diff --git a/modules/Bill/container/FormBill/index.tsx b/modules/Bill/container/FormBill/index.tsx deleted file mode 100644 index 86416b1..0000000 --- a/modules/Bill/container/FormBill/index.tsx +++ /dev/null @@ -1,226 +0,0 @@ -import { useMemo, useEffect, useState } from 'react'; -import { useRouter } from 'next/router'; -import { useForm, Controller } from 'react-hook-form'; -import { Button } from '@chakra-ui/button'; -import { useToast, Flex, Spacer, Box } from '@chakra-ui/react'; - -import { billsCollection } from '@Modules/Bill/constants/FirestoreCollections'; -import { Bill } from '@Modules/Bill/interfaces/Bill.interface'; -import { BillTypes, BillStatus } from '@Modules/Bill/constants/Types'; -import { Input, MoneyInput, Select, DatePicker } from '@Components'; -import { useUser } from '@Modules/Authentication/context/UserContext'; - -const MONTHS_DICT = { - 0: 'Janeiro', - 1: 'Fevereiro', - 2: 'Março', - 3: 'Abril', - 4: 'Maio', - 5: 'Junho', - 6: 'Julho', - 7: 'Agosto', - 8: 'Setembro', - 9: 'Outubro', - 10: 'Novembro', - 11: 'Dezembro', -}; - -interface FormBillProps { - billId?: string; -} - -const FormBill = ({ billId }: FormBillProps) => { - const { - handleSubmit, - register, - setValue, - control, - formState: { errors, isSubmitting }, - } = useForm(); - - const router = useRouter(); - const toast = useToast(); - const { userId } = useUser(); - - const [foundBill, setFoundBill] = useState(); - - const onSubmit = async values => { - if (!userId) return; - - const dueDate = new Date(values.dueDate); - dueDate.setHours(3, 0, 0, 0); - - const bill: Bill = { - name: values.name, - description: values.description ?? '', - value: Number(values.value), - dueDate: dueDate.getTime(), - year: +values.year, - status: billId ? foundBill?.status : BillStatus.PENDING, - month: +values.month, - type: values.type, - createdAt: new Date().getTime(), - userId, - }; - - try { - if (billId) { - await billsCollection.doc(billId).update(bill); - } else { - await billsCollection.add(bill); - } - toast({ - description: 'Bill successful submited!', - status: 'success', - }); - - router.push('/'); - } catch (error) { - console.log(error); - } - }; - - useEffect(() => { - const findBill = async () => { - if (!billId) return; - - const billDoc = await billsCollection.doc(billId).get(); - if (billDoc.exists) { - setFoundBill({ id: billDoc.id, ...billDoc.data() } as Bill); - } else { - toast({ - description: 'Bill not found!', - status: 'error', - }); - } - }; - - findBill(); - }, [billId, toast]); - - useEffect(() => { - setValue('name', foundBill?.name); - setValue('dueDate', foundBill?.dueDate); - setValue('year', foundBill?.year); - setValue('month', foundBill?.month); - setValue('type', foundBill?.type); - setValue('value', foundBill?.value); - }, [foundBill]); - - const years = useMemo(() => { - const finalYears = []; - const beginYear = 2020; - - for (let yearCount = 0; yearCount < 5; yearCount++) { - finalYears.push({ - value: beginYear + yearCount, - label: `${beginYear + yearCount}`, - }); - } - - return finalYears; - }, []); - - const months = useMemo(() => { - const finalMonths = []; - - for (let monthCount = 0; monthCount <= 11; monthCount++) { - finalMonths.push({ - label: `${MONTHS_DICT[monthCount]}`, - value: monthCount, - }); - } - - return finalMonths; - }, []); - - const types = [ - { - label: 'Expense', - value: BillTypes.EXPENSE, - }, - { - label: 'Income', - value: BillTypes.INCOME, - }, - ]; - - return ( - -

- -

- - - - ( - field.onChange(date)} - selected={field.value} - style={{ marginBottom: '10px' }} - /> - )} - /> - - - - - - - - - - - Submit - - - - - ); -}; - -export default FormBill; diff --git a/modules/Bill/container/ListBills/index.tsx b/modules/Bill/container/ListBills/index.tsx deleted file mode 100644 index 5ccce41..0000000 --- a/modules/Bill/container/ListBills/index.tsx +++ /dev/null @@ -1,62 +0,0 @@ -import { useCallback, useEffect, useState } from 'react'; -import { useToast } from '@chakra-ui/react'; - -import { billsCollection } from '@Modules/Bill/constants/FirestoreCollections'; -import { Bill } from '@Modules/Bill/interfaces/Bill.interface'; -import BillItem from '@Modules/Bill/components/BillItem'; -import BillFilters from '@Modules/Bill/components/BillFilters'; -import StateMonth from '@Modules/Bill/components/StateMonth'; -import { useUser } from '@Modules/Authentication/context/UserContext'; - -const ListBills = () => { - const { userId } = useUser(); - - const [bills, setBills] = useState([]); - const [filters, setFilters] = useState({ - year: new Date().getFullYear(), - month: new Date().getMonth(), - }); - - const loadBills = useCallback(() => { - if (!userId) return; - - billsCollection - .where('userId', '==', userId) - .where('year', '==', filters?.year) - .where('month', '==', filters?.month) - .onSnapshot(({ docs }) => { - setBills(docs.map(bill => ({ id: bill.id, ...bill.data() } as Bill))); - }); - }, [filters]); - - useEffect(() => { - loadBills(); - }, [filters]); - - useEffect(() => { - loadBills(); - }, []); - - const onChange = (target, value) => { - setFilters(oldFilters => ({ - ...oldFilters, - [target]: value, - })); - }; - - const toast = useToast(); - - return ( -

- onChange(target, value)} from={2020} to={2024} /> - - - - {bills.map(bill => ( - - ))} -

- ); -}; - -export default ListBills; diff --git a/modules/Bill/container/ListBills/list-bills.container.tsx b/modules/Bill/container/ListBills/list-bills.container.tsx new file mode 100644 index 0000000..fde4906 --- /dev/null +++ b/modules/Bill/container/ListBills/list-bills.container.tsx @@ -0,0 +1,109 @@ +import React, { useCallback, useEffect, useMemo, useRef, useState } from 'react'; +import { Box, Button, Skeleton, Stack, useToast } from '@chakra-ui/react'; + +import { billsCollection } from '@Modules/Bill/constants/FirestoreCollections'; +import { Bill } from '@Modules/Bill/interfaces/Bill.interface'; +import { BillItem } from '@Modules/Bill/components/BillItem/bill-item.component'; +import BillFilters from '@Modules/Bill/components/BillFilters'; +import { StatsMonth } from '@Modules/Bill/components/StatsMonth/stats-month.component'; +import { useUser } from '@Modules/Authentication/context/UserContext'; +import { BillTypes } from '@Modules/Bill/constants/Types'; +import { CopyBill } from '@Modules/Bill/components/CopyBill/copy-bill.component'; +import { DeleteBill } from '@Modules/Bill/components/DeleteBill/delete-bill.component'; + +export const ListBillsContainer = () => { + const { userId } = useUser(); + const [isLoaded, setIsLoaded] = useState(false); + const [bills, setBills] = useState([]); + const [filters, setFilters] = useState({ + year: new Date().getFullYear(), + month: new Date().getMonth(), + }); + const [billId, setBillId] = useState(); + + const copyBillModal = useRef(false); + const deleteBillModal = useRef(false); + + const loadBills = useCallback(() => { + if (!userId) return; + + const { year, month } = filters; + const startDate = new Date(year, month, 1); + const endDate = new Date(year, month + 1, 0); + + billsCollection + .where('userId', '==', userId) + .where('dueDate', '>=', startDate.getTime()) + .where('dueDate', '<=', endDate.getTime()) + .orderBy('dueDate', 'desc') + .onSnapshot(({ docs }) => { + setIsLoaded(true); + setBills(docs.map(bill => ({ id: bill.id, ...bill.data() } as Bill))); + }); + }, [filters, userId]); + + useEffect(() => { + loadBills(); + }, [filters, loadBills]); + + useEffect(() => { + loadBills(); + }, [loadBills]); + + const onChange = (target, value) => { + setFilters(oldFilters => ({ + ...oldFilters, + [target]: value, + })); + }; + + const toast = useToast(); + + const income = useMemo(() => { + return ( + bills.filter(bill => bill.type === BillTypes.INCOME).reduce((prev, current) => (prev += current.value), 0) ?? 0 + ); + }, [bills]); + + const expense = useMemo(() => { + return ( + bills.filter(bill => bill.type === BillTypes.EXPENSE).reduce((prev, current) => (prev += current.value), 0) ?? 0 + ); + }, [bills]); + + const onCopyBill = billId => { + copyBillModal.current = true; + setBillId(billId); + }; + + const onCloseCopyBill = () => { + copyBillModal.current = false; + setBillId(undefined); + }; + + const onDeleteBill = billId => { + deleteBillModal.current = true; + setBillId(billId); + }; + + const onCloseDeleteBill = () => { + deleteBillModal.current = false; + setBillId(undefined); + }; + + return ( +

+ + + onChange(target, value)} from={2020} to={2024} /> + + + + + {bills.map(bill => ( + + ))} + +

+ ); +}; diff --git a/modules/Bill/interfaces/Bill.interface.ts b/modules/Bill/interfaces/Bill.interface.ts index e095fa1..e691c80 100644 --- a/modules/Bill/interfaces/Bill.interface.ts +++ b/modules/Bill/interfaces/Bill.interface.ts @@ -6,14 +6,13 @@ interface BillMetadata { export interface Bill { id?: string; name: string; - description: string; + description?: string; value: number; type: 'INCOME' | 'EXPENSE'; status: string; dueDate: number; - year: number; - month: number; metadata?: BillMetadata; createdAt: number; userId: string; + category?: string; } diff --git a/modules/Category/.gitkeep b/modules/Category/.gitkeep deleted file mode 100644 index e69de29..0000000 diff --git a/next-env.d.ts b/next-env.d.ts index c6643fd..9bc3dd4 100644 --- a/next-env.d.ts +++ b/next-env.d.ts @@ -1,3 +1,6 @@ /// /// /// + +// NOTE: This file should not be edited +// see https://nextjs.org/docs/basic-features/typescript for more information. diff --git a/next.config.js b/next.config.js index 0d60710..25617c2 100644 --- a/next.config.js +++ b/next.config.js @@ -1,3 +1,6 @@ module.exports = { reactStrictMode: true, + experimental: { + esmExternals: false + } } diff --git a/package.json b/package.json index 02d3e62..a959826 100644 --- a/package.json +++ b/package.json @@ -4,7 +4,7 @@ "private": true, "scripts": { "dev": "next dev", - "build": "next build", + "build": "NODE_OPTIONS=--openssl-legacy-provider next build", "start": "next start", "lint": "eslint \"**/*.{ts,tsx}\"" }, @@ -14,13 +14,16 @@ "@chakra-ui/react": "^1.6.6", "@emotion/react": "^11", "@emotion/styled": "^11", + "@hookform/resolvers": "^2.8.2", "firebase": "^8.9.1", "framer-motion": "^4", - "next": "11.0.1", - "react": "17.0.2", + "next": "^12.0.0", + "react": "^17.0.2", "react-datepicker": "^4.2.1", "react-dom": "17.0.2", - "react-hook-form": "^7.12.2" + "react-hook-form": "^7.12.2", + "react-icons": "^4.12.0", + "yup": "^0.32.10" }, "devDependencies": { "@babel/core": "^7.15.0", @@ -34,6 +37,7 @@ "eslint-import-resolver-babel-module": "^5.3.1", "eslint-plugin-prettier": "^3.4.0", "prettier": "^2.3.2", + "sass": "^1.69.5", "typescript": "^4.3.5" } -} +} \ No newline at end of file diff --git a/pages/_app.tsx b/pages/_app.tsx index e973145..246a96c 100644 --- a/pages/_app.tsx +++ b/pages/_app.tsx @@ -1,16 +1,21 @@ import '../styles/globals.css'; import type { AppProps } from 'next/app'; +import Head from 'next/head'; import { ChakraProvider } from '@chakra-ui/react'; import theme from '@Configs/theme'; import { UserProvider } from '@Modules/Authentication/context/UserContext'; + import 'react-datepicker/dist/react-datepicker.css'; -import './styles.css'; +import './styles.scss'; function MyApp({ Component, pageProps }: AppProps) { return ( - + + + + diff --git a/pages/bill/[billId].tsx b/pages/bill/[billId].tsx index d3c3522..1390395 100644 --- a/pages/bill/[billId].tsx +++ b/pages/bill/[billId].tsx @@ -1,13 +1,16 @@ import { useRouter } from 'next/router'; -import FormBill from '@Modules/Bill/container/FormBill'; +import { FormBillContainer } from '@Modules/Bill/container/FormBill/form-bill.container'; +import withLateralMenu from '@/hoc/withLateralMenu'; -export default function EditBillPage() { +const EditBillPage = () => { const router = useRouter(); const billId: string = String(router.query.billId); return (

- +

); -} +}; + +export default withLateralMenu(EditBillPage); diff --git a/pages/bill/index.tsx b/pages/bill/index.tsx index 3811379..74e90d4 100644 --- a/pages/bill/index.tsx +++ b/pages/bill/index.tsx @@ -1,9 +1,10 @@ -import FormBill from '@Modules/Bill/container/FormBill'; +import { FormBillContainer } from '@Modules/Bill/container/FormBill/form-bill.container'; +import { LateralMenu } from '@Components'; export default function NewBillPage() { return ( -

- -

+ + + ); } diff --git a/pages/forgot.tsx b/pages/forgot.tsx deleted file mode 100644 index 43a21ba..0000000 --- a/pages/forgot.tsx +++ /dev/null @@ -1,14 +0,0 @@ -import { useRouter } from 'next/router'; -import { Box } from '@chakra-ui/react'; - -import FormForgotPassword from '@Authentication/container/FormForgotPassword'; - -export default function Home() { - const router = useRouter(); - - return ( - - - - ); -} diff --git a/pages/index.tsx b/pages/index.tsx index b8f9a6c..d7056c1 100644 --- a/pages/index.tsx +++ b/pages/index.tsx @@ -1,26 +1,12 @@ -import { useRouter } from 'next/router'; -import { Button } from '@chakra-ui/button'; -import { Box } from '@chakra-ui/react'; - import withAuth from '@/hoc/withAuth'; -import { auth } from '@Configs/Firebase'; - -import ListBills from '../modules/Bill/container/ListBills'; +import { LateralMenu } from '@Components/LateralMenu'; +import { ListBillsContainer } from '@Modules/Bill/container/ListBills/list-bills.container'; const Dashboard = () => { - const router = useRouter(); - return ( - - router.push('bill')}> - Create new bill - - - auth.signOut()}> - SignOut - - - + + + ); }; diff --git a/pages/login.tsx b/pages/login.tsx index 7be72d8..5b0ed3c 100644 --- a/pages/login.tsx +++ b/pages/login.tsx @@ -1,15 +1,14 @@ import { useRouter } from 'next/router'; -import { Button } from '@chakra-ui/button'; import { Box } from '@chakra-ui/react'; -import FormLogin from '@Authentication/container/FormLogin'; +import { FormLoginContainer } from '@Authentication/container/FormLogin/form-login.container'; export default function Home() { const router = useRouter(); return ( - - + + ); } diff --git a/pages/signup.tsx b/pages/signup.tsx deleted file mode 100644 index ed9e21a..0000000 --- a/pages/signup.tsx +++ /dev/null @@ -1,14 +0,0 @@ -import { useRouter } from 'next/router'; -import { Box } from '@chakra-ui/react'; - -import FormSignUp from '@Modules/Authentication/container/FormSignUp'; - -export default function Home() { - const router = useRouter(); - - return ( - - - - ); -} diff --git a/pages/styles.css b/pages/styles.css deleted file mode 100644 index 38c8365..0000000 --- a/pages/styles.css +++ /dev/null @@ -1,194 +0,0 @@ -.light-theme{ - --light-gray: var(--chakra-colors-gray-200); - --gray: var(--chakra-colors-gray-300); - --blue700:var(--chakra-colors-blue-600); - --blue600: var(--chakra-colors-blue-500); - --blue500: var(--chakra-colors-gray-400); - --blue400: var(--chakra-colors-gray-300); - --blue300: var(--chakra-colors-gray-200); - --blue200: var(--chakra-colors-gray-200); - --blue100: var(--chakra-colors-gray-100); - --monthBackground: var(--chakra-colors-white); - --text:var(--chakra-colors-black); - --negative-text:var(--chakra-colors-white); -} -.dark-theme{ - --light-gray: var(--chakra-colors-gray-600); - --gray: var(--chakra-colors-gray-500); - --blue700: var(--chakra-colors-blue-600); - --blue600: var(--chakra-colors-blue-300); - --blue500: var(--chakra-colors-gray-500); - --blue400: var(--chakra-colors-gray-600); - --blue300: var(--chakra-colors-gray-700); - --blue200: var(--chakra-colors-gray-600); - --blue100: var(--chakra-colors-gray-800); - --monthBackground: var(--chakra-colors-gray-700); - --text:var(--chakra-colors-gray-200); - --negative-text:var(--chakra-colors-black); -} - -/* if you dont want to use chakra's theme use this class in the wrapping div. These are the exact original values */ -.light-theme-original{ - --light-gray: #cccccc; - --gray: #b3b3b3; - --blue700:#2a69ac; - --blue600: #3182ce; - --blue500: #a0aec0; - --blue400: #cbd5e0; - --blue300: #e2e8f0; - --blue200: #edf2f7; - --blue100: #f7fafc; -} -.react-datepicker { - font-family: unset; - font-size: 0.9rem; - border-color: var(--light-gray); -} - - -.react-datepicker.dark-theme, -.react-datepicker.light-theme { - width: 100%; -} - -.react-datepicker-wrapper { - width: 100%; - display: block; - border: 0px solid transparent; -} - -.react-datepicker-wrapper > .react-datepicker__input-container { - width: 100%; - display: block; - border: 0px solid transparent; -} - -.react-datepicker__input-container { -font-size: 1rem; -padding-left: 1rem; -padding-right: 1rem; -height: 2.5rem; -border-radius: 0.25rem; -border: 1px solid; -border-color: var(--light-gray); -} -.react-datapicker__input-text { - background-color: transparent; -} - -.react-datepicker__input-container:hover { -border-color: var(--gray) -} -.react-datepicker__input-container:focus-within { -z-index: 1; -border-color: var(--blue600); -border-width: 1.5px; -box-shadow: 0 0 0 1px var(--blue600); -} - -.react-datepicker__input-container > input { -width: 100%; -height: 100%; -outline: 0; -} - -.react-datepicker__navigation--next--with-time:not(.react-datepicker__navigation--next--with-today-button) { -right: 90px; -} - -.react-datepicker__navigation--previous, -.react-datepicker__navigation--next { -height: 8px; -} - -.react-datepicker__navigation--previous { -border-right-color: var(--blue400); -} - -.react-datepicker__navigation--previous:hover { -border-right-color: var(--blue500); -} - -.react-datepicker__navigation--next { -border-left-color: var(--blue400); - -} - -.react-datepicker__navigation--next:hover { -border-left-color: var(--blue500); -} - -.react-datepicker__header { -background-color: var(--blue100); -} - -.react-datepicker__header, -.react-datepicker__time-container { -border-color: var(--blue300); -} - -.react-datepicker__current-month, -.react-datepicker-time__header, -.react-datepicker-year-header { -font-size: inherit; -font-weight: 600; -color: var(--text) -} - -.react-datepicker__month{ - background-color: var(--monthBackground); - margin:0; - padding:0.4rem; -} - -.react-datepicker__time-container .react-datepicker__time .react-datepicker__time-box ul.react-datepicker__time-list li.react-datepicker__time-list-item { -margin: 0 1px 0 0; - height: auto; - padding: 7px 10px; -} - -.react-datepicker__time-container .react-datepicker__time .react-datepicker__time-box ul.react-datepicker__time-list li.react-datepicker__time-list-item:hover { - background: var(--blue200); -} - -.react-datepicker__day { - color: var(--text) -} - -.react-datepicker__day:hover { - background: var(--blue200); -} - -.react-datepicker__day-name { - color:var(--text) -} - -.react-datepicker__day--selected, -.react-datepicker__day--in-selecting-range, -.react-datepicker__day--in-range, -.react-datepicker__month-text--selected, -.react-datepicker__month-text--in-selecting-range, -.react-datepicker__month-text--in-range, -.react-datepicker__time-container .react-datepicker__time .react-datepicker__time-box ul.react-datepicker__time-list li.react-datepicker__time-list-item--selected { -background: var(--blue600); -font-weight: normal; -color:var(--negative-text); -} - -.react-datepicker__time-container .react-datepicker__time .react-datepicker__time-box ul.react-datepicker__time-list li.react-datepicker__time-list-item--selected:hover { -background: var(--blue700); -} - -.react-datepicker__close-icon::after { - background-color: unset; - border-radius: unset; - font-size: 1.5rem; - font-weight: bold; - color: var(--light-gray); - height: 20px; - width: 20px; -} - -.react-datepicker__close-icon::after:hover { - color: var(--gray) -} \ No newline at end of file diff --git a/pages/styles.scss b/pages/styles.scss new file mode 100644 index 0000000..d3c7a32 --- /dev/null +++ b/pages/styles.scss @@ -0,0 +1,214 @@ +.light-theme { + --light-gray: var(--chakra-colors-gray-200); + --gray: var(--chakra-colors-gray-300); + --blue700: var(--chakra-colors-blue-600); + --blue600: var(--chakra-colors-blue-500); + --blue500: var(--chakra-colors-gray-400); + --blue400: var(--chakra-colors-gray-300); + --blue300: var(--chakra-colors-gray-200); + --blue200: var(--chakra-colors-gray-200); + --blue100: var(--chakra-colors-gray-100); + --monthBackground: var(--chakra-colors-white); + --text: var(--chakra-colors-black); + --negative-text: var(--chakra-colors-white); +} + +.dark-theme { + --light-gray: var(--chakra-colors-gray-600); + --gray: var(--chakra-colors-gray-500); + --blue700: var(--chakra-colors-blue-600); + --blue600: var(--chakra-colors-blue-300); + --blue500: var(--chakra-colors-gray-500); + --blue400: var(--chakra-colors-gray-600); + --blue300: var(--chakra-colors-gray-700); + --blue200: var(--chakra-colors-gray-600); + --blue100: var(--chakra-colors-gray-800); + --monthBackground: var(--chakra-colors-gray-700); + --text: var(--chakra-colors-gray-200); + --negative-text: var(--chakra-colors-black); +} + +/* if you dont want to use chakra's theme use this class in the wrapping div. These are the exact original values */ +.light-theme-original { + --light-gray: #cccccc; + --gray: #b3b3b3; + --blue700: #2a69ac; + --blue600: #3182ce; + --blue500: #a0aec0; + --blue400: #cbd5e0; + --blue300: #e2e8f0; + --blue200: #edf2f7; + --blue100: #f7fafc; +} + +html { + height: 100%; +} + +.react-datepicker { + font-family: unset; + font-size: 0.9rem; + border-color: var(--light-gray); +} + + +.react-datepicker.dark-theme, +.react-datepicker.light-theme { + width: 100%; +} + +.react-datepicker-wrapper { + width: 100%; + display: block; + border: 0px solid transparent; +} + +.react-datepicker-wrapper > .react-datepicker__input-container { + width: 100%; + display: block; + border: 0px solid transparent; +} + +.react-datepicker__input-container { + /* font-size: 1rem; + height: 2.5rem; + border-radius: 0.25rem; + border: 1px solid; + border-color: var(--light-gray); */ + +} + +.react-datepicker__input-container > input { + width: 100%; + min-width: 0px; + outline: 2px solid transparent; + outline-offset: 2px; + position: relative; + -webkit-appearance: none; + -moz-appearance: none; + -ms-appearance: none; + appearance: none; + transition-property: var(--chakra-transition-property-common); + transition-duration: var(--chakra-transition-duration-normal); + font-size: var(--chakra-fontSizes-md); + -webkit-padding-start: var(--chakra-space-4); + padding-inline-start: var(--chakra-space-4); + -webkit-padding-end: var(--chakra-space-4); + padding-inline-end: var(--chakra-space-4); + height: var(--chakra-sizes-10); + border-radius: var(--chakra-radii-md); + border: 1px solid var(--chakra-colors-whiteAlpha-300); + background: transparent; + + &:focus { + z-index: 1; + border-color: #63b3ed; + box-shadow: 0 0 0 1px #63b3ed; + } + + &.hasError { + border-color: #FC8181; + box-shadow: 0 0 0 1px #FC8181; + } +} + +.react-datepicker__navigation--next--with-time:not(.react-datepicker__navigation--next--with-today-button) { + right: 90px; +} + +.react-datepicker__navigation--previous, +.react-datepicker__navigation--next { + height: 45px; +} + +.react-datepicker__navigation--previous { + border-right-color: var(--blue400); +} + +.react-datepicker__navigation--previous:hover { + border-right-color: var(--blue500); +} + +.react-datepicker__navigation--next { + border-left-color: var(--blue400); + +} + +.react-datepicker__navigation--next:hover { + border-left-color: var(--blue500); +} + +.react-datepicker__header { + background-color: var(--blue100); +} + +.react-datepicker__header, +.react-datepicker__time-container { + border-color: var(--blue300); +} + +.react-datepicker__current-month, +.react-datepicker-time__header, +.react-datepicker-year-header { + font-size: inherit; + font-weight: 600; + color: var(--text) +} + +.react-datepicker__month { + background-color: var(--monthBackground); + margin: 0; + padding: 0.4rem; +} + +.react-datepicker__time-container .react-datepicker__time .react-datepicker__time-box ul.react-datepicker__time-list li.react-datepicker__time-list-item { + margin: 0 1px 0 0; + height: auto; + padding: 7px 10px; +} + +.react-datepicker__time-container .react-datepicker__time .react-datepicker__time-box ul.react-datepicker__time-list li.react-datepicker__time-list-item:hover { + background: var(--blue200); +} + +.react-datepicker__day { + color: var(--text) +} + +.react-datepicker__day:hover { + background: var(--blue200); +} + +.react-datepicker__day-name { + color: var(--text) +} + +.react-datepicker__day--selected, +.react-datepicker__day--in-selecting-range, +.react-datepicker__day--in-range, +.react-datepicker__month-text--selected, +.react-datepicker__month-text--in-selecting-range, +.react-datepicker__month-text--in-range, +.react-datepicker__time-container .react-datepicker__time .react-datepicker__time-box ul.react-datepicker__time-list li.react-datepicker__time-list-item--selected { + background: var(--blue600); + font-weight: normal; + color: var(--negative-text); +} + +.react-datepicker__time-container .react-datepicker__time .react-datepicker__time-box ul.react-datepicker__time-list li.react-datepicker__time-list-item--selected:hover { + background: var(--blue700); +} + +.react-datepicker__close-icon::after { + background-color: unset; + border-radius: unset; + font-size: 1.5rem; + font-weight: bold; + color: var(--light-gray); + height: 20px; + width: 20px; +} + +.react-datepicker__close-icon::after:hover { + color: var(--gray) +} \ No newline at end of file diff --git a/public/favicon.ico b/public/favicon.ico index 718d6fea4835ec2d246af9800eddb7ffb276240c..c678ea8ebfa6f2ce22dd908a6ba1ac060fa25ed8 100644 GIT binary patch literal 719 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 LrJugUA?W`A8`#=m diff --git a/public/logo.png b/public/logo.png new file mode 100644 index 0000000000000000000000000000000000000000..51063fbfc2e9ae3efcde6692d381d26e1de194ea GIT binary patch literal 1218 zcmV;z1U>tSP)9DUpa0Audv?O$FIamgN%wrjJ7ng)JHg4fG(}3e=EK5Pt(U>2XM%6ho}F zah0XO5}ktyU>Wu>&x%2gameM|-gkWdlI8Wc{L|6qxSgim#^W_zsn!AWL^c?RPP}N_l!2|DQZC;HGJ(T zDnTAMbj>L0K%R8iT2WMiJnfJ*qNo9R*5PVHQ32vRR81)2K|&2v3yNrv&_mRKA{Hdp z@T8-N1c^N~$tdDLQVmNgiYSoOLz0Lh1|-*Tq@joa$vqTFDA_@z3`5E~vVusvxsb4) zY#>q}<>X#h77*!A&T_6VIf$0mlya>zDTub0!gH)Q8Hm<*@KUck35fPTJV?3z=pfoL zno?~?RFJk{G^N;{XdrFFXo|gEQ9#;?(G+w0f`hajqbb&Q1_e1P7)>#@HyFrK!)OY< z-9bQ(Dn?Vt?e{)DB*bENR#)qf?~tn(-hU6rUwaikaSqJ)_!MuD2e)r~gPfe5#m=`k zvm9*m;^hy$G1%VL7Jj>P2fodG{PHVH@M!mk&FNw|RG&`1GmE{Swy?XoiBu8erOO|| zH*Wur3m;6^@0&LW(}*Gwg9QO$noy)-uwWoe1Bzq}78Ha@Mv;!ef`c%LC>k(W6c8o} zMGFRt2ErtuXu@DoL0C={Z5S*%2+M(@5rZWGVJT6xVz6W&ECq^Y43-px#YEAL!IFcp z7$|MPU}nA7cgWPKOBZqGi!1Q$*VUVNe)etnmK%d*1!193e3O8|vL8Wpe|Q61pM8#; zNx@(ujxo%MA_;?uISMxiiZl!+>Nxe3C=xN4xHCDVK#_{UM4sy;CW>SXCiZMVF;Jvq zFwy7B3W=ftgNZ+*TnH2`7)-@E7kyAPVK5aS>{(E>VK6ly>}gOmVlY)8>`73xVlZ_e z?Eg?SV=$E<>@XDV7)&h)+mF%)45t1+>=0%0%MSji-^SIB!Lq+&Sb8|sH(710fC#IA z2&;eytAGfrfC!5qW0a&cw$7LeB@sD?@2zp}7D^(r#t!Z7F}qS<-bN{NW_)f`t=KoJ zY8%!rpp-QOv&_%aM_JvqYB({tic*&9`;KMq9lUJze`9pMzhoR1QA(G?)$aP;Pns{y z!S8SM2J;TCMsXdK;$_S>{xS>QjcWMN)sOo5DU5M*^=tE;`jOZGr2v_6J@E?8+&b|9 gD`&^me;!Qz4O1={hOD~nwg3PC07*qoM6N<$f{e%^WB>pF literal 0 HcmV?d00001 diff --git a/public/vercel.svg b/public/vercel.svg deleted file mode 100644 index fbf0e25..0000000 --- a/public/vercel.svg +++ /dev/null @@ -1,4 +0,0 @@ - \ No newline at end of file diff --git a/tsconfig.json b/tsconfig.json index eef1fa1..d4285b4 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -45,7 +45,5 @@ "**/*.ts", "**/*.tsx" ], - "exclude": [ - "node_modules" - ] + "exclude": ["node_modules", ".next"] } diff --git a/yarn.lock b/yarn.lock index a8e80c1..454898a 100644 --- a/yarn.lock +++ b/yarn.lock @@ -16,6 +16,14 @@ dependencies: "@babel/highlight" "^7.14.5" +"@babel/code-frame@^7.22.13": + version "7.22.13" + resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.22.13.tgz#e3c1c099402598483b7a8c46a721d1038803755e" + integrity "sha1-48HAmUAlmEg7eoxGpyHRA4gDdV4= sha512-XktuhWlJ5g+3TJXc5upd9Ks1HutSArik6jf2eAjYFyIOf4ej3RN+184cZbzDvbPnuTJIUhPKKJE3cIsYTiAT3w==" + dependencies: + "@babel/highlight" "^7.22.13" + chalk "^2.4.2" + "@babel/compat-data@^7.15.0": version "7.15.0" resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.15.0.tgz#2dbaf8b85334796cafbb0f5793a90a2fc010b176" @@ -51,6 +59,16 @@ jsesc "^2.5.1" source-map "^0.5.0" +"@babel/generator@^7.23.3": + version "7.23.3" + resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.23.3.tgz#86e6e83d95903fbe7613f448613b8b319f330a8e" + integrity "sha1-huboPZWQP752E/RIYTuLMZ8zCo4= sha512-keeZWAV4LU3tW0qRi19HRpabC/ilM0HRBBzf9/k8FFiG4KVpiv0FIy4hHfLfFQZNhziCTPTmd59zoyv6DNISzg==" + dependencies: + "@babel/types" "^7.23.3" + "@jridgewell/gen-mapping" "^0.3.2" + "@jridgewell/trace-mapping" "^0.3.17" + jsesc "^2.5.1" + "@babel/helper-compilation-targets@^7.15.0": version "7.15.0" resolved "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.15.0.tgz#973df8cbd025515f3ff25db0c05efc704fa79818" @@ -61,28 +79,25 @@ browserslist "^4.16.6" semver "^6.3.0" -"@babel/helper-function-name@^7.14.5": - version "7.14.5" - resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.14.5.tgz#89e2c474972f15d8e233b52ee8c480e2cfcd50c4" - integrity sha512-Gjna0AsXWfFvrAuX+VKcN/aNNWonizBj39yGwUzVDVTlMYJMK2Wp6xdpy72mfArFq5uK+NOuexfzZlzI1z9+AQ== - dependencies: - "@babel/helper-get-function-arity" "^7.14.5" - "@babel/template" "^7.14.5" - "@babel/types" "^7.14.5" +"@babel/helper-environment-visitor@^7.22.20": + version "7.22.20" + resolved "https://registry.yarnpkg.com/@babel/helper-environment-visitor/-/helper-environment-visitor-7.22.20.tgz#96159db61d34a29dba454c959f5ae4a649ba9167" + integrity "sha1-lhWdth00op26RUyVn1rkpkm6kWc= sha512-zfedSIzFhat/gFhWfHtgWvlec0nqB9YEIVrpuwjruLlXfUSnA8cJB0miHKwqDnQ7d32aKo2xt88/xZptwxbfhA==" -"@babel/helper-get-function-arity@^7.14.5": - version "7.14.5" - resolved "https://registry.yarnpkg.com/@babel/helper-get-function-arity/-/helper-get-function-arity-7.14.5.tgz#25fbfa579b0937eee1f3b805ece4ce398c431815" - integrity sha512-I1Db4Shst5lewOM4V+ZKJzQ0JGGaZ6VY1jYvMghRjqs6DWgxLCIyFt30GlnKkfUeFLpJt2vzbMVEXVSXlIFYUg== +"@babel/helper-function-name@^7.23.0": + version "7.23.0" + resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.23.0.tgz#1f9a3cdbd5b2698a670c30d2735f9af95ed52759" + integrity "sha1-H5o829WyaYpnDDDSc1+a+V7VJ1k= sha512-OErEqsrxjZTJciZ4Oo+eoZqeW9UIiOcuYKRJA4ZAgV9myA+pOXhhmpfNCKjEH/auVfEYVFJ6y1Tc4r0eIApqiw==" dependencies: - "@babel/types" "^7.14.5" + "@babel/template" "^7.22.15" + "@babel/types" "^7.23.0" -"@babel/helper-hoist-variables@^7.14.5": - version "7.14.5" - resolved "https://registry.yarnpkg.com/@babel/helper-hoist-variables/-/helper-hoist-variables-7.14.5.tgz#e0dd27c33a78e577d7c8884916a3e7ef1f7c7f8d" - integrity sha512-R1PXiz31Uc0Vxy4OEOm07x0oSjKAdPPCh3tPivn/Eo8cvz6gveAeuyUUPB21Hoiif0uoPQSSdhIPS3352nvdyQ== +"@babel/helper-hoist-variables@^7.22.5": + version "7.22.5" + resolved "https://registry.yarnpkg.com/@babel/helper-hoist-variables/-/helper-hoist-variables-7.22.5.tgz#c01a007dac05c085914e8fb652b339db50d823bb" + integrity "sha1-wBoAfawFwIWRTo+2UrM521DYI7s= sha512-wGjk9QZVzvknA6yKIUURb8zY3grXCcOZt+/7Wcy8O2uctxhplmUPkOdlgoNhmdVee2c92JXbf1xpMtVNbfoxRw==" dependencies: - "@babel/types" "^7.14.5" + "@babel/types" "^7.22.5" "@babel/helper-member-expression-to-functions@^7.15.0": version "7.15.0" @@ -148,11 +163,28 @@ dependencies: "@babel/types" "^7.14.5" +"@babel/helper-split-export-declaration@^7.22.6": + version "7.22.6" + resolved "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.22.6.tgz#322c61b7310c0997fe4c323955667f18fcefb91c" + integrity "sha1-MixhtzEMCZf+TDI5VWZ/GPzvuRw= sha512-AsUnxuLhRYsisFiaJwvp1QF+I3KjD5FOxut14q/GzovUe6orHLesW2C7d754kRm53h5gqrz6sFl6sxc4BVtE/g==" + dependencies: + "@babel/types" "^7.22.5" + +"@babel/helper-string-parser@^7.22.5": + version "7.22.5" + resolved "https://registry.yarnpkg.com/@babel/helper-string-parser/-/helper-string-parser-7.22.5.tgz#533f36457a25814cf1df6488523ad547d784a99f" + integrity "sha1-Uz82RXolgUzx32SIUjrVR9eEqZ8= sha512-mM4COjgZox8U+JcXQwPijIZLElkgEpO5rsERVDJTc2qfCDfERyob6k5WegS14SX18IIjv+XD+GrqNumY5JRCDw==" + "@babel/helper-validator-identifier@^7.14.5", "@babel/helper-validator-identifier@^7.14.9": version "7.14.9" resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.14.9.tgz#6654d171b2024f6d8ee151bf2509699919131d48" integrity sha512-pQYxPY0UP6IHISRitNe8bsijHex4TWZXi2HwKVsjPiltzlhse2znVcm9Ace510VT1kxIHjGJCZZQBX2gJDbo0g== +"@babel/helper-validator-identifier@^7.22.20": + version "7.22.20" + resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.22.20.tgz#c4ae002c61d2879e724581d96665583dbc1dc0e0" + integrity "sha1-xK4ALGHSh55yRYHZZmVYPbwdwOA= sha512-Y4OZ+ytlatR8AI+8KZfKuL5urKp7qey08ha31L8b3BwewJAoJamTzyvxPR/5D+KkdJCGPq/+8TukHBlY10FX9A==" + "@babel/helper-validator-option@^7.14.5": version "7.14.5" resolved "https://registry.yarnpkg.com/@babel/helper-validator-option/-/helper-validator-option-7.14.5.tgz#6e72a1fff18d5dfcb878e1e62f1a021c4b72d5a3" @@ -176,12 +208,26 @@ chalk "^2.0.0" js-tokens "^4.0.0" +"@babel/highlight@^7.22.13": + version "7.22.20" + resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.22.20.tgz#4ca92b71d80554b01427815e06f2df965b9c1f54" + integrity "sha1-TKkrcdgFVLAUJ4FeBvLfllucH1Q= sha512-dkdMCN3py0+ksCgYmGG8jKeGA/8Tk+gJwSYYlFGxG5lmhfKNoAy004YpLxpS1W2J8m/EK2Ew+yOs9pVRwO89mg==" + dependencies: + "@babel/helper-validator-identifier" "^7.22.20" + chalk "^2.4.2" + js-tokens "^4.0.0" + "@babel/parser@^7.14.5", "@babel/parser@^7.15.0": version "7.15.3" resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.15.3.tgz#3416d9bea748052cfcb63dbcc27368105b1ed862" integrity sha512-O0L6v/HvqbdJawj0iBEfVQMc3/6WP+AeOsovsIgBFyJaG+W2w7eqvZB7puddATmWuARlm1SX7DwxJ/JJUnDpEA== -"@babel/plugin-syntax-jsx@^7.12.13": +"@babel/parser@^7.22.15", "@babel/parser@^7.23.3": + version "7.23.3" + resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.23.3.tgz#0ce0be31a4ca4f1884b5786057cadcb6c3be58f9" + integrity "sha1-DOC+MaTKTxiEtXhgV8rctsO+WPk= sha512-uVsWNvlVsIninV2prNz/3lHCb+5CJ+e+IUBfbjToAHODtfGYLfCFuY4AU7TskI+dAKk+njsPiBjq1gKTvZOBaw==" + +"@babel/plugin-syntax-jsx@7.14.5", "@babel/plugin-syntax-jsx@^7.12.13": version "7.14.5" resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.14.5.tgz#000e2e25d8673cce49300517a3eda44c263e4201" integrity sha512-ohuFIsOMXJnbOMRfX7/w7LocdR6R7whhuRD4ax8IipLcLPlZGJKkBxgHp++U4N/vKyU16/YDQr2f5seajD3jIw== @@ -196,10 +242,10 @@ core-js-pure "^3.16.0" regenerator-runtime "^0.13.4" -"@babel/runtime@7.12.5": - version "7.12.5" - resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.12.5.tgz#410e7e487441e1b360c29be715d870d9b985882e" - integrity sha512-plcc+hbExy3McchJCEQG3knOsuh3HH+Prx1P6cLIkET/0dLuQDEnrT+s27Axgc9bqfsmNUNHfscgMUdBpC9xfg== +"@babel/runtime@7.15.4", "@babel/runtime@^7.15.4": + version "7.15.4" + resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.15.4.tgz#fd17d16bfdf878e6dd02d19753a39fa8a8d9c84a" + integrity sha512-99catp6bHCaxr4sJ/DbTGgHS4+Rs2RVd2g7iOap6SLGPDknRK9ztKNsE/Fg6QhSeh1FGE5f6gHGQmvvn3I3xhw== dependencies: regenerator-runtime "^0.13.4" @@ -219,31 +265,32 @@ "@babel/parser" "^7.14.5" "@babel/types" "^7.14.5" -"@babel/traverse@^7.15.0": - version "7.15.0" - resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.15.0.tgz#4cca838fd1b2a03283c1f38e141f639d60b3fc98" - integrity sha512-392d8BN0C9eVxVWd8H6x9WfipgVH5IaIoLp23334Sc1vbKKWINnvwRpb4us0xtPaCumlwbTtIYNA0Dv/32sVFw== +"@babel/template@^7.22.15": + version "7.22.15" + resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.22.15.tgz#09576efc3830f0430f4548ef971dde1350ef2f38" + integrity "sha1-CVdu/Dgw8EMPRUjvlx3eE1DvLzg= sha512-QPErUVm4uyJa60rkI73qneDacvdvzxshT3kksGqlGWYdOTIUOwJ7RDUL8sGqslY1uXWSL6xMFKEXDS3ox2uF0w==" dependencies: - "@babel/code-frame" "^7.14.5" - "@babel/generator" "^7.15.0" - "@babel/helper-function-name" "^7.14.5" - "@babel/helper-hoist-variables" "^7.14.5" - "@babel/helper-split-export-declaration" "^7.14.5" - "@babel/parser" "^7.15.0" - "@babel/types" "^7.15.0" + "@babel/code-frame" "^7.22.13" + "@babel/parser" "^7.22.15" + "@babel/types" "^7.22.15" + +"@babel/traverse@^7.15.0": + version "7.23.3" + resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.23.3.tgz#26ee5f252e725aa7aca3474aa5b324eaf7908b5b" + integrity "sha1-Ju5fJS5yWqeso0dKpbMk6veQi1s= sha512-+K0yF1/9yR0oHdE0StHuEj3uTPzwwbrLGfNOndVJVV2TqA5+j3oljJUb4nmB954FLGjNem976+B+eDuLIjesiQ==" + dependencies: + "@babel/code-frame" "^7.22.13" + "@babel/generator" "^7.23.3" + "@babel/helper-environment-visitor" "^7.22.20" + "@babel/helper-function-name" "^7.23.0" + "@babel/helper-hoist-variables" "^7.22.5" + "@babel/helper-split-export-declaration" "^7.22.6" + "@babel/parser" "^7.23.3" + "@babel/types" "^7.23.3" debug "^4.1.0" globals "^11.1.0" -"@babel/types@7.8.3": - version "7.8.3" - resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.8.3.tgz#5a383dffa5416db1b73dedffd311ffd0788fb31c" - integrity sha512-jBD+G8+LWpMBBWvVcdr4QysjUE4mU/syrhN17o1u3gx0/WzJB1kwiVZAXRtWbsIPOwW8pF/YJV5+nmetPzepXg== - dependencies: - esutils "^2.0.2" - lodash "^4.17.13" - to-fast-properties "^2.0.0" - -"@babel/types@^7.14.5", "@babel/types@^7.14.8", "@babel/types@^7.15.0": +"@babel/types@7.15.0", "@babel/types@^7.14.5", "@babel/types@^7.14.8", "@babel/types@^7.15.0": version "7.15.0" resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.15.0.tgz#61af11f2286c4e9c69ca8deb5f4375a73c72dcbd" integrity sha512-OBvfqnllOIdX4ojTHpwZbpvz4j3EWyjkZEdmjH0/cgsd6QOdSgU8rLSk6ard/pcW7rlmjdVSX/AWOaORR1uNOQ== @@ -251,6 +298,15 @@ "@babel/helper-validator-identifier" "^7.14.9" to-fast-properties "^2.0.0" +"@babel/types@^7.22.15", "@babel/types@^7.22.5", "@babel/types@^7.23.0", "@babel/types@^7.23.3": + version "7.23.3" + resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.23.3.tgz#d5ea892c07f2ec371ac704420f4dcdb07b5f9598" + integrity "sha1-1eqJLAfy7DcaxwRCD03NsHtflZg= sha512-OZnvoH2l8PK5eUvEcUyCt/sXgr/h+UWpVuBbOljwcrAgUl6lpchoQ++PHGyQy1AtYnVA6CEq3y5xeEI10brpXw==" + dependencies: + "@babel/helper-string-parser" "^7.22.5" + "@babel/helper-validator-identifier" "^7.22.20" + to-fast-properties "^2.0.0" + "@chakra-ui/accordion@1.3.5": version "1.3.5" resolved "https://registry.yarnpkg.com/@chakra-ui/accordion/-/accordion-1.3.5.tgz#b150e47ed57d2a3aaf78c86af6dd62bc10dbe4c3" @@ -1199,6 +1255,11 @@ resolved "https://registry.yarnpkg.com/@hapi/hoek/-/hoek-9.2.0.tgz#f3933a44e365864f4dad5db94158106d511e8131" integrity sha512-sqKVVVOe5ivCaXDWivIJYVSaEgdQK9ul7a4Kity5Iw7u9+wBAPbX1RMSnLLmp7O4Vzj0WOWwMAJsTL00xwaNug== +"@hookform/resolvers@^2.8.2": + version "2.8.2" + resolved "https://registry.yarnpkg.com/@hookform/resolvers/-/resolvers-2.8.2.tgz#590dcc23212a659bad08212138261c3950ef09f1" + integrity sha512-oDTGrm7yHxT4VIv4kJcfjvWvozCbdcL0/jrpbAkeo39FYn78XnKOrrGTNmrXdfu+EQVkNIdZ47IYRFManZ4jUA== + "@humanwhocodes/config-array@^0.5.0": version "0.5.0" resolved "https://registry.yarnpkg.com/@humanwhocodes/config-array/-/config-array-0.5.0.tgz#1407967d4c6eecd7388f83acf1eaf4d0c6e58ef9" @@ -1213,25 +1274,62 @@ resolved "https://registry.yarnpkg.com/@humanwhocodes/object-schema/-/object-schema-1.2.0.tgz#87de7af9c231826fdd68ac7258f77c429e0e5fcf" integrity sha512-wdppn25U8z/2yiaT6YGquE6X8sSv7hNMWSXYSSU1jGv/yd6XqjXgTDJ8KP4NgjTXfJ3GbRjeeb8RTV7a/VpM+w== -"@next/env@11.0.1": - version "11.0.1" - resolved "https://registry.yarnpkg.com/@next/env/-/env-11.0.1.tgz#6dc96ac76f1663ab747340e907e8933f190cc8fd" - integrity sha512-yZfKh2U6R9tEYyNUrs2V3SBvCMufkJ07xMH5uWy8wqcl5gAXoEw6A/1LDqwX3j7pUutF9d1ZxpdGDA3Uag+aQQ== +"@jridgewell/gen-mapping@^0.3.2": + version "0.3.3" + resolved "https://registry.yarnpkg.com/@jridgewell/gen-mapping/-/gen-mapping-0.3.3.tgz#7e02e6eb5df901aaedb08514203b096614024098" + integrity sha512-HLhSWOLRi875zjjMG/r+Nv0oCW8umGb0BgEhyX3dDX3egwZtB8PqLnjz3yedt8R5StBrzcg4aBpnh8UA9D1BoQ== + dependencies: + "@jridgewell/set-array" "^1.0.1" + "@jridgewell/sourcemap-codec" "^1.4.10" + "@jridgewell/trace-mapping" "^0.3.9" + +"@jridgewell/resolve-uri@^3.1.0": + version "3.1.1" + resolved "https://registry.yarnpkg.com/@jridgewell/resolve-uri/-/resolve-uri-3.1.1.tgz#c08679063f279615a3326583ba3a90d1d82cc721" + integrity "sha1-wIZ5Bj8nlhWjMmWDujqQ0dgsxyE= sha512-dSYZh7HhCDtCKm4QakX0xFpsRDqjjtZf/kjI/v3T3Nwt5r8/qz/M19F9ySyOqU94SXBmeG9ttTul+YnR4LOxFA==" + +"@jridgewell/set-array@^1.0.1": + version "1.1.2" + resolved "https://registry.yarnpkg.com/@jridgewell/set-array/-/set-array-1.1.2.tgz#7c6cf998d6d20b914c0a55a91ae928ff25965e72" + integrity sha512-xnkseuNADM0gt2bs+BvhO0p78Mk762YnZdsuzFV018NoG1Sj1SCQvpSqa7XUaTam5vAGasABV9qXASMKnFMwMw== + +"@jridgewell/sourcemap-codec@^1.4.10", "@jridgewell/sourcemap-codec@^1.4.14": + version "1.4.15" + resolved "https://registry.yarnpkg.com/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.15.tgz#d7c6e6755c78567a951e04ab52ef0fd26de59f32" + integrity sha512-eF2rxCRulEKXHTRiDrDy6erMYWqNw4LPdQ8UQA4huuxaQsVeRPFl2oM8oDGxMFhJUWZf9McpLtJasDDZb/Bpeg== + +"@jridgewell/trace-mapping@^0.3.17", "@jridgewell/trace-mapping@^0.3.9": + version "0.3.20" + resolved "https://registry.yarnpkg.com/@jridgewell/trace-mapping/-/trace-mapping-0.3.20.tgz#72e45707cf240fa6b081d0366f8265b0cd10197f" + integrity "sha1-cuRXB88kD6awgdA2b4JlsM0QGX8= sha512-R8LcPeWZol2zR8mmH3JeKQ6QRCFb7XgUhV9ZlGhHLGyg4wpPiPZNQOOWhFZhxKw8u//yTbNGI42Bx/3paXEQ+Q==" + dependencies: + "@jridgewell/resolve-uri" "^3.1.0" + "@jridgewell/sourcemap-codec" "^1.4.14" + +"@napi-rs/triples@^1.0.3": + version "1.0.3" + resolved "https://registry.yarnpkg.com/@napi-rs/triples/-/triples-1.0.3.tgz#76d6d0c3f4d16013c61e45dfca5ff1e6c31ae53c" + integrity sha512-jDJTpta+P4p1NZTFVLHJ/TLFVYVcOqv6l8xwOeBKNPMgY/zDYH/YH7SJbvrr/h1RcS9GzbPcLKGzpuK9cV56UA== + +"@next/env@12.0.0": + version "12.0.0" + resolved "https://registry.yarnpkg.com/@next/env/-/env-12.0.0.tgz#1ce019c9e470d7ad05cf0523ee9f606a2e460b65" + integrity sha512-ztXvXG0dEHbWsOZZ2x443fVJK2QtVOhCU6QfmeJjnbmeYhiHhJ4sWOF2QFt0EgNTcyt6prLBVUFGQheW6Jc6lA== "@next/eslint-plugin-next@11.0.1": version "11.0.1" resolved "https://registry.yarnpkg.com/@next/eslint-plugin-next/-/eslint-plugin-next-11.0.1.tgz#5dd3264a40fadcf28eba00d914d69103422bb7e6" integrity sha512-UzdX3y6XSrj9YuASUb/p4sRvfjP2klj2YgIOfMwrWoLTTPJQMh00hREB9Ftr7m7RIxjVSAaaLXIRLdxvq948GA== -"@next/polyfill-module@11.0.1": - version "11.0.1" - resolved "https://registry.yarnpkg.com/@next/polyfill-module/-/polyfill-module-11.0.1.tgz#ca2a110c1c44672cbcff6c2b983f0c0549d87291" - integrity sha512-Cjs7rrKCg4CF4Jhri8PCKlBXhszTfOQNl9AjzdNy4K5jXFyxyoSzuX2rK4IuoyE+yGp5A3XJCBEmOQ4xbUp9Mg== +"@next/polyfill-module@12.0.0": + version "12.0.0" + resolved "https://registry.yarnpkg.com/@next/polyfill-module/-/polyfill-module-12.0.0.tgz#9516a57b72150bb250f76b8f94667dadf2973988" + integrity sha512-eajaHprq5AaCdhWLlLW53mJWykWSgThAJ2IBUvm2Jx13ruole3t6rMOVPR2MvTacaq8ayj3zRtLM5j9j4Ejqyw== -"@next/react-dev-overlay@11.0.1": - version "11.0.1" - resolved "https://registry.yarnpkg.com/@next/react-dev-overlay/-/react-dev-overlay-11.0.1.tgz#3c481e83347255abd466dcf7e59ac8a79a0d7fd6" - integrity sha512-lvUjMVpLsgzADs9Q8wtC5LNqvfdN+M0BDMSrqr04EDWAyyX0vURHC9hkvLbyEYWyh+WW32pwjKBXdkMnJhoqMg== +"@next/react-dev-overlay@12.0.0": + version "12.0.0" + resolved "https://registry.yarnpkg.com/@next/react-dev-overlay/-/react-dev-overlay-12.0.0.tgz#ddad018afa1ebc9fa79d3a3ef09103e1901a0983" + integrity sha512-sGDNFQFV6H+KAi6yQRIv4LtZ8Mg8zu1CwyVimwgYboai4eVIOg4rigZADV2xp4YEtwkgvQEijDh6J7rLCKPDXA== dependencies: "@babel/code-frame" "7.12.11" anser "1.4.9" @@ -1243,12 +1341,74 @@ shell-quote "1.7.2" source-map "0.8.0-beta.0" stacktrace-parser "0.1.10" - strip-ansi "6.0.0" - -"@next/react-refresh-utils@11.0.1": - version "11.0.1" - resolved "https://registry.yarnpkg.com/@next/react-refresh-utils/-/react-refresh-utils-11.0.1.tgz#a7509f22b6f70c13101a26573afd295295f1c020" - integrity sha512-K347DM6Z7gBSE+TfUaTTceWvbj0B6iNAsFZXbFZOlfg3uyz2sbKpzPYYFocCc27yjLaS8OfR8DEdS2mZXi8Saw== + strip-ansi "6.0.1" + +"@next/react-refresh-utils@12.0.0": + version "12.0.0" + resolved "https://registry.yarnpkg.com/@next/react-refresh-utils/-/react-refresh-utils-12.0.0.tgz#515826c7c0ca01fc39ef7e7f6f8990c4ff388494" + integrity sha512-S5EjnsNus4vX4hU0Ky/NIGXAWO2aPxS78ZQO2qK4yvEpNJ554B/xDoErb6D1HSpMiwBxSXE36FLsjvaxMvUs3g== + +"@next/swc-android-arm64@12.0.0": + version "12.0.0" + resolved "https://registry.yarnpkg.com/@next/swc-android-arm64/-/swc-android-arm64-12.0.0.tgz#4ccb356f70cabc6399e215c9bb9129835ae0b408" + integrity sha512-m0CSgD+aUZ49fctjJ7IRbkPtEYkFk+AtpJ73sfjbxzOXwAEfB2LM33rIQNp/G7D1WLqWITF00keNaeGAADD0aw== + +"@next/swc-darwin-arm64@12.0.0": + version "12.0.0" + resolved "https://registry.yarnpkg.com/@next/swc-darwin-arm64/-/swc-darwin-arm64-12.0.0.tgz#770abf91bc4e201d096e9283af2795ee7c027bc5" + integrity sha512-y+p+rTVx1sfQqBURZkheVTyz7ugkIMcFxQkd+yNU4IMCT6nOH9SdL1jr+E+neqY1D1vvsOj/UwkPxyOHH2p8Lw== + +"@next/swc-darwin-x64@12.0.0": + version "12.0.0" + resolved "https://registry.yarnpkg.com/@next/swc-darwin-x64/-/swc-darwin-x64-12.0.0.tgz#ebe5878c5b568ae0a4f4adac7ce937d380f332e9" + integrity sha512-A4gsNmMg+TN89djBJMKbYlKIWrTwKw+dvyvaE8rx+CDUzh4hdro3mhqWtaNTqCWhE28WnoGhXLdANeDWsoXg1Q== + +"@next/swc-linux-arm-gnueabihf@12.0.0": + version "12.0.0" + resolved "https://registry.yarnpkg.com/@next/swc-linux-arm-gnueabihf/-/swc-linux-arm-gnueabihf-12.0.0.tgz#18b82c7e64f37803f5104544840ab3ee89af1ade" + integrity sha512-DntdAybXbEOzP7wiv/Ppa9BTaGkb/Fp3SVxrZv694OjtGbmY0Q8+YGsShh0FQmhMKBwcJ0GMLI+anmsWj9ZUcA== + +"@next/swc-linux-arm64-gnu@12.0.0": + version "12.0.0" + resolved "https://registry.yarnpkg.com/@next/swc-linux-arm64-gnu/-/swc-linux-arm64-gnu-12.0.0.tgz#8fd3db89d206be3f9a66ca004a159998a2eeb1a4" + integrity sha512-3D18X1dpziBnk9UEg7b/hIyQA6Qt18UDKY3dmKqKcGcFMwtMqBsunVLDoNmB5SHVDVBGvA4zOtq28Xovb/3MOA== + +"@next/swc-linux-arm64-musl@12.0.0": + version "12.0.0" + resolved "https://registry.yarnpkg.com/@next/swc-linux-arm64-musl/-/swc-linux-arm64-musl-12.0.0.tgz#0b895996ea87a9cd18de836a78f824c66b598301" + integrity sha512-el+Xin2vl2JnWw809Eg+otWxvIcw+waBuOj4B36+d8yircexhNvSDjAnZkhXCWA6I05IANUx83Q0Up/NrnZ5yQ== + +"@next/swc-linux-x64-gnu@12.0.0": + version "12.0.0" + resolved "https://registry.yarnpkg.com/@next/swc-linux-x64-gnu/-/swc-linux-x64-gnu-12.0.0.tgz#13bb694f1dabd25ca6722a2a574039c50c0589f0" + integrity sha512-jMOBEc7wbsJfq6UZinrEFky3kK4LCjFPL2caHqfXpodTv/oVA/DMkiXhpYRkdfLc9vNZbw/a4Ut7gQjgYPVPtg== + +"@next/swc-linux-x64-musl@12.0.0": + version "12.0.0" + resolved "https://registry.yarnpkg.com/@next/swc-linux-x64-musl/-/swc-linux-x64-musl-12.0.0.tgz#f6718cecd37bd6e77b7edf19fbfb0f27a1d17411" + integrity sha512-0pizk3CZasxbaSyn7FzXb9cfrgIjmyq0dA3+MqvFZJNTLjDw8/yk0w3HdAOPFor3Tgoqhu5nsX/X5mnE6tObng== + +"@next/swc-win32-arm64-msvc@12.0.0": + version "12.0.0" + resolved "https://registry.yarnpkg.com/@next/swc-win32-arm64-msvc/-/swc-win32-arm64-msvc-12.0.0.tgz#456d357cab970d7fa1b6d4ca6dee323e8f4b3883" + integrity sha512-0+NT/FY2qfwgScqRhNabV6vVCfx+4PmRS4675/iMKdGLdGzat69FGjUqxW6rPS+bJGc8qvpa6oztsvsVODJHSQ== + +"@next/swc-win32-ia32-msvc@12.0.0": + version "12.0.0" + resolved "https://registry.yarnpkg.com/@next/swc-win32-ia32-msvc/-/swc-win32-ia32-msvc-12.0.0.tgz#8a82da7f95c6c45f1487e991ab8af8bd45b75c84" + integrity sha512-sbjvdZGKiSJQrOSJRooEPIWwSfyatBiuRC7Q6R2jiR2KW1jg98nbnXRwiI8tj7OSl28h0yswmtGFjz5t5O1EbQ== + +"@next/swc-win32-x64-msvc@12.0.0": + version "12.0.0" + resolved "https://registry.yarnpkg.com/@next/swc-win32-x64-msvc/-/swc-win32-x64-msvc-12.0.0.tgz#c19e6cfdb1cebe088ea663d6405a6ed76fc4e79d" + integrity sha512-NMZRwS59X4+yQT53jROZMcboiPVd6zCGlEN3kuPewelTDVwKAXxzhpLuxCO46e0ssol8UZiOTdgB4NPVbsLK2A== + +"@node-rs/helper@1.2.1": + version "1.2.1" + resolved "https://registry.yarnpkg.com/@node-rs/helper/-/helper-1.2.1.tgz#e079b05f21ff4329d82c4e1f71c0290e4ecdc70c" + integrity sha512-R5wEmm8nbuQU0YGGmYVjEc0OHtYsuXdpRG+Ut/3wZ9XAvQWyThN08bTh2cBJgoZxHQUPtvRfeQuxcAgLuiBISg== + dependencies: + "@napi-rs/triples" "^1.0.3" "@nodelib/fs.scandir@2.1.5": version "2.1.5" @@ -1383,6 +1543,11 @@ resolved "https://registry.yarnpkg.com/@types/lodash/-/lodash-4.14.172.tgz#aad774c28e7bfd7a67de25408e03ee5a8c3d028a" integrity sha512-/BHF5HAx3em7/KkzVKm3LrsD6HZAXuXO1AJZQ3cRRBZj4oHZDviWPYu0aEplAqDFNHZPW6d3G7KN+ONcCCC7pw== +"@types/lodash@^4.14.175": + version "4.14.175" + resolved "https://registry.yarnpkg.com/@types/lodash/-/lodash-4.14.175.tgz#b78dfa959192b01fae0ad90e166478769b215f45" + integrity sha512-XmdEOrKQ8a1Y/yxQFOMbC47G/V2VDO1GvMRnl4O75M4GW/abC5tnfzadQYkqEveqRM1dEJGFFegfPNA2vvx2iw== + "@types/long@^4.0.1": version "4.0.1" resolved "https://registry.yarnpkg.com/@types/long/-/long-4.0.1.tgz#459c65fa1867dafe6a8f322c4c51695663cc55e9" @@ -1589,10 +1754,10 @@ ansi-colors@^4.1.1: resolved "https://registry.yarnpkg.com/ansi-colors/-/ansi-colors-4.1.1.tgz#cbb9ae256bf750af1eab344f229aa27fe94ba348" integrity sha512-JoX0apGbHaUJBNl6yF+p6JAFYZ666/hhCGKN5t9QFjbJQKUU/g8MNbFDbvfrgKXvI1QpZplPOnwIo99lX/AAmA== -ansi-regex@^5.0.0: - version "5.0.0" - resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-5.0.0.tgz#388539f55179bf39339c81af30a654d69f87cb75" - integrity sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg== +ansi-regex@^5.0.0, ansi-regex@^5.0.1: + version "5.0.1" + resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-5.0.1.tgz#082cb2c89c9fe8659a311a53bd6a4dc5301db304" + integrity sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ== ansi-styles@^3.2.1: version "3.2.1" @@ -1616,6 +1781,14 @@ anymatch@~3.1.1: normalize-path "^3.0.0" picomatch "^2.0.4" +anymatch@~3.1.2: + version "3.1.3" + resolved "https://registry.yarnpkg.com/anymatch/-/anymatch-3.1.3.tgz#790c58b19ba1720a84205b57c618d5ad8524973e" + integrity sha512-KMReFUr0B4t+D+OBkjR3KYqvocp2XaSzO55UcB6mgQMd3KbcE+mWTyvVV7D/zsdEbNnV6acZUutkiHQXvTr1Rw== + dependencies: + normalize-path "^3.0.0" + picomatch "^2.0.4" + argparse@^1.0.7: version "1.0.10" resolved "https://registry.yarnpkg.com/argparse/-/argparse-1.0.10.tgz#bcd6791ea5ae09725e17e5ad988134cd40b3d911" @@ -1693,24 +1866,11 @@ assert@2.0.0: object-is "^1.0.1" util "^0.12.0" -assert@^1.1.1: - version "1.5.0" - resolved "https://registry.yarnpkg.com/assert/-/assert-1.5.0.tgz#55c109aaf6e0aefdb3dc4b71240c70bf574b18eb" - integrity sha512-EDsgawzwoun2CZkCgtxJbv392v4nbk9XDD06zI+kQYoBM/3RBWLlEyJARDOmhAAosBjWACEkKL6S+lIZtcAubA== - dependencies: - object-assign "^4.1.1" - util "0.10.3" - ast-types-flow@^0.0.7: version "0.0.7" resolved "https://registry.yarnpkg.com/ast-types-flow/-/ast-types-flow-0.0.7.tgz#f70b735c6bca1a5c9c22d982c3e39e7feba3bdad" integrity sha1-9wtzXGvKGlycItmCw+Oef+ujva0= -ast-types@0.13.2: - version "0.13.2" - resolved "https://registry.yarnpkg.com/ast-types/-/ast-types-0.13.2.tgz#df39b677a911a83f3a049644fb74fdded23cea48" - integrity sha512-uWMHxJxtfj/1oZClOxDEV1sQ1HCDkA4MG8Gr69KKeBjEVH0R84WlejZ0y2DcwyBlpAEMltmVYkVgqfLFb2oyiA== - astral-regex@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/astral-regex/-/astral-regex-2.0.0.tgz#483143c567aeed4785759c0865786dc77d7d2e31" @@ -1751,11 +1911,6 @@ babel-plugin-module-resolver@^4.1.0: reselect "^4.0.0" resolve "^1.13.1" -babel-plugin-syntax-jsx@6.18.0: - version "6.18.0" - resolved "https://registry.yarnpkg.com/babel-plugin-syntax-jsx/-/babel-plugin-syntax-jsx-6.18.0.tgz#0af32a9a6e13ca7a3fd5069e62d7b0f58d0d8946" - integrity sha1-CvMqmm4Tyno/1QaeYtew9Y0NiUY= - balanced-match@^1.0.0: version "1.0.2" resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.2.tgz#e83e3a7e3f300b34cb9d87f615fa0cbf357690ee" @@ -1781,11 +1936,16 @@ bn.js@^4.0.0, bn.js@^4.1.0, bn.js@^4.11.9: resolved "https://registry.yarnpkg.com/bn.js/-/bn.js-4.12.0.tgz#775b3f278efbb9718eec7361f483fb36fbbfea88" integrity sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA== -bn.js@^5.0.0, bn.js@^5.1.1: +bn.js@^5.0.0: version "5.2.0" resolved "https://registry.yarnpkg.com/bn.js/-/bn.js-5.2.0.tgz#358860674396c6997771a9d051fcc1b57d4ae002" integrity sha512-D7iWRBvnZE8ecXiLj/9wbxH7Tk79fAh8IHaTNq1RWRixsS02W+5qS+iE9yq6RYl0asXx5tw0bLhmT5pIfbSquw== +bn.js@^5.2.1: + version "5.2.1" + resolved "https://registry.yarnpkg.com/bn.js/-/bn.js-5.2.1.tgz#0bc527a6a0d18d0aa8d5b0538ce4a77dccfa7b70" + integrity sha512-eXRvHzWyYPBuB4NBy0cmYQjGitUrtqwbvlzP3G6VFnNRbsZQIxQ10PbKKHt8gZ/HW/D/747aDl+QkDqg3KQLMQ== + brace-expansion@^1.1.7: version "1.1.11" resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.11.tgz#3c7fcbf529d87226f3d2f52b966ff5271eb441dd" @@ -1837,7 +1997,7 @@ browserify-des@^1.0.0: inherits "^2.0.1" safe-buffer "^5.1.2" -browserify-rsa@^4.0.0, browserify-rsa@^4.0.1: +browserify-rsa@^4.0.0, browserify-rsa@^4.1.0: version "4.1.0" resolved "https://registry.yarnpkg.com/browserify-rsa/-/browserify-rsa-4.1.0.tgz#b2fd06b5b75ae297f7ce2dc651f918f5be158c8d" integrity sha512-AdEER0Hkspgno2aR97SAf6vi0y0k8NuOpGnVH3O99rcA5Q6sh8QxcngtHuJ6uXwnfAXNM4Gn1Gb7/MV1+Ymbog== @@ -1846,21 +2006,21 @@ browserify-rsa@^4.0.0, browserify-rsa@^4.0.1: randombytes "^2.0.1" browserify-sign@^4.0.0: - version "4.2.1" - resolved "https://registry.yarnpkg.com/browserify-sign/-/browserify-sign-4.2.1.tgz#eaf4add46dd54be3bb3b36c0cf15abbeba7956c3" - integrity sha512-/vrA5fguVAKKAVTNJjgSm1tRQDHUU6DbwO9IROu/0WAzC8PKhucDSh18J0RMvVeHAn5puMd+QHC2erPRNf8lmg== + version "4.2.2" + resolved "https://registry.yarnpkg.com/browserify-sign/-/browserify-sign-4.2.2.tgz#e78d4b69816d6e3dd1c747e64e9947f9ad79bc7e" + integrity "sha1-541LaYFtbj3Rx0fmTplH+a15vH4= sha512-1rudGyeYY42Dk6texmv7c4VcQ0EsvVbLwZkA+AQB7SxvXxmcD93jcHie8bzecJ+ChDlmAm2Qyu0+Ccg5uhZXCg==" dependencies: - bn.js "^5.1.1" - browserify-rsa "^4.0.1" + bn.js "^5.2.1" + browserify-rsa "^4.1.0" create-hash "^1.2.0" create-hmac "^1.1.7" - elliptic "^6.5.3" + elliptic "^6.5.4" inherits "^2.0.4" - parse-asn1 "^5.1.5" - readable-stream "^3.6.0" - safe-buffer "^5.2.0" + parse-asn1 "^5.1.6" + readable-stream "^3.6.2" + safe-buffer "^5.2.1" -browserify-zlib@0.2.0, browserify-zlib@^0.2.0: +browserify-zlib@0.2.0: version "0.2.0" resolved "https://registry.yarnpkg.com/browserify-zlib/-/browserify-zlib-0.2.0.tgz#2869459d9aa3be245fe8fe2ca1f46e2e7f54d73f" integrity sha512-Z942RysHXmJrhqk88FmKBVq/v5tqmSkDz7p54G/MGyjMnCFFnC79XWNbg+Vta8W6Wb2qtSZTSxIGkJrRpCFEiA== @@ -1902,15 +2062,6 @@ buffer@5.6.0: base64-js "^1.0.2" ieee754 "^1.1.4" -buffer@^4.3.0: - version "4.9.2" - resolved "https://registry.yarnpkg.com/buffer/-/buffer-4.9.2.tgz#230ead344002988644841ab0244af8c44bbe3ef8" - integrity sha512-xq+q3SRMOxGivLhBNaUdC64hDTQwejJ+H0T/NB1XMtTVEwNTrfFF3gAxiyW0Bu/xWEGhjVKgUcMhCrUy2+uCWg== - dependencies: - base64-js "^1.0.2" - ieee754 "^1.1.4" - isarray "^1.0.0" - builtin-status-codes@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/builtin-status-codes/-/builtin-status-codes-3.0.0.tgz#85982878e21b98e1c66425e03d0174788f569ee8" @@ -1934,17 +2085,12 @@ callsites@^3.0.0: resolved "https://registry.yarnpkg.com/callsites/-/callsites-3.1.0.tgz#b3630abd8943432f54b3f0519238e33cd7df2f73" integrity sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ== -caniuse-lite@^1.0.30001202, caniuse-lite@^1.0.30001219, caniuse-lite@^1.0.30001228: - version "1.0.30001249" - resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001249.tgz#90a330057f8ff75bfe97a94d047d5e14fabb2ee8" - integrity sha512-vcX4U8lwVXPdqzPWi6cAJ3FnQaqXbBqy/GZseKNQzRj37J7qZdGcBtxq/QLFNLLlfsoXLUdHw8Iwenri86Tagw== - -caniuse-lite@^1.0.30001251: +caniuse-lite@^1.0.30001202, caniuse-lite@^1.0.30001219, caniuse-lite@^1.0.30001228, caniuse-lite@^1.0.30001251: version "1.0.30001251" resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001251.tgz#6853a606ec50893115db660f82c094d18f096d85" integrity sha512-HOe1r+9VkU4TFmnU70z+r7OLmtR+/chB1rdcJUeQlAinjEeb0cKL20tlAtOagNZhbrtLnCvV19B4FmF1rgzl6A== -chalk@2.4.2, chalk@^2.0.0: +chalk@2.4.2, chalk@^2.0.0, chalk@^2.4.2: version "2.4.2" resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.4.2.tgz#cd42541677a54333cf541a49108c1432b44c9424" integrity sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ== @@ -1984,6 +2130,21 @@ chokidar@3.5.1: optionalDependencies: fsevents "~2.3.1" +"chokidar@>=3.0.0 <4.0.0": + version "3.5.3" + resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-3.5.3.tgz#1cf37c8707b932bd1af1ae22c0432e2acd1903bd" + integrity sha512-Dr3sfKRP6oTcjf2JmUmFJfeVMvXBdegxB0iVQ5eb2V10uFJUCAS8OByZdVAyVb8xXNz3GjjTgj9kLWsZTqE6kw== + dependencies: + anymatch "~3.1.2" + braces "~3.0.2" + glob-parent "~5.1.2" + is-binary-path "~2.1.0" + is-glob "~4.0.1" + normalize-path "~3.0.0" + readdirp "~3.6.0" + optionalDependencies: + fsevents "~2.3.2" + cipher-base@^1.0.0, cipher-base@^1.0.1, cipher-base@^1.0.3: version "1.0.4" resolved "https://registry.yarnpkg.com/cipher-base/-/cipher-base-1.0.4.tgz#8760e4ecc272f4c363532f926d874aae2c1397de" @@ -2055,12 +2216,7 @@ concat-map@0.0.1: resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b" integrity sha1-2Klr13/Wjfd5OnMDajug1UBdR3s= -console-browserify@^1.1.0: - version "1.2.0" - resolved "https://registry.yarnpkg.com/console-browserify/-/console-browserify-1.2.0.tgz#67063cef57ceb6cf4993a2ab3a55840ae8c49336" - integrity sha512-ZMkYO/LkF17QvCPqM0gxw8yUzigAOZOSWSHg91FH6orS7vcEj5dVZTidN2fQ14yBSdg97RqhSNwLUXInd52OTA== - -constants-browserify@1.0.0, constants-browserify@^1.0.0: +constants-browserify@1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/constants-browserify/-/constants-browserify-1.0.0.tgz#c20b96d8c617748aaf1c16021760cd27fcb8cb75" integrity sha1-wguW2MYXdIqvHBYCF2DNJ/y4y3U= @@ -2096,11 +2252,6 @@ core-js@3.6.5: resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.6.5.tgz#7395dc273af37fb2e50e9bd3d9fe841285231d1a" integrity sha512-vZVEEwZoIsI+vPEuoF9Iqf5H7/M3eeQqWlQnYa8FSKKePuYTf5MWnxb5SDAzCa60b3JBRS5g9b+Dq7b1y/RCrA== -core-util-is@~1.0.0: - version "1.0.2" - resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.2.tgz#b5fd54220aa2bc5ab57aab7140c940754503c1a7" - integrity sha1-tf1UIgqivFq1eqtxQMlAdUUDwac= - cosmiconfig@^6.0.0: version "6.0.0" resolved "https://registry.yarnpkg.com/cosmiconfig/-/cosmiconfig-6.0.0.tgz#da4fee853c52f6b1e6935f41c1a2fc50bd4a9982" @@ -2152,7 +2303,7 @@ cross-spawn@^7.0.2: shebang-command "^2.0.0" which "^2.0.1" -crypto-browserify@3.12.0, crypto-browserify@^3.11.0: +crypto-browserify@3.12.0: version "3.12.0" resolved "https://registry.yarnpkg.com/crypto-browserify/-/crypto-browserify-3.12.0.tgz#396cf9f3137f03e4b8e532c58f698254e00f80ec" integrity sha512-fz4spIh+znjO2VjL+IdhEpRJ3YN6sMzITSBijk6FK2UvTqruSQW+/cCZTSNsMiZNvUeq0CqurF+dAbyiGOY6Wg== @@ -2181,19 +2332,19 @@ css.escape@1.5.1: resolved "https://registry.yarnpkg.com/css.escape/-/css.escape-1.5.1.tgz#42e27d4fa04ae32f931a4b4d4191fa9cddee97cb" integrity sha1-QuJ9T6BK4y+TGktNQZH6nN3ul8s= -cssnano-preset-simple@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/cssnano-preset-simple/-/cssnano-preset-simple-2.0.0.tgz#b55e72cb970713f425560a0e141b0335249e2f96" - integrity sha512-HkufSLkaBJbKBFx/7aj5HmCK9Ni/JedRQm0mT2qBzMG/dEuJOLnMt2lK6K1rwOOyV4j9aSY+knbW9WoS7BYpzg== +cssnano-preset-simple@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/cssnano-preset-simple/-/cssnano-preset-simple-3.0.0.tgz#e95d0012699ca2c741306e9a3b8eeb495a348dbe" + integrity sha512-vxQPeoMRqUT3c/9f0vWeVa2nKQIHFpogtoBvFdW4GQ3IvEJ6uauCP6p3Y5zQDLFcI7/+40FTgX12o7XUL0Ko+w== dependencies: caniuse-lite "^1.0.30001202" -cssnano-simple@2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/cssnano-simple/-/cssnano-simple-2.0.0.tgz#930d9dcd8ba105c5a62ce719cb00854da58b5c05" - integrity sha512-0G3TXaFxlh/szPEG/o3VcmCwl0N3E60XNb9YZZijew5eIs6fLjJuOPxQd9yEBaX2p/YfJtt49i4vYi38iH6/6w== +cssnano-simple@3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/cssnano-simple/-/cssnano-simple-3.0.0.tgz#a4b8ccdef4c7084af97e19bc5b93b4ecf211e90f" + integrity sha512-oU3ueli5Dtwgh0DyeohcIEE00QVfbPR3HzyXdAl89SfnQG3y0/qcpfLVW+jPIh3/rgMZGwuW96rejZGaYE9eUg== dependencies: - cssnano-preset-simple "^2.0.0" + cssnano-preset-simple "^3.0.0" csstype@^3.0.2, csstype@^3.0.6: version "3.0.8" @@ -2306,11 +2457,6 @@ domain-browser@4.19.0: resolved "https://registry.yarnpkg.com/domain-browser/-/domain-browser-4.19.0.tgz#1093e17c0a17dbd521182fe90d49ac1370054af1" integrity sha512-fRA+BaAWOR/yr/t7T9E9GJztHPeFjj8U35ajyAjCDtAAnTn1Rc1f6W6VGPJrO1tkQv9zWu+JRof7z6oQtiYVFQ== -domain-browser@^1.1.1: - version "1.2.0" - resolved "https://registry.yarnpkg.com/domain-browser/-/domain-browser-1.2.0.tgz#3d31f50191a6749dd1375a7f522e823d42e54eda" - integrity sha512-jnjyiM6eRyZl2H+W8Q/zLMA481hzi0eszAaBUzIVnmYVDBbnLxVNnfu1HgEBvCbL+71FrxMl3E6lpKH7Ge3OXA== - electron-to-chromium@^1.3.723: version "1.3.801" resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.801.tgz#f41c588e408ad1a4f794f91f38aa94a89c492f51" @@ -2321,7 +2467,7 @@ electron-to-chromium@^1.3.811: resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.812.tgz#4c4fb407e0e1335056097f172e9f2c0a09efe77d" integrity sha512-7KiUHsKAWtSrjVoTSzxQ0nPLr/a+qoxNZwkwd9LkylTOgOXSVXkQbpIVT0WAUQcI5gXq3SwOTCrK+WfINHOXQg== -elliptic@^6.5.3: +elliptic@^6.5.3, elliptic@^6.5.4: version "6.5.4" resolved "https://registry.yarnpkg.com/elliptic/-/elliptic-6.5.4.tgz#da37cebd31e79a1367e941b592ed1fbebd58abbb" integrity sha512-iLhC6ULemrljPZb+QutR5TQGB+pdW6KGD5RSegS+8sorOZT+rdQFbsQFJgvN3eRqNALqJer4oQ16YvJHlU8hzQ== @@ -2671,7 +2817,7 @@ etag@1.8.1: resolved "https://registry.yarnpkg.com/etag/-/etag-1.8.1.tgz#41ae2eeb65efa62268aebfea83ac7d79299b0887" integrity sha1-Qa4u62XvpiJorr/qg6x9eSmbCIc= -events@^3.0.0: +events@3.3.0: version "3.3.0" resolved "https://registry.yarnpkg.com/events/-/events-3.3.0.tgz#31a95ad0a924e2d2c419a813aeb2c4e878ea7400" integrity sha512-mQw+2fkQbALzQ7V0MY0IqdnXNOeTtP4r0lN9z7AAawCXgqea7bDii20AYrIBrFd/Hx0M2Ocz6S111CaFkUcb0Q== @@ -2863,6 +3009,11 @@ fsevents@~2.3.1: resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-2.3.2.tgz#8a526f78b8fdf4623b709e0b975c52c24c02fd1a" integrity sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA== +fsevents@~2.3.2: + version "2.3.3" + resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-2.3.3.tgz#cac6407785d03675a2a5e1a5305c697b347d90d6" + integrity sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw== + function-bind@^1.1.1: version "1.1.1" resolved "https://registry.yarnpkg.com/function-bind/-/function-bind-1.1.1.tgz#a56899d3ea3c9bab874bb9773b7c5ede92f4895d" @@ -2904,7 +3055,7 @@ get-orientation@1.1.2: dependencies: stream-parser "^0.3.1" -glob-parent@^5.1.2, glob-parent@~5.1.0: +glob-parent@^5.1.2, glob-parent@~5.1.0, glob-parent@~5.1.2: version "5.1.2" resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-5.1.2.tgz#869832c58034fe68a4093c17dc15e8340d8401c4" integrity sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow== @@ -3055,7 +3206,7 @@ http-parser-js@>=0.5.1: resolved "https://registry.yarnpkg.com/http-parser-js/-/http-parser-js-0.5.3.tgz#01d2709c79d41698bb01d4decc5e9da4e4a033d9" integrity sha512-t7hjvef/5HEK7RWTdUzVUhl8zkEu+LlaE0IYzdMuvbSDipxBRpOn4Uhw8ZyECEa808iVT8XCjzo6xmYt4CiLZg== -https-browserify@1.0.0, https-browserify@^1.0.0: +https-browserify@1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/https-browserify/-/https-browserify-1.0.0.tgz#ec06c10e0a34c0f2faf199f7fd7fc78fffd03c73" integrity sha1-7AbBDgo0wPL68Zn3/X/Hj//QPHM= @@ -3101,6 +3252,11 @@ image-size@1.0.0: dependencies: queue "6.0.2" +immutable@^4.0.0: + version "4.3.4" + resolved "https://registry.yarnpkg.com/immutable/-/immutable-4.3.4.tgz#2e07b33837b4bb7662f288c244d1ced1ef65a78f" + integrity sha512-fsXeu4J4i6WNWSikpI88v/PcVflZz+6kMhUfIwc5SY+poQRPnaf5V7qds6SUyUN3cVxEzuCab7QIoLOQ+DQ1wA== + import-fresh@^3.0.0, import-fresh@^3.1.0, import-fresh@^3.2.1: version "3.3.0" resolved "https://registry.yarnpkg.com/import-fresh/-/import-fresh-3.3.0.tgz#37162c25fcb9ebaa2e6e53d5b4d88ce17d9e0c2b" @@ -3122,21 +3278,11 @@ inflight@^1.0.4: once "^1.3.0" wrappy "1" -inherits@2, inherits@2.0.4, inherits@^2.0.1, inherits@^2.0.3, inherits@^2.0.4, inherits@~2.0.1, inherits@~2.0.3, inherits@~2.0.4: +inherits@2, inherits@2.0.4, inherits@^2.0.1, inherits@^2.0.3, inherits@^2.0.4, inherits@~2.0.3, inherits@~2.0.4: version "2.0.4" resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.4.tgz#0fa2c64f932917c3433a0ded55363aae37416b7c" integrity sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ== -inherits@2.0.1: - version "2.0.1" - resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.1.tgz#b17d08d326b4423e568eff719f91b0b1cbdf69f1" - integrity sha1-sX0I0ya0Qj5Wjv9xn5GwscvfafE= - -inherits@2.0.3: - version "2.0.3" - resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.3.tgz#633c2c83e3da42a502f52466022480f4208261de" - integrity sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4= - internal-slot@^1.0.3: version "1.0.3" resolved "https://registry.yarnpkg.com/internal-slot/-/internal-slot-1.0.3.tgz#7347e307deeea2faac2ac6205d4bc7d34967f59c" @@ -3287,11 +3433,6 @@ is-typed-array@^1.1.3, is-typed-array@^1.1.6: foreach "^2.0.5" has-tostringtag "^1.0.0" -isarray@^1.0.0, isarray@~1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/isarray/-/isarray-1.0.0.tgz#bb935d48582cba168c06834957a54a3e07124f11" - integrity sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE= - isexe@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/isexe/-/isexe-2.0.0.tgz#e8fbf374dc556ff8947a10dcb0572d633f2cfa10" @@ -3362,11 +3503,9 @@ json5@^1.0.1: minimist "^1.2.0" json5@^2.1.2, json5@^2.2.0: - version "2.2.0" - resolved "https://registry.yarnpkg.com/json5/-/json5-2.2.0.tgz#2dfefe720c6ba525d9ebd909950f0515316c89a3" - integrity sha512-f+8cldu7X/y7RAJurMEJmdoKXGB/X550w2Nr3tTbezL6RwEE/iMcm+tZnXeoZtKuOq6ft8+CqzEkrIgx1fPoQA== - dependencies: - minimist "^1.2.5" + version "2.2.3" + resolved "https://registry.yarnpkg.com/json5/-/json5-2.2.3.tgz#78cd6f1a19bdc12b73db5ad0c61efd66c1e29283" + integrity sha512-XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg== "jsx-ast-utils@^2.4.1 || ^3.0.0", jsx-ast-utils@^3.1.0: version "3.2.0" @@ -3443,6 +3582,11 @@ locate-path@^5.0.0: dependencies: p-locate "^4.1.0" +lodash-es@^4.17.21: + version "4.17.21" + resolved "https://registry.yarnpkg.com/lodash-es/-/lodash-es-4.17.21.tgz#43e626c46e6591b7750beb2b50117390c609e3ee" + integrity sha512-mKnC+QJ9pWVzv+C4/U3rRsHapFfHvQFoFB92e52xeyGMcX6/OlIl78je1u8vePzYZSkkogMPJ2yjxxsb89cxyw== + lodash.camelcase@^4.3.0: version "4.3.0" resolved "https://registry.yarnpkg.com/lodash.camelcase/-/lodash.camelcase-4.3.0.tgz#b28aa6288a2b9fc651035c7711f65ab6190331a6" @@ -3473,7 +3617,7 @@ lodash.truncate@^4.4.2: resolved "https://registry.yarnpkg.com/lodash.truncate/-/lodash.truncate-4.4.2.tgz#5a350da0b1113b837ecfffd5812cbe58d6eae193" integrity sha1-WjUNoLERO4N+z//VgSy+WNbq4ZM= -lodash@^4.17.13: +lodash@^4.17.21: version "4.17.21" resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.21.tgz#679591c564c3bffaae8454cf0b3df370c3d6911c" integrity sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg== @@ -3550,16 +3694,16 @@ minimalistic-crypto-utils@^1.0.1: integrity sha1-9sAMHAsIIkblxNmd+4x8CDsrWCo= minimatch@^3.0.4: - version "3.0.4" - resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.4.tgz#5166e286457f03306064be5497e8dbb0c3d32083" - integrity sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA== + version "3.1.2" + resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.1.2.tgz#19cd194bfd3e428f049a70817c038d89ab4be35b" + integrity sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw== dependencies: brace-expansion "^1.1.7" -minimist@^1.2.0, minimist@^1.2.5: - version "1.2.5" - resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.5.tgz#67d66014b66a6a8aaa0c083c5fd58df4e4e97602" - integrity sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw== +minimist@^1.2.0: + version "1.2.8" + resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.8.tgz#c1a464e7693302e082a075cee0c057741ac4772c" + integrity sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA== ms@2.0.0: version "2.0.0" @@ -3576,36 +3720,34 @@ ms@^2.1.1: resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.3.tgz#574c8138ce1d2b5861f0b44579dbadd60c6615b2" integrity sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA== -nanoid@^3.1.22: - version "3.1.23" - resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.1.23.tgz#f744086ce7c2bc47ee0a8472574d5c78e4183a81" - integrity sha512-FiB0kzdP0FFVGDKlRLEQ1BgDzU87dy5NnzjeW9YZNt+/c3+q82EQDUwniSAUxp/F0gFNI1ZhKU1FqYsMuqZVnw== +nanoclone@^0.2.1: + version "0.2.1" + resolved "https://registry.yarnpkg.com/nanoclone/-/nanoclone-0.2.1.tgz#dd4090f8f1a110d26bb32c49ed2f5b9235209ed4" + integrity sha512-wynEP02LmIbLpcYw8uBKpcfF6dmg2vcpKqxeH5UcoKEYdExslsdUA4ugFauuaeYdTB76ez6gJW8XAZ6CgkXYxA== -native-url@0.3.4: - version "0.3.4" - resolved "https://registry.yarnpkg.com/native-url/-/native-url-0.3.4.tgz#29c943172aed86c63cee62c8c04db7f5756661f8" - integrity sha512-6iM8R99ze45ivyH8vybJ7X0yekIcPf5GgLV5K0ENCbmRcaRIDoj37BC8iLEmaaBfqqb8enuZ5p0uhY+lVAbAcA== - dependencies: - querystring "^0.2.0" +nanoid@^3.1.23: + version "3.3.7" + resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.3.7.tgz#d0c301a691bc8d54efa0a2226ccf3fe2fd656bd8" + integrity "sha1-0MMBppG8jVTvoKIibM8/4v1la9g= sha512-eSRppjcPIatRIMC1U6UngP8XFcz8MQWGQdt1MTBQ7NaAmvXDfvNxbvWV3x2y6CdEUciCSsDHDQZbhYaB8QEo2g==" natural-compare@^1.4.0: version "1.4.0" resolved "https://registry.yarnpkg.com/natural-compare/-/natural-compare-1.4.0.tgz#4abebfeed7541f2c27acfb29bdbbd15c8d5ba4f7" integrity sha1-Sr6/7tdUHywnrPspvbvRXI1bpPc= -next@11.0.1: - version "11.0.1" - resolved "https://registry.yarnpkg.com/next/-/next-11.0.1.tgz#b8e3914d153aaf7143cb98c09bcd3c8230eeb17a" - integrity sha512-yR7be7asNbvpVNpi6xxEg28wZ7Gqmj1nOt0sABH9qORmF3+pms2KZ7Cng33oK5nqPIzEEFJD0pp2PCe3/ueMIg== +next@^12.0.0: + version "12.0.0" + resolved "https://registry.yarnpkg.com/next/-/next-12.0.0.tgz#f9df3f1788c7e0526c2cde861dbb391b499af758" + integrity sha512-FCV4ODfm+7g8TWi9FjwjH+z5Rt1UHIVnFFO7GfCg+LLYC2LF89gCjjXEIeK8loaiDEkxafPqjyCWWfUU7xJ8DA== dependencies: - "@babel/runtime" "7.12.5" + "@babel/runtime" "7.15.4" "@hapi/accept" "5.0.2" - "@next/env" "11.0.1" - "@next/polyfill-module" "11.0.1" - "@next/react-dev-overlay" "11.0.1" - "@next/react-refresh-utils" "11.0.1" + "@next/env" "12.0.0" + "@next/polyfill-module" "12.0.0" + "@next/react-dev-overlay" "12.0.0" + "@next/react-refresh-utils" "12.0.0" + "@node-rs/helper" "1.2.1" assert "2.0.0" - ast-types "0.13.2" browserify-zlib "0.2.0" browserslist "4.16.6" buffer "5.6.0" @@ -3614,40 +3756,50 @@ next@11.0.1: chokidar "3.5.1" constants-browserify "1.0.0" crypto-browserify "3.12.0" - cssnano-simple "2.0.0" + cssnano-simple "3.0.0" domain-browser "4.19.0" encoding "0.1.13" etag "1.8.1" + events "3.3.0" find-cache-dir "3.3.1" get-orientation "1.1.2" https-browserify "1.0.0" image-size "1.0.0" jest-worker "27.0.0-next.5" - native-url "0.3.4" node-fetch "2.6.1" node-html-parser "1.4.9" - node-libs-browser "^2.2.1" os-browserify "0.3.0" p-limit "3.1.0" path-browserify "1.0.1" - pnp-webpack-plugin "1.6.4" - postcss "8.2.13" + postcss "8.2.15" process "0.11.10" - prop-types "15.7.2" querystring-es3 "0.2.1" raw-body "2.4.1" react-is "17.0.2" react-refresh "0.8.3" + regenerator-runtime "0.13.4" stream-browserify "3.0.0" stream-http "3.1.1" string_decoder "1.3.0" - styled-jsx "3.3.2" + styled-jsx "5.0.0-beta.3" timers-browserify "2.0.12" tty-browserify "0.0.1" use-subscription "1.5.1" - util "0.12.3" + util "0.12.4" vm-browserify "1.1.2" watchpack "2.1.1" + optionalDependencies: + "@next/swc-android-arm64" "12.0.0" + "@next/swc-darwin-arm64" "12.0.0" + "@next/swc-darwin-x64" "12.0.0" + "@next/swc-linux-arm-gnueabihf" "12.0.0" + "@next/swc-linux-arm64-gnu" "12.0.0" + "@next/swc-linux-arm64-musl" "12.0.0" + "@next/swc-linux-x64-gnu" "12.0.0" + "@next/swc-linux-x64-musl" "12.0.0" + "@next/swc-win32-arm64-msvc" "12.0.0" + "@next/swc-win32-ia32-msvc" "12.0.0" + "@next/swc-win32-x64-msvc" "12.0.0" node-fetch@2.6.1: version "2.6.1" @@ -3661,35 +3813,6 @@ node-html-parser@1.4.9: dependencies: he "1.2.0" -node-libs-browser@^2.2.1: - version "2.2.1" - resolved "https://registry.yarnpkg.com/node-libs-browser/-/node-libs-browser-2.2.1.tgz#b64f513d18338625f90346d27b0d235e631f6425" - integrity sha512-h/zcD8H9kaDZ9ALUWwlBUDo6TKF8a7qBSCSEGfjTVIYeqsioSKaAX+BN7NgiMGp6iSIXZ3PxgCu8KS3b71YK5Q== - dependencies: - assert "^1.1.1" - browserify-zlib "^0.2.0" - buffer "^4.3.0" - console-browserify "^1.1.0" - constants-browserify "^1.0.0" - crypto-browserify "^3.11.0" - domain-browser "^1.1.1" - events "^3.0.0" - https-browserify "^1.0.0" - os-browserify "^0.3.0" - path-browserify "0.0.1" - process "^0.11.10" - punycode "^1.2.4" - querystring-es3 "^0.2.0" - readable-stream "^2.3.3" - stream-browserify "^2.0.1" - stream-http "^2.7.2" - string_decoder "^1.0.0" - timers-browserify "^2.0.4" - tty-browserify "0.0.0" - url "^0.11.0" - util "^0.11.0" - vm-browserify "^1.0.1" - node-releases@^1.1.71: version "1.1.74" resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.74.tgz#e5866488080ebaa70a93b91144ccde06f3c3463e" @@ -3795,7 +3918,7 @@ optionator@^0.9.1: type-check "^0.4.0" word-wrap "^1.2.3" -os-browserify@0.3.0, os-browserify@^0.3.0: +os-browserify@0.3.0: version "0.3.0" resolved "https://registry.yarnpkg.com/os-browserify/-/os-browserify-0.3.0.tgz#854373c7f5c2315914fc9bfc6bd8238fdda1ec27" integrity sha1-hUNzx/XCMVkU/Jv8a9gjj92h7Cc= @@ -3864,7 +3987,7 @@ parent-module@^1.0.0: dependencies: callsites "^3.0.0" -parse-asn1@^5.0.0, parse-asn1@^5.1.5: +parse-asn1@^5.0.0, parse-asn1@^5.1.6: version "5.1.6" resolved "https://registry.yarnpkg.com/parse-asn1/-/parse-asn1-5.1.6.tgz#385080a3ec13cb62a62d39409cb3e88844cdaed4" integrity sha512-RnZRo1EPU6JBnra2vGHj0yhp6ebyjBZpmUCLHWiFhxlzvBCCpAuZ7elsBp1PVAbQN0/04VD/19rfzlBSwLstMw== @@ -3893,11 +4016,6 @@ parse-json@^5.0.0: json-parse-even-better-errors "^2.3.0" lines-and-columns "^1.1.6" -path-browserify@0.0.1: - version "0.0.1" - resolved "https://registry.yarnpkg.com/path-browserify/-/path-browserify-0.0.1.tgz#e6c4ddd7ed3aa27c68a20cc4e50e1a4ee83bbc4a" - integrity sha512-BapA40NHICOS+USX9SN4tyhq+A2RrN/Ws5F0Z5aMHDp98Fl86lX8Oti8B7uN93L4Ifv4fHOEA+pQw87gmMO/lQ== - path-browserify@1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/path-browserify/-/path-browserify-1.0.1.tgz#d98454a9c3753d5790860f16f68867b9e46be1fd" @@ -3994,13 +4112,6 @@ platform@1.3.6: resolved "https://registry.yarnpkg.com/platform/-/platform-1.3.6.tgz#48b4ce983164b209c2d45a107adb31f473a6e7a7" integrity sha512-fnWVljUchTro6RiCFvCXBbNhJc2NijN7oIQxbwsyL0buWJPG85v81ehlHI9fXrJsMNgTofEoWIQeClKpgxFLrg== -pnp-webpack-plugin@1.6.4: - version "1.6.4" - resolved "https://registry.yarnpkg.com/pnp-webpack-plugin/-/pnp-webpack-plugin-1.6.4.tgz#c9711ac4dc48a685dabafc86f8b6dd9f8df84149" - integrity sha512-7Wjy+9E3WwLOEL30D+m8TSTF7qJJUJLONBnwQp0518siuMxUQUbgZwssaFX+QKlZkjHZcw/IpZCt/H0srrntSg== - dependencies: - ts-pnp "^1.1.6" - popmotion@9.3.6: version "9.3.6" resolved "https://registry.yarnpkg.com/popmotion/-/popmotion-9.3.6.tgz#b5236fa28f242aff3871b9e23721f093133248d1" @@ -4011,13 +4122,13 @@ popmotion@9.3.6: style-value-types "4.1.4" tslib "^2.1.0" -postcss@8.2.13: - version "8.2.13" - resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.2.13.tgz#dbe043e26e3c068e45113b1ed6375d2d37e2129f" - integrity sha512-FCE5xLH+hjbzRdpbRb1IMCvPv9yZx2QnDarBEYSN0N0HYk+TcXsEhwdFcFb+SRWOKzKGErhIEbBK2ogyLdTtfQ== +postcss@8.2.15: + version "8.2.15" + resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.2.15.tgz#9e66ccf07292817d226fc315cbbf9bc148fbca65" + integrity sha512-2zO3b26eJD/8rb106Qu2o7Qgg52ND5HPjcyQiK2B98O388h43A448LCslC0dI2P97wCAQRJsFvwTRcXxTKds+Q== dependencies: colorette "^1.2.2" - nanoid "^3.1.22" + nanoid "^3.1.23" source-map "^0.6.1" prelude-ls@^1.2.1: @@ -4037,12 +4148,7 @@ prettier@^2.3.2: resolved "https://registry.yarnpkg.com/prettier/-/prettier-2.3.2.tgz#ef280a05ec253712e486233db5c6f23441e7342d" integrity sha512-lnJzDfJ66zkMy58OL5/NY5zp70S7Nz6KqcKkXYzn2tMVrNxvbqaBpg7H3qHaLxCJ5lNMsGuM8+ohS7cZrthdLQ== -process-nextick-args@~2.0.0: - version "2.0.1" - resolved "https://registry.yarnpkg.com/process-nextick-args/-/process-nextick-args-2.0.1.tgz#7820d9b16120cc55ca9ae7792680ae7dba6d7fe2" - integrity sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag== - -process@0.11.10, process@^0.11.10: +process@0.11.10: version "0.11.10" resolved "https://registry.yarnpkg.com/process/-/process-0.11.10.tgz#7332300e840161bda3e69a1d1d91a7d4bc16f182" integrity sha1-czIwDoQBYb2j5podHZGn1LwW8YI= @@ -4057,7 +4163,7 @@ promise-polyfill@8.1.3: resolved "https://registry.yarnpkg.com/promise-polyfill/-/promise-polyfill-8.1.3.tgz#8c99b3cf53f3a91c68226ffde7bde81d7f904116" integrity sha512-MG5r82wBzh7pSKDRa9y+vllNHz3e3d4CNj1PQE4BQYxLme0gKYYBm9YENq+UkEikyZ0XbiGWxYlVw3Rl9O/U8g== -prop-types@15.7.2, prop-types@^15.6.2, prop-types@^15.7.2: +prop-types@^15.6.2, prop-types@^15.7.2: version "15.7.2" resolved "https://registry.yarnpkg.com/prop-types/-/prop-types-15.7.2.tgz#52c41e75b8c87e72b9d9360e0206b99dcbffa6c5" integrity sha512-8QQikdH7//R2vurIJSutZ1smHYTcLpRWEOlHnzcWHmBYrOGUysKwSsrC89BCiFj3CbrfJ/nXFdJepOVrY1GCHQ== @@ -4066,10 +4172,15 @@ prop-types@15.7.2, prop-types@^15.6.2, prop-types@^15.7.2: object-assign "^4.1.1" react-is "^16.8.1" +property-expr@^2.0.4: + version "2.0.4" + resolved "https://registry.yarnpkg.com/property-expr/-/property-expr-2.0.4.tgz#37b925478e58965031bb612ec5b3260f8241e910" + integrity sha512-sFPkHQjVKheDNnPvotjQmm3KD3uk1fWKUN7CrpdbwmUx3CrG3QiM8QpTSimvig5vTXmTvjz7+TDvXOI9+4rkcg== + protobufjs@^6.10.0: - version "6.11.2" - resolved "https://registry.yarnpkg.com/protobufjs/-/protobufjs-6.11.2.tgz#de39fabd4ed32beaa08e9bb1e30d08544c1edf8b" - integrity sha512-4BQJoPooKJl2G9j3XftkIXjoC9C0Av2NOrWmbLWT1vH32GcSUHjM0Arra6UfTsVyfMAuFzaLucXn1sadxJydAw== + version "6.11.4" + resolved "https://registry.yarnpkg.com/protobufjs/-/protobufjs-6.11.4.tgz#29a412c38bf70d89e537b6d02d904a6f448173aa" + integrity "sha1-KaQSw4v3DYnlN7bQLZBKb0SBc6o= sha512-5kQWPaJHi1WoCpjTGszzQ32PG2F4+wRY6BmAT4Vfw56Q2FZ4YZzK20xUYQH4YkfehY1e6QSICrJquM6xXZNcrw==" dependencies: "@protobufjs/aspromise" "^1.1.2" "@protobufjs/base64" "^1.1.2" @@ -4097,36 +4208,16 @@ public-encrypt@^4.0.0: randombytes "^2.0.1" safe-buffer "^5.1.2" -punycode@1.3.2: - version "1.3.2" - resolved "https://registry.yarnpkg.com/punycode/-/punycode-1.3.2.tgz#9653a036fb7c1ee42342f2325cceefea3926c48d" - integrity sha1-llOgNvt8HuQjQvIyXM7v6jkmxI0= - -punycode@^1.2.4: - version "1.4.1" - resolved "https://registry.yarnpkg.com/punycode/-/punycode-1.4.1.tgz#c0d5a63b2718800ad8e1eb0fa5269c84dd41845e" - integrity sha1-wNWmOycYgArY4esPpSachN1BhF4= - punycode@^2.1.0: version "2.1.1" resolved "https://registry.yarnpkg.com/punycode/-/punycode-2.1.1.tgz#b58b010ac40c22c5657616c8d2c2c02c7bf479ec" integrity sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A== -querystring-es3@0.2.1, querystring-es3@^0.2.0: +querystring-es3@0.2.1: version "0.2.1" resolved "https://registry.yarnpkg.com/querystring-es3/-/querystring-es3-0.2.1.tgz#9ec61f79049875707d69414596fd907a4d711e73" integrity sha1-nsYfeQSYdXB9aUFFlv2Qek1xHnM= -querystring@0.2.0: - version "0.2.0" - resolved "https://registry.yarnpkg.com/querystring/-/querystring-0.2.0.tgz#b209849203bb25df820da756e747005878521620" - integrity sha1-sgmEkgO7Jd+CDadW50cAWHhSFiA= - -querystring@^0.2.0: - version "0.2.1" - resolved "https://registry.yarnpkg.com/querystring/-/querystring-0.2.1.tgz#40d77615bb09d16902a85c3e38aa8b5ed761c2dd" - integrity sha512-wkvS7mL/JMugcup3/rMitHmd9ecIGd2lhFhK9N3UUQ450h66d1r3Y9nvXzQAW1Lq+wyx61k/1pfKS5KuKiyEbg== - queue-microtask@^1.2.2: version "1.2.3" resolved "https://registry.yarnpkg.com/queue-microtask/-/queue-microtask-1.2.3.tgz#4929228bbc724dfac43e0efb058caf7b6cfb6243" @@ -4214,6 +4305,11 @@ react-hook-form@^7.12.2: resolved "https://registry.yarnpkg.com/react-hook-form/-/react-hook-form-7.12.2.tgz#2660afbf03c4ef360a9314ebf46ce3d972296c77" integrity sha512-cpxocjrgpMAJCMJQR51BQhMoEx80/EQqePNihMTgoTYTqCRbd2GExi+N4GJIr+cFqrmbwNj9wxk5oLWYQsUefg== +react-icons@^4.12.0: + version "4.12.0" + resolved "https://registry.yarnpkg.com/react-icons/-/react-icons-4.12.0.tgz#54806159a966961bfd5cdb26e492f4dafd6a8d78" + integrity sha512-IBaDuHiShdZqmfc/TwHu6+d6k2ltNCf3AszxNmjJc1KUfXdEeRJOKyNvLmAHaarhzGmTSVygNdyu8/opXv2gaw== + react-is@17.0.2: version "17.0.2" resolved "https://registry.yarnpkg.com/react-is/-/react-is-17.0.2.tgz#e691d4a8e9c789365655539ab372762b0efb54f0" @@ -4270,7 +4366,7 @@ react-style-singleton@^2.1.0: invariant "^2.2.4" tslib "^1.0.0" -react@17.0.2: +react@^17.0.2: version "17.0.2" resolved "https://registry.yarnpkg.com/react/-/react-17.0.2.tgz#d0b5cc516d29eb3eee383f75b62864cfb6800037" integrity sha512-gnhPt75i/dq/z3/6q/0asP78D0u592D5L1pd7M8P+dck6Fu/jJeL6iVVK23fptSUZj8Vjf++7wXA8UNclGQcbA== @@ -4295,19 +4391,6 @@ read-pkg@^3.0.0: normalize-package-data "^2.3.2" path-type "^3.0.0" -readable-stream@^2.0.2, readable-stream@^2.3.3, readable-stream@^2.3.6: - version "2.3.7" - resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.7.tgz#1eca1cf711aef814c04f62252a36a62f6cb23b57" - integrity sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw== - dependencies: - core-util-is "~1.0.0" - inherits "~2.0.3" - isarray "~1.0.0" - process-nextick-args "~2.0.0" - safe-buffer "~5.1.1" - string_decoder "~1.1.1" - util-deprecate "~1.0.1" - readable-stream@^3.5.0, readable-stream@^3.6.0: version "3.6.0" resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-3.6.0.tgz#337bbda3adc0706bd3e024426a286d4b4b2c9198" @@ -4317,6 +4400,15 @@ readable-stream@^3.5.0, readable-stream@^3.6.0: string_decoder "^1.1.1" util-deprecate "^1.0.1" +readable-stream@^3.6.2: + version "3.6.2" + resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-3.6.2.tgz#56a9b36ea965c00c5a93ef31eb111a0f11056967" + integrity sha512-9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA== + dependencies: + inherits "^2.0.3" + string_decoder "^1.1.1" + util-deprecate "^1.0.1" + readdirp@~3.5.0: version "3.5.0" resolved "https://registry.yarnpkg.com/readdirp/-/readdirp-3.5.0.tgz#9ba74c019b15d365278d2e91bb8c48d7b4d42c9e" @@ -4324,6 +4416,18 @@ readdirp@~3.5.0: dependencies: picomatch "^2.2.1" +readdirp@~3.6.0: + version "3.6.0" + resolved "https://registry.yarnpkg.com/readdirp/-/readdirp-3.6.0.tgz#74a370bd857116e245b29cc97340cd431a02a6c7" + integrity sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA== + dependencies: + picomatch "^2.2.1" + +regenerator-runtime@0.13.4: + version "0.13.4" + resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.13.4.tgz#e96bf612a3362d12bb69f7e8f74ffeab25c7ac91" + integrity sha512-plpwicqEzfEyTQohIKktWigcLzmNStMGwbOUbykx51/29Z3JOGYldaaNGK7ngNXV+UcoqvIMmloZ48Sr74sd+g== + regenerator-runtime@^0.13.4: version "0.13.9" resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.13.9.tgz#8925742a98ffd90814988d7566ad30ca3b263b52" @@ -4405,12 +4509,12 @@ run-parallel@^1.1.9: dependencies: queue-microtask "^1.2.2" -safe-buffer@>=5.1.0, safe-buffer@^5.0.1, safe-buffer@^5.1.0, safe-buffer@^5.1.1, safe-buffer@^5.1.2, safe-buffer@^5.2.0, safe-buffer@~5.2.0: +safe-buffer@>=5.1.0, safe-buffer@^5.0.1, safe-buffer@^5.1.0, safe-buffer@^5.1.1, safe-buffer@^5.1.2, safe-buffer@^5.2.0, safe-buffer@^5.2.1, safe-buffer@~5.2.0: version "5.2.1" resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.2.1.tgz#1eaf9fa9bdb1fdd4ec75f58f9cdb4e6b7827eec6" integrity sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ== -safe-buffer@~5.1.0, safe-buffer@~5.1.1: +safe-buffer@~5.1.1: version "5.1.2" resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.2.tgz#991ec69d296e0313747d59bdfd2b745c35f8828d" integrity sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g== @@ -4420,6 +4524,15 @@ safe-buffer@~5.1.0, safe-buffer@~5.1.1: resolved "https://registry.yarnpkg.com/safer-buffer/-/safer-buffer-2.1.2.tgz#44fa161b0187b9549dd84bb91802f9bd8385cd6a" integrity sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg== +sass@^1.69.5: + version "1.69.5" + resolved "https://registry.yarnpkg.com/sass/-/sass-1.69.5.tgz#23e18d1c757a35f2e52cc81871060b9ad653dfde" + integrity sha512-qg2+UCJibLr2LCVOt3OlPhr/dqVHWOa9XtZf2OjbLs/T4VPSJ00udtgJxH3neXZm+QqX8B+3cU7RaLqp1iVfcQ== + dependencies: + chokidar ">=3.0.0 <4.0.0" + immutable "^4.0.0" + source-map-js ">=0.6.2 <2.0.0" + scheduler@^0.20.2: version "0.20.2" resolved "https://registry.yarnpkg.com/scheduler/-/scheduler-0.20.2.tgz#4baee39436e34aa93b4874bddcbf0fe8b8b50e91" @@ -4434,9 +4547,9 @@ scheduler@^0.20.2: integrity sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ== semver@^6.0.0, semver@^6.3.0: - version "6.3.0" - resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.0.tgz#ee0a64c8af5e8ceea67687b133761e1becbd1d3d" - integrity sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw== + version "6.3.1" + resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.1.tgz#556d2ef8689146e46dcea4bfdd095f3434dffcb4" + integrity sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA== semver@^7.2.1, semver@^7.3.5: version "7.3.5" @@ -4503,6 +4616,11 @@ slice-ansi@^4.0.0: astral-regex "^2.0.0" is-fullwidth-code-point "^3.0.0" +"source-map-js@>=0.6.2 <2.0.0": + version "1.0.2" + resolved "https://registry.yarnpkg.com/source-map-js/-/source-map-js-1.0.2.tgz#adbc361d9c62df380125e7f161f71c826f1e490c" + integrity sha512-R0XvVJ9WusLiqTCEiGCmICCMplcCkIwwR11mOSD9CR5u+IXYdiseeEuXCVAjS54zqwkLcPNnmU4OeJ6tUrWhDw== + source-map@0.7.3: version "0.7.3" resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.7.3.tgz#5302f8169031735226544092e64981f751750383" @@ -4576,14 +4694,6 @@ stream-browserify@3.0.0: inherits "~2.0.4" readable-stream "^3.5.0" -stream-browserify@^2.0.1: - version "2.0.2" - resolved "https://registry.yarnpkg.com/stream-browserify/-/stream-browserify-2.0.2.tgz#87521d38a44aa7ee91ce1cd2a47df0cb49dd660b" - integrity sha512-nX6hmklHs/gr2FuxYDltq8fJA1GDlxKQCz8O/IM4atRqBH8OORmBNgfvW5gG10GT/qQ9u0CzIvr2X5Pkt6ntqg== - dependencies: - inherits "~2.0.1" - readable-stream "^2.0.2" - stream-http@3.1.1: version "3.1.1" resolved "https://registry.yarnpkg.com/stream-http/-/stream-http-3.1.1.tgz#0370a8017cf8d050b9a8554afe608f043eaff564" @@ -4594,17 +4704,6 @@ stream-http@3.1.1: readable-stream "^3.6.0" xtend "^4.0.2" -stream-http@^2.7.2: - version "2.8.3" - resolved "https://registry.yarnpkg.com/stream-http/-/stream-http-2.8.3.tgz#b2d242469288a5a27ec4fe8933acf623de6514fc" - integrity sha512-+TSkfINHDo4J+ZobQLWiMouQYB+UVYFttRA94FpEzzJ7ZdqcL4uUUQ7WkdkI4DSozGmgBUE/a47L+38PenXhUw== - dependencies: - builtin-status-codes "^3.0.0" - inherits "^2.0.1" - readable-stream "^2.3.6" - to-arraybuffer "^1.0.0" - xtend "^4.0.0" - stream-parser@^0.3.1: version "0.3.1" resolved "https://registry.yarnpkg.com/stream-parser/-/stream-parser-0.3.1.tgz#1618548694420021a1182ff0af1911c129761773" @@ -4656,21 +4755,21 @@ string.prototype.trimstart@^1.0.4: call-bind "^1.0.2" define-properties "^1.1.3" -string_decoder@1.3.0, string_decoder@^1.0.0, string_decoder@^1.1.1: +string_decoder@1.3.0, string_decoder@^1.1.1: version "1.3.0" resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.3.0.tgz#42f114594a46cf1a8e30b0a84f56c78c3edac21e" integrity sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA== dependencies: safe-buffer "~5.2.0" -string_decoder@~1.1.1: - version "1.1.1" - resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.1.1.tgz#9cf1611ba62685d7030ae9e4ba34149c3af03fc8" - integrity sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg== +strip-ansi@6.0.1: + version "6.0.1" + resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9" + integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A== dependencies: - safe-buffer "~5.1.0" + ansi-regex "^5.0.1" -strip-ansi@6.0.0, strip-ansi@^6.0.0: +strip-ansi@^6.0.0: version "6.0.0" resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.0.tgz#0b1571dd7669ccd4f3e06e14ef1eed26225ae532" integrity sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w== @@ -4695,13 +4794,13 @@ style-value-types@4.1.4: hey-listen "^1.0.8" tslib "^2.1.0" -styled-jsx@3.3.2: - version "3.3.2" - resolved "https://registry.yarnpkg.com/styled-jsx/-/styled-jsx-3.3.2.tgz#2474601a26670a6049fb4d3f94bd91695b3ce018" - integrity sha512-daAkGd5mqhbBhLd6jYAjYBa9LpxYCzsgo/f6qzPdFxVB8yoGbhxvzQgkC0pfmCVvW3JuAEBn0UzFLBfkHVZG1g== +styled-jsx@5.0.0-beta.3: + version "5.0.0-beta.3" + resolved "https://registry.yarnpkg.com/styled-jsx/-/styled-jsx-5.0.0-beta.3.tgz#400d16179b5dff10d5954ab8be27a9a1b7780dd2" + integrity sha512-HtDDGSFPvmjHIqWf9n8Oo54tAoY/DTplvlyOH2+YOtD80Sp31Ap8ffSmxhgk5EkUoJ7xepdXMGT650mSffWuRA== dependencies: - "@babel/types" "7.8.3" - babel-plugin-syntax-jsx "6.18.0" + "@babel/plugin-syntax-jsx" "7.14.5" + "@babel/types" "7.15.0" convert-source-map "1.7.0" loader-utils "1.2.3" source-map "0.7.3" @@ -4762,7 +4861,7 @@ text-table@^0.2.0: resolved "https://registry.yarnpkg.com/text-table/-/text-table-0.2.0.tgz#7f5ee823ae805207c00af2df4a84ec3fcfa570b4" integrity sha1-f17oI66AUgfACvLfSoTsP8+lcLQ= -timers-browserify@2.0.12, timers-browserify@^2.0.4: +timers-browserify@2.0.12: version "2.0.12" resolved "https://registry.yarnpkg.com/timers-browserify/-/timers-browserify-2.0.12.tgz#44a45c11fbf407f34f97bccd1577c652361b00ee" integrity sha512-9phl76Cqm6FhSX9Xe1ZUAMLtm1BLkKj2Qd5ApyWkXzsMRaA7dgr81kf4wJmQf/hAvg8EEyJxDo3du/0KlhPiKQ== @@ -4779,11 +4878,6 @@ tinycolor2@1.4.2: resolved "https://registry.yarnpkg.com/tinycolor2/-/tinycolor2-1.4.2.tgz#3f6a4d1071ad07676d7fa472e1fac40a719d8803" integrity sha512-vJhccZPs965sV/L2sU4oRQVAos0pQXwsvTLkWYdqJ+a8Q5kPFzJTuOFwy7UniPli44NKQGAglksjvOcpo95aZA== -to-arraybuffer@^1.0.0: - version "1.0.1" - resolved "https://registry.yarnpkg.com/to-arraybuffer/-/to-arraybuffer-1.0.1.tgz#7d229b1fcc637e466ca081180836a7aabff83f43" - integrity sha1-fSKbH8xjfkZsoIEYCDanqr/4P0M= - to-fast-properties@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/to-fast-properties/-/to-fast-properties-2.0.0.tgz#dc5e698cbd079265bc73e0377681a4e4e83f616e" @@ -4806,6 +4900,11 @@ toidentifier@1.0.0: resolved "https://registry.yarnpkg.com/toidentifier/-/toidentifier-1.0.0.tgz#7e1be3470f1e77948bc43d94a3c8f4d7752ba553" integrity sha512-yaOH/Pk/VEhBWWTlhI+qXxDFXlejDGcQipMlyxda9nthulaxLZUNcUqFxokp0vcYnvteJln5FNQDRrxj3YcbVw== +toposort@^2.0.2: + version "2.0.2" + resolved "https://registry.yarnpkg.com/toposort/-/toposort-2.0.2.tgz#ae21768175d1559d48bef35420b2f4962f09c330" + integrity sha1-riF2gXXRVZ1IvvNUILL0li8JwzA= + tr46@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/tr46/-/tr46-1.0.1.tgz#a8b13fd6bfd2489519674ccde55ba3693b706d09" @@ -4813,11 +4912,6 @@ tr46@^1.0.1: dependencies: punycode "^2.1.0" -ts-pnp@^1.1.6: - version "1.2.0" - resolved "https://registry.yarnpkg.com/ts-pnp/-/ts-pnp-1.2.0.tgz#a500ad084b0798f1c3071af391e65912c86bca92" - integrity sha512-csd+vJOb/gkzvcCHgTGSChYpy5f1/XKNsmvBGO4JXS+z1v2HobugDz4s1IeFXM3wZB44uczs+eazB5Q/ccdhQw== - tsconfig-paths@^3.9.0: version "3.10.1" resolved "https://registry.yarnpkg.com/tsconfig-paths/-/tsconfig-paths-3.10.1.tgz#79ae67a68c15289fdf5c51cb74f397522d795ed7" @@ -4844,11 +4938,6 @@ tsutils@^3.21.0: dependencies: tslib "^1.8.1" -tty-browserify@0.0.0: - version "0.0.0" - resolved "https://registry.yarnpkg.com/tty-browserify/-/tty-browserify-0.0.0.tgz#a157ba402da24e9bf957f9aa69d524eed42901a6" - integrity sha1-oVe6QC2iTpv5V/mqadUk7tQpAaY= - tty-browserify@0.0.1: version "0.0.1" resolved "https://registry.yarnpkg.com/tty-browserify/-/tty-browserify-0.0.1.tgz#3f05251ee17904dfd0677546670db9651682b811" @@ -4898,14 +4987,6 @@ uri-js@^4.2.2: dependencies: punycode "^2.1.0" -url@^0.11.0: - version "0.11.0" - resolved "https://registry.yarnpkg.com/url/-/url-0.11.0.tgz#3838e97cfc60521eb73c525a8e55bfdd9e2e28f1" - integrity sha1-ODjpfPxgUh63PFJajlW/3Z4uKPE= - dependencies: - punycode "1.3.2" - querystring "0.2.0" - use-callback-ref@^1.2.1, use-callback-ref@^1.2.3: version "1.2.5" resolved "https://registry.yarnpkg.com/use-callback-ref/-/use-callback-ref-1.2.5.tgz#6115ed242cfbaed5915499c0a9842ca2912f38a5" @@ -4926,38 +5007,12 @@ use-subscription@1.5.1: dependencies: object-assign "^4.1.1" -util-deprecate@^1.0.1, util-deprecate@~1.0.1: +util-deprecate@^1.0.1: version "1.0.2" resolved "https://registry.yarnpkg.com/util-deprecate/-/util-deprecate-1.0.2.tgz#450d4dc9fa70de732762fbd2d4a28981419a0ccf" integrity sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8= -util@0.10.3: - version "0.10.3" - resolved "https://registry.yarnpkg.com/util/-/util-0.10.3.tgz#7afb1afe50805246489e3db7fe0ed379336ac0f9" - integrity sha1-evsa/lCAUkZInj23/g7TeTNqwPk= - dependencies: - inherits "2.0.1" - -util@0.12.3: - version "0.12.3" - resolved "https://registry.yarnpkg.com/util/-/util-0.12.3.tgz#971bb0292d2cc0c892dab7c6a5d37c2bec707888" - integrity sha512-I8XkoQwE+fPQEhy9v012V+TSdH2kp9ts29i20TaaDUXsg7x/onePbhFJUExBfv/2ay1ZOp/Vsm3nDlmnFGSAog== - dependencies: - inherits "^2.0.3" - is-arguments "^1.0.4" - is-generator-function "^1.0.7" - is-typed-array "^1.1.3" - safe-buffer "^5.1.2" - which-typed-array "^1.1.2" - -util@^0.11.0: - version "0.11.1" - resolved "https://registry.yarnpkg.com/util/-/util-0.11.1.tgz#3236733720ec64bb27f6e26f421aaa2e1b588d61" - integrity sha512-HShAsny+zS2TZfaXxD9tYj4HQGlBezXZMZuM/S5PKLLoZkShZiGk9o5CzukI1LVHZvjdvZ2Sj1aW/Ndn2NB/HQ== - dependencies: - inherits "2.0.3" - -util@^0.12.0: +util@0.12.4, util@^0.12.0: version "0.12.4" resolved "https://registry.yarnpkg.com/util/-/util-0.12.4.tgz#66121a31420df8f01ca0c464be15dfa1d1850253" integrity sha512-bxZ9qtSlGUWSOy9Qa9Xgk11kSslpuZwaxCg4sNIDj6FLucDab2JxnHwyNTCpHMtK1MjoQiWQ6DiUMZYbSrO+Sw== @@ -4982,7 +5037,7 @@ validate-npm-package-license@^3.0.1: spdx-correct "^3.0.0" spdx-expression-parse "^3.0.0" -vm-browserify@1.1.2, vm-browserify@^1.0.1: +vm-browserify@1.1.2: version "1.1.2" resolved "https://registry.yarnpkg.com/vm-browserify/-/vm-browserify-1.1.2.tgz#78641c488b8e6ca91a75f511e7a3b32a86e5dda0" integrity sha512-2ham8XPWTONajOR0ohOKOHXkm3+gaBmGut3SRuu75xLd/RRaY6vqgh8NBYYk7+RW3u5AtzPQZG8F10LHkl0lAQ== @@ -5066,9 +5121,9 @@ which@^2.0.1: isexe "^2.0.0" word-wrap@^1.2.3: - version "1.2.3" - resolved "https://registry.yarnpkg.com/word-wrap/-/word-wrap-1.2.3.tgz#610636f6b1f703891bd34771ccb17fb93b47079c" - integrity sha512-Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ== + version "1.2.5" + resolved "https://registry.yarnpkg.com/word-wrap/-/word-wrap-1.2.5.tgz#d2c45c6dd4fbce621a66f136cbe328afd0410b34" + integrity "sha1-0sRcbdT7zmIaZvE2y+Mor9BBCzQ= sha512-BN22B5eaMMI9UMtjrGd5g5eCYPpCPDUy0FJXbYsaT5zYxjFOckS53SQDE3pWkVoWpHXVb3BrYcEN4Twa55B5cA==" wrap-ansi@^7.0.0: version "7.0.0" @@ -5089,7 +5144,7 @@ xmlhttprequest@1.8.0: resolved "https://registry.yarnpkg.com/xmlhttprequest/-/xmlhttprequest-1.8.0.tgz#67fe075c5c24fef39f9d65f5f7b7fe75171968fc" integrity sha1-Z/4HXFwk/vOfnWX197f+dRcZaPw= -xtend@^4.0.0, xtend@^4.0.2: +xtend@^4.0.2: version "4.0.2" resolved "https://registry.yarnpkg.com/xtend/-/xtend-4.0.2.tgz#bb72779f5fa465186b1f438f674fa347fdb5db54" integrity sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ== @@ -5131,3 +5186,16 @@ yocto-queue@^0.1.0: version "0.1.0" resolved "https://registry.yarnpkg.com/yocto-queue/-/yocto-queue-0.1.0.tgz#0294eb3dee05028d31ee1a5fa2c556a6aaf10a1b" integrity sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q== + +yup@^0.32.10: + version "0.32.10" + resolved "https://registry.yarnpkg.com/yup/-/yup-0.32.10.tgz#b8809bb9a5c4782672b86651cae41adef1decbb8" + integrity sha512-xRZnd0EEXz+zNQ3mIN5p5r9FbSeK811oKXT3SKU+yml0NiqEd5qj+Roy37kkMYVaOM6TTQs/D/sfWHS/JxXeTg== + dependencies: + "@babel/runtime" "^7.15.4" + "@types/lodash" "^4.14.175" + lodash "^4.17.21" + lodash-es "^4.17.21" + nanoclone "^0.2.1" + property-expr "^2.0.4" + toposort "^2.0.2" From dfc8bcb60232beebb600481ebf22d1fb9f7bd641 Mon Sep 17 00:00:00 2001 From: Victor Lucas Date: Mon, 20 Nov 2023 08:53:12 -0500 Subject: [PATCH 37/39] fix: create income --- .../FormBill/form-bill.container.tsx | 97 +++++++++++-------- pages/_app.tsx | 2 +- 2 files changed, 60 insertions(+), 39 deletions(-) diff --git a/modules/Bill/container/FormBill/form-bill.container.tsx b/modules/Bill/container/FormBill/form-bill.container.tsx index 6816481..cddfcb5 100644 --- a/modules/Bill/container/FormBill/form-bill.container.tsx +++ b/modules/Bill/container/FormBill/form-bill.container.tsx @@ -34,29 +34,6 @@ const recurrenceTypes = [ // }, ]; -const categoriesExpense = [ - { - label: '💳 Cartão de crédito', - value: 'CREDIT_CARD', - }, - { - label: '💰 Investimento', - value: 'INVESTING', - }, - { - label: '💸 Fixo', - value: 'FIXED', - }, - { - label: '🔁 Flexível', - value: 'FLEX', - }, - { - label: '💲 Outro', - value: 'OTHER', - }, -]; - interface FormBillProps { billId?: string; } @@ -86,10 +63,6 @@ export const FormBillContainer = ({ billId }: FormBillProps) => { } }, [router.query.type, setValue]); - useEffect(() => { - setValue('category', categoriesExpense[0].value); - }, [setValue]); - const onSubmit = async values => { if (!userId) return; @@ -203,6 +176,56 @@ export const FormBillContainer = ({ billId }: FormBillProps) => { return `${prefix} conta`; }, [billId, router.query.type]); + const type = useMemo(() => { + return router.query.type || watch('type', false); + }, [watch, router.query.type]); + + const categories = useMemo(() => { + if (type === BillTypes.EXPENSE) { + return [ + { + label: '💳 Cartão de crédito', + value: 'CREDIT_CARD', + }, + { + label: '💰 Investimento', + value: 'INVESTING', + }, + { + label: '💸 Fixo', + value: 'FIXED', + }, + { + label: '🔁 Flexível', + value: 'FLEX', + }, + { + label: '💲 Outro', + value: 'OTHER', + }, + ]; + } else { + return [ + { + label: '💰 Salário', + value: 'SALARY', + }, + { + label: '💸 Veaco', + value: 'VEACO', + }, + { + label: '💲 Outro', + value: 'OTHER', + }, + ]; + } + }, [type]); + + useEffect(() => { + setValue('category', categories[0].value); + }, [setValue]); + return ( { { isRequired /> - - - + diff --git a/pages/_app.tsx b/pages/_app.tsx index 246a96c..cfd1e78 100644 --- a/pages/_app.tsx +++ b/pages/_app.tsx @@ -14,7 +14,7 @@ function MyApp({ Component, pageProps }: AppProps) { - + From c6207ee17da937d0cb8d2d9a9fdcd70307c1108c Mon Sep 17 00:00:00 2001 From: Victor Lucas Date: Mon, 20 Nov 2023 13:55:55 -0500 Subject: [PATCH 38/39] fix: categories --- components/Box/index.tsx | 2 +- components/LateralMenu/index.tsx | 2 + components/Modal/index.tsx | 19 ++- .../services/authentication.service.ts | 19 +-- .../BaseModule/components/Bubble/index.tsx | 16 ++- modules/BaseModule/constants/Bubble.ts | 3 +- .../BaseModule/container/BaseForm/index.tsx | 2 +- .../BaseModule/container/BaseList/index.tsx | 101 ++++++++++++++-- modules/BaseModule/shared/renderFields.tsx | 1 + .../FormBill/form-bill.container.tsx | 60 +++------- .../components/form-category.component.tsx | 113 ++++++++++++++++++ .../container/form-category.container.tsx | 12 ++ .../container/list-categories.container.tsx | 66 ++++++++++ .../helpers/createDefaultCategories.ts | 64 ++++++++++ .../Category/hooks/useCategoriesSelect.tsx | 24 ++++ pages/category/create.tsx | 15 +++ pages/category/index.tsx | 10 ++ pages/styles.scss | 21 ++++ 18 files changed, 481 insertions(+), 69 deletions(-) create mode 100644 modules/Category/components/form-category.component.tsx create mode 100644 modules/Category/container/form-category.container.tsx create mode 100644 modules/Category/container/list-categories.container.tsx create mode 100644 modules/Category/helpers/createDefaultCategories.ts create mode 100644 modules/Category/hooks/useCategoriesSelect.tsx create mode 100644 pages/category/create.tsx create mode 100644 pages/category/index.tsx diff --git a/components/Box/index.tsx b/components/Box/index.tsx index bf905a2..622e382 100644 --- a/components/Box/index.tsx +++ b/components/Box/index.tsx @@ -9,7 +9,7 @@ type BoxProps = { export const Box = ({ title, description, children, ...rest }: BoxProps) => { return ( - + {(title || description) && ( {title && ( diff --git a/components/LateralMenu/index.tsx b/components/LateralMenu/index.tsx index cda7833..1bbc53e 100644 --- a/components/LateralMenu/index.tsx +++ b/components/LateralMenu/index.tsx @@ -19,6 +19,7 @@ import { import { FiHome, FiPower, FiTrendingUp, FiTrendingDown, FiMenu } from 'react-icons/fi'; import { IconType } from 'react-icons'; import Image from 'next/image'; +import { BiSolidCategoryAlt } from 'react-icons/bi'; interface LinkItemProps { name: string; @@ -29,6 +30,7 @@ const LinkItems: Array = [ { name: 'Início', icon: FiHome, link: '/' }, { name: 'Criar receita', icon: FiTrendingUp, link: '/bill?type=INCOME' }, { name: 'Criar despesa', icon: FiTrendingDown, link: '/bill?type=EXPENSE' }, + { name: 'Categorias', icon: BiSolidCategoryAlt, link: '/category' }, { name: 'Sair', icon: FiPower, diff --git a/components/Modal/index.tsx b/components/Modal/index.tsx index 36ee630..eb07131 100644 --- a/components/Modal/index.tsx +++ b/components/Modal/index.tsx @@ -1,17 +1,30 @@ -import { Modal as ModalChakra, ModalOverlay, ModalContent, ModalBody } from '@chakra-ui/react'; +import { + Modal as ModalChakra, + ModalOverlay, + ModalContent, + ModalBody, + ModalCloseButton, + ModalHeader, + ModalFooter, +} from '@chakra-ui/react'; interface ModalInterface { onClose: () => void; isOpen: boolean; + title?: string; + footer?: React.ReactElement; children: React.ReactElement; } -export const Modal = ({ onClose, isOpen, children }: ModalInterface) => { +export const Modal = ({ title, footer, onClose, isOpen, children }: ModalInterface) => { return ( - + + + {title && {title}} {children} + {footer && {footer}} ); diff --git a/modules/Authentication/services/authentication.service.ts b/modules/Authentication/services/authentication.service.ts index 5452137..5f96907 100644 --- a/modules/Authentication/services/authentication.service.ts +++ b/modules/Authentication/services/authentication.service.ts @@ -1,4 +1,5 @@ import { auth, firestore, googleProvider } from '@Configs/Firebase'; +import { createDefaultCategories } from '@Modules/Category/helpers/createDefaultCategories'; interface IGoogleProviderProfile { email?: string; @@ -12,16 +13,20 @@ interface IGoogleProviderProfile { } export const signInWithGoogle = () => { - return auth.signInWithPopup(googleProvider).then(({ additionalUserInfo, user }) => { + return auth.signInWithPopup(googleProvider).then(async ({ additionalUserInfo, user }) => { if (additionalUserInfo.isNewUser) { const profile = additionalUserInfo.profile as IGoogleProviderProfile; - firestore.collection('user').add({ - email: profile?.email, - name: `${profile?.given_name} ${profile?.family_name}`, - locale: profile?.locale, - image: profile?.picture, - }); + await firestore + .collection('user') + .doc(user.uid) + .set({ + email: profile?.email, + name: `${profile?.given_name} ${profile?.family_name}`, + locale: profile?.locale, + image: profile?.picture, + }) + .then(() => createDefaultCategories(user.uid)); } return user.uid; }); diff --git a/modules/BaseModule/components/Bubble/index.tsx b/modules/BaseModule/components/Bubble/index.tsx index 14968c2..d9e57b1 100644 --- a/modules/BaseModule/components/Bubble/index.tsx +++ b/modules/BaseModule/components/Bubble/index.tsx @@ -30,7 +30,7 @@ const Bubble = ({ props = {}, }: BubbleInterface) => { switch (type) { - case BUBBLE_TYPES.INPUT: + case BUBBLE_TYPES.INPUT_TEXT: return ( ); + case BUBBLE_TYPES.INPUT_COLOR: + return ( + + ); + case BUBBLE_TYPES.SELECT: return ( ); diff --git a/modules/BaseModule/constants/Bubble.ts b/modules/BaseModule/constants/Bubble.ts index c547777..05dfa3e 100644 --- a/modules/BaseModule/constants/Bubble.ts +++ b/modules/BaseModule/constants/Bubble.ts @@ -1,5 +1,6 @@ export const BUBBLE_TYPES = { - INPUT: 'INPUT', + INPUT_TEXT: 'INPUT_TEXT', + INPUT_COLOR: 'INPUT_COLOR', SELECT: 'SELECT', }; diff --git a/modules/BaseModule/container/BaseForm/index.tsx b/modules/BaseModule/container/BaseForm/index.tsx index 0bf8709..3111a4e 100644 --- a/modules/BaseModule/container/BaseForm/index.tsx +++ b/modules/BaseModule/container/BaseForm/index.tsx @@ -58,7 +58,7 @@ const BaseForm = ({ }, [fetch, fields, setValue] ); - + // useEffect(() => { if (id) { fetchData(id); diff --git a/modules/BaseModule/container/BaseList/index.tsx b/modules/BaseModule/container/BaseList/index.tsx index 416013e..adb5270 100644 --- a/modules/BaseModule/container/BaseList/index.tsx +++ b/modules/BaseModule/container/BaseList/index.tsx @@ -1,5 +1,25 @@ import React, { useEffect, useMemo, useState } from 'react'; -import { Box, Table, Thead, Tbody, Tr, Th, Td, Spinner, Button } from '@chakra-ui/react'; +import { + Box, + Table, + Thead, + Tbody, + Tr, + Th, + Td, + Spinner, + Button, + Text, + Popover, + PopoverTrigger, + PopoverContent, + PopoverBody, + PopoverArrow, + IconButton, + Stack, +} from '@chakra-ui/react'; +import { BsThreeDotsVertical } from 'react-icons/bs'; +import { DeleteIcon, EditIcon } from '@chakra-ui/icons'; import { Modal } from '@Components'; @@ -11,6 +31,7 @@ const MODAL_TYPES = { interface BaseHeader { label: string; field: string; + render?: (item) => React.ReactElement; } interface BaseListInterface { @@ -36,7 +57,7 @@ const BaseList = ({ const [id, setId] = useState(); useEffect(() => { - if (!modalType) { + if (!modalType && !!onCloseOption) { onCloseOption(); } }, [modalType]); @@ -51,14 +72,55 @@ const BaseList = ({ return items.map((item: T, index) => ( - {fields.map(field => { + {headers.map(({ field, render }) => { if (!item[field]) return; + if (!!render) return {render(item)}; return {item[field]}; })} {optionsEnabled && ( - handleOpenModalWithId(item.id, MODAL_TYPES.EDIT_MODAL)}>Edit - handleOpenModalWithId(item.id, MODAL_TYPES.DELETE_MODAL)}>Delete + + + } + variant="outline" + size="sm" + w="fit-content" + /> + + + + + + } + justifyContent="flex-start" + fontWeight="normal" + fontSize="sm" + onClick={() => handleOpenModalWithId(item.id, MODAL_TYPES.EDIT_MODAL)} + > + Editar categoria + + + } + justifyContent="flex-start" + fontWeight="normal" + colorScheme="red" + fontSize="sm" + onClick={() => handleOpenModalWithId(item.id, MODAL_TYPES.DELETE_MODAL)} + > + Deletar categoria + + + + + )} @@ -70,9 +132,10 @@ const BaseList = ({ case MODAL_TYPES.DELETE_MODAL: return ( <> -

Are you sure about this action?

- onDeleteItem(id)}>Yes, I'm - setModalType(null)}>Cancel + + Deletar categoria + + Você tem certeza que deseja apagar esta categoria? ); @@ -84,9 +147,27 @@ const BaseList = ({ } }, [editComponent, id, modalType]); + const modalFooter = useMemo(() => { + switch (modalType) { + case MODAL_TYPES.DELETE_MODAL: + return ( + <> + setModalType(null)}>Cancelar + onDeleteItem(id)}> + Deletar + + + ); + } + }, [editComponent, id, modalType]); + return ( <> - setModalType(null)}> + setModalType(null)} + footer={modalFooter} + > {modalContent} @@ -96,7 +177,7 @@ const BaseList = ({ {headers.map(({ label }) => ( {label} ))} - {optionsEnabled && Options} + {optionsEnabled && } diff --git a/modules/BaseModule/shared/renderFields.tsx b/modules/BaseModule/shared/renderFields.tsx index 88c29a2..e9b168e 100644 --- a/modules/BaseModule/shared/renderFields.tsx +++ b/modules/BaseModule/shared/renderFields.tsx @@ -14,6 +14,7 @@ const renderFields = (fields: BaseField[], errors, register) => register={register} options={options} value={value} + props={{ mb: 5 }} /> )); diff --git a/modules/Bill/container/FormBill/form-bill.container.tsx b/modules/Bill/container/FormBill/form-bill.container.tsx index cddfcb5..9be7ada 100644 --- a/modules/Bill/container/FormBill/form-bill.container.tsx +++ b/modules/Bill/container/FormBill/form-bill.container.tsx @@ -10,6 +10,7 @@ import { BillTypes, BillStatus } from '@Modules/Bill/constants/Types'; import { Input, MoneyInput, Select, DatePicker, Box, If } from '@Components'; import { useUser } from '@Modules/Authentication/context/UserContext'; import { defaultRequiredMessage, TO_YEAR } from '@Modules/Bill/constants/BillConsts'; +import { useCategoriesSelect } from '@Modules/Category/hooks/useCategoriesSelect'; const types = [ { @@ -51,6 +52,7 @@ export const FormBillContainer = ({ billId }: FormBillProps) => { const router = useRouter(); const toast = useToast(); const { userId } = useUser(); + const categoriesSelect = useCategoriesSelect(); const [foundBill, setFoundBill] = useState(); @@ -181,59 +183,27 @@ export const FormBillContainer = ({ billId }: FormBillProps) => { }, [watch, router.query.type]); const categories = useMemo(() => { - if (type === BillTypes.EXPENSE) { - return [ - { - label: '💳 Cartão de crédito', - value: 'CREDIT_CARD', - }, - { - label: '💰 Investimento', - value: 'INVESTING', - }, - { - label: '💸 Fixo', - value: 'FIXED', - }, - { - label: '🔁 Flexível', - value: 'FLEX', - }, - { - label: '💲 Outro', - value: 'OTHER', - }, - ]; - } else { - return [ - { - label: '💰 Salário', - value: 'SALARY', - }, - { - label: '💸 Veaco', - value: 'VEACO', - }, - { - label: '💲 Outro', - value: 'OTHER', - }, - ]; - } - }, [type]); + console.log( + categoriesSelect, + categoriesSelect.filter(category => category.type === type) + ); + return categoriesSelect + .filter(category => category.type === type) + .map(category => ({ + label: category.name, + value: category.id, + })); + }, [type, categoriesSelect]); useEffect(() => { + if (!categories[0]) return; setValue('category', categories[0].value); - }, [setValue]); + }, [setValue, categories]); return (

diff --git a/modules/Category/components/form-category.component.tsx b/modules/Category/components/form-category.component.tsx new file mode 100644 index 0000000..bc086fb --- /dev/null +++ b/modules/Category/components/form-category.component.tsx @@ -0,0 +1,113 @@ +import React, { useCallback } from 'react'; +import { object, string } from 'yup'; +import { useToast, Text } from '@chakra-ui/react'; +import { useRouter } from 'next/router'; + +import BaseForm from '@Modules/BaseModule/container/BaseForm'; +import { BUBBLE_TYPES, BubbleEnum } from '@Modules/BaseModule/constants/Bubble'; +import { firestore } from '@Configs/Firebase'; +import { BillTypes } from '@Modules/Bill/constants/Types'; +import { useUser } from '@Authentication/context/UserContext'; + +interface FormCategoryProps { + id?: string | number; +} +interface ICategory { + id?: string; + name: string; + color: string; +} + +const fields = [ + { + name: 'name', + label: 'Nome', + type: BUBBLE_TYPES.INPUT_TEXT as BubbleEnum, + }, + { + name: 'color', + label: 'Cor', + type: BUBBLE_TYPES.INPUT_COLOR as BubbleEnum, + }, + { + name: 'type', + label: 'Tipo', + type: BUBBLE_TYPES.SELECT as BubbleEnum, + options: [ + { + label: 'Despesa', + value: BillTypes.EXPENSE, + }, + { + label: 'Receita', + value: BillTypes.INCOME, + }, + ], + }, +]; + +const schema = object().shape({ + name: string().required('Este campo é obrigatório.'), + color: string().required('Este campo é obrigatório.'), + type: string().required('Este campo é obrigatório.'), +}); + +export const FormCategory = ({ id }: FormCategoryProps) => { + const toast = useToast(); + const router = useRouter(); + const { userId } = useUser(); + + const fetch = useCallback(async () => { + const categoryDoc = await firestore + .collection('categories') + .doc(id as string) + .get(); + + return categoryDoc.data() as ICategory; + }, [id]); + + const onSubmit = async values => { + try { + if (id) { + firestore + .collection('categories') + .doc(id as string) + .update({ + userId, + ...values, + }); + } else { + firestore.collection('categories').add({ + userId, + ...values, + }); + } + toast({ + description: `Categoria ${id ? 'editada' : 'criada'} com sucesso!`, + status: 'success', + }); + router.replace('/category'); + } catch (error) { + toast({ + description: error.message, + status: 'error', + }); + } + }; + + return ( + <> + + {id ? 'Editar' : 'Criar'} categoria + + + id={id} + fields={fields} + fetch={fetch} + onSubmit={onSubmit} + submitLabel={id ? 'Editar' : 'Criar'} + schema={schema} + /> + + ); +}; diff --git a/modules/Category/container/form-category.container.tsx b/modules/Category/container/form-category.container.tsx new file mode 100644 index 0000000..ac2bcd5 --- /dev/null +++ b/modules/Category/container/form-category.container.tsx @@ -0,0 +1,12 @@ +import React from 'react'; + +import { Box } from '@Components/Box'; +import { FormCategory } from '@Modules/Category/components/form-category.component'; + +export const FormCategoryContainer = () => { + return ( + + + + ); +}; diff --git a/modules/Category/container/list-categories.container.tsx b/modules/Category/container/list-categories.container.tsx new file mode 100644 index 0000000..836d8cf --- /dev/null +++ b/modules/Category/container/list-categories.container.tsx @@ -0,0 +1,66 @@ +import React, { useCallback, useEffect, useState } from 'react'; +import { Button } from '@chakra-ui/button'; +import { Badge, Link } from '@chakra-ui/react'; + +import { FormCategory } from '@Modules/Category/components/form-category.component'; +import BaseList from '@Modules/BaseModule/container/BaseList'; +import { firestore } from '@Configs/Firebase'; +import { BillTypes } from '@Modules/Bill/constants/Types'; + +interface ICategory { + id?: string; + name: string; + color: string; +} + +const billTypesText = { + [BillTypes.EXPENSE]: 'Despesa', + [BillTypes.INCOME]: 'Receita', +}; +export const ListCategoriesContainer = () => { + const [items, setItems] = useState([]); + const [loading, setLoading] = useState(true); + + const fetchData = useCallback(async () => { + firestore.collection('categories').onSnapshot(({ docs }) => { + setLoading(true); + setItems(docs.map(category => ({ id: category.id, ...category.data() } as ICategory))); + }); + }, []); + + useEffect(() => { + fetchData(); + }, [fetchData]); + + const onDeleteItem = id => { + firestore.collection('categories').doc(id).delete(); + }; + + return ( + <> + + Criar categoria + + + + headers={[ + { + label: 'Nome', + field: 'name', + render: item => {item.name}, + }, + { + label: 'Tipo', + field: 'type', + render: item => <>{billTypesText[item.type]}, + }, + ]} + items={items} + isLoading={false} + editComponent={id => } + onDeleteItem={onDeleteItem} + optionsEnabled + /> + + ); +}; diff --git a/modules/Category/helpers/createDefaultCategories.ts b/modules/Category/helpers/createDefaultCategories.ts new file mode 100644 index 0000000..f3d7c77 --- /dev/null +++ b/modules/Category/helpers/createDefaultCategories.ts @@ -0,0 +1,64 @@ +import { BillTypes } from '@Modules/Bill/constants/Types'; +import { firestore } from '@Configs/Firebase'; + +const expenseCategories = [ + { + name: '💳 Cartão de crédito', + color: '#000000', + type: BillTypes.EXPENSE, + }, + { + name: '💰 Investimento', + color: '#000000', + type: BillTypes.EXPENSE, + }, + { + name: '💸 Fixo', + color: '#000000', + type: BillTypes.EXPENSE, + }, + { + name: '🔁 Flexível', + color: '#000000', + type: BillTypes.EXPENSE, + }, + { + name: '💲 Outro', + color: '#000000', + type: BillTypes.EXPENSE, + }, +]; + +const incomeCategories = [ + { + name: '💰 Salário', + color: '#000000', + type: BillTypes.INCOME, + }, + { + name: '💸 Veaco', + color: '#000000', + type: BillTypes.INCOME, + }, + { + name: '💲 Outro', + color: '#000000', + type: BillTypes.INCOME, + }, +]; + +export const createDefaultCategories = async userId => { + const defaultCategories = [...expenseCategories, ...incomeCategories]; + let createBatchCategories = []; + + defaultCategories.forEach(category => + createBatchCategories.push( + firestore.collection('categories').add({ + ...category, + userId, + }) + ) + ); + + return Promise.all(createBatchCategories); +}; diff --git a/modules/Category/hooks/useCategoriesSelect.tsx b/modules/Category/hooks/useCategoriesSelect.tsx new file mode 100644 index 0000000..4ff841e --- /dev/null +++ b/modules/Category/hooks/useCategoriesSelect.tsx @@ -0,0 +1,24 @@ +import { useState, useEffect, useCallback } from 'react'; + +import { firestore } from '@Configs/Firebase'; +import { useUser } from '@Authentication/context/UserContext'; + +export const useCategoriesSelect = () => { + const [categories, setCategories] = useState([]); + const { userId } = useUser(); + const fetchUserCategories = useCallback(async () => { + const data = await firestore.collection('categories').where('userId', '==', userId).get(); + setCategories( + data.docs.map(category => ({ + id: category.id, + ...category.data(), + })) + ); + }, [setCategories, userId]); + + useEffect(() => { + fetchUserCategories(); + }, [fetchUserCategories]); + + return categories; +}; diff --git a/pages/category/create.tsx b/pages/category/create.tsx new file mode 100644 index 0000000..50295b6 --- /dev/null +++ b/pages/category/create.tsx @@ -0,0 +1,15 @@ +import React from 'react'; +import { useRouter } from 'next/router'; + +import withLateralMenu from '@/hoc/withLateralMenu'; +import { FormCategoryContainer } from '@Modules/Category/container/form-category.container'; + +const FormCategory = () => { + return ( + <> + + + ); +}; + +export default withLateralMenu(FormCategory); diff --git a/pages/category/index.tsx b/pages/category/index.tsx new file mode 100644 index 0000000..2f7998d --- /dev/null +++ b/pages/category/index.tsx @@ -0,0 +1,10 @@ +import React from 'react'; + +import { ListCategoriesContainer } from '@Modules/Category/container/list-categories.container'; +import withLateralMenu from '@/hoc/withLateralMenu'; + +const Category = () => { + return ; +}; + +export default withLateralMenu(Category); diff --git a/pages/styles.scss b/pages/styles.scss index d3c7a32..92a395a 100644 --- a/pages/styles.scss +++ b/pages/styles.scss @@ -211,4 +211,25 @@ html { .react-datepicker__close-icon::after:hover { color: var(--gray) +} + +input[type="color"] { + padding: 0; +} + +/* Adicionando um estilo de fundo personalizado para indicar cor atual */ +input[type="color"]::-webkit-color-swatch-wrapper { + padding: 5px; +} + +input[type="color"]::-webkit-color-swatch { + border: 0; + width: 100%; + border-radius: var(--chakra-radii-md); +} + +/* Adicionando uma borda ao focar */ +input[type="color"]:focus { + outline: none; + box-shadow: 0 0 5px rgba(0, 0, 0, 0.3); } \ No newline at end of file From e8525330b90c0efcd2f47f2e7f1dabdfc98ce443 Mon Sep 17 00:00:00 2001 From: Victor Lucas Date: Mon, 20 Nov 2023 14:33:11 -0500 Subject: [PATCH 39/39] fix: show only categories from the logged user --- .../container/list-categories.container.tsx | 6 ++++-- .../Category/helpers/createDefaultCategories.ts | 7 ++----- modules/Category/hooks/useCategoriesSelect.tsx | 2 ++ pages/logout.tsx | 15 +++++++++++++++ 4 files changed, 23 insertions(+), 7 deletions(-) create mode 100644 pages/logout.tsx diff --git a/modules/Category/container/list-categories.container.tsx b/modules/Category/container/list-categories.container.tsx index 836d8cf..5f98f2a 100644 --- a/modules/Category/container/list-categories.container.tsx +++ b/modules/Category/container/list-categories.container.tsx @@ -6,6 +6,7 @@ import { FormCategory } from '@Modules/Category/components/form-category.compone import BaseList from '@Modules/BaseModule/container/BaseList'; import { firestore } from '@Configs/Firebase'; import { BillTypes } from '@Modules/Bill/constants/Types'; +import { useUser } from "@Authentication/context/UserContext"; interface ICategory { id?: string; @@ -20,13 +21,14 @@ const billTypesText = { export const ListCategoriesContainer = () => { const [items, setItems] = useState([]); const [loading, setLoading] = useState(true); + const { userId } = useUser(); const fetchData = useCallback(async () => { - firestore.collection('categories').onSnapshot(({ docs }) => { + firestore.collection('categories').where('userId', '==', userId).onSnapshot(({ docs }) => { setLoading(true); setItems(docs.map(category => ({ id: category.id, ...category.data() } as ICategory))); }); - }, []); + }, [userId]); useEffect(() => { fetchData(); diff --git a/modules/Category/helpers/createDefaultCategories.ts b/modules/Category/helpers/createDefaultCategories.ts index f3d7c77..3c904b3 100644 --- a/modules/Category/helpers/createDefaultCategories.ts +++ b/modules/Category/helpers/createDefaultCategories.ts @@ -22,11 +22,6 @@ const expenseCategories = [ color: '#000000', type: BillTypes.EXPENSE, }, - { - name: '💲 Outro', - color: '#000000', - type: BillTypes.EXPENSE, - }, ]; const incomeCategories = [ @@ -48,6 +43,8 @@ const incomeCategories = [ ]; export const createDefaultCategories = async userId => { + if (!userId) return; + const defaultCategories = [...expenseCategories, ...incomeCategories]; let createBatchCategories = []; diff --git a/modules/Category/hooks/useCategoriesSelect.tsx b/modules/Category/hooks/useCategoriesSelect.tsx index 4ff841e..8287740 100644 --- a/modules/Category/hooks/useCategoriesSelect.tsx +++ b/modules/Category/hooks/useCategoriesSelect.tsx @@ -7,6 +7,8 @@ export const useCategoriesSelect = () => { const [categories, setCategories] = useState([]); const { userId } = useUser(); const fetchUserCategories = useCallback(async () => { + if (!userId) return; + const data = await firestore.collection('categories').where('userId', '==', userId).get(); setCategories( data.docs.map(category => ({ diff --git a/pages/logout.tsx b/pages/logout.tsx new file mode 100644 index 0000000..3605c40 --- /dev/null +++ b/pages/logout.tsx @@ -0,0 +1,15 @@ +import { useRouter } from 'next/router'; +import { useEffect } from 'react'; + +import { auth } from '@Configs/Firebase'; + +export default function Logout() { + const router = useRouter(); + + useEffect(() => { + auth.signOut(); + router.push('/'); + }, []); + + return <>Loading; +}