Skip to content

Jan updates 2 #6014

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 11 commits into from
Feb 14, 2022
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
2 changes: 1 addition & 1 deletion .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -130,6 +130,11 @@ exports[`Default render 1`] = `
],
"title": "Explore",
},
Object {
"href": "https://discord.gg/topcoder",
"openNewTab": true,
"title": "Discord",
},
],
"title": "COMMUNITY",
},
Expand Down
104 changes: 93 additions & 11 deletions __tests__/shared/components/__snapshots__/TopcoderFooter.jsx.snap
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@ exports[`Matches shallow shapshot 1`] = `
>
<a
href="https://www.topcoder-dev.com/challenges"
target="_self"
>
All Challenges
</a>
Expand All @@ -55,6 +56,7 @@ exports[`Matches shallow shapshot 1`] = `
>
<a
href="https://www.topcoder-dev.com/community/arena"
target="_self"
>
Competitive Programming
</a>
Expand All @@ -64,6 +66,7 @@ exports[`Matches shallow shapshot 1`] = `
>
<a
href="https://www.topcoder-dev.com/gigs"
target="_self"
>
Gig Work
</a>
Expand All @@ -73,6 +76,7 @@ exports[`Matches shallow shapshot 1`] = `
>
<a
href="https://www.topcoder-dev.com/community/practice"
target="_self"
>
Practice
</a>
Expand All @@ -98,6 +102,7 @@ exports[`Matches shallow shapshot 1`] = `
>
<a
href="https://www.topcoder-dev.com/thrive/tracks?track=Competitive%20Programming"
target="_self"
>
Competitive Programming
</a>
Expand All @@ -107,6 +112,7 @@ exports[`Matches shallow shapshot 1`] = `
>
<a
href="https://www.topcoder-dev.com/thrive/tracks?track=Data%20Science&tax="
target="_self"
>
Data Science
</a>
Expand All @@ -116,6 +122,7 @@ exports[`Matches shallow shapshot 1`] = `
>
<a
href="https://www.topcoder-dev.com/thrive/tracks?track=Design&tax="
target="_self"
>
Design
</a>
Expand All @@ -125,6 +132,7 @@ exports[`Matches shallow shapshot 1`] = `
>
<a
href="https://www.topcoder-dev.com/thrive/tracks?track=Development&tax="
target="_self"
>
Development
</a>
Expand All @@ -134,6 +142,7 @@ exports[`Matches shallow shapshot 1`] = `
>
<a
href="https://www.topcoder-dev.com/thrive/tracks?track=QA&tax="
target="_self"
>
QA
</a>
Expand All @@ -159,6 +168,7 @@ exports[`Matches shallow shapshot 1`] = `
>
<a
href="https://www.topcoder-dev.com/blog"
target="_self"
>
Blog
</a>
Expand All @@ -168,6 +178,7 @@ exports[`Matches shallow shapshot 1`] = `
>
<a
href="https://www.topcoder-dev.com/community/events"
target="_self"
>
Events Calendar
</a>
Expand All @@ -177,6 +188,7 @@ exports[`Matches shallow shapshot 1`] = `
>
<a
href="https://vanilla.topcoder-dev.com"
target="_self"
>
Forums
</a>
Expand All @@ -186,6 +198,7 @@ exports[`Matches shallow shapshot 1`] = `
>
<a
href="https://www.topcoder-dev.com/community/member-programs"
target="_self"
>
Programs
</a>
Expand All @@ -195,6 +208,7 @@ exports[`Matches shallow shapshot 1`] = `
>
<a
href="https://www.topcoder-dev.com/community/statistics"
target="_self"
>
Statistics
</a>
Expand All @@ -204,6 +218,7 @@ exports[`Matches shallow shapshot 1`] = `
>
<a
href="https://www.topcoder-dev.com/community/member-programs/topcoder-open"
target="_self"
>
TCO
</a>
Expand All @@ -213,10 +228,21 @@ exports[`Matches shallow shapshot 1`] = `
>
<a
href="https://www.topcoder-dev.com/thrive"
target="_self"
>
Thrive
</a>
</li>
<li
className="src-shared-components-TopcoderFooter-___style__link___3-nzm"
>
<a
href="https://discord.gg/topcoder"
target="_blank"
>
Discord
</a>
</li>
</ul>
</div>
<div
Expand All @@ -238,6 +264,7 @@ exports[`Matches shallow shapshot 1`] = `
>
<a
href="https://www.topcoder-dev.com/thrive/tracks?track=Topcoder&tax=Getting%20Paid"
target="_self"
>
Getting Paid
</a>
Expand All @@ -247,6 +274,7 @@ exports[`Matches shallow shapshot 1`] = `
>
<a
href="https://www.topcoder-dev.com/thrive/tracks?track=Topcoder&tax=FAQ"
target="_self"
>
FAQ
</a>
Expand All @@ -256,6 +284,7 @@ exports[`Matches shallow shapshot 1`] = `
>
<a
href="https://www.topcoder-dev.com/thrive/tracks?track=Topcoder"
target="_self"
>
General Info
</a>
Expand All @@ -265,6 +294,7 @@ exports[`Matches shallow shapshot 1`] = `
>
<a
href="mailto:support@topcoder.com"
target="_self"
>
Website Help
</a>
Expand All @@ -285,20 +315,12 @@ exports[`Matches shallow shapshot 1`] = `
<ul
className="src-shared-components-TopcoderFooter-___style__navi-col-links___CFs95"
>
<li
className="src-shared-components-TopcoderFooter-___style__link___3-nzm"
>
<a
href="https://www.topcoder-dev.com/community/admins"
>
Admins
</a>
</li>
<li
className="src-shared-components-TopcoderFooter-___style__link___3-nzm"
>
<a
href="https://www.topcoder-dev.com/community/contact"
target="_self"
>
Contact Us
</a>
Expand All @@ -308,6 +330,7 @@ exports[`Matches shallow shapshot 1`] = `
>
<a
href="https://accounts-auth0.topcoder-dev.com?utm_source=community&utm_campaign=tc-footer&utm_medium=promotion&retUrl="
target="_self"
>
Join Community
</a>
Expand All @@ -317,6 +340,7 @@ exports[`Matches shallow shapshot 1`] = `
>
<a
href="https://www.topcoder-dev.com/community/learn"
target="_self"
>
About Community
</a>
Expand All @@ -326,6 +350,7 @@ exports[`Matches shallow shapshot 1`] = `
>
<a
href="https://www.topcoder-dev.com/community/changelog"
target="_self"
>
Changelog
</a>
Expand All @@ -335,6 +360,7 @@ exports[`Matches shallow shapshot 1`] = `
>
<a
href="https://www.topcoder-dev.com/contact-us/"
target="_self"
>
Talk to Sales
</a>
Expand Down Expand Up @@ -445,6 +471,34 @@ exports[`Matches shallow shapshot 1`] = `
/>
</svg>
</a>
<a
href="https://discord.gg/topcoder"
rel="noopener noreferrer"
target="_blank"
>
<svg
height="24"
viewBox="0 0 24 24"
width="24"
xmlns="http://www.w3.org/2000/svg"
>
<title>
Join Topcoder Discord
</title>
<g
fill="#AAA"
fillRule="evenodd"
>
<path
d="M12 2c5.514 0 10 4.486 10 10s-4.486 10-10 10S2 17.514 2 12 6.486 2 12 2zm0-2C5.373 0 0 5.373 0 12s5.373 12 12 12 12-5.373 12-12S18.627 0 12 0z"
/>
<path
d="M17.005 7.829A10.65 10.65 0 0 0 14.359 7a.04.04 0 0 0-.043.02c-.114.205-.24.473-.33.683a9.808 9.808 0 0 0-2.971 0 6.938 6.938 0 0 0-.335-.683.042.042 0 0 0-.042-.02 10.62 10.62 0 0 0-2.646.828.038.038 0 0 0-.018.015c-1.685 2.541-2.147 5.02-1.92 7.467a.045.045 0 0 0 .017.031 10.742 10.742 0 0 0 3.246 1.656.042.042 0 0 0 .045-.015c.25-.345.473-.708.664-1.09a.042.042 0 0 0-.022-.058 7.07 7.07 0 0 1-1.014-.488.042.042 0 0 1-.004-.07c.068-.05.136-.105.201-.159a.04.04 0 0 1 .042-.005c2.128.98 4.431.98 6.533 0a.04.04 0 0 1 .043.005c.065.054.133.108.202.16a.042.042 0 0 1-.004.07c-.324.19-.66.352-1.014.487a.042.042 0 0 0-.022.058c.195.382.418.745.663 1.09.01.014.029.02.046.015a10.707 10.707 0 0 0 3.251-1.656.042.042 0 0 0 .017-.03c.271-2.83-.454-5.288-1.922-7.467a.033.033 0 0 0-.017-.016zm-6.483 5.642c-.62 0-1.13-.528-1.13-1.177 0-.648.5-1.176 1.13-1.176.634 0 1.14.532 1.13 1.176 0 .649-.5 1.177-1.13 1.177zm3.956 0c-.62 0-1.13-.528-1.13-1.177 0-.648.5-1.176 1.13-1.176.635 0 1.14.532 1.13 1.176 0 .649-.495 1.177-1.13 1.177z"
fillRule="nonzero"
/>
</g>
</svg>
</a>
</div>
</div>
</div>
Expand Down Expand Up @@ -486,9 +540,9 @@ exports[`Matches shallow shapshot 1`] = `
className="src-shared-components-TopcoderFooter-___style__mobile-navi-col___3BcW4"
>
<a
href="https://www.topcoder-dev.com/community/admins"
href="https://www.topcoder-dev.com/community/contact"
>
ABOUT
Contact Us
</a>
</div>
</div>
Expand Down Expand Up @@ -585,6 +639,34 @@ exports[`Matches shallow shapshot 1`] = `
/>
</svg>
</a>
<a
href="https://discord.gg/topcoder"
rel="noopener noreferrer"
target="_blank"
>
<svg
height="24"
viewBox="0 0 24 24"
width="24"
xmlns="http://www.w3.org/2000/svg"
>
<title>
Join Topcoder Discord
</title>
<g
fill="#AAA"
fillRule="evenodd"
>
<path
d="M12 2c5.514 0 10 4.486 10 10s-4.486 10-10 10S2 17.514 2 12 6.486 2 12 2zm0-2C5.373 0 0 5.373 0 12s5.373 12 12 12 12-5.373 12-12S18.627 0 12 0z"
/>
<path
d="M17.005 7.829A10.65 10.65 0 0 0 14.359 7a.04.04 0 0 0-.043.02c-.114.205-.24.473-.33.683a9.808 9.808 0 0 0-2.971 0 6.938 6.938 0 0 0-.335-.683.042.042 0 0 0-.042-.02 10.62 10.62 0 0 0-2.646.828.038.038 0 0 0-.018.015c-1.685 2.541-2.147 5.02-1.92 7.467a.045.045 0 0 0 .017.031 10.742 10.742 0 0 0 3.246 1.656.042.042 0 0 0 .045-.015c.25-.345.473-.708.664-1.09a.042.042 0 0 0-.022-.058 7.07 7.07 0 0 1-1.014-.488.042.042 0 0 1-.004-.07c.068-.05.136-.105.201-.159a.04.04 0 0 1 .042-.005c2.128.98 4.431.98 6.533 0a.04.04 0 0 1 .043.005c.065.054.133.108.202.16a.042.042 0 0 1-.004.07c-.324.19-.66.352-1.014.487a.042.042 0 0 0-.022.058c.195.382.418.745.663 1.09.01.014.029.02.046.015a10.707 10.707 0 0 0 3.251-1.656.042.042 0 0 0 .017-.03c.271-2.83-.454-5.288-1.922-7.467a.033.033 0 0 0-.017-.016zm-6.483 5.642c-.62 0-1.13-.528-1.13-1.177 0-.648.5-1.176 1.13-1.176.634 0 1.14.532 1.13 1.176 0 .649-.5 1.177-1.13 1.177zm3.956 0c-.62 0-1.13-.528-1.13-1.177 0-.648.5-1.176 1.13-1.176.635 0 1.14.532 1.13 1.176 0 .649-.495 1.177-1.13 1.177z"
fillRule="nonzero"
/>
</g>
</svg>
</a>
</div>
<div
className="src-shared-components-TopcoderFooter-___style__bottom___JLB31"
Expand Down
5 changes: 5 additions & 0 deletions config/default.js
Original file line number Diff line number Diff line change
Expand Up @@ -405,6 +405,11 @@ module.exports = {
},
],
},
{
title: 'Discord',
href: 'https://discord.gg/topcoder',
openNewTab: true,
},
],
},
],
Expand Down
5 changes: 5 additions & 0 deletions config/production.js
Original file line number Diff line number Diff line change
Expand Up @@ -186,6 +186,11 @@ module.exports = {
},
],
},
{
title: 'Discord',
href: 'https://discord.gg/topcoder',
openNewTab: true,
},
],
},
],
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ class ContentSlider extends Component {
className={theme.controlLeft}
>
{arrowRightImage && <img src={arrowRightImage.fields.file.url} alt="Slider left arrow" />}
{!arrowRightImage && (arrowTheme === 'Gray' ? <GrayArrowNext /> : <WhiteArrowNext />)}
{!arrowRightImage && (arrowTheme === 'Gray' ? <GrayArrowPrev /> : <WhiteArrowPrev />)}
</a>
),
renderCenterRightControls: ({ nextSlide }) => (
Expand All @@ -61,7 +61,7 @@ class ContentSlider extends Component {
className={theme.controlRight}
>
{arrowLeftImage && <img src={arrowLeftImage.fields.file.url} alt="Slider right arrow" />}
{!arrowLeftImage && (arrowTheme === 'Gray' ? <GrayArrowPrev /> : <WhiteArrowPrev />)}
{!arrowLeftImage && (arrowTheme === 'Gray' ? <GrayArrowNext /> : <WhiteArrowNext />)}
</a>
),
};
Expand Down
Loading