diff --git a/.circleci/config.yml b/.circleci/config.yml index f99b3a4db1..fdc185e38f 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -363,7 +363,7 @@ workflows: filters: branches: only: - - jan-fixes-2 + - jan-updates-2 # This is stage env for production QA releases - "build-prod-staging": context : org-global diff --git a/__tests__/shared/components/Header/__snapshots__/index.jsx.snap b/__tests__/shared/components/Header/__snapshots__/index.jsx.snap index cc4996f8f9..3a956ad083 100644 --- a/__tests__/shared/components/Header/__snapshots__/index.jsx.snap +++ b/__tests__/shared/components/Header/__snapshots__/index.jsx.snap @@ -130,6 +130,11 @@ exports[`Default render 1`] = ` ], "title": "Explore", }, + Object { + "href": "https://discord.gg/topcoder", + "openNewTab": true, + "title": "Discord", + }, ], "title": "COMMUNITY", }, diff --git a/__tests__/shared/components/__snapshots__/TopcoderFooter.jsx.snap b/__tests__/shared/components/__snapshots__/TopcoderFooter.jsx.snap index dfc40a93d9..d7932d91ea 100644 --- a/__tests__/shared/components/__snapshots__/TopcoderFooter.jsx.snap +++ b/__tests__/shared/components/__snapshots__/TopcoderFooter.jsx.snap @@ -46,6 +46,7 @@ exports[`Matches shallow shapshot 1`] = ` > All Challenges @@ -55,6 +56,7 @@ exports[`Matches shallow shapshot 1`] = ` > Competitive Programming @@ -64,6 +66,7 @@ exports[`Matches shallow shapshot 1`] = ` > Gig Work @@ -73,6 +76,7 @@ exports[`Matches shallow shapshot 1`] = ` > Practice @@ -98,6 +102,7 @@ exports[`Matches shallow shapshot 1`] = ` > Competitive Programming @@ -107,6 +112,7 @@ exports[`Matches shallow shapshot 1`] = ` > Data Science @@ -116,6 +122,7 @@ exports[`Matches shallow shapshot 1`] = ` > Design @@ -125,6 +132,7 @@ exports[`Matches shallow shapshot 1`] = ` > Development @@ -134,6 +142,7 @@ exports[`Matches shallow shapshot 1`] = ` > QA @@ -159,6 +168,7 @@ exports[`Matches shallow shapshot 1`] = ` > Blog @@ -168,6 +178,7 @@ exports[`Matches shallow shapshot 1`] = ` > Events Calendar @@ -177,6 +188,7 @@ exports[`Matches shallow shapshot 1`] = ` > Forums @@ -186,6 +198,7 @@ exports[`Matches shallow shapshot 1`] = ` > Programs @@ -195,6 +208,7 @@ exports[`Matches shallow shapshot 1`] = ` > Statistics @@ -204,6 +218,7 @@ exports[`Matches shallow shapshot 1`] = ` > TCO @@ -213,10 +228,21 @@ exports[`Matches shallow shapshot 1`] = ` > Thrive +
  • + + Discord + +
    • 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 @@ -285,20 +315,12 @@ exports[`Matches shallow shapshot 1`] = `
    @@ -486,9 +540,9 @@ exports[`Matches shallow shapshot 1`] = ` className="src-shared-components-TopcoderFooter-___style__mobile-navi-col___3BcW4" > - ABOUT + Contact Us @@ -585,6 +639,34 @@ exports[`Matches shallow shapshot 1`] = ` /> + + + + Join Topcoder Discord + + + + + + +
    {arrowRightImage && Slider left arrow} - {!arrowRightImage && (arrowTheme === 'Gray' ? : )} + {!arrowRightImage && (arrowTheme === 'Gray' ? : )} ), renderCenterRightControls: ({ nextSlide }) => ( @@ -61,7 +61,7 @@ class ContentSlider extends Component { className={theme.controlRight} > {arrowLeftImage && Slider right arrow} - {!arrowLeftImage && (arrowTheme === 'Gray' ? : )} + {!arrowLeftImage && (arrowTheme === 'Gray' ? : )} ), }; diff --git a/src/shared/components/TopcoderFooter/icons/icon-discord.svg b/src/shared/components/TopcoderFooter/icons/icon-discord.svg new file mode 100644 index 0000000000..69b51cddb6 --- /dev/null +++ b/src/shared/components/TopcoderFooter/icons/icon-discord.svg @@ -0,0 +1,20 @@ + + + Join Topcoder Discord + + + + + + + + + + + + + + + + + diff --git a/src/shared/components/TopcoderFooter/index.jsx b/src/shared/components/TopcoderFooter/index.jsx index d886390320..d97986455d 100644 --- a/src/shared/components/TopcoderFooter/index.jsx +++ b/src/shared/components/TopcoderFooter/index.jsx @@ -11,25 +11,32 @@ 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'; 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 +82,7 @@ export default function TopcoderFooter() { Statistics TCO Thrive + Discord
    @@ -91,7 +99,6 @@ export default function TopcoderFooter() {

    ABOUT

    @@ -124,7 +132,7 @@ export default function TopcoderFooter() { HELP CENTER
    - ABOUT + Contact Us
    @@ -133,6 +141,7 @@ export default function TopcoderFooter() { +