diff --git a/client/package-lock.json b/client/package-lock.json index 3ac9f99d0..7080a7b91 100644 --- a/client/package-lock.json +++ b/client/package-lock.json @@ -4779,8 +4779,7 @@ "decode-uri-component": { "version": "0.2.0", "resolved": "https://registry.npmjs.org/decode-uri-component/-/decode-uri-component-0.2.0.tgz", - "integrity": "sha1-6zkTMzRYd1y4TNGh+uBiEGu4dUU=", - "dev": true + "integrity": "sha1-6zkTMzRYd1y4TNGh+uBiEGu4dUU=" }, "deep-equal": { "version": "1.0.1", @@ -16420,7 +16419,6 @@ "version": "6.2.0", "resolved": "https://registry.npmjs.org/query-string/-/query-string-6.2.0.tgz", "integrity": "sha512-5wupExkIt8RYL4h/FE+WTg3JHk62e6fFPWtAZA9J5IWK1PfTfKkMS93HBUHcFpeYi9KsY5pFbh+ldvEyaz5MyA==", - "dev": true, "requires": { "decode-uri-component": "^0.2.0", "strict-uri-encode": "^2.0.0" @@ -20077,8 +20075,7 @@ "strict-uri-encode": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/strict-uri-encode/-/strict-uri-encode-2.0.0.tgz", - "integrity": "sha1-ucczDHBChi9rFC3CdLvMWGbONUY=", - "dev": true + "integrity": "sha1-ucczDHBChi9rFC3CdLvMWGbONUY=" }, "string-length": { "version": "2.0.0", diff --git a/client/package.json b/client/package.json index ba2b863e8..bffac01d4 100644 --- a/client/package.json +++ b/client/package.json @@ -90,6 +90,7 @@ "npm": "^6.4.1", "optimize-css-assets-webpack-plugin": "^5.0.1", "prop-types": "^15.6.2", + "query-string": "^6.2.0", "react": "^16.6.1", "react-apollo": "^2.2.4", "react-dom": "^16.6.1", diff --git a/client/src/App.js b/client/src/App.js index fe3d4e87b..58d5f4ec7 100644 --- a/client/src/App.js +++ b/client/src/App.js @@ -42,8 +42,8 @@ export const MasterApp = (props) => ( { - console.log(props, props.match) - return + console.log(props.location) + return }} /> , 'Thank you for opting-in to recieve updates about the Advanced Algos project!']} - backgroundUrl='https://aacorporatesitedevelop.azurewebsites.net/img/photos/superalgos-platform.jpg' -/> +import NEWSLETTER_SIGNUP_VERIFY from './graphql/NewsletterSignupVerify' + +export const EmailSignupConfirm = ({ tokenParam }) => { + let token + let BannerTitle = '' + let BannerText = '' + if (tokenParam !== '' && tokenParam !== null) { + const values = queryString.parse(tokenParam) + token = values.token + } else { + BannerText = [ + 'Newsletter Signup Error: Invalid Token', +
, + 'Please try signing up again! We apologize for the inconvenience,', +
, + 'but we highly value your seurity and privacy.' + ] + return ( + + ) + } + console.log(token) + return ( + + {(NewsletterSignupVerify, { loading, error, data }) => { + console.log(loading, error, data) + if (error) { + BannerText = ['Newsletter Signup Error: ',
, JSON.stringify(error)] + } + if (loading && !error) { + BannerText = ['Processing newsletter sign-up...',
, 'Thank you for opting-in to recieve updates about the Advanced Algos project!'] + } + if (data !== undefined && data !== null) { + console.log(data) + return ( + + ) + } else { + return ( + + ) + } + } + } +
+ ) +} + +EmailSignupConfirm.propTypes = { + tokenParam: PropTypes.string +} export default EmailSignupConfirm