3 Commits

Auteur SHA1 Bericht Datum
  Tennessee Gibbs 288fb89d8d updated wallet, blockchain, and payment screen 6 jaren geleden
  Mexi 767f4c5482 payment is working 6 jaren geleden
  Mexi 83b32bb51d payment is done 6 jaren geleden

+ 1
- 1
.sourcemaps/main.js.map
Diff onderdrukt omdat het te groot bestand
Bestand weergeven


+ 0
- 1
ionic.config.json Bestand weergeven

@@ -9,6 +9,5 @@
9 9
       "proxyUrl": "http://cors.api.com/api"
10 10
     }
11 11
   ],
12
-  
13 12
   "type": "ionic-angular"
14 13
 }

+ 0
- 1
src/app/app.component.ts Bestand weergeven

@@ -2,7 +2,6 @@ import { Component } from '@angular/core';
2 2
 import { Platform } from 'ionic-angular';
3 3
 import { StatusBar } from '@ionic-native/status-bar';
4 4
 import { SplashScreen } from '@ionic-native/splash-screen';
5
-
6 5
 import { TabsPage } from '../pages/tabs/tabs';
7 6
 
8 7
 @Component({

+ 8
- 13
src/app/app.scss Bestand weergeven

@@ -1,16 +1,11 @@
1 1
 // http://ionicframework.com/docs/theming/
2 2
 
3
+$colors: (
4
+  primary:    #58B43F,
5
+  secondary:  #fff,
3 6
 
4
-// App Global Sass
5
-// --------------------------------------------------
6
-// Put style rules here that you want to apply globally. These
7
-// styles are for the entire app and not just one component.
8
-// Additionally, this file can be also used as an entry point
9
-// to import other Sass files to be included in the output CSS.
10
-//
11
-// Shared Sass variables, which can be used to adjust Ionic's
12
-// default Sass variables, belong in "theme/variables.scss".
13
-//
14
-// To declare rules for a specific mode, create a child rule
15
-// for the .md, .ios, or .wp mode classes. The mode class is
16
-// automatically applied to the <body> element in the app.
7
+);
8
+
9
+ion-content{
10
+    background-image: url('https://specials-images.forbesimg.com/dam/imageserve/1022389510/960x0.jpg?fit=scale');
11
+}

BIN
src/assets/imgs/bcBackground.jpeg Bestand weergeven


+ 25
- 7
src/pages/payment/payment.html Bestand weergeven

@@ -5,20 +5,38 @@
5 5
 </ion-header>
6 6
 
7 7
 <ion-content padding>
8
-  <h2>Payment</h2>
8
+    <div padding>
9
+   </div>
9 10
   <ion-item>
10
-      <ion-label color="primary" stacked>Your ID</ion-label>
11
-      <ion-input type="string" placeholder="Your ID" [(ngModel)]="fromId"></ion-input>
12
-    </ion-item>
11
+     
12
+           <ion-label color="primary" stacked>Please select your ID</ion-label>
13
+      <!-- <ion-input type="string" [(ngModel)]="trans.fromId"></ion-input> // Can type ID manually-->
14
+    
15
+          <ion-select [(ngModel)]="trans.fromId">
16
+            <ion-option value="15b9ef7d26485fae2ecdc74f8f9f465e0c082fe19a996aef2f1daf712aec5751">Vince</ion-option>
17
+            <ion-option value="9e3123b4c696cb7d9d906a6ec2813d6e6fed5af58b49c4e5f849b7adcb00486c">Tennessee</ion-option>
18
+            <ion-option value="625ef69f8ef7318876d5c5e31c045f4cc2c89ec01949a3af3789be1f45405342">Mexi</ion-option>
19
+            <ion-option value="9b1e8a94fcdb88c8391ec1200718b3ddd73fb631b9c6b5d56619852a47833665">Eugene</ion-option>
20
+            <ion-option value="4b2166f22897c2e85fbab852ae252ee2990231d9692aa7fcc8535cf74c571efd">Clement</ion-option>
21
+          </ion-select>
22
+        </ion-item>
23
+    
13 24
     
14 25
     <ion-item>
15
-        <ion-label color="primary" stacked>Receiver ID</ion-label>
16
-        <ion-input type="string" placeholder="Receiver ID" [(ngModel)]="toId"></ion-input>
26
+        <ion-label color="primary" stacked>Who would you like to receive BlueCoin?</ion-label>
27
+        <!-- <ion-input type="string"[(ngModel)]="trans.fromId"></ion-input> Can type ID mamaully-->
28
+        <ion-select [(ngModel)]="trans.toId">
29
+            <ion-option value="15b9ef7d26485fae2ecdc74f8f9f465e0c082fe19a996aef2f1daf712aec5751">Vince</ion-option>
30
+            <ion-option value="9e3123b4c696cb7d9d906a6ec2813d6e6fed5af58b49c4e5f849b7adcb00486c">Tennessee</ion-option>
31
+            <ion-option value="625ef69f8ef7318876d5c5e31c045f4cc2c89ec01949a3af3789be1f45405342">Mexi</ion-option>
32
+            <ion-option value="9b1e8a94fcdb88c8391ec1200718b3ddd73fb631b9c6b5d56619852a47833665">Eugene</ion-option>
33
+            <ion-option value="4b2166f22897c2e85fbab852ae252ee2990231d9692aa7fcc8535cf74c571efd">Clement</ion-option>
34
+          </ion-select>
17 35
       </ion-item>
18 36
 
19 37
       <ion-item>
20 38
           <ion-label color="primary" stacked>Amount</ion-label>
21
-          <ion-input type="number" placeholder="Amount" [(ngModel)]="amount" ></ion-input>
39
+          <ion-input type="number" placeholder="Enter Amount" [(ngModel)]="trans.amount" ></ion-input>
22 40
         </ion-item>
23 41
 
24 42
         <button ion-button (click) = "transferMoney()">Send BlueCoin</button>

+ 11
- 6
src/pages/payment/payment.ts Bestand weergeven

@@ -1,7 +1,7 @@
1
+
1 2
 import { Component } from '@angular/core';
2 3
 import { IonicPage, NavController, NavParams} from 'ionic-angular';
3 4
 import { HttpClient } from '@angular/common/http';
4
-import { TransactionComponent } from '../../components/transaction/transaction';
5 5
 import { TransactionService } from '../../providers/transaction-service';
6 6
 
7 7
 
@@ -10,15 +10,20 @@ import { TransactionService } from '../../providers/transaction-service';
10 10
   selector: 'page-payment',
11 11
   templateUrl: 'payment.html',
12 12
 })
