Browse Source

fixed spelling of recipient

Eric Foster 6 years ago
parent
commit
cb407969c3

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

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

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

@@ -20,7 +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
+    this.getAllTransactions();
24 24
   }
25 25
 
26 26
   ionViewDidLoad() {

+ 35
- 83
ZipCoinRedIonicClient/www/build/main.js View File

@@ -34,7 +34,7 @@ var Tab4Page = /** @class */ (function () {
34 34
     };
35 35
     Tab4Page = __decorate([
36 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"*/,
37
+            selector: 'page-tab4',template:/*ion-inline-start:"/Users/ericf/ZCWProjects/ZipCoin-RED/ZipCoinRedIonicClient/src/pages/tab4/tab4.html"*/'<!--\n  Generated template for the Tab4Page page.\n\n  See http://ionicframework.com/docs/components/#navigation for more info on\n  Ionic pages and navigation.\n-->\n<ion-header>\n\n  <ion-navbar>\n    <ion-title>tab4</ion-title>\n  </ion-navbar>\n\n</ion-header>\n\n\n<ion-content padding>\n\n</ion-content>\n'/*ion-inline-end:"/Users/ericf/ZCWProjects/ZipCoin-RED/ZipCoinRedIonicClient/src/pages/tab4/tab4.html"*/,
38 38
         }),
39 39
         __metadata("design:paramtypes", [__WEBPACK_IMPORTED_MODULE_1_ionic_angular__["e" /* NavController */], __WEBPACK_IMPORTED_MODULE_1_ionic_angular__["f" /* NavParams */]])
40 40
     ], Tab4Page);
@@ -49,7 +49,7 @@ var Tab4Page = /** @class */ (function () {
49 49
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
50 50
 
51 51
 "use strict";
52
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return Tab4Page; });
52
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return TabsPage; });
53 53
 /* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__angular_core__ = __webpack_require__(0);
54 54
 /* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__home_home__ = __webpack_require__(159);
55 55
 /* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__wallet_wallet__ = __webpack_require__(103);
@@ -66,30 +66,26 @@ var __metadata = (this && this.__metadata) || function (k, v) {
66 66
 };
67 67
 
68 68
 
69
-/**
70
- * Generated class for the Tab4Page page.
71
- *
72
- * See https://ionicframework.com/docs/components/#navigation for more info on
73
- * Ionic pages and navigation.
74
- */
75
-var Tab4Page = /** @class */ (function () {
76
-    function Tab4Page(navCtrl, navParams) {
77
-        this.navCtrl = navCtrl;
78
-        this.navParams = navParams;
69
+
70
+
71
+
72
+var TabsPage = /** @class */ (function () {
73
+    function TabsPage() {
74
+        this.homePage = __WEBPACK_IMPORTED_MODULE_1__home_home__["a" /* HomePage */];
75
+        this.walletPage = __WEBPACK_IMPORTED_MODULE_2__wallet_wallet__["a" /* WalletPage */];
76
+        this.transactionPage = __WEBPACK_IMPORTED_MODULE_3__transaction_transaction__["a" /* TransactionPage */];
77
+        this.tab4 = __WEBPACK_IMPORTED_MODULE_4__tab4_tab4__["a" /* Tab4Page */];
79 78
     }
80
-    Tab4Page.prototype.ionViewDidLoad = function () {
81
-        console.log('ionViewDidLoad Tab4Page');
82
-    };
83
-    Tab4Page = __decorate([
79
+    TabsPage = __decorate([
84 80
         Object(__WEBPACK_IMPORTED_MODULE_0__angular_core__["m" /* Component */])({
85
-            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"*/,
81
+            selector: 'page-tabs',template:/*ion-inline-start:"/Users/ericf/ZCWProjects/ZipCoin-RED/ZipCoinRedIonicClient/src/pages/tabs/tabs.html"*/'<ion-tabs>\n  <ion-tab [root]="homePage" tabTitle="ZipCoin-BlockChain" tabIcon="link"></ion-tab>\n  <ion-tab [root]="walletPage" tabTitle="ZipCoin Wallet" tabIcon="cash"></ion-tab>\n  <ion-tab [root]="transactionPage" tabTitle="ZipCoin Transactions" tabIcon="contacts"></ion-tab>\n  <ion-tab [root]="tab4" tabTitle="Ziptab" tabIcon="star"></ion-tab>\n\n</ion-tabs>'/*ion-inline-end:"/Users/ericf/ZCWProjects/ZipCoin-RED/ZipCoinRedIonicClient/src/pages/tabs/tabs.html"*/,
86 82
         }),
87
-        __metadata("design:paramtypes", [__WEBPACK_IMPORTED_MODULE_1_ionic_angular__["e" /* NavController */], __WEBPACK_IMPORTED_MODULE_1_ionic_angular__["f" /* NavParams */]])
88
-    ], Tab4Page);
89
-    return Tab4Page;
83
+        __metadata("design:paramtypes", [])
84
+    ], TabsPage);
85
+    return TabsPage;
90 86
 }());
91 87
 
92
-//# sourceMappingURL=tab4.js.map
88
+//# sourceMappingURL=tabs.js.map
93 89
 
94 90
 /***/ }),
95 91
 
@@ -97,7 +93,7 @@ var Tab4Page = /** @class */ (function () {
97 93
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
98 94
 
99 95
 "use strict";
100
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return TransactionPage; });
96
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return WalletPage; });
101 97
 /* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__angular_core__ = __webpack_require__(0);
102 98
 /* harmony import */ var __WEBPACK_IMPORTED_MODULE_1_ionic_angular__ = __webpack_require__(28);
