From 376aa82d4a450af666acd4f51be19cd5a11d76d3 Mon Sep 17 00:00:00 2001 From: Kiril Kartunov Date: Fri, 28 Aug 2020 10:58:33 +0300 Subject: [PATCH] Gig work fixes #4826 --- src/assets/images/icon-skills-blue.png | Bin 0 -> 912 bytes src/assets/images/icon-skills.png | Bin 0 -> 479 bytes src/assets/images/icon-skills.svg | 31 -------------- src/assets/images/l1.png | Bin 0 -> 1849 bytes src/assets/images/l2.png | Bin 0 -> 2041 bytes src/assets/images/l3.png | Bin 0 -> 2146 bytes src/assets/images/l4.png | Bin 0 -> 1902 bytes src/server/services/recruitCRM.js | 25 +++++++----- .../components/GUIKit/JobListCard/index.jsx | 4 +- .../components/GUIKit/JobListCard/style.scss | 3 +- .../components/GUIKit/SearchCombo/index.jsx | 7 +++- .../components/GUIKit/SearchCombo/style.scss | 10 ++++- src/shared/components/Gigs/GigDetails.jsx | 34 ++++++++++++---- src/shared/components/Gigs/style.scss | 38 +++++++++++++++++- src/shared/containers/Gigs/RecruitCRMJobs.jsx | 9 ++++- .../containers/Gigs/jobLisingStyles.scss | 5 +++ src/shared/containers/GigsPages.jsx | 3 +- 17 files changed, 112 insertions(+), 57 deletions(-) create mode 100644 src/assets/images/icon-skills-blue.png create mode 100644 src/assets/images/icon-skills.png delete mode 100644 src/assets/images/icon-skills.svg create mode 100644 src/assets/images/l1.png create mode 100644 src/assets/images/l2.png create mode 100644 src/assets/images/l3.png create mode 100644 src/assets/images/l4.png diff --git a/src/assets/images/icon-skills-blue.png b/src/assets/images/icon-skills-blue.png new file mode 100644 index 0000000000000000000000000000000000000000..658369b2d2ca974c9c116146df99895b47fdcd4a GIT binary patch literal 912 zcmeAS@N?(olHy`uVBq!ia0vp^!ayv_!3-oPUsrw1z`!^uz$e5N$YuEdpP}JD!>Uyd z`}Z54IitPms>1&LGOLd1E!wHKbEo#I{puT!sBAl-wEK+mx}%C4PiXEqq_+7OP(*pd zLCvj4)i)hf+j3ZA>tUdv>Xzdw8xE;&JfX7jn9AnkYMYLN1h*bm*?d%e<8igkN7S|) z0g9+?Ij*tgnChlu>RXPeZvk?Ts&6?8Q4Ca|x(R3|P}xz{%|Kb0I9LRz5-12VVKYdX zD$rP<_KiTRfy$0Rq|`Tqj0I^2i5yi2N`cHd0yG~e0yF`n7^n+mK2#RS2I>Nd!?i%| zg(wD@1~v!e9iTZdHb@p|2uLHyQy>OR3Zw-S!DO*WK@|W0|6jFCH2@eXEhRyI!3>N{ z%q*;I9Gu+TJiL7TV&an0GP3fDN@^OKT6%^?re@}r);6}zF77^lp%F2$aq$VssTrAB z*@Z>Lr4^OcHMI>5jZJM`-M#%2CQg|#bLq0>D_5;vvu^#SE!%hO+_m@6;Uh~S41#dVm33Lx*lDE4{tLXKt=RmfM zr;B5Vge2=hPG@cg2DS^^Gh6RGJu!8LOy@~KPD`h}iN;PE-+hy_qVMy6mvcD(`qh;% zhJ;enliQy%Bv@>|ZTC#UVPUrNdZP@J?;_XB6W;oKO5Swy#g)moCf`4~xa|Aqe7lnp zYLl+a+L@sDblaziaS@yH6Wmwo2j6?fwMJrBk}+dEh5TOM8Y-E*0DjBl;@^2;}p zROX-ie-zaQ;z`d{O_Y0Q;rO1(c-u76bU%vF58rgCCU{hge$SDv{= zdX>9)Was*%U&uHnYM#qrFvtA%{w4AZYgViM+$F+r!}jy@O7REw`Kv;v>3$!-w MUHx3vIVCg!0PcapqW}N^ literal 0 HcmV?d00001 diff --git a/src/assets/images/icon-skills.png b/src/assets/images/icon-skills.png new file mode 100644 index 0000000000000000000000000000000000000000..9708ba945f82fe14d43140128505f39aa7bd4cc5 GIT binary patch literal 479 zcmV<50U-W~P)G?G}@AOCb?(McfPsjobQYfMQg4?&Ef`Gm71#%<(8U+ zo7-xtED0I7aug$^o&FCs$RQa;HCh>bhBxZN3tTHqBqFV(pA^}rA?|NHGR=y - - - 52CD6D74-4265-497A-89D8-FF91F35564F8 - Created with sketchtool. - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/assets/images/l1.png b/src/assets/images/l1.png new file mode 100644 index 0000000000000000000000000000000000000000..be745ce393fd4e0e3f0a0f1c40dc6dc73b0eb777 GIT binary patch literal 1849 zcmV-92gdk`P)kkcVp0>QvTjzDn$zzl?cQpK)~k6-li z@$MtXbMvED?;C#m@a#GQ*HdIY$q@)Zvm^pLx3%J$%3la>cT0!v|Jozx9s0ik{MGe) zN00t%{%#>|^uUK8&0`*no9BQ;1Qc|@+I`~Wpb~d{{jm#v`GEmWUb^Q>@9TRh7;l~s z5Dd{u#|)N=@BDfMX@CU~?1oe~-S(TcuO2tRZI|v@IiR1U@bg5VPQoL?xJd^P3236) zoXY7gqN+Ma;fC8EIe+JS1~~b}sWk)EPmzAPh=O1Q5rJK0}Y+6Fjl3!oFMzkr6fv(k+IV7RB?e{6&5b4m%w__s$2-dDAed9o&D# z-W8twZ7n>}3qTc61zrVS0Xhxeww{jZ(x1<-Ie`}-*~{z-qkUVWlamL!a9lv`H)^}bwm)jD6BA0)6C((+ko^}GjoZ`9aez{$DjT8YwG|!QEj<)>XL!yIgN+fiJXtx zmq#@@BTjJLrZX|VdNfZReB@(G;QxF$ZQjdD*?}5|n>7!76~GhK0CFYOBDR=b1!*uN zneio~8o><~JgOm$QSsVJ7nF7j>B*u=5r}gA_wIUitfKN_Vi67NqqU`tvvVFh9(oi1 z*guOUqYhvG#+l)H0IC55%d`LxyA#+H3iH4K6bv6-kad+;SzU(P0Q5&Qh-%a@K=8tI zhX4Uqp1m|uOcB&-3}{COJDM4CG%p@cuBp6}rC`>wLN2x|m_;6@R+TE7G2$`mPAwWB znu22n)*_u!OHySwpwF$SSfD}A@}iy0*3uffZIcX)G-`r+0Zi$5~5BJ6h0>xkvCmomU$GrrJvADm0Dz9sZ%W;S zla|b+`${l{qoLZ{`!!C>t_lD!q&w;TRS1<>CNW#oYpmEj;c2;>0i^30??pP*94kDg zLl_#IK2rgJbNb|;u5&iRo2? z`TDPYn;Z4*7T6s^^SmruX3@rCAMUg^Tl>!BZD)Mb7zY6SU}DuYEB&LDe|$$UYNRbe zf?7JV(5%^C-#dy?8`qdp$q8zQ7fv2K;fIk}l%K6s`Ba-qO3UlQ`*K7oUkzG=YR*c$ zCSlwMsCa$EEnWZPuPi$fvmr-!(zjOq8kO!f4NEOd<6B)GMK6fricH9J2CTU17Asy% zxJ{^aM%?hatv4_GXO5`=I3eNz-5h(a_1{PpB8{nfo64+P4%q9f^<-uhZ}*r}sASvl zX(yb&?dIj3ACaWJ006gqfBzOw-rAX}GfGn*F6TJ_QS*8yXHx_f3b+H#{p5j-D|Yqa zSQOv{sc+qL;4y$3dgr!$R06X146Ed_8(DsesHbp`Dt5xjgWGQypI!{uy8;A&TYk!s zdf~ub9^6dGNUro<4Qu|{oEUzl^Hlr|#7l7UvJg`;gx%Y382`_)K)ok`_Sv}QjkC!5 zRsfd(avp`6v=Ix09w7X*sLlYKhPY|xbY}UfAKgE3jm#epnD+%R|7_ZR@T9}@gE6ms nXY|zi$i3H$AN`;Jj`jH;s98J`aUjmJ00000NkvXXu0mjf2Hked literal 0 HcmV?d00001 diff --git a/src/assets/images/l2.png b/src/assets/images/l2.png new file mode 100644 index 0000000000000000000000000000000000000000..fd3e0c91c46b60317802b4736e8504538852b179 GIT binary patch literal 2041 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 YKkn;dyc@gH1 zG{npw5!}XzGPh`gnL|OtvL$5x*jUM|hy=%CwiPS`IxKDJ`yBtc_qq3Z?)%n(`XtT0 zz4tlie4q34dtc$dTo2#!!tALr*K2Cm8n)b^TabAOtq4;N`4`GD;3#6xs`Au^Utas- z#oCdJ+5GseLoH`U$NCIzH<2}FHUk0knnXarc>(qB#J~TWVGky4wQYCqTzcyN25`si z2WOrenf#hKKI?=zNG9g60+F2)k*pfpR4e-bP2j)+i+iKW{y#W9d0kOg>HVq&mz*2bA zKQCld$H8v7Yv-~(7YuOg&4Y{UR^RK)y+iWwd4L7j;<+IrS>9E>h7rn#auS4JRL4za z?LChy+54sdf4F9FrIV@MK!=4MAvO?)vIG`;tC>f`1C;WnIxg^$P1~3Jc3OZxSa;xh zbNtG%OJfktl=|>C9-s(g==G|+=AMmmR7O*&UA5_TkAv^kBDh_Vc>frB1+9 zFcq8%PQen*uYx7{vwV-KM9=F2u8^le-X%i4V#8D*Vb)Y~{(GU*3V`RV{*$`WnHkeu zv0yon@_#7+_-9U`uHX+wQUY^Y0(Y8$^ZP;@!NJyjbHmWuD8vtZ?1fwFW{-yYka~&IYol|NfEY?YgW%;=ByNe!Dn7)V$!lu7sVpk-X=xo9pDO^*}f^^lfV<{ z6tdpbhawlORB$F3G-m+SV$`kd?F67cW&B~^N$Q%*c@VjGV)^pG9(>ruMQzRIdk=M_ zrnb_%IUM*FwvJG7q)d3vvUWP=%>ZENxigH8*0Dr#fK{)7Xq<0GUd@GL#5eVpbLXWm zbt+d_9^Nnq!#?Qq!}q%|!B^ch7r*xZZX~PN+?YQ|7*gjwmdiIDyxdzy7N;(ewh~YP zAar?AD0#8u3c44x(X*fpfTM@ba(s9a1ZH>5;JO>;0Px5Cr#Ue^QOH{$A2s!$kP!7S zu1ZZg@BDCVGRzyML!N&Ct8VNly|?dV)~tc zDxVY58eH?>C^z-bh;*jU=BZqJD7 zMDcx5oGJqrS6ud2YfT~$t*r^ut(F$0v$K}X-=IB7C4EYerF}%k1mM1nhkk=tZ+x<# zaaZz36ngvSQfrYSJOr{`T`erUJge?wFQ4PN!BKwy{Ak>$y*~BfY_ugRyHfy5_?ba( z<3KOlOLS6T_nwicJ%k5Xv8=rSc;L@(@a%y%GVg`cqd6a}0(?pVlG%%Pn(8YBEfNAQ z81lh@_esnLBU%-N*rdWI^L+&$%=w|GX`XsnBG?SwrvL*3GHI!8DU627JjwL@E|HA; zB{3f?4wgvy*-2T&*?TGEGGL8-&^y3HPR;%D{J|pATiQB)M4Fs(!3jdox!{DQ*8+uF zdiLyi>BF<*j!l`YhE`Sswaa3Gyw-C6|wcem_IZv zK!ESuxA1vO?M72M?J5=PE3HU;^({wn36a6NR0__25mx1kJ+e2|?#&^Vh8zsn#%~>4 z?!-L`T-oeLq6QjP$-lVa(}W#GLt$6@Wj!B%pkF2~7$CsF!!KQOd_?X?_^O#pq5=rn zM-#Bq7DG6Dl_4>{zJ0@GyPDa5Q-FTmx#gv04*9$@yA6@{W_&IL8;{Klq==k#VuwZa zF9-)z<<}2=`kjaWlidpj=+|94hG(8WJ+U6_eIjzD!4)Pl&#b%7 literal 0 HcmV?d00001 diff --git a/src/server/services/recruitCRM.js b/src/server/services/recruitCRM.js index 4f7fb95189..b8659ae824 100644 --- a/src/server/services/recruitCRM.js +++ b/src/server/services/recruitCRM.js @@ -114,20 +114,27 @@ export default class RecruitCRMService { const data = await response.json(); if (data.current_page < data.last_page) { const pages = _.range(2, data.last_page + 1); - // eslint-disable-next-line no-restricted-syntax - for (const page of pages) { - // eslint-disable-next-line no-await-in-loop - const pageDataRsp = await fetch(`${this.private.baseUrl}/v1/jobs/search?${qs.stringify(req.query)}&page=${page}`, { + return Promise.all( + pages.map(page => fetch(`${this.private.baseUrl}/v1/jobs/search?${qs.stringify(req.query)}&page=${page}`, { method: 'GET', headers: { 'Content-Type': req.headers['content-type'], Authorization: this.private.authorization, }, - }); - // eslint-disable-next-line no-await-in-loop - const pageData = await pageDataRsp.json(); - data.data = _.flatten(data.data.concat(pageData.data)); - } + })), + ) + .then(async (allPages) => { + // eslint-disable-next-line no-restricted-syntax + for (const pageDataRsp of allPages) { + // eslint-disable-next-line no-await-in-loop + const pageData = await pageDataRsp.json(); + data.data = _.flatten(data.data.concat(pageData.data)); + } + return res.send(data.data); + }) + .catch(e => res.send({ + error: e, + })); } return res.send(data.data); } catch (err) { diff --git a/src/shared/components/GUIKit/JobListCard/index.jsx b/src/shared/components/GUIKit/JobListCard/index.jsx index d94f4dc175..f2801de3b0 100644 --- a/src/shared/components/GUIKit/JobListCard/index.jsx +++ b/src/shared/components/GUIKit/JobListCard/index.jsx @@ -10,7 +10,7 @@ import './style.scss'; import IconBlackDuration from 'assets/images/icon-black-duration.svg'; import IconBlackLocation from 'assets/images/icon-black-location.svg'; import IconBlackPayment from 'assets/images/icon-black-payment.svg'; -import IconBlackSkills from 'assets/images/icon-skills.svg'; +import iconBlackSkills from 'assets/images/icon-skills.png'; export default function JobListCard({ job, @@ -30,7 +30,7 @@ export default function JobListCard({ {job.name}
- {skills} + skills-icon {skills}
{job.country} diff --git a/src/shared/components/GUIKit/JobListCard/style.scss b/src/shared/components/GUIKit/JobListCard/style.scss index 1cff03c199..d25dc60fd5 100644 --- a/src/shared/components/GUIKit/JobListCard/style.scss +++ b/src/shared/components/GUIKit/JobListCard/style.scss @@ -69,7 +69,8 @@ width: 141px; } - svg { + svg, + img { margin-right: 7px; } } diff --git a/src/shared/components/GUIKit/SearchCombo/index.jsx b/src/shared/components/GUIKit/SearchCombo/index.jsx index 29400e9cb0..c94b4e0480 100644 --- a/src/shared/components/GUIKit/SearchCombo/index.jsx +++ b/src/shared/components/GUIKit/SearchCombo/index.jsx @@ -17,6 +17,11 @@ function SearchCombo({ setVal(''); onSearch(''); }; + const onKeyDown = (e) => { + if (e.which === 13) { + onSearch(inputVal); + } + }; return (
@@ -24,7 +29,7 @@ function SearchCombo({ { !inputVal ? {placeholder} : null } - setVal(event.target.value)} /> + setVal(event.target.value)} onKeyDown={onKeyDown} /> { inputVal ? : null } diff --git a/src/shared/components/GUIKit/SearchCombo/style.scss b/src/shared/components/GUIKit/SearchCombo/style.scss index a47b4940ec..30d0928547 100644 --- a/src/shared/components/GUIKit/SearchCombo/style.scss +++ b/src/shared/components/GUIKit/SearchCombo/style.scss @@ -9,7 +9,6 @@ width: 100%; position: relative; margin-right: 10px; - z-index: 1; input.input { background: transparent; @@ -17,6 +16,8 @@ border-radius: 6px; height: 39px; margin: 0; + position: relative; + z-index: 1; } .search-placeholder { @@ -29,6 +30,12 @@ z-index: 0; top: 8px; left: 15px; + + @include xs-to-sm { + max-width: 250px; + overflow: hidden; + white-space: nowrap; + } } .clear-search { @@ -36,6 +43,7 @@ top: calc(50% - 5px); right: 15px; cursor: pointer; + z-index: 2; } } diff --git a/src/shared/components/Gigs/GigDetails.jsx b/src/shared/components/Gigs/GigDetails.jsx index cbf3602331..9f83e9198e 100644 --- a/src/shared/components/Gigs/GigDetails.jsx +++ b/src/shared/components/Gigs/GigDetails.jsx @@ -17,6 +17,11 @@ import IconMoney from 'assets/images/icon-payment.svg'; import IconDuration from 'assets/images/icon-calendar-gig.svg'; import IconHours from 'assets/images/icon-duration.svg'; import IconTimezone from 'assets/images/icon-timezone.svg'; +import iconSkills from 'assets/images/icon-skills-blue.png'; +import iconLabel1 from 'assets/images/l1.png'; +import iconLabel2 from 'assets/images/l2.png'; +import iconLabel3 from 'assets/images/l3.png'; +import iconLabel4 from 'assets/images/l4.png'; // Cleanup HTML from style tags // so it won't affect other parts of the UI @@ -41,11 +46,11 @@ export default function GigDetails(props) { return (
{ - job.error ? ( + job.error || job.enable_job_application_form !== 1 ? (

Gig does not exist.

- VIEW OTHER JOBS + VIEW OTHER GIGS
) : ( @@ -90,8 +95,8 @@ export default function GigDetails(props) {
-

Required Tech Skills

-

{skills}

+

Skills

+

skills-icon {skills}

Description

{ReactHtmlParser(job.job_description_text, ReactHtmlParserOptions)}

@@ -126,12 +131,25 @@ export default function GigDetails(props) {

Thank you for checking out our latest gig at Topcoder. Gig work through us is simple and effective for those that would like traditional freelance work. To learn more about how Gigs work with us, go here.

At Topcoder, we pride ourselves in bringing our customers the very best candidates to help fill their needs. Want to improve your chances? You can do a few things:

    -
  • Check out our Topcoder challenges and participate. Challenges showing your technology skills make you a “qualified” candidate so we know you’re good. The proof is in the pudding!
    • -
  • Make sure your Topcoder profile says it all. Fill out your profile to the best of your ability. Your skills, your location, your devices, etc, all help you improve your chances of being selected for a gig
    • -
  • Let us know you’re here! Check in on our Gig Work forum and tell us you’re looking for a gig. It’s great visibility for the Gig team
    • -
  • Subscribe to our Gig notifications email. We’ll send you a weekly update on gigs available so you don’t miss a beat. Find the button at the top of this page.
    • +
  • + label 1 +
    Make sure your Topcoder profile says it all. Fill out your profile to the best of your ability. Your skills, your location, your devices, etc, all help you improve your chances of being selected for a gig.
    +
    • +
  • + label 2 +
    Subscribe to our Gig notifications email.. We’ll send you a weekly update on gigs available so you don’t miss a beat.
    +
    • +
  • + label 3 +
    Let us know you’re here! Check in on our Gig Work forum and tell us you’re looking for a gig. It’s great visibility for the Gig team.
    +
    • +
  • + label 4 +
    Check out our Topcoder challenges and participate. Challenges showing your technology skills make you a “qualified” candidate so we know you’re good. The proof is in the pudding!
    +
+
If you have any questions or doubts, don’t hesitate to email support@topcoder.com.
diff --git a/src/shared/components/Gigs/style.scss b/src/shared/components/Gigs/style.scss index 03756963e1..840e6508a2 100644 --- a/src/shared/components/Gigs/style.scss +++ b/src/shared/components/Gigs/style.scss @@ -23,6 +23,11 @@ height: 80vh; } + .wrap .content .right .support a { + font-weight: 600; + text-decoration: none; + } + .wrap { h2 { color: #26b3c5; @@ -118,15 +123,26 @@ li { font-size: 14px; line-height: 26px; - } + strong { + font-weight: bold; + } + } /* stylelint-enable */ ul { margin-bottom: 0; + list-style: none; + padding: 0; li { margin-bottom: 15px; + display: flex; + align-items: flex-start; + + img { + margin-right: 16px; + } &:last-child { margin-bottom: 0; @@ -138,6 +154,16 @@ .gig-skills { display: flex; } + + .support { + background-color: #eaf6fd; + border-radius: 10px; + padding: 20px; + text-transform: uppercase; + font-weight: 600; + font-family: Barlow, sans-serif; + margin-top: 20px; + } } .left { @@ -159,6 +185,16 @@ margin-top: 0; } } + + .skills { + display: flex; + align-items: center; + /* stylelint-disable */ + img { + margin-right: 8px; + } + /* stylelint-enable */ + } } } } diff --git a/src/shared/containers/Gigs/RecruitCRMJobs.jsx b/src/shared/containers/Gigs/RecruitCRMJobs.jsx index eacff10bde..e9ffd09d65 100644 --- a/src/shared/containers/Gigs/RecruitCRMJobs.jsx +++ b/src/shared/containers/Gigs/RecruitCRMJobs.jsx @@ -118,10 +118,15 @@ class RecruitCRMJobsContainer extends React.Component {
{ - jobsToDisplay.map(job => ) + jobsToDisplay.length + ? jobsToDisplay.map(job => ) + : No Results }
- + { + jobsToDisplay.length + ? : null + } ); } diff --git a/src/shared/containers/Gigs/jobLisingStyles.scss b/src/shared/containers/Gigs/jobLisingStyles.scss index ef403335ee..4edc9b7c5b 100644 --- a/src/shared/containers/Gigs/jobLisingStyles.scss +++ b/src/shared/containers/Gigs/jobLisingStyles.scss @@ -16,5 +16,10 @@ display: flex; flex-direction: column; margin: 20px 0 50px 0; + + .no-results { + display: flex; + justify-content: center; + } } } diff --git a/src/shared/containers/GigsPages.jsx b/src/shared/containers/GigsPages.jsx index 65b18b48a8..f0406e7259 100644 --- a/src/shared/containers/GigsPages.jsx +++ b/src/shared/containers/GigsPages.jsx @@ -6,7 +6,7 @@ import PT from 'prop-types'; import Header from 'containers/TopcoderHeader'; import Footer from 'components/TopcoderFooter'; import Viewport from 'components/Contentful/Viewport'; -import { config } from 'topcoder-react-utils'; +import { config, MetaTags } from 'topcoder-react-utils'; import RecruitCRMJobDetails from 'containers/Gigs/RecruitCRMJobDetails'; @@ -15,6 +15,7 @@ export default function GigsPagesContainer(props) { const { id } = match.params; return (
+
{ id ? (