부모
커밋
c668cb0910

+ 0
- 4
ZipCoinRedIonicClient/.sourcemaps/main.js.map
파일 크기가 너무 크기때문에 변경 상태를 표시하지 않습니다.
파일 보기


+ 0
- 4
ZipCoinRedIonicClient/src/app/app.component.ts 파일 보기

@@ -2,10 +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
-<<<<<<< HEAD
6
-import { HomePage } from '../pages/home/home';
7
-=======
8
->>>>>>> 8b1e22a5a0caf7af0d9105c89403f7d2bcc4b254
9 5
 import { TabsPage } from '../pages/tabs/tabs';
10 6
 @Component({
11 7
   templateUrl: 'app.html'

+ 0
- 15
ZipCoinRedIonicClient/src/pages/transaction/transaction.html 파일 보기

@@ -6,20 +6,6 @@
6 6
 
7 7
 </ion-header>
8 8
 <ion-content padding>
9
-<<<<<<< HEAD
10
-  <ion-list>
11
-      <ion-item-sliding *ngFor="let block of blocks">
12
-        <ion-item>
13
-          <ion-card>
14
-              <ion-card-content>
15
-                <div>Data: {{ block.transactionList }}</div>
16
-              </ion-card-content>
17
-          </ion-card>
18
-        </ion-item>
19
-      </ion-item-sliding>
20
-    </ion-list>
21
-</ion-content>
22
-=======
23 9
 
24 10
     <ion-list>
25 11
         <ion-item-sliding *ngFor="let transaction of transactions">
@@ -39,4 +25,3 @@
39 25
       </ion-list>
40 26
 
41 27
 </ion-content>
42
->>>>>>> 8b1e22a5a0caf7af0d9105c89403f7d2bcc4b254

+ 0
- 25
ZipCoinRedIonicClient/src/pages/transaction/transaction.ts 파일 보기

@@ -1,11 +1,7 @@
1 1
 import { Component } from '@angular/core';
2 2
 import { IonicPage, NavController, NavParams } from 'ionic-angular';
3
-<<<<<<< HEAD
4
-import { BlockService } from '../../providers/block-service';
5 3
 
6
-=======
7 4
 import { TransactionService } from '../../providers/transaction-service';
8
->>>>>>> 8b1e22a5a0caf7af0d9105c89403f7d2bcc4b254
9 5
 
10 6
 /**
11 7
  * Generated class for the TransactionPage page.
@@ -23,42 +19,21 @@ export class TransactionPage {
23 19
   private block : any = {};
24 20
   private blocks : Array<any>;
25 21
 
26
-<<<<<<< HEAD
27
-  constructor(public navCtrl: NavController, public navParams: NavParams, public blockService: BlockService) {
28
-    this.getMinedBlock('block');
29
-  
30
-=======
31 22
   private transactions : Array<any>;
32 23
 
33 24
   constructor(public navCtrl: NavController, public navParams: NavParams,
34 25
   public transactionService: TransactionService){
35 26
     this.getAllTransactions();
36
->>>>>>> 8b1e22a5a0caf7af0d9105c89403f7d2bcc4b254
37 27
   }
38 28
 
39 29
   ionViewDidLoad() {
40 30
     console.log('ionViewDidLoad TransactionPage');
41 31
   }
42 32
 
43
-<<<<<<< HEAD
44
-  getBlock(id) {
45
-    this.blockService.getBlock(id).subscribe(block => {
46
-      this.block = block;
47
-    })
48
-  }
49
-
50
-  getMinedBlock(id) {
51
-    this.blockService.getMinedBlock(id).subscribe(minedBlock => {
52
-      this.block = minedBlock;
53
-  })
54
-  }
55
-
56
-=======
57 33
   getAllTransactions() {
58 34
     this.transactionService.getAllTransactions().subscribe(transactions => {
59 35
       this.transactions = transactions;
60 36
     })
61 37
   }
62 38
 
63
->>>>>>> 8b1e22a5a0caf7af0d9105c89403f7d2bcc4b254
64 39
 }

+ 0
- 4
ZipCoinRedIonicClient/www/build/0.js 파일 보기

@@ -8,12 +8,8 @@ Object.defineProperty(__webpack_exports__, "__esModule", { value: true });
8 8
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "WalletPageModule", function() { return WalletPageModule; });
9 9
 /* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__angular_core__ = __webpack_require__(0);
10 10
 /* harmony import */ var __WEBPACK_IMPORTED_MODULE_1_ionic_angular__ = __webpack_require__(28);
11
-<<<<<<< HEAD
12
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__wallet__ = __webpack_require__(102);
13
-=======
14 11
 /* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__wallet__ = __webpack_require__(104);
15 12
 /* harmony import */ var __WEBPACK_IMPORTED_MODULE_3__providers_transaction_service__ = __webpack_require__(50);
16
->>>>>>> 8b1e22a5a0caf7af0d9105c89403f7d2bcc4b254
17 13
 var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
18 14
     var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
19 15
     if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);

+ 0
- 4
ZipCoinRedIonicClient/www/build/1.js 파일 보기

@@ -8,11 +8,7 @@ Object.defineProperty(__webpack_exports__, "__esModule", { value: true });
8 8
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "TransactionPageModule", function() { return TransactionPageModule; });
9 9
 /* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__angular_core__ = __webpack_require__(0);
10 10
 /* harmony import */ var __WEBPACK_IMPORTED_MODULE_1_ionic_angular__ = __webpack_require__(28);
11
-<<<<<<< HEAD
12
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__transaction__ = __webpack_require__(103);
13
-=======
14 11
 /* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__transaction__ = __webpack_require__(102);
15
->>>>>>> 8b1e22a5a0caf7af0d9105c89403f7d2bcc4b254
16 12
 var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
17 13
     var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
18 14
     if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);

+ 0
- 4
ZipCoinRedIonicClient/www/build/2.js 파일 보기

@@ -8,11 +8,7 @@ Object.defineProperty(__webpack_exports__, "__esModule", { value: true });
8 8
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "TabsPageModule", function() { return TabsPageModule; });
9 9
 /* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__angular_core__ = __webpack_require__(0);
10 10
 /* harmony import */ var __WEBPACK_IMPORTED_MODULE_1_ionic_angular__ = __webpack_require__(28);
