Skip to content

Contentful updates #3008

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 51 commits into from
Jul 27, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
51 commits
Select commit Hold shift + click to select a range
7388c5a
Fix Server-side filtering on challenge listings
Apr 27, 2019
d144471
Keep challenge util reference name consistent
Apr 28, 2019
5084cc5
Check member's each external data before render <ExternalLink> component
Apr 28, 2019
534861f
Merge pull request #2339 from nauhil/hot-fixes
sushilshinde Apr 29, 2019
b9cdd8c
upgrading topcoder-react-lib version
sushilshinde Apr 29, 2019
b2829b2
deploying on test and beta env
sushilshinde Apr 29, 2019
3fe140b
Update react lib version
ThomasKranitsas Apr 30, 2019
45128d5
code 30090056
suppermancool May 3, 2019
b3972a7
removing deployment on test and beta env
sushilshinde May 6, 2019
9c84922
Merge pull request #2347 from suppermancool/code-30090056
ThomasKranitsas May 8, 2019
b2db0e5
updates from develop
sushilshinde May 16, 2019
8c2fcde
merges `server_side_filtering`
kkartunov May 16, 2019
ecfab16
Merge pull request #2358 from topcoder-platform/server_side_filtering
sushilshinde May 17, 2019
f9184eb
fixing syntax issues
sushilshinde May 17, 2019
5b50ca9
Merge remote-tracking branch 'origin/develop' into server_side_filtering
ThomasKranitsas May 21, 2019
11426eb
Fix code
ThomasKranitsas May 21, 2019
9f5051c
Fixed issues of server-side filtering on challenge listings
May 24, 2019
34d93fe
fix for serverside filtering issues in topcoder react lib 0.7.15
sushilshinde May 28, 2019
6a75204
fix for serverside filtering issues in topcoder react lib 0.7.15
sushilshinde May 28, 2019
009d1ae
Merge branch 'server_side_filtering' of https://github.com/nauhil/com…
ThomasKranitsas May 28, 2019
913dacb
Bump react lib version
ThomasKranitsas May 28, 2019
93c94b2
Resolve conflicts
ThomasKranitsas May 28, 2019
7554922
Fix lint conflict
kkartunov May 30, 2019
401c783
Merge pull request #2373 from topcoder-platform/server_side_filtering
sushilshinde May 30, 2019
1d21aae
Contentful Docs add Demos Update
kkartunov May 31, 2019
80bda72
Deploying SSF on beta
sushilshinde Jun 4, 2019
9036f0b
Fix for Issue #2391
Jun 5, 2019
dfec76a
Fix for Lint issues for #2391
Jun 6, 2019
a851467
Supplemental fix for Issue #2391
Jun 6, 2019
abe7df6
Merge pull request #2409 from mhikeo/issues/mhikeo/2391
sushilshinde Jun 6, 2019
c89b5d2
Revert "Fix for Issue #2391"
ThomasKranitsas Jun 6, 2019
321923f
Merge pull request #2413 from topcoder-platform/revert-2409-issues/mh…
sushilshinde Jun 6, 2019
df3b1bb
Update MM challenge leaderboard
Jul 4, 2019
001b744
Merge branch 'develop-from-master-23may' of https://github.com/nauhil…
ThomasKranitsas Jul 16, 2019
242fed0
Change react lib version
ThomasKranitsas Jul 17, 2019
15a3975
Update ci configs
ThomasKranitsas Jul 17, 2019
90c5bde
Update react lib version
ThomasKranitsas Jul 17, 2019
f59c0c2
Replace develop with develop-from-master-23may
sushilshinde Jul 18, 2019
c307d98
Update miscellaneous-CSS-solutions.md
kkartunov Jul 18, 2019
021145d
Merge pull request #2961 from topcoder-platform/mm-updated-leaderboar…
sushilshinde Jul 19, 2019
0391e43
Add TCO20 themes for banner and contentBlock
kkartunov Jul 19, 2019
bfe664f
Shapes and Images for Contemtful
kkartunov Jul 20, 2019
ee12114
Fix image mask bug
kkartunov Jul 20, 2019
be55173
Button fixes #2974
kkartunov Jul 20, 2019
fadbc2c
Implements #2972
kkartunov Jul 20, 2019
eb49943
Fixed snap test
kkartunov Jul 20, 2019
bb7c629
Feedback DaraK on new tco19/20 themes
kkartunov Jul 21, 2019
acc0911
Large card theme for contentBlocks
kkartunov Jul 21, 2019
946cd90
Revert "Mm updated leaderboard with fixes"
ThomasKranitsas Jul 23, 2019
0ccaaf8
Merge pull request #2991 from topcoder-platform/revert-2961-mm-update…
sushilshinde Jul 23, 2019
a61491c
Merge pull request #2986 from topcoder-platform/feature-contentful
sushilshinde Jul 23, 2019
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
24 changes: 24 additions & 0 deletions __tests__/shared/components/Contentful/Image/Image.jsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
import React from 'react';
import Renderer from 'react-test-renderer/shallow';
import { ImageInner } from 'components/Contentful/Image/Image';

test('Matches shallow shapshot', () => {
const renderer = new Renderer();
const MOCK_PROPS = {
id: '1',
image: {},
imageSource: {
file: {
url: 'https://www.topcoder.com',
},
},
clipSvg: {
file: {
url: 'https://www.topcoder.com',
},
},
theme: {},
};
renderer.render(<ImageInner {...MOCK_PROPS} />);
expect(renderer.getRenderOutput()).toMatchSnapshot();
});
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
// Jest Snapshot v1, https://goo.gl/fbAQLP

exports[`Matches shallow shapshot 1`] = `
<div
id="image-1"
>
<InlineSVG
baseURL=""
cacheGetRequests={false}
onLoad={[Function]}
preloader={
<ThemedLoadingIndicator
composeAdhocTheme="deeply"
composeContextTheme="softly"
mapThemrProps={[Function]}
themePriority="adhoc-context-default"
/>
}
src="https://www.topcoder.com"
supportTest={[Function]}
uniquifyIDs={true}
wrapper={[Function]}
/>
<img
alt=""
src="https://www.topcoder.com"
style={
Object {
"display": "none",
}
}
/>
</div>
`;
19 changes: 19 additions & 0 deletions __tests__/shared/components/Contentful/Shape/Shape.jsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
import React from 'react';
import Renderer from 'react-test-renderer/shallow';
import { ShapeInner } from 'components/Contentful/Shape/Shape';

test('Matches shallow shapshot', () => {
const renderer = new Renderer();
const MOCK_PROPS = {
id: '1',
shape: {},
shapeSvg: {
file: {
url: 'https://www.topcoder.com',
},
},
theme: {},
};
renderer.render(<ShapeInner {...MOCK_PROPS} />);
expect(renderer.getRenderOutput()).toMatchSnapshot();
});
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
// Jest Snapshot v1, https://goo.gl/fbAQLP

exports[`Matches shallow shapshot 1`] = `
<div
id="1"
style={
Object {
"backgroundImage": "url(https://www.topcoder.com)",
}
}
/>
`;
10 changes: 9 additions & 1 deletion docs/contentful/miscellaneous-CSS-solutions.md
Original file line number Diff line number Diff line change
Expand Up @@ -20,4 +20,12 @@ Content
"justify-content": "space-between",
"flex": "auto"
}
```
```

## Position banner content left/right
Put this custom CSS on content field.
```
{
"margin-left/right": "calc(100vw - 50%)
}
```
Loading