13
+
14
+
13 15
 export class PaymentPage {
14
-  fromId: string;
15
-  toId: string;
16
-  amount: number;
17
-  trans: TransactionComponent =  new TransactionComponent(this.fromId, this.toId, this.amount);
18
-  ;
16
+  fromId: any;
17
+  toId: any;
18
+  amount: any;
19
+  //trans: TransactionComponent =  new TransactionComponent(this.fromId, this.toId, this.amount);
20
+  trans = {fromId: '', toId: '', amount: ''};
19 21
 
20 22
   constructor(public navCtrl: NavController, public navParams: NavParams, private http: HttpClient, public transfer: TransactionService) {
21 23
  this.navCtrl = navCtrl;
24
+//  this.fromId = document.getElementByIdaa;
25
+//  this.toId ='';
26
+//  this.amount = 0;
22 27
   }
23 28
 
24 29
   ionViewDidLoad() {

+ 3
- 3
src/pages/tabs/tabs.html Bestand weergeven

@@ -1,6 +1,6 @@
1 1
 <ion-tabs>
2
-  <ion-tab [root]="tab1Root" tabTitle="Blockchain" tabIcon="cube"></ion-tab>
3
-  <ion-tab [root]="tab2Root" tabTitle="Payment" tabIcon="cog"></ion-tab>
4
-  <ion-tab [root]="tab3Root" tabTitle="Transactions" tabIcon="list-box"></ion-tab>
2
+  <!-- <ion-tab [root]="tab1Root" tabTitle="Blockchain" tabIcon="cube"></ion-tab> -->
3
+  <ion-tab [root]="tab2Root" tabTitle="Payment" tabIcon="send"></ion-tab>
4
+  <ion-tab [root]="tab3Root" tabTitle="Blockchain" tabIcon="cube"></ion-tab>
5 5
   <ion-tab [root]="tab4Root" tabTitle="Wallet" tabIcon="logo-usd"></ion-tab>
6 6
 </ion-tabs>

+ 24
- 19
src/pages/transactions/transactions.html Bestand weergeven

@@ -1,27 +1,32 @@
1 1
 <ion-header>
2 2
   <ion-navbar>
3 3
     <ion-title>
4
-      Transactions
4
+      Blockchain
5 5
     </ion-title>
6 6
   </ion-navbar>
7 7
 </ion-header>
8 8
 
9 9
   
10
-    <ion-content padding>
11
-      <ion-list>
12
-        <ion-item *ngFor="let transaction of transactions">
13
-            <ion-card>
14
-
15
-                <ion-card-content>
16
-                    Date: <h4>{{transaction.timestamp}}</h4>
17
-                    Sender: <h4>{{transaction.fromId}}</h4>
18
-                    Receiver: <h4>{{transaction.toId}}</h4>
19
-                    Amount: <h4>{{transaction.amount}}</h4>
20
-                    TransactionId<h4>{{transaction.transactionId}}</h4>
21
-        </ion-card-content>
22
-      </ion-card>
23
-        </ion-item>
24
-      </ion-list>
25
-    
26
-      
27
-    </ion-content>
10
+<ion-content padding>
11
+  <ion-refresher (ionRefresh)="doRefresh($event);">
12
+    <ion-refresher-content
13
+      pullingText="Pull to refresh"
14
+      pullingIcon="arrow-dropdown"
15
+      refreshingSpinner="circles"
16
+      refreshingText="...fetching...">
17
+    </ion-refresher-content>
18
+  </ion-refresher>
19
+  <ion-list>
20
+    <ion-item *ngFor="let transaction of transactions">
21
+      <ion-card>
22
+          <ion-card-content>
23
+              Date: <h4>{{transaction.timestamp}}</h4>
24
+              Sender: <h4>{{transaction.fromId}}</h4>
25
+              Receiver: <h4>{{transaction.toId}}</h4>
26
+              Amount: <h4>{{transaction.amount}}</h4>
27
+              TransactionId<h4>{{transaction.transactionId}}</h4>
28
+  </ion-card-content>
29
+</ion-card>
30
+  </ion-item>
31
+  </ion-list>
32
+</ion-content>

+ 4
- 0
src/pages/transactions/transactions.scss Bestand weergeven

@@ -0,0 +1,4 @@
1
+
2
+ion-content{
3
+    background-image: url('https://specials-images.forbesimg.com/dam/imageserve/1022389510/960x0.jpg?fit=scale');
4
+}

+ 4
- 0
src/pages/transactions/transactions.ts Bestand weergeven

@@ -19,6 +19,10 @@ export class TransactionPage {
19 19
       this.transactions = transactions;
20 20
     })
21 21
   }
22
+  doRefresh(refresher) {
23
+    this.ionViewDidLoad();
24
+    refresher.complete();
25
+  };
22 26
 
23 27
   
24 28
 }

+ 8
- 0
src/pages/wallet/wallet.html Bestand weergeven

@@ -5,6 +5,14 @@
5 5
 </ion-header>
6 6
 
7 7
 <ion-content padding>
8
+    <ion-refresher (ionRefresh)="doRefresh($event);">
9
+        <ion-refresher-content
10
+          pullingText="Pull to refresh"
11
+          pullingIcon="arrow-dropdown"
12
+          refreshingSpinner="circles"
13
+          refreshingText="...fetching...">
14
+        </ion-refresher-content>
15
+      </ion-refresher>
8 16
   <ion-list>
9 17
     <ion-item *ngFor="let wallet of wallets">
10 18
         <ion-card>

+ 4
- 0
src/pages/wallet/wallet.ts Bestand weergeven

@@ -20,5 +20,9 @@ export class WalletPage {
20 20
       this.wallets = wallets;
21 21
     })
22 22
   }
23
+  doRefresh(refresher) {
24
+    this.ionViewDidLoad();
25
+    refresher.complete();
26
+  };
23 27
 
24 28
 }

+ 1
- 1
src/providers/transaction-service.ts Bestand weergeven

@@ -14,7 +14,7 @@ export class TransactionService {
14 14
   }
15 15
 
16 16
   getTransactions(): Observable<any> {
17
-    return this.http.get(this.API + '/transactions');
17
+    return this.http.get(this.API + 'transactions');
18 18
   }
19 19
 ; 
20 20
   postTransactions(path: string, data: any):  Observable<any> {

BIN
www/assets/imgs/bcBackground.jpeg Bestand weergeven


+ 8
- 0
www/build/main.css Bestand weergeven

@@ -25677,3 +25677,11 @@ ion-navbar.toolbar {
25677 25677
   min-height: calc(46px + constant(safe-area-inset-bottom));
25678 25678
   min-height: calc(46px + env(safe-area-inset-bottom));
25679 25679
 }
25680
+
25681
+ion-content {
25682
+  background-image: url("https://specials-images.forbesimg.com/dam/imageserve/1022389510/960x0.jpg?fit=scale");
25683
+}
25684
+
25685
+ion-content {
25686
+  background-image: url("https://specials-images.forbesimg.com/dam/imageserve/1022389510/960x0.jpg?fit=scale");
25687
+}

+ 160
- 152
www/build/main.js Bestand weergeven

@@ -22,13 +22,13 @@ webpackEmptyAsyncContext.id = 115;
22 22
 
23 23
 var map = {
24 24
 	"../pages/payment/payment.module": [
25
-		158
25
+		161
26 26
 	],
27 27
 	"../pages/transactions/transactions.module": [
28
-		162
28
+		158
29 29
 	],
30 30
 	"../pages/wallet/wallet.module": [
31
-		160
31
+		159
32 32
 	]
33 33
 };
34 34
 function webpackAsyncContext(req) {
@@ -52,12 +52,11 @@ module.exports = webpackAsyncContext;
52 52
 
53 53
 "use strict";
54 54
 Object.defineProperty(__webpack_exports__, "__esModule", { value: true });
55
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "PaymentPageModule", function() { return PaymentPageModule; });
55
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "TransactionPageModule", function() { return TransactionPageModule; });
56 56
 /* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__angular_core__ = __webpack_require__(0);
57 57
 /* harmony import */ var __WEBPACK_IMPORTED_MODULE_1_ionic_angular__ = __webpack_require__(18);
58
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__payment__ = __webpack_require__(80);
58
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__transactions__ = __webpack_require__(57);
59 59
 /* harmony import */ var __WEBPACK_IMPORTED_MODULE_3__providers_transaction_service__ = __webpack_require__(41);
60
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_4__components_transaction_transaction__ = __webpack_require__(159);
61 60
 var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
