Skip to content

Commit 8d549fb

Browse files
authored
Merge pull request #532 from topcoder-platform/develop
vets updates
2 parents 38c478b + 3aaddad commit 8d549fb

File tree

45 files changed

+388
-67
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

45 files changed

+388
-67
lines changed

__tests__/shared/components/tc-communities/__snapshots__/CommunityStats.jsx.snap

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ exports[`Snapshot match 1`] = `
77
composeContextTheme="softly"
88
link={null}
99
mapThemrProps={[Function]}
10+
subTitle=""
1011
theme={
1112
Object {
1213
"container": "src-shared-components-tc-communities-CommunityStats-___style__container___3IKHh",

__tests__/shared/components/tc-communities/__snapshots__/NewsSection.jsx.snap

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ exports[`Matches shallow shapshot 1`] = `
77
composeContextTheme="softly"
88
link={null}
99
mapThemrProps={[Function]}
10+
subTitle=""
1011
theme={Object {}}
1112
themePriority="adhoc-context-default"
1213
title="Latest News"

__tests__/shared/components/tc-communities/communities/community-2/__snapshots__/Home.jsx.snap

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ exports[`Match shadow snapshot 1`] = `
2626
composeContextTheme="softly"
2727
link={null}
2828
mapThemrProps={[Function]}
29+
subTitle=""
2930
theme={
3031
Object {
3132
"container": "src-shared-components-tc-communities-communities-community-2-Home-___style__linksContainer___CzMMR",
@@ -75,6 +76,7 @@ exports[`Match shadow snapshot 1`] = `
7576
composeContextTheme="softly"
7677
link={null}
7778
mapThemrProps={[Function]}
79+
subTitle=""
7880
theme={
7981
Object {
8082
"container": "src-shared-components-tc-communities-communities-community-2-Home-___style__resourcesContainer___1Y23p",

__tests__/shared/components/tc-communities/communities/community-2/__snapshots__/Learn.jsx.snap

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ exports[`Match shadow snapshot 1`] = `
2525
composeContextTheme="softly"
2626
link={null}
2727
mapThemrProps={[Function]}
28+
subTitle=""
2829
theme={
2930
Object {
3031
"container": "src-shared-components-tc-communities-communities-community-2-Learn-___style__learnBasicsContainer___1ZPny",
@@ -95,6 +96,7 @@ exports[`Match shadow snapshot 1`] = `
9596
}
9697
}
9798
mapThemrProps={[Function]}
99+
subTitle=""
98100
theme={
99101
Object {
100102
"container": "src-shared-components-tc-communities-communities-community-2-Learn-___style__coursesContainer___3SRv4",
@@ -158,6 +160,7 @@ exports[`Match shadow snapshot 1`] = `
158160
composeContextTheme="softly"
159161
link={null}
160162
mapThemrProps={[Function]}
163+
subTitle=""
161164
theme={
162165
Object {
163166
"container": "src-shared-components-tc-communities-communities-community-2-Learn-___style__resourcesContainer___dzJCp",

__tests__/shared/components/tc-communities/communities/demo-expert/__snapshots__/Learn.jsx.snap

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ exports[`Snapshot match 1`] = `
2525
composeContextTheme="softly"
2626
link={null}
2727
mapThemrProps={[Function]}
28+
subTitle=""
2829
theme={
2930
Object {
3031
"container": "src-shared-components-tc-communities-communities-demo-expert-Learn-___style__learnBasicsContainer___aCUEb",
@@ -250,6 +251,7 @@ exports[`Snapshot match 1`] = `
250251
}
251252
}
252253
mapThemrProps={[Function]}
254+
subTitle=""
253255
theme={
254256
Object {
255257
"container": "src-shared-components-tc-communities-communities-demo-expert-Learn-___style__coursesContainer___1l39O",
@@ -313,6 +315,7 @@ exports[`Snapshot match 1`] = `
313315
composeContextTheme="softly"
314316
link={null}
315317
mapThemrProps={[Function]}
318+
subTitle=""
316319
theme={
317320
Object {
318321
"container": "src-shared-components-tc-communities-communities-demo-expert-Learn-___style__resourcesContainer___299NM",

__tests__/shared/components/tc-communities/communities/taskforce/__snapshots__/Home.jsx.snap

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,7 @@ exports[`Match shadow snapshot 1`] = `
4646
composeContextTheme="softly"
4747
link={null}
4848
mapThemrProps={[Function]}
49+
subTitle=""
4950
theme={
5051
Object {
5152
"container": "src-shared-components-tc-communities-communities-taskforce-Home-___style__linksContainer___25Lds",
@@ -99,6 +100,7 @@ exports[`Match shadow snapshot 1`] = `
99100
composeContextTheme="softly"
100101
link={null}
101102
mapThemrProps={[Function]}
103+
subTitle=""
102104
theme={
103105
Object {
104106
"container": "src-shared-components-tc-communities-communities-taskforce-Home-___style__WhatCanYouGetDone___1to7k",
@@ -125,6 +127,7 @@ exports[`Match shadow snapshot 1`] = `
125127
composeContextTheme="softly"
126128
link={null}
127129
mapThemrProps={[Function]}
130+
subTitle=""
128131
theme={
129132
Object {
130133
"container": "src-shared-components-tc-communities-communities-taskforce-Home-___style__resourcesContainer___tnDQ3",

__tests__/shared/components/tc-communities/communities/tc-prod-dev/__snapshots__/Learn.jsx.snap

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ exports[`Snapshot match 1`] = `
2525
composeContextTheme="softly"
2626
link={null}
2727
mapThemrProps={[Function]}
28+
subTitle=""
2829
theme={
2930
Object {
3031
"container": "src-shared-components-tc-communities-communities-tc-prod-dev-Learn-___style__learnBasicsContainer___1iYDC",
@@ -234,6 +235,7 @@ exports[`Snapshot match 1`] = `
234235
}
235236
}
236237
mapThemrProps={[Function]}
238+
subTitle=""
237239
theme={
238240
Object {
239241
"container": "src-shared-components-tc-communities-communities-tc-prod-dev-Learn-___style__coursesContainer____PCRk",
@@ -297,6 +299,7 @@ exports[`Snapshot match 1`] = `
297299
composeContextTheme="softly"
298300
link={null}
299301
mapThemrProps={[Function]}
302+
subTitle=""
300303
theme={
301304
Object {
302305
"container": "src-shared-components-tc-communities-communities-tc-prod-dev-Learn-___style__resourcesContainer___1uPkY",

__tests__/shared/components/tc-communities/communities/wipro/__snapshots__/Learn.jsx.snap

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ exports[`Snapshot match 1`] = `
2525
composeContextTheme="softly"
2626
link={null}
2727
mapThemrProps={[Function]}
28+
subTitle=""
2829
theme={Object {}}
2930
themePriority="adhoc-context-default"
3031
title={null}
-8.63 KB
7.32 KB
11.1 KB
9.24 KB
10.4 KB
14.8 KB
8.48 KB
10.4 KB
11.2 KB
10.1 KB
10.1 KB
6.34 KB
6.33 KB
7.22 KB
3.37 KB
2.95 KB
4.31 KB
4.76 KB
11.2 KB
55.8 KB
48.4 KB
32.6 KB
108 KB
66.4 KB
-46.5 KB
Binary file not shown.
Binary file not shown.
1.76 KB
1.73 KB
1.51 KB
1.41 KB
1.67 KB

src/server/tc-communities/veterans/metadata.json

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
"value": "2"
1414
}],
1515
"groupIds": ["20000007"],
16+
"terms": [21193],
1617
"logos": [{
1718
"img": "/themes/veterans/logo_topcoder_with_name.svg",
1819
"url": "https://www.topcoder.com"
@@ -27,9 +28,6 @@
2728
}, {
2829
"title": "Challenges",
2930
"url": "/challenges"
30-
}, {
31-
"title": "Leaderboard",
32-
"url": "/leaderboard"
3331
}
3432
],
3533
"leaderboardApiUrl": "https://api.topcoder.com/v4/looks/458/run/json/",

src/shared/components/tc-communities/Section/index.jsx

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,14 +22,15 @@ import { Link } from 'utils/router';
2222
import defaultStyle from './style.scss';
2323

2424
function Section(props) {
25-
const { anchor, title, children, link, theme } = props;
25+
const { anchor, subTitle, title, children, link, theme } = props;
2626

2727
return (
2828
<section className={theme.container}>
2929
{anchor && <a name={anchor}>&nbsp;</a>}
3030
{title &&
3131
<h2 className={theme.title}>{title}</h2>
3232
}
33+
{subTitle ? <h3 className={theme.subTitle}>{subTitle}</h3> : null}
3334
<div className={theme.content}>
3435
{children}
3536
</div>
@@ -42,13 +43,15 @@ function Section(props) {
4243

4344
Section.defaultProps = {
4445
anchor: null,
46+
subTitle: '',
4547
title: null,
4648
link: null,
4749
theme: {},
4850
};
4951

5052
Section.propTypes = {
5153
anchor: PT.string,
54+
subTitle: PT.string,
5255
title: PT.string,
5356
children: PT.node.isRequired,
5457
link: PT.shape({
@@ -57,6 +60,7 @@ Section.propTypes = {
5760
}),
5861
theme: PT.shape({
5962
container: PT.string,
63+
subTitle: PT.string,
6064
title: PT.string,
6165
content: PT.string,
6266
linkWrap: PT.string,

src/shared/components/tc-communities/Section/style.scss

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
@import '~styles/tc-styles';
1+
@import '~styles/mixins';
22

33
.container {
44
padding: 35px 0;
@@ -9,6 +9,18 @@
99
}
1010
}
1111

12+
.subTitle {
13+
color: #394146;
14+
font: 18px 'Open Sans';
15+
padding: 0 0 30px;
16+
text-align: center;
17+
18+
@include xxs-to-xs {
19+
font-size: 24px;
20+
padding-top: 30px;
21+
}
22+
}
23+
1224
.title {
1325
color: #394146;
1426
font: 600 36px/136.11% 'Open Sans';

0 commit comments

Comments
 (0)