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

[PROD] Next Release #384

Merged
merged 44 commits into from
Jul 26, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
44 commits
Select commit Hold shift + click to select a range
8597adb
fix: issue #373
yoution Jul 14, 2021
9c63cc2
Label updates and simple UI style fixes
mbaghel Jul 14, 2021
81ab3ee
feat: Integrate Customer Scroll
mbaghel Jul 14, 2021
d69d8f4
fix: issue #364
yoution Jul 14, 2021
2090bc8
fix: issue #356
yoution Jul 15, 2021
abfe1cc
Merge pull request #377 from yoution/issue-356
nikolay83 Jul 15, 2021
975a7fc
Merge pull request #377 from yoution/issue-356
nikolay83 Jul 15, 2021
b1153ad
Merge branch 'roles-milestone18' of https://github.com/topcoder-platf…
mbaghel Jul 15, 2021
e065422
Merge pull request #378 from topcoder-platform/roles-milestone18
nikolay83 Jul 15, 2021
2270993
fix: Increase job description length, Change minimum job duration
mbaghel Jul 15, 2021
0cbe16e
feat: Update Team Details Labels & add additional options under "Adva…
mbaghel Jul 15, 2021
af0ed91
Merge pull request #379 from mbaghel/roles-milestone18
nikolay83 Jul 15, 2021
b2477fd
Merge pull request #380 from topcoder-platform/roles-milestone18
nikolay83 Jul 15, 2021
a06e065
fix: issue #356
yoution Jul 16, 2021
ca24b14
Merge branch 'roles-milestone18' into issue-356
yoution Jul 16, 2021
a28ded8
Merge pull request #381 from yoution/issue-356
nikolay83 Jul 16, 2021
ba44ac9
Merge pull request #382 from topcoder-platform/roles-milestone18
nikolay83 Jul 16, 2021
628f577
fix: issue #356
yoution Jul 16, 2021
63bbcb8
Merge pull request #385 from yoution/issue-356
nikolay83 Jul 17, 2021
bf6c558
Merge pull request #386 from topcoder-platform/roles-milestone18
nikolay83 Jul 17, 2021
07dd2bd
fix: issue #375
yoution Jul 18, 2021
1fe3070
fix: issue #376
yoution Jul 18, 2021
d167be4
Merge pull request #387 from yoution/issue-376
nikolay83 Jul 19, 2021
bb7dd97
fix: issue #375 deploy error
yoution Jul 19, 2021
ac33c90
Merge pull request #388 from yoution/issue-376
nikolay83 Jul 19, 2021
012c0ec
fix: #383 Restrict the duration field on Jobs to a 4 week minimum
mbaghel Jul 19, 2021
1a112c0
Merge branch 'dev' of https://github.com/topcoder-platform/taas-app i…
mbaghel Jul 19, 2021
3fd55ba
Merge pull request #389 from mbaghel/dev
maxceem Jul 20, 2021
66fecb9
docs: add constant comment
maxceem Jul 20, 2021
755f424
fix: Min duration message showing when value is float.
mbaghel Jul 20, 2021
3d53219
Merge pull request #392 from mbaghel/dev
maxceem Jul 20, 2021
d1b5aa6
fix: Typos: #368 & #390
mbaghel Jul 20, 2021
0584ad5
Merge branch 'dev' of https://github.com/topcoder-platform/taas-app i…
mbaghel Jul 20, 2021
eb1bf00
Merge pull request #394 from mbaghel/dev
nikolay83 Jul 20, 2021
5acd01a
fix: issue #355
yoution Jul 21, 2021
1a3cc09
Merge pull request #395 from yoution/issue-355
nikolay83 Jul 21, 2021
9e4fd37
feat: Support direct links to the Job Candidates tabs.
mbaghel Jul 22, 2021
2370ddb
add withdrawn in decline
Jul 22, 2021
fbf22a1
Merge pull request #399 from topcoder-platform/feature/jc-withdrawn
LieutenantRoger Jul 22, 2021
4718302
fix: Customer scroll (small screen height fix).
mbaghel Jul 22, 2021
c3aac43
Merge pull request #398 from mbaghel/dev
nikolay83 Jul 22, 2021
50ff6bc
Update utils.js
mbaghel Jul 24, 2021
6780ad7
Update index.jsx
mbaghel Jul 24, 2021
a791e9a
Merge pull request #409 from mbaghel/dev
maxceem Jul 24, 2021
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
29 changes: 25 additions & 4 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 2 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,8 @@
"redux-logger": "^3.0.6",
"redux-promise-middleware": "^6.1.2",
"redux-thunk": "^2.3.0",
"tc-auth-lib": "topcoder-platform/tc-auth-lib#1.0.4"
"tc-auth-lib": "topcoder-platform/tc-auth-lib#1.0.4",
"uuid": "^8.3.2"
},
"browserslist": [
"last 1 version",
Expand Down
139 changes: 139 additions & 0 deletions src/assets/images/customer-logos.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
13 changes: 13 additions & 0 deletions src/components/CustomerScroll/index.jsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
import React from "react";
import "./styles.module.scss";

function CustomerScroll() {
return (
<div>
<h6 styleName="title">Trusted By</h6>
<div styleName="scrolling-logos" />
</div>
);
}

export default CustomerScroll;
56 changes: 56 additions & 0 deletions src/components/CustomerScroll/styles.module.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,56 @@
@import "styles/include";

.title {
@include font-barlow;
font-weight: 600;
font-size: 22px;
color: #7f7f7f;
text-align: center;
text-transform: uppercase;
margin-bottom: 30px;
}

@keyframes scroll {
from {background-position: 0 0;}
to {background-position: -7701px 0;}
}

.scrolling-logos {
background-image: url("../../assets/images/customer-logos.svg");
background-size: cover;
height: 60px;
width: 100%;
animation: scroll 300s linear infinite;
position: relative;

&:before {
background: linear-gradient(to right, #F4F5F6 0%, rgba(255, 255, 255, 0) 100%);
content: '';
height: 60px;
left: 0;
position: absolute;
top: 0;
width: 60px;
z-index: 2;
}
&:after {
background: linear-gradient(to right, rgba(255, 255, 255, 0) 0%, #F4F5F6 100%);
content: '';
height: 60px;
position: absolute;
right: 0;
top: 0;
width: 60px;
z-index: 2;
}
}

@media only screen and (max-height: 859px) {
.scrolling-logos {
height: 30px;
}
.title {
font-size: 16px;
margin-bottom: 15px;
}
}
12 changes: 12 additions & 0 deletions src/constants/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -111,6 +111,7 @@ export const CANDIDATE_STATUS = {
TOPCODER_REJECTED: "topcoder-rejected",
JOB_CLOSED: "job-closed",
OFFERED: "offered",
WITHDRAWN: "withdrawn",
};

/**
Expand All @@ -133,20 +134,23 @@ 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,
buttonText: "Interviews",
title: "Interviews",
noCandidateMessage: "No Interviews",
statuses: [CANDIDATE_STATUS.INTERVIEW],
urlParam: "interviews",
},
{
key: CANDIDATE_STATUS_FILTER_KEY.SELECTED,
buttonText: "Selected",
title: "Selected",
noCandidateMessage: "No Selected Candidates",
statuses: [CANDIDATE_STATUS.SELECTED, CANDIDATE_STATUS.OFFERED],
urlParam: "selected",
},
{
key: CANDIDATE_STATUS_FILTER_KEY.NOT_INTERESTED,
Expand All @@ -159,7 +163,9 @@ export const CANDIDATE_STATUS_FILTERS = [
CANDIDATE_STATUS.REJECTED_OTHER,
CANDIDATE_STATUS.TOPCODER_REJECTED,
CANDIDATE_STATUS.JOB_CLOSED,
CANDIDATE_STATUS.WITHDRAWN,
],
urlParam: "declined",
},
];

Expand Down Expand Up @@ -264,6 +270,7 @@ export const ACTION_TYPE = {
*/
ADD_MATCHING_ROLE: "ADD_MATCHING_ROLE",
DELETE_MATCHING_ROLE: "DELETE_MATCHING_ROLE",
EDIT_MATCHING_ROLE: "EDIT_MATCHING_ROLE",
};

/**
Expand Down Expand Up @@ -366,3 +373,8 @@ export const MAX_ALLOWED_INTERVIEWS = 3;
* Custom role names to remove from RoleList component
*/
export const CUSTOM_ROLE_NAMES = ["custom", "niche"];

/**
* Minimal Resource Booking duration (weeks)
*/
export const MIN_DURATION = 4;
13 changes: 8 additions & 5 deletions src/root.component.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ import JobDetails from "./routes/JobDetails";
import JobForm from "./routes/JobForm";
import TeamAccess from "./routes/TeamAccess";
import CreateNewTeam from "./routes/CreateNewTeam";
import CreateTeamLanding from "./routes/CreateNewTeam/pages/CreateTeamLanding";
import InputSkills from "./routes/CreateNewTeam/pages/InputSkills";
import InputJobDescription from "./routes/CreateNewTeam/pages/InputJobDescription";
import SelectRole from "./routes/CreateNewTeam/pages/SelectRole";
Expand All @@ -25,18 +26,20 @@ export default function Root() {
<Router>
<Redirect from="/taas" to="/taas/myteams" exact />
<MyTeamsList path="/taas/myteams" />
<CreateNewTeam path="/taas/createnewteam" />
<MyTeamsDetails path="/taas/myteams/:teamId" />
<JobDetails path="/taas/myteams/:teamId/positions/:jobId" />
<JobForm path="/taas/myteams/:teamId/positions/:jobId/edit" />
<JobForm path="/taas/myteams/:teamId/positions/new" />
<ResourceBookingDetails path="/taas/myteams/:teamId/rb/:resourceBookingId" />
<ResourceBookingForm path="/taas/myteams/:teamId/rb/:resourceBookingId/edit" />
<PositionDetails path="/taas/myteams/:teamId/positions/:positionId/candidates" />
<PositionDetails path="/taas/myteams/:teamId/positions/:positionId/candidates/*candidateStatus" />
<TeamAccess path="/taas/myteams/:teamId/access" />
<InputJobDescription path="/taas/createnewteam/jd/*" />
<InputSkills path="/taas/createnewteam/skills/*" />
<SelectRole path="/taas/createnewteam/role/*" />
<CreateNewTeam path="/taas/createnewteam">
<CreateTeamLanding path="/" />
<InputJobDescription path="jd/*" />
<InputSkills path="skills/*" />
<SelectRole path="role/*" />
</CreateNewTeam>
</Router>

{/* Global config for Toastr popups */}
Expand Down
10 changes: 10 additions & 0 deletions src/routes/CreateNewTeam/actions/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,11 @@ const deleteMatchingRole = () => ({
type: ACTION_TYPE.DELETE_MATCHING_ROLE,
});

const editMatchingRole = (role) => ({
type: ACTION_TYPE.EDIT_MATCHING_ROLE,
payload: role,
});

export const clearSearchedRoles = () => (dispatch, getState) => {
dispatch(clearRoles());
updateLocalStorage(getState().searchedRoles);
Expand All @@ -51,6 +56,11 @@ export const addRoleSearchId = (id) => (dispatch, getState) => {
updateLocalStorage(getState().searchedRoles);
};

export const editRoleAction = (role) => (dispatch, getState) => {
dispatch(editMatchingRole(role));
updateLocalStorage(getState().searchedRoles);
};

export const deleteSearchedRole = (id) => (dispatch, getState) => {
dispatch(deleteRole(id));
updateLocalStorage(getState().searchedRoles);
Expand Down
Loading