Skip to content

Commit 16df8be

Browse files
committed
bug fixes v1
1 parent 1d5d543 commit 16df8be

File tree

9 files changed

+11
-22
lines changed

9 files changed

+11
-22
lines changed

src/assets/images/new-arrow-left.svg

Lines changed: 0 additions & 3 deletions
Loading

src/assets/images/new-arrow-right.svg

Lines changed: 0 additions & 3 deletions
Loading

src/assets/images/slider-arrow-left.svg

Lines changed: 0 additions & 3 deletions
Loading

src/assets/images/slider-arrow-right.svg

Lines changed: 0 additions & 3 deletions
Loading

src/shared/components/Dashboard/GigsFeed/index.jsx

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
import LoadingIndicator from 'components/LoadingIndicator';
66
import PT from 'prop-types';
77
import React from 'react';
8-
import { Scrollbars } from 'react-custom-scrollbars';
98
import './styles.scss';
109
import { config } from 'topcoder-react-utils';
1110

@@ -27,7 +26,7 @@ export default function GigsFeed({
2726
>View all <span>gigs</span>
2827
</a>
2928
</div>
30-
<Scrollbars styleName="gigs">
29+
<div styleName="gigs">
3130
{loading ? <div styleName="loading"><LoadingIndicator /></div>
3231
: gigs.message ? <span>{gigs.message}</span> : gigs.map(gig => (
3332
<div styleName="row" key={`dashboard-gigs-feed-${gig.externalId}`}>
@@ -39,15 +38,15 @@ export default function GigsFeed({
3938
</a>
4039
<div styleName="salary">
4140
<span styleName="amount">
42-
${`${(gig.minSalary || 0).toLocaleString()} - ${
41+
${`${(gig.minSalary || 0).toLocaleString()} - $${
4342
(gig.maxSalary || 0).toLocaleString()}`
4443
}
4544
</span>
4645
<span styleName="rateType">{formatRateType(gig.rateType)}</span>
4746
</div>
4847
</div>
4948
))}
50-
</Scrollbars>
49+
</div>
5150
</div>
5251
);
5352
}

src/shared/components/Dashboard/GigsFeed/styles.scss

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,6 @@
6666
align-items: center;
6767
justify-content: space-between;
6868
padding: 10px 0;
69-
margin: 0 14px;
7069
border-top: 1px solid $tc-gray-05;
7170

7271
a {

src/shared/components/Dashboard/TCOLeaderboards/index.jsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,12 +34,12 @@ export default class TCOLeaderboards extends React.Component {
3434
} = this.props;
3535
const { selectedIndex } = this.state;
3636
const AvatarComponent = themr('Avatar', styles)(Avatar);
37-
const options = leaderboards && _.sortBy(leaderboards
37+
const options = leaderboards && leaderboards
3838
.map((track, index) => ({
3939
value: index,
4040
label: track.selectText,
4141
selected: index === selectedIndex,
42-
})), 'label');
42+
}));
4343
const data = _.get(leaderboards, [selectedIndex]);
4444
const items = (data && !leaderboardsLoading) ? data.leaderboard
4545
.slice(0, itemCount).map((row, index) => (

src/shared/components/Dashboard/TCOLeaderboards/styles.scss

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
flex-direction: row;
1414
justify-content: space-between;
1515
align-items: center;
16-
padding: 0 8px 10px 8px;
16+
padding: 0 8px 10px 14px;
1717
}
1818

1919
.titles {
@@ -79,6 +79,7 @@
7979

8080
.Select-value {
8181
line-height: 26px;
82+
padding-right: 15px;
8283
}
8384

8485
.Select-value-label {
@@ -102,6 +103,7 @@
102103
.Select-menu {
103104
border-radius: 8px;
104105
border: none;
106+
width: auto;
105107
}
106108

107109
.Select-menu {
@@ -116,6 +118,7 @@
116118
margin: 0;
117119
padding: 0 15px;
118120
color: $tc-gray-90;
121+
white-space: nowrap;
119122

120123
&.is-focused {
121124
background-color: #229174;

src/shared/containers/Dashboard/ChallengesFeed.jsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,13 +15,13 @@ class ChallengesFeedContainer extends React.Component {
1515
getChallenges({
1616
page: 1,
1717
perPage: itemCount,
18-
types: ['CH', 'F2F', 'TSK'],
18+
types: ['CH', 'F2F', 'MM'],
1919
tracks: ['DES', 'DEV', 'DEV', 'DS', 'QA'],
2020
status: 'Active',
2121
sortBy: 'updated',
2222
sortOrder: 'desc',
2323
isLightweight: true,
24-
tPhaseName: 'Registration',
24+
currentPhaseName: 'Registration',
2525
});
2626
}
2727
}

0 commit comments

Comments
 (0)