[OP-15] contracts and dapp restructure (#85)

.editorconfig

@@ -1,17 +1,17 @@
 root = true
 
 [*]
+charset = utf-8
 end_of_line = lf
 insert_final_newline = true
-
-[src/**.{css,js,jsx,ts,tsx}]
-charset = utf-8
 trim_trailing_whitespace = true
 indent_style = space
+
+[src/**.{css,js,jsx,ts,tsx}]
 indent_size = 2
 
-[package.json]
+[*.json]
-charset = utf-8
-trim_trailing_whitespace = true
-indent_style = space
 indent_size = 2
+
+[*.sol]
+indent_size = 4

.gitignore

@@ -26,6 +26,7 @@ test-results/
 node_modules
 build
 app/src/contracts
+src/chain/abis
 .DS_Store
 .idea
 
@@ -63,6 +64,8 @@ build/Release
 # Dependency directories
 node_modules/
 jspm_packages/
+.pnp
+.pnp.js
 
 # TypeScript v1 declaration files
 typings/
@@ -79,12 +82,19 @@ typings/
 # Output of 'npm pack'
 *.tgz
 
+# Junit output
+junit.xml
+
 # Yarn Integrity file
 .yarn-integrity
 
 # dotenv environment variables file
 .env
 .env.test
+.env.local
+.env.development.local
+.env.test.local
+.env.production.local
 
 # parcel-bundler cache (https://parceljs.org/)
 .cache

.solcover.js

@@ -1,3 +1,3 @@
 module.exports = {
-    buildDirPath: '/app/src/contracts'
+    buildDirPath: '/src/chain/abis'
 };

Jenkinsfile

@@ -15,56 +15,51 @@ pipeline {
         stage('Contracts: Build') {
             steps {
                 sh 'npm install'
-                sh 'npm run build'
+                sh 'npm run build:contracts'
             }
         }
         stage('Contracts: Lint') {
             steps {
-                sh 'npm run lint'
+                sh 'npm run lint:contracts'
             }
         }
         stage('Contracts: Test') {
             steps {
-                sh 'npm test'
+                sh 'npm run test:contracts'
             }
         }
         stage('Contracts: Coverage') {
             steps {
-                sh 'npm run coverage'
+                sh 'npm run coverage:contracts'
                 sh './node_modules/.bin/istanbul report cobertura --root .'
             }
         }
         stage('Dapp: Build') {
             steps {
-                dir('app') {
+                sh 'npm run build:app'
-                    sh 'npm install'
-                    sh 'npm run build'
-                }
             }
         }
         stage('Dapp: Test') {
             steps {
-                dir('app') {
+                sh 'npm run test:app:ci'
-                    sh 'npm run test:ci'
-                }
             }
         }
     }
     post {
         always {
             junit 'test-results/**/*.xml'
-            junit 'app/junit.xml'
+            junit 'junit.xml'
             publishCoverage adapters: [
                 istanbulCoberturaAdapter(
-                    path: 'coverage/cobertura-coverage.xml', 
+                    path: 'coverage/cobertura-coverage.xml',
                     thresholds: [[failUnhealthy: true, thresholdTarget: 'Function', unhealthyThreshold: 80.0, unstableThreshold: 85.0]])]
             publishHTML([
-                allowMissing: false, 
+                allowMissing: false,
-                alwaysLinkToLastBuild: false, 
+                alwaysLinkToLastBuild: false,
-                keepAll: false, 
+                keepAll: false,
-                reportDir: 'coverage', 
+                reportDir: 'coverage',
-                reportFiles: 'index.html', 
+                reportFiles: 'index.html',
-                reportName: 'Coverage Report (HTML)', 
+                reportName: 'Coverage Report (HTML)',
                 reportTitles: ''])
         }
       }

app/.gitignore

@@ -1,24 +0,0 @@
-# See https://help.github.com/articles/ignoring-files/ for more about ignoring files.
-
-# dependencies
-/node_modules
-/.pnp
-.pnp.js
-
-# testing
-/coverage
-junit.xml
-
-# production
-/build
-
-# misc
-.DS_Store
-.env.local
-.env.development.local
-.env.test.local
-.env.production.local
-
-npm-debug.log*
-yarn-debug.log*
-yarn-error.log*

app/README.md

