Deploy xDAI change to master

.deploy/now.polygon.json

@@ -0,0 +1,28 @@
+{
+  "version": 2,
+  "scope": "wearekickback",
+  "builds": [
+    { "src": "build/**", "use": "@now/static" },
+    { "src": "api/**", "use": "@now/node" }
+  ],
+  "routes": [
+    { "src": "/", "dest": "build/index.html" },
+    { "src": "/gettingstarted", "dest": "build/index.html" },
+    { "src": "/faq", "dest": "build/index.html" },
+    { "src": "/team", "dest": "build/index.html" },
+    { "src": "/terms", "dest": "build/index.html" },
+    { "src": "/privacy", "dest": "build/index.html" },
+    { "src": "/pricing", "dest": "build/index.html" },
+    { "src": "/create/?", "dest": "build/index.html" },
+    { "src": "/deploy/?", "dest": "build/index.html" },
+    { "src": "/events/?", "dest": "build/index.html" },
+    { "src": "/event/.+", "dest": "api/event.js" },
+    { "src": "/user/.+", "dest": "build/index.html" },
+    {
+      "src": "/service-worker.js",
+      "dest": "build/service-worker.js",
+      "headers": { "cache-control": "no-cache" }
+    },
+    { "src": "/(.+)", "dest": "build/$1" }
+  ]
+}

.deploy/now.rinkeby.json

