Skip to content

Commit b168f63

Browse files
committed
Revert "Merge pull request #458 from topcoder-platform/tony-faq-updates"
This reverts commit 928fae7, reversing changes made to a861093.
1 parent a801121 commit b168f63

File tree

12 files changed

+74
-31
lines changed

12 files changed

+74
-31
lines changed

__tests__/shared/components/Dashboard/MyChallenges/__snapshots__/ChallengeLinks.jsx.snap

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,9 @@ exports[`Matches shallow shapshot 2`] = `
4747
<div
4848
className="src-shared-components-Dashboard-MyChallenges-ChallengeLinks-___style__icon___3IZGz src-shared-components-Dashboard-MyChallenges-ChallengeLinks-___style__registrants-icon___tm0l6"
4949
/>
50-
<p />
50+
<p>
51+
0
52+
</p>
5153
</a>
5254
<a
5355
className="src-shared-components-Dashboard-MyChallenges-ChallengeLinks-___style__submissions___3TDly"

__tests__/shared/components/Dashboard/MyChallenges/__snapshots__/ChallengeTile.jsx.snap

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -633,7 +633,9 @@ exports[`Matches shallow shapshot 7`] = `
633633
<span>
634634
Role:
635635
</span>
636-
<span />
636+
<span>
637+
638+
</span>
637639
</p>
638640
</div>
639641
</div>
@@ -669,7 +671,9 @@ exports[`Matches shallow shapshot 8`] = `
669671
<span>
670672
Role:
671673
</span>
672-
<span />
674+
<span>
675+
676+
</span>
673677
</p>
674678
</header>
675679
<div

__tests__/shared/components/Dashboard/Program/__snapshots__/IosCard.jsx.snap

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,9 @@ exports[`Matches shallow shapshot 1`] = `
1919
</a>
2020
<p
2121
className="src-shared-components-Dashboard-Program-___IosCard__subtrack-color___2axPS"
22-
/>
22+
>
23+
24+
</p>
2325
</div>
2426
<div
2527
className="src-shared-components-Dashboard-Program-___IosCard__challenge-links___2nxNN"
@@ -101,7 +103,9 @@ exports[`Matches shallow shapshot 2`] = `
101103
</a>
102104
<p
103105
className="src-shared-components-Dashboard-Program-___IosCard__subtrack-color___2axPS"
104-
/>
106+
>
107+
108+
</p>
105109
</div>
106110
<div
107111
className="src-shared-components-Dashboard-Program-___IosCard__challenge-links___2nxNN"
@@ -195,7 +199,9 @@ exports[`Matches shallow shapshot 3`] = `
195199
</a>
196200
<p
197201
className="src-shared-components-Dashboard-Program-___IosCard__subtrack-color___2axPS"
198-
/>
202+
>
203+
204+
</p>
199205
</div>
200206
<div
201207
className="src-shared-components-Dashboard-Program-___IosCard__challenge-links___2nxNN"

__tests__/shared/components/Dashboard/SRM/__snapshots__/SRMTile.jsx.snap

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ exports[`Matches shallow shapshot 1`] = `
2222
Starts in
2323
<span>
2424
1d
25-
1d
25+
1d
2626
</span>
2727
</p>
2828
<div
@@ -85,7 +85,7 @@ exports[`Matches shallow shapshot 2`] = `
8585
Starts in
8686
<span>
8787
1d
88-
1d
88+
1d
8989
</span>
9090
</p>
9191
<div

