Eric Foster před 6 roky
rodič
revize
381292ea63

+ 1
- 1
ZipCoinRedIonicClient/.sourcemaps/main.js.map
Diff nebyl zobrazen, protože je příliš veliký
Zobrazit soubor


+ 1
- 1
ZipCoinRedIonicClient/www/build/0.js Zobrazit soubor

@@ -8,7 +8,7 @@ Object.defineProperty(__webpack_exports__, "__esModule", { value: true });
8 8
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "WalletPageModule", function() { return WalletPageModule; });
9 9
 /* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__angular_core__ = __webpack_require__(0);
10 10
 /* harmony import */ var __WEBPACK_IMPORTED_MODULE_1_ionic_angular__ = __webpack_require__(28);
11
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__wallet__ = __webpack_require__(104);
11
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__wallet__ = __webpack_require__(103);
12 12
 /* harmony import */ var __WEBPACK_IMPORTED_MODULE_3__providers_transaction_service__ = __webpack_require__(50);
13 13
 var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
14 14
     var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;

+ 2
- 2
ZipCoinRedIonicClient/www/build/1.js Zobrazit soubor

@@ -1,6 +1,6 @@
1 1
 webpackJsonp([1],{
2 2
 
3
-/***/ 281:
3
+/***/ 282:
4 4
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
5 5
 
6 6
 "use strict";
@@ -8,7 +8,7 @@ Object.defineProperty(__webpack_exports__, "__esModule", { value: true });
8 8
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "TransactionPageModule", function() { return TransactionPageModule; });
9 9
 /* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__angular_core__ = __webpack_require__(0);
10 10
 /* harmony import */ var __WEBPACK_IMPORTED_MODULE_1_ionic_angular__ = __webpack_require__(28);
11
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__transaction__ = __webpack_require__(102);
11
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__transaction__ = __webpack_require__(104);
12 12
 var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
13 13
     var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
14 14
     if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);

+ 2
- 2
ZipCoinRedIonicClient/www/build/2.js Zobrazit soubor

@@ -1,6 +1,6 @@
1 1
 webpackJsonp([2],{
2 2
 
3
-/***/ 282:
3
+/***/ 281:
4 4
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
5 5
 
6 6
 "use strict";
@@ -8,7 +8,7 @@ Object.defineProperty(__webpack_exports__, "__esModule", { value: true });
8 8
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "TabsPageModule", function() { return TabsPageModule; });
9 9
 /* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__angular_core__ = __webpack_require__(0);
10 10
 /* harmony import */ var __WEBPACK_IMPORTED_MODULE_1_ionic_angular__ = __webpack_require__(28);
11
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__tabs__ = __webpack_require__(103);
11
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__tabs__ = __webpack_require__(102);
12 12
 var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
13 13
     var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
14 14
     if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);

+ 66
- 66
ZipCoinRedIonicClient/www/build/main.js Zobrazit soubor

