Skip to content

Commit b041cda

Browse files
luizrrodriguesluizrrodrigues
authored
Merge pull request #5376 from topcoder-platform/develop
Release 2021/02/22 (v1.7.7)
2 parents 8296254 + 3e5a82b commit b041cda

File tree

20 files changed

+328
-212
lines changed

20 files changed

+328
-212
lines changed

‎.circleci/config.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -282,7 +282,7 @@ workflows:
282282
filters:
283283
branches:
284284
only:
285-
- gsheet-contentful-develop
285+
- free
286286
# This is alternate dev env for parallel testing
287287
- "build-qa":
288288
context : org-global

‎__tests__/shared/components/Header/__snapshots__/index.jsx.snap

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -110,8 +110,7 @@ exports[`Default render 1`] = `
110110
"title": "Programs",
111111
},
112112
Object {
113-
"href": "https://apps.topcoder-dev.com/forums",
114-
"openNewTab": true,
113+
"href": "https://vanilla.topcoder-dev.com",
115114
"title": "Forums",
116115
},
117116
Object {

‎__tests__/shared/components/Settings/Preferences/Email/__snapshots__/index.jsx.snap

Lines changed: 41 additions & 62 deletions
Original file line numberDiff line numberDiff line change
@@ -10,69 +10,48 @@ exports[`renders email preferences setting page correctly 1`] = `
1010
E-Mail Preferences
1111
</h1>
1212
<div
13-
className="src-shared-components-Settings-Preferences-Email-___styles__sub-title___2Fh1W"
13+
className="src-shared-components-Settings-Preferences-Email-___styles__unsubscribed-msg___3yh6s"
1414
>
15-
Your preferences
16-
</div>
17-
<div
18-
className="src-shared-components-Settings-Preferences-Email-___styles__preferences-container___38AVF"
19-
>
20-
<ToggleableItem
21-
checked={false}
22-
id="Pipeline"
23-
onToggle={[Function]}
24-
primaryText="Challenge Pipeline"
25-
secondaryText="Subscribe to this newsletter if you want to get updates on the types of challenges coming up in the future. To view these challenges at your leisure you can always visit the <a href=\\"https://www.topcoder.com/community/pipeline\\" style=\\"color:#0d61bf;text-decoration:underline\\">Challenge Pipeline</a> page."
26-
value="Pipeline"
27-
/>
28-
<ToggleableItem
29-
checked={false}
30-
id="Gig Work"
31-
onToggle={[Function]}
32-
primaryText="Gig Work"
33-
secondaryText="This newsletter gets sent out at various times, specifically when we have an opportunity of mass appeal. For more information you can visit the <a href=\\"https://www.topcoder.com/community/taas\\" style=\\"color:#0d61bf;text-decoration:underline\\">Gig Work</a> page."
34-
value="Gig Work"
35-
/>
36-
<ToggleableItem
37-
checked={false}
38-
id="Monthly Newsletter"
39-
onToggle={[Function]}
40-
primaryText="Monthly Newsletter"
41-
secondaryText="This newsletter gets sent out at the end of every month and contains a variety of important information across all of our tracks."
42-
value="Monthly Newsletter"
43-
/>
44-
<ToggleableItem
45-
checked={false}
46-
id="Marathon Match Reminders"
47-
onToggle={[Function]}
48-
primaryText="Marathon Match Reminders"
49-
secondaryText="Receive updates whenever a new marathon match is scheduled."
50-
value="Marathon Match Reminders"
51-
/>
52-
<ToggleableItem
53-
checked={false}
54-
id="Single Round Match Reminders"
55-
onToggle={[Function]}
56-
primaryText="Single Round Match (SRM) Reminders"
57-
secondaryText="Attention Competitive Programmers! If there is any newsletter you are subscribing too, it better be this one. Receive updates when a new SRM event is scheduled."
58-
value="Single Round Match Reminders"
59-
/>
60-
<ToggleableItem
61-
checked={false}
62-
id="TCO Tuesdays"
63-
onToggle={[Function]}
64-
primaryText="TCO Newsletter"
65-
secondaryText="For all the latest updates surrounding the <a href=\\"https://www.topcoder.com/community/member-programs/topcoder-open\\" style=\\"color:#0d61bf;text-decoration:underline\\">Topcoder Open</a> you should definitely be subscribing to this one. Expect an update in your mailbox every Tuesday!"
66-
value="TCO Tuesdays"
67-
/>
68-
<ToggleableItem
69-
checked={false}
70-
id="RDM"
71-
onToggle={[Function]}
72-
primaryText="Rapid Development Match (RDM) Reminders"
73-
secondaryText="Receive notifications of our brand new RDMs! These rated, development matches will be a fun new way to engage with us!"
74-
value="RDM"
75-
/>
15+
<h3>
16+
You are not subscribed to receive Topcoder emails
17+
</h3>
18+
<p>
19+
If this was a mistake or if you would like to resubscribe, please click the button below.
20+
</p>
21+
<form
22+
action="https://topcoder.us13.list-manage.com/subscribe/post?u=65bd5a1857b73643aad556093&id=28bfd3c062"
23+
id="mc-embedded-subscribe-form"
24+
method="post"
25+
name="mc-embedded-subscribe-form"
26+
noValidate={true}
27+
>
28+
<input
29+
id="mce-EMAIL"
30+
name="EMAIL"
31+
readOnly={true}
32+
type="email"
33+
value="[email protected]"
34+
/>
35+
<input
36+
id="gdpr_11101"
37+
name="gdpr[11101]"
38+
type="checkbox"
39+
value="Y"
40+
/>
41+
<input
42+
name="b_65bd5a1857b73643aad556093_28bfd3c062"
43+
tabIndex="-1"
44+
type="text"
45+
value=""
46+
/>
47+
<input
48+
className="submit-button"
49+
id="mc-embedded-subscribe"
50+
name="subscribe"
51+
type="submit"
52+
value="Subscribe"
53+
/>
54+
</form>
7655
</div>
7756
</div>
7857
`;

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -185,7 +185,7 @@ exports[`Matches shallow shapshot 1`] = `
185185
className="src-shared-components-TopcoderFooter-___style__link___3-nzm"
186186
>
187187
<a
188-
href="https://apps.topcoder.com/forums"
188+
href="https://vanilla.topcoder-dev.com"
189189
>
190190
Forums
191191
</a>

