Skip to content

Release v1.17.6 #6527

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 15 commits into from
Jun 24, 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 @@ -356,7 +356,7 @@ workflows:
filters:
branches:
only:
- debug-CMS-error
- tco23
# This is alternate dev env for parallel testing
- "build-qa":
context : org-global
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -491,7 +491,7 @@ exports[`Matches shallow shapshot 1`] = `
<li>
<Link
replace={false}
to="/__community__/wipro"
to="/__community__/wipro/challenges"
>
TopGear (Wipro) community
</Link>
Expand Down
1 change: 1 addition & 0 deletions src/server/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -185,6 +185,7 @@ async function onExpressJsSetup(server) {
+ ` ${config.CDN.PUBLIC}`
+ ' https://d1of0acg2orgco.cloudfront.net'
+ ' https://d24oibycet9bsb.cloudfront.net'
+ ' https://d1mwkvp2xbqfs9.cloudfront.net'
+ ' https://43d132d5dbff47c59d9d53ad448f93c2.js.ubembed.com;'
+ " frame-src 'self'"
+ ` ${config.URL.AUTH}`
Expand Down
11 changes: 11 additions & 0 deletions src/server/services/communities.js
Original file line number Diff line number Diff line change
Expand Up @@ -116,6 +116,17 @@ export async function getMetadata(communityId) {
if (metadata.groupIds) {
metadata.groupIds = await extendByChildGroups(metadata.groupIds);
}

// FIXME: This is a tempory patch to resolve "Backstage Error" that's showing up on Topgear
// app due to missing "Wipro All" authorized group
// Roll this back as soon as the root cause is fixed
// which is likely either in topcoder-react-lib that handles merging groups (https://github.com/topcoder-platform/topcoder-react-lib/blob/c637525211550bea283390e52490fce7f6dd44a8/src/services/groups.js#L107)
// or Groups Api
if (communityId === 'wipro') {
logger.info('Getting metadata for Topgear. Existing Authorized Groups', JSON.stringify(metadata.authorizedGroupIds));
metadata.authorizedGroupIds = _.uniq(metadata.authorizedGroupIds.concat('b7f7c0f8-8ee8-409e-9e5c-33404983b635'));
logger.info('After adding "Wipro All" group', JSON.stringify(metadata.authorizedGroupIds));
}
getMetadata.cache[communityId] = { data: metadata, timestamp: now };
return _.cloneDeep(metadata);
}
Expand Down
20 changes: 20 additions & 0 deletions src/server/tc-communities/tco23/metadata.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
{
"challengeFilter": {
"events": ["tco23"]
},
"communityId": "tco23",
"communityName": "TCO23",
"groupIds": [],
"hideSearch": true,
"logos": [{
"img": "/community-app-assets/themes/tco/TCO23.svg",
"url": "https://tco23.topcoder.com"
}],
"menuItems": [{
"navigationMenu": "6SsceF3R5YuKxsf8XnCM5I"
}],
"newsFeed": "http://www.topcoder.com/feed",
"subdomains": ["tco23"],
"description": "2023 Topcoder Open. The Ultimate Programming & Design Tournament",
"image": "tco23.jpg"
}
2 changes: 1 addition & 1 deletion src/shared/components/Content/index.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -413,7 +413,7 @@ export default function Content() {
</Link>
</li>
<li>
<Link to="/__community__/wipro">
<Link to="/__community__/wipro/challenges">
TopGear (Wipro) community
</Link>
</li>
Expand Down
2 changes: 2 additions & 0 deletions src/shared/components/Contentful/ContentBlock/index.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ import generalTheme from './themes/general.scss';
import blobCard from './themes/blobCard.scss';
import TCO20Theme from './themes/TCO20.scss';
import largeCard from './themes/largeCard.scss';
import bracketsTheme from './themes/brackets.scss';

const THEMES = {
Default: defaultTheme,
Expand All @@ -31,6 +32,7 @@ const THEMES = {
'Blob Card': blobCard,
TCO20: TCO20Theme,
'Large Card': largeCard,
Brackets: bracketsTheme,
};

/* Loads content block background asset. */
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,64 @@
@import "~styles/mixins";
@import "~components/Contentful/brackets";

.contentWrapper {
display: flex;
margin: 0 auto;
max-width: $screen-lg;
padding: 15px 0;
color: $tc-black;

@include xs-to-sm {
flex-direction: column;
}
}

.container {
align-content: center;
background: white;
padding: 10px 0;

&:nth-child(even) .contentWrapper {
flex-direction: row-reverse;

@include xs-to-sm {
flex-direction: column;
}
}
}

strong a {
font-weight: 600 !important;
}

.content {
flex: 1;
padding: 0;

@include xs-to-md {
padding: 15px;
}

@include roboto-regular;

h1,
h2,
h3,
h4,
h5,
h6 {
color: $tco-black;
}

@include brackets-headers;
@include brackets-content;
}

.image {
flex: 1;
margin: 15px;

img {
width: 100%;
}
}
2 changes: 2 additions & 0 deletions src/shared/components/Contentful/Tabs/Tabs.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ import underlineDarkTheme from './themes/underline-dark.scss';
import verticalTheme from './themes/vertical.scss';
import pillsTheme from './themes/pills.scss';
import underlineBoxTheme from './themes/underline-box.scss';
import bracketsTheme from './themes/brackets.scss';

export const TAB_THEMES = {
Default: defaultTheme,
Expand All @@ -38,6 +39,7 @@ export const TAB_THEMES = {
Vertical: verticalTheme,
Pills: pillsTheme,
'Underline box': underlineBoxTheme,
Brackets: bracketsTheme,
};

export default class TabsItemsLoader extends Component {
Expand Down
168 changes: 168 additions & 0 deletions src/shared/components/Contentful/Tabs/themes/brackets.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,168 @@
@import "~styles/mixins";

$container-background-gray: #ebebeb;
$text-color-black: #262628;
$text-color-gray: #888894;
$text-color-pannel: #4a4a4a;

.container {
margin: auto;

@include xs-to-sm {
margin-top: 65px;
}
}

.tabListWrap {
display: flex;
justify-content: center;
position: relative;

.tablist {
@include roboto-regular;

display: flex;
flex-direction: row;
justify-content: center;
list-style-type: none;
box-shadow: 0 2px 4px 0 rgba(0, 0, 0, 0.06);
margin: auto;
min-height: 60px;
border-radius: 30px;
align-items: center;
background-color: white;
padding: 0 25px;
border: 1px solid #e4e4e4;

@include xs-to-sm {
white-space: nowrap;
flex-direction: column;
padding: 28px 15px 0;
align-items: flex-start;
border-radius: 8px;
min-width: 85vw;
overflow: visible;
position: absolute;
z-index: 999;
display: none; // by default

&.visible {
display: flex;
}
}
}

.tabListMobileTrigger {
display: none;
justify-content: center;
align-items: center;
background-color: white;
position: absolute;
top: -65px;
width: 85vw;
left: calc(50% - 42.5vw);
outline: none;
border: navajowhite;
min-height: 60px;
font-family: Barlow, sans-serif;
font-size: 16px;
font-weight: 600;
text-transform: uppercase;
border-radius: 30px;
box-shadow: 0 2px 4px 0 rgba(0, 0, 0, 0.06);
color: #2a2a2a;

@media (max-width: 768px) {
display: flex;
}

.tabListMobileTriggerSVG,
.tabListMobileTriggerSVGOpen {
margin-left: 9px;
}

.tabListMobileTriggerSVGOpen {
transform: scaleY(-1);
}
}
}

.tab {
text-align: center;
margin: 0 25px;
color: #555;
font-family: Barlow, sans-serif;
font-size: 16px;
font-weight: 600;
line-height: 20px;
padding-bottom: 5px;
cursor: pointer;
margin-bottom: -5px;
position: relative;

@include xs-to-sm {
margin: 0;
margin-bottom: 23px;
padding: 0;
padding-left: 5px;

&::after {
display: none;
}

&:hover,
&.selected {
border-left: 3px solid #43d7b0;
margin-left: -3px;
}
}

&:hover,
&.selected {
color: #2a2a2a;

&::after {
content: '';
border-radius: 1000vw;
background: #43d7b0;
height: 3px;
width: 15px;
position: absolute;
bottom: 0;
left: calc(50% - 7px);
border-left: 1px solid #fff;
border-right: 1px solid #fff;

@include xs-to-sm {
width: calc(100% - 36px);
bottom: -5px;
}
}
}

p {
small {
color: #888894;
font-size: 13px;
font-weight: 400;
line-height: 25px;
text-align: left;
}

strong {
font-weight: bold;
}
}
}

.tabpannel {
display: none;
}

.selectedTabPanel {
display: block;

@include xs-to-sm {
padding: 0 15px;
}
}
Loading