@@ -1,68 +0,0 @@
-This project was bootstrapped with [Create React App](https://github.com/facebook/create-react-app).
-
-## Available Scripts
-
-In the project directory, you can run:
-
-### `npm start`
-
-Runs the app in the development mode.<br>
-Open [http://localhost:3000](http://localhost:3000) to view it in the browser.
-
-The page will reload if you make edits.<br>
-You will also see any lint errors in the console.
-
-### `npm test`
-
-Launches the test runner in the interactive watch mode.<br>
-See the section about [running tests](https://facebook.github.io/create-react-app/docs/running-tests) for more information.
-
-### `npm run build`
-
-Builds the app for production to the `build` folder.<br>
-It correctly bundles React in production mode and optimizes the build for the best performance.
-
-The build is minified and the filenames include the hashes.<br>
-Your app is ready to be deployed!
-
-See the section about [deployment](https://facebook.github.io/create-react-app/docs/deployment) for more information.
-
-### `npm run eject`
-
-**Note: this is a one-way operation. Once you `eject`, you can’t go back!**
-
-If you aren’t satisfied with the build tool and configuration choices, you can `eject` at any time. This command will remove the single build dependency from your project.
-
-Instead, it will copy all the configuration files and the transitive dependencies (Webpack, Babel, ESLint, etc) right into your project so you have full control over them. All of the commands except `eject` will still work, but they will point to the copied scripts so you can tweak them. At this point you’re on your own.
-
-You don’t have to ever use `eject`. The curated feature set is suitable for small and middle deployments, and you shouldn’t feel obligated to use this feature. However we understand that this tool wouldn’t be useful if you couldn’t customize it when you are ready for it.
-
-## Learn More
-
-You can learn more in the [Create React App documentation](https://facebook.github.io/create-react-app/docs/getting-started).
-
-To learn React, check out the [React documentation](https://reactjs.org/).
-
-### Code Splitting
-
-This section has moved here: https://facebook.github.io/create-react-app/docs/code-splitting
-
-### Analyzing the Bundle Size
-
-This section has moved here: https://facebook.github.io/create-react-app/docs/analyzing-the-bundle-size
-
-### Making a Progressive Web App
-
-This section has moved here: https://facebook.github.io/create-react-app/docs/making-a-progressive-web-app
-
-### Advanced Configuration
-
-This section has moved here: https://facebook.github.io/create-react-app/docs/advanced-configuration
-
-### Deployment
-
-This section has moved here: https://facebook.github.io/create-react-app/docs/deployment
-
-### `npm run build` fails to minify
-
-This section has moved here: https://facebook.github.io/create-react-app/docs/troubleshooting#npm-run-build-fails-to-minify

app/package.json

@@ -1,78 +0,0 @@
-{
-  "name": "permissioning-dapp",
-  "version": "0.1.0",
-  "private": true,
-  "dependencies": {
-    "@types/enzyme": "^3.9.3",
-    "@types/enzyme-adapter-react-16": "^1.0.5",
-    "@types/jest": "^24.0.13",
-    "@types/node": "^12.0.4",
-    "@types/react": "^16.8.19",
-    "@types/react-dom": "^16.8.4",
-    "@types/styled-components": "^4.1.15",
-    "classnames": "^2.2.6",
-    "drizzle": "^1.4.0",
-    "drizzle-react": "^1.3.0",
-    "jest-junit": "^6.4.0",
-    "node-sass": "^4.12.0",
-    "react": "^16.8.6",
-    "react-dom": "^16.8.6",
-    "react-router-dom": "^5.0.0",
-    "react-scripts": "3.0.1",
-    "rimble-ui": "^0.8.0",
-    "styled-components": "^4.2.0",
-    "typescript": "^3.5.1"
-  },
-  "scripts": {
-    "start": "react-scripts start",
-    "build": "react-scripts build",
-    "test": "react-scripts test --env=jsdom",
-    "test:ci": "react-scripts test --reporters=default --reporters=jest-junit",
-    "eject": "react-scripts eject"
-  },
-  "eslintConfig": {
-    "extends": "react-app"
-  },
-  "browserslist": {
-    "production": [
-      ">0.2%",
-      "not dead",
-      "not op_mini all"
-    ],
-    "development": [
-      "last 1 chrome version",
-      "last 1 firefox version",
-      "last 1 safari version"
-    ]
-  },
-  "devDependencies": {
-    "enzyme": "^3.9.0",
-    "enzyme-adapter-react-16": "^1.13.1",
-    "enzyme-to-json": "^3.3.5",
-    "husky": "^2.2.0",
-    "lint-staged": "^8.1.6",
-    "prettier": "^1.17.0"
-  },
-  "lint-staged": {
-    "src/**/*.{js,jsx,json,css}": [
-      "prettier --write",
-      "git add"
-    ]
-  },
-  "prettier": {
-    "useTabs": false,
-    "tabWidth": 4
-  },
-  "husky": {
-    "hooks": {
-      "pre-commit": "lint-staged"
-    }
-  },
-  "jest": {
-    "collectCoverageFrom": [
-      "src/**/*.{js,jsx}",
-      "!**/src/index.js",
-      "!**/src/serviceWorker.js"
-    ]
-  }
-}

app/src/index.css

@@ -1,4 +0,0 @@
-body {
-  margin: 0;
-  padding: 0;
-}

package.json

@@ -1,26 +1,99 @@
 {
   "name": "permissioning-smart-contracts",
+  "version": "0.1.0",
   "repository": "permissioning-smart-contracts",
   "license": "Apache-2.0",
   "private": true,
   "scripts": {
-    "lint": "solium -d contracts",
+    "lint:contracts": "solium -d contracts",
-    "test": "truffle test --network develop",
+    "lint": "npm run lint:contracts",
-    "coverage": "solidity-coverage",
+    "test:app": "react-scripts test --env=jsdom --watchAll=false",
-    "build": "truffle compile"
+    "test:app:watch": "react-scripts test --env=jsdom",
+    "test:app:ci": "react-scripts test --reporters=default --reporters=jest-junit",
+    "test:contracts": "truffle test --network develop",
+    "test": "npm run test:contracts && npm run test:app",
+    "coverage:contracts": "solidity-coverage",
+    "coverage": "npm run coverage:contracts",
+    "build:app": "react-scripts build",
+    "build:contracts": "truffle compile",
+    "build": "npm run build:contracts && npm run build:app",
+    "start": "react-scripts start",
+    "eject": "react-scripts eject"
+  },
+  "eslintConfig": {
+    "extends": "react-app"
+  },
+  "browserslist": {
+    "production": [
+      ">0.2%",
+      "not dead",
+      "not op_mini all"
+    ],
+    "development": [
+      "last 1 chrome version",
+      "last 1 firefox version",
+      "last 1 safari version"
+    ]
   },
   "dependencies": {
+    "@types/enzyme": "^3.9.3",
+    "@types/enzyme-adapter-react-16": "^1.0.5",
+    "@types/jest": "^24.0.13",
+    "@types/node": "^12.0.4",
+    "@types/react": "^16.8.19",
+    "@types/react-dom": "^16.8.4",
+    "@types/styled-components": "^4.1.15",
+    "classnames": "^2.2.6",
     "dotenv": "^7.0.0",
+    "drizzle": "^1.4.0",
+    "drizzle-react": "^1.3.0",
+    "jest-junit": "^6.4.0",
+    "node-sass": "^4.12.0",
+    "react": "^16.8.6",
+    "react-dom": "^16.8.6",
+    "react-router-dom": "^5.0.0",
+    "react-scripts": "3.0.1",
+    "rimble-ui": "^0.8.0",
     "solidity-linked-list": "^2.0.2",
+    "styled-components": "^4.2.0",
     "truffle-hdwallet-provider": "^1.0.6",
+    "typescript": "^3.5.1",
     "web3-utils": "^1.0.0-beta.52"
   },
   "devDependencies": {
+    "enzyme": "^3.9.0",
+    "enzyme-adapter-react-16": "^1.13.1",
+    "enzyme-to-json": "^3.3.5",
+    "husky": "^2.2.0",
     "istanbul": "^0.4.5",
+    "lint-staged": "^8.1.6",
     "mocha-junit-reporter": "^1.21.0",
     "mocha-multi-reporters": "^1.1.7",
+    "prettier": "^1.17.0",
     "solidity-coverage": "github:sc-forks/solidity-coverage#leapdao",
     "solium": "^1.2.4",
     "truffle": "^5.0.12"
+  },
+  "lint-staged": {
+    "src/**/*.{js,jsx,json,css}": [
+      "prettier --write",
+      "git add"
+    ]
+  },
+  "prettier": {
+    "useTabs": false,
+    "tabWidth": 4
+  },
+  "husky": {
+    "hooks": {
+      "pre-commit": "lint-staged"
+    }
+  },
+  "jest": {
+    "collectCoverageFrom": [
+      "src/**/*.{js,jsx}",
+      "!**/src/index.js",
+      "!**/src/serviceWorker.js"
+    ]
   }
 }

src/components/AppBar/__test__/__snapshots__/AppBar.test.js.snap

@@ -255,9 +255,11 @@ exports[`<AppBar /> matches snapshot 1`] = `
 >
   <Styled(Styled(Text))
     as="h3"
+    color="copyColor"
     fontFamily="sansSerif"
     fontSize={4}
     fontWeight={3}
+    lineHeight="copy"
     my={3}
     textAlign="left"
     theme={

src/containers/Dashboard/__test__/__snapshots__/Dashboard.test.tsx.snap

@@ -1,7 +1,7 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
 exports[`<Dashboard Container /> matches snapshot 1`] = `
-<Dashboard
+<Memo(Dashboard)
   dataReady={true}
   setTab={[Function]}
   tab="accountTab"

src/containers/Toasts/__test__/__snapshots__/Toasts.test.js.snap

@@ -1,7 +1,7 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
 exports[`<Toasts Container /> matches snapshot 1`] = `
-<Toasts
+<Memo(Toasts)
   closeToast={[Function]}
   toasts={Array []}
 />