Browse Source

resolve conflicts

Arin Turpin 6 years ago
parent
commit
5793360dd7

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


+ 1
- 0
ZipCoinRedIonicClient/src/pages/transaction/transaction.ts View File

@@ -20,6 +20,7 @@ export class TransactionPage {
20 20
 
21 21
   constructor(public navCtrl: NavController, public navParams: NavParams,
22 22
   public transactionService: TransactionService){
23
+    this.getAllTransactions;
23 24
   }
24 25
 
25 26
   ionViewDidLoad() {

+ 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);

+ 24
- 117
ZipCoinRedIonicClient/www/build/main.js View File

@@ -52,6 +52,7 @@ var Tab4Page = /** @class */ (function () {
52 52
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return TransactionPage; });
53 53
 /* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__angular_core__ = __webpack_require__(0);
54 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);
55 56
 var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
56 57
     var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
57 58
     if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
@@ -63,6 +64,7 @@ var __metadata = (this && this.__metadata) || function (k, v) {
63 64
 };
64 65
 
65 66
 
67
+
66 68
 /**
67 69
  * Generated class for the TransactionPage page.
68 70
  *
@@ -70,44 +72,45 @@ var __metadata = (this && this.__metadata) || function (k, v) {
70 72
  * Ionic pages and navigation.
71 73
  */
72 74
 var TransactionPage = /** @class */ (function () {
73
-    function TransactionPage(navCtrl, navParams) {
75
+    function TransactionPage(navCtrl, navParams, transactionService) {
74 76
         this.navCtrl = navCtrl;
75 77
         this.navParams = navParams;
78
+        this.transactionService = transactionService;
79
+        this.getAllTransactions;
76 80
     }
77 81
     TransactionPage.prototype.ionViewDidLoad = function () {
78 82
         console.log('ionViewDidLoad TransactionPage');
79 83
     };
84
+    TransactionPage.prototype.getAllTransactions = function () {
85
+        var _this = this;
86
+        this.transactionService.getAllTransactions().subscribe(function (transactions) {
87
+            _this.transactions = transactions;
88
+        });
89
+    };
80 90
     TransactionPage = __decorate([
81 91
         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"*/,
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: {{ 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"*/,
83 93
         }),
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])
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 */]])
85 96
     ], TransactionPage);
86 97
     return TransactionPage;
87
-    var _a, _b;
88 98
 }());
89 99
 
90 100
 //# sourceMappingURL=transaction.js.map
91 101
 
92 102
 /***/ }),
93 103
 
94
-/***/ 101:
104
+/***/ 103:
95 105
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
96 106
 
97 107
 "use strict";
98 108
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return TabsPage; });
99 109
 /* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__angular_core__ = __webpack_require__(0);
100
-<<<<<<< HEAD
101
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__home_home__ = __webpack_require__(157);
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);
104
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_4__tab4_tab4__ = __webpack_require__(99);
105
-=======
106 110
 /* 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);
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);
109 113
 /* harmony import */ var __WEBPACK_IMPORTED_MODULE_4__tab4_tab4__ = __webpack_require__(101);
110
->>>>>>> posttransaction
111 114
 var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
112 115
     var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
113 116
     if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
@@ -142,11 +145,7 @@ var TabsPage = /** @class */ (function () {
142 145
 
143 146
 /***/ }),
144 147
 
145
-<<<<<<< HEAD
146
-/***/ 102:
147
-=======
148
-/***/ 103:
149
->>>>>>> posttransaction
148
+/***/ 104:
150 149
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
151 150
 
152 151
 "use strict";
@@ -197,66 +196,7 @@ var WalletPage = /** @class */ (function () {
197 196
 
198 197
 /***/ }),
199 198
 
