diff --git a/.env b/.env
new file mode 100644
index 000000000..ca5ffe6eb
--- /dev/null
+++ b/.env
@@ -0,0 +1,6 @@
+REACT_APP_BACKEND_GETUSERINFO_API=https://k9dc.essential-dev.com/fence/login/
+REACT_APP_LOGIN_URL=https://nci-crdc-staging.datacommons.io/user/oauth2/authorize?client_id=82pslYFJqA7auRvKYfTOK67jzQAMb8f6C33tlmZz&response_type=code&redirect_uri=https%3A%2F%2Fk9dc.essential-dev.com%2F&scope=openid%20user
+REACT_APP_USER_LOGOUT_URL=https://k9dc.essential-dev.com/fence/logout
+REACT_APP_BACKEND_API=https://trialcommons-dev.cancer.gov/v1/graphql/
+REACT_APP_APPLICATION_VERSION=YYYY_MM_DD/HH:MM
+REACT_APP_ABOUT_CONTENT_URL= https://raw.githubusercontent.com/CBIIT/ctdc-codebase/master/src/main/frontend/src/content/dev/aboutPagesContent.yaml
\ No newline at end of file
diff --git a/.eslintignore b/.eslintignore
new file mode 100644
index 000000000..b0baadca3
--- /dev/null
+++ b/.eslintignore
@@ -0,0 +1,2 @@
+src/serviceWorker.js
+src/index.js
\ No newline at end of file
diff --git a/.eslintrc.js b/.eslintrc.js
new file mode 100644
index 000000000..5977a7f87
--- /dev/null
+++ b/.eslintrc.js
@@ -0,0 +1,35 @@
+module.exports = {
+ env: {
+ browser: true,
+ es6: true,
+ },
+ extends: [
+ 'airbnb',
+ ],
+ parser: 'babel-eslint',
+ globals: {
+ Atomics: 'readonly',
+ SharedArrayBuffer: 'readonly',
+ },
+ parserOptions: {
+ ecmaFeatures: {
+ jsx: true,
+ modules: true,
+ },
+ ecmaVersion: 2018,
+ sourceType: 'module',
+ },
+ plugins: [
+ 'react',
+ ],
+ rules: {
+ "react/no-unescaped-entities": "off", // To escape the html entotoes in static text
+ "react/prop-types": "off", //Will add this back
+ "react/jsx-filename-extension": "off",
+ "react/no-array-index-key":"off", // This is for passing the array index in .map need to remove this soon
+ "no-nested-ternary":"off",
+ "jsx-a11y/no-static-element-interactions":"off",
+ "jsx-a11y/click-events-have-key-events":"off",
+ "react/jsx-props-no-spreading":"off",
+ },
+};
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 000000000..f1a7dd9c7
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,26 @@
+# See https://help.github.com/articles/ignoring-files/ for more about ignoring files.
+
+# dependencies
+/node_modules
+/.pnp
+.pnp.js
+
+# testing
+/coverage
+
+# production
+/dist
+
+# vscode
+/.vscode
+
+# misc
+.DS_Store
+.env.local
+.env.development.local
+.env.test.local
+.env.production.local
+
+npm-debug.log*
+yarn-debug.log*
+yarn-error.log*
diff --git a/config/env.js b/config/env.js
index 235c50858..b6299ca5d 100644
--- a/config/env.js
+++ b/config/env.js
@@ -65,6 +65,7 @@ function getClientEnvironment(publicUrl) {
.filter(key => REACT_APP.test(key))
.reduce(
(env, key) => {
+ // eslint-disable-next-line
env[key] = process.env[key];
return env;
},
@@ -82,6 +83,7 @@ function getClientEnvironment(publicUrl) {
// Stringify all values so we can feed into Webpack DefinePlugin
const stringified = {
'process.env': Object.keys(raw).reduce((env, key) => {
+ // eslint-disable-next-line
env[key] = JSON.stringify(raw[key]);
return env;
}, {}),
diff --git a/package-lock.json b/package-lock.json
index 5e0e62739..33ea18156 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,5 +1,5 @@
{
- "name": "icdc-frontend",
+ "name": "ctdc-frontend",
"version": "0.1.0",
"lockfileVersion": 1,
"requires": true,
@@ -2092,6 +2092,37 @@
"resolved": "https://registry.npmjs.org/aws4/-/aws4-1.8.0.tgz",
"integrity": "sha512-ReZxvNHIOv88FlT7rxcXIIC0fPt4KZqZbOlivyWtXLt8ESx84zd3kMC6iK5jVeS2qt+g7ftS7ye4fi06X5rtRQ=="
},
+ "axios": {
+ "version": "0.19.1",
+ "resolved": "https://registry.npmjs.org/axios/-/axios-0.19.1.tgz",
+ "integrity": "sha512-Yl+7nfreYKaLRvAvjNPkvfjnQHJM1yLBY3zhqAwcJSwR/6ETkanUgylgtIvkvz0xJ+p/vZuNw8X7Hnb7Whsbpw==",
+ "requires": {
+ "follow-redirects": "1.5.10"
+ },
+ "dependencies": {
+ "debug": {
+ "version": "3.1.0",
+ "resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz",
+ "integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==",
+ "requires": {
+ "ms": "2.0.0"
+ }
+ },
+ "follow-redirects": {
+ "version": "1.5.10",
+ "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.5.10.tgz",
+ "integrity": "sha512-0V5l4Cizzvqt5D44aTXbFZz+FtyXV1vrDN6qrelxtfYQKW0KO0W2T/hkE8xvGa/540LkZlkaUjO4ailYTFtHVQ==",
+ "requires": {
+ "debug": "=3.1.0"
+ }
+ },
+ "ms": {
+ "version": "2.0.0",
+ "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+ "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g="
+ }
+ }
+ },
"axobject-query": {
"version": "2.0.2",
"resolved": "https://registry.npmjs.org/axobject-query/-/axobject-query-2.0.2.tgz",
@@ -2975,9 +3006,9 @@
"integrity": "sha512-r9S/ZyXu/Xu9q1tYlpsLIsa3EeLXXk0VwlxqTcFRfg9EhMW+17kbt9G0NrgCmhGb5vT2hyhJZLfDGx+7+5Uj/w=="
},
"yallist": {
- "version": "3.0.3",
- "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.0.3.tgz",
- "integrity": "sha512-S+Zk8DEWE6oKpV+vI3qWkaK+jSbIK86pCwe2IF/xwIpQ8jEuxpw9NyaGjmp9+BoJv5FV2piqCDcoCtStppiq2A=="
+ "version": "3.1.1",
+ "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.1.1.tgz",
+ "integrity": "sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g=="
}
}
},
@@ -3224,9 +3255,9 @@
}
},
"chownr": {
- "version": "1.1.2",
- "resolved": "https://registry.npmjs.org/chownr/-/chownr-1.1.2.tgz",
- "integrity": "sha512-GkfeAQh+QNy3wquu9oIZr6SS5x7wGdSgNQvD10X3r+AZr1Oys22HW8kAmDMvNg2+Dm0TeGaEuO8gFwdBXxwO8A=="
+ "version": "1.1.4",
+ "resolved": "https://registry.npmjs.org/chownr/-/chownr-1.1.4.tgz",
+ "integrity": "sha512-jJ0bqzaylmJtVnNgzTeSOs8DPavpbYgEr/b0YL8/2GO3xJEhInFmhKMUnEJQjZumK7KXGFhUy89PrsJWlakBVg=="
},
"chrome-trace-event": {
"version": "1.0.2",
@@ -5387,12 +5418,12 @@
}
},
"execa": {
- "version": "0.7.0",
- "resolved": "https://registry.npmjs.org/execa/-/execa-0.7.0.tgz",
- "integrity": "sha1-lEvs00zEHuMqY6n68nrVpl/Fl3c=",
+ "version": "1.0.0",
+ "resolved": "https://registry.npmjs.org/execa/-/execa-1.0.0.tgz",
+ "integrity": "sha512-adbxcyWV46qiHyvSp50TKt05tB4tK3HcmF7/nxfAdhnox83seTDbwnaqKO4sXRy7roHAIFqJP/Rw/AuEbX61LA==",
"requires": {
- "cross-spawn": "^5.0.1",
- "get-stream": "^3.0.0",
+ "cross-spawn": "^6.0.0",
+ "get-stream": "^4.0.0",
"is-stream": "^1.1.0",
"npm-run-path": "^2.0.0",
"p-finally": "^1.0.0",
@@ -5400,14 +5431,12 @@
"strip-eof": "^1.0.0"
},
"dependencies": {
- "cross-spawn": {
- "version": "5.1.0",
- "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-5.1.0.tgz",
- "integrity": "sha1-6L0O/uWPz/b4+UUQoKVUu/ojVEk=",
+ "get-stream": {
+ "version": "4.1.0",
+ "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-4.1.0.tgz",
+ "integrity": "sha512-GMat4EJ5161kIy2HevLlr4luNjBgvmj413KaQA7jt4V8B4RDsfpHk7WQ9GVqfYyyx8OS/L66Kox+rJRNklLK7w==",
"requires": {
- "lru-cache": "^4.0.1",
- "shebang-command": "^1.2.0",
- "which": "^1.2.9"
+ "pump": "^3.0.0"
}
}
}
@@ -7198,9 +7227,9 @@
"integrity": "sha512-d4sze1JNC454Wdo2fkuyzCr6aHcbL6PGGuFAz0Li/NcOm1tCHGnWDRmJP85dh9IhQErTc2svWFEX5xHIOo//kQ=="
},
"handlebars": {
- "version": "4.2.0",
- "resolved": "https://registry.npmjs.org/handlebars/-/handlebars-4.2.0.tgz",
- "integrity": "sha512-Kb4xn5Qh1cxAKvQnzNWZ512DhABzyFNmsaJf3OAkWNa4NkaqWcNI8Tao8Tasi0/F4JD9oyG0YxuFyvyR57d+Gw==",
+ "version": "4.7.3",
+ "resolved": "https://registry.npmjs.org/handlebars/-/handlebars-4.7.3.tgz",
+ "integrity": "sha512-SRGwSYuNfx8DwHD/6InAPzD6RgeruWLT+B8e8a7gGs8FWgHzlExpTFMEq2IA6QpAfOClpKHy6+8IqTjeBCu6Kg==",
"requires": {
"neo-async": "^2.6.0",
"optimist": "^0.6.1",
@@ -8043,9 +8072,9 @@
}
},
"invert-kv": {
- "version": "1.0.0",
- "resolved": "https://registry.npmjs.org/invert-kv/-/invert-kv-1.0.0.tgz",
- "integrity": "sha1-EEqOSqym09jNFXqO+L+rLXo//bY="
+ "version": "2.0.0",
+ "resolved": "https://registry.npmjs.org/invert-kv/-/invert-kv-2.0.0.tgz",
+ "integrity": "sha512-wPVv/y/QQ/Uiirj/vh3oP+1Ww+AWehmi1g5fFWGPF6IpCBCDVrhgHRMvrLfdYcwDh3QJbGXDW4JAuzxElLSqKA=="
},
"ip": {
"version": "1.1.5",
@@ -9281,11 +9310,11 @@
"integrity": "sha1-odePw6UEdMuAhF07O24dpJpEbo4="
},
"lcid": {
- "version": "1.0.0",
- "resolved": "https://registry.npmjs.org/lcid/-/lcid-1.0.0.tgz",
- "integrity": "sha1-MIrMr6C8SDo4Z7S28rlQYlHRuDU=",
+ "version": "2.0.0",
+ "resolved": "https://registry.npmjs.org/lcid/-/lcid-2.0.0.tgz",
+ "integrity": "sha512-avPEb8P8EGnwXKClwsNUgryVjllcRqtMYa49NTsbQagYuT1DcXnl1915oxWjoyGrXR6zH/Y0Zc96xWsPcoDKeA==",
"requires": {
- "invert-kv": "^1.0.0"
+ "invert-kv": "^2.0.0"
}
},
"left-pad": {
@@ -9537,15 +9566,6 @@
"highlight.js": "~9.13.0"
}
},
- "lru-cache": {
- "version": "4.1.5",
- "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-4.1.5.tgz",
- "integrity": "sha512-sWZlbEP2OsHNkXrMl5GYk/jKk70MBng6UU4YI/qGDYbgf6YbP4EvmqISbXCoJiRKs+1bSpFHVgQxvJ17F2li5g==",
- "requires": {
- "pseudomap": "^1.0.2",
- "yallist": "^2.1.2"
- }
- },
"make-dir": {
"version": "2.1.0",
"resolved": "https://registry.npmjs.org/make-dir/-/make-dir-2.1.0.tgz",
@@ -9622,11 +9642,20 @@
"integrity": "sha1-hxDXrwqmJvj/+hzgAWhUUmMlV0g="
},
"mem": {
- "version": "1.1.0",
- "resolved": "https://registry.npmjs.org/mem/-/mem-1.1.0.tgz",
- "integrity": "sha1-Xt1StIXKHZAP5kiVUFOZoN+kX3Y=",
+ "version": "4.3.0",
+ "resolved": "https://registry.npmjs.org/mem/-/mem-4.3.0.tgz",
+ "integrity": "sha512-qX2bG48pTqYRVmDB37rn/6PT7LcR8T7oAX3bf99u1Tt1nzxYfxkgqDwUwolPlXweM0XzBOBFzSx4kfp7KP1s/w==",
"requires": {
- "mimic-fn": "^1.0.0"
+ "map-age-cleaner": "^0.1.1",
+ "mimic-fn": "^2.0.0",
+ "p-is-promise": "^2.0.0"
+ },
+ "dependencies": {
+ "mimic-fn": {
+ "version": "2.1.0",
+ "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-2.1.0.tgz",
+ "integrity": "sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg=="
+ }
}
},
"memoize-one": {
@@ -10383,13 +10412,13 @@
"integrity": "sha1-/7xJiDNuDoM94MFox+8VISGqf7M="
},
"os-locale": {
- "version": "2.1.0",
- "resolved": "https://registry.npmjs.org/os-locale/-/os-locale-2.1.0.tgz",
- "integrity": "sha512-3sslG3zJbEYcaC4YVAvDorjGxc7tv6KVATnLPZONiljsUncvihe9BQoVCEs0RZ1kmf4Hk9OBqlZfJZWI4GanKA==",
+ "version": "3.1.0",
+ "resolved": "https://registry.npmjs.org/os-locale/-/os-locale-3.1.0.tgz",
+ "integrity": "sha512-Z8l3R4wYWM40/52Z+S265okfFj8Kt2cC2MKY+xNi3kFs+XGI7WXu/I309QQQYbRW4ijiZ+yxs9pqEhJh0DqW3Q==",
"requires": {
- "execa": "^0.7.0",
- "lcid": "^1.0.0",
- "mem": "^1.1.0"
+ "execa": "^1.0.0",
+ "lcid": "^2.0.0",
+ "mem": "^4.0.0"
}
},
"os-tmpdir": {
@@ -13078,11 +13107,6 @@
"resolved": "https://registry.npmjs.org/prr/-/prr-1.0.1.tgz",
"integrity": "sha1-0/wRS6BplaRexok/SEzrHXj19HY="
},
- "pseudomap": {
- "version": "1.0.2",
- "resolved": "https://registry.npmjs.org/pseudomap/-/pseudomap-1.0.2.tgz",
- "integrity": "sha1-8FKijacOYYkX7wqKw0wa5aaChrM="
- },
"psl": {
"version": "1.4.0",
"resolved": "https://registry.npmjs.org/psl/-/psl-1.4.0.tgz",
@@ -13530,6 +13554,15 @@
"tiny-warning": "^1.0.0"
}
},
+ "react-scroll": {
+ "version": "1.7.16",
+ "resolved": "https://registry.npmjs.org/react-scroll/-/react-scroll-1.7.16.tgz",
+ "integrity": "sha512-f4M5AdL+3cw3MJ7c/T0hPMY2iHCeQLDXV13lRanAFQ6JIt9xyAdHCpTH9mLUQt9SQh4pRarD+Qc7KhU6qMx3Yg==",
+ "requires": {
+ "lodash.throttle": "^4.1.1",
+ "prop-types": "^15.5.8"
+ }
+ },
"react-smooth": {
"version": "1.0.2",
"resolved": "https://registry.npmjs.org/react-smooth/-/react-smooth-1.0.2.tgz",
@@ -15437,9 +15470,9 @@
}
},
"stream-shift": {
- "version": "1.0.0",
- "resolved": "https://registry.npmjs.org/stream-shift/-/stream-shift-1.0.0.tgz",
- "integrity": "sha1-1cdSgl5TZ+eG944Y5EXqIjoVWVI="
+ "version": "1.0.1",
+ "resolved": "https://registry.npmjs.org/stream-shift/-/stream-shift-1.0.1.tgz",
+ "integrity": "sha512-AiisoFqQ0vbGcZgQPY1cdP2I76glaVA/RauYR4G4thNFgkTqr90yXTo4LYX60Jl+sIlPNHHdGSwo01AvbKUSVQ=="
},
"strict-uri-encode": {
"version": "2.0.0",
@@ -15754,9 +15787,9 @@
"integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g=="
},
"source-map-support": {
- "version": "0.5.13",
- "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.13.tgz",
- "integrity": "sha512-SHSKFHadjVA5oR4PPqhtAVdcBWwRYVd6g6cAXnIbRiIwc2EhPrTuKUBdSLvlEKyIP3GCf89fltvcZiP9MMFA1w==",
+ "version": "0.5.16",
+ "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.16.tgz",
+ "integrity": "sha512-efyLRJDr68D9hBBNIPWFjhpFzURh+KJykQwvMyW5UiZzYwoF6l4YMMDIJJEyFWxWCqfyxLzz6tSfUFR+kXXsVQ==",
"requires": {
"buffer-from": "^1.0.0",
"source-map": "^0.6.0"
@@ -17220,21 +17253,16 @@
"resolved": "https://registry.npmjs.org/y18n/-/y18n-3.2.1.tgz",
"integrity": "sha1-bRX7qITAhnnA136I53WegR4H+kE="
},
- "yallist": {
- "version": "2.1.2",
- "resolved": "https://registry.npmjs.org/yallist/-/yallist-2.1.2.tgz",
- "integrity": "sha1-HBH5IY8HYImkfdUS+TxmmaaoHVI="
- },
"yargs": {
- "version": "11.1.0",
- "resolved": "https://registry.npmjs.org/yargs/-/yargs-11.1.0.tgz",
- "integrity": "sha512-NwW69J42EsCSanF8kyn5upxvjp5ds+t3+udGBeTbFnERA+lF541DDpMawzo4z6W/QrzNM18D+BPMiOBibnFV5A==",
+ "version": "11.1.1",
+ "resolved": "https://registry.npmjs.org/yargs/-/yargs-11.1.1.tgz",
+ "integrity": "sha512-PRU7gJrJaXv3q3yQZ/+/X6KBswZiaQ+zOmdprZcouPYtQgvNU35i+68M4b1ZHLZtYFT5QObFLV+ZkmJYcwKdiw==",
"requires": {
"cliui": "^4.0.0",
"decamelize": "^1.1.1",
"find-up": "^2.1.0",
"get-caller-file": "^1.0.1",
- "os-locale": "^2.0.0",
+ "os-locale": "^3.1.0",
"require-directory": "^2.1.1",
"require-main-filename": "^1.0.1",
"set-blocking": "^2.0.0",
diff --git a/package.json b/package.json
index cc60834de..7962b03d9 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
{
"homepage": ".",
- "name": "icdc-frontend",
+ "name": "ctdc-frontend",
"version": "0.1.0",
"dependencies": {
"@babel/core": "7.2.2",
@@ -8,6 +8,7 @@
"@material-ui/icons": "^3.0.2",
"@svgr/webpack": "4.1.0",
"apollo-boost": "^0.4.3",
+ "axios": "^0.19.1",
"babel-core": "7.0.0-bridge.0",
"babel-eslint": "^9.0.0",
"babel-jest": "23.6.0",
@@ -35,6 +36,7 @@
"jest-pnp-resolver": "1.0.2",
"jest-resolve": "23.6.0",
"jest-watch-typeahead": "^0.2.1",
+ "js-yaml": "^3.13.1",
"line-awesome": "github:icons8/line-awesome",
"mini-css-extract-plugin": "0.5.0",
"mui-custom-datatables": "git+https://github.com/skiran86/mui-custom-datatables.git",
@@ -55,6 +57,7 @@
"react-redux": "^7.1.1",
"react-router": "^5.1.2",
"react-router-dom": "^5.1.2",
+ "react-scroll": "^1.7.16",
"react-syntax-highlighter": "^10.2.0",
"react-toastify": "^4.5.2",
"react-uuid": "^1.0.2",
diff --git a/public/index.html b/public/index.html
index 5e9a2613e..c580f94cc 100644
--- a/public/index.html
+++ b/public/index.html
@@ -1,16 +1,20 @@
+
+
+
+
-
+
-
+
- ICDC
+ CTDC
-
diff --git a/scripts/build.js b/scripts/build.js
index a52a0d8c4..bda859473 100644
--- a/scripts/build.js
+++ b/scripts/build.js
@@ -1,5 +1,4 @@
'use strict';
-
// Do this as the first thing so that any code reading it knows the right env.
process.env.BABEL_ENV = 'production';
process.env.NODE_ENV = 'production';
@@ -81,23 +80,22 @@ checkBrowsers(paths.appPath, isInteractive)
.then(
({ stats, previousFileSizes, warnings }) => {
if (warnings.length) {
- console.log(chalk.yellow('Compiled with warnings.\n'));
- console.log(warnings.join('\n\n'));
- console.log(
+ /* eslint no-console: ["error", { allow: ["warn", "error"] }] */
+
+ console.warn(chalk.yellow('Compiled with warnings.\n'));
+ console.warn(warnings.join('\n\n'));
+ console.warn(
'\nSearch for the ' +
chalk.underline(chalk.yellow('keywords')) +
' to learn more about each warning.'
);
- console.log(
+ console.warn(
'To ignore, add ' +
chalk.cyan('// eslint-disable-next-line') +
' to the line before.\n'
);
- } else {
- console.log(chalk.green('Compiled successfully.\n'));
- }
+ }
- console.log('File sizes after gzip:\n');
printFileSizesAfterBuild(
stats,
previousFileSizes,
@@ -105,7 +103,6 @@ checkBrowsers(paths.appPath, isInteractive)
WARN_AFTER_BUNDLE_GZIP_SIZE,
WARN_AFTER_CHUNK_GZIP_SIZE,
);
- console.log();
const appPackage = require(paths.appPackageJson);
const publicUrl = paths.publicUrl;
@@ -120,21 +117,24 @@ checkBrowsers(paths.appPath, isInteractive)
);
},
(err) => {
- console.log(chalk.red('Failed to compile.\n'));
+ /* eslint no-console: ["error", { allow: ["warn", "error"] }] */
+
+ console.error(chalk.red('Failed to compile.\n'));
printBuildError(err);
process.exit(1);
},
)
.catch((err) => {
if (err && err.message) {
- console.log(err.message);
+ /* eslint no-console: ["error", { allow: ["warn", "error"] }] */
+
+ console.error(err.message);
}
process.exit(1);
});
// Create the production build and print the deployment instructions.
function build(previousFileSizes) {
- console.log('Creating an optimized production build...');
let compiler = webpack(config);
return new Promise((resolve, reject) => {
@@ -167,7 +167,9 @@ function build(previousFileSizes) {
process.env.CI.toLowerCase() !== 'false') &&
messages.warnings.length
) {
- console.log(
+ /* eslint no-console: ["error", { allow: ["warn", "error"] }] */
+
+ console.warn(
chalk.yellow(
'\nTreating warnings as errors because process.env.CI = true.\n' +
'Most CI servers set it automatically.\n'
diff --git a/scripts/start.js b/scripts/start.js
index 5e4027554..2220dbb2a 100644
--- a/scripts/start.js
+++ b/scripts/start.js
@@ -1,5 +1,8 @@
'use strict';
+/* eslint no-console: ["error", { allow: ["warn", "error"] }] */
+
+
// Do this as the first thing so that any code reading it knows the right env.
process.env.BABEL_ENV = 'development';
process.env.NODE_ENV = 'development';
@@ -45,20 +48,17 @@ const DEFAULT_PORT = parseInt(process.env.PORT, 10) || 3000;
const HOST = process.env.HOST || '0.0.0.0';
if (process.env.HOST) {
- console.log(
+ console.warn(
chalk.cyan(
`Attempting to bind to HOST environment variable: ${chalk.yellow(
chalk.bold(process.env.HOST)
)}`
)
);
- console.log(
+ console.warn(
`If this was unintentional, check that you haven't mistakenly set it in your shell.`
);
- console.log(
- `Learn more here: ${chalk.yellow('http://bit.ly/CRA-advanced-config')}`
- );
- console.log();
+
}
// We require that you explictly set browsers and do not fall back to
@@ -91,14 +91,13 @@ checkBrowsers(paths.appPath, isInteractive)
);
const devServer = new WebpackDevServer(compiler, serverConfig);
// Launch WebpackDevServer.
- devServer.listen(port, HOST, (err) => {
+ devServer.listen(port, HOST, function(err){
if (err) {
- return console.log(err);
+ console.error(err);
}
if (isInteractive) {
clearConsole();
}
- console.log(chalk.cyan('Starting the development server...\n'));
openBrowser(urls.localUrlForBrowser);
});
@@ -111,7 +110,7 @@ checkBrowsers(paths.appPath, isInteractive)
})
.catch((err) => {
if (err && err.message) {
- console.log(err.message);
+ console.error(err.message);
}
process.exit(1);
});
diff --git a/src/assets/about/About_CRDC.png b/src/assets/about/About_CRDC.png
new file mode 100644
index 000000000..d7c76e0ae
Binary files /dev/null and b/src/assets/about/About_CRDC.png differ
diff --git a/src/assets/about/About_CTDC_Model.png b/src/assets/about/About_CTDC_Model.png
new file mode 100644
index 000000000..f023ac7f5
Binary files /dev/null and b/src/assets/about/About_CTDC_Model.png differ
diff --git a/src/assets/about/About_DataDictionary.png b/src/assets/about/About_DataDictionary.png
new file mode 100644
index 000000000..aa3b88a0b
Binary files /dev/null and b/src/assets/about/About_DataDictionary.png differ
diff --git a/src/assets/about/About_Developers.png b/src/assets/about/About_Developers.png
new file mode 100644
index 000000000..f46e642a7
Binary files /dev/null and b/src/assets/about/About_Developers.png differ
diff --git a/src/assets/about/About_Purpose.png b/src/assets/about/About_Purpose.png
new file mode 100644
index 000000000..4fd9fe8e8
Binary files /dev/null and b/src/assets/about/About_Purpose.png differ
diff --git a/src/assets/about/About_RequestAccess.png b/src/assets/about/About_RequestAccess.png
new file mode 100644
index 000000000..b565a9e5a
Binary files /dev/null and b/src/assets/about/About_RequestAccess.png differ
diff --git a/src/assets/about/About_Support.jpg b/src/assets/about/About_Support.jpg
deleted file mode 100644
index 53b256a92..000000000
Binary files a/src/assets/about/About_Support.jpg and /dev/null differ
diff --git a/src/assets/about/About_Support.png b/src/assets/about/About_Support.png
new file mode 100644
index 000000000..e884a500b
Binary files /dev/null and b/src/assets/about/About_Support.png differ
diff --git a/src/assets/about/Photo-About_AnalyzingData.jpg b/src/assets/about/Photo-About_AnalyzingData.jpg
deleted file mode 100644
index 71e01a50c..000000000
Binary files a/src/assets/about/Photo-About_AnalyzingData.jpg and /dev/null differ
diff --git a/src/assets/about/Photo-About_CRDC.jpg b/src/assets/about/Photo-About_CRDC.jpg
deleted file mode 100644
index 59801f018..000000000
Binary files a/src/assets/about/Photo-About_CRDC.jpg and /dev/null differ
diff --git a/src/assets/about/Photo-About_Developer.jpg b/src/assets/about/Photo-About_Developer.jpg
deleted file mode 100644
index 2a46898f6..000000000
Binary files a/src/assets/about/Photo-About_Developer.jpg and /dev/null differ
diff --git a/src/assets/about/Photo-About_ICDC_model.jpg b/src/assets/about/Photo-About_ICDC_model.jpg
deleted file mode 100644
index 4c1f0e8f8..000000000
Binary files a/src/assets/about/Photo-About_ICDC_model.jpg and /dev/null differ
diff --git a/src/assets/about/Photo-About_Purpose.jpg b/src/assets/about/Photo-About_Purpose.jpg
deleted file mode 100644
index cbc8c9a4a..000000000
Binary files a/src/assets/about/Photo-About_Purpose.jpg and /dev/null differ
diff --git a/src/assets/about/Photo-About_SubmittingData.jpg b/src/assets/about/Photo-About_SubmittingData.jpg
deleted file mode 100644
index a344cbe73..000000000
Binary files a/src/assets/about/Photo-About_SubmittingData.jpg and /dev/null differ
diff --git a/src/assets/error/canine_helix.jpg b/src/assets/error/canine_helix.jpg
deleted file mode 100644
index a7cfbde88..000000000
Binary files a/src/assets/error/canine_helix.jpg and /dev/null differ
diff --git a/src/assets/error/leftBg.png b/src/assets/error/leftBg.png
new file mode 100644
index 000000000..b6a6d9875
Binary files /dev/null and b/src/assets/error/leftBg.png differ
diff --git a/src/assets/error/rightBg.png b/src/assets/error/rightBg.png
new file mode 100644
index 000000000..11d926f4d
Binary files /dev/null and b/src/assets/error/rightBg.png differ
diff --git a/src/assets/footer/footerBackground1200.png b/src/assets/footer/footerBackground1200.png
new file mode 100644
index 000000000..bae9e37e6
Binary files /dev/null and b/src/assets/footer/footerBackground1200.png differ
diff --git a/src/assets/footer/footerBackground1800.png b/src/assets/footer/footerBackground1800.png
new file mode 100644
index 000000000..6742e0a78
Binary files /dev/null and b/src/assets/footer/footerBackground1800.png differ
diff --git a/src/assets/footer/footerBackground800.png b/src/assets/footer/footerBackground800.png
new file mode 100644
index 000000000..d5fb3e984
Binary files /dev/null and b/src/assets/footer/footerBackground800.png differ
diff --git a/src/assets/header/CTDC_Logo.svg b/src/assets/header/CTDC_Logo.svg
new file mode 100644
index 000000000..7017f9292
--- /dev/null
+++ b/src/assets/header/CTDC_Logo.svg
@@ -0,0 +1,157 @@
+
+
+
diff --git a/src/assets/header/Canine1400.png b/src/assets/header/Canine1400.png
deleted file mode 100644
index 40e7f216c..000000000
Binary files a/src/assets/header/Canine1400.png and /dev/null differ
diff --git a/src/assets/header/Canine1600.png b/src/assets/header/Canine1600.png
deleted file mode 100644
index 878239236..000000000
Binary files a/src/assets/header/Canine1600.png and /dev/null differ
diff --git a/src/assets/header/Canine1800.png b/src/assets/header/Canine1800.png
deleted file mode 100644
index 09f366a24..000000000
Binary files a/src/assets/header/Canine1800.png and /dev/null differ
diff --git a/src/assets/header/Canine2000.png b/src/assets/header/Canine2000.png
deleted file mode 100644
index a43730620..000000000
Binary files a/src/assets/header/Canine2000.png and /dev/null differ
diff --git a/src/assets/header/Canine400.png b/src/assets/header/Canine400.png
deleted file mode 100644
index cab69e0dd..000000000
Binary files a/src/assets/header/Canine400.png and /dev/null differ
diff --git a/src/assets/header/Canine800.png b/src/assets/header/Canine800.png
deleted file mode 100644
index 750a3580c..000000000
Binary files a/src/assets/header/Canine800.png and /dev/null differ
diff --git a/src/assets/header/easter1400.png b/src/assets/header/easter1400.png
new file mode 100644
index 000000000..f930632ac
Binary files /dev/null and b/src/assets/header/easter1400.png differ
diff --git a/src/assets/header/easter1600.png b/src/assets/header/easter1600.png
new file mode 100644
index 000000000..6c9c6f2cc
Binary files /dev/null and b/src/assets/header/easter1600.png differ
diff --git a/src/assets/header/easter1800.png b/src/assets/header/easter1800.png
new file mode 100644
index 000000000..00db77001
Binary files /dev/null and b/src/assets/header/easter1800.png differ
diff --git a/src/assets/header/easter2000.png b/src/assets/header/easter2000.png
new file mode 100644
index 000000000..de7cc9cad
Binary files /dev/null and b/src/assets/header/easter2000.png differ
diff --git a/src/assets/header/easter800.png b/src/assets/header/easter800.png
new file mode 100644
index 000000000..381bbcdd1
Binary files /dev/null and b/src/assets/header/easter800.png differ
diff --git a/src/assets/icons/Icon-CaseDetail.svg b/src/assets/icons/Icon-CaseDetail.svg
index 20de45ff8..439df4fee 100644
--- a/src/assets/icons/Icon-CaseDetail.svg
+++ b/src/assets/icons/Icon-CaseDetail.svg
@@ -1,40 +1,2489 @@
-
+
diff --git a/src/assets/icons/Icon-MyCases.svg b/src/assets/icons/Icon-MyCases.svg
index e6c92e90e..0b48de953 100644
--- a/src/assets/icons/Icon-MyCases.svg
+++ b/src/assets/icons/Icon-MyCases.svg
@@ -1,19 +1,2271 @@
-
+
diff --git a/src/assets/icons/MyCases-Wizard-Step1.svg b/src/assets/icons/MyCases-Wizard-Step1.svg
new file mode 100644
index 000000000..022cf34e9
--- /dev/null
+++ b/src/assets/icons/MyCases-Wizard-Step1.svg
@@ -0,0 +1,1291 @@
+
+
+
diff --git a/src/assets/icons/MyCases-Wizard-Step2.svg b/src/assets/icons/MyCases-Wizard-Step2.svg
new file mode 100644
index 000000000..808b74737
--- /dev/null
+++ b/src/assets/icons/MyCases-Wizard-Step2.svg
@@ -0,0 +1,1291 @@
+
+
+
diff --git a/src/assets/icons/MyCases-Wizard-Step3.svg b/src/assets/icons/MyCases-Wizard-Step3.svg
new file mode 100644
index 000000000..863e57a41
--- /dev/null
+++ b/src/assets/icons/MyCases-Wizard-Step3.svg
@@ -0,0 +1,1289 @@
+
+
+
diff --git a/src/assets/icons/MyCases-Wizard-Step4.svg b/src/assets/icons/MyCases-Wizard-Step4.svg
new file mode 100644
index 000000000..4b4edb805
--- /dev/null
+++ b/src/assets/icons/MyCases-Wizard-Step4.svg
@@ -0,0 +1,1328 @@
+
+
+
diff --git a/src/assets/icons/ScrollUpButton.svg b/src/assets/icons/ScrollUpButton.svg
new file mode 100644
index 000000000..bb4ab3901
--- /dev/null
+++ b/src/assets/icons/ScrollUpButton.svg
@@ -0,0 +1,14 @@
+
+
+
diff --git a/src/assets/icons/ScrollUpHoverButton.svg b/src/assets/icons/ScrollUpHoverButton.svg
new file mode 100644
index 000000000..45d0b5bae
--- /dev/null
+++ b/src/assets/icons/ScrollUpHoverButton.svg
@@ -0,0 +1,14 @@
+
+
+
diff --git a/src/assets/icons/stats/stats-bar-aliquots.svg b/src/assets/icons/stats/stats-bar-aliquots.svg
deleted file mode 100644
index e5b7b863c..000000000
--- a/src/assets/icons/stats/stats-bar-aliquots.svg
+++ /dev/null
@@ -1 +0,0 @@
-
\ No newline at end of file
diff --git a/src/assets/icons/stats/stats-bar-cases.svg b/src/assets/icons/stats/stats-bar-cases.svg
index 13f364e28..939092a2a 100644
--- a/src/assets/icons/stats/stats-bar-cases.svg
+++ b/src/assets/icons/stats/stats-bar-cases.svg
@@ -1 +1,98 @@
-
\ No newline at end of file
+
+
+
diff --git a/src/assets/icons/stats/stats-bar-files.svg b/src/assets/icons/stats/stats-bar-files.svg
index 5e648c583..66997b338 100644
--- a/src/assets/icons/stats/stats-bar-files.svg
+++ b/src/assets/icons/stats/stats-bar-files.svg
@@ -1 +1,98 @@
-
\ No newline at end of file
+
+
+
diff --git a/src/assets/icons/stats/stats-bar-samples.svg b/src/assets/icons/stats/stats-bar-samples.svg
deleted file mode 100644
index 7aab0beb9..000000000
--- a/src/assets/icons/stats/stats-bar-samples.svg
+++ /dev/null
@@ -1 +0,0 @@
-
\ No newline at end of file
diff --git a/src/assets/icons/stats/stats-bar-studies.svg b/src/assets/icons/stats/stats-bar-studies.svg
deleted file mode 100644
index 0faf1ed93..000000000
--- a/src/assets/icons/stats/stats-bar-studies.svg
+++ /dev/null
@@ -1 +0,0 @@
-
\ No newline at end of file
diff --git a/src/assets/icons/stats/stats-bar-trials.svg b/src/assets/icons/stats/stats-bar-trials.svg
new file mode 100644
index 000000000..c31453b50
--- /dev/null
+++ b/src/assets/icons/stats/stats-bar-trials.svg
@@ -0,0 +1,116 @@
+
+
+
diff --git a/src/assets/landing/About-image.jpg b/src/assets/landing/About-image.jpg
new file mode 100644
index 000000000..e250d564b
Binary files /dev/null and b/src/assets/landing/About-image.jpg differ
diff --git a/src/assets/landing/BackgroundTexture-LP.jpg b/src/assets/landing/BackgroundTexture-LP.jpg
new file mode 100644
index 000000000..ba1ec642d
Binary files /dev/null and b/src/assets/landing/BackgroundTexture-LP.jpg differ
diff --git a/src/assets/landing/Cases-LP.jpg b/src/assets/landing/Cases-LP.jpg
new file mode 100644
index 000000000..28476fab1
Binary files /dev/null and b/src/assets/landing/Cases-LP.jpg differ
diff --git a/src/assets/landing/RequestAccess-LP.jpg b/src/assets/landing/RequestAccess-LP.jpg
new file mode 100644
index 000000000..29b0e9a0f
Binary files /dev/null and b/src/assets/landing/RequestAccess-LP.jpg differ
diff --git a/src/assets/landing/Trials-image.jpg b/src/assets/landing/Trials-image.jpg
new file mode 100644
index 000000000..2e9011eb5
Binary files /dev/null and b/src/assets/landing/Trials-image.jpg differ
diff --git a/src/assets/landing/animation/CasesActive.png b/src/assets/landing/animation/CasesActive.png
new file mode 100644
index 000000000..d2c377b6f
Binary files /dev/null and b/src/assets/landing/animation/CasesActive.png differ
diff --git a/src/assets/landing/animation/CasesInActive.png b/src/assets/landing/animation/CasesInActive.png
new file mode 100644
index 000000000..40add565c
Binary files /dev/null and b/src/assets/landing/animation/CasesInActive.png differ
diff --git a/src/assets/landing/animation/Dial_facing_down.svg b/src/assets/landing/animation/Dial_facing_down.svg
new file mode 100644
index 000000000..11b8481c3
--- /dev/null
+++ b/src/assets/landing/animation/Dial_facing_down.svg
@@ -0,0 +1,59 @@
+
+
+
diff --git a/src/assets/landing/animation/Dial_facing_left.svg b/src/assets/landing/animation/Dial_facing_left.svg
new file mode 100644
index 000000000..bb783ce0d
--- /dev/null
+++ b/src/assets/landing/animation/Dial_facing_left.svg
@@ -0,0 +1,60 @@
+
+
+
diff --git a/src/assets/landing/animation/Dial_facing_right.svg b/src/assets/landing/animation/Dial_facing_right.svg
new file mode 100644
index 000000000..b83e2bcd1
--- /dev/null
+++ b/src/assets/landing/animation/Dial_facing_right.svg
@@ -0,0 +1,59 @@
+
+
+
diff --git a/src/assets/landing/animation/Dial_facing_up.svg b/src/assets/landing/animation/Dial_facing_up.svg
new file mode 100644
index 000000000..542bde30d
--- /dev/null
+++ b/src/assets/landing/animation/Dial_facing_up.svg
@@ -0,0 +1,59 @@
+
+
+
diff --git a/src/assets/landing/animation/FilesActive.png b/src/assets/landing/animation/FilesActive.png
new file mode 100644
index 000000000..f96f146e9
Binary files /dev/null and b/src/assets/landing/animation/FilesActive.png differ
diff --git a/src/assets/landing/animation/FilesInActive.png b/src/assets/landing/animation/FilesInActive.png
new file mode 100644
index 000000000..293106fb3
Binary files /dev/null and b/src/assets/landing/animation/FilesInActive.png differ
diff --git a/src/assets/landing/animation/TrialsActive.png b/src/assets/landing/animation/TrialsActive.png
new file mode 100644
index 000000000..a244a42ef
Binary files /dev/null and b/src/assets/landing/animation/TrialsActive.png differ
diff --git a/src/assets/landing/animation/TrialsInActive.png b/src/assets/landing/animation/TrialsInActive.png
new file mode 100644
index 000000000..c3f9840eb
Binary files /dev/null and b/src/assets/landing/animation/TrialsInActive.png differ
diff --git a/src/assets/landing/animation/Whisp-All_Active.png b/src/assets/landing/animation/Whisp-All_Active.png
new file mode 100644
index 000000000..ff3d721fe
Binary files /dev/null and b/src/assets/landing/animation/Whisp-All_Active.png differ
diff --git a/src/assets/landing/animation/Whisp-InActive.png b/src/assets/landing/animation/Whisp-InActive.png
new file mode 100644
index 000000000..811548b7d
Binary files /dev/null and b/src/assets/landing/animation/Whisp-InActive.png differ
diff --git a/src/assets/landing/animation/activeCases.png b/src/assets/landing/animation/activeCases.png
new file mode 100644
index 000000000..423ab5e8b
Binary files /dev/null and b/src/assets/landing/animation/activeCases.png differ
diff --git a/src/assets/landing/heroGraphic/heroGraphic1000.png b/src/assets/landing/heroGraphic/heroGraphic1000.png
new file mode 100644
index 000000000..5043cc08c
Binary files /dev/null and b/src/assets/landing/heroGraphic/heroGraphic1000.png differ
diff --git a/src/assets/landing/heroGraphic/heroGraphic1200.png b/src/assets/landing/heroGraphic/heroGraphic1200.png
new file mode 100644
index 000000000..b4d12028a
Binary files /dev/null and b/src/assets/landing/heroGraphic/heroGraphic1200.png differ
diff --git a/src/assets/landing/heroGraphic/heroGraphic1400.png b/src/assets/landing/heroGraphic/heroGraphic1400.png
new file mode 100644
index 000000000..4bde753f5
Binary files /dev/null and b/src/assets/landing/heroGraphic/heroGraphic1400.png differ
diff --git a/src/assets/landing/heroGraphic/heroGraphic1600.png b/src/assets/landing/heroGraphic/heroGraphic1600.png
new file mode 100644
index 000000000..fd94c4e3d
Binary files /dev/null and b/src/assets/landing/heroGraphic/heroGraphic1600.png differ
diff --git a/src/assets/landing/heroGraphic/heroGraphic1800.png b/src/assets/landing/heroGraphic/heroGraphic1800.png
new file mode 100644
index 000000000..5a885ff85
Binary files /dev/null and b/src/assets/landing/heroGraphic/heroGraphic1800.png differ
diff --git a/src/assets/landing/heroGraphic/heroGraphic2000.png b/src/assets/landing/heroGraphic/heroGraphic2000.png
new file mode 100644
index 000000000..ac81ef21f
Binary files /dev/null and b/src/assets/landing/heroGraphic/heroGraphic2000.png differ
diff --git a/src/assets/landing/heroGraphic/heroGraphic800.png b/src/assets/landing/heroGraphic/heroGraphic800.png
new file mode 100644
index 000000000..0e29175fa
Binary files /dev/null and b/src/assets/landing/heroGraphic/heroGraphic800.png differ
diff --git a/src/assets/landing/tmp.jpg b/src/assets/landing/tmp.jpg
new file mode 100644
index 000000000..6d3a00c15
Binary files /dev/null and b/src/assets/landing/tmp.jpg differ
diff --git a/src/assets/programCards/COP.png b/src/assets/programCards/COP.png
deleted file mode 100644
index 104f413ed..000000000
Binary files a/src/assets/programCards/COP.png and /dev/null differ
diff --git a/src/assets/programCards/NCATS.png b/src/assets/programCards/NCATS.png
deleted file mode 100644
index dd5bd0bb4..000000000
Binary files a/src/assets/programCards/NCATS.png and /dev/null differ
diff --git a/src/assets/programCards/NIH.png b/src/assets/programCards/NIH.png
deleted file mode 100644
index 6120c965a..000000000
Binary files a/src/assets/programCards/NIH.png and /dev/null differ
diff --git a/src/assets/programCards/ProgramDetail_Image.jpg b/src/assets/programCards/ProgramDetail_Image.jpg
deleted file mode 100644
index 31e77a62e..000000000
Binary files a/src/assets/programCards/ProgramDetail_Image.jpg and /dev/null differ
diff --git a/src/assets/programCards/Program_Image.png b/src/assets/programCards/Program_Image.png
deleted file mode 100644
index 892ee436e..000000000
Binary files a/src/assets/programCards/Program_Image.png and /dev/null differ
diff --git a/src/assets/trial/Trials_File_Counter.Icon.svg b/src/assets/trial/Trials_File_Counter.Icon.svg
new file mode 100644
index 000000000..fb1e95a85
--- /dev/null
+++ b/src/assets/trial/Trials_File_Counter.Icon.svg
@@ -0,0 +1,66 @@
+
+
+
diff --git a/src/assets/trial/Trials_Title_Bar.Icon.svg b/src/assets/trial/Trials_Title_Bar.Icon.svg
new file mode 100644
index 000000000..769b577b0
--- /dev/null
+++ b/src/assets/trial/Trials_Title_Bar.Icon.svg
@@ -0,0 +1,140 @@
+
+
+
diff --git a/src/components/About/BodyView.js b/src/components/About/BodyView.js
deleted file mode 100644
index 159294c4a..000000000
--- a/src/components/About/BodyView.js
+++ /dev/null
@@ -1,63 +0,0 @@
-import React from 'react';
-import { Grid, withStyles } from '@material-ui/core';
-
-const AboutBody = ({ classes, data }) => (
-
-
-
-
-
-
-
- {data.body}
-
-
-
-
-);
-
-const styles = () => ({
- container: {
- margin: '16px auto 16px auto',
- color: '#000000',
- fontFamily: '"Open Sans"',
- fontSize: '15px',
- lineHeight: '22px',
- maxWidth: '1440px',
- },
- text: {
- height: '476px',
- width: '675px',
- color: '#000000',
- fontFamily: '"Open Sans"',
- fontSize: '15px',
- lineHeight: '22px',
- },
- link: {
- color: '#0296C9',
- '&:hover': {
- color: '#0296C9',
- },
- },
- title: {
- color: '#0B3556',
- textTransform: 'uppercase',
- fontWeight: 'bold',
- },
- rightSection: {
- padding: '8px 25px !important',
- float: 'left',
- },
- leftSection: {
- float: 'left',
- },
- aboutSection: {
- margin: '60px auto 60px auto',
- },
- img: {
- width: '100%',
- },
-});
-
-
-export default withStyles(styles)(AboutBody);
diff --git a/src/components/Breadcrumb/BreadcrumbView.js b/src/components/Breadcrumb/BreadcrumbView.js
index a658c26a8..0ad66b4b3 100644
--- a/src/components/Breadcrumb/BreadcrumbView.js
+++ b/src/components/Breadcrumb/BreadcrumbView.js
@@ -3,7 +3,7 @@ import { withStyles } from '@material-ui/core';
import { Link } from 'react-router-dom';
const CustomBreadcrumb = ({ classes, data }) => (
-
+
{
data.reduce((acc, current, index) => {
if (current.isALink) {
@@ -26,19 +26,19 @@ const CustomBreadcrumb = ({ classes, data }) => (
const styles = (theme) => ({
headerNav: {
- paddingTop: '8px',
- color: '#5e8ca5',
- paddingBottom: '12px',
+ paddingTop: '0px',
+ color: '#3D9ACC',
},
headerNavLink: {
- paddingLeft: '6px',
- paddingRight: '6px',
- textDecoration: 'none',
- color: '#5e8ca5',
+ paddingLeft: '3px',
+ paddingRight: '3px',
+ textDecoration: 'underline',
+ color: '#3D9ACC',
textTransform: 'uppercase',
fontFamily: theme.custom.fontFamilySans,
- fontSize: '8pt',
+ fontSize: '10px',
letterSpacing: '0.025em',
+ verticalAlign: 'text-top',
},
});
diff --git a/src/components/Footer/FooterView.js b/src/components/Footer/FooterView.js
index 7bd2be956..1d1aa9f2a 100644
--- a/src/components/Footer/FooterView.js
+++ b/src/components/Footer/FooterView.js
@@ -6,17 +6,21 @@ import { useLocation } from 'react-router';
import { Typography } from '../Wrappers/Wrappers';
import cn from '../../utils/classNameConcat';
import nciLogo from '../../assets/footer/NCI-footer.logo.svg';
-
+import footerBackground800 from '../../assets/footer/footerBackground800.png';
+import footerBackground1200 from '../../assets/footer/footerBackground1200.png';
+import footerBackground1800 from '../../assets/footer/footerBackground1800.png';
const VERSION = process.env.REACT_APP_APPLICATION_VERSION;
-const Footer = ({ classes, data }) => {
+const Footer = ({ classes }) => {
const location = useLocation();
- const sideBarStatus = location.pathname === '/cases' ? data.isSidebarOpened : false;
+ const sideBarStatus = location.pathname === '/cases';
return (
-