@@ -49,67 +49,11 @@ var Tab4Page = /** @class */ (function () {
49 49
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
50 50
 
51 51
 "use strict";
52
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return TransactionPage; });
53
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__angular_core__ = __webpack_require__(0);
54
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1_ionic_angular__ = __webpack_require__(28);
55
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__providers_transaction_service__ = __webpack_require__(50);
56
-var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
57
-    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
58
-    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
59
-    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;
60
-    return c > 3 && r && Object.defineProperty(target, key, r), r;
61
-};
62
-var __metadata = (this && this.__metadata) || function (k, v) {
63
-    if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
64
-};
65
-
66
-
67
-
68
-/**
69
- * Generated class for the TransactionPage page.
70
- *
71
- * See https://ionicframework.com/docs/components/#navigation for more info on
72
- * Ionic pages and navigation.
73
- */
74
-var TransactionPage = /** @class */ (function () {
75
-    function TransactionPage(navCtrl, navParams, transactionService) {
76
-        this.navCtrl = navCtrl;
77
-        this.navParams = navParams;
78
-        this.transactionService = transactionService;
79
-        this.getAllTransactions();
80
-    }
81
-    TransactionPage.prototype.ionViewDidLoad = function () {
82
-        console.log('ionViewDidLoad TransactionPage');
83
-    };
84
-    TransactionPage.prototype.getAllTransactions = function () {
85
-        var _this = this;
86
-        this.transactionService.getAllTransactions().subscribe(function (transactions) {
87
-            _this.transactions = transactions;
88
-        });
89
-    };
90
-    TransactionPage = __decorate([
91
-        Object(__WEBPACK_IMPORTED_MODULE_0__angular_core__["m" /* Component */])({
92
-            selector: 'page-transaction',template:/*ion-inline-start:"/Users/ericf/ZCWProjects/ZipCoin-RED/ZipCoinRedIonicClient/src/pages/transaction/transaction.html"*/'<!--\n  Generated template for the TransactionPage page.\n\n  See http://ionicframework.com/docs/components/#navigation for more info on\n  Ionic pages and navigation.\n-->\n<ion-header>\n\n  <ion-navbar>\n    <ion-title>Transaction</ion-title>\n  </ion-navbar>\n\n</ion-header>\n\n\n<ion-content padding>\n\n    <ion-list>\n        <ion-item-sliding *ngFor="let transaction of transactions">\n          <ion-item>\n            <ion-card>\n                <ion-card-header>\n                  Transaction #: {{transaction.transactionId}}\n                </ion-card-header>\n                <ion-card-content>\n                  <div>Sender: {{ transaction.sender }}</div>\n                  <div>Recipient: {{ 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/ericf/ZCWProjects/ZipCoin-RED/ZipCoinRedIonicClient/src/pages/transaction/transaction.html"*/,
93
-        }),
94
-        __metadata("design:paramtypes", [__WEBPACK_IMPORTED_MODULE_1_ionic_angular__["e" /* NavController */], __WEBPACK_IMPORTED_MODULE_1_ionic_angular__["f" /* NavParams */],
95
-            __WEBPACK_IMPORTED_MODULE_2__providers_transaction_service__["a" /* TransactionService */]])
96
-    ], TransactionPage);
97
-    return TransactionPage;
98
-}());
99
-
100
-//# sourceMappingURL=transaction.js.map
101
-
102
-/***/ }),
103
-
104
-/***/ 103:
105
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
106
-
107
-"use strict";
108 52
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return TabsPage; });
109 53
 /* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__angular_core__ = __webpack_require__(0);
110 54
 /* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__home_home__ = __webpack_require__(159);
111
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__wallet_wallet__ = __webpack_require__(104);
112
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_3__transaction_transaction__ = __webpack_require__(102);
55
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__wallet_wallet__ = __webpack_require__(103);
56
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_3__transaction_transaction__ = __webpack_require__(104);
113 57
 /* harmony import */ var __WEBPACK_IMPORTED_MODULE_4__tab4_tab4__ = __webpack_require__(101);
114 58
 var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
115 59
     var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
@@ -145,7 +89,7 @@ var TabsPage = /** @class */ (function () {
145 89
 
146 90
 /***/ }),
147 91
 
148
-/***/ 104:
92
+/***/ 103:
149 93
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
150 94
 
151 95
 "use strict";
@@ -196,6 +140,62 @@ var WalletPage = /** @class */ (function () {
196 140
 
197 141
 /***/ }),
198 142
 
