From 9e4fd3734b9cd23a1a79866bb02fa7765b8ed17b Mon Sep 17 00:00:00 2001 From: Michael Baghel <31278895+mbaghel@users.noreply.github.com> Date: Thu, 22 Jul 2021 13:39:05 +0400 Subject: [PATCH 1/2] feat: Support direct links to the Job Candidates tabs. resolves #391 --- src/constants/index.js | 4 ++++ src/root.component.jsx | 2 +- src/routes/PositionDetails/index.jsx | 24 ++++++++++++++++-------- 3 files changed, 21 insertions(+), 9 deletions(-) diff --git a/src/constants/index.js b/src/constants/index.js index a94ca818..c8612cf2 100644 --- a/src/constants/index.js +++ b/src/constants/index.js @@ -133,6 +133,7 @@ export const CANDIDATE_STATUS_FILTERS = [ title: "Candidates to Review", noCandidateMessage: "No Candidates To Review", statuses: [CANDIDATE_STATUS.OPEN], + urlParam: "to-review", }, { key: CANDIDATE_STATUS_FILTER_KEY.INTERESTED, @@ -140,6 +141,7 @@ export const CANDIDATE_STATUS_FILTERS = [ title: "Interviews", noCandidateMessage: "No Interviews", statuses: [CANDIDATE_STATUS.INTERVIEW], + urlParam: "interviews", }, { key: CANDIDATE_STATUS_FILTER_KEY.SELECTED, @@ -147,6 +149,7 @@ export const CANDIDATE_STATUS_FILTERS = [ title: "Selected", noCandidateMessage: "No Selected Candidates", statuses: [CANDIDATE_STATUS.SELECTED, CANDIDATE_STATUS.OFFERED], + urlParam: "selected", }, { key: CANDIDATE_STATUS_FILTER_KEY.NOT_INTERESTED, @@ -160,6 +163,7 @@ export const CANDIDATE_STATUS_FILTERS = [ CANDIDATE_STATUS.TOPCODER_REJECTED, CANDIDATE_STATUS.JOB_CLOSED, ], + urlParam: "declined", }, ]; diff --git a/src/root.component.jsx b/src/root.component.jsx index 4392f546..2f5d06a9 100644 --- a/src/root.component.jsx +++ b/src/root.component.jsx @@ -32,7 +32,7 @@ export default function Root() { - + diff --git a/src/routes/PositionDetails/index.jsx b/src/routes/PositionDetails/index.jsx index b18df067..584727aa 100644 --- a/src/routes/PositionDetails/index.jsx +++ b/src/routes/PositionDetails/index.jsx @@ -22,7 +22,12 @@ const inReviewStatusFilter = _.find(CANDIDATE_STATUS_FILTERS, { key: CANDIDATE_STATUS_FILTER_KEY.TO_REVIEW, }); -const PositionDetails = ({ teamId, positionId }) => { +const getKeyFromParam = (urlParam) => { + const filter = _.find(CANDIDATE_STATUS_FILTERS, { urlParam }); + return filter?.key || undefined; +} + +const PositionDetails = ({ teamId, positionId, candidateStatus }) => { // by default show "interested" tab const [candidateStatusFilterKey, setCandidateStatusFilterKey] = useState( CANDIDATE_STATUS_FILTER_KEY.INTERESTED @@ -41,15 +46,18 @@ const PositionDetails = ({ teamId, positionId }) => { // if there are some candidates to review, then show "To Review" tab by default useEffect(() => { - if ( - position && - _.filter(position.candidates, (candidate) => + if (position) { + const key = getKeyFromParam(candidateStatus); + if (key) { + setCandidateStatusFilterKey(key); + } else if (_.filter(position.candidates, (candidate) => inReviewStatusFilter.statuses.includes(candidate.status) - ).length > 0 - ) { - setCandidateStatusFilterKey(CANDIDATE_STATUS_FILTER_KEY.TO_REVIEW); + ).length > 0 + ) { + setCandidateStatusFilterKey(CANDIDATE_STATUS_FILTER_KEY.TO_REVIEW); + } } - }, [position]); + }, [position, candidateStatus]); return ( From 4718302485e6c3904d510db0aa68e666d21ac1ec Mon Sep 17 00:00:00 2001 From: Michael Baghel <31278895+mbaghel@users.noreply.github.com> Date: Thu, 22 Jul 2021 14:39:23 +0400 Subject: [PATCH 2/2] fix: Customer scroll (small screen height fix). issue #355 --- src/components/CustomerScroll/styles.module.scss | 13 ++++++++++++- src/routes/CreateNewTeam/styles.module.scss | 11 +++++++++-- 2 files changed, 21 insertions(+), 3 deletions(-) diff --git a/src/components/CustomerScroll/styles.module.scss b/src/components/CustomerScroll/styles.module.scss index 35c004fb..60cfdf55 100644 --- a/src/components/CustomerScroll/styles.module.scss +++ b/src/components/CustomerScroll/styles.module.scss @@ -17,6 +17,7 @@ .scrolling-logos { background-image: url("../../assets/images/customer-logos.svg"); + background-size: cover; height: 60px; width: 100%; animation: scroll 300s linear infinite; @@ -42,4 +43,14 @@ width: 60px; z-index: 2; } -} \ No newline at end of file +} + +@media only screen and (max-height: 859px) { + .scrolling-logos { + height: 30px; + } + .title { + font-size: 16px; + margin-bottom: 15px; + } +} diff --git a/src/routes/CreateNewTeam/styles.module.scss b/src/routes/CreateNewTeam/styles.module.scss index bf5fb5aa..ba56c3ed 100644 --- a/src/routes/CreateNewTeam/styles.module.scss +++ b/src/routes/CreateNewTeam/styles.module.scss @@ -11,8 +11,15 @@ } } -@media only screen and (max-height: 820px) { +@media only screen and (max-height: 859px) { .logos { - display: none; + position: relative; + width: 100vw; + } +} + +@media only screen and (max-height: 859px) and (min-width: 1024px) { + .logos { + left: -270px; } }