Skip to content

Feature contentful #4643

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 8 commits into from
Jul 13, 2020
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
4 changes: 2 additions & 2 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -238,7 +238,7 @@ workflows:
filters:
branches:
only:
- feature-contentful
- integration-v5-challenge-api
# This is alternate dev env for parallel testing
- "build-qa":
context : org-global
Expand All @@ -259,7 +259,7 @@ workflows:
filters:
branches:
only:
- feature-contentful
- develop
# Production builds are exectuted
# when PR is merged to the master
# Don't change anything in this configuration
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ exports[`Default render 1`] = `
"title": "All Challenges",
},
Object {
"href": "https://arena.topcoder-dev.com",
"href": "/community/arena",
"title": "Competitive Programming",
},
Object {
Expand Down Expand Up @@ -208,4 +208,4 @@ exports[`Default render 1`] = `
}
/>
</div>
`;
`;
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ exports[`Matches shallow shapshot 1`] = `
className="src-shared-components-TopcoderFooter-___style__link___3-nzm"
>
<a
href="https://arena.topcoder.com/"
href="https://www.topcoder-dev.com/community/arena"
>
Competitive Programming
</a>
Expand All @@ -68,6 +68,15 @@ exports[`Matches shallow shapshot 1`] = `
Gig Work
</a>
</li>
<li
className="src-shared-components-TopcoderFooter-___style__link___3-nzm"
>
<a
href="https://www.topcoder-dev.com/community/practice"
>
Practice
</a>
</li>
</ul>
</div>
<div
Expand Down Expand Up @@ -154,6 +163,15 @@ exports[`Matches shallow shapshot 1`] = `
Blog
</a>
</li>
<li
className="src-shared-components-TopcoderFooter-___style__link___3-nzm"
>
<a
href="https://www.topcoder-dev.com/community/pipeline"
>
Challenge Pipeline
</a>
</li>
<li
className="src-shared-components-TopcoderFooter-___style__link___3-nzm"
>
Expand Down
2 changes: 1 addition & 1 deletion config/default.js
Original file line number Diff line number Diff line change
Expand Up @@ -309,7 +309,7 @@ module.exports = {
},
{
title: 'Competitive Programming',
href: 'https://arena.topcoder-dev.com',
href: '/community/arena',
},
{
title: 'Gig Work',
Expand Down
2 changes: 1 addition & 1 deletion config/production.js
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@ module.exports = {
},
{
title: 'Competitive Programming',
href: 'https://arena.topcoder.com',
href: '/community/arena',
},
{
title: 'Gig Work',
Expand Down
4 changes: 3 additions & 1 deletion src/shared/components/TopcoderFooter/index.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -44,8 +44,9 @@ export default function TopcoderFooter() {
<div styleName="sep-line" />
<ul styleName="navi-col-links">
<Link to={`${base}/challenges`}>All Challenges</Link>
<Link to="https://arena.topcoder.com/">Competitive Programming</Link>
<Link to={`${base}/community/arena`}>Competitive Programming</Link>
<Link to={`${base}/community/taas`}>Gig Work</Link>
<Link to={`${base}/community/practice`}>Practice</Link>
</ul>
</div>
<div styleName="navi-col">
Expand All @@ -64,6 +65,7 @@ export default function TopcoderFooter() {
<div styleName="sep-line" />
<ul styleName="navi-col-links">
<Link to={`${base}/blog`}>Blog</Link>
<Link to={`${base}/community/pipeline`}>Challenge Pipeline</Link>
<Link to={`${base}/community/events`}>Events Calendar</Link>
<Link to="https://apps.topcoder.com/forums">Forums</Link>
<Link to={`${base}/community/member-programs`}>Programs</Link>
Expand Down
2 changes: 1 addition & 1 deletion src/shared/components/buttons/themed/tc.scss
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@

&:active,
&:visited {
border: 1px solid #0ab88a !important;
border: 1px solid #137d60 !important;
box-shadow: none !important;
}
}
Expand Down