11
-<<<<<<< HEAD
12
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__tabs__ = __webpack_require__(101);
13
-=======
14 11
 /* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__tabs__ = __webpack_require__(103);
15
->>>>>>> 8b1e22a5a0caf7af0d9105c89403f7d2bcc4b254
16 12
 var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
17 13
     var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
18 14
     if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);

+ 0
- 4
ZipCoinRedIonicClient/www/build/3.js 파일 보기

@@ -8,11 +8,7 @@ Object.defineProperty(__webpack_exports__, "__esModule", { value: true });
8 8
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "Tab4PageModule", function() { return Tab4PageModule; });
9 9
 /* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__angular_core__ = __webpack_require__(0);
10 10
 /* harmony import */ var __WEBPACK_IMPORTED_MODULE_1_ionic_angular__ = __webpack_require__(28);
11
-<<<<<<< HEAD
12
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__tab4__ = __webpack_require__(100);
13
-=======
14 11
 /* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__tab4__ = __webpack_require__(101);
15
->>>>>>> 8b1e22a5a0caf7af0d9105c89403f7d2bcc4b254
16 12
 var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
17 13
     var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
18 14
     if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);

+ 2
- 234
ZipCoinRedIonicClient/www/build/main.js 파일 보기

@@ -5,98 +5,6 @@ webpackJsonp([4],{
5 5
 
6 6
 "use strict";
7 7
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return Tab4Page; });
8
-<<<<<<< HEAD
9
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__angular_core__ = __webpack_require__(0);
10
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1_ionic_angular__ = __webpack_require__(28);
11
-var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
12
-    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
13
-    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
14
-    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;
15
-    return c > 3 && r && Object.defineProperty(target, key, r), r;
16
-};
17
-var __metadata = (this && this.__metadata) || function (k, v) {
18
-    if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
19
-};
20
-
21
-
22
-/**
23
- * Generated class for the Tab4Page page.
24
- *
25
- * See https://ionicframework.com/docs/components/#navigation for more info on
26
- * Ionic pages and navigation.
27
- */
28
-var Tab4Page = /** @class */ (function () {
29
-    function Tab4Page(navCtrl, navParams) {
30
-        this.navCtrl = navCtrl;
31
-        this.navParams = navParams;
32
-    }
33
-    Tab4Page.prototype.ionViewDidLoad = function () {
34
-        console.log('ionViewDidLoad Tab4Page');
35
-    };
36
-    Tab4Page = __decorate([
37
-        Object(__WEBPACK_IMPORTED_MODULE_0__angular_core__["m" /* Component */])({
38
-            selector: 'page-tab4',template:/*ion-inline-start:"/Users/khalils/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/khalils/ZipCoin-RED/ZipCoinRedIonicClient/src/pages/tab4/tab4.html"*/,
39
-        }),
40
-        __metadata("design:paramtypes", [__WEBPACK_IMPORTED_MODULE_1_ionic_angular__["e" /* NavController */], __WEBPACK_IMPORTED_MODULE_1_ionic_angular__["f" /* NavParams */]])
41
-    ], Tab4Page);
42
-    return Tab4Page;
43
-}());
44
-
45
-//# sourceMappingURL=tab4.js.map
46
-
47
-/***/ }),
48
-
49
-/***/ 101:
50
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
51
-
52
-"use strict";
53
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return TabsPage; });
54
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__angular_core__ = __webpack_require__(0);
55
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__home_home__ = __webpack_require__(158);
56
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__wallet_wallet__ = __webpack_require__(102);
57
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_3__transaction_transaction__ = __webpack_require__(103);
58
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_4__tab4_tab4__ = __webpack_require__(100);
59
-var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
60
-    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
61
-    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
62
-    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;
63
-    return c > 3 && r && Object.defineProperty(target, key, r), r;
64
-};
65
-var __metadata = (this && this.__metadata) || function (k, v) {
66
-    if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
67
-};
68
-
69
-
70
-
71
-
72
-
73
-var TabsPage = /** @class */ (function () {
74
-    function TabsPage() {
75
-        this.homePage = __WEBPACK_IMPORTED_MODULE_1__home_home__["a" /* HomePage */];
76
-        this.walletPage = __WEBPACK_IMPORTED_MODULE_2__wallet_wallet__["a" /* WalletPage */];
77
-        this.transactionPage = __WEBPACK_IMPORTED_MODULE_3__transaction_transaction__["a" /* TransactionPage */];
78
-        this.tab4 = __WEBPACK_IMPORTED_MODULE_4__tab4_tab4__["a" /* Tab4Page */];
79
-    }
80
-    TabsPage = __decorate([
81
-        Object(__WEBPACK_IMPORTED_MODULE_0__angular_core__["m" /* Component */])({
82
-            selector: 'page-tabs',template:/*ion-inline-start:"/Users/khalils/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/khalils/ZipCoin-RED/ZipCoinRedIonicClient/src/pages/tabs/tabs.html"*/,
83
-        }),
84
-        __metadata("design:paramtypes", [])
85
-    ], TabsPage);
86
-    return TabsPage;
87
-}());
88
-
89
-//# sourceMappingURL=tabs.js.map
90
-
91
-/***/ }),
92
-
93
-/***/ 102:
94
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
95
-
96
-"use strict";
97
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return WalletPage; });
98
-=======
99
->>>>>>> 8b1e22a5a0caf7af0d9105c89403f7d2bcc4b254
100 8
 /* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__angular_core__ = __webpack_require__(0);
101 9
 /* harmony import */ var __WEBPACK_IMPORTED_MODULE_1_ionic_angular__ = __webpack_require__(28);
102 10
 var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
@@ -137,22 +45,14 @@ var Tab4Page = /** @class */ (function () {
137 45
 
138 46
 /***/ }),
139 47
 
140
-<<<<<<< HEAD
141
-/***/ 103:
142
-=======
143 48
 /***/ 102:
144
->>>>>>> 8b1e22a5a0caf7af0d9105c89403f7d2bcc4b254
145 49
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
146 50
 
147 51
 "use strict";
148 52
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return TransactionPage; });
149 53
 /* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__angular_core__ = __webpack_require__(0);
150 54
 /* harmony import */ var __WEBPACK_IMPORTED_MODULE_1_ionic_angular__ = __webpack_require__(28);
