From d2e0689647cfe5e16f48a5de4235a89e01ee6b67 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jimena=20Hern=C3=A1ndez?= Date: Sun, 12 Nov 2023 12:12:08 -0600 Subject: [PATCH 1/3] Update OfferDetails.jsx --- uniEmpleos/src/pages/OfferDetails/OfferDetails.jsx | 2 ++ 1 file changed, 2 insertions(+) diff --git a/uniEmpleos/src/pages/OfferDetails/OfferDetails.jsx b/uniEmpleos/src/pages/OfferDetails/OfferDetails.jsx index 31d504d7..a3177979 100644 --- a/uniEmpleos/src/pages/OfferDetails/OfferDetails.jsx +++ b/uniEmpleos/src/pages/OfferDetails/OfferDetails.jsx @@ -266,6 +266,7 @@ const OfferDetails = ({ id }) => { {horarioInicioDisplay && horarioFinDisplay && (
Horario + Inicio { value={horarioInicioDisplay} className={styles.inputHorario} /> + Fin Date: Sun, 12 Nov 2023 12:18:07 -0600 Subject: [PATCH 2/3] Update PostulationsEmpresa.jsx --- uniEmpleos/src/pages/PostulationsEmpresa/PostulationsEmpresa.jsx | 1 + 1 file changed, 1 insertion(+) diff --git a/uniEmpleos/src/pages/PostulationsEmpresa/PostulationsEmpresa.jsx b/uniEmpleos/src/pages/PostulationsEmpresa/PostulationsEmpresa.jsx index c13438d4..147ed9a9 100644 --- a/uniEmpleos/src/pages/PostulationsEmpresa/PostulationsEmpresa.jsx +++ b/uniEmpleos/src/pages/PostulationsEmpresa/PostulationsEmpresa.jsx @@ -108,6 +108,7 @@ const PostulationsEmpresa = () => { title={postulation.puesto} area={postulation.nombre_carreras} salary={`Q.${postulation.salario}.00`} + jornada={postulation.jornada} company={postulation.nombre_empresa} labelbutton="Ver más" onClick={() => { From d3c841862b0b4ec7a8da5211808ee2b38ace9a9a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jimena=20Hern=C3=A1ndez?= Date: Sun, 12 Nov 2023 17:36:38 -0600 Subject: [PATCH 3/3] updates horario y jornada students --- uniEmpleos/public/images/horario.svg | 1 + uniEmpleos/public/images/jornada.svg | 1 + uniEmpleos/public/images/requisitos.svg | 2 +- uniEmpleos/src/components/InfoTab/InfoTab.jsx | 6 ++--- .../src/components/ofertaInfo/OfertaInfo.jsx | 2 +- .../ofertaInfo/OfertaInfo.module.css | 6 +++++ .../src/pages/postulacion/Postulacion.jsx | 18 +++++++++++-- .../pages/postulacion/Postulacion.module.css | 27 ++++++++++++++++--- 8 files changed, 52 insertions(+), 11 deletions(-) create mode 100644 uniEmpleos/public/images/horario.svg create mode 100644 uniEmpleos/public/images/jornada.svg diff --git a/uniEmpleos/public/images/horario.svg b/uniEmpleos/public/images/horario.svg new file mode 100644 index 00000000..b652a4cf --- /dev/null +++ b/uniEmpleos/public/images/horario.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/uniEmpleos/public/images/jornada.svg b/uniEmpleos/public/images/jornada.svg new file mode 100644 index 00000000..02d5dca2 --- /dev/null +++ b/uniEmpleos/public/images/jornada.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/uniEmpleos/public/images/requisitos.svg b/uniEmpleos/public/images/requisitos.svg index 964c0cbb..a4e33b94 100644 --- a/uniEmpleos/public/images/requisitos.svg +++ b/uniEmpleos/public/images/requisitos.svg @@ -1 +1 @@ - details \ No newline at end of file + \ No newline at end of file diff --git a/uniEmpleos/src/components/InfoTab/InfoTab.jsx b/uniEmpleos/src/components/InfoTab/InfoTab.jsx index f718f3ad..54cf1b09 100644 --- a/uniEmpleos/src/components/InfoTab/InfoTab.jsx +++ b/uniEmpleos/src/components/InfoTab/InfoTab.jsx @@ -20,7 +20,7 @@ const InfoTab = ({ console.log(horariofin) const parseTime = (isoString) => { - return isoString.split("T")[1].split("Z")[0] + return isoString.split("T")[1].split("Z")[0].slice(0, -3) } return ( @@ -35,9 +35,9 @@ const InfoTab = ({ {salary &&

{`Salario: ${salary}`}

} {jornada &&

{`Jornada: ${jornada}`}

} {horarioinicio && horariofin && ( -

{`Horario: ${`${parseTime(horarioinicio)} - ${parseTime( +

{`Horario: ${`${parseTime(horarioinicio)}AM - ${parseTime( horariofin - )}`}`}

+ )}PM`}`}

)}
diff --git a/uniEmpleos/src/components/ofertaInfo/OfertaInfo.jsx b/uniEmpleos/src/components/ofertaInfo/OfertaInfo.jsx index f012ba7c..6bbddfbe 100644 --- a/uniEmpleos/src/components/ofertaInfo/OfertaInfo.jsx +++ b/uniEmpleos/src/components/ofertaInfo/OfertaInfo.jsx @@ -6,7 +6,7 @@ const OfertaInfo = ({ img, label }) => { return (
- {label} + {label}
{label}
diff --git a/uniEmpleos/src/components/ofertaInfo/OfertaInfo.module.css b/uniEmpleos/src/components/ofertaInfo/OfertaInfo.module.css index 35d994ee..c7e77d9b 100644 --- a/uniEmpleos/src/components/ofertaInfo/OfertaInfo.module.css +++ b/uniEmpleos/src/components/ofertaInfo/OfertaInfo.module.css @@ -11,7 +11,13 @@ width: 30px; } + +.svg{ + height: 100%; +} + .textContainer { color: #000; padding: 5px; + text-align: left; } \ No newline at end of file diff --git a/uniEmpleos/src/pages/postulacion/Postulacion.jsx b/uniEmpleos/src/pages/postulacion/Postulacion.jsx index 8714fdfc..b6c44be7 100644 --- a/uniEmpleos/src/pages/postulacion/Postulacion.jsx +++ b/uniEmpleos/src/pages/postulacion/Postulacion.jsx @@ -1,12 +1,12 @@ import React, { useEffect, useState } from "react" import { useStoreon } from "storeon/react" +import { useQuill } from "react-quilljs" import style from "./Postulacion.module.css" import { Header } from "../../components/Header/Header" import OfertaInfo from "../../components/ofertaInfo/OfertaInfo" import Button from "../../components/Button/Button" import { navigate } from "../../store" import useApi from "../../Hooks/useApi" -import { useQuill } from "react-quilljs" import Popup from "../../components/Popup/Popup" const Postulacion = ({ id }) => { @@ -69,6 +69,10 @@ const Postulacion = ({ id }) => { navigate("/profile") } + const parseTime = (isoString) => { + return isoString.split("T")[1].split("Z")[0].slice(0, -3) + } + return (
{ img="/images/salario.svg" label={api.data.offer.salario.toString()} /> + +
- Detalles + Detalles
diff --git a/uniEmpleos/src/pages/postulacion/Postulacion.module.css b/uniEmpleos/src/pages/postulacion/Postulacion.module.css index bf4cafbe..91a02729 100644 --- a/uniEmpleos/src/pages/postulacion/Postulacion.module.css +++ b/uniEmpleos/src/pages/postulacion/Postulacion.module.css @@ -1,9 +1,9 @@ .container{ background-color: #fff; width: 100%; - height: 100%; display: flex; flex-direction: column; + } .postulacionContainer { @@ -12,17 +12,23 @@ justify-content: flex-start; align-items: center; gap: 25px; - height: calc(100% - 25px); - background-color: #f5f5f5; + background-color: #fff; color: #000; padding: 25px; + +} +span.detailsText, .titleContainer { + font-size: 1.5rem; + font-weight: 600; + color: #000; + font-family: "Poppins", sans-serif; } .titleContainer{ width: 75%; background-color: transparent; border-radius: 10px; - box-shadow: rgba(0, 0, 0, 0.3) 0px 19px 38px, rgba(0, 0, 0, 0.22) 0px 15px 12px; + box-shadow: #a08ae5 0px 19px 38px, #a08ae5 0px 15px 12px; padding: 15px; } @@ -61,3 +67,16 @@ width: 30px; height: 30px; } + +@media screen and (max-width: 768px) { + + .buttonContainer { + width: 90%; + margin: 10px; + } + + .Editor { + width: 100%; + text-align: justify; + } +}