From 5126535f0da127653534a6d71e2352cde0c4624c Mon Sep 17 00:00:00 2001 From: Kiril Kartunov Date: Thu, 27 Jan 2022 14:48:34 +0200 Subject: [PATCH 1/9] Fix #5991 --- .../__snapshots__/TopcoderFooter.jsx.snap | 13 ++----------- src/shared/components/TopcoderFooter/index.jsx | 3 +-- 2 files changed, 3 insertions(+), 13 deletions(-) diff --git a/__tests__/shared/components/__snapshots__/TopcoderFooter.jsx.snap b/__tests__/shared/components/__snapshots__/TopcoderFooter.jsx.snap index dfc40a93d9..cfb5bce005 100644 --- a/__tests__/shared/components/__snapshots__/TopcoderFooter.jsx.snap +++ b/__tests__/shared/components/__snapshots__/TopcoderFooter.jsx.snap @@ -285,15 +285,6 @@ exports[`Matches shallow shapshot 1`] = `
Getting Paid @@ -247,6 +274,7 @@ exports[`Matches shallow shapshot 1`] = ` > FAQ @@ -256,6 +284,7 @@ exports[`Matches shallow shapshot 1`] = ` > General Info @@ -265,6 +294,7 @@ exports[`Matches shallow shapshot 1`] = ` > Website Help @@ -290,6 +320,7 @@ exports[`Matches shallow shapshot 1`] = ` > Contact Us @@ -299,6 +330,7 @@ exports[`Matches shallow shapshot 1`] = ` > Join Community @@ -308,6 +340,7 @@ exports[`Matches shallow shapshot 1`] = ` > About Community @@ -317,6 +350,7 @@ exports[`Matches shallow shapshot 1`] = ` > Changelog @@ -326,6 +360,7 @@ exports[`Matches shallow shapshot 1`] = ` > Talk to Sales diff --git a/config/default.js b/config/default.js index 487939cd2d..9fb8ed43d7 100644 --- a/config/default.js +++ b/config/default.js @@ -327,6 +327,11 @@ module.exports = { href: '/thrive/tracks?track=Topcoder', logged: false, }, + { + title: 'Join Discord', + href: 'https://discord.gg/topcoder', + openNewTab: true, + }, ], subMenu: [ { diff --git a/config/production.js b/config/production.js index 24ca88848a..1e82404c53 100644 --- a/config/production.js +++ b/config/production.js @@ -108,6 +108,11 @@ module.exports = { href: '/thrive/tracks?track=Topcoder', logged: false, }, + { + title: 'Join Discord', + href: 'https://discord.gg/topcoder', + openNewTab: true, + }, ], subMenu: [ { diff --git a/src/shared/components/TopcoderFooter/index.jsx b/src/shared/components/TopcoderFooter/index.jsx index 7272b05100..b17529fe2a 100644 --- a/src/shared/components/TopcoderFooter/index.jsx +++ b/src/shared/components/TopcoderFooter/index.jsx @@ -17,19 +17,25 @@ import './style.scss'; function Link({ children, to, + openNewTab, }) { return (
  • - + {children}
    • ); } +Link.defaultProps = { + openNewTab: false, +}; + Link.propTypes = { to: PT.string.isRequired, children: PT.node.isRequired, + openNewTab: PT.bool, }; export default function TopcoderFooter() { @@ -75,6 +81,7 @@ export default function TopcoderFooter() { Statistics TCO Thrive + Join Discord
    From b09c6a84c4d2972291d179d53d5805e5c7dc7d36 Mon Sep 17 00:00:00 2001 From: Kiril Kartunov Date: Tue, 8 Feb 2022 20:14:01 +0200 Subject: [PATCH 5/9] fixed logged in navi --- .../shared/components/Header/__snapshots__/index.jsx.snap | 7 +++++++ config/default.js | 7 +++++++ config/production.js | 7 +++++++ 3 files changed, 21 insertions(+) diff --git a/__tests__/shared/components/Header/__snapshots__/index.jsx.snap b/__tests__/shared/components/Header/__snapshots__/index.jsx.snap index 247242a934..d624a3ecb5 100644 --- a/__tests__/shared/components/Header/__snapshots__/index.jsx.snap +++ b/__tests__/shared/components/Header/__snapshots__/index.jsx.snap @@ -54,6 +54,13 @@ exports[`Default render 1`] = ` }, Object { "href": "https://discord.gg/topcoder", + "logged": false, + "openNewTab": true, + "title": "Join Discord", + }, + Object { + "href": "https://discord.gg/topcoder", + "logged": true, "openNewTab": true, "title": "Join Discord", }, diff --git a/config/default.js b/config/default.js index 9fb8ed43d7..8f3019a279 100644 --- a/config/default.js +++ b/config/default.js @@ -331,6 +331,13 @@ module.exports = { title: 'Join Discord', href: 'https://discord.gg/topcoder', openNewTab: true, + logged: false, + }, + { + title: 'Join Discord', + href: 'https://discord.gg/topcoder', + openNewTab: true, + logged: true, }, ], subMenu: [ diff --git a/config/production.js b/config/production.js index 1e82404c53..db86ed08b8 100644 --- a/config/production.js +++ b/config/production.js @@ -112,6 +112,13 @@ module.exports = { title: 'Join Discord', href: 'https://discord.gg/topcoder', openNewTab: true, + logged: false, + }, + { + title: 'Join Discord', + href: 'https://discord.gg/topcoder', + openNewTab: true, + logged: true, }, ], subMenu: [ From 24a40232443de573222268779818289a474520a1 Mon Sep 17 00:00:00 2001 From: Kiril Kartunov Date: Tue, 8 Feb 2022 21:14:21 +0200 Subject: [PATCH 6/9] move discord to 1st level navi --- .../Header/__snapshots__/index.jsx.snap | 17 +++++------------ config/default.js | 17 +++++------------ config/production.js | 17 +++++------------ 3 files changed, 15 insertions(+), 36 deletions(-) diff --git a/__tests__/shared/components/Header/__snapshots__/index.jsx.snap b/__tests__/shared/components/Header/__snapshots__/index.jsx.snap index d624a3ecb5..551bdbcf7f 100644 --- a/__tests__/shared/components/Header/__snapshots__/index.jsx.snap +++ b/__tests__/shared/components/Header/__snapshots__/index.jsx.snap @@ -52,18 +52,6 @@ exports[`Default render 1`] = ` "logged": false, "title": "How It Works", }, - Object { - "href": "https://discord.gg/topcoder", - "logged": false, - "openNewTab": true, - "title": "Join Discord", - }, - Object { - "href": "https://discord.gg/topcoder", - "logged": true, - "openNewTab": true, - "title": "Join Discord", - }, ], "subMenu": Array [ Object { @@ -142,6 +130,11 @@ exports[`Default render 1`] = ` ], "title": "Explore", }, + Object { + "href": "https://discord.gg/topcoder", + "openNewTab": true, + "title": "Join Discord", + }, ], "title": "COMMUNITY", }, diff --git a/config/default.js b/config/default.js index 8f3019a279..26fe5b3025 100644 --- a/config/default.js +++ b/config/default.js @@ -327,18 +327,6 @@ module.exports = { href: '/thrive/tracks?track=Topcoder', logged: false, }, - { - title: 'Join Discord', - href: 'https://discord.gg/topcoder', - openNewTab: true, - logged: false, - }, - { - title: 'Join Discord', - href: 'https://discord.gg/topcoder', - openNewTab: true, - logged: true, - }, ], subMenu: [ { @@ -417,6 +405,11 @@ module.exports = { }, ], }, + { + title: 'Join Discord', + href: 'https://discord.gg/topcoder', + openNewTab: true, + }, ], }, ], diff --git a/config/production.js b/config/production.js index db86ed08b8..0ac37cd474 100644 --- a/config/production.js +++ b/config/production.js @@ -108,18 +108,6 @@ module.exports = { href: '/thrive/tracks?track=Topcoder', logged: false, }, - { - title: 'Join Discord', - href: 'https://discord.gg/topcoder', - openNewTab: true, - logged: false, - }, - { - title: 'Join Discord', - href: 'https://discord.gg/topcoder', - openNewTab: true, - logged: true, - }, ], subMenu: [ { @@ -198,6 +186,11 @@ module.exports = { }, ], }, + { + title: 'Join Discord', + href: 'https://discord.gg/topcoder', + openNewTab: true, + }, ], }, ], From a46af67048b77aa1648a8eceed0aeb01d6555f4e Mon Sep 17 00:00:00 2001 From: "Luiz R. Rodrigues" Date: Wed, 9 Feb 2022 07:47:09 -0300 Subject: [PATCH 7/9] Nav - Added newTab support to level 2 menu --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 37d04f4e84..e14786d102 100644 --- a/package.json +++ b/package.json @@ -90,7 +90,7 @@ "money": "^0.2.0", "morgan": "^1.9.0", "multer": "^1.4.2", - "navigation-component": "github:topcoder-platform/navigation-component#develop", + "navigation-component": "github:topcoder-platform/navigation-component#level2-new-tab", "navigation-component-tco": "github:topcoder-platform/navigation-component-tco#new-dev", "node-cache": "^5.1.2", "node-forge": "^0.7.5", From 096415ded7d3c8f7b00de7c07a2482e2423b800b Mon Sep 17 00:00:00 2001 From: Kiril Kartunov Date: Fri, 11 Feb 2022 18:37:11 +0200 Subject: [PATCH 8/9] discord icon in footer --- .../__snapshots__/TopcoderFooter.jsx.snap | 56 +++++++++++++++++++ .../TopcoderFooter/icons/icon-discord.svg | 20 +++++++ .../components/TopcoderFooter/index.jsx | 3 + 3 files changed, 79 insertions(+) create mode 100644 src/shared/components/TopcoderFooter/icons/icon-discord.svg diff --git a/__tests__/shared/components/__snapshots__/TopcoderFooter.jsx.snap b/__tests__/shared/components/__snapshots__/TopcoderFooter.jsx.snap index 0c7e97bf96..801783c01a 100644 --- a/__tests__/shared/components/__snapshots__/TopcoderFooter.jsx.snap +++ b/__tests__/shared/components/__snapshots__/TopcoderFooter.jsx.snap @@ -471,6 +471,34 @@ exports[`Matches shallow shapshot 1`] = ` /> + + + + Join Topcoder Discord + + + + + + +
    @@ -611,6 +639,34 @@ exports[`Matches shallow shapshot 1`] = ` /> + + + + Join Topcoder Discord + + + + + + +
    + + Join Topcoder Discord + + + + + + + + + + + + + + + + + diff --git a/src/shared/components/TopcoderFooter/index.jsx b/src/shared/components/TopcoderFooter/index.jsx index b17529fe2a..f9878a5a47 100644 --- a/src/shared/components/TopcoderFooter/index.jsx +++ b/src/shared/components/TopcoderFooter/index.jsx @@ -11,6 +11,7 @@ import LinkedInIcon from './icons/icon-linkedln.svg'; import TwitterIcon from './icons/icon-twitter.svg'; import InstagramIcon from './icons/icon-instagram.svg'; import TCLogo from './icons/TC-logo-inverted.svg'; +import DiscordIcon from './icons/icon-discord.svg'; import './style.scss'; @@ -116,6 +117,7 @@ export default function TopcoderFooter() { +
    @@ -139,6 +141,7 @@ export default function TopcoderFooter() { +
    From e1bdc27bf96d99798000f92230512d5f18ef0f5e Mon Sep 17 00:00:00 2001 From: Kiril Kartunov Date: Fri, 11 Feb 2022 20:51:59 +0200 Subject: [PATCH 9/9] changed link texts --- __tests__/shared/components/Header/__snapshots__/index.jsx.snap | 2 +- .../shared/components/__snapshots__/TopcoderFooter.jsx.snap | 2 +- config/default.js | 2 +- config/production.js | 2 +- src/shared/components/TopcoderFooter/index.jsx | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/__tests__/shared/components/Header/__snapshots__/index.jsx.snap b/__tests__/shared/components/Header/__snapshots__/index.jsx.snap index 551bdbcf7f..3a956ad083 100644 --- a/__tests__/shared/components/Header/__snapshots__/index.jsx.snap +++ b/__tests__/shared/components/Header/__snapshots__/index.jsx.snap @@ -133,7 +133,7 @@ exports[`Default render 1`] = ` Object { "href": "https://discord.gg/topcoder", "openNewTab": true, - "title": "Join Discord", + "title": "Discord", }, ], "title": "COMMUNITY", diff --git a/__tests__/shared/components/__snapshots__/TopcoderFooter.jsx.snap b/__tests__/shared/components/__snapshots__/TopcoderFooter.jsx.snap index 801783c01a..d7932d91ea 100644 --- a/__tests__/shared/components/__snapshots__/TopcoderFooter.jsx.snap +++ b/__tests__/shared/components/__snapshots__/TopcoderFooter.jsx.snap @@ -240,7 +240,7 @@ exports[`Matches shallow shapshot 1`] = ` href="https://discord.gg/topcoder" target="_blank" > - Join Discord + Discord diff --git a/config/default.js b/config/default.js index 26fe5b3025..f52f684b5f 100644 --- a/config/default.js +++ b/config/default.js @@ -406,7 +406,7 @@ module.exports = { ], }, { - title: 'Join Discord', + title: 'Discord', href: 'https://discord.gg/topcoder', openNewTab: true, }, diff --git a/config/production.js b/config/production.js index 0ac37cd474..6557caf03e 100644 --- a/config/production.js +++ b/config/production.js @@ -187,7 +187,7 @@ module.exports = { ], }, { - title: 'Join Discord', + title: 'Discord', href: 'https://discord.gg/topcoder', openNewTab: true, }, diff --git a/src/shared/components/TopcoderFooter/index.jsx b/src/shared/components/TopcoderFooter/index.jsx index f9878a5a47..d97986455d 100644 --- a/src/shared/components/TopcoderFooter/index.jsx +++ b/src/shared/components/TopcoderFooter/index.jsx @@ -82,7 +82,7 @@ export default function TopcoderFooter() { Statistics TCO Thrive - Join Discord + Discord