From 536ec702996a0f22f179815d417a706fe809306c Mon Sep 17 00:00:00 2001 From: Edson Ayllon Date: Mon, 9 Dec 2019 20:50:38 -0500 Subject: [PATCH 01/20] Converted /create page to functional component, started unlock integration --- package.json | 6 +- public/index.html | 37 ++++++ src/routes/CreateEvent.js | 133 +++++++++++++++----- yarn.lock | 249 ++++++++++++++++++++++++++++++++++---- 4 files changed, 370 insertions(+), 55 deletions(-) diff --git a/package.json b/package.json index c7a5c370..7a63705c 100644 --- a/package.json +++ b/package.json @@ -30,16 +30,16 @@ "moment-timezone": "^0.5.23", "query-string": "^6.2.0", "rc-time-picker": "^3.6.2", - "react": "^16.8.1", + "react": "^16.12.0", "react-apollo": "^2.2.4", "react-blockies": "^1.4.1", "react-day-picker": "^7.3.0", - "react-dom": "^16.8.1", + "react-dom": "^16.12.0", "react-dropdown": "^1.6.4", "react-dropzone": "^7.0.1", "react-emotion": "^9.2.6", "react-router": "^4.3.1", - "react-router-dom": "^4.3.1", + "react-router-dom": "^5.1.2", "react-router-hash-link": "^1.2.0", "react-scripts": "2.1.5", "react-select": "^2.1.0", diff --git a/public/index.html b/public/index.html index 1633df1b..defff798 100644 --- a/public/index.html +++ b/public/index.html @@ -34,6 +34,43 @@ Learn how to configure a non-root public URL by running `npm run build`. --> Kickback + + + + + diff --git a/src/routes/CreateEvent.js b/src/routes/CreateEvent.js index 11f88f10..d26d3bea 100644 --- a/src/routes/CreateEvent.js +++ b/src/routes/CreateEvent.js @@ -1,8 +1,9 @@ -import React, { Component } from 'react' +import React, { useState, useEffect } from 'react' import styled from 'react-emotion' -import { withRouter } from 'react-router-dom' +import { useHistory } from 'react-router-dom' import DefaultTextInput from '../components/Forms/TextInput' import Label from '../components/Forms/Label' +import DefaultButton from '../components/Forms/Button' import PartyForm from '../components/SingleEvent/Admin/PartyForm' import { CREATE_PENDING_PARTY } from '../graphql/mutations' @@ -13,42 +14,114 @@ const CreateContainer = styled('div')` flex-direction: column; ` +const LockedContainer = styled('div')` + display: flex; + flex-direction: column; +` + const TextInput = styled(DefaultTextInput)` margin-bottom: 20px; ` -class Create extends Component { - state = { - password: '' - } +const Button = styled(DefaultButton)` + width: 300px; + margin: 60px auto 0px auto; +` - render() { - const { password } = this.state - - return ( - - - - this.setState({ password: val })} - type="password" - /> - - - ) - } +const UnlockCredit = styled('div')` + margin: 30px auto 80px auto; +` - _onCreated = ({ id }, deposit, limitOfParticipants, coolingPeriod) => { - this.props.history.push( +const UnlockedLogo = styled('a')` + color: #ff6771; + font-weight: 700; +` + +function Create() { + const [password, setPassword] = useState('') + const [locked, setLocked] = useState('pending') + let history = useHistory() + + const _onCreated = ({ id }, deposit, limitOfParticipants, coolingPeriod) => { + history.push( `/deploy?id=${id}&deposit=${deposit}&limitOfParticipants=${limitOfParticipants}&coolingPeriod=${coolingPeriod}` ) } + + const unlockHandler = e => { + setLocked(e.detail) + console.log(e.detail) + /* + Status can either be 'unlocked' or 'locked'... + If state is 'unlocked': implement code here which will be triggered when + the current visitor has a valid lock key + If state is 'locked': implement code here which will be + triggered when the current visitor does not have a valid lock key + */ + } + + const checkout = () => { + console.log(window.unlockProtocol) + window.unlockProtocol && window.unlockProtocol.loadCheckoutModal() + } + + useEffect(() => { + window.addEventListener('unlockProtocol', unlockHandler) + }, []) + + useEffect(() => { + return () => { + window.removeEventListener('unlockProtocol', unlockHandler) + } + }, []) + + return ( + + { + { + unlocked: ( + + + setPassword(val)} + type="password" + /> + + ), + locked: ( + +

Deploy your Kickback contract with us

+

+ Kickback offers paid benefits for event organizers publishing + their own kickback contract. Membership comes in two tiers. +

+ + + Powered by{' '} + + Unlock + + + + ), + pending:
Loading Unlock
, + default:
Please enable Javascript
+ }[locked || locked['default']] + } + + ) } -export default withRouter(Create) +export default Create diff --git a/yarn.lock b/yarn.lock index 5d887f91..fc363373 100644 --- a/yarn.lock +++ b/yarn.lock @@ -891,6 +891,13 @@ dependencies: regenerator-runtime "^0.12.0" +"@babel/runtime@^7.1.2", "@babel/runtime@^7.4.0", "@babel/runtime@^7.5.5": + version "7.7.6" + resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.7.6.tgz#d18c511121aff1b4f2cd1d452f1bac9601dd830f" + integrity sha512-BWAJxpNVa0QlE5gZdWjSxXtemZyZ9RmrmVozxt3NUXeZhVIJ5ANyqmMc0JDrivBZyxUuQvFxlvH4OWWOogGfUw== + dependencies: + regenerator-runtime "^0.13.2" + "@babel/template@7.0.0-beta.44": version "7.0.0-beta.44" resolved "http://registry.npmjs.org/@babel/template/-/template-7.0.0-beta.44.tgz#f8832f4fdcee5d59bf515e595fc5106c529b394f" @@ -1042,20 +1049,79 @@ find-root "^1.1.0" source-map "^0.7.2" +"@emotion/cache@^10.0.17": + version "10.0.19" + resolved "https://registry.yarnpkg.com/@emotion/cache/-/cache-10.0.19.tgz#d258d94d9c707dcadaf1558def968b86bb87ad71" + integrity sha512-BoiLlk4vEsGBg2dAqGSJu0vJl/PgVtCYLBFJaEO8RmQzPugXewQCXZJNXTDFaRlfCs0W+quesayav4fvaif5WQ== + dependencies: + "@emotion/sheet" "0.9.3" + "@emotion/stylis" "0.8.4" + "@emotion/utils" "0.11.2" + "@emotion/weak-memoize" "0.2.4" + +"@emotion/core@^10.0.22": + version "10.0.22" + resolved "https://registry.yarnpkg.com/@emotion/core/-/core-10.0.22.tgz#2ac7bcf9b99a1979ab5b0a876fbf37ab0688b177" + integrity sha512-7eoP6KQVUyOjAkE6y4fdlxbZRA4ILs7dqkkm6oZUJmihtHv0UBq98VgPirq9T8F9K2gKu0J/au/TpKryKMinaA== + dependencies: + "@babel/runtime" "^7.5.5" + "@emotion/cache" "^10.0.17" + "@emotion/css" "^10.0.22" + "@emotion/serialize" "^0.11.12" + "@emotion/sheet" "0.9.3" + "@emotion/utils" "0.11.2" + +"@emotion/css@^10.0.22": + version "10.0.22" + resolved "https://registry.yarnpkg.com/@emotion/css/-/css-10.0.22.tgz#37b1abb6826759fe8ac0af0ac0034d27de6d1793" + integrity sha512-8phfa5mC/OadBTmGpMpwykIVH0gFCbUoO684LUkyixPq4F1Wwri7fK5Xlm8lURNBrd2TuvTbPUGxFsGxF9UacA== + dependencies: + "@emotion/serialize" "^0.11.12" + "@emotion/utils" "0.11.2" + babel-plugin-emotion "^10.0.22" + +"@emotion/hash@0.7.3": + version "0.7.3" + resolved "https://registry.yarnpkg.com/@emotion/hash/-/hash-0.7.3.tgz#a166882c81c0c6040975dd30df24fae8549bd96f" + integrity sha512-14ZVlsB9akwvydAdaEnVnvqu6J2P6ySv39hYyl/aoB6w/V+bXX0tay8cF6paqbgZsN2n5Xh15uF4pE+GvE+itw== + "@emotion/hash@^0.6.2", "@emotion/hash@^0.6.6": version "0.6.6" resolved "https://registry.yarnpkg.com/@emotion/hash/-/hash-0.6.6.tgz#62266c5f0eac6941fece302abad69f2ee7e25e44" +"@emotion/is-prop-valid@0.8.5": + version "0.8.5" + resolved "https://registry.yarnpkg.com/@emotion/is-prop-valid/-/is-prop-valid-0.8.5.tgz#2dda0791f0eafa12b7a0a5b39858405cc7bde983" + integrity sha512-6ZODuZSFofbxSbcxwsFz+6ioPjb0ISJRRPLZ+WIbjcU2IMU0Io+RGQjjaTgOvNQl007KICBm7zXQaYQEC1r6Bg== + dependencies: + "@emotion/memoize" "0.7.3" + "@emotion/is-prop-valid@^0.6.1": version "0.6.8" resolved "https://registry.yarnpkg.com/@emotion/is-prop-valid/-/is-prop-valid-0.6.8.tgz#68ad02831da41213a2089d2cab4e8ac8b30cbd85" dependencies: "@emotion/memoize" "^0.6.6" +"@emotion/memoize@0.7.3": + version "0.7.3" + resolved "https://registry.yarnpkg.com/@emotion/memoize/-/memoize-0.7.3.tgz#5b6b1c11d6a6dddf1f2fc996f74cf3b219644d78" + integrity sha512-2Md9mH6mvo+ygq1trTeVp2uzAKwE2P7In0cRpD/M9Q70aH8L+rxMLbb3JCN2JoSWsV2O+DdFjfbbXoMoLBczow== + "@emotion/memoize@^0.6.1", "@emotion/memoize@^0.6.6": version "0.6.6" resolved "https://registry.yarnpkg.com/@emotion/memoize/-/memoize-0.6.6.tgz#004b98298d04c7ca3b4f50ca2035d4f60d2eed1b" +"@emotion/serialize@^0.11.12", "@emotion/serialize@^0.11.14": + version "0.11.14" + resolved "https://registry.yarnpkg.com/@emotion/serialize/-/serialize-0.11.14.tgz#56a6d8d04d837cc5b0126788b2134c51353c6488" + integrity sha512-6hTsySIuQTbDbv00AnUO6O6Xafdwo5GswRlMZ5hHqiFx+4pZ7uGWXUQFW46Kc2taGhP89uXMXn/lWQkdyTosPA== + dependencies: + "@emotion/hash" "0.7.3" + "@emotion/memoize" "0.7.3" + "@emotion/unitless" "0.7.4" + "@emotion/utils" "0.11.2" + csstype "^2.5.7" + "@emotion/serialize@^0.9.1": version "0.9.1" resolved "https://registry.yarnpkg.com/@emotion/serialize/-/serialize-0.9.1.tgz#a494982a6920730dba6303eb018220a2b629c145" @@ -1065,18 +1131,61 @@ "@emotion/unitless" "^0.6.7" "@emotion/utils" "^0.8.2" +"@emotion/sheet@0.9.3": + version "0.9.3" + resolved "https://registry.yarnpkg.com/@emotion/sheet/-/sheet-0.9.3.tgz#689f135ecf87d3c650ed0c4f5ddcbe579883564a" + integrity sha512-c3Q6V7Df7jfwSq5AzQWbXHa5soeE4F5cbqi40xn0CzXxWW9/6Mxq48WJEtqfWzbZtW9odZdnRAkwCQwN12ob4A== + +"@emotion/styled-base@^10.0.23": + version "10.0.24" + resolved "https://registry.yarnpkg.com/@emotion/styled-base/-/styled-base-10.0.24.tgz#9497efd8902dfeddee89d24b0eeb26b0665bfe8b" + integrity sha512-AnBImerf0h4dGAJVo0p0VE8KoAns71F28ErGFK474zbNAHX6yqSWQUasb+1jvg/VPwZjCp19+tAr6oOB0pwmLQ== + dependencies: + "@babel/runtime" "^7.5.5" + "@emotion/is-prop-valid" "0.8.5" + "@emotion/serialize" "^0.11.14" + "@emotion/utils" "0.11.2" + +"@emotion/styled@^10.0.23": + version "10.0.23" + resolved "https://registry.yarnpkg.com/@emotion/styled/-/styled-10.0.23.tgz#2f8279bd59b99d82deade76d1046249ddfab7c1b" + integrity sha512-gNr04eqBQ2iYUx8wFLZDfm3N8/QUOODu/ReDXa693uyQGy2OqA+IhPJk+kA7id8aOfwAsMuvZ0pJImEXXKtaVQ== + dependencies: + "@emotion/styled-base" "^10.0.23" + babel-plugin-emotion "^10.0.23" + +"@emotion/stylis@0.8.4": + version "0.8.4" + resolved "https://registry.yarnpkg.com/@emotion/stylis/-/stylis-0.8.4.tgz#6c51afdf1dd0d73666ba09d2eb6c25c220d6fe4c" + integrity sha512-TLmkCVm8f8gH0oLv+HWKiu7e8xmBIaokhxcEKPh1m8pXiV/akCiq50FvYgOwY42rjejck8nsdQxZlXZ7pmyBUQ== + "@emotion/stylis@^0.7.0": version "0.7.1" resolved "https://registry.yarnpkg.com/@emotion/stylis/-/stylis-0.7.1.tgz#50f63225e712d99e2b2b39c19c70fff023793ca5" +"@emotion/unitless@0.7.4": + version "0.7.4" + resolved "https://registry.yarnpkg.com/@emotion/unitless/-/unitless-0.7.4.tgz#a87b4b04e5ae14a88d48ebef15015f6b7d1f5677" + integrity sha512-kBa+cDHOR9jpRJ+kcGMsysrls0leukrm68DmFQoMIWQcXdr2cZvyvypWuGYT7U+9kAExUE7+T7r6G3C3A6L8MQ== + "@emotion/unitless@^0.6.2", "@emotion/unitless@^0.6.7": version "0.6.7" resolved "https://registry.yarnpkg.com/@emotion/unitless/-/unitless-0.6.7.tgz#53e9f1892f725b194d5e6a1684a7b394df592397" +"@emotion/utils@0.11.2": + version "0.11.2" + resolved "https://registry.yarnpkg.com/@emotion/utils/-/utils-0.11.2.tgz#713056bfdffb396b0a14f1c8f18e7b4d0d200183" + integrity sha512-UHX2XklLl3sIaP6oiMmlVzT0J+2ATTVpf0dHQVyPJHTkOITvXfaSqnRk6mdDhV9pR8T/tHc3cex78IKXssmzrA== + "@emotion/utils@^0.8.2": version "0.8.2" resolved "https://registry.yarnpkg.com/@emotion/utils/-/utils-0.8.2.tgz#576ff7fb1230185b619a75d258cbc98f0867a8dc" +"@emotion/weak-memoize@0.2.4": + version "0.2.4" + resolved "https://registry.yarnpkg.com/@emotion/weak-memoize/-/weak-memoize-0.2.4.tgz#622a72bebd1e3f48d921563b4b60a762295a81fc" + integrity sha512-6PYY5DVdAY1ifaQW6XYTnOMihmBVT27elqSjEoodchsGjzYlEsTQMcEhSud99kVawatyTZRTiVkJ/c6lwbQ7nA== + "@iamstarkov/listr-update-renderer@0.4.1": version "0.4.1" resolved "https://registry.yarnpkg.com/@iamstarkov/listr-update-renderer/-/listr-update-renderer-0.4.1.tgz#d7c48092a2dcf90fd672b6c8b458649cb350c77e" @@ -2552,6 +2661,22 @@ babel-plugin-dynamic-import-node@2.2.0: dependencies: object.assign "^4.1.0" +babel-plugin-emotion@^10.0.22, babel-plugin-emotion@^10.0.23: + version "10.0.23" + resolved "https://registry.yarnpkg.com/babel-plugin-emotion/-/babel-plugin-emotion-10.0.23.tgz#040d40bf61dcab6d31dd6043d10e180240b8515b" + integrity sha512-1JiCyXU0t5S2xCbItejCduLGGcKmF3POT0Ujbexog2MI4IlRcIn/kWjkYwCUZlxpON0O5FC635yPl/3slr7cKQ== + dependencies: + "@babel/helper-module-imports" "^7.0.0" + "@emotion/hash" "0.7.3" + "@emotion/memoize" "0.7.3" + "@emotion/serialize" "^0.11.14" + babel-plugin-macros "^2.0.0" + babel-plugin-syntax-jsx "^6.18.0" + convert-source-map "^1.5.0" + escape-string-regexp "^1.0.5" + find-root "^1.1.0" + source-map "^0.5.7" + babel-plugin-emotion@^9.2.11: version "9.2.11" resolved "https://registry.yarnpkg.com/babel-plugin-emotion/-/babel-plugin-emotion-9.2.11.tgz#319c005a9ee1d15bb447f59fe504c35fd5807728" @@ -4824,6 +4949,11 @@ csstype@^2.2.0, csstype@^2.5.2: version "2.5.7" resolved "https://registry.yarnpkg.com/csstype/-/csstype-2.5.7.tgz#bf9235d5872141eccfb2d16d82993c6b149179ff" +csstype@^2.5.7: + version "2.6.7" + resolved "https://registry.yarnpkg.com/csstype/-/csstype-2.6.7.tgz#20b0024c20b6718f4eda3853a1f5a1cce7f5e4a5" + integrity sha512-9Mcn9sFbGBAdmimWb2gLVDtFJzeKtDGIr76TUqmjZrw9LFXBMSU70lcs+C0/7fyCd6iBDqmksUcCOUIkisPHsQ== + cycle@1.0.x: version "1.0.3" resolved "https://registry.yarnpkg.com/cycle/-/cycle-1.0.3.tgz#21e80b2be8580f98b468f379430662b046c34ad2" @@ -6920,6 +7050,11 @@ growly@^1.3.0: version "1.3.0" resolved "https://registry.yarnpkg.com/growly/-/growly-1.3.0.tgz#f10748cbe76af964b7c96c93c6bcc28af120c081" +gud@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/gud/-/gud-1.0.0.tgz#a489581b17e6a70beca9abe3ae57de7a499852c0" + integrity sha512-zGEOVKFM5sVPPrYs7J5/hYEw2Pof8KCyOwyhG8sAF26mCAeUFAcYPu1mwB7hhpIP29zOIBaDqwuHdLp0jvZXjw== + gzip-size@3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/gzip-size/-/gzip-size-3.0.0.tgz#546188e9bdc337f673772f81660464b389dce520" @@ -7116,6 +7251,18 @@ history@^4.7.2: value-equal "^0.4.0" warning "^3.0.0" +history@^4.9.0: + version "4.10.1" + resolved "https://registry.yarnpkg.com/history/-/history-4.10.1.tgz#33371a65e3a83b267434e2b3f3b1b4c58aad4cf3" + integrity sha512-36nwAD620w12kuzPAsyINPWJqlNbij+hpK1k9XRloDtym8mxzGYl2c17LnV6IAGB2Dmg4tEa7G7DlawS0+qjew== + dependencies: + "@babel/runtime" "^7.1.2" + loose-envify "^1.2.0" + resolve-pathname "^3.0.0" + tiny-invariant "^1.0.2" + tiny-warning "^1.0.0" + value-equal "^1.0.1" + hmac-drbg@^1.0.0: version "1.0.1" resolved "https://registry.yarnpkg.com/hmac-drbg/-/hmac-drbg-1.0.1.tgz#d2745701025a6c775a6c545793ed502fc0c649a1" @@ -7142,6 +7289,13 @@ hoist-non-react-statics@^3.0.0: dependencies: react-is "^16.3.2" +hoist-non-react-statics@^3.1.0: + version "3.3.1" + resolved "https://registry.yarnpkg.com/hoist-non-react-statics/-/hoist-non-react-statics-3.3.1.tgz#101685d3aff3b23ea213163f6e8e12f4f111e19f" + integrity sha512-wbg3bpgA/ZqWrZuMOeJi8+SKMhr7X9TesL/rXMjTzh0p0JUBo3II8DHboYbuIXWRlttrUFxwcu/5kygrCw8fJw== + dependencies: + react-is "^16.7.0" + home-or-tmp@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/home-or-tmp/-/home-or-tmp-2.0.0.tgz#e36c3f2d2cae7d746a857e38d18d5f32a7882db8" @@ -9292,6 +9446,15 @@ min-document@^2.19.0: dependencies: dom-walk "^0.1.0" +mini-create-react-context@^0.3.0: + version "0.3.2" + resolved "https://registry.yarnpkg.com/mini-create-react-context/-/mini-create-react-context-0.3.2.tgz#79fc598f283dd623da8e088b05db8cddab250189" + integrity sha512-2v+OeetEyliMt5VHMXsBhABoJ0/M4RCe7fatd/fBy6SMiKazUSEt3gxxypfnk2SHMkdBYvorHRoQxuGoiwbzAw== + dependencies: + "@babel/runtime" "^7.4.0" + gud "^1.0.0" + tiny-warning "^1.0.2" + mini-css-extract-plugin@0.5.0: version "0.5.0" resolved "https://registry.yarnpkg.com/mini-css-extract-plugin/-/mini-css-extract-plugin-0.5.0.tgz#ac0059b02b9692515a637115b0cc9fed3a35c7b0" @@ -11637,15 +11800,15 @@ react-docgen@^3.0.0-beta11: node-dir "^0.1.10" recast "^0.15.0" -react-dom@^16.8.1: - version "16.8.1" - resolved "https://registry.yarnpkg.com/react-dom/-/react-dom-16.8.1.tgz#ec860f98853d09d39bafd3a6f1e12389d283dbb4" - integrity sha512-N74IZUrPt6UiDjXaO7UbDDFXeUXnVhZzeRLy/6iqqN1ipfjrhR60Bp5NuBK+rv3GMdqdIuwIl22u1SYwf330bg== +react-dom@^16.12.0: + version "16.12.0" + resolved "https://registry.yarnpkg.com/react-dom/-/react-dom-16.12.0.tgz#0da4b714b8d13c2038c9396b54a92baea633fe11" + integrity sha512-LMxFfAGrcS3kETtQaCkTKjMiifahaMySFDn71fZUNpPHZQEzmk/GiAeIT8JSOrHB23fnuCOMruL2a8NYlw+8Gw== dependencies: loose-envify "^1.1.0" object-assign "^4.1.1" prop-types "^15.6.2" - scheduler "^0.13.1" + scheduler "^0.18.0" react-dropdown@^1.6.4: version "1.6.4" @@ -11719,6 +11882,11 @@ react-is@^16.3.2: version "16.5.2" resolved "https://registry.yarnpkg.com/react-is/-/react-is-16.5.2.tgz#e2a7b7c3f5d48062eb769fcb123505eb928722e3" +react-is@^16.6.0, react-is@^16.7.0: + version "16.12.0" + resolved "https://registry.yarnpkg.com/react-is/-/react-is-16.12.0.tgz#2cc0fe0fba742d97fd527c42a13bec4eeb06241c" + integrity sha512-rPCkf/mWBtKc97aLL9/txD8DZdemK0vkA3JMLShjlJB3Pj3s+lpf1KaBzMfQrAmhMQB0n1cU/SUGgKKBCe837Q== + react-is@^16.8.1: version "16.8.4" resolved "https://registry.yarnpkg.com/react-is/-/react-is-16.8.4.tgz#90f336a68c3a29a096a3d648ab80e87ec61482a2" @@ -11737,16 +11905,18 @@ react-modal@^3.3.2: react-lifecycles-compat "^3.0.0" warning "^3.0.0" -react-router-dom@^4.3.1: - version "4.3.1" - resolved "https://registry.yarnpkg.com/react-router-dom/-/react-router-dom-4.3.1.tgz#4c2619fc24c4fa87c9fd18f4fb4a43fe63fbd5c6" +react-router-dom@^5.1.2: + version "5.1.2" + resolved "https://registry.yarnpkg.com/react-router-dom/-/react-router-dom-5.1.2.tgz#06701b834352f44d37fbb6311f870f84c76b9c18" + integrity sha512-7BPHAaIwWpZS074UKaw1FjVdZBSVWEk8IuDXdB+OkLb8vd/WRQIpA4ag9WQk61aEfQs47wHyjWUoUGGZxpQXew== dependencies: - history "^4.7.2" - invariant "^2.2.4" + "@babel/runtime" "^7.1.2" + history "^4.9.0" loose-envify "^1.3.1" - prop-types "^15.6.1" - react-router "^4.3.1" - warning "^4.0.1" + prop-types "^15.6.2" + react-router "5.1.2" + tiny-invariant "^1.0.2" + tiny-warning "^1.0.0" react-router-hash-link@^1.2.0: version "1.2.0" @@ -11754,6 +11924,22 @@ react-router-hash-link@^1.2.0: dependencies: prop-types "^15.6.0" +react-router@5.1.2: + version "5.1.2" + resolved "https://registry.yarnpkg.com/react-router/-/react-router-5.1.2.tgz#6ea51d789cb36a6be1ba5f7c0d48dd9e817d3418" + integrity sha512-yjEuMFy1ONK246B+rsa0cUam5OeAQ8pyclRDgpxuSCrAlJ1qN9uZ5IgyKC7gQg0w8OM50NXHEegPh/ks9YuR2A== + dependencies: + "@babel/runtime" "^7.1.2" + history "^4.9.0" + hoist-non-react-statics "^3.1.0" + loose-envify "^1.3.1" + mini-create-react-context "^0.3.0" + path-to-regexp "^1.7.0" + prop-types "^15.6.2" + react-is "^16.6.0" + tiny-invariant "^1.0.2" + tiny-warning "^1.0.0" + react-router@^4.3.1: version "4.3.1" resolved "https://registry.yarnpkg.com/react-router/-/react-router-4.3.1.tgz#aada4aef14c809cb2e686b05cee4742234506c4e" @@ -11883,15 +12069,14 @@ react-treebeard@^2.1.0: shallowequal "^0.2.2" velocity-react "^1.3.1" -react@^16.8.1: - version "16.8.1" - resolved "https://registry.yarnpkg.com/react/-/react-16.8.1.tgz#ae11831f6cb2a05d58603a976afc8a558e852c4a" - integrity sha512-wLw5CFGPdo7p/AgteFz7GblI2JPOos0+biSoxf1FPsGxWQZdN/pj6oToJs1crn61DL3Ln7mN86uZ4j74p31ELQ== +react@^16.12.0: + version "16.12.0" + resolved "https://registry.yarnpkg.com/react/-/react-16.12.0.tgz#0c0a9c6a142429e3614834d5a778e18aa78a0b83" + integrity sha512-fglqy3k5E+81pA8s+7K0/T3DBCF0ZDOher1elBFzF7O6arXJgzyu/FW+COxFvAWXJoJN9KIZbT2LXlukwphYTA== dependencies: loose-envify "^1.1.0" object-assign "^4.1.1" prop-types "^15.6.2" - scheduler "^0.13.1" read-pkg-up@^1.0.1: version "1.0.1" @@ -12362,6 +12547,11 @@ resolve-pathname@^2.2.0: version "2.2.0" resolved "https://registry.yarnpkg.com/resolve-pathname/-/resolve-pathname-2.2.0.tgz#7e9ae21ed815fd63ab189adeee64dc831eefa879" +resolve-pathname@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/resolve-pathname/-/resolve-pathname-3.0.0.tgz#99d02224d3cf263689becbb393bc560313025dcd" + integrity sha512-C7rARubxI8bXFNB/hqcp/4iUeIXJhJZvFPFPiSPRnhU5UPxzMFIl+2E6yY6c4k9giDJAhtV+enfA+G89N6Csng== + resolve-url@^0.2.1: version "0.2.1" resolved "https://registry.yarnpkg.com/resolve-url/-/resolve-url-0.2.1.tgz#2c637fe77c893afd2a663fe21aa9080068e2052a" @@ -12551,10 +12741,10 @@ sax@^1.2.4, sax@~1.2.1, sax@~1.2.4: version "1.2.4" resolved "https://registry.yarnpkg.com/sax/-/sax-1.2.4.tgz#2816234e2378bddc4e5354fab5caa895df7100d9" -scheduler@^0.13.1: - version "0.13.1" - resolved "https://registry.yarnpkg.com/scheduler/-/scheduler-0.13.1.tgz#1a217df1bfaabaf4f1b92a9127d5d732d85a9591" - integrity sha512-VJKOkiKIN2/6NOoexuypwSrybx13MY7NSy9RNt8wPvZDMRT1CW6qlpF5jXRToXNHz3uWzbm2elNpZfXfGPqP9A== +scheduler@^0.18.0: + version "0.18.0" + resolved "https://registry.yarnpkg.com/scheduler/-/scheduler-0.18.0.tgz#5901ad6659bc1d8f3fdaf36eb7a67b0d6746b1c4" + integrity sha512-agTSHR1Nbfi6ulI0kYNK0203joW2Y5W4po4l+v03tOoiJKpTBbxpNhWDvqc/4IcOw+KLmSiQLTasZ4cab2/UWQ== dependencies: loose-envify "^1.1.0" object-assign "^4.1.1" @@ -13674,6 +13864,16 @@ timsort@^0.3.0: version "0.3.0" resolved "https://registry.yarnpkg.com/timsort/-/timsort-0.3.0.tgz#405411a8e7e6339fe64db9a234de11dc31e02bd4" +tiny-invariant@^1.0.2: + version "1.0.6" + resolved "https://registry.yarnpkg.com/tiny-invariant/-/tiny-invariant-1.0.6.tgz#b3f9b38835e36a41c843a3b0907a5a7b3755de73" + integrity sha512-FOyLWWVjG+aC0UqG76V53yAWdXfH8bO6FNmyZOuUrzDzK8DI3/JRY25UD7+g49JWM1LXwymsKERB+DzI0dTEQA== + +tiny-warning@^1.0.0, tiny-warning@^1.0.2: + version "1.0.3" + resolved "https://registry.yarnpkg.com/tiny-warning/-/tiny-warning-1.0.3.tgz#94a30db453df4c643d0fd566060d60a875d84754" + integrity sha512-lBN9zLN/oAf68o3zNXYrdCt1kP8WsiGW8Oo2ka41b2IM5JL/S1CTyX1rW0mb/zSuJun0ZUrDxx4sqvYS2FWzPA== + tmp@0.0.31: version "0.0.31" resolved "https://registry.yarnpkg.com/tmp/-/tmp-0.0.31.tgz#8f38ab9438e17315e5dbd8b3657e8bfb277ae4a7" @@ -14133,6 +14333,11 @@ value-equal@^0.4.0: version "0.4.0" resolved "https://registry.yarnpkg.com/value-equal/-/value-equal-0.4.0.tgz#c5bdd2f54ee093c04839d71ce2e4758a6890abc7" +value-equal@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/value-equal/-/value-equal-1.0.1.tgz#1e0b794c734c5c0cade179c437d356d931a34d6c" + integrity sha512-NOJ6JZCAWr0zlxZt+xqCHNTEKOsrks2HQd4MqhP1qy4z1SkbEP467eNx6TgDKXMvUOb+OENfJCZwM+16n7fRfw== + vary@^1, vary@~1.1.2: version "1.1.2" resolved "https://registry.yarnpkg.com/vary/-/vary-1.1.2.tgz#2299f02c6ded30d4a5961b0b9f74524a18f634fc" From 292b7b04d18dd0f3c19a6a993351e5c71909eba2 Mon Sep 17 00:00:00 2001 From: Edson Ayllon Date: Tue, 10 Dec 2019 23:53:36 -0500 Subject: [PATCH 02/20] converted paywall to Rinkeby --- package.json | 4 +- public/index.html | 26 +++++--- src/routes/CreateEvent.js | 8 +-- yarn.lock | 129 +------------------------------------- 4 files changed, 26 insertions(+), 141 deletions(-) diff --git a/package.json b/package.json index 7a63705c..f3dd5589 100644 --- a/package.json +++ b/package.json @@ -30,11 +30,11 @@ "moment-timezone": "^0.5.23", "query-string": "^6.2.0", "rc-time-picker": "^3.6.2", - "react": "^16.12.0", + "react": "^16.8.1", "react-apollo": "^2.2.4", "react-blockies": "^1.4.1", "react-day-picker": "^7.3.0", - "react-dom": "^16.12.0", + "react-dom": "^16.8.1", "react-dropdown": "^1.6.4", "react-dropzone": "^7.0.1", "react-emotion": "^9.2.6", diff --git a/public/index.html b/public/index.html index defff798..5b555409 100644 --- a/public/index.html +++ b/public/index.html @@ -39,24 +39,32 @@ Unlock snippet scripts modified from https://github.com/unlock-protocol/react-example/blob/master/public/index.html --> - - - // Kovan is included, but currently unsupported with paywall - const lockSelection = { - 1: {}, + + + @@ -91,38 +117,13 @@ // unlock config must use var var unlockProtocolConfig = { locks, - icon: 'https://unlock-protocol.com/static/images/svg/unlock-word-mark.svg', + icon: "https://kickback.events/card.png", callToAction: { default: 'Select a membership to access page', }, } - - - - -
- - - - diff --git a/public/logo.svg b/public/logo.svg new file mode 100644 index 00000000..00aca731 --- /dev/null +++ b/public/logo.svg @@ -0,0 +1 @@ + \ No newline at end of file From eda6bd51883ad5503196a777163fe9f02a35afca Mon Sep 17 00:00:00 2001 From: Edson Ayllon Date: Wed, 11 Dec 2019 17:38:22 -0500 Subject: [PATCH 05/20] Remove logo.svg from public folder --- public/logo.svg | 1 - 1 file changed, 1 deletion(-) delete mode 100644 public/logo.svg diff --git a/public/logo.svg b/public/logo.svg deleted file mode 100644 index 00aca731..00000000 --- a/public/logo.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file From 595316b9f82d516e64ffda03cffe7b5e0a82a9d1 Mon Sep 17 00:00:00 2001 From: Edson Ayllon Date: Thu, 12 Dec 2019 19:37:56 -0500 Subject: [PATCH 06/20] removes paywall in /create for local network set in env.json --- public/index.html | 12 ++++++------ src/components/Header/HamburgerMenu.js | 8 ++++++-- src/routes/CreateEvent.js | 22 +++++++++++----------- 3 files changed, 23 insertions(+), 19 deletions(-) diff --git a/public/index.html b/public/index.html index cd8c7277..432bfa7a 100644 --- a/public/index.html +++ b/public/index.html @@ -34,8 +34,6 @@ Learn how to configure a non-root public URL by running `npm run build`. --> Kickback - - @@ -84,9 +82,11 @@ const environment = "%NODE_ENV%"; const networkId = environment === "production" ? 1 : 4; - // Kovan is included, but currently only Rinkeby and Mainnet is unsupported with paywall - // tokens entered first to last are displayed right to left in paywall modal - // NOTE: Replace Mainnet keys with keys Kickback owns + /* + Kovan is included, but currently only Rinkeby and Mainnet is supported with paywall + tokens entered first to last are displayed right to left in paywall modal + NOTE: Replace Mainnet keys with keys Kickback owns + */ const locks = { 1: { "enter-key-address-here": { @@ -120,7 +120,7 @@ icon: "https://kickback.events/card.png", callToAction: { default: - 'Select a membership to access page', + 'Select a membership to access page.', }, } diff --git a/src/components/Header/HamburgerMenu.js b/src/components/Header/HamburgerMenu.js index 3c675615..f77664ec 100644 --- a/src/components/Header/HamburgerMenu.js +++ b/src/components/Header/HamburgerMenu.js @@ -31,9 +31,13 @@ function HamburgerMenu({ isMenuOpen }) { Pricing {links.map(l => isExternal(l.url) ? ( - {l.label} + + {l.label} + ) : ( - {l.label} + + {l.label} + ) )} diff --git a/src/routes/CreateEvent.js b/src/routes/CreateEvent.js index 052e5421..8db39703 100644 --- a/src/routes/CreateEvent.js +++ b/src/routes/CreateEvent.js @@ -5,7 +5,7 @@ import DefaultTextInput from '../components/Forms/TextInput' import Label from '../components/Forms/Label' import DefaultButton from '../components/Forms/Button' import Loader from '../components/Loader' - +import { ENV } from '../config' import PartyForm from '../components/SingleEvent/Admin/PartyForm' import { CREATE_PENDING_PARTY } from '../graphql/mutations' @@ -38,7 +38,7 @@ const UnlockedLogo = styled('a')` font-weight: 800; ` -function Create() { +export default function Create() { const [password, setPassword] = useState('') const [locked, setLocked] = useState('pending') let history = useHistory() @@ -66,12 +66,18 @@ function Create() { } useEffect(() => { - window.addEventListener('unlockProtocol', unlockHandler) + console.log(ENV) + if (ENV !== 'local') { + window.addEventListener('unlockProtocol', unlockHandler) + } else { + setLocked('unlocked') + } }, []) useEffect(() => { return () => { - window.removeEventListener('unlockProtocol', unlockHandler) + if (ENV !== 'local') + window.removeEventListener('unlockProtocol', unlockHandler) } }, []) @@ -116,16 +122,10 @@ function Create() { ), - pending: ( -
- -
- ), + pending: , default:
Please enable Javascript
}[locked || locked['default']] } ) } - -export default Create From c1f1908d7da54ccdb89da409eeb4dd0a1ea5b283 Mon Sep 17 00:00:00 2001 From: Edson Ayllon Date: Fri, 13 Dec 2019 17:43:29 -0500 Subject: [PATCH 07/20] updated unlock environment selection by package.json parameters, added instructions in README --- README.md | 11 +++++++++++ package.json | 10 +++++----- public/index.html | 25 +++++++++++++++++++------ src/routes/CreateEvent.js | 1 - 4 files changed, 35 insertions(+), 12 deletions(-) diff --git a/README.md b/README.md index 48d702d9..180e6360 100644 --- a/README.md +++ b/README.md @@ -135,7 +135,18 @@ yarn start **Test creating a event locally** +Event creation is has a paywall by Unlock. Unlock currently only supports Rinkeby and Mainnet. Using Kovan with your wallet will cause an error. + +Rinkeby or Mainnet for Unlock is chosen with `package.json` scripts. Using `yarn build:release:` will select either Rinkeby or Mainnet depending on the script you use. These scripts are found in `package.json`. + +Using `yarn build` will select Mainnet for Unlock. Using `yarn start` will select Rinkeby for unlock. These can be overwritten by entering a network with your start script. `REACT_APP_ENV=live yarn start` will have Unlock use Mainnet, and `REACT_APP_ENV=rinkeby yarn build` will have Unlock use Rinkeby. + +If `env.json` sets `ENV` to `local`, no paywall will be shown. + +After the app starts with an envirnoment chosen for unlock: + - Go to http://localhost:3000/create +- Display form by paying for a membership tier (must be Rinkeby or Mainnet) - Fill in event detail (leave password as blank) - Fill in event detail and press "Submit" diff --git a/package.json b/package.json index f3dd5589..46b57059 100644 --- a/package.json +++ b/package.json @@ -56,11 +56,11 @@ "seedParty": "node scripts/seedParty.js", "start": "react-scripts start", "build": "react-scripts build", - "build:release:kovan": "yarn setup --kovan && yarn build", - "build:release:ropsten": "yarn setup --ropsten && yarn build", - "build:release:rinkeby": "yarn setup --rinkeby && yarn build", - "build:release:alpha": "yarn setup --alpha && yarn build", - "build:release:live": "yarn setup --live && yarn build", + "build:release:kovan": "REACT_APP_ENV=kovan yarn setup --kovan && yarn build", + "build:release:ropsten": "REACT_APP_ENV=ropsten yarn setup --ropsten && yarn build", + "build:release:rinkeby": "REACT_APP_ENV=rinkeby yarn setup --rinkeby && yarn build", + "build:release:alpha": "REACT_APP_ENV=alpha yarn setup --alpha && yarn build", + "build:release:live": "REACT_APP_ENV=live yarn setup --live && yarn build", "deploy:ropsten": "yarn build:release:ropsten && yarn now -f --local-config .deploy/now.ropsten.json --public && yarn now alias --local-config .deploy/now.ropsten.json && yarn now rm kickback-app-ropsten --safe --yes", "deploy:rinkeby": "yarn build:release:rinkeby && yarn now -f --local-config .deploy/now.rinkeby.json --public && yarn now alias --local-config .deploy/now.rinkeby.json && yarn now rm kickback-app-rinkeby --safe --yes", "deploy:kovan": "yarn build:release:kovan && yarn now -f --local-config .deploy/now.kovan.json --public && yarn now alias --local-config .deploy/now.kovan.json && yarn now rm kickback-app-kovan --safe --yes", diff --git a/public/index.html b/public/index.html index 432bfa7a..dbe93337 100644 --- a/public/index.html +++ b/public/index.html @@ -64,9 +64,15 @@ https://github.com/unlock-protocol/react-example/blob/master/public/index.html --> - + + - - - diff --git a/src/index.js b/src/index.js index 7837b495..bcfa2284 100644 --- a/src/index.js +++ b/src/index.js @@ -11,6 +11,20 @@ import { clientInstance } from './graphql' import setupWeb3 from './api/web3' import { GlobalProvider } from './GlobalState' import './globalStyles' +import { ENV, LOCKS } from './config' + +const networkId = ENV === 'live' ? 1 : 4 + +const locks = LOCKS[networkId] + +// unlock config must use var +window.unlockProtocolConfig = { + locks, + icon: 'https://kickback.events/card.png', + callToAction: { + default: 'Select a membership to access page.' + } +} window.addEventListener('load', async () => { setupRollbar() From 0c05ba2d16584955d31bcc73179fd80c5f3803ef Mon Sep 17 00:00:00 2001 From: Edson Ayllon Date: Mon, 16 Dec 2019 00:14:27 -0500 Subject: [PATCH 14/20] Readme json fix --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 07a94bb5..df9a6388 100644 --- a/README.md +++ b/README.md @@ -127,12 +127,12 @@ Add `src/config/env.json` with the following information "ENV": "kovan", "DAI_CONTRACT_ADDRESS": "0x7d669a64deb8a4a51eea755bb0e19fd39ce25ae9", "LOCKS": { - 1: { + "1": { "0xa5bA2f45aFc9864bFA97CBb7D92BF8390744d529": { "name": "Kickback Bronze Supporter" } }, - 4: { + "4": { "0xb452A1BfE64036718aCeFC8B5F718E0c9d233cB8": { "name": "Kickback Gold Supporter" }, From b76de810aad37b2ee082492505473b17e2329bff Mon Sep 17 00:00:00 2001 From: Edson Ayllon Date: Mon, 16 Dec 2019 00:16:59 -0500 Subject: [PATCH 15/20] Comment edits --- src/index.js | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/index.js b/src/index.js index bcfa2284..0abee6c6 100644 --- a/src/index.js +++ b/src/index.js @@ -13,11 +13,10 @@ import { GlobalProvider } from './GlobalState' import './globalStyles' import { ENV, LOCKS } from './config' +// assumes mainnet or rinkeby Unlock for now const networkId = ENV === 'live' ? 1 : 4 - const locks = LOCKS[networkId] -// unlock config must use var window.unlockProtocolConfig = { locks, icon: 'https://kickback.events/card.png', From 54149f1059c13ff6460c43cc4552b07bae1051a3 Mon Sep 17 00:00:00 2001 From: Edson Ayllon Date: Mon, 16 Dec 2019 16:51:56 -0500 Subject: [PATCH 16/20] add to Readme --- README.md | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/README.md b/README.md index df9a6388..064a6368 100644 --- a/README.md +++ b/README.md @@ -144,6 +144,21 @@ Add `src/config/env.json` with the following information } ``` +The format for "LOCKS" is the following: + +``` +"LOCKS": { + "": { + "": { + "name": "" + } + } +} +``` + +Run the app. + + ``` yarn start ``` From 2eee09a2791af4b07faae200429db8ac5a72a529 Mon Sep 17 00:00:00 2001 From: Edson Ayllon Date: Mon, 16 Dec 2019 18:44:01 -0500 Subject: [PATCH 17/20] update setup.js for Rinkeby --- scripts/setup.js | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/scripts/setup.js b/scripts/setup.js index fc3fa43f..6619a35d 100755 --- a/scripts/setup.js +++ b/scripts/setup.js @@ -44,6 +44,16 @@ if (argv.ropsten) { appConfig.ROLLBAR_TOKEN = 'e676d64e462b48d098a12db8a173598a' appConfig.BLOCKNATIVE_DAPPID = '27b3eac2-e46c-428a-9a0c-56cce2725d42' appConfig.MIXPANEL_ID = '28243587317e7b2d8a669dcce23302cb' + appConfig.LOCKS = { + 4: { + '0xb452A1BfE64036718aCeFC8B5F718E0c9d233cB8': { + name: 'Kickback Gold Supporter' + }, + '0x70456ebD53E19eaE05932C482FeF1b24251ABb18': { + name: 'Kickback Bronze Supporter' + } + } + } } else if (argv.kovan) { appConfig.ENV = 'kovan' appConfig.API_URL = 'https://kovan.api.kickback.events' From c0eaed373a3fdb55d31aeabbac0bf703b89fde03 Mon Sep 17 00:00:00 2001 From: Edson Ayllon Date: Tue, 17 Dec 2019 19:14:53 -0500 Subject: [PATCH 18/20] fix membership ownership to correct ownership --- src/routes/CreateEvent.js | 43 +++++++++++++++++++++++++++++---------- 1 file changed, 32 insertions(+), 11 deletions(-) diff --git a/src/routes/CreateEvent.js b/src/routes/CreateEvent.js index 80bae559..88ad91dd 100644 --- a/src/routes/CreateEvent.js +++ b/src/routes/CreateEvent.js @@ -68,17 +68,37 @@ export default function Create() { } const updateUnlockUser = () => { - // sets membership lock and lock name to state - let unlock = window.unlockProtocol.blockchainData() - let locks = Object.keys(unlock.locks).map(i => unlock.locks[i]) - let bronze = locks.find(o => o.name.includes('Kickback Bronze')) - let gold = locks.find(o => o.name.includes('Kickback Gold')) - if (gold) { - setMembership(gold.name) - setMembershipAddr(gold.address) - } else { - setMembership(bronze.name) - setMembershipAddr(bronze.address) + /* + get available locks by tier + get all purchases for user, select latest purchase, isolate key address + search for owned keys a pair matches highest lock tier, set label and address + if not search for next tier, set label and address + */ + + const data = window.unlockProtocol.blockchainData() + const locks = Object.keys(data.locks).map(i => data.locks[i]) + const bronzeLock = locks.find(o => o.name.includes('Kickback Bronze')) + const goldLock = locks.find(o => o.name.includes('Kickback Gold')) + const purchases = Object.keys(data.transactions).map( + i => data.transactions[i] + ) + const latestPurchaseBlock = Math.max.apply( + Math, + purchases.map(function(o) { + return o.blockNumber + }) + ) + const latestPurchase = purchases.find( + o => o.blockNumber === latestPurchaseBlock + ) + const key = latestPurchase.lock + + if (Object.values(goldLock).includes(key)) { + setMembership(goldLock.name) + setMembershipAddr(goldLock.address) + } else if (Object.values(bronzeLock).includes(key)) { + setMembership(bronzeLock.name) + setMembershipAddr(bronzeLock.address) } } @@ -94,6 +114,7 @@ export default function Create() { setLocked(e.detail) // run this loop only if unlocked + // if keys previously purchased and expired, will be locked, updateUnlockUser() won't run if (e.detail === 'unlocked') { // blockchainData() will load empty first, check if loaded before updating state, checks every 100 ms let checkExist = setInterval(function() { From 173d5c37d765ce100cd7ed94326fc4b58229d57b Mon Sep 17 00:00:00 2001 From: Edson Ayllon <34966228+edsonayllon@users.noreply.github.com> Date: Tue, 17 Dec 2019 20:02:30 -0500 Subject: [PATCH 19/20] Minor change. Edit comment wording --- src/routes/CreateEvent.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/routes/CreateEvent.js b/src/routes/CreateEvent.js index 88ad91dd..37332a29 100644 --- a/src/routes/CreateEvent.js +++ b/src/routes/CreateEvent.js @@ -71,7 +71,7 @@ export default function Create() { /* get available locks by tier get all purchases for user, select latest purchase, isolate key address - search for owned keys a pair matches highest lock tier, set label and address + search for owned keys, if a pair matches highest lock tier, set label and address if not search for next tier, set label and address */ From 7e1fa4b34e98ecee199e8707213fce446c351146 Mon Sep 17 00:00:00 2001 From: Edson Ayllon Date: Wed, 22 Jan 2020 18:21:13 -0500 Subject: [PATCH 20/20] yarn.lock --- package.json | 4 +- public/index.html | 4 +- src/components/Profile/ProfileForm.js | 5 +- src/mediaQuery.js | 35 +++--- yarn.lock | 166 ++++++++++---------------- 5 files changed, 87 insertions(+), 127 deletions(-) diff --git a/package.json b/package.json index 7bc65fce..8b33a1f4 100644 --- a/package.json +++ b/package.json @@ -40,7 +40,7 @@ "react-emotion": "^9.2.6", "react-markdown": "^4.3.1", "react-qr-reader": "2.2.1", - "react-router": "^4.3.1", + "react-router": "^5.1.2", "react-router-dom": "^5.1.2", "react-router-hash-link": "^1.2.0", "react-scripts": "2.1.5", @@ -120,4 +120,4 @@ "engines": { "node": "10.x" } -} \ No newline at end of file +} diff --git a/public/index.html b/public/index.html index 5691b059..de26bfd4 100644 --- a/public/index.html +++ b/public/index.html @@ -86,8 +86,8 @@ let testnetUrl = networkId === 4 ? 'staging-' : ''; let js = d.createElement(s); let sc = d.getElementsByTagName(s)[0]; - js.src = `https://${testnetUrl}paywall.unlock-protocol.com/static/unlock.1.0.min.js`; - sc.parentNode.insertBefore(js, sc); + js.src = `https://${testnetUrl}paywall.unlock-protocol.com/static/unlock.1.0.min.js`; + sc.parentNode.insertBefore(js, sc); }(document, "script")); diff --git a/src/components/Profile/ProfileForm.js b/src/components/Profile/ProfileForm.js index 0643c10a..a16975ea 100644 --- a/src/components/Profile/ProfileForm.js +++ b/src/components/Profile/ProfileForm.js @@ -60,7 +60,10 @@ export default class ProfileForm extends Component { '' const realName = _.get(existingProfile, 'realName') || '' const twitter = - _.get(social.find(({ type }) => type === 'twitter'), 'value') || '' + _.get( + social.find(({ type }) => type === 'twitter'), + 'value' + ) || '' const terms = _.get( getUserAcceptedLegalAgreement(legal, latestLegal, TERMS_AND_CONDITIONS), 'id' diff --git a/src/mediaQuery.js b/src/mediaQuery.js index e3f12ce7..1f4190ad 100644 --- a/src/mediaQuery.js +++ b/src/mediaQuery.js @@ -28,25 +28,22 @@ const mq = Object.keys(breakpoints).reduce((accumulator, label) => { const useMedia = (query, defaultState) => { const [state, setState] = useState(defaultState) - useEffect( - () => { - let mounted = true - const mql = window.matchMedia(query) - const onChange = () => { - if (!mounted) return - setState(!!mql.matches) - } - - mql.addListener(onChange) - setState(mql.matches) - - return () => { - mounted = false - mql.removeListener(onChange) - } - }, - [query] - ) + useEffect(() => { + let mounted = true + const mql = window.matchMedia(query) + const onChange = () => { + if (!mounted) return + setState(!!mql.matches) + } + + mql.addListener(onChange) + setState(mql.matches) + + return () => { + mounted = false + mql.removeListener(onChange) + } + }, [query]) return state } diff --git a/yarn.lock b/yarn.lock index 5fe26471..92c9654f 100644 --- a/yarn.lock +++ b/yarn.lock @@ -987,7 +987,7 @@ dependencies: regenerator-runtime "^0.12.0" -"@babel/runtime@^7.0.0", "@babel/runtime@^7.1.2", "@babel/runtime@^7.4.3", "@babel/runtime@^7.6.3", "@babel/runtime@^7.7.2", "@babel/runtime@^7.7.4": +"@babel/runtime@^7.0.0", "@babel/runtime@^7.1.2", "@babel/runtime@^7.4.0", "@babel/runtime@^7.4.3", "@babel/runtime@^7.6.3", "@babel/runtime@^7.7.2", "@babel/runtime@^7.7.4": version "7.8.3" resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.8.3.tgz#0811944f73a6c926bb2ad35e918dcc1bfab279f1" integrity sha512-fVHx1rzEmwB130VTkLnxR+HmxcTjGzH12LYQcFFoBwakMd3aOMD4OsRN7tGG/UOYE2ektgFrS8uACAoRk1CY0w== @@ -1470,9 +1470,9 @@ integrity sha512-hRJD2ahnnpLgsj6KWMYSrmXkM3rm2Dl1qkx6IOFD5FnuNPXJIG5L0dhgKXCYTRMGzU4n0wImQ/xfmRc4POUFlg== "@types/istanbul-lib-report@*": - version "1.1.1" - resolved "https://registry.yarnpkg.com/@types/istanbul-lib-report/-/istanbul-lib-report-1.1.1.tgz#e5471e7fa33c61358dd38426189c037a58433b8c" - integrity sha512-3BUTyMzbZa2DtDI2BkERNC6jJw2Mr2Y0oGI7mRxYNBPxppbtEK1F66u3bKwU2g+wxwWI7PAoRpJnOY1grJqzHg== + version "3.0.0" + resolved "https://registry.yarnpkg.com/@types/istanbul-lib-report/-/istanbul-lib-report-3.0.0.tgz#c14c24f18ea8190c118ee7562b7ff99a36552686" + integrity sha512-plGgXAPfVKFoYfa9NpYDAkseG+g6Jr294RqeqcqDixSbU34MZVJRi/P+7Y8GDpzkEwLaGZZOpKIEmeVZNtKsrg== dependencies: "@types/istanbul-lib-coverage" "*" @@ -1520,9 +1520,9 @@ integrity sha512-FA/BWv8t8ZWJ+gEOnLLd8ygxH/2UFbAvgEonyfN6yWGLKc7zVjbpl2Y4CTjid9h2RfgPP6SEt6uHwEOply00yw== "@types/yargs@^13.0.0": - version "13.0.5" - resolved "https://registry.yarnpkg.com/@types/yargs/-/yargs-13.0.5.tgz#18121bfd39dc12f280cee58f92c5b21d32041908" - integrity sha512-CF/+sxTO7FOwbIRL4wMv0ZYLCRfMid2HQpzDRyViH7kSpfoAFiMdGqKIxb1PxWfjtQXQhnQuD33lvRHNwr809Q== + version "13.0.6" + resolved "https://registry.yarnpkg.com/@types/yargs/-/yargs-13.0.6.tgz#6aed913a92c262c13b94d4bca8043237de202124" + integrity sha512-IkltIncDQWv6fcAvnHtJ6KtkmY/vtR3bViOaCzpj/A3yNhlfZAgxNe6AEQD1cQrkYD+YsKVo08DSxvNKEsD7BA== dependencies: "@types/yargs-parser" "*" @@ -3835,13 +3835,13 @@ browserslist@^3.2.6: electron-to-chromium "^1.3.47" browserslist@^4.0.0, browserslist@^4.3.4, browserslist@^4.3.5, browserslist@^4.8.2, browserslist@^4.8.3: - version "4.8.3" - resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.8.3.tgz#65802fcd77177c878e015f0e3189f2c4f627ba44" - integrity sha512-iU43cMMknxG1ClEZ2MDKeonKE1CCrFVkQK2AqO2YWFmvIrx4JWrvQ4w4hQez6EpVI8rHTtqh/ruHHDHSOKxvUg== + version "4.8.5" + resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.8.5.tgz#691af4e327ac877b25e7a3f7ee869c4ef36cdea3" + integrity sha512-4LMHuicxkabIB+n9874jZX/az1IaZ5a+EUuvD7KFOu9x/Bd5YHyO0DIz2ls/Kl8g0ItS4X/ilEgf4T1Br0lgSg== dependencies: - caniuse-lite "^1.0.30001017" - electron-to-chromium "^1.3.322" - node-releases "^1.1.44" + caniuse-lite "^1.0.30001022" + electron-to-chromium "^1.3.338" + node-releases "^1.1.46" bser@2.1.1: version "2.1.1" @@ -4085,14 +4085,14 @@ caniuse-api@^3.0.0: lodash.uniq "^4.5.0" caniuse-db@^1.0.30000529, caniuse-db@^1.0.30000634, caniuse-db@^1.0.30000639: - version "1.0.30001021" - resolved "https://registry.yarnpkg.com/caniuse-db/-/caniuse-db-1.0.30001021.tgz#ee4ad516fb2530abd90d2b32e986b172808672e5" - integrity sha512-FNfovmJx9ssO2hpvdN7D9daRAZHZ80gDV2KQRC0+icpm7QjyWm6Ea2TUEAk0rpNrRQYMeRbVOVsWwq9CE7V2zw== + version "1.0.30001022" + resolved "https://registry.yarnpkg.com/caniuse-db/-/caniuse-db-1.0.30001022.tgz#a7721c26a4af4d8420680079dcd27754be84daf6" + integrity sha512-2RQQgO+yDEaqF4ltwrCja7oZst+FVnXHQLSJgZ678tausEljBq3/U20Fedvze+Hxqm8XLV+9OgGbtdgS7ksnRw== -caniuse-lite@^1.0.0, caniuse-lite@^1.0.30000792, caniuse-lite@^1.0.30000805, caniuse-lite@^1.0.30000844, caniuse-lite@^1.0.30000918, caniuse-lite@^1.0.30000929, caniuse-lite@^1.0.30001017, caniuse-lite@^1.0.30001020: - version "1.0.30001021" - resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001021.tgz#e75ed1ef6dbadd580ac7e7720bb16f07b083f254" - integrity sha512-wuMhT7/hwkgd8gldgp2jcrUjOU9RXJ4XxGumQeOsUr91l3WwmM68Cpa/ymCnWEDqakwFXhuDQbaKNHXBPgeE9g== +caniuse-lite@^1.0.0, caniuse-lite@^1.0.30000792, caniuse-lite@^1.0.30000805, caniuse-lite@^1.0.30000844, caniuse-lite@^1.0.30000918, caniuse-lite@^1.0.30000929, caniuse-lite@^1.0.30001020, caniuse-lite@^1.0.30001022: + version "1.0.30001022" + resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001022.tgz#9eeffe580c3a8f110b7b1742dcf06a395885e4c6" + integrity sha512-FjwPPtt/I07KyLPkBQ0g7/XuZg6oUkYBVnPHNj3VHJbOjmmJ/GdSo/GUY6MwINEQvjhP6WZVbX8Tvms8xh0D5A== capture-exit@^1.2.0: version "1.2.0" @@ -4817,6 +4817,15 @@ cross-spawn@6.0.5, cross-spawn@^6.0.0, cross-spawn@^6.0.5: shebang-command "^1.2.0" which "^1.2.9" +cross-spawn@^7.0.0: + version "7.0.1" + resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-7.0.1.tgz#0ab56286e0f7c24e153d04cc2aa027e43a9a5d14" + integrity sha512-u7v4o84SwFpD32Z8IIcPZ6z1/ie24O6RU3RbtL5Y316l3KuHVPx9ItBgWQ6VlfAFnRnTtMUrsQ9MUUTuEZjogg== + dependencies: + path-key "^3.1.0" + shebang-command "^2.0.0" + which "^2.0.1" + crypto-browserify@3.12.0, crypto-browserify@^3.11.0: version "3.12.0" resolved "https://registry.yarnpkg.com/crypto-browserify/-/crypto-browserify-3.12.0.tgz#396cf9f3137f03e4b8e532c58f698254e00f80ec" @@ -5666,9 +5675,9 @@ dot-prop@^4.1.1: is-obj "^1.0.0" dotenv-defaults@^1.0.2: - version "1.0.3" - resolved "https://registry.yarnpkg.com/dotenv-defaults/-/dotenv-defaults-1.0.3.tgz#434a78209f2cab07f9ec9b86b79ae7e9ca5d818b" - integrity sha512-EHeXF8VZA/XhkGJCtRpJCTHC8GkoisPXjdvJMzxgFrlN6lTEW/eksRNsVKnW0BxR1pGZH8IEBO/D0mDkIrC6fA== + version "1.1.1" + resolved "https://registry.yarnpkg.com/dotenv-defaults/-/dotenv-defaults-1.1.1.tgz#032c024f4b5906d9990eb06d722dc74cc60ec1bd" + integrity sha512-6fPRo9o/3MxKvmRZBD3oNFdxODdhJtIy1zcJeUSCs6HCy4tarUpd+G67UTU9tF6OWXeSPqsm4fPAB+2eY9Rt9Q== dependencies: dotenv "^6.2.0" @@ -5748,10 +5757,10 @@ ee-first@1.1.1: resolved "https://registry.yarnpkg.com/ee-first/-/ee-first-1.1.1.tgz#590c61156b0ae2f4f0255732a158b266bc56b21d" integrity sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0= -electron-to-chromium@^1.2.7, electron-to-chromium@^1.3.103, electron-to-chromium@^1.3.30, electron-to-chromium@^1.3.322, electron-to-chromium@^1.3.47: - version "1.3.337" - resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.337.tgz#b2c093cdb66121a946d333b454adcdc5666ceaed" - integrity sha512-uJ+wLjslYQ/2rAusDg+6FlK8DLhHWTLCe7gkofBehTifW7KCkPVTn5rhKSCncWYNq34Iy/o4OfswuEkAO2RBaw== +electron-to-chromium@^1.2.7, electron-to-chromium@^1.3.103, electron-to-chromium@^1.3.30, electron-to-chromium@^1.3.338, electron-to-chromium@^1.3.47: + version "1.3.339" + resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.339.tgz#ff7b56c4bc58159f0d6623591116e4414e7a618b" + integrity sha512-C1i/vH6/kQx9YV8RddMkmW216GwW4pTrnYIlKmDFIqXA4fPwqDxIdGyHsuG+fgurHoljRz7/oaD+tztcryW/9g== elegant-spinner@^1.0.1: version "1.0.1" @@ -5867,9 +5876,9 @@ error-ex@^1.2.0, error-ex@^1.3.1: is-arrayish "^0.2.1" es-abstract@^1.16.3, es-abstract@^1.17.0, es-abstract@^1.17.0-next.0, es-abstract@^1.17.0-next.1, es-abstract@^1.17.2: - version "1.17.2" - resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.17.2.tgz#965b10af56597b631da15872c17a405e86c1fd46" - integrity sha512-YoKuru3Lyoy7yVTBSH2j7UxTqe/je3dWAruC0sHvZX1GNd5zX8SSLvQqEgO9b3Ex8IW+goFI9arEEsFIbulhOw== + version "1.17.4" + resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.17.4.tgz#e3aedf19706b20e7c2594c35fc0d57605a79e184" + integrity sha512-Ae3um/gb8F0mui/jPL+QiqmglkUsaQf7FwBEHYIFkztkneosu9imhqHpBzQ3h1vit8t5iQ74t6PEVvphBZiuiQ== dependencies: es-to-primitive "^1.2.1" function-bind "^1.1.1" @@ -7215,9 +7224,9 @@ functional-red-black-tree@^1.0.1: integrity sha1-GwqzvVU7Kg1jmdKcDj6gslIHgyc= functions-have-names@^1.2.0: - version "1.2.0" - resolved "https://registry.yarnpkg.com/functions-have-names/-/functions-have-names-1.2.0.tgz#83da7583e4ea0c9ac5ff530f73394b033e0bf77d" - integrity sha512-zKXyzksTeaCSw5wIX79iCA40YAa6CJMJgNg9wdkU/ERBrIdPSimPICYiLp65lRbSBqtiHql/HZfS2DyI/AH6tQ== + version "1.2.1" + resolved "https://registry.yarnpkg.com/functions-have-names/-/functions-have-names-1.2.1.tgz#a981ac397fa0c9964551402cdc5533d7a4d52f91" + integrity sha512-j48B/ZI7VKs3sgeI2cZp7WXWmZXu7Iq5pl5/vptV5N2mq+DGFuS/ulaDjtaoLpYzuD6u8UgrUKHfgo7fDTSiBA== fuse.js@^3.0.1, fuse.js@^3.2.0: version "3.4.6" @@ -7747,18 +7756,6 @@ hex-color-regex@^1.1.0: resolved "https://registry.yarnpkg.com/hex-color-regex/-/hex-color-regex-1.1.0.tgz#4c06fccb4602fe2602b3c93df82d7e7dbf1a8a8e" integrity sha512-l9sfDFsuqtOqKDsQdqrMRk0U85RZc0RtOR9yPI7mRVOa4FsR/BVnZ0shmQRM96Ji99kYZP/7hn1cedc1+ApsTQ== -history@^4.7.2: - version "4.10.1" - resolved "https://registry.yarnpkg.com/history/-/history-4.10.1.tgz#33371a65e3a83b267434e2b3f3b1b4c58aad4cf3" - integrity sha512-36nwAD620w12kuzPAsyINPWJqlNbij+hpK1k9XRloDtym8mxzGYl2c17LnV6IAGB2Dmg4tEa7G7DlawS0+qjew== - dependencies: - "@babel/runtime" "^7.1.2" - loose-envify "^1.2.0" - resolve-pathname "^3.0.0" - tiny-invariant "^1.0.2" - tiny-warning "^1.0.0" - value-equal "^1.0.1" - history@^4.9.0: version "4.10.1" resolved "https://registry.yarnpkg.com/history/-/history-4.10.1.tgz#33371a65e3a83b267434e2b3f3b1b4c58aad4cf3" @@ -7790,19 +7787,7 @@ hoist-non-react-statics@1.x.x, hoist-non-react-statics@^1.2.0: resolved "https://registry.yarnpkg.com/hoist-non-react-statics/-/hoist-non-react-statics-1.2.0.tgz#aa448cf0986d55cc40773b17174b7dd066cb7cfb" integrity sha1-qkSM8JhtVcxAdzsXF0t90GbLfPs= -hoist-non-react-statics@^2.5.0: - version "2.5.5" - resolved "https://registry.yarnpkg.com/hoist-non-react-statics/-/hoist-non-react-statics-2.5.5.tgz#c5903cf409c0dfd908f388e619d86b9c1174cb47" - integrity sha512-rqcy4pJo55FTTLWt+bU8ukscqHeE/e9KWvsOW2b/a3afxQZhwkQdT1rPPCJ0rYXdj4vNcasY8zHTH+jF/qStxw== - -hoist-non-react-statics@^3.3.0: - version "3.3.1" - resolved "https://registry.yarnpkg.com/hoist-non-react-statics/-/hoist-non-react-statics-3.3.1.tgz#101685d3aff3b23ea213163f6e8e12f4f111e19f" - integrity sha512-wbg3bpgA/ZqWrZuMOeJi8+SKMhr7X9TesL/rXMjTzh0p0JUBo3II8DHboYbuIXWRlttrUFxwcu/5kygrCw8fJw== - dependencies: - react-is "^16.7.0" - -hoist-non-react-statics@^3.1.0: +hoist-non-react-statics@^3.1.0, hoist-non-react-statics@^3.3.0: version "3.3.1" resolved "https://registry.yarnpkg.com/hoist-non-react-statics/-/hoist-non-react-statics-3.3.1.tgz#101685d3aff3b23ea213163f6e8e12f4f111e19f" integrity sha512-wbg3bpgA/ZqWrZuMOeJi8+SKMhr7X9TesL/rXMjTzh0p0JUBo3II8DHboYbuIXWRlttrUFxwcu/5kygrCw8fJw== @@ -10858,10 +10843,10 @@ node-pre-gyp@^0.10.0: semver "^5.3.0" tar "^4" -node-releases@^1.1.3, node-releases@^1.1.44: - version "1.1.46" - resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.46.tgz#6b262afef1bdc9a950a96df2e77e0d2290f484bf" - integrity sha512-YOjdx+Uoh9FbRO7yVYbnbt1puRWPQMemR3SutLeyv2XfxKs1ihpe0OLAUwBPEP2ImNH/PZC7SEiC6j32dwRZ7g== +node-releases@^1.1.3, node-releases@^1.1.46: + version "1.1.47" + resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.47.tgz#c59ef739a1fd7ecbd9f0b7cf5b7871e8a8b591e4" + integrity sha512-k4xjVPx5FpwBUj0Gw7uvFOTF4Ep8Hok1I6qjwL3pLfwe7Y0REQSAqOwwv9TWBCUtMHxcXfY4PgRLRozcChvTcA== dependencies: semver "^6.3.0" @@ -12982,9 +12967,9 @@ rc-trigger@^2.2.0: react-lifecycles-compat "^3.0.4" rc-util@^4.0.4, rc-util@^4.15.3, rc-util@^4.4.0: - version "4.18.1" - resolved "https://registry.yarnpkg.com/rc-util/-/rc-util-4.18.1.tgz#5a6312503cd5366ef0bede021dce42d373f404a8" - integrity sha512-3aRHG32ZvqBymtJUGoQnbZS+XANzO6XTiFEFAYI3BfuxESEazopAy0kBwcAI6BlLHsW1oLiy3ysE9uYwylh2ag== + version "4.19.0" + resolved "https://registry.yarnpkg.com/rc-util/-/rc-util-4.19.0.tgz#f3b5e3a02cc0a667d127784068e1236c095dbcbf" + integrity sha512-mptALlLwpeczS3nrv83DbwJNeupolbuvlIEjcvimSiWI8NUBjpF0HgG3kWp1RymiuiRCNm9yhaXqDz0a99dpgQ== dependencies: add-dom-event-listener "^1.1.0" babel-runtime "6.x" @@ -13195,8 +13180,7 @@ react-inspector@^2.2.2: is-dom "^1.0.9" prop-types "^15.6.1" - -react-is@^16.7.0, react-is@^16.8.1, react-is@^16.8.4, react-is@^16.8.6: +react-is@^16.6.0, react-is@^16.7.0, react-is@^16.8.1, react-is@^16.8.4, react-is@^16.8.6: version "16.12.0" resolved "https://registry.yarnpkg.com/react-is/-/react-is-16.12.0.tgz#2cc0fe0fba742d97fd527c42a13bec4eeb06241c" integrity sha512-rPCkf/mWBtKc97aLL9/txD8DZdemK0vkA3JMLShjlJB3Pj3s+lpf1KaBzMfQrAmhMQB0n1cU/SUGgKKBCe837Q== @@ -13259,7 +13243,7 @@ react-router-hash-link@^1.2.0: dependencies: prop-types "^15.6.0" -react-router@5.1.2: +react-router@5.1.2, react-router@^5.1.2: version "5.1.2" resolved "https://registry.yarnpkg.com/react-router/-/react-router-5.1.2.tgz#6ea51d789cb36a6be1ba5f7c0d48dd9e817d3418" integrity sha512-yjEuMFy1ONK246B+rsa0cUam5OeAQ8pyclRDgpxuSCrAlJ1qN9uZ5IgyKC7gQg0w8OM50NXHEegPh/ks9YuR2A== @@ -13275,19 +13259,6 @@ react-router@5.1.2: tiny-invariant "^1.0.2" tiny-warning "^1.0.0" -react-router@^4.3.1: - version "4.3.1" - resolved "https://registry.yarnpkg.com/react-router/-/react-router-4.3.1.tgz#aada4aef14c809cb2e686b05cee4742234506c4e" - integrity sha512-yrvL8AogDh2X42Dt9iknk4wF4V8bWREPirFfS9gLU1huk6qK41sg7Z/1S81jjTrGHxa3B8R3J6xIkDAA6CVarg== - dependencies: - history "^4.7.2" - hoist-non-react-statics "^2.5.0" - invariant "^2.2.4" - loose-envify "^1.3.1" - path-to-regexp "^1.7.0" - prop-types "^15.6.1" - warning "^4.0.1" - react-scripts@2.1.5: version "2.1.5" resolved "https://registry.yarnpkg.com/react-scripts/-/react-scripts-2.1.5.tgz#0740507db0a06d518c231caa1ef4e908bd8ebce5" @@ -13868,11 +13839,6 @@ resolve-pathname@^3.0.0: resolved "https://registry.yarnpkg.com/resolve-pathname/-/resolve-pathname-3.0.0.tgz#99d02224d3cf263689becbb393bc560313025dcd" integrity sha512-C7rARubxI8bXFNB/hqcp/4iUeIXJhJZvFPFPiSPRnhU5UPxzMFIl+2E6yY6c4k9giDJAhtV+enfA+G89N6Csng== -resolve-pathname@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/resolve-pathname/-/resolve-pathname-3.0.0.tgz#99d02224d3cf263689becbb393bc560313025dcd" - integrity sha512-C7rARubxI8bXFNB/hqcp/4iUeIXJhJZvFPFPiSPRnhU5UPxzMFIl+2E6yY6c4k9giDJAhtV+enfA+G89N6Csng== - resolve-url@^0.2.1: version "0.2.1" resolved "https://registry.yarnpkg.com/resolve-url/-/resolve-url-0.2.1.tgz#2c637fe77c893afd2a663fe21aa9080068e2052a" @@ -13891,9 +13857,9 @@ resolve@1.10.0: path-parse "^1.0.6" resolve@^1.1.6, resolve@^1.10.0, resolve@^1.12.0, resolve@^1.13.1, resolve@^1.3.2, resolve@^1.5.0, resolve@^1.6.0, resolve@^1.8.1, resolve@^1.9.0: - version "1.14.2" - resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.14.2.tgz#dbf31d0fa98b1f29aa5169783b9c290cb865fea2" - integrity sha512-EjlOBLBO1kxsUxsKjLt7TAECyKW6fOh1VRkykQkKGzcBbjjPIxBqGh0jf7GJ3k/f5mxMqW3htMD3WdTUVtW8HQ== + version "1.15.0" + resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.15.0.tgz#1b7ca96073ebb52e741ffd799f6b39ea462c67f5" + integrity sha512-+hTmAldEGE80U2wJJDC1lebb5jWqvTYAfm3YZ1ckk1gBr0MnCqUKlwK1e+anaFljIl+F5tR5IoZcm4ZDA1zMQw== dependencies: path-parse "^1.0.6" @@ -14450,9 +14416,9 @@ simple-get@^2.7.0: simple-concat "^1.0.0" simple-git@^1.85.0: - version "1.129.0" - resolved "https://registry.yarnpkg.com/simple-git/-/simple-git-1.129.0.tgz#eddd2611d2bf41c77e1d08cd70c0b7f3af785040" - integrity sha512-XbzNmugMTeV2crZnPl+b1ZJn+nqXCUNyrZxDXpLM0kHL3B85sbPlpd8q9I4qtAHI9D2FxTB6w4BuiAGKYtyzKw== + version "1.130.0" + resolved "https://registry.yarnpkg.com/simple-git/-/simple-git-1.130.0.tgz#b689c4163bc021df563a81f256de54482005195d" + integrity sha512-gQsPA1uuAkGUa6S+yG4NRknKHVEV+Vnp437w8dJpDpzjtEH566WRSz5z6DoIxlBFaLC7Xwypznsuf1S/J0gtFg== dependencies: debug "^4.0.1" @@ -15395,12 +15361,11 @@ tiny-invariant@^1.0.2: resolved "https://registry.yarnpkg.com/tiny-invariant/-/tiny-invariant-1.0.6.tgz#b3f9b38835e36a41c843a3b0907a5a7b3755de73" integrity sha512-FOyLWWVjG+aC0UqG76V53yAWdXfH8bO6FNmyZOuUrzDzK8DI3/JRY25UD7+g49JWM1LXwymsKERB+DzI0dTEQA== -tiny-warning@^1.0.0: +tiny-warning@^1.0.0, tiny-warning@^1.0.2: version "1.0.3" resolved "https://registry.yarnpkg.com/tiny-warning/-/tiny-warning-1.0.3.tgz#94a30db453df4c643d0fd566060d60a875d84754" integrity sha512-lBN9zLN/oAf68o3zNXYrdCt1kP8WsiGW8Oo2ka41b2IM5JL/S1CTyX1rW0mb/zSuJun0ZUrDxx4sqvYS2FWzPA== - tmp@0.1.0: version "0.1.0" resolved "https://registry.yarnpkg.com/tmp/-/tmp-0.1.0.tgz#ee434a4e22543082e294ba6201dcc6eafefa2877" @@ -15661,9 +15626,9 @@ uglify-js@^2.8.29: uglify-to-browserify "~1.0.0" uglify-js@^3.1.4: - version "3.7.5" - resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-3.7.5.tgz#278c7c24927ac5a32d3336fc68fd4ae1177a486a" - integrity sha512-GFZ3EXRptKGvb/C1Sq6nO1iI7AGcjyqmIyOw0DrD0675e+NNbGO72xmMM2iEBdFbxaTLo70NbjM/Wy54uZIlsg== + version "3.7.6" + resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-3.7.6.tgz#0783daa867d4bc962a37cc92f67f6e3238c47485" + integrity sha512-yYqjArOYSxvqeeiYH2VGjZOqq6SVmhxzaPjJC1W2F9e+bqvFL9QXQ2osQuKUFjM2hGjKG2YclQnRKWQSt/nOTQ== dependencies: commander "~2.20.3" source-map "~0.6.1" @@ -16040,11 +16005,6 @@ value-equal@^1.0.1: resolved "https://registry.yarnpkg.com/value-equal/-/value-equal-1.0.1.tgz#1e0b794c734c5c0cade179c437d356d931a34d6c" integrity sha512-NOJ6JZCAWr0zlxZt+xqCHNTEKOsrks2HQd4MqhP1qy4z1SkbEP467eNx6TgDKXMvUOb+OENfJCZwM+16n7fRfw== -value-equal@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/value-equal/-/value-equal-1.0.1.tgz#1e0b794c734c5c0cade179c437d356d931a34d6c" - integrity sha512-NOJ6JZCAWr0zlxZt+xqCHNTEKOsrks2HQd4MqhP1qy4z1SkbEP467eNx6TgDKXMvUOb+OENfJCZwM+16n7fRfw== - vary@^1, vary@~1.1.2: version "1.1.2" resolved "https://registry.yarnpkg.com/vary/-/vary-1.1.2.tgz#2299f02c6ded30d4a5961b0b9f74524a18f634fc" @@ -16125,7 +16085,7 @@ walker@~1.0.5: dependencies: makeerror "1.0.x" -warning@^4.0.1, warning@^4.0.3: +warning@^4.0.3: version "4.0.3" resolved "https://registry.yarnpkg.com/warning/-/warning-4.0.3.tgz#16e9e077eb8a86d6af7d64aa1e05fd85b4678ca3" integrity sha512-rpJyN222KWIvHJ/F53XSZv0Zl/accqHR8et1kpaMTD/fLCRxtV8iX8czMzY7sVZupTI3zcUTg8eycS2kNF9l6w==