Bladeren bron

changing branches

Eric Foster 6 jaren geleden
bovenliggende
commit
29f49e3225

+ 1
- 1
ZipCoinRedIonicClient/.sourcemaps/main.js.map
Diff onderdrukt omdat het te groot bestand
Bestand weergeven


+ 3
- 4
ZipCoinRedIonicClient/ionic.config.json Bestand weergeven

@@ -1,6 +1,5 @@
1 1
 {
2 2
   "name": "ZipCoinRed",
3
-  "app_id": "",
4
-  "type": "ionic-angular",
5
-  "integrations": {}
6
-}
3
+  "integrations": {},
4
+  "type": "ionic-angular"
5
+}

+ 0
- 25
ZipCoinRedIonicClient/www/build/.ion-diagnostic-typescript.html Bestand weergeven

@@ -1,25 +0,0 @@
1
-<div class="ion-diagnostic">
2
-<div class="ion-diagnostic-masthead" title="typescript error: 2307">
3
-<div class="ion-diagnostic-title">Typescript Error</div>
4
-<div class="ion-diagnostic-message" data-error-code="typescript-2307">Cannot find module &#039;../../model/transaction&#039;.</div>
5
-</div>
6
-<div class="ion-diagnostic-file">
7
-<div class="ion-diagnostic-file-header" title="/Users/ericf/ZCWProjects/ZipCoin-RED/ZipCoinRedIonicClient/src/pages/wallet/wallet.ts">src/pages/wallet/wallet.ts</div>
8
-<div class="ion-diagnostic-blob">
9
-<table class="ion-diagnostic-table">
10
-<tr>
11
-<td class="ion-diagnostic-blob-num" data-line-number="3"></td>
12
-<td class="ion-diagnostic-blob-code"><span class="hljs-keyword">import</span> { TransactionService } from <span class="hljs-string">'../../providers/transaction-service'</span>;</td>
13
-</tr>
14
-<tr class="ion-diagnostic-error-line">
15
-<td class="ion-diagnostic-blob-num" data-line-number="4"></td>
16
-<td class="ion-diagnostic-blob-code"><span class="hljs-keyword">import</span> { Transaction } from <span class="hljs-string"><span class="ion-diagnostics-error-chr">'</span><span class="ion-diagnostics-error-chr">.</span><span class="ion-diagnostics-error-chr">.</span><span class="ion-diagnostics-error-chr">/</span><span class="ion-diagnostics-error-chr">.</span><span class="ion-diagnostics-error-chr">.</span><span class="ion-diagnostics-error-chr">/</span><span class="ion-diagnostics-error-chr">m</span><span class="ion-diagnostics-error-chr">o</span><span class="ion-diagnostics-error-chr">d</span><span class="ion-diagnostics-error-chr">e</span><span class="ion-diagnostics-error-chr">l</span><span class="ion-diagnostics-error-chr">/</span><span class="ion-diagnostics-error-chr">t</span><span class="ion-diagnostics-error-chr">r</span><span class="ion-diagnostics-error-chr">a</span><span class="ion-diagnostics-error-chr">n</span><span class="ion-diagnostics-error-chr">s</span><span class="ion-diagnostics-error-chr">a</span><span class="ion-diagnostics-error-chr">c</span><span class="ion-diagnostics-error-chr">t</span><span class="ion-diagnostics-error-chr">i</span><span class="ion-diagnostics-error-chr">o</span><span class="ion-diagnostics-error-chr">n</span><span class="ion-diagnostics-error-chr">'</span></span>;</td>
17
-</tr>
18
-<tr>
19
-<td class="ion-diagnostic-blob-num" data-line-number="5"></td>
20
-<td class="ion-diagnostic-blob-code"><span class="hljs-keyword">import</span> { FormGroup } from <span class="hljs-string">'@angular/forms'</span>;</td>
21
-</tr>
22
-</table>
23
-</div>
24
-</div>
25
-</div>

+ 1
- 1
ZipCoinRedIonicClient/www/build/0.js Bestand weergeven

@@ -8,7 +8,7 @@ Object.defineProperty(__webpack_exports__, "__esModule", { value: true });
8 8
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "WalletPageModule", function() { return WalletPageModule; });
9 9
 /* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__angular_core__ = __webpack_require__(0);
10 10
 /* harmony import */ var __WEBPACK_IMPORTED_MODULE_1_ionic_angular__ = __webpack_require__(28);
11
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__wallet__ = __webpack_require__(101);
11
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__wallet__ = __webpack_require__(102);
12 12
 var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
13 13
     var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
14 14
     if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);

+ 2
- 2
ZipCoinRedIonicClient/www/build/1.js Bestand weergeven

@@ -1,6 +1,6 @@
1 1
 webpackJsonp([1],{
2 2
 
3
-/***/ 281:
3
+/***/ 280:
4 4
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
5 5
 
6 6
 "use strict";
@@ -8,7 +8,7 @@ Object.defineProperty(__webpack_exports__, "__esModule", { value: true });
8 8
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "TransactionPageModule", function() { return TransactionPageModule; });
9 9
 /* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__angular_core__ = __webpack_require__(0);
10 10
 /* harmony import */ var __WEBPACK_IMPORTED_MODULE_1_ionic_angular__ = __webpack_require__(28);
11
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__transaction__ = __webpack_require__(102);
11
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__transaction__ = __webpack_require__(100);
12 12
 var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
13 13
     var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
14 14
     if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);

+ 2
- 2
ZipCoinRedIonicClient/www/build/2.js Bestand weergeven

@@ -1,6 +1,6 @@
1 1
 webpackJsonp([2],{
2 2
 
3
-/***/ 280:
3
+/***/ 281:
4 4
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
5 5
 
6 6
 "use strict";
@@ -8,7 +8,7 @@ Object.defineProperty(__webpack_exports__, "__esModule", { value: true });
8 8
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "TabsPageModule", function() { return TabsPageModule; });
9 9
 /* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__angular_core__ = __webpack_require__(0);
10 10
 /* harmony import */ var __WEBPACK_IMPORTED_MODULE_1_ionic_angular__ = __webpack_require__(28);
11
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__tabs__ = __webpack_require__(100);
11
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__tabs__ = __webpack_require__(101);
12 12
 var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
13 13
     var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
14 14
     if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);

+ 74
- 132
ZipCoinRedIonicClient/www/build/main.js Bestand weergeven

@@ -1,10 +1,10 @@
1 1
 webpackJsonp([4],{
2 2
 
3
-/***/ 101:
3
+/***/ 100:
4 4
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
5 5
 
6 6
 "use strict";
7
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return Tab4Page; });
7
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return TransactionPage; });
8 8
 /* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__angular_core__ = __webpack_require__(0);
9 9
 /* harmony import */ var __WEBPACK_IMPORTED_MODULE_1_ionic_angular__ = __webpack_require__(28);
10 10
 var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
