From 64d6f536b1bd242251d07838310c569c700a0dbb Mon Sep 17 00:00:00 2001 From: Barry Low Date: Fri, 9 Nov 2018 11:39:46 -0800 Subject: [PATCH] Setup email-verification page --- client/package-lock.json | 44 +++++++++---------- client/src/App.js | 10 ++++- .../views/common/components/BannerTopBar.js | 26 +++++++++++ client/src/views/common/index.js | 3 ++ client/src/views/email-verification/index.js | 11 +++++ client/src/views/index.js | 3 +- 6 files changed, 73 insertions(+), 24 deletions(-) create mode 100644 client/src/views/common/components/BannerTopBar.js create mode 100644 client/src/views/common/index.js create mode 100644 client/src/views/email-verification/index.js diff --git a/client/package-lock.json b/client/package-lock.json index 0dbd8d1b6..29334fd6c 100644 --- a/client/package-lock.json +++ b/client/package-lock.json @@ -44,9 +44,9 @@ } }, "@advancedalgos/teams-client": { - "version": "0.0.24", - "resolved": "https://registry.npmjs.org/@advancedalgos/teams-client/-/teams-client-0.0.24.tgz", - "integrity": "sha512-xJV3GgJRHgjVJeSDGBeR2YjBN5KYczLMYJr0ry/i41a9W2MEilyxeA50j69H+r0zFM5jzr6GwSJp9x+mAnUSyw==", + "version": "0.0.25", + "resolved": "https://registry.npmjs.org/@advancedalgos/teams-client/-/teams-client-0.0.25.tgz", + "integrity": "sha512-hO4eQTe1hpLO9PsI2QrUu80ouQCGbs4uz2xhlHSMtmhcLcBMQaH2QBYOAJI6lcalF8GvdlyhDrlbjr1T/H5I1w==", "dev": true, "requires": { "@advancedalgos/web-components": "0.0.13", @@ -70,9 +70,9 @@ "minilog": "^3.1.0", "prop-types": "^15.6.2", "query-string": "^6.2.0", - "react": "^16.5.2", + "react": "^16.6.1", "react-apollo": "^2.2.4", - "react-dom": "^16.5.2", + "react-dom": "^16.6.1", "react-router-dom": "^4.3.1", "recompose": "^0.30.0", "subscriptions-transport-ws": "^0.9.15" @@ -2269,7 +2269,7 @@ }, "array-equal": { "version": "1.0.0", - "resolved": "http://registry.npmjs.org/array-equal/-/array-equal-1.0.0.tgz", + "resolved": "https://registry.npmjs.org/array-equal/-/array-equal-1.0.0.tgz", "integrity": "sha1-jCpe8kcv2ep0KwTHenUJO6J1fJM=", "dev": true }, @@ -2729,7 +2729,7 @@ "dependencies": { "jsesc": { "version": "1.3.0", - "resolved": "http://registry.npmjs.org/jsesc/-/jsesc-1.3.0.tgz", + "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-1.3.0.tgz", "integrity": "sha1-RsP+yMGJKxKwgz25vHYiF226s0s=", "dev": true }, @@ -8161,7 +8161,7 @@ }, "hoek": { "version": "4.2.1", - "resolved": "http://registry.npmjs.org/hoek/-/hoek-4.2.1.tgz", + "resolved": "https://registry.npmjs.org/hoek/-/hoek-4.2.1.tgz", "integrity": "sha512-QLg82fGkfnJ/4iy1xZ81/9SIJiq1NGFUMGs6ParyjBZr6jW2Ufj/snDqTHixNlHdPNwN2RLVD0Pi3igeK9+JfA==", "dev": true }, @@ -9771,7 +9771,7 @@ }, "jest-get-type": { "version": "22.4.3", - "resolved": "http://registry.npmjs.org/jest-get-type/-/jest-get-type-22.4.3.tgz", + "resolved": "https://registry.npmjs.org/jest-get-type/-/jest-get-type-22.4.3.tgz", "integrity": "sha512-/jsz0Y+V29w1chdXVygEKSz2nBoHoYqNShPe+QgxSNjAuP1i8+k4LbQNrfoliKej0P45sivkSCh7yiD6ubHS3w==", "dev": true }, @@ -16525,14 +16525,14 @@ } }, "react": { - "version": "16.6.0", - "resolved": "https://registry.npmjs.org/react/-/react-16.6.0.tgz", - "integrity": "sha512-zJPnx/jKtuOEXCbQ9BKaxDMxR0001/hzxXwYxG8septeyYGfsgAei6NgfbVgOhbY1WOP2o3VPs/E9HaN+9hV3Q==", + "version": "16.6.1", + "resolved": "https://registry.npmjs.org/react/-/react-16.6.1.tgz", + "integrity": "sha512-OtawJThYlvRgm9BXK+xTL7BIlDx8vv21j+fbQDjRRUyok6y7NyjlweGorielTahLZHYIdKUoK2Dp9ByVWuMqxw==", "requires": { "loose-envify": "^1.1.0", "object-assign": "^4.1.1", "prop-types": "^15.6.2", - "scheduler": "^0.10.0" + "scheduler": "^0.11.0" } }, "react-apollo": { @@ -16690,14 +16690,14 @@ } }, "react-dom": { - "version": "16.6.0", - "resolved": "https://registry.npmjs.org/react-dom/-/react-dom-16.6.0.tgz", - "integrity": "sha512-Stm2D9dXEUUAQdvpvhvFj/DEXwC2PAL/RwEMhoN4dvvD2ikTlJegEXf97xryg88VIAU22ZAP7n842l+9BTz6+w==", + "version": "16.6.1", + "resolved": "https://registry.npmjs.org/react-dom/-/react-dom-16.6.1.tgz", + "integrity": "sha512-zm+wBuEMGm009Wt1uE4Zw5KcXOW7qC4E/xW/fpJsCsbOco4U/R84u+DzzO/S4SYSdNBcqcaulcp4w3FXl8pImw==", "requires": { "loose-envify": "^1.1.0", "object-assign": "^4.1.1", "prop-types": "^15.6.2", - "scheduler": "^0.10.0" + "scheduler": "^0.11.0" } }, "react-dropzone": { @@ -16963,7 +16963,7 @@ }, "cacache": { "version": "10.0.4", - "resolved": "http://registry.npmjs.org/cacache/-/cacache-10.0.4.tgz", + "resolved": "https://registry.npmjs.org/cacache/-/cacache-10.0.4.tgz", "integrity": "sha512-Dph0MzuH+rTQzGPNT9fAnrPmMmjKfST6trxJeK7NQuHRaVw24VzPRWTmg9MpcwOVQZO0E1FBICUlFeNaKPIfHA==", "dev": true, "requires": { @@ -19287,9 +19287,9 @@ } }, "scheduler": { - "version": "0.10.0", - "resolved": "https://registry.npmjs.org/scheduler/-/scheduler-0.10.0.tgz", - "integrity": "sha512-+TSTVTCBAA3h8Anei3haDc1IRwMeDmtI/y/o3iBe3Mjl2vwYF9DtPDt929HyRmV/e7au7CLu8sc4C4W0VOs29w==", + "version": "0.11.0", + "resolved": "https://registry.npmjs.org/scheduler/-/scheduler-0.11.0.tgz", + "integrity": "sha512-MAYbBfmiEHxF0W+c4CxMpEqMYK+rYF584VP/qMKSiHM6lTkBKKYOJaDiSILpJHla6hBOsVd6GucPL46o2Uq3sg==", "requires": { "loose-envify": "^1.1.0", "object-assign": "^4.1.1" @@ -20541,7 +20541,7 @@ }, "topo": { "version": "2.0.2", - "resolved": "http://registry.npmjs.org/topo/-/topo-2.0.2.tgz", + "resolved": "https://registry.npmjs.org/topo/-/topo-2.0.2.tgz", "integrity": "sha1-zVYVdSU5BXwNwEkaYhw7xvvh0YI=", "dev": true, "requires": { diff --git a/client/src/App.js b/client/src/App.js index 39d60ce90..fe3d4e87b 100644 --- a/client/src/App.js +++ b/client/src/App.js @@ -7,11 +7,12 @@ import MuiThemeProvider from '@material-ui/core/styles/MuiThemeProvider' import CssBaseline from '@material-ui/core/CssBaseline' import { withStyles } from '@material-ui/core/styles' import { theme, globalStyles } from './styles' +import './styles/styles.scss' import { client } from './graphql/apollo' import Auth from './auth' -import { Layout, Home, Charts, Callback } from './views' +import { Layout, Home, Charts, Callback, EmailSignupConfirm } from './views' import Users from '@advancedalgos/users-client' import Teams from '@advancedalgos/teams-client' @@ -38,6 +39,13 @@ export const MasterApp = (props) => ( return }} /> + { + console.log(props, props.match) + return + }} + /> } diff --git a/client/src/views/common/components/BannerTopBar.js b/client/src/views/common/components/BannerTopBar.js new file mode 100644 index 000000000..866cbfe2a --- /dev/null +++ b/client/src/views/common/components/BannerTopBar.js @@ -0,0 +1,26 @@ +import React from 'react' +import PropTypes from 'prop-types' +import Typography from '@material-ui/core/Typography' + +const BannerTopBar = ({ + size, + backgroundUrl, + title, + text +}) => ( +
+
+ {title} + {text} +
+
+) + +BannerTopBar.propTypes = { + backgroundUrl: PropTypes.string, + size: PropTypes.string, + title: PropTypes.string, + text: PropTypes.string +} + +export default BannerTopBar diff --git a/client/src/views/common/index.js b/client/src/views/common/index.js new file mode 100644 index 000000000..9af9dc8f7 --- /dev/null +++ b/client/src/views/common/index.js @@ -0,0 +1,3 @@ +import BannerTopBar from './components/BannerTopBar' + +export { BannerTopBar } diff --git a/client/src/views/email-verification/index.js b/client/src/views/email-verification/index.js new file mode 100644 index 000000000..c4ca17709 --- /dev/null +++ b/client/src/views/email-verification/index.js @@ -0,0 +1,11 @@ +import React from 'react' + +import { BannerTopBar } from '../common' + +const EmailSignupConfirm = () => { + return ( + + ) +} + +export default EmailSignupConfirm diff --git a/client/src/views/index.js b/client/src/views/index.js index c86a62d96..1d70a9d6c 100644 --- a/client/src/views/index.js +++ b/client/src/views/index.js @@ -2,5 +2,6 @@ import Home from './home' import Charts from './charts' import Callback from './callback' import Layout from './layout' +import EmailSignupConfirm from './email-verification' -export { Layout, Home, Charts, Callback } +export { Layout, Home, Charts, Callback, EmailSignupConfirm }