Browse Source

wallet loader

Aleena Rose-Mathew 6 years ago
parent
commit
c5af445008

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


+ 3
- 2
ZipCoinRedIonicClient/ionic.config.json View File

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

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

@@ -20,8 +20,8 @@
20 20
   <ion-item>
21 21
       <ion-label>Name</ion-label>
22 22
       <ion-select [(ngModel)]="name">
23
-        <ion-option value="navya">navya</ion-option>
24
-        <ion-option value="aleena">aleena</ion-option>
23
+        <ion-option value="ann">Ann</ion-option>
24
+        <ion-option value="sen">Sen</ion-option>
25 25
       </ion-select>
26 26
      </ion-item>
27 27
      <ion-item>
@@ -40,15 +40,15 @@
40 40
        <ion-item>
41 41
           <ion-label>From</ion-label>
42 42
           <ion-select [(ngModel)]="name">
43
-            <ion-option value="navya">navya</ion-option>
44
-            <ion-option value="aleena">aleena</ion-option>
43
+            <ion-option value="ann">Ann</ion-option>
44
+            <ion-option value="sen">Sen</ion-option>
45 45
           </ion-select>
46 46
          </ion-item>
47 47
          <ion-item>
48 48
             <ion-label>To</ion-label>
49 49
             <ion-select [(ngModel)]="to">
50
-              <ion-option value="navya">navya</ion-option>
51
-              <ion-option value="aleena">aleena</ion-option>
50
+              <ion-option value="ann">Ann</ion-option>
51
+              <ion-option value="sen">Sen</ion-option>
52 52
             </ion-select>
53 53
            </ion-item>
54 54
       

+ 0
- 25
ZipCoinRedIonicClient/www/build/.ion-diagnostic-typescript.html View File

@@ -1,25 +0,0 @@
1
-<div class="ion-diagnostic">
2
-<div class="ion-diagnostic-masthead" title="typescript error: 2307">
3
-<div class="ion-diagnostic-title">Typescript Error</div>
4
-<div class="ion-diagnostic-message" data-error-code="typescript-2307">Cannot find module &#039;../block/home&#039;.</div>
5
-</div>
6
-<div class="ion-diagnostic-file">
7
-<div class="ion-diagnostic-file-header" title="/Users/navyas/Labs6/ZipCoin-RED/ZipCoinRedIonicClient/src/pages/tabs/tabs.ts">src/pages/tabs/tabs.ts</div>
8
-<div class="ion-diagnostic-blob">
9
-<table class="ion-diagnostic-table">
10
-<tr>
11
-<td class="ion-diagnostic-blob-num" data-line-number="2"></td>
12
-<td class="ion-diagnostic-blob-code"><span class="hljs-keyword">import</span> { NavController, NavParams } from <span class="hljs-string">'ionic-angular'</span>;</td>
13
-</tr>
14
-<tr class="ion-diagnostic-error-line">
15
-<td class="ion-diagnostic-blob-num" data-line-number="3"></td>
16
-<td class="ion-diagnostic-blob-code"><span class="hljs-keyword">import</span> { HomePage } from <span class="hljs-string"><span class="ion-diagnostics-error-chr">'</span><span class="ion-diagnostics-error-chr">.</span><span class="ion-diagnostics-error-chr">.</span><span class="ion-diagnostics-error-chr">/</span><span class="ion-diagnostics-error-chr">b</span><span class="ion-diagnostics-error-chr">l</span><span class="ion-diagnostics-error-chr">o</span><span class="ion-diagnostics-error-chr">c</span><span class="ion-diagnostics-error-chr">k</span><span class="ion-diagnostics-error-chr">/</span><span class="ion-diagnostics-error-chr">h</span><span class="ion-diagnostics-error-chr">o</span><span class="ion-diagnostics-error-chr">m</span><span class="ion-diagnostics-error-chr">e</span><span class="ion-diagnostics-error-chr">'</span></span>;</td>
17
-</tr>
18
-<tr>
19
-<td class="ion-diagnostic-blob-num" data-line-number="4"></td>
20
-<td class="ion-diagnostic-blob-code"><span class="hljs-keyword">import</span> { WalletPage } from <span class="hljs-string">'../wallet/wallet'</span>;</td>
21
-</tr>
22
-</table>
23
-</div>
24
-</div>
25
-</div>

+ 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__(104);
11
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__wallet__ = __webpack_require__(103);
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
-/***/ 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__, "TransactionPageModule", function() { return TransactionPageModule; });
9 9
 /* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__angular_core__ = __webpack_require__(0);
10 10
 /* harmony import */ var __WEBPACK_IMPORTED_MODULE_1_ionic_angular__ = __webpack_require__(28);
11
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__transaction__ = __webpack_require__(102);
11
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__transaction__ = __webpack_require__(104);
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
-/***/ 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__, "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__(103);
11
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__tabs__ = __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);

+ 131
- 70
ZipCoinRedIonicClient/www/build/main.js View File

@@ -1,15 +1,60 @@
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/AleenaRM/Labi/zipcoin/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/AleenaRM/Labi/zipcoin/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:
4 49
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
5 50
 
6 51
 "use strict";
7 52
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return TabsPage; });
8 53
 /* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__angular_core__ = __webpack_require__(0);
9
-/* 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);
12
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_4__tab4_tab4__ = __webpack_require__(99);
54
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__home_home__ = __webpack_require__(159);
55
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__wallet_wallet__ = __webpack_require__(103);
56
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_3__transaction_transaction__ = __webpack_require__(104);
57
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_4__tab4_tab4__ = __webpack_require__(101);
13 58
 var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
14 59
     var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
15 60
     if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
@@ -33,7 +78,7 @@ var TabsPage = /** @class */ (function () {
33 78
     }
34 79
     TabsPage = __decorate([
35 80
         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"*/,
81
+            selector: 'page-tabs',template:/*ion-inline-start:"/Users/AleenaRM/Labi/zipcoin/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/AleenaRM/Labi/zipcoin/ZipCoin-RED/ZipCoinRedIonicClient/src/pages/tabs/tabs.html"*/,
37 82
         }),
38 83
         __metadata("design:paramtypes", [])
39 84
     ], TabsPage);
@@ -44,13 +89,14 @@ var TabsPage = /** @class */ (function () {
44 89
 
45 90
 /***/ }),
46 91
 
47
-/***/ 101:
92
+/***/ 103:
48 93
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
49 94
 
50 95
 "use strict";
51 96
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return WalletPage; });
52 97
 /* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__angular_core__ = __webpack_require__(0);
53 98
 /* harmony import */ var __WEBPACK_IMPORTED_MODULE_1_ionic_angular__ = __webpack_require__(28);
99
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__providers_transaction_service__ = __webpack_require__(50);
54 100
 var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
55 101
     var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
56 102
     if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
@@ -62,6 +108,7 @@ var __metadata = (this && this.__metadata) || function (k, v) {
62 108
 };
63 109
 
64 110
 
111
+
65 112
 /**
66 113
  * Generated class for the WalletPage page.
67 114
  *
@@ -69,18 +116,22 @@ var __metadata = (this && this.__metadata) || function (k, v) {
69 116
  * Ionic pages and navigation.
70 117
  */
71 118
 var WalletPage = /** @class */ (function () {
72
-    function WalletPage(navCtrl, navParams) {
119
+    function WalletPage(navCtrl, navParams, transactionService) {
73 120
         this.navCtrl = navCtrl;
74 121
         this.navParams = navParams;
122
+        this.transactionService = transactionService;
75 123
     }
76 124
     WalletPage.prototype.ionViewDidLoad = function () {
77 125
         console.log('ionViewDidLoad WalletPage');
78 126
     };
127
+    WalletPage.prototype.createTransaction = function () {
128
+        this.transactionService.createTransaction(this.transaction);
129
+    };
79 130
     WalletPage = __decorate([
80 131
         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"*/,
132
+            selector: 'page-wallet',template:/*ion-inline-start:"/Users/AleenaRM/Labi/zipcoin/ZipCoin-RED/ZipCoinRedIonicClient/src/pages/wallet/wallet.html"*/'<!--\n  Generated template for the WalletPage page.\n\n  See http://ionicframework.com/docs/components/#navigation for more info on\n  Ionic pages and navigation.\n-->\n<ion-header>\n\n  <ion-navbar>\n    <ion-title>Wallet</ion-title>\n  </ion-navbar>\n\n</ion-header>\n\n\n<ion-content padding>\n\n\n  \n  <ion-item>\n      <ion-label>Name</ion-label>\n      <ion-select [(ngModel)]="name">\n        <ion-option value="ann">Ann</ion-option>\n        <ion-option value="sen">Sen</ion-option>\n      </ion-select>\n     </ion-item>\n     <ion-item>\n        <ion-label>current balance</ion-label>\n        <ion-input></ion-input>\n      </ion-item>\n      <ion-item>\n          <ion-label>Public Key</ion-label>\n          <ion-input></ion-input>\n        </ion-item>\n      <br>\n      <br>\n      <div class = "bar bar-subheader bar-assertive">\n          <h2 class = "title">Payment</h2>\n       </div>\n       <ion-item>\n          <ion-label>From</ion-label>\n          <ion-select [(ngModel)]="name">\n            <ion-option value="ann">Ann</ion-option>\n            <ion-option value="sen">Sen</ion-option>\n          </ion-select>\n         </ion-item>\n         <ion-item>\n            <ion-label>To</ion-label>\n            <ion-select [(ngModel)]="to">\n              <ion-option value="ann">Ann</ion-option>\n              <ion-option value="sen">Sen</ion-option>\n            </ion-select>\n           </ion-item>\n      \n          <ion-item>\n              <ion-label>Amount</ion-label>\n              <ion-input></ion-input>\n            </ion-item>\n            <br>\n            <button ion-button>Pay</button>\n</ion-content>\n'/*ion-inline-end:"/Users/AleenaRM/Labi/zipcoin/ZipCoin-RED/ZipCoinRedIonicClient/src/pages/wallet/wallet.html"*/,
82 133
         }),
83
-        __metadata("design:paramtypes", [__WEBPACK_IMPORTED_MODULE_1_ionic_angular__["e" /* NavController */], __WEBPACK_IMPORTED_MODULE_1_ionic_angular__["f" /* NavParams */]])
134
+        __metadata("design:paramtypes", [__WEBPACK_IMPORTED_MODULE_1_ionic_angular__["e" /* NavController */], __WEBPACK_IMPORTED_MODULE_1_ionic_angular__["f" /* NavParams */], __WEBPACK_IMPORTED_MODULE_2__providers_transaction_service__["a" /* TransactionService */]])
84 135
     ], WalletPage);
85 136
     return WalletPage;
86 137
 }());
@@ -89,13 +140,14 @@ var WalletPage = /** @class */ (function () {
89 140
 
90 141
 /***/ }),
91 142
 
92
-/***/ 102:
143
+/***/ 104:
93 144
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
94 145
 
95 146
 "use strict";
96 147
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return TransactionPage; });
97 148
 /* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__angular_core__ = __webpack_require__(0);
98 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);
99 151
 var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
100 152
     var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
101 153
     if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
@@ -107,6 +159,7 @@ var __metadata = (this && this.__metadata) || function (k, v) {
107 159
 };
108 160
 
109 161
 
162
+
110 163
 /**
111 164
  * Generated class for the TransactionPage page.
112 165
  *
@@ -114,18 +167,27 @@ var __metadata = (this && this.__metadata) || function (k, v) {
114 167
  * Ionic pages and navigation.
115 168
  */
116 169
 var TransactionPage = /** @class */ (function () {
117
-    function TransactionPage(navCtrl, navParams) {
170
+    function TransactionPage(navCtrl, navParams, transactionService) {
118 171
         this.navCtrl = navCtrl;
119 172
         this.navParams = navParams;
173
+        this.transactionService = transactionService;
174
+        this.getAllTransactions;
120 175
     }
121 176
     TransactionPage.prototype.ionViewDidLoad = function () {
122 177
         console.log('ionViewDidLoad TransactionPage');
123 178
     };
179
+    TransactionPage.prototype.getAllTransactions = function () {
180
+        var _this = this;
181
+        this.transactionService.getAllTransactions().subscribe(function (transactions) {
182
+            _this.transactions = transactions;
183
+        });
184
+    };
124 185
     TransactionPage = __decorate([
125 186
         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-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/navyas/Labs6/ZipCoin-RED/ZipCoinRedIonicClient/src/pages/transaction/transaction.html"*/,
187
+            selector: 'page-transaction',template:/*ion-inline-start:"/Users/AleenaRM/Labi/zipcoin/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/AleenaRM/Labi/zipcoin/ZipCoin-RED/ZipCoinRedIonicClient/src/pages/transaction/transaction.html"*/,
127 188
         }),
128
-        __metadata("design:paramtypes", [__WEBPACK_IMPORTED_MODULE_1_ionic_angular__["e" /* NavController */], __WEBPACK_IMPORTED_MODULE_1_ionic_angular__["f" /* NavParams */]])
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 */]])
129 191
     ], TransactionPage);
130 192
     return TransactionPage;
131 193
 }());
@@ -134,7 +196,7 @@ var TransactionPage = /** @class */ (function () {
134 196
 
135 197
 /***/ }),
136 198
 
137
-/***/ 114:
199
+/***/ 116:
138 200
 /***/ (function(module, exports) {
139 201
 
140 202
 function webpackEmptyAsyncContext(req) {
@@ -147,28 +209,28 @@ function webpackEmptyAsyncContext(req) {
147 209
 webpackEmptyAsyncContext.keys = function() { return []; };
148 210
 webpackEmptyAsyncContext.resolve = webpackEmptyAsyncContext;
149 211
 module.exports = webpackEmptyAsyncContext;
150
-webpackEmptyAsyncContext.id = 114;
212
+webpackEmptyAsyncContext.id = 116;
151 213
 
152 214
 /***/ }),
153 215
 
154
-/***/ 156:
216
+/***/ 158:
155 217
 /***/ (function(module, exports, __webpack_require__) {
156 218
 
157 219
 var map = {
158 220
 	"../pages/tab4/tab4.module": [
159
-		279,
221
+		280,
160 222
 		3
161 223
 	],
162 224
 	"../pages/tabs/tabs.module": [
163
-		280,
225
+		281,
164 226
 		2
165 227
 	],
166 228
 	"../pages/transaction/transaction.module": [
167
-		281,
229
+		282,
168 230
 		1
169 231
 	],
170 232
 	"../pages/wallet/wallet.module": [
171
-		282,
233
+		283,
172 234
 		0
173 235
 	]
174 236
 };
@@ -183,19 +245,19 @@ function webpackAsyncContext(req) {
183 245
 webpackAsyncContext.keys = function webpackAsyncContextKeys() {
184 246
 	return Object.keys(map);
185 247
 };
186
-webpackAsyncContext.id = 156;
248
+webpackAsyncContext.id = 158;
187 249
 module.exports = webpackAsyncContext;
188 250
 
189 251
 /***/ }),
190 252
 
191
-/***/ 157:
253
+/***/ 159:
192 254
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
193 255
 
194 256
 "use strict";
195 257
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return HomePage; });
196 258
 /* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__angular_core__ = __webpack_require__(0);
197 259
 /* 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);
260
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__providers_block_service__ = __webpack_require__(160);
199 261
 var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
200 262
     var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
201 263
     if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
@@ -235,7 +297,7 @@ var HomePage = /** @class */ (function () {
235 297
     };
236 298
     HomePage = __decorate([
237 299
         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"*/
300
+            selector: 'page-home',template:/*ion-inline-start:"/Users/AleenaRM/Labi/zipcoin/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/AleenaRM/Labi/zipcoin/ZipCoin-RED/ZipCoinRedIonicClient/src/pages/home/home.html"*/
239 301
         }),
240 302
         __metadata("design:paramtypes", [__WEBPACK_IMPORTED_MODULE_1_ionic_angular__["e" /* NavController */], __WEBPACK_IMPORTED_MODULE_2__providers_block_service__["a" /* BlockService */]])
241 303
     ], HomePage);
@@ -252,12 +314,12 @@ var HomePage = /** @class */ (function () {
252 314
 
253 315
 /***/ }),
254 316
 
255
-/***/ 158:
317
+/***/ 160:
256 318
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
257 319
 
258 320
 "use strict";
259 321
 /* 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);
322
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__angular_common_http__ = __webpack_require__(78);
261 323
 /* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__angular_core__ = __webpack_require__(0);
262 324
 var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
263 325
     var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
@@ -296,13 +358,13 @@ var BlockService = /** @class */ (function () {
296 358
 
297 359
 /***/ }),
298 360
 
299
-/***/ 203:
361
+/***/ 204:
300 362
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
301 363
 
302 364
 "use strict";
303 365
 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);
366
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__angular_platform_browser_dynamic__ = __webpack_require__(205);
367
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__app_module__ = __webpack_require__(225);
306 368
 
307 369
 
308 370
 Object(__WEBPACK_IMPORTED_MODULE_0__angular_platform_browser_dynamic__["a" /* platformBrowserDynamic */])().bootstrapModule(__WEBPACK_IMPORTED_MODULE_1__app_module__["a" /* AppModule */]);
@@ -310,7 +372,7 @@ Object(__WEBPACK_IMPORTED_MODULE_0__angular_platform_browser_dynamic__["a" /* pl
310 372
 
311 373
 /***/ }),
312 374
 
313
-/***/ 224:
375
+/***/ 225:
314 376
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
315 377
 
316 378
 "use strict";
@@ -318,16 +380,17 @@ Object(__WEBPACK_IMPORTED_MODULE_0__angular_platform_browser_dynamic__["a" /* pl
318 380
 /* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__angular_platform_browser__ = __webpack_require__(31);
319 381
 /* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__angular_core__ = __webpack_require__(0);
320 382
 /* harmony import */ var __WEBPACK_IMPORTED_MODULE_2_ionic_angular__ = __webpack_require__(28);
321
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_3__ionic_native_splash_screen__ = __webpack_require__(199);
322
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_4__ionic_native_status_bar__ = __webpack_require__(202);
323
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_5__app_component__ = __webpack_require__(278);
324
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_6__angular_common_http__ = __webpack_require__(159);
325
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_7__providers_block_service__ = __webpack_require__(158);
326
-/* 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);
330
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_12__pages_tab4_tab4__ = __webpack_require__(99);
383
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_3__ionic_native_splash_screen__ = __webpack_require__(200);
384
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_4__ionic_native_status_bar__ = __webpack_require__(203);
385
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_5__app_component__ = __webpack_require__(279);
386
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_6__angular_common_http__ = __webpack_require__(78);
387
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_7__providers_block_service__ = __webpack_require__(160);
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);
392
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_12__pages_tab4_tab4__ = __webpack_require__(101);
393
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_13__providers_transaction_service__ = __webpack_require__(50);
331 394
 var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
332 395
     var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
333 396
     if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
@@ -347,6 +410,7 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
347 410
 
348 411
 
349 412
 
413
+
350 414
 var AppModule = /** @class */ (function () {
351 415
     function AppModule() {
352 416
     }
@@ -385,6 +449,7 @@ var AppModule = /** @class */ (function () {
385 449
                 __WEBPACK_IMPORTED_MODULE_4__ionic_native_status_bar__["a" /* StatusBar */],
386 450
                 __WEBPACK_IMPORTED_MODULE_3__ionic_native_splash_screen__["a" /* SplashScreen */],
387 451
                 __WEBPACK_IMPORTED_MODULE_7__providers_block_service__["a" /* BlockService */],
452
+                __WEBPACK_IMPORTED_MODULE_13__providers_transaction_service__["a" /* TransactionService */],
388 453
                 { provide: __WEBPACK_IMPORTED_MODULE_1__angular_core__["u" /* ErrorHandler */], useClass: __WEBPACK_IMPORTED_MODULE_2_ionic_angular__["b" /* IonicErrorHandler */] }
389 454
             ]
390 455
         })
@@ -396,16 +461,16 @@ var AppModule = /** @class */ (function () {
396 461
 
397 462
 /***/ }),
398 463
 
399
-/***/ 278:
464
+/***/ 279:
400 465
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
401 466
 
402 467
 "use strict";
403 468
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return MyApp; });
404 469
 /* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__angular_core__ = __webpack_require__(0);
405 470
 /* harmony import */ var __WEBPACK_IMPORTED_MODULE_1_ionic_angular__ = __webpack_require__(28);
406
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__ionic_native_status_bar__ = __webpack_require__(202);
407
-/* 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);
471
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__ionic_native_status_bar__ = __webpack_require__(203);
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);
409 474
 var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
410 475
     var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
411 476
     if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
@@ -431,7 +496,7 @@ var MyApp = /** @class */ (function () {
431 496
         });
432 497
     }
433 498
     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"*/
499
+        Object(__WEBPACK_IMPORTED_MODULE_0__angular_core__["m" /* Component */])({template:/*ion-inline-start:"/Users/AleenaRM/Labi/zipcoin/ZipCoin-RED/ZipCoinRedIonicClient/src/app/app.html"*/'<ion-nav [root]="rootPage"></ion-nav>\n'/*ion-inline-end:"/Users/AleenaRM/Labi/zipcoin/ZipCoin-RED/ZipCoinRedIonicClient/src/app/app.html"*/
435 500
         }),
436 501
         __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 502
     ], MyApp);
@@ -442,13 +507,13 @@ var MyApp = /** @class */ (function () {
442 507
 
443 508
 /***/ }),
444 509
 
445
-/***/ 99:
510
+/***/ 50:
446 511
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
447 512
 
448 513
 "use strict";
449
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return Tab4Page; });
514
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return TransactionService; });
450 515
 /* 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);
516
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__angular_common_http__ = __webpack_require__(78);
452 517
 var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
453 518
     var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
454 519
     if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
@@ -460,32 +525,28 @@ var __metadata = (this && this.__metadata) || function (k, v) {
460 525
 };
461 526
 
462 527
 
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;
528
+var TransactionService = /** @class */ (function () {
529
+    function TransactionService(http) {
530
+        this.http = http;
531
+        this.API = 'http://localhost:8080/api/v1';
532
+        this.TRANSACTION_API = this.API + '/transactions';
473 533
     }
474
-    Tab4Page.prototype.ionViewDidLoad = function () {
475
-        console.log('ionViewDidLoad Tab4Page');
534
+    TransactionService.prototype.createTransaction = function (transaction) {
535
+        return this.http.post(this.TRANSACTION_API, transaction);
476 536
     };
477
-    Tab4Page = __decorate([
478
-        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"*/,
480
-        }),
481
-        __metadata("design:paramtypes", [__WEBPACK_IMPORTED_MODULE_1_ionic_angular__["e" /* NavController */], __WEBPACK_IMPORTED_MODULE_1_ionic_angular__["f" /* NavParams */]])
482
-    ], Tab4Page);
483
-    return Tab4Page;
537
+    TransactionService.prototype.getAllTransactions = function () {
538
+        return this.http.get(this.TRANSACTION_API);
539
+    };
540
+    TransactionService = __decorate([
541
+        Object(__WEBPACK_IMPORTED_MODULE_0__angular_core__["A" /* Injectable */])(),
542
+        __metadata("design:paramtypes", [__WEBPACK_IMPORTED_MODULE_1__angular_common_http__["a" /* HttpClient */]])
543
+    ], TransactionService);
544
+    return TransactionService;
484 545
 }());
485 546
 
486
-//# sourceMappingURL=tab4.js.map
547
+//# sourceMappingURL=transaction-service.js.map
487 548
 
488 549
 /***/ })
489 550
 
490
-},[203]);
551
+},[204]);
491 552
 //# sourceMappingURL=main.js.map

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


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


+ 492
- 26
ZipCoinRedJavaServer/.idea/workspace.xml View File

@@ -10,12 +10,147 @@
10 10
     <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
11 11
     <option name="LAST_RESOLUTION" value="IGNORE" />
12 12
   </component>
13
+  <component name="FileEditorManager">
14
+    <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
15
+      <file leaf-file-name="Block.java" pinned="false" current-in-tab="false">
16
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/zipcoin/model/Block.java">
17
+          <provider selected="true" editor-type-id="text-editor">
18
+            <state relative-caret-position="930">
19
+              <caret line="82" column="4" selection-start-line="82" selection-start-column="4" selection-end-line="82" selection-end-column="4" />
20
+              <folding>
21
+                <element signature="imports" expanded="true" />
22
+              </folding>
23
+            </state>
24
+          </provider>
25
+        </entry>
26
+      </file>
27
+      <file leaf-file-name="BlockController.java" pinned="false" current-in-tab="false">
28
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/zipcoin/controller/BlockController.java">
29
+          <provider selected="true" editor-type-id="text-editor">
30
+            <state relative-caret-position="105">
31
+              <caret line="7" column="15" selection-start-line="7" selection-start-column="15" selection-end-line="7" selection-end-column="15" />
32
+              <folding>
33
+                <element signature="e#645#646#0" expanded="true" />
34
+                <element signature="e#703#704#0" expanded="true" />
35
+                <element signature="e#863#864#0" expanded="true" />
36
+                <element signature="e#913#914#0" expanded="true" />
37
+                <element signature="e#1032#1033#0" expanded="true" />
38
+                <element signature="e#1080#1081#0" expanded="true" />
39
+              </folding>
40
+            </state>
41
+          </provider>
42
+        </entry>
43
+      </file>
44
+      <file leaf-file-name="HomeController.java" pinned="false" current-in-tab="false">
45
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/zipcoin/controller/HomeController.java">
46
+          <provider selected="true" editor-type-id="text-editor">
47
+            <state relative-caret-position="90">
48
+              <caret line="9" column="5" selection-start-line="9" selection-start-column="5" selection-end-line="9" selection-end-column="5" />
49
+            </state>
50
+          </provider>
51
+        </entry>
52
+      </file>
53
+      <file leaf-file-name="TransactionController.java" pinned="false" current-in-tab="false">
54
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/zipcoin/controller/TransactionController.java">
55
+          <provider selected="true" editor-type-id="text-editor">
56
+            <state relative-caret-position="525">
57
+              <caret line="42" lean-forward="true" selection-start-line="42" selection-end-line="42" />
58
+            </state>
59
+          </provider>
60
+        </entry>
61
+      </file>
62
+      <file leaf-file-name="WalletController.java" pinned="false" current-in-tab="false">
63
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/zipcoin/controller/WalletController.java">
64
+          <provider selected="true" editor-type-id="text-editor">
65
+            <state relative-caret-position="66">
66
+              <caret line="14" column="13" selection-start-line="14" selection-start-column="13" selection-end-line="14" selection-end-column="13" />
67
+            </state>
68
+          </provider>
69
+        </entry>
70
+      </file>
71
+      <file leaf-file-name="WalletLoader.java" pinned="false" current-in-tab="true">
72
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/zipcoin/config/WalletLoader.java">
73
+          <provider selected="true" editor-type-id="text-editor">
74
+            <state relative-caret-position="240">
75
+              <caret line="24" column="39" selection-start-line="24" selection-start-column="39" selection-end-line="24" selection-end-column="39" />
76
+            </state>
77
+          </provider>
78
+        </entry>
79
+      </file>
80
+      <file leaf-file-name="application.properties" pinned="false" current-in-tab="false">
81
+        <entry file="file://$PROJECT_DIR$/src/main/resources/application.properties">
82
+          <provider selected="true" editor-type-id="text-editor">
83
+            <state relative-caret-position="60">
84
+              <caret line="4" selection-start-line="4" selection-end-line="4" />
85
+            </state>
86
+          </provider>
87
+        </entry>
88
+      </file>
89
+      <file leaf-file-name="pom.xml" pinned="false" current-in-tab="false">
90
+        <entry file="file://$PROJECT_DIR$/pom.xml">
91
+          <provider selected="true" editor-type-id="text-editor">
92
+            <state relative-caret-position="135">
93
+              <caret line="9" lean-forward="true" selection-start-line="9" selection-end-line="9" />
94
+            </state>
95
+          </provider>
96
+        </entry>
97
+      </file>
98
+      <file leaf-file-name="ZipCoinApp.java" pinned="false" current-in-tab="false">
99
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/zipcoin/ZipCoinApp.java">
100
+          <provider selected="true" editor-type-id="text-editor">
101
+            <state relative-caret-position="75">
102
+              <caret line="6" column="13" selection-start-line="6" selection-start-column="13" selection-end-line="6" selection-end-column="13" />
103
+              <folding>
104
+                <element signature="imports" expanded="true" />
105
+              </folding>
106
+            </state>
107
+          </provider>
108
+        </entry>
109
+      </file>
110
+      <file leaf-file-name="minerTest.java" pinned="false" current-in-tab="false">
111
+        <entry file="file://$PROJECT_DIR$/src/test/java/com/zipcoin/redCoin/miner/test/minerTest.java">
112
+          <provider selected="true" editor-type-id="text-editor">
113
+            <state relative-caret-position="135">
114
+              <caret line="12" column="9" selection-start-line="12" selection-start-column="9" selection-end-line="12" selection-end-column="9" />
115
+              <folding>
116
+                <element signature="imports" expanded="true" />
117
+              </folding>
118
+            </state>
119
+          </provider>
120
+        </entry>
121
+      </file>
122
+    </leaf>
123
+  </component>
124
+  <component name="IdeDocumentHistory">
125
+    <option name="CHANGED_PATHS">
126
+      <list>
127
+        <option value="$PROJECT_DIR$/pom.xml" />
128
+        <option value="$PROJECT_DIR$/src/main/java/com/zipcoin/config/WalletLoader.java" />
129
+      </list>
130
+    </option>
131
+  </component>
13 132
   <component name="JsBuildToolGruntFileManager" detection-done="true" sorting="DEFINITION_ORDER" />
14 133
   <component name="JsBuildToolPackageJson" detection-done="true" sorting="DEFINITION_ORDER" />
15 134
   <component name="JsGulpfileManager">
16 135
     <detection-done>true</detection-done>
17 136
     <sorting>DEFINITION_ORDER</sorting>
18 137
   </component>
138
+  <component name="MavenProjectNavigator">
139
+    <treeState>
140
+      <expand>
141
+        <path>
142
+          <item name="" type="16c1761:MavenProjectsStructure$RootNode" />
143
+          <item name="zip-coin" type="9519ce18:MavenProjectsStructure$ProjectNode" />
144
+        </path>
145
+        <path>
146
+          <item name="" type="16c1761:MavenProjectsStructure$RootNode" />
147
+          <item name="zip-coin" type="9519ce18:MavenProjectsStructure$ProjectNode" />
148
+          <item name="Lifecycle" type="58874e2:MavenProjectsStructure$LifecycleNode" />
149
+        </path>
150
+      </expand>
151
+      <select />
152
+    </treeState>
153
+  </component>
19 154
   <component name="NodePackageJsonFileManager">
20 155
     <packageJsonPaths />
21 156
   </component>
@@ -24,18 +159,108 @@
24 159
     <option name="width" value="1280" />
25 160
     <option name="height" value="713" />
26 161
   </component>
162
+  <component name="ProjectLevelVcsManager">
163
+    <ConfirmationsSetting value="2" id="Add" />
164
+  </component>
27 165
   <component name="ProjectView">
28 166
     <navigator proportions="" version="1">
29 167
       <foldersAlwaysOnTop value="true" />
30 168
     </navigator>
31 169
     <panes>
32 170
       <pane id="Scope" />
33
-      <pane id="AndroidView" />
34 171
       <pane id="PackagesPane" />
35
-      <pane id="ProjectPane" />
172
+      <pane id="ProjectPane">
173
+        <subPane>
174
+          <expand>
175
+            <path>
176
+              <item name="ZipCoinRedJavaServer" type="b2602c69:ProjectViewProjectNode" />
177
+              <item name="ZipCoinRedJavaServer" type="462c0819:PsiDirectoryNode" />
178
+            </path>
179
+            <path>
180
+              <item name="ZipCoinRedJavaServer" type="b2602c69:ProjectViewProjectNode" />
181
+              <item name="ZipCoinRedJavaServer" type="462c0819:PsiDirectoryNode" />
182
+              <item name="src" type="462c0819:PsiDirectoryNode" />
183
+            </path>
184
+            <path>
185
+              <item name="ZipCoinRedJavaServer" type="b2602c69:ProjectViewProjectNode" />
186
+              <item name="ZipCoinRedJavaServer" type="462c0819:PsiDirectoryNode" />
187
+              <item name="src" type="462c0819:PsiDirectoryNode" />
188
+              <item name="main" type="462c0819:PsiDirectoryNode" />
189
+            </path>
190
+            <path>
191
+              <item name="ZipCoinRedJavaServer" type="b2602c69:ProjectViewProjectNode" />
192
+              <item name="ZipCoinRedJavaServer" type="462c0819:PsiDirectoryNode" />
193
+              <item name="src" type="462c0819:PsiDirectoryNode" />
194
+              <item name="main" type="462c0819:PsiDirectoryNode" />
195
+              <item name="java" type="462c0819:PsiDirectoryNode" />
196
+            </path>
197
+            <path>
198
+              <item name="ZipCoinRedJavaServer" type="b2602c69:ProjectViewProjectNode" />
199
+              <item name="ZipCoinRedJavaServer" type="462c0819:PsiDirectoryNode" />
200
+              <item name="src" type="462c0819:PsiDirectoryNode" />
201
+              <item name="main" type="462c0819:PsiDirectoryNode" />
202
+              <item name="java" type="462c0819:PsiDirectoryNode" />
203
+              <item name="zipcoin" type="462c0819:PsiDirectoryNode" />
204
+            </path>
205
+            <path>
206
+              <item name="ZipCoinRedJavaServer" type="b2602c69:ProjectViewProjectNode" />
207
+              <item name="ZipCoinRedJavaServer" type="462c0819:PsiDirectoryNode" />
208
+              <item name="src" type="462c0819:PsiDirectoryNode" />
209
+              <item name="main" type="462c0819:PsiDirectoryNode" />
210
+              <item name="java" type="462c0819:PsiDirectoryNode" />
211
+              <item name="zipcoin" type="462c0819:PsiDirectoryNode" />
212
+              <item name="config" type="462c0819:PsiDirectoryNode" />
213
+            </path>
214
+            <path>
215
+              <item name="ZipCoinRedJavaServer" type="b2602c69:ProjectViewProjectNode" />
216
+              <item name="ZipCoinRedJavaServer" type="462c0819:PsiDirectoryNode" />
217
+              <item name="src" type="462c0819:PsiDirectoryNode" />
218
+              <item name="main" type="462c0819:PsiDirectoryNode" />
219
+              <item name="java" type="462c0819:PsiDirectoryNode" />
220
+              <item name="zipcoin" type="462c0819:PsiDirectoryNode" />
221
+              <item name="controller" type="462c0819:PsiDirectoryNode" />
222
+            </path>
223
+            <path>
224
+              <item name="ZipCoinRedJavaServer" type="b2602c69:ProjectViewProjectNode" />
225
+              <item name="ZipCoinRedJavaServer" type="462c0819:PsiDirectoryNode" />
226
+              <item name="src" type="462c0819:PsiDirectoryNode" />
227
+              <item name="main" type="462c0819:PsiDirectoryNode" />
228
+              <item name="java" type="462c0819:PsiDirectoryNode" />
229
+              <item name="zipcoin" type="462c0819:PsiDirectoryNode" />
230
+              <item name="model" type="462c0819:PsiDirectoryNode" />
231
+            </path>
232
+            <path>
233
+              <item name="ZipCoinRedJavaServer" type="b2602c69:ProjectViewProjectNode" />
234
+              <item name="ZipCoinRedJavaServer" type="462c0819:PsiDirectoryNode" />
235
+              <item name="src" type="462c0819:PsiDirectoryNode" />
236
+              <item name="main" type="462c0819:PsiDirectoryNode" />
237
+              <item name="java" type="462c0819:PsiDirectoryNode" />
238
+              <item name="zipcoin" type="462c0819:PsiDirectoryNode" />
239
+              <item name="repository" type="462c0819:PsiDirectoryNode" />
240
+            </path>
241
+            <path>
242
+              <item name="ZipCoinRedJavaServer" type="b2602c69:ProjectViewProjectNode" />
243
+              <item name="ZipCoinRedJavaServer" type="462c0819:PsiDirectoryNode" />
244
+              <item name="src" type="462c0819:PsiDirectoryNode" />
245
+              <item name="main" type="462c0819:PsiDirectoryNode" />
246
+              <item name="java" type="462c0819:PsiDirectoryNode" />
247
+              <item name="zipcoin" type="462c0819:PsiDirectoryNode" />
248
+              <item name="utilities" type="462c0819:PsiDirectoryNode" />
249
+            </path>
250
+          </expand>
251
+          <select />
252
+        </subPane>
253
+      </pane>
254
+      <pane id="AndroidView" />
36 255
     </panes>
37 256
   </component>
38 257
   <component name="PropertiesComponent">
258
+    <property name="RequestMappingsPanelOrder0" value="0" />
259
+    <property name="RequestMappingsPanelOrder1" value="1" />
260
+    <property name="RequestMappingsPanelOrder2" value="2" />
261
+    <property name="RequestMappingsPanelWidth0" value="75" />
262
+    <property name="RequestMappingsPanelWidth1" value="75" />
263
+    <property name="RequestMappingsPanelWidth2" value="75" />
39 264
     <property name="WebServerToolWindowFactoryState" value="false" />
40 265
     <property name="aspect.path.notification.shown" value="true" />
41 266
     <property name="nodejs_interpreter_path.stuck_in_default_project" value="undefined stuck path" />
@@ -130,42 +355,66 @@
130 355
     <servers />
131 356
   </component>
132 357
   <component name="TimeTrackingManager">
133
-    <option name="totallyTimeSpent" value="17000" />
358
+    <option name="totallyTimeSpent" value="1539000" />
134 359
   </component>
135 360
   <component name="ToolWindowManager">
136
-    <frame x="0" y="23" width="1280" height="713" extended-state="0" />
361
+    <frame x="39" y="23" width="1203" height="713" extended-state="0" />
362
+    <editor active="true" />
137 363
     <layout>
138
-      <window_info anchor="right" id="Palette" />
139
-      <window_info anchor="bottom" id="Event Log" side_tool="true" />
140
-      <window_info anchor="right" id="Maven Projects" />
141
-      <window_info anchor="bottom" id="Database Changes" show_stripe_button="false" />
142
-      <window_info id="Capture Tool" />
143
-      <window_info id="Designer" />
144
-      <window_info anchor="right" id="Database" />
364
+      <window_info anchor="right" id="Palette" order="3" />
365
+      <window_info anchor="bottom" id="Event Log" order="7" sideWeight="0.25925925" side_tool="true" visible="true" weight="0.29707792" />
366
+      <window_info anchor="right" id="Maven Projects" order="3" weight="0.32988802" />
367
+      <window_info anchor="bottom" id="Database Changes" order="7" show_stripe_button="false" />
368
+      <window_info id="Capture Tool" order="2" />
369
+      <window_info id="Designer" order="2" />
370
+      <window_info anchor="right" id="Database" order="3" />
145 371
       <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
146 372
       <window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
147
-      <window_info id="UI Designer" />
373
+      <window_info id="UI Designer" order="2" />
148 374
       <window_info anchor="bottom" id="Debug" order="3" weight="0.4" />
149 375
       <window_info anchor="bottom" id="TODO" order="6" />
150
-      <window_info anchor="right" id="Palette&#9;" />
151
-      <window_info id="Image Layers" />
152
-      <window_info anchor="bottom" id="Java Enterprise" />
153
-      <window_info anchor="right" id="Capture Analysis" />
376
+      <window_info anchor="bottom" id="Messages" order="9" weight="0.3298969" />
377
+      <window_info anchor="right" id="Palette&#9;" order="3" />
378
+      <window_info id="Image Layers" order="2" />
379
+      <window_info anchor="bottom" id="Java Enterprise" order="8" />
380
+      <window_info anchor="right" id="Capture Analysis" order="3" />
381
+      <window_info anchor="bottom" id="Version Control" order="7" show_stripe_button="false" />
382
+      <window_info anchor="bottom" id="Run" order="2" sideWeight="0.84409994" weight="0.4318182" />
383
+      <window_info anchor="bottom" id="Spring" order="10" />
384
+      <window_info anchor="bottom" id="Terminal" order="7" sideWeight="0.7407407" visible="true" weight="0.29707792" />
385
+      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.2868217" />
386
+      <window_info anchor="right" id="Bean Validation" order="5" />
387
+      <window_info id="Web" order="4" side_tool="true" />
388
+      <window_info anchor="right" id="Theme Preview" order="3" />
389
+      <window_info id="Favorites" order="2" side_tool="true" />
390
+      <window_info anchor="bottom" id="Message" order="0" />
154 391
       <window_info anchor="bottom" id="Run" order="2" />
155
-      <window_info anchor="bottom" id="Version Control" show_stripe_button="false" />
156
-      <window_info anchor="bottom" id="Spring" />
157
-      <window_info anchor="bottom" id="Terminal" />
392
+      <window_info anchor="bottom" id="Event Log" order="10" side_tool="true" />
158 393
       <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.24959612" />
159
-      <window_info anchor="right" id="Bean Validation" />
160
-      <window_info id="Web" side_tool="true" />
161
-      <window_info anchor="right" id="Theme Preview" />
162
-      <window_info id="Favorites" side_tool="true" />
394
+      <window_info id="Favorites" order="5" side_tool="true" />
395
+      <window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
396
+      <window_info anchor="bottom" id="Terminal" order="10" />
397
+      <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
398
+      <window_info anchor="right" id="Palette" order="5" />
399
+      <window_info anchor="right" id="Palette&#9;" order="5" />
400
+      <window_info anchor="right" id="Maven Projects" order="5" />
401
+      <window_info id="Web" order="5" side_tool="true" />
402
+      <window_info anchor="bottom" id="Database Changes" order="10" show_stripe_button="false" />
403
+      <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
404
+      <window_info id="Image Layers" order="5" />
405
+      <window_info anchor="right" id="Theme Preview" order="5" />
406
+      <window_info anchor="right" id="Database" order="5" />
407
+      <window_info id="Capture Tool" order="5" />
408
+      <window_info anchor="bottom" id="Version Control" order="10" show_stripe_button="false" />
409
+      <window_info anchor="right" id="Capture Analysis" order="5" />
410
+      <window_info anchor="bottom" id="TODO" order="6" />
163 411
       <window_info anchor="bottom" id="Find" order="1" />
164
-      <window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
165 412
       <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
166
-      <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
167
-      <window_info anchor="bottom" id="Message" order="0" />
168 413
       <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
414
+      <window_info id="UI Designer" order="5" />
415
+      <window_info anchor="bottom" id="Debug" order="3" weight="0.4" />
416
+      <window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
417
+      <window_info id="Designer" order="5" />
169 418
     </layout>
170 419
   </component>
171 420
   <component name="TypeScriptGeneratedFilesManager">
@@ -174,6 +423,223 @@
174 423
   <component name="VcsContentAnnotationSettings">
175 424
     <option name="myLimit" value="2678400000" />
176 425
   </component>
426
+  <component name="editorHistoryManager">
427
+    <entry file="file://$PROJECT_DIR$/src/test/java/redCoin/minerTest.java" />
428
+    <entry file="file://$PROJECT_DIR$/.idea/workspace.xml">
429
+      <provider selected="true" editor-type-id="text-editor">
430
+        <state relative-caret-position="405">
431
+          <caret line="27" selection-start-line="27" selection-end-line="27" selection-end-column="12" />
432
+        </state>
433
+      </provider>
434
+    </entry>
435
+    <entry file="file://$PROJECT_DIR$/.idea/ZipCoin-RED.iml" />
436
+    <entry file="file://$PROJECT_DIR$/pom.xml">
437
+      <provider selected="true" editor-type-id="text-editor">
438
+        <state relative-caret-position="270">
439
+          <caret line="18" column="10" lean-forward="true" selection-start-line="18" selection-start-column="10" selection-end-line="18" selection-end-column="10" />
440
+        </state>
441
+      </provider>
442
+    </entry>
443
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/zipcoin/redCoin/Main.java" />
444
+    <entry file="file://$PROJECT_DIR$/src/test/java/com/zipcoin/redCoin/testMain.java" />
445
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/zipcoin/redCoin/Main.java" />
446
+    <entry file="file://$PROJECT_DIR$/src/test/java/com/zipcoin/redCoin/testMain.java" />
447
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/zipcoin/redCoin/Main.java" />
448
+    <entry file="file://$PROJECT_DIR$/src/test/java/com/zipcoin/redCoin/testMain.java" />
449
+    <entry file="file://$PROJECT_DIR$/pom.xml">
450
+      <provider selected="true" editor-type-id="text-editor">
451
+        <state relative-caret-position="90">
452
+          <caret line="6" column="20" selection-start-line="6" selection-start-column="13" selection-end-line="6" selection-end-column="20" />
453
+        </state>
454
+      </provider>
455
+    </entry>
456
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/zipcoin/redCoin/Main.java" />
457
+    <entry file="file://$PROJECT_DIR$/ZipCoin-RED.iml">
458
+      <provider selected="true" editor-type-id="text-editor">
459
+        <state relative-caret-position="195">
460
+          <caret line="13" column="34" selection-start-line="13" selection-start-column="34" selection-end-line="13" selection-end-column="34" />
461
+        </state>
462
+      </provider>
463
+    </entry>
464
+    <entry file="file://$PROJECT_DIR$/src/test/java/com/zipcoin/redCoin/block/test/BlockControllerTest.java">
465
+      <provider selected="true" editor-type-id="text-editor">
466
+        <state relative-caret-position="30">
467
+          <caret line="2" column="32" selection-start-line="2" selection-start-column="32" selection-end-line="2" selection-end-column="32" />
468
+        </state>
469
+      </provider>
470
+    </entry>
471
+    <entry file="file://$PROJECT_DIR$/.idea/workspace.xml">
472
+      <provider selected="true" editor-type-id="text-editor">
473
+        <state relative-caret-position="438">
474
+          <caret line="461" column="19" selection-start-line="461" selection-start-column="19" selection-end-line="461" selection-end-column="19" />
475
+        </state>
476
+      </provider>
477
+    </entry>
478
+    <entry file="file://$PROJECT_DIR$/pom.xml">
479
+      <provider selected="true" editor-type-id="text-editor">
480
+        <state relative-caret-position="60">
481
+          <caret line="4" column="30" selection-start-line="4" selection-start-column="30" selection-end-line="4" selection-end-column="30" />
482
+        </state>
483
+      </provider>
484
+    </entry>
485
+    <entry file="file://$PROJECT_DIR$/src/main/java/Main.java" />
486
+    <entry file="file://$PROJECT_DIR$/src/main/java/redCoin/Main.java" />
487
+    <entry file="file://$PROJECT_DIR$/src/test/java/redCoin/testMain.java" />
488
+    <entry file="file://$PROJECT_DIR$/pom.xml">
489
+      <provider selected="true" editor-type-id="text-editor">
490
+        <state relative-caret-position="165">
491
+          <caret line="11" column="10" lean-forward="true" selection-start-line="11" selection-start-column="10" selection-end-line="11" selection-end-column="10" />
492
+        </state>
493
+      </provider>
494
+    </entry>
495
+    <entry file="file://$PROJECT_DIR$/src/test/java/redCoin/minerTest.java" />
496
+    <entry file="file://$PROJECT_DIR$/.idea/workspace.xml">
497
+      <provider selected="true" editor-type-id="text-editor">
498
+        <state relative-caret-position="-4617">
499
+          <caret line="124" column="19" selection-start-line="124" selection-start-column="19" selection-end-line="124" selection-end-column="19" />
500
+        </state>
501
+      </provider>
502
+    </entry>
503
+    <entry file="file://$PROJECT_DIR$/.idea/ZipCoin-RED.iml" />
504
+    <entry file="file://$PROJECT_DIR$/src/main/java/redCoin/Main.java" />
505
+    <entry file="file://$PROJECT_DIR$/src/test/java/redCoin/testMain.java" />
506
+    <entry file="file://$PROJECT_DIR$/src/main/java/redCoin/Main.java" />
507
+    <entry file="file://$PROJECT_DIR$/src/test/java/redCoin/testMain.java" />
508
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/zipcoin/redCoin/Main.java" />
509
+    <entry file="file://$PROJECT_DIR$/src/test/java/mainTest.java" />
510
+    <entry file="file://$PROJECT_DIR$/src/test/java/com/zipcoin/redCoin/testMain.java" />
511
+    <entry file="file://$PROJECT_DIR$/README.md" />
512
+    <entry file="file://$PROJECT_DIR$/src/main/resources/db.migration/mine_block.sql" />
513
+    <entry file="file://$PROJECT_DIR$/src/main/resources/db.migration/V2__mine_block.sql" />
514
+    <entry file="file://$PROJECT_DIR$/src/main/java/redCoin/Miner/Miner.java" />
515
+    <entry file="file://$PROJECT_DIR$/src/test/java/com/zipcoin/redCoin/block/test/BlockTest.java">
516
+      <provider selected="true" editor-type-id="text-editor">
517
+        <state relative-caret-position="449">
518
+          <caret line="78" lean-forward="true" selection-start-line="78" selection-end-line="78" />
519
+        </state>
520
+      </provider>
521
+    </entry>
522
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/zipcoin/model/Transaction.java" />
523
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/zipcoin/config/PersistenceConfiguration.java">
524
+      <provider selected="true" editor-type-id="text-editor">
525
+        <state relative-caret-position="420">
526
+          <caret line="28" selection-start-line="28" selection-end-line="28" />
527
+        </state>
528
+      </provider>
529
+    </entry>
530
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/zipcoin/repository/BlockRepository.java">
531
+      <provider selected="true" editor-type-id="text-editor">
532
+        <state relative-caret-position="75">
533
+          <caret line="5" column="17" selection-start-line="5" selection-start-column="17" selection-end-line="5" selection-end-column="17" />
534
+          <folding>
535
+            <element signature="imports" expanded="true" />
536
+          </folding>
537
+        </state>
538
+      </provider>
539
+    </entry>
540
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/zipcoin/ZipCoinApp.java">
541
+      <provider selected="true" editor-type-id="text-editor">
542
+        <state relative-caret-position="75">
543
+          <caret line="6" column="13" selection-start-line="6" selection-start-column="13" selection-end-line="6" selection-end-column="13" />
544
+          <folding>
545
+            <element signature="imports" expanded="true" />
546
+          </folding>
547
+        </state>
548
+      </provider>
549
+    </entry>
550
+    <entry file="file://$PROJECT_DIR$/src/main/resources/db/migration/V2__create_block.sql">
551
+      <provider selected="true" editor-type-id="text-editor">
552
+        <state relative-caret-position="105">
553
+          <caret line="7" column="2" selection-start-line="7" selection-start-column="2" selection-end-line="7" selection-end-column="2" />
554
+        </state>
555
+      </provider>
556
+    </entry>
557
+    <entry file="file://$PROJECT_DIR$/src/main/resources/application.properties">
558
+      <provider selected="true" editor-type-id="text-editor">
559
+        <state relative-caret-position="60">
560
+          <caret line="4" selection-start-line="4" selection-end-line="4" />
561
+        </state>
562
+      </provider>
563
+    </entry>
564
+    <entry file="file://$PROJECT_DIR$/src/test/java/redCoin/Miner/minerTest.java" />
565
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/zipcoin/model/Miner.java">
566
+      <provider selected="true" editor-type-id="text-editor">
567
+        <state relative-caret-position="210">
568
+          <caret line="14" column="21" selection-start-line="14" selection-start-column="21" selection-end-line="14" selection-end-column="21" />
569
+        </state>
570
+      </provider>
571
+    </entry>
572
+    <entry file="file://$PROJECT_DIR$/src/test/java/com/zipcoin/redCoin/miner/test/minerTest.java">
573
+      <provider selected="true" editor-type-id="text-editor">
574
+        <state relative-caret-position="135">
575
+          <caret line="12" column="9" selection-start-line="12" selection-start-column="9" selection-end-line="12" selection-end-column="9" />
576
+          <folding>
577
+            <element signature="imports" expanded="true" />
578
+          </folding>
579
+        </state>
580
+      </provider>
581
+    </entry>
582
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/zipcoin/model/Block.java">
583
+      <provider selected="true" editor-type-id="text-editor">
584
+        <state relative-caret-position="930">
585
+          <caret line="82" column="4" selection-start-line="82" selection-start-column="4" selection-end-line="82" selection-end-column="4" />
586
+          <folding>
587
+            <element signature="imports" expanded="true" />
588
+          </folding>
589
+        </state>
590
+      </provider>
591
+    </entry>
592
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/zipcoin/controller/BlockController.java">
593
+      <provider selected="true" editor-type-id="text-editor">
594
+        <state relative-caret-position="105">
595
+          <caret line="7" column="15" selection-start-line="7" selection-start-column="15" selection-end-line="7" selection-end-column="15" />
596
+          <folding>
597
+            <element signature="e#645#646#0" expanded="true" />
598
+            <element signature="e#703#704#0" expanded="true" />
599
+            <element signature="e#863#864#0" expanded="true" />
600
+            <element signature="e#913#914#0" expanded="true" />
601
+            <element signature="e#1032#1033#0" expanded="true" />
602
+            <element signature="e#1080#1081#0" expanded="true" />
603
+          </folding>
604
+        </state>
605
+      </provider>
606
+    </entry>
607
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/zipcoin/controller/HomeController.java">
608
+      <provider selected="true" editor-type-id="text-editor">
609
+        <state relative-caret-position="90">
610
+          <caret line="9" column="5" selection-start-line="9" selection-start-column="5" selection-end-line="9" selection-end-column="5" />
611
+        </state>
612
+      </provider>
613
+    </entry>
614
+    <entry file="file://$PROJECT_DIR$/pom.xml">
615
+      <provider selected="true" editor-type-id="text-editor">
616
+        <state relative-caret-position="135">
617
+          <caret line="9" lean-forward="true" selection-start-line="9" selection-end-line="9" />
618
+        </state>
619
+      </provider>
620
+    </entry>
621
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/zipcoin/controller/TransactionController.java">
622
+      <provider selected="true" editor-type-id="text-editor">
623
+        <state relative-caret-position="525">
624
+          <caret line="42" lean-forward="true" selection-start-line="42" selection-end-line="42" />
625
+        </state>
626
+      </provider>
627
+    </entry>
628
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/zipcoin/controller/WalletController.java">
629
+      <provider selected="true" editor-type-id="text-editor">
630
+        <state relative-caret-position="66">
631
+          <caret line="14" column="13" selection-start-line="14" selection-start-column="13" selection-end-line="14" selection-end-column="13" />
632
+        </state>
633
+      </provider>
634
+    </entry>
635
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/zipcoin/config/WalletLoader.java">
636
+      <provider selected="true" editor-type-id="text-editor">
637
+        <state relative-caret-position="240">
638
+          <caret line="24" column="39" selection-start-line="24" selection-start-column="39" selection-end-line="24" selection-end-column="39" />
639
+        </state>
640
+      </provider>
641
+    </entry>
642
+  </component>
177 643
   <component name="masterDetails">
178 644
     <states>
179 645
       <state key="GlobalLibrariesConfigurable.UI">

+ 1
- 1
ZipCoinRedJavaServer/pom.xml View File

@@ -11,7 +11,7 @@
11 11
     <parent>
12 12
         <groupId>org.springframework.boot</groupId>
13 13
         <artifactId>spring-boot-starter-parent</artifactId>
14
-        <version>1.3.1.RELEASE</version>
14
+        <version>1.3.2.RELEASE</version>
15 15
     </parent>
16 16
 
17 17
     <name>zip-coin</name>

+ 1
- 1
ZipCoinRedJavaServer/src/main/java/com/zipcoin/config/WalletLoader.java View File

@@ -21,7 +21,7 @@ public class WalletLoader implements ApplicationRunner {
21 21
     public void run(ApplicationArguments applicationArguments) throws Exception {
22 22
         Wallet[] wallets = new Wallet[]
23 23
                 {
24
-                        new Wallet("ANN","34",80),
24
+                        new Wallet("ann","34",80),
25 25
                         new Wallet("sen","3564",8)
26 26
 
27 27
 

BIN
ZipCoinRedJavaServer/target/classes/com/zipcoin/config/WalletLoader.class View File


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