200
-<<<<<<< HEAD
201
-/***/ 114:
202
-=======
203
-/***/ 104:
204
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
205
-
206
-"use strict";
207
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return TransactionPage; });
208
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__angular_core__ = __webpack_require__(0);
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);
211
-var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
212
-    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
213
-    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
214
-    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;
215
-    return c > 3 && r && Object.defineProperty(target, key, r), r;
216
-};
217
-var __metadata = (this && this.__metadata) || function (k, v) {
218
-    if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
219
-};
220
-
221
-
222
-
223
-/**
224
- * Generated class for the TransactionPage page.
225
- *
226
- * See https://ionicframework.com/docs/components/#navigation for more info on
227
- * Ionic pages and navigation.
228
- */
229
-var TransactionPage = /** @class */ (function () {
230
-    function TransactionPage(navCtrl, navParams, transactionService) {
231
-        this.navCtrl = navCtrl;
232
-        this.navParams = navParams;
233
-        this.transactionService = transactionService;
234
-    }
235
-    TransactionPage.prototype.ionViewDidLoad = function () {
236
-        console.log('ionViewDidLoad TransactionPage');
237
-    };
238
-    TransactionPage.prototype.getAllTransactions = function () {
239
-        var _this = this;
240
-        this.transactionService.getAllTransactions().subscribe(function (transactions) {
241
-            _this.transactions = transactions;
242
-        });
243
-    };
244
-    TransactionPage = __decorate([
245
-        Object(__WEBPACK_IMPORTED_MODULE_0__angular_core__["m" /* Component */])({
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"*/,
247
-        }),
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 */]])
250
-    ], TransactionPage);
251
-    return TransactionPage;
252
-}());
253
-
254
-//# sourceMappingURL=transaction.js.map
255
-
256
-/***/ }),
257
-
258 199
 /***/ 116:
259
->>>>>>> posttransaction
260 200
 /***/ (function(module, exports) {
261 201
 
262 202
 function webpackEmptyAsyncContext(req) {
@@ -282,15 +222,11 @@ var map = {
282 222
 		3
283 223
 	],
284 224
 	"../pages/tabs/tabs.module": [
285
-		281,
225
+		282,
286 226
 		2
287 227
 	],
288 228
 	"../pages/transaction/transaction.module": [
289
-<<<<<<< HEAD
290
-		280,
291
-=======
292
-		282,
293
->>>>>>> posttransaction
229
+		281,
294 230
 		1
295 231
 	],
296 232
 	"../pages/wallet/wallet.module": [
@@ -444,30 +380,17 @@ Object(__WEBPACK_IMPORTED_MODULE_0__angular_platform_browser_dynamic__["a" /* pl
444 380
 /* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__angular_platform_browser__ = __webpack_require__(31);
445 381
 /* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__angular_core__ = __webpack_require__(0);
446 382
 /* harmony import */ var __WEBPACK_IMPORTED_MODULE_2_ionic_angular__ = __webpack_require__(28);
447
-<<<<<<< HEAD
448
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_3__ionic_native_splash_screen__ = __webpack_require__(199);
449
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_4__ionic_native_status_bar__ = __webpack_require__(202);
450
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_5__app_component__ = __webpack_require__(278);
451
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_6__angular_common_http__ = __webpack_require__(159);
452
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_7__providers_block_service__ = __webpack_require__(158);
453
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_8__pages_home_home__ = __webpack_require__(157);
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);
457
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_12__pages_tab4_tab4__ = __webpack_require__(99);
458
-=======
459 383
 /* harmony import */ var __WEBPACK_IMPORTED_MODULE_3__ionic_native_splash_screen__ = __webpack_require__(200);
460 384
 /* harmony import */ var __WEBPACK_IMPORTED_MODULE_4__ionic_native_status_bar__ = __webpack_require__(203);
461 385
 /* harmony import */ var __WEBPACK_IMPORTED_MODULE_5__app_component__ = __webpack_require__(279);
462 386
 /* harmony import */ var __WEBPACK_IMPORTED_MODULE_6__angular_common_http__ = __webpack_require__(78);
463 387
 /* harmony import */ var __WEBPACK_IMPORTED_MODULE_7__providers_block_service__ = __webpack_require__(160);
464 388
 /* 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);
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);
468 392
 /* harmony import */ var __WEBPACK_IMPORTED_MODULE_12__pages_tab4_tab4__ = __webpack_require__(101);
469 393
 /* harmony import */ var __WEBPACK_IMPORTED_MODULE_13__providers_transaction_service__ = __webpack_require__(50);
470
->>>>>>> posttransaction
471 394
 var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
472 395
     var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
473 396
     if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
@@ -545,15 +468,9 @@ var AppModule = /** @class */ (function () {
545 468
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return MyApp; });
546 469
 /* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__angular_core__ = __webpack_require__(0);
547 470
 /* harmony import */ var __WEBPACK_IMPORTED_MODULE_1_ionic_angular__ = __webpack_require__(28);
548
-<<<<<<< HEAD
549
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__ionic_native_status_bar__ = __webpack_require__(202);
550
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_3__ionic_native_splash_screen__ = __webpack_require__(199);
551
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_4__pages_tabs_tabs__ = __webpack_require__(101);
552
-=======
553 471
 /* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__ionic_native_status_bar__ = __webpack_require__(203);
554 472
 /* 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
473
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_4__pages_tabs_tabs__ = __webpack_require__(103);
557 474
 var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
558 475
     var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
559 476
     if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
@@ -617,15 +534,6 @@ var TransactionService = /** @class */ (function () {
617 534
     TransactionService.prototype.createTransaction = function (transaction) {
618 535
         return this.http.post(this.TRANSACTION_API, transaction);
619 536
     };
620
-<<<<<<< HEAD
621
-    Tab4Page = __decorate([
622
-        Object(__WEBPACK_IMPORTED_MODULE_0__angular_core__["m" /* Component */])({
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"*/,
624
-        }),
625
-        __metadata("design:paramtypes", [__WEBPACK_IMPORTED_MODULE_1_ionic_angular__["e" /* NavController */], __WEBPACK_IMPORTED_MODULE_1_ionic_angular__["f" /* NavParams */]])
626
-    ], Tab4Page);
627
-    return Tab4Page;
628
-=======
629 537
     TransactionService.prototype.getAllTransactions = function () {
630 538
         return this.http.get(this.TRANSACTION_API);
631 539
     };
@@ -634,7 +542,6 @@ var TransactionService = /** @class */ (function () {
634 542
         __metadata("design:paramtypes", [__WEBPACK_IMPORTED_MODULE_1__angular_common_http__["a" /* HttpClient */]])
635 543
     ], TransactionService);
636 544
     return TransactionService;
637
->>>>>>> posttransaction
638 545
 }());
639 546
 
640 547
 //# sourceMappingURL=transaction-service.js.map

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


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


+ 46
- 0
ZipCoinRedJavaServer/.idea/workspace.xml View File

@@ -0,0 +1,46 @@
1
+<?xml version="1.0" encoding="UTF-8"?>
2
+<project version="4">
3
+  <component name="RunManager">
4
+    <configuration default="true" type="Application" factoryName="Application">
5
+      <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
6
+    </configuration>
7
+    <configuration default="true" type="JUnit" factoryName="JUnit">
8
+      <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
9
+      <option name="ALTERNATIVE_JRE_PATH" />
10
+      <option name="PACKAGE_NAME" />
11
+      <option name="MAIN_CLASS_NAME" />
12
+      <option name="METHOD_NAME" />
13
+      <option name="TEST_OBJECT" value="class" />
14
+      <option name="VM_PARAMETERS" value="-ea" />
15
+      <option name="PARAMETERS" />
16
+      <option name="WORKING_DIRECTORY" value="%MODULE_WORKING_DIR%" />
17
+      <option name="PASS_PARENT_ENVS" value="true" />
18
+      <option name="TEST_SEARCH_SCOPE">
19
+        <value defaultName="singleModule" />
20
+      </option>
21
+      <patterns />
22
+    </configuration>
23
+    <configuration default="true" type="TestNG" factoryName="TestNG">
24
+      <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
25
+      <option name="ALTERNATIVE_JRE_PATH" />
26
+      <option name="SUITE_NAME" />
27
+      <option name="PACKAGE_NAME" />
28
+      <option name="MAIN_CLASS_NAME" />
29
+      <option name="METHOD_NAME" />
30
+      <option name="GROUP_NAME" />
31
+      <option name="TEST_OBJECT" value="CLASS" />
32
+      <option name="VM_PARAMETERS" value="-ea" />
33
+      <option name="PARAMETERS" />
34
+      <option name="WORKING_DIRECTORY" value="%MODULE_WORKING_DIR%" />
35
+      <option name="OUTPUT_DIRECTORY" />
36
+      <option name="PASS_PARENT_ENVS" value="true" />
37
+      <option name="TEST_SEARCH_SCOPE">
38
+        <value defaultName="singleModule" />
39
+      </option>
40
+      <option name="USE_DEFAULT_REPORTERS" value="false" />
41
+      <option name="PROPERTIES_FILE" />
42
+      <properties />
43
+      <listeners />
44
+    </configuration>
45
+  </component>
46
+</project>

+ 96
- 0
ZipCoinRedJavaServer/ZipCoin-RED.iml View File

@@ -0,0 +1,96 @@
1
+<?xml version="1.0" encoding="UTF-8"?>
2
+<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
3
+  <component name="ExternalSystem" externalSystem="Maven" />
4
+  <component name="FacetManager">
5
+    <facet type="Spring" name="Spring">
6
+      <configuration />
7
+    </facet>
8
+    <facet type="web" name="Web">
9
+      <configuration>
10
+        <webroots />
11
+        <sourceRoots>
12
+          <root url="file://$MODULE_DIR$/src/main/java" />
13
+          <root url="file://$MODULE_DIR$/src/main/resources" />
14
+        </sourceRoots>
15
+      </configuration>
16
+    </facet>
17
+  </component>
18
+  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_6">
19
+    <output url="file://$MODULE_DIR$/target/classes" />
20
+    <output-test url="file://$MODULE_DIR$/target/test-classes" />
21
+    <content url="file://$MODULE_DIR$">
22
+      <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
23
+      <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
24
+      <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
25
+      <sourceFolder url="file://$MODULE_DIR$/target/generated-test-sources/redCoin" isTestSource="true" generated="true" />
26
+      <excludeFolder url="file://$MODULE_DIR$/target" />
27
+    </content>
28
+    <orderEntry type="inheritedJdk" />
29
+    <orderEntry type="sourceFolder" forTests="false" />
30
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-web:1.3.1.RELEASE" level="project" />
31
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter:1.3.1.RELEASE" level="project" />
32
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot:1.3.1.RELEASE" level="project" />
33
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-autoconfigure:1.3.1.RELEASE" level="project" />
34
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-logging:1.3.1.RELEASE" level="project" />
35
+    <orderEntry type="library" name="Maven: ch.qos.logback:logback-classic:1.1.3" level="project" />
36
+    <orderEntry type="library" name="Maven: ch.qos.logback:logback-core:1.1.3" level="project" />
37
+    <orderEntry type="library" name="Maven: org.slf4j:jul-to-slf4j:1.7.13" level="project" />
38
+    <orderEntry type="library" name="Maven: org.slf4j:log4j-over-slf4j:1.7.13" level="project" />
39
+    <orderEntry type="library" scope="RUNTIME" name="Maven: org.yaml:snakeyaml:1.16" level="project" />
40
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-tomcat:1.3.1.RELEASE" level="project" />
41
+    <orderEntry type="library" name="Maven: org.apache.tomcat.embed:tomcat-embed-core:8.0.30" level="project" />
42
+    <orderEntry type="library" name="Maven: org.apache.tomcat.embed:tomcat-embed-el:8.0.30" level="project" />
43
+    <orderEntry type="library" name="Maven: org.apache.tomcat.embed:tomcat-embed-logging-juli:8.0.30" level="project" />
44
+    <orderEntry type="library" name="Maven: org.apache.tomcat.embed:tomcat-embed-websocket:8.0.30" level="project" />
45
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-validation:1.3.1.RELEASE" level="project" />
46
+    <orderEntry type="library" name="Maven: org.hibernate:hibernate-validator:5.2.2.Final" level="project" />
47
+    <orderEntry type="library" name="Maven: javax.validation:validation-api:1.1.0.Final" level="project" />
48
+    <orderEntry type="library" name="Maven: com.fasterxml:classmate:1.1.0" level="project" />
49
+    <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-databind:2.6.4" level="project" />
50
+    <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-annotations:2.6.4" level="project" />
51
+    <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-core:2.6.4" level="project" />
52
+    <orderEntry type="library" name="Maven: org.springframework:spring-web:4.2.4.RELEASE" level="project" />
53
+    <orderEntry type="library" name="Maven: org.springframework:spring-aop:4.2.4.RELEASE" level="project" />
54
+    <orderEntry type="library" name="Maven: aopalliance:aopalliance:1.0" level="project" />
55
+    <orderEntry type="library" name="Maven: org.springframework:spring-beans:4.2.4.RELEASE" level="project" />
56
+    <orderEntry type="library" name="Maven: org.springframework:spring-context:4.2.4.RELEASE" level="project" />
57
+    <orderEntry type="library" name="Maven: org.springframework:spring-webmvc:4.2.4.RELEASE" level="project" />
58
+    <orderEntry type="library" name="Maven: org.springframework:spring-expression:4.2.4.RELEASE" level="project" />
59
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-data-jpa:1.3.1.RELEASE" level="project" />
60
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-aop:1.3.1.RELEASE" level="project" />
61
+    <orderEntry type="library" name="Maven: org.aspectj:aspectjweaver:1.8.7" level="project" />
62
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-jdbc:1.3.1.RELEASE" level="project" />
63
+    <orderEntry type="library" name="Maven: org.apache.tomcat:tomcat-jdbc:8.0.30" level="project" />
64
+    <orderEntry type="library" name="Maven: org.apache.tomcat:tomcat-juli:8.0.30" level="project" />
65
+    <orderEntry type="library" name="Maven: org.springframework:spring-jdbc:4.2.4.RELEASE" level="project" />
66
+    <orderEntry type="library" name="Maven: org.hibernate:hibernate-entitymanager:4.3.11.Final" level="project" />
67
+    <orderEntry type="library" name="Maven: org.jboss.logging:jboss-logging:3.3.0.Final" level="project" />
68
+    <orderEntry type="library" name="Maven: org.jboss.logging:jboss-logging-annotations:1.2.0.Beta1" level="project" />
69
+    <orderEntry type="library" name="Maven: org.hibernate:hibernate-core:4.3.11.Final" level="project" />
70
+    <orderEntry type="library" name="Maven: antlr:antlr:2.7.7" level="project" />
71
+    <orderEntry type="library" name="Maven: org.jboss:jandex:1.1.0.Final" level="project" />
72
+    <orderEntry type="library" name="Maven: dom4j:dom4j:1.6.1" level="project" />
73
+    <orderEntry type="library" name="Maven: xml-apis:xml-apis:1.0.b2" level="project" />
74
+    <orderEntry type="library" name="Maven: org.hibernate.common:hibernate-commons-annotations:4.0.5.Final" level="project" />
75
+    <orderEntry type="library" name="Maven: org.hibernate.javax.persistence:hibernate-jpa-2.1-api:1.0.0.Final" level="project" />
76
+    <orderEntry type="library" name="Maven: org.javassist:javassist:3.18.1-GA" level="project" />
77
+    <orderEntry type="library" name="Maven: javax.transaction:javax.transaction-api:1.2" level="project" />
78
+    <orderEntry type="library" name="Maven: org.springframework.data:spring-data-jpa:1.9.2.RELEASE" level="project" />
79
+    <orderEntry type="library" name="Maven: org.springframework.data:spring-data-commons:1.11.2.RELEASE" level="project" />
80
+    <orderEntry type="library" name="Maven: org.springframework:spring-orm:4.2.4.RELEASE" level="project" />
81
+    <orderEntry type="library" name="Maven: org.springframework:spring-tx:4.2.4.RELEASE" level="project" />
82
+    <orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.7.13" level="project" />
83
+    <orderEntry type="library" name="Maven: org.slf4j:jcl-over-slf4j:1.7.13" level="project" />
84
+    <orderEntry type="library" name="Maven: org.springframework:spring-aspects:4.2.4.RELEASE" level="project" />
85
+    <orderEntry type="library" scope="TEST" name="Maven: org.springframework.boot:spring-boot-starter-test:1.3.1.RELEASE" level="project" />
86
+    <orderEntry type="library" scope="TEST" name="Maven: org.mockito:mockito-core:1.10.19" level="project" />
87
+    <orderEntry type="library" scope="TEST" name="Maven: org.objenesis:objenesis:2.1" level="project" />
88
+    <orderEntry type="library" scope="TEST" name="Maven: org.hamcrest:hamcrest-core:1.3" level="project" />
89
+    <orderEntry type="library" scope="TEST" name="Maven: org.hamcrest:hamcrest-library:1.3" level="project" />
90
+    <orderEntry type="library" name="Maven: org.springframework:spring-core:4.2.4.RELEASE" level="project" />
91
+    <orderEntry type="library" scope="TEST" name="Maven: org.springframework:spring-test:4.2.4.RELEASE" level="project" />
92
+    <orderEntry type="library" name="Maven: commons-codec:commons-codec:1.10" level="project" />
93
+    <orderEntry type="library" scope="TEST" name="Maven: junit:junit:4.12" level="project" />
94
+    <orderEntry type="library" scope="RUNTIME" name="Maven: mysql:mysql-connector-java:5.1.38" level="project" />
95
+  </component>
96
+</module>

+ 4
- 23
ZipCoinRedJavaServer/src/main/java/com/zipcoin/model/Transaction.java View File

@@ -9,16 +9,10 @@ import javax.persistence.*;
9 9
 public class Transaction {
10 10
     @Id
11 11
     @GeneratedValue(strategy = GenerationType.AUTO)
12
-<<<<<<< HEAD
13 12
     private Long transactionId;
14 13
 
15 14
     private String sender;
16
-    private String reciepient;
17
-=======
18
-    private String transactionId;
19
-    private PublicKey sender;
20
-    private PublicKey recipient;
21
->>>>>>> posttransaction
15
+    private String recipient;
22 16
     private float amount;
23 17
 
24 18
     //@OneToMany
@@ -56,21 +50,12 @@ public class Transaction {
56 50
         this.sender = sender;
57 51
     }
58 52
 
59
-<<<<<<< HEAD
60 53
     public String getReciepient() {
61
-        return reciepient;
62
-    }
63
-
64
-    public void setReciepient(String reciepient) {
65
-        this.reciepient = reciepient;
66
-=======
67
-    public PublicKey getReciepient() {
68 54
         return recipient;
69 55
     }
70 56
 
71
-    public void setReciepient(PublicKey reciepient) {
57
+    public void setReciepient(String reciepient) {
72 58
         this.recipient = reciepient;
73
->>>>>>> posttransaction
74 59
     }
75 60
 
76 61
     public float getAmount() { return amount; }
@@ -84,13 +69,9 @@ public class Transaction {
84 69
     private String calulateHash() {
85 70
 
86 71
         return DigestUtils.sha256Hex(
87
-<<<<<<< HEAD
88 72
                 sender +
89
-                        (reciepient) +
90
-=======
91
-                StringUtil.getStringFromKey(sender) +
92
-                        StringUtil.getStringFromKey(recipient) +
93
->>>>>>> posttransaction
73
+                        (recipient) +
74
+
94 75
                         Float.toString(amount)
95 76
         );
96 77
     }

BIN
ZipCoinRedJavaServer/target/classes/com/zipcoin/ZipCoinApp.class View File


BIN
ZipCoinRedJavaServer/target/classes/com/zipcoin/controller/TransactionController.class View File


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


BIN
ZipCoinRedJavaServer/target/classes/com/zipcoin/repository/TransactionRepository.class View File