Skip to content

Commit

Permalink
chore(root): update deps
Browse files Browse the repository at this point in the history
  • Loading branch information
hendraaagil committed Mar 2, 2022
1 parent 465ccc7 commit 20e97b2
Show file tree
Hide file tree
Showing 6 changed files with 1,535 additions and 1,103 deletions.
13 changes: 9 additions & 4 deletions .eslintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -25,12 +25,17 @@ module.exports = {
extends: ['plugin:react/recommended', 'next', 'airbnb', 'prettier'],
plugins: ['react', 'prettier'],
rules: {
'react/react-in-jsx-scope': 'off',
'react/prop-types': 'off',
'import/extensions': 'off',
'import/no-unresolved': 'off',
'no-plusplus': 'off',
'react/function-component-definition': [
2,
{ namedComponents: 'arrow-function' },
],
'react/jsx-filename-extension': [1, { extensions: ['.js', '.jsx'] }],
'react/jsx-props-no-spreading': 'off',
'react/prop-types': 'off',
'react/react-in-jsx-scope': 'off',
'@next/next/no-page-custom-font': 'off',
'import/no-unresolved': 'off',
'no-plusplus': 'off',
},
};
43 changes: 22 additions & 21 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,34 +7,35 @@
"dev": "next dev",
"build": "next build",
"start": "next start",
"lint": "eslint ./components/** ./pages/** -c .eslintrc.js --ext js,jsx",
"lint-fix": "eslint ./components/** ./pages/** -c .eslintrc.js --fix --ext js,jsx"
"lint": "eslint ./src/components/** ./src/pages/** -c .eslintrc.js --ext js,jsx",
"lint-fix": "eslint ./src/components/** ./src/pages/** -c .eslintrc.js --fix --ext js,jsx"
},
"dependencies": {
"@chakra-ui/react": "^1.6.4",
"@chakra-ui/theme-tools": "^1.1.7",
"@emotion/react": "11",
"@emotion/styled": "11",
"contentful": "^8.4.2",
"date-fns": "^2.23.0",
"framer-motion": "4",
"@chakra-ui/react": "^1.8.6",
"@chakra-ui/theme-tools": "^1.3.6",
"@emotion/react": "11.8.1",
"@emotion/styled": "11.8.1",
"contentful": "^9.1.12",
"date-fns": "^2.28.0",
"framer-motion": "6.2.8",
"next": "12.1.0",
"next-seo": "^4.26.0",
"next-seo": "^5.1.0",
"nprogress": "^0.2.0",
"react": "17.0.2",
"react-dom": "17.0.2",
"react-icons": "^4.2.0",
"react-typical": "^0.1.3"
"react-icons": "^4.3.1",
"react-typical": "^0.1.3",
"sharp": "^0.30.2"
},
"devDependencies": {
"eslint": "^7.29.0",
"eslint-config-airbnb": "^18.2.1",
"eslint-config-next": "^11.0.0",
"eslint-config-prettier": "^8.3.0",
"eslint-plugin-import": "^2.23.4",
"eslint-plugin-jsx-a11y": "^6.4.1",
"eslint-plugin-prettier": "^3.4.0",
"eslint-plugin-react": "^7.24.0",
"prettier": "^2.3.1"
"eslint": "^8.10.0",
"eslint-config-airbnb": "^19.0.4",
"eslint-config-next": "^12.1.0",
"eslint-config-prettier": "^8.4.0",
"eslint-plugin-import": "^2.25.4",
"eslint-plugin-jsx-a11y": "^6.5.1",
"eslint-plugin-prettier": "^4.0.0",
"eslint-plugin-react": "^7.29.2",
"prettier": "^2.5.1"
}
}
2 changes: 1 addition & 1 deletion src/components/nav/Navbar.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ import Image from 'next/image';
import Link from 'next/link';
import { Box, Container, HStack, useColorModeValue } from '@chakra-ui/react';

import links from '@/data/navlinks.json';
import logo from 'public/logo.png';
import links from '@/data/navlinks.json';

import NavLink from './NavLink';
import ToggleMode from './ToggleMode';
Expand Down
56 changes: 27 additions & 29 deletions src/pages/_app.js
Original file line number Diff line number Diff line change
Expand Up @@ -19,34 +19,32 @@ Router.events.on('routeChangeError', () => NProgress.done());

const MotionBox = motion(Box);

function MyApp({ Component, pageProps, router }) {
return (
<ChakraProvider resetCSS theme={theme}>
<DefaultSeo {...SEO} />

<GlobalStyle>
<Navbar />
<AnimatePresence exitBeforeEnter>
<MotionBox
key={router.route}
animate="enter"
as="main"
exit="exit"
flexGrow={1}
initial="initial"
variants={{
initial: { opacity: 0, y: -8 },
enter: { opacity: 1, y: 0 },
exit: { opacity: 0, y: 8 },
}}
>
<Component {...pageProps} />
</MotionBox>
</AnimatePresence>
<Footer />
</GlobalStyle>
</ChakraProvider>
);
}
const MyApp = ({ Component, pageProps, router }) => (
<ChakraProvider resetCSS theme={theme}>
<DefaultSeo {...SEO} />

<GlobalStyle>
<Navbar />
<AnimatePresence exitBeforeEnter>
<MotionBox
key={router.route}
animate="enter"
as="main"
exit="exit"
flexGrow={1}
initial="initial"
variants={{
initial: { opacity: 0, y: -8 },
enter: { opacity: 1, y: 0 },
exit: { opacity: 0, y: 8 },
}}
>
<Component {...pageProps} />
</MotionBox>
</AnimatePresence>
<Footer />
</GlobalStyle>
</ChakraProvider>
);

export default MyApp;
6 changes: 4 additions & 2 deletions src/pages/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import Typical from 'react-typical';
import PageContainer from '@/components/PageContainer';
import SocialButton from '@/components/SocialButton';

export default function Home() {
const Home = () => {
const types = [
'Tempat Untuk Belajar',
2500,
Expand Down Expand Up @@ -56,4 +56,6 @@ export default function Home() {
</Stack>
</PageContainer>
);
}
};

export default Home;
Loading

0 comments on commit 20e97b2

Please sign in to comment.