Skip to content

tweaked join content and updated tests #458

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 2 commits into from
Sep 14, 2017
Merged

tweaked join content and updated tests #458

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ba36140
Merge branch 'develop' into tony-faq-updates
ajefts Sep 14, 2017
d9bed19
tweaked join content
ajefts Sep 14, 2017
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
4 changes: 1 addition & 3 deletions __tests__/shared/components/Dashboard/MyChallenges/__snapshots__/ChallengeLinks.jsx.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,9 +47,7 @@ exports[`Matches shallow shapshot 2`] = `
<div
className="src-shared-components-Dashboard-MyChallenges-ChallengeLinks-___style__icon___3IZGz src-shared-components-Dashboard-MyChallenges-ChallengeLinks-___style__registrants-icon___tm0l6"
/>
<p>
0
</p>
<p />
</a>
<a
className="src-shared-components-Dashboard-MyChallenges-ChallengeLinks-___style__submissions___3TDly"
Expand Down
8 changes: 2 additions & 6 deletions __tests__/shared/components/Dashboard/MyChallenges/__snapshots__/ChallengeTile.jsx.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -633,9 +633,7 @@ exports[`Matches shallow shapshot 7`] = `
<span>
Role:
</span>
<span>

</span>
<span />
</p>
</div>
</div>
Expand Down Expand Up @@ -671,9 +669,7 @@ exports[`Matches shallow shapshot 8`] = `
<span>
Role:
</span>
<span>

</span>
<span />
</p>
</header>
<div
Expand Down
12 changes: 3 additions & 9 deletions __tests__/shared/components/Dashboard/Program/__snapshots__/IosCard.jsx.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,7 @@ exports[`Matches shallow shapshot 1`] = `
</a>
<p
className="src-shared-components-Dashboard-Program-___IosCard__subtrack-color___2axPS"
>

</p>
/>
</div>
<div
className="src-shared-components-Dashboard-Program-___IosCard__challenge-links___2nxNN"
Expand Down Expand Up @@ -103,9 +101,7 @@ exports[`Matches shallow shapshot 2`] = `
</a>
<p
className="src-shared-components-Dashboard-Program-___IosCard__subtrack-color___2axPS"
>

</p>
/>
</div>
<div
className="src-shared-components-Dashboard-Program-___IosCard__challenge-links___2nxNN"
Expand Down Expand Up @@ -199,9 +195,7 @@ exports[`Matches shallow shapshot 3`] = `
</a>
<p
className="src-shared-components-Dashboard-Program-___IosCard__subtrack-color___2axPS"
>

</p>
/>
</div>
<div
className="src-shared-components-Dashboard-Program-___IosCard__challenge-links___2nxNN"
Expand Down
4 changes: 2 additions & 2 deletions __tests__/shared/components/Dashboard/SRM/__snapshots__/SRMTile.jsx.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ exports[`Matches shallow shapshot 1`] = `
Starts in
<span>
1d
1d
1d
</span>
</p>
<div
Expand Down Expand Up @@ -85,7 +85,7 @@ exports[`Matches shallow shapshot 2`] = `
Starts in
<span>
1d
1d
1d
</span>
</p>
<div
Expand Down
16 changes: 4 additions & 12 deletions __tests__/shared/components/Dashboard/__snapshots__/SubtrackStats.jsx.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,7 @@ exports[`Matches shallow shapshot 1`] = `
<p
className="src-shared-components-Dashboard-SubtrackStats-___styles__subtrack___2TXRB"
title=""
>

</p>
/>
<p
className="src-shared-components-Dashboard-SubtrackStats-___styles__rating___9uUVx"
style={
Expand Down Expand Up @@ -56,9 +54,7 @@ exports[`Matches shallow shapshot 1`] = `
<p
className="src-shared-components-Dashboard-SubtrackStats-___styles__subtrack___2TXRB"
title=""
>

