Merge pull request #384 from topcoder-platform/dev

[PROD] Next Release

Author: urwithat

package-lock.json

@@ -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",

package.json

@@ -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;

src/assets/images/customer-logos.svg

@@ -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;
+  }
+}

src/components/CustomerScroll/index.jsx

@@ -111,6 +111,7 @@ export const CANDIDATE_STATUS = {
   TOPCODER_REJECTED: "topcoder-rejected",
   JOB_CLOSED: "job-closed",
   OFFERED: "offered",
+  WITHDRAWN: "withdrawn",
 };
 
 /**
@@ -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,
@@ -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",
   },
 ];
 
@@ -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",
 };
 
 /**
@@ -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;

src/components/CustomerScroll/styles.module.scss

@@ -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";
@@ -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 */}

src/constants/index.js

@@ -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);
@@ -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);