diff --git a/app-template/apply.js b/app-template/apply.js index 14fdaab57..7ecad93d8 100755 --- a/app-template/apply.js +++ b/app-template/apply.js @@ -5,6 +5,7 @@ // var templates = { + 'package.json': '/', 'Makefile': 'cordova/', 'ProjectMakefile': 'cordova/', 'config-template.xml': '/', diff --git a/app-template/bitpay/appConfig.json b/app-template/bitpay/appConfig.json index 79eb58f52..54faf2203 100644 --- a/app-template/bitpay/appConfig.json +++ b/app-template/bitpay/appConfig.json @@ -5,12 +5,13 @@ "purposeLine": "Secure Bitcoin Wallet", "bundleName": "wallet", "appUri": "bitpay", - "name": "bitpay", "nameNoSpace": "bitpay", "nameCase": "BitPay", "nameCaseNoSpace": "BitPay", "gitHubRepoName": "bitpay-wallet", + "gitHubRepoUrl": "git://github.com/bitpay/bitpay-wallet.git", + "gitHubRepoBugs": "https://github.com/bitpay/bitpay-wallet/issues", "disclaimerUrl": "", "url": "https://bitpay.com", "appDescription": "Secure Bitcoin Wallet", diff --git a/app-template/bitpay/img/favicon.ico b/app-template/bitpay/img/favicon.ico new file mode 100644 index 000000000..166c0bcaf Binary files /dev/null and b/app-template/bitpay/img/favicon.ico differ diff --git a/app-template/bitpay/img/icon-128.png b/app-template/bitpay/img/icon-128.png new file mode 100644 index 000000000..6958667cd Binary files /dev/null and b/app-template/bitpay/img/icon-128.png differ diff --git a/app-template/copay/appConfig.json b/app-template/copay/appConfig.json index 7a6ee7ef3..6e66bd2bf 100644 --- a/app-template/copay/appConfig.json +++ b/app-template/copay/appConfig.json @@ -3,14 +3,15 @@ "packageDescription": "Copay Bitcoin Wallet", "userVisibleName": "Copay", "purposeLine": "Copay Bitcoin Wallet", + "bundleName": "copay", "appUri": "copay", - "name": "copay", "nameNoSpace": "copay", "nameCase": "Copay", "nameCaseNoSpace": "Copay", - "bundleName": "copay", "gitHubRepoName": "copay", + "gitHubRepoUrl": "git://github.com/bitpay/copay.git", + "gitHubRepoBugs": "https://github.com/bitpay/copay/issues", "disclaimerUrl": "https://copay.io/disclaimer", "url": "https://copay.io", "appDescription": "Copay Bitcoin Wallet", diff --git a/app-template/copay/img/favicon.ico b/app-template/copay/img/favicon.ico new file mode 100644 index 000000000..e2f92139d Binary files /dev/null and b/app-template/copay/img/favicon.ico differ diff --git a/app-template/copay/img/icon-128.png b/app-template/copay/img/icon-128.png new file mode 100644 index 000000000..8624a0189 Binary files /dev/null and b/app-template/copay/img/icon-128.png differ diff --git a/app-template/package.json b/app-template/package.json index 0aa436dc1..6b1c77033 100644 --- a/app-template/package.json +++ b/app-template/package.json @@ -14,14 +14,14 @@ "main": "www/index.html", "window": { "title": "*USERVISIBLENAME* - *PURPOSELINE*", - "icon": "./www/img/icons/icon-256.png", + "icon": "www/img/icon-128.png", "toolbar": false, "show": true, "visible": true, "resizable": true, "frame": true, "width": 400, - "height": 600, + "height": 650, "position": "center", "fullscreen": false }, @@ -32,14 +32,14 @@ }, "dom_storage_quota": 200, "id": "jid1-x7bV5evAaI1P9Q", - "homepage": "https://github.com/bitpay/copay", + "homepage": "*URL*", "license": "MIT", "repository": { - "url": "git://github.com/bitpay/copay.git", + "url": "*GITHUBREPOURL*", "type": "git" }, "bugs": { - "url": "https://github.com/bitpay/copay/issues" + "url": "*GITHUBREPOBUGS*" }, "dependencies": { "adm-zip": "^0.4.7", @@ -82,22 +82,41 @@ "load-grunt-tasks": "^3.5.0", "mocha": "^2.4.5", "phantomjs-prebuilt": "^2.1.7", - "shelljs": "^0.3.0", - "xcode": "^0.8.2" + "shelljs": "^0.3.0" }, "scripts": { - "preinstall": "bower install && npm i fs-extra", - "build": "grunt", - "apply:copay": "cd app-template && node apply.js", - "apply:bitpay-wallet": "cd app-template && node apply.js bitpay-wallet", - "start": "npm run build && node app.js", - "watch": "grunt watch", - "test": "./node_modules/.bin/grunt test-coveralls", - "clean": "git clean -dfx", - "start:ios": "npm run build && cd cordova && trash project-ios && make ios && open project-ios/platforms/ios/BitPay\\ Wallet.xcodeproj", - "start:android": "npm run build && cd cordova && trash project-android && make android && open -a /Applications/Android\\ Studio.app project-android/platforms/android" + "preinstall": "bower install && npm i fs-extra", + "postinstall": "npm run apply:bitpay && cordova prepare", + "start": "npm run build:www && ionic serve --nolivereload --nogulp -s", + "start:ios": "npm run build:www && npm run build:ios && npm run open:ios", + "start:android": "npm run build:www && npm run build:android && npm run run:android", + "watch": "grunt watch", + "build:www": "grunt", + "build:www-release": "grunt prod", + "build:ios": "cordova prepare ios && cordova build ios --debug", + "build:android": "cordova prepare android && cordova build android --debug", + "build:ios-release": "cordova prepare ios && cordova build ios --release", + "build:android-release": "cordova prepare android && cordova build android --release", + "open:ios": "open platforms/ios/*.xcodeproj", + "open:android": "open -a open -a /Applications/Android\\ Studio.app platforms/android", + "final:www": "npm run clean-all && npm run build:www-release", + "final:ios": "npm run final:www && npm run build:ios-release && npm run open:ios", + "final:android": "npm run final:www && npm run build:android-release && npm run run:android", + "run:android": "cordova run android --device", + "log:android": "adb logcat | grep chromium", + "apply:copay": "cd app-template && node apply.js copay", + "apply:bitpay": "cd app-template && node apply.js bitpay", + "test": "./node_modules/.bin/grunt test-coveralls", + "clean": "trash platforms && trash plugins && npm run postinstall", + "clean-all": "git clean -dfx && npm install" }, "devDependencies": { - "trash-cli": "^1.4.0" + "androidmanifest": "^2.0.0", + "cordova": "^5.4.1", + "globby": "^6.0.0", + "ionic": "^2.1.0", + "plist": "^2.0.1", + "trash-cli": "^1.4.0", + "xcode": "^0.8.2" } } diff --git a/app-template/setup-win.iss b/app-template/setup-win.iss index d9f6eaa30..d2443afef 100755 --- a/app-template/setup-win.iss +++ b/app-template/setup-win.iss @@ -8,7 +8,7 @@ #define MyAppExeName "*PACKAGENAME.exe" [Setup] -AppId={{804636ee-b017-4cad-8719-e58ac97ffa5c} +AppId={804636ee-b017-4cad-8719-e58ac97ffa5c} AppName={#MyAppName} AppVersion={#MyAppVersion} ;AppVerName={#MyAppName} {#MyAppVersion} diff --git a/package.json b/package.json index 4d770f788..b9099cefa 100644 --- a/package.json +++ b/package.json @@ -1,4 +1,9 @@ -{ + { + "//":"PLEASE! Do not edit this file directly", + "//":" Modify it at app-template/", + + "name": "bitpay", + "description": "Secure Bitcoin Storage", "author": "BitPay", "version": "0.14.0", "keywords": [ @@ -9,14 +14,35 @@ "multisignature", "bitcore" ], - "homepage": "https://github.com/bitpay/copay", + "main": "www/index.html", + "window": { + "title": "BitPay - Secure Bitcoin Wallet", + "icon": "www/img/icon-128.png", + "toolbar": false, + "show": true, + "visible": true, + "resizable": true, + "frame": true, + "width": 400, + "height": 650, + "position": "center", + "fullscreen": false + }, + "webkit": { + "page-cache": false, + "java": false, + "plugin": false + }, + "dom_storage_quota": 200, + "id": "jid1-x7bV5evAaI1P9Q", + "homepage": "https://bitpay.com", "license": "MIT", "repository": { - "url": "git://github.com/bitpay/copay.git", + "url": "git://github.com/bitpay/bitpay-wallet.git", "type": "git" }, "bugs": { - "url": "https://github.com/bitpay/copay/issues" + "url": "https://github.com/bitpay/bitpay-wallet/issues" }, "dependencies": { "adm-zip": "^0.4.7", @@ -59,7 +85,6 @@ "karma-sinon": "^1.0.5", "load-grunt-tasks": "^3.5.0", "mocha": "^2.4.5", - "pbkdf2": "^3.0.4", "phantomjs-prebuilt": "^2.1.7", "shelljs": "^0.3.0" }, diff --git a/webkitbuilds/setup-win.iss b/webkitbuilds/setup-win.iss index 8ae2a631f..f495bd8db 100755 --- a/webkitbuilds/setup-win.iss +++ b/webkitbuilds/setup-win.iss @@ -8,7 +8,7 @@ #define MyAppExeName "*PACKAGENAME.exe" [Setup] -AppId={{804636ee-b017-4cad-8719-e58ac97ffa5c} +AppId={804636ee-b017-4cad-8719-e58ac97ffa5c} AppName={#MyAppName} AppVersion={#MyAppVersion} ;AppVerName={#MyAppName} {#MyAppVersion} diff --git a/www/img/favicon.ico b/www/img/favicon.ico index e2f92139d..166c0bcaf 100644 Binary files a/www/img/favicon.ico and b/www/img/favicon.ico differ diff --git a/www/img/icon-128.png b/www/img/icon-128.png new file mode 100644 index 000000000..6958667cd Binary files /dev/null and b/www/img/icon-128.png differ