Explorar el Código

Tabs and Wallet functions

Tennessee Gibbs hace 6 años
padre
commit
00e12068c8

+ 1
- 1
.sourcemaps/main.js.map
La diferencia del archivo ha sido suprimido porque es demasiado grande
Ver fichero


+ 9
- 9
src/pages/about/about.html Ver fichero

@@ -1,22 +1,22 @@
1
-<<ion-header>
1
+<ion-header>
2 2
     <ion-navbar>
3 3
       <ion-title>BlueCoin</ion-title>
4 4
     </ion-navbar>
5 5
   </ion-header>
6 6
   
7 7
   <ion-content padding>
8
-    <h2>Wallet</h2>
8
+    <h2>Payment</h2>
9 9
     <ion-item>
10
-        <ion-label color="primary" stacked>Public ID</ion-label>
11
-        <ion-input type="number" placeholder="public ID"></ion-input>
10
+        <ion-label color="primary" stacked>Your ID</ion-label>
11
+        <ion-input type="number" placeholder="Your ID"></ion-input>
12 12
       </ion-item>
13 13
       <ion-item>
14
-          <ion-label color="primary" stacked>Private ID</ion-label>
15
-          <ion-input type="number" placeholder="private ID"></ion-input>
14
+          <ion-label color="primary" stacked>Receiver ID</ion-label>
15
+          <ion-input type="number" placeholder="Receiver ID"></ion-input>
16 16
         </ion-item>
17 17
         <ion-item>
18 18
             <ion-label color="primary" stacked>Amount</ion-label>
19
-            <ion-input type="number" placeholder="Data"></ion-input>
19
+            <ion-input type="number" placeholder="Amount"></ion-input>
20 20
           </ion-item>
21
-          <button ion-button block>Send BlueCoin</button>
22
-              
21
+          <button ion-button (click)='transferMoney()' block>Send BlueCoin</button>
22
+     

+ 5
- 1
src/pages/about/about.ts Ver fichero

@@ -6,9 +6,13 @@ import { NavController } from 'ionic-angular';
6 6
   templateUrl: 'about.html'
7 7
 })
8 8
 export class AboutPage {
9
+  private API = "localhost:8080/"
9 10
 
10 11
   constructor(public navCtrl: NavController) {
11 12
 
12 13
   }
13
-
14
+transferMoney(){
15
+  return this.API + "wallet/" + "{Id}"
16
+  
17
+}
14 18
 }

+ 12
- 2
src/pages/wallet/wallet.html Ver fichero

@@ -3,11 +3,21 @@
3 3
     <ion-title>ZipCoin Blue Wallet</ion-title>
4 4
   </ion-navbar>
5 5
 </ion-header>
6
-
6
+ç
7 7
 <ion-content padding>
8 8
   <ion-list>
9 9
     <ion-item *ngFor="let wallet of wallets">
10
-      <h2>{{wallet.name}}</h2>
10
+        <ion-card>
11
+            <ion-card-header>
12
+               Name: <h2>{{wallet.name}}</h2>
13
+            </ion-card-header>
14
+            <ion-card-content>
15
+     Balance: <h2>{{wallet.amount}}</h2>
16
+     Public Key: <h2>{{wallet.publicId}}</h2>
17
+      
18
+    </ion-card-content>
19
+  </ion-card>
11 20
     </ion-item>
12 21
   </ion-list>
22
+  
13 23
 </ion-content>

+ 1
- 1
src/providers/wallet-service.ts Ver fichero

@@ -11,6 +11,6 @@ export class WalletService {
11 11
   }
12 12
 
13 13
   getWalletAmount(): Observable<any> {
14
-    return this.http.get(this.API + '/get');
14
+    return this.http.get(this.API + '/wallets');
15 15
   }
16 16
 }

+ 9
- 4
www/build/main.js Ver fichero

