Skip to content

Gig details fixes #5090

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Oct 13, 2020
Merged

Gig details fixes #5090

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
bac0b4c
Merge pull request #5065 from topcoder-platform/develop
mtwomey Oct 7, 2020
50094ec
Merge pull request #5084 from topcoder-platform/develop
mtwomey Oct 9, 2020
99bfb65
Fixes #5086
kkartunov Oct 9, 2020
9992bb2
ci: on test
kkartunov Oct 9, 2020
c81569d
Equal min/max salary fix
kkartunov Oct 12, 2020
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
2 changes: 1 addition & 1 deletion .circleci/config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -237,7 +237,7 @@ workflows:
filters:
branches:
only:
- develop
- gig-details-fixes
# This is alternate dev env for parallel testing
- "build-qa":
context : org-global
Expand Down
11 changes: 8 additions & 3 deletions src/shared/components/Gigs/GigDetails/index.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,8 @@ export default function GigDetails(props) {
}
let skills = getCustomField(job.custom_fields, 'Technologies Required');
if (skills !== 'n/a') skills = skills.split(',').join(', ');
const hPerW = getCustomField(job.custom_fields, 'Hours per week');
const compens = job.min_annual_salary === job.max_annual_salary ? job.max_annual_salary : `${job.min_annual_salary} - ${job.max_annual_salary}`;

return (
<div styleName="container">
Expand Down Expand Up @@ -70,7 +72,7 @@ export default function GigDetails(props) {
<IconMoney />
<div styleName="infos-data">
Compensation
<strong>${job.min_annual_salary} - ${job.max_annual_salary} / {getSalaryType(job.salary_type)}</strong>
<strong>${compens} / {getSalaryType(job.salary_type)}</strong>
</div>
</div>
<div styleName="infos-item">
Expand All @@ -84,7 +86,7 @@ export default function GigDetails(props) {
<IconHours />
<div styleName="infos-data">
Hours
<strong>{getCustomField(job.custom_fields, 'Hours per week')} hours / week</strong>
<strong>{hPerW === 'n/a' ? hPerW : `${hPerW} hours / week`}</strong>
</div>
</div>
<div styleName="infos-item">
Expand All @@ -108,7 +110,10 @@ export default function GigDetails(props) {
* Topcoder does not provide visa sponsorship nor will we work with Staffing Agencies.
</strong>
<strong>
** Topcoder and Wipro employees are not eligible for Gig work opportunities. Do not apply and send questions to <a href="mailto:support@topcoder.com">support@topcoder.com</a>.
** USA Visa Holders - Please consult an attorney before applying to any Topcoder Gig. Some visa statuses will or will not allow you to conduct freelance work with Topcoder.
</strong>
<strong>
*** Topcoder and Wipro employees are not eligible for Gig work opportunities. Do not apply and send questions to <a href="mailto:support@topcoder.com">support@topcoder.com</a>.
</strong>
</div>
<div styleName="cta-buttons">
Expand Down
1 change: 1 addition & 0 deletions src/shared/utils/gigs.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ export function getSalaryType(data) {
switch (data.id) {
case 2: return 'annual';
case 3: return 'week';
case 5: return 'hourly';
default: return 'n/a';
}
}
Expand Down