Skip to content

Commit 5920e25

Browse files
authored
Merge pull request #44 from topcoder-platform/develop
Merge latest listings v3 api code and group filtering
2 parents 2519f3a + fee6c97 commit 5920e25

File tree

125 files changed

+1590
-1854
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

125 files changed

+1590
-1854
lines changed

__tests__/shared/components/examples/__snapshots__/Content.jsx.snap

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -116,6 +116,15 @@ exports[`Matches shallow shapshot 1`] = `
116116
</code>
117117
. The link here leads to the test challenge.
118118
</li>
119+
<li>
120+
<Link
121+
replace={false}
122+
to="/challenges"
123+
>
124+
Main Website Challenge Listing Page
125+
</Link>
126+
– Ported Challenge Listing for the main website.
127+
</li>
119128
<li>
120129
<Link
121130
replace={false}

__tests__/shared/components/tc-communities/AccordionItem.jsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ describe('Click on title', () => {
5252

5353
test('onTitleClick', () => {
5454
const btn = TU.findAllInRenderedTree(page, item =>
55-
item && item.className && item.className.match(/__title___/));
55+
item && item.className && item.className.match(/accordion-title-button/));
5656
expect(btn.length).toBe(1);
5757
TU.Simulate.click(btn[0]);
5858
expect(mockOnTitleClick).toHaveBeenCalled();

package.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
"autoprefixer": "^7.1.0",
3737
"babel-loader": "^6.4.0",
3838
"babel-plugin-css-modules-transform": "^1.2.7",
39-
"babel-plugin-inline-react-svg": "^0.3.1",
39+
"babel-plugin-inline-react-svg": "^0.4.0",
4040
"babel-plugin-module-alias": "^1.6.0",
4141
"babel-plugin-module-resolver": "^2.5.0",
4242
"babel-plugin-react-css-modules": "^2.6.0",
@@ -75,6 +75,7 @@
7575
"postcss-loader": "^1.3.3",
7676
"postcss-scss": "^0.4.1",
7777
"prop-types": "^15.5.8",
78+
"qs": "^6.4.0",
7879
"rc-tooltip": "^3.4.3",
7980
"react": "^15.4.2",
8081
"react-css-themr": "^2.1.2",

src/server/tc-communities/wipro2/metadata.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,8 @@
22
"authorizedGroupIds": [
33
"20000000"
44
],
5-
"challengeFilterTag": "Bootstrap",
5+
"challengeGroupId": "20000000",
6+
"challengeFilterTag": "",
67
"communityId": "wipro2",
78
"logos": [
89
"https://upload.wikimedia.org/wikipedia/commons/thumb/0/0e/Wipro_Logo_RGB.png/480px-Wipro_Logo_RGB.png",

src/shared/components/ChallengeCard/ChallengeCardExamples.jsx

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

src/shared/components/ChallengeCard/ChallengeCardExamples.scss

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

src/shared/components/ChallengeCard/Tooltips/PrizesTooltip/index.js

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

src/shared/components/ChallengeCard/Tooltips/ProgressBarTooltip/index.js

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

src/shared/components/ChallengeCard/Tooltips/Tooltip/Tooltip.jsx

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

0 commit comments

Comments
 (0)