151
-<<<<<<< HEAD
152
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__providers_block_service__ = __webpack_require__(77);
153
-=======
154 55
 /* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__providers_transaction_service__ = __webpack_require__(50);
155
->>>>>>> 8b1e22a5a0caf7af0d9105c89403f7d2bcc4b254
156 56
 var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
157 57
     var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
158 58
     if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
@@ -172,55 +72,23 @@ var __metadata = (this && this.__metadata) || function (k, v) {
172 72
  * Ionic pages and navigation.
173 73
  */
174 74
 var TransactionPage = /** @class */ (function () {
175
-<<<<<<< HEAD
176
-    function TransactionPage(navCtrl, navParams, blockService) {
177
-        this.navCtrl = navCtrl;
178
-        this.navParams = navParams;
179
-        this.blockService = blockService;
180
-        this.block = {};
181
-        this.getMinedBlock('block');
182
-=======
183 75
     function TransactionPage(navCtrl, navParams, transactionService) {
184 76
         this.navCtrl = navCtrl;
185 77
         this.navParams = navParams;
186 78
         this.transactionService = transactionService;
187 79
         this.getAllTransactions;
188
->>>>>>> 8b1e22a5a0caf7af0d9105c89403f7d2bcc4b254
189 80
     }
190 81
     TransactionPage.prototype.ionViewDidLoad = function () {
191 82
         console.log('ionViewDidLoad TransactionPage');
192 83
     };
193
-<<<<<<< HEAD
194
-    TransactionPage.prototype.getBlock = function (id) {
195
-        var _this = this;
196
-        this.blockService.getBlock(id).subscribe(function (block) {
197
-            _this.block = block;
198
-        });
199
-    };
200
-    TransactionPage.prototype.getMinedBlock = function (id) {
201
-        var _this = this;
202
-        this.blockService.getMinedBlock(id).subscribe(function (minedBlock) {
203
-            _this.block = minedBlock;
204
-=======
205
-    TransactionPage.prototype.getAllTransactions = function () {
206
-        var _this = this;
207
-        this.transactionService.getAllTransactions().subscribe(function (transactions) {
208
-            _this.transactions = transactions;
209
->>>>>>> 8b1e22a5a0caf7af0d9105c89403f7d2bcc4b254
210
-        });
211
-    };
212
-    TransactionPage = __decorate([
213
-        Object(__WEBPACK_IMPORTED_MODULE_0__angular_core__["m" /* Component */])({
214
-<<<<<<< HEAD
84
+
215 85
             selector: 'page-transaction',template:/*ion-inline-start:"/Users/khalils/ZipCoin-RED/ZipCoinRedIonicClient/src/pages/transaction/transaction.html"*/'<ion-header>\n\n  <ion-navbar>\n    <ion-title>Transaction</ion-title>\n  </ion-navbar>\n\n</ion-header>\n<ion-content padding>\n  <ion-list>\n      <ion-item-sliding *ngFor="let block of blocks">\n        <ion-item>\n          <ion-card>\n              <ion-card-content>\n                <div>Data: {{ block.transactionList }}</div>\n              </ion-card-content>\n          </ion-card>\n        </ion-item>\n      </ion-item-sliding>\n    </ion-list>\n</ion-content>'/*ion-inline-end:"/Users/khalils/ZipCoin-RED/ZipCoinRedIonicClient/src/pages/transaction/transaction.html"*/,
216 86
         }),
217 87
         __metadata("design:paramtypes", [__WEBPACK_IMPORTED_MODULE_1_ionic_angular__["e" /* NavController */], __WEBPACK_IMPORTED_MODULE_1_ionic_angular__["f" /* NavParams */], __WEBPACK_IMPORTED_MODULE_2__providers_block_service__["a" /* BlockService */]])
218
-=======
219 88
             selector: 'page-transaction',template:/*ion-inline-start:"/Users/shivamp/labs/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: {{ transaction.recipient }}</div>\n                  <div>Amount: {{ transaction.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/shivamp/labs/ZipCoin-RED/ZipCoinRedIonicClient/src/pages/transaction/transaction.html"*/,
220 89
         }),
221 90
         __metadata("design:paramtypes", [__WEBPACK_IMPORTED_MODULE_1_ionic_angular__["e" /* NavController */], __WEBPACK_IMPORTED_MODULE_1_ionic_angular__["f" /* NavParams */],
222 91
             __WEBPACK_IMPORTED_MODULE_2__providers_transaction_service__["a" /* TransactionService */]])
223
->>>>>>> 8b1e22a5a0caf7af0d9105c89403f7d2bcc4b254
224 92
     ], TransactionPage);
225 93
     return TransactionPage;
226 94
 }());
@@ -229,15 +97,7 @@ var TransactionPage = /** @class */ (function () {
229 97
 
230 98
 /***/ }),
231 99
 
232
-<<<<<<< HEAD
233
-/***/ 115:
234
-=======
235
-/***/ 103:
236
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
237
-
238
-"use strict";
239 100
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return TabsPage; });
240
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__angular_core__ = __webpack_require__(0);
241 101
 /* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__home_home__ = __webpack_require__(159);
242 102
 /* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__wallet_wallet__ = __webpack_require__(104);
243 103
 /* harmony import */ var __WEBPACK_IMPORTED_MODULE_3__transaction_transaction__ = __webpack_require__(102);
@@ -341,19 +201,11 @@ function webpackEmptyAsyncContext(req) {
341 201
 webpackEmptyAsyncContext.keys = function() { return []; };
342 202
 webpackEmptyAsyncContext.resolve = webpackEmptyAsyncContext;
343 203
 module.exports = webpackEmptyAsyncContext;
344
-<<<<<<< HEAD
345
-webpackEmptyAsyncContext.id = 115;
346
-
347
-/***/ }),
348
-
349
-/***/ 157:
350
-=======
351 204
 webpackEmptyAsyncContext.id = 116;
352 205
 
353 206
 /***/ }),
354 207
 
355 208
 /***/ 158:
