Skip to content

Misc enhancements #81

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 6 commits into from
Jun 22, 2017
Merged

Misc enhancements #81

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
214a20b
Misc fixes related to challenge listing
birdofpreyru Jun 16, 2017
3b70c61
Challenge listing: Optimization of challenge loading
birdofpreyru Jun 16, 2017
0859cdc
Fix: Server-side rendering of images
birdofpreyru Jun 21, 2017
4c0f340
Update of the Leaderboard to match the new format of API response
birdofpreyru Jun 21, 2017
2f58b52
modified route for my submissions page
ajefts Jun 22, 2017
090e004
config leaderboard for tc-prod-dev
ajefts Jun 22, 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
2 changes: 1 addition & 1 deletion .babelrc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
}],
["transform-assets", {
"extensions": ["gif", "jpeg", "jpg", "png"],
"name": "[hash].[ext]"
"name": "/images/[hash].[ext]"
}]
]
}
72 changes: 20 additions & 52 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 @@ -53,41 +53,33 @@ exports[`Matches shallow shapshot 1`] = `
"avatar": "src-shared-components-Leaderboard-___avatarStyles__default___1bHTz",
}
}
url="some.fake.string"
url={null}
/>
</span>
</td>
<td
className="src-shared-components-Leaderboard-LeaderboardTable-___styles__col-handle___3Sr8G"
>
<a
href="https://www.topcoder-dev.com/members/overachieving.mofo/"
>
overachieving.mofo
</a>
href="https://www.topcoder-dev.com/members/undefined/"
/>
<div
className="src-shared-components-Leaderboard-LeaderboardTable-___styles__winnings-info___1Fiyn"
>
<span>
9999999999
points
</span>
<span>
99999
challenges
</span>
</div>
</td>
<td
className="src-shared-components-Leaderboard-LeaderboardTable-___styles__col-challenges___29htm"
>
99999
</td>
/>
<td
className="src-shared-components-Leaderboard-LeaderboardTable-___styles__col-points___10Lis"
>
9999999999
</td>
/>
</tr>
<tr>
<td
Expand All @@ -110,41 +102,33 @@ exports[`Matches shallow shapshot 1`] = `
"avatar": "src-shared-components-Leaderboard-___avatarStyles__default___1bHTz",
}
}
url="some.fake.string"
url={null}
/>
</span>
</td>
<td
className="src-shared-components-Leaderboard-LeaderboardTable-___styles__col-handle___3Sr8G"
>
<a
href="https://www.topcoder-dev.com/members/overachieving.mofo/"
>
overachieving.mofo
</a>
href="https://www.topcoder-dev.com/members/undefined/"
/>
<div
className="src-shared-components-Leaderboard-LeaderboardTable-___styles__winnings-info___1Fiyn"
>
<span>
9999999999
points
</span>
<span>
99999
challenges
</span>
</div>
</td>
<td
className="src-shared-components-Leaderboard-LeaderboardTable-___styles__col-challenges___29htm"
>
99999
</td>
/>
<td
className="src-shared-components-Leaderboard-LeaderboardTable-___styles__col-points___10Lis"
>
9999999999
</td>
/>
</tr>
<tr>
<td
Expand All @@ -167,41 +151,33 @@ exports[`Matches shallow shapshot 1`] = `
"avatar": "src-shared-components-Leaderboard-___avatarStyles__default___1bHTz",
}
}
url="some.fake.string"
url={null}
/>
</span>
</td>
<td
className="src-shared-components-Leaderboard-LeaderboardTable-___styles__col-handle___3Sr8G"
>
<a
href="https://www.topcoder-dev.com/members/overachieving.mofo/"
>
overachieving.mofo
</a>
href="https://www.topcoder-dev.com/members/undefined/"
/>
<div
className="src-shared-components-Leaderboard-LeaderboardTable-___styles__winnings-info___1Fiyn"
>
<span>
9999999999
points
</span>
<span>
99999
challenges
</span>
</div>
</td>
<td
className="src-shared-components-Leaderboard-LeaderboardTable-___styles__col-challenges___29htm"
>
99999
</td>
/>
<td
className="src-shared-components-Leaderboard-LeaderboardTable-___styles__col-points___10Lis"
>
9999999999
</td>
/>
</tr>
<tr>
<td
Expand All @@ -224,41 +200,33 @@ exports[`Matches shallow shapshot 1`] = `
"avatar": "src-shared-components-Leaderboard-___avatarStyles__default___1bHTz",
}
}
url="some.fake.string"
url={null}
/>
</span>
</td>
<td
className="src-shared-components-Leaderboard-LeaderboardTable-___styles__col-handle___3Sr8G"
>
<a
href="https://www.topcoder-dev.com/members/overachieving.mofo/"
>
overachieving.mofo
</a>
href="https://www.topcoder-dev.com/members/undefined/"
/>
<div
className="src-shared-components-Leaderboard-LeaderboardTable-___styles__winnings-info___1Fiyn"
>
<span>
9999999999
points
</span>
<span>
99999
challenges
</span>
</div>
</td>
<td
className="src-shared-components-Leaderboard-LeaderboardTable-___styles__col-challenges___29htm"
>
99999
</td>
/>
<td
className="src-shared-components-Leaderboard-LeaderboardTable-___styles__col-points___10Lis"
>
9999999999
</td>
/>
</tr>
</tbody>
</table>
Expand Down
10 changes: 3 additions & 7 deletions __tests__/shared/components/Leaderboard/__snapshots__/PodiumSpot.jsx.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ exports[`Matches shallow shapshot 1`] = `
"avatar": "src-shared-components-Leaderboard-___avatarStyles__gold___1KUGN",
}
}
url="some.fake.string"
url={null}
/>
</span>
<div
Expand All @@ -27,20 +27,16 @@ exports[`Matches shallow shapshot 1`] = `
<div>
<a
className="src-shared-components-Leaderboard-PodiumSpot-___styles__profile-link___n7nJB"
href="https://www.topcoder-dev.com/members/overachieving.mofo/"
>
overachieving.mofo
</a>
href="https://www.topcoder-dev.com/members/undefined/"
/>
</div>
<div
className="src-shared-components-Leaderboard-PodiumSpot-___styles__winnings-info___2_pZP"
>
<span>
9999999999
points
</span>
<span>
99999
challenges
</span>
</div>
Expand Down
15 changes: 9 additions & 6 deletions __tests__/shared/components/TopcoderHeader/__snapshots__/index.jsx.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ exports[`Default render 1`] = `
href="https://www.topcoder-dev.com"
>
<LogoTopcoderWithName
height={54}
width={156}
height={53}
width={135}
/>
</a>
<ul
Expand Down Expand Up @@ -71,6 +71,7 @@ exports[`Default render 1`] = `
</div>
<SubMenu
closeMenu={[Function]}
currentSubMenuTitle=""
menu={null}
trigger={null}
/>
Expand Down Expand Up @@ -194,8 +195,8 @@ exports[`Render with open menu 1`] = `
href="https://www.topcoder-dev.com"
>
<LogoTopcoderWithName
height={54}
width={156}
height={53}
width={135}
/>
</a>
<ul
Expand Down Expand Up @@ -253,6 +254,7 @@ exports[`Render with open menu 1`] = `
</div>
<SubMenu
closeMenu={[Function]}
currentSubMenuTitle=""
menu={
Object {
"items": Array [
Expand Down Expand Up @@ -387,8 +389,8 @@ exports[`Render with specified profile 1`] = `
href="https://www.topcoder-dev.com"
>
<LogoTopcoderWithName
height={54}
width={156}
height={53}
width={135}
/>
</a>
<ul
Expand Down Expand Up @@ -459,6 +461,7 @@ exports[`Render with specified profile 1`] = `
</div>
<SubMenu
closeMenu={[Function]}
currentSubMenuTitle=""
menu={null}
trigger={null}
/>
Expand Down
4 changes: 4 additions & 0 deletions __tests__/shared/components/TopcoderHeader/index.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ test('Default render', () => {
closeMenu={_.noop}
closeMobileMenu={_.noop}
closeSearch={_.noop}
currentNav={{}}
openMenu={_.noop}
openMobileMenu={_.noop}
openSearch={_.noop}
Expand All @@ -46,6 +47,7 @@ test('Render with open menu', () => {
closeMenu={_.noop}
closeMobileMenu={_.noop}
closeSearch={_.noop}
currentNav={{}}
openMenu={_.noop}
openedMenu={{
title: 'Menu Title',
Expand All @@ -68,6 +70,7 @@ test('Render with specified profile', () => {
closeMenu={_.noop}
closeMobileMenu={_.noop}
closeSearch={_.noop}
currentNav={{}}
openMenu={_.noop}
openMobileMenu={_.noop}
openSearch={_.noop}
Expand All @@ -91,6 +94,7 @@ describe('User input handling', () => {
closeMenu={mockCloseMenu}
closeMobileMenu={_.noop}
closeSearch={mockCloseSearch}
currentNav={{}}
openMenu={mockOpenMenu}
openMobileMenu={_.noop}
openSearch={mockOpenSearch}
Expand Down
2 changes: 1 addition & 1 deletion __tests__/shared/components/__snapshots__/LoadingIndicator.jsx.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,6 @@ exports[`renders correctly 1`] = `
<img
alt="Loading..."
className="src-shared-components-LoadingIndicator-___styles__style___3RNHL"
src="2f402d440d802a10b7672b75897c47a5.gif"
src="/images/2f402d440d802a10b7672b75897c47a5.gif"
/>
`;
2 changes: 2 additions & 0 deletions __tests__/shared/components/tc-communities/__snapshots__/Header.jsx.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,6 +89,7 @@ exports[`Snapshot match 1`] = `
</header>
<SubMenu
closeMenu={undefined}
currentSubMenuTitle=""
menu={null}
trigger={null}
/>
Expand Down Expand Up @@ -233,6 +234,7 @@ exports[`Snapshot match 2`] = `
</header>
<SubMenu
closeMenu={undefined}
currentSubMenuTitle=""
menu={null}
trigger={null}
/>
Expand Down
1 change: 1 addition & 0 deletions __tests__/shared/containers/__snapshots__/TopcoderHeader.jsx.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ exports[`Matches shallow snapshot 1`] = `
openedMenu={null}
profile={Object {}}
searchOpened={false}
setCurrentNav={[Function]}
store={
Object {
"dispatch": [Function],
Expand Down
1 change: 1 addition & 0 deletions __tests__/shared/containers/tc-communities/__snapshots__/Page.jsx.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,7 @@ exports[`Matches shapshot 1`] = `
],
}
}
setCurrentNav={[Function]}
store={
Object {
"dispatch": [Function],
Expand Down
4 changes: 3 additions & 1 deletion __tests__/shared/reducers/topcoder_header.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,8 @@ function testReducer(reducer, istate) {
}

describe('Default reducer', () =>
testReducer(reducers.default, {}),
testReducer(reducers.default, {
currentNav: {},
}),
);

2 changes: 1 addition & 1 deletion config/webpack/default.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ module.exports = {
loader: 'file-loader',
options: {
outputPath: '/images/',
publicPath: '/images/../',
publicPath: '',
},
}, {
test: /\.scss$/,
Expand Down
2 changes: 1 addition & 1 deletion src/server/tc-communities/tc-prod-dev/metadata.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,5 +33,5 @@
"url": "leaderboard"
}
],
"leaderboardApiUrl": "https://api.topcoder.com/v4/looks/412/run/json/"
"leaderboardApiUrl": "https://api.topcoder.com/v4/looks/458/run/json/"
}
2 changes: 1 addition & 1 deletion src/server/tc-communities/wipro/metadata.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
"redirect": "https://ios.topcoder.com/",
"value": "3"
}],
"leaderboardApiUrl": "https://api.topcoder.com/v4/looks/0/run/json/",
"leaderboardApiUrl": "https://api.topcoder.com/v4/looks/458/run/json/",
"logos": [
"/themes/wipro/wipro-logo.png",
"/themes/wipro/logo_topcoder_with_name.svg"
Expand Down
Loading