62 61
     var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
63 62
     if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
@@ -68,28 +67,26 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
68 67
 
69 68
 
70 69
 
71
-
72
-var PaymentPageModule = /** @class */ (function () {
73
-    function PaymentPageModule() {
70
+var TransactionPageModule = /** @class */ (function () {
71
+    function TransactionPageModule() {
74 72
     }
75
-    PaymentPageModule = __decorate([
73
+    TransactionPageModule = __decorate([
76 74
         Object(__WEBPACK_IMPORTED_MODULE_0__angular_core__["I" /* NgModule */])({
77 75
             declarations: [
78
-                __WEBPACK_IMPORTED_MODULE_2__payment__["a" /* PaymentPage */],
79
-                __WEBPACK_IMPORTED_MODULE_4__components_transaction_transaction__["a" /* TransactionComponent */]
76
+                __WEBPACK_IMPORTED_MODULE_2__transactions__["a" /* TransactionPage */],
80 77
             ],
81 78
             imports: [
82
-                __WEBPACK_IMPORTED_MODULE_1_ionic_angular__["d" /* IonicPageModule */].forChild(__WEBPACK_IMPORTED_MODULE_2__payment__["a" /* PaymentPage */]),
79
+                __WEBPACK_IMPORTED_MODULE_1_ionic_angular__["d" /* IonicPageModule */].forChild(__WEBPACK_IMPORTED_MODULE_2__transactions__["a" /* TransactionPage */]),
83 80
             ],
84 81
             providers: [
85 82
                 __WEBPACK_IMPORTED_MODULE_3__providers_transaction_service__["a" /* TransactionService */],
86 83
             ],
87 84
         })
88
-    ], PaymentPageModule);
89
-    return PaymentPageModule;
85
+    ], TransactionPageModule);
86
+    return TransactionPageModule;
90 87
 }());
91 88
 
92
-//# sourceMappingURL=payment.module.js.map
89
+//# sourceMappingURL=transactions.module.js.map
93 90
 
94 91
 /***/ }),
95 92
 
@@ -97,53 +94,12 @@ var PaymentPageModule = /** @class */ (function () {
97 94
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
98 95
 
99 96
 "use strict";
100
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return TransactionComponent; });
101
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__angular_core__ = __webpack_require__(0);
102
-var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
103
-    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
104
-    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
105
-    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;
106
-    return c > 3 && r && Object.defineProperty(target, key, r), r;
107
-};
108
-var __metadata = (this && this.__metadata) || function (k, v) {
109
-    if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
110
-};
111
-
112
-/**
113
- * Generated class for the TransactionComponent component.
114
- *
115
- * See https://angular.io/api/core/Component for more info on Angular
116
- * Components.
117
- */
118
-var TransactionComponent = /** @class */ (function () {
119
-    function TransactionComponent(fromId, toId, amount) {
120
-        this.fromId = fromId;
121
-        this.toId = toId;
122
-        this.amount = amount;
123
-    }
124
-    TransactionComponent = __decorate([
125
-        Object(__WEBPACK_IMPORTED_MODULE_0__angular_core__["m" /* Component */])({
126
-            selector: 'transaction',template:/*ion-inline-start:"/Users/clementO/Desktop/blueCoin-UI/src/components/transaction/transaction.html"*/'<!-- Generated template for the TransactionComponent component -->\n<div>\n  {{text}}\n</div>\n'/*ion-inline-end:"/Users/clementO/Desktop/blueCoin-UI/src/components/transaction/transaction.html"*/
127
-        }),
128
-        __metadata("design:paramtypes", [String, String, Number])
129
-    ], TransactionComponent);
130
-    return TransactionComponent;
131
-}());
132
-
133
-//# sourceMappingURL=transaction.js.map
134
-
135
-/***/ }),
136
-
137
-/***/ 160:
138
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
139
-
140
-"use strict";
141 97
 Object.defineProperty(__webpack_exports__, "__esModule", { value: true });
142 98
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "WalletPageModule", function() { return WalletPageModule; });
143 99
 /* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__angular_core__ = __webpack_require__(0);
144 100
 /* harmony import */ var __WEBPACK_IMPORTED_MODULE_1_ionic_angular__ = __webpack_require__(18);
145
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__wallet__ = __webpack_require__(161);
146
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_3__providers_wallet_service__ = __webpack_require__(81);
101
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__wallet__ = __webpack_require__(160);
102
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_3__providers_wallet_service__ = __webpack_require__(80);
147 103
 var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
148 104
     var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
149 105
     if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
@@ -177,12 +133,12 @@ var WalletPageModule = /** @class */ (function () {
177 133
 
178 134
 /***/ }),
179 135
 
180
-/***/ 161:
136
+/***/ 160:
181 137
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
182 138
 
183 139
 "use strict";
184 140
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return WalletPage; });
185
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__providers_wallet_service__ = __webpack_require__(81);
141
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__providers_wallet_service__ = __webpack_require__(80);
186 142
 /* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__angular_core__ = __webpack_require__(0);
187 143
 /* harmony import */ var __WEBPACK_IMPORTED_MODULE_2_ionic_angular__ = __webpack_require__(18);
188 144
 var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
@@ -209,29 +165,36 @@ var WalletPage = /** @class */ (function () {
209 165
             _this.wallets = wallets;
210 166
         });
211 167
     };
168
+    WalletPage.prototype.doRefresh = function (refresher) {
169
+        this.ionViewDidLoad();
170
+        refresher.complete();
171
+    };
172
+    ;
212 173
     WalletPage = __decorate([
213 174
         Object(__WEBPACK_IMPORTED_MODULE_1__angular_core__["m" /* Component */])({
214
-            selector: 'page-wallet',template:/*ion-inline-start:"/Users/clementO/Desktop/blueCoin-UI/src/pages/wallet/wallet.html"*/'<ion-header>\n  <ion-navbar>\n    <ion-title>ZipCoin Blue Wallet</ion-title>\n  </ion-navbar>\n</ion-header>\n\n<ion-content padding>\n  <ion-list>\n    <ion-item *ngFor="let wallet of wallets">\n        <ion-card>\n            <ion-card-header>\n               Name: <h2>{{wallet.name}}</h2>\n            </ion-card-header>\n            <ion-card-content>\n     Balance: <h2>{{wallet.amount}}</h2>\n     Public Key: <h2>{{wallet.publicId}}</h2>\n      \n    </ion-card-content>\n  </ion-card>\n    </ion-item>\n  </ion-list>\n  \n</ion-content>'/*ion-inline-end:"/Users/clementO/Desktop/blueCoin-UI/src/pages/wallet/wallet.html"*/,
175
+            selector: 'page-wallet',template:/*ion-inline-start:"/Users/tennesseeg/blueCoin/blueCoin-UI/src/pages/wallet/wallet.html"*/'<ion-header>\n  <ion-navbar>\n    <ion-title>ZipCoin Blue Wallet</ion-title>\n  </ion-navbar>\n</ion-header>\n\n<ion-content padding>\n    <ion-refresher (ionRefresh)="doRefresh($event);">\n        <ion-refresher-content\n          pullingText="Pull to refresh"\n          pullingIcon="arrow-dropdown"\n          refreshingSpinner="circles"\n          refreshingText="...fetching...">\n        </ion-refresher-content>\n      </ion-refresher>\n  <ion-list>\n    <ion-item *ngFor="let wallet of wallets">\n        <ion-card>\n            <ion-card-header>\n               Name: <h2>{{wallet.name}}</h2>\n            </ion-card-header>\n            <ion-card-content>\n     Balance: <h2>{{wallet.amount}}</h2>\n     Public Key: <h2>{{wallet.publicId}}</h2>\n      \n    </ion-card-content>\n  </ion-card>\n    </ion-item>\n  </ion-list>\n  \n</ion-content>'/*ion-inline-end:"/Users/tennesseeg/blueCoin/blueCoin-UI/src/pages/wallet/wallet.html"*/,
215 176
         }),
216
-        __metadata("design:paramtypes", [__WEBPACK_IMPORTED_MODULE_2_ionic_angular__["e" /* NavController */], __WEBPACK_IMPORTED_MODULE_2_ionic_angular__["f" /* NavParams */], __WEBPACK_IMPORTED_MODULE_0__providers_wallet_service__["a" /* WalletService */]])
177
+        __metadata("design:paramtypes", [typeof (_a = typeof __WEBPACK_IMPORTED_MODULE_2_ionic_angular__["e" /* NavController */] !== "undefined" && __WEBPACK_IMPORTED_MODULE_2_ionic_angular__["e" /* NavController */]) === "function" && _a || Object, typeof (_b = typeof __WEBPACK_IMPORTED_MODULE_2_ionic_angular__["f" /* NavParams */] !== "undefined" && __WEBPACK_IMPORTED_MODULE_2_ionic_angular__["f" /* NavParams */]) === "function" && _b || Object, typeof (_c = typeof __WEBPACK_IMPORTED_MODULE_0__providers_wallet_service__["a" /* WalletService */] !== "undefined" && __WEBPACK_IMPORTED_MODULE_0__providers_wallet_service__["a" /* WalletService */]) === "function" && _c || Object])
217 178
     ], WalletPage);
