Merge pull request topcoder-platform#5267 from topcoder-platform/gig-apply-fix

Gig apply fix

Author: luizrrodrigues

.circleci/config.yml

@@ -237,7 +237,7 @@ workflows:
           filters:
             branches:
               only:                
-                - hall-of-fame-fixes
+                - gig-apply-fix
       # This is alternate dev env for parallel testing
       - "build-qa":
           context : org-global      

src/shared/actions/recruitCRM.js

@@ -60,7 +60,6 @@ function normalizeRecruitPayload(job, payload) {
     `Date Available: ${new Date(payload.availFrom).toDateString()}`,
     `Heard About Gig: ${payload.reffereal}`,
     `Why fit: ${payload.whyFit}`,
-    `Availability Per Week: ${payload.timeAvailability.filter(s => s.checked).map(s => s.label).join(',')}`,
     `Able to work during timezone? ${payload.timezoneConfirm.filter(s => s.value).map(s => s.label).join(',')}`,
     `Am I ok to work the duration? ${payload.durationConfirm.filter(s => s.value).map(s => s.label).join(',')}`,
     `Notes: ${payload.notes}`,

src/shared/components/Gigs/GigApply/index.jsx

@@ -224,24 +224,6 @@ export default function GigApply(props) {
                       errorMsg={formErrors.whyFit}
                       value={formData.whyFit}
                     />
-                    <p>What is your availability per week?</p>
-                    <div styleName="checkboxes-row">
-                      {
-                        _.map(formData.timeAvailability, (cbox, indx) => (
-                          <div styleName="checkbox" key={`cbox-${indx}`}>
-                            <Checkbox
-                              onChange={(val) => {
-                                formData.timeAvailability[indx].checked = val;
-                                onFormInputChange('timeAvailability', formData.timeAvailability);
-                              }}
-                              checked={formData.timeAvailability[indx].checked}
-                              size="lg"
-                            />
-                            <span styleName="label">{cbox.label}</span>
-                          </div>
-                        ))
-                      }
-                    </div>
                     <p>Are you able to work during the specified timezone? (<strong>{`${getCustomField(job.custom_fields, 'Timezone')}`}</strong>)</p>
                     <RadioButton
                       onChange={val => onFormInputChange('timezoneConfirm', val)}

src/shared/components/Leaderboard/LeaderboardTable/index.jsx

@@ -93,15 +93,15 @@ export default function LeaderboardTable(props) {
                 <div
                   styleName={`${stylesName}.handle-link`}
                   onClick={() => onUsernameClick(competitor)}
-                  style={{ color: rating ? getRatingColor(rating) : null }}
+                  style={{ color: rating !== undefined ? getRatingColor(rating) : null }}
                 >
                   {competitor['member_profile_basic.handle'] || competitor.handle}
                 </div>
               ) : (
                 <a
                   href={`${window.origin}/members/${competitor['member_profile_basic.handle'] || competitor.handle}/`}
                   target={`${_.includes(window.origin, 'www') ? '_self' : '_blank'}`}
-                  style={{ color: rating ? getRatingColor(rating) : null }}
+                  style={{ color: rating !== undefined ? getRatingColor(rating) : null }}
                 >
                   {competitor['member_profile_basic.handle'] || competitor.handle}
                 </a>

src/shared/components/Leaderboard/Podium/styles.scss

@@ -20,7 +20,7 @@
 
 .PodiumWrap {
   display: flex;
-  justify-content: space-evenly;
+  justify-content: center !important;
 
   @include xs-to-sm {
     flex-direction: column;
@@ -30,8 +30,14 @@
 
 .Podium .podium-column {
   display: inline-block;
+  margin-right: 20px;
+
+  &:last-child {
+    margin-right: 0;
+  }
 
   @include xs-to-sm {
     margin-bottom: 15px;
+    margin-right: 0;
   }
 }

src/shared/components/Leaderboard/PodiumSpot/index.jsx

@@ -160,7 +160,7 @@ export default function PodiumSpot(props) {
                   <div
                     styleName={`${stylesName}.handle-link`}
                     onClick={() => onUsernameClick(competitor)}
-                    style={{ color: rating ? getRatingColor(rating) : null }}
+                    style={{ color: rating !== undefined ? getRatingColor(rating) : null }}
                   >
                     {competitor['member_profile_basic.handle'] || competitor.handle}
                   </div>
@@ -169,7 +169,7 @@ export default function PodiumSpot(props) {
                     styleName={`${stylesName}.profile-link`}
                     href={`${window.origin}/members/${competitor['member_profile_basic.handle'] || competitor.handle}/`}
                     target={`${_.includes(window.origin, 'www') ? '_self' : '_blank'}`}
-                    style={{ color: rating ? getRatingColor(rating) : null }}
+                    style={{ color: rating !== undefined ? getRatingColor(rating) : null }}
                   >
                     {competitor['member_profile_basic.handle'] || competitor.handle}
                   </a>

src/shared/containers/Gigs/RecruitCRMJobApply.jsx

@@ -25,9 +25,6 @@ class RecruitCRMJobApplyContainer extends React.Component {
         skills: _.map(techSkills, label => ({ label, selected: false })),
         durationConfirm: [{ label: 'Yes', value: false }, { label: 'No', value: false }],
         timezoneConfirm: [{ label: 'Yes', value: false }, { label: 'No', value: false }],
-        timeAvailability: [
-          { label: '10 hours', checked: false }, { label: '20 hours', checked: false }, { label: '30 hours', checked: false }, { label: '40 hours', checked: false },
-        ],
         agreedTerms: false,
         country: _.map(countries.getNames('en'), val => ({ label: val, selected: false })),
         // eslint-disable-next-line react/destructuring-assignment