Browse Source

transaction list, block list, and removed payment from dropdown

Eric Foster 6 years ago
parent
commit
b891d7d804

+ 1
- 1
ZipCoinRedIonicClient/.sourcemaps/main.js.map
File diff suppressed because it is too large
View File


+ 2
- 2
ZipCoinRedIonicClient/src/pages/transaction/transaction.html View File

@@ -24,8 +24,8 @@
24 24
                 </ion-card-header>
25 25
                 <ion-card-content>
26 26
                   <div>Sender: {{ transaction.sender }}</div>
27
-                  <div>Recipient: {{ block.recipient }}</div>
28
-                  <div>Amount: {{ block.amount }}</div>
27
+                  <div>Recipient: {{ transaction.recipient }}</div>
28
+                  <div>Amount: {{ transaction.amount }}</div>
29 29
                 </ion-card-content>
30 30
             </ion-card>
31 31
           </ion-item>

+ 2
- 2
ZipCoinRedIonicClient/src/pages/wallet/wallet.html View File

@@ -37,13 +37,13 @@
37 37
       <div class = "bar bar-subheader bar-assertive">
38 38
           <h2 class = "title">Payment</h2>
39 39
        </div>
40
-       <ion-item>
40
+       <!-- <ion-item>
41 41
           <ion-label>From</ion-label>
42 42
           <ion-select [(ngModel)]="name">
43 43
             <ion-option value="ann">Ann</ion-option>
44 44
             <ion-option value="sen">Sen</ion-option>
45 45
           </ion-select>
46
-         </ion-item>
46
+         </ion-item> -->
47 47
          <ion-item>
48 48
             <ion-label>To</ion-label>
49 49
             <ion-select [(ngModel)]="to">

+ 1
- 1
ZipCoinRedIonicClient/www/build/0.js View File

@@ -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__(103);
11
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__wallet__ = __webpack_require__(104);
12 12
 /* harmony import */ var __WEBPACK_IMPORTED_MODULE_3__providers_transaction_service__ = __webpack_require__(50);
13 13
 var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
14 14
     var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;

+ 2
- 2
ZipCoinRedIonicClient/www/build/1.js View File

@@ -1,6 +1,6 @@
1 1
 webpackJsonp([1],{
2 2
 
3
-/***/ 282:
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__, "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__(104);
11
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__transaction__ = __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/2.js View File

@@ -1,6 +1,6 @@
1 1
 webpackJsonp([2],{
2 2
 
3
-/***/ 281:
3
+/***/ 282:
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__(102);
11
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__tabs__ = __webpack_require__(103);
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);

+ 67
- 67
ZipCoinRedIonicClient/www/build/main.js View File

@@ -49,11 +49,67 @@ var Tab4Page = /** @class */ (function () {
49 49
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
50 50
 
51 51
 "use strict";
52
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return TransactionPage; });
53
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__angular_core__ = __webpack_require__(0);
54
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1_ionic_angular__ = __webpack_require__(28);
55
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__providers_transaction_service__ = __webpack_require__(50);
56
+var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
57
+    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
58
+    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
59
+    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;
60
+    return c > 3 && r && Object.defineProperty(target, key, r), r;
61
+};
62
+var __metadata = (this && this.__metadata) || function (k, v) {
63
+    if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
64
+};
65
+
66
+
67
+
68
+/**
69
+ * Generated class for the TransactionPage page.
70
+ *
71
+ * See https://ionicframework.com/docs/components/#navigation for more info on
72
+ * Ionic pages and navigation.
73
+ */
74
+var TransactionPage = /** @class */ (function () {
75
+    function TransactionPage(navCtrl, navParams, transactionService) {
76
+        this.navCtrl = navCtrl;
77
+        this.navParams = navParams;
78
+        this.transactionService = transactionService;
79
+        this.getAllTransactions();
80
+    }
81
+    TransactionPage.prototype.ionViewDidLoad = function () {
82
+        console.log('ionViewDidLoad TransactionPage');
83
+    };
84
+    TransactionPage.prototype.getAllTransactions = function () {
85
+        var _this = this;
86
+        this.transactionService.getAllTransactions().subscribe(function (transactions) {
87
+            _this.transactions = transactions;
88
+        });
89
+    };
90
+    TransactionPage = __decorate([
91
+        Object(__WEBPACK_IMPORTED_MODULE_0__angular_core__["m" /* Component */])({
92
+            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-list>\n        <ion-item-sliding *ngFor="let transaction of transactions">\n          <ion-item>\n            <ion-card>\n                <ion-card-header>\n                  Transaction #: {{transaction.transactionId}}\n                </ion-card-header>\n                <ion-card-content>\n                  <div>Sender: {{ transaction.sender }}</div>\n                  <div>Recipient: {{ transaction.recipient }}</div>\n                  <div>Amount: {{ transaction.amount }}</div>\n                </ion-card-content>\n            </ion-card>\n          </ion-item>\n        </ion-item-sliding>\n      </ion-list>\n\n</ion-content>\n'/*ion-inline-end:"/Users/ericf/ZCWProjects/ZipCoin-RED/ZipCoinRedIonicClient/src/pages/transaction/transaction.html"*/,
93
+        }),
94
+        __metadata("design:paramtypes", [__WEBPACK_IMPORTED_MODULE_1_ionic_angular__["e" /* NavController */], __WEBPACK_IMPORTED_MODULE_1_ionic_angular__["f" /* NavParams */],
95
+            __WEBPACK_IMPORTED_MODULE_2__providers_transaction_service__["a" /* TransactionService */]])
96
+    ], TransactionPage);
97
+    return TransactionPage;
98
+}());
99
+
100
+//# sourceMappingURL=transaction.js.map
101
+
102
+/***/ }),
103
+
104
+/***/ 103:
105
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
106
+
107
+"use strict";
52 108
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return TabsPage; });
53 109
 /* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__angular_core__ = __webpack_require__(0);
54 110
 /* 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);
111
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__wallet_wallet__ = __webpack_require__(104);
112
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_3__transaction_transaction__ = __webpack_require__(102);
57 113
 /* harmony import */ var __WEBPACK_IMPORTED_MODULE_4__tab4_tab4__ = __webpack_require__(101);