</p>
/>
<p
className="src-shared-components-Dashboard-SubtrackStats-___styles__rating___9uUVx"
style={
Expand Down Expand Up @@ -101,9 +97,7 @@ exports[`Matches shallow shapshot 1`] = `
<p
className="src-shared-components-Dashboard-SubtrackStats-___styles__subtrack___2TXRB"
title=""
>

</p>
/>
<p
className="src-shared-components-Dashboard-SubtrackStats-___styles__rating___9uUVx"
style={
Expand Down Expand Up @@ -134,9 +128,7 @@ exports[`Matches shallow shapshot 1`] = `
<p
className="src-shared-components-Dashboard-SubtrackStats-___styles__subtrack___2TXRB"
title=""
>

</p>
/>
<p
className="src-shared-components-Dashboard-SubtrackStats-___styles__rating___9uUVx"
style={
Expand Down
32 changes: 8 additions & 24 deletions __tests__/shared/components/Leaderboard/__snapshots__/LeaderboardTable.jsx.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,14 +80,10 @@ exports[`Matches shallow shapshot 1`] = `
</td>
<td
className="src-shared-components-Leaderboard-LeaderboardTable-___styles__col-challenges___29htm"
>
0
</td>
/>
<td
className="src-shared-components-Leaderboard-LeaderboardTable-___styles__col-points___10Lis"
>
0
</td>
/>
</tr>
<tr>
<td
Expand Down Expand Up @@ -137,14 +133,10 @@ exports[`Matches shallow shapshot 1`] = `
</td>
<td
className="src-shared-components-Leaderboard-LeaderboardTable-___styles__col-challenges___29htm"
>
0
</td>
/>
<td
className="src-shared-components-Leaderboard-LeaderboardTable-___styles__col-points___10Lis"
>
0
</td>
/>
</tr>
<tr>
<td
Expand Down Expand Up @@ -194,14 +186,10 @@ exports[`Matches shallow shapshot 1`] = `
</td>
<td
className="src-shared-components-Leaderboard-LeaderboardTable-___styles__col-challenges___29htm"
>
0
</td>
/>
<td
className="src-shared-components-Leaderboard-LeaderboardTable-___styles__col-points___10Lis"
>
0
</td>
/>
</tr>
<tr>
<td
Expand Down Expand Up @@ -251,14 +239,10 @@ exports[`Matches shallow shapshot 1`] = `
</td>
<td
className="src-shared-components-Leaderboard-LeaderboardTable-___styles__col-challenges___29htm"
>
0
</td>
/>
<td
className="src-shared-components-Leaderboard-LeaderboardTable-___styles__col-points___10Lis"
>
0
</td>
/>
</tr>
</tbody>
</table>
Expand Down
4 changes: 1 addition & 3 deletions __tests__/shared/components/SubmissionManagement/__snapshots__/ScreeningDetails.jsx.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,7 @@ exports[`Snapshot match 1`] = `
>
<p
className="src-shared-components-SubmissionManagement-ScreeningDetails-___styles__status-title___3HTbG"
>

</p>
/>
</div>
<p>
Your submission has been received, and will be evaluated during Review phase.
Expand Down
4 changes: 1 addition & 3 deletions __tests__/shared/components/SubmissionManagement/__snapshots__/ScreeningStatus.jsx.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,9 +105,7 @@ exports[`Snapshot match 6`] = `
>
<span
className="src-shared-components-SubmissionManagement-ScreeningStatus-___styles__status___1CCjJ"
>

</span>
/>
<span
className="src-shared-components-SubmissionManagement-ScreeningStatus-___styles__warning___6tSHD"
>
Expand Down
1 change: 0 additions & 1 deletion __tests__/shared/components/__snapshots__/Select.jsx.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,6 @@ exports[`Matches shallow shapshot 1`] = `
noResultsText="No results found"
onBlurResetsInput={true}
onCloseResetsInput={true}
openAfterFocus={false}
optionComponent={[Function]}
pageSize={5}
placeholder="Select..."
Expand Down
5 changes: 1 addition & 4 deletions __tests__/shared/components/challenge-listing/Filters/__snapshots__/DateRangePicker.jsx.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@ exports[`Matches shallow shapshot 1`] = `
hideKeyboardShortcutsPanel={false}
horizontalMargin={0}
initialVisibleMonth={null}
inputIconPosition="before"
isDayBlocked={[Function]}
isDayHighlighted={[Function]}
isOutsideRange={[Function]}
Expand All @@ -34,7 +33,6 @@ exports[`Matches shallow shapshot 1`] = `
onFocusChange={[Function]}
onNextMonthClick={[Function]}
onPrevMonthClick={[Function]}
openDirection="down"
orientation="horizontal"
phrases={
Object {
Expand All @@ -51,7 +49,7 @@ exports[`Matches shallow shapshot 1`] = `
"jumpToNextMonth": "Move forward to switch to the next month",
"jumpToPrevMonth": "Move backward to switch to the previous month",
"keyboardNavigationInstructions": "Press the down arrow key to interact with the calendar and
select a date. Press the question mark key to get the keyboard shortcuts for changing dates.",
select a date. Press the question mark key to get the keyboard shortcuts for changing dates.",
"keyboardShortcuts": "Keyboard Shortcuts",
"leftArrowRightArrow": "Right and left arrow keys",
"moveFocusByOneDay": "Move backward (left) and forward (right) by one day",
Expand Down Expand Up @@ -79,7 +77,6 @@ exports[`Matches shallow shapshot 1`] = `
startDate={null}
startDateId="startDate"
startDatePlaceholderText="Start Date"
weekDayFormat="dd"
withFullScreenPortal={false}
withPortal={false}
/>
Expand Down
8 changes: 4 additions & 4 deletions src/shared/components/tc-communities/JoinCommunity/ConfirmModal/index.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,9 +27,9 @@ export default function ConfirmModal({
<Modal onCancel={resetJoinButton}>
<div styleName="confirmMsg">
{ userId ? null : (
<p>To join you must login / register into Topcoder platform!</p>
<p>You must be a Topcoder member before you can join the {communityName} community.</p>
)}
Are you sure you want to join {communityName}?
To join, login if you are already a member. If not, register first to join the {communityName} community.
</div>
<div styleName="buttons">
{ userId ? (
Expand All @@ -53,7 +53,7 @@ export default function ConfirmModal({
window.location = `${config.URL.AUTH}/member?retUrl=${url}`;
}}
styleName="btnConfirmLong"
>Log In & Join</button>
>Login</button>
<button
onClick={() => {
const url = `${
Expand All @@ -62,7 +62,7 @@ export default function ConfirmModal({
window.location = `${config.URL.AUTH}/member/registration?retUrl=${url}`;
}}
styleName="btnConfirmLong"
>Register & Join</button>
>Register</button>
<button
onClick={resetJoinButton}
styleName="btnCancelLong"
Expand Down
7 changes: 4 additions & 3 deletions src/shared/components/tc-communities/communities/blockchain/Home/index.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,10 +37,10 @@ export default function Home(props) {
imageSrc="/themes/blockchain/community-hero.jpg"
/>

<CommunityStats />

<JoinCommunity />

<CommunityStats />

<Section
theme={{
container: style.linksContainer,
Expand Down Expand Up @@ -104,12 +104,13 @@ export default function Home(props) {

<NewsSection news={props.news} />

/**
<NewsletterSignup
title="Sign up for Topcoder Product Development Updates"
text="Don’t miss out opportunities to work on the Topcoder Platform!"
imageSrc="/themes/wipro/subscribe-bg.jpg"
/>

*/
</main>
);
}
Expand Down