@@ -1,7 +1,6 @@
 {
   "version": 2,
-  "name": "kickback-app-rinkeby",
-  "alias": "rinkeby.kickback.events",
+  "scope": "wearekickback",
   "builds": [
     { "src": "build/**", "use": "@now/static" },
     { "src": "api/**", "use": "@now/node" }

.deploy/now.xdai.json

@@ -0,0 +1,28 @@
+{
+  "version": 2,
+  "scope": "wearekickback",
+  "builds": [
+    { "src": "build/**", "use": "@now/static" },
+    { "src": "api/**", "use": "@now/node" }
+  ],
+  "routes": [
+    { "src": "/", "dest": "build/index.html" },
+    { "src": "/gettingstarted", "dest": "build/index.html" },
+    { "src": "/faq", "dest": "build/index.html" },
+    { "src": "/team", "dest": "build/index.html" },
+    { "src": "/terms", "dest": "build/index.html" },
+    { "src": "/privacy", "dest": "build/index.html" },
+    { "src": "/pricing", "dest": "build/index.html" },
+    { "src": "/create/?", "dest": "build/index.html" },
+    { "src": "/deploy/?", "dest": "build/index.html" },
+    { "src": "/events/?", "dest": "build/index.html" },
+    { "src": "/event/.+", "dest": "api/event.js" },
+    { "src": "/user/.+", "dest": "build/index.html" },
+    {
+      "src": "/service-worker.js",
+      "dest": "build/service-worker.js",
+      "headers": { "cache-control": "no-cache" }
+    },
+    { "src": "/(.+)", "dest": "build/$1" }
+  ]
+}

.gitignore

@@ -28,3 +28,5 @@ tmp/*
 # IDE
 .idea
 .vscode
+
+.vercel

.nvmrc

@@ -0,0 +1 @@
+v14.17.0

.travis.yml

@@ -1,6 +1,5 @@
 language: node_js
-node_js:
-  - lts/dubnium
+node_js: 14
 cache: yarn
 branches:
   only:

LICENSE

@@ -0,0 +1,7 @@
+The MIT License (MIT) Copyright (c)
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

README.md

@@ -162,3 +162,23 @@ $ yarn run cypress:open
 ```
 
 Seed script must be re-run to test again.
+
+## Deploying to xdai env manually
+
+```
+vercel login
+vercel switch wearekickback
+vercel -f --local-config .deploy/now.xdai.json --public --prod
+```
+
+## Deploying to Polygon env manually
+
+
+
+```
+vercel login
+vercel switch wearekickback
+// 1. Make sure .vercel/project.json points to Polygon project
+yarn build:release:polygon
+vercel -f --local-config .deploy/now.polygon.json --public --prod
+```

package.json

@@ -1,12 +1,12 @@
 {
   "name": "app",
-  "version": "1.0.0",
+  "version": "1.2.0",
   "private": true,
   "dependencies": {
     "@emotion/core": "^10.0.27",
     "@emotion/styled": "^10.0.27",
-    "@ensdomains/renewal-widget": "^0.1.9",
-    "@wearekickback/contracts": "^1.2.9",
+    "@ensdomains/ens-contracts": "^0.0.3",
+    "@wearekickback/contracts": "1.5.0",
     "@wearekickback/shared": "^1.14.1",
     "apollo-cache-inmemory": "^1.2.8",
     "apollo-client": "^2.4.0",
@@ -15,7 +15,8 @@
     "apollo-link-state": "^0.4.1",
     "apollo-upload-client": "^10.0.0",
     "apollo-utilities": "^1.0.21",
-    "bnc-onboard": "^1.7.1",
+    "bnc-notify": "^1.9.1",
+    "bnc-onboard": "^1.34.1",
     "decimal.js": "^10.0.1",
     "es6-promisify": "^6.0.0",
     "ethereum-event-logs": "^1.0.2",
@@ -33,7 +34,7 @@
     "query-string": "^6.2.0",
     "rc-time-picker": "^3.6.2",
     "react": "^16.13.1",
-    "react-apollo": "^2.2.4",
+    "react-apollo": "^3.1.5",
     "react-blockies": "^1.4.1",
     "react-day-picker": "^7.3.0",
     "react-dom": "^16.8.1",
@@ -51,12 +52,12 @@
     "react-tiny-link": "^3.4.0",
     "react-tooltip": "^3.9.0",
     "sanitize-html": "^1.20.1",
-    "smart-chat-react": "^0.1.15",
-    "truffle": "^5.0.0-beta.0",
+    "truffle": "^5.1.30",
     "use-interval": "^1.2.1",
     "uuid": "^3.3.2",
-    "web3": "1.0.0-beta.36",
-    "web3-utils": "^1.0.0-beta.36",
+    "vercel": "^20.1.0",
+    "web3": "^1.3.5",
+    "web3-utils": "^1.3.5",
     "whatwg-fetch": "^3.0.0"
   },
   "scripts": {
@@ -69,13 +70,17 @@
     "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:xdai": "yarn setup --xdai && yarn build",
+    "build:release:polygon": "yarn setup --polygon && 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",
     "deploy:alpha": "yarn build:release:alpha && yarn now -f --local-config .deploy/now.alpha.json --public && yarn now alias --local-config .deploy/now.alpha.json && yarn now rm kickback-app-alpha --safe --yes",
     "deploy:live": "yarn build:release:live && yarn now -f --local-config .deploy/now.live.json --public && yarn now alias --local-config .deploy/now.live.json && yarn now rm kickback-app-live --safe --yes",
+    "deploy:xdai": "yarn build:release:xdai && yarn now -f --local-config .deploy/now.xdai.json --public && yarn now alias --local-config .deploy/now.xdai.json && yarn now rm kickback-app-xdai --safe --yes",
+    "deploy:polygon": "yarn build:release:polygon && vercel -f --local-config .deploy/now.xdai.json --public --prod",
     "deploy:dev": "yarn deploy:rinkeby",
-    "deploy:branch": "/bin/sh -c 'if [ \"$TRAVIS_BRANCH\" = \"master\" ]; then yarn deploy:live; elif [ \"$TRAVIS_BRANCH\" = \"dev\" ]; then yarn deploy:dev; fi'",
+    "deploy:branch": "/bin/sh -c 'if [ \"$TRAVIS_BRANCH\" = \"master\" ]; then yarn deploy:polygon; elif [ \"$TRAVIS_BRANCH\" = \"dev\" ]; then yarn deploy:dev; fi'",
     "deploy:pr": "yarn build:release:rinkeby && scripts/deployTravisBuildToSurge.sh",
     "deploy": "/bin/sh -c 'if [ \"$TRAVIS_PULL_REQUEST\" = \"false\" ]; then yarn deploy:branch; else yarn deploy:pr; fi'",
     "precommit": "lint-staged",
@@ -85,7 +90,7 @@
     "eject": "react-scripts eject",
     "storybook": "start-storybook -p 9009 -s public",
     "build-storybook": "build-storybook -s public",
-    "now": "now --team wearekickback --token $NOW_TOKEN"
+    "now": "vercel --scope wearekickback -t $NOW_TOKEN"
   },
   "devDependencies": {
     "@storybook/addon-actions": "^3.4.11",
@@ -103,6 +108,12 @@
     "surge": "^0.20.1",
     "yargs": "^12.0.2"
   },
+  "optionalDependencies":{
+    "fsevents": "2.3.2"
+  },
+  "resolutions": {
+    "fsevents": "2.3.2"
+  },
   "lint-staged": {
     "*.js": [
       "npm run pretty",
@@ -122,6 +133,6 @@
     ]
   },
   "engines": {
-    "node": "10.x"
+    "node": "14.x"
   }
 }

scripts/setup.js

@@ -30,61 +30,91 @@ appConfig.API_URL = 'http://localhost:3001'
 if (undefined === appConfig.NUM_CONFIRMATIONS) {
   appConfig.NUM_CONFIRMATIONS = 1
 }
-
-if (argv.ropsten) {
-  appConfig.ENV = 'ropsten'
-  appConfig.API_URL = 'https://kickback-ropsten.herokuapp.com'
-  appConfig.GIT_COMMIT = getGitCommit()
-  appConfig.ROLLBAR_TOKEN = '37e0bca9006a4a348e244ae2d233d660'
-  appConfig.BLOCKNATIVE_DAPPID = '18cb2fa0-5941-43a2-b71d-07221c15a50f'
-  appConfig.INFURA_KEY = 'cd1ba006128543a0a11d23e54efaab93'
-  appConfig.FORTMATIC_KEY = 'pk_test_D3CAA2AEFE6A022E'
-  appConfig.PORTIS_KEY = '0ae69aa0-2a4e-41b2-a312-4aa2de69626e'
-  appConfig.SQUARELINK_KEY = '7918e26f77908d911fac'
-} else if (argv.rinkeby) {
-  appConfig.ENV = 'rinkeby'
-  appConfig.API_URL = 'https://kickback-rinkeby.herokuapp.com'
-  appConfig.GIT_COMMIT = getGitCommit()
-  appConfig.ROLLBAR_TOKEN = 'e676d64e462b48d098a12db8a173598a'
-  appConfig.BLOCKNATIVE_DAPPID = '27b3eac2-e46c-428a-9a0c-56cce2725d42'
-  appConfig.INFURA_KEY = 'cd1ba006128543a0a11d23e54efaab93'
-  appConfig.FORTMATIC_KEY = 'pk_test_D3CAA2AEFE6A022E'
-  appConfig.PORTIS_KEY = '0ae69aa0-2a4e-41b2-a312-4aa2de69626e'
-  appConfig.SQUARELINK_KEY = '7918e26f77908d911fac'
-} else if (argv.kovan) {
-  appConfig.ENV = 'kovan'
-  appConfig.API_URL = 'https://kickback-kovan.herokuapp.com'
+// Hardcode polygon
+// if (argv.ropsten) {
+//   appConfig.ENV = 'ropsten'
+//   appConfig.API_URL = 'https://kickback-ropsten.herokuapp.com'
+//   appConfig.GIT_COMMIT = getGitCommit()
+//   appConfig.ROLLBAR_TOKEN = '37e0bca9006a4a348e244ae2d233d660'
+//   appConfig.BLOCKNATIVE_DAPPID = '18cb2fa0-5941-43a2-b71d-07221c15a50f'
+//   appConfig.INFURA_KEY = 'cd1ba006128543a0a11d23e54efaab93'
+//   appConfig.FORTMATIC_KEY = 'pk_test_D3CAA2AEFE6A022E'
+//   appConfig.PORTIS_KEY = '0ae69aa0-2a4e-41b2-a312-4aa2de69626e'
+//   appConfig.SQUARELINK_KEY = '7918e26f77908d911fac'
+// } else if (argv.rinkeby) {
+//   appConfig.ENV = 'rinkeby'
+//   appConfig.API_URL = 'https://kickback-rinkeby.herokuapp.com'
+//   appConfig.GIT_COMMIT = getGitCommit()
+//   appConfig.ROLLBAR_TOKEN = 'e676d64e462b48d098a12db8a173598a'
+//   appConfig.BLOCKNATIVE_DAPPID = '27b3eac2-e46c-428a-9a0c-56cce2725d42'
+//   appConfig.INFURA_KEY = 'cd1ba006128543a0a11d23e54efaab93'
+//   appConfig.FORTMATIC_KEY = 'pk_test_D3CAA2AEFE6A022E'
+//   appConfig.PORTIS_KEY = '0ae69aa0-2a4e-41b2-a312-4aa2de69626e'
+//   appConfig.SQUARELINK_KEY = '7918e26f77908d911fac'
+// } else if (argv.kovan) {
+//   appConfig.ENV = 'kovan'
+//   appConfig.API_URL = 'https://kickback-kovan.herokuapp.com'
+//   appConfig.GIT_COMMIT = getGitCommit()
+//   appConfig.ROLLBAR_TOKEN = ''
+//   appConfig.BLOCKNATIVE_DAPPID = ''
+//   appConfig.INFURA_KEY = 'cd1ba006128543a0a11d23e54efaab93'
+//   appConfig.FORTMATIC_KEY = 'pk_test_D3CAA2AEFE6A022E'
+//   appConfig.PORTIS_KEY = '0ae69aa0-2a4e-41b2-a312-4aa2de69626e'
+//   appConfig.SQUARELINK_KEY = '7918e26f77908d911fac'
+// } else if (argv.alpha) {
+//   appConfig.ENV = 'alpha'
+//   appConfig.API_URL = 'https://kickback-alpha.herokuapp.com'
+//   appConfig.GIT_COMMIT = getGitCommit()
+//   appConfig.ROLLBAR_TOKEN = ''
+//   appConfig.BLOCKNATIVE_DAPPID = ''
+//   appConfig.INFURA_KEY = 'cd1ba006128543a0a11d23e54efaab93'
+//   appConfig.FORTMATIC_KEY = 'pk_test_D3CAA2AEFE6A022E'
+//   appConfig.PORTIS_KEY = '0ae69aa0-2a4e-41b2-a312-4aa2de69626e'
+//   appConfig.SQUARELINK_KEY = '7918e26f77908d911fac'
+// } else if (argv.xdai) {
+//   appConfig.ENV = 'xdai'
+//   appConfig.API_URL = 'https://kickback-xdai.herokuapp.com'
+//   appConfig.GIT_COMMIT = getGitCommit()
+//   appConfig.ROLLBAR_TOKEN = ''
+//   appConfig.BLOCKNATIVE_DAPPID = ''
+//   appConfig.INFURA_KEY = 'cd1ba006128543a0a11d23e54efaab93'
+//   appConfig.FORTMATIC_KEY = 'pk_test_D3CAA2AEFE6A022E'
+//   appConfig.PORTIS_KEY = '0ae69aa0-2a4e-41b2-a312-4aa2de69626e'
+//   appConfig.SQUARELINK_KEY = '7918e26f77908d911fac'
+//   appConfig.PLATFORM_FEE_ADDRESS = '0xeC34bf8f41BC951071A501502e1E60Af0cC9f9d6'
+//   appConfig.NETWORK_NAME = 'xdai'
+// } else if (argv.polygon) {
+if (argv.polygon) {
+  appConfig.ENV = 'polygon'
+  appConfig.API_URL = 'https://kickback-polygon.herokuapp.com'
   appConfig.GIT_COMMIT = getGitCommit()
   appConfig.ROLLBAR_TOKEN = ''
   appConfig.BLOCKNATIVE_DAPPID = ''
-  appConfig.INFURA_KEY = 'cd1ba006128543a0a11d23e54efaab93'
+  appConfig.INFURA_KEY = '3f0f6038f2614a7994fb48b7031e22ad'
   appConfig.FORTMATIC_KEY = 'pk_test_D3CAA2AEFE6A022E'
   appConfig.PORTIS_KEY = '0ae69aa0-2a4e-41b2-a312-4aa2de69626e'
   appConfig.SQUARELINK_KEY = '7918e26f77908d911fac'
-} else if (argv.alpha) {
-  appConfig.ENV = 'alpha'
-  appConfig.API_URL = 'https://kickback-alpha.herokuapp.com'
-  appConfig.GIT_COMMIT = getGitCommit()
-  appConfig.ROLLBAR_TOKEN = ''
-  appConfig.BLOCKNATIVE_DAPPID = ''
-  appConfig.INFURA_KEY = 'cd1ba006128543a0a11d23e54efaab93'
-  appConfig.FORTMATIC_KEY = 'pk_test_D3CAA2AEFE6A022E'
-  appConfig.PORTIS_KEY = '0ae69aa0-2a4e-41b2-a312-4aa2de69626e'
-  appConfig.SQUARELINK_KEY = '7918e26f77908d911fac'
-} else if (argv.live) {
-  appConfig.ENV = 'live'
-  appConfig.API_URL = 'https://kickback-live.herokuapp.com'
-  appConfig.GIT_COMMIT = getGitCommit()
-  appConfig.MIXPANEL_ID = '11a2f7a59470cdb46cb611c5d22876f2'
-  appConfig.LOGROCKET_TOKEN = '5gnafo/kickback-live'
-  appConfig.ROLLBAR_TOKEN = 'bfb8dfff7ff44f6fa6a13d4571447c28'
-  appConfig.BLOCKNATIVE_DAPPID = '612ef703-3041-442c-b246-cf68604b8ce9'
-  appConfig.INFURA_KEY = 'cd1ba006128543a0a11d23e54efaab93'
-  appConfig.FORTMATIC_KEY = 'pk_live_34FA001C997028B0'
-  appConfig.PORTIS_KEY = '0ae69aa0-2a4e-41b2-a312-4aa2de69626e'
-  appConfig.SQUARELINK_KEY = '7918e26f77908d911fac'
+  appConfig.PLATFORM_FEE_ADDRESS = '0x24362A8b91baded7Aa4F5FCaAA5B0032864B9f25'
+  appConfig.NETWORK_NAME = 'polygon-mainnet'
+  // } else if (argv.live) {
+  //   appConfig.ENV = 'live'
+  //   appConfig.API_URL = 'https://kickback-live.herokuapp.com'
+  //   appConfig.GIT_COMMIT = getGitCommit()
+  //   appConfig.MIXPANEL_ID = '11a2f7a59470cdb46cb611c5d22876f2'
+  //   appConfig.LOGROCKET_TOKEN = '5gnafo/kickback-live'
+  //   appConfig.ROLLBAR_TOKEN = 'bfb8dfff7ff44f6fa6a13d4571447c28'
+  //   appConfig.BLOCKNATIVE_DAPPID = '612ef703-3041-442c-b246-cf68604b8ce9'
+  //   appConfig.INFURA_KEY = 'cd1ba006128543a0a11d23e54efaab93'
+  //   appConfig.FORTMATIC_KEY = 'pk_live_34FA001C997028B0'
+  //   appConfig.PORTIS_KEY = '0ae69aa0-2a4e-41b2-a312-4aa2de69626e'
+  //   appConfig.SQUARELINK_KEY = '7918e26f77908d911fac'
+  //   appConfig.NETWORK_NAME = 'mainnet'
+} else {
+  // local
+  appConfig.PLATFORM_FEE_ADDRESS = '0x4ef57faD87Ce46e3f63C8F6B7A1ACB987e9140Fe' // Some random address
+  appConfig.NETWORK_NAME = 'local'
 }
-
+console.log('***appConfig', { appConfig })
 const str = JSON.stringify(appConfig, null, 2)
 console.log(str)
 

src/App.js

@@ -13,6 +13,7 @@ import DefaultLayout, {
 } from './layout/Layouts'
 
 import AllEvents from './routes/AllEvents'
+import AdminEvents from './routes/AdminEvents'
 import CreateEvent from './routes/CreateEvent'
 import SingleEvent from './routes/SingleEvent'
 import SingleEventChallenge from './routes/SingleEventChallenge'
@@ -86,6 +87,7 @@ class App extends Component {
                 layout={NoWeb3CheckLayout}
               />
               <Route path="/create" component={CreateEvent} />
+              <Route path="/admin" component={AdminEvents} />
               <Route path="/faq" component={Faq} layout={NoWeb3CheckLayout} />
               <Route
                 path="/terms"