From 329e50b5897b5220d47d3a78bb52cba4e7e9ef22 Mon Sep 17 00:00:00 2001 From: Ian Mancini Date: Fri, 11 Dec 2020 02:33:16 -0300 Subject: [PATCH] Fix build. Add titles to pages --- src/components/Form.tsx | 30 +++++++++++++++--------------- src/components/MenuButton.tsx | 4 ++-- src/components/Nav.tsx | 6 ++---- src/components/NavBar.tsx | 10 +++++----- src/components/ResponsiveImage.tsx | 5 +++-- src/lib/api.ts | 2 +- src/pages/_app.tsx | 12 +++++------- src/pages/about.tsx | 14 ++++++-------- src/pages/contact.tsx | 6 +++--- src/pages/index.tsx | 7 +++---- src/pages/notas/[slug].tsx | 6 ++---- src/pages/notas/index.tsx | 10 ++++------ src/pages/team.tsx | 5 ++--- src/pages/work/[slug].tsx | 6 ++---- src/pages/work/index.tsx | 8 +++----- 15 files changed, 58 insertions(+), 73 deletions(-) diff --git a/src/components/Form.tsx b/src/components/Form.tsx index ca7ad25..72b6290 100644 --- a/src/components/Form.tsx +++ b/src/components/Form.tsx @@ -1,18 +1,18 @@ -import { useState, forwardRef } from 'react' -import { useFormContext } from 'react-hook-form' -import TextareaAutosize from 'react-textarea-autosize' import { + Box, Button, Flex, - Stack, - Box, - Text, - Input, FormControl, FormErrorMessage, + Input, InputProps, + Stack, + Text, Textarea, } from '@chakra-ui/react' +import { forwardRef, useState } from 'react' +import { useFormContext } from 'react-hook-form' +import TextareaAutosize from 'react-textarea-autosize' const CustomInput = forwardRef( ({ name, ...props }, ref) => { @@ -35,11 +35,11 @@ const CustomInput = forwardRef( CustomInput.displayName = 'CustomInput' -type FormFields = { - name: string - email: string - message: string -} +// type FormFields = { +// name: string +// email: string +// message: string +// } const sendMessage = async () => { return new Promise((resolve) => { @@ -99,7 +99,7 @@ const ContactForm: React.FC = () => { name="name" placeholder="Nombre" aria-label="Nombre" - disabled={isSubmitSuccessful} + isDisabled={isSubmitSuccessful} ref={register({ required: true })} /> Este campo es obligatorio @@ -110,7 +110,7 @@ const ContactForm: React.FC = () => { name="email" placeholder="e-mail" aria-label="e-mail" - disabled={isSubmitSuccessful} + isDisabled={isSubmitSuccessful} ref={register({ required: true, pattern: /^[a-z0-9._%+-]+@[a-z0-9.-]+\.[a-z]{2,4}$/, @@ -141,7 +141,7 @@ const ContactForm: React.FC = () => { borderColor="gray" focusBorderColor="primary" overflow="hidden" - disabled={isSubmitSuccessful} + isDisabled={isSubmitSuccessful} ref={register({ required: true })} _disabled={{ color: 'gray' }} /> diff --git a/src/components/MenuButton.tsx b/src/components/MenuButton.tsx index df5df01..b475a22 100644 --- a/src/components/MenuButton.tsx +++ b/src/components/MenuButton.tsx @@ -1,6 +1,6 @@ -import React from 'react' import { IconButton } from '@chakra-ui/react' -import { MdMenu, MdClose } from 'react-icons/md' +import React from 'react' +import { MdClose, MdMenu } from 'react-icons/md' interface MenuButtonProps { isOpen?: boolean diff --git a/src/components/Nav.tsx b/src/components/Nav.tsx index d18301d..1c903a9 100644 --- a/src/components/Nav.tsx +++ b/src/components/Nav.tsx @@ -1,9 +1,7 @@ -import React, { useEffect } from 'react' +import { Box, Flex, Link as ChakraLink, Stack } from '@chakra-ui/react' +import { motion } from 'framer-motion' import Link from 'next/link' -import { AnimateSharedLayout, motion } from 'framer-motion' import { useRouter } from 'next/router' -import { Link as ChakraLink, Flex, Box, Stack, HStack } from '@chakra-ui/react' -import Headroom from 'react-headroom' import paths from '../paths' diff --git a/src/components/NavBar.tsx b/src/components/NavBar.tsx index 5433206..b20bcb2 100644 --- a/src/components/NavBar.tsx +++ b/src/components/NavBar.tsx @@ -1,18 +1,18 @@ -import React, { useState, useEffect } from 'react' -import Link from 'next/link' import { - Image, - Link as ChakraLink, Box, Flex, + Image, + Link as ChakraLink, Spacer, useBreakpointValue, } from '@chakra-ui/react' import { motion } from 'framer-motion' +import Link from 'next/link' +import React, { useEffect, useState } from 'react' import Headroom from 'react-headroom' -import Nav from './Nav' import MenuButton from './MenuButton' +import Nav from './Nav' export const closedNavHeight = '76px' diff --git a/src/components/ResponsiveImage.tsx b/src/components/ResponsiveImage.tsx index d42ff2c..92da1c2 100644 --- a/src/components/ResponsiveImage.tsx +++ b/src/components/ResponsiveImage.tsx @@ -1,4 +1,4 @@ -import { Image, Box, BoxProps, SystemStyleObject } from '@chakra-ui/react' +import { Box, BoxProps, Image, SystemStyleObject } from '@chakra-ui/react' type ResponsiveImageProps = { url: string | null @@ -41,6 +41,7 @@ const ResponsiveImage: React.FC = ({ const src = responsiveImage.src.replaceAll('_next', '/_next') const srcSet = responsiveImage.srcSet.replaceAll('_next', '/_next') + const srcSetWebp = responsiveImageWebp.srcSet.replaceAll('_next', '/_next') return ( = ({ > {children} - + = ({ Component, pageProps }) => { diff --git a/src/pages/about.tsx b/src/pages/about.tsx index f8396e3..4d0b5be 100644 --- a/src/pages/about.tsx +++ b/src/pages/about.tsx @@ -1,9 +1,7 @@ -import { Stack, Heading, Text, Box, Flex } from '@chakra-ui/react' - +import { Box, Flex, Heading, Text } from '@chakra-ui/react' import ReactMarkdown from 'react-markdown' -import ResponsiveImage from '../components/ResponsiveImage' -import SEO from '../components/SEO' +import SEO from '../components/SEO' import { getAbout, getTeamMembersWithImages, @@ -12,13 +10,13 @@ import { login, } from '../lib/api' -const Team: React.FC<{ +const About: React.FC<{ data: { about: IAbout; teamMembers: ITeamMemberWithImage[] } }> = ({ data }) => { - const { about, teamMembers } = data + const { about } = data return ( <> - + @@ -48,7 +46,7 @@ const Team: React.FC<{ ) } -export default Team +export default About export async function getStaticProps() { await login() diff --git a/src/pages/contact.tsx b/src/pages/contact.tsx index 28bcb12..d70b286 100644 --- a/src/pages/contact.tsx +++ b/src/pages/contact.tsx @@ -1,8 +1,8 @@ -import { Heading, Text, Box, Flex } from '@chakra-ui/react' - +import { Box, Flex, Heading, Text } from '@chakra-ui/react' import ReactMarkdown from 'react-markdown' -import SEO from '../components/SEO' + import Form from '../components/Form' +import SEO from '../components/SEO' const Contact: React.FC = () => { return ( diff --git a/src/pages/index.tsx b/src/pages/index.tsx index 8c6e63d..f592546 100644 --- a/src/pages/index.tsx +++ b/src/pages/index.tsx @@ -1,11 +1,10 @@ -import { Text, Box } from '@chakra-ui/react' +import { Box, Text } from '@chakra-ui/react' import ResponsiveImage from '../components/ResponsiveImage' import SEO from '../components/SEO' +import { getInicioWithImage, IInicioWithImage, login } from '../lib/api' -import { getInicioWithImage, login } from '../lib/api' - -const Home: React.FC = ({ fondo_file, mensaje_inspirador }) => { +const Home: React.FC = ({ fondo_file, mensaje_inspirador }) => { return ( <> diff --git a/src/pages/notas/[slug].tsx b/src/pages/notas/[slug].tsx index 6d461a9..2ff3c69 100644 --- a/src/pages/notas/[slug].tsx +++ b/src/pages/notas/[slug].tsx @@ -1,8 +1,6 @@ -import { Spacer, Stack, Heading, Text, Box, Flex } from '@chakra-ui/react' - +import { Box, Heading, Stack, Text } from '@chakra-ui/react' import ResponsiveImage from 'components/ResponsiveImage' import SEO from 'components/SEO' - import { getAllNotasWithImages, getNotaWithImage, INotaWithImage, login } from 'lib/api' import ReactMarkdown from 'react-markdown' @@ -10,7 +8,7 @@ const NotePage: React.FC<{ data: INotaWithImage }> = ({ data }) => { console.log(data) return ( <> - + {data.titulo} diff --git a/src/pages/notas/index.tsx b/src/pages/notas/index.tsx index 011d2ac..8922561 100644 --- a/src/pages/notas/index.tsx +++ b/src/pages/notas/index.tsx @@ -1,15 +1,13 @@ -import { Link as ChakraLink, Stack, Heading, Text, Box, Flex } from '@chakra-ui/react' -import Link from 'next/link' - +import { Box, Flex, Heading, Link as ChakraLink, Stack, Text } from '@chakra-ui/react' import ResponsiveImage from 'components/ResponsiveImage' import SEO from 'components/SEO' - -import { getAbout, getAllNotasWithImages, INotaWithImage, login } from 'lib/api' +import { getAllNotasWithImages, INotaWithImage, login } from 'lib/api' +import Link from 'next/link' const Notas: React.FC<{ notas: INotaWithImage[] }> = ({ notas }) => { return ( <> - + Notas y pensamientos diff --git a/src/pages/team.tsx b/src/pages/team.tsx index 441526e..c48eb6e 100644 --- a/src/pages/team.tsx +++ b/src/pages/team.tsx @@ -1,8 +1,7 @@ -import { Stack, Heading, Text, Box, Flex } from '@chakra-ui/react' +import { Box, Flex, Heading, Stack, Text } from '@chakra-ui/react' import ResponsiveImage from '../components/ResponsiveImage' import SEO from '../components/SEO' - import { getAbout, getTeamMembersWithImages, @@ -17,7 +16,7 @@ const Team: React.FC<{ const { about, teamMembers } = data return ( <> - + diff --git a/src/pages/work/[slug].tsx b/src/pages/work/[slug].tsx index 9ad3c5c..6511855 100644 --- a/src/pages/work/[slug].tsx +++ b/src/pages/work/[slug].tsx @@ -1,14 +1,12 @@ -import { Spacer, Stack, Heading, Text, Box, Flex } from '@chakra-ui/react' - +import { Box, Flex, Heading, Spacer, Stack, Text } from '@chakra-ui/react' import ResponsiveImage from 'components/ResponsiveImage' import SEO from 'components/SEO' - import { getAllWorks, getWorkWithImages, IWorkWithImages, login } from 'lib/api' const WorkPage: React.FC<{ data: IWorkWithImages }> = ({ data }) => { return ( <> - + = ({ data }) => { return ( <> - + Work y cositas