|
|
@@ -1,15 +1,113 @@
|
|
1
|
1
|
webpackJsonp([4],{
|
|
2
|
2
|
|
|
3
|
|
-/***/ 100:
|
|
|
3
|
+/***/ 101:
|
|
|
4
|
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
|
|
|
5
|
+
|
|
|
6
|
+"use strict";
|
|
|
7
|
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return Tab4Page; });
|
|
|
8
|
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__angular_core__ = __webpack_require__(0);
|
|
|
9
|
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1_ionic_angular__ = __webpack_require__(28);
|
|
|
10
|
+var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
|
|
|
11
|
+ var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
|
|
|
12
|
+ if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
|
|
|
13
|
+ 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;
|
|
|
14
|
+ return c > 3 && r && Object.defineProperty(target, key, r), r;
|
|
|
15
|
+};
|
|
|
16
|
+var __metadata = (this && this.__metadata) || function (k, v) {
|
|
|
17
|
+ if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
|
|
|
18
|
+};
|
|
|
19
|
+
|
|
|
20
|
+
|
|
|
21
|
+/**
|
|
|
22
|
+ * Generated class for the Tab4Page page.
|
|
|
23
|
+ *
|
|
|
24
|
+ * See https://ionicframework.com/docs/components/#navigation for more info on
|
|
|
25
|
+ * Ionic pages and navigation.
|
|
|
26
|
+ */
|
|
|
27
|
+var Tab4Page = /** @class */ (function () {
|
|
|
28
|
+ function Tab4Page(navCtrl, navParams) {
|
|
|
29
|
+ this.navCtrl = navCtrl;
|
|
|
30
|
+ this.navParams = navParams;
|
|
|
31
|
+ }
|
|
|
32
|
+ Tab4Page.prototype.ionViewDidLoad = function () {
|
|
|
33
|
+ console.log('ionViewDidLoad Tab4Page');
|
|
|
34
|
+ };
|
|
|
35
|
+ Tab4Page = __decorate([
|
|
|
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"*/,
|
|
|
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;
|
|
|
42
|
+}());
|
|
|
43
|
+
|
|
|
44
|
+//# sourceMappingURL=tab4.js.map
|
|
|
45
|
+
|
|
|
46
|
+/***/ }),
|
|
|
47
|
+
|
|
|
48
|
+/***/ 102:
|
|
|
49
|
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
|
|
|
50
|
+
|
|
|
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
|
+var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
|
|
|
56
|
+ var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
|
|
|
57
|
+ if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
|
|
|
58
|
+ 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;
|
|
|
59
|
+ return c > 3 && r && Object.defineProperty(target, key, r), r;
|
|
|
60
|
+};
|
|
|
61
|
+var __metadata = (this && this.__metadata) || function (k, v) {
|
|
|
62
|
+ if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
|
|
|
63
|
+};
|
|
|
64
|
+
|
|
|
65
|
+
|
|
|
66
|
+/**
|
|
|
67
|
+ * Generated class for the TransactionPage page.
|
|
|
68
|
+ *
|
|
|
69
|
+ * See https://ionicframework.com/docs/components/#navigation for more info on
|
|
|
70
|
+ * Ionic pages and navigation.
|
|
|
71
|
+ */
|
|
|
72
|
+var TransactionPage = /** @class */ (function () {
|
|
|
73
|
+ function TransactionPage(navCtrl, navParams) {
|
|
|
74
|
+ this.navCtrl = navCtrl;
|
|
|
75
|
+ this.navParams = navParams;
|
|
|
76
|
+ }
|
|
|
77
|
+ TransactionPage.prototype.ionViewDidLoad = function () {
|
|
|
78
|
+ console.log('ionViewDidLoad TransactionPage');
|
|
|
79
|
+ };
|
|
|
80
|
+ TransactionPage = __decorate([
|
|
|
81
|
+ Object(__WEBPACK_IMPORTED_MODULE_0__angular_core__["m" /* Component */])({
|
|
|
82
|
+ 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"*/,
|
|
|
83
|
+ }),
|
|
|
84
|
+ __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])
|
|
|
85
|
+ ], TransactionPage);
|
|
|
86
|
+ return TransactionPage;
|
|
|
87
|
+ var _a, _b;
|
|
|
88
|
+}());
|
|
|
89
|
+
|
|
|
90
|
+//# sourceMappingURL=transaction.js.map
|
|
|
91
|
+
|
|
|
92
|
+/***/ }),
|
|
|
93
|
+
|
|
|
94
|
+/***/ 101:
|
|
4
|
95
|
/***/ (function(module, __webpack_exports__, __webpack_require__) {
|
|
5
|
96
|
|
|
6
|
97
|
"use strict";
|
|
7
|
98
|
/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return TabsPage; });
|
|
8
|
99
|
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__angular_core__ = __webpack_require__(0);
|
|
|
100
|
+<<<<<<< HEAD
|
|
9
|
101
|
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__home_home__ = __webpack_require__(157);
|
|
10
|
|
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__wallet_wallet__ = __webpack_require__(101);
|
|
11
|
|
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_3__transaction_transaction__ = __webpack_require__(102);
|
|
|
102
|
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__wallet_wallet__ = __webpack_require__(102);
|
|
|
103
|
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_3__transaction_transaction__ = __webpack_require__(100);
|
|
12
|
104
|
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_4__tab4_tab4__ = __webpack_require__(99);
|
|
|
105
|
+=======
|
|
|
106
|
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__home_home__ = __webpack_require__(159);
|
|
|
107
|
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__wallet_wallet__ = __webpack_require__(103);
|
|
|
108
|
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_3__transaction_transaction__ = __webpack_require__(104);
|
|
|
109
|
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_4__tab4_tab4__ = __webpack_require__(101);
|
|
|
110
|
+>>>>>>> posttransaction
|
|
13
|
111
|
var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
|
|
14
|
112
|
var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
|
|
15
|
113
|
if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
|
|
|
@@ -33,7 +131,7 @@ var TabsPage = /** @class */ (function () {
|
|
33
|
131
|
}
|
|
34
|
132
|
TabsPage = __decorate([
|
|
35
|
133
|
Object(__WEBPACK_IMPORTED_MODULE_0__angular_core__["m" /* Component */])({
|
|
36
|
|
- selector: 'page-tabs',template:/*ion-inline-start:"/Users/navyas/Labs6/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/navyas/Labs6/ZipCoin-RED/ZipCoinRedIonicClient/src/pages/tabs/tabs.html"*/,
|
|
|
134
|
+ 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"*/,
|
|
37
|
135
|
}),
|
|
38
|
136
|
__metadata("design:paramtypes", [])
|
|
39
|
137
|
], TabsPage);
|
|
|
@@ -44,13 +142,18 @@ var TabsPage = /** @class */ (function () {
|
|
44
|
142
|
|
|
45
|
143
|
/***/ }),
|
|
46
|
144
|
|
|
47
|
|
-/***/ 101:
|
|
|
145
|
+<<<<<<< HEAD
|
|
|
146
|
+/***/ 102:
|
|
|
147
|
+=======
|
|
|
148
|
+/***/ 103:
|
|
|
149
|
+>>>>>>> posttransaction
|
|
48
|
150
|
/***/ (function(module, __webpack_exports__, __webpack_require__) {
|
|
49
|
151
|
|
|
50
|
152
|
"use strict";
|
|
51
|
153
|
/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return WalletPage; });
|
|
52
|
154
|
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__angular_core__ = __webpack_require__(0);
|
|
53
|
155
|
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1_ionic_angular__ = __webpack_require__(28);
|
|
|
156
|
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__providers_transaction_service__ = __webpack_require__(50);
|
|
54
|
157
|
var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
|
|
55
|
158
|
var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
|
|
56
|
159
|
if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
|
|
|
@@ -62,6 +165,7 @@ var __metadata = (this && this.__metadata) || function (k, v) {
|
|
62
|
165
|
};
|
|
63
|
166
|
|
|
64
|
167
|
|
|
|
168
|
+
|
|
65
|
169
|
/**
|
|
66
|
170
|
* Generated class for the WalletPage page.
|
|
67
|
171
|
*
|
|
|
@@ -69,18 +173,22 @@ var __metadata = (this && this.__metadata) || function (k, v) {
|
|
69
|
173
|
* Ionic pages and navigation.
|
|
70
|
174
|
*/
|
|
71
|
175
|
var WalletPage = /** @class */ (function () {
|
|
72
|
|
- function WalletPage(navCtrl, navParams) {
|
|
|
176
|
+ function WalletPage(navCtrl, navParams, transactionService) {
|
|
73
|
177
|
this.navCtrl = navCtrl;
|
|
74
|
178
|
this.navParams = navParams;
|
|
|
179
|
+ this.transactionService = transactionService;
|
|
75
|
180
|
}
|
|
76
|
181
|
WalletPage.prototype.ionViewDidLoad = function () {
|
|
77
|
182
|
console.log('ionViewDidLoad WalletPage');
|
|
78
|
183
|
};
|
|
|
184
|
+ WalletPage.prototype.createTransaction = function () {
|
|
|
185
|
+ this.transactionService.createTransaction(this.transaction);
|
|
|
186
|
+ };
|
|
79
|
187
|
WalletPage = __decorate([
|
|
80
|
188
|
Object(__WEBPACK_IMPORTED_MODULE_0__angular_core__["m" /* Component */])({
|
|
81
|
|
- selector: 'page-wallet',template:/*ion-inline-start:"/Users/navyas/Labs6/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/navyas/Labs6/ZipCoin-RED/ZipCoinRedIonicClient/src/pages/wallet/wallet.html"*/,
|
|
|
189
|
+ 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"*/,
|
|
82
|
190
|
}),
|
|
83
|
|
- __metadata("design:paramtypes", [__WEBPACK_IMPORTED_MODULE_1_ionic_angular__["e" /* NavController */], __WEBPACK_IMPORTED_MODULE_1_ionic_angular__["f" /* NavParams */]])
|
|
|
191
|
+ __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 */]])
|
|
84
|
192
|
], WalletPage);
|
|
85
|
193
|
return WalletPage;
|
|
86
|
194
|
}());
|
|
|
@@ -89,13 +197,17 @@ var WalletPage = /** @class */ (function () {
|
|
89
|
197
|
|
|
90
|
198
|
/***/ }),
|
|
91
|
199
|
|
|
92
|
|
-/***/ 102:
|
|
|
200
|
+<<<<<<< HEAD
|
|
|
201
|
+/***/ 114:
|
|
|
202
|
+=======
|
|
|
203
|
+/***/ 104:
|
|
93
|
204
|
/***/ (function(module, __webpack_exports__, __webpack_require__) {
|
|
94
|
205
|
|
|
95
|
206
|
"use strict";
|
|
96
|
207
|
/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return TransactionPage; });
|
|
97
|
208
|
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__angular_core__ = __webpack_require__(0);
|
|
98
|
209
|
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1_ionic_angular__ = __webpack_require__(28);
|
|
|
210
|
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__providers_transaction_service__ = __webpack_require__(50);
|
|
99
|
211
|
var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
|
|
100
|
212
|
var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
|
|
101
|
213
|
if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
|
|
|
@@ -107,6 +219,7 @@ var __metadata = (this && this.__metadata) || function (k, v) {
|
|
107
|
219
|
};
|
|
108
|
220
|
|
|
109
|
221
|
|
|
|
222
|
+
|
|
110
|
223
|
/**
|
|
111
|
224
|
* Generated class for the TransactionPage page.
|
|
112
|
225
|
*
|
|
|
@@ -114,18 +227,26 @@ var __metadata = (this && this.__metadata) || function (k, v) {
|
|
114
|
227
|
* Ionic pages and navigation.
|
|
115
|
228
|
*/
|
|
116
|
229
|
var TransactionPage = /** @class */ (function () {
|
|
117
|
|
- function TransactionPage(navCtrl, navParams) {
|
|
|
230
|
+ function TransactionPage(navCtrl, navParams, transactionService) {
|
|
118
|
231
|
this.navCtrl = navCtrl;
|
|
119
|
232
|
this.navParams = navParams;
|
|
|
233
|
+ this.transactionService = transactionService;
|
|
120
|
234
|
}
|
|
121
|
235
|
TransactionPage.prototype.ionViewDidLoad = function () {
|
|
122
|
236
|
console.log('ionViewDidLoad TransactionPage');
|
|
123
|
237
|
};
|
|
|
238
|
+ TransactionPage.prototype.getAllTransactions = function () {
|
|
|
239
|
+ var _this = this;
|
|
|
240
|
+ this.transactionService.getAllTransactions().subscribe(function (transactions) {
|
|
|
241
|
+ _this.transactions = transactions;
|
|
|
242
|
+ });
|
|
|
243
|
+ };
|
|
124
|
244
|
TransactionPage = __decorate([
|
|
125
|
245
|
Object(__WEBPACK_IMPORTED_MODULE_0__angular_core__["m" /* Component */])({
|
|
126
|
|
- selector: 'page-transaction',template:/*ion-inline-start:"/Users/navyas/Labs6/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/navyas/Labs6/ZipCoin-RED/ZipCoinRedIonicClient/src/pages/transaction/transaction.html"*/,
|
|
|
246
|
+ 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"*/,
|
|
127
|
247
|
}),
|
|
128
|
|
- __metadata("design:paramtypes", [__WEBPACK_IMPORTED_MODULE_1_ionic_angular__["e" /* NavController */], __WEBPACK_IMPORTED_MODULE_1_ionic_angular__["f" /* NavParams */]])
|
|
|
248
|
+ __metadata("design:paramtypes", [__WEBPACK_IMPORTED_MODULE_1_ionic_angular__["e" /* NavController */], __WEBPACK_IMPORTED_MODULE_1_ionic_angular__["f" /* NavParams */],
|
|
|
249
|
+ __WEBPACK_IMPORTED_MODULE_2__providers_transaction_service__["a" /* TransactionService */]])
|
|
129
|
250
|
], TransactionPage);
|
|
130
|
251
|
return TransactionPage;
|
|
131
|
252
|
}());
|
|
|
@@ -134,7 +255,8 @@ var TransactionPage = /** @class */ (function () {
|
|
134
|
255
|
|
|
135
|
256
|
/***/ }),
|
|
136
|
257
|
|
|
137
|
|
-/***/ 114:
|
|
|
258
|
+/***/ 116:
|
|
|
259
|
+>>>>>>> posttransaction
|
|
138
|
260
|
/***/ (function(module, exports) {
|
|
139
|
261
|
|
|
140
|
262
|
function webpackEmptyAsyncContext(req) {
|
|
|
@@ -147,28 +269,32 @@ function webpackEmptyAsyncContext(req) {
|
|
147
|
269
|
webpackEmptyAsyncContext.keys = function() { return []; };
|
|
148
|
270
|
webpackEmptyAsyncContext.resolve = webpackEmptyAsyncContext;
|
|
149
|
271
|
module.exports = webpackEmptyAsyncContext;
|
|
150
|
|
-webpackEmptyAsyncContext.id = 114;
|
|
|
272
|
+webpackEmptyAsyncContext.id = 116;
|
|
151
|
273
|
|
|
152
|
274
|
/***/ }),
|
|
153
|
275
|
|
|
154
|
|
-/***/ 156:
|
|
|
276
|
+/***/ 158:
|
|
155
|
277
|
/***/ (function(module, exports, __webpack_require__) {
|
|
156
|
278
|
|
|
157
|
279
|
var map = {
|
|
158
|
280
|
"../pages/tab4/tab4.module": [
|
|
159
|
|
- 279,
|
|
|
281
|
+ 280,
|
|
160
|
282
|
3
|
|
161
|
283
|
],
|
|
162
|
284
|
"../pages/tabs/tabs.module": [
|
|
163
|
|
- 280,
|
|
|
285
|
+ 281,
|
|
164
|
286
|
2
|
|
165
|
287
|
],
|
|
166
|
288
|
"../pages/transaction/transaction.module": [
|
|
167
|
|
- 281,
|
|
|
289
|
+<<<<<<< HEAD
|
|
|
290
|
+ 280,
|
|
|
291
|
+=======
|
|
|
292
|
+ 282,
|
|
|
293
|
+>>>>>>> posttransaction
|
|
168
|
294
|
1
|
|
169
|
295
|
],
|
|
170
|
296
|
"../pages/wallet/wallet.module": [
|
|
171
|
|
- 282,
|
|
|
297
|
+ 283,
|
|
172
|
298
|
0
|
|
173
|
299
|
]
|
|
174
|
300
|
};
|
|
|
@@ -183,19 +309,19 @@ function webpackAsyncContext(req) {
|
|
183
|
309
|
webpackAsyncContext.keys = function webpackAsyncContextKeys() {
|
|
184
|
310
|
return Object.keys(map);
|
|
185
|
311
|
};
|
|
186
|
|
-webpackAsyncContext.id = 156;
|
|
|
312
|
+webpackAsyncContext.id = 158;
|
|
187
|
313
|
module.exports = webpackAsyncContext;
|
|
188
|
314
|
|
|
189
|
315
|
/***/ }),
|
|
190
|
316
|
|
|
191
|
|
-/***/ 157:
|
|
|
317
|
+/***/ 159:
|
|
192
|
318
|
/***/ (function(module, __webpack_exports__, __webpack_require__) {
|
|
193
|
319
|
|
|
194
|
320
|
"use strict";
|
|
195
|
321
|
/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return HomePage; });
|
|
196
|
322
|
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__angular_core__ = __webpack_require__(0);
|
|
197
|
323
|
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1_ionic_angular__ = __webpack_require__(28);
|
|
198
|
|
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__providers_block_service__ = __webpack_require__(158);
|
|
|
324
|
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__providers_block_service__ = __webpack_require__(160);
|
|
199
|
325
|
var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
|
|
200
|
326
|
var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
|
|
201
|
327
|
if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
|
|
|
@@ -235,7 +361,7 @@ var HomePage = /** @class */ (function () {
|
|
235
|
361
|
};
|
|
236
|
362
|
HomePage = __decorate([
|
|
237
|
363
|
Object(__WEBPACK_IMPORTED_MODULE_0__angular_core__["m" /* Component */])({
|
|
238
|
|
- selector: 'page-home',template:/*ion-inline-start:"/Users/navyas/Labs6/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/navyas/Labs6/ZipCoin-RED/ZipCoinRedIonicClient/src/pages/home/home.html"*/
|
|
|
364
|
+ 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"*/
|
|
239
|
365
|
}),
|
|
240
|
366
|
__metadata("design:paramtypes", [__WEBPACK_IMPORTED_MODULE_1_ionic_angular__["e" /* NavController */], __WEBPACK_IMPORTED_MODULE_2__providers_block_service__["a" /* BlockService */]])
|
|
241
|
367
|
], HomePage);
|
|
|
@@ -252,12 +378,12 @@ var HomePage = /** @class */ (function () {
|
|
252
|
378
|
|
|
253
|
379
|
/***/ }),
|
|
254
|
380
|
|
|
255
|
|
-/***/ 158:
|
|
|
381
|
+/***/ 160:
|
|
256
|
382
|
/***/ (function(module, __webpack_exports__, __webpack_require__) {
|
|
257
|
383
|
|
|
258
|
384
|
"use strict";
|
|
259
|
385
|
/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return BlockService; });
|
|
260
|
|
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__angular_common_http__ = __webpack_require__(159);
|
|
|
386
|
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__angular_common_http__ = __webpack_require__(78);
|
|
261
|
387
|
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__angular_core__ = __webpack_require__(0);
|
|
262
|
388
|
var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
|
|
263
|
389
|
var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
|
|
|
@@ -296,13 +422,13 @@ var BlockService = /** @class */ (function () {
|
|
296
|
422
|
|
|
297
|
423
|
/***/ }),
|
|
298
|
424
|
|
|
299
|
|
-/***/ 203:
|
|
|
425
|
+/***/ 204:
|
|
300
|
426
|
/***/ (function(module, __webpack_exports__, __webpack_require__) {
|
|
301
|
427
|
|
|
302
|
428
|
"use strict";
|
|
303
|
429
|
Object.defineProperty(__webpack_exports__, "__esModule", { value: true });
|
|
304
|
|
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__angular_platform_browser_dynamic__ = __webpack_require__(204);
|
|
305
|
|
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__app_module__ = __webpack_require__(224);
|
|
|
430
|
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__angular_platform_browser_dynamic__ = __webpack_require__(205);
|
|
|
431
|
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__app_module__ = __webpack_require__(225);
|
|
306
|
432
|
|
|
307
|
433
|
|
|
308
|
434
|
Object(__WEBPACK_IMPORTED_MODULE_0__angular_platform_browser_dynamic__["a" /* platformBrowserDynamic */])().bootstrapModule(__WEBPACK_IMPORTED_MODULE_1__app_module__["a" /* AppModule */]);
|
|
|
@@ -310,7 +436,7 @@ Object(__WEBPACK_IMPORTED_MODULE_0__angular_platform_browser_dynamic__["a" /* pl
|
|
310
|
436
|
|
|
311
|
437
|
/***/ }),
|
|
312
|
438
|
|
|
313
|
|
-/***/ 224:
|
|
|
439
|
+/***/ 225:
|
|
314
|
440
|
/***/ (function(module, __webpack_exports__, __webpack_require__) {
|
|
315
|
441
|
|
|
316
|
442
|
"use strict";
|
|
|
@@ -318,16 +444,30 @@ Object(__WEBPACK_IMPORTED_MODULE_0__angular_platform_browser_dynamic__["a" /* pl
|
|
318
|
444
|
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__angular_platform_browser__ = __webpack_require__(31);
|
|
319
|
445
|
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__angular_core__ = __webpack_require__(0);
|
|
320
|
446
|
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2_ionic_angular__ = __webpack_require__(28);
|
|
|
447
|
+<<<<<<< HEAD
|
|
321
|
448
|
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_3__ionic_native_splash_screen__ = __webpack_require__(199);
|
|
322
|
449
|
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_4__ionic_native_status_bar__ = __webpack_require__(202);
|
|
323
|
450
|
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_5__app_component__ = __webpack_require__(278);
|
|
324
|
451
|
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_6__angular_common_http__ = __webpack_require__(159);
|
|
325
|
452
|
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_7__providers_block_service__ = __webpack_require__(158);
|
|
326
|
453
|
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_8__pages_home_home__ = __webpack_require__(157);
|
|
327
|
|
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_9__pages_wallet_wallet__ = __webpack_require__(101);
|
|
328
|
|
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_10__pages_transaction_transaction__ = __webpack_require__(102);
|
|
329
|
|
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_11__pages_tabs_tabs__ = __webpack_require__(100);
|
|
|
454
|
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_9__pages_wallet_wallet__ = __webpack_require__(102);
|
|
|
455
|
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_10__pages_transaction_transaction__ = __webpack_require__(100);
|
|
|
456
|
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_11__pages_tabs_tabs__ = __webpack_require__(101);
|
|
330
|
457
|
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_12__pages_tab4_tab4__ = __webpack_require__(99);
|
|
|
458
|
+=======
|
|
|
459
|
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_3__ionic_native_splash_screen__ = __webpack_require__(200);
|
|
|
460
|
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_4__ionic_native_status_bar__ = __webpack_require__(203);
|
|
|
461
|
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_5__app_component__ = __webpack_require__(279);
|
|
|
462
|
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_6__angular_common_http__ = __webpack_require__(78);
|
|
|
463
|
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_7__providers_block_service__ = __webpack_require__(160);
|
|
|
464
|
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_8__pages_home_home__ = __webpack_require__(159);
|
|
|
465
|
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_9__pages_wallet_wallet__ = __webpack_require__(103);
|
|
|
466
|
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_10__pages_transaction_transaction__ = __webpack_require__(104);
|
|
|
467
|
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_11__pages_tabs_tabs__ = __webpack_require__(102);
|
|
|
468
|
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_12__pages_tab4_tab4__ = __webpack_require__(101);
|
|
|
469
|
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_13__providers_transaction_service__ = __webpack_require__(50);
|
|
|
470
|
+>>>>>>> posttransaction
|
|
331
|
471
|
var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
|
|
332
|
472
|
var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
|
|
333
|
473
|
if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
|
|
|
@@ -347,6 +487,7 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
|
|
347
|
487
|
|
|
348
|
488
|
|
|
349
|
489
|
|
|
|
490
|
+
|
|
350
|
491
|
var AppModule = /** @class */ (function () {
|
|
351
|
492
|
function AppModule() {
|
|
352
|
493
|
}
|
|
|
@@ -366,8 +507,8 @@ var AppModule = /** @class */ (function () {
|
|
366
|
507
|
__WEBPACK_IMPORTED_MODULE_2_ionic_angular__["c" /* IonicModule */].forRoot(__WEBPACK_IMPORTED_MODULE_5__app_component__["a" /* MyApp */], {}, {
|
|
367
|
508
|
links: [
|
|
368
|
509
|
{ loadChildren: '../pages/tab4/tab4.module#Tab4PageModule', name: 'Tab4Page', segment: 'tab4', priority: 'low', defaultHistory: [] },
|
|
369
|
|
- { loadChildren: '../pages/tabs/tabs.module#TabsPageModule', name: 'TabsPage', segment: 'tabs', priority: 'low', defaultHistory: [] },
|
|
370
|
510
|
{ loadChildren: '../pages/transaction/transaction.module#TransactionPageModule', name: 'TransactionPage', segment: 'transaction', priority: 'low', defaultHistory: [] },
|
|
|
511
|
+ { loadChildren: '../pages/tabs/tabs.module#TabsPageModule', name: 'TabsPage', segment: 'tabs', priority: 'low', defaultHistory: [] },
|
|
371
|
512
|
{ loadChildren: '../pages/wallet/wallet.module#WalletPageModule', name: 'WalletPage', segment: 'wallet', priority: 'low', defaultHistory: [] }
|
|
372
|
513
|
]
|
|
373
|
514
|
})
|
|
|
@@ -385,6 +526,7 @@ var AppModule = /** @class */ (function () {
|
|
385
|
526
|
__WEBPACK_IMPORTED_MODULE_4__ionic_native_status_bar__["a" /* StatusBar */],
|
|
386
|
527
|
__WEBPACK_IMPORTED_MODULE_3__ionic_native_splash_screen__["a" /* SplashScreen */],
|
|
387
|
528
|
__WEBPACK_IMPORTED_MODULE_7__providers_block_service__["a" /* BlockService */],
|
|
|
529
|
+ __WEBPACK_IMPORTED_MODULE_13__providers_transaction_service__["a" /* TransactionService */],
|
|
388
|
530
|
{ provide: __WEBPACK_IMPORTED_MODULE_1__angular_core__["u" /* ErrorHandler */], useClass: __WEBPACK_IMPORTED_MODULE_2_ionic_angular__["b" /* IonicErrorHandler */] }
|
|
389
|
531
|
]
|
|
390
|
532
|
})
|
|
|
@@ -396,16 +538,22 @@ var AppModule = /** @class */ (function () {
|
|
396
|
538
|
|
|
397
|
539
|
/***/ }),
|
|
398
|
540
|
|
|
399
|
|
-/***/ 278:
|
|
|
541
|
+/***/ 279:
|
|
400
|
542
|
/***/ (function(module, __webpack_exports__, __webpack_require__) {
|
|
401
|
543
|
|
|
402
|
544
|
"use strict";
|
|
403
|
545
|
/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return MyApp; });
|
|
404
|
546
|
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__angular_core__ = __webpack_require__(0);
|
|
405
|
547
|
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1_ionic_angular__ = __webpack_require__(28);
|
|
|
548
|
+<<<<<<< HEAD
|
|
406
|
549
|
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__ionic_native_status_bar__ = __webpack_require__(202);
|
|
407
|
550
|
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_3__ionic_native_splash_screen__ = __webpack_require__(199);
|
|
408
|
|
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_4__pages_tabs_tabs__ = __webpack_require__(100);
|
|
|
551
|
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_4__pages_tabs_tabs__ = __webpack_require__(101);
|
|
|
552
|
+=======
|
|
|
553
|
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__ionic_native_status_bar__ = __webpack_require__(203);
|
|
|
554
|
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_3__ionic_native_splash_screen__ = __webpack_require__(200);
|
|
|
555
|
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_4__pages_tabs_tabs__ = __webpack_require__(102);
|
|
|
556
|
+>>>>>>> posttransaction
|
|
409
|
557
|
var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
|
|
410
|
558
|
var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
|
|
411
|
559
|
if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
|
|
|
@@ -431,7 +579,7 @@ var MyApp = /** @class */ (function () {
|
|
431
|
579
|
});
|
|
432
|
580
|
}
|
|
433
|
581
|
MyApp = __decorate([
|
|
434
|
|
- Object(__WEBPACK_IMPORTED_MODULE_0__angular_core__["m" /* Component */])({template:/*ion-inline-start:"/Users/navyas/Labs6/ZipCoin-RED/ZipCoinRedIonicClient/src/app/app.html"*/'<ion-nav [root]="rootPage"></ion-nav>\n'/*ion-inline-end:"/Users/navyas/Labs6/ZipCoin-RED/ZipCoinRedIonicClient/src/app/app.html"*/
|
|
|
582
|
+ 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"*/
|
|
435
|
583
|
}),
|
|
436
|
584
|
__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 */]])
|
|
437
|
585
|
], MyApp);
|
|
|
@@ -442,13 +590,13 @@ var MyApp = /** @class */ (function () {
|
|
442
|
590
|
|
|
443
|
591
|
/***/ }),
|
|
444
|
592
|
|
|
445
|
|
-/***/ 99:
|
|
|
593
|
+/***/ 50:
|
|
446
|
594
|
/***/ (function(module, __webpack_exports__, __webpack_require__) {
|
|
447
|
595
|
|
|
448
|
596
|
"use strict";
|
|
449
|
|
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return Tab4Page; });
|
|
|
597
|
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return TransactionService; });
|
|
450
|
598
|
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__angular_core__ = __webpack_require__(0);
|
|
451
|
|
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1_ionic_angular__ = __webpack_require__(28);
|
|
|
599
|
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__angular_common_http__ = __webpack_require__(78);
|
|
452
|
600
|
var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
|
|
453
|
601
|
var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
|
|
454
|
602
|
if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
|
|
|
@@ -460,32 +608,38 @@ var __metadata = (this && this.__metadata) || function (k, v) {
|
|
460
|
608
|
};
|
|
461
|
609
|
|
|
462
|
610
|
|
|
463
|
|
-/**
|
|
464
|
|
- * Generated class for the Tab4Page page.
|
|
465
|
|
- *
|
|
466
|
|
- * See https://ionicframework.com/docs/components/#navigation for more info on
|
|
467
|
|
- * Ionic pages and navigation.
|
|
468
|
|
- */
|
|
469
|
|
-var Tab4Page = /** @class */ (function () {
|
|
470
|
|
- function Tab4Page(navCtrl, navParams) {
|
|
471
|
|
- this.navCtrl = navCtrl;
|
|
472
|
|
- this.navParams = navParams;
|
|
|
611
|
+var TransactionService = /** @class */ (function () {
|
|
|
612
|
+ function TransactionService(http) {
|
|
|
613
|
+ this.http = http;
|
|
|
614
|
+ this.API = 'http://localhost:8080/api/v1';
|
|
|
615
|
+ this.TRANSACTION_API = this.API + '/transactions';
|
|
473
|
616
|
}
|
|
474
|
|
- Tab4Page.prototype.ionViewDidLoad = function () {
|
|
475
|
|
- console.log('ionViewDidLoad Tab4Page');
|
|
|
617
|
+ TransactionService.prototype.createTransaction = function (transaction) {
|
|
|
618
|
+ return this.http.post(this.TRANSACTION_API, transaction);
|
|
476
|
619
|
};
|
|
|
620
|
+<<<<<<< HEAD
|
|
477
|
621
|
Tab4Page = __decorate([
|
|
478
|
622
|
Object(__WEBPACK_IMPORTED_MODULE_0__angular_core__["m" /* Component */])({
|
|
479
|
|
- selector: 'page-tab4',template:/*ion-inline-start:"/Users/navyas/Labs6/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/navyas/Labs6/ZipCoin-RED/ZipCoinRedIonicClient/src/pages/tab4/tab4.html"*/,
|
|
|
623
|
+ 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"*/,
|
|
480
|
624
|
}),
|
|
481
|
625
|
__metadata("design:paramtypes", [__WEBPACK_IMPORTED_MODULE_1_ionic_angular__["e" /* NavController */], __WEBPACK_IMPORTED_MODULE_1_ionic_angular__["f" /* NavParams */]])
|
|
482
|
626
|
], Tab4Page);
|
|
483
|
627
|
return Tab4Page;
|
|
|
628
|
+=======
|
|
|
629
|
+ TransactionService.prototype.getAllTransactions = function () {
|
|
|
630
|
+ return this.http.get(this.TRANSACTION_API);
|
|
|
631
|
+ };
|
|
|
632
|
+ TransactionService = __decorate([
|
|
|
633
|
+ Object(__WEBPACK_IMPORTED_MODULE_0__angular_core__["A" /* Injectable */])(),
|
|
|
634
|
+ __metadata("design:paramtypes", [__WEBPACK_IMPORTED_MODULE_1__angular_common_http__["a" /* HttpClient */]])
|
|
|
635
|
+ ], TransactionService);
|
|
|
636
|
+ return TransactionService;
|
|
|
637
|
+>>>>>>> posttransaction
|
|
484
|
638
|
}());
|
|
485
|
639
|
|
|
486
|
|
-//# sourceMappingURL=tab4.js.map
|
|
|
640
|
+//# sourceMappingURL=transaction-service.js.map
|
|
487
|
641
|
|
|
488
|
642
|
/***/ })
|
|
489
|
643
|
|
|
490
|
|
-},[203]);
|
|
|
644
|
+},[204]);
|
|
491
|
645
|
//# sourceMappingURL=main.js.map
|
Arin Turpin
Eric Foster
Shivam Patel