218 179
     return WalletPage;
180
+    var _a, _b, _c;
219 181
 }());
220 182
 
221 183
 //# sourceMappingURL=wallet.js.map
222 184
 
223 185
 /***/ }),
224 186
 
225
-/***/ 162:
187
+/***/ 161:
226 188
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
227 189
 
228 190
 "use strict";
229 191
 Object.defineProperty(__webpack_exports__, "__esModule", { value: true });
230
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "TransactionPageModule", function() { return TransactionPageModule; });
192
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "PaymentPageModule", function() { return PaymentPageModule; });
231 193
 /* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__angular_core__ = __webpack_require__(0);
232 194
 /* harmony import */ var __WEBPACK_IMPORTED_MODULE_1_ionic_angular__ = __webpack_require__(18);
233
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__transactions__ = __webpack_require__(57);
195
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__payment__ = __webpack_require__(81);
234 196
 /* harmony import */ var __WEBPACK_IMPORTED_MODULE_3__providers_transaction_service__ = __webpack_require__(41);
197
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_4__components_transaction_transaction__ = __webpack_require__(258);
235 198
 var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
236 199
     var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
237 200
     if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
@@ -242,39 +205,41 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
242 205
 
243 206
 
244 207
 
245
-var TransactionPageModule = /** @class */ (function () {
246
-    function TransactionPageModule() {
208
+
209
+var PaymentPageModule = /** @class */ (function () {
210
+    function PaymentPageModule() {
247 211
     }
248
-    TransactionPageModule = __decorate([
212
+    PaymentPageModule = __decorate([
249 213
         Object(__WEBPACK_IMPORTED_MODULE_0__angular_core__["I" /* NgModule */])({
250 214
             declarations: [
251
-                __WEBPACK_IMPORTED_MODULE_2__transactions__["a" /* TransactionPage */],
215
+                __WEBPACK_IMPORTED_MODULE_2__payment__["a" /* PaymentPage */],
216
+                __WEBPACK_IMPORTED_MODULE_4__components_transaction_transaction__["a" /* TransactionComponent */]
252 217
             ],
253 218
             imports: [
254
-                __WEBPACK_IMPORTED_MODULE_1_ionic_angular__["d" /* IonicPageModule */].forChild(__WEBPACK_IMPORTED_MODULE_2__transactions__["a" /* TransactionPage */]),
219
+                __WEBPACK_IMPORTED_MODULE_1_ionic_angular__["d" /* IonicPageModule */].forChild(__WEBPACK_IMPORTED_MODULE_2__payment__["a" /* PaymentPage */]),
255 220
             ],
256 221
             providers: [
257 222
                 __WEBPACK_IMPORTED_MODULE_3__providers_transaction_service__["a" /* TransactionService */],
258 223
             ],
259 224
         })
260
-    ], TransactionPageModule);
261
-    return TransactionPageModule;
225
+    ], PaymentPageModule);
226
+    return PaymentPageModule;
262 227
 }());
263 228
 
264
-//# sourceMappingURL=transactions.module.js.map
229
+//# sourceMappingURL=payment.module.js.map
265 230
 
266 231
 /***/ }),
267 232
 
268
-/***/ 206:
233
+/***/ 205:
269 234
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
270 235
 
271 236
 "use strict";
272 237
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return TabsPage; });
273
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__payment_payment__ = __webpack_require__(80);
238
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__payment_payment__ = __webpack_require__(81);
274 239
 /* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__transactions_transactions__ = __webpack_require__(57);
275
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__wallet_wallet__ = __webpack_require__(161);
240
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__wallet_wallet__ = __webpack_require__(160);
276 241
 /* harmony import */ var __WEBPACK_IMPORTED_MODULE_3__angular_core__ = __webpack_require__(0);
277
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_4__home_home__ = __webpack_require__(207);
242
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_4__home_home__ = __webpack_require__(206);
278 243
 var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
279 244
     var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
280 245
     if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
