From 3c6cd2b886cd79d3434b3a4265318beb3d600957 Mon Sep 17 00:00:00 2001 From: Gustavo Maximiliano Cortez Date: Fri, 20 Oct 2017 11:32:11 -0300 Subject: [PATCH 1/3] Add cordova plugins. Update package. Fix log wording --- app-template/config-template.xml | 10 + package-lock.json | 478 +++++++++++++++-------- package.json | 14 +- src/providers/language/language.ts | 7 +- src/providers/persistence/persistence.ts | 17 +- src/providers/platform/platform.ts | 3 +- 6 files changed, 353 insertions(+), 176 deletions(-) diff --git a/app-template/config-template.xml b/app-template/config-template.xml index 4abdcde4c..4f60bc0e7 100644 --- a/app-template/config-template.xml +++ b/app-template/config-template.xml @@ -61,11 +61,21 @@ + + + + + + + + + + diff --git a/package-lock.json b/package-lock.json index 5ebce443a..8c2b0a2eb 100644 --- a/package-lock.json +++ b/package-lock.json @@ -891,6 +891,138 @@ } } }, + "@ionic/cli-utils": { + "version": "1.13.1", + "resolved": "https://registry.npmjs.org/@ionic/cli-utils/-/cli-utils-1.13.1.tgz", + "integrity": "sha512-r6yTJ0EmC5MDGqQsR1ItGSLOHCssLRISpqECBbDtINrBa36fdDigcspzEJAJ9xXoWwyXbY+suTtvc5Jb7YFZNQ==", + "dev": true, + "requires": { + "archiver": "2.1.0", + "basic-auth": "1.1.0", + "body-parser": "1.18.2", + "chalk": "2.1.0", + "chokidar": "1.7.0", + "ci-info": "1.1.1", + "cross-spawn": "5.1.0", + "dargs": "5.1.0", + "diff": "3.4.0", + "elementtree": "0.1.7", + "express": "4.16.2", + "inquirer": "3.3.0", + "leek": "0.0.24", + "lodash": "4.17.4", + "minimist": "1.2.0", + "ncp": "2.0.0", + "opn": "5.1.0", + "proxy-middleware": "0.15.0", + "semver": "5.4.1", + "slice-ansi": "1.0.0", + "ssh-config": "1.1.3", + "string-width": "2.1.1", + "strip-ansi": "4.0.0", + "superagent": "3.6.3", + "tar": "2.2.1", + "tiny-lr": "1.0.5", + "tslib": "1.8.0", + "uuid": "3.1.0", + "wrap-ansi": "3.0.1", + "ws": "3.2.0" + }, + "dependencies": { + "ansi-regex": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz", + "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=", + "dev": true + }, + "cross-spawn": { + "version": "5.1.0", + "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-5.1.0.tgz", + "integrity": "sha1-6L0O/uWPz/b4+UUQoKVUu/ojVEk=", + "dev": true, + "requires": { + "lru-cache": "4.1.1", + "shebang-command": "1.2.0", + "which": "1.3.0" + } + }, + "debug": { + "version": "2.6.9", + "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", + "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", + "dev": true, + "requires": { + "ms": "2.0.0" + } + }, + "is-fullwidth-code-point": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz", + "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=", + "dev": true + }, + "string-width": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz", + "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==", + "dev": true, + "requires": { + "is-fullwidth-code-point": "2.0.0", + "strip-ansi": "4.0.0" + } + }, + "strip-ansi": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz", + "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=", + "dev": true, + "requires": { + "ansi-regex": "3.0.0" + } + }, + "tiny-lr": { + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/tiny-lr/-/tiny-lr-1.0.5.tgz", + "integrity": "sha512-YrxUSiMgOVh3PnAqtdAUQuUVEVRnqcRCxJ3BHrl/aaWV2fplKKB60oClM0GH2Gio2hcXvkxMUxsC/vXZrQePlg==", + "dev": true, + "requires": { + "body": "5.1.0", + "debug": "2.6.9", + "faye-websocket": "0.10.0", + "livereload-js": "2.2.2", + "object-assign": "4.1.1", + "qs": "6.5.1" + } + }, + "ultron": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/ultron/-/ultron-1.1.0.tgz", + "integrity": "sha1-sHoualQagV/Go0zNRTO67DB8qGQ=", + "dev": true + }, + "wrap-ansi": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-3.0.1.tgz", + "integrity": "sha1-KIoE2H7aXChuBg3+jxNc6NAH+Lo=", + "dev": true, + "requires": { + "string-width": "2.1.1", + "strip-ansi": "4.0.0" + } + }, + "ws": { + "version": "3.2.0", + "resolved": "https://registry.npmjs.org/ws/-/ws-3.2.0.tgz", + "integrity": "sha512-hTS3mkXm/j85jTQOIcwVz3yK3up9xHgPtgEhDBOH3G18LDOZmSAG1omJeXejLKJakx+okv8vS1sopgs7rw0kVw==", + "dev": true, + "requires": { + "async-limiter": "1.0.0", + "safe-buffer": "5.1.1", + "ultron": "1.1.0" + } + } + } + }, "@ionic/discover": { "version": "0.3.3", "resolved": "https://registry.npmjs.org/@ionic/discover/-/discover-0.3.3.tgz", @@ -1186,9 +1318,9 @@ "dev": true }, "archiver": { - "version": "2.0.3", - "resolved": "https://registry.npmjs.org/archiver/-/archiver-2.0.3.tgz", - "integrity": "sha1-tDYLtYSvFDeZGUJxbyHXxSPR270=", + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/archiver/-/archiver-2.1.0.tgz", + "integrity": "sha1-0t8ujVdzqCwdzOklzMQUUOqZmv0=", "dev": true, "requires": { "archiver-utils": "1.3.0", @@ -1198,7 +1330,6 @@ "lodash": "4.17.4", "readable-stream": "2.3.3", "tar-stream": "1.5.4", - "walkdir": "0.0.11", "zip-stream": "1.2.0" }, "dependencies": { @@ -12654,8 +12785,7 @@ "colors": { "version": "1.1.2", "resolved": "https://registry.npmjs.org/colors/-/colors-1.1.2.tgz", - "integrity": "sha1-FopHAXVran9RoSzgyXv6KMCE7WM=", - "dev": true + "integrity": "sha1-FopHAXVran9RoSzgyXv6KMCE7WM=" }, "colour": { "version": "0.7.1", @@ -13192,6 +13322,53 @@ "resolved": "https://registry.npmjs.org/cordova-clipboard/-/cordova-clipboard-1.1.0.tgz", "integrity": "sha512-vC6lIUBA6IYKaTngnd58LSmwykeD51TyUR4DM2rhmBxikoXpM7QPrHb14dtlfW6OhJxSvda4nhRnO59KG+LpTQ==" }, + "cordova-custom-config": { + "version": "4.0.2", + "resolved": "https://registry.npmjs.org/cordova-custom-config/-/cordova-custom-config-4.0.2.tgz", + "integrity": "sha1-duiKQK0hN1QGny5kmB6RZ6WX3+4=", + "requires": { + "colors": "1.1.2", + "elementtree": "0.1.7", + "lodash": "4.17.4", + "plist": "1.2.0", + "shelljs": "0.7.8", + "tostr": "0.1.0", + "xcode": "0.8.9" + }, + "dependencies": { + "base64-js": { + "version": "0.0.8", + "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-0.0.8.tgz", + "integrity": "sha1-EQHpVE9KdrG8OybUUsqW16NeeXg=" + }, + "plist": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/plist/-/plist-1.2.0.tgz", + "integrity": "sha1-CEtQk93JJQbiWfh0uNmxr7jHlZM=", + "requires": { + "base64-js": "0.0.8", + "util-deprecate": "1.0.2", + "xmlbuilder": "4.0.0", + "xmldom": "0.1.27" + } + }, + "xmlbuilder": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/xmlbuilder/-/xmlbuilder-4.0.0.tgz", + "integrity": "sha1-mLj2UcowqmJANvEn0RzGbce5B6M=", + "requires": { + "lodash": "3.10.1" + }, + "dependencies": { + "lodash": { + "version": "3.10.1", + "resolved": "https://registry.npmjs.org/lodash/-/lodash-3.10.1.tgz", + "integrity": "sha1-W/Rejkm6QYnhfUgnid/RW9FAt7Y=" + } + } + } + } + }, "cordova-ios": { "version": "4.5.2", "resolved": "https://registry.npmjs.org/cordova-ios/-/cordova-ios-4.5.2.tgz", @@ -13520,6 +13697,9 @@ "resolved": "https://registry.npmjs.org/cordova-plugin-console/-/cordova-plugin-console-1.1.0.tgz", "integrity": "sha1-4vusECkBeeRMtyxf28QQpTHBzW0=" }, + "cordova-plugin-customurlscheme": { + "version": "git+https://github.com/cmgustavo/Custom-URL-scheme.git#4d49f0c75f472cbe144ada8408c064b376bdc733" + }, "cordova-plugin-device": { "version": "1.1.6", "resolved": "https://registry.npmjs.org/cordova-plugin-device/-/cordova-plugin-device-1.1.6.tgz", @@ -13530,6 +13710,9 @@ "resolved": "https://registry.npmjs.org/cordova-plugin-dialogs/-/cordova-plugin-dialogs-1.3.3.tgz", "integrity": "sha1-Uy/y61yGEzpYeFUNrlnHarOX+Mk=" }, + "cordova-plugin-fcm": { + "version": "git+https://github.com/cmgustavo/cordova-plugin-fcm.git#85e84c315bdb973ff7e7fbfcf522f970f27499e5" + }, "cordova-plugin-file": { "version": "4.3.3", "resolved": "https://registry.npmjs.org/cordova-plugin-file/-/cordova-plugin-file-4.3.3.tgz", @@ -13620,9 +13803,9 @@ "integrity": "sha1-W2M1/rn1MB88ATuQlsuIhb29UHY=" }, "cordova-plugin-x-socialsharing": { - "version": "5.2.0", - "resolved": "https://registry.npmjs.org/cordova-plugin-x-socialsharing/-/cordova-plugin-x-socialsharing-5.2.0.tgz", - "integrity": "sha1-GiJHa8WNRsHSqahMTxIeYpysqxQ=" + "version": "5.2.1", + "resolved": "https://registry.npmjs.org/cordova-plugin-x-socialsharing/-/cordova-plugin-x-socialsharing-5.2.1.tgz", + "integrity": "sha1-28NUuZP5t7FgA5aCLYICtzzFgfM=" }, "cordova-plugin-x-toast": { "version": "2.6.0", @@ -14546,7 +14729,6 @@ "version": "0.1.7", "resolved": "https://registry.npmjs.org/elementtree/-/elementtree-0.1.7.tgz", "integrity": "sha1-mskb5uUvtuYkTE5UpKw+2K6OKcA=", - "dev": true, "requires": { "sax": "1.1.4" }, @@ -14554,8 +14736,7 @@ "sax": { "version": "1.1.4", "resolved": "https://registry.npmjs.org/sax/-/sax-1.1.4.tgz", - "integrity": "sha1-dLbTPJrh4AFRDxeakRaFiPGu2qk=", - "dev": true + "integrity": "sha1-dLbTPJrh4AFRDxeakRaFiPGu2qk=" } } }, @@ -15612,8 +15793,7 @@ "fs.realpath": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz", - "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=", - "dev": true + "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=" }, "fsevents": { "version": "1.1.2", @@ -17556,8 +17736,7 @@ "interpret": { "version": "1.0.4", "resolved": "https://registry.npmjs.org/interpret/-/interpret-1.0.4.tgz", - "integrity": "sha1-ggzdWIuGj/sZGoCVBtbJyPISsbA=", - "dev": true + "integrity": "sha1-ggzdWIuGj/sZGoCVBtbJyPISsbA=" }, "invariant": { "version": "2.2.2", @@ -17574,12 +17753,12 @@ "integrity": "sha1-EEqOSqym09jNFXqO+L+rLXo//bY=" }, "ionic": { - "version": "3.13.0", - "resolved": "https://registry.npmjs.org/ionic/-/ionic-3.13.0.tgz", - "integrity": "sha512-jDjGaKCo+9FCDqcOuXdb4syui7lSXpgM/w28wmMUAQGJB2aaEBHPCk1hWfLQQu0cDnRiFvZyV/accT7cONRUww==", + "version": "3.13.2", + "resolved": "https://registry.npmjs.org/ionic/-/ionic-3.13.2.tgz", + "integrity": "sha512-YbWW0UuZS7nidz9IQh2TIH21YPJNlSZAju23qUFFM4XSK/SMZJPWvaI9tLHJ9PoFqtcakNmkug29iDqwLOnTuA==", "dev": true, "requires": { - "@ionic/cli-utils": "1.13.0", + "@ionic/cli-utils": "1.13.1", "@ionic/discover": "0.3.3", "chalk": "2.1.0", "opn": "5.1.0", @@ -17587,138 +17766,6 @@ "rimraf": "2.6.2", "semver": "5.4.1", "tslib": "1.8.0" - }, - "dependencies": { - "@ionic/cli-utils": { - "version": "1.13.0", - "resolved": "https://registry.npmjs.org/@ionic/cli-utils/-/cli-utils-1.13.0.tgz", - "integrity": "sha512-IsIzzcgeJgrYelT/gM4o15IWsVJSsKhiCb/27lO2n897VNobTqI1O2nXmtr16F6orB4T4N5QtnEKZlCoCZynzQ==", - "dev": true, - "requires": { - "archiver": "2.0.3", - "basic-auth": "1.1.0", - "body-parser": "1.18.2", - "chalk": "2.1.0", - "chokidar": "1.7.0", - "ci-info": "1.1.1", - "cross-spawn": "5.1.0", - "dargs": "5.1.0", - "diff": "3.4.0", - "elementtree": "0.1.7", - "express": "4.16.2", - "inquirer": "3.3.0", - "leek": "0.0.24", - "lodash": "4.17.4", - "minimist": "1.2.0", - "ncp": "2.0.0", - "opn": "5.1.0", - "proxy-middleware": "0.15.0", - "semver": "5.4.1", - "slice-ansi": "1.0.0", - "ssh-config": "1.1.3", - "string-width": "2.1.1", - "strip-ansi": "4.0.0", - "superagent": "3.6.3", - "tar": "2.2.1", - "tiny-lr": "1.0.5", - "tslib": "1.8.0", - "uuid": "3.1.0", - "wrap-ansi": "3.0.1", - "ws": "3.2.0" - } - }, - "ansi-regex": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz", - "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=", - "dev": true - }, - "cross-spawn": { - "version": "5.1.0", - "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-5.1.0.tgz", - "integrity": "sha1-6L0O/uWPz/b4+UUQoKVUu/ojVEk=", - "dev": true, - "requires": { - "lru-cache": "4.1.1", - "shebang-command": "1.2.0", - "which": "1.3.0" - } - }, - "debug": { - "version": "2.6.9", - "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", - "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", - "dev": true, - "requires": { - "ms": "2.0.0" - } - }, - "is-fullwidth-code-point": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz", - "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=", - "dev": true - }, - "string-width": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz", - "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==", - "dev": true, - "requires": { - "is-fullwidth-code-point": "2.0.0", - "strip-ansi": "4.0.0" - } - }, - "strip-ansi": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz", - "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=", - "dev": true, - "requires": { - "ansi-regex": "3.0.0" - } - }, - "tiny-lr": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/tiny-lr/-/tiny-lr-1.0.5.tgz", - "integrity": "sha512-YrxUSiMgOVh3PnAqtdAUQuUVEVRnqcRCxJ3BHrl/aaWV2fplKKB60oClM0GH2Gio2hcXvkxMUxsC/vXZrQePlg==", - "dev": true, - "requires": { - "body": "5.1.0", - "debug": "2.6.9", - "faye-websocket": "0.10.0", - "livereload-js": "2.2.2", - "object-assign": "4.1.1", - "qs": "6.5.1" - } - }, - "ultron": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/ultron/-/ultron-1.1.0.tgz", - "integrity": "sha1-sHoualQagV/Go0zNRTO67DB8qGQ=", - "dev": true - }, - "wrap-ansi": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-3.0.1.tgz", - "integrity": "sha1-KIoE2H7aXChuBg3+jxNc6NAH+Lo=", - "dev": true, - "requires": { - "string-width": "2.1.1", - "strip-ansi": "4.0.0" - } - }, - "ws": { - "version": "3.2.0", - "resolved": "https://registry.npmjs.org/ws/-/ws-3.2.0.tgz", - "integrity": "sha512-hTS3mkXm/j85jTQOIcwVz3yK3up9xHgPtgEhDBOH3G18LDOZmSAG1omJeXejLKJakx+okv8vS1sopgs7rw0kVw==", - "dev": true, - "requires": { - "async-limiter": "1.0.0", - "safe-buffer": "5.1.1", - "ultron": "1.1.0" - } - } } }, "ionic-angular": { @@ -20470,8 +20517,7 @@ "path-parse": { "version": "1.0.5", "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.5.tgz", - "integrity": "sha1-PBrfhx6pzWyUMbbqK9dKD/BVxME=", - "dev": true + "integrity": "sha1-PBrfhx6pzWyUMbbqK9dKD/BVxME=" }, "path-to-regexp": { "version": "1.7.0", @@ -23126,6 +23172,14 @@ } } }, + "rechoir": { + "version": "0.6.2", + "resolved": "https://registry.npmjs.org/rechoir/-/rechoir-0.6.2.tgz", + "integrity": "sha1-hSBLVNuoLVdC4oyWdW70OvUOM4Q=", + "requires": { + "resolve": "1.4.0" + } + }, "redent": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/redent/-/redent-1.0.0.tgz", @@ -23416,7 +23470,6 @@ "version": "1.4.0", "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.4.0.tgz", "integrity": "sha512-aW7sVKPufyHqOmyyLzg/J+8606v5nevBgaliIlV7nUpVMsDnoBGV/cbSLNjZAg9q0Cfd/+easKVKQ8vOu8fn1Q==", - "dev": true, "requires": { "path-parse": "1.0.5" } @@ -24011,6 +24064,31 @@ "integrity": "sha1-2kL0l0DAtC2yypcoVxyxkMmO/qM=", "dev": true }, + "shelljs": { + "version": "0.7.8", + "resolved": "https://registry.npmjs.org/shelljs/-/shelljs-0.7.8.tgz", + "integrity": "sha1-3svPh0sNHl+3LhSxZKloMEjprLM=", + "requires": { + "glob": "7.1.2", + "interpret": "1.0.4", + "rechoir": "0.6.2" + }, + "dependencies": { + "glob": { + "version": "7.1.2", + "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.2.tgz", + "integrity": "sha512-MJTUg1kjuLeQCJ+ccE4Vpa6kKVXkPYJ2mOCQyUuKLcLQsdrMCpBPUi8qVE6+YuaJkozeA9NusTAw3hLr8Xe5EQ==", + "requires": { + "fs.realpath": "1.0.0", + "inflight": "1.0.6", + "inherits": "2.0.3", + "minimatch": "3.0.4", + "once": "1.4.0", + "path-is-absolute": "1.0.1" + } + } + } + }, "signal-exit": { "version": "3.0.2", "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.2.tgz", @@ -25044,6 +25122,11 @@ "integrity": "sha1-wxdI5V0hDv/AD9zcfW5o19e7nOw=", "dev": true }, + "tostr": { + "version": "0.1.0", + "resolved": "https://registry.npmjs.org/tostr/-/tostr-0.1.0.tgz", + "integrity": "sha1-cjm6H6gHyBAMlTLNIxvwQat3lik=" + }, "tough-cookie": { "version": "2.3.3", "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.3.3.tgz", @@ -25757,12 +25840,6 @@ "matcher-collection": "1.0.5" } }, - "walkdir": { - "version": "0.0.11", - "resolved": "https://registry.npmjs.org/walkdir/-/walkdir-0.0.11.tgz", - "integrity": "sha1-oW0CXrkxvQO1LzCMrtD0D86+lTI=", - "dev": true - }, "watchpack": { "version": "1.4.0", "resolved": "https://registry.npmjs.org/watchpack/-/watchpack-1.4.0.tgz", @@ -26236,6 +26313,85 @@ "integrity": "sha1-OS2LotDxw00e4tYw8V0O+2jhBIo=", "dev": true }, + "xcode": { + "version": "0.8.9", + "resolved": "https://registry.npmjs.org/xcode/-/xcode-0.8.9.tgz", + "integrity": "sha1-7Gdl9w6dzMzJ9umlubTn6BS0zzU=", + "requires": { + "node-uuid": "1.4.7", + "pegjs": "0.9.0", + "simple-plist": "0.1.4" + }, + "dependencies": { + "base64-js": { + "version": "0.0.8", + "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-0.0.8.tgz", + "integrity": "sha1-EQHpVE9KdrG8OybUUsqW16NeeXg=" + }, + "bplist-creator": { + "version": "0.0.4", + "resolved": "https://registry.npmjs.org/bplist-creator/-/bplist-creator-0.0.4.tgz", + "integrity": "sha1-SsBJZ4LhJ6hcHSAmpPXrIqev+ZE=", + "requires": { + "stream-buffers": "0.2.6" + } + }, + "bplist-parser": { + "version": "0.0.6", + "resolved": "https://registry.npmjs.org/bplist-parser/-/bplist-parser-0.0.6.tgz", + "integrity": "sha1-ONo0cYF9+dRKs4kuJ3B7u9daEbk=" + }, + "lodash": { + "version": "3.10.1", + "resolved": "https://registry.npmjs.org/lodash/-/lodash-3.10.1.tgz", + "integrity": "sha1-W/Rejkm6QYnhfUgnid/RW9FAt7Y=" + }, + "node-uuid": { + "version": "1.4.7", + "resolved": "https://registry.npmjs.org/node-uuid/-/node-uuid-1.4.7.tgz", + "integrity": "sha1-baWhdmjEs91ZYjvaEc9/pMH2Cm8=" + }, + "pegjs": { + "version": "0.9.0", + "resolved": "https://registry.npmjs.org/pegjs/-/pegjs-0.9.0.tgz", + "integrity": "sha1-9q76LjzlYWkgjlIXnf5B+JFBo2k=" + }, + "plist": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/plist/-/plist-1.2.0.tgz", + "integrity": "sha1-CEtQk93JJQbiWfh0uNmxr7jHlZM=", + "requires": { + "base64-js": "0.0.8", + "util-deprecate": "1.0.2", + "xmlbuilder": "4.0.0", + "xmldom": "0.1.27" + } + }, + "simple-plist": { + "version": "0.1.4", + "resolved": "https://registry.npmjs.org/simple-plist/-/simple-plist-0.1.4.tgz", + "integrity": "sha1-EOtRtH4zxVbrjsRtXuZNZOcX210=", + "requires": { + "bplist-creator": "0.0.4", + "bplist-parser": "0.0.6", + "plist": "1.2.0" + } + }, + "stream-buffers": { + "version": "0.2.6", + "resolved": "https://registry.npmjs.org/stream-buffers/-/stream-buffers-0.2.6.tgz", + "integrity": "sha1-GBwI1bs2kARfaUAbmuanoM8zE/w=" + }, + "xmlbuilder": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/xmlbuilder/-/xmlbuilder-4.0.0.tgz", + "integrity": "sha1-mLj2UcowqmJANvEn0RzGbce5B6M=", + "requires": { + "lodash": "3.10.1" + } + } + } + }, "xdg-basedir": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/xdg-basedir/-/xdg-basedir-1.0.1.tgz", diff --git a/package.json b/package.json index 7fadf531f..336234f86 100644 --- a/package.json +++ b/package.json @@ -81,13 +81,16 @@ "buffer-compare": "1.1.1", "cordova-android": "6.2.3", "cordova-clipboard": "^1.1.0", + "cordova-custom-config": "^4.0.2", "cordova-ios": "4.5.2", "cordova-ios-requires-fullscreen": "0.0.2", "cordova-plugin-android-fingerprint-auth": "^1.4.0", "cordova-plugin-compat": "^1.2.0", "cordova-plugin-console": "^1.1.0", + "cordova-plugin-customurlscheme": "git+https://github.com/cmgustavo/Custom-URL-scheme.git", "cordova-plugin-device": "^1.1.6", "cordova-plugin-dialogs": "^1.3.3", + "cordova-plugin-fcm": "git+https://github.com/cmgustavo/cordova-plugin-fcm.git", "cordova-plugin-file": "^4.3.3", "cordova-plugin-ionic-webview": "^1.1.15", "cordova-plugin-network-information": "^1.3.3", @@ -101,7 +104,7 @@ "cordova-plugin-transport-security": "^0.1.2", "cordova-plugin-uniquedeviceid": "^1.3.2", "cordova-plugin-whitelist": "^1.3.2", - "cordova-plugin-x-socialsharing": "^5.2.0", + "cordova-plugin-x-socialsharing": "^5.2.1", "cordova-plugin-x-toast": "^2.6.0", "cordova-sqlite-storage": "^2.0.4", "es6-promise-plugin": "^4.1.0", @@ -172,7 +175,14 @@ "cordova-plugin-transport-security": {}, "cordova-ios-requires-fullscreen": {}, "cordova-plugin-screen-orientation": {}, - "cordova-plugin-ionic-webview": {} + "cordova-plugin-ionic-webview": {}, + "cordova-custom-config": {}, + "cordova-plugin-customurlscheme": { + "URL_SCHEME": "bitcoin", + "SECOND_URL_SCHEME": "copay", + "THIRD_URL_SCHEME": "bitcoincash" + }, + "cordova-plugin-fcm": {} }, "platforms": [ "android", diff --git a/src/providers/language/language.ts b/src/providers/language/language.ts index 2e3f0a1c5..0de594efb 100644 --- a/src/providers/language/language.ts +++ b/src/providers/language/language.ts @@ -46,13 +46,13 @@ export class LanguageProvider { private current: string; constructor( - private logger: Logger, + private log: Logger, private translate: TranslateService, private config: ConfigProvider ) { - this.logger.info('LanguageProvider initialized.'); + this.log.info('LanguageProvider initialized.'); this.translate.onLangChange.subscribe((event) => { - this.logger.info('Settings language changed to: ' + event.lang); + this.log.info('Setting new default language to: ' + event.lang); }); } @@ -66,6 +66,7 @@ export class LanguageProvider { if (validBrowserLang) this.current = browserLang; else this.current = this.getDefault(); } + this.log.info('Default language: ' + this.current); this.translate.setDefaultLang(this.current); } diff --git a/src/providers/persistence/persistence.ts b/src/providers/persistence/persistence.ts index 2368367ce..16dae0684 100644 --- a/src/providers/persistence/persistence.ts +++ b/src/providers/persistence/persistence.ts @@ -1,6 +1,7 @@ import { Injectable } from '@angular/core'; import { Inject } from '@angular/core'; import { Logger } from '@nsalaun/ng-logger'; +import { File } from '@ionic-native/file'; import * as _ from 'lodash'; import { IStorage, ISTORAGE } from './storage/istorage'; @@ -38,26 +39,24 @@ const Keys = { TX_HISTORY: walletId => 'txsHistory-' + walletId, }; -export let persistenceProviderFactory = (platform: PlatformProvider, log: Logger) => { - // TODO: select appropriate storage service based on platform +export let persistenceProviderFactory = (platform: PlatformProvider, log: Logger, file: File) => { let storage; - /* - if (this.platform.isChromeApp) { - storage = new ChromeStorage(log); - } else if (this.platform.isCordova) { - storage = new FileStorage(log); + if (platform.isCordova) { + log.info('Persistence mode: FileStorage.'); + storage = new FileStorage(this.log, this.platform.platform, this.file); } else { + log.info('Persistence mode: LocalStorage.'); storage = new LocalStorage(log); } - */ // Testing in RAM - storage = new LocalStorage(log); + // storage = new RamStorage(log); return new PersistenceProvider(storage, log); }; @Injectable() export class PersistenceProvider { constructor( @Inject(ISTORAGE) public storage: IStorage, private log: Logger) { + this.log.info('PersistenceProvider initialized.'); }; storeNewProfile(profile): Promise { diff --git a/src/providers/platform/platform.ts b/src/providers/platform/platform.ts index 6d76cc73f..e4bcb7724 100644 --- a/src/providers/platform/platform.ts +++ b/src/providers/platform/platform.ts @@ -15,7 +15,6 @@ export class PlatformProvider { isDevel: boolean; constructor(private platform: Platform, private log: Logger) { - let chrome: any; var ua = navigator ? navigator.userAgent : null; if (!ua) { @@ -34,6 +33,8 @@ export class PlatformProvider { this.isNW = this.isNodeWebkit(); this.isMobile = platform.is('mobile'); this.isDevel = !this.isMobile && !this.isNW; + + this.log.info('PlatformProvider initialized.'); } getBrowserName(): string { From 21d7647f0a4e3f5ef57c0a8ea7809976fda4b285 Mon Sep 17 00:00:00 2001 From: Gustavo Maximiliano Cortez Date: Fri, 20 Oct 2017 13:58:55 -0300 Subject: [PATCH 2/3] Updates package. Fix onboarding --- package-lock.json | 148 +++++++++++++++------------ package.json | 46 ++++----- src/pages/onboarding/onboarding.html | 2 +- src/pages/onboarding/onboarding.scss | 7 +- src/pages/onboarding/onboarding.ts | 9 +- src/pages/onboarding/tour/tour.html | 44 ++++---- src/pages/onboarding/tour/tour.scss | 19 ---- src/pages/onboarding/tour/tour.ts | 19 ++-- src/pages/tabs/tabs.html | 2 +- 9 files changed, 148 insertions(+), 148 deletions(-) diff --git a/package-lock.json b/package-lock.json index 8c2b0a2eb..b443399f2 100644 --- a/package-lock.json +++ b/package-lock.json @@ -65,7 +65,7 @@ "raw-loader": "0.5.1", "resolve": "1.4.0", "rsvp": "3.6.2", - "rxjs": "5.4.3", + "rxjs": "5.5.0", "sass-loader": "6.0.6", "script-loader": "0.7.2", "semver": "5.4.1", @@ -99,7 +99,7 @@ "dev": true, "requires": { "browserslist": "1.7.7", - "caniuse-db": "1.0.30000746", + "caniuse-db": "1.0.30000748", "normalize-range": "0.1.2", "num2fraction": "1.2.2", "postcss": "5.2.18", @@ -112,7 +112,7 @@ "integrity": "sha1-C9dnBCWL6CmyOYu1Dkti0aFmsLk=", "dev": true, "requires": { - "caniuse-db": "1.0.30000746", + "caniuse-db": "1.0.30000748", "electron-to-chromium": "1.3.25" } }, @@ -172,9 +172,9 @@ } }, "rxjs": { - "version": "5.4.3", - "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-5.4.3.tgz", - "integrity": "sha512-fSNi+y+P9ss+EZuV0GcIIqPUK07DEaMRUtLJvdcvMyFjc9dizuDjere+A4V7JrLGnm9iCc+nagV/4QdMTkqC4A==", + "version": "5.5.0", + "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-5.5.0.tgz", + "integrity": "sha512-vmvP5y/oJIJmXKHY36PIjVeI/46Sny6BMBa7/ou2zsNz1PiqU/Gtcz1GujnHz5Qlxncv+J9VlWmttnshqFj3Kg==", "dev": true, "requires": { "symbol-observable": "1.0.4" @@ -188,64 +188,79 @@ "requires": { "has-flag": "1.0.0" } - }, - "zone.js": { - "version": "0.8.18", - "resolved": "https://registry.npmjs.org/zone.js/-/zone.js-0.8.18.tgz", - "integrity": "sha512-knKOBQM0oea3/x9pdyDuDi7RhxDlJhOIkeixXSiTKWLgs4LpK37iBc+1HaHwzlciHUKT172CymJFKo8Xgh+44Q==", - "dev": true } } }, "@angular/common": { - "version": "4.1.3", - "resolved": "https://registry.npmjs.org/@angular/common/-/common-4.1.3.tgz", - "integrity": "sha1-58R5HjITHPdMI5QowqZ9qrLu8Bc=" + "version": "4.4.3", + "resolved": "https://registry.npmjs.org/@angular/common/-/common-4.4.3.tgz", + "integrity": "sha1-+SrGiwK+xfDm02A6hDKU3JbJYHQ=", + "requires": { + "tslib": "1.8.0" + } }, "@angular/compiler": { - "version": "4.1.3", - "resolved": "https://registry.npmjs.org/@angular/compiler/-/compiler-4.1.3.tgz", - "integrity": "sha1-0t0whTsM9KVHWLSjFGMsIx+clMM=" + "version": "4.4.3", + "resolved": "https://registry.npmjs.org/@angular/compiler/-/compiler-4.4.3.tgz", + "integrity": "sha1-jwEWPa19s0CEl9mdOHVUtrGFrWY=", + "requires": { + "tslib": "1.8.0" + } }, "@angular/compiler-cli": { - "version": "4.1.3", - "resolved": "https://registry.npmjs.org/@angular/compiler-cli/-/compiler-cli-4.1.3.tgz", - "integrity": "sha1-wjYv/fZXVkcUgfg5+rZ1vKwhP5Y=", + "version": "4.4.3", + "resolved": "https://registry.npmjs.org/@angular/compiler-cli/-/compiler-cli-4.4.3.tgz", + "integrity": "sha1-GDr4HxQRhrjWYLBkKVktQLdUCko=", "requires": { - "@angular/tsc-wrapped": "4.1.3", + "@angular/tsc-wrapped": "4.4.3", "minimist": "1.2.0", "reflect-metadata": "0.1.10" } }, "@angular/core": { - "version": "4.1.3", - "resolved": "https://registry.npmjs.org/@angular/core/-/core-4.1.3.tgz", - "integrity": "sha1-KFSY64arfQtvmC+Pn0h+9hABOzU=" + "version": "4.4.3", + "resolved": "https://registry.npmjs.org/@angular/core/-/core-4.4.3.tgz", + "integrity": "sha1-5x0rB76qy6tIq39R1OIobqXXDhU=", + "requires": { + "tslib": "1.8.0" + } }, "@angular/forms": { - "version": "4.1.3", - "resolved": "https://registry.npmjs.org/@angular/forms/-/forms-4.1.3.tgz", - "integrity": "sha1-OAq0w6+ExdHXSMKn0EFRx9yOSYI=" + "version": "4.4.3", + "resolved": "https://registry.npmjs.org/@angular/forms/-/forms-4.4.3.tgz", + "integrity": "sha1-JbQburWL8dqHJBHIUXwQ18U3PY4=", + "requires": { + "tslib": "1.8.0" + } }, "@angular/http": { - "version": "4.1.3", - "resolved": "https://registry.npmjs.org/@angular/http/-/http-4.1.3.tgz", - "integrity": "sha1-650cMCoBcoFfmlczENm+C964Ra4=" + "version": "4.4.3", + "resolved": "https://registry.npmjs.org/@angular/http/-/http-4.4.3.tgz", + "integrity": "sha1-tVftJBRKrMRLE2zUd+hNL1eAiQM=", + "requires": { + "tslib": "1.8.0" + } }, "@angular/platform-browser": { - "version": "4.1.3", - "resolved": "https://registry.npmjs.org/@angular/platform-browser/-/platform-browser-4.1.3.tgz", - "integrity": "sha1-T6HbURndF4sxXdrlsym+4akypb0=" + "version": "4.4.3", + "resolved": "https://registry.npmjs.org/@angular/platform-browser/-/platform-browser-4.4.3.tgz", + "integrity": "sha1-I/mkW9Pcf0TZeHf7+OYDLez8ncs=", + "requires": { + "tslib": "1.8.0" + } }, "@angular/platform-browser-dynamic": { - "version": "4.1.3", - "resolved": "https://registry.npmjs.org/@angular/platform-browser-dynamic/-/platform-browser-dynamic-4.1.3.tgz", - "integrity": "sha1-PBP9z1kdSH9u/cHUaRPygMbYwuw=" + "version": "4.4.3", + "resolved": "https://registry.npmjs.org/@angular/platform-browser-dynamic/-/platform-browser-dynamic-4.4.3.tgz", + "integrity": "sha1-5B3dglJDJ3UxDqtZQM3Y3wYY8IQ=", + "requires": { + "tslib": "1.8.0" + } }, "@angular/tsc-wrapped": { - "version": "4.1.3", - "resolved": "https://registry.npmjs.org/@angular/tsc-wrapped/-/tsc-wrapped-4.1.3.tgz", - "integrity": "sha1-LWNyyRh78WIerNlguUs5xPlSk80=", + "version": "4.4.3", + "resolved": "https://registry.npmjs.org/@angular/tsc-wrapped/-/tsc-wrapped-4.4.3.tgz", + "integrity": "sha1-LT84IQodTbA/yG3PHglYErhc0Rk=", "requires": { "tsickle": "0.21.6" } @@ -12249,7 +12264,7 @@ "dev": true, "requires": { "browserslist": "1.7.7", - "caniuse-db": "1.0.30000746", + "caniuse-db": "1.0.30000748", "lodash.memoize": "4.1.2", "lodash.uniq": "4.5.0" }, @@ -12260,16 +12275,16 @@ "integrity": "sha1-C9dnBCWL6CmyOYu1Dkti0aFmsLk=", "dev": true, "requires": { - "caniuse-db": "1.0.30000746", + "caniuse-db": "1.0.30000748", "electron-to-chromium": "1.3.25" } } } }, "caniuse-db": { - "version": "1.0.30000746", - "resolved": "https://registry.npmjs.org/caniuse-db/-/caniuse-db-1.0.30000746.tgz", - "integrity": "sha1-UBCYxm9fu/Y0wC8lUIsF6ICZEPQ=", + "version": "1.0.30000748", + "resolved": "https://registry.npmjs.org/caniuse-db/-/caniuse-db-1.0.30000748.tgz", + "integrity": "sha1-eF2e381kW/eVxv887TPEXVgMSKA=", "dev": true }, "caniuse-lite": { @@ -12546,7 +12561,7 @@ "integrity": "sha1-qe8VNmDWqGqL3sAomlxoTSF0Mv0=", "dev": true, "requires": { - "q": "1.5.0" + "q": "1.5.1" } }, "code-point-at": { @@ -13041,9 +13056,9 @@ } }, "connect-history-api-fallback": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/connect-history-api-fallback/-/connect-history-api-fallback-1.3.0.tgz", - "integrity": "sha1-5R0X+PDvDbkKZP20feMFFVbp8Wk=", + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/connect-history-api-fallback/-/connect-history-api-fallback-1.4.0.tgz", + "integrity": "sha1-PbJPlz9LkjsOgvYZzg3wJBHKYj0=", "dev": true }, "console-browserify": { @@ -14232,7 +14247,7 @@ "dev": true, "requires": { "browserslist": "1.7.7", - "caniuse-db": "1.0.30000746", + "caniuse-db": "1.0.30000748", "normalize-range": "0.1.2", "num2fraction": "1.2.2", "postcss": "5.2.18", @@ -14245,7 +14260,7 @@ "integrity": "sha1-C9dnBCWL6CmyOYu1Dkti0aFmsLk=", "dev": true, "requires": { - "caniuse-db": "1.0.30000746", + "caniuse-db": "1.0.30000748", "electron-to-chromium": "1.3.25" } }, @@ -17769,9 +17784,9 @@ } }, "ionic-angular": { - "version": "3.6.0", - "resolved": "https://registry.npmjs.org/ionic-angular/-/ionic-angular-3.6.0.tgz", - "integrity": "sha512-V6NNax+X8CihwCerb+IlSTKe+GOfLyp/AYtD7zYkGqu1euL++LxepCCUo5Cn1UWn4aif+rUr0/JC2TQ0iwduOw==" + "version": "3.7.1", + "resolved": "https://registry.npmjs.org/ionic-angular/-/ionic-angular-3.7.1.tgz", + "integrity": "sha512-FNRf+rR+R9aoS5BZfd5uO0ffjuJDi00WCM3rsXGsu0m26IVYHWDW3qvVpGkyljirowqRuGp01u3CSgkPSq5VBg==" }, "ionic-plugin-keyboard": { "version": "2.2.1", @@ -21699,7 +21714,7 @@ "integrity": "sha1-C9dnBCWL6CmyOYu1Dkti0aFmsLk=", "dev": true, "requires": { - "caniuse-db": "1.0.30000746", + "caniuse-db": "1.0.30000748", "electron-to-chromium": "1.3.25" } }, @@ -22893,9 +22908,9 @@ "dev": true }, "q": { - "version": "1.5.0", - "resolved": "https://registry.npmjs.org/q/-/q-1.5.0.tgz", - "integrity": "sha1-3QG6ydBtMObyGa7LglPunr3DCPE=", + "version": "1.5.1", + "resolved": "https://registry.npmjs.org/q/-/q-1.5.1.tgz", + "integrity": "sha1-fjL3W0E4EpHQRhHxvxQQmsAGUdc=", "dev": true }, "qjobs": { @@ -23727,9 +23742,9 @@ } }, "rxjs": { - "version": "5.4.0", - "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-5.4.0.tgz", - "integrity": "sha1-p9sUqxV/nXqsalbmVeejhg05vyY=", + "version": "5.4.3", + "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-5.4.3.tgz", + "integrity": "sha512-fSNi+y+P9ss+EZuV0GcIIqPUK07DEaMRUtLJvdcvMyFjc9dizuDjere+A4V7JrLGnm9iCc+nagV/4QdMTkqC4A==", "requires": { "symbol-observable": "1.0.4" } @@ -25277,8 +25292,7 @@ "tslib": { "version": "1.8.0", "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.8.0.tgz", - "integrity": "sha512-ymKWWZJST0/CkgduC2qkzjMOWr4bouhuURNXCn/inEX0L57BnRG6FhX76o7FOnsjHazCjfU2LKeSrlS2sIKQJg==", - "dev": true + "integrity": "sha512-ymKWWZJST0/CkgduC2qkzjMOWr4bouhuURNXCn/inEX0L57BnRG6FhX76o7FOnsjHazCjfU2LKeSrlS2sIKQJg==" }, "tslint": { "version": "5.5.0", @@ -26082,7 +26096,7 @@ "bonjour": "3.5.0", "chokidar": "1.7.0", "compression": "1.7.1", - "connect-history-api-fallback": "1.3.0", + "connect-history-api-fallback": "1.4.0", "del": "3.0.0", "express": "4.16.2", "html-entities": "1.2.1", @@ -26581,9 +26595,9 @@ } }, "zone.js": { - "version": "0.8.12", - "resolved": "https://registry.npmjs.org/zone.js/-/zone.js-0.8.12.tgz", - "integrity": "sha1-hv9QU8mK7CkaC/S7rFAdaUoFz7s=" + "version": "0.8.18", + "resolved": "https://registry.npmjs.org/zone.js/-/zone.js-0.8.18.tgz", + "integrity": "sha512-knKOBQM0oea3/x9pdyDuDi7RhxDlJhOIkeixXSiTKWLgs4LpK37iBc+1HaHwzlciHUKT172CymJFKo8Xgh+44Q==" } } } diff --git a/package.json b/package.json index 336234f86..d8cf543d1 100644 --- a/package.json +++ b/package.json @@ -49,27 +49,27 @@ "apply:bitpay": "npm i && cd app-template && node apply.js bitpay && npm run build" }, "dependencies": { - "@angular/common": "4.1.3", - "@angular/compiler": "4.1.3", - "@angular/compiler-cli": "4.1.3", - "@angular/core": "4.1.3", - "@angular/forms": "4.1.3", - "@angular/http": "4.1.3", - "@angular/platform-browser": "4.1.3", - "@angular/platform-browser-dynamic": "4.1.3", - "@angular/tsc-wrapped": "4.1.3", + "@angular/common": "4.4.3", + "@angular/compiler": "4.4.3", + "@angular/compiler-cli": "4.4.3", + "@angular/core": "4.4.3", + "@angular/forms": "4.4.3", + "@angular/http": "4.4.3", + "@angular/platform-browser": "4.4.3", + "@angular/platform-browser-dynamic": "4.4.3", + "@angular/tsc-wrapped": "4.4.3", "@biesbjerg/ngx-translate-po-http-loader": "1.0.1", - "@ionic-native/android-fingerprint-auth": "4.2.1", - "@ionic-native/clipboard": "4.1.0", - "@ionic-native/core": "3.12.1", - "@ionic-native/file": "4.1.0", - "@ionic-native/qr-scanner": "4.1.0", - "@ionic-native/social-sharing": "4.1.0", - "@ionic-native/splash-screen": "3.12.1", - "@ionic-native/status-bar": "3.12.1", - "@ionic-native/toast": "4.1.0", - "@ionic-native/touch-id": "4.2.1", - "@ionic/storage": "2.0.1", + "@ionic-native/android-fingerprint-auth": "^4.2.1", + "@ionic-native/clipboard": "^4.1.0", + "@ionic-native/core": "^3.12.1", + "@ionic-native/file": "^4.1.0", + "@ionic-native/qr-scanner": "^4.1.0", + "@ionic-native/social-sharing": "^4.1.0", + "@ionic-native/splash-screen": "^3.12.1", + "@ionic-native/status-bar": "^3.12.1", + "@ionic-native/toast": "^4.1.0", + "@ionic-native/touch-id": "^4.2.1", + "@ionic/storage": "^2.0.1", "@ngx-translate/core": "6.0.1", "@nsalaun/ng-logger": "2.0.1", "ajv": "5.2.2", @@ -108,15 +108,15 @@ "cordova-plugin-x-toast": "^2.6.0", "cordova-sqlite-storage": "^2.0.4", "es6-promise-plugin": "^4.1.0", - "ionic-angular": "3.6.0", + "ionic-angular": "3.7.1", "ionic-plugin-keyboard": "^2.2.1", "ionicons": "3.0.0", "lodash": "4.17.4", "ngx-clipboard": "8.0.3", - "rxjs": "5.4.0", + "rxjs": "5.4.3", "simple-plist": "0.2.1", "sw-toolbox": "3.6.0", - "zone.js": "0.8.12" + "zone.js": "0.8.18" }, "devDependencies": { "@angular/cli": "1.3.0", diff --git a/src/pages/onboarding/onboarding.html b/src/pages/onboarding/onboarding.html index 496ad94de..31ecc988a 100644 --- a/src/pages/onboarding/onboarding.html +++ b/src/pages/onboarding/onboarding.html @@ -1,7 +1,7 @@
- +