@@ -19,42 +19,43 @@ var __metadata = (this && this.__metadata) || function (k, v) {
19 19
 
20 20
 
21 21
 /**
22
- * Generated class for the Tab4Page page.
22
+ * Generated class for the TransactionPage page.
23 23
  *
24 24
  * See https://ionicframework.com/docs/components/#navigation for more info on
25 25
  * Ionic pages and navigation.
26 26
  */
27
-var Tab4Page = /** @class */ (function () {
28
-    function Tab4Page(navCtrl, navParams) {
27
+var TransactionPage = /** @class */ (function () {
28
+    function TransactionPage(navCtrl, navParams) {
29 29
         this.navCtrl = navCtrl;
30 30
         this.navParams = navParams;
31 31
     }
32
-    Tab4Page.prototype.ionViewDidLoad = function () {
33
-        console.log('ionViewDidLoad Tab4Page');
32
+    TransactionPage.prototype.ionViewDidLoad = function () {
33
+        console.log('ionViewDidLoad TransactionPage');
34 34
     };
35
-    Tab4Page = __decorate([
35
+    TransactionPage = __decorate([
36 36
         Object(__WEBPACK_IMPORTED_MODULE_0__angular_core__["m" /* Component */])({
37
-            selector: 'page-tab4',template:/*ion-inline-start:"/Users/ericf/ZCWProjects/ZipCoin-RED/ZipCoinRedIonicClient/src/pages/tab4/tab4.html"*/'<!--\n  Generated template for the Tab4Page page.\n\n  See http://ionicframework.com/docs/components/#navigation for more info on\n  Ionic pages and navigation.\n-->\n<ion-header>\n\n  <ion-navbar>\n    <ion-title>tab4</ion-title>\n  </ion-navbar>\n\n</ion-header>\n\n\n<ion-content padding>\n\n</ion-content>\n'/*ion-inline-end:"/Users/ericf/ZCWProjects/ZipCoin-RED/ZipCoinRedIonicClient/src/pages/tab4/tab4.html"*/,
37
+            selector: 'page-transaction',template:/*ion-inline-start:"/Users/ericf/ZCWProjects/ZipCoin-RED/ZipCoinRedIonicClient/src/pages/transaction/transaction.html"*/'<!--\n  Generated template for the TransactionPage page.\n\n  See http://ionicframework.com/docs/components/#navigation for more info on\n  Ionic pages and navigation.\n-->\n<ion-header>\n\n  <ion-navbar>\n    <ion-title>Transaction</ion-title>\n  </ion-navbar>\n\n</ion-header>\n\n\n<ion-content padding>\n\n</ion-content>\n'/*ion-inline-end:"/Users/ericf/ZCWProjects/ZipCoin-RED/ZipCoinRedIonicClient/src/pages/transaction/transaction.html"*/,
38 38
         }),
39
-        __metadata("design:paramtypes", [__WEBPACK_IMPORTED_MODULE_1_ionic_angular__["e" /* NavController */], __WEBPACK_IMPORTED_MODULE_1_ionic_angular__["f" /* NavParams */]])
40
-    ], Tab4Page);
41
-    return Tab4Page;
39
+        __metadata("design:paramtypes", [typeof (_a = typeof __WEBPACK_IMPORTED_MODULE_1_ionic_angular__["e" /* NavController */] !== "undefined" && __WEBPACK_IMPORTED_MODULE_1_ionic_angular__["e" /* NavController */]) === "function" && _a || Object, typeof (_b = typeof __WEBPACK_IMPORTED_MODULE_1_ionic_angular__["f" /* NavParams */] !== "undefined" && __WEBPACK_IMPORTED_MODULE_1_ionic_angular__["f" /* NavParams */]) === "function" && _b || Object])
40
+    ], TransactionPage);
41
+    return TransactionPage;
42
+    var _a, _b;
42 43
 }());
43 44
 
44
-//# sourceMappingURL=tab4.js.map
45
+//# sourceMappingURL=transaction.js.map
45 46
 
46 47
 /***/ }),
47 48
 
48
-/***/ 102:
49
+/***/ 101:
49 50
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
50 51
 
51 52
 "use strict";
52 53
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return TabsPage; });
53 54
 /* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__angular_core__ = __webpack_require__(0);
54
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__home_home__ = __webpack_require__(159);
55
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__wallet_wallet__ = __webpack_require__(103);
56
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_3__transaction_transaction__ = __webpack_require__(104);
57
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_4__tab4_tab4__ = __webpack_require__(101);
55
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__home_home__ = __webpack_require__(157);
56
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__wallet_wallet__ = __webpack_require__(102);
57
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_3__transaction_transaction__ = __webpack_require__(100);
58
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_4__tab4_tab4__ = __webpack_require__(99);
58 59
 var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
59 60
     var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
60 61
     if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
@@ -78,7 +79,7 @@ var TabsPage = /** @class */ (function () {
78 79
     }
79 80
     TabsPage = __decorate([
80 81
         Object(__WEBPACK_IMPORTED_MODULE_0__angular_core__["m" /* Component */])({
81
-            selector: 'page-tabs',template:/*ion-inline-start:"/Users/shivamp/labs/ZipCoin-RED/ZipCoinRedIonicClient/src/pages/tabs/tabs.html"*/'<ion-tabs>\n  <ion-tab [root]="homePage" tabTitle="ZipCoin-BlockChain" tabIcon="link"></ion-tab>\n  <ion-tab [root]="walletPage" tabTitle="ZipCoin Wallet" tabIcon="cash"></ion-tab>\n  <ion-tab [root]="transactionPage" tabTitle="ZipCoin Transactions" tabIcon="contacts"></ion-tab>\n  <ion-tab [root]="tab4" tabTitle="Ziptab" tabIcon="star"></ion-tab>\n\n</ion-tabs>'/*ion-inline-end:"/Users/shivamp/labs/ZipCoin-RED/ZipCoinRedIonicClient/src/pages/tabs/tabs.html"*/,
82
+            selector: 'page-tabs',template:/*ion-inline-start:"/Users/ericf/ZCWProjects/ZipCoin-RED/ZipCoinRedIonicClient/src/pages/tabs/tabs.html"*/'<ion-tabs>\n  <ion-tab [root]="homePage" tabTitle="ZipCoin-BlockChain" tabIcon="link"></ion-tab>\n  <ion-tab [root]="walletPage" tabTitle="ZipCoin Wallet" tabIcon="cash"></ion-tab>\n  <ion-tab [root]="transactionPage" tabTitle="ZipCoin Transactions" tabIcon="contacts"></ion-tab>\n  <ion-tab [root]="tab4" tabTitle="Ziptab" tabIcon="star"></ion-tab>\n\n</ion-tabs>'/*ion-inline-end:"/Users/ericf/ZCWProjects/ZipCoin-RED/ZipCoinRedIonicClient/src/pages/tabs/tabs.html"*/,
82 83
         }),
83 84
         __metadata("design:paramtypes", [])
84 85
     ], TabsPage);
@@ -89,14 +90,13 @@ var TabsPage = /** @class */ (function () {
89 90
 
90 91
 /***/ }),
91 92
 
92
-/***/ 103:
93
+/***/ 102:
93 94
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
94 95
 
95 96
 "use strict";
96 97
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return WalletPage; });
97 98
 /* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__angular_core__ = __webpack_require__(0);
98 99
 /* harmony import */ var __WEBPACK_IMPORTED_MODULE_1_ionic_angular__ = __webpack_require__(28);
99
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__providers_transaction_service__ = __webpack_require__(50);
100 100
 var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
101 101
     var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
102 102
     if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
@@ -108,7 +108,6 @@ var __metadata = (this && this.__metadata) || function (k, v) {
108 108
 };
109 109
 
110 110
 
111
-
112 111
 /**
113 112
  * Generated class for the WalletPage page.
114 113
  *
@@ -116,22 +115,18 @@ var __metadata = (this && this.__metadata) || function (k, v) {
116 115
  * Ionic pages and navigation.
117 116
  */