356
->>>>>>> 8b1e22a5a0caf7af0d9105c89403f7d2bcc4b254
357 209
 /***/ (function(module, exports, __webpack_require__) {
358 210
 
359 211
 var map = {
@@ -385,35 +237,21 @@ function webpackAsyncContext(req) {
385 237
 webpackAsyncContext.keys = function webpackAsyncContextKeys() {
386 238
 	return Object.keys(map);
387 239
 };
388
-<<<<<<< HEAD
389
-webpackAsyncContext.id = 157;
390
-=======
391 240
 webpackAsyncContext.id = 158;
392
->>>>>>> 8b1e22a5a0caf7af0d9105c89403f7d2bcc4b254
393 241
 module.exports = webpackAsyncContext;
394 242
 
395 243
 /***/ }),
396 244
 
397
-<<<<<<< HEAD
398
-/***/ 158:
399
-=======
400 245
 /***/ 159:
401
->>>>>>> 8b1e22a5a0caf7af0d9105c89403f7d2bcc4b254
402 246
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
403 247
 
404 248
 "use strict";
405 249
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return HomePage; });
406 250
 /* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__angular_core__ = __webpack_require__(0);
407 251
 /* harmony import */ var __WEBPACK_IMPORTED_MODULE_1_ionic_angular__ = __webpack_require__(28);
408
-<<<<<<< HEAD
409
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__providers_block_service__ = __webpack_require__(77);
410
-=======
252
+
411 253
 /* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__providers_block_service__ = __webpack_require__(160);
412
->>>>>>> 8b1e22a5a0caf7af0d9105c89403f7d2bcc4b254
413
-var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
414
-    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
415 254
     if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
416
-    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;
417 255
     return c > 3 && r && Object.defineProperty(target, key, r), r;
418 256
 };
419 257
 var __metadata = (this && this.__metadata) || function (k, v) {
@@ -466,9 +304,6 @@ var HomePage = /** @class */ (function () {
466 304
 
467 305
 /***/ }),
468 306
 
469
-<<<<<<< HEAD
470
-/***/ 203:
471
-=======
472 307
 /***/ 160:
473 308
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
474 309
 
@@ -514,7 +349,6 @@ var BlockService = /** @class */ (function () {
514 349
 /***/ }),
515 350
 
516 351
 /***/ 204:
517
->>>>>>> 8b1e22a5a0caf7af0d9105c89403f7d2bcc4b254
518 352
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
519 353
 
520 354
 "use strict";
