Skip to content

Commit 4c53844

Browse files
codeMintercodeMinter
authored
Merge branch 'develop-from-master-23may' into feature-profile-enhancements
2 parents c524b65 + 9da908f commit 4c53844

File tree

47 files changed

+1388
-487
lines changed

Some content is hidden

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

47 files changed

+1388
-487
lines changed

‎.circleci/config.yml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -174,7 +174,8 @@ workflows:
174174
filters:
175175
branches:
176176
only:
177-
- feature-profile-enhancements
177+
- develop-from-master-23may
178+
- hot-fixes-4
178179
# This is alternate dev env for parallel testing
179180
- "build-test":
180181
context : org-global
@@ -189,10 +190,10 @@ workflows:
189190
filters:
190191
branches:
191192
only:
192-
- hot-fixes
193193
- develop
194194
- general-features
195195
- develop-from-master-23may
196+
- hot-fixes-4
196197
# Production builds are exectuted only on tagged commits to the
197198
# master branch.
198199
- "build-prod":

‎.eslintrc

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
{
22
"extends": "./node_modules/topcoder-react-utils/config/eslint/default.json",
33
"rules": {
4-
"jsx-a11y/anchor-is-valid": false
4+
"jsx-a11y/anchor-is-valid": false,
5+
"import/no-cycle": [2, { "maxDepth": 1 }]
56
},
67
"env": {
78
"browser": true

‎__tests__/shared/components/Contentful/MemberCard/MemberCard.jsx

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
import React from 'react';
2+
import Renderer from 'react-test-renderer/shallow';
3+
import { MemberCardInner } from 'components/Contentful/MemberCard/MemberCard';
4+
5+
test('Matches shallow shapshot', () => {
6+
const renderer = new Renderer();
7+
const MOCK_PROPS = {
8+
memberCard: {
9+
country: 'es',
10+
},
11+
trackIcon: {
12+
file: {
13+
url: 'https://www.topcoder.com',
14+
},
15+
},
16+
theme: {},
17+
};
18+
renderer.render(<MemberCardInner {...MOCK_PROPS} />);
19+
expect(renderer.getRenderOutput()).toMatchSnapshot();
20+
});

‎__tests__/shared/components/Contentful/MemberCard/__snapshots__/MemberCard.jsx.snap

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
// Jest Snapshot v1, https://goo.gl/fbAQLP
2+
3+
exports[`Matches shallow shapshot 1`] = `
4+
<a>
5+
<div>
6+
<div
7+
style={
8+
Object {
9+
"backgroundColor": "#63c630",
10+
}
11+
}
12+
>
13+
<img
14+
alt="track icon"
15+
src="https://www.topcoder.com"
16+
/>
17+
</div>
18+
<div>
19+
<div />
20+
<div>
21+
<span
22+
className="flag-icon flag-icon-es undefined"
23+
/>
24+
<span>
25+
SPAIN
26+
</span>
27+
</div>
28+
</div>
29+
</div>
30+
</a>
31+
`;

‎__tests__/shared/components/ProfilePage/Skill/__snapshots__/index.jsx.snap

Lines changed: 16 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,23 @@ exports[`renders a skill correctly 1`] = `
1515
/>
1616
</div>
1717
<div
18-
className="src-shared-components-ProfilePage-Skill-___styles__name___31cKG"
18+
className="src-shared-components-ProfilePage-Skill-___styles__name-wrapper___2hnPT"
1919
>
20-
Test Skill
20+
<div
21+
className="src-shared-components-ProfilePage-Skill-___styles__name___31cKG"
22+
>
23+
Test Skill
24+
</div>
25+
<div
26+
className="src-shared-components-ProfilePage-Skill-___styles__verified-badge____BoiH"
27+
>
28+
<VerifiedBadgeIcon
29+
height="14"
30+
viewBox="0 0 14 14"
31+
width="14"
32+
xmlns="http://www.w3.org/2000/svg"
33+
/>
34+
</div>
2135
</div>
2236
</div>
2337
`;

‎__tests__/shared/components/ProfilePage/Skill/index.jsx

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ it('renders a skill correctly', () => {
99
rnd.render((<Skill
1010
tagId="1"
1111
tagName="Test Skill"
12+
isVerified
1213
/>));
1314
expect(rnd.getRenderOutput()).toMatchSnapshot();
1415
});

‎__tests__/shared/components/ProfilePage/__snapshots__/index.jsx.snap

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -83,6 +83,7 @@ exports[`renders a full Profile correctly 1`] = `
8383
className="src-shared-components-ProfilePage-___styles__skill___17_DJ"
8484
>
8585
<Skill
86+
isVerified={false}
8687
tagId="117"
8788
tagName="API"
8889
/>
@@ -91,6 +92,7 @@ exports[`renders a full Profile correctly 1`] = `
9192
className="src-shared-components-ProfilePage-___styles__skill___17_DJ"
9293
>
9394
<Skill
95+
isVerified={false}
9496
tagId="125"
9597
tagName="Bash"
9698
/>
@@ -99,6 +101,7 @@ exports[`renders a full Profile correctly 1`] = `
99101
className="src-shared-components-ProfilePage-___styles__skill___17_DJ"
100102
>
101103
<Skill
104+
isVerified={false}
102105
tagId="132"
103106
tagName="C#"
104107
/>
@@ -107,6 +110,7 @@ exports[`renders a full Profile correctly 1`] = `
107110
className="src-shared-components-ProfilePage-___styles__skill___17_DJ"
108111
>
109112
<Skill
113+
isVerified={false}
110114
tagId="153"
111115
tagName="CSS"
112116
/>
@@ -115,6 +119,7 @@ exports[`renders a full Profile correctly 1`] = `
115119
className="src-shared-components-ProfilePage-___styles__skill___17_DJ"
116120
>
117121
<Skill
122+
isVerified={false}
118123
tagId="159"
119124
tagName="Database"
120125
/>
@@ -123,6 +128,7 @@ exports[`renders a full Profile correctly 1`] = `
123128
className="src-shared-components-ProfilePage-___styles__skill___17_DJ"
124129
>
125130
<Skill
131+
isVerified={false}
126132
tagId="168"
127133
tagName="EC2"
128134
/>
@@ -131,6 +137,7 @@ exports[`renders a full Profile correctly 1`] = `
131137
className="src-shared-components-ProfilePage-___styles__skill___17_DJ"
132138
>
133139
<Skill
140+
isVerified={false}
134141
tagId="170"
135142
tagName="EJB"
136143
/>
@@ -139,6 +146,7 @@ exports[`renders a full Profile correctly 1`] = `
139146
className="src-shared-components-ProfilePage-___styles__skill___17_DJ"
140147
>
141148
<Skill
149+
isVerified={false}
142150
tagId="176"
143151
tagName="Excel"
144152
/>
@@ -147,6 +155,7 @@ exports[`renders a full Profile correctly 1`] = `
147155
className="src-shared-components-ProfilePage-___styles__skill___17_DJ"
148156
>
149157
<Skill
158+
isVerified={false}
150159
tagId="212"
151160
tagName="HTML"
152161
/>
@@ -155,6 +164,7 @@ exports[`renders a full Profile correctly 1`] = `
155164
className="src-shared-components-ProfilePage-___styles__skill___17_DJ"
156165
>
157166
<Skill
167+
isVerified={false}
158168
tagId="247"
159169
tagName="Java"
160170
/>

‎config/webpack/default.js

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -30,14 +30,17 @@ module.exports = {
3030
* are not bundled. */
3131
/utils[\\/]router[\\/]require/,
3232
],
33-
rules: [{
34-
test: /\.svg$/,
35-
loader: 'file-loader',
36-
options: {
37-
outputPath: '/images/',
38-
publicPath: `${publicPath}/images`,
33+
rules: [
34+
{
35+
test: /\.svg$/,
36+
loader: 'file-loader',
37+
options: {
38+
outputPath: '/images/',
39+
publicPath: `${publicPath}/images`,
40+
},
41+
exclude: /node_modules/,
3942
},
40-
}],
43+
],
4144
},
4245
plugins: [
4346
new CopyWebpackPlugin([{

‎docs/contentful/custom-inline-components-in-markdown-fields.md

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -90,6 +90,14 @@ other types too.
9090
component works only with YouTube videos, and the URL should be similar to
9191
`https://www.youtube.com/embed/mD12LIqdxqk` ().
9292

93+
- #### NewsletterArchive
94+
*Example:* `<NewsletterArchive name="Design Newsletter" />`
95+
96+
A list of archive links sorted by descending `sent_date` from a MailChimp's campaign folder. Sould be working under any MarkdownParser component.
97+
98+
The properties are:
99+
- `name` - the unique name of the camplaing foler. It has to be only one name entity. If those duplicate first found will be picked up and rest ignored.
100+
93101
## Links
94102

95103
- #### Link

‎docs/contentful/index.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ Instructions are also provided below for developments that want to modify/create
2727
- [Navigation Menu](./NavigationMenu.md)
2828
- [Route](./Route.md)
2929
- [Viewport](./viewport.md)
30+
- [Member Card](./memberCard.md)
3031
- [Preview Content](./preview-content.md)
3132
- [Custom inline components in Markdown fields](./custom-inline-components-in-markdown-fields.md)
3233
- [Miscellaneous CSS Solutions](./miscellaneous-CSS-solutions.md)

‎docs/contentful/memberCard.md

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
# Member Card
2+
A card looking component that represents member/speaker/person card.
3+
4+
## Fields
5+
![](./pics/memberCard.png)
6+
7+
## Live Demo
8+
https://community-app.topcoder.com/examples/contentful/viewport/4SKonli2adCNFxBvgaeayI

‎docs/contentful/pics/memberCard.png

98.2 KB
Loading

0 commit comments

Comments
 (0)