@@ -124,7 +124,7 @@ var WalletPage = /** @class */ (function () {
124 124
     };
125 125
     WalletPage = __decorate([
126 126
         Object(__WEBPACK_IMPORTED_MODULE_1__angular_core__["m" /* Component */])({
127
-            selector: 'page-wallet',template:/*ion-inline-start:"/Users/tennesseeg/passionproject/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      <h2>{{wallet.name}}</h2>\n    </ion-item>\n  </ion-list>\n</ion-content>'/*ion-inline-end:"/Users/tennesseeg/passionproject/blueCoin-UI/src/pages/wallet/wallet.html"*/,
127
+            selector: 'page-wallet',template:/*ion-inline-start:"/Users/tennesseeg/passionproject/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/tennesseeg/passionproject/blueCoin-UI/src/pages/wallet/wallet.html"*/,
128 128
         }),
129 129
         __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 */]])
130 130
     ], WalletPage);
@@ -160,7 +160,7 @@ var WalletService = /** @class */ (function () {
160 160
         this.WALLET_API = this.API + '/user';
161 161
     }
162 162
     WalletService.prototype.getWalletAmount = function () {
163
-        return this.http.get(this.API + '/get');
163
+        return this.http.get(this.API + '/wallets');
164 164
     };
165 165
     WalletService = __decorate([
166 166
         Object(__WEBPACK_IMPORTED_MODULE_0__angular_core__["A" /* Injectable */])(),
@@ -237,14 +237,19 @@ var __metadata = (this && this.__metadata) || function (k, v) {
237 237
 var AboutPage = /** @class */ (function () {
238 238
     function AboutPage(navCtrl) {
239 239
         this.navCtrl = navCtrl;
240
+        this.API = "localhost:8080/";
240 241
     }
242
+    AboutPage.prototype.transferMoney = function () {
243
+        return this.API + "wallet/" + "{Id}";
244
+    };
241 245
     AboutPage = __decorate([
242 246
         Object(__WEBPACK_IMPORTED_MODULE_0__angular_core__["m" /* Component */])({
243
-            selector: 'page-about',template:/*ion-inline-start:"/Users/tennesseeg/passionproject/blueCoin-UI/src/pages/about/about.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>Wallet</h2>\n    <ion-item>\n        <ion-label color="primary" stacked>Public ID</ion-label>\n        <ion-input type="number" placeholder="public ID"></ion-input>\n      </ion-item>\n      <ion-item>\n          <ion-label color="primary" stacked>Private ID</ion-label>\n          <ion-input type="number" placeholder="private ID"></ion-input>\n        </ion-item>\n        <ion-item>\n            <ion-label color="primary" stacked>Amount</ion-label>\n            <ion-input type="number" placeholder="Data"></ion-input>\n          </ion-item>\n          <button ion-button block>Send BlueCoin</button>\n              '/*ion-inline-end:"/Users/tennesseeg/passionproject/blueCoin-UI/src/pages/about/about.html"*/
247
+            selector: 'page-about',template:/*ion-inline-start:"/Users/tennesseeg/passionproject/blueCoin-UI/src/pages/about/about.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="number" placeholder="Your ID"></ion-input>\n      </ion-item>\n      <ion-item>\n          <ion-label color="primary" stacked>Receiver ID</ion-label>\n          <ion-input type="number" placeholder="Receiver ID"></ion-input>\n        </ion-item>\n        <ion-item>\n            <ion-label color="primary" stacked>Amount</ion-label>\n            <ion-input type="number" placeholder="Amount"></ion-input>\n          </ion-item>\n          <button ion-button (click)=\'transferMoney()\' block>Send BlueCoin</button>\n     '/*ion-inline-end:"/Users/tennesseeg/passionproject/blueCoin-UI/src/pages/about/about.html"*/
244 248
         }),
245
-        __metadata("design:paramtypes", [__WEBPACK_IMPORTED_MODULE_1_ionic_angular__["e" /* NavController */]])
249
+        __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])
246 250
     ], AboutPage);
247 251
     return AboutPage;
252
+    var _a;
248 253
 }());
249 254
 
250 255
 //# sourceMappingURL=about.js.map

+ 1
- 1
www/build/main.js.map
La diferencia del archivo ha sido suprimido porque es demasiado grande
Ver fichero


+ 1
- 1
www/build/vendor.js.map
La diferencia del archivo ha sido suprimido porque es demasiado grande
Ver fichero