103 99
 /* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__providers_transaction_service__ = __webpack_require__(50);
@@ -114,7 +110,7 @@ var __metadata = (this && this.__metadata) || function (k, v) {
114 110
 
115 111
 
116 112
 /**
117
- * Generated class for the TransactionPage page.
113
+ * Generated class for the WalletPage page.
118 114
  *
119 115
  * See https://ionicframework.com/docs/components/#navigation for more info on
120 116
  * Ionic pages and navigation.
@@ -125,66 +121,22 @@ var WalletPage = /** @class */ (function () {
125 121
         this.navParams = navParams;
126 122
         this.transactionService = transactionService;
127 123
     }
128
-    TransactionPage.prototype.ionViewDidLoad = function () {
129
-        console.log('ionViewDidLoad TransactionPage');
124
+    WalletPage.prototype.ionViewDidLoad = function () {
125
+        console.log('ionViewDidLoad WalletPage');
130 126
     };
131 127
     WalletPage.prototype.createTransaction = function () {
132 128
         this.transactionService.createTransaction(this.transaction);
133 129
     };
134 130
     WalletPage = __decorate([
135 131
         Object(__WEBPACK_IMPORTED_MODULE_0__angular_core__["m" /* Component */])({
136
-            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"*/,
132
+            selector: 'page-wallet',template:/*ion-inline-start:"/Users/ericf/ZCWProjects/ZipCoin-RED/ZipCoinRedIonicClient/src/pages/wallet/wallet.html"*/'<!--\n  Generated template for the WalletPage page.\n\n  See http://ionicframework.com/docs/components/#navigation for more info on\n  Ionic pages and navigation.\n-->\n<ion-header>\n\n  <ion-navbar>\n    <ion-title>Wallet</ion-title>\n  </ion-navbar>\n\n</ion-header>\n\n\n<ion-content padding>\n\n\n  \n  <ion-item>\n      <ion-label>Name</ion-label>\n      <ion-select [(ngModel)]="name">\n        <ion-option value="ann">Ann</ion-option>\n        <ion-option value="sen">Sen</ion-option>\n      </ion-select>\n     </ion-item>\n     <ion-item>\n        <ion-label>current balance</ion-label>\n        <ion-input></ion-input>\n      </ion-item>\n      <ion-item>\n          <ion-label>Public Key</ion-label>\n          <ion-input></ion-input>\n        </ion-item>\n      <br>\n      <br>\n      <div class = "bar bar-subheader bar-assertive">\n          <h2 class = "title">Payment</h2>\n       </div>\n       <ion-item>\n          <ion-label>From</ion-label>\n          <ion-select [(ngModel)]="name">\n            <ion-option value="ann">Ann</ion-option>\n            <ion-option value="sen">Sen</ion-option>\n          </ion-select>\n         </ion-item>\n         <ion-item>\n            <ion-label>To</ion-label>\n            <ion-select [(ngModel)]="to">\n              <ion-option value="ann">Ann</ion-option>\n              <ion-option value="sen">Sen</ion-option>\n            </ion-select>\n           </ion-item>\n      \n          <ion-item>\n              <ion-label>Amount</ion-label>\n              <ion-input></ion-input>\n            </ion-item>\n            <br>\n            <button ion-button>Pay</button>\n</ion-content>\n'/*ion-inline-end:"/Users/ericf/ZCWProjects/ZipCoin-RED/ZipCoinRedIonicClient/src/pages/wallet/wallet.html"*/,
137 133
         }),
138 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 */]])
139 135
     ], WalletPage);
140 136
     return WalletPage;
141 137
 }());
142 138
 
