diff --git a/package.json b/package.json index 3f28d49e..d9c29817 100644 --- a/package.json +++ b/package.json @@ -21,6 +21,7 @@ "@apollo/client": "^3.7.12", "@radix-ui/colors": "^0.1.8", "@radix-ui/react-accordion": "^1.1.1", + "@radix-ui/react-alert-dialog": "^1.0.4", "@radix-ui/react-checkbox": "^1.0.3", "@radix-ui/react-dialog": "^1.0.3", "@radix-ui/react-icons": "^1.3.0", diff --git a/src/components/Dropzone/Dropzone.tsx b/src/components/Dropzone/Dropzone.tsx index 164aaa50..a9ffcddc 100644 --- a/src/components/Dropzone/Dropzone.tsx +++ b/src/components/Dropzone/Dropzone.tsx @@ -17,6 +17,7 @@ const Dropzone = () => { const { user } = useUser(); const { theme } = useTheme(); const { openModal, closeModal } = useModal(); + const onDrop = async (acceptedFiles: File[]) => { closeModal(ModalActionTypes.SETTINGS_MODAL); const [selectedFile] = acceptedFiles; diff --git a/src/components/MentorModalAvailability/MentorModalAvailability.tsx b/src/components/MentorModalAvailability/MentorModalAvailability.tsx index 158ca50e..dd158e37 100644 --- a/src/components/MentorModalAvailability/MentorModalAvailability.tsx +++ b/src/components/MentorModalAvailability/MentorModalAvailability.tsx @@ -1,18 +1,18 @@ +import { useMutation } from "@apollo/client"; import Button from "@components/Button"; import Chip from "@components/Chip/Chip"; -import Modal from "@components/Modal"; +import { Modal } from "@components/Modal/Modal"; import TimeInput from "@components/TimeInput/TimeInput"; +import { useUser } from "@hooks/useUser"; import { DAYS_OF_THE_WEEK_SHORT, TWeekday_Short } from "config/constants"; import { useState } from "react"; -import { saveAvailabilityInMemory } from "./helpers/saveAvailability"; import { MdClose } from "react-icons/md"; -import { useMutation } from "@apollo/client"; -import { PERSIST_AVAILABILITY } from "services/apollo/mutations"; -import { useUser } from "@hooks/useUser"; import { toast } from "react-toastify"; -import { SuccessfullyCreated } from "./SuccessullyCreated"; -import { AvailabilitySlot, Props } from "./MentorModalAvailability.types"; +import { PERSIST_AVAILABILITY } from "services/apollo/mutations"; import { IAvailabilityAPI } from "types/availability.types"; +import { AvailabilitySlot, Props } from "./MentorModalAvailability.types"; +import { SuccessfullyCreated } from "./SuccessullyCreated"; +import { saveAvailabilityInMemory } from "./helpers/saveAvailability"; export const MentorModalAvailability = ({ open, @@ -82,93 +82,97 @@ export const MentorModalAvailability = ({ return ( <> - -
-

- Horário de mentoria -

-

- Defina seus horários e datas disponíveis -

-

- *O tempo de cada mentoria é de aproximadamente 30 minutos. -

-

- Cada mentoria deve ser criada com esse intervalo, podendo ter vários - horários disponíveis no mesmo dia. -

-
- {DAYS_OF_THE_WEEK_SHORT.map((day) => ( -
- setSelectedDay(day)} - > - {day} - + + +
+

+ Horário de mentoria +

+

+ Defina seus horários e datas disponíveis +

+

+ *O tempo de cada mentoria é de aproximadamente 30 minutos. +

+

+ Cada mentoria deve ser criada com esse intervalo, podendo ter + vários horários disponíveis no mesmo dia. +

+
+ {DAYS_OF_THE_WEEK_SHORT.map((day) => ( +
+ setSelectedDay(day)} + > + {day} + +
+ ))} +
+
+
+

Horário

- ))} -
-
-
-

Horário

-
-
- - -
-
-
- -
-
-
- {availability.map((slot) => ( -
+ + +
+
+
+
- ))} -
-
- + Agendar horários + +
+
+
+ {availability.map((slot) => ( +
+
+

+ {slot.weekDay} +

+
+
+ {slot.startHour} até {slot.endHour} +
+ removeAvailability(slot)} + /> +
+ ))} +
+
+ +
- -
- setSuccessModal(false)} - /> + + setSuccessModal(false)} + /> + ); }; diff --git a/src/components/MentorModalAvailability/SuccessullyCreated.tsx b/src/components/MentorModalAvailability/SuccessullyCreated.tsx index 30c65239..579ca4bd 100644 --- a/src/components/MentorModalAvailability/SuccessullyCreated.tsx +++ b/src/components/MentorModalAvailability/SuccessullyCreated.tsx @@ -1,5 +1,5 @@ import Button from "@components/Button"; -import Modal from "@components/Modal/Modal"; +import { Modal } from "@components/Modal/Modal"; export const SuccessfullyCreated = ({ open, @@ -9,7 +9,7 @@ export const SuccessfullyCreated = ({ onClose: () => void; }) => { return ( - +

Agenda criada! @@ -26,6 +26,6 @@ export const SuccessfullyCreated = ({ Finalizar

-
+ ); }; diff --git a/src/components/MentoringLinkCard/SelectComponent.tsx b/src/components/MentoringLinkCard/SelectComponent.tsx index d6286f79..d09e4f58 100644 --- a/src/components/MentoringLinkCard/SelectComponent.tsx +++ b/src/components/MentoringLinkCard/SelectComponent.tsx @@ -3,10 +3,10 @@ import clsx from "clsx"; import { useState } from "react"; import { BiChevronDown, BiChevronUp } from "react-icons/bi"; import Button from "../../components/Button"; -import Modal from "@components/Modal/Modal"; import { useMutation } from "@apollo/client"; import { UPDATE_EVENT } from "services/apollo/mutations"; import { IUpdateEventInput, Props } from "./SelectComponent.types"; +import { Modal } from "@components/Modal/Modal"; export const SelectComponent = ({ eventId, @@ -53,17 +53,17 @@ export const SelectComponent = ({ }; return ( <> - } > {currentStep === 1 && ( <> -

+

Deseja realmente cancelar sua mentoria?

-
+