Skip to content

Commit f624779

Browse files
sushilshindesushilshinde
committed
Merge remote-tracking branch 'origin/integration-v5-develop' into i-v5-develop-12Aug
2 parents 6fd9a02 + 747e8f6 commit f624779

File tree

64 files changed

+1289
-1271
lines changed

Some content is hidden

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

64 files changed

+1289
-1271
lines changed

‎.circleci/config.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -253,6 +253,8 @@ workflows:
253253
branches:
254254
only:
255255
- integration-v5-challenge-api
256+
- develop
257+
- feature-contentful
256258
# This is stage env for production QA releases
257259
- "build-prod-staging":
258260
context : org-global

‎.eslintrc

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,8 @@
22
"extends": "./node_modules/topcoder-react-utils/config/eslint/default.json",
33
"rules": {
44
"jsx-a11y/anchor-is-valid": false,
5-
"import/no-cycle": [2, { "maxDepth": 1 }]
5+
"import/no-cycle": [2, { "maxDepth": 1 }],
6+
"react/forbid-prop-types": false
67
},
78
"env": {
89
"browser": true

‎__tests__/shared/components/Contentful/Image/__snapshots__/Image.jsx.snap

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
exports[`Matches shallow shapshot 1`] = `
44
<div
55
id="image-1"
6+
style={Object {}}
67
>
78
<InlineSVG
89
baseURL=""

‎__tests__/shared/components/Contentful/MemberCard/__snapshots__/MemberCard.jsx.snap

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
11
// Jest Snapshot v1, https://goo.gl/fbAQLP
22

33
exports[`Matches shallow shapshot 1`] = `
4-
<a>
4+
<a
5+
style={Object {}}
6+
>
57
<div>
68
<div
79
style={

‎__tests__/shared/components/Contentful/TracksTree/__snapshots__/TracksTree.jsx.snap

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@ exports[`Matches shallow shapshot 1`] = `
44
<div
55
className="undefined "
66
>
7-
<a
8-
href="/thrive"
7+
<Link
8+
to="/thrive"
99
>
1010
THRIVE
11-
</a>
11+
</Link>
1212
</div>
1313
`;

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

Lines changed: 16 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -44,16 +44,10 @@ exports[`Matches shallow shapshot 1`] = `
4444
<span
4545
className="src-shared-components-Leaderboard-LeaderboardTable-themes-___styles__leaderboard-avatar___21pJ3"
4646
>
47-
<ThemedAvatar
48-
composeAdhocTheme="deeply"
49-
composeContextTheme="softly"
50-
mapThemrProps={[Function]}
51-
theme={
52-
Object {
53-
"avatar": "src-shared-components-Leaderboard-avatarStyles___default___1bHTzy",
54-
}
55-
}
56-
themePriority="adhoc-context-default"
47+
<DefaultAvatar
48+
data-name="Layer 1"
49+
viewBox="0 0 33 33.00137"
50+
xmlns="http://www.w3.org/2000/svg"
5751
/>
5852
</span>
5953
</td>
@@ -97,16 +91,10 @@ exports[`Matches shallow shapshot 1`] = `
9791
<span
9892
className="src-shared-components-Leaderboard-LeaderboardTable-themes-___styles__leaderboard-avatar___21pJ3"
9993
>
100-
<ThemedAvatar
101-
composeAdhocTheme="deeply"
102-
composeContextTheme="softly"
103-
mapThemrProps={[Function]}
104-
theme={
105-
Object {
106-
"avatar": "src-shared-components-Leaderboard-avatarStyles___default___1bHTzy",
107-
}
108-
}
109-
themePriority="adhoc-context-default"
94+
<DefaultAvatar
95+
data-name="Layer 1"
96+
viewBox="0 0 33 33.00137"
97+
xmlns="http://www.w3.org/2000/svg"
11098
/>
11199
</span>
112100
</td>
@@ -150,16 +138,10 @@ exports[`Matches shallow shapshot 1`] = `
150138
<span
151139
className="src-shared-components-Leaderboard-LeaderboardTable-themes-___styles__leaderboard-avatar___21pJ3"
152140
>
153-
<ThemedAvatar
154-
composeAdhocTheme="deeply"
155-
composeContextTheme="softly"
156-
mapThemrProps={[Function]}
157-
theme={
158-
Object {
159-
"avatar": "src-shared-components-Leaderboard-avatarStyles___default___1bHTzy",
160-
}
161-
}
162-
themePriority="adhoc-context-default"
141+
<DefaultAvatar
142+
data-name="Layer 1"
143+
viewBox="0 0 33 33.00137"
144+
xmlns="http://www.w3.org/2000/svg"
163145
/>
164146
</span>
165147
</td>
@@ -203,16 +185,10 @@ exports[`Matches shallow shapshot 1`] = `
203185
<span
204186
className="src-shared-components-Leaderboard-LeaderboardTable-themes-___styles__leaderboard-avatar___21pJ3"
205187
>
206-
<ThemedAvatar
207-
composeAdhocTheme="deeply"
208-
composeContextTheme="softly"
209-
mapThemrProps={[Function]}
210-
theme={
211-
Object {
212-
"avatar": "src-shared-components-Leaderboard-avatarStyles___default___1bHTzy",
213-
}
214-
}
215-
themePriority="adhoc-context-default"
188+
<DefaultAvatar
189+
data-name="Layer 1"
190+
viewBox="0 0 33 33.00137"
191+
xmlns="http://www.w3.org/2000/svg"
216192
/>
217193
</span>
218194
</td>

‎__tests__/shared/components/Leaderboard/__snapshots__/PodiumSpot.jsx.snap

Lines changed: 8 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -7,16 +7,10 @@ exports[`Matches shallow shapshot 1`] = `
77
<span
88
className="src-shared-components-Leaderboard-PodiumSpot-themes-___styles__leaderboard-avatar___JjdZ_"
99
>
10-
<ThemedAvatar
11-
composeAdhocTheme="deeply"
12-
composeContextTheme="softly"
13-
mapThemrProps={[Function]}
14-
theme={
15-
Object {
16-
"avatar": "src-shared-components-Leaderboard-avatarStyles___gold___1KUGNq",
17-
}
18-
}
19-
themePriority="adhoc-context-default"
10+
<DefaultAvatar
11+
data-name="Layer 1"
12+
viewBox="0 0 33 33.00137"
13+
xmlns="http://www.w3.org/2000/svg"
2014
/>
2115
<div
2216
className="src-shared-components-Leaderboard-PodiumSpot-themes-___styles__ranking___3eGBy"
@@ -72,16 +66,10 @@ exports[`Matches shallow shapshot 2`] = `
7266
<span
7367
className="src-shared-components-Leaderboard-PodiumSpot-themes-___styles__leaderboard-avatar___JjdZ_"
7468
>
75-
<ThemedAvatar
76-
composeAdhocTheme="deeply"
77-
composeContextTheme="softly"
78-
mapThemrProps={[Function]}
79-
theme={
80-
Object {
81-
"avatar": "src-shared-components-Leaderboard-avatarStyles___gold___1KUGNq",
82-
}
83-
}
84-
themePriority="adhoc-context-default"
69+
<DefaultAvatar
70+
data-name="Layer 1"
71+
viewBox="0 0 33 33.00137"
72+
xmlns="http://www.w3.org/2000/svg"
8573
/>
8674
<div
8775
className="src-shared-components-Leaderboard-PodiumSpot-themes-___styles__ranking___3eGBy"

‎__tests__/shared/components/__snapshots__/TopcoderFooter.jsx.snap

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -348,15 +348,6 @@ exports[`Matches shallow shapshot 1`] = `
348348
Talk to Sales
349349
</a>
350350
</li>
351-
<li
352-
className="src-shared-components-TopcoderFooter-___style__link___3-nzm"
353-
>
354-
<a
355-
href="https://www.topcoder-dev.com/community/terms"
356-
>
357-
Terms
358-
</a>
359-
</li>
360351
</ul>
361352
</div>
362353
<div
@@ -613,7 +604,7 @@ exports[`Matches shallow shapshot 1`] = `
613604
© 2020 Topcoder
614605
<a
615606
className="src-shared-components-TopcoderFooter-___style__link___3-nzm"
616-
href="https://www.topcoder.com/privacy-policy/"
607+
href="https://www.topcoder-dev.com/policy"
617608
>
618609
Policies
619610
</a>

‎__tests__/shared/containers/__snapshots__/TopcoderHeader.jsx.snap

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ exports[`Matches shallow snapshot 1`] = `
1111
closeMobileMenu={[Function]}
1212
closeSearch={[Function]}
1313
dismissChallengeNotifications={[Function]}
14+
headerMenu={null}
1415
loadNotifications={[Function]}
1516
markAllNotificationAsRead={[Function]}
1617
markAllNotificationAsSeen={[Function]}

‎config/default.js

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -160,7 +160,6 @@ module.exports = {
160160
COMMUNITY_API: 'http://localhost:8000',
161161
COMMUNITY_APP_GITHUB_ISSUES: 'https://github.com/topcoder-platform/community-app/issues',
162162
EMAIL_VERIFY_URL: 'http://www.topcoder-dev.com/settings/account/changeEmail',
163-
THRIVE_POLL_FEED: 'https://www.topcoder.com/feed',
164163
},
165164

166165
/* Information about Topcoder user groups can be cached in various places.
@@ -406,9 +405,5 @@ module.exports = {
406405
TC_EDU_ARTICLES_PATH: '/articles',
407406
TC_EDU_SEARCH_PATH: '/search',
408407
TC_EDU_SEARCH_BAR_MAX_RESULTS_EACH_GROUP: 3,
409-
410-
ENV: {
411-
HOST: process.env.HOST,
412-
PORT: process.env.PORT,
413-
},
408+
POLICY_PAGES_PATH: '/policy',
414409
};

‎package-lock.json

Lines changed: 40 additions & 6 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎package.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -110,6 +110,7 @@
110110
"react-player": "^0.24.1",
111111
"react-redux": "^5.0.7",
112112
"react-redux-toastr": "^7.2.6",
113+
"react-responsive": "^8.1.0",
113114
"react-router": "^4.3.1",
114115
"react-router-dom": "^4.3.1",
115116
"react-select": "^1.2.0",

‎src/assets/images/default-avatar-photo.svg

Lines changed: 1 addition & 0 deletions
Loading

‎src/assets/images/icon-facebook.svg

Lines changed: 11 additions & 0 deletions
Loading

‎src/assets/images/icon-linkedIn.svg

Lines changed: 11 additions & 0 deletions
Loading

‎src/assets/images/icon-twitter.svg

Lines changed: 11 additions & 0 deletions
Loading

‎src/assets/images/minimal-down.svg

Lines changed: 23 additions & 0 deletions
Loading

0 commit comments

Comments
 (0)