Skip to content

Commit bd11298

Browse files
Merge pull request #6642 from topcoder-platform/develop
Release v1.18.2
2 parents a573aec + 4abebb3 commit bd11298

File tree

39 files changed

+715
-740
lines changed

39 files changed

+715
-740
lines changed

.circleci/config.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -379,6 +379,7 @@ workflows:
379379
only:
380380
- develop
381381
- old-mm-fix
382+
- reskin-profile-settings
382383
# Production builds are exectuted
383384
# when PR is merged to the master
384385
# Don't change anything in this configuration
Lines changed: 4 additions & 0 deletions
Loading

src/shared/components/MemberSearch/EndOfResults/index.jsx

Lines changed: 0 additions & 18 deletions
This file was deleted.

src/shared/components/MemberSearch/EndOfResults/style.scss

Lines changed: 0 additions & 8 deletions
This file was deleted.

src/shared/components/MemberSearch/LoadingListItem/style.scss

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,6 @@
120120
margin-top: 10px;
121121
margin-right: 5px;
122122
border-radius: 13px;
123-
background-color: $tc-gray-10;
124123

125124
&:last-child {
126125
margin-right: 0;

src/shared/components/MemberSearch/MemberItem/UserInfo/index.jsx

Lines changed: 0 additions & 67 deletions
This file was deleted.

src/shared/components/MemberSearch/MemberItem/UserInfo/style.scss

Lines changed: 0 additions & 32 deletions
This file was deleted.

src/shared/components/MemberSearch/MemberItem/UserStats/index.jsx

Lines changed: 0 additions & 57 deletions
This file was deleted.

src/shared/components/MemberSearch/MemberItem/UserStats/style.scss

Lines changed: 0 additions & 28 deletions
This file was deleted.

src/shared/components/MemberSearch/MemberItem/index.jsx

Lines changed: 0 additions & 56 deletions
This file was deleted.

src/shared/components/MemberSearch/MemberItem/style.scss

Lines changed: 0 additions & 31 deletions
This file was deleted.

src/shared/components/MemberSearch/MemberList/index.jsx

Lines changed: 0 additions & 20 deletions
This file was deleted.

src/shared/components/MemberSearch/MemberList/style.scss

Lines changed: 0 additions & 10 deletions
This file was deleted.
Lines changed: 41 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,41 @@
1+
import React from 'react';
2+
import PT from 'prop-types';
3+
import UserAvatar from '../../User/UserAvatar';
4+
import UsernameAndDetails from '../../User/UsernameAndDetails';
5+
import UserStats from '../../User/UserStats';
6+
7+
import './styles.scss';
8+
9+
const MemberSearchItem = ({ index, item }) => (
10+
<div styleName={`member-search-item ${index % 2 ? 'odd' : ''}`} key={index}>
11+
<div styleName="left-content">
12+
<UserAvatar
13+
photoURL={item.photoURL}
14+
handle={item.handle}
15+
/>
16+
<UsernameAndDetails
17+
username={item.handle}
18+
country={item.competitionCountryCode}
19+
numWins={item.wins}
20+
memberSince={item.createdAt}
21+
/>
22+
</div>
23+
24+
<div styleName="right-content">
25+
<UserStats tracks={item.tracks} skills={item.skills} />
26+
</div>
27+
28+
</div>
29+
);
30+
31+
MemberSearchItem.defaultProps = {
32+
index: 0,
33+
item: {},
34+
};
35+
36+
MemberSearchItem.propTypes = {
37+
index: PT.number,
38+
item: PT.shape(),
39+
};
40+
41+
export default MemberSearchItem;

0 commit comments

Comments
 (0)