@@ -297,7 +262,7 @@ var TabsPage = /** @class */ (function () {
297 262
         this.tab4Root = __WEBPACK_IMPORTED_MODULE_2__wallet_wallet__["a" /* WalletPage */];
298 263
     }
299 264
     TabsPage = __decorate([
300
-        Object(__WEBPACK_IMPORTED_MODULE_3__angular_core__["m" /* Component */])({template:/*ion-inline-start:"/Users/clementO/Desktop/blueCoin-UI/src/pages/tabs/tabs.html"*/'<ion-tabs>\n  <ion-tab [root]="tab1Root" tabTitle="Blockchain" tabIcon="cube"></ion-tab>\n  <ion-tab [root]="tab2Root" tabTitle="Payment" tabIcon="cog"></ion-tab>\n  <ion-tab [root]="tab3Root" tabTitle="Transactions" tabIcon="list-box"></ion-tab>\n  <ion-tab [root]="tab4Root" tabTitle="Wallet" tabIcon="logo-usd"></ion-tab>\n</ion-tabs>\n'/*ion-inline-end:"/Users/clementO/Desktop/blueCoin-UI/src/pages/tabs/tabs.html"*/
265
+        Object(__WEBPACK_IMPORTED_MODULE_3__angular_core__["m" /* Component */])({template:/*ion-inline-start:"/Users/tennesseeg/blueCoin/blueCoin-UI/src/pages/tabs/tabs.html"*/'<ion-tabs>\n  <!-- <ion-tab [root]="tab1Root" tabTitle="Blockchain" tabIcon="cube"></ion-tab> -->\n  <ion-tab [root]="tab2Root" tabTitle="Payment" tabIcon="send"></ion-tab>\n  <ion-tab [root]="tab3Root" tabTitle="Blockchain" tabIcon="cube"></ion-tab>\n  <ion-tab [root]="tab4Root" tabTitle="Wallet" tabIcon="logo-usd"></ion-tab>\n</ion-tabs>\n'/*ion-inline-end:"/Users/tennesseeg/blueCoin/blueCoin-UI/src/pages/tabs/tabs.html"*/
301 266
         }),
302 267
         __metadata("design:paramtypes", [])
303 268
     ], TabsPage);
@@ -308,7 +273,7 @@ var TabsPage = /** @class */ (function () {
308 273
 
309 274
 /***/ }),
310 275
 
311
-/***/ 207:
276
+/***/ 206:
312 277
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
313 278
 
314 279
 "use strict";
@@ -334,7 +299,7 @@ var HomePage = /** @class */ (function () {
334 299
     };
335 300
     HomePage = __decorate([
336 301
         Object(__WEBPACK_IMPORTED_MODULE_0__angular_core__["m" /* Component */])({
337
-            selector: 'page-home',template:/*ion-inline-start:"/Users/clementO/Desktop/blueCoin-UI/src/pages/home/home.html"*/'<ion-header>\n  <ion-navbar>\n    <ion-title>BlueCoin</ion-title>\n  </ion-navbar>\n</ion-header>\n\n<ion-content padding>\n  <h2>Blockchain</h2>\n  <div>\n  <ion-item>\n      <ion-label color="primary" stacked>Blockchain</ion-label>\n      <ion-input type="number" placeholder="Block"></ion-input>\n    </ion-item>\n    <ion-item>\n        <ion-label color="primary" stacked>Nonce</ion-label>\n        <ion-input type="number" placeholder="Nonce"></ion-input>\n      </ion-item>\n      <ion-item>\n          <ion-label color="primary" stacked>Transaction Data</ion-label>\n          <p></p>\n          <ion-input type="number" placeholder="Data"></ion-input>\n        </ion-item>\n        <ion-item>\n            <ion-label color="primary" stacked>Hash</ion-label>\n            <ion-input type="number" disabled placeholder="Hash"></ion-input>\n          </ion-item>\n          <button ion-button block>Mine</button></div>\n  <!-- <div id="block1chain1well" class="well well-success">\n    <form class="form-horizontal">\n      <div class="form-group">\n        <label for="block1chain1number" class="col-sm-2 control-label">Block:</label>\n        <div class="col-sm-10">\n          <div class="input-group">\n            <span class="input-group-addon">#</span>\n            <input id="block1chain1number" type="text" value="1" onkeyup="updateHash(1, 1);" class="form-control"></div>\n          </div></div><div class="form-group">\n            <label for="block1chain1nonce" class="col-sm-2 control-label">Nonce:</label>\n            <div class="col-sm-10"><input id="block1chain1nonce" type="text" value="72608" onkeyup="updateHash(1, 1);" class="form-control"></div>\n          </div><div class="form-group"><label for="block1chain1data" class="col-sm-2 control-label">Data:</label>\n            <div class="col-sm-10">\n              <textarea id="block1chain1data" rows="10" onkeyup="updateHash(1, 1);" class="form-control">\n\n              </textarea></div></div><div id="state" class="form-group">\n                <label for="block1chain1hash" class="col-sm-2 control-label">Hash:</label><div class="col-sm-10">\n                  <input id="block1chain1hash" type="text" disabled="" class="form-control">\n                </div></div><div class="form-group"><div class="col-sm-2">\n                  <i class="icon-spinner icon-spin icon-large">\n\n                  </i></div><div class="col-sm-10">\n                    <button id="block1chain1mineButton" data-style="expand-right" class="btn btn-primary ladda-button">\n                      <span class="ladda-label">Mine</span></button></div></div></form></div> -->'/*ion-inline-end:"/Users/clementO/Desktop/blueCoin-UI/src/pages/home/home.html"*/
302
+            selector: 'page-home',template:/*ion-inline-start:"/Users/tennesseeg/blueCoin/blueCoin-UI/src/pages/home/home.html"*/'<ion-header>\n  <ion-navbar>\n    <ion-title>BlueCoin</ion-title>\n  </ion-navbar>\n</ion-header>\n\n<ion-content padding>\n  <h2>Blockchain</h2>\n  <div>\n  <ion-item>\n      <ion-label color="primary" stacked>Blockchain</ion-label>\n      <ion-input type="number" placeholder="Block"></ion-input>\n    </ion-item>\n    <ion-item>\n        <ion-label color="primary" stacked>Nonce</ion-label>\n        <ion-input type="number" placeholder="Nonce"></ion-input>\n      </ion-item>\n      <ion-item>\n          <ion-label color="primary" stacked>Transaction Data</ion-label>\n          <p></p>\n          <ion-input type="number" placeholder="Data"></ion-input>\n        </ion-item>\n        <ion-item>\n            <ion-label color="primary" stacked>Hash</ion-label>\n            <ion-input type="number" disabled placeholder="Hash"></ion-input>\n          </ion-item>\n          <button ion-button block>Mine</button></div>\n  <!-- <div id="block1chain1well" class="well well-success">\n    <form class="form-horizontal">\n      <div class="form-group">\n        <label for="block1chain1number" class="col-sm-2 control-label">Block:</label>\n        <div class="col-sm-10">\n          <div class="input-group">\n            <span class="input-group-addon">#</span>\n            <input id="block1chain1number" type="text" value="1" onkeyup="updateHash(1, 1);" class="form-control"></div>\n          </div></div><div class="form-group">\n            <label for="block1chain1nonce" class="col-sm-2 control-label">Nonce:</label>\n            <div class="col-sm-10"><input id="block1chain1nonce" type="text" value="72608" onkeyup="updateHash(1, 1);" class="form-control"></div>\n          </div><div class="form-group"><label for="block1chain1data" class="col-sm-2 control-label">Data:</label>\n            <div class="col-sm-10">\n              <textarea id="block1chain1data" rows="10" onkeyup="updateHash(1, 1);" class="form-control">\n\n              </textarea></div></div><div id="state" class="form-group">\n                <label for="block1chain1hash" class="col-sm-2 control-label">Hash:</label><div class="col-sm-10">\n                  <input id="block1chain1hash" type="text" disabled="" class="form-control">\n                </div></div><div class="form-group"><div class="col-sm-2">\n                  <i class="icon-spinner icon-spin icon-large">\n\n                  </i></div><div class="col-sm-10">\n                    <button id="block1chain1mineButton" data-style="expand-right" class="btn btn-primary ladda-button">\n                      <span class="ladda-label">Mine</span></button></div></div></form></div> -->'/*ion-inline-end:"/Users/tennesseeg/blueCoin/blueCoin-UI/src/pages/home/home.html"*/
338 303
         }),
339 304
         __metadata("design:paramtypes", [__WEBPACK_IMPORTED_MODULE_1_ionic_angular__["e" /* NavController */]])
340 305
     ], HomePage);
@@ -345,13 +310,13 @@ var HomePage = /** @class */ (function () {
345 310
 
346 311
 /***/ }),
347 312
 
348
-/***/ 208:
313
+/***/ 207:
349 314
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
350 315
 
351 316
 "use strict";
352 317
 Object.defineProperty(__webpack_exports__, "__esModule", { value: true });
353
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__angular_platform_browser_dynamic__ = __webpack_require__(209);
354
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__app_module__ = __webpack_require__(229);
318
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__angular_platform_browser_dynamic__ = __webpack_require__(208);
319
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__app_module__ = __webpack_require__(228);
355 320
 
356 321
 
357 322
 Object(__WEBPACK_IMPORTED_MODULE_0__angular_platform_browser_dynamic__["a" /* platformBrowserDynamic */])().bootstrapModule(__WEBPACK_IMPORTED_MODULE_1__app_module__["a" /* AppModule */]);
@@ -359,7 +324,7 @@ Object(__WEBPACK_IMPORTED_MODULE_0__angular_platform_browser_dynamic__["a" /* pl
359 324
 
360 325
 /***/ }),
361 326
 
362
-/***/ 229:
327
+/***/ 228:
363 328
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
364 329
 
365 330
 "use strict";
@@ -370,16 +335,16 @@ Object(__WEBPACK_IMPORTED_MODULE_0__angular_platform_browser_dynamic__["a" /* pl
370 335
 /* harmony import */ var __WEBPACK_IMPORTED_MODULE_3_ionic_angular__ = __webpack_require__(18);
371 336
 /* harmony import */ var __WEBPACK_IMPORTED_MODULE_4__app_component__ = __webpack_require__(276);
372 337
 /* harmony import */ var __WEBPACK_IMPORTED_MODULE_5__angular_common_http__ = __webpack_require__(47);
373
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_6__pages_home_home__ = __webpack_require__(207);
374
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_7__pages_tabs_tabs__ = __webpack_require__(206);
375
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_8__pages_wallet_wallet_module__ = __webpack_require__(160);
376
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_9__ionic_native_status_bar__ = __webpack_require__(202);
377
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_10__ionic_native_splash_screen__ = __webpack_require__(205);
378
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_11__pages_transactions_transactions_module__ = __webpack_require__(162);
379
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_12__pages_payment_payment__ = __webpack_require__(80);
380
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_13__pages_payment_payment_module__ = __webpack_require__(158);
338
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_6__pages_home_home__ = __webpack_require__(206);
339
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_7__pages_tabs_tabs__ = __webpack_require__(205);
340
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_8__pages_wallet_wallet_module__ = __webpack_require__(159);
341
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_9__ionic_native_status_bar__ = __webpack_require__(201);
342
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_10__ionic_native_splash_screen__ = __webpack_require__(204);
343
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_11__pages_transactions_transactions_module__ = __webpack_require__(158);
344
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_12__pages_payment_payment__ = __webpack_require__(81);
345
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_13__pages_payment_payment_module__ = __webpack_require__(161);
381 346
 /* harmony import */ var __WEBPACK_IMPORTED_MODULE_14__providers_transaction_service__ = __webpack_require__(41);
382
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_15__providers_wallet_service__ = __webpack_require__(81);
347
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_15__providers_wallet_service__ = __webpack_require__(80);
383 348
 var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
384 349
     var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
385 350
     if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
@@ -420,9 +385,9 @@ var AppModule = /** @class */ (function () {
420 385
                 __WEBPACK_IMPORTED_MODULE_5__angular_common_http__["b" /* HttpClientModule */],
421 386
                 __WEBPACK_IMPORTED_MODULE_3_ionic_angular__["c" /* IonicModule */].forRoot(__WEBPACK_IMPORTED_MODULE_4__app_component__["a" /* MyApp */], {}, {
422 387
                     links: [
423
-                        { loadChildren: '../pages/payment/payment.module#PaymentPageModule', name: 'PaymentPage', segment: 'payment', priority: 'low', defaultHistory: [] },
388
+                        { loadChildren: '../pages/transactions/transactions.module#TransactionPageModule', name: 'TransactionPage', segment: 'transactions', priority: 'low', defaultHistory: [] },
424 389
                         { loadChildren: '../pages/wallet/wallet.module#WalletPageModule', name: 'WalletPage', segment: 'wallet', priority: 'low', defaultHistory: [] },
425
-                        { loadChildren: '../pages/transactions/transactions.module#TransactionPageModule', name: 'TransactionPage', segment: 'transactions', priority: 'low', defaultHistory: [] }
390
+                        { loadChildren: '../pages/payment/payment.module#PaymentPageModule', name: 'PaymentPage', segment: 'payment', priority: 'low', defaultHistory: [] }
426 391
                     ]
427 392
                 })
428 393
             ],
@@ -450,6 +415,47 @@ var AppModule = /** @class */ (function () {
450 415
 
451 416
 /***/ }),
452 417
 
418
+/***/ 258:
419
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
420
+
421
+"use strict";
422
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return TransactionComponent; });
423
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__angular_core__ = __webpack_require__(0);
424
+var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
425
+    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
426
+    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
427
+    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;
428
+    return c > 3 && r && Object.defineProperty(target, key, r), r;
429
+};
430
+var __metadata = (this && this.__metadata) || function (k, v) {
431
+    if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
432
+};
433
+
434
+/**
435
+ * Generated class for the TransactionComponent component.
436
+ *
437
+ * See https://angular.io/api/core/Component for more info on Angular
438
+ * Components.
439
+ */
440
+var TransactionComponent = /** @class */ (function () {
441
+    function TransactionComponent(fromId, toId, amount) {
442
+        this.fromId = fromId;
443
+        this.toId = toId;
444
+        this.amount = amount;
445
+    }
446
+    TransactionComponent = __decorate([
447
+        Object(__WEBPACK_IMPORTED_MODULE_0__angular_core__["m" /* Component */])({
448
+            selector: 'transaction',template:/*ion-inline-start:"/Users/tennesseeg/blueCoin/blueCoin-UI/src/components/transaction/transaction.html"*/'<!-- Generated template for the TransactionComponent component -->\n<div>\n  {{text}}\n</div>\n'/*ion-inline-end:"/Users/tennesseeg/blueCoin/blueCoin-UI/src/components/transaction/transaction.html"*/
449
+        }),
450
+        __metadata("design:paramtypes", [String, String, Number])
451
+    ], TransactionComponent);
452
+    return TransactionComponent;
453
+}());
454
+
455
+//# sourceMappingURL=transaction.js.map
456
+
457
+/***/ }),
458
+
453 459
 /***/ 276:
454 460
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
455 461
 
@@ -457,9 +463,9 @@ var AppModule = /** @class */ (function () {
457 463
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return MyApp; });
458 464
 /* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__angular_core__ = __webpack_require__(0);
459 465
 /* harmony import */ var __WEBPACK_IMPORTED_MODULE_1_ionic_angular__ = __webpack_require__(18);
460
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__ionic_native_status_bar__ = __webpack_require__(202);
461
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_3__ionic_native_splash_screen__ = __webpack_require__(205);
462
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_4__pages_tabs_tabs__ = __webpack_require__(206);
466
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__ionic_native_status_bar__ = __webpack_require__(201);
467
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_3__ionic_native_splash_screen__ = __webpack_require__(204);
468
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_4__pages_tabs_tabs__ = __webpack_require__(205);
463 469
 var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
464 470
     var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
465 471
     if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
@@ -485,7 +491,7 @@ var MyApp = /** @class */ (function () {
485 491
         });
486 492
     }
487 493
     MyApp = __decorate([
488
-        Object(__WEBPACK_IMPORTED_MODULE_0__angular_core__["m" /* Component */])({template:/*ion-inline-start:"/Users/clementO/Desktop/blueCoin-UI/src/app/app.html"*/'<ion-nav [root]="rootPage"></ion-nav>\n'/*ion-inline-end:"/Users/clementO/Desktop/blueCoin-UI/src/app/app.html"*/
494
+        Object(__WEBPACK_IMPORTED_MODULE_0__angular_core__["m" /* Component */])({template:/*ion-inline-start:"/Users/tennesseeg/blueCoin/blueCoin-UI/src/app/app.html"*/'<ion-nav [root]="rootPage"></ion-nav>\n'/*ion-inline-end:"/Users/tennesseeg/blueCoin/blueCoin-UI/src/app/app.html"*/
489 495
         }),
490 496
         __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 */]])
491 497
     ], MyApp);