118 117
 var WalletPage = /** @class */ (function () {
119
-    function WalletPage(navCtrl, navParams, transactionService) {
118
+    function WalletPage(navCtrl, navParams) {
120 119
         this.navCtrl = navCtrl;
121 120
         this.navParams = navParams;
122
-        this.transactionService = transactionService;
123 121
     }
124 122
     WalletPage.prototype.ionViewDidLoad = function () {
125 123
         console.log('ionViewDidLoad WalletPage');
126 124
     };
127
-    WalletPage.prototype.createTransaction = function () {
128
-        this.transactionService.createTransaction(this.transaction);
129
-    };
130 125
     WalletPage = __decorate([
131 126
         Object(__WEBPACK_IMPORTED_MODULE_0__angular_core__["m" /* Component */])({
132
-            selector: 'page-wallet',template:/*ion-inline-start:"/Users/shivamp/labs/ZipCoin-RED/ZipCoinRedIonicClient/src/pages/wallet/wallet.html"*/'<!--\n  Generated template for the WalletPage page.\n\n  See http://ionicframework.com/docs/components/#navigation for more info on\n  Ionic pages and navigation.\n-->\n<ion-header>\n\n  <ion-navbar>\n    <ion-title>Wallet</ion-title>\n  </ion-navbar>\n\n</ion-header>\n\n\n<ion-content padding>\n\n\n  \n  <ion-item>\n      <ion-label>Name</ion-label>\n      <ion-select [(ngModel)]="name">\n        <ion-option value="navya">navya</ion-option>\n        <ion-option value="aleena">aleena</ion-option>\n      </ion-select>\n     </ion-item>\n     <ion-item>\n        <ion-label>current balance</ion-label>\n        <ion-input></ion-input>\n      </ion-item>\n      <ion-item>\n          <ion-label>Public Key</ion-label>\n          <ion-input></ion-input>\n        </ion-item>\n      <br>\n      <br>\n      <div class = "bar bar-subheader bar-assertive">\n          <h2 class = "title">Payment</h2>\n       </div>\n       <ion-item>\n          <ion-label>From</ion-label>\n          <ion-select [(ngModel)]="name">\n            <ion-option value="navya">navya</ion-option>\n            <ion-option value="aleena">aleena</ion-option>\n          </ion-select>\n         </ion-item>\n         <ion-item>\n            <ion-label>To</ion-label>\n            <ion-select [(ngModel)]="to">\n              <ion-option value="navya">navya</ion-option>\n              <ion-option value="aleena">aleena</ion-option>\n            </ion-select>\n           </ion-item>\n      \n          <ion-item>\n              <ion-label>Amount</ion-label>\n              <ion-input></ion-input>\n            </ion-item>\n            <br>\n            <button ion-button>Pay</button>\n</ion-content>\n'/*ion-inline-end:"/Users/shivamp/labs/ZipCoin-RED/ZipCoinRedIonicClient/src/pages/wallet/wallet.html"*/,
127
+            selector: 'page-wallet',template:/*ion-inline-start:"/Users/ericf/ZCWProjects/ZipCoin-RED/ZipCoinRedIonicClient/src/pages/wallet/wallet.html"*/'<!--\n  Generated template for the WalletPage page.\n\n  See http://ionicframework.com/docs/components/#navigation for more info on\n  Ionic pages and navigation.\n-->\n<ion-header>\n\n  <ion-navbar>\n    <ion-title>Wallet</ion-title>\n  </ion-navbar>\n\n</ion-header>\n\n\n<ion-content padding>\n\n\n  \n  <ion-item>\n      <ion-label>Name</ion-label>\n      <ion-select [(ngModel)]="name">\n        <ion-option value="navya">navya</ion-option>\n        <ion-option value="aleena">aleena</ion-option>\n      </ion-select>\n     </ion-item>\n     <ion-item>\n        <ion-label>current balance</ion-label>\n        <ion-input></ion-input>\n      </ion-item>\n      <ion-item>\n          <ion-label>Public Key</ion-label>\n          <ion-input></ion-input>\n        </ion-item>\n      <br>\n      <br>\n      <div class = "bar bar-subheader bar-assertive">\n          <h2 class = "title">Payment</h2>\n       </div>\n       <ion-item>\n          <ion-label>From</ion-label>\n          <ion-select [(ngModel)]="name">\n            <ion-option value="navya">navya</ion-option>\n            <ion-option value="aleena">aleena</ion-option>\n          </ion-select>\n         </ion-item>\n         <ion-item>\n            <ion-label>To</ion-label>\n            <ion-select [(ngModel)]="to">\n              <ion-option value="navya">navya</ion-option>\n              <ion-option value="aleena">aleena</ion-option>\n            </ion-select>\n           </ion-item>\n      \n          <ion-item>\n              <ion-label>Amount</ion-label>\n              <ion-input></ion-input>\n            </ion-item>\n            <br>\n            <button ion-button>Pay</button>\n</ion-content>\n'/*ion-inline-end:"/Users/ericf/ZCWProjects/ZipCoin-RED/ZipCoinRedIonicClient/src/pages/wallet/wallet.html"*/,
133 128
         }),
134
-        __metadata("design:paramtypes", [__WEBPACK_IMPORTED_MODULE_1_ionic_angular__["e" /* NavController */], __WEBPACK_IMPORTED_MODULE_1_ionic_angular__["f" /* NavParams */], __WEBPACK_IMPORTED_MODULE_2__providers_transaction_service__["a" /* TransactionService */]])
129
+        __metadata("design:paramtypes", [__WEBPACK_IMPORTED_MODULE_1_ionic_angular__["e" /* NavController */], __WEBPACK_IMPORTED_MODULE_1_ionic_angular__["f" /* NavParams */]])
135 130
     ], WalletPage);
136 131
     return WalletPage;
137 132
 }());
@@ -140,62 +135,7 @@ var WalletPage = /** @class */ (function () {
140 135
 
141 136
 /***/ }),
142 137
 
143
-/***/ 104:
144
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
145
-
146
-"use strict";
147
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return TransactionPage; });
148
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__angular_core__ = __webpack_require__(0);
149
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1_ionic_angular__ = __webpack_require__(28);
150
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__providers_transaction_service__ = __webpack_require__(50);
151
-var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
152
-    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
153
-    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
154
-    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
155
-    return c > 3 && r && Object.defineProperty(target, key, r), r;
156
-};
157
-var __metadata = (this && this.__metadata) || function (k, v) {
158
-    if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
159
-};
160
-
161
-
162
-
163
-/**
164
- * Generated class for the TransactionPage page.
165
- *
166
- * See https://ionicframework.com/docs/components/#navigation for more info on
167
- * Ionic pages and navigation.
168
- */
169
-var TransactionPage = /** @class */ (function () {
170
-    function TransactionPage(navCtrl, navParams, transactionService) {
171
-        this.navCtrl = navCtrl;
172
-        this.navParams = navParams;
173
-        this.transactionService = transactionService;
174
-    }
175
-    TransactionPage.prototype.ionViewDidLoad = function () {
176
-        console.log('ionViewDidLoad TransactionPage');
177
-    };
178
-    TransactionPage.prototype.getAllTransactions = function () {
179
-        var _this = this;
180
-        this.transactionService.getAllTransactions().subscribe(function (transactions) {
181
-            _this.transactions = transactions;
182
-        });
183
-    };
184
-    TransactionPage = __decorate([
185
-        Object(__WEBPACK_IMPORTED_MODULE_0__angular_core__["m" /* Component */])({
186
-            selector: 'page-transaction',template:/*ion-inline-start:"/Users/shivamp/labs/ZipCoin-RED/ZipCoinRedIonicClient/src/pages/transaction/transaction.html"*/'<!--\n  Generated template for the TransactionPage page.\n\n  See http://ionicframework.com/docs/components/#navigation for more info on\n  Ionic pages and navigation.\n-->\n<ion-header>\n\n  <ion-navbar>\n    <ion-title>Transaction</ion-title>\n  </ion-navbar>\n\n</ion-header>\n\n\n<ion-content padding>\n\n</ion-content>\n'/*ion-inline-end:"/Users/shivamp/labs/ZipCoin-RED/ZipCoinRedIonicClient/src/pages/transaction/transaction.html"*/,
187
-        }),
188
-        __metadata("design:paramtypes", [__WEBPACK_IMPORTED_MODULE_1_ionic_angular__["e" /* NavController */], __WEBPACK_IMPORTED_MODULE_1_ionic_angular__["f" /* NavParams */],
189
-            __WEBPACK_IMPORTED_MODULE_2__providers_transaction_service__["a" /* TransactionService */]])
190
-    ], TransactionPage);
191
-    return TransactionPage;
192
-}());
193
-
194
-//# sourceMappingURL=transaction.js.map
195
-
196
-/***/ }),
197
-
198
-/***/ 116:
138
+/***/ 114:
199 139
 /***/ (function(module, exports) {
200 140
 
201 141
 function webpackEmptyAsyncContext(req) {
@@ -208,16 +148,16 @@ function webpackEmptyAsyncContext(req) {
208 148
 webpackEmptyAsyncContext.keys = function() { return []; };
209 149
 webpackEmptyAsyncContext.resolve = webpackEmptyAsyncContext;
210 150
 module.exports = webpackEmptyAsyncContext;
211
-webpackEmptyAsyncContext.id = 116;
151
+webpackEmptyAsyncContext.id = 114;
212 152
 
213 153
 /***/ }),
214 154
 
215
-/***/ 158:
155
+/***/ 156:
216 156
 /***/ (function(module, exports, __webpack_require__) {
217 157
 
218 158
 var map = {
219 159
 	"../pages/tab4/tab4.module": [
220
-		280,
160
+		279,
221 161
 		3
222 162
 	],
223 163
 	"../pages/tabs/tabs.module": [
@@ -225,11 +165,11 @@ var map = {
225 165
 		2
226 166
 	],
227 167
 	"../pages/transaction/transaction.module": [
228
-		282,
168
+		280,
229 169
 		1
230 170
 	],
231 171
 	"../pages/wallet/wallet.module": [
232
-		283,
172
+		282,
233 173
 		0
234 174
 	]
235 175
 };
@@ -244,19 +184,19 @@ function webpackAsyncContext(req) {
244 184
 webpackAsyncContext.keys = function webpackAsyncContextKeys() {
245 185
 	return Object.keys(map);
246 186
 };
247
-webpackAsyncContext.id = 158;
187
+webpackAsyncContext.id = 156;
248 188
 module.exports = webpackAsyncContext;
249 189
 
250 190
 /***/ }),
251 191
 
252
-/***/ 159:
192
+/***/ 157:
253 193
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
254 194
 
255 195
 "use strict";
256 196
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return HomePage; });
257 197
 /* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__angular_core__ = __webpack_require__(0);
258 198
 /* harmony import */ var __WEBPACK_IMPORTED_MODULE_1_ionic_angular__ = __webpack_require__(28);
259
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__providers_block_service__ = __webpack_require__(160);
199
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__providers_block_service__ = __webpack_require__(158);
260 200
 var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
261 201
     var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
262 202
     if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
@@ -296,7 +236,7 @@ var HomePage = /** @class */ (function () {
296 236
     };
297 237
     HomePage = __decorate([
298 238
         Object(__WEBPACK_IMPORTED_MODULE_0__angular_core__["m" /* Component */])({
299
-            selector: 'page-home',template:/*ion-inline-start:"/Users/shivamp/labs/ZipCoin-RED/ZipCoinRedIonicClient/src/pages/home/home.html"*/'<ion-header>\n  <ion-navbar>\n    <ion-title>\n      ZipCoin BlockChain\n    </ion-title>\n  </ion-navbar>\n</ion-header>\n\n<ion-content padding>\n\n  <ion-list>\n    <ion-item-sliding *ngFor="let block of blocks">\n      <ion-item>\n        <ion-card>\n            <ion-card-header>\n              Block #: {{block.blockNumber}}\n            </ion-card-header>\n            <ion-card-content>\n              <div>Nonce: {{ block.nonce }}</div>\n              <div>Data: {{ block.transactionList }}</div>\n              <div>Previous Hash: {{ block.previousHash }}</div>\n              <div>Current Hash: {{ block.currentHash }}</div>\n              <button ion-button (click)="getMinedBlock(block.id)">Mine</button>\n            </ion-card-content>\n        </ion-card>\n      </ion-item>\n    </ion-item-sliding>\n  </ion-list>\n\n</ion-content>'/*ion-inline-end:"/Users/shivamp/labs/ZipCoin-RED/ZipCoinRedIonicClient/src/pages/home/home.html"*/
239
+            selector: 'page-home',template:/*ion-inline-start:"/Users/ericf/ZCWProjects/ZipCoin-RED/ZipCoinRedIonicClient/src/pages/home/home.html"*/'<ion-header>\n  <ion-navbar>\n    <ion-title>\n      ZipCoin BlockChain\n    </ion-title>\n  </ion-navbar>\n</ion-header>\n\n<ion-content padding>\n\n  <ion-list>\n    <ion-item-sliding *ngFor="let block of blocks">\n      <ion-item>\n        <ion-card>\n            <ion-card-header>\n              Block #: {{block.blockNumber}}\n            </ion-card-header>\n            <ion-card-content>\n              <div>Nonce: {{ block.nonce }}</div>\n              <div>Data: {{ block.transactionList }}</div>\n              <div>Previous Hash: {{ block.previousHash }}</div>\n              <div>Current Hash: {{ block.currentHash }}</div>\n              <button ion-button (click)="getMinedBlock(block.id)">Mine</button>\n            </ion-card-content>\n        </ion-card>\n      </ion-item>\n    </ion-item-sliding>\n  </ion-list>\n\n</ion-content>'/*ion-inline-end:"/Users/ericf/ZCWProjects/ZipCoin-RED/ZipCoinRedIonicClient/src/pages/home/home.html"*/
300 240
         }),
301 241
         __metadata("design:paramtypes", [__WEBPACK_IMPORTED_MODULE_1_ionic_angular__["e" /* NavController */], __WEBPACK_IMPORTED_MODULE_2__providers_block_service__["a" /* BlockService */]])
302 242
     ], HomePage);
@@ -313,12 +253,12 @@ var HomePage = /** @class */ (function () {
313 253
 
314 254
 /***/ }),
315 255
 
316
-/***/ 160:
256
+/***/ 158:
317 257
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
318 258
 
319 259
 "use strict";
320 260
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return BlockService; });
321
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__angular_common_http__ = __webpack_require__(78);
261
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__angular_common_http__ = __webpack_require__(159);
322 262
 /* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__angular_core__ = __webpack_require__(0);
323 263
 var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
324 264
     var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
@@ -357,13 +297,13 @@ var BlockService = /** @class */ (function () {
357 297
 
358 298
 /***/ }),
359 299
 
360
-/***/ 204:
300
+/***/ 203:
361 301
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
362 302
 
363 303
 "use strict";
364 304
 Object.defineProperty(__webpack_exports__, "__esModule", { value: true });
365
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__angular_platform_browser_dynamic__ = __webpack_require__(205);
366
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__app_module__ = __webpack_require__(225);
305
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__angular_platform_browser_dynamic__ = __webpack_require__(204);
306
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__app_module__ = __webpack_require__(224);
367 307
 
368 308
 
369 309
 Object(__WEBPACK_IMPORTED_MODULE_0__angular_platform_browser_dynamic__["a" /* platformBrowserDynamic */])().bootstrapModule(__WEBPACK_IMPORTED_MODULE_1__app_module__["a" /* AppModule */]);
@@ -371,7 +311,7 @@ Object(__WEBPACK_IMPORTED_MODULE_0__angular_platform_browser_dynamic__["a" /* pl
371 311
 
372 312
 /***/ }),
373 313
 
374
-/***/ 225:
314
+/***/ 224:
375 315
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
376 316
 
377 317
 "use strict";
@@ -379,17 +319,16 @@ Object(__WEBPACK_IMPORTED_MODULE_0__angular_platform_browser_dynamic__["a" /* pl
379 319
 /* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__angular_platform_browser__ = __webpack_require__(31);
380 320
 /* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__angular_core__ = __webpack_require__(0);
381 321
 /* harmony import */ var __WEBPACK_IMPORTED_MODULE_2_ionic_angular__ = __webpack_require__(28);
382
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_3__ionic_native_splash_screen__ = __webpack_require__(200);
383
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_4__ionic_native_status_bar__ = __webpack_require__(203);
384
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_5__app_component__ = __webpack_require__(279);
385
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_6__angular_common_http__ = __webpack_require__(78);
386
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_7__providers_block_service__ = __webpack_require__(160);
387
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_8__pages_home_home__ = __webpack_require__(159);
388
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_9__pages_wallet_wallet__ = __webpack_require__(103);
389
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_10__pages_transaction_transaction__ = __webpack_require__(104);
390
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_11__pages_tabs_tabs__ = __webpack_require__(102);
391
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_12__pages_tab4_tab4__ = __webpack_require__(101);
392
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_13__providers_transaction_service__ = __webpack_require__(50);
322
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_3__ionic_native_splash_screen__ = __webpack_require__(199);
323
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_4__ionic_native_status_bar__ = __webpack_require__(202);
324
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_5__app_component__ = __webpack_require__(278);
325
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_6__angular_common_http__ = __webpack_require__(159);
326
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_7__providers_block_service__ = __webpack_require__(158);
327
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_8__pages_home_home__ = __webpack_require__(157);
328
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_9__pages_wallet_wallet__ = __webpack_require__(102);
329
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_10__pages_transaction_transaction__ = __webpack_require__(100);
330
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_11__pages_tabs_tabs__ = __webpack_require__(101);
331
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_12__pages_tab4_tab4__ = __webpack_require__(99);
393 332
 var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
394 333
     var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
395 334
     if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
@@ -409,7 +348,6 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
409 348
 
410 349
 
411 350
 
412
-
413 351
 var AppModule = /** @class */ (function () {
414 352
     function AppModule() {
415 353
     }
@@ -429,8 +367,8 @@ var AppModule = /** @class */ (function () {
429 367
                 __WEBPACK_IMPORTED_MODULE_2_ionic_angular__["c" /* IonicModule */].forRoot(__WEBPACK_IMPORTED_MODULE_5__app_component__["a" /* MyApp */], {}, {
430 368
                     links: [
431 369
                         { loadChildren: '../pages/tab4/tab4.module#Tab4PageModule', name: 'Tab4Page', segment: 'tab4', priority: 'low', defaultHistory: [] },
432
-                        { loadChildren: '../pages/tabs/tabs.module#TabsPageModule', name: 'TabsPage', segment: 'tabs', priority: 'low', defaultHistory: [] },
433 370
                         { loadChildren: '../pages/transaction/transaction.module#TransactionPageModule', name: 'TransactionPage', segment: 'transaction', priority: 'low', defaultHistory: [] },
371
+                        { loadChildren: '../pages/tabs/tabs.module#TabsPageModule', name: 'TabsPage', segment: 'tabs', priority: 'low', defaultHistory: [] },
434 372
                         { loadChildren: '../pages/wallet/wallet.module#WalletPageModule', name: 'WalletPage', segment: 'wallet', priority: 'low', defaultHistory: [] }
435 373
                     ]
436 374
                 })
@@ -448,7 +386,6 @@ var AppModule = /** @class */ (function () {
448 386
                 __WEBPACK_IMPORTED_MODULE_4__ionic_native_status_bar__["a" /* StatusBar */],
449 387
                 __WEBPACK_IMPORTED_MODULE_3__ionic_native_splash_screen__["a" /* SplashScreen */],
450 388
                 __WEBPACK_IMPORTED_MODULE_7__providers_block_service__["a" /* BlockService */],
451
-                __WEBPACK_IMPORTED_MODULE_13__providers_transaction_service__["a" /* TransactionService */],
452 389
                 { provide: __WEBPACK_IMPORTED_MODULE_1__angular_core__["u" /* ErrorHandler */], useClass: __WEBPACK_IMPORTED_MODULE_2_ionic_angular__["b" /* IonicErrorHandler */] }
453 390
             ]
454 391
         })
@@ -460,16 +397,16 @@ var AppModule = /** @class */ (function () {
460 397
 
461 398
 /***/ }),
462 399
 
463
-/***/ 279:
400
+/***/ 278:
464 401
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
465 402
 
466 403
 "use strict";
467 404
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return MyApp; });
468 405
 /* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__angular_core__ = __webpack_require__(0);
469 406
 /* harmony import */ var __WEBPACK_IMPORTED_MODULE_1_ionic_angular__ = __webpack_require__(28);
470
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__ionic_native_status_bar__ = __webpack_require__(203);
471
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_3__ionic_native_splash_screen__ = __webpack_require__(200);
472
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_4__pages_tabs_tabs__ = __webpack_require__(102);
407
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__ionic_native_status_bar__ = __webpack_require__(202);
408
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_3__ionic_native_splash_screen__ = __webpack_require__(199);
409
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_4__pages_tabs_tabs__ = __webpack_require__(101);
473 410
 var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
474 411
     var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
475 412
     if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
@@ -495,7 +432,7 @@ var MyApp = /** @class */ (function () {
495 432
         });
496 433
     }
497 434
     MyApp = __decorate([
498
-        Object(__WEBPACK_IMPORTED_MODULE_0__angular_core__["m" /* Component */])({template:/*ion-inline-start:"/Users/shivamp/labs/ZipCoin-RED/ZipCoinRedIonicClient/src/app/app.html"*/'<ion-nav [root]="rootPage"></ion-nav>\n'/*ion-inline-end:"/Users/shivamp/labs/ZipCoin-RED/ZipCoinRedIonicClient/src/app/app.html"*/
435
+        Object(__WEBPACK_IMPORTED_MODULE_0__angular_core__["m" /* Component */])({template:/*ion-inline-start:"/Users/ericf/ZCWProjects/ZipCoin-RED/ZipCoinRedIonicClient/src/app/app.html"*/'<ion-nav [root]="rootPage"></ion-nav>\n'/*ion-inline-end:"/Users/ericf/ZCWProjects/ZipCoin-RED/ZipCoinRedIonicClient/src/app/app.html"*/
499 436
         }),
500 437
         __metadata("design:paramtypes", [__WEBPACK_IMPORTED_MODULE_1_ionic_angular__["g" /* Platform */], __WEBPACK_IMPORTED_MODULE_2__ionic_native_status_bar__["a" /* StatusBar */], __WEBPACK_IMPORTED_MODULE_3__ionic_native_splash_screen__["a" /* SplashScreen */]])
501 438
     ], MyApp);
@@ -506,13 +443,13 @@ var MyApp = /** @class */ (function () {
506 443
 
507 444
 /***/ }),
508 445
 
509
-/***/ 50:
446
+/***/ 99:
510 447
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
511 448
 
512 449
 "use strict";
513
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return TransactionService; });
450
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return Tab4Page; });
514 451
 /* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__angular_core__ = __webpack_require__(0);
515
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__angular_common_http__ = __webpack_require__(78);
452
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1_ionic_angular__ = __webpack_require__(28);
516 453
 var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
517 454
     var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
518 455
     if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
@@ -524,27 +461,32 @@ var __metadata = (this && this.__metadata) || function (k, v) {
524 461
 };
525 462
 
526 463
 
527
-var TransactionService = /** @class */ (function () {
528
-    function TransactionService(http) {
529
-        this.http = http;
530
-        this.API = 'http://localhost:8080/api/v1';
531
-        this.TRANSACTION_API = this.API + '/transactions';
464
+/**
465
+ * Generated class for the Tab4Page page.
466
+ *
467
+ * See https://ionicframework.com/docs/components/#navigation for more info on
468
+ * Ionic pages and navigation.
469
+ */
470
+var Tab4Page = /** @class */ (function () {
471
+    function Tab4Page(navCtrl, navParams) {
472
+        this.navCtrl = navCtrl;
473
+        this.navParams = navParams;
532 474
     }
533
-    TransactionService.prototype.createTransaction = function (transaction) {
534
-        return this.http.post(this.TRANSACTION_API, transaction);
475
+    Tab4Page.prototype.ionViewDidLoad = function () {
476
+        console.log('ionViewDidLoad Tab4Page');
535 477
     };
536 478
     Tab4Page = __decorate([
537 479
         Object(__WEBPACK_IMPORTED_MODULE_0__angular_core__["m" /* Component */])({
538
-            selector: 'page-tab4',template:/*ion-inline-start:"/Users/shivamp/labs/ZipCoin-RED/ZipCoinRedIonicClient/src/pages/tab4/tab4.html"*/'<!--\n  Generated template for the Tab4Page page.\n\n  See http://ionicframework.com/docs/components/#navigation for more info on\n  Ionic pages and navigation.\n-->\n<ion-header>\n\n  <ion-navbar>\n    <ion-title>tab4</ion-title>\n  </ion-navbar>\n\n</ion-header>\n\n\n<ion-content padding>\n\n</ion-content>\n'/*ion-inline-end:"/Users/shivamp/labs/ZipCoin-RED/ZipCoinRedIonicClient/src/pages/tab4/tab4.html"*/,
480
+            selector: 'page-tab4',template:/*ion-inline-start:"/Users/ericf/ZCWProjects/ZipCoin-RED/ZipCoinRedIonicClient/src/pages/tab4/tab4.html"*/'<!--\n  Generated template for the Tab4Page page.\n\n  See http://ionicframework.com/docs/components/#navigation for more info on\n  Ionic pages and navigation.\n-->\n<ion-header>\n\n  <ion-navbar>\n    <ion-title>tab4</ion-title>\n  </ion-navbar>\n\n</ion-header>\n\n\n<ion-content padding>\n\n</ion-content>\n'/*ion-inline-end:"/Users/ericf/ZCWProjects/ZipCoin-RED/ZipCoinRedIonicClient/src/pages/tab4/tab4.html"*/,
539 481
         }),
540 482
         __metadata("design:paramtypes", [__WEBPACK_IMPORTED_MODULE_1_ionic_angular__["e" /* NavController */], __WEBPACK_IMPORTED_MODULE_1_ionic_angular__["f" /* NavParams */]])
541 483
     ], Tab4Page);
542 484
     return Tab4Page;
543 485
 }());
544 486
 
545
-//# sourceMappingURL=transaction-service.js.map
487
+//# sourceMappingURL=tab4.js.map
546 488
 
547 489
 /***/ })
548 490
 
549
-},[204]);
491
+},[203]);
550 492
 //# sourceMappingURL=main.js.map

+ 1
- 1
ZipCoinRedIonicClient/www/build/main.js.map
Diff onderdrukt omdat het te groot bestand
Bestand weergeven


+ 1
- 1
ZipCoinRedIonicClient/www/build/vendor.js.map
Diff onderdrukt omdat het te groot bestand
Bestand weergeven


+ 366
- 0
ZipCoinRedJavaServer/.idea/workspace.xml Bestand weergeven

@@ -0,0 +1,366 @@
1
+<?xml version="1.0" encoding="UTF-8"?>
2
+<project version="4">
3
+  <component name="ChangeListManager">
4
+    <list default="true" id="b5dbb83e-180b-4a0c-b0a5-ad5d71d5235c" name="Default" comment="" />
5
+    <ignored path="$PROJECT_DIR$/target/" />
6
+    <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
7
+    <option name="TRACKING_ENABLED" value="true" />
8
+    <option name="SHOW_DIALOG" value="false" />
9
+    <option name="HIGHLIGHT_CONFLICTS" value="true" />
10
+    <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
11
+    <option name="LAST_RESOLUTION" value="IGNORE" />
12
+  </component>
13
+  <component name="FileEditorManager">
14
+    <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
15
+      <file leaf-file-name="application.properties" pinned="false" current-in-tab="false">
16
+        <entry file="file://$PROJECT_DIR$/src/main/resources/application.properties">
17
+          <provider selected="true" editor-type-id="text-editor" />
18
+        </entry>
19
+      </file>
20
+      <file leaf-file-name="Transaction.java" pinned="false" current-in-tab="false">
21
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/zipcoin/model/Transaction.java">
22
+          <provider selected="true" editor-type-id="text-editor">
23
+            <state relative-caret-position="1080">
24
+              <caret line="72" column="30" selection-start-line="72" selection-start-column="30" selection-end-line="72" selection-end-column="30" />
25
+            </state>
26
+          </provider>
27
+        </entry>
28
+      </file>
29
+      <file leaf-file-name="BlockLoader.java" pinned="false" current-in-tab="false">
30
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/zipcoin/config/BlockLoader.java">
31
+          <provider selected="true" editor-type-id="text-editor">
32
+            <state relative-caret-position="30">
33
+              <caret line="2" column="13" selection-start-line="2" selection-start-column="13" selection-end-line="2" selection-end-column="13" />
34
+            </state>
35
+          </provider>
36
+        </entry>
37
+      </file>
38
+      <file leaf-file-name="TransactionLoader.java" pinned="false" current-in-tab="true">
39
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/zipcoin/config/TransactionLoader.java">
40
+          <provider selected="true" editor-type-id="text-editor">
41
+            <state relative-caret-position="18">
42
+              <caret line="10" column="13" selection-start-line="10" selection-start-column="13" selection-end-line="10" selection-end-column="13" />
43
+            </state>
44
+          </provider>
45
+        </entry>
46
+      </file>
47
+      <file leaf-file-name="Wallet.java" pinned="false" current-in-tab="false">
48
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/zipcoin/model/Wallet.java">
49
+          <provider selected="true" editor-type-id="text-editor">
50
+            <state relative-caret-position="75">
51
+              <caret line="12" column="13" selection-start-line="12" selection-start-column="13" selection-end-line="12" selection-end-column="13" />
52
+            </state>
53
+          </provider>
54
+        </entry>
55
+      </file>
56
+      <file leaf-file-name="WalletLoader.java" pinned="false" current-in-tab="false">
57
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/zipcoin/config/WalletLoader.java">
58
+          <provider selected="true" editor-type-id="text-editor">
59
+            <state relative-caret-position="75">
60
+              <caret line="7" column="13" selection-start-line="7" selection-start-column="13" selection-end-line="7" selection-end-column="13" />
61
+            </state>
62
+          </provider>
63
+        </entry>
64
+      </file>
65
+    </leaf>
66
+  </component>
67
+  <component name="Git.Settings">
68
+    <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$/.." />
69
+  </component>
70
+  <component name="IdeDocumentHistory">
71
+    <option name="CHANGED_PATHS">
72
+      <list>
73
+        <option value="$PROJECT_DIR$/src/main/resources/db/migration/V2__create_block.sql" />
74
+        <option value="$PROJECT_DIR$/src/main/java/com/zipcoin/model/Transaction.java" />
75
+      </list>
76
+    </option>
77
+  </component>
78
+  <component name="JsBuildToolGruntFileManager" detection-done="true" sorting="DEFINITION_ORDER" />
79
+  <component name="JsBuildToolPackageJson" detection-done="true" sorting="DEFINITION_ORDER" />
80
+  <component name="JsGulpfileManager">
81
+    <detection-done>true</detection-done>
82
+    <sorting>DEFINITION_ORDER</sorting>
83
+  </component>
84
+  <component name="MavenImportPreferences">
85
+    <option name="importingSettings">
86
+      <MavenImportingSettings>
87
+        <option name="importAutomatically" value="true" />
88
+      </MavenImportingSettings>
89
+    </option>
90
+  </component>
91
+  <component name="NodePackageJsonFileManager">
92
+    <packageJsonPaths />
93
+  </component>
94
+  <component name="ProjectFrameBounds" extendedState="1">
95
+    <option name="y" value="23" />
96
+    <option name="width" value="1280" />
97
+    <option name="height" value="713" />
98
+  </component>
99
+  <component name="ProjectView">
100
+    <navigator proportions="" version="1">
101
+      <foldersAlwaysOnTop value="true" />
102
+    </navigator>
103
+    <panes>
104
+      <pane id="Scope" />
105
+      <pane id="PackagesPane" />
106
+      <pane id="ProjectPane">
107
+        <subPane>
108
+          <expand>
109
+            <path>
110
+              <item name="ZipCoinRedJavaServer" type="b2602c69:ProjectViewProjectNode" />
111
+              <item name="ZipCoinRedJavaServer" type="462c0819:PsiDirectoryNode" />
112
+            </path>
113
+            <path>
114
+              <item name="ZipCoinRedJavaServer" type="b2602c69:ProjectViewProjectNode" />
115
+              <item name="ZipCoinRedJavaServer" type="462c0819:PsiDirectoryNode" />
116
+              <item name=".idea" type="462c0819:PsiDirectoryNode" />
117
+            </path>
118
+            <path>
119
+              <item name="ZipCoinRedJavaServer" type="b2602c69:ProjectViewProjectNode" />
120
+              <item name="ZipCoinRedJavaServer" type="462c0819:PsiDirectoryNode" />
121
+              <item name="src" type="462c0819:PsiDirectoryNode" />
122
+            </path>
123
+            <path>
124
+              <item name="ZipCoinRedJavaServer" type="b2602c69:ProjectViewProjectNode" />
125
+              <item name="ZipCoinRedJavaServer" type="462c0819:PsiDirectoryNode" />
126
+              <item name="src" type="462c0819:PsiDirectoryNode" />
127
+              <item name="main" type="462c0819:PsiDirectoryNode" />
128
+            </path>
129
+            <path>
130
+              <item name="ZipCoinRedJavaServer" type="b2602c69:ProjectViewProjectNode" />
131
+              <item name="ZipCoinRedJavaServer" type="462c0819:PsiDirectoryNode" />
132
+              <item name="src" type="462c0819:PsiDirectoryNode" />
133
+              <item name="main" type="462c0819:PsiDirectoryNode" />
134
+              <item name="java" type="462c0819:PsiDirectoryNode" />
135
+            </path>
136
+            <path>
137
+              <item name="ZipCoinRedJavaServer" type="b2602c69:ProjectViewProjectNode" />
138
+              <item name="ZipCoinRedJavaServer" type="462c0819:PsiDirectoryNode" />
139
+              <item name="src" type="462c0819:PsiDirectoryNode" />
140
+              <item name="main" type="462c0819:PsiDirectoryNode" />
141
+              <item name="java" type="462c0819:PsiDirectoryNode" />
142
+              <item name="zipcoin" type="462c0819:PsiDirectoryNode" />
143
+            </path>
144
+            <path>
145
+              <item name="ZipCoinRedJavaServer" type="b2602c69:ProjectViewProjectNode" />
146
+              <item name="ZipCoinRedJavaServer" type="462c0819:PsiDirectoryNode" />
147
+              <item name="src" type="462c0819:PsiDirectoryNode" />
148
+              <item name="main" type="462c0819:PsiDirectoryNode" />
149
+              <item name="java" type="462c0819:PsiDirectoryNode" />
150
+              <item name="zipcoin" type="462c0819:PsiDirectoryNode" />
151
+              <item name="config" type="462c0819:PsiDirectoryNode" />
152
+            </path>
153
+            <path>
154
+              <item name="ZipCoinRedJavaServer" type="b2602c69:ProjectViewProjectNode" />
155
+              <item name="ZipCoinRedJavaServer" type="462c0819:PsiDirectoryNode" />
156
+              <item name="src" type="462c0819:PsiDirectoryNode" />
157
+              <item name="main" type="462c0819:PsiDirectoryNode" />
158
+              <item name="java" type="462c0819:PsiDirectoryNode" />
159
+              <item name="zipcoin" type="462c0819:PsiDirectoryNode" />
160
+              <item name="model" type="462c0819:PsiDirectoryNode" />
161
+            </path>
162
+            <path>
163
+              <item name="ZipCoinRedJavaServer" type="b2602c69:ProjectViewProjectNode" />
164
+              <item name="ZipCoinRedJavaServer" type="462c0819:PsiDirectoryNode" />
165
+              <item name="src" type="462c0819:PsiDirectoryNode" />
166
+              <item name="main" type="462c0819:PsiDirectoryNode" />
167
+              <item name="resources" type="462c0819:PsiDirectoryNode" />
168
+            </path>
169
+          </expand>
170
+          <select />
171
+        </subPane>
172
+      </pane>
173
+      <pane id="AndroidView" />
174
+    </panes>
175
+  </component>
176
+  <component name="PropertiesComponent">
177
+    <property name="RequestMappingsPanelOrder0" value="0" />
178
+    <property name="RequestMappingsPanelOrder1" value="1" />
179
+    <property name="RequestMappingsPanelOrder2" value="2" />
180
+    <property name="RequestMappingsPanelWidth0" value="75" />
181
+    <property name="RequestMappingsPanelWidth1" value="75" />
182
+    <property name="RequestMappingsPanelWidth2" value="75" />
183
+    <property name="WebServerToolWindowFactoryState" value="false" />
184
+    <property name="aspect.path.notification.shown" value="true" />
185
+  </component>
186
+  <component name="RunDashboard">
187
+    <option name="ruleStates">
188
+      <list>
189
+        <RuleState>
190
+          <option name="name" value="ConfigurationTypeDashboardGroupingRule" />
191
+        </RuleState>
192
+        <RuleState>
193
+          <option name="name" value="StatusDashboardGroupingRule" />
194
+        </RuleState>
195
+      </list>
196
+    </option>
197
+  </component>
198
+  <component name="RunManager">
199
+    <configuration default="true" type="Application" factoryName="Application">
200
+      <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
201
+    </configuration>
202
+    <configuration default="true" type="JUnit" factoryName="JUnit">
203
+      <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
204
+      <option name="ALTERNATIVE_JRE_PATH" />
205
+      <option name="PACKAGE_NAME" />
206
+      <option name="MAIN_CLASS_NAME" />
207
+      <option name="METHOD_NAME" />
208
+      <option name="TEST_OBJECT" value="class" />
209
+      <option name="VM_PARAMETERS" value="-ea" />
210
+      <option name="PARAMETERS" />
211
+      <option name="WORKING_DIRECTORY" value="%MODULE_WORKING_DIR%" />
212
+      <option name="PASS_PARENT_ENVS" value="true" />
213
+      <option name="TEST_SEARCH_SCOPE">
214
+        <value defaultName="singleModule" />
215
+      </option>
216
+      <patterns />
217
+    </configuration>
218
+    <configuration name="ZipCoinApp" type="SpringBootApplicationConfigurationType" factoryName="Spring Boot" temporary="true" nameIsGenerated="true">
219
+      <module name="ZipCoin-RED" />
220
+      <extension name="coverage">
221
+        <pattern>
222
+          <option name="PATTERN" value="com.zipcoin.*" />
223
+          <option name="ENABLED" value="true" />
224
+        </pattern>
225
+      </extension>
226
+      <option name="SPRING_BOOT_MAIN_CLASS" value="com.zipcoin.ZipCoinApp" />
227
+    </configuration>
228
+    <configuration default="true" type="TestNG" factoryName="TestNG">
229
+      <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
230
+      <option name="ALTERNATIVE_JRE_PATH" />
231
+      <option name="SUITE_NAME" />
232
+      <option name="PACKAGE_NAME" />
233
+      <option name="MAIN_CLASS_NAME" />
234
+      <option name="METHOD_NAME" />
235
+      <option name="GROUP_NAME" />
236
+      <option name="TEST_OBJECT" value="CLASS" />
237
+      <option name="VM_PARAMETERS" value="-ea" />
238
+      <option name="PARAMETERS" />
239
+      <option name="WORKING_DIRECTORY" value="%MODULE_WORKING_DIR%" />
240
+      <option name="OUTPUT_DIRECTORY" />
241
+      <option name="PASS_PARENT_ENVS" value="true" />
242
+      <option name="TEST_SEARCH_SCOPE">
243
+        <value defaultName="singleModule" />
244
+      </option>
245
+      <option name="USE_DEFAULT_REPORTERS" value="false" />
246
+      <option name="PROPERTIES_FILE" />
247
+      <properties />
248
+      <listeners />
249
+    </configuration>
250
+    <recent_temporary>
251
+      <list>
252
+        <item itemvalue="Spring Boot.ZipCoinApp" />
253
+      </list>
254
+    </recent_temporary>
255
+  </component>
256
+  <component name="SvnConfiguration">
257
+    <configuration />
258
+  </component>
259
+  <component name="TaskManager">
260
+    <task active="true" id="Default" summary="Default task">
261
+      <changelist id="b5dbb83e-180b-4a0c-b0a5-ad5d71d5235c" name="Default" comment="" />
262
+      <created>1532539277106</created>
263
+      <option name="number" value="Default" />
264
+      <option name="presentableId" value="Default" />
265
+      <updated>1532539277106</updated>
266
+      <workItem from="1532539278868" duration="1448000" />
267
+      <workItem from="1532634925447" duration="753000" />
268
+      <workItem from="1533209082694" duration="537000" />
269
+    </task>
270
+    <servers />
271
+  </component>
272
+  <component name="TimeTrackingManager">
273
+    <option name="totallyTimeSpent" value="95000" />
274
+  </component>
275
+  <component name="ToolWindowManager">
276
+    <frame x="0" y="23" width="1280" height="713" extended-state="0" />
277
+    <layout>
278
+      <window_info anchor="right" id="Palette" order="3" />
279
+      <window_info anchor="bottom" id="Event Log" order="7" side_tool="true" />
280
+      <window_info anchor="right" id="Maven Projects" order="3" />
281
+      <window_info anchor="bottom" id="Database Changes" order="7" show_stripe_button="false" />
282
+      <window_info id="Capture Tool" order="2" />
283
+      <window_info id="Designer" order="2" />
284
+      <window_info anchor="right" id="Database" order="3" />
285
+      <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
286
+      <window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
287
+      <window_info id="UI Designer" order="2" />
288
+      <window_info anchor="bottom" id="Debug" order="3" weight="0.4" />
289
+      <window_info anchor="bottom" id="TODO" order="6" />
290
+      <window_info anchor="bottom" id="Messages" order="7" weight="0.22530521" />
291
+      <window_info anchor="right" id="Palette&#9;" order="3" />
292
+      <window_info id="Image Layers" order="2" />
293
+      <window_info anchor="bottom" id="Java Enterprise" order="7" />
294
+      <window_info anchor="right" id="Capture Analysis" order="3" />
295
+      <window_info anchor="bottom" id="Version Control" order="7" />
296
+      <window_info active="true" anchor="bottom" id="Run" order="2" visible="true" weight="0.9853896" />
297
+      <window_info anchor="bottom" id="Spring" order="7" />
298
+      <window_info anchor="bottom" id="Terminal" order="7" />
299
+      <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.25767368" />
300
+      <window_info anchor="right" id="Bean Validation" order="3" />
301
+      <window_info id="Web" order="2" side_tool="true" />
302
+      <window_info anchor="right" id="Theme Preview" order="3" />
303
+      <window_info id="Favorites" order="2" side_tool="true" />
304
+      <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
305
+      <window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
306
+      <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
307
+      <window_info anchor="bottom" id="Message" order="0" />
308
+      <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
309
+      <window_info anchor="bottom" id="Find" order="1" />
310
+    </layout>
311
+  </component>
312
+  <component name="VcsContentAnnotationSettings">
313
+    <option name="myLimit" value="2678400000" />
314
+  </component>
315
+  <component name="editorHistoryManager">
316
+    <entry file="file://$PROJECT_DIR$/src/main/resources/application.properties">
317
+      <provider selected="true" editor-type-id="text-editor" />
318
+    </entry>
319
+    <entry file="file://$PROJECT_DIR$/.idea/workspace.xml">
320
+      <provider selected="true" editor-type-id="text-editor">
321
+        <state relative-caret-position="330">
322
+          <caret line="22" column="23" lean-forward="true" selection-start-line="22" selection-start-column="23" selection-end-line="22" selection-end-column="23" />
323
+        </state>
324
+      </provider>
325
+    </entry>
326
+    <entry file="file://$PROJECT_DIR$/src/main/resources/application.properties">
327
+      <provider selected="true" editor-type-id="text-editor" />
328
+    </entry>
329
+    <entry file="file://$PROJECT_DIR$/src/main/resources/db/migration/V2__create_block.sql" />
330
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/zipcoin/model/Transaction.java">
331
+      <provider selected="true" editor-type-id="text-editor">
332
+        <state relative-caret-position="1080">
333
+          <caret line="72" column="30" selection-start-line="72" selection-start-column="30" selection-end-line="72" selection-end-column="30" />
334
+        </state>
335
+      </provider>
336
+    </entry>
337
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/zipcoin/model/Wallet.java">
338
+      <provider selected="true" editor-type-id="text-editor">
339
+        <state relative-caret-position="75">
340
+          <caret line="12" column="13" selection-start-line="12" selection-start-column="13" selection-end-line="12" selection-end-column="13" />
341
+        </state>
342
+      </provider>
343
+    </entry>
344
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/zipcoin/config/BlockLoader.java">
345
+      <provider selected="true" editor-type-id="text-editor">
346
+        <state relative-caret-position="30">
347
+          <caret line="2" column="13" selection-start-line="2" selection-start-column="13" selection-end-line="2" selection-end-column="13" />
348
+        </state>
349
+      </provider>
350
+    </entry>
351
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/zipcoin/config/WalletLoader.java">
352
+      <provider selected="true" editor-type-id="text-editor">
353
+        <state relative-caret-position="75">
354
+          <caret line="7" column="13" selection-start-line="7" selection-start-column="13" selection-end-line="7" selection-end-column="13" />
355
+        </state>
356
+      </provider>
357
+    </entry>
358
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/zipcoin/config/TransactionLoader.java">
359
+      <provider selected="true" editor-type-id="text-editor">
360
+        <state relative-caret-position="18">
361
+          <caret line="10" column="13" selection-start-line="10" selection-start-column="13" selection-end-line="10" selection-end-column="13" />
362
+        </state>
363
+      </provider>
364
+    </entry>
365
+  </component>
366
+</project>

+ 0
- 1
ZipCoinRedJavaServer/ZipCoin-RED.iml Bestand weergeven

@@ -26,7 +26,6 @@
26 26
     </content>
27 27
     <orderEntry type="inheritedJdk" />
28 28
     <orderEntry type="sourceFolder" forTests="false" />
29
-    <orderEntry type="library" scope="RUNTIME" name="Maven: mysql:mysql-connector-java:5.1.38" level="project" />
30 29
     <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-web:1.3.1.RELEASE" level="project" />
31 30
     <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter:1.3.1.RELEASE" level="project" />
32 31
     <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot:1.3.1.RELEASE" level="project" />