diff --git a/config.xml b/config.xml index 436c857..41c85ba 100644 --- a/config.xml +++ b/config.xml @@ -86,4 +86,5 @@ + diff --git a/package-lock.json b/package-lock.json index fa389eb..82fe443 100644 --- a/package-lock.json +++ b/package-lock.json @@ -116,14 +116,14 @@ } }, "@ionic/cli-utils": { - "version": "1.10.2", - "resolved": "https://registry.npmjs.org/@ionic/cli-utils/-/cli-utils-1.10.2.tgz", - "integrity": "sha512-3UQIXlceD77tLon0/e3Pd1R8gEVm3+EEhKHVrwBSBLX446nG6+Jpd75Hvi5b9aJIQ+CUSvxKbHBciB1btytl7Q==", + "version": "1.12.0", + "resolved": "https://registry.npmjs.org/@ionic/cli-utils/-/cli-utils-1.12.0.tgz", + "integrity": "sha512-N7/pKa+kiOjtfdc//Gv8vCbsRftenHjs4tIcz5VTW8VM7B9QIu8Ylcuq2JTsKJJoXiFreShku9KPqPm4bpbpSg==", "dev": true, "requires": { "archiver": "2.0.3", "basic-auth": "1.1.0", - "body-parser": "1.18.1", + "body-parser": "1.18.2", "chalk": "2.1.0", "chokidar": "1.7.0", "ci-info": "1.1.1", @@ -131,8 +131,8 @@ "dargs": "5.1.0", "diff": "3.3.1", "elementtree": "0.1.7", - "express": "4.15.4", - "inquirer": "3.2.3", + "express": "4.16.1", + "inquirer": "3.3.0", "leek": "0.0.24", "lodash": "4.17.4", "minimist": "1.2.0", @@ -141,10 +141,10 @@ "proxy-middleware": "0.15.0", "semver": "5.4.1", "slice-ansi": "1.0.0", - "ssh-config": "1.1.1", + "ssh-config": "1.1.3", "string-width": "2.1.1", "strip-ansi": "4.0.0", - "superagent": "3.6.0", + "superagent": "3.6.2", "tar": "2.2.1", "tiny-lr": "1.0.5", "tslib": "1.7.1", @@ -170,75 +170,141 @@ "supports-color": "4.4.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" + } + }, + "etag": { + "version": "1.8.1", + "resolved": "https://registry.npmjs.org/etag/-/etag-1.8.1.tgz", + "integrity": "sha1-Qa4u62XvpiJorr/qg6x9eSmbCIc=", + "dev": true + }, "express": { - "version": "4.15.4", - "resolved": "https://registry.npmjs.org/express/-/express-4.15.4.tgz", - "integrity": "sha1-Ay4iU0ic+PzgJma+yj0R7XotrtE=", + "version": "4.16.1", + "resolved": "https://registry.npmjs.org/express/-/express-4.16.1.tgz", + "integrity": "sha512-STB7LZ4N0L+81FJHGla2oboUHTk4PaN1RsOkoRh9OSeEKylvF5hwKYVX1xCLFaCT7MD0BNG/gX2WFMLqY6EMBw==", "dev": true, "requires": { "accepts": "1.3.4", "array-flatten": "1.1.1", + "body-parser": "1.18.2", "content-disposition": "0.5.2", "content-type": "1.0.4", "cookie": "0.3.1", "cookie-signature": "1.0.6", - "debug": "2.6.8", + "debug": "2.6.9", "depd": "1.1.1", "encodeurl": "1.0.1", "escape-html": "1.0.3", - "etag": "1.8.0", - "finalhandler": "1.0.4", - "fresh": "0.5.0", + "etag": "1.8.1", + "finalhandler": "1.1.0", + "fresh": "0.5.2", "merge-descriptors": "1.0.1", "methods": "1.1.2", "on-finished": "2.3.0", "parseurl": "1.3.2", "path-to-regexp": "0.1.7", - "proxy-addr": "1.1.5", - "qs": "6.5.0", + "proxy-addr": "2.0.2", + "qs": "6.5.1", "range-parser": "1.2.0", - "send": "0.15.4", - "serve-static": "1.12.4", - "setprototypeof": "1.0.3", + "safe-buffer": "5.1.1", + "send": "0.16.1", + "serve-static": "1.13.1", + "setprototypeof": "1.1.0", "statuses": "1.3.1", "type-is": "1.6.15", - "utils-merge": "1.0.0", - "vary": "1.1.1" + "utils-merge": "1.0.1", + "vary": "1.1.2" } }, + "finalhandler": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.1.0.tgz", + "integrity": "sha1-zgtoVbRYU+eRsvzGgARtiCU91/U=", + "dev": true, + "requires": { + "debug": "2.6.9", + "encodeurl": "1.0.1", + "escape-html": "1.0.3", + "on-finished": "2.3.0", + "parseurl": "1.3.2", + "statuses": "1.3.1", + "unpipe": "1.0.0" + } + }, + "forwarded": { + "version": "0.1.2", + "resolved": "https://registry.npmjs.org/forwarded/-/forwarded-0.1.2.tgz", + "integrity": "sha1-mMI9qxF1ZXuMBXPozszZGw/xjIQ=", + "dev": true + }, + "fresh": { + "version": "0.5.2", + "resolved": "https://registry.npmjs.org/fresh/-/fresh-0.5.2.tgz", + "integrity": "sha1-PYyt2Q2XZWn6g1qx+OSyOhBWBac=", + "dev": true + }, + "ipaddr.js": { + "version": "1.5.2", + "resolved": "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.5.2.tgz", + "integrity": "sha1-1LUFvemUaYfM8PxY2QEP+WB+P6A=", + "dev": true + }, "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 }, + "mime": { + "version": "1.4.1", + "resolved": "https://registry.npmjs.org/mime/-/mime-1.4.1.tgz", + "integrity": "sha512-KI1+qOZu5DcW6wayYHSzR/tXKCDC5Om4s1z2QJjDULzLcmf3DvzS7oluY4HCTrc+9FiKmWUgeNLg7W3uIQvxtQ==", + "dev": true + }, "path-to-regexp": { "version": "0.1.7", "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.7.tgz", "integrity": "sha1-32BBeABfUi8V60SQ5yR6G/qmf4w=", "dev": true }, + "proxy-addr": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/proxy-addr/-/proxy-addr-2.0.2.tgz", + "integrity": "sha1-ZXFQT0e7mI7IGAJT+F3X4UlSvew=", + "dev": true, + "requires": { + "forwarded": "0.1.2", + "ipaddr.js": "1.5.2" + } + }, "qs": { - "version": "6.5.0", - "resolved": "https://registry.npmjs.org/qs/-/qs-6.5.0.tgz", - "integrity": "sha512-fjVFjW9yhqMhVGwRExCXLhJKrLlkYSaxNWdyc9rmHlrVZbk35YHH312dFd7191uQeXkI3mKLZTIbSvIeFwFemg==", + "version": "6.5.1", + "resolved": "https://registry.npmjs.org/qs/-/qs-6.5.1.tgz", + "integrity": "sha512-eRzhrN1WSINYCDCbrz796z37LOe3m5tmW7RQf6oBntukAG1nmovJvhnwHHRMAfeoItc1m2Hk02WER2aQ/iqs+A==", "dev": true }, "send": { - "version": "0.15.4", - "resolved": "https://registry.npmjs.org/send/-/send-0.15.4.tgz", - "integrity": "sha1-mF+qPihLAnPHkzZKNcZze9k5Bbk=", + "version": "0.16.1", + "resolved": "https://registry.npmjs.org/send/-/send-0.16.1.tgz", + "integrity": "sha512-ElCLJdJIKPk6ux/Hocwhk7NFHpI3pVm/IZOYWqUmoxcgeyM+MpxHHKhb8QmlJDX1pU6WrgaHBkVNm73Sv7uc2A==", "dev": true, "requires": { - "debug": "2.6.8", + "debug": "2.6.9", "depd": "1.1.1", "destroy": "1.0.4", "encodeurl": "1.0.1", "escape-html": "1.0.3", - "etag": "1.8.0", - "fresh": "0.5.0", + "etag": "1.8.1", + "fresh": "0.5.2", "http-errors": "1.6.2", - "mime": "1.3.4", + "mime": "1.4.1", "ms": "2.0.0", "on-finished": "2.3.0", "range-parser": "1.2.0", @@ -246,17 +312,23 @@ } }, "serve-static": { - "version": "1.12.4", - "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.12.4.tgz", - "integrity": "sha1-m2qpjutyU8Tu3Ewfb9vKYJkBqWE=", + "version": "1.13.1", + "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.13.1.tgz", + "integrity": "sha512-hSMUZrsPa/I09VYFJwa627JJkNs0NrfL1Uzuup+GqHfToR2KcsXFymXSV90hoyw3M+msjFuQly+YzIH/q0MGlQ==", "dev": true, "requires": { "encodeurl": "1.0.1", "escape-html": "1.0.3", "parseurl": "1.3.2", - "send": "0.15.4" + "send": "0.16.1" } }, + "setprototypeof": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.1.0.tgz", + "integrity": "sha512-BvE/TwpZX4FXExxOxZyRGQQv651MSwmWKZGqvmPcRIjDqWub67kTKuIMx43cZZrS/cBBzwBcNDWoFxt2XEFIpQ==", + "dev": true + }, "string-width": { "version": "2.1.1", "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz", @@ -283,11 +355,11 @@ "dev": true, "requires": { "body": "5.1.0", - "debug": "2.6.8", + "debug": "2.6.9", "faye-websocket": "0.10.0", "livereload-js": "2.2.2", "object-assign": "4.1.1", - "qs": "6.5.0" + "qs": "6.5.1" } }, "ultron": { @@ -296,6 +368,18 @@ "integrity": "sha1-sHoualQagV/Go0zNRTO67DB8qGQ=", "dev": true }, + "utils-merge": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.1.tgz", + "integrity": "sha1-n5VxD1CiZ5R7LMwSR0HBAoQn5xM=", + "dev": true + }, + "vary": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/vary/-/vary-1.1.2.tgz", + "integrity": "sha1-IpnwLG3tMNSllhsLn3RSShj2NPw=", + "dev": true + }, "wrap-ansi": { "version": "3.0.1", "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-3.0.1.tgz", @@ -432,9 +516,9 @@ "integrity": "sha1-SlKCrBZHKek2Gbz9OtFR+BfOkfU=" }, "ansi-escapes": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-2.0.0.tgz", - "integrity": "sha1-W65SvkJIeN2Xg+iRDj/Cki6DyBs=", + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-3.0.0.tgz", + "integrity": "sha512-O/klc27mWNUigtv0F8NJWbLF00OcegQalkqKURWdosW08YZKi4m6CnSUSvIZG1otNJbTWhN01Hhz389DW7mvDQ==", "dev": true }, "ansi-regex": { @@ -1295,14 +1379,14 @@ } }, "body-parser": { - "version": "1.18.1", - "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.18.1.tgz", - "integrity": "sha512-KL2pZpGvy6xuZHgYUznB1Zfw4AoGMApfRanT5NafeLvglbaSM+4CCtmlyYOv66oYXqvKL1xpaFb94V/AZVUnYg==", + "version": "1.18.2", + "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.18.2.tgz", + "integrity": "sha1-h2eKGdhLR9hZuDGZvVm84iKxBFQ=", "dev": true, "requires": { "bytes": "3.0.0", "content-type": "1.0.4", - "debug": "2.6.8", + "debug": "2.6.9", "depd": "1.1.1", "http-errors": "1.6.2", "iconv-lite": "0.4.19", @@ -1318,6 +1402,15 @@ "integrity": "sha1-0ygVQE1olpn4Wk6k+odV3ROpYEg=", "dev": true }, + "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" + } + }, "qs": { "version": "6.5.1", "resolved": "https://registry.npmjs.org/qs/-/qs-6.5.1.tgz", @@ -2608,6 +2701,19 @@ "resolved": "https://registry.npmjs.org/cordova-plugin-whitelist/-/cordova-plugin-whitelist-1.3.2.tgz", "integrity": "sha1-W2M1/rn1MB88ATuQlsuIhb29UHY=" }, + "cordova-sqlite-storage": { + "version": "2.0.4", + "resolved": "https://registry.npmjs.org/cordova-sqlite-storage/-/cordova-sqlite-storage-2.0.4.tgz", + "integrity": "sha1-i1zmXGO0awQVynASzFe/JxGyA3E=", + "requires": { + "cordova-sqlite-storage-dependencies": "1.0.4" + } + }, + "cordova-sqlite-storage-dependencies": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/cordova-sqlite-storage-dependencies/-/cordova-sqlite-storage-dependencies-1.0.4.tgz", + "integrity": "sha1-gnmvyNg7AWG/p92cIoqCf13YFF4=" + }, "core-js": { "version": "2.5.1", "resolved": "https://registry.npmjs.org/core-js/-/core-js-2.5.1.tgz", @@ -2620,9 +2726,9 @@ "integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac=" }, "crc": { - "version": "3.4.4", - "resolved": "https://registry.npmjs.org/crc/-/crc-3.4.4.tgz", - "integrity": "sha1-naHpgOO9RPxck79as9ozeNheRms=", + "version": "3.5.0", + "resolved": "https://registry.npmjs.org/crc/-/crc-3.5.0.tgz", + "integrity": "sha1-mLi6fUiWZbo5efWbITgTdBAaGWQ=", "dev": true }, "crc32-stream": { @@ -2631,7 +2737,7 @@ "integrity": "sha1-483TtN8xaN10494/u8t7KX/pCPQ=", "dev": true, "requires": { - "crc": "3.4.4", + "crc": "3.5.0", "readable-stream": "2.3.3" }, "dependencies": { @@ -3283,14 +3389,14 @@ "dev": true }, "external-editor": { - "version": "2.0.4", - "resolved": "https://registry.npmjs.org/external-editor/-/external-editor-2.0.4.tgz", - "integrity": "sha1-HtkZnanL/i7y96MbL96LDRI2iXI=", + "version": "2.0.5", + "resolved": "https://registry.npmjs.org/external-editor/-/external-editor-2.0.5.tgz", + "integrity": "sha512-Msjo64WT5W+NhOpQXh0nOHm+n0RfU1QUwDnKYvJ8dEJ8zlwLrqXNTv5mSUTJpepf41PDJGyhueTw2vNZW+Fr/w==", "dev": true, "requires": { "iconv-lite": "0.4.19", "jschardet": "1.5.1", - "tmp": "0.0.31" + "tmp": "0.0.33" } }, "extglob": { @@ -3824,16 +3930,16 @@ } }, "inquirer": { - "version": "3.2.3", - "resolved": "https://registry.npmjs.org/inquirer/-/inquirer-3.2.3.tgz", - "integrity": "sha512-Bc3KbimpDTOeQdDj18Ir/rlsGuhBSSNqdOnxaAuKhpkdnMMuKsEGbZD2v5KFF9oso2OU+BPh7+/u5obmFDRmWw==", + "version": "3.3.0", + "resolved": "https://registry.npmjs.org/inquirer/-/inquirer-3.3.0.tgz", + "integrity": "sha512-h+xtnyk4EwKvFWHrUYsWErEVR+igKtLdchu+o0Z1RL7VU/jVMFbYir2bp6bAj8efFNxWqHX0dIss6fJQ+/+qeQ==", "dev": true, "requires": { - "ansi-escapes": "2.0.0", + "ansi-escapes": "3.0.0", "chalk": "2.1.0", "cli-cursor": "2.1.0", "cli-width": "2.2.0", - "external-editor": "2.0.4", + "external-editor": "2.0.5", "figures": "2.0.0", "lodash": "4.17.4", "mute-stream": "0.0.7", @@ -3911,12 +4017,12 @@ "dev": true }, "ionic": { - "version": "3.10.3", - "resolved": "https://registry.npmjs.org/ionic/-/ionic-3.10.3.tgz", - "integrity": "sha512-JbBPMwii5Zx4otGExVAc/slbRE5MbyXwh79l+QHAmvh0gYz2PBzGu+4cSSvd/ijYtRKt9Gn1q09e468rqkiTrA==", + "version": "3.12.0", + "resolved": "https://registry.npmjs.org/ionic/-/ionic-3.12.0.tgz", + "integrity": "sha512-a2W91OzjrShfxQ1DLe79TG5uNEdVyFjT2y6aHj6aE43vaP4N1+xg64TH26W7APUPqz9CvGURd6JzNnGh+5wQOg==", "dev": true, "requires": { - "@ionic/cli-utils": "1.10.2", + "@ionic/cli-utils": "1.12.0", "@ionic/discover": "0.3.1", "chalk": "2.1.0", "opn": "5.1.0", @@ -6345,9 +6451,9 @@ "dev": true }, "ssh-config": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/ssh-config/-/ssh-config-1.1.1.tgz", - "integrity": "sha512-ZKqLWbqUrMRFZPL6TAXWbRhY6yG64xh18OzfhOyOpJYrMVq4S0WTxGcer4KRf1c1vFKOc+4kO0bXzgpZsS6kyA==", + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/ssh-config/-/ssh-config-1.1.3.tgz", + "integrity": "sha1-KxljCvhbFmZoi51o9uQhiQD4H4w=", "dev": true }, "sshpk": { @@ -6576,23 +6682,43 @@ } }, "superagent": { - "version": "3.6.0", - "resolved": "https://registry.npmjs.org/superagent/-/superagent-3.6.0.tgz", - "integrity": "sha512-oWsu4mboo8sVxagp4bNwZIR1rUmypeAJDmNIwT9mF4k06hSu6P92aOjEWLaIj7vsX3fOUp+cRH/04tao+q5Q7A==", + "version": "3.6.2", + "resolved": "https://registry.npmjs.org/superagent/-/superagent-3.6.2.tgz", + "integrity": "sha512-eCWciyl+6YrBQmMBS54GTPsdDLhVV27URTDpvMFKXZDfzXgtU42KAUpo2GFkldWA/1tGnWbn5Xo1vO5RygVtew==", "dev": true, "requires": { "component-emitter": "1.2.1", "cookiejar": "2.1.1", - "debug": "2.6.8", + "debug": "3.1.0", "extend": "3.0.1", - "form-data": "2.1.4", + "form-data": "2.3.1", "formidable": "1.1.1", "methods": "1.1.2", - "mime": "1.4.0", - "qs": "6.4.0", + "mime": "2.0.3", + "qs": "6.5.1", "readable-stream": "2.3.3" }, "dependencies": { + "debug": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz", + "integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==", + "dev": true, + "requires": { + "ms": "2.0.0" + } + }, + "form-data": { + "version": "2.3.1", + "resolved": "https://registry.npmjs.org/form-data/-/form-data-2.3.1.tgz", + "integrity": "sha1-b7lPvXGIUwbXPRXMSX/kzE7NRL8=", + "dev": true, + "requires": { + "asynckit": "0.4.0", + "combined-stream": "1.0.5", + "mime-types": "2.1.17" + } + }, "isarray": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz", @@ -6600,9 +6726,15 @@ "dev": true }, "mime": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/mime/-/mime-1.4.0.tgz", - "integrity": "sha512-n9ChLv77+QQEapYz8lV+rIZAW3HhAPW2CXnzb1GN5uMkuczshwvkW7XPsbzU0ZQN3sP47Er2KVkp2p3KyqZKSQ==", + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/mime/-/mime-2.0.3.tgz", + "integrity": "sha512-TrpAd/vX3xaLPDgVRm6JkZwLR0KHfukMdU2wTEbqMDdCnY6Yo3mE+mjs9YE6oMNw2QRfXVeBEYpmpO94BIqiug==", + "dev": true + }, + "qs": { + "version": "6.5.1", + "resolved": "https://registry.npmjs.org/qs/-/qs-6.5.1.tgz", + "integrity": "sha512-eRzhrN1WSINYCDCbrz796z37LOe3m5tmW7RQf6oBntukAG1nmovJvhnwHHRMAfeoItc1m2Hk02WER2aQ/iqs+A==", "dev": true }, "readable-stream": { @@ -6779,9 +6911,9 @@ } }, "tmp": { - "version": "0.0.31", - "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.0.31.tgz", - "integrity": "sha1-jzirlDjhcxXl29izZX6L+yd65Kc=", + "version": "0.0.33", + "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.0.33.tgz", + "integrity": "sha512-jRCJlojKnZ3addtTOjdIqoRuPEKBvNXcGYqzO6zWZX8KfKEpnGY5jfggJQ3EjKuu8D4bJRr0y+cYJFmYbImXGw==", "dev": true, "requires": { "os-tmpdir": "1.0.2" diff --git a/package.json b/package.json index 5c67c16..4c9c0bd 100644 --- a/package.json +++ b/package.json @@ -24,7 +24,7 @@ "@ionic-native/in-app-browser": "^4.2.1", "@ionic-native/splash-screen": "3.12.1", "@ionic-native/status-bar": "3.12.1", - "@ionic/storage": "2.0.1", + "@ionic/storage": "^2.0.1", "ajv": "^5.2.2", "bignumber.js": "^4.0.4", "cordova-android": "^6.2.3", @@ -35,6 +35,7 @@ "cordova-plugin-splashscreen": "^4.0.3", "cordova-plugin-statusbar": "^2.2.3", "cordova-plugin-whitelist": "^1.3.2", + "cordova-sqlite-storage": "^2.0.4", "ionic-angular": "3.6.1", "ionic-plugin-keyboard": "^2.2.1", "ionicons": "3.0.0", @@ -45,7 +46,7 @@ }, "devDependencies": { "@ionic/app-scripts": "2.1.4", - "ionic": "3.10.3", + "ionic": "3.12.0", "typescript": "2.3.4" }, "description": "An Ionic project", @@ -57,10 +58,11 @@ "cordova-plugin-splashscreen": {}, "cordova-plugin-statusbar": {}, "cordova-plugin-whitelist": {}, - "ionic-plugin-keyboard": {} + "ionic-plugin-keyboard": {}, + "cordova-sqlite-storage": {} }, "platforms": [ "android" ] } -} \ No newline at end of file +} diff --git a/src/app/app.module.ts b/src/app/app.module.ts index 38172e2..5e13af0 100644 --- a/src/app/app.module.ts +++ b/src/app/app.module.ts @@ -7,6 +7,7 @@ import { AboutPage } from '../pages/about/about'; import { ContactPage } from '../pages/contact/contact'; import { HomePage } from '../pages/home/home'; import { TabsPage } from '../pages/tabs/tabs'; +import { StartPage } from '../pages/start/start'; import { StatusBar } from '@ionic-native/status-bar'; import { SplashScreen } from '@ionic-native/splash-screen'; @@ -16,17 +17,21 @@ import { InAppBrowser } from '@ionic-native/in-app-browser'; import { UserContractProvider } from '../providers/user-contract/user-contract'; import { KevinContractProvider } from '../providers/kevin-contract/kevin-contract'; +import { IonicStorageModule } from '@ionic/storage'; + @NgModule({ declarations: [ MyApp, AboutPage, ContactPage, HomePage, - TabsPage + TabsPage, + StartPage ], imports: [ BrowserModule, - IonicModule.forRoot(MyApp) + IonicModule.forRoot(MyApp), + IonicStorageModule.forRoot() ], bootstrap: [IonicApp], entryComponents: [ @@ -34,7 +39,8 @@ import { KevinContractProvider } from '../providers/kevin-contract/kevin-contrac AboutPage, ContactPage, HomePage, - TabsPage + TabsPage, + StartPage ], providers: [ StatusBar, diff --git a/src/assets/js/truffle-contract-artifacts.js b/src/assets/js/truffle-contract-artifacts.js index 8e280cf..7f4ce8e 100644 --- a/src/assets/js/truffle-contract-artifacts.js +++ b/src/assets/js/truffle-contract-artifacts.js @@ -62,5 +62,5 @@ App = { } window.onload = function() { - App.init(); + // App.init(); }; \ No newline at end of file diff --git a/src/pages/home/home.html b/src/pages/home/home.html index 7ef636c..931062c 100644 --- a/src/pages/home/home.html +++ b/src/pages/home/home.html @@ -26,7 +26,4 @@ -
- -
\ No newline at end of file diff --git a/src/pages/home/home.ts b/src/pages/home/home.ts index 1b1cffe..8ec22b8 100644 --- a/src/pages/home/home.ts +++ b/src/pages/home/home.ts @@ -3,6 +3,7 @@ import { NavController } from 'ionic-angular'; import { InAppBrowser } from '@ionic-native/in-app-browser'; import { LoadingController } from 'ionic-angular'; + // import { BigNumber } from 'bignumber.js'; declare var web3; // declare var Web3; @@ -30,12 +31,6 @@ export class HomePage { } - openEthWebClient() - { - this.iab.create('http://159.203.0.218/eth/ethereum_client/'); - } - - charge_data() { this.loader = this.loadingCtrl.create({ content: "Please wait...", diff --git a/src/pages/start/start.html b/src/pages/start/start.html new file mode 100644 index 0000000..65b5961 --- /dev/null +++ b/src/pages/start/start.html @@ -0,0 +1,19 @@ + + + + + Start + + + + + + +

