Skip to content

Commit

Permalink
Merge pull request #178 from estartando-devs/feature/next-13
Browse files Browse the repository at this point in the history
Feature/next 13
  • Loading branch information
ramonxm authored Nov 3, 2022
2 parents 5d7f09e + a768c50 commit 0caff7f
Show file tree
Hide file tree
Showing 20 changed files with 972 additions and 927 deletions.
49 changes: 25 additions & 24 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,61 +23,62 @@
]
},
"dependencies": {
"@chakra-ui/react": "^2.3.2",
"@chakra-ui/react": "^2.3.6",
"@emotion/react": "^11.10.4",
"@emotion/styled": "^11.10.4",
"@styled-icons/boxicons-logos": "^10.46.0",
"@styled-icons/boxicons-regular": "^10.46.0",
"@styled-icons/heroicons-outline": "^10.46.0",
"aos": "^2.3.4",
"axios": "^0.27.2",
"axios": "^1.1.3",
"cookies-next": "^2.1.1",
"framer-motion": "^7.3.5",
"framer-motion": "^7.6.1",
"html2canvas": "^1.4.1",
"next": "^12.3.0",
"next-seo": "^5.5.0",
"nextjs-progressbar": "^0.0.14",
"next": "^13.0.0",
"next-seo": "^5.8.0",
"nextjs-progressbar": "^0.0.16",
"plop": "^3.1.1",
"react": "^18.2.0",
"react-dom": "^18.2.0",
"react-easy-crop": "^4.5.0",
"react-hook-form": "^7.35.0",
"styled-components": "^5.3.5",
"vanilla-masker": "^1.2.0"
"react-easy-crop": "^4.6.1",
"react-hook-form": "^7.38.0",
"styled-components": "^5.3.6",
"vanilla-masker": "^1.2.0",
"yarn-upgrade-all": "^0.7.1"
},
"devDependencies": {
"@types/aos": "^3.0.4",
"@types/jest": "^29.0.2",
"@types/node": "^18.7.18",
"@types/react": "^18.0.20",
"@types/react-dom": "^18.0.6",
"@types/jest": "^29.2.0",
"@types/node": "^18.11.6",
"@types/react": "^18.0.23",
"@types/react-dom": "^18.0.7",
"@types/styled-components": "^5.1.26",
"@types/vanilla-masker": "^1.2.1",
"@typescript-eslint/eslint-plugin": "^5.37.0",
"@typescript-eslint/parser": "^5.37.0",
"@typescript-eslint/eslint-plugin": "^5.41.0",
"@typescript-eslint/parser": "^5.41.0",
"commitizen": "^4.2.5",
"cz-conventional-changelog": "^3.3.0",
"eslint": "^8.23.1",
"eslint-config-next": "^12.3.0",
"eslint": "^8.26.0",
"eslint-config-next": "^13.0.0",
"eslint-config-prettier": "^8.5.0",
"eslint-import-resolver-typescript": "^3.5.1",
"eslint-import-resolver-typescript": "^3.5.2",
"eslint-plugin-import": "^2.26.0",
"eslint-plugin-jsx-a11y": "^6.6.1",
"eslint-plugin-no-inline-styles": "^1.0.5",
"eslint-plugin-prettier": "^4.2.1",
"eslint-plugin-react": "^7.31.8",
"eslint-plugin-react": "^7.31.10",
"eslint-plugin-react-hooks": "^4.6.0",
"eslint-plugin-unused-imports": "^2.0.0",
"lint-staged": "^13.0.3",
"next-sitemap": "^3.1.22",
"next-sitemap": "^3.1.29",
"prettier": "^2.7.1",
"prettier-plugin-organize-imports": "^3.1.1",
"stylelint": "^14.11.0",
"stylelint": "^14.14.0",
"stylelint-config-recommended": "^9.0.0",
"stylelint-config-standard": "^28.0.0",
"stylelint-config-standard": "^29.0.0",
"stylelint-config-styled-components": "^0.1.1",
"stylelint-processor-styled-components": "^1.10.0",
"typescript": "^4.8.3"
"typescript": "^4.8.4"
},
"browserslist": {
"production": [
Expand Down
10 changes: 8 additions & 2 deletions public/robots.txt
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
# robotstxt.org/

# *
User-agent: *
Allow: /

# Host
Host: https://estartandodevs.com.br

# Sitemaps
Sitemap: https://estartandodevs.com.br/sitemap.xml
7 changes: 7 additions & 0 deletions public/sitemap-0.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<urlset xmlns="https://www.sitemaps.org/schemas/sitemap/0.9" xmlns:news="https://www.google.com/schemas/sitemap-news/0.9" xmlns:xhtml="https://www.w3.org/1999/xhtml" xmlns:mobile="https://www.google.com/schemas/sitemap-mobile/1.0" xmlns:image="https://www.google.com/schemas/sitemap-image/1.1" xmlns:video="https://www.google.com/schemas/sitemap-video/1.1">
<url><loc>https://estartandodevs.com.br</loc><lastmod>2022-11-01T16:39:38.795Z</lastmod><changefreq>daily</changefreq><priority>0.9</priority></url>
<url><loc>https://estartandodevs.com.br/id-card</loc><lastmod>2022-11-01T16:39:38.795Z</lastmod><changefreq>daily</changefreq><priority>0.9</priority></url>
<url><loc>https://estartandodevs.com.br/id-card/time</loc><lastmod>2022-11-01T16:39:38.795Z</lastmod><changefreq>daily</changefreq><priority>0.9</priority></url>
<url><loc>https://estartandodevs.com.br/perguntas-frequentes</loc><lastmod>2022-11-01T16:39:38.795Z</lastmod><changefreq>daily</changefreq><priority>0.9</priority></url>
</urlset>
4 changes: 4 additions & 0 deletions public/sitemap.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
<sitemapindex xmlns="http://www.sitemaps.org/schemas/sitemap/0.9">
<sitemap><loc>https://estartandodevs.com.br/sitemap-0.xml</loc></sitemap>
</sitemapindex>
4 changes: 1 addition & 3 deletions src/components/CommonQuestions/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,7 @@ export const CommonQuestions = ({ title, questions }: CommonQuestionsProps) => (
<S.CommonQuestionsSection>
<header>
<Link href="/">
<a>
<Logo width={48} height={68} priority quality={30} />
</a>
<Logo width={48} height={68} priority quality={30} />
</Link>
</header>

Expand Down
10 changes: 4 additions & 6 deletions src/components/Footer/SocialShareButtons/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,10 @@ export const SocialShareButtons = () => {
return (
<S.SocialShareContainer>
{socialLinks.map(({ title, href, iconProps, icon: Icon }) => (
<Link key={title} href={href}>
<a target="_blank" rel="noreferrer noopener">
<S.SocialShareContent title={title}>
<Icon {...iconProps} />
</S.SocialShareContent>
</a>
<Link key={title} href={href} target="_blank" rel="noreferrer noopener">
<S.SocialShareContent title={title}>
<Icon {...iconProps} />
</S.SocialShareContent>
</Link>
))}
</S.SocialShareContainer>
Expand Down
9 changes: 5 additions & 4 deletions src/components/Footer/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,7 @@ export const Footer = () => (
<S.FooterWrapper>
<S.FooterContainer>
<Link href="/">
<a>
<Logo width={65} height={94} />
</a>
<Logo width={65} height={94} />
</Link>
<S.FooterContent>
<Typography variant="body1" weight="700">
Expand All @@ -22,7 +20,10 @@ export const Footer = () => (
<S.DoubtsLinkWrapper>
<Typography variant="body3">{`Dúvidas? Veja as`}</Typography>
<S.DoubtsLink>
<Link href="/perguntas-frequentes">{`perguntas mais frequentes`}</Link>
<Link
href="/perguntas-frequentes"
legacyBehavior
>{`perguntas mais frequentes`}</Link>
</S.DoubtsLink>
</S.DoubtsLinkWrapper>
<S.CopyContainer>
Expand Down
2 changes: 1 addition & 1 deletion src/components/Header/index.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import Image from 'next/image';
import Image from 'next/legacy/image';
import { Logo } from '../Logo';
import { Typography } from '../Typography';
import * as S from './styles';
Expand Down
6 changes: 1 addition & 5 deletions src/components/IdCardForm/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -115,9 +115,7 @@ export const IdCardForm = (props: { team?: boolean }) => {
<S.Container>
<S.Header>
<Link href="/">
<a>
<Logo width={91} height={138} priority quality={30} />
</a>
<Logo width={91} height={138} priority quality={30} />
</Link>
<S.ContainerHeading>
<Typography variant="h1">Estartando Devs</Typography>
Expand Down Expand Up @@ -194,8 +192,6 @@ export const IdCardForm = (props: { team?: boolean }) => {
layout="fixed"
src={imagePreview}
alt="Preview"
width="100%"
height="100%"
objectFit="contain"
/>
)}
Expand Down
2 changes: 1 addition & 1 deletion src/components/IdCardForm/styles.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import Image from 'next/image';
import Image from 'next/legacy/image';
import styled from 'styled-components';
import { Typography } from '../Typography';

Expand Down
4 changes: 3 additions & 1 deletion src/components/LinkWrapper/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,9 @@ const LinkWrapper = ({
...props
}: PropsWithChildren<LinkProps> & { target?: string }) => (
<S.ContainerLink color={color} {...props}>
<Link href={href}>{target && <a target={target}>{children}</a>}</Link>
<Link href={href} legacyBehavior>
{target && <a target={target}>{children}</a>}
</Link>
</S.ContainerLink>
);

Expand Down
2 changes: 1 addition & 1 deletion src/components/Logo/index.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import Image, { ImageProps as NextImageProps } from 'next/image';
import Image, { ImageProps as NextImageProps } from 'next/legacy/image';

type ImageProps = {
width?: number;
Expand Down
2 changes: 1 addition & 1 deletion src/components/OurResultsIcon/index.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import Image from 'next/image';
import Image from 'next/legacy/image';
import { PropsWithChildren } from 'react';
import { Typography } from '../Typography';
import * as S from './styles';
Expand Down
2 changes: 1 addition & 1 deletion src/components/SelectiveProcess/styles.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import Image from 'next/image';
import Image from 'next/legacy/image';
import styled from 'styled-components';
import { Typography } from '../Typography';

Expand Down
2 changes: 1 addition & 1 deletion src/components/StudentCharacteristicsCard/index.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/* eslint-disable jsx-a11y/alt-text */
import Image, { ImageProps as NextImageProps } from 'next/image';
import Image, { ImageProps as NextImageProps } from 'next/legacy/image';
import * as S from './styles';

type PropsCard = {
Expand Down
7 changes: 5 additions & 2 deletions src/components/Subscribe/index.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import Image from 'next/image';
import Image from 'next/legacy/image';
import Link from 'next/link';
import { Typography } from '../Typography';
import * as S from './styles';
Expand Down Expand Up @@ -29,7 +29,10 @@ export const Subscribe = () => (
<S.ContainerSubscribeContentDoubts>
<Typography variant="body3">{`Dúvidas? Veja as`}</Typography>
<S.ContainerSubscribeContentDoubtsLink>
<Link href="/perguntas-frequentes">{`perguntas mais frequentes`}</Link>
<Link
href="/perguntas-frequentes"
legacyBehavior
>{`perguntas mais frequentes`}</Link>
</S.ContainerSubscribeContentDoubtsLink>
</S.ContainerSubscribeContentDoubts>
</S.ContainerSubscribeContent>
Expand Down
2 changes: 1 addition & 1 deletion src/components/WhatWeTeach/index.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import Image from 'next/image';
import Image from 'next/legacy/image';
import { WhatWeTeachProps } from '../../mocks/WhatWeTeach.mock';
import { Typography } from '../Typography';
import * as S from './styles';
Expand Down
4 changes: 1 addition & 3 deletions src/pages/404.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,7 @@ export default function NotfoundPage() {
<Box padding="2.5rem">
<header>
<Link href="/">
<a>
<Logo width={48} height={68} priority quality={30} />
</a>
<Logo width={48} height={68} priority quality={30} />
</Link>
</header>
</Box>
Expand Down
3 changes: 0 additions & 3 deletions src/styles/styled.d.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
import { ReactNode } from 'react';
import 'styled-components';
import theme from './theme';

Expand All @@ -7,6 +6,4 @@ type Theme = typeof theme;
declare module 'styled-components' {
// eslint-disable-next-line @typescript-eslint/no-empty-interface
export interface DefaultTheme extends Theme {}

export const ThemeProvider: ReactNode;
}
Loading

0 comments on commit 0caff7f

Please sign in to comment.