143
+/***/ 104:
144
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
145
+
146
+"use strict";
147
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return TransactionPage; });
148
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__angular_core__ = __webpack_require__(0);
149
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1_ionic_angular__ = __webpack_require__(28);
150
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__providers_transaction_service__ = __webpack_require__(50);
151
+var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
152
+    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
153
+    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
154
+    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;
155
+    return c > 3 && r && Object.defineProperty(target, key, r), r;
156
+};
157
+var __metadata = (this && this.__metadata) || function (k, v) {
158
+    if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
159
+};
160
+
161
+
162
+
163
+/**
164
+ * Generated class for the TransactionPage page.
165
+ *
166
+ * See https://ionicframework.com/docs/components/#navigation for more info on
167
+ * Ionic pages and navigation.
168
+ */
169
+var TransactionPage = /** @class */ (function () {
170
+    function TransactionPage(navCtrl, navParams, transactionService) {
171
+        this.navCtrl = navCtrl;
172
+        this.navParams = navParams;
173
+        this.transactionService = transactionService;
174
+        this.getAllTransactions();
175
+    }
176
+    TransactionPage.prototype.ionViewDidLoad = function () {
177
+        console.log('ionViewDidLoad TransactionPage');
178
+    };
179
+    TransactionPage.prototype.getAllTransactions = function () {
180
+        var _this = this;
181
+        this.transactionService.getAllTransactions().subscribe(function (transactions) {
182
+            _this.transactions = transactions;
183
+        });
184
+    };
185
+    TransactionPage = __decorate([
186
+        Object(__WEBPACK_IMPORTED_MODULE_0__angular_core__["m" /* Component */])({
187
+            selector: 'page-transaction',template:/*ion-inline-start:"/Users/ericf/ZCWProjects/ZipCoin-RED/ZipCoinRedIonicClient/src/pages/transaction/transaction.html"*/'<!--\n  Generated template for the TransactionPage page.\n\n  See http://ionicframework.com/docs/components/#navigation for more info on\n  Ionic pages and navigation.\n-->\n<ion-header>\n\n  <ion-navbar>\n    <ion-title>Transaction</ion-title>\n  </ion-navbar>\n\n</ion-header>\n\n\n<ion-content padding>\n\n    <ion-list>\n        <ion-item-sliding *ngFor="let transaction of transactions">\n          <ion-item>\n            <ion-card>\n                <ion-card-header>\n                  Transaction #: {{transaction.transactionId}}\n                </ion-card-header>\n                <ion-card-content>\n                  <div>Sender: {{ transaction.sender }}</div>\n                  <div>Recipient: {{ 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/ericf/ZCWProjects/ZipCoin-RED/ZipCoinRedIonicClient/src/pages/transaction/transaction.html"*/,
188
+        }),
189
+        __metadata("design:paramtypes", [__WEBPACK_IMPORTED_MODULE_1_ionic_angular__["e" /* NavController */], __WEBPACK_IMPORTED_MODULE_1_ionic_angular__["f" /* NavParams */],
190
+            __WEBPACK_IMPORTED_MODULE_2__providers_transaction_service__["a" /* TransactionService */]])
191
+    ], TransactionPage);
192
+    return TransactionPage;
193
+}());
194
+
195
+//# sourceMappingURL=transaction.js.map
196
+
197
+/***/ }),
198
+
199 199
 /***/ 116:
200 200
 /***/ (function(module, exports) {
201 201
 
@@ -222,11 +222,11 @@ var map = {
222 222
 		3
223 223
 	],
224 224
 	"../pages/tabs/tabs.module": [
225
-		282,
225
+		281,
226 226
 		2
227 227
 	],
228 228
 	"../pages/transaction/transaction.module": [
229
-		281,
229
+		282,
230 230
 		1
231 231
 	],
232 232
 	"../pages/wallet/wallet.module": [
@@ -386,9 +386,9 @@ Object(__WEBPACK_IMPORTED_MODULE_0__angular_platform_browser_dynamic__["a" /* pl
386 386
 /* harmony import */ var __WEBPACK_IMPORTED_MODULE_6__angular_common_http__ = __webpack_require__(78);
387 387
 /* harmony import */ var __WEBPACK_IMPORTED_MODULE_7__providers_block_service__ = __webpack_require__(160);
388 388
 /* harmony import */ var __WEBPACK_IMPORTED_MODULE_8__pages_home_home__ = __webpack_require__(159);
389
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_9__pages_wallet_wallet__ = __webpack_require__(104);
390
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_10__pages_transaction_transaction__ = __webpack_require__(102);
391
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_11__pages_tabs_tabs__ = __webpack_require__(103);
389
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_9__pages_wallet_wallet__ = __webpack_require__(103);
390
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_10__pages_transaction_transaction__ = __webpack_require__(104);
391
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_11__pages_tabs_tabs__ = __webpack_require__(102);
392 392
 /* harmony import */ var __WEBPACK_IMPORTED_MODULE_12__pages_tab4_tab4__ = __webpack_require__(101);
393 393
 /* harmony import */ var __WEBPACK_IMPORTED_MODULE_13__providers_transaction_service__ = __webpack_require__(50);
394 394
 var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
@@ -430,8 +430,8 @@ var AppModule = /** @class */ (function () {
430 430
                 __WEBPACK_IMPORTED_MODULE_2_ionic_angular__["c" /* IonicModule */].forRoot(__WEBPACK_IMPORTED_MODULE_5__app_component__["a" /* MyApp */], {}, {
431 431
                     links: [
432 432
                         { loadChildren: '../pages/tab4/tab4.module#Tab4PageModule', name: 'Tab4Page', segment: 'tab4', priority: 'low', defaultHistory: [] },
433
-                        { loadChildren: '../pages/transaction/transaction.module#TransactionPageModule', name: 'TransactionPage', segment: 'transaction', priority: 'low', defaultHistory: [] },
434 433
                         { loadChildren: '../pages/tabs/tabs.module#TabsPageModule', name: 'TabsPage', segment: 'tabs', priority: 'low', defaultHistory: [] },
434
+                        { loadChildren: '../pages/transaction/transaction.module#TransactionPageModule', name: 'TransactionPage', segment: 'transaction', priority: 'low', defaultHistory: [] },
435 435
                         { loadChildren: '../pages/wallet/wallet.module#WalletPageModule', name: 'WalletPage', segment: 'wallet', priority: 'low', defaultHistory: [] }
436 436
                     ]
437 437
                 })
@@ -470,7 +470,7 @@ var AppModule = /** @class */ (function () {
470 470
 /* harmony import */ var __WEBPACK_IMPORTED_MODULE_1_ionic_angular__ = __webpack_require__(28);
471 471
 /* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__ionic_native_status_bar__ = __webpack_require__(203);
472 472
 /* harmony import */ var __WEBPACK_IMPORTED_MODULE_3__ionic_native_splash_screen__ = __webpack_require__(200);
473
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_4__pages_tabs_tabs__ = __webpack_require__(103);
473
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_4__pages_tabs_tabs__ = __webpack_require__(102);
474 474
 var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
475 475
     var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
476 476
     if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);

+ 1
- 1
ZipCoinRedIonicClient/www/build/main.js.map
Diff nebyl zobrazen, protože je příliš veliký
Zobrazit soubor


+ 1
- 1
ZipCoinRedIonicClient/www/build/vendor.js.map
Diff nebyl zobrazen, protože je příliš veliký
Zobrazit soubor


+ 7
- 6
ZipCoinRedJavaServer/.idea/workspace.xml Zobrazit soubor

@@ -142,7 +142,7 @@
142 142
   <component name="NodePackageJsonFileManager">
143 143
     <packageJsonPaths />
144 144
   </component>
145
-  <component name="ProjectFrameBounds" fullScreen="true">
145
+  <component name="ProjectFrameBounds" extendedState="1">
146 146
     <option name="y" value="23" />
147 147
     <option name="width" value="1280" />
148 148
     <option name="height" value="713" />
@@ -318,15 +318,16 @@
318 318
       <option name="presentableId" value="Default" />
319 319
       <updated>1533221514750</updated>
320 320
       <workItem from="1533221516219" duration="17000" />
321
-      <workItem from="1533244438155" duration="2092000" />
321
+      <workItem from="1533244438155" duration="3286000" />
322 322
     </task>
323 323
     <servers />
324 324
   </component>
325 325
   <component name="TimeTrackingManager">
326
-    <option name="totallyTimeSpent" value="5206000" />
326
+    <option name="totallyTimeSpent" value="6400000" />
327 327
   </component>
328 328
   <component name="ToolWindowManager">
329
-    <frame x="0" y="0" width="1280" height="800" extended-state="0" />
329
+    <frame x="0" y="23" width="1280" height="713" extended-state="1" />
330
+    <editor active="true" />
330 331
     <layout>
331 332
       <window_info anchor="right" id="Palette" order="5" />
332 333
       <window_info anchor="bottom" id="Event Log" order="10" side_tool="true" />
@@ -347,8 +348,8 @@
347 348
       <window_info anchor="bottom" id="Version Control" order="10" show_stripe_button="false" />
348 349
       <window_info anchor="bottom" id="Run" order="2" />
349 350
       <window_info anchor="bottom" id="Spring" order="7" />
350
-      <window_info anchor="bottom" id="Terminal" order="10" />
351
-      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.2536349" />
351
+      <window_info active="true" anchor="bottom" id="Terminal" order="10" visible="true" weight="0.38798702" />
352
+      <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.2536349" />
352 353
       <window_info anchor="right" id="Bean Validation" order="3" />
353 354
       <window_info id="Web" order="5" side_tool="true" />
354 355
       <window_info anchor="right" id="Theme Preview" order="5" />