Merge pull request #198 from raiane-oliveira/main

Autenticação, Mensagens de Erro, Componente de Modal e outras melhorias

Author: mariopaglia

package-lock.json

@@ -23,6 +23,7 @@
     "@mui/icons-material": "^5.14.11",
     "@mui/material": "^5.14.11",
     "@radix-ui/react-checkbox": "^1.0.4",
+    "@radix-ui/react-dialog": "^1.0.5",
     "@radix-ui/react-dropdown-menu": "^2.0.6",
     "@radix-ui/react-popover": "^1.0.7",
     "@radix-ui/react-scroll-area": "^1.0.5",
@@ -35,6 +36,7 @@
     "eslint-config-next": "13.4.12",
     "formik": "^2.4.2",
     "framer-motion": "^10.13.0",
+    "jwt-decode": "^4.0.0",
     "next": "13.4.12",
     "phosphor-react": "^1.4.1",
     "react": "18.2.0",

package.json

@@ -5,7 +5,6 @@ import {
   StyledName,
   TitleContainer,
   ButtonsContainer,
-  InfoButton,
 } from './styled'
 import Image from 'next/image'
 import ModalSchedMentor from '../ModalSchedMentor'
@@ -14,6 +13,7 @@ import { IMentors } from '@/services/interfaces/IUseMentorsService'
 import userWithoutImage from '@/assets/userDefault.png'
 import { Tag } from '../Tag'
 import { Button } from '../Button'
+import { Modal } from '../Modal'
 
 interface MentorsProps {
   mentor: IMentors
@@ -34,7 +34,6 @@ export default function CardScheduling({ mentor }: MentorsProps) {
 
   return (
     <CardContainer>
-      <ModalSchedMentor onClose={handleModal} mentor={mentor} open={open} />
       <TitleContainer>
         <Image
           width={80}
@@ -60,7 +59,14 @@ export default function CardScheduling({ mentor }: MentorsProps) {
         ) : (
           <Button disabled>Agendar Mentoria</Button>
         )}
-        <InfoButton onClick={handleModal}>Saiba mais</InfoButton>
+
+        <Modal.Root open={open} onOpenChange={handleModal}>
+          <Modal.Control asChild>
+            <Button variant="tertiary">Saiba mais</Button>
+          </Modal.Control>
+
+          <ModalSchedMentor mentor={mentor} />
+        </Modal.Root>
       </ButtonsContainer>
     </CardContainer>
   )

src/assets/logos/sou-junior-black.svg

@@ -40,24 +40,6 @@ export const StacksContainer = styled.span`
   flex-wrap: wrap;
 `
 
-const BaseButton = styled.button`
-  padding: 1rem 1.5rem;
-  border-radius: 0.5rem;
-  font-size: 1rem;
-  line-height: 0.9rem;
-  border: none;
-`
-
-export const InfoButton = styled(BaseButton)`
-  background-color: #ffff;
-  color: #003986;
-  text-align: center;
-
-  &:hover {
-    color: #002c66;
-  }
-`
-
 export const ButtonsContainer = styled.span`
   display: flex;
   gap: 0.5rem;