Skip to content
This repository was archived by the owner on Mar 13, 2025. It is now read-only.

#475, #467 & fixed liniting issues #476

Merged
merged 1 commit into from Aug 12, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 10 additions & 6 deletions src/routes/CreateNewTeam/components/SearchAndSubmit/index.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -29,19 +29,23 @@ function SearchAndSubmit(props) {

const matchedSkills = useMemo(() => {
if (skills && matchingRole && matchingRole.matchedSkills) {
return _.compact(_.map(matchingRole.matchedSkills, (s) =>
_.find(skills, (skill) => skill.name === s)
));
return _.compact(
_.map(matchingRole.matchedSkills, (s) =>
_.find(skills, (skill) => skill.name === s)
)
);
} else {
return [];
}
}, [skills, matchingRole]);

const unMatchedSkills = useMemo(() => {
if (skills && matchingRole && matchingRole.unMatchedSkills) {
return _.compact(_.map(matchingRole.unMatchedSkills, (s) =>
_.find(skills, (skill) => skill.name === s)
));
return _.compact(
_.map(matchingRole.unMatchedSkills, (s) =>
_.find(skills, (skill) => skill.name === s)
)
);
} else {
return [];
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ const PaymentForm = ({ calculatedAmount }) => {
const [errors, setErrors] = useState({
card: true,
cardExpire: true,
cardCvc: true,
cvc: true,
});
const [clicked, setClicked] = useState(true);
const [projectId, setProjectId] = useState(null);
Expand Down Expand Up @@ -172,8 +172,8 @@ const PaymentForm = ({ calculatedAmount }) => {
fieldValues.name &&
fieldValues.zipcode &&
dropdown &&
cardValid;
Object.values(errors).every((x) => x === "");
cardValid &&
Object.values(errors).every((x) => x === "" || x === false);

return isValid;
};
Expand Down Expand Up @@ -240,14 +240,20 @@ const PaymentForm = ({ calculatedAmount }) => {
</button>
</form>

<ConfirmationModal open={requestLoading} isLoading={requestLoading} loadingMessage="Creating A New Team"/>
<PaymentResultPopup
open={showPaymentResultPopup}
onContinueClick={goToTassProject}
onClose={() => {
setShowPaymentResultPopup(false);
}}
<ConfirmationModal
open={requestLoading}
isLoading={requestLoading}
loadingMessage="Creating A New Team"
/>
{showPaymentResultPopup ? (
<PaymentResultPopup
open={showPaymentResultPopup}
onContinueClick={goToTassProject}
onClose={() => {
setShowPaymentResultPopup(false);
}}
/>
) : null}
</>
);
};
Expand Down
Original file line number Diff line number Diff line change
@@ -1,24 +1,22 @@
@import "styles/include";

.header {
margin-top: -30px;
background-color: #ffffff;
background-image: linear-gradient(
90deg
, #9D41C9, #EF476F);
background-size: 100%;
background-clip: text;
-webkit-text-fill-color: transparent;
font-family: BarlowCondensed;
font-size: 34px;
line-height: 38px;
text-align: center;
margin-top: -30px;
background-color: #ffffff;
background-image: linear-gradient(90deg, #9d41c9, #ef476f);
background-size: 100%;
background-clip: text;
-webkit-text-fill-color: transparent;
font-family: BarlowCondensed;
font-size: 34px;
line-height: 38px;
text-align: center;
}

.sub-header {
@include font-roboto;
margin-top: 20px;
color: #2A2A2A;
color: #2a2a2a;
font-size: 16px;
line-height: 26px;
text-align: center;
Expand All @@ -32,7 +30,7 @@
.time-label {
@include font-roboto;
margin-top: 10px;
color: #2A2A2A;
color: #2a2a2a;
font-size: 14px;
line-height: 22px;
text-align: center;
Expand Down