__tests__/shared/components/Dashboard/__snapshots__/SubtrackStats.jsx.snap

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,9 @@ exports[`Matches shallow shapshot 1`] = `
2323
<p
2424
className="src-shared-components-Dashboard-SubtrackStats-___styles__subtrack___2TXRB"
2525
title=""
26-
/>
26+
>
27+
28+
</p>
2729
<p
2830
className="src-shared-components-Dashboard-SubtrackStats-___styles__rating___9uUVx"
2931
style={
@@ -54,7 +56,9 @@ exports[`Matches shallow shapshot 1`] = `
5456
<p
5557
className="src-shared-components-Dashboard-SubtrackStats-___styles__subtrack___2TXRB"
5658
title=""
57-
/>
59+
>
60+
61+
</p>
5862
<p
5963
className="src-shared-components-Dashboard-SubtrackStats-___styles__rating___9uUVx"
6064
style={
@@ -97,7 +101,9 @@ exports[`Matches shallow shapshot 1`] = `
97101
<p
98102
className="src-shared-components-Dashboard-SubtrackStats-___styles__subtrack___2TXRB"
99103
title=""
100-
/>
104+
>
105+
106+
</p>
101107
<p
102108
className="src-shared-components-Dashboard-SubtrackStats-___styles__rating___9uUVx"
103109
style={
@@ -128,7 +134,9 @@ exports[`Matches shallow shapshot 1`] = `
128134
<p
129135
className="src-shared-components-Dashboard-SubtrackStats-___styles__subtrack___2TXRB"
130136
title=""
131-
/>
137+
>
138+
139+
</p>
132140
<p
133141
className="src-shared-components-Dashboard-SubtrackStats-___styles__rating___9uUVx"
134142
style={

__tests__/shared/components/Leaderboard/__snapshots__/LeaderboardTable.jsx.snap

Lines changed: 24 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -80,10 +80,14 @@ exports[`Matches shallow shapshot 1`] = `
8080
</td>
8181
<td
8282
className="src-shared-components-Leaderboard-LeaderboardTable-___styles__col-challenges___29htm"
83-
/>
83+
>
84+
0
85+
</td>
8486
<td
8587
className="src-shared-components-Leaderboard-LeaderboardTable-___styles__col-points___10Lis"
86-
/>
88+
>
89+
0
90+
</td>
8791
</tr>
8892
<tr>
8993
<td
@@ -133,10 +137,14 @@ exports[`Matches shallow shapshot 1`] = `
133137
</td>
134138
<td
135139
className="src-shared-components-Leaderboard-LeaderboardTable-___styles__col-challenges___29htm"
136-
/>
140+
>
141+
0
142+
</td>
137143
<td
138144
className="src-shared-components-Leaderboard-LeaderboardTable-___styles__col-points___10Lis"
139-
/>
145+
>
146+
0
147+
</td>
140148
</tr>
141149
<tr>
142150
<td
@@ -186,10 +194,14 @@ exports[`Matches shallow shapshot 1`] = `
186194
</td>
187195
<td
188196
className="src-shared-components-Leaderboard-LeaderboardTable-___styles__col-challenges___29htm"
189-
/>
197+
>
198+
0
199+
</td>
190200
<td
191201
className="src-shared-components-Leaderboard-LeaderboardTable-___styles__col-points___10Lis"
192-
/>
202+
>
203+
0
204+
</td>
193205
</tr>
194206
<tr>
195207
<td
@@ -239,10 +251,14 @@ exports[`Matches shallow shapshot 1`] = `
239251
</td>
240252
<td
241253
className="src-shared-components-Leaderboard-LeaderboardTable-___styles__col-challenges___29htm"
242-
/>
254+
>
255+
0
256+
</td>
243257
<td
244258
className="src-shared-components-Leaderboard-LeaderboardTable-___styles__col-points___10Lis"
245-
/>
259+
>
260+
0
261+
</td>
246262
</tr>
247263
</tbody>
248264
</table>

__tests__/shared/components/SubmissionManagement/__snapshots__/ScreeningDetails.jsx.snap

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,9 @@ exports[`Snapshot match 1`] = `
99
>
1010
<p
1111
className="src-shared-components-SubmissionManagement-ScreeningDetails-___styles__status-title___3HTbG"
12-
/>
12+
>
13+
14+
</p>
1315
</div>
1416
<p>
1517
Your submission has been received, and will be evaluated during Review phase.

__tests__/shared/components/SubmissionManagement/__snapshots__/ScreeningStatus.jsx.snap

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,9 @@ exports[`Snapshot match 6`] = `
105105
>
106106
<span
107107
className="src-shared-components-SubmissionManagement-ScreeningStatus-___styles__status___1CCjJ"
108-
/>
108+
>
109+
110+
</span>
109111
<span
110112
className="src-shared-components-SubmissionManagement-ScreeningStatus-___styles__warning___6tSHD"
111113
>

__tests__/shared/components/__snapshots__/Select.jsx.snap

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@ exports[`Matches shallow shapshot 1`] = `
3232
noResultsText="No results found"
3333
onBlurResetsInput={true}
3434
onCloseResetsInput={true}
35+
openAfterFocus={false}
3536
optionComponent={[Function]}
3637
pageSize={5}
3738
placeholder="Select..."

__tests__/shared/components/challenge-listing/Filters/__snapshots__/DateRangePicker.jsx.snap

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ exports[`Matches shallow shapshot 1`] = `
1818
hideKeyboardShortcutsPanel={false}
1919
horizontalMargin={0}
2020
initialVisibleMonth={null}
21+
inputIconPosition="before"
2122
isDayBlocked={[Function]}
2223
isDayHighlighted={[Function]}
2324
isOutsideRange={[Function]}
@@ -33,6 +34,7 @@ exports[`Matches shallow shapshot 1`] = `
3334
onFocusChange={[Function]}
3435
onNextMonthClick={[Function]}
3536
onPrevMonthClick={[Function]}
37+
openDirection="down"
3638
orientation="horizontal"
3739
phrases={
3840
Object {
@@ -49,7 +51,7 @@ exports[`Matches shallow shapshot 1`] = `
4951
"jumpToNextMonth": "Move forward to switch to the next month",
5052
"jumpToPrevMonth": "Move backward to switch to the previous month",
5153
"keyboardNavigationInstructions": "Press the down arrow key to interact with the calendar and
52-
select a date. Press the question mark key to get the keyboard shortcuts for changing dates.",
54+
select a date. Press the question mark key to get the keyboard shortcuts for changing dates.",
5355
"keyboardShortcuts": "Keyboard Shortcuts",
5456
"leftArrowRightArrow": "Right and left arrow keys",
5557
"moveFocusByOneDay": "Move backward (left) and forward (right) by one day",
@@ -77,6 +79,7 @@ exports[`Matches shallow shapshot 1`] = `
7779
startDate={null}
7880
startDateId="startDate"
7981
startDatePlaceholderText="Start Date"
82+
weekDayFormat="dd"
8083
withFullScreenPortal={false}
8184
withPortal={false}
8285
/>

src/shared/components/tc-communities/JoinCommunity/ConfirmModal/index.jsx

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,9 @@ export default function ConfirmModal({
2727
<Modal onCancel={resetJoinButton}>
2828
<div styleName="confirmMsg">
2929
{ userId ? null : (
30-
<p>You must be a Topcoder member before you can join the {communityName} community.</p>
30+
<p>To join you must login / register into Topcoder platform!</p>
3131
)}
32-
To join, login if you are already a member. If not, register first to join the {communityName} community.
32+
Are you sure you want to join {communityName}?
3333
</div>
3434
<div styleName="buttons">
3535
{ userId ? (
@@ -53,7 +53,7 @@ export default function ConfirmModal({
5353
window.location = `${config.URL.AUTH}/member?retUrl=${url}`;
5454
}}
5555
styleName="btnConfirmLong"
56-
>Login</button>
56+
>Log In & Join</button>
5757
<button
5858
onClick={() => {
5959
const url = `${
@@ -62,7 +62,7 @@ export default function ConfirmModal({
6262
window.location = `${config.URL.AUTH}/member/registration?retUrl=${url}`;
6363
}}
6464
styleName="btnConfirmLong"
65-
>Register</button>
65+
>Register & Join</button>
6666
<button
6767
onClick={resetJoinButton}
6868
styleName="btnCancelLong"

src/shared/components/tc-communities/communities/blockchain/Home/index.jsx

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -37,10 +37,10 @@ export default function Home(props) {
3737
imageSrc="/themes/blockchain/community-hero.jpg"
3838
/>
3939

40-
<JoinCommunity />
41-
4240
<CommunityStats />
4341

42+
<JoinCommunity />
43+
4444
<Section
4545
theme={{
4646
container: style.linksContainer,
@@ -104,13 +104,12 @@ export default function Home(props) {
104104

105105
<NewsSection news={props.news} />
106106

107-
/**
108107
<NewsletterSignup
109108
title="Sign up for Topcoder Product Development Updates"
110109
text="Don’t miss out opportunities to work on the Topcoder Platform!"
111110
imageSrc="/themes/wipro/subscribe-bg.jpg"
112111
/>
113-
*/
112+
114113
</main>
115114
);
116115
}

0 commit comments

Comments
 (0)