@@ -536,18 +370,6 @@ Object(__WEBPACK_IMPORTED_MODULE_0__angular_platform_browser_dynamic__["a" /* pl
536 370
 /* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__angular_platform_browser__ = __webpack_require__(31);
537 371
 /* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__angular_core__ = __webpack_require__(0);
538 372
 /* harmony import */ var __WEBPACK_IMPORTED_MODULE_2_ionic_angular__ = __webpack_require__(28);
539
-<<<<<<< HEAD
540
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_3__ionic_native_splash_screen__ = __webpack_require__(199);
541
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_4__ionic_native_status_bar__ = __webpack_require__(202);
542
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_5__app_component__ = __webpack_require__(278);
543
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_6__angular_common_http__ = __webpack_require__(159);
544
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_7__providers_block_service__ = __webpack_require__(77);
545
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_8__pages_home_home__ = __webpack_require__(158);
546
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_9__pages_wallet_wallet__ = __webpack_require__(102);
547
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_10__pages_transaction_transaction__ = __webpack_require__(103);
548
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_11__pages_tabs_tabs__ = __webpack_require__(101);
549
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_12__pages_tab4_tab4__ = __webpack_require__(100);
550
-=======
551 373
 /* harmony import */ var __WEBPACK_IMPORTED_MODULE_3__ionic_native_splash_screen__ = __webpack_require__(200);
552 374
 /* harmony import */ var __WEBPACK_IMPORTED_MODULE_4__ionic_native_status_bar__ = __webpack_require__(203);
553 375
 /* harmony import */ var __WEBPACK_IMPORTED_MODULE_5__app_component__ = __webpack_require__(279);
@@ -559,7 +381,6 @@ Object(__WEBPACK_IMPORTED_MODULE_0__angular_platform_browser_dynamic__["a" /* pl
559 381
 /* harmony import */ var __WEBPACK_IMPORTED_MODULE_11__pages_tabs_tabs__ = __webpack_require__(103);
560 382
 /* harmony import */ var __WEBPACK_IMPORTED_MODULE_12__pages_tab4_tab4__ = __webpack_require__(101);
561 383
 /* harmony import */ var __WEBPACK_IMPORTED_MODULE_13__providers_transaction_service__ = __webpack_require__(50);
562
->>>>>>> 8b1e22a5a0caf7af0d9105c89403f7d2bcc4b254
563 384
 var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
564 385
     var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
565 386
     if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
@@ -579,10 +400,6 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
579 400
 
580 401
 
581 402
 
582
-<<<<<<< HEAD
583
-=======
584
-
585
->>>>>>> 8b1e22a5a0caf7af0d9105c89403f7d2bcc4b254
586 403
 var AppModule = /** @class */ (function () {
587 404
     function AppModule() {
588 405
     }
@@ -592,10 +409,7 @@ var AppModule = /** @class */ (function () {
592 409
                 __WEBPACK_IMPORTED_MODULE_5__app_component__["a" /* MyApp */],
593 410
                 __WEBPACK_IMPORTED_MODULE_8__pages_home_home__["a" /* HomePage */],
594 411
                 __WEBPACK_IMPORTED_MODULE_9__pages_wallet_wallet__["a" /* WalletPage */],
595
-                __WEBPACK_IMPORTED_MODULE_10__pages_transaction_transaction__["a" /* TransactionPage */],
596
-                __WEBPACK_IMPORTED_MODULE_12__pages_tab4_tab4__["a" /* Tab4Page */],
597 412
                 __WEBPACK_IMPORTED_MODULE_11__pages_tabs_tabs__["a" /* TabsPage */]
598
-            ],
599 413
             imports: [
600 414
                 __WEBPACK_IMPORTED_MODULE_0__angular_platform_browser__["a" /* BrowserModule */],
601 415
                 __WEBPACK_IMPORTED_MODULE_6__angular_common_http__["b" /* HttpClientModule */],
@@ -621,10 +435,7 @@ var AppModule = /** @class */ (function () {
621 435
                 __WEBPACK_IMPORTED_MODULE_4__ionic_native_status_bar__["a" /* StatusBar */],
622 436
                 __WEBPACK_IMPORTED_MODULE_3__ionic_native_splash_screen__["a" /* SplashScreen */],
623 437
                 __WEBPACK_IMPORTED_MODULE_7__providers_block_service__["a" /* BlockService */],
624
-<<<<<<< HEAD
625
-=======
626 438
                 __WEBPACK_IMPORTED_MODULE_13__providers_transaction_service__["a" /* TransactionService */],
627
->>>>>>> 8b1e22a5a0caf7af0d9105c89403f7d2bcc4b254
628 439
                 { provide: __WEBPACK_IMPORTED_MODULE_1__angular_core__["u" /* ErrorHandler */], useClass: __WEBPACK_IMPORTED_MODULE_2_ionic_angular__["b" /* IonicErrorHandler */] }
629 440
             ]
630 441
         })
@@ -643,19 +454,12 @@ var AppModule = /** @class */ (function () {
643 454
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return MyApp; });
644 455
 /* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__angular_core__ = __webpack_require__(0);
645 456
 /* harmony import */ var __WEBPACK_IMPORTED_MODULE_1_ionic_angular__ = __webpack_require__(28);
646
-<<<<<<< HEAD
647 457
 /* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__ionic_native_status_bar__ = __webpack_require__(202);
648 458
 /* harmony import */ var __WEBPACK_IMPORTED_MODULE_3__ionic_native_splash_screen__ = __webpack_require__(199);
649 459
 /* harmony import */ var __WEBPACK_IMPORTED_MODULE_4__pages_tabs_tabs__ = __webpack_require__(101);
650
-=======
651
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__ionic_native_status_bar__ = __webpack_require__(203);
652
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_3__ionic_native_splash_screen__ = __webpack_require__(200);
653
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_4__pages_tabs_tabs__ = __webpack_require__(103);
654
->>>>>>> 8b1e22a5a0caf7af0d9105c89403f7d2bcc4b254
655 460
 var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
656 461
     var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
657 462
     if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
658
-    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;
659 463
     return c > 3 && r && Object.defineProperty(target, key, r), r;
660 464
 };
661 465
 var __metadata = (this && this.__metadata) || function (k, v) {
@@ -688,15 +492,6 @@ var MyApp = /** @class */ (function () {
688 492
 
689 493
 /***/ }),
690 494
 
691
-<<<<<<< HEAD
692
-/***/ 77:
693
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
694
-
695
-"use strict";
696
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return BlockService; });
697
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__angular_common_http__ = __webpack_require__(159);
698
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__angular_core__ = __webpack_require__(0);
699
-=======
700 495
 /***/ 50:
701 496
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
702 497
 
@@ -704,7 +499,6 @@ var MyApp = /** @class */ (function () {
704 499
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return TransactionService; });
705 500
 /* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__angular_core__ = __webpack_require__(0);
706 501
 /* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__angular_common_http__ = __webpack_require__(78);
707
->>>>>>> 8b1e22a5a0caf7af0d9105c89403f7d2bcc4b254
708 502
 var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
709 503
     var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
710 504
     if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
@@ -716,31 +510,6 @@ var __metadata = (this && this.__metadata) || function (k, v) {
716 510
 };
717 511
 
718 512
 
719
-<<<<<<< HEAD
720
-var BlockService = /** @class */ (function () {
721
-    function BlockService(http) {
722
-        this.http = http;
723
-        this.API = 'http://localhost:8080/api/v1';
724
-        this.BLOCK_API = this.API + '/blocks';
725
-    }
726
-    BlockService.prototype.getBlock = function (id) {
727
-        return this.http.get(this.BLOCK_API + '/' + id);
728
-    };
729
-    BlockService.prototype.getMinedBlock = function (id) {
730
-        return this.http.get(this.BLOCK_API + '/' + id + '/' + 'mine');
731
-    };
732
-    BlockService.prototype.getAllBlocks = function () {
733
-        return this.http.get(this.BLOCK_API);
734
-    };
735
-    BlockService = __decorate([
736
-        Object(__WEBPACK_IMPORTED_MODULE_1__angular_core__["A" /* Injectable */])(),
737
-        __metadata("design:paramtypes", [__WEBPACK_IMPORTED_MODULE_0__angular_common_http__["a" /* HttpClient */]])
738
-    ], BlockService);
739
-    return BlockService;
740
-}());
741
-
742
-//# sourceMappingURL=block-service.js.map
743
-=======
744 513
 var TransactionService = /** @class */ (function () {
745 514
     function TransactionService(http) {
746 515
         this.http = http;
@@ -761,7 +530,6 @@ var TransactionService = /** @class */ (function () {
761 530
 }());
762 531
 
763 532
 //# sourceMappingURL=transaction-service.js.map
764
->>>>>>> 8b1e22a5a0caf7af0d9105c89403f7d2bcc4b254
765 533
 
766 534
 /***/ })
767 535
 

+ 0
- 4
ZipCoinRedIonicClient/www/build/main.js.map
파일 크기가 너무 크기때문에 변경 상태를 표시하지 않습니다.
파일 보기


+ 186
- 227
ZipCoinRedIonicClient/www/build/vendor.js 파일 보기

@@ -36044,192 +36044,192 @@ function setControlCss(element, control) {
36044 36044
 /* unused harmony export __makeTemplateObject */
36045 36045
 /* unused harmony export __importStar */
36046 36046
 /* unused harmony export __importDefault */
36047
-/*! *****************************************************************************
36048
-Copyright (c) Microsoft Corporation. All rights reserved.
36049
-Licensed under the Apache License, Version 2.0 (the "License"); you may not use
36050
-this file except in compliance with the License. You may obtain a copy of the
36051
-License at http://www.apache.org/licenses/LICENSE-2.0
36052
-
36053
-THIS CODE IS PROVIDED ON AN *AS IS* BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
36054
-KIND, EITHER EXPRESS OR IMPLIED, INCLUDING WITHOUT LIMITATION ANY IMPLIED
36055
-WARRANTIES OR CONDITIONS OF TITLE, FITNESS FOR A PARTICULAR PURPOSE,
36056
-MERCHANTABLITY OR NON-INFRINGEMENT.
36057
-
36058
-See the Apache Version 2.0 License for specific language governing permissions
36059
-and limitations under the License.
36060
-***************************************************************************** */
36061
-/* global Reflect, Promise */
36062
-
36063
-var extendStatics = function(d, b) {
36064
-    extendStatics = Object.setPrototypeOf ||
36065
-        ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
36066
-        function (d, b) { for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p]; };
36067
-    return extendStatics(d, b);
36068
-};
36069
-
36070
-function __extends(d, b) {
36071
-    extendStatics(d, b);
36072
-    function __() { this.constructor = d; }
36073
-    d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
36074
-}
36075
-
36076
-var __assign = function() {
36077
-    __assign = Object.assign || function __assign(t) {
36078
-        for (var s, i = 1, n = arguments.length; i < n; i++) {
36079
-            s = arguments[i];
36080
-            for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p)) t[p] = s[p];
36081
-        }
36082
-        return t;
36083
-    }
36084
-    return __assign.apply(this, arguments);
36085
-}
36086
-
36087
-function __rest(s, e) {
36088
-    var t = {};
36089
-    for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0)
36090
-        t[p] = s[p];
36091
-    if (s != null && typeof Object.getOwnPropertySymbols === "function")
36092
-        for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) if (e.indexOf(p[i]) < 0)
36093
-            t[p[i]] = s[p[i]];
36094
-    return t;
36095
-}
36096
-
36097
-function __decorate(decorators, target, key, desc) {
36098
-    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
36099
-    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
36100
-    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;
36101
-    return c > 3 && r && Object.defineProperty(target, key, r), r;
36102
-}
36103
-
36104
-function __param(paramIndex, decorator) {
36105
-    return function (target, key) { decorator(target, key, paramIndex); }
36106
-}
36107
-
36108
-function __metadata(metadataKey, metadataValue) {
36109
-    if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(metadataKey, metadataValue);
36110
-}
36111
-
36112
-function __awaiter(thisArg, _arguments, P, generator) {
36113
-    return new (P || (P = Promise))(function (resolve, reject) {
36114
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
36115
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
36116
-        function step(result) { result.done ? resolve(result.value) : new P(function (resolve) { resolve(result.value); }).then(fulfilled, rejected); }
36117
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
36118
-    });
36119
-}
36120
-
36121
-function __generator(thisArg, body) {
36122
-    var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g;
36123
-    return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
36124
-    function verb(n) { return function (v) { return step([n, v]); }; }
36125
-    function step(op) {
36126
-        if (f) throw new TypeError("Generator is already executing.");
36127
-        while (_) try {
36128
-            if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
36129
-            if (y = 0, t) op = [op[0] & 2, t.value];
36130
-            switch (op[0]) {
36131
-                case 0: case 1: t = op; break;
36132
-                case 4: _.label++; return { value: op[1], done: false };
36133
-                case 5: _.label++; y = op[1]; op = [0]; continue;
36134
-                case 7: op = _.ops.pop(); _.trys.pop(); continue;
36135
-                default:
36136
-                    if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; }
36137
-                    if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; }
36138
-                    if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; }
36139
-                    if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; }
36140
-                    if (t[2]) _.ops.pop();
36141
-                    _.trys.pop(); continue;
36142
-            }
36143
-            op = body.call(thisArg, _);
36144
-        } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; }
36145
-        if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
36146
-    }
36147
-}
36148
-
36149
-function __exportStar(m, exports) {
36150
-    for (var p in m) if (!exports.hasOwnProperty(p)) exports[p] = m[p];
36151
-}
36152
-
36153
-function __values(o) {
36154
-    var m = typeof Symbol === "function" && o[Symbol.iterator], i = 0;
36155
-    if (m) return m.call(o);
36156
-    return {
36157
-        next: function () {
36158
-            if (o && i >= o.length) o = void 0;
36159
-            return { value: o && o[i++], done: !o };
36160
-        }
36161
-    };
36162
-}
36163
-
36164
-function __read(o, n) {
36165
-    var m = typeof Symbol === "function" && o[Symbol.iterator];
36166
-    if (!m) return o;
36167
-    var i = m.call(o), r, ar = [], e;
36168
-    try {
36169
-        while ((n === void 0 || n-- > 0) && !(r = i.next()).done) ar.push(r.value);
36170
-    }
36171
-    catch (error) { e = { error: error }; }
36172
-    finally {
36173
-        try {
36174
-            if (r && !r.done && (m = i["return"])) m.call(i);
36175
-        }
36176
-        finally { if (e) throw e.error; }
36177
-    }
36178
-    return ar;
36179
-}
36180
-
36181
-function __spread() {
36182
-    for (var ar = [], i = 0; i < arguments.length; i++)
36183
-        ar = ar.concat(__read(arguments[i]));
36184
-    return ar;
36185
-}
36186
-
36187
-function __await(v) {
36188
-    return this instanceof __await ? (this.v = v, this) : new __await(v);
36189
-}
36190
-
36191
-function __asyncGenerator(thisArg, _arguments, generator) {
36192
-    if (!Symbol.asyncIterator) throw new TypeError("Symbol.asyncIterator is not defined.");
36193
-    var g = generator.apply(thisArg, _arguments || []), i, q = [];
36194
-    return i = {}, verb("next"), verb("throw"), verb("return"), i[Symbol.asyncIterator] = function () { return this; }, i;
36195
-    function verb(n) { if (g[n]) i[n] = function (v) { return new Promise(function (a, b) { q.push([n, v, a, b]) > 1 || resume(n, v); }); }; }
36196
-    function resume(n, v) { try { step(g[n](v)); } catch (e) { settle(q[0][3], e); } }
36197
-    function step(r) { r.value instanceof __await ? Promise.resolve(r.value.v).then(fulfill, reject) : settle(q[0][2], r); }
36198
-    function fulfill(value) { resume("next", value); }
36199
-    function reject(value) { resume("throw", value); }
36200
-    function settle(f, v) { if (f(v), q.shift(), q.length) resume(q[0][0], q[0][1]); }
36201
-}
36202
-
36203
-function __asyncDelegator(o) {
36204
-    var i, p;
36205
-    return i = {}, verb("next"), verb("throw", function (e) { throw e; }), verb("return"), i[Symbol.iterator] = function () { return this; }, i;
36206
-    function verb(n, f) { i[n] = o[n] ? function (v) { return (p = !p) ? { value: __await(o[n](v)), done: n === "return" } : f ? f(v) : v; } : f; }
36207
-}
36208
-
36209
-function __asyncValues(o) {
36210
-    if (!Symbol.asyncIterator) throw new TypeError("Symbol.asyncIterator is not defined.");
36211
-    var m = o[Symbol.asyncIterator], i;
36212
-    return m ? m.call(o) : (o = typeof __values === "function" ? __values(o) : o[Symbol.iterator](), i = {}, verb("next"), verb("throw"), verb("return"), i[Symbol.asyncIterator] = function () { return this; }, i);
36213
-    function verb(n) { i[n] = o[n] && function (v) { return new Promise(function (resolve, reject) { v = o[n](v), settle(resolve, reject, v.done, v.value); }); }; }
36214
-    function settle(resolve, reject, d, v) { Promise.resolve(v).then(function(v) { resolve({ value: v, done: d }); }, reject); }
36215
-}
36216
-
36217
-function __makeTemplateObject(cooked, raw) {
36218
-    if (Object.defineProperty) { Object.defineProperty(cooked, "raw", { value: raw }); } else { cooked.raw = raw; }
36219
-    return cooked;
36220
-};
36221
-
36222
-function __importStar(mod) {
36223
-    if (mod && mod.__esModule) return mod;
36224
-    var result = {};
36225
-    if (mod != null) for (var k in mod) if (Object.hasOwnProperty.call(mod, k)) result[k] = mod[k];
36226
-    result.default = mod;
36227
-    return result;
36228
-}
36229
-
36230
-function __importDefault(mod) {
36231
-    return (mod && mod.__esModule) ? mod : { default: mod };
36232
-}
36047
+/*! *****************************************************************************
36048
+Copyright (c) Microsoft Corporation. All rights reserved.
36049
+Licensed under the Apache License, Version 2.0 (the "License"); you may not use
36050
+this file except in compliance with the License. You may obtain a copy of the
36051
+License at http://www.apache.org/licenses/LICENSE-2.0
36052
+
36053
+THIS CODE IS PROVIDED ON AN *AS IS* BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
36054
+KIND, EITHER EXPRESS OR IMPLIED, INCLUDING WITHOUT LIMITATION ANY IMPLIED
36055
+WARRANTIES OR CONDITIONS OF TITLE, FITNESS FOR A PARTICULAR PURPOSE,
36056
+MERCHANTABLITY OR NON-INFRINGEMENT.
36057
+
36058
+See the Apache Version 2.0 License for specific language governing permissions
36059
+and limitations under the License.
36060
+***************************************************************************** */
36061
+/* global Reflect, Promise */
36062
+
36063
+var extendStatics = function(d, b) {
36064
+    extendStatics = Object.setPrototypeOf ||
36065
+        ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
36066
+        function (d, b) { for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p]; };
36067
+    return extendStatics(d, b);
36068
+};
36069
+
36070
+function __extends(d, b) {
36071
+    extendStatics(d, b);
36072
+    function __() { this.constructor = d; }
36073
+    d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
36074
+}
36075
+
36076
+var __assign = function() {
36077
+    __assign = Object.assign || function __assign(t) {
36078
+        for (var s, i = 1, n = arguments.length; i < n; i++) {
36079
+            s = arguments[i];
36080
+            for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p)) t[p] = s[p];
36081
+        }
36082
+        return t;
36083
+    }
36084
+    return __assign.apply(this, arguments);
36085
+}
36086
+
36087
+function __rest(s, e) {
36088
+    var t = {};
36089
+    for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0)
36090
+        t[p] = s[p];
36091
+    if (s != null && typeof Object.getOwnPropertySymbols === "function")
36092
+        for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) if (e.indexOf(p[i]) < 0)
36093
+            t[p[i]] = s[p[i]];
36094
+    return t;
36095
+}
36096
+
36097
+function __decorate(decorators, target, key, desc) {
36098
+    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
36099
+    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
36100
+    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;
36101
+    return c > 3 && r && Object.defineProperty(target, key, r), r;
36102
+}
36103
+
36104
+function __param(paramIndex, decorator) {
36105
+    return function (target, key) { decorator(target, key, paramIndex); }
36106
+}
36107
+
36108
+function __metadata(metadataKey, metadataValue) {
36109
+    if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(metadataKey, metadataValue);
36110
+}
36111
+
36112
+function __awaiter(thisArg, _arguments, P, generator) {
36113
+    return new (P || (P = Promise))(function (resolve, reject) {
36114
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
36115
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
36116
+        function step(result) { result.done ? resolve(result.value) : new P(function (resolve) { resolve(result.value); }).then(fulfilled, rejected); }
36117
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
36118
+    });
36119
+}
36120
+
36121
+function __generator(thisArg, body) {
36122
+    var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g;
36123
+    return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
36124
+    function verb(n) { return function (v) { return step([n, v]); }; }
36125
+    function step(op) {
36126
+        if (f) throw new TypeError("Generator is already executing.");
36127
+        while (_) try {
36128
+            if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
36129
+            if (y = 0, t) op = [op[0] & 2, t.value];
36130
+            switch (op[0]) {
36131
+                case 0: case 1: t = op; break;
36132
+                case 4: _.label++; return { value: op[1], done: false };
36133
+                case 5: _.label++; y = op[1]; op = [0]; continue;
36134
+                case 7: op = _.ops.pop(); _.trys.pop(); continue;
36135
+                default:
36136
+                    if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; }
36137
+                    if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; }
36138
+                    if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; }
36139
+                    if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; }
36140
+                    if (t[2]) _.ops.pop();
36141
+                    _.trys.pop(); continue;
36142
+            }
36143
+            op = body.call(thisArg, _);
36144
+        } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; }
36145
+        if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
36146
+    }
36147
+}
36148
+
36149
+function __exportStar(m, exports) {
36150
+    for (var p in m) if (!exports.hasOwnProperty(p)) exports[p] = m[p];
36151
+}
36152
+
36153
+function __values(o) {
36154
+    var m = typeof Symbol === "function" && o[Symbol.iterator], i = 0;
36155
+    if (m) return m.call(o);
36156
+    return {
36157
+        next: function () {
36158
+            if (o && i >= o.length) o = void 0;
36159
+            return { value: o && o[i++], done: !o };
36160
+        }
36161
+    };
36162
+}
36163
+
36164
+function __read(o, n) {
36165
+    var m = typeof Symbol === "function" && o[Symbol.iterator];
36166
+    if (!m) return o;
36167
+    var i = m.call(o), r, ar = [], e;
36168
+    try {
36169
+        while ((n === void 0 || n-- > 0) && !(r = i.next()).done) ar.push(r.value);
36170
+    }
36171
+    catch (error) { e = { error: error }; }
36172
+    finally {
36173
+        try {
36174
+            if (r && !r.done && (m = i["return"])) m.call(i);
36175
+        }
36176
+        finally { if (e) throw e.error; }
36177
+    }
36178
+    return ar;
36179
+}
36180
+
36181
+function __spread() {
36182
+    for (var ar = [], i = 0; i < arguments.length; i++)
36183
+        ar = ar.concat(__read(arguments[i]));
36184
+    return ar;
36185
+}
36186
+
36187
+function __await(v) {
36188
+    return this instanceof __await ? (this.v = v, this) : new __await(v);
36189
+}
36190
+
36191
+function __asyncGenerator(thisArg, _arguments, generator) {
36192
+    if (!Symbol.asyncIterator) throw new TypeError("Symbol.asyncIterator is not defined.");
36193
+    var g = generator.apply(thisArg, _arguments || []), i, q = [];
36194
+    return i = {}, verb("next"), verb("throw"), verb("return"), i[Symbol.asyncIterator] = function () { return this; }, i;
36195
+    function verb(n) { if (g[n]) i[n] = function (v) { return new Promise(function (a, b) { q.push([n, v, a, b]) > 1 || resume(n, v); }); }; }
36196
+    function resume(n, v) { try { step(g[n](v)); } catch (e) { settle(q[0][3], e); } }
36197
+    function step(r) { r.value instanceof __await ? Promise.resolve(r.value.v).then(fulfill, reject) : settle(q[0][2], r); }
36198
+    function fulfill(value) { resume("next", value); }
36199
+    function reject(value) { resume("throw", value); }
36200
+    function settle(f, v) { if (f(v), q.shift(), q.length) resume(q[0][0], q[0][1]); }
36201
+}
36202
+
36203
+function __asyncDelegator(o) {
36204
+    var i, p;
36205
+    return i = {}, verb("next"), verb("throw", function (e) { throw e; }), verb("return"), i[Symbol.iterator] = function () { return this; }, i;
36206
+    function verb(n, f) { i[n] = o[n] ? function (v) { return (p = !p) ? { value: __await(o[n](v)), done: n === "return" } : f ? f(v) : v; } : f; }
36207
+}
36208
+
36209
+function __asyncValues(o) {
36210
+    if (!Symbol.asyncIterator) throw new TypeError("Symbol.asyncIterator is not defined.");
36211
+    var m = o[Symbol.asyncIterator], i;
36212
+    return m ? m.call(o) : (o = typeof __values === "function" ? __values(o) : o[Symbol.iterator](), i = {}, verb("next"), verb("throw"), verb("return"), i[Symbol.asyncIterator] = function () { return this; }, i);
36213
+    function verb(n) { i[n] = o[n] && function (v) { return new Promise(function (resolve, reject) { v = o[n](v), settle(resolve, reject, v.done, v.value); }); }; }
36214
+    function settle(resolve, reject, d, v) { Promise.resolve(v).then(function(v) { resolve({ value: v, done: d }); }, reject); }
36215
+}
36216
+
36217
+function __makeTemplateObject(cooked, raw) {
36218
+    if (Object.defineProperty) { Object.defineProperty(cooked, "raw", { value: raw }); } else { cooked.raw = raw; }
36219
+    return cooked;
36220
+};
36221
+
36222
+function __importStar(mod) {
36223
+    if (mod && mod.__esModule) return mod;
36224
+    var result = {};
36225
+    if (mod != null) for (var k in mod) if (Object.hasOwnProperty.call(mod, k)) result[k] = mod[k];
36226
+    result.default = mod;
36227
+    return result;
36228
+}
36229
+
36230
+function __importDefault(mod) {
36231
+    return (mod && mod.__esModule) ? mod : { default: mod };
36232
+}
36233 36233
 