‎config/default.js

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ module.exports = {
110110
BLOG: 'https://www.topcoder-dev.com/blog',
111111
BLOG_FEED: 'https://www.topcoder.com/blog/feed/',
112112
COMMUNITY: 'https://community.topcoder-dev.com',
113-
FORUMS: 'https://apps.topcoder-dev.com/forums',
113+
FORUMS: 'https://vanilla.topcoder-dev.com',
114114
HELP: 'https://www.topcoder.com/thrive/tracks?track=Topcoder&tax=Help%20Articles',
115115
SUBMISSION_REVIEW: 'https://submission-review.topcoder-dev.com',
116116

@@ -360,8 +360,7 @@ module.exports = {
360360
},
361361
{
362362
title: 'Forums',
363-
href: 'https://apps.topcoder-dev.com/forums',
364-
openNewTab: true,
363+
href: 'https://vanilla.topcoder-dev.com',
365364
},
366365
{
367366
title: 'Statistics',

‎config/production.js

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ module.exports = {
3030
BASE: 'https://www.topcoder.com',
3131
HOME: '/my-dashboard',
3232
COMMUNITY: 'https://community.topcoder.com',
33-
FORUMS: 'https://apps.topcoder.com/forums',
33+
FORUMS: 'https://discussions.topcoder.com',
3434
HELP: 'https://www.topcoder.com/thrive/tracks?track=Topcoder&tax=Help%20Articles',
3535
SUBMISSION_REVIEW: 'https://submission-review.topcoder.com',
3636
MEMBER: 'https://member.topcoder.com',
@@ -165,8 +165,7 @@ module.exports = {
165165
},
166166
{
167167
title: 'Forums',
168-
href: 'https://apps.topcoder.com/forums',
169-
openNewTab: true,
168+
href: 'https://discussions.topcoder.com',
170169
},
171170
{
172171
title: 'Statistics',

0 commit comments

Comments
 (0)