Host input here!

+

Submit button here!

+
diff --git a/src/pages/start/start.scss b/src/pages/start/start.scss new file mode 100644 index 0000000..b7091f3 --- /dev/null +++ b/src/pages/start/start.scss @@ -0,0 +1,3 @@ +page-start { + +} diff --git a/src/pages/start/start.ts b/src/pages/start/start.ts new file mode 100644 index 0000000..2c4a9d8 --- /dev/null +++ b/src/pages/start/start.ts @@ -0,0 +1,35 @@ +import { Component } from '@angular/core'; +import { NavController, NavParams } from 'ionic-angular'; +import { AlertController } from 'ionic-angular'; + +/** + * Generated class for the StartPage page. + * + * See https://ionicframework.com/docs/components/#navigation for more info on + * Ionic pages and navigation. + */ + +@Component({ + selector: 'page-start', + templateUrl: 'start.html', +}) +export class StartPage { + + constructor(public navCtrl: NavController, public navParams: NavParams, public alertCtrl: AlertController) { + } + + ionViewDidLoad() { + console.log('ionViewDidLoad StartPage'); + this.showAlert() + } + + showAlert() { + let alert = this.alertCtrl.create({ + title: 'Wait!', + subTitle: 'You must add a host url before you continue', + buttons: ['OK'] + }); + alert.present(); + } + +} diff --git a/src/pages/tabs/tabs.ts b/src/pages/tabs/tabs.ts index f80301b..c473cbd 100644 --- a/src/pages/tabs/tabs.ts +++ b/src/pages/tabs/tabs.ts @@ -1,8 +1,12 @@ import { Component } from '@angular/core'; +import { NavController } from 'ionic-angular'; + +import { Storage } from '@ionic/storage'; import { AboutPage } from '../about/about'; import { ContactPage } from '../contact/contact'; import { HomePage } from '../home/home'; +import { StartPage } from '../start/start'; @Component({ templateUrl: 'tabs.html' @@ -13,7 +17,11 @@ export class TabsPage { tab2Root = AboutPage; tab3Root = ContactPage; - constructor() { - + constructor(public navCtrl: NavController, private storage: Storage) { + storage.get('host').then((val) => { + if (val == null) { + this.navCtrl.setRoot(StartPage) + } + }); } }