rebase middleware backup

dev-launchers · Jul 1, 2024 · 5032a2f · 5032a2f
1 parent 42af29f
commit 5032a2f
Show file tree

Hide file tree

Showing 21 changed files with 89 additions and 701 deletions.
diff --git a/apps/app/pages/join/[slug]/apply.jsx b/apps/app/pages/join/[slug]/apply.jsx
@@ -9,10 +9,3 @@ export {
 
 import { constructAppPage } from '../../../utils/routingTools.js';
 export default constructAppPage(App, Page);
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-*/
->>>>>>> d8bad424 (fix: bug fix)
-=======
->>>>>>> 55a4d324 (build: bug fix)
diff --git a/...e/RolesFilterComponent/RolesFilterList/CollapsibleContainerFilter/Commitment/checkBox.tsx b/...e/RolesFilterComponent/RolesFilterList/CollapsibleContainerFilter/Commitment/checkBox.tsx
@@ -2,35 +2,14 @@ import React from 'react';
 import styled from 'styled-components';
 
 const Checkbox = styled.label`
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-  /* Estilização do container do checkbox */
->>>>>>> 2bc7ee42 (fix: bug fix)
-=======
->>>>>>> e99587eb (fix: fixing the design)
   display: inline-block;
   position: relative;
   cursor: pointer;
 
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-  /* Estilos do checkbox oculto */
->>>>>>> 2bc7ee42 (fix: bug fix)
-=======
->>>>>>> e99587eb (fix: fixing the design)
   input[type='checkbox'] {
     display: none;
   }
 
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-  /* Estilos do "V" quando o checkbox está marcado */
->>>>>>> 2bc7ee42 (fix: bug fix)
-=======
->>>>>>> e99587eb (fix: fixing the design)
   input[type='checkbox']:checked + span::before {
     content: '✔';
     position: absolute;
@@ -42,24 +21,10 @@ const Checkbox = styled.label`
     color: white;
   }
 
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-  /* Estilos do container quando o checkbox está marcado */
->>>>>>> 2bc7ee42 (fix: bug fix)
-=======
->>>>>>> e99587eb (fix: fixing the design)
   input[type='checkbox']:checked + span {
     background-color: black;
   }
 
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-  /* Estilos do container quando o checkbox não está marcado */
->>>>>>> 2bc7ee42 (fix: bug fix)
-=======
->>>>>>> e99587eb (fix: fixing the design)
   span {
     display: inline-block;
     width: 25px;
@@ -78,13 +43,4 @@ const StyledCheckbox = ({ isChecked, onChange }) => (
   </Checkbox>
 );
 
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-// Exemplo de uso:
-// <NikeStyledCheckbox isChecked={isFilterActive} onChange={handleCheckboxChange} />
-
->>>>>>> 2bc7ee42 (fix: bug fix)
-=======
->>>>>>> e99587eb (fix: fixing the design)
 export default StyledCheckbox;
diff --git a/...Page/RolesFilterComponent/RolesFilterList/CollapsibleContainerFilter/Commitment/index.tsx b/...Page/RolesFilterComponent/RolesFilterList/CollapsibleContainerFilter/Commitment/index.tsx
@@ -1,8 +1,3 @@
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
->>>>>>> e99587eb (fix: fixing the design)
 import React, { useState } from 'react';
 import {
   CommitmentMain,
@@ -11,7 +6,6 @@ import {
   CommitmentTitle,
   TimeCommitment,
 } from './styles';
-<<<<<<< HEAD
 import StyledCheckbox from './checkBox';
 import { useOpportunitiesContext } from '../../../../../../../contexts/SelectRoleContext';
 
@@ -64,78 +58,6 @@ function Commitment() {
           </TimeCommitment>
         </CommitmentTimeContainer>
       </CommitmentMain>
-=======
-import React, { useEffect, useState } from 'react';
-=======
-import React, { useEffect, useState, useContext } from 'react';
->>>>>>> 79e3fb90 (feat: create the logic of time commitment)
-import { CommitmentText, IconImage, TimeCommitment } from './styles';
-import CheckBox from '../../../../../../../images/icons/checkbox.png';
-=======
->>>>>>> e99587eb (fix: fixing the design)
-import StyledCheckbox from './checkBox';
-import { useOpportunitiesContext } from '../../../../../../../contexts/SelectRoleContext';
-
-function Commitment() {
-  const [checkBoxLow, setCheckBoxLow] = useState(null);
-  const [checkBoxMed, setCheckBoxMed] = useState(null);
-  const [checkBoxHigh, setCheckBoxHigh] = useState(null);
-
-  const { setCommitmentRange } = useOpportunitiesContext();
-
-  const handleCheckboxChange = (min, max) => {
-    setCheckBoxLow(min === checkBoxLow ? null : min);
-    setCheckBoxMed(min === checkBoxMed ? null : min);
-    setCheckBoxHigh(min === checkBoxHigh ? null : min);
-
-    if (min === checkBoxLow || min === checkBoxMed || min === checkBoxHigh) {
-      setCommitmentRange(null);
-    } else {
-      setCommitmentRange({ min, max });
-    }
-  };
-
-  return (
-    <>
-      <CommitmentMain>
-        <CommitmentTitle>TIME COMMITMENT:</CommitmentTitle>
-        <CommitmentTimeContainer>
-          <TimeCommitment>
-            <StyledCheckbox
-              isChecked={checkBoxLow === 0}
-              onChange={() => handleCheckboxChange(0, 4)}
-            />
-            <CommitmentText>Low (0-4 hrs/wk)</CommitmentText>
-          </TimeCommitment>
-
-          <TimeCommitment>
-            <StyledCheckbox
-              isChecked={checkBoxMed === 5}
-              onChange={() => handleCheckboxChange(5, 9)}
-            />
-            <CommitmentText>Med (5-9 hrs/wk)</CommitmentText>
-          </TimeCommitment>
-
-<<<<<<< HEAD
-      <TimeCommitment>
-        <StyledCheckbox
-          isChecked={checkBoxHigh === 10}
-          onChange={() => handleCheckboxChange(10, 20)}
-        />
-        <CommitmentText>High (10-20 hrs/wk)</CommitmentText>
-      </TimeCommitment>
->>>>>>> d03a4c35 (fix: cleaning the code)
-=======
-          <TimeCommitment>
-            <StyledCheckbox
-              isChecked={checkBoxHigh === 10}
-              onChange={() => handleCheckboxChange(10, 20)}
-            />
-            <CommitmentText>High (10-20 hrs/wk)</CommitmentText>
-          </TimeCommitment>
-        </CommitmentTimeContainer>
-      </CommitmentMain>
->>>>>>> e99587eb (fix: fixing the design)
     </>
   );
 }

diff --git a/...Page/RolesFilterComponent/RolesFilterList/CollapsibleContainerFilter/Commitment/styles.ts b/...Page/RolesFilterComponent/RolesFilterList/CollapsibleContainerFilter/Commitment/styles.ts
@@ -1,9 +1,5 @@
 import styled from 'styled-components';
 
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
->>>>>>> e99587eb (fix: fixing the design)
 export const CommitmentMain = styled.div`
   width: 100%;
   height: 80%;
@@ -35,26 +31,12 @@ export const CommitmentText = styled.div`
   display: flex;
   align-items: center;
   font-family: 'Nunito Sans', sans-serif;
-<<<<<<< HEAD
-=======
-export const CommitmentText = styled.div`
-  font-size: 14px;
->>>>>>> d03a4c35 (fix: cleaning the code)
-=======
->>>>>>> e99587eb (fix: fixing the design)
 `;
 
 export const TimeCommitment = styled.div`
   display: flex;
   align-items: center;
-<<<<<<< HEAD
-<<<<<<< HEAD
-  gap: 10px;
-=======
->>>>>>> d03a4c35 (fix: cleaning the code)
-=======
   gap: 10px;
->>>>>>> e99587eb (fix: fixing the design)
 `;
 
 export const IconImage = styled.img`

diff --git a/...ge/RolesFilterComponent/RolesFilterList/CollapsibleContainerFilter/RolesButtons/index.tsx b/...ge/RolesFilterComponent/RolesFilterList/CollapsibleContainerFilter/RolesButtons/index.tsx
@@ -1,23 +1,9 @@
 import { ButtonRoles, TextRole } from './styles';
 
-<<<<<<< HEAD
-<<<<<<< HEAD
 function RolesButtons({ textRole, onClick, isActive }) {
   return (
     <>
       <ButtonRoles isActive={isActive} onClick={onClick}>
-=======
-function RolesButtons({ textRole, onClick }) {
-  return (
-    <>
-      <ButtonRoles onClick={onClick}>
->>>>>>> d03a4c35 (fix: cleaning the code)
-=======
-function RolesButtons({ textRole, onClick, isActive }) {
-  return (
-    <>
-      <ButtonRoles isActive={isActive} onClick={onClick}>
->>>>>>> 1fc468f4 (feat: creating logic to change the button color when active)
         <TextRole>{textRole}</TextRole>
       </ButtonRoles>
     </>

diff --git a/...ge/RolesFilterComponent/RolesFilterList/CollapsibleContainerFilter/RolesButtons/styles.ts b/...ge/RolesFilterComponent/RolesFilterList/CollapsibleContainerFilter/RolesButtons/styles.ts
@@ -1,50 +1,21 @@
 import styled from 'styled-components';
 
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
->>>>>>> 1fc468f4 (feat: creating logic to change the button color when active)
 interface ButtonRolesProps {
   isActive: boolean; // Declare a prop for isActive
 }
 
 export const ButtonRoles = styled.div<ButtonRolesProps>`
-<<<<<<< HEAD
-=======
-export const ButtonRoles = styled.div`
->>>>>>> d03a4c35 (fix: cleaning the code)
-=======
->>>>>>> 1fc468f4 (feat: creating logic to change the button color when active)
   border-radius: 24px;
   padding: 10px 8px;
   font-size: 14px;
   font-family: 'Nunito Sans', sans-serif;
-<<<<<<< HEAD
-<<<<<<< HEAD
   border: 1px solid ${({ isActive }) => (isActive ? '#ff7f0e' : 'black')};
   background-color: ${({ isActive }) => (isActive ? '#ff7f0e' : 'transparent')};
   cursor: pointer;
   &:hover {
     background-color: #ff7f0e;
     border: 1px solid #ff7f0e;
     transition: 0.1s;
-=======
-  border: 1px solid black;
-  background-color: transparent;
-  cursor: pointer;
-  &:hover {
-    background-color: #ff7f0e;
-    border: none;
->>>>>>> d03a4c35 (fix: cleaning the code)
-=======
-  border: 1px solid ${({ isActive }) => (isActive ? '#ff7f0e' : 'black')};
-  background-color: ${({ isActive }) => (isActive ? '#ff7f0e' : 'transparent')};
-  cursor: pointer;
-  &:hover {
-    background-color: #ff7f0e;
-    border: 1px solid #ff7f0e;
-    transition: 0.1s;
->>>>>>> 1fc468f4 (feat: creating logic to change the button color when active)
   }
 `;
 

diff --git a/...ules/FilterPage/RolesFilterComponent/RolesFilterList/CollapsibleContainerFilter/styles.ts b/...ules/FilterPage/RolesFilterComponent/RolesFilterList/CollapsibleContainerFilter/styles.ts
@@ -3,13 +3,6 @@ import styled from 'styled-components';
 export const ContainerMain = styled.div`
   width: 100%;
   background-color: white;
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-
->>>>>>> 1fc468f4 (feat: creating logic to change the button color when active)
-=======
->>>>>>> e99587eb (fix: fixing the design)
   border-radius: 8px;
   display: inline-block;
   flex-direction: column;
@@ -30,15 +23,7 @@ export const ContainerHead = styled.div`
 `;
 
 export const ContainerBody = styled.div`
-<<<<<<< HEAD
-<<<<<<< HEAD
-  height: 650px;
-=======
-  height: 600px;
->>>>>>> 1fc468f4 (feat: creating logic to change the button color when active)
-=======
-  height: 650px;
->>>>>>> e99587eb (fix: fixing the design)
+  height: 700px;
   display: flex;
   flex-direction: column;
   justify-content: space-around;
@@ -55,20 +40,9 @@ export const ContainerRoles = styled.div`
 `;
 
 export const ContainerCommitment = styled.div`
-<<<<<<< HEAD
-<<<<<<< HEAD
-  height: 250px;
-  display: flex;
-  align-items: center;
-=======
-  height: 140px;
-  padding: 0 20px;
->>>>>>> 1fc468f4 (feat: creating logic to change the button color when active)
-=======
   height: 250px;
   display: flex;
   align-items: center;
->>>>>>> e99587eb (fix: fixing the design)
 `;
 
 export const CommitmentText = styled.div`

diff --git a/...ilterPage/RolesFilterComponent/RolesFilterList/SearchRoles/RoleModal/RoleDetailsModal.tsx b/...ilterPage/RolesFilterComponent/RolesFilterList/SearchRoles/RoleModal/RoleDetailsModal.tsx
@@ -5,14 +5,7 @@ import {
   BulletListItem,
   CloseIcon,
   ColorBox,
-<<<<<<< HEAD:apps/dev-recruiters/src/components/modules/FilterPage/RolesFilterComponent/RolesFilterList/SearchRoles/RoleModal/RoleDetailsModal.tsx
-<<<<<<< HEAD
   ExpectationsListItem,
-=======
->>>>>>> b4f9e26e (build: work in time commitment)
-=======
-  ExpectationsListItem,
->>>>>>> cdd29da3 (Restructure position popup font):apps/dev-recruiters/src/components/modules/FilterPage/RoleModal/RoleDetailsModal.tsx
   ModalDescriptionSection,
   ModalProjectSection,
   TagsList,
@@ -78,15 +71,7 @@ function ModalTopSection({ position }: Props) {
       <ModalProjectSection>
         <h3>{position.attributes.title}</h3>
         {/* <p>{position.isPlatform ? "Platform" : "Independent"}</p> */}
-<<<<<<< HEAD:apps/dev-recruiters/src/components/modules/FilterPage/RolesFilterComponent/RolesFilterList/SearchRoles/RoleModal/RoleDetailsModal.tsx
-<<<<<<< HEAD
-        <h4>Product Platform</h4>
-=======
-        <h4>PRODUCT PLATFORM</h4>
->>>>>>> b4f9e26e (build: work in time commitment)
-=======
         <h4>Product Platform</h4>
->>>>>>> cdd29da3 (Restructure position popup font):apps/dev-recruiters/src/components/modules/FilterPage/RoleModal/RoleDetailsModal.tsx
         <h6>TIME COMMITMENT</h6>
         <p>{position.attributes.commitmentHoursPerWeek} hrs per week</p>
       </ModalProjectSection>

diff --git a/...dules/FilterPage/RolesFilterComponent/RolesFilterList/SearchRoles/SuggestedRole/index.tsx b/...dules/FilterPage/RolesFilterComponent/RolesFilterList/SearchRoles/SuggestedRole/index.tsx
@@ -43,15 +43,7 @@ const SuggestedRole = () => {
             }
           </AboutDescription>
         </AboutContainer>
-<<<<<<< HEAD
-<<<<<<< HEAD
         <ButtonsContainer /*onClick={handleOpenModal}*/>
-=======
-        <ButtonsContainer onClick={handleOpenModal}>
->>>>>>> b4f9e26e (build: work in time commitment)
-=======
-        <ButtonsContainer /*onClick={handleOpenModal}*/>
->>>>>>> e99587eb (fix: fixing the design)
           More Details
         </ButtonsContainer>
         <Modal