Skip to content

Commit 1fb1aac

Browse files
nursoltan-snursoltan-s
committed
Merge branch 'develop' into recommender-final-fix
2 parents 458de1b + 108a7ac commit 1fb1aac

File tree

35 files changed

+1398
-439
lines changed

35 files changed

+1398
-439
lines changed

‎.circleci/config.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -304,6 +304,7 @@ workflows:
304304
branches:
305305
only:
306306
- develop
307+
- nav-vanilla-forum
307308
- "approve-smoke-test-on-staging":
308309
type: approval
309310
requires:

‎Dockerfile

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,7 @@ ARG TC_M2M_AUTH0_URL
6565
ARG AUTH_SECRET
6666

6767
ARG COMMUNITY_APP_URL
68+
ARG GSHEETS_API_KEY
6869

6970
################################################################################
7071
# Setting of environment variables in the Docker image.
@@ -120,6 +121,7 @@ ENV CONTENTFUL_EDU_CDN_API_KEY=$CONTENTFUL_EDU_CDN_API_KEY
120121
ENV CONTENTFUL_EDU_PREVIEW_API_KEY=$CONTENTFUL_EDU_PREVIEW_API_KEY
121122
ENV RECRUITCRM_API_KEY=$RECRUITCRM_API_KEY
122123
ENV COMMUNITY_APP_URL=$COMMUNITY_APP_URL
124+
ENV GSHEETS_API_KEY=$GSHEETS_API_KEY
123125

124126
################################################################################
125127
# Testing and build of the application inside the container.

‎__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>

‎build.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,7 @@ docker build -t $TAG \
4444
--build-arg CONTENTFUL_COMCAST_CDN_API_KEY=$CONTENTFUL_COMCAST_CDN_API_KEY \
4545
--build-arg CONTENTFUL_COMCAST_PREVIEW_API_KEY=$CONTENTFUL_COMCAST_PREVIEW_API_KEY \
4646
--build-arg RECRUITCRM_API_KEY=$RECRUITCRM_API_KEY \
47+
--build-arg GSHEETS_API_KEY=$GSHEETS_API_KEY \
4748
--build-arg COMMUNITY_APP_URL=$COMMUNITY_APP_URL .
4849

4950
# Copies "node_modules" from the created image, if necessary for caching.

‎config/custom-environment-variables.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -104,4 +104,5 @@ module.exports = {
104104
AUTH0_PROXY_SERVER_URL: 'TC_M2M_AUTH0_PROXY_SERVER_URL',
105105
TOKEN_CACHE_TIME: 'TOKEN_CACHE_TIME',
106106
},
107+
GSHEETS_API_KEY: 'GSHEETS_API_KEY',
107108
};

‎config/default.js

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -111,6 +111,7 @@ module.exports = {
111111
BLOG_FEED: 'https://www.topcoder.com/blog/feed/',
112112
COMMUNITY: 'https://community.topcoder-dev.com',
113113
FORUMS: 'https://apps.topcoder-dev.com/forums',
114+
FORUMS_VANILLA: 'https://vanilla.topcoder-dev.com',
114115
HELP: 'https://www.topcoder.com/thrive/tracks?track=Topcoder&tax=Help%20Articles',
115116
SUBMISSION_REVIEW: 'https://submission-review.topcoder-dev.com',
116117

@@ -249,6 +250,8 @@ module.exports = {
249250
RECRUITCRM_API_KEY: '',
250251
},
251252

253+
GSHEETS_API_KEY: 'AIzaSyBRdKySN5JNCb2H6ZxJdTTvp3cWU51jiOQ',
254+
252255
AUTH_CONFIG: {
253256
AUTH0_URL: 'TC_M2M_AUTH0_URL',
254257
AUTH0_AUDIENCE: 'TC_M2M_AUDIENCE',
@@ -358,8 +361,7 @@ module.exports = {
358361
},
359362
{
360363
title: 'Forums',
361-
href: 'https://apps.topcoder-dev.com/forums',
362-
openNewTab: true,
364+
href: 'https://vanilla.topcoder-dev.com',
363365
},
364366
{
365367
title: 'Statistics',

‎config/production.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ module.exports = {
3131
HOME: '/my-dashboard',
3232
COMMUNITY: 'https://community.topcoder.com',
3333
FORUMS: 'https://apps.topcoder.com/forums',
34+
FORUMS_VANILLA: 'https://discussions.topcoder.com',
3435
HELP: 'https://www.topcoder.com/thrive/tracks?track=Topcoder&tax=Help%20Articles',
3536
SUBMISSION_REVIEW: 'https://submission-review.topcoder.com',
3637
MEMBER: 'https://member.topcoder.com',
@@ -165,8 +166,7 @@ module.exports = {
165166
},
166167
{
167168
title: 'Forums',
168-
href: 'https://apps.topcoder.com/forums',
169-
openNewTab: true,
169+
href: 'https://discussions.topcoder.com',
170170
},
171171
{
172172
title: 'Statistics',

0 commit comments

Comments
 (0)