Merge pull request #59 from cakedefi/develop

Develop

.babelrc

@@ -0,0 +1,3 @@
+{
+  "presets": ["@babel/preset-env"]
+}

.eslintrc.json

@@ -1,29 +1,21 @@
 {
   "env": {
     "browser": true,
-    "commonjs": true,
-    "es6": true,
-    "jest": true
+    "es6": true
   },
+  "extends": [
+    "eslint:recommended",
+    "plugin:@typescript-eslint/eslint-recommended"
+  ],
+  "globals": {
+    "Atomics": "readonly",
+    "SharedArrayBuffer": "readonly"
+  },
+  "parser": "@typescript-eslint/parser",
   "parserOptions": {
-    "ecmaFeatures": {
-      "jsx": true
-    },
+    "ecmaVersion": 2018,
     "sourceType": "module"
   },
-  "rules": {
-    "no-const-assign": "warn",
-    "no-this-before-super": "warn",
-    "no-undef": "warn",
-    "no-continue": "off",
-    "no-unreachable": "warn",
-    "no-unused-vars": "warn",
-    "constructor-super": "warn",
-    "valid-typeof": "warn",
-    "quotes": [2, "single"],
-    "semi": ["error", "never"]
-  },
-  "parser": "babel-eslint",
-  "extends": "airbnb",
-  "plugins": ["react", "jsx-a11y", "import"]
+  "plugins": ["@typescript-eslint"],
+  "rules": {}
 }

.gitignore

@@ -121,4 +121,9 @@ build
 dist
 
 # Unnecessary folders
-.DS_Store
+.DS_Store
+
+# Storybook build
+storybook-static
+
+/temp

.prettierrc

@@ -0,0 +1,5 @@
+{
+  "semi": true,
+  "singleQuote": true,
+  "trailingComma": "es5"
+}

Procfile

@@ -1,2 +1,2 @@
-react: npm run react-start
-electron: npm run electron-start
+react: cd webapp && npm run start:dev
+electron: npm run start:electron

README.md

@@ -2,8 +2,38 @@
 
 ## Scripts
 
-`npm start` has been configured to open as Electron desktop app.
+`npm run init` initialize and install npm dependency for electron and webapp
+
+### Run Electron desktop app with webapp
+
+`npm start`
+
+### Run Electron desktop app with webapp in dev mode
+
+`npm run start:dev`
+
+### Run webapp
+
+`npm run start:react`
+
+### Build react app
+
+`npm run build:react`
+
+### Build electron app for native platform
+
+`npm run build`
+
+### Build electron app for all platform
+
+`npm run build:all`
 
 ## Electron configuration
 
-Electron config is in src/start.js
+Electron config is in [electron-app/index.ts](electron-app/index.ts)
+
+## Copyright and license
+
+Copyright 2020 DeFi Blockchain Foundation.
+
+QR scanner shutter audio `webapp/src/assets/audio/shutter.mp3` is licensed by [Soundsnap](https://www.soundsnap.com). Commercial redistribution of the audio is prohibited. For full Soundsnap license, visit [https://www.soundsnap.com/licence](https://www.soundsnap.com/licence).

electron-app/index.ts

@@ -0,0 +1,8 @@
+import App from './src/app';
+
+function main() {
+  const electronApp = new App();
+  electronApp.run();
+}
+
+main();