@@ -520,16 +526,11 @@ var TransactionService = /** @class */ (function () {
520 526
         this.API = 'http://localhost:8080/';
521 527
     }
522 528
     TransactionService.prototype.getTransactions = function () {
523
-        return this.http.get(this.API + '/transactions');
529
+        return this.http.get(this.API + 'transactions');
524 530
     };
525 531
     ;
526 532
     TransactionService.prototype.postTransactions = function (path, data) {
527
-        var transaction = {
528
-            "fromId": data.fromId,
529
-            "toId": data.toId,
530
-            "amount": data.amount
531
-        };
532
-        return this.http.post(this.API + path, transaction);
533
+        return this.http.post(this.API + path, data);
533 534
     };
534 535
     TransactionService = __decorate([
535 536
         Object(__WEBPACK_IMPORTED_MODULE_0__angular_core__["A" /* Injectable */])(),
@@ -574,9 +575,14 @@ var TransactionPage = /** @class */ (function () {
574 575
             _this.transactions = transactions;
575 576
         });
576 577
     };
578
+    TransactionPage.prototype.doRefresh = function (refresher) {
579
+        this.ionViewDidLoad();
580
+        refresher.complete();
581
+    };
582
+    ;
577 583
     TransactionPage = __decorate([
578 584
         Object(__WEBPACK_IMPORTED_MODULE_0__angular_core__["m" /* Component */])({
579
-            selector: 'page-transactions',template:/*ion-inline-start:"/Users/clementO/Desktop/blueCoin-UI/src/pages/transactions/transactions.html"*/'<ion-header>\n  <ion-navbar>\n    <ion-title>\n      Transactions\n    </ion-title>\n  </ion-navbar>\n</ion-header>\n\n  \n    <ion-content padding>\n      <ion-list>\n        <ion-item *ngFor="let transaction of transactions">\n            <ion-card>\n\n                <ion-card-content>\n                    Date: <h4>{{transaction.timestamp}}</h4>\n                    Sender: <h4>{{transaction.fromId}}</h4>\n                    Receiver: <h4>{{transaction.toId}}</h4>\n                    Amount: <h4>{{transaction.amount}}</h4>\n                    TransactionId<h4>{{transaction.transactionId}}</h4>\n        </ion-card-content>\n      </ion-card>\n        </ion-item>\n      </ion-list>\n    \n      \n    </ion-content>'/*ion-inline-end:"/Users/clementO/Desktop/blueCoin-UI/src/pages/transactions/transactions.html"*/,
585
+            selector: 'page-transactions',template:/*ion-inline-start:"/Users/tennesseeg/blueCoin/blueCoin-UI/src/pages/transactions/transactions.html"*/'<ion-header>\n  <ion-navbar>\n    <ion-title>\n      Blockchain\n    </ion-title>\n  </ion-navbar>\n</ion-header>\n\n  \n<ion-content padding>\n  <ion-refresher (ionRefresh)="doRefresh($event);">\n    <ion-refresher-content\n      pullingText="Pull to refresh"\n      pullingIcon="arrow-dropdown"\n      refreshingSpinner="circles"\n      refreshingText="...fetching...">\n    </ion-refresher-content>\n  </ion-refresher>\n  <ion-list>\n    <ion-item *ngFor="let transaction of transactions">\n      <ion-card>\n          <ion-card-content>\n              Date: <h4>{{transaction.timestamp}}</h4>\n              Sender: <h4>{{transaction.fromId}}</h4>\n              Receiver: <h4>{{transaction.toId}}</h4>\n              Amount: <h4>{{transaction.amount}}</h4>\n              TransactionId<h4>{{transaction.transactionId}}</h4>\n  </ion-card-content>\n</ion-card>\n  </ion-item>\n  </ion-list>\n</ion-content>'/*ion-inline-end:"/Users/tennesseeg/blueCoin/blueCoin-UI/src/pages/transactions/transactions.html"*/,
580 586
         }),
581 587
         __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 */]])
582 588
     ], TransactionPage);