143
-//# sourceMappingURL=transaction.js.map
144
-
145
-/***/ }),
146
-
147
-/***/ 104:
148
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
149
-
150
-"use strict";
151
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return TabsPage; });
152
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__angular_core__ = __webpack_require__(0);
153
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__home_home__ = __webpack_require__(159);
154
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__wallet_wallet__ = __webpack_require__(104);
155
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_3__transaction_transaction__ = __webpack_require__(102);
156
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_4__tab4_tab4__ = __webpack_require__(101);
157
-var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
158
-    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
159
-    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
160
-    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;
161
-    return c > 3 && r && Object.defineProperty(target, key, r), r;
162
-};
163
-var __metadata = (this && this.__metadata) || function (k, v) {
164
-    if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
165
-};
166
-
167
-
168
-
169
-
170
-
171
-var TabsPage = /** @class */ (function () {
172
-    function TabsPage() {
173
-        this.homePage = __WEBPACK_IMPORTED_MODULE_1__home_home__["a" /* HomePage */];
174
-        this.walletPage = __WEBPACK_IMPORTED_MODULE_2__wallet_wallet__["a" /* WalletPage */];
175
-        this.transactionPage = __WEBPACK_IMPORTED_MODULE_3__transaction_transaction__["a" /* TransactionPage */];
176
-        this.tab4 = __WEBPACK_IMPORTED_MODULE_4__tab4_tab4__["a" /* Tab4Page */];
177
-    }
178
-    TabsPage = __decorate([
179
-        Object(__WEBPACK_IMPORTED_MODULE_0__angular_core__["m" /* Component */])({
180
-            selector: 'page-tabs',template:/*ion-inline-start:"/Users/ericf/ZCWProjects/ZipCoin-RED/ZipCoinRedIonicClient/src/pages/tabs/tabs.html"*/'<ion-tabs>\n  <ion-tab [root]="homePage" tabTitle="ZipCoin-BlockChain" tabIcon="link"></ion-tab>\n  <ion-tab [root]="walletPage" tabTitle="ZipCoin Wallet" tabIcon="cash"></ion-tab>\n  <ion-tab [root]="transactionPage" tabTitle="ZipCoin Transactions" tabIcon="contacts"></ion-tab>\n  <ion-tab [root]="tab4" tabTitle="Ziptab" tabIcon="star"></ion-tab>\n\n</ion-tabs>'/*ion-inline-end:"/Users/ericf/ZCWProjects/ZipCoin-RED/ZipCoinRedIonicClient/src/pages/tabs/tabs.html"*/,
181
-        }),
182
-        __metadata("design:paramtypes", [])
183
-    ], TabsPage);
184
-    return TabsPage;
185
-}());
186
-
187
-//# sourceMappingURL=tabs.js.map
139
+//# sourceMappingURL=wallet.js.map
188 140
 
189 141
 /***/ }),
190 142
 
@@ -192,7 +144,7 @@ var TabsPage = /** @class */ (function () {
192 144
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
193 145
 
194 146
 "use strict";
195
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return WalletPage; });
147
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return TransactionPage; });
196 148
 /* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__angular_core__ = __webpack_require__(0);
197 149
 /* harmony import */ var __WEBPACK_IMPORTED_MODULE_1_ionic_angular__ = __webpack_require__(28);
198 150
 /* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__providers_transaction_service__ = __webpack_require__(50);
@@ -209,7 +161,7 @@ var __metadata = (this && this.__metadata) || function (k, v) {
209 161
 
210 162
 
211 163
 /**
212
- * Generated class for the WalletPage page.
164
+ * Generated class for the TransactionPage page.
213 165
  *
214 166
  * See https://ionicframework.com/docs/components/#navigation for more info on
215 167
  * Ionic pages and navigation.
@@ -219,10 +171,10 @@ var TransactionPage = /** @class */ (function () {
219 171
         this.navCtrl = navCtrl;
220 172
         this.navParams = navParams;
221 173
         this.transactionService = transactionService;
222
-        this.getAllTransactions;
174
+        this.getAllTransactions();
223 175
     }
224
-    WalletPage.prototype.ionViewDidLoad = function () {
225
-        console.log('ionViewDidLoad WalletPage');
176
+    TransactionPage.prototype.ionViewDidLoad = function () {
177
+        console.log('ionViewDidLoad TransactionPage');
226 178
     };
227 179
     TransactionPage.prototype.getAllTransactions = function () {
228 180
         var _this = this;
@@ -232,15 +184,15 @@ var TransactionPage = /** @class */ (function () {
232 184
     };
233 185
     TransactionPage = __decorate([
234 186
         Object(__WEBPACK_IMPORTED_MODULE_0__angular_core__["m" /* Component */])({
235
-            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"*/,
187
+            selector: 'page-transaction',template:/*ion-inline-start:"/Users/ericf/ZCWProjects/ZipCoin-RED/ZipCoinRedIonicClient/src/pages/transaction/transaction.html"*/'<!--\n  Generated template for the TransactionPage page.\n\n  See http://ionicframework.com/docs/components/#navigation for more info on\n  Ionic pages and navigation.\n-->\n<ion-header>\n\n  <ion-navbar>\n    <ion-title>Transaction</ion-title>\n  </ion-navbar>\n\n</ion-header>\n\n\n<ion-content padding>\n\n    <ion-list>\n        <ion-item-sliding *ngFor="let transaction of transactions">\n          <ion-item>\n            <ion-card>\n                <ion-card-header>\n                  Transaction #: {{transaction.transactionId}}\n                </ion-card-header>\n                <ion-card-content>\n                  <div>Sender: {{ transaction.sender }}</div>\n                  <div>Recipient: {{ block.recipient }}</div>\n                  <div>Amount: {{ block.amount }}</div>\n                </ion-card-content>\n            </ion-card>\n          </ion-item>\n        </ion-item-sliding>\n      </ion-list>\n\n</ion-content>\n'/*ion-inline-end:"/Users/ericf/ZCWProjects/ZipCoin-RED/ZipCoinRedIonicClient/src/pages/transaction/transaction.html"*/,
236 188
         }),
237
-        __metadata("design:paramtypes", [__WEBPACK_IMPORTED_MODULE_1_ionic_angular__["e" /* NavController */], __WEBPACK_IMPORTED_MODULE_1_ionic_angular__["f" /* NavParams */],
238
-            __WEBPACK_IMPORTED_MODULE_2__providers_transaction_service__["a" /* TransactionService */]])
189
+        __metadata("design:paramtypes", [typeof (_a = typeof __WEBPACK_IMPORTED_MODULE_1_ionic_angular__["e" /* NavController */] !== "undefined" && __WEBPACK_IMPORTED_MODULE_1_ionic_angular__["e" /* NavController */]) === "function" && _a || Object, typeof (_b = typeof __WEBPACK_IMPORTED_MODULE_1_ionic_angular__["f" /* NavParams */] !== "undefined" && __WEBPACK_IMPORTED_MODULE_1_ionic_angular__["f" /* NavParams */]) === "function" && _b || Object, typeof (_c = typeof __WEBPACK_IMPORTED_MODULE_2__providers_transaction_service__["a" /* TransactionService */] !== "undefined" && __WEBPACK_IMPORTED_MODULE_2__providers_transaction_service__["a" /* TransactionService */]) === "function" && _c || Object])
239 190
     ], TransactionPage);
240 191
     return TransactionPage;
192
+    var _a, _b, _c;
241 193
 }());
242 194
 
243
-//# sourceMappingURL=wallet.js.map
195
+//# sourceMappingURL=transaction.js.map
244 196
 
245 197
 /***/ }),
