Skip to content

Issues 3510 11 14 15 16 #3517

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 6 commits into from
Dec 14, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 9 additions & 14 deletions __tests__/shared/components/Header/__snapshots__/index.jsx.snap
Original file line number Diff line number Diff line change
Expand Up @@ -23,21 +23,13 @@ exports[`Default render 1`] = `
"id": "community",
"secondaryMenuForGuest": Array [
Object {
"href": "https://www.topcoder-dev.com/about",
"href": "/community/learn",
"title": "Overview",
},
Object {
"href": "https://www.topcoder-dev.com/how-it-works/faqs/",
"href": "/thrive/tracks?track=Topcoder",
"title": "How It Works",
},
Object {
"href": "/community/learn",
"title": "Tracks",
},
Object {
"href": "https://www.topcoder-dev.com/about/why-crowdsourcing/",
"title": "Why Join",
},
],
"secondaryMenuForLoggedInUser": Array [
Object {
Expand Down Expand Up @@ -96,7 +88,7 @@ exports[`Default render 1`] = `
Object {
"subMenu": Array [
Object {
"href": "https://www.topcoder-dev.com/tco",
"href": "/tco",
"title": "TCO",
},
Object {
Expand All @@ -116,9 +108,13 @@ exports[`Default render 1`] = `
"title": "Events",
},
Object {
"href": "https://www.topcoder-dev.com/blog",
"href": "/blog",
"title": "Blog",
},
Object {
"href": "/thrive",
"title": "Thrive",
},
],
"title": "Explore",
},
Expand Down Expand Up @@ -146,8 +142,7 @@ exports[`Default render 1`] = `
"title": "Help",
},
Object {
"href": "https://www.topcoder.com/about/",
"title": "About Topcoder",
"separator": true,
},
Object {
"href": "https://www.topcoder-dev.com/logout",
Expand Down
58 changes: 9 additions & 49 deletions config/default.js
Original file line number Diff line number Diff line change
Expand Up @@ -223,39 +223,6 @@ module.exports = {
},
},

SECONDARY_MENU_FOR_LOGGED_USER: [
{
title: 'Dashboard',
href: '/my-dashboard',
},
{
id: 'myprofile',
title: 'My Profile',
href: '/members/',
},
{
title: 'Payments',
href: 'https://community.topcoder-dev.com/PactsMemberServlet?module=PaymentHistory&full_list=false',
},
],
SECONDARY_MENU_FOR_GUEST: [
{
title: 'Overview',
href: 'https://www.topcoder-dev.com/about',
},
{
title: 'How It Works',
href: 'https://www.topcoder-dev.com/how-it-works/faqs/',
},
{
title: 'Tracks',
href: '/community/learn',
},
{
title: 'Why Join',
href: 'https://www.topcoder-dev.com/about/why-crowdsourcing/',
},
],
ACCOUNT_MENU_SWITCH_TEXT: {
title: 'Switch to BUSINESS',
href: 'https://connect.topcoder-dev.com',
Expand Down Expand Up @@ -287,19 +254,11 @@ module.exports = {
secondaryMenuForGuest: [
{
title: 'Overview',
href: 'https://www.topcoder-dev.com/about',
},
{
title: 'How It Works',
href: 'https://www.topcoder-dev.com/how-it-works/faqs/',
},
{
title: 'Tracks',
href: '/community/learn',
},
{
title: 'Why Join',
href: 'https://www.topcoder-dev.com/about/why-crowdsourcing/',
title: 'How It Works',
href: '/thrive/tracks?track=Topcoder',
},
],
subMenu: [
Expand Down Expand Up @@ -346,7 +305,7 @@ module.exports = {
subMenu: [
{
title: 'TCO',
href: 'https://www.topcoder-dev.com/tco',
href: '/tco',
},
{
title: 'Programs',
Expand All @@ -366,7 +325,11 @@ module.exports = {
},
{
title: 'Blog',
href: 'https://www.topcoder-dev.com/blog',
href: '/blog',
},
{
title: 'Thrive',
href: '/thrive',
},
],
},
Expand All @@ -388,10 +351,7 @@ module.exports = {
title: 'Help',
href: 'https://help.topcoder-dev.com/',
},
{
title: 'About Topcoder',
href: 'https://www.topcoder.com/about/',
},
{ separator: true },
{
title: 'Log Out',
href: 'https://www.topcoder-dev.com/logout',
Expand Down
73 changes: 20 additions & 53 deletions config/production.js
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,11 @@ module.exports = {
FILESTACK: {
SUBMISSION_CONTAINER: 'topcoder-submissions-dmz',
},

ACCOUNT_MENU_SWITCH_TEXT: {
title: 'Switch to BUSINESS',
href: 'https://connect.topcoder.com',
},
HEADER_MENU: [
{
id: 'business',
Expand Down Expand Up @@ -83,19 +88,11 @@ module.exports = {
secondaryMenuForGuest: [
{
title: 'Overview',
href: 'https://www.topcoder.com/about',
},
{
title: 'How It Works',
href: 'https://www.topcoder.com/how-it-works/faqs/',
},
{
title: 'Tracks',
href: '/community/learn',
},
{
title: 'Why Join',
href: 'https://www.topcoder.com/about/why-crowdsourcing/',
title: 'How It Works',
href: '/thrive/tracks?track=Topcoder',
},
],
subMenu: [
Expand Down Expand Up @@ -142,7 +139,7 @@ module.exports = {
subMenu: [
{
title: 'TCO',
href: 'https://www.topcoder.com/tco',
href: '/tco',
},
{
title: 'Programs',
Expand All @@ -162,7 +159,11 @@ module.exports = {
},
{
title: 'Blog',
href: 'https://www.topcoder.com/blog',
href: '/blog',
},
{
title: 'Thrive',
href: '/thrive',
},
],
},
Expand All @@ -184,50 +185,16 @@ module.exports = {
title: 'Help',
href: 'https://help.topcoder.com/',
},
{
title: 'About Topcoder',
href: 'https://www.topcoder.com/about/',
},
{ separator: true },
{
title: 'Log Out',
href: 'https://www.topcoder.com/logout',
},
],
SECONDARY_MENU_FOR_LOGGED_USER: [
{
title: 'Dashboard',
href: '/my-dashboard',
},
{
id: 'myprofile',
title: 'My Profile',
href: '/members/',
},
{
title: 'Payments',
href: 'https://community.topcoder.com/PactsMemberServlet?module=PaymentHistory&full_list=false',
},
],
SECONDARY_MENU_FOR_GUEST: [
{
title: 'Overview',
href: 'https://www.topcoder.com/about',
},
{
title: 'How It Works',
href: 'https://www.topcoder.com/how-it-works/faqs/',
},
{
title: 'Tracks',
href: '/community/learn',
},
{
title: 'Why Join',
href: 'https://www.topcoder.com/about/why-crowdsourcing/',
},
],
ACCOUNT_MENU_SWITCH_TEXT: {
title: 'Switch to BUSINESS',
href: 'https://connect.topcoder.com',
},
// Config for TC EDU - THRIVE
TC_EDU_BASE_PATH: '/thrive',
TC_EDU_TRACKS_PATH: '/tracks',
TC_EDU_ARTICLES_PATH: '/articles',
TC_EDU_SEARCH_PATH: '/search',
TC_EDU_SEARCH_BAR_MAX_RESULTS_EACH_GROUP: 3,
};