36234 36234
 
36235 36235
 /***/ }),
@@ -54141,23 +54141,6 @@ function updateRealIndex(s) {
54141 54141
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return Toolbar; });
54142 54142
 /* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__angular_core__ = __webpack_require__(0);
54143 54143
 /* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__config_config__ = __webpack_require__(1);
54144
-<<<<<<< HEAD
54145
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__toolbar_base__ = __webpack_require__(153);
54146
-=======
54147
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__toolbar_base__ = __webpack_require__(154);
54148
->>>>>>> 8b1e22a5a0caf7af0d9105c89403f7d2bcc4b254
54149
-var __extends = (this && this.__extends) || (function () {
54150
-    var extendStatics = Object.setPrototypeOf ||
54151
-        ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
54152
-        function (d, b) { for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p]; };
54153
-    return function (d, b) {
54154
-        extendStatics(d, b);
54155
-        function __() { this.constructor = d; }
54156
-        d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
54157
-    };
54158
-})();
54159
-
54160
-
54161 54144
 
54162 54145
 /**
54163 54146
  * @name Toolbar
@@ -54669,31 +54652,7 @@ var __extends = (this && this.__extends) || (function () {
54669 54652
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
54670 54653
     };
54671 54654
 })();
54672
-
54673
-
54674
-
54675
-/**
54676
- * @hidden
54677
- */
54678
-var SlideEdgeGesture = (function (_super) {
54679
-    __extends(SlideEdgeGesture, _super);
54680
-    function SlideEdgeGesture(plt, element, opts) {
54681
-        if (opts === void 0) { opts = {}; }
54682
-        var _this = this;
54683
-        Object(__WEBPACK_IMPORTED_MODULE_1__util_util__["d" /* defaults */])(opts, {
54684
-            edge: 'start',
54685
-            maxEdgeStart: 50
54686
-        });
54687
-        _this = _super.call(this, plt, element, opts) || this;
54688
-        // Can check corners through use of eg 'left top'
54689
-        _this.setEdges(opts.edge);
54690
-        _this.maxEdgeStart = opts.maxEdgeStart;
54691
-        return _this;
54692
-    }
54693
-    SlideEdgeGesture.prototype.setEdges = function (edges) {
54694
-        var isRTL = this.plt.isRTL;
54695 54655
         this.edges = edges.split(' ').map(function (value) {
54696
-            switch (value) {
54697 54656
                 case 'start': return isRTL ? 'right' : 'left';
54698 54657
                 case 'end': return isRTL ? 'left' : 'right';
54699 54658
                 default: return value;

+ 0
- 4
ZipCoinRedIonicClient/www/build/vendor.js.map
파일 크기가 너무 크기때문에 변경 상태를 표시하지 않습니다.
파일 보기