From 15af49c8187f52ccfb133fda22ef98d64c37fd33 Mon Sep 17 00:00:00 2001 From: korlando7 Date: Fri, 29 Oct 2021 15:37:29 -0700 Subject: [PATCH 1/4] upgrade to chakra v1 --- components/about/aboutUsSection.js | 2 +- components/about/contactForm.js | 2 +- components/about/contactSection.js | 2 +- components/common/authProcess.js | 4 +- components/common/backButton.js | 2 +- components/common/banner.js | 4 +- components/common/button.js | 2 +- components/common/card.js | 2 +- components/common/divider.js | 2 +- components/common/errorMessage.js | 4 +- components/common/faqHeading.js | 2 +- components/common/fbButton.js | 2 +- components/common/fbTextInput.js | 2 +- components/common/footer.js | 2 +- components/common/formControl.js | 2 +- components/common/githubButton.js | 2 +- components/common/header/authNav.js | 4 +- components/common/header/header.js | 2 +- components/common/header/logo.js | 2 +- components/common/header/logoLetters.js | 2 +- components/common/linkBtn.js | 6 +- components/common/pageWrapper.js | 6 +- components/common/percentInput.js | 2 +- components/common/section.js | 2 +- components/common/stepper.js | 8 +- components/common/stepperSection.js | 2 +- components/common/subheading.js | 2 +- components/common/textLink.js | 2 +- components/common/underlinedHeading.js | 6 +- components/common/updateIlpModal.js | 2 +- components/dashboard/usernameModal.js | 2 +- .../settings/billingInformationSection.js | 2 +- .../settings/manageRevenueSection.js | 2 +- .../maintainer/settings/settingsCard.js | 2 +- .../maintainer/settings/usernameSection.js | 2 +- components/signup/verify_recaptcha.js | 2 +- components/splash/cards/whyFBCards.js | 4 +- components/splash/splash_hero.js | 2 +- components/splash/splash_why_flossbank.js | 2 +- package-lock.json | 47468 +++++++++++----- package.json | 14 +- pages/_app.js | 15 +- pages/brand-guidelines.js | 4 +- pages/complete-login.js | 2 +- pages/dashboard.js | 4 +- pages/faq.js | 2 +- pages/find-packages.js | 2 +- pages/how-it-works.js | 2 +- pages/import-packages.js | 2 +- pages/package/[packageId]/index.js | 6 +- pages/privacy.js | 3 +- pages/wallet-overview.js | 2 +- public/theme.js | 21 +- test/_setup.js | 11 +- utils/useAuth.js | 2 +- yarn.lock | 22809 ++++---- 56 files changed, 44256 insertions(+), 26219 deletions(-) diff --git a/components/about/aboutUsSection.js b/components/about/aboutUsSection.js index 7e58a9e..d351f36 100644 --- a/components/about/aboutUsSection.js +++ b/components/about/aboutUsSection.js @@ -1,4 +1,4 @@ -import { Box, Text } from '@chakra-ui/core' +import { Box, Text } from '@chakra-ui/react' import Section from '../common/section' import UnderlinedHeading from '../common/underlinedHeading' diff --git a/components/about/contactForm.js b/components/about/contactForm.js index 41d85a5..d8b2c04 100644 --- a/components/about/contactForm.js +++ b/components/about/contactForm.js @@ -5,7 +5,7 @@ import { Textarea, Alert, AlertIcon -} from '@chakra-ui/core' +} from '@chakra-ui/react' import { useState } from 'react' import PropTypes from 'prop-types' diff --git a/components/about/contactSection.js b/components/about/contactSection.js index b45a4f4..ae86eb2 100644 --- a/components/about/contactSection.js +++ b/components/about/contactSection.js @@ -1,4 +1,4 @@ -import { Box, Text } from '@chakra-ui/core' +import { Box, Text } from '@chakra-ui/react' import { useState } from 'react' import Section from '../common/section' diff --git a/components/common/authProcess.js b/components/common/authProcess.js index 8cf7e70..07ef057 100644 --- a/components/common/authProcess.js +++ b/components/common/authProcess.js @@ -9,7 +9,7 @@ import { Heading, FormControl, FormLabel -} from '@chakra-ui/core' +} from '@chakra-ui/react' import { useForm } from 'react-hook-form' @@ -196,7 +196,7 @@ const AuthProcess = ({ justify='space-between' aria-live='polite' > - + { return ( @@ -22,7 +22,7 @@ const Banner = ({ icon, children, onCloseClick }) => { > diff --git a/components/common/button.js b/components/common/button.js index fbce102..f905cab 100644 --- a/components/common/button.js +++ b/components/common/button.js @@ -1,6 +1,6 @@ import { Button -} from '@chakra-ui/core' +} from '@chakra-ui/react' const FBButton = (props) => { return ( diff --git a/components/common/card.js b/components/common/card.js index 81a2cd9..1158c7f 100644 --- a/components/common/card.js +++ b/components/common/card.js @@ -1,5 +1,5 @@ // White card with a box shadow used for forms, select plans, install instuctions, etc. -import { Box } from '@chakra-ui/core' +import { Box } from '@chakra-ui/react' import PropTypes from 'prop-types' const shadowSizes = { diff --git a/components/common/divider.js b/components/common/divider.js index 5e54a4d..d4ef345 100644 --- a/components/common/divider.js +++ b/components/common/divider.js @@ -1,4 +1,4 @@ -import { Box } from '@chakra-ui/core' +import { Box } from '@chakra-ui/react' const Divider = (props) => ( ( ( > diff --git a/components/common/faqHeading.js b/components/common/faqHeading.js index 52df05b..ce7d050 100644 --- a/components/common/faqHeading.js +++ b/components/common/faqHeading.js @@ -1,4 +1,4 @@ -import { Heading } from '@chakra-ui/core' +import { Heading } from '@chakra-ui/react' // used for FAQ and How it Works page const FAQHeading = ({ children, ...props }) => ( diff --git a/components/common/fbButton.js b/components/common/fbButton.js index e792024..34305b4 100644 --- a/components/common/fbButton.js +++ b/components/common/fbButton.js @@ -1,4 +1,4 @@ -import { Button } from '@chakra-ui/core' +import { Button } from '@chakra-ui/react' import { defaultProps } from '../../utils/defaultBtnProps' import PropTypes from 'prop-types' diff --git a/components/common/fbTextInput.js b/components/common/fbTextInput.js index 8c8dfb4..772817f 100644 --- a/components/common/fbTextInput.js +++ b/components/common/fbTextInput.js @@ -1,4 +1,4 @@ -import { Input } from '@chakra-ui/core' +import { Input } from '@chakra-ui/react' const FBTextInput = ({ id, type, register, ...props }) => ( ( diff --git a/components/common/githubButton.js b/components/common/githubButton.js index dc6f806..4598d23 100644 --- a/components/common/githubButton.js +++ b/components/common/githubButton.js @@ -1,4 +1,4 @@ -import { Button, Image, Link } from '@chakra-ui/core' +import { Button, Image, Link } from '@chakra-ui/react' import { defaultProps } from '../../utils/defaultBtnProps' import { useLocalStorage } from '../../utils/useLocalStorage' import { localStorageGHStateKey } from '../../utils/constants' diff --git a/components/common/header/authNav.js b/components/common/header/authNav.js index 8e85509..a6bee6a 100644 --- a/components/common/header/authNav.js +++ b/components/common/header/authNav.js @@ -12,7 +12,7 @@ import { MenuButton, MenuList, MenuItem -} from '@chakra-ui/core' +} from '@chakra-ui/react' import { AddIcon } from '@chakra-ui/icons' const AuthNav = ({ user, onLogout }) => { @@ -80,7 +80,7 @@ const AuthNav = ({ user, onLogout }) => { diff --git a/components/common/header/header.js b/components/common/header/header.js index 561babd..c1d0652 100644 --- a/components/common/header/header.js +++ b/components/common/header/header.js @@ -1,7 +1,7 @@ import { useRouter } from 'next/router' import { useAuth } from '../../../utils/useAuth' -import { Box, Flex } from '@chakra-ui/core' +import { Box, Flex } from '@chakra-ui/react' import LinkBtn from '../linkBtn' import TextLink from '../textLink' diff --git a/components/common/header/logo.js b/components/common/header/logo.js index 8b2e80d..f979d43 100644 --- a/components/common/header/logo.js +++ b/components/common/header/logo.js @@ -1,4 +1,4 @@ -import { Link as ChakraLink, Box } from '@chakra-ui/core' +import { Link as ChakraLink, Box } from '@chakra-ui/react' import Link from 'next/link' import FullLogo from './fullLogo' import FBLogoLetters from './logoLetters' diff --git a/components/common/header/logoLetters.js b/components/common/header/logoLetters.js index 70ef102..9e75f40 100644 --- a/components/common/header/logoLetters.js +++ b/components/common/header/logoLetters.js @@ -1,4 +1,4 @@ -import { Flex } from '@chakra-ui/core' +import { Flex } from '@chakra-ui/react' import PropTypes from 'prop-types' const FBLogoLetters = ({ id, ...props }) => { diff --git a/components/common/linkBtn.js b/components/common/linkBtn.js index fe6ff7b..c7c0428 100644 --- a/components/common/linkBtn.js +++ b/components/common/linkBtn.js @@ -1,11 +1,11 @@ -import { PseudoBox } from '@chakra-ui/core' +import { Box } from '@chakra-ui/react' import { defaultProps } from '../../utils/defaultBtnProps' import PropTypes from 'prop-types' const LinkBtn = ({ children, ...props }) => ( - + {children} - + ) LinkBtn.defaultProps = { ...defaultProps } diff --git a/components/common/pageWrapper.js b/components/common/pageWrapper.js index 9a688a8..1249c8d 100644 --- a/components/common/pageWrapper.js +++ b/components/common/pageWrapper.js @@ -1,4 +1,4 @@ -import { PseudoBox, Flex } from '@chakra-ui/core' +import { Box, Flex } from '@chakra-ui/react' import PropTypes from 'prop-types' import FBHead from './head' @@ -21,7 +21,7 @@ const PageWrapper = (props) => (
- ( }} > {props.children} - +