@@ -591,12 +597,48 @@ var TransactionPage = /** @class */ (function () {
591 597
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
592 598
 
593 599
 "use strict";
600
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return WalletService; });
601
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__angular_core__ = __webpack_require__(0);
602
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__angular_common_http__ = __webpack_require__(47);
603
+var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
604
+    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
605
+    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
606
+    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;
607
+    return c > 3 && r && Object.defineProperty(target, key, r), r;
608
+};
609
+var __metadata = (this && this.__metadata) || function (k, v) {
610
+    if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
611
+};
612
+
613
+
614
+var WalletService = /** @class */ (function () {
615
+    function WalletService(http) {
616
+        this.http = http;
617
+        this.API = 'http://localhost:8080';
618
+    }
619
+    WalletService.prototype.getWalletAmount = function () {
620
+        return this.http.get(this.API + '/wallets');
621
+    };
622
+    WalletService = __decorate([
623
+        Object(__WEBPACK_IMPORTED_MODULE_0__angular_core__["A" /* Injectable */])(),
624
+        __metadata("design:paramtypes", [__WEBPACK_IMPORTED_MODULE_1__angular_common_http__["a" /* HttpClient */]])
625
+    ], WalletService);
626
+    return WalletService;
627
+}());
628
+
629
+//# sourceMappingURL=wallet-service.js.map
630
+
631
+/***/ }),
632
+
633
+/***/ 81:
634
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
635
+
636
+"use strict";
594 637
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return PaymentPage; });
595 638
 /* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__angular_core__ = __webpack_require__(0);
596 639
 /* harmony import */ var __WEBPACK_IMPORTED_MODULE_1_ionic_angular__ = __webpack_require__(18);
