瀏覽代碼

merge with dev fixing conflicts

Eric Foster 6 年之前
父節點
當前提交
473adcce6f

+ 2
- 3
ZipCoinRedIonicClient/ionic.config.json 查看文件

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

+ 0
- 15
ZipCoinRedIonicClient/src/pages/transaction/transaction.html 查看文件

@@ -6,20 +6,6 @@
6 6
 
7 7
 </ion-header>
8 8
 <ion-content padding>
9
-<<<<<<< HEAD
10
-  <ion-list>
11
-      <ion-item-sliding *ngFor="let block of blocks">
12
-        <ion-item>
13
-          <ion-card>
14
-              <ion-card-content>
15
-                <div>Data: {{ block.transactionList }}</div>
16
-              </ion-card-content>
17
-          </ion-card>
18
-        </ion-item>
19
-      </ion-item-sliding>
20
-    </ion-list>
21
-</ion-content>
22
-=======
23 9
 
24 10
     <ion-list>
25 11
         <ion-item-sliding *ngFor="let transaction of transactions">
@@ -39,4 +25,3 @@
39 25
       </ion-list>
40 26
 
41 27
 </ion-content>
42
->>>>>>> 8b1e22a5a0caf7af0d9105c89403f7d2bcc4b254

+ 0
- 31
ZipCoinRedIonicClient/src/pages/transaction/transaction.ts 查看文件

@@ -1,11 +1,6 @@
1 1
 import { Component } from '@angular/core';
2 2
 import { IonicPage, NavController, NavParams } from 'ionic-angular';
3
-<<<<<<< HEAD
4
-import { BlockService } from '../../providers/block-service';
5
-
6
-=======
7 3
 import { TransactionService } from '../../providers/transaction-service';
8
->>>>>>> 8b1e22a5a0caf7af0d9105c89403f7d2bcc4b254
9 4
 
10 5
 /**
11 6
  * Generated class for the TransactionPage page.
@@ -20,48 +15,22 @@ import { TransactionService } from '../../providers/transaction-service';
20 15
   templateUrl: 'transaction.html',
21 16
 })
22 17
 export class TransactionPage {
23
-  private block : any = {};
24
-  private blocks : Array<any>;
25 18
 
26
-<<<<<<< HEAD
27
-  constructor(public navCtrl: NavController, public navParams: NavParams, public blockService: BlockService) {
28
-    this.getMinedBlock('block');
29
-  
30
-=======
31 19
   private transactions : Array<any>;
32 20
 
33 21
   constructor(public navCtrl: NavController, public navParams: NavParams,
34 22
   public transactionService: TransactionService){
35 23
     this.getAllTransactions();
36
-<<<<<<< HEAD
37
-=======
38
->>>>>>> 8b1e22a5a0caf7af0d9105c89403f7d2bcc4b254
39
->>>>>>> dev
40 24
   }
41 25
 
42 26
   ionViewDidLoad() {
43 27
     console.log('ionViewDidLoad TransactionPage');
44 28
   }
45 29
 
46
-<<<<<<< HEAD
47
-  getBlock(id) {
48
-    this.blockService.getBlock(id).subscribe(block => {
49
-      this.block = block;
50
-    })
51
-  }
52
-
53
-  getMinedBlock(id) {
54
-    this.blockService.getMinedBlock(id).subscribe(minedBlock => {
55
-      this.block = minedBlock;
56
-  })
57
-  }
58
-
59
-=======
60 30
   getAllTransactions() {
61 31
     this.transactionService.getAllTransactions().subscribe(transactions => {
62 32
       this.transactions = transactions;
63 33
     })
64 34
   }
65 35
 
66
->>>>>>> 8b1e22a5a0caf7af0d9105c89403f7d2bcc4b254
67 36
 }

+ 66
- 66
ZipCoinRedIonicClient/www/build/main.js 查看文件

@@ -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"*/'<ion-header>\n\n  <ion-navbar>\n    <ion-title>Transaction</ion-title>\n  </ion-navbar>\n\n</ion-header>\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", [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])
95
+    ], TransactionPage);
96
+    return TransactionPage;
97
+    var _a, _b, _c;
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";
@@ -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"*/'<ion-header>\n\n  <ion-navbar>\n    <ion-title>Transaction</ion-title>\n  </ion-navbar>\n\n</ion-header>\n<ion-content padding>\n<<<<<<< HEAD\n  <ion-list>\n      <ion-item-sliding *ngFor="let block of blocks">\n        <ion-item>\n          <ion-card>\n              <ion-card-content>\n                <div>Data: {{ block.transactionList }}</div>\n              </ion-card-content>\n          </ion-card>\n        </ion-item>\n      </ion-item-sliding>\n    </ion-list>\n</ion-content>\n=======\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>>>>>>> 8b1e22a5a0caf7af0d9105c89403f7d2bcc4b254\n'/*ion-inline-end:"/Users/ericf/ZCWProjects/ZipCoin-RED/ZipCoinRedIonicClient/src/pages/transaction/transaction.html"*/,
188
-        }),
189
-        __metadata("design:paramtypes", [__WEBPACK_IMPORTED_MODULE_1_ionic_angular__["e" /* NavController */], __WEBPACK_IMPORTED_MODULE_1_ionic_angular__["f" /* NavParams */],
190
-            __WEBPACK_IMPORTED_MODULE_2__providers_transaction_service__["a" /* TransactionService */]])
191
-    ], TransactionPage);
192
-    return TransactionPage;
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
文件差異過大導致無法顯示
查看文件