Take control of your money,
get started with bitcoin.

diff --git a/src/pages/onboarding/onboarding.scss b/src/pages/onboarding/onboarding.scss index 418057050..5397e8be9 100644 --- a/src/pages/onboarding/onboarding.scss +++ b/src/pages/onboarding/onboarding.scss @@ -1,16 +1,13 @@ page-onboarding { .logo-tagline { - + text-align: center; img { - width: 50%; max-width: 200px; - margin: 5rem auto 0; + margin: 5rem 0; } - p { line-height: 1.6; font-size: 18px; - text-align: center; } } diff --git a/src/pages/onboarding/onboarding.ts b/src/pages/onboarding/onboarding.ts index 399288a03..cbba54fbd 100644 --- a/src/pages/onboarding/onboarding.ts +++ b/src/pages/onboarding/onboarding.ts @@ -1,5 +1,6 @@ import { Component } from '@angular/core'; -import { NavController, NavParams } from 'ionic-angular'; +import { NavController } from 'ionic-angular'; +import { Logger } from '@nsalaun/ng-logger'; import { TourPage } from './tour/tour'; import { TabsPage } from '../tabs/tabs'; @@ -12,12 +13,12 @@ export class OnboardingPage { constructor( public navCtrl: NavController, - public navParams: NavParams + private log: Logger ) { } ionViewDidLoad() { - console.log('ionViewDidLoad OnboardingPage'); + this.log.info('ionViewDidLoad OnboardingPage'); } getStarted() { @@ -28,8 +29,8 @@ export class OnboardingPage { // TODO navigate to backupFlow } - // TODO: Testing purpose skipOnboarding() { + // TODO: Testing purpose this.navCtrl.setRoot(TabsPage); this.navCtrl.popToRoot(); } diff --git a/src/pages/onboarding/tour/tour.html b/src/pages/onboarding/tour/tour.html index 58b556875..e4e64e4ec 100644 --- a/src/pages/onboarding/tour/tour.html +++ b/src/pages/onboarding/tour/tour.html @@ -1,8 +1,8 @@ - + - @@ -10,44 +10,44 @@ - - + +
-

Bitcoin is secure,
digital money.

-

You can spend bitcoin at millions of websites and stores worldwide.

-
-
- +

Bitcoin is secure,
digital money.

+

You can spend bitcoin at millions of websites and stores worldwide.

+
-
Just scan the code to pay.
- +
Just scan the code to pay.
+
-
Bitcoin is a currency.
-
You can trade it for other currencies like US Dollars, Euros, or Pounds.
+
+

Bitcoin is a currency.

+

You can trade it for other currencies like US Dollars, Euros, or Pounds.

+
-
1 BTC = 2000 USD
+

1 BTC = 6000 USD

-
The exchange rate changes with the market.
-
-
You control your bitcoin.
-
This app stores your bitcoin with cutting-edge security.
+
+

You control your bitcoin.

+

This app stores your bitcoin with cutting-edge security.

+
-
Not even BitPay can access it.
-
diff --git a/src/pages/onboarding/tour/tour.scss b/src/pages/onboarding/tour/tour.scss index 54fa8ccc0..1926b5bf3 100644 --- a/src/pages/onboarding/tour/tour.scss +++ b/src/pages/onboarding/tour/tour.scss @@ -1,11 +1,5 @@ page-tour { - position: relative; - - .pages { - position: absolute; - } .buttons { - padding: 15px; width: 100%; position: absolute; bottom: 0px; @@ -13,18 +7,5 @@ page-tour { } .slide-zoom { height: inherit; - img { - padding-top: 10%; - width: 65%; - } - } - - .navbarc { - .bar-button { - color: $v-accent-color; - } - } - .header-md::after { - background: none; } } diff --git a/src/pages/onboarding/tour/tour.ts b/src/pages/onboarding/tour/tour.ts index 44c718034..7d5acdd31 100644 --- a/src/pages/onboarding/tour/tour.ts +++ b/src/pages/onboarding/tour/tour.ts @@ -1,5 +1,6 @@ import { Component, ViewChild } from '@angular/core'; -import { NavController, NavParams, LoadingController, Slides, Navbar } from 'ionic-angular'; +import { NavController, LoadingController, Slides, Navbar } from 'ionic-angular'; +import { Logger } from '@nsalaun/ng-logger'; import { EmailPage } from '../email/email'; @@ -11,21 +12,29 @@ export class TourPage { @ViewChild(Slides) slides: Slides; @ViewChild(Navbar) navBar: Navbar; - public currentIndex: number; + public currentIndex: number = 0; - constructor(public navCtrl: NavController, public navParams: NavParams, public loadingCtrl: LoadingController) { + constructor( + public navCtrl: NavController, + public loadingCtrl: LoadingController, + private log: Logger + ) { } ionViewDidLoad() { + this.log.info('ionViewDidLoad TourPage'); } ngOnInit() { - this.currentIndex = this.slides.getActiveIndex() || 0; this.navBar.backButtonClick = (e: UIEvent) => { this.slidePrev(); } } + slideChanged() { + this.currentIndex = this.slides.getActiveIndex(); + } + skip() { this.navCtrl.push(EmailPage); } @@ -34,13 +43,11 @@ export class TourPage { if (this.currentIndex == 0) this.navCtrl.pop(); else { this.slides.slidePrev(); - this.currentIndex = this.slides.getActiveIndex(); } } slideNext() { this.slides.slideNext(); - this.currentIndex = this.slides.getActiveIndex(); } createDefaultWallet() { diff --git a/src/pages/tabs/tabs.html b/src/pages/tabs/tabs.html index b98891787..63d497cee 100644 --- a/src/pages/tabs/tabs.html +++ b/src/pages/tabs/tabs.html @@ -1,7 +1,7 @@ - + From 7455440abf1f7f1971580f71a95e5c15dadcaee8 Mon Sep 17 00:00:00 2001 From: Gustavo Maximiliano Cortez Date: Fri, 20 Oct 2017 16:12:03 -0300 Subject: [PATCH 3/3] Fix onboarding. Clear styling --- src/assets/img/tour-control.svg | 47 ---- src/assets/img/tour-currency.svg | 33 --- src/assets/img/tour-phone.svg | 39 ---- .../backup-request/backup-request.html | 14 +- .../backup-request/backup-request.scss | 73 ++---- .../backup-request/backup-request.ts | 13 +- .../onboarding/disclaimer/disclaimer.html | 54 ++--- .../onboarding/disclaimer/disclaimer.scss | 61 +---- src/pages/onboarding/disclaimer/disclaimer.ts | 8 +- src/pages/onboarding/email/email.html | 66 +++--- src/pages/onboarding/email/email.scss | 210 ++---------------- src/pages/onboarding/email/email.ts | 13 +- src/pages/onboarding/tour/tour.html | 6 +- 13 files changed, 138 insertions(+), 499 deletions(-) delete mode 100644 src/assets/img/tour-control.svg delete mode 100644 src/assets/img/tour-currency.svg delete mode 100644 src/assets/img/tour-phone.svg diff --git a/src/assets/img/tour-control.svg b/src/assets/img/tour-control.svg deleted file mode 100644 index 7a49991b1..000000000 --- a/src/assets/img/tour-control.svg +++ /dev/null @@ -1,47 +0,0 @@ - - - - tour-control - Created with Sketch. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/assets/img/tour-currency.svg b/src/assets/img/tour-currency.svg deleted file mode 100644 index 85854559f..000000000 --- a/src/assets/img/tour-currency.svg +++ /dev/null @@ -1,33 +0,0 @@ - - - - tour-currency - Created with Sketch. - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/assets/img/tour-phone.svg b/src/assets/img/tour-phone.svg deleted file mode 100644 index 9386356db..000000000 --- a/src/assets/img/tour-phone.svg +++ /dev/null @@ -1,39 +0,0 @@ - - - - onboarding-tour-phone - Created with Sketch. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/pages/onboarding/backup-request/backup-request.html b/src/pages/onboarding/backup-request/backup-request.html index 037362936..c9c0c7d3a 100644 --- a/src/pages/onboarding/backup-request/backup-request.html +++ b/src/pages/onboarding/backup-request/backup-request.html @@ -1,13 +1,13 @@ - -
- -
No backup, no bitcoin.
-
Since only you control your money, you’ll need to save your backup phrase in case this app is deleted.
+ +
+ +

No backup, no bitcoin.

+

Since only you control your money, you’ll need to save your backup phrase in case this app is deleted.

-
Your wallet is never saved to cloud storage or standard device backups.
+

Your wallet is never saved to cloud storage or standard device backups.

- +
diff --git a/src/pages/onboarding/backup-request/backup-request.scss b/src/pages/onboarding/backup-request/backup-request.scss index 6e6013fa5..a73650788 100644 --- a/src/pages/onboarding/backup-request/backup-request.scss +++ b/src/pages/onboarding/backup-request/backup-request.scss @@ -1,64 +1,17 @@ page-backup-request { - .backup-request { - #warning { - padding-top: 15%; - display: block; - flex-direction: column; - height: calc(100vh - 320px); - justify-content: center; - align-content: center; - } - #alert-icon { - margin: 20px auto 5px; - height: 10vh; - } - #arrow-down { - font-size: 4.2rem; - color: $v-accent-color; - } - #backup-tldr { - font-size: 16px; - } - #backup-description { - max-width: 500px; - margin: auto; - padding: 1rem 0.5rem 0 1rem; - @media (max-height: 480px) { - padding-top: 40px; - } - } - .buttons { - position: absolute; - bottom: 0px; - padding: 15px; - } - @media (max-height: 568px) { - #warning { - padding-top: 5%; - } - #backup-description { - font-size: 14px; - } - #backup-tldr { - font-size: 14px; - } - } - @media (max-height: 480px) { - #warning { - padding-top: 5%; - } - #backup-description { - font-size: 14px; - } - #backup-tldr { - font-size: 14px; - } - #arrow-down { - display: none; - } - } + .buttons { + text-align: center; + width: 100%; + position: absolute; + bottom: 0px; + padding: 15px 15px 4vh 15px; } - .header-md::after { - background: none; + .header { + margin: 5vh 3vh; + text-align: center; + font-size: 3vh; + img { + width: 50px; + } } } diff --git a/src/pages/onboarding/backup-request/backup-request.ts b/src/pages/onboarding/backup-request/backup-request.ts index 14aba6532..b211713bd 100644 --- a/src/pages/onboarding/backup-request/backup-request.ts +++ b/src/pages/onboarding/backup-request/backup-request.ts @@ -1,5 +1,6 @@ import { Component } from '@angular/core'; import { NavController, NavParams, AlertController} from 'ionic-angular'; +import { Logger } from '@nsalaun/ng-logger'; import { DisclaimerPage } from '../disclaimer/disclaimer'; @@ -10,7 +11,12 @@ import { DisclaimerPage } from '../disclaimer/disclaimer'; export class BackupRequestPage { private opts: any; - constructor(public navCtrl: NavController, public navParams: NavParams, public alertCtrl: AlertController) { + constructor( + public navCtrl: NavController, + public navParams: NavParams, + public alertCtrl: AlertController, + private log: Logger + ) { this.opts = { title: '', message: '', @@ -19,13 +25,14 @@ export class BackupRequestPage { } ionViewDidLoad() { + this.log.info('ionViewDidLoad BackupRequestPage'); } initBackupFlow() { // TODO navigate to backupFlow } - later(confirmed: boolean) { + doBackupLater(confirmed: boolean) { this.opts.title = !confirmed ? '¡Watch Out!' : 'Are you sure you want to skip it?'; this.opts.message = !confirmed ? 'If this device is replaced or this app is deleted, neither you nor BitPay can recover your funds without a backup.' : 'You can create a backup later from your wallet settings.'; this.opts.buttons = [{ @@ -37,7 +44,7 @@ export class BackupRequestPage { handler: () => { if (!confirmed) { setTimeout(() => { - this.later(true); + this.doBackupLater(true); }, 300); } else { this.navCtrl.push(DisclaimerPage); diff --git a/src/pages/onboarding/disclaimer/disclaimer.html b/src/pages/onboarding/disclaimer/disclaimer.html index 9a4192170..229da7540 100644 --- a/src/pages/onboarding/disclaimer/disclaimer.html +++ b/src/pages/onboarding/disclaimer/disclaimer.html @@ -1,35 +1,27 @@ - - - - - - - - - -
-
Quick review!
-
Almost done! Let's review.
-
Bitcoin is different – it cannot be safely held with a bank or web service.
-
- - I understand that my funds are held securely on this device, not by a company. - - - - I understand that if this app is moved to another device or deleted, my bitcoin can only be recovered with the backup phrase. - - -
-
-
-
- -
- - Terms of Use. + +
+
Quick review!
+
Almost done! Let's review.
+

Bitcoin is different – it cannot be safely held with a bank or web service.

+ + I understand that my funds are held securely on this device, not by a company. + + + + I understand that if this app is moved to another device or deleted, my bitcoin can only be recovered with the backup phrase. + + +
+
+ Terms of Use + + + I have read, understood, and agree to the + + + +
-
diff --git a/src/pages/onboarding/disclaimer/disclaimer.scss b/src/pages/onboarding/disclaimer/disclaimer.scss index d809d1431..0290ddb45 100644 --- a/src/pages/onboarding/disclaimer/disclaimer.scss +++ b/src/pages/onboarding/disclaimer/disclaimer.scss @@ -1,54 +1,17 @@ page-disclaimer { - .disclaimer { - .options { - padding-top: 20px; - } - .item { - background-color: transparent; - color: $v-onboarding-color; - } - .item-md.item-block .item-inner { - border-bottom: 0; - } - ion-label { - white-space: normal; - } - #agree-to-terms { - position: absolute; - bottom: 0; - width: 100%; - padding: 15px; - .item { - padding-left: 0px; - } - .terms-check { - text-align: left; - margin-bottom: 25px; - display: flex; - label { - font-size: 16px; - cursor: pointer; - } - a { - cursor: pointer; - } - .checkbox { - margin: auto; - padding: 5px; - } - .modal-text { - margin-left: 30px; - } - } + .terms { + width: 100%; + position: absolute; + bottom: 0px; + padding: 15px 15px 4vh 15px; + .link { + font-size: 2vh; + cursor: pointer; } } - - .navbarc { - .bar-button { - color: $v-accent-color; - } - } - .header-md::after { - background: none; + .content { + padding-top: 5vh; + text-align: center; + font-size: 3vh; } } diff --git a/src/pages/onboarding/disclaimer/disclaimer.ts b/src/pages/onboarding/disclaimer/disclaimer.ts index 8fa51b843..21797d2d9 100644 --- a/src/pages/onboarding/disclaimer/disclaimer.ts +++ b/src/pages/onboarding/disclaimer/disclaimer.ts @@ -1,5 +1,6 @@ import { Component } from '@angular/core'; import { NavController, NavParams} from 'ionic-angular'; +import { Logger } from '@nsalaun/ng-logger'; import { TermsOfUsePage } from '../../settings/about/terms-of-use/terms-of-use'; import { TabsPage } from '../../tabs/tabs'; @@ -12,7 +13,11 @@ export class DisclaimerPage { public accepted: any; public terms: any; - constructor(public navCtrl: NavController, public navParams: NavParams) { + constructor( + public navCtrl: NavController, + public navParams: NavParams, + private log: Logger + ) { this.accepted = { first: false, second: false, @@ -23,6 +28,7 @@ export class DisclaimerPage { } ionViewDidLoad() { + this.log.info('ionViewDidLoad DisclaimerPage'); } selectTerms() { diff --git a/src/pages/onboarding/email/email.html b/src/pages/onboarding/email/email.html index 103d780ed..b238664b7 100644 --- a/src/pages/onboarding/email/email.html +++ b/src/pages/onboarding/email/email.html @@ -1,29 +1,45 @@ -