From 32534db2cfb0c4f8f56a887a9b5e603a98396850 Mon Sep 17 00:00:00 2001 From: "Luiz R. Rodrigues" Date: Fri, 13 Dec 2019 19:21:48 -0300 Subject: [PATCH 1/6] Fix Issue #3510 : Overview URL --- __tests__/shared/components/Header/__snapshots__/index.jsx.snap | 2 +- config/default.js | 2 +- config/production.js | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/__tests__/shared/components/Header/__snapshots__/index.jsx.snap b/__tests__/shared/components/Header/__snapshots__/index.jsx.snap index 311045f5f8..33c09e90d5 100644 --- a/__tests__/shared/components/Header/__snapshots__/index.jsx.snap +++ b/__tests__/shared/components/Header/__snapshots__/index.jsx.snap @@ -23,7 +23,7 @@ exports[`Default render 1`] = ` "id": "community", "secondaryMenuForGuest": Array [ Object { - "href": "https://www.topcoder-dev.com/about", + "href": "https://www.topcoder.com/community/learn", "title": "Overview", }, Object { diff --git a/config/default.js b/config/default.js index db896d63bf..f812b48b54 100644 --- a/config/default.js +++ b/config/default.js @@ -287,7 +287,7 @@ module.exports = { secondaryMenuForGuest: [ { title: 'Overview', - href: 'https://www.topcoder-dev.com/about', + href: 'https://www.topcoder.com/community/learn', }, { title: 'How It Works', diff --git a/config/production.js b/config/production.js index 99a369561f..b2ed5d0f68 100644 --- a/config/production.js +++ b/config/production.js @@ -83,7 +83,7 @@ module.exports = { secondaryMenuForGuest: [ { title: 'Overview', - href: 'https://www.topcoder.com/about', + href: 'https://www.topcoder.com/community/learn', }, { title: 'How It Works', From 09ce1901324b2f57cc37cf97dd6f72150b7c40f1 Mon Sep 17 00:00:00 2001 From: "Luiz R. Rodrigues" Date: Fri, 13 Dec 2019 19:30:35 -0300 Subject: [PATCH 2/6] Fix Issue #3511 : Remove Tracks and Why Join from Community menu --- .../shared/components/Header/__snapshots__/index.jsx.snap | 8 -------- config/default.js | 8 -------- config/production.js | 8 -------- 3 files changed, 24 deletions(-) diff --git a/__tests__/shared/components/Header/__snapshots__/index.jsx.snap b/__tests__/shared/components/Header/__snapshots__/index.jsx.snap index 33c09e90d5..f5be04a75a 100644 --- a/__tests__/shared/components/Header/__snapshots__/index.jsx.snap +++ b/__tests__/shared/components/Header/__snapshots__/index.jsx.snap @@ -30,14 +30,6 @@ exports[`Default render 1`] = ` "href": "https://www.topcoder-dev.com/how-it-works/faqs/", "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 { diff --git a/config/default.js b/config/default.js index f812b48b54..3cf79692d0 100644 --- a/config/default.js +++ b/config/default.js @@ -293,14 +293,6 @@ module.exports = { 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/', - }, ], subMenu: [ { diff --git a/config/production.js b/config/production.js index b2ed5d0f68..3cac4d6724 100644 --- a/config/production.js +++ b/config/production.js @@ -89,14 +89,6 @@ module.exports = { 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/', - }, ], subMenu: [ { From 9abfd24e06264b1cedc0d93d3921aa01ef98949e Mon Sep 17 00:00:00 2001 From: "Luiz R. Rodrigues" Date: Fri, 13 Dec 2019 19:35:01 -0300 Subject: [PATCH 3/6] FIx Issue #3514 : Remove About Topcoder from Account Menu --- .../shared/components/Header/__snapshots__/index.jsx.snap | 3 +-- config/default.js | 5 +---- config/production.js | 5 +---- 3 files changed, 3 insertions(+), 10 deletions(-) diff --git a/__tests__/shared/components/Header/__snapshots__/index.jsx.snap b/__tests__/shared/components/Header/__snapshots__/index.jsx.snap index f5be04a75a..c195837a55 100644 --- a/__tests__/shared/components/Header/__snapshots__/index.jsx.snap +++ b/__tests__/shared/components/Header/__snapshots__/index.jsx.snap @@ -138,8 +138,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", diff --git a/config/default.js b/config/default.js index 3cf79692d0..0950ba2d63 100644 --- a/config/default.js +++ b/config/default.js @@ -380,10 +380,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', diff --git a/config/production.js b/config/production.js index 3cac4d6724..47bcd48069 100644 --- a/config/production.js +++ b/config/production.js @@ -176,10 +176,7 @@ 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', From e09ed8a0f503b5b0dc78aba186b785109c3e2b22 Mon Sep 17 00:00:00 2001 From: "Luiz R. Rodrigues" Date: Fri, 13 Dec 2019 19:43:04 -0300 Subject: [PATCH 4/6] Fix Issue #3515 : Add Thrive to Explore menu --- .../shared/components/Header/__snapshots__/index.jsx.snap | 4 ++++ config/default.js | 4 ++++ config/production.js | 4 ++++ 3 files changed, 12 insertions(+) diff --git a/__tests__/shared/components/Header/__snapshots__/index.jsx.snap b/__tests__/shared/components/Header/__snapshots__/index.jsx.snap index c195837a55..693f0b6534 100644 --- a/__tests__/shared/components/Header/__snapshots__/index.jsx.snap +++ b/__tests__/shared/components/Header/__snapshots__/index.jsx.snap @@ -111,6 +111,10 @@ exports[`Default render 1`] = ` "href": "https://www.topcoder-dev.com/blog", "title": "Blog", }, + Object { + "href": "https://www.topcoder.com/thrive", + "title": "Thrive", + }, ], "title": "Explore", }, diff --git a/config/default.js b/config/default.js index 0950ba2d63..ccc5fb09b0 100644 --- a/config/default.js +++ b/config/default.js @@ -360,6 +360,10 @@ module.exports = { title: 'Blog', href: 'https://www.topcoder-dev.com/blog', }, + { + title: 'Thrive', + href: 'https://www.topcoder.com/thrive', + }, ], }, ], diff --git a/config/production.js b/config/production.js index 47bcd48069..87a2c9dc20 100644 --- a/config/production.js +++ b/config/production.js @@ -156,6 +156,10 @@ module.exports = { title: 'Blog', href: 'https://www.topcoder.com/blog', }, + { + title: 'Thrive', + href: 'https://www.topcoder.com/thrive', + }, ], }, ], From 60155e2152508caf2e6fc1ef37664a1180360175 Mon Sep 17 00:00:00 2001 From: "Luiz R. Rodrigues" Date: Fri, 13 Dec 2019 19:45:24 -0300 Subject: [PATCH 5/6] Fix Issue #3515 : Change How It Works URL from Community menu --- __tests__/shared/components/Header/__snapshots__/index.jsx.snap | 2 +- config/default.js | 2 +- config/production.js | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/__tests__/shared/components/Header/__snapshots__/index.jsx.snap b/__tests__/shared/components/Header/__snapshots__/index.jsx.snap index 693f0b6534..fb61583f76 100644 --- a/__tests__/shared/components/Header/__snapshots__/index.jsx.snap +++ b/__tests__/shared/components/Header/__snapshots__/index.jsx.snap @@ -27,7 +27,7 @@ exports[`Default render 1`] = ` "title": "Overview", }, Object { - "href": "https://www.topcoder-dev.com/how-it-works/faqs/", + "href": "https://www.topcoder.com/thrive/tracks?track=Topcoder", "title": "How It Works", }, ], diff --git a/config/default.js b/config/default.js index ccc5fb09b0..3b6f873a36 100644 --- a/config/default.js +++ b/config/default.js @@ -291,7 +291,7 @@ module.exports = { }, { title: 'How It Works', - href: 'https://www.topcoder-dev.com/how-it-works/faqs/', + href: 'https://www.topcoder.com/thrive/tracks?track=Topcoder', }, ], subMenu: [ diff --git a/config/production.js b/config/production.js index 87a2c9dc20..0dfc884ce9 100644 --- a/config/production.js +++ b/config/production.js @@ -87,7 +87,7 @@ module.exports = { }, { title: 'How It Works', - href: 'https://www.topcoder.com/how-it-works/faqs/', + href: 'https://www.topcoder.com/thrive/tracks?track=Topcoder', }, ], subMenu: [ From 4705331270876858f1dab4ebbad6ec7b1d4b3069 Mon Sep 17 00:00:00 2001 From: "Luiz R. Rodrigues" Date: Sat, 14 Dec 2019 12:40:08 -0300 Subject: [PATCH 6/6] Fix href from menu items --- .../Header/__snapshots__/index.jsx.snap | 10 ++-- config/default.js | 43 ++------------ config/production.js | 58 +++++-------------- 3 files changed, 26 insertions(+), 85 deletions(-) diff --git a/__tests__/shared/components/Header/__snapshots__/index.jsx.snap b/__tests__/shared/components/Header/__snapshots__/index.jsx.snap index fb61583f76..64c4410dc1 100644 --- a/__tests__/shared/components/Header/__snapshots__/index.jsx.snap +++ b/__tests__/shared/components/Header/__snapshots__/index.jsx.snap @@ -23,11 +23,11 @@ exports[`Default render 1`] = ` "id": "community", "secondaryMenuForGuest": Array [ Object { - "href": "https://www.topcoder.com/community/learn", + "href": "/community/learn", "title": "Overview", }, Object { - "href": "https://www.topcoder.com/thrive/tracks?track=Topcoder", + "href": "/thrive/tracks?track=Topcoder", "title": "How It Works", }, ], @@ -88,7 +88,7 @@ exports[`Default render 1`] = ` Object { "subMenu": Array [ Object { - "href": "https://www.topcoder-dev.com/tco", + "href": "/tco", "title": "TCO", }, Object { @@ -108,11 +108,11 @@ exports[`Default render 1`] = ` "title": "Events", }, Object { - "href": "https://www.topcoder-dev.com/blog", + "href": "/blog", "title": "Blog", }, Object { - "href": "https://www.topcoder.com/thrive", + "href": "/thrive", "title": "Thrive", }, ], diff --git a/config/default.js b/config/default.js index 3b6f873a36..00f1835fc0 100644 --- a/config/default.js +++ b/config/default.js @@ -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', @@ -287,11 +254,11 @@ module.exports = { secondaryMenuForGuest: [ { title: 'Overview', - href: 'https://www.topcoder.com/community/learn', + href: '/community/learn', }, { title: 'How It Works', - href: 'https://www.topcoder.com/thrive/tracks?track=Topcoder', + href: '/thrive/tracks?track=Topcoder', }, ], subMenu: [ @@ -338,7 +305,7 @@ module.exports = { subMenu: [ { title: 'TCO', - href: 'https://www.topcoder-dev.com/tco', + href: '/tco', }, { title: 'Programs', @@ -358,11 +325,11 @@ module.exports = { }, { title: 'Blog', - href: 'https://www.topcoder-dev.com/blog', + href: '/blog', }, { title: 'Thrive', - href: 'https://www.topcoder.com/thrive', + href: '/thrive', }, ], }, diff --git a/config/production.js b/config/production.js index 0dfc884ce9..781bcf4f09 100644 --- a/config/production.js +++ b/config/production.js @@ -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', @@ -83,11 +88,11 @@ module.exports = { secondaryMenuForGuest: [ { title: 'Overview', - href: 'https://www.topcoder.com/community/learn', + href: '/community/learn', }, { title: 'How It Works', - href: 'https://www.topcoder.com/thrive/tracks?track=Topcoder', + href: '/thrive/tracks?track=Topcoder', }, ], subMenu: [ @@ -134,7 +139,7 @@ module.exports = { subMenu: [ { title: 'TCO', - href: 'https://www.topcoder.com/tco', + href: '/tco', }, { title: 'Programs', @@ -154,11 +159,11 @@ module.exports = { }, { title: 'Blog', - href: 'https://www.topcoder.com/blog', + href: '/blog', }, { title: 'Thrive', - href: 'https://www.topcoder.com/thrive', + href: '/thrive', }, ], }, @@ -186,41 +191,10 @@ module.exports = { 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, };