58 114
 var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
59 115
     var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
@@ -89,7 +145,7 @@ var TabsPage = /** @class */ (function () {
89 145
 
90 146
 /***/ }),
91 147
 
92
-/***/ 103:
148
+/***/ 104:
93 149
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
94 150
 
95 151
 "use strict";
@@ -129,7 +185,7 @@ var WalletPage = /** @class */ (function () {
129 185
     };
130 186
     WalletPage = __decorate([
131 187
         Object(__WEBPACK_IMPORTED_MODULE_0__angular_core__["m" /* Component */])({
132
-            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="ann">Ann</ion-option>\n        <ion-option value="sen">Sen</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="ann">Ann</ion-option>\n            <ion-option value="sen">Sen</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="ann">Ann</ion-option>\n              <ion-option value="sen">Sen</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"*/,
188
+            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="ann">Ann</ion-option>\n        <ion-option value="sen">Sen</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="ann">Ann</ion-option>\n            <ion-option value="sen">Sen</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="ann">Ann</ion-option>\n              <ion-option value="sen">Sen</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 189
         }),
134 190
         __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 */]])
135 191
     ], WalletPage);
@@ -140,62 +196,6 @@ var WalletPage = /** @class */ (function () {
140 196
 
141 197
 /***/ }),
142 198
 
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
-        this.getAllTransactions();
175
-    }
176
-    TransactionPage.prototype.ionViewDidLoad = function () {
177
-        console.log('ionViewDidLoad TransactionPage');
178
-    };
179
-    TransactionPage.prototype.getAllTransactions = function () {
180
-        var _this = this;
181
-        this.transactionService.getAllTransactions().subscribe(function (transactions) {
182
-            _this.transactions = transactions;
183
-        });
184
-    };
185
-    TransactionPage = __decorate([
186
-        Object(__WEBPACK_IMPORTED_MODULE_0__angular_core__["m" /* Component */])({
187
-            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-list>\n        <ion-item-sliding *ngFor="let transaction of transactions">\n          <ion-item>\n            <ion-card>\n                <ion-card-header>\n                  Transaction #: {{transaction.transactionId}}\n                </ion-card-header>\n                <ion-card-content>\n                  <div>Sender: {{ transaction.sender }}</div>\n                  <div>Recipient: {{ block.recipient }}</div>\n                  <div>Amount: {{ block.amount }}</div>\n                </ion-card-content>\n            </ion-card>\n          </ion-item>\n        </ion-item-sliding>\n      </ion-list>\n\n</ion-content>\n'/*ion-inline-end:"/Users/ericf/ZCWProjects/ZipCoin-RED/ZipCoinRedIonicClient/src/pages/transaction/transaction.html"*/,
188
-        }),
189
-        __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, typeof (_c = typeof __WEBPACK_IMPORTED_MODULE_2__providers_transaction_service__["a" /* TransactionService */] !== "undefined" && __WEBPACK_IMPORTED_MODULE_2__providers_transaction_service__["a" /* TransactionService */]) === "function" && _c || Object])
190
-    ], TransactionPage);
191
-    return TransactionPage;
192
-    var _a, _b, _c;
193
-}());
194
-
195
-//# sourceMappingURL=transaction.js.map
196
-
197
-/***/ }),
198
-
199 199
 /***/ 116:
