Skip to content

Commit

Permalink
Merge pull request #245 from markalbrand56/front_searchbar
Browse files Browse the repository at this point in the history
Front searchbar
  • Loading branch information
angelcast2002 authored Nov 12, 2023
2 parents 5e204b9 + d3c8418 commit a418918
Show file tree
Hide file tree
Showing 10 changed files with 55 additions and 11 deletions.
1 change: 1 addition & 0 deletions uniEmpleos/public/images/horario.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions uniEmpleos/public/images/jornada.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion uniEmpleos/public/images/requisitos.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
6 changes: 3 additions & 3 deletions uniEmpleos/src/components/InfoTab/InfoTab.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -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 (
Expand All @@ -35,9 +35,9 @@ const InfoTab = ({
{salary && <p>{`Salario: ${salary}`}</p>}
{jornada && <p>{`Jornada: ${jornada}`}</p>}
{horarioinicio && horariofin && (
<p>{`Horario: ${`${parseTime(horarioinicio)} - ${parseTime(
<p>{`Horario: ${`${parseTime(horarioinicio)}AM - ${parseTime(
horariofin
)}`}`}</p>
)}PM`}`}</p>
)}
</div>
<div className={styles.button}>
Expand Down
2 changes: 1 addition & 1 deletion uniEmpleos/src/components/ofertaInfo/OfertaInfo.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ const OfertaInfo = ({ img, label }) => {
return (
<div className={style.generalContainer}>
<div className={style.svgContainer}>
<img src={img} alt={label} />
<img src={img} alt={label} className={style.svg} />
</div>
<div className={style.textContainer}>{label}</div>
</div>
Expand Down
6 changes: 6 additions & 0 deletions uniEmpleos/src/components/ofertaInfo/OfertaInfo.module.css
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,13 @@
width: 30px;
}


.svg{
height: 100%;
}

.textContainer {
color: #000;
padding: 5px;
text-align: left;
}
2 changes: 2 additions & 0 deletions uniEmpleos/src/pages/OfferDetails/OfferDetails.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -266,13 +266,15 @@ const OfferDetails = ({ id }) => {
{horarioInicioDisplay && horarioFinDisplay && (
<div className={styles.inputContainer}>
<span>Horario</span>
<span className={styles.horario}>Inicio</span>
<input
name="horarioinicio"
type="time"
onChange={handleHorarioInputChange}
value={horarioInicioDisplay}
className={styles.inputHorario}
/>
<span className={styles.horario}>Fin</span>
<input
name="horariofin"
type="time"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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={() => {
Expand Down
18 changes: 16 additions & 2 deletions uniEmpleos/src/pages/postulacion/Postulacion.jsx
Original file line number Diff line number Diff line change
@@ -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 }) => {
Expand Down Expand Up @@ -69,6 +69,10 @@ const Postulacion = ({ id }) => {
navigate("/profile")
}

const parseTime = (isoString) => {
return isoString.split("T")[1].split("Z")[0].slice(0, -3)
}

return (
<div className={style.container}>
<Popup
Expand Down Expand Up @@ -101,9 +105,19 @@ const Postulacion = ({ id }) => {
img="/images/salario.svg"
label={api.data.offer.salario.toString()}
/>
<OfertaInfo
img="/images/jornada.svg"
label={api.data.offer.jornada}
/>
<OfertaInfo
img="/images/horario.svg"
label={`${parseTime(api.data.offer.hora_inicio)}AM - ${parseTime(
api.data.offer.hora_fin
)}PM`}
/>
</div>
<div className={style.label}>
Detalles
<span className={style.detailsText}>Detalles</span>
<div ref={quillRef} className={style.Editor} />
</div>
<div className={style.buttonContainer}>
Expand Down
27 changes: 23 additions & 4 deletions uniEmpleos/src/pages/postulacion/Postulacion.module.css
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
.container{
background-color: #fff;
width: 100%;
height: 100%;
display: flex;
flex-direction: column;

}

.postulacionContainer {
Expand All @@ -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;
}

Expand Down Expand Up @@ -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;
}
}

0 comments on commit a418918

Please sign in to comment.