@bento-core/about 1.0.1-CDS.9 → 1.0.1-c3dc.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/aboutBodyView.js +17 -136
- package/dist/aboutHeaderView.js +8 -14
- package/package.json +4 -6
- package/src/aboutBodyView.js +19 -177
- package/src/aboutHeaderView.js +5 -8
package/dist/aboutBodyView.js
CHANGED
|
@@ -6,10 +6,9 @@ Object.defineProperty(exports, "__esModule", {
|
|
|
6
6
|
exports.default = void 0;
|
|
7
7
|
var _react = _interopRequireDefault(require("react"));
|
|
8
8
|
var _core = require("@material-ui/core");
|
|
9
|
-
var _reactRouterDom = require("react-router-dom");
|
|
10
9
|
var _xoomInOutView = _interopRequireDefault(require("./xoomInOutView"));
|
|
10
|
+
var _AboutTableExternalLink = _interopRequireDefault(require("./assets/About-Table-ExternalLink.svg"));
|
|
11
11
|
function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
|
|
12
|
-
function _extends() { _extends = Object.assign ? Object.assign.bind() : function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); }
|
|
13
12
|
const AboutBody = _ref => {
|
|
14
13
|
let {
|
|
15
14
|
classes,
|
|
@@ -57,9 +56,7 @@ const AboutBody = _ref => {
|
|
|
57
56
|
// Alphetised sub ordered list
|
|
58
57
|
_react.default.createElement("ol", {
|
|
59
58
|
type: "a"
|
|
60
|
-
}, listObj.listWithAlpahbets.map(listObj1 => /*#__PURE__*/_react.default.createElement("li", null, listObj1.includes('$$') ? boldText(listObj1) : listObj1))) : /*#__PURE__*/_react.default.createElement("li", null, listObj.includes('$$') ? boldText(listObj) : listObj)))), contentObj.
|
|
61
|
-
className: classes.text
|
|
62
|
-
}, /*#__PURE__*/_react.default.createElement("ul", null, contentObj.listWithBullets.map(listObj => /*#__PURE__*/_react.default.createElement("li", null, listObj.includes('$$') ? boldText(listObj) : listObj)))), contentObj.listWithAlpahbets && /*#__PURE__*/_react.default.createElement("div", {
|
|
59
|
+
}, listObj.listWithAlpahbets.map(listObj1 => /*#__PURE__*/_react.default.createElement("li", null, listObj1.includes('$$') ? boldText(listObj1) : listObj1))) : /*#__PURE__*/_react.default.createElement("li", null, listObj.includes('$$') ? boldText(listObj) : listObj)))), contentObj.listWithAlpahbets && /*#__PURE__*/_react.default.createElement("div", {
|
|
63
60
|
className: classes.text
|
|
64
61
|
}, /*#__PURE__*/_react.default.createElement("ol", {
|
|
65
62
|
type: "a"
|
|
@@ -68,13 +65,12 @@ const AboutBody = _ref => {
|
|
|
68
65
|
}, contentObj.paragraph.split('$$').map(splitedParagraph => {
|
|
69
66
|
// Checking for regex ()[] pattern
|
|
70
67
|
if (splitedParagraph != null && (/\[(.+)\]\((.+)\)/g.test(splitedParagraph) || /\((.+)\)\[(.+)\]/g.test(splitedParagraph))) {
|
|
71
|
-
const
|
|
68
|
+
const title = splitedParagraph.match(/\[(.*)\]/).pop();
|
|
72
69
|
const linkAttrs = splitedParagraph.match(/\((.*)\)/).pop().split(' ');
|
|
73
|
-
const titleMatch = splitedParagraph.match(/title:\s*'([^']+)'/);
|
|
74
|
-
const title = titleMatch ? titleMatch[1].trim() : defaultTitle;
|
|
75
70
|
const target = linkAttrs.find(link => link.includes('target:'));
|
|
76
71
|
const url = linkAttrs.find(link => link.includes('url:'));
|
|
77
|
-
const
|
|
72
|
+
const type = linkAttrs.find(link => link.includes('type:')); // 0 : no img
|
|
73
|
+
const href = splitedParagraph.match(/\((.*)\)/).pop();
|
|
78
74
|
const link = /*#__PURE__*/_react.default.createElement(_core.Link, {
|
|
79
75
|
title: title,
|
|
80
76
|
target: target ? target.replace('target:', '') : '_blank',
|
|
@@ -82,8 +78,8 @@ const AboutBody = _ref => {
|
|
|
82
78
|
href: url ? url.replace('url:', '') : href && href.includes('@') ? "mailto:".concat(href) : href,
|
|
83
79
|
color: "inherit",
|
|
84
80
|
className: classes.link
|
|
85
|
-
},
|
|
86
|
-
return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, link,
|
|
81
|
+
}, title);
|
|
82
|
+
return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, link, type ? '' : /*#__PURE__*/_react.default.createElement("img", {
|
|
87
83
|
src: externalIconImage
|
|
88
84
|
// externalIconImage: 'https://raw.githubusercontent.com/CBIIT/datacommons-assets/main/common/images/logos/svgs/externalLinkIcon.svg',
|
|
89
85
|
,
|
|
@@ -191,69 +187,20 @@ const AboutBody = _ref => {
|
|
|
191
187
|
outputHTML = /*#__PURE__*/_react.default.createElement("td", {
|
|
192
188
|
className: classes.tableCell
|
|
193
189
|
}, link, type ? '' : /*#__PURE__*/_react.default.createElement("img", {
|
|
194
|
-
src:
|
|
190
|
+
src: _AboutTableExternalLink.default,
|
|
195
191
|
alt: "outbounnd web site icon",
|
|
196
192
|
className: classes.tablelinkIcon
|
|
197
193
|
}));
|
|
198
194
|
}
|
|
199
195
|
return outputHTML;
|
|
200
|
-
}))))))), /*#__PURE__*/_react.default.createElement("br", null))) : ''), data.
|
|
201
|
-
className: classes.downloadableContentContainer
|
|
202
|
-
}, /*#__PURE__*/_react.default.createElement("div", {
|
|
203
|
-
className: classes.downloadableContentTitle
|
|
204
|
-
}, data.downloadableContentTitle), /*#__PURE__*/_react.default.createElement("span", {
|
|
205
|
-
className: classes.text
|
|
206
|
-
}, data.downloadableContent ? data.downloadableContent.map(contentObj => /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, contentObj.paragraph && /*#__PURE__*/_react.default.createElement("div", {
|
|
207
|
-
className: classes.text
|
|
208
|
-
}, contentObj.paragraph.split('$$').map(splitedParagraph => {
|
|
209
|
-
// Checking for regex ()[] pattern
|
|
210
|
-
if (splitedParagraph != null && (/\[(.+)\]\((.+)\)/g.test(splitedParagraph) || /\((.+)\)\[(.+)\]/g.test(splitedParagraph))) {
|
|
211
|
-
const title = splitedParagraph.match(/\[(.*)\]/).pop();
|
|
212
|
-
const linkAttrs = splitedParagraph.match(/\((.*)\)/).pop().split(' ');
|
|
213
|
-
const target = linkAttrs.find(link => link.includes('target:'));
|
|
214
|
-
const url = linkAttrs.find(link => link.includes('url:'));
|
|
215
|
-
const href = splitedParagraph.match(/\((.*)\)/).pop();
|
|
216
|
-
const link = /*#__PURE__*/_react.default.createElement(_core.Link, {
|
|
217
|
-
title: title,
|
|
218
|
-
target: target ? target.replace('target:', '') : '_blank',
|
|
219
|
-
rel: "noreferrer",
|
|
220
|
-
href: url ? url.replace('url:', '') : href && href.includes('@') ? "mailto:".concat(href) : href,
|
|
221
|
-
color: "inherit",
|
|
222
|
-
className: classes.link
|
|
223
|
-
}, title);
|
|
224
|
-
return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, link, href.includes('@') || !href.includes('http') ? '' : /*#__PURE__*/_react.default.createElement("img", {
|
|
225
|
-
src: externalIconImage
|
|
226
|
-
// externalIconImage: 'https://raw.githubusercontent.com/CBIIT/datacommons-assets/main/common/images/logos/svgs/externalLinkIcon.svg',
|
|
227
|
-
,
|
|
228
|
-
alt: "outbounnd web site icon",
|
|
229
|
-
className: classes.linkIcon
|
|
230
|
-
}));
|
|
231
|
-
}
|
|
232
|
-
return splitedParagraph;
|
|
233
|
-
})))) : ''))), (data.imageLocation === 'right' || data.actionButtonLabel && data.actionLink) && /*#__PURE__*/_react.default.createElement(_core.Grid, {
|
|
196
|
+
}))))))), /*#__PURE__*/_react.default.createElement("br", null))) : '')), data.imageLocation === 'right' && /*#__PURE__*/_react.default.createElement(_core.Grid, {
|
|
234
197
|
item: true,
|
|
235
198
|
lg: 3,
|
|
236
199
|
md: 3,
|
|
237
200
|
sm: 12,
|
|
238
201
|
xs: 12,
|
|
239
202
|
className: classes.imageSection
|
|
240
|
-
}, data.image, data.
|
|
241
|
-
className: classes.actionSection
|
|
242
|
-
}, data.actionTitle && /*#__PURE__*/_react.default.createElement("div", {
|
|
243
|
-
className: classes.actionTitle
|
|
244
|
-
}, data.actionTitle), /*#__PURE__*/_react.default.createElement(_core.Link, _extends({}, data.actionLink && data.actionLink.includes('http') ? {
|
|
245
|
-
href: data.actionLink,
|
|
246
|
-
target: '_blank',
|
|
247
|
-
rel: 'noreferrer'
|
|
248
|
-
} : {
|
|
249
|
-
component: _reactRouterDom.Link,
|
|
250
|
-
to: data.actionLink
|
|
251
|
-
}, {
|
|
252
|
-
title: data.actionButtonLabel,
|
|
253
|
-
color: "inherit",
|
|
254
|
-
underline: "none",
|
|
255
|
-
className: classes.actionLink
|
|
256
|
-
}), data.actionButtonLabel))))), data.secondaryZoomImageTitle && /*#__PURE__*/_react.default.createElement("div", {
|
|
203
|
+
}, data.image))), data.secondaryZoomImageTitle && /*#__PURE__*/_react.default.createElement("div", {
|
|
257
204
|
className: classes.secondayTitle
|
|
258
205
|
}, data.secondaryZoomImageTitle), data.secondaryImage && /*#__PURE__*/_react.default.createElement(_xoomInOutView.default, null, data.secondaryImageData));
|
|
259
206
|
};
|
|
@@ -266,9 +213,6 @@ const styles = () => ({
|
|
|
266
213
|
lineHeight: '22px',
|
|
267
214
|
maxWidth: '1440px'
|
|
268
215
|
},
|
|
269
|
-
tabbedParag: {
|
|
270
|
-
paddingLeft: '40px'
|
|
271
|
-
},
|
|
272
216
|
maxWidthContainer: {
|
|
273
217
|
margin: '0px auto 0px auto',
|
|
274
218
|
maxWidth: '1440px'
|
|
@@ -292,83 +236,32 @@ const styles = () => ({
|
|
|
292
236
|
},
|
|
293
237
|
title: props => ({
|
|
294
238
|
color: props.titleColor,
|
|
295
|
-
fontWeight: '
|
|
296
|
-
fontSize: '24px'
|
|
239
|
+
fontWeight: 'bold'
|
|
297
240
|
}),
|
|
298
241
|
email: props => ({
|
|
299
242
|
color: props.linkColor,
|
|
300
243
|
fontWeight: 'bold'
|
|
301
244
|
}),
|
|
302
245
|
contentSection: {
|
|
303
|
-
padding: props => props.data.imageLocation === 'right'
|
|
304
|
-
|
|
305
|
-
float: 'left',
|
|
306
|
-
background: 'white'
|
|
246
|
+
padding: props => props.data.imageLocation === 'right' ? '8px 25px 8px 0px !important' : '8px 0px 8px 25px !important',
|
|
247
|
+
float: 'left'
|
|
307
248
|
},
|
|
308
249
|
imageSection: {
|
|
309
250
|
float: 'left'
|
|
310
251
|
},
|
|
311
|
-
actionSection: {
|
|
312
|
-
display: 'flex',
|
|
313
|
-
width: '100%',
|
|
314
|
-
padding: '25px 25px 35px',
|
|
315
|
-
flexDirection: 'column',
|
|
316
|
-
alignItems: 'center',
|
|
317
|
-
flexShrink: 0,
|
|
318
|
-
border: '0.5px solid #98B5CB',
|
|
319
|
-
background: '#EBF3F7',
|
|
320
|
-
marginTop: '19px'
|
|
321
|
-
},
|
|
322
|
-
actionTitle: {
|
|
323
|
-
color: '#7A9BB1',
|
|
324
|
-
textAlign: 'center',
|
|
325
|
-
fontFamily: 'Lato',
|
|
326
|
-
fontSize: '19px',
|
|
327
|
-
fontStyle: 'normal',
|
|
328
|
-
fontWeight: '700',
|
|
329
|
-
lineHeight: '25px',
|
|
330
|
-
letterSpacing: '0.15px',
|
|
331
|
-
textTransform: 'uppercase',
|
|
332
|
-
wordBreak: 'break-word',
|
|
333
|
-
marginBottom: '22px'
|
|
334
|
-
},
|
|
335
|
-
actionLink: {
|
|
336
|
-
display: 'flex',
|
|
337
|
-
width: '210px',
|
|
338
|
-
height: 'fit-content',
|
|
339
|
-
minHeight: '45px',
|
|
340
|
-
justifyContent: 'center',
|
|
341
|
-
alignItems: 'center',
|
|
342
|
-
gap: '10px',
|
|
343
|
-
flexShrink: '0',
|
|
344
|
-
borderRadius: '10px',
|
|
345
|
-
border: '1px solid #42779A',
|
|
346
|
-
background: '#0E6292',
|
|
347
|
-
color: '#FFF',
|
|
348
|
-
textAlign: 'center',
|
|
349
|
-
fontFamily: 'Lato',
|
|
350
|
-
fontSize: '12px',
|
|
351
|
-
fontStyle: 'normal',
|
|
352
|
-
fontWeight: 600,
|
|
353
|
-
lineHeight: 'normal',
|
|
354
|
-
letterSpacing: '1px',
|
|
355
|
-
wordBreak: 'break-word',
|
|
356
|
-
padding: '15.5px'
|
|
357
|
-
},
|
|
358
252
|
aboutSection: {
|
|
359
|
-
padding: '
|
|
253
|
+
padding: '60px 45px'
|
|
360
254
|
},
|
|
361
255
|
img: {
|
|
362
256
|
width: '100%'
|
|
363
257
|
},
|
|
364
258
|
linkIcon: {
|
|
365
|
-
width: '
|
|
259
|
+
width: '20px',
|
|
366
260
|
verticalAlign: 'sub',
|
|
367
|
-
margin: '0px 0px
|
|
261
|
+
margin: '0px 0px 0px 2px'
|
|
368
262
|
},
|
|
369
263
|
link: props => ({
|
|
370
264
|
color: props.linkColor,
|
|
371
|
-
fontWeight: '600',
|
|
372
265
|
'&:hover': {
|
|
373
266
|
color: props.linkColor
|
|
374
267
|
}
|
|
@@ -390,6 +283,7 @@ const styles = () => ({
|
|
|
390
283
|
borderCollapse: 'collapse',
|
|
391
284
|
fontSize: '12px',
|
|
392
285
|
fontWeight: 'bold',
|
|
286
|
+
letterSpacing: '0.025em',
|
|
393
287
|
lineHeight: '30px',
|
|
394
288
|
textAlign: 'left',
|
|
395
289
|
width: '100%'
|
|
@@ -418,19 +312,6 @@ const styles = () => ({
|
|
|
418
312
|
},
|
|
419
313
|
MyCasesWizardStep4: {
|
|
420
314
|
width: '600px'
|
|
421
|
-
},
|
|
422
|
-
downloadableContentContainer: {
|
|
423
|
-
background: '#ebebeb',
|
|
424
|
-
padding: '32px',
|
|
425
|
-
borderRadius: '8px'
|
|
426
|
-
},
|
|
427
|
-
downloadableContentTitle: {
|
|
428
|
-
fontWeight: 'bold',
|
|
429
|
-
marginBottom: '20px',
|
|
430
|
-
color: '#1280AE',
|
|
431
|
-
fontSize: '20px',
|
|
432
|
-
fontFamily: 'Lato',
|
|
433
|
-
letterSpacing: '0.025em'
|
|
434
315
|
}
|
|
435
316
|
});
|
|
436
317
|
AboutBody.defaultProps = {
|
package/dist/aboutHeaderView.js
CHANGED
|
@@ -7,11 +7,6 @@ exports.default = void 0;
|
|
|
7
7
|
var _react = _interopRequireDefault(require("react"));
|
|
8
8
|
var _core = require("@material-ui/core");
|
|
9
9
|
function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
|
|
10
|
-
function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
|
|
11
|
-
function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
|
|
12
|
-
function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
|
|
13
|
-
function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return typeof key === "symbol" ? key : String(key); }
|
|
14
|
-
function _toPrimitive(input, hint) { if (typeof input !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (typeof res !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); }
|
|
15
10
|
const AboutHeader = _ref => {
|
|
16
11
|
let {
|
|
17
12
|
classes,
|
|
@@ -24,7 +19,7 @@ const AboutHeader = _ref => {
|
|
|
24
19
|
}, /*#__PURE__*/_react.default.createElement("div", {
|
|
25
20
|
id: "about_title",
|
|
26
21
|
className: classes.titleBody
|
|
27
|
-
}, /*#__PURE__*/_react.default.createElement("
|
|
22
|
+
}, /*#__PURE__*/_react.default.createElement("span", {
|
|
28
23
|
className: classes.titleText
|
|
29
24
|
}, title))), /*#__PURE__*/_react.default.createElement("div", {
|
|
30
25
|
className: classes.whitePadding
|
|
@@ -34,13 +29,13 @@ const styles = () => ({
|
|
|
34
29
|
header: {
|
|
35
30
|
padding: '45px'
|
|
36
31
|
},
|
|
37
|
-
container: props =>
|
|
32
|
+
container: props => ({
|
|
38
33
|
background: props.background
|
|
39
|
-
}
|
|
40
|
-
whitePadding:
|
|
41
|
-
height:
|
|
42
|
-
background:
|
|
43
|
-
},
|
|
34
|
+
}),
|
|
35
|
+
whitePadding: {
|
|
36
|
+
height: '6px',
|
|
37
|
+
background: 'white'
|
|
38
|
+
},
|
|
44
39
|
titleBody: {
|
|
45
40
|
textAlign: 'center'
|
|
46
41
|
},
|
|
@@ -50,8 +45,7 @@ const styles = () => ({
|
|
|
50
45
|
color: props.titleColor,
|
|
51
46
|
fontFamily: 'Lato',
|
|
52
47
|
fontSize: '35px',
|
|
53
|
-
fontWeight: 'bold'
|
|
54
|
-
display: 'inline'
|
|
48
|
+
fontWeight: 'bold'
|
|
55
49
|
})
|
|
56
50
|
});
|
|
57
51
|
AboutHeader.defaultProps = {
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@bento-core/about",
|
|
3
|
-
"version": "1.0.1-
|
|
3
|
+
"version": "1.0.1-c3dc.0",
|
|
4
4
|
"description": "",
|
|
5
5
|
"main": "dist/index.js",
|
|
6
6
|
"scripts": {
|
|
@@ -13,7 +13,7 @@
|
|
|
13
13
|
"access": "public"
|
|
14
14
|
},
|
|
15
15
|
"dependencies": {
|
|
16
|
-
"@bento-core/facet-filter": "^1.0.1-
|
|
16
|
+
"@bento-core/facet-filter": "^1.0.1-c3dc.3",
|
|
17
17
|
"lodash": "^4.17.20",
|
|
18
18
|
"react-zoom-pan-pinch": "*"
|
|
19
19
|
},
|
|
@@ -22,10 +22,8 @@
|
|
|
22
22
|
"clsx": "^1.2.1",
|
|
23
23
|
"react": "^17.0.2",
|
|
24
24
|
"react-dom": "^17.0.0",
|
|
25
|
-
"react-redux": "^7.2.1"
|
|
26
|
-
"react-router-dom": "^5.1.2"
|
|
25
|
+
"react-redux": "^7.2.1"
|
|
27
26
|
},
|
|
28
27
|
"author": "CTOS Bento Team",
|
|
29
|
-
"license": "ISC"
|
|
30
|
-
"gitHead": "61639923b9c77418e4b96267b0e4e430d0756b55"
|
|
28
|
+
"license": "ISC"
|
|
31
29
|
}
|
package/src/aboutBodyView.js
CHANGED
|
@@ -1,11 +1,9 @@
|
|
|
1
1
|
import React from 'react';
|
|
2
2
|
import { Grid, Link, withStyles } from '@material-ui/core';
|
|
3
|
-
import { Link as RouterLink } from 'react-router-dom';
|
|
4
3
|
import XoomInOut from './xoomInOutView';
|
|
4
|
+
import tableExternalIcon from './assets/About-Table-ExternalLink.svg';
|
|
5
5
|
|
|
6
|
-
const AboutBody = ({
|
|
7
|
-
classes, data, externalIconImage,
|
|
8
|
-
}) => {
|
|
6
|
+
const AboutBody = ({ classes, data, externalIconImage }) => {
|
|
9
7
|
function boldText(text) {
|
|
10
8
|
const boldedText = text.split('$$').map((splitedText) => {
|
|
11
9
|
if (splitedText != null && (/\*(.*)\*/.test(splitedText))) {
|
|
@@ -46,14 +44,6 @@ const AboutBody = ({
|
|
|
46
44
|
</ol>
|
|
47
45
|
</div>
|
|
48
46
|
)}
|
|
49
|
-
{contentObj.listWithBullets && (
|
|
50
|
-
<div className={classes.text}>
|
|
51
|
-
{/* Alphabetised ordered list */}
|
|
52
|
-
<ul>
|
|
53
|
-
{ contentObj.listWithBullets.map((listObj) => <li>{listObj.includes('$$') ? boldText(listObj) : listObj}</li>)}
|
|
54
|
-
</ul>
|
|
55
|
-
</div>
|
|
56
|
-
)}
|
|
57
47
|
{/* Ordered List with Alphabets logic */}
|
|
58
48
|
{contentObj.listWithAlpahbets && (
|
|
59
49
|
<div className={classes.text}>
|
|
@@ -70,13 +60,12 @@ const AboutBody = ({
|
|
|
70
60
|
{ contentObj.paragraph.split('$$').map((splitedParagraph) => {
|
|
71
61
|
// Checking for regex ()[] pattern
|
|
72
62
|
if (splitedParagraph != null && ((/\[(.+)\]\((.+)\)/g.test(splitedParagraph)) || (/\((.+)\)\[(.+)\]/g.test(splitedParagraph)))) {
|
|
73
|
-
const
|
|
63
|
+
const title = splitedParagraph.match(/\[(.*)\]/).pop();
|
|
74
64
|
const linkAttrs = splitedParagraph.match(/\((.*)\)/).pop().split(' ');
|
|
75
|
-
const titleMatch = splitedParagraph.match(/title:\s*'([^']+)'/);
|
|
76
|
-
const title = titleMatch ? titleMatch[1].trim() : defaultTitle;
|
|
77
65
|
const target = linkAttrs.find((link) => link.includes('target:'));
|
|
78
66
|
const url = linkAttrs.find((link) => link.includes('url:'));
|
|
79
|
-
const
|
|
67
|
+
const type = linkAttrs.find((link) => link.includes('type:')); // 0 : no img
|
|
68
|
+
const href = splitedParagraph.match(/\((.*)\)/).pop();
|
|
80
69
|
|
|
81
70
|
const link = (
|
|
82
71
|
<Link
|
|
@@ -87,14 +76,14 @@ const AboutBody = ({
|
|
|
87
76
|
color="inherit"
|
|
88
77
|
className={classes.link}
|
|
89
78
|
>
|
|
90
|
-
{
|
|
79
|
+
{title}
|
|
91
80
|
</Link>
|
|
92
81
|
);
|
|
93
82
|
|
|
94
83
|
return (
|
|
95
84
|
<>
|
|
96
85
|
{link}
|
|
97
|
-
{
|
|
86
|
+
{type ? '' : (
|
|
98
87
|
<img
|
|
99
88
|
src={externalIconImage}
|
|
100
89
|
// externalIconImage: 'https://raw.githubusercontent.com/CBIIT/datacommons-assets/main/common/images/logos/svgs/externalLinkIcon.svg',
|
|
@@ -218,7 +207,7 @@ const AboutBody = ({
|
|
|
218
207
|
{link}
|
|
219
208
|
{type ? '' : (
|
|
220
209
|
<img
|
|
221
|
-
src={
|
|
210
|
+
src={tableExternalIcon}
|
|
222
211
|
alt="outbounnd web site icon"
|
|
223
212
|
className={classes.tablelinkIcon}
|
|
224
213
|
/>
|
|
@@ -240,93 +229,12 @@ const AboutBody = ({
|
|
|
240
229
|
</>
|
|
241
230
|
)) : ''}
|
|
242
231
|
</span>
|
|
243
|
-
{data.downloadableContentTitle
|
|
244
|
-
&& (
|
|
245
|
-
<div className={classes.downloadableContentContainer}>
|
|
246
|
-
<div className={classes.downloadableContentTitle}>{data.downloadableContentTitle}</div>
|
|
247
|
-
<span className={classes.text}>
|
|
248
|
-
{data.downloadableContent ? data.downloadableContent.map((contentObj) => (
|
|
249
|
-
<>
|
|
250
|
-
{/* Ordered List with Numbers logic */}
|
|
251
|
-
|
|
252
|
-
{/* Paragraphs */}
|
|
253
|
-
{contentObj.paragraph && (
|
|
254
|
-
<div className={classes.text}>
|
|
255
|
-
{ contentObj.paragraph.split('$$').map((splitedParagraph) => {
|
|
256
|
-
// Checking for regex ()[] pattern
|
|
257
|
-
if (splitedParagraph != null && ((/\[(.+)\]\((.+)\)/g.test(splitedParagraph)) || (/\((.+)\)\[(.+)\]/g.test(splitedParagraph)))) {
|
|
258
|
-
const title = splitedParagraph.match(/\[(.*)\]/).pop();
|
|
259
|
-
const linkAttrs = splitedParagraph.match(/\((.*)\)/).pop().split(' ');
|
|
260
|
-
const target = linkAttrs.find((link) => link.includes('target:'));
|
|
261
|
-
const url = linkAttrs.find((link) => link.includes('url:'));
|
|
262
|
-
const href = splitedParagraph.match(/\((.*)\)/).pop();
|
|
263
|
-
|
|
264
|
-
const link = (
|
|
265
|
-
<Link
|
|
266
|
-
title={title}
|
|
267
|
-
target={target ? target.replace('target:', '') : '_blank'}
|
|
268
|
-
rel="noreferrer"
|
|
269
|
-
href={url ? url.replace('url:', '') : (href && href.includes('@') ? `mailto:${href}` : href)}
|
|
270
|
-
color="inherit"
|
|
271
|
-
className={classes.link}
|
|
272
|
-
>
|
|
273
|
-
{title}
|
|
274
|
-
</Link>
|
|
275
|
-
);
|
|
276
|
-
|
|
277
|
-
return (
|
|
278
|
-
<>
|
|
279
|
-
{link}
|
|
280
|
-
{href.includes('@') || !href.includes('http') ? '' : (
|
|
281
|
-
<img
|
|
282
|
-
src={externalIconImage}
|
|
283
|
-
// externalIconImage: 'https://raw.githubusercontent.com/CBIIT/datacommons-assets/main/common/images/logos/svgs/externalLinkIcon.svg',
|
|
284
|
-
alt="outbounnd web site icon"
|
|
285
|
-
className={classes.linkIcon}
|
|
286
|
-
/>
|
|
287
|
-
)}
|
|
288
|
-
|
|
289
|
-
</>
|
|
290
|
-
);
|
|
291
|
-
}
|
|
292
|
-
|
|
293
|
-
return splitedParagraph;
|
|
294
|
-
})}
|
|
295
|
-
</div>
|
|
296
|
-
)}
|
|
297
|
-
</>
|
|
298
|
-
)) : ''}
|
|
299
|
-
</span>
|
|
300
|
-
</div>
|
|
301
|
-
)}
|
|
302
232
|
</Grid>
|
|
303
|
-
{
|
|
304
|
-
|| (data.actionButtonLabel && data.actionLink))
|
|
233
|
+
{data.imageLocation === 'right'
|
|
305
234
|
&& (
|
|
306
|
-
|
|
307
|
-
|
|
308
|
-
|
|
309
|
-
{data.actionButtonLabel && data.actionLink && (
|
|
310
|
-
<div className={classes.actionSection}>
|
|
311
|
-
{data.actionTitle && (
|
|
312
|
-
<div className={classes.actionTitle}>
|
|
313
|
-
{data.actionTitle}
|
|
314
|
-
</div>
|
|
315
|
-
)}
|
|
316
|
-
<Link
|
|
317
|
-
{...(data.actionLink && data.actionLink.includes('http')
|
|
318
|
-
? { href: data.actionLink, target: '_blank', rel: 'noreferrer' }
|
|
319
|
-
: { component: RouterLink, to: data.actionLink })}
|
|
320
|
-
title={data.actionButtonLabel}
|
|
321
|
-
color="inherit"
|
|
322
|
-
underline="none"
|
|
323
|
-
className={classes.actionLink}
|
|
324
|
-
>
|
|
325
|
-
{data.actionButtonLabel}
|
|
326
|
-
</Link>
|
|
327
|
-
</div>
|
|
328
|
-
)}
|
|
329
|
-
</Grid>
|
|
235
|
+
<Grid item lg={3} md={3} sm={12} xs={12} className={classes.imageSection}>
|
|
236
|
+
{data.image}
|
|
237
|
+
</Grid>
|
|
330
238
|
)}
|
|
331
239
|
</Grid>
|
|
332
240
|
</div>
|
|
@@ -346,9 +254,6 @@ const styles = () => ({
|
|
|
346
254
|
lineHeight: '22px',
|
|
347
255
|
maxWidth: '1440px',
|
|
348
256
|
},
|
|
349
|
-
tabbedParag: {
|
|
350
|
-
paddingLeft: '40px',
|
|
351
|
-
},
|
|
352
257
|
maxWidthContainer: {
|
|
353
258
|
margin: '0px auto 0px auto',
|
|
354
259
|
maxWidth: '1440px',
|
|
@@ -372,84 +277,33 @@ const styles = () => ({
|
|
|
372
277
|
},
|
|
373
278
|
title: (props) => ({
|
|
374
279
|
color: props.titleColor,
|
|
375
|
-
fontWeight: '
|
|
376
|
-
fontSize: '24px',
|
|
280
|
+
fontWeight: 'bold',
|
|
377
281
|
}),
|
|
378
282
|
email: (props) => ({
|
|
379
283
|
color: props.linkColor,
|
|
380
284
|
fontWeight: 'bold',
|
|
381
285
|
}),
|
|
382
286
|
contentSection: {
|
|
383
|
-
padding: (props) => (
|
|
384
|
-
? '8px 25px 8px
|
|
385
|
-
marginBottom: (props) => (props.data.marginBottom ? props.data.marginBottom : 0),
|
|
287
|
+
padding: (props) => (props.data.imageLocation === 'right'
|
|
288
|
+
? '8px 25px 8px 0px !important' : '8px 0px 8px 25px !important'),
|
|
386
289
|
float: 'left',
|
|
387
|
-
background: 'white',
|
|
388
290
|
},
|
|
389
291
|
imageSection: {
|
|
390
292
|
float: 'left',
|
|
391
293
|
},
|
|
392
|
-
actionSection: {
|
|
393
|
-
display: 'flex',
|
|
394
|
-
width: '100%',
|
|
395
|
-
padding: '25px 25px 35px',
|
|
396
|
-
flexDirection: 'column',
|
|
397
|
-
alignItems: 'center',
|
|
398
|
-
flexShrink: 0,
|
|
399
|
-
border: '0.5px solid #98B5CB',
|
|
400
|
-
background: '#EBF3F7',
|
|
401
|
-
marginTop: '19px',
|
|
402
|
-
},
|
|
403
|
-
actionTitle: {
|
|
404
|
-
color: '#7A9BB1',
|
|
405
|
-
textAlign: 'center',
|
|
406
|
-
fontFamily: 'Lato',
|
|
407
|
-
fontSize: '19px',
|
|
408
|
-
fontStyle: 'normal',
|
|
409
|
-
fontWeight: '700',
|
|
410
|
-
lineHeight: '25px',
|
|
411
|
-
letterSpacing: '0.15px',
|
|
412
|
-
textTransform: 'uppercase',
|
|
413
|
-
wordBreak: 'break-word',
|
|
414
|
-
marginBottom: '22px',
|
|
415
|
-
},
|
|
416
|
-
actionLink: {
|
|
417
|
-
display: 'flex',
|
|
418
|
-
width: '210px',
|
|
419
|
-
height: 'fit-content',
|
|
420
|
-
minHeight: '45px',
|
|
421
|
-
justifyContent: 'center',
|
|
422
|
-
alignItems: 'center',
|
|
423
|
-
gap: '10px',
|
|
424
|
-
flexShrink: '0',
|
|
425
|
-
borderRadius: '10px',
|
|
426
|
-
border: '1px solid #42779A',
|
|
427
|
-
background: '#0E6292',
|
|
428
|
-
color: '#FFF',
|
|
429
|
-
textAlign: 'center',
|
|
430
|
-
fontFamily: 'Lato',
|
|
431
|
-
fontSize: '12px',
|
|
432
|
-
fontStyle: 'normal',
|
|
433
|
-
fontWeight: 600,
|
|
434
|
-
lineHeight: 'normal',
|
|
435
|
-
letterSpacing: '1px',
|
|
436
|
-
wordBreak: 'break-word',
|
|
437
|
-
padding: '15.5px',
|
|
438
|
-
},
|
|
439
294
|
aboutSection: {
|
|
440
|
-
padding: '
|
|
295
|
+
padding: '60px 45px',
|
|
441
296
|
},
|
|
442
297
|
img: {
|
|
443
298
|
width: '100%',
|
|
444
299
|
},
|
|
445
300
|
linkIcon: {
|
|
446
|
-
width: '
|
|
301
|
+
width: '20px',
|
|
447
302
|
verticalAlign: 'sub',
|
|
448
|
-
margin: '0px 0px
|
|
303
|
+
margin: '0px 0px 0px 2px',
|
|
449
304
|
},
|
|
450
305
|
link: (props) => ({
|
|
451
306
|
color: props.linkColor,
|
|
452
|
-
fontWeight: '600',
|
|
453
307
|
'&:hover': {
|
|
454
308
|
color: props.linkColor,
|
|
455
309
|
},
|
|
@@ -471,6 +325,7 @@ const styles = () => ({
|
|
|
471
325
|
borderCollapse: 'collapse',
|
|
472
326
|
fontSize: '12px',
|
|
473
327
|
fontWeight: 'bold',
|
|
328
|
+
letterSpacing: '0.025em',
|
|
474
329
|
lineHeight: '30px',
|
|
475
330
|
textAlign: 'left',
|
|
476
331
|
width: '100%',
|
|
@@ -501,19 +356,6 @@ const styles = () => ({
|
|
|
501
356
|
MyCasesWizardStep4: {
|
|
502
357
|
width: '600px',
|
|
503
358
|
},
|
|
504
|
-
downloadableContentContainer: {
|
|
505
|
-
background: '#ebebeb',
|
|
506
|
-
padding: '32px',
|
|
507
|
-
borderRadius: '8px',
|
|
508
|
-
},
|
|
509
|
-
downloadableContentTitle: {
|
|
510
|
-
fontWeight: 'bold',
|
|
511
|
-
marginBottom: '20px',
|
|
512
|
-
color: '#1280AE',
|
|
513
|
-
fontSize: '20px',
|
|
514
|
-
fontFamily: 'Lato',
|
|
515
|
-
letterSpacing: '0.025em',
|
|
516
|
-
},
|
|
517
359
|
});
|
|
518
360
|
|
|
519
361
|
AboutBody.defaultProps = {
|
package/src/aboutHeaderView.js
CHANGED
|
@@ -4,7 +4,7 @@ import { withStyles } from '@material-ui/core';
|
|
|
4
4
|
const AboutHeader = ({ classes, title }) => (
|
|
5
5
|
<div className={classes.container}>
|
|
6
6
|
<div className={classes.header}>
|
|
7
|
-
<div id="about_title" className={classes.titleBody}><
|
|
7
|
+
<div id="about_title" className={classes.titleBody}><span className={classes.titleText}>{title}</span></div>
|
|
8
8
|
</div>
|
|
9
9
|
<div className={classes.whitePadding} />
|
|
10
10
|
</div>
|
|
@@ -16,13 +16,11 @@ const styles = () => ({
|
|
|
16
16
|
},
|
|
17
17
|
container: (props) => ({
|
|
18
18
|
background: props.background,
|
|
19
|
-
...props.container,
|
|
20
|
-
}),
|
|
21
|
-
whitePadding: (props) => ({
|
|
22
|
-
height: props.whitePadding ? props.whitePadding.height : 0,
|
|
23
|
-
background: props.background,
|
|
24
|
-
...props.whitePadding,
|
|
25
19
|
}),
|
|
20
|
+
whitePadding: {
|
|
21
|
+
height: '6px',
|
|
22
|
+
background: 'white',
|
|
23
|
+
},
|
|
26
24
|
titleBody: {
|
|
27
25
|
textAlign: 'center',
|
|
28
26
|
},
|
|
@@ -33,7 +31,6 @@ const styles = () => ({
|
|
|
33
31
|
fontFamily: 'Lato',
|
|
34
32
|
fontSize: '35px',
|
|
35
33
|
fontWeight: 'bold',
|
|
36
|
-
display: 'inline',
|
|
37
34
|
}),
|
|
38
35
|
});
|
|
39
36
|
|