597 640
 /* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__angular_common_http__ = __webpack_require__(47);
598
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_3__components_transaction_transaction__ = __webpack_require__(159);
599
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_4__providers_transaction_service__ = __webpack_require__(41);
641
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_3__providers_transaction_service__ = __webpack_require__(41);
600 642
 var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
601 643
     var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
602 644
     if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
@@ -610,14 +652,18 @@ var __metadata = (this && this.__metadata) || function (k, v) {
610 652
 
611 653
 
612 654
 
613
-
614 655
 var PaymentPage = /** @class */ (function () {
615 656
     function PaymentPage(navCtrl, navParams, http, transfer) {
616 657
         this.navCtrl = navCtrl;
617 658
         this.navParams = navParams;
618 659
         this.http = http;
619 660
         this.transfer = transfer;
661
+        //trans: TransactionComponent =  new TransactionComponent(this.fromId, this.toId, this.amount);
662
+        this.trans = { fromId: '', toId: '', amount: '' };
620 663
         this.navCtrl = navCtrl;
664
+        //  this.fromId = document.getElementByIdaa;
665
+        //  this.toId ='';
666
+        //  this.amount = 0;
621 667
     }
622 668
     PaymentPage.prototype.ionViewDidLoad = function () {
623 669
         console.log('ionViewDidLoad PaymentPage');
@@ -626,59 +672,21 @@ var PaymentPage = /** @class */ (function () {
626 672
         console.log(this.fromId);
627 673
         console.log(this.toId);
628 674
         console.log(this.amount);
629
-        this.trans = new __WEBPACK_IMPORTED_MODULE_3__components_transaction_transaction__["a" /* TransactionComponent */](this.fromId, this.toId, this.amount);
630 675
         console.log(this.trans);
631 676
         this.transfer.postTransactions("checkTx", this.trans).subscribe(function (data) { return console.log(data); });
632 677
     };
633 678
     PaymentPage = __decorate([
634 679
         Object(__WEBPACK_IMPORTED_MODULE_0__angular_core__["m" /* Component */])({
635
-            selector: 'page-payment',template:/*ion-inline-start:"/Users/clementO/Desktop/blueCoin-UI/src/pages/payment/payment.html"*/'<ion-header>\n  <ion-navbar>\n    <ion-title>BlueCoin</ion-title>\n  </ion-navbar>\n</ion-header>\n\n<ion-content padding>\n  <h2>Payment</h2>\n  <ion-item>\n      <ion-label color="primary" stacked>Your ID</ion-label>\n      <ion-input type="string" placeholder="Your ID" [(ngModel)]="fromId"></ion-input>\n    </ion-item>\n    \n    <ion-item>\n        <ion-label color="primary" stacked>Receiver ID</ion-label>\n        <ion-input type="string" placeholder="Receiver ID" [(ngModel)]="toId"></ion-input>\n      </ion-item>\n\n      <ion-item>\n          <ion-label color="primary" stacked>Amount</ion-label>\n          <ion-input type="number" placeholder="Amount" [(ngModel)]="amount" ></ion-input>\n        </ion-item>\n\n        <button ion-button (click) = "transferMoney()">Send BlueCoin</button>\n</ion-content>'/*ion-inline-end:"/Users/clementO/Desktop/blueCoin-UI/src/pages/payment/payment.html"*/,
680
+            selector: 'page-payment',template:/*ion-inline-start:"/Users/tennesseeg/blueCoin/blueCoin-UI/src/pages/payment/payment.html"*/'<ion-header>\n  <ion-navbar>\n    <ion-title>BlueCoin</ion-title>\n  </ion-navbar>\n</ion-header>\n\n<ion-content padding>\n    <div padding>\n   </div>\n  <ion-item>\n     \n           <ion-label color="primary" stacked>Please select your ID</ion-label>\n      <!-- <ion-input type="string" [(ngModel)]="trans.fromId"></ion-input> // Can type ID manually-->\n    \n          <ion-select [(ngModel)]="trans.fromId">\n            <ion-option value="15b9ef7d26485fae2ecdc74f8f9f465e0c082fe19a996aef2f1daf712aec5751">Vince</ion-option>\n            <ion-option value="9e3123b4c696cb7d9d906a6ec2813d6e6fed5af58b49c4e5f849b7adcb00486c">Tennessee</ion-option>\n            <ion-option value="625ef69f8ef7318876d5c5e31c045f4cc2c89ec01949a3af3789be1f45405342">Mexi</ion-option>\n            <ion-option value="9b1e8a94fcdb88c8391ec1200718b3ddd73fb631b9c6b5d56619852a47833665">Eugene</ion-option>\n            <ion-option value="4b2166f22897c2e85fbab852ae252ee2990231d9692aa7fcc8535cf74c571efd">Clement</ion-option>\n          </ion-select>\n        </ion-item>\n    \n    \n    <ion-item>\n        <ion-label color="primary" stacked>Who would you like to receive BlueCoin?</ion-label>\n        <!-- <ion-input type="string"[(ngModel)]="trans.fromId"></ion-input> Can type ID mamaully-->\n        <ion-select [(ngModel)]="trans.toId">\n            <ion-option value="15b9ef7d26485fae2ecdc74f8f9f465e0c082fe19a996aef2f1daf712aec5751">Vince</ion-option>\n            <ion-option value="9e3123b4c696cb7d9d906a6ec2813d6e6fed5af58b49c4e5f849b7adcb00486c">Tennessee</ion-option>\n            <ion-option value="625ef69f8ef7318876d5c5e31c045f4cc2c89ec01949a3af3789be1f45405342">Mexi</ion-option>\n            <ion-option value="9b1e8a94fcdb88c8391ec1200718b3ddd73fb631b9c6b5d56619852a47833665">Eugene</ion-option>\n            <ion-option value="4b2166f22897c2e85fbab852ae252ee2990231d9692aa7fcc8535cf74c571efd">Clement</ion-option>\n          </ion-select>\n      </ion-item>\n\n      <ion-item>\n          <ion-label color="primary" stacked>Amount</ion-label>\n          <ion-input type="number" placeholder="Enter Amount" [(ngModel)]="trans.amount" ></ion-input>\n        </ion-item>\n\n        <button ion-button (click) = "transferMoney()">Send BlueCoin</button>\n</ion-content>'/*ion-inline-end:"/Users/tennesseeg/blueCoin/blueCoin-UI/src/pages/payment/payment.html"*/,
636 681
         }),
637
-        __metadata("design:paramtypes", [__WEBPACK_IMPORTED_MODULE_1_ionic_angular__["e" /* NavController */], __WEBPACK_IMPORTED_MODULE_1_ionic_angular__["f" /* NavParams */], __WEBPACK_IMPORTED_MODULE_2__angular_common_http__["a" /* HttpClient */], __WEBPACK_IMPORTED_MODULE_4__providers_transaction_service__["a" /* TransactionService */]])
682
+        __metadata("design:paramtypes", [__WEBPACK_IMPORTED_MODULE_1_ionic_angular__["e" /* NavController */], __WEBPACK_IMPORTED_MODULE_1_ionic_angular__["f" /* NavParams */], __WEBPACK_IMPORTED_MODULE_2__angular_common_http__["a" /* HttpClient */], __WEBPACK_IMPORTED_MODULE_3__providers_transaction_service__["a" /* TransactionService */]])
638 683
     ], PaymentPage);
639 684
     return PaymentPage;
640 685
 }());
641 686
 
642 687
 //# sourceMappingURL=payment.js.map
643 688
 
644
-/***/ }),
645
-
646
-/***/ 81:
647
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
648
-
649
-"use strict";
650
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return WalletService; });
651
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__angular_core__ = __webpack_require__(0);
652
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__angular_common_http__ = __webpack_require__(47);
653
-var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
654
-    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
655
-    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
656
-    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;
657
-    return c > 3 && r && Object.defineProperty(target, key, r), r;
658
-};
659
-var __metadata = (this && this.__metadata) || function (k, v) {
660
-    if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
661
-};
662
-
663
-
664
-var WalletService = /** @class */ (function () {
665
-    function WalletService(http) {
666
-        this.http = http;
667
-        this.API = 'http://localhost:8080';
668
-    }
669
-    WalletService.prototype.getWalletAmount = function () {
670
-        return this.http.get(this.API + '/wallets');
671
-    };
672
-    WalletService = __decorate([
673
-        Object(__WEBPACK_IMPORTED_MODULE_0__angular_core__["A" /* Injectable */])(),
674
-        __metadata("design:paramtypes", [__WEBPACK_IMPORTED_MODULE_1__angular_common_http__["a" /* HttpClient */]])
675
-    ], WalletService);
676
-    return WalletService;
677
-}());
678
-
679
-//# sourceMappingURL=wallet-service.js.map
680
-
681 689
 /***/ })
682 690
 
683
-},[208]);
691
+},[207]);
684 692
 //# sourceMappingURL=main.js.map

+ 1
- 1
www/build/main.js.map
Diff onderdrukt omdat het te groot bestand
Bestand weergeven


+ 225
- 225
www/build/vendor.js
Diff onderdrukt omdat het te groot bestand
Bestand weergeven


+ 1
- 1
www/build/vendor.js.map
Diff onderdrukt omdat het te groot bestand
Bestand weergeven