Skip to content

Commit b2ca447

Browse files
authored
Merge pull request #3517 from topcoder-platform/issues_3510_11_14_15_16
Issues 3510 11 14 15 16
2 parents 263d791 + 4705331 commit b2ca447

File tree

3 files changed

+38
-116
lines changed

3 files changed

+38
-116
lines changed

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

+9-14
Original file line numberDiff line numberDiff line change
@@ -23,21 +23,13 @@ exports[`Default render 1`] = `
2323
"id": "community",
2424
"secondaryMenuForGuest": Array [
2525
Object {
26-
"href": "https://www.topcoder-dev.com/about",
26+
"href": "/community/learn",
2727
"title": "Overview",
2828
},
2929
Object {
30-
"href": "https://www.topcoder-dev.com/how-it-works/faqs/",
30+
"href": "/thrive/tracks?track=Topcoder",
3131
"title": "How It Works",
3232
},
33-
Object {
34-
"href": "/community/learn",
35-
"title": "Tracks",
36-
},
37-
Object {
38-
"href": "https://www.topcoder-dev.com/about/why-crowdsourcing/",
39-
"title": "Why Join",
40-
},
4133
],
4234
"secondaryMenuForLoggedInUser": Array [
4335
Object {
@@ -96,7 +88,7 @@ exports[`Default render 1`] = `
9688
Object {
9789
"subMenu": Array [
9890
Object {
99-
"href": "https://www.topcoder-dev.com/tco",
91+
"href": "/tco",
10092
"title": "TCO",
10193
},
10294
Object {
@@ -116,9 +108,13 @@ exports[`Default render 1`] = `
116108
"title": "Events",
117109
},
118110
Object {
119-
"href": "https://www.topcoder-dev.com/blog",
111+
"href": "/blog",
120112
"title": "Blog",
121113
},
114+
Object {
115+
"href": "/thrive",
116+
"title": "Thrive",
117+
},
122118
],
123119
"title": "Explore",
124120
},
@@ -146,8 +142,7 @@ exports[`Default render 1`] = `
146142
"title": "Help",
147143
},
148144
Object {
149-
"href": "https://www.topcoder.com/about/",
150-
"title": "About Topcoder",
145+
"separator": true,
151146
},
152147
Object {
153148
"href": "https://www.topcoder-dev.com/logout",

config/default.js

+9-49
Original file line numberDiff line numberDiff line change
@@ -223,39 +223,6 @@ module.exports = {
223223
},
224224
},
225225

226-
SECONDARY_MENU_FOR_LOGGED_USER: [
227-
{
228-
title: 'Dashboard',
229-
href: '/my-dashboard',
230-
},
231-
{
232-
id: 'myprofile',
233-
title: 'My Profile',
234-
href: '/members/',
235-
},
236-
{
237-
title: 'Payments',
238-
href: 'https://community.topcoder-dev.com/PactsMemberServlet?module=PaymentHistory&full_list=false',
239-
},
240-
],
241-
SECONDARY_MENU_FOR_GUEST: [
242-
{
243-
title: 'Overview',
244-
href: 'https://www.topcoder-dev.com/about',
245-
},
246-
{
247-
title: 'How It Works',
248-
href: 'https://www.topcoder-dev.com/how-it-works/faqs/',
249-
},
250-
{
251-
title: 'Tracks',
252-
href: '/community/learn',
253-
},
254-
{
255-
title: 'Why Join',
256-
href: 'https://www.topcoder-dev.com/about/why-crowdsourcing/',
257-
},
258-
],
259226
ACCOUNT_MENU_SWITCH_TEXT: {
260227
title: 'Switch to BUSINESS',
261228
href: 'https://connect.topcoder-dev.com',
@@ -287,19 +254,11 @@ module.exports = {
287254
secondaryMenuForGuest: [
288255
{
289256
title: 'Overview',
290-
href: 'https://www.topcoder-dev.com/about',
291-
},
292-
{
293-
title: 'How It Works',
294-
href: 'https://www.topcoder-dev.com/how-it-works/faqs/',
295-
},
296-
{
297-
title: 'Tracks',
298257
href: '/community/learn',
299258
},
300259
{
301-
title: 'Why Join',
302-
href: 'https://www.topcoder-dev.com/about/why-crowdsourcing/',
260+
title: 'How It Works',
261+
href: '/thrive/tracks?track=Topcoder',
303262
},
304263
],
305264
subMenu: [
@@ -346,7 +305,7 @@ module.exports = {
346305
subMenu: [
347306
{
348307
title: 'TCO',
349-
href: 'https://www.topcoder-dev.com/tco',
308+
href: '/tco',
350309
},
351310
{
352311
title: 'Programs',
@@ -366,7 +325,11 @@ module.exports = {
366325
},
367326
{
368327
title: 'Blog',
369-
href: 'https://www.topcoder-dev.com/blog',
328+
href: '/blog',
329+
},
330+
{
331+
title: 'Thrive',
332+
href: '/thrive',
370333
},
371334
],
372335
},
@@ -388,10 +351,7 @@ module.exports = {
388351
title: 'Help',
389352
href: 'https://help.topcoder-dev.com/',
390353
},
391-
{
392-
title: 'About Topcoder',
393-
href: 'https://www.topcoder.com/about/',
394-
},
354+
{ separator: true },
395355
{
396356
title: 'Log Out',
397357
href: 'https://www.topcoder-dev.com/logout',

config/production.js

+20-53
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,11 @@ module.exports = {
5656
FILESTACK: {
5757
SUBMISSION_CONTAINER: 'topcoder-submissions-dmz',
5858
},
59+
60+
ACCOUNT_MENU_SWITCH_TEXT: {
61+
title: 'Switch to BUSINESS',
62+
href: 'https://connect.topcoder.com',
63+
},
5964
HEADER_MENU: [
6065
{
6166
id: 'business',
@@ -83,19 +88,11 @@ module.exports = {
8388
secondaryMenuForGuest: [
8489
{
8590
title: 'Overview',
86-
href: 'https://www.topcoder.com/about',
87-
},
88-
{
89-
title: 'How It Works',
90-
href: 'https://www.topcoder.com/how-it-works/faqs/',
91-
},
92-
{
93-
title: 'Tracks',
9491
href: '/community/learn',
9592
},
9693
{
97-
title: 'Why Join',
98-
href: 'https://www.topcoder.com/about/why-crowdsourcing/',
94+
title: 'How It Works',
95+
href: '/thrive/tracks?track=Topcoder',
9996
},
10097
],
10198
subMenu: [
@@ -142,7 +139,7 @@ module.exports = {
142139
subMenu: [
143140
{
144141
title: 'TCO',
145-
href: 'https://www.topcoder.com/tco',
142+
href: '/tco',
146143
},
147144
{
148145
title: 'Programs',
@@ -162,7 +159,11 @@ module.exports = {
162159
},
163160
{
164161
title: 'Blog',
165-
href: 'https://www.topcoder.com/blog',
162+
href: '/blog',
163+
},
164+
{
165+
title: 'Thrive',
166+
href: '/thrive',
166167
},
167168
],
168169
},
@@ -184,50 +185,16 @@ module.exports = {
184185
title: 'Help',
185186
href: 'https://help.topcoder.com/',
186187
},
187-
{
188-
title: 'About Topcoder',
189-
href: 'https://www.topcoder.com/about/',
190-
},
188+
{ separator: true },
191189
{
192190
title: 'Log Out',
193191
href: 'https://www.topcoder.com/logout',
194192
},
195193
],
196-
SECONDARY_MENU_FOR_LOGGED_USER: [
197-
{
198-
title: 'Dashboard',
199-
href: '/my-dashboard',
200-
},
201-
{
202-
id: 'myprofile',
203-
title: 'My Profile',
204-
href: '/members/',
205-
},
206-
{
207-
title: 'Payments',
208-
href: 'https://community.topcoder.com/PactsMemberServlet?module=PaymentHistory&full_list=false',
209-
},
210-
],
211-
SECONDARY_MENU_FOR_GUEST: [
212-
{
213-
title: 'Overview',
214-
href: 'https://www.topcoder.com/about',
215-
},
216-
{
217-
title: 'How It Works',
218-
href: 'https://www.topcoder.com/how-it-works/faqs/',
219-
},
220-
{
221-
title: 'Tracks',
222-
href: '/community/learn',
223-
},
224-
{
225-
title: 'Why Join',
226-
href: 'https://www.topcoder.com/about/why-crowdsourcing/',
227-
},
228-
],
229-
ACCOUNT_MENU_SWITCH_TEXT: {
230-
title: 'Switch to BUSINESS',
231-
href: 'https://connect.topcoder.com',
232-
},
194+
// Config for TC EDU - THRIVE
195+
TC_EDU_BASE_PATH: '/thrive',
196+
TC_EDU_TRACKS_PATH: '/tracks',
197+
TC_EDU_ARTICLES_PATH: '/articles',
198+
TC_EDU_SEARCH_PATH: '/search',
199+
TC_EDU_SEARCH_BAR_MAX_RESULTS_EACH_GROUP: 3,
233200
};

0 commit comments

Comments
 (0)