Merge pull request #5425 from topcoder-platform/gigwork-updates

Gigwork updates

Author: luizrrodrigues

src/shared/actions/recruitCRM.js

@@ -1,6 +1,7 @@
 import { redux } from 'topcoder-react-utils';
 import Service from 'services/recruitCRM';
 import _ from 'lodash';
+import { getCustomField } from 'utils/gigs';
 
 /**
  * Jobs page fetch init
@@ -60,7 +61,7 @@ function normalizeRecruitPayload(job, payload) {
     `Date Available: ${new Date(payload.availFrom).toDateString()}`,
     `Heard About Gig: ${payload.reffereal}`,
     `Why fit: ${payload.whyFit}`,
-    `Able to work during timezone? ${payload.timezoneConfirm.filter(s => s.value).map(s => s.label).join(',')}`,
+    `Able to work during timezone? ${payload.timezoneConfirm.filter(s => s.value).map(() => getCustomField(job.custom_fields, 'Timezone')).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

@@ -121,6 +121,7 @@ export default function GigApply(props) {
                         errorMsg={formErrors.email}
                         value={formData.email}
                         required
+                        readonly
                       />
                       <TextInput
                         placeholder="Phone Including Country Code"
@@ -289,7 +290,7 @@ export default function GigApply(props) {
           <div styleName="cta-buttons">
             <Link to={`${config.URL.AUTH}/member?retUrl=${encodeURIComponent(retUrl)}`} styleName="primaryBtn">Login</Link>
           </div>
-          <p styleName="regTxt">Not a member? Register <a href={`${config.URL.AUTH}/member/registration?retUrl=${encodeURIComponent(retUrl)}`}>here</a>.</p>
+          <p styleName="regTxt">Not a member? Register <a href={`${config.URL.AUTH}/member/registration?retUrl=${encodeURIComponent(retUrl)}&mode=signUp&utm_source=gig_listing`}>here</a>.</p>
         </div>
       </div>
     </div>

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

@@ -108,7 +108,7 @@ export default function GigDetails(props) {
               <div styleName="infos-item">
                 <IconTimezone />
                 <div styleName="infos-data">
-                  Timezone
+                  Working Hours
                   <strong>{getCustomField(job.custom_fields, 'Timezone')}</strong>
                 </div>
               </div>

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

@@ -40,7 +40,7 @@ function LoginModal({ retUrl, onCancel }) {
             LOGIN
           </PrimaryButton>
         </div>
-        <p className={modalStyle.regTxt}>Not a member? Register <a href={`${config.URL.AUTH}/member/registration?retUrl=${encodeURIComponent(retUrl)}`}>here</a>.</p>
+        <p className={modalStyle.regTxt}>Not a member? It is free to <a href={`${config.URL.AUTH}/member/registration?retUrl=${encodeURIComponent(retUrl)}&mode=signUp&utm_source=gig_listing`}>register</a>!</p>
       </div>
     </Modal>
   );

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

@@ -105,7 +105,7 @@ function ReferralModal({
               LOGIN
             </PrimaryButton>
           </div>
-          <p className={modalStyle.regTxt}>Not a member? Register <a href={`${config.URL.AUTH}/member/registration?retUrl=${encodeURIComponent(retUrl)}`}>here</a>.</p>
+          <p className={modalStyle.regTxt}>Not a member? It is free to <a href={`${config.URL.AUTH}/member/registration?retUrl=${encodeURIComponent(retUrl)}&mode=signUp&utm_source=gig_listing`}>register</a>!</p>
         </div>
       )}
     </Modal>

src/shared/utils/gigs.js

@@ -10,8 +10,10 @@ import _ from 'lodash';
  */
 export function getSalaryType(data) {
   switch (data.id) {
+    case 1: return 'monthly';
     case 2: return 'annual';
     case 3: return 'week';
+    case 4: return 'daily';
     case 5: return 'hourly';
     default: return 'n/a';
   }