200 200
 /***/ (function(module, exports) {
201 201
 
@@ -222,11 +222,11 @@ var map = {
222 222
 		3
223 223
 	],
224 224
 	"../pages/tabs/tabs.module": [
225
-		281,
225
+		282,
226 226
 		2
227 227
 	],
228 228
 	"../pages/transaction/transaction.module": [
229
-		282,
229
+		281,
230 230
 		1
231 231
 	],
232 232
 	"../pages/wallet/wallet.module": [
@@ -386,9 +386,9 @@ Object(__WEBPACK_IMPORTED_MODULE_0__angular_platform_browser_dynamic__["a" /* pl
386 386
 /* harmony import */ var __WEBPACK_IMPORTED_MODULE_6__angular_common_http__ = __webpack_require__(78);
387 387
 /* harmony import */ var __WEBPACK_IMPORTED_MODULE_7__providers_block_service__ = __webpack_require__(160);
388 388
 /* harmony import */ var __WEBPACK_IMPORTED_MODULE_8__pages_home_home__ = __webpack_require__(159);
389
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_9__pages_wallet_wallet__ = __webpack_require__(103);
390
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_10__pages_transaction_transaction__ = __webpack_require__(104);
391
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_11__pages_tabs_tabs__ = __webpack_require__(102);
389
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_9__pages_wallet_wallet__ = __webpack_require__(104);
390
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_10__pages_transaction_transaction__ = __webpack_require__(102);
391
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_11__pages_tabs_tabs__ = __webpack_require__(103);
392 392
 /* harmony import */ var __WEBPACK_IMPORTED_MODULE_12__pages_tab4_tab4__ = __webpack_require__(101);
393 393
 /* harmony import */ var __WEBPACK_IMPORTED_MODULE_13__providers_transaction_service__ = __webpack_require__(50);
394 394
 var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
@@ -430,8 +430,8 @@ var AppModule = /** @class */ (function () {
430 430
                 __WEBPACK_IMPORTED_MODULE_2_ionic_angular__["c" /* IonicModule */].forRoot(__WEBPACK_IMPORTED_MODULE_5__app_component__["a" /* MyApp */], {}, {
431 431
                     links: [
432 432
                         { loadChildren: '../pages/tab4/tab4.module#Tab4PageModule', name: 'Tab4Page', segment: 'tab4', priority: 'low', defaultHistory: [] },
433
-                        { loadChildren: '../pages/tabs/tabs.module#TabsPageModule', name: 'TabsPage', segment: 'tabs', priority: 'low', defaultHistory: [] },
434 433
                         { loadChildren: '../pages/transaction/transaction.module#TransactionPageModule', name: 'TransactionPage', segment: 'transaction', priority: 'low', defaultHistory: [] },
434
+                        { loadChildren: '../pages/tabs/tabs.module#TabsPageModule', name: 'TabsPage', segment: 'tabs', priority: 'low', defaultHistory: [] },
435 435
                         { loadChildren: '../pages/wallet/wallet.module#WalletPageModule', name: 'WalletPage', segment: 'wallet', priority: 'low', defaultHistory: [] }
436 436
                     ]
437 437
                 })
@@ -470,7 +470,7 @@ var AppModule = /** @class */ (function () {
470 470
 /* harmony import */ var __WEBPACK_IMPORTED_MODULE_1_ionic_angular__ = __webpack_require__(28);
471 471
 /* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__ionic_native_status_bar__ = __webpack_require__(203);
472 472
 /* harmony import */ var __WEBPACK_IMPORTED_MODULE_3__ionic_native_splash_screen__ = __webpack_require__(200);
473
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_4__pages_tabs_tabs__ = __webpack_require__(102);
473
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_4__pages_tabs_tabs__ = __webpack_require__(103);
474 474
 var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
475 475
     var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
476 476
     if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);

+ 1
- 1
ZipCoinRedIonicClient/www/build/main.js.map
File diff suppressed because it is too large
View File


+ 1
- 1
ZipCoinRedIonicClient/www/build/vendor.js.map
File diff suppressed because it is too large
View File


+ 2
- 1
ZipCoinRedJavaServer/src/main/java/com/zipcoin/model/Transaction.java View File

@@ -50,7 +50,7 @@ public class Transaction {
50 50
         this.sender = sender;
51 51
     }
52 52
 
53
-    public String getReciepient() {
53
+    public String getRecipient() {
54 54
         return recipient;
55 55
     }
56 56
 
@@ -85,4 +85,5 @@ public class Transaction {
85 85
     // String data = StringUtil.getStringFromKey(sender) + StringUtil.getStringFromKey(reciepient) + Float.toString(value)    ;
86 86
     // return StringUtil.verifyECDSASig(sender, data, this.signature);
87 87
     //}
88
+
88 89
 }

BIN
ZipCoinRedJavaServer/target/classes/com/zipcoin/model/Transaction.class View File