diff --git a/.gitignore b/.gitignore
index 877c8e22..31ace1ab 100644
--- a/.gitignore
+++ b/.gitignore
@@ -42,3 +42,5 @@ yarn-error.log
.env.production.local
.now
+
+.vercel
diff --git a/.storybook/main.js b/.storybook/main.js
index 90a28888..1dfb1a11 100644
--- a/.storybook/main.js
+++ b/.storybook/main.js
@@ -1,9 +1,12 @@
module.exports = {
- stories: ['../src/**/*.stories.js'],
- addons: [
- '@storybook/preset-create-react-app',
- '@storybook/addon-actions',
- '@storybook/addon-links',
- '@storybook/addon-knobs/register'
+ "stories": [
+ "../src/**/*.stories.mdx",
+ "../src/**/*.stories.@(js|jsx|ts|tsx)"
],
-};
+ "addons": [
+ "@storybook/addon-links",
+ "@storybook/addon-essentials",
+ "@storybook/preset-create-react-app",
+ "storybook-addon-material-ui"
+ ]
+}
\ No newline at end of file
diff --git a/.storybook/preview-head.html b/.storybook/preview-head.html
index 7c201d37..6d7ef6f1 100644
--- a/.storybook/preview-head.html
+++ b/.storybook/preview-head.html
@@ -1,37 +1,9 @@
-
\ No newline at end of file
+
BLAH BLAH
+
+
+
diff --git a/.storybook/preview.js b/.storybook/preview.js
new file mode 100644
index 00000000..5ce735b5
--- /dev/null
+++ b/.storybook/preview.js
@@ -0,0 +1,20 @@
+import {ThemeProvider} from '@material-ui/core/styles'
+import {theme} from '../src/styles/theme'
+
+export const decorators = [
+ (story) => (
+
+ {story()}
+
+ ),
+];
+
+export const parameters = {
+ actions: { argTypesRegex: "^on[A-Z].*" },
+ controls: {
+ matchers: {
+ color: /(background|color)$/i,
+ date: /Date$/,
+ },
+ },
+}
\ No newline at end of file
diff --git a/.storybook/webpack.config.js b/.storybook/webpack.config.js
deleted file mode 100644
index 20f808a0..00000000
--- a/.storybook/webpack.config.js
+++ /dev/null
@@ -1,16 +0,0 @@
-const path = require('path');
-
-module.exports = async ({config}) => {
- config.module.rules.push({
- test: /\.(ttf|otf|woff|woff2|eot)$/,
- use: [
- {
- loader: 'file-loader',
- query: '[name].[ext]'
- }
- ],
- include: path.resolve(__dirname, '../')
- });
-
- return config;
-};
\ No newline at end of file
diff --git a/package.json b/package.json
index 6416a7ab..5392e3ae 100644
--- a/package.json
+++ b/package.json
@@ -1,77 +1,90 @@
{
"name": "arbor-frontend",
- "version": "1.5.0",
+ "version": "1.6.7",
"private": true,
"dependencies": {
"@brainhubeu/react-carousel": "1.19.26",
- "@ethersproject/providers": "5.0.5",
+ "@ethersproject/providers": "5.0.23",
"@hapi/joi": "17.1.1",
- "@material-ui/core": "4.11.0",
- "@material-ui/icons": "4.9.1",
- "@material-ui/styles": "4.10.0",
- "@storybook/addon-knobs": "5.3.19",
- "@testing-library/jest-dom": "5.11.2",
- "@testing-library/react": "10.4.8",
- "@testing-library/user-event": "12.1.0",
- "@web3-react/core": "6.1.1",
- "@web3-react/injected-connector": "6.0.7",
+ "@material-ui/core": "4.11.3",
+ "@material-ui/icons": "4.11.2",
+ "@material-ui/styles": "4.11.3",
+ "@metamask/onboarding": "1.0.0",
+ "@portis/web3": "2.0.0-beta.57",
+ "@stripe/react-stripe-js": "1.2.2",
+ "@stripe/stripe-js": "1.12.1",
+ "@windingtree/org.id-lif-deposit": "1.0.2",
"@windingtree/org.json-schema": "0.4.3",
- "formik": "2.1.5",
+ "esri-leaflet-geocoder": "2.3.3",
+ "formik": "2.2.6",
"history": "4.10.1",
"js-sha3": "0.8.0",
"jsonschema": "1.2.6",
- "lodash": "4.17.19",
- "moment": "2.27.0",
- "node-sass": "4.14.1",
+ "leaflet": "1.7.1",
+ "lodash": "4.17.21",
+ "moment": "2.29.1",
+ "node-sass": "5.0.0",
"prop-types": "15.7.2",
- "radium": "0.26.0",
- "react": "16.13.1",
+ "query-string": "6.14.0",
+ "radium": "0.26.1",
+ "react": "17.0.2",
"react-animations": "1.0.0",
- "react-dom": "16.13.1",
+ "react-blockies": "1.4.1",
+ "react-dom": "17.0.2",
"react-dotdotdot": "1.3.1",
"react-dropzone": "11.0.1",
+ "react-esri-leaflet": "0.2.2",
+ "react-leaflet": "3.0.0",
+ "react-number-format": "4.4.4",
"react-paginate": "6.3.2",
- "react-redux": "7.2.1",
+ "react-redux": "7.2.3",
"react-router": "5.2.0",
"react-router-dom": "5.2.0",
"react-router-redux": "4.0.8",
- "react-scripts": "3.4.1",
+ "react-scripts": "4.0.3",
"react-visibility-sensor": "5.1.1",
"redux": "4.0.5",
- "redux-devtools-extension": "2.13.8",
+ "redux-devtools-extension": "2.13.9",
"redux-logger": "3.0.6",
"redux-persist": "6.0.0",
"redux-saga": "1.1.3",
"reselect": "4.0.0",
- "web3": "1.2.11",
- "web3-sagas": "0.3.1",
- "@metamask/onboarding": "1.0.0",
- "@portis/web3": "2.0.0-beta.57",
- "@stripe/stripe-js": "1.9.0",
- "@stripe/react-stripe-js": "1.1.2",
- "query-string": "6.13.1"
+ "web3": "1.3.5"
},
"devDependencies": {
- "@storybook/addon-actions": "5.3.18",
- "@storybook/addon-links": "5.3.18",
- "@storybook/addons": "5.3.18",
- "@storybook/preset-create-react-app": "2.1.2",
- "@storybook/react": "5.3.18",
- "env-cmd": "10.1.0"
+ "@storybook/addon-actions": "6.2.8",
+ "@storybook/addon-essentials": "6.2.8",
+ "@storybook/addon-links": "6.2.8",
+ "@storybook/node-logger": "6.2.8",
+ "@storybook/preset-create-react-app": "3.1.7",
+ "@storybook/react": "6.2.8",
+ "env-cmd": "10.1.0",
+ "now": "21.0.1",
+ "storybook-addon-material-ui": "0.9.0-alpha.24"
},
"scripts": {
"start": "react-scripts start",
"build": "react-scripts build",
"test": "react-scripts test",
"eject": "react-scripts eject",
- "storybook": "npx start-storybook -p 9009 -c .storybook watch-css -s ./src",
+ "storybook": "start-storybook -p 6006 -s public",
"build-storybook": "build-storybook -s public",
"build:staging": "env-cmd -f zeit.staging.env react-scripts build",
"build:ropsten": "env-cmd -f zeit.ropsten.env react-scripts build",
"build:production": "env-cmd -f zeit.production.env react-scripts build"
},
"eslintConfig": {
- "extends": "react-app"
+ "extends": "react-app",
+ "overrides": [
+ {
+ "files": [
+ "**/*.stories.*"
+ ],
+ "rules": {
+ "import/no-anonymous-default-export": "off"
+ }
+ }
+ ]
},
"browserslist": {
"production": [
diff --git a/public/index.html b/public/index.html
index fcd881b6..c5e6475e 100644
--- a/public/index.html
+++ b/public/index.html
@@ -1,22 +1,21 @@
-
-
-
-
-
-
-
-
-
-
-
- Winding Tree
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
-
-
+