Skip to content

Commit 458de1b

Browse files
nursoltan-snursoltan-s
committed
recommender final fixes
1 parent 0d25612 commit 458de1b

File tree

10 files changed

+79
-85
lines changed

10 files changed

+79
-85
lines changed

‎package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,7 @@
143143
"supertest": "^3.1.0",
144144
"tc-core-library-js": "github:appirio-tech/tc-core-library-js#v2.6.3",
145145
"tc-ui": "^1.0.12",
146-
"topcoder-react-lib": "1000.27.5",
146+
"topcoder-react-lib": "1.1.6",
147147
"topcoder-react-ui-kit": "2.0.1",
148148
"topcoder-react-utils": "0.7.8",
149149
"turndown": "^4.0.2",

‎src/shared/components/challenge-listing/Filters/ChallengeSearchBar/style.scss

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,9 @@ $challenge-radius-1: $corner-radius / 2;
99
$challenge-radius-4: $corner-radius * 2;
1010

1111
.container {
12-
padding: 0 3px;
12+
background: $tc-gray-neutral-light;
13+
border-bottom: 1px solid $tc-gray-30;
14+
padding: 0 $base-unit * 3;
1315

1416
@media (max-width: #{$screen-lg - 1px}) {
1517
padding: 0 $base-unit * 2;
@@ -19,8 +21,8 @@ $challenge-radius-4: $corner-radius * 2;
1921
.ChallengeSearchBar {
2022
display: block;
2123
position: relative;
22-
top: 20px;
23-
height: 35px;
24+
top: 10px;
25+
height: 60px;
2426

2527
.input-container {
2628
font-size: 12px;

‎src/shared/components/challenge-listing/Filters/FiltersPanel/index.jsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -555,7 +555,7 @@ export default function FiltersPanel({
555555
) : null
556556
}
557557

558-
{ !isReviewOpportunitiesBucket
558+
{ !isReviewOpportunitiesBucket && !recommendedToggle
559559
&& (
560560
<div styleName="filter-row">
561561
<div styleName="filter filter community">

‎src/shared/components/challenge-listing/Listing/Bucket/index.jsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import PT from 'prop-types';
99
// import qs from 'qs';
1010
import React, { useRef } from 'react';
1111
// import { config } from 'topcoder-react-utils';
12-
import Sort from 'utils/challenge-listing/sort';
12+
import Sort, { SORTS } from 'utils/challenge-listing/sort';
1313
import {
1414
NO_LIVE_CHALLENGES_CONFIG, BUCKETS, BUCKET_DATA, isRecommendedChallengeType,
1515
} from 'utils/challenge-listing/buckets';
@@ -54,7 +54,7 @@ export default function Bucket({
5454
setSearchText,
5555
}) {
5656
const activeBucketData = isRecommendedChallengeType(bucket, filterState)
57-
? BUCKET_DATA[bucket].sorts : BUCKET_DATA[bucket].sorts.filter(item => item !== 'bestMatch');
57+
? [SORTS.BEST_MATCH] : BUCKET_DATA[bucket].sorts.filter(item => item !== 'bestMatch');
5858

5959
const refs = useRef([]);
6060
refs.current = [];

‎src/shared/components/challenge-listing/Listing/index.jsx

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -224,7 +224,6 @@ function Listing({
224224
// </div>
225225
// );
226226
// }
227-
228227
const loading = loadingMyChallenges
229228
|| loadingMyPastChallenges
230229
|| loadingOpenForRegistrationChallenges

‎src/shared/components/challenge-listing/Listing/style.scss

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,12 @@
22

33
.challengeCardContainer {
44
border-radius: $corner-radius;
5-
width: 100%;
6-
padding: 12px $base-unit 0 $base-unit;
5+
width: 70%;
6+
padding: 0 $base-unit;
77

88
@include xs-to-md {
99
width: 100%;
10-
padding: 12px $base-unit + 5 0 $base-unit + 5;
10+
padding: 0 $base-unit + 5;
1111
}
1212

1313
.category-challenges-container {

‎src/shared/components/challenge-listing/NoChallengeCard/style.scss

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
@import '~styles/mixins';
22

33
.container {
4+
width: 70%;
5+
height: 150px;
46
background-color: #fff;
57
border-radius: 4px;
68
display: flex;

‎src/shared/components/challenge-listing/index.jsx

Lines changed: 65 additions & 61 deletions
Original file line numberDiff line numberDiff line change
@@ -99,74 +99,74 @@ export default function ChallengeListing(props) {
9999
// );
100100
// } else {
101101
const challengeCardContainer = (
102-
<div styleName="card-container">
103-
{
104-
filterState.recommended
105-
&& !loadingOpenForRegistrationChallenges
106-
&& activeBucket === 'openForRegistration'
107-
&& !openForRegistrationChallenges.length && (
108-
<NoChallengeCard />
109-
)
110-
}
111-
<ChallengeSearchBar
112-
setFilterState={props.setFilterState}
113-
/>
114-
<Listing
115-
activeBucket={activeBucket}
116-
auth={props.auth}
117-
challenges={challenges}
118-
openForRegistrationChallenges={openForRegistrationChallenges}
119-
myChallenges={myChallenges}
120-
myPastChallenges={myPastChallenges}
121-
allChallenges={allChallenges}
122-
pastChallenges={pastChallenges}
123-
challengesUrl={props.challengesUrl}
124-
communityName={props.communityName}
125-
expandedTags={props.expandedTags}
126-
expandTag={props.expandTag}
127-
// extraBucket={extraBucket}
128-
filterState={props.filterState}
129-
keepPastPlaceholders={keepPastPlaceholders}
130-
loadingPastChallenges={props.loadingPastChallenges}
131-
loadingMyChallenges={props.loadingMyChallenges}
132-
loadingMyPastChallenges={props.loadingMyPastChallenges}
133-
loadingAllChallenges={props.loadingAllChallenges}
134-
loadingOpenForRegistrationChallenges={props.loadingOpenForRegistrationChallenges}
135-
loadingOnGoingChallenges={props.loadingOnGoingChallenges}
136-
loadingReviewOpportunities={props.loadingReviewOpportunities}
137-
loadMoreMy={props.loadMoreMy}
138-
loadMoreMyPast={props.loadMoreMyPast}
139-
loadMoreAll={props.loadMoreAll}
140-
loadMoreOpenForRegistration={props.loadMoreOpenForRegistration}
141-
loadMoreOnGoing={props.loadMoreOnGoing}
142-
loadMorePast={props.loadMorePast}
143-
loadMoreReviewOpportunities={props.loadMoreReviewOpportunities}
144-
newChallengeDetails={props.newChallengeDetails}
145-
openChallengesInNewTabs={props.openChallengesInNewTabs}
146-
preListingMsg={preListingMsg}
147-
prizeMode={props.prizeMode}
148-
reviewOpportunities={props.reviewOpportunities}
149-
selectBucket={props.selectBucket}
150-
selectChallengeDetailsTab={props.selectChallengeDetailsTab}
151-
selectedCommunityId={props.selectedCommunityId}
152-
setFilterState={props.setFilterState}
153-
setSort={props.setSort}
154-
sorts={props.sorts}
155-
loadMoreActive={props.loadMoreActive}
156-
expanding={expanding}
102+
<Listing
103+
activeBucket={activeBucket}
104+
auth={props.auth}
105+
challenges={challenges}
106+
openForRegistrationChallenges={openForRegistrationChallenges}
107+
myChallenges={myChallenges}
108+
myPastChallenges={myPastChallenges}
109+
allChallenges={allChallenges}
110+
pastChallenges={pastChallenges}
111+
challengesUrl={props.challengesUrl}
112+
communityName={props.communityName}
113+
expandedTags={props.expandedTags}
114+
expandTag={props.expandTag}
115+
// extraBucket={extraBucket}
116+
filterState={props.filterState}
117+
keepPastPlaceholders={keepPastPlaceholders}
118+
loadingPastChallenges={props.loadingPastChallenges}
119+
loadingMyChallenges={props.loadingMyChallenges}
120+
loadingMyPastChallenges={props.loadingMyPastChallenges}
121+
loadingAllChallenges={props.loadingAllChallenges}
122+
loadingOpenForRegistrationChallenges={props.loadingOpenForRegistrationChallenges}
123+
loadingOnGoingChallenges={props.loadingOnGoingChallenges}
124+
loadingReviewOpportunities={props.loadingReviewOpportunities}
125+
loadMoreMy={props.loadMoreMy}
126+
loadMoreMyPast={props.loadMoreMyPast}
127+
loadMoreAll={props.loadMoreAll}
128+
loadMoreOpenForRegistration={props.loadMoreOpenForRegistration}
129+
loadMoreOnGoing={props.loadMoreOnGoing}
130+
loadMorePast={props.loadMorePast}
131+
loadMoreReviewOpportunities={props.loadMoreReviewOpportunities}
132+
newChallengeDetails={props.newChallengeDetails}
133+
openChallengesInNewTabs={props.openChallengesInNewTabs}
134+
preListingMsg={preListingMsg}
135+
prizeMode={props.prizeMode}
136+
reviewOpportunities={props.reviewOpportunities}
137+
selectBucket={props.selectBucket}
138+
selectChallengeDetailsTab={props.selectChallengeDetailsTab}
139+
selectedCommunityId={props.selectedCommunityId}
140+
setFilterState={props.setFilterState}
141+
setSort={props.setSort}
142+
sorts={props.sorts}
143+
loadMoreActive={props.loadMoreActive}
144+
expanding={expanding}
157145
// loadingActiveChallenges={props.loadingChallenges}
158146
// userChallenges={props.userChallenges}
159-
isLoggedIn={isLoggedIn}
160-
setSearchText={setSearchText}
161-
/>
162-
</div>
147+
isLoggedIn={isLoggedIn}
148+
setSearchText={setSearchText}
149+
/>
163150
);
164-
// }
165151

166152
const desktop = useMediaQuery({ minWidth: 1024 });
153+
const isRecommendedOn = filterState.recommended
154+
&& !loadingOpenForRegistrationChallenges
155+
&& activeBucket === 'openForRegistration'
156+
&& !openForRegistrationChallenges.length;
167157

168158
return (
169159
<div styleName="ChallengeFiltersExample" id="challengeFilterContainer">
160+
{
161+
filterState.recommended
162+
? null
163+
: (
164+
<ChallengeSearchBar
165+
setFilterState={props.setFilterState}
166+
/>
167+
)
168+
}
169+
170170
<div styleName="tc-content-wrapper">
171171
<div styleName={desktop ? 'sidebar-container-desktop' : 'sidebar-container-mobile'}>
172172
<Sidebar
@@ -183,7 +183,11 @@ export default function ChallengeListing(props) {
183183
/>
184184
</div>
185185

186-
{challengeCardContainer}
186+
{
187+
isRecommendedOn
188+
? <NoChallengeCard />
189+
: challengeCardContainer
190+
}
187191

188192
</div>
189193
</div>

‎src/shared/components/challenge-listing/style.scss

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -98,15 +98,6 @@ $challenge-radius-4: $corner-radius * 2;
9898
}
9999
}
100100

101-
.card-container {
102-
width: 70%;
103-
104-
@include xs-to-md {
105-
width: 100%;
106-
padding-top: 0;
107-
}
108-
}
109-
110101
.recommended-plus-tag {
111102
margin-left: 3px;
112103
display: inline-block;

‎src/styles/awesome.css

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -65,10 +65,6 @@
6565
content: "\f110";
6666
}
6767

68-
.fa-info-cirle::before {
69-
content: "\0024D8";
70-
}
71-
7268
@keyframes fa-spin {
7369
0% {
7470
-webkit-transform: rotate(0deg);

0 commit comments

Comments
 (0)