Skip to content

Commit

Permalink
config flow
Browse files Browse the repository at this point in the history
  • Loading branch information
kendricktan committed Sep 7, 2017
1 parent 0d621b6 commit 34c47d3
Show file tree
Hide file tree
Showing 18 changed files with 723 additions and 1,508 deletions.
5 changes: 5 additions & 0 deletions .babelrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{
"presets": [
"flow", "react", "es2015"
]
}
3 changes: 0 additions & 3 deletions .eslintignore

This file was deleted.

150 changes: 0 additions & 150 deletions .eslintrc.json

This file was deleted.

13 changes: 13 additions & 0 deletions .flowconfig
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
[ignore]
.*/plugins/.*
.*/platforms/.*
.*/node_modules/.*

[include]
./src/.*

[libs]

[lints]

[options]
3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -37,4 +37,5 @@ platforms
plugins

.vscode/
dist/
dist/
lib/
1 change: 1 addition & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ ZENCash mobile app built using Onsen UI, Redux, React and Webpack.

```
yarn install
yarn run flow-build
cordova plugin add cordova-plugin-qrscanner cordova-plugin-file cordova-plugin-http cordova-clipboard cordova-plugin-inappbrowser
cordova platform add [android | ios]
cordova run [android | ios]
Expand Down
File renamed without changes.
File renamed without changes
4 changes: 2 additions & 2 deletions config.xml
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@
</platform>
<preference name="iosPersistentFileLocation" value="Compatibility" />
<preference name="AndroidPersistentFileLocation" value="Internal" />
<hook src="./src/scripts/build.sh" type="before_prepare" />
<icon src="src/assets/img/zencash.png" />
<hook src="./scripts/build.sh" type="before_prepare" />
<icon src="./assets/img/zencash.png" />
<plugin name="cordova-clipboard" spec="^1.0.0" />
<plugin name="cordova-plugin-file" spec="^4.3.3" />
<plugin name="cordova-plugin-http" spec="^1.2.0" />
Expand Down
5 changes: 4 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
"scripts": {
"start": "webpack-dev-server --host 0.0.0.0 --progress --content-base www/",
"build": "cross-env NODE_ENV=production webpack --config webpack.config.prod.js",
"lint": "eslint ."
"flow-build": "babel --watch src/ -d lib/"
},
"repository": {
"type": "git",
Expand All @@ -21,10 +21,12 @@
"devDependencies": {
"autoprefixer": "^7.1.3",
"axios": "^0.16.2",
"babel-cli": "^6.26.0",
"babel-core": "^6.26.0",
"babel-loader": "^7.1.2",
"babel-polyfill": "^6.26.0",
"babel-preset-es2015": "^6.18.0",
"babel-preset-flow": "^6.23.0",
"babel-preset-react": "^6.5.0",
"babel-preset-stage-2": "^6.18.0",
"bip32-utils": "^0.10.0",
Expand All @@ -39,6 +41,7 @@
"eslint-plugin-react": "^7.3.0",
"eslint-plugin-standard": "^3.0.1",
"file-loader": "^0.11.2",
"flow-bin": "^0.54.1",
"isomorphic-fetch": "^2.2.1",
"json-loader": "^0.5.4",
"moment": "^2.18.1",
Expand Down
2 changes: 1 addition & 1 deletion src/scripts/build.sh → scripts/build.sh
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
#!/usr/bin/env bash

npm run build
yarn run build
2 changes: 1 addition & 1 deletion src/containers/App.js
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ import { phraseToSecretItems } from '../utils/wallet'
import MainPage from './MainPage'
import SetupPage from './SetupPage'

import ZENCASH_IMG from '../assets/img/zencash.png'
import ZENCASH_IMG from '../../assets/img/zencash.png'

const renderPage = (route, navigator) => (
<route.component key={route.key} navigator={navigator} />
Expand Down
2 changes: 1 addition & 1 deletion src/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ import App from './containers/App';
import ons from 'onsenui';
import 'onsenui/css/onsenui.css';
import 'onsenui/css/onsen-css-components.css'
import './assets/css/index.css'
import '../assets/css/index.css'

import { ZENCASH_MOBILE_SAVE_PATH, readFromFile, writeToFile } from './utils/persistentStorage'

Expand Down
2 changes: 1 addition & 1 deletion webpack.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ module.exports = {
'react-hot-loader/patch',
'webpack-dev-server/client?http://0.0.0.0:9000',
'webpack/hot/only-dev-server',
'./src/index.js'
'./lib/index.js'
],
output: {
path: path.join(__dirname, 'www'),
Expand Down
2 changes: 1 addition & 1 deletion webpack.config.prod.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ module.exports = {
devtool: 'source-map',
context: __dirname,
entry: [
'./src/index.js'
'./lib/index.js'
],
output: {
path: path.join(__dirname, 'www'),
Expand Down
Loading

0 comments on commit 34c47d3

Please sign in to comment.