From 26ff478ddc83f7a61c268c39d874509e0e632fb0 Mon Sep 17 00:00:00 2001 From: Barry Low Date: Thu, 6 Dec 2018 22:32:08 -0800 Subject: [PATCH 01/10] Teams 0.0.32 + WebComponent 0.0.17 --- client/package-lock.json | 345 ++++++++++++++++++++++++--------------- client/package.json | 4 +- 2 files changed, 214 insertions(+), 135 deletions(-) diff --git a/client/package-lock.json b/client/package-lock.json index 617465463..2f799c021 100644 --- a/client/package-lock.json +++ b/client/package-lock.json @@ -46,12 +46,12 @@ } }, "@advancedalgos/teams-client": { - "version": "0.0.30", - "resolved": "https://registry.npmjs.org/@advancedalgos/teams-client/-/teams-client-0.0.30.tgz", - "integrity": "sha512-L7i6GunMCdba9tDEq4SPQgnR8Ul8Qg6htMJUOukv78y2PgcWeTmWk3KtudN0NuUyzxw7SLBFEl3u66mTX/Tz6g==", + "version": "0.0.32", + "resolved": "https://registry.npmjs.org/@advancedalgos/teams-client/-/teams-client-0.0.32.tgz", + "integrity": "sha512-G8f5Jmso+6OTUUVafyOyfmaBC1GasX68dm5DjeJn7c8KVnDA8gU1Zm2yebDTPsoHMyvk6/eJIF6jISiaW6Itsw==", "dev": true, "requires": { - "@advancedalgos/web-components": "0.0.15", + "@advancedalgos/web-components": "0.0.17", "@azure/storage-blob": "^10.0.0-preview", "apollo-cache-inmemory": "^1.3.5", "apollo-client": "^2.4.2", @@ -145,25 +145,27 @@ } }, "@advancedalgos/web-components": { - "version": "0.0.15", - "resolved": "https://registry.npmjs.org/@advancedalgos/web-components/-/web-components-0.0.15.tgz", - "integrity": "sha512-Z9QyMqgpR/Al+0EYuLtSK3/9BJ/anB0zulBG7QMac9xCgNGSSbon9GndtSIFN3HwyirDCsIH3CZdPi6tJL3KnA==", + "version": "0.0.17", + "resolved": "https://registry.npmjs.org/@advancedalgos/web-components/-/web-components-0.0.17.tgz", + "integrity": "sha512-xD+0E4XBltgIxH/9TkzMS6a6iz7973YjxOzEr2O/D93lGIeHaYJQTDwykOLtSocuSaSSYRzxFlf82pVh22wLIA==", "dev": true, "requires": { "@azure/storage-blob": "^10.1.0-preview", - "@material-ui/core": "^3.2.2", + "@bearcanrun/react-image-cropper": "^1.3.6", + "@material-ui/core": "^3.6.1", "@material-ui/icons": "^3.0.1", - "apollo-client": "^2.4.5", + "apollo-client": "^2.4.7", "blob-util": "^2.0.2", "browser-image-resizer": "^1.2.0", "graphql": "^14.0.2", "graphql-tag": "^2.10.0", "prop-types": "^15.6.2", "react": "^16.6.1", - "react-apollo": "^2.3.1", + "react-apollo": "^2.3.2", "react-dom": "^16.6.1", "react-dropzone": "^5.1.0", - "react-image-cropper": "^1.3.0" + "react-helmet": "^5.2.0", + "react-router-dom": "^4.3.1" }, "dependencies": { "@azure/storage-blob": { @@ -177,44 +179,79 @@ "tslib": "^1.9.3" } }, - "apollo-cache": { - "version": "1.1.20", - "resolved": "https://registry.npmjs.org/apollo-cache/-/apollo-cache-1.1.20.tgz", - "integrity": "sha512-+Du0/4kUSuf5PjPx0+pvgMGV12ezbHA8/hubYuqRQoy/4AWb4faa61CgJNI6cKz2mhDd9m94VTNKTX11NntwkQ==", + "@material-ui/core": { + "version": "3.6.1", + "resolved": "https://registry.npmjs.org/@material-ui/core/-/core-3.6.1.tgz", + "integrity": "sha512-jmDtLQVXYHzvv6TljspaoHazGXkgmgnLUosFateBdB3Vva6WVJZ7WY5LaAGOqtuTEUW6KUKDumaGoOQs4xuJWA==", "dev": true, "requires": { - "apollo-utilities": "^1.0.25" + "@babel/runtime": "7.1.2", + "@material-ui/utils": "^3.0.0-alpha.0", + "@types/jss": "^9.5.6", + "@types/react-transition-group": "^2.0.8", + "brcast": "^3.0.1", + "classnames": "^2.2.5", + "csstype": "^2.5.2", + "debounce": "^1.1.0", + "deepmerge": "^2.0.1", + "dom-helpers": "^3.2.1", + "hoist-non-react-statics": "^3.0.0", + "is-plain-object": "^2.0.4", + "jss": "^9.3.3", + "jss-camel-case": "^6.0.0", + "jss-default-unit": "^8.0.2", + "jss-global": "^3.0.0", + "jss-nested": "^6.0.1", + "jss-props-sort": "^6.0.0", + "jss-vendor-prefixer": "^7.0.0", + "keycode": "^2.1.9", + "normalize-scroll-left": "^0.1.2", + "popper.js": "^1.14.1", + "prop-types": "^15.6.0", + "react-event-listener": "^0.6.2", + "react-transition-group": "^2.2.1", + "recompose": "0.28.0 - 0.30.0", + "warning": "^4.0.1" + } + }, + "apollo-cache": { + "version": "1.1.21", + "resolved": "https://registry.npmjs.org/apollo-cache/-/apollo-cache-1.1.21.tgz", + "integrity": "sha512-5ErNb78KHtrJNimkDBTEigcvHkIqUmS7QJIk4lpZZ+XLVVgvk2fD+GhD1PLP+s8vHfAKVbO6vdbRxCCjGGrh5w==", + "dev": true, + "requires": { + "apollo-utilities": "^1.0.26" } }, "apollo-client": { - "version": "2.4.6", - "resolved": "https://registry.npmjs.org/apollo-client/-/apollo-client-2.4.6.tgz", - "integrity": "sha512-RsZVMYone7mu3Wj4sr7ehctN8pdaHsP4X1Sv6Ly4gZ/YDetCCVnhbmnk5q7kvDtfoo0jhhHblxgFyA3FLLImtA==", + "version": "2.4.7", + "resolved": "https://registry.npmjs.org/apollo-client/-/apollo-client-2.4.7.tgz", + "integrity": "sha512-6aAm+16AFBYZhJF8eKxrup6AbYni01InDiwTfZhMMTP2xaXQWjsQnfaHbI2oE+hd3+AZFy1drkse8RZKghR/WQ==", "dev": true, "requires": { "@types/async": "2.0.50", "@types/zen-observable": "^0.8.0", - "apollo-cache": "1.1.20", + "apollo-cache": "1.1.21", "apollo-link": "^1.0.0", "apollo-link-dedup": "^1.0.0", - "apollo-utilities": "1.0.25", + "apollo-utilities": "1.0.26", "symbol-observable": "^1.0.2", "zen-observable": "^0.8.0" } }, "apollo-utilities": { - "version": "1.0.25", - "resolved": "https://registry.npmjs.org/apollo-utilities/-/apollo-utilities-1.0.25.tgz", - "integrity": "sha512-AXvqkhni3Ir1ffm4SA1QzXn8k8I5BBl4PVKEyak734i4jFdp+xgfUyi2VCqF64TJlFTA/B73TRDUvO2D+tKtZg==", + "version": "1.0.26", + "resolved": "https://registry.npmjs.org/apollo-utilities/-/apollo-utilities-1.0.26.tgz", + "integrity": "sha512-URw7o3phymliqYCYatcird2YRPUU2eWCNvip64U9gQrX56mEfK4m99yBIDCMTpmcvOFsKLii1sIEZsHIs/bvnw==", "dev": true, "requires": { "fast-json-stable-stringify": "^2.0.0" } }, "core-js": { - "version": "2.5.7", - "resolved": "https://registry.npmjs.org/core-js/-/core-js-2.5.7.tgz", - "integrity": "sha512-RszJCAxg/PP6uzXVXL6BsxSXx/B05oJAQ2vkJRjyjrEcNVycaqOmNb5OTxZPE3xa5gwZduqza6L9JOCenh/Ecw==", + "version": "2.6.0", + "resolved": "https://registry.npmjs.org/core-js/-/core-js-2.6.0.tgz", + "integrity": "sha512-kLRC6ncVpuEW/1kwrOXYX6KQASCVtrh1gQr/UiaVgFlf9WE5Vp+lNe5+h3LuMr5PAucWnnEXwH0nQHRH/gpGtw==", "dev": true }, "fbjs": { @@ -234,18 +271,18 @@ } }, "hoist-non-react-statics": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/hoist-non-react-statics/-/hoist-non-react-statics-3.1.0.tgz", - "integrity": "sha512-MYcYuROh7SBM69xHGqXEwQqDux34s9tz+sCnxJmN18kgWh6JFdTw/5YdZtqsOdZJXddE/wUpCzfEdDrJj8p0Iw==", + "version": "3.2.1", + "resolved": "https://registry.npmjs.org/hoist-non-react-statics/-/hoist-non-react-statics-3.2.1.tgz", + "integrity": "sha512-TFsu3TV3YLY+zFTZDrN8L2DTFanObwmBLpWvJs1qfUuEQ5bTAdFcwfx2T/bsCXfM9QHSLvjfP+nihEl0yvozxw==", "dev": true, "requires": { "react-is": "^16.3.2" } }, "react-apollo": { - "version": "2.3.1", - "resolved": "https://registry.npmjs.org/react-apollo/-/react-apollo-2.3.1.tgz", - "integrity": "sha512-xPteQmCzMJT8wE4v0zq38E6JWLhrNcJENl66fP117lwzU2lZA+qoUDcizqKl0z2OY5b+KklmqnPPD+wcWAdy7w==", + "version": "2.3.2", + "resolved": "https://registry.npmjs.org/react-apollo/-/react-apollo-2.3.2.tgz", + "integrity": "sha512-3lU9iqmj4KMIZvlWWSuLihxMGLEAL6oNmnSTWrb3/mRP36Zy0zJD4rdaonDx4WzqFYQAnUPaOiFnHGp0UQUTwA==", "dev": true, "requires": { "fbjs": "^1.0.0", @@ -1235,6 +1272,80 @@ "to-fast-properties": "^2.0.0" } }, + "@bearcanrun/react-image-cropper": { + "version": "1.3.6", + "resolved": "https://registry.npmjs.org/@bearcanrun/react-image-cropper/-/react-image-cropper-1.3.6.tgz", + "integrity": "sha512-/6F2rNd/bNR7jB/Pxhan1T6KDF+CHl9hEeybumtOyZrYc2foxawMNjxgD4MW0Z3Wh6GxZKDM9dlsxaaC+/y0Zg==", + "dev": true, + "requires": { + "deep-extend": "^0.6.0", + "npm-run-all": "^4.1.5", + "prop-types": "15.6.0", + "react": "16.5.2", + "react-dom": "16.5.2" + }, + "dependencies": { + "prop-types": { + "version": "15.6.0", + "resolved": "https://registry.npmjs.org/prop-types/-/prop-types-15.6.0.tgz", + "integrity": "sha1-zq8IMCL8RrSjX2nhPvda7Q1jmFY=", + "dev": true, + "requires": { + "fbjs": "^0.8.16", + "loose-envify": "^1.3.1", + "object-assign": "^4.1.1" + } + }, + "react": { + "version": "16.5.2", + "resolved": "https://registry.npmjs.org/react/-/react-16.5.2.tgz", + "integrity": "sha512-FDCSVd3DjVTmbEAjUNX6FgfAmQ+ypJfHUsqUJOYNCBUp1h8lqmtC+0mXJ+JjsWx4KAVTkk1vKd1hLQPvEviSuw==", + "dev": true, + "requires": { + "loose-envify": "^1.1.0", + "object-assign": "^4.1.1", + "prop-types": "^15.6.2", + "schedule": "^0.5.0" + }, + "dependencies": { + "prop-types": { + "version": "15.6.2", + "resolved": "https://registry.npmjs.org/prop-types/-/prop-types-15.6.2.tgz", + "integrity": "sha512-3pboPvLiWD7dkI3qf3KbUe6hKFKa52w+AE0VCqECtf+QHAKgOL37tTaNCnuX1nAAQ4ZhyP+kYVKf8rLmJ/feDQ==", + "dev": true, + "requires": { + "loose-envify": "^1.3.1", + "object-assign": "^4.1.1" + } + } + } + }, + "react-dom": { + "version": "16.5.2", + "resolved": "https://registry.npmjs.org/react-dom/-/react-dom-16.5.2.tgz", + "integrity": "sha512-RC8LDw8feuZOHVgzEf7f+cxBr/DnKdqp56VU0lAs1f4UfKc4cU8wU4fTq/mgnvynLQo8OtlPC19NUFh/zjZPuA==", + "dev": true, + "requires": { + "loose-envify": "^1.1.0", + "object-assign": "^4.1.1", + "prop-types": "^15.6.2", + "schedule": "^0.5.0" + }, + "dependencies": { + "prop-types": { + "version": "15.6.2", + "resolved": "https://registry.npmjs.org/prop-types/-/prop-types-15.6.2.tgz", + "integrity": "sha512-3pboPvLiWD7dkI3qf3KbUe6hKFKa52w+AE0VCqECtf+QHAKgOL37tTaNCnuX1nAAQ4ZhyP+kYVKf8rLmJ/feDQ==", + "dev": true, + "requires": { + "loose-envify": "^1.3.1", + "object-assign": "^4.1.1" + } + } + } + } + } + }, "@csstools/convert-colors": { "version": "1.4.0", "resolved": "https://registry.npmjs.org/@csstools/convert-colors/-/convert-colors-1.4.0.tgz", @@ -1344,6 +1455,15 @@ } } }, + "@material-ui/utils": { + "version": "3.0.0-alpha.0", + "resolved": "https://registry.npmjs.org/@material-ui/utils/-/utils-3.0.0-alpha.0.tgz", + "integrity": "sha512-HwC/pBcPG81UP4Jh0BaH2i4wAY9aDOrvL5+B/7J6cyFlG/Wip5Li+qI+GDlk9MR3kpG8v0sxfpWA0IlQYcHK6g==", + "dev": true, + "requires": { + "@babel/runtime": "7.1.2" + } + }, "@mrmlnc/readdir-enhanced": { "version": "2.2.1", "resolved": "https://registry.npmjs.org/@mrmlnc/readdir-enhanced/-/readdir-enhanced-2.2.1.tgz", @@ -2566,9 +2686,9 @@ }, "dependencies": { "core-js": { - "version": "2.5.7", - "resolved": "https://registry.npmjs.org/core-js/-/core-js-2.5.7.tgz", - "integrity": "sha512-RszJCAxg/PP6uzXVXL6BsxSXx/B05oJAQ2vkJRjyjrEcNVycaqOmNb5OTxZPE3xa5gwZduqza6L9JOCenh/Ecw==", + "version": "2.6.0", + "resolved": "https://registry.npmjs.org/core-js/-/core-js-2.6.0.tgz", + "integrity": "sha512-kLRC6ncVpuEW/1kwrOXYX6KQASCVtrh1gQr/UiaVgFlf9WE5Vp+lNe5+h3LuMr5PAucWnnEXwH0nQHRH/gpGtw==", "dev": true } } @@ -3087,9 +3207,9 @@ }, "dependencies": { "core-js": { - "version": "2.5.7", - "resolved": "https://registry.npmjs.org/core-js/-/core-js-2.5.7.tgz", - "integrity": "sha512-RszJCAxg/PP6uzXVXL6BsxSXx/B05oJAQ2vkJRjyjrEcNVycaqOmNb5OTxZPE3xa5gwZduqza6L9JOCenh/Ecw==", + "version": "2.6.0", + "resolved": "https://registry.npmjs.org/core-js/-/core-js-2.6.0.tgz", + "integrity": "sha512-kLRC6ncVpuEW/1kwrOXYX6KQASCVtrh1gQr/UiaVgFlf9WE5Vp+lNe5+h3LuMr5PAucWnnEXwH0nQHRH/gpGtw==", "dev": true }, "regenerator-runtime": { @@ -4914,9 +5034,9 @@ "dev": true }, "deep-extend": { - "version": "0.4.2", - "resolved": "https://registry.npmjs.org/deep-extend/-/deep-extend-0.4.2.tgz", - "integrity": "sha1-SLaZwn4zS/ifEIkr5DL25MfTSn8=", + "version": "0.6.0", + "resolved": "https://registry.npmjs.org/deep-extend/-/deep-extend-0.6.0.tgz", + "integrity": "sha512-LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA==", "dev": true }, "deep-is": { @@ -5981,22 +6101,6 @@ "integrity": "sha1-Qa4u62XvpiJorr/qg6x9eSmbCIc=", "dev": true }, - "event-stream": { - "version": "3.3.6", - "resolved": "https://registry.npmjs.org/event-stream/-/event-stream-3.3.6.tgz", - "integrity": "sha512-dGXNg4F/FgVzlApjzItL+7naHutA3fDqbV/zAZqDDlXTjiMnQmZKu+prImWKszeBM5UQeGvAl3u1wBiKeDh61g==", - "dev": true, - "requires": { - "duplexer": "^0.1.1", - "flatmap-stream": "^0.1.0", - "from": "^0.1.7", - "map-stream": "0.0.7", - "pause-stream": "^0.0.11", - "split": "^1.0.1", - "stream-combiner": "^0.2.2", - "through": "^2.3.8" - } - }, "eventemitter3": { "version": "3.1.0", "resolved": "https://registry.npmjs.org/eventemitter3/-/eventemitter3-3.1.0.tgz", @@ -6065,6 +6169,12 @@ } } }, + "exenv": { + "version": "1.2.2", + "resolved": "https://registry.npmjs.org/exenv/-/exenv-1.2.2.tgz", + "integrity": "sha1-KueOhdmJQVhnCwPUe+wfA72Ru50=", + "dev": true + }, "exit": { "version": "0.1.2", "resolved": "https://registry.npmjs.org/exit/-/exit-0.1.2.tgz", @@ -6773,12 +6883,6 @@ "write": "^0.2.1" } }, - "flatmap-stream": { - "version": "0.1.2", - "resolved": "https://registry.npmjs.org/flatmap-stream/-/flatmap-stream-0.1.2.tgz", - "integrity": "sha512-ucyr6WkLXjyMuHPtOUq4l+nSAxgWi7v4QO508eQ9resnGj+lSup26oIsUI5aH8k4Qfpjsxa8dDf9UCKkS2KHzQ==", - "dev": true - }, "flatten": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/flatten/-/flatten-1.0.2.tgz", @@ -7184,12 +7288,6 @@ "integrity": "sha1-PYyt2Q2XZWn6g1qx+OSyOhBWBac=", "dev": true }, - "from": { - "version": "0.1.7", - "resolved": "https://registry.npmjs.org/from/-/from-0.1.7.tgz", - "integrity": "sha1-g8YK/Fi5xWmXAH7Rp2izqzA6RP4=", - "dev": true - }, "from2": { "version": "2.3.0", "resolved": "https://registry.npmjs.org/from2/-/from2-2.3.0.tgz", @@ -10906,12 +11004,6 @@ "integrity": "sha1-2TPOuSBdgr3PSIb2dCvcK03qFG0=", "dev": true }, - "map-stream": { - "version": "0.0.7", - "resolved": "https://registry.npmjs.org/map-stream/-/map-stream-0.0.7.tgz", - "integrity": "sha1-ih8HiW2CsQkmvTdEokIACfiJdKg=", - "dev": true - }, "map-visit": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/map-visit/-/map-visit-1.0.0.tgz", @@ -14333,17 +14425,17 @@ } }, "npm-run-all": { - "version": "4.1.3", - "resolved": "https://registry.npmjs.org/npm-run-all/-/npm-run-all-4.1.3.tgz", - "integrity": "sha512-aOG0N3Eo/WW+q6sUIdzcV2COS8VnTZCmdji0VQIAZF3b+a3YWb0AD0vFIyjKec18A7beLGbaQ5jFTNI2bPt9Cg==", + "version": "4.1.5", + "resolved": "https://registry.npmjs.org/npm-run-all/-/npm-run-all-4.1.5.tgz", + "integrity": "sha512-Oo82gJDAVcaMdi3nuoKFavkIHBRVqQ1qvMb+9LHk/cF4P6B2m8aP04hGf7oL6wZ9BuGwX1onlLhpuoofSyoQDQ==", "dev": true, "requires": { - "ansi-styles": "^3.2.0", - "chalk": "^2.1.0", - "cross-spawn": "^6.0.4", + "ansi-styles": "^3.2.1", + "chalk": "^2.4.1", + "cross-spawn": "^6.0.5", "memorystream": "^0.3.1", "minimatch": "^3.0.4", - "ps-tree": "^1.1.0", + "pidtree": "^0.3.0", "read-pkg": "^3.0.0", "shell-quote": "^1.6.1", "string.prototype.padend": "^3.0.0" @@ -14840,15 +14932,6 @@ "pify": "^3.0.0" } }, - "pause-stream": { - "version": "0.0.11", - "resolved": "http://registry.npmjs.org/pause-stream/-/pause-stream-0.0.11.tgz", - "integrity": "sha1-/lo0sMvOErWqaitAPuLnO2AvFEU=", - "dev": true, - "requires": { - "through": "~2.3" - } - }, "pbkdf2": { "version": "3.0.17", "resolved": "https://registry.npmjs.org/pbkdf2/-/pbkdf2-3.0.17.tgz", @@ -14868,6 +14951,12 @@ "integrity": "sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns=", "dev": true }, + "pidtree": { + "version": "0.3.0", + "resolved": "https://registry.npmjs.org/pidtree/-/pidtree-0.3.0.tgz", + "integrity": "sha512-9CT4NFlDcosssyg8KVFltgokyKZIFjoBxw8CTGy+5F38Y1eQWrt8tRayiUOXE+zVKQnYu5BR8JjCtvK3BcnBhg==", + "dev": true + }, "pify": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz", @@ -16468,15 +16557,6 @@ "resolved": "https://registry.npmjs.org/prr/-/prr-1.0.1.tgz", "integrity": "sha1-0/wRS6BplaRexok/SEzrHXj19HY=" }, - "ps-tree": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/ps-tree/-/ps-tree-1.1.0.tgz", - "integrity": "sha1-tCGyQUDWID8e08dplrRCewjowBQ=", - "dev": true, - "requires": { - "event-stream": "~3.3.0" - } - }, "pseudomap": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/pseudomap/-/pseudomap-1.0.2.tgz", @@ -16868,6 +16948,18 @@ } } }, + "react-helmet": { + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/react-helmet/-/react-helmet-5.2.0.tgz", + "integrity": "sha1-qBgR3yExOm1VxfBYxK66XW89l6c=", + "dev": true, + "requires": { + "deep-equal": "^1.0.1", + "object-assign": "^4.1.1", + "prop-types": "^15.5.4", + "react-side-effect": "^1.1.0" + } + }, "react-hot-loader": { "version": "4.3.11", "resolved": "https://registry.npmjs.org/react-hot-loader/-/react-hot-loader-4.3.11.tgz", @@ -16882,19 +16974,6 @@ "shallowequal": "^1.0.2" } }, - "react-image-cropper": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/react-image-cropper/-/react-image-cropper-1.3.0.tgz", - "integrity": "sha512-OPEMv66xXQdNsAixqxhlsSX3+D3KVRQMYc6YHmgGINeKx433xB9l04hMFynngPuUa+ChiKal6aQmbzpg79iJ+Q==", - "dev": true, - "requires": { - "deep-extend": "^0.4.1", - "npm-run-all": "^4.1.1", - "prop-types": "^15.6.0", - "react": "^16.2.0", - "react-dom": "^16.2.0" - } - }, "react-is": { "version": "16.6.0", "resolved": "https://registry.npmjs.org/react-is/-/react-is-16.6.0.tgz", @@ -17998,6 +18077,16 @@ } } }, + "react-side-effect": { + "version": "1.1.5", + "resolved": "https://registry.npmjs.org/react-side-effect/-/react-side-effect-1.1.5.tgz", + "integrity": "sha512-Z2ZJE4p/jIfvUpiUMRydEVpQRf2f8GMHczT6qLcARmX7QRb28JDBTpnM2g/i5y/p7ZDEXYGHWg0RbhikE+hJRw==", + "dev": true, + "requires": { + "exenv": "^1.2.1", + "shallowequal": "^1.0.1" + } + }, "react-sortable-hoc": { "version": "0.8.3", "resolved": "https://registry.npmjs.org/react-sortable-hoc/-/react-sortable-hoc-0.8.3.tgz", @@ -19412,6 +19501,15 @@ "xmlchars": "^1.3.1" } }, + "schedule": { + "version": "0.5.0", + "resolved": "https://registry.npmjs.org/schedule/-/schedule-0.5.0.tgz", + "integrity": "sha512-HUcJicG5Ou8xfR//c2rPT0lPIRR09vVvN81T9fqfVgBmhERUbDEQoYKjpBxbueJnCPpSu2ujXzOnRQt6x9o/jw==", + "dev": true, + "requires": { + "object-assign": "^4.1.1" + } + }, "scheduler": { "version": "0.11.0", "resolved": "https://registry.npmjs.org/scheduler/-/scheduler-0.11.0.tgz", @@ -20050,15 +20148,6 @@ } } }, - "split": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/split/-/split-1.0.1.tgz", - "integrity": "sha512-mTyOoPbrivtXnwnIxZRFYRrPNtEFKlpB2fvjSnCQUiAA6qAZzqwna5envK4uk6OIeP17CsdF3rSBGYVBsU0Tkg==", - "dev": true, - "requires": { - "through": "2" - } - }, "split-string": { "version": "3.1.0", "resolved": "https://registry.npmjs.org/split-string/-/split-string-3.1.0.tgz", @@ -20161,16 +20250,6 @@ "readable-stream": "^2.0.2" } }, - "stream-combiner": { - "version": "0.2.2", - "resolved": "http://registry.npmjs.org/stream-combiner/-/stream-combiner-0.2.2.tgz", - "integrity": "sha1-rsjLrBd7Vrb0+kec7YwZEs7lKFg=", - "dev": true, - "requires": { - "duplexer": "~0.1.1", - "through": "~2.3.4" - } - }, "stream-each": { "version": "1.2.3", "resolved": "https://registry.npmjs.org/stream-each/-/stream-each-1.2.3.tgz", diff --git a/client/package.json b/client/package.json index 5e9e19710..6d2cc65ad 100644 --- a/client/package.json +++ b/client/package.json @@ -27,9 +27,9 @@ "devDependencies": { "@advancedalgos/events-client": "0.0.4", "@advancedalgos/key-vault-client": "0.0.25", - "@advancedalgos/teams-client": "0.0.30", + "@advancedalgos/teams-client": "0.0.32", "@advancedalgos/users-client": "0.0.24", - "@advancedalgos/web-components": "0.0.15", + "@advancedalgos/web-components": "0.0.17", "@babel/core": "^7.1.2", "@babel/plugin-proposal-class-properties": "^7.1.0", "@babel/plugin-syntax-dynamic-import": "^7.0.0", From c974c31ea239357a3cfe8e698fbc41eaf3558270 Mon Sep 17 00:00:00 2001 From: Barry Low Date: Thu, 6 Dec 2018 22:46:36 -0800 Subject: [PATCH 02/10] Fixed footer links --- client/src/views/layout/footer/index.js | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/client/src/views/layout/footer/index.js b/client/src/views/layout/footer/index.js index c8e2dcf1c..3e4e7fbfb 100644 --- a/client/src/views/layout/footer/index.js +++ b/client/src/views/layout/footer/index.js @@ -41,7 +41,7 @@ class Footer extends Component { Advanced Algos Ltd. Ground Floor, Palace Court, Church Street,
St. Julians STJ3049, Malta
- Privacy Statement | Terms of Service + Privacy Statement | Terms of Service © Advanced Algos, Ltd. 2018 | All Rights Reserved. @@ -51,24 +51,24 @@ class Footer extends Component { Meet us on Social Networks: - + - - + + - - + + - + From 353aee8b0ad069bb332a7480b9961c168ee91fe9 Mon Sep 17 00:00:00 2001 From: Barry Low Date: Thu, 13 Dec 2018 12:50:57 -0800 Subject: [PATCH 03/10] Update .env.sample --- server/.env.example | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/server/.env.example b/server/.env.example index ddb7185f4..b0365091c 100644 --- a/server/.env.example +++ b/server/.env.example @@ -1,13 +1,19 @@ +NODE_ENV=development + TEAMS_API_PRESHARED=THIS_IS_VERY_SECRET USERS_API_PRESHARED=THIS_IS_VERY_SECRET EVENTS_API_PRESHARED=THIS_IS_VERY_SECRET KEYVAULT_API_PRESHARED=THIS_IS_VERY_SECRET +FINANCIAL_BEINGS_API_PRESHARED=THIS_IS_VERY_SECRET +NOTIFICATIONS_API_PRESHARED=THIS_IS_VERY_SECRET -GRAPHQL_API_URL=https://app-api.advancedalgos.net/graphql -TEAMS_API_URL=https://teams-api.advancedalgos.net/graphql -USERS_API_URL=https://users-api.advancedalgos.net/graphql -EVENTS_API_URL=https://events-api.advancedalgos.net/graphql -KEYVAULT_API_URL=https://keyvault-api.advancedalgos.net/graphql +GRAPHQL_API_URL=https://platform-api-dev.advancedalgos.net/graphql +TEAMS_API_URL=https://teams-api-dev.advancedalgos.net/graphql +USERS_API_URL=https://users-api-dev.advancedalgos.net/graphql +EVENTS_API_URL=https://events-api-dev.advancedalgos.net/graphql +KEYVAULT_API_URL=https://keyvault-api-dev.advancedalgos.net/graphql +FINANCIAL_BEINGS_API_URL=https://financialbeings-api-dev.advancedalgos.net/graphql +NOTIFICATIONS_API__URL=https://notifications-api-dev.advancedalgos.net/graphql AUTH0_DOMAIN=auth0-domain AUTH0_AUDIENCE=auth0-audience @@ -16,8 +22,3 @@ AUTH0_ISSUER=auth0-issuer AACLOUD_ID=aacloud-id RECAPTCHA= - -SG_APIKEY= -SG_APIKEY_CONTACTS= -SG_SIGNUP_EMAILID= -SG_CONTACT_EMAILID= From 610cdef1159e3852a21f25fb8e58adf87a28658e Mon Sep 17 00:00:00 2001 From: Barry Low Date: Fri, 14 Dec 2018 19:42:57 -0800 Subject: [PATCH 04/10] Add notifications module --- server/.env.example | 7 ++++++- server/src/index.js | 38 +++++++++++++++++++++++++++++++++----- 2 files changed, 39 insertions(+), 6 deletions(-) diff --git a/server/.env.example b/server/.env.example index b0365091c..7a98bc3d7 100644 --- a/server/.env.example +++ b/server/.env.example @@ -7,13 +7,18 @@ KEYVAULT_API_PRESHARED=THIS_IS_VERY_SECRET FINANCIAL_BEINGS_API_PRESHARED=THIS_IS_VERY_SECRET NOTIFICATIONS_API_PRESHARED=THIS_IS_VERY_SECRET +# PROJECT_SITE_URL=https://advancedalgos.net +PROJECT_SITE_URL=http://localhost:3999 +# PLATFORM_URL=https://platform.advancedalgos.net +PLATFORM_URL=http://localhost:3100 + GRAPHQL_API_URL=https://platform-api-dev.advancedalgos.net/graphql TEAMS_API_URL=https://teams-api-dev.advancedalgos.net/graphql USERS_API_URL=https://users-api-dev.advancedalgos.net/graphql EVENTS_API_URL=https://events-api-dev.advancedalgos.net/graphql KEYVAULT_API_URL=https://keyvault-api-dev.advancedalgos.net/graphql FINANCIAL_BEINGS_API_URL=https://financialbeings-api-dev.advancedalgos.net/graphql -NOTIFICATIONS_API__URL=https://notifications-api-dev.advancedalgos.net/graphql +NOTIFICATIONS_API_URL=https://notifications-api-dev.advancedalgos.net/graphql AUTH0_DOMAIN=auth0-domain AUTH0_AUDIENCE=auth0-audience diff --git a/server/src/index.js b/server/src/index.js index 75ebfebc0..128f1b8c4 100644 --- a/server/src/index.js +++ b/server/src/index.js @@ -68,7 +68,12 @@ async function run () { 'financialBeings_', process.env.FINANCIAL_BEINGS_API_URL, process.env.FINANCIAL_BEINGS_API_PRESHARED) - logger.info('FINANCIAL_BEINGS schema created') + logger.info('Financial Beings schema created') + const transformedNotificationsSchema = await createTransformedRemoteSchema( + 'notifications_', + process.env.NOTIFICATIONS_API_URL, + process.env.NOTIFICATIONS_API_PRESHARED) + logger.info('Notifications schema created') var schemas = [masterSchema] var resolvers = {} @@ -97,7 +102,10 @@ async function run () { if (transformedFinancialBeingsSchema) { schemas.push(transformedFinancialBeingsSchema) } - + if (transformedNotificationsSchema) { + schemas.push(transformedNotificationsSchema) + } + const schema = mergeSchemas({ schemas, resolvers @@ -164,7 +172,7 @@ async function run () { return error }, formatResponse: response => { - logger.debug('Response from Apolo Server: ' + response) + logger.debug('Response from Apollo Server: ' + response) return response }, playground: { @@ -175,9 +183,29 @@ async function run () { } }) - server.applyMiddleware({ app }) + const whitelist = [ + process.env.PROJECT_SITE_URL, + process.env.PLATFORM_URL, + process.env.GRAPHQL_API_URL, + process.env.TEAMS_API_URL, + process.env.USERS_API_URL, + process.env.EVENTS_API_URL, + process.env.KEYVAULT_API_URL, + process.env.FINANCIAL_BEINGS_API_URL, + process.env.NOTIFICATIONS_API_URL + ] - app.use(cors()) + const corsOptionsDelegate = (req, callback) => { + let corsOptions + if (whitelist.indexOf(req.header('Origin')) !== -1) { + corsOptions = { origin: true, credentials: true } + } else { + corsOptions = { origin: false, credentials: true } + } + callback(null, corsOptions) + } + + server.applyMiddleware({ app, cors: corsOptionsDelegate }) app.listen(4100) logger.info(`Server running. Open ${process.env.GRAPHQL_API_URL} to run queries.`) From 6307cb3e649027e25c3c9df4052fa3e96edbb944 Mon Sep 17 00:00:00 2001 From: Barry Low Date: Fri, 14 Dec 2018 22:17:00 -0800 Subject: [PATCH 05/10] Add Changelog --- CHANGELOG.md | 18 ++++++++++++++++++ package.json | 2 +- 2 files changed, 19 insertions(+), 1 deletion(-) create mode 100644 CHANGELOG.md diff --git a/CHANGELOG.md b/CHANGELOG.md new file mode 100644 index 000000000..78575d67f --- /dev/null +++ b/CHANGELOG.md @@ -0,0 +1,18 @@ +# Changelog +All notable changes to this project will be documented in this file. + +## [Unreleased] +### Changed +- [List changes here for upcoming release] + +## 0.1.0 - 2018-12-14 +### Added +- Notifications Module - Sending notifications such as emails, messages to client, etc +- Reintroduced CORS whitelist +- Created CHANGELOG — for the logging of changes + +### Removed +- Removed Sendgrid Mutations (moved to notifications module) + +The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), +and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). diff --git a/package.json b/package.json index e2b128d1f..f32897886 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "master-app", - "version": "0.0.1", + "version": "0.1.0", "description": "Responsible for loading all web modules and running them.", "main": "index.js", "scripts": { From ce9d12d2f2a000ad2200c4401427cc5f234fe691 Mon Sep 17 00:00:00 2001 From: Barry Low Date: Fri, 14 Dec 2018 22:20:47 -0800 Subject: [PATCH 06/10] Remove Sendgrid Mutations --- server/src/index.js | 6 +- server/src/resolvers/index.js | 4 +- server/src/resolvers/mutation/index.js | 3 - server/src/resolvers/mutation/sendgrid.js | 237 ---------------------- server/src/schema/index.js | 4 +- 5 files changed, 5 insertions(+), 249 deletions(-) delete mode 100644 server/src/resolvers/mutation/sendgrid.js diff --git a/server/src/index.js b/server/src/index.js index 128f1b8c4..845a5fd30 100644 --- a/server/src/index.js +++ b/server/src/index.js @@ -9,8 +9,7 @@ import axios from 'axios' import { createTransformedRemoteSchema } from './createRemoteSchema' import { teams, events } from './links' -import { typeDef as masterSchema } from './schema' -import masterResolvers from './resolvers' + import logger from './logger' async function getUserId (authId) { @@ -75,9 +74,8 @@ async function run () { process.env.NOTIFICATIONS_API_PRESHARED) logger.info('Notifications schema created') - var schemas = [masterSchema] + var schemas = [] var resolvers = {} - resolvers = Object.assign(resolvers, masterResolvers) if (transformedTeamsSchema) { schemas.push(transformedTeamsSchema) diff --git a/server/src/resolvers/index.js b/server/src/resolvers/index.js index c260c10b3..9919da6d3 100644 --- a/server/src/resolvers/index.js +++ b/server/src/resolvers/index.js @@ -1,9 +1,9 @@ import merge from 'lodash.merge' -import { SendgridMutations } from './mutation' +// import { SendgridMutations } from './mutation' const resolvers = { Mutation: { - ...SendgridMutations + // ...SendgridMutations } } diff --git a/server/src/resolvers/mutation/index.js b/server/src/resolvers/mutation/index.js index 70ad9aef6..e69de29bb 100644 --- a/server/src/resolvers/mutation/index.js +++ b/server/src/resolvers/mutation/index.js @@ -1,3 +0,0 @@ -import SendgridMutations from './sendgrid' - -export { SendgridMutations } diff --git a/server/src/resolvers/mutation/sendgrid.js b/server/src/resolvers/mutation/sendgrid.js deleted file mode 100644 index 40b9c1275..000000000 --- a/server/src/resolvers/mutation/sendgrid.js +++ /dev/null @@ -1,237 +0,0 @@ -import axios from 'axios' -import jwt from 'jsonwebtoken' -import { ApolloError } from 'apollo-server-express' - -import logger from '../../logger' - -const API_KEY = process.env.SG_APIKEY -const API_KEY_CONTACTS = process.env.SG_APIKEY_CONTACTS -let origin = process.env.SANDGRID_ORIGN - -export default { - async master_NewsletterSignup(parent, { email }, ctx, info) { - logger.info('master_NewsletterSignup params email:') - logger.info(email) - const token = jwt.sign({ email: email }, API_KEY, { expiresIn: '1d' }) - const params = '/email-verification?token=' - - const headers = { - 'Content-Type': 'application/json', - 'Access-Control-Allow-Origin' : origin, - 'Access-Control-Allow-Credentials': 'true' - } - - const data = JSON.stringify({ - "personalizations": [ - { - "to": [ - { - "email": email - } - ], - dynamic_template_data: { - "aaverifylink": origin + params + token, - "subject": 'VERIFY YOUR INTEREST in Advanced Algos' - }, - "subject": 'VERIFY YOUR INTEREST in Advanced Algos' - } - ], - "from": { - "email": "feedback@advancedalgos.net", - "name": "Advanced Algos Team" - }, - "reply_to": { - "email": "feedback@advancedalgos.net", - "name": "Advanced Algos Team" - }, - "template_id": process.env.SG_SIGNUP_EMAILID - }) - - const sendVerify = axios({ - method: 'post', - url: 'https://api.sendgrid.com/v3/mail/send', - data: data, - headers:{ - 'content-type': 'application/json', - 'authorization': 'Bearer ' + API_KEY - } - }) - .then(function (response) { - logger.info('Sendgrid sendVerify response:') - logger.info(response) - if (response.status >= 200 && response.status < 300) { - return 'SUCCESS' - } else { - throw response.data.errors[0].message - } - }) - .catch(function (error) { - logger.error('Sendgrid sendVerify Error:') - logger.error(error) - throw new ApolloError(`Sendgrid sendVerify Error: ${error.response.data.errors[0].message}`, 404) - }) - return sendVerify - }, - async master_NewsletterSignupVerify(parent, { token }, ctx, info){ - let origin = process.env.SANDGRID_ORIGN - const headers = { - 'Content-Type': 'application/json', - 'Access-Control-Allow-Origin' : origin, - 'Access-Control-Allow-Credentials': 'true' - } - - let verifiedToken - try { - verifiedToken = jwt.verify(token, API_KEY, {maxAge: '1d'}) - } catch(err) { - logger.error('Sendgrid verifiedToken Error:') - logger.error(err) - if (err.name === 'TokenExpiredError'){ - throw new ApolloError('Error: Token Expired. Please resubmit email address.', 400) - } else { - throw new ApolloError(`Error: ${err.message}`, 400) - } - } - logger.info('Sendgrid verifySignup verifiedToken: ') - logger.info(verifiedToken) - - const email = verifiedToken.email - - const subscribe = axios({ - method: 'post', - url: 'https://api.sendgrid.com/v3/contactdb/recipients', - data: [{"email": email}], - headers:{ - 'content-type': 'application/json', - 'authorization': 'Bearer ' + API_KEY_CONTACTS - } - }) - .then(response => { - logger.info('Sendgrid verifySignup subscribe: ') - logger.info(response) - const recipients = response.data.persisted_recipients - - if (recipients.length > 0 ){ - const addToList = axios({ - method: 'post', - url: 'https://api.sendgrid.com/v3/contactdb/lists/4068018/recipients/' + recipients[0], - headers:{ - 'content-type': 'application/json', - 'authorization': 'Bearer ' + API_KEY_CONTACTS - } - }) - .then(response => { - logger.info('Sendgrid verifySignup addToList: ') - logger.info(response) - if (response.status >= 200 && response.status < 300) { - return 'SUCCESS' - } else { - throw response.data.errors[0].message - } - }) - .catch(error => { - logger.error('Sendgrid verifySignUp subscribe Error:') - logger.error(error) - throw `Email SignUp Error: ${error}` - }) - return addToList - } else{ - return response.data.errors[0].message - } - }) - .then(response => { - return response - }) - .catch(error => { - logger.error('Sendgrid verifySubscribe Error:') - logger.error(error) - throw new ApolloError(`Sendgrid verifySubscribe Error: ${error.response.data.errors[0].message}`, 404) - }) - return subscribe - }, - async master_Contact(parent, { email, subject, message, recaptcha }, ctx, info) { - const headers = { - 'Content-Type': 'application/json', - 'Access-Control-Allow-Origin' : origin, - 'Access-Control-Allow-Credentials': 'true' - } - - const toEmail = 'feedback@advancedalgos.net' - - const data = JSON.stringify({ - "personalizations": [ - { - "to": [ - { - "email": email - } - ], - dynamic_template_data: { - "aacontactname": name, - "aacontactemail": email, - "aacontactbody": message - }, - "subject": `AA Corporate Site Contact - Message from ${name}` - } - ], - "from": { - "email": email, - "name": name - }, - "reply_to": { - "email": email, - "name": name - }, - "template_id": process.env.SG_CONTACT_EMAILID - }) - - const checkCaptcha = axios({ - method: 'post', - url: 'https://www.google.com/recaptcha/api/siteverify', - params: { - secret: process.env.RECAPTCHA, - response: recaptcha - } - }) - .then(function (response) { - logger.info(response.data) - if (response.status >= 200 && response.status < 300 && response.data.success) { - context.log('presend SendGrid') - return axios({ - method: 'post', - url: 'https://api.sendgrid.com/v3/mail/send', - data: data, - headers:{ - 'content-type': 'application/json', - 'authorization': 'Bearer ' + API_KEY - } - }) - .then(function (response) { - logger.info('Sendgrid Contact response: ') - logger.info(response) - if (response.status >= 200 && response.status < 300) { - return `Contact email sent` - } else { - throw response.data.errors[0].message - } - }) - .catch(function (error) { - logger.error(`sendgrid Error: ${JSON.stringify(error)}`) - throw `Contact email send error: ${error.response.data.errors[0].message}` - }) - }else{ - throw response.data - } - }) - .then(function(response){ - return response - }) - .catch(function (error) { - logger.error('Sendgrid Contact RECAPTCHA Error:') - logger.error(error) - throw new ApolloError(`Sendgrid Contact RECAPTCHA Error: ${error.response.data.errors[0].message}`, 404) - }) - - return checkCaptcha - } -} diff --git a/server/src/schema/index.js b/server/src/schema/index.js index 4b416cceb..8b1651b1d 100644 --- a/server/src/schema/index.js +++ b/server/src/schema/index.js @@ -1,8 +1,6 @@ export const typeDef = ` type Mutation { - master_NewsletterSignup(email: String!): String - master_NewsletterSignupVerify(token: String!): String - master_Contact(email: String!, subject: String!, Message: String!, recaptcha: String!): String + master_SampleMutation(variable: String!): String } schema { From 01e5f06b883d49f52d1db12ad8cf9de54d32cbf5 Mon Sep 17 00:00:00 2001 From: Barry Low Date: Sun, 16 Dec 2018 19:04:30 -0800 Subject: [PATCH 07/10] Update email-verification graphql to notifications module --- CHANGELOG.md | 4 ++++ .../src/views/email-verification/graphql/NewsletterSignup.js | 2 +- .../email-verification/graphql/NewsletterSignupVerify.js | 4 ++-- package.json | 2 +- 4 files changed, 8 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 78575d67f..a4643f666 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,10 @@ All notable changes to this project will be documented in this file. ### Changed - [List changes here for upcoming release] +## 0.1.1 - 2018-12-16 +### Changed +- Update Master Client integration with Notifications Module + ## 0.1.0 - 2018-12-14 ### Added - Notifications Module - Sending notifications such as emails, messages to client, etc diff --git a/client/src/views/email-verification/graphql/NewsletterSignup.js b/client/src/views/email-verification/graphql/NewsletterSignup.js index 314b47bf3..92c09f432 100644 --- a/client/src/views/email-verification/graphql/NewsletterSignup.js +++ b/client/src/views/email-verification/graphql/NewsletterSignup.js @@ -3,7 +3,7 @@ import gql from 'graphql-tag' const NEWSLETTER_SIGNUP = gql` mutation NewsletterSignup($email: String!) { - master_NewsletterSignup(email: $email) + notifications_Master_NewsletterSignup(email: $email) } ` diff --git a/client/src/views/email-verification/graphql/NewsletterSignupVerify.js b/client/src/views/email-verification/graphql/NewsletterSignupVerify.js index 462a8cd3b..060b645fd 100644 --- a/client/src/views/email-verification/graphql/NewsletterSignupVerify.js +++ b/client/src/views/email-verification/graphql/NewsletterSignupVerify.js @@ -2,8 +2,8 @@ import gql from 'graphql-tag' const NEWSLETTER_SIGNUP_VERIFY = gql` - mutation NewsletterSignupVerify($token: String!) { - master_NewsletterSignupVerify(token: $token) + mutation NewsletterSignupVerify($token: String!){ + notifications_Master_NewsletterSignupVerify(token: $token) } ` diff --git a/package.json b/package.json index f32897886..9b759e37f 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "master-app", - "version": "0.1.0", + "version": "0.1.1", "description": "Responsible for loading all web modules and running them.", "main": "index.js", "scripts": { From 2656b4da02af54a8083ebd1798b226e19dc6baf6 Mon Sep 17 00:00:00 2001 From: Barry Low Date: Sun, 16 Dec 2018 19:57:38 -0800 Subject: [PATCH 08/10] Upgrade material-ui + webcomponents --- CHANGELOG.md | 4 + client/package-lock.json | 245 ++++++++++++++++++++++++++++----------- client/package.json | 4 +- 3 files changed, 184 insertions(+), 69 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index a4643f666..c2a340ad6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,10 @@ All notable changes to this project will be documented in this file. ### Changed - [List changes here for upcoming release] +## 0.1.2 - 2018-12-16 +### Change +- Client: Upgrade Material-ui to fix webpack deepmerge import bug + ## 0.1.1 - 2018-12-16 ### Changed - Update Master Client integration with Notifications Module diff --git a/client/package-lock.json b/client/package-lock.json index 2f799c021..7c19c0f02 100644 --- a/client/package-lock.json +++ b/client/package-lock.json @@ -78,6 +78,135 @@ "react-router-dom": "^4.3.1", "recompose": "^0.30.0", "subscriptions-transport-ws": "^0.9.15" + }, + "dependencies": { + "@advancedalgos/web-components": { + "version": "0.0.17", + "resolved": "https://registry.npmjs.org/@advancedalgos/web-components/-/web-components-0.0.17.tgz", + "integrity": "sha512-xD+0E4XBltgIxH/9TkzMS6a6iz7973YjxOzEr2O/D93lGIeHaYJQTDwykOLtSocuSaSSYRzxFlf82pVh22wLIA==", + "dev": true, + "requires": { + "@azure/storage-blob": "^10.1.0-preview", + "@bearcanrun/react-image-cropper": "^1.3.6", + "@material-ui/core": "^3.6.1", + "@material-ui/icons": "^3.0.1", + "apollo-client": "^2.4.7", + "blob-util": "^2.0.2", + "browser-image-resizer": "^1.2.0", + "graphql": "^14.0.2", + "graphql-tag": "^2.10.0", + "prop-types": "^15.6.2", + "react": "^16.6.1", + "react-apollo": "^2.3.2", + "react-dom": "^16.6.1", + "react-dropzone": "^5.1.0", + "react-helmet": "^5.2.0", + "react-router-dom": "^4.3.1" + }, + "dependencies": { + "@azure/storage-blob": { + "version": "10.1.0-preview", + "resolved": "https://registry.npmjs.org/@azure/storage-blob/-/storage-blob-10.1.0-preview.tgz", + "integrity": "sha512-vKY4dF8VCRCOOQ03Z1ResyjZbWg4jPOnQtRtlSEKE6a7WwFE3EuIbhE7OQfEihuNYyE+XWLkTjrHxeHDFx1hFg==", + "dev": true, + "requires": { + "events": "3.0.0", + "ms-rest-js": "0.22.425", + "tslib": "^1.9.3" + } + }, + "apollo-client": { + "version": "2.4.7", + "resolved": "https://registry.npmjs.org/apollo-client/-/apollo-client-2.4.7.tgz", + "integrity": "sha512-6aAm+16AFBYZhJF8eKxrup6AbYni01InDiwTfZhMMTP2xaXQWjsQnfaHbI2oE+hd3+AZFy1drkse8RZKghR/WQ==", + "dev": true, + "requires": { + "@types/async": "2.0.50", + "@types/zen-observable": "^0.8.0", + "apollo-cache": "1.1.21", + "apollo-link": "^1.0.0", + "apollo-link-dedup": "^1.0.0", + "apollo-utilities": "1.0.26", + "symbol-observable": "^1.0.2", + "zen-observable": "^0.8.0" + } + }, + "apollo-utilities": { + "version": "1.0.26", + "resolved": "https://registry.npmjs.org/apollo-utilities/-/apollo-utilities-1.0.26.tgz", + "integrity": "sha512-URw7o3phymliqYCYatcird2YRPUU2eWCNvip64U9gQrX56mEfK4m99yBIDCMTpmcvOFsKLii1sIEZsHIs/bvnw==", + "dev": true, + "requires": { + "fast-json-stable-stringify": "^2.0.0" + } + }, + "react-apollo": { + "version": "2.3.3", + "resolved": "https://registry.npmjs.org/react-apollo/-/react-apollo-2.3.3.tgz", + "integrity": "sha512-y4CwwmJjp0De/An7vrvEWOJ27lxmS/SXT8z22I8aOEBC2wzdcavDPjKzeLYJKs+hv1MGS3h84PSwFtlU4Em/bA==", + "dev": true, + "requires": { + "fbjs": "^1.0.0", + "hoist-non-react-statics": "^3.0.0", + "invariant": "^2.2.2", + "lodash.flowright": "^3.5.0", + "lodash.isequal": "^4.5.0", + "prop-types": "^15.6.0" + } + } + } + }, + "apollo-cache": { + "version": "1.1.21", + "resolved": "https://registry.npmjs.org/apollo-cache/-/apollo-cache-1.1.21.tgz", + "integrity": "sha512-5ErNb78KHtrJNimkDBTEigcvHkIqUmS7QJIk4lpZZ+XLVVgvk2fD+GhD1PLP+s8vHfAKVbO6vdbRxCCjGGrh5w==", + "dev": true, + "requires": { + "apollo-utilities": "^1.0.26" + }, + "dependencies": { + "apollo-utilities": { + "version": "1.0.26", + "resolved": "https://registry.npmjs.org/apollo-utilities/-/apollo-utilities-1.0.26.tgz", + "integrity": "sha512-URw7o3phymliqYCYatcird2YRPUU2eWCNvip64U9gQrX56mEfK4m99yBIDCMTpmcvOFsKLii1sIEZsHIs/bvnw==", + "dev": true, + "requires": { + "fast-json-stable-stringify": "^2.0.0" + } + } + } + }, + "core-js": { + "version": "2.6.0", + "resolved": "https://registry.npmjs.org/core-js/-/core-js-2.6.0.tgz", + "integrity": "sha512-kLRC6ncVpuEW/1kwrOXYX6KQASCVtrh1gQr/UiaVgFlf9WE5Vp+lNe5+h3LuMr5PAucWnnEXwH0nQHRH/gpGtw==", + "dev": true + }, + "fbjs": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/fbjs/-/fbjs-1.0.0.tgz", + "integrity": "sha512-MUgcMEJaFhCaF1QtWGnmq9ZDRAzECTCRAF7O6UZIlAlkTs1SasiX9aP0Iw7wfD2mJ7wDTNfg2w7u5fSCwJk1OA==", + "dev": true, + "requires": { + "core-js": "^2.4.1", + "fbjs-css-vars": "^1.0.0", + "isomorphic-fetch": "^2.1.1", + "loose-envify": "^1.0.0", + "object-assign": "^4.1.0", + "promise": "^7.1.1", + "setimmediate": "^1.0.5", + "ua-parser-js": "^0.7.18" + } + }, + "hoist-non-react-statics": { + "version": "3.2.1", + "resolved": "https://registry.npmjs.org/hoist-non-react-statics/-/hoist-non-react-statics-3.2.1.tgz", + "integrity": "sha512-TFsu3TV3YLY+zFTZDrN8L2DTFanObwmBLpWvJs1qfUuEQ5bTAdFcwfx2T/bsCXfM9QHSLvjfP+nihEl0yvozxw==", + "dev": true, + "requires": { + "react-is": "^16.3.2" + } + } } }, "@advancedalgos/users-client": { @@ -145,14 +274,14 @@ } }, "@advancedalgos/web-components": { - "version": "0.0.17", - "resolved": "https://registry.npmjs.org/@advancedalgos/web-components/-/web-components-0.0.17.tgz", - "integrity": "sha512-xD+0E4XBltgIxH/9TkzMS6a6iz7973YjxOzEr2O/D93lGIeHaYJQTDwykOLtSocuSaSSYRzxFlf82pVh22wLIA==", + "version": "0.0.18", + "resolved": "https://registry.npmjs.org/@advancedalgos/web-components/-/web-components-0.0.18.tgz", + "integrity": "sha512-zkfIRdiyJwRhtdcyTEltx3gQcVZPFh8IYMIDiFbFBfWbihwYLHpDQctR9DjSOCFeUsNqbV6OCzaSD7pZa51w8Q==", "dev": true, "requires": { "@azure/storage-blob": "^10.1.0-preview", "@bearcanrun/react-image-cropper": "^1.3.6", - "@material-ui/core": "^3.6.1", + "@material-ui/core": "^3.6.2", "@material-ui/icons": "^3.0.1", "apollo-client": "^2.4.7", "blob-util": "^2.0.2", @@ -179,41 +308,6 @@ "tslib": "^1.9.3" } }, - "@material-ui/core": { - "version": "3.6.1", - "resolved": "https://registry.npmjs.org/@material-ui/core/-/core-3.6.1.tgz", - "integrity": "sha512-jmDtLQVXYHzvv6TljspaoHazGXkgmgnLUosFateBdB3Vva6WVJZ7WY5LaAGOqtuTEUW6KUKDumaGoOQs4xuJWA==", - "dev": true, - "requires": { - "@babel/runtime": "7.1.2", - "@material-ui/utils": "^3.0.0-alpha.0", - "@types/jss": "^9.5.6", - "@types/react-transition-group": "^2.0.8", - "brcast": "^3.0.1", - "classnames": "^2.2.5", - "csstype": "^2.5.2", - "debounce": "^1.1.0", - "deepmerge": "^2.0.1", - "dom-helpers": "^3.2.1", - "hoist-non-react-statics": "^3.0.0", - "is-plain-object": "^2.0.4", - "jss": "^9.3.3", - "jss-camel-case": "^6.0.0", - "jss-default-unit": "^8.0.2", - "jss-global": "^3.0.0", - "jss-nested": "^6.0.1", - "jss-props-sort": "^6.0.0", - "jss-vendor-prefixer": "^7.0.0", - "keycode": "^2.1.9", - "normalize-scroll-left": "^0.1.2", - "popper.js": "^1.14.1", - "prop-types": "^15.6.0", - "react-event-listener": "^0.6.2", - "react-transition-group": "^2.2.1", - "recompose": "0.28.0 - 0.30.0", - "warning": "^4.0.1" - } - }, "apollo-cache": { "version": "1.1.21", "resolved": "https://registry.npmjs.org/apollo-cache/-/apollo-cache-1.1.21.tgz", @@ -280,9 +374,9 @@ } }, "react-apollo": { - "version": "2.3.2", - "resolved": "https://registry.npmjs.org/react-apollo/-/react-apollo-2.3.2.tgz", - "integrity": "sha512-3lU9iqmj4KMIZvlWWSuLihxMGLEAL6oNmnSTWrb3/mRP36Zy0zJD4rdaonDx4WzqFYQAnUPaOiFnHGp0UQUTwA==", + "version": "2.3.3", + "resolved": "https://registry.npmjs.org/react-apollo/-/react-apollo-2.3.3.tgz", + "integrity": "sha512-y4CwwmJjp0De/An7vrvEWOJ27lxmS/SXT8z22I8aOEBC2wzdcavDPjKzeLYJKs+hv1MGS3h84PSwFtlU4Em/bA==", "dev": true, "requires": { "fbjs": "^1.0.0", @@ -1391,20 +1485,21 @@ } }, "@material-ui/core": { - "version": "3.3.2", - "resolved": "https://registry.npmjs.org/@material-ui/core/-/core-3.3.2.tgz", - "integrity": "sha512-3yYGrWBzML7OhzmgwBvWpQnFq9ROWj+so+ULADB+lXjpOuxbUf8IUWbR4/S4chh+8/DTNMjTGIUdpj//XeubLQ==", + "version": "3.6.2", + "resolved": "https://registry.npmjs.org/@material-ui/core/-/core-3.6.2.tgz", + "integrity": "sha512-ONWU8ZCrhzzmeh6QXbYwicZxD0wSxj32UOSmPHXReZs4RTaeXOtLVloIxh7810fIR/GkfGXa/UJIK/woSHW4/Q==", "requires": { "@babel/runtime": "7.1.2", + "@material-ui/utils": "^3.0.0-alpha.0", "@types/jss": "^9.5.6", "@types/react-transition-group": "^2.0.8", "brcast": "^3.0.1", "classnames": "^2.2.5", "csstype": "^2.5.2", "debounce": "^1.1.0", - "deepmerge": "^2.0.1", + "deepmerge": "^3.0.0", "dom-helpers": "^3.2.1", - "hoist-non-react-statics": "^2.5.0", + "hoist-non-react-statics": "^3.2.1", "is-plain-object": "^2.0.4", "jss": "^9.3.3", "jss-camel-case": "^6.0.0", @@ -1421,6 +1516,16 @@ "react-transition-group": "^2.2.1", "recompose": "0.28.0 - 0.30.0", "warning": "^4.0.1" + }, + "dependencies": { + "hoist-non-react-statics": { + "version": "3.2.1", + "resolved": "https://registry.npmjs.org/hoist-non-react-statics/-/hoist-non-react-statics-3.2.1.tgz", + "integrity": "sha512-TFsu3TV3YLY+zFTZDrN8L2DTFanObwmBLpWvJs1qfUuEQ5bTAdFcwfx2T/bsCXfM9QHSLvjfP+nihEl0yvozxw==", + "requires": { + "react-is": "^16.3.2" + } + } } }, "@material-ui/icons": { @@ -1459,7 +1564,6 @@ "version": "3.0.0-alpha.0", "resolved": "https://registry.npmjs.org/@material-ui/utils/-/utils-3.0.0-alpha.0.tgz", "integrity": "sha512-HwC/pBcPG81UP4Jh0BaH2i4wAY9aDOrvL5+B/7J6cyFlG/Wip5Li+qI+GDlk9MR3kpG8v0sxfpWA0IlQYcHK6g==", - "dev": true, "requires": { "@babel/runtime": "7.1.2" } @@ -1599,9 +1703,9 @@ "dev": true }, "@types/prop-types": { - "version": "15.5.6", - "resolved": "https://registry.npmjs.org/@types/prop-types/-/prop-types-15.5.6.tgz", - "integrity": "sha512-ZBFR7TROLVzCkswA3Fmqq+IIJt62/T7aY/Dmz+QkU7CaW2QFqAitCE8Ups7IzmGhcN1YWMBT4Qcoc07jU9hOJQ==" + "version": "15.5.8", + "resolved": "https://registry.npmjs.org/@types/prop-types/-/prop-types-15.5.8.tgz", + "integrity": "sha512-3AQoUxQcQtLHsK25wtTWIoIpgYjH3vSDroZOUr7PpCHw/jLY1RB9z9E8dBT/OSmwStVgkRNvdh+ZHNiomRieaw==" }, "@types/range-parser": { "version": "1.2.2", @@ -1610,9 +1714,9 @@ "dev": true }, "@types/react": { - "version": "16.4.18", - "resolved": "https://registry.npmjs.org/@types/react/-/react-16.4.18.tgz", - "integrity": "sha512-eFzJKEg6pdeaukVLVZ8Xb79CTl/ysX+ExmOfAAqcFlCCK5TgFDD9kWR0S18sglQ3EmM8U+80enjUqbfnUyqpdA==", + "version": "16.7.17", + "resolved": "https://registry.npmjs.org/@types/react/-/react-16.7.17.tgz", + "integrity": "sha512-YcXcaoXaxo7A76mBCGlKlN2aZu3REQfF0DTrhiyXVJLA7PDdxVCr+wiQOrkVNn44D/zLlIyDSn3U918Ve0AaEA==", "requires": { "@types/prop-types": "*", "csstype": "^2.2.0" @@ -4952,9 +5056,9 @@ } }, "csstype": { - "version": "2.5.7", - "resolved": "https://registry.npmjs.org/csstype/-/csstype-2.5.7.tgz", - "integrity": "sha512-Nt5VDyOTIIV4/nRFswoCKps1R5CD1hkiyjBE9/thNaNZILLEviVw9yWQw15+O+CpNjQKB/uvdcxFFOrSflY3Yw==" + "version": "2.5.8", + "resolved": "https://registry.npmjs.org/csstype/-/csstype-2.5.8.tgz", + "integrity": "sha512-r4DbsyNJ7slwBSKoGesxDubRWJ71ghG8W2+1HcsDlAo12KGca9dDLv0u98tfdFw7ldBdoA7XmCnI6Q8LpAJXaQ==" }, "currently-unhandled": { "version": "0.4.1", @@ -5046,9 +5150,9 @@ "dev": true }, "deepmerge": { - "version": "2.2.1", - "resolved": "https://registry.npmjs.org/deepmerge/-/deepmerge-2.2.1.tgz", - "integrity": "sha512-R9hc1Xa/NOBi9WRVUWg19rl1UB7Tt4kuPd+thNJgFZoxXsTz7ncaPaeIm+40oSGuP33DfMb4sZt1QIGiJzC4EA==" + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/deepmerge/-/deepmerge-3.0.0.tgz", + "integrity": "sha512-a8z8bkgHsAML+uHLqmMS83HHlpy3PvZOOuiTQqaa3wu8ZVg3h0hqHk6aCsGdOnZV2XMM/FRimNGjUh0KCcmHBw==" }, "default-gateway": { "version": "2.7.2", @@ -9141,11 +9245,18 @@ "dev": true }, "indefinite-observable": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/indefinite-observable/-/indefinite-observable-1.0.1.tgz", - "integrity": "sha1-CZFUI8yNb36xy3iCrRNGM8mm7cM=", + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/indefinite-observable/-/indefinite-observable-1.0.2.tgz", + "integrity": "sha512-Mps0898zEduHyPhb7UCgNmfzlqNZknVmaFz5qzr0mm04YQ5FGLhAyK/dJ+NaRxGyR6juQXIxh5Ev0xx+qq0nYA==", "requires": { - "symbol-observable": "1.0.4" + "symbol-observable": "1.2.0" + }, + "dependencies": { + "symbol-observable": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/symbol-observable/-/symbol-observable-1.2.0.tgz", + "integrity": "sha512-e900nM8RRtGhlV36KGEU9k65K3mPb1WV70OdjfxlG2EAuM1noi/E/BaW/uMhL7bPEssK8QV57vN3esixjUvcXQ==" + } } }, "indent-string": { @@ -15058,9 +15169,9 @@ "dev": true }, "popper.js": { - "version": "1.14.4", - "resolved": "https://registry.npmjs.org/popper.js/-/popper.js-1.14.4.tgz", - "integrity": "sha1-juwdj/AqWjoVLdQ0FKFce3n9abY=" + "version": "1.14.6", + "resolved": "https://registry.npmjs.org/popper.js/-/popper.js-1.14.6.tgz", + "integrity": "sha512-AGwHGQBKumlk/MDfrSOf0JHhJCImdDMcGNoqKmKkU+68GFazv3CQ6q9r7Ja1sKDZmYWTckY/uLyEznheTDycnA==" }, "portfinder": { "version": "1.0.19", diff --git a/client/package.json b/client/package.json index 6d2cc65ad..2fd10c8e4 100644 --- a/client/package.json +++ b/client/package.json @@ -29,7 +29,7 @@ "@advancedalgos/key-vault-client": "0.0.25", "@advancedalgos/teams-client": "0.0.32", "@advancedalgos/users-client": "0.0.24", - "@advancedalgos/web-components": "0.0.17", + "@advancedalgos/web-components": "0.0.18", "@babel/core": "^7.1.2", "@babel/plugin-proposal-class-properties": "^7.1.0", "@babel/plugin-syntax-dynamic-import": "^7.0.0", @@ -79,7 +79,7 @@ "@fortawesome/free-brands-svg-icons": "^5.5.0", "@fortawesome/free-solid-svg-icons": "^5.5.0", "@fortawesome/react-fontawesome": "^0.1.3", - "@material-ui/core": "^3.2.2", + "@material-ui/core": "^3.6.2", "@material-ui/icons": "^3.0.1", "apollo-cache-inmemory": "^1.3.5", "apollo-client": "^2.4.2", From 90f6ed6ab6c837b9d33e40ef9d903ba72fb86a43 Mon Sep 17 00:00:00 2001 From: Barry Low Date: Mon, 17 Dec 2018 08:25:06 -0800 Subject: [PATCH 09/10] Update signup data responses --- client/src/views/email-verification/components/SignupForm.js | 2 +- .../views/email-verification/components/SignupVerifyResponse.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/client/src/views/email-verification/components/SignupForm.js b/client/src/views/email-verification/components/SignupForm.js index d8db5a03a..ae959467a 100644 --- a/client/src/views/email-verification/components/SignupForm.js +++ b/client/src/views/email-verification/components/SignupForm.js @@ -122,7 +122,7 @@ export class SignupForm extends Component { console.log('NewsletterSignup handleSubmit: ', this.state.email) const signupResponse = await NewsletterSignup({ variables: { email: this.state.email } }) console.log('NewsletterSignup: ', signupResponse) - if (signupResponse.data.master_NewsletterSignup === 'SUCCESS') this.setState({ email: '', success: true }) + if (signupResponse.data.notifications_Master_NewsletterSignup === 'SUCCESS') this.setState({ email: '', success: true }) } } diff --git a/client/src/views/email-verification/components/SignupVerifyResponse.js b/client/src/views/email-verification/components/SignupVerifyResponse.js index 525cee3a9..89303dba6 100644 --- a/client/src/views/email-verification/components/SignupVerifyResponse.js +++ b/client/src/views/email-verification/components/SignupVerifyResponse.js @@ -56,7 +56,7 @@ export class SignupVerifyResponse extends React.Component { } if (data !== undefined && data !== null) { console.log(data) - if (data.master_NewsletterSignupVerify === 'SUCCESS') { + if (data.notifications_Master_NewsletterSignupVerify === 'SUCCESS') { return ( Date: Mon, 17 Dec 2018 08:27:47 -0800 Subject: [PATCH 10/10] Update Changelog --- CHANGELOG.md | 4 ++++ client/package.json | 2 +- package.json | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index c2a340ad6..6991b67cb 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,10 @@ All notable changes to this project will be documented in this file. ### Changed - [List changes here for upcoming release] +## 0.1.3 - 2018-12-17 +### Change +- Client: Fix newsletter signup notification integration + ## 0.1.2 - 2018-12-16 ### Change - Client: Upgrade Material-ui to fix webpack deepmerge import bug diff --git a/client/package.json b/client/package.json index 2fd10c8e4..45fa48784 100644 --- a/client/package.json +++ b/client/package.json @@ -1,6 +1,6 @@ { "name": "master-app-client", - "version": "0.0.1", + "version": "0.1.3", "description": "Responsible for loading all web modules and running them.", "main": "src/index.js", "scripts": { diff --git a/package.json b/package.json index 9b759e37f..70ea69af3 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "master-app", - "version": "0.1.1", + "version": "0.1.3", "description": "Responsible for loading all web modules and running them.", "main": "index.js", "scripts": {