246 198
 
@@ -345,7 +297,7 @@ var HomePage = /** @class */ (function () {
345 297
     };
346 298
     HomePage = __decorate([
347 299
         Object(__WEBPACK_IMPORTED_MODULE_0__angular_core__["m" /* Component */])({
348
-            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"*/
300
+            selector: 'page-home',template:/*ion-inline-start:"/Users/ericf/ZCWProjects/ZipCoin-RED/ZipCoinRedIonicClient/src/pages/home/home.html"*/'<ion-header>\n  <ion-navbar>\n    <ion-title>\n      ZipCoin BlockChain\n    </ion-title>\n  </ion-navbar>\n</ion-header>\n\n<ion-content padding>\n\n  <ion-list>\n    <ion-item-sliding *ngFor="let block of blocks">\n      <ion-item>\n        <ion-card>\n            <ion-card-header>\n              Block #: {{block.blockNumber}}\n            </ion-card-header>\n            <ion-card-content>\n              <div>Nonce: {{ block.nonce }}</div>\n              <div>Data: {{ block.transactionList }}</div>\n              <div>Previous Hash: {{ block.previousHash }}</div>\n              <div>Current Hash: {{ block.currentHash }}</div>\n              <button ion-button (click)="getMinedBlock(block.id)">Mine</button>\n            </ion-card-content>\n        </ion-card>\n      </ion-item>\n    </ion-item-sliding>\n  </ion-list>\n\n</ion-content>'/*ion-inline-end:"/Users/ericf/ZCWProjects/ZipCoin-RED/ZipCoinRedIonicClient/src/pages/home/home.html"*/
349 301
         }),
350 302
         __metadata("design:paramtypes", [__WEBPACK_IMPORTED_MODULE_1_ionic_angular__["e" /* NavController */], __WEBPACK_IMPORTED_MODULE_2__providers_block_service__["a" /* BlockService */]])
351 303
     ], HomePage);
@@ -478,8 +430,8 @@ var AppModule = /** @class */ (function () {
478 430
                 __WEBPACK_IMPORTED_MODULE_2_ionic_angular__["c" /* IonicModule */].forRoot(__WEBPACK_IMPORTED_MODULE_5__app_component__["a" /* MyApp */], {}, {
479 431
                     links: [
480 432
                         { loadChildren: '../pages/tab4/tab4.module#Tab4PageModule', name: 'Tab4Page', segment: 'tab4', priority: 'low', defaultHistory: [] },
481
-                        { loadChildren: '../pages/transaction/transaction.module#TransactionPageModule', name: 'TransactionPage', segment: 'transaction', priority: 'low', defaultHistory: [] },
482 433
                         { loadChildren: '../pages/tabs/tabs.module#TabsPageModule', name: 'TabsPage', segment: 'tabs', priority: 'low', defaultHistory: [] },
434
+                        { loadChildren: '../pages/transaction/transaction.module#TransactionPageModule', name: 'TransactionPage', segment: 'transaction', priority: 'low', defaultHistory: [] },
483 435
                         { loadChildren: '../pages/wallet/wallet.module#WalletPageModule', name: 'WalletPage', segment: 'wallet', priority: 'low', defaultHistory: [] }
484 436
                     ]
485 437
                 })
@@ -544,7 +496,7 @@ var MyApp = /** @class */ (function () {
544 496
         });
545 497
     }
546 498
     MyApp = __decorate([
547
-        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"*/
499
+        Object(__WEBPACK_IMPORTED_MODULE_0__angular_core__["m" /* Component */])({template:/*ion-inline-start:"/Users/ericf/ZCWProjects/ZipCoin-RED/ZipCoinRedIonicClient/src/app/app.html"*/'<ion-nav [root]="rootPage"></ion-nav>\n'/*ion-inline-end:"/Users/ericf/ZCWProjects/ZipCoin-RED/ZipCoinRedIonicClient/src/app/app.html"*/
548 500
         }),
549 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 */]])
550 502
     ], MyApp);

+ 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


+ 82
- 164
ZipCoinRedJavaServer/.idea/workspace.xml View File

@@ -12,40 +12,11 @@
12 12
   </component>
13 13
   <component name="FileEditorManager">
14 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">
15
+      <file leaf-file-name="BlockLoader.java" pinned="false" current-in-tab="false">
16
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/zipcoin/config/BlockLoader.java">
17 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" />
18
+            <state relative-caret-position="75">
19
+              <caret line="10" column="17" selection-start-line="10" selection-start-column="17" selection-end-line="10" selection-end-column="17" />
49 20
             </state>
50 21
           </provider>
51 22
         </entry>
@@ -53,68 +24,53 @@
53 24
       <file leaf-file-name="TransactionController.java" pinned="false" current-in-tab="false">
54 25
         <entry file="file://$PROJECT_DIR$/src/main/java/com/zipcoin/controller/TransactionController.java">
55 26
           <provider selected="true" editor-type-id="text-editor">
56
-            <state relative-caret-position="525">
57
-              <caret line="42" selection-start-line="42" selection-end-line="42" />
27
+            <state relative-caret-position="105">
28
+              <caret line="12" column="13" selection-start-line="12" selection-start-column="13" selection-end-line="12" selection-end-column="13" />
58 29
             </state>
59 30
           </provider>
60 31
         </entry>
61 32
       </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">
33
+      <file leaf-file-name="Transaction.java" pinned="false" current-in-tab="false">
34
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/zipcoin/model/Transaction.java">
64 35
           <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" />
36
+            <state relative-caret-position="130">
37
+              <caret line="13" column="20" selection-start-line="13" selection-start-column="20" selection-end-line="13" selection-end-column="20" />
67 38
             </state>
68 39
           </provider>
69 40
         </entry>
70 41
       </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">
42
+      <file leaf-file-name="Chain.java" pinned="false" current-in-tab="false">
43
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/zipcoin/model/Chain.java">
73 44
           <provider selected="true" editor-type-id="text-editor">
74
-            <state relative-caret-position="480">
75
-              <caret line="32" selection-start-line="32" selection-end-line="32" />
45
+            <state relative-caret-position="150">
46
+              <caret line="10" selection-start-line="10" selection-end-line="10" />
76 47
             </state>
77 48
           </provider>
78 49
         </entry>
79 50
       </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">
51
+      <file leaf-file-name="workspace.xml" pinned="false" current-in-tab="false">
52
+        <entry file="file://$PROJECT_DIR$/.idea/workspace.xml">
82 53
           <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" />
54
+            <state relative-caret-position="990">
55
+              <caret line="66" column="20" selection-start-line="66" selection-start-column="20" selection-end-line="66" selection-end-column="20" />
85 56
             </state>
86 57
           </provider>
87 58
         </entry>
88 59
       </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" 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">
60
+      <file leaf-file-name="TransactionLoader.java" pinned="false" current-in-tab="false">
61
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/zipcoin/config/TransactionLoader.java">
100 62
           <provider selected="true" editor-type-id="text-editor">
101 63
             <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>
64
+              <caret line="10" column="13" selection-start-line="10" selection-start-column="13" selection-end-line="10" selection-end-column="13" />
106 65
             </state>
107 66
           </provider>
108 67
         </entry>
109 68
       </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">
69
+      <file leaf-file-name="WalletLoader.java" pinned="false" current-in-tab="true">
70
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/zipcoin/config/WalletLoader.java">
112 71
           <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>
72
+            <state relative-caret-position="284">
73
+              <caret line="34" column="5" selection-start-line="34" selection-start-column="5" selection-end-line="34" selection-end-column="5" />
118 74
             </state>
119 75
           </provider>
120 76
         </entry>
@@ -135,6 +91,13 @@
135 91
     <detection-done>true</detection-done>
136 92
     <sorting>DEFINITION_ORDER</sorting>
137 93
   </component>
94
+  <component name="MavenImportPreferences">
95
+    <option name="importingSettings">
96
+      <MavenImportingSettings>
97
+        <option name="importAutomatically" value="true" />
98
+      </MavenImportingSettings>
99
+    </option>
100
+  </component>
138 101
   <component name="MavenProjectNavigator">
139 102
     <treeState>
140 103
       <expand>
@@ -159,43 +122,39 @@
159 122
     <option name="width" value="1280" />
160 123
     <option name="height" value="713" />
161 124
   </component>
162
-  <component name="ProjectLevelVcsManager">
163
-    <ConfirmationsSetting value="2" id="Add" />
164
-  </component>
165 125
   <component name="ProjectView">
166 126
     <navigator proportions="" version="1">
167 127
       <foldersAlwaysOnTop value="true" />
168 128
     </navigator>
169 129
     <panes>
170
-      <pane id="Scope" />
171 130
       <pane id="PackagesPane" />
172 131
       <pane id="ProjectPane">
173 132
         <subPane>
174 133
           <expand>
175 134
             <path>
176
-              <item name="ZipCoinRedJavaServer" type="b2602c69:ProjectViewProjectNode" />
135
+              <item name="ZipCoin-RED" type="b2602c69:ProjectViewProjectNode" />
177 136
               <item name="ZipCoinRedJavaServer" type="462c0819:PsiDirectoryNode" />
178 137
             </path>
179 138
             <path>
180
-              <item name="ZipCoinRedJavaServer" type="b2602c69:ProjectViewProjectNode" />
139
+              <item name="ZipCoin-RED" type="b2602c69:ProjectViewProjectNode" />
181 140
               <item name="ZipCoinRedJavaServer" type="462c0819:PsiDirectoryNode" />
182 141
               <item name="src" type="462c0819:PsiDirectoryNode" />
183 142
             </path>
184 143
             <path>
185
-              <item name="ZipCoinRedJavaServer" type="b2602c69:ProjectViewProjectNode" />
144
+              <item name="ZipCoin-RED" type="b2602c69:ProjectViewProjectNode" />
186 145
               <item name="ZipCoinRedJavaServer" type="462c0819:PsiDirectoryNode" />
187 146
               <item name="src" type="462c0819:PsiDirectoryNode" />
188 147
               <item name="main" type="462c0819:PsiDirectoryNode" />
189 148
             </path>
190 149
             <path>
191
-              <item name="ZipCoinRedJavaServer" type="b2602c69:ProjectViewProjectNode" />
150
+              <item name="ZipCoin-RED" type="b2602c69:ProjectViewProjectNode" />
192 151
               <item name="ZipCoinRedJavaServer" type="462c0819:PsiDirectoryNode" />
193 152
               <item name="src" type="462c0819:PsiDirectoryNode" />
194 153
               <item name="main" type="462c0819:PsiDirectoryNode" />
195 154
               <item name="java" type="462c0819:PsiDirectoryNode" />
196 155
             </path>
197 156
             <path>
198
-              <item name="ZipCoinRedJavaServer" type="b2602c69:ProjectViewProjectNode" />
157
+              <item name="ZipCoin-RED" type="b2602c69:ProjectViewProjectNode" />
199 158
               <item name="ZipCoinRedJavaServer" type="462c0819:PsiDirectoryNode" />
200 159
               <item name="src" type="462c0819:PsiDirectoryNode" />
201 160
               <item name="main" type="462c0819:PsiDirectoryNode" />
@@ -203,7 +162,7 @@
203 162
               <item name="zipcoin" type="462c0819:PsiDirectoryNode" />
204 163
             </path>
205 164
             <path>
206
-              <item name="ZipCoinRedJavaServer" type="b2602c69:ProjectViewProjectNode" />
165
+              <item name="ZipCoin-RED" type="b2602c69:ProjectViewProjectNode" />
207 166
               <item name="ZipCoinRedJavaServer" type="462c0819:PsiDirectoryNode" />
208 167
               <item name="src" type="462c0819:PsiDirectoryNode" />
209 168
               <item name="main" type="462c0819:PsiDirectoryNode" />
@@ -211,47 +170,12 @@
211 170
               <item name="zipcoin" type="462c0819:PsiDirectoryNode" />
212 171
               <item name="config" type="462c0819:PsiDirectoryNode" />
213 172
             </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 173
           </expand>
251 174
           <select />
252 175
         </subPane>
253 176
       </pane>
254 177
       <pane id="AndroidView" />
178
+      <pane id="Scope" />
255 179
     </panes>
256 180
   </component>
257 181
   <component name="PropertiesComponent">
@@ -355,14 +279,14 @@
355 279
     <servers />
356 280
   </component>
357 281
   <component name="TimeTrackingManager">
358
-    <option name="totallyTimeSpent" value="1539000" />
282
+    <option name="totallyTimeSpent" value="1589000" />
359 283
   </component>
360 284
   <component name="ToolWindowManager">
361
-    <frame x="39" y="23" width="1203" height="713" extended-state="0" />
285
+    <frame x="0" y="0" width="1280" height="800" extended-state="0" />
362 286
     <layout>
363 287
       <window_info anchor="right" id="Palette" order="3" />
364
-      <window_info anchor="bottom" id="Event Log" order="7" sideWeight="0.2601206" side_tool="true" visible="true" weight="0.30032468" />
365
-      <window_info anchor="right" id="Maven Projects" order="3" weight="0.32988802" />
288
+      <window_info anchor="bottom" id="Event Log" order="7" side_tool="true" />
289
+      <window_info anchor="right" id="Maven Projects" order="3" />
366 290
       <window_info anchor="bottom" id="Database Changes" order="7" show_stripe_button="false" />
367 291
       <window_info id="Capture Tool" order="2" />
368 292
       <window_info id="Designer" order="2" />
@@ -372,18 +296,19 @@
372 296
       <window_info id="UI Designer" order="2" />
373 297
       <window_info anchor="bottom" id="Debug" order="3" weight="0.4" />
374 298
       <window_info anchor="bottom" id="TODO" order="6" />
375
-      <window_info anchor="bottom" id="Messages" order="9" weight="0.3298969" />
299
+      <window_info anchor="bottom" id="Messages" order="7" />
376 300
       <window_info anchor="right" id="Palette&#9;" order="3" />
377 301
       <window_info id="Image Layers" order="2" />
378
-      <window_info anchor="bottom" id="Java Enterprise" order="8" />
302
+      <window_info anchor="bottom" id="Java Enterprise" order="7" />
379 303
       <window_info anchor="right" id="Capture Analysis" order="3" />
304
+      <window_info active="true" anchor="bottom" id="Run Dashboard" order="7" visible="true" weight="0.47310343" />
305
+      <window_info anchor="bottom" id="Run" order="2" weight="0.12012987" />
380 306
       <window_info anchor="bottom" id="Version Control" order="7" show_stripe_button="false" />
381
-      <window_info anchor="bottom" id="Run" order="2" sideWeight="0.87510765" weight="0.4318182" />
382
-      <window_info anchor="bottom" id="Spring" order="10" />
383
-      <window_info active="true" anchor="bottom" id="Terminal" order="7" sideWeight="0.7398794" visible="true" weight="0.30032468" />
384
-      <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.2868217" />
385
-      <window_info anchor="right" id="Bean Validation" order="5" />
386
-      <window_info id="Web" order="4" side_tool="true" />
307
+      <window_info anchor="bottom" id="Spring" order="7" />
308
+      <window_info anchor="bottom" id="Terminal" order="7" />
309
+      <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.2536349" />
310
+      <window_info anchor="right" id="Bean Validation" order="3" />
311
+      <window_info id="Web" order="2" side_tool="true" />
387 312
       <window_info anchor="right" id="Theme Preview" order="3" />
388 313
       <window_info id="Favorites" order="2" side_tool="true" />
389 314
       <window_info anchor="bottom" id="Message" order="0" />
@@ -392,7 +317,7 @@
392 317
       <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.24959612" />
393 318
       <window_info id="Favorites" order="5" side_tool="true" />
394 319
       <window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
395
-      <window_info anchor="bottom" id="Java Enterprise" order="8" />
320
+      <window_info anchor="right" id="Theme Preview" order="5" />
396 321
       <window_info anchor="bottom" id="Terminal" order="10" />
397 322
       <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
398 323
       <window_info anchor="right" id="Palette" order="5" />
@@ -400,20 +325,18 @@
400 325
       <window_info anchor="right" id="Maven Projects" order="5" />
401 326
       <window_info id="Web" order="5" side_tool="true" />
402 327
       <window_info anchor="bottom" id="Database Changes" order="10" show_stripe_button="false" />
403
-      <window_info anchor="bottom" id="Spring" order="10" />
328
+      <window_info anchor="bottom" id="Run Dashboard" order="7" visible="true" weight="0.060064934" />
404 329
       <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
405 330
       <window_info id="Image Layers" order="5" />
406
-      <window_info anchor="right" id="Theme Preview" order="5" />
407 331
       <window_info anchor="right" id="Database" order="5" />
408 332
       <window_info id="Capture Tool" order="5" />
409 333
       <window_info anchor="bottom" id="Version Control" order="10" show_stripe_button="false" />
410 334
       <window_info anchor="right" id="Capture Analysis" order="5" />
411 335
       <window_info anchor="bottom" id="TODO" order="6" />
412
-      <window_info anchor="bottom" id="Find" order="1" />
413 336
       <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
414 337
       <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
415 338
       <window_info id="UI Designer" order="5" />
416
-      <window_info anchor="right" id="Bean Validation" order="5" />
339
+      <window_info anchor="bottom" id="Find" order="1" />
417 340
       <window_info anchor="bottom" id="Debug" order="3" weight="0.4" />
418 341
       <window_info anchor="bottom" id="Messages" order="9" weight="0.3298969" />
419 342
       <window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
@@ -427,14 +350,6 @@
427 350
     <option name="myLimit" value="2678400000" />
428 351
   </component>
429 352
   <component name="editorHistoryManager">
430
-    <entry file="file://$PROJECT_DIR$/src/test/java/redCoin/minerTest.java" />
431
-    <entry file="file://$PROJECT_DIR$/.idea/workspace.xml">
432
-      <provider selected="true" editor-type-id="text-editor">
433
-        <state relative-caret-position="405">
434
-          <caret line="27" selection-start-line="27" selection-end-line="27" selection-end-column="12" />
435
-        </state>
436
-      </provider>
437
-    </entry>
438 353
     <entry file="file://$PROJECT_DIR$/.idea/ZipCoin-RED.iml" />
439 354
     <entry file="file://$PROJECT_DIR$/pom.xml">
440 355
       <provider selected="true" editor-type-id="text-editor">
@@ -492,8 +407,8 @@
492 407
     <entry file="file://$PROJECT_DIR$/src/test/java/redCoin/minerTest.java" />
493 408
     <entry file="file://$PROJECT_DIR$/.idea/workspace.xml">
494 409
       <provider selected="true" editor-type-id="text-editor">
495
-        <state relative-caret-position="-4617">
496
-          <caret line="124" column="19" selection-start-line="124" selection-start-column="19" selection-end-line="124" selection-end-column="19" />
410
+        <state relative-caret-position="990">
411
+          <caret line="66" column="20" selection-start-line="66" selection-start-column="20" selection-end-line="66" selection-end-column="20" />
497 412
         </state>
498 413
       </provider>
499 414
     </entry>
@@ -516,15 +431,18 @@
516 431
         </state>
517 432
       </provider>
518 433
     </entry>
519
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/zipcoin/model/Transaction.java" />
434
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/zipcoin/model/Transaction.java">
435
+      <provider selected="true" editor-type-id="text-editor">
436
+        <state relative-caret-position="130">
437
+          <caret line="13" column="20" selection-start-line="13" selection-start-column="20" selection-end-line="13" selection-end-column="20" />
438
+        </state>
439
+      </provider>
440
+    </entry>
520 441
     <entry file="file://$PROJECT_DIR$/src/main/java/com/zipcoin/config/PersistenceConfiguration.java" />
521 442
     <entry file="file://$PROJECT_DIR$/src/main/java/com/zipcoin/repository/BlockRepository.java">
522 443
       <provider selected="true" editor-type-id="text-editor">
523 444
         <state relative-caret-position="75">
524 445
           <caret line="5" column="17" selection-start-line="5" selection-start-column="17" selection-end-line="5" selection-end-column="17" />
525
-          <folding>
526
-            <element signature="imports" expanded="true" />
527
-          </folding>
528 446
         </state>
529 447
       </provider>
530 448
     </entry>
@@ -552,9 +470,6 @@
552 470
       <provider selected="true" editor-type-id="text-editor">
553 471
         <state relative-caret-position="135">
554 472
           <caret line="12" column="9" selection-start-line="12" selection-start-column="9" selection-end-line="12" selection-end-column="9" />
555
-          <folding>
556
-            <element signature="imports" expanded="true" />
557
-          </folding>
558 473
         </state>
559 474
       </provider>
560 475
     </entry>
@@ -562,9 +477,6 @@
562 477
       <provider selected="true" editor-type-id="text-editor">
563 478
         <state relative-caret-position="930">
564 479
           <caret line="82" column="4" selection-start-line="82" selection-start-column="4" selection-end-line="82" selection-end-column="4" />
565
-          <folding>
566
-            <element signature="imports" expanded="true" />
567
-          </folding>
568 480
         </state>
569 481
       </provider>
570 482
     </entry>
@@ -572,14 +484,6 @@
572 484
       <provider selected="true" editor-type-id="text-editor">
573 485
         <state relative-caret-position="105">
574 486
           <caret line="7" column="15" selection-start-line="7" selection-start-column="15" selection-end-line="7" selection-end-column="15" />
575
-          <folding>
576
-            <element signature="e#645#646#0" expanded="true" />
577
-            <element signature="e#703#704#0" expanded="true" />
578
-            <element signature="e#863#864#0" expanded="true" />
579
-            <element signature="e#913#914#0" expanded="true" />
580
-            <element signature="e#1032#1033#0" expanded="true" />
581
-            <element signature="e#1080#1081#0" expanded="true" />
582
-          </folding>
583 487
         </state>
584 488
       </provider>
585 489
     </entry>
@@ -599,8 +503,8 @@
599 503
     </entry>
600 504
     <entry file="file://$PROJECT_DIR$/src/main/java/com/zipcoin/controller/TransactionController.java">
601 505
       <provider selected="true" editor-type-id="text-editor">
602
-        <state relative-caret-position="525">
603
-          <caret line="42" selection-start-line="42" selection-end-line="42" />
506
+        <state relative-caret-position="105">
507
+          <caret line="12" column="13" selection-start-line="12" selection-start-column="13" selection-end-line="12" selection-end-column="13" />
604 508
         </state>
605 509
       </provider>
606 510
     </entry>
@@ -611,10 +515,24 @@
611 515
         </state>
612 516
       </provider>
613 517
     </entry>
518
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/zipcoin/config/BlockLoader.java">
519
+      <provider selected="true" editor-type-id="text-editor">
520
+        <state relative-caret-position="75">
521
+          <caret line="10" column="17" selection-start-line="10" selection-start-column="17" selection-end-line="10" selection-end-column="17" />
522
+        </state>
523
+      </provider>
524
+    </entry>
525
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/zipcoin/config/TransactionLoader.java">
526
+      <provider selected="true" editor-type-id="text-editor">
527
+        <state relative-caret-position="75">
528
+          <caret line="10" column="13" selection-start-line="10" selection-start-column="13" selection-end-line="10" selection-end-column="13" />
529
+        </state>
530
+      </provider>
531
+    </entry>
614 532
     <entry file="file://$PROJECT_DIR$/src/main/java/com/zipcoin/config/WalletLoader.java">
615 533
       <provider selected="true" editor-type-id="text-editor">
616
-        <state relative-caret-position="480">
617
-          <caret line="32" selection-start-line="32" selection-end-line="32" />
534
+        <state relative-caret-position="284">
535
+          <caret line="34" column="5" selection-start-line="34" selection-start-column="5" selection-end-line="34" selection-end-column="5" />
618 536
         </state>
619 537
       </provider>
620 538
     </entry>

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

@@ -54,8 +54,8 @@ public class Transaction {
54 54
         return recipient;
55 55
     }
56 56
 
57
-    public void setReciepient(String reciepient) {
58
-        this.recipient = reciepient;
57
+    public void setRecipient(String recipient) {
58
+        this.recipient = recipient;
59 59
     }
60 60
 
61 61
     public float getAmount() { return amount; }