Przeglądaj źródła

fixed meerge conflicts

Roy 6 lat temu
rodzic
commit
9ae64d0a69

+ 1
- 1
ionic-fb/.sourcemaps/main.js.map
Plik diff jest za duży
Wyświetl plik


+ 11
- 11
ionic-fb/www/build/0.js Wyświetl plik

@@ -1,14 +1,14 @@
1 1
 webpackJsonp([0],{
2 2
 
3
-/***/ 283:
3
+/***/ 288:
4 4
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
5 5
 
6 6
 "use strict";
7 7
 Object.defineProperty(__webpack_exports__, "__esModule", { value: true });
8
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "SignUpPageModule", function() { return SignUpPageModule; });
8
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "TournamentsPageModule", function() { return TournamentsPageModule; });
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__(18);
11
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__sign_up__ = __webpack_require__(107);
11
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__tournaments__ = __webpack_require__(50);
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);
@@ -18,23 +18,23 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
18 18
 
19 19
 
20 20
 
21
-var SignUpPageModule = /** @class */ (function () {
22
-    function SignUpPageModule() {
21
+var TournamentsPageModule = /** @class */ (function () {
22
+    function TournamentsPageModule() {
23 23
     }
24
-    SignUpPageModule = __decorate([
24
+    TournamentsPageModule = __decorate([
25 25
         Object(__WEBPACK_IMPORTED_MODULE_0__angular_core__["I" /* NgModule */])({
26 26
             declarations: [
27
-                __WEBPACK_IMPORTED_MODULE_2__sign_up__["a" /* SignUpPage */],
27
+                __WEBPACK_IMPORTED_MODULE_2__tournaments__["a" /* TournamentsPage */],
28 28
             ],
29 29
             imports: [
30
-                __WEBPACK_IMPORTED_MODULE_1_ionic_angular__["d" /* IonicPageModule */].forChild(__WEBPACK_IMPORTED_MODULE_2__sign_up__["a" /* SignUpPage */]),
30
+                __WEBPACK_IMPORTED_MODULE_1_ionic_angular__["d" /* IonicPageModule */].forChild(__WEBPACK_IMPORTED_MODULE_2__tournaments__["a" /* TournamentsPage */]),
31 31
             ],
32 32
         })
33
-    ], SignUpPageModule);
34
-    return SignUpPageModule;
33
+    ], TournamentsPageModule);
34
+    return TournamentsPageModule;
35 35
 }());
36 36
 
37
-//# sourceMappingURL=sign-up.module.js.map
37
+//# sourceMappingURL=tournaments.module.js.map
38 38
 
39 39
 /***/ })
40 40
 

+ 1
- 1
ionic-fb/www/build/0.js.map Wyświetl plik

@@ -1 +1 @@
1
-{"version":3,"sources":["../../src/pages/sign-up/sign-up.module.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;AAAyC;AACO;AACT;AAUvC;IAAA;IAA+B,CAAC;IAAnB,gBAAgB;QAR5B,uEAAQ,CAAC;YACR,YAAY,EAAE;gBACZ,4DAAU;aACX;YACD,OAAO,EAAE;gBACP,sEAAe,CAAC,QAAQ,CAAC,4DAAU,CAAC;aACrC;SACF,CAAC;OACW,gBAAgB,CAAG;IAAD,uBAAC;CAAA;AAAH","file":"0.js","sourcesContent":["import { NgModule } from '@angular/core';\nimport { IonicPageModule } from 'ionic-angular';\nimport { SignUpPage } from './sign-up';\n\n@NgModule({\n  declarations: [\n    SignUpPage,\n  ],\n  imports: [\n    IonicPageModule.forChild(SignUpPage),\n  ],\n})\nexport class SignUpPageModule {}\n\n\n\n// WEBPACK FOOTER //\n// ./src/pages/sign-up/sign-up.module.ts"],"sourceRoot":""}
1
+{"version":3,"sources":["../../src/pages/tournaments/tournaments.module.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;AAAyC;AACO;AACA;AAUhD;IAAA;IAAoC,CAAC;IAAxB,qBAAqB;QARjC,uEAAQ,CAAC;YACR,YAAY,EAAE;gBACZ,qEAAe;aAChB;YACD,OAAO,EAAE;gBACP,sEAAe,CAAC,QAAQ,CAAC,qEAAe,CAAC;aAC1C;SACF,CAAC;OACW,qBAAqB,CAAG;IAAD,4BAAC;CAAA;AAAH","file":"0.js","sourcesContent":["import { NgModule } from '@angular/core';\nimport { IonicPageModule } from 'ionic-angular';\nimport { TournamentsPage } from './tournaments';\n\n@NgModule({\n  declarations: [\n    TournamentsPage,\n  ],\n  imports: [\n    IonicPageModule.forChild(TournamentsPage),\n  ],\n})\nexport class TournamentsPageModule {}\n\n\n\n// WEBPACK FOOTER //\n// ./src/pages/tournaments/tournaments.module.ts"],"sourceRoot":""}

+ 11
- 11
ionic-fb/www/build/1.js Wyświetl plik

@@ -1,14 +1,14 @@
1 1
 webpackJsonp([1],{
2 2
 
3
-/***/ 288:
3
+/***/ 287:
4 4
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
5 5
 
6 6
 "use strict";
7 7
 Object.defineProperty(__webpack_exports__, "__esModule", { value: true });
8
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "TournamentsPageModule", function() { return TournamentsPageModule; });
8
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "TeamsPageModule", function() { return TeamsPageModule; });
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__(18);
11
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__tournaments__ = __webpack_require__(50);
11
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__teams__ = __webpack_require__(103);
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);
@@ -18,23 +18,23 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
18 18
 
19 19
 
20 20
 
21
-var TournamentsPageModule = /** @class */ (function () {
22
-    function TournamentsPageModule() {
21
+var TeamsPageModule = /** @class */ (function () {
22
+    function TeamsPageModule() {
23 23
     }
24
-    TournamentsPageModule = __decorate([
24
+    TeamsPageModule = __decorate([
25 25
         Object(__WEBPACK_IMPORTED_MODULE_0__angular_core__["I" /* NgModule */])({
26 26
             declarations: [
27
-                __WEBPACK_IMPORTED_MODULE_2__tournaments__["a" /* TournamentsPage */],
27
+                __WEBPACK_IMPORTED_MODULE_2__teams__["a" /* TeamsPage */],
28 28
             ],
29 29
             imports: [
30
-                __WEBPACK_IMPORTED_MODULE_1_ionic_angular__["d" /* IonicPageModule */].forChild(__WEBPACK_IMPORTED_MODULE_2__tournaments__["a" /* TournamentsPage */]),
30
+                __WEBPACK_IMPORTED_MODULE_1_ionic_angular__["d" /* IonicPageModule */].forChild(__WEBPACK_IMPORTED_MODULE_2__teams__["a" /* TeamsPage */]),
31 31
             ],
32 32
         })
33
-    ], TournamentsPageModule);
34
-    return TournamentsPageModule;
33
+    ], TeamsPageModule);
34
+    return TeamsPageModule;
35 35
 }());
36 36
 
37
-//# sourceMappingURL=tournaments.module.js.map
37
+//# sourceMappingURL=teams.module.js.map
38 38
 
39 39
 /***/ })
40 40
 

+ 1
- 1
ionic-fb/www/build/1.js.map Wyświetl plik

@@ -1 +1 @@
1
-{"version":3,"sources":["../../src/pages/tournaments/tournaments.module.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;AAAyC;AACO;AACA;AAUhD;IAAA;IAAoC,CAAC;IAAxB,qBAAqB;QARjC,uEAAQ,CAAC;YACR,YAAY,EAAE;gBACZ,qEAAe;aAChB;YACD,OAAO,EAAE;gBACP,sEAAe,CAAC,QAAQ,CAAC,qEAAe,CAAC;aAC1C;SACF,CAAC;OACW,qBAAqB,CAAG;IAAD,4BAAC;CAAA;AAAH","file":"1.js","sourcesContent":["import { NgModule } from '@angular/core';\nimport { IonicPageModule } from 'ionic-angular';\nimport { TournamentsPage } from './tournaments';\n\n@NgModule({\n  declarations: [\n    TournamentsPage,\n  ],\n  imports: [\n    IonicPageModule.forChild(TournamentsPage),\n  ],\n})\nexport class TournamentsPageModule {}\n\n\n\n// WEBPACK FOOTER //\n// ./src/pages/tournaments/tournaments.module.ts"],"sourceRoot":""}
1
+{"version":3,"sources":["../../src/pages/teams/teams.module.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;AAAyC;AACO;AACZ;AAUpC;IAAA;IAA8B,CAAC;IAAlB,eAAe;QAR3B,uEAAQ,CAAC;YACR,YAAY,EAAE;gBACZ,yDAAS;aACV;YACD,OAAO,EAAE;gBACP,sEAAe,CAAC,QAAQ,CAAC,yDAAS,CAAC;aACpC;SACF,CAAC;OACW,eAAe,CAAG;IAAD,sBAAC;CAAA;AAAH","file":"1.js","sourcesContent":["import { NgModule } from '@angular/core';\nimport { IonicPageModule } from 'ionic-angular';\nimport { TeamsPage } from './teams';\n\n@NgModule({\n  declarations: [\n    TeamsPage,\n  ],\n  imports: [\n    IonicPageModule.forChild(TeamsPage),\n  ],\n})\nexport class TeamsPageModule {}\n\n\n\n// WEBPACK FOOTER //\n// ./src/pages/teams/teams.module.ts"],"sourceRoot":""}

+ 10
- 10
ionic-fb/www/build/2.js Wyświetl plik

@@ -5,10 +5,10 @@ webpackJsonp([2],{
5 5
 
6 6
 "use strict";
7 7
 Object.defineProperty(__webpack_exports__, "__esModule", { value: true });
8
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "TeamDetailsPageModule", function() { return TeamDetailsPageModule; });
8
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "TeamHomePageModule", function() { return TeamHomePageModule; });
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__(18);
11
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__team_details__ = __webpack_require__(105);
11
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__team_home__ = __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);
@@ -18,23 +18,23 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
18 18
 
19 19
 
20 20
 
21
-var TeamDetailsPageModule = /** @class */ (function () {
22
-    function TeamDetailsPageModule() {
21
+var TeamHomePageModule = /** @class */ (function () {
22
+    function TeamHomePageModule() {
23 23
     }
24
-    TeamDetailsPageModule = __decorate([
24
+    TeamHomePageModule = __decorate([
25 25
         Object(__WEBPACK_IMPORTED_MODULE_0__angular_core__["I" /* NgModule */])({
26 26
             declarations: [
27
-                __WEBPACK_IMPORTED_MODULE_2__team_details__["a" /* TeamDetailsPage */],
27
+                __WEBPACK_IMPORTED_MODULE_2__team_home__["a" /* TeamHomePage */],
28 28
             ],
29 29
             imports: [
30
-                __WEBPACK_IMPORTED_MODULE_1_ionic_angular__["d" /* IonicPageModule */].forChild(__WEBPACK_IMPORTED_MODULE_2__team_details__["a" /* TeamDetailsPage */]),
30
+                __WEBPACK_IMPORTED_MODULE_1_ionic_angular__["d" /* IonicPageModule */].forChild(__WEBPACK_IMPORTED_MODULE_2__team_home__["a" /* TeamHomePage */]),
31 31
             ],
32 32
         })
33
-    ], TeamDetailsPageModule);
34
-    return TeamDetailsPageModule;
33
+    ], TeamHomePageModule);
34
+    return TeamHomePageModule;
35 35
 }());
36 36
 
37
-//# sourceMappingURL=team-details.module.js.map
37
+//# sourceMappingURL=team-home.module.js.map
38 38
 
39 39
 /***/ })
40 40
 

+ 1
- 1
ionic-fb/www/build/2.js.map Wyświetl plik

@@ -1 +1 @@
1
-{"version":3,"sources":["../../src/pages/team-details/team-details.module.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;AAAyC;AACO;AACC;AAUjD;IAAA;IAAoC,CAAC;IAAxB,qBAAqB;QARjC,uEAAQ,CAAC;YACR,YAAY,EAAE;gBACZ,sEAAe;aAChB;YACD,OAAO,EAAE;gBACP,sEAAe,CAAC,QAAQ,CAAC,sEAAe,CAAC;aAC1C;SACF,CAAC;OACW,qBAAqB,CAAG;IAAD,4BAAC;CAAA;AAAH","file":"2.js","sourcesContent":["import { NgModule } from '@angular/core';\nimport { IonicPageModule } from 'ionic-angular';\nimport { TeamDetailsPage } from './team-details';\n\n@NgModule({\n  declarations: [\n    TeamDetailsPage,\n  ],\n  imports: [\n    IonicPageModule.forChild(TeamDetailsPage),\n  ],\n})\nexport class TeamDetailsPageModule {}\n\n\n\n// WEBPACK FOOTER //\n// ./src/pages/team-details/team-details.module.ts"],"sourceRoot":""}
1
+{"version":3,"sources":["../../src/pages/team-home/team-home.module.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;AAAyC;AACO;AACL;AAU3C;IAAA;IAAiC,CAAC;IAArB,kBAAkB;QAR9B,uEAAQ,CAAC;YACR,YAAY,EAAE;gBACZ,gEAAY;aACb;YACD,OAAO,EAAE;gBACP,sEAAe,CAAC,QAAQ,CAAC,gEAAY,CAAC;aACvC;SACF,CAAC;OACW,kBAAkB,CAAG;IAAD,yBAAC;CAAA;AAAH","file":"2.js","sourcesContent":["import { NgModule } from '@angular/core';\nimport { IonicPageModule } from 'ionic-angular';\nimport { TeamHomePage } from './team-home';\n\n@NgModule({\n  declarations: [\n    TeamHomePage,\n  ],\n  imports: [\n    IonicPageModule.forChild(TeamHomePage),\n  ],\n})\nexport class TeamHomePageModule {}\n\n\n\n// WEBPACK FOOTER //\n// ./src/pages/team-home/team-home.module.ts"],"sourceRoot":""}

+ 11
- 11
ionic-fb/www/build/3.js Wyświetl plik

@@ -1,14 +1,14 @@
1 1
 webpackJsonp([3],{
2 2
 
3
-/***/ 287:
3
+/***/ 285:
4 4
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
5 5
 
6 6
 "use strict";
7 7
 Object.defineProperty(__webpack_exports__, "__esModule", { value: true });
8
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "TeamsPageModule", function() { return TeamsPageModule; });
8
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "TeamDetailsPageModule", function() { return TeamDetailsPageModule; });
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__(18);
11
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__teams__ = __webpack_require__(103);
11
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__team_details__ = __webpack_require__(105);
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);
@@ -18,23 +18,23 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
18 18
 
19 19
 
20 20
 
21
-var TeamsPageModule = /** @class */ (function () {
22
-    function TeamsPageModule() {
21
+var TeamDetailsPageModule = /** @class */ (function () {
22
+    function TeamDetailsPageModule() {
23 23
     }
24
-    TeamsPageModule = __decorate([
24
+    TeamDetailsPageModule = __decorate([
25 25
         Object(__WEBPACK_IMPORTED_MODULE_0__angular_core__["I" /* NgModule */])({
26 26
             declarations: [
27
-                __WEBPACK_IMPORTED_MODULE_2__teams__["a" /* TeamsPage */],
27
+                __WEBPACK_IMPORTED_MODULE_2__team_details__["a" /* TeamDetailsPage */],
28 28
             ],
29 29
             imports: [
30
-                __WEBPACK_IMPORTED_MODULE_1_ionic_angular__["d" /* IonicPageModule */].forChild(__WEBPACK_IMPORTED_MODULE_2__teams__["a" /* TeamsPage */]),
30
+                __WEBPACK_IMPORTED_MODULE_1_ionic_angular__["d" /* IonicPageModule */].forChild(__WEBPACK_IMPORTED_MODULE_2__team_details__["a" /* TeamDetailsPage */]),
31 31
             ],
32 32
         })
33
-    ], TeamsPageModule);
34
-    return TeamsPageModule;
33
+    ], TeamDetailsPageModule);
34
+    return TeamDetailsPageModule;
35 35
 }());
36 36
 
37
-//# sourceMappingURL=teams.module.js.map
37
+//# sourceMappingURL=team-details.module.js.map
38 38
 
39 39
 /***/ })
40 40
 

+ 1
- 1
ionic-fb/www/build/3.js.map Wyświetl plik

@@ -1 +1 @@
1
-{"version":3,"sources":["../../src/pages/teams/teams.module.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;AAAyC;AACO;AACZ;AAUpC;IAAA;IAA8B,CAAC;IAAlB,eAAe;QAR3B,uEAAQ,CAAC;YACR,YAAY,EAAE;gBACZ,yDAAS;aACV;YACD,OAAO,EAAE;gBACP,sEAAe,CAAC,QAAQ,CAAC,yDAAS,CAAC;aACpC;SACF,CAAC;OACW,eAAe,CAAG;IAAD,sBAAC;CAAA;AAAH","file":"3.js","sourcesContent":["import { NgModule } from '@angular/core';\nimport { IonicPageModule } from 'ionic-angular';\nimport { TeamsPage } from './teams';\n\n@NgModule({\n  declarations: [\n    TeamsPage,\n  ],\n  imports: [\n    IonicPageModule.forChild(TeamsPage),\n  ],\n})\nexport class TeamsPageModule {}\n\n\n\n// WEBPACK FOOTER //\n// ./src/pages/teams/teams.module.ts"],"sourceRoot":""}
1
+{"version":3,"sources":["../../src/pages/team-details/team-details.module.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;AAAyC;AACO;AACC;AAUjD;IAAA;IAAoC,CAAC;IAAxB,qBAAqB;QARjC,uEAAQ,CAAC;YACR,YAAY,EAAE;gBACZ,sEAAe;aAChB;YACD,OAAO,EAAE;gBACP,sEAAe,CAAC,QAAQ,CAAC,sEAAe,CAAC;aAC1C;SACF,CAAC;OACW,qBAAqB,CAAG;IAAD,4BAAC;CAAA;AAAH","file":"3.js","sourcesContent":["import { NgModule } from '@angular/core';\nimport { IonicPageModule } from 'ionic-angular';\nimport { TeamDetailsPage } from './team-details';\n\n@NgModule({\n  declarations: [\n    TeamDetailsPage,\n  ],\n  imports: [\n    IonicPageModule.forChild(TeamDetailsPage),\n  ],\n})\nexport class TeamDetailsPageModule {}\n\n\n\n// WEBPACK FOOTER //\n// ./src/pages/team-details/team-details.module.ts"],"sourceRoot":""}

+ 11
- 11
ionic-fb/www/build/4.js Wyświetl plik

@@ -1,14 +1,14 @@
1 1
 webpackJsonp([4],{
2 2
 
3
-/***/ 285:
3
+/***/ 284:
4 4
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
5 5
 
6 6
 "use strict";
7 7
 Object.defineProperty(__webpack_exports__, "__esModule", { value: true });
8
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "TeamHomePageModule", function() { return TeamHomePageModule; });
8
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "StandingsPageModule", function() { return StandingsPageModule; });
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__(18);
11
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__team_home__ = __webpack_require__(104);
11
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__standings__ = __webpack_require__(106);
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);
@@ -18,23 +18,23 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
18 18
 
19 19
 
20 20
 
21
-var TeamHomePageModule = /** @class */ (function () {
22
-    function TeamHomePageModule() {
21
+var StandingsPageModule = /** @class */ (function () {
22
+    function StandingsPageModule() {
23 23
     }
24
-    TeamHomePageModule = __decorate([
24
+    StandingsPageModule = __decorate([
25 25
         Object(__WEBPACK_IMPORTED_MODULE_0__angular_core__["I" /* NgModule */])({
26 26
             declarations: [
27
-                __WEBPACK_IMPORTED_MODULE_2__team_home__["a" /* TeamHomePage */],
27
+                __WEBPACK_IMPORTED_MODULE_2__standings__["a" /* StandingsPage */],
28 28
             ],
29 29
             imports: [
30
-                __WEBPACK_IMPORTED_MODULE_1_ionic_angular__["d" /* IonicPageModule */].forChild(__WEBPACK_IMPORTED_MODULE_2__team_home__["a" /* TeamHomePage */]),
30
+                __WEBPACK_IMPORTED_MODULE_1_ionic_angular__["d" /* IonicPageModule */].forChild(__WEBPACK_IMPORTED_MODULE_2__standings__["a" /* StandingsPage */]),
31 31
             ],
32 32
         })
33
-    ], TeamHomePageModule);
34
-    return TeamHomePageModule;
33
+    ], StandingsPageModule);
34
+    return StandingsPageModule;
35 35
 }());
36 36
 
37
-//# sourceMappingURL=team-home.module.js.map
37
+//# sourceMappingURL=standings.module.js.map
38 38
 
39 39
 /***/ })
40 40
 

+ 1
- 1
ionic-fb/www/build/4.js.map Wyświetl plik

@@ -1 +1 @@
1
-{"version":3,"sources":["../../src/pages/team-home/team-home.module.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;AAAyC;AACO;AACL;AAU3C;IAAA;IAAiC,CAAC;IAArB,kBAAkB;QAR9B,uEAAQ,CAAC;YACR,YAAY,EAAE;gBACZ,gEAAY;aACb;YACD,OAAO,EAAE;gBACP,sEAAe,CAAC,QAAQ,CAAC,gEAAY,CAAC;aACvC;SACF,CAAC;OACW,kBAAkB,CAAG;IAAD,yBAAC;CAAA;AAAH","file":"4.js","sourcesContent":["import { NgModule } from '@angular/core';\nimport { IonicPageModule } from 'ionic-angular';\nimport { TeamHomePage } from './team-home';\n\n@NgModule({\n  declarations: [\n    TeamHomePage,\n  ],\n  imports: [\n    IonicPageModule.forChild(TeamHomePage),\n  ],\n})\nexport class TeamHomePageModule {}\n\n\n\n// WEBPACK FOOTER //\n// ./src/pages/team-home/team-home.module.ts"],"sourceRoot":""}
1
+{"version":3,"sources":["../../src/pages/standings/standings.module.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;AAAyC;AACO;AACJ;AAU5C;IAAA;IAAkC,CAAC;IAAtB,mBAAmB;QAR/B,uEAAQ,CAAC;YACR,YAAY,EAAE;gBACZ,iEAAa;aACd;YACD,OAAO,EAAE;gBACP,sEAAe,CAAC,QAAQ,CAAC,iEAAa,CAAC;aACxC;SACF,CAAC;OACW,mBAAmB,CAAG;IAAD,0BAAC;CAAA;AAAH","file":"4.js","sourcesContent":["import { NgModule } from '@angular/core';\nimport { IonicPageModule } from 'ionic-angular';\nimport { StandingsPage } from './standings';\n\n@NgModule({\n  declarations: [\n    StandingsPage,\n  ],\n  imports: [\n    IonicPageModule.forChild(StandingsPage),\n  ],\n})\nexport class StandingsPageModule {}\n\n\n\n// WEBPACK FOOTER //\n// ./src/pages/standings/standings.module.ts"],"sourceRoot":""}

+ 11
- 11
ionic-fb/www/build/5.js Wyświetl plik

@@ -1,14 +1,14 @@
1 1
 webpackJsonp([5],{
2 2
 
3
-/***/ 284:
3
+/***/ 283:
4 4
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
5 5
 
6 6
 "use strict";
7 7
 Object.defineProperty(__webpack_exports__, "__esModule", { value: true });
8
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "StandingsPageModule", function() { return StandingsPageModule; });
8
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "SignUpPageModule", function() { return SignUpPageModule; });
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__(18);
11
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__standings__ = __webpack_require__(106);
11
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__sign_up__ = __webpack_require__(107);
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);
@@ -18,23 +18,23 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
18 18
 
19 19
 
20 20
 
21
-var StandingsPageModule = /** @class */ (function () {
22
-    function StandingsPageModule() {
21
+var SignUpPageModule = /** @class */ (function () {
22
+    function SignUpPageModule() {
23 23
     }
24
-    StandingsPageModule = __decorate([
24
+    SignUpPageModule = __decorate([
25 25
         Object(__WEBPACK_IMPORTED_MODULE_0__angular_core__["I" /* NgModule */])({
26 26
             declarations: [
27
-                __WEBPACK_IMPORTED_MODULE_2__standings__["a" /* StandingsPage */],
27
+                __WEBPACK_IMPORTED_MODULE_2__sign_up__["a" /* SignUpPage */],
28 28
             ],
29 29
             imports: [
30
-                __WEBPACK_IMPORTED_MODULE_1_ionic_angular__["d" /* IonicPageModule */].forChild(__WEBPACK_IMPORTED_MODULE_2__standings__["a" /* StandingsPage */]),
30
+                __WEBPACK_IMPORTED_MODULE_1_ionic_angular__["d" /* IonicPageModule */].forChild(__WEBPACK_IMPORTED_MODULE_2__sign_up__["a" /* SignUpPage */]),
31 31
             ],
32 32
         })
33
-    ], StandingsPageModule);
34
-    return StandingsPageModule;
33
+    ], SignUpPageModule);
34
+    return SignUpPageModule;
35 35
 }());
36 36
 
37
-//# sourceMappingURL=standings.module.js.map
37
+//# sourceMappingURL=sign-up.module.js.map
38 38
 
39 39
 /***/ })
40 40
 

+ 1
- 1
ionic-fb/www/build/5.js.map Wyświetl plik

@@ -1 +1 @@
1
-{"version":3,"sources":["../../src/pages/standings/standings.module.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;AAAyC;AACO;AACJ;AAU5C;IAAA;IAAkC,CAAC;IAAtB,mBAAmB;QAR/B,uEAAQ,CAAC;YACR,YAAY,EAAE;gBACZ,iEAAa;aACd;YACD,OAAO,EAAE;gBACP,sEAAe,CAAC,QAAQ,CAAC,iEAAa,CAAC;aACxC;SACF,CAAC;OACW,mBAAmB,CAAG;IAAD,0BAAC;CAAA;AAAH","file":"5.js","sourcesContent":["import { NgModule } from '@angular/core';\nimport { IonicPageModule } from 'ionic-angular';\nimport { StandingsPage } from './standings';\n\n@NgModule({\n  declarations: [\n    StandingsPage,\n  ],\n  imports: [\n    IonicPageModule.forChild(StandingsPage),\n  ],\n})\nexport class StandingsPageModule {}\n\n\n\n// WEBPACK FOOTER //\n// ./src/pages/standings/standings.module.ts"],"sourceRoot":""}
1
+{"version":3,"sources":["../../src/pages/sign-up/sign-up.module.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;AAAyC;AACO;AACT;AAUvC;IAAA;IAA+B,CAAC;IAAnB,gBAAgB;QAR5B,uEAAQ,CAAC;YACR,YAAY,EAAE;gBACZ,4DAAU;aACX;YACD,OAAO,EAAE;gBACP,sEAAe,CAAC,QAAQ,CAAC,4DAAU,CAAC;aACrC;SACF,CAAC;OACW,gBAAgB,CAAG;IAAD,uBAAC;CAAA;AAAH","file":"5.js","sourcesContent":["import { NgModule } from '@angular/core';\nimport { IonicPageModule } from 'ionic-angular';\nimport { SignUpPage } from './sign-up';\n\n@NgModule({\n  declarations: [\n    SignUpPage,\n  ],\n  imports: [\n    IonicPageModule.forChild(SignUpPage),\n  ],\n})\nexport class SignUpPageModule {}\n\n\n\n// WEBPACK FOOTER //\n// ./src/pages/sign-up/sign-up.module.ts"],"sourceRoot":""}

+ 10
- 10
ionic-fb/www/build/main.js Wyświetl plik

@@ -347,27 +347,27 @@ var map = {
347 347
 	],
348 348
 	"../pages/sign-up/sign-up.module": [
349 349
 		283,
350
-		0
350
+		5
351 351
 	],
352 352
 	"../pages/standings/standings.module": [
353 353
 		284,
354
-		5
354
+		4
355 355
 	],
356 356
 	"../pages/team-details/team-details.module": [
357
-		286,
358
-		2
357
+		285,
358
+		3
359 359
 	],
360 360
 	"../pages/team-home/team-home.module": [
361
-		285,
362
-		4
361
+		286,
362
+		2
363 363
 	],
364 364
 	"../pages/teams/teams.module": [
365 365
 		287,
366
-		3
366
+		1
367 367
 	],
368 368
 	"../pages/tournaments/tournaments.module": [
369 369
 		288,
370
-		1
370
+		0
371 371
 	]
372 372
 };
373 373
 function webpackAsyncContext(req) {
@@ -515,8 +515,8 @@ var AppModule = /** @class */ (function () {
515 515
                         { loadChildren: '../pages/my-teams/my-teams.module#MyTeamsPageModule', name: 'MyTeamsPage', segment: 'my-teams', priority: 'low', defaultHistory: [] },
516 516
                         { loadChildren: '../pages/sign-up/sign-up.module#SignUpPageModule', name: 'SignUpPage', segment: 'sign-up', priority: 'low', defaultHistory: [] },
517 517
                         { loadChildren: '../pages/standings/standings.module#StandingsPageModule', name: 'StandingsPage', segment: 'standings', priority: 'low', defaultHistory: [] },
518
-                        { loadChildren: '../pages/team-home/team-home.module#TeamHomePageModule', name: 'TeamHomePage', segment: 'team-home', priority: 'low', defaultHistory: [] },
519 518
                         { loadChildren: '../pages/team-details/team-details.module#TeamDetailsPageModule', name: 'TeamDetailsPage', segment: 'team-details', priority: 'low', defaultHistory: [] },
519
+                        { loadChildren: '../pages/team-home/team-home.module#TeamHomePageModule', name: 'TeamHomePage', segment: 'team-home', priority: 'low', defaultHistory: [] },
520 520
                         { loadChildren: '../pages/teams/teams.module#TeamsPageModule', name: 'TeamsPage', segment: 'teams', priority: 'low', defaultHistory: [] },
521 521
                         { loadChildren: '../pages/tournaments/tournaments.module#TournamentsPageModule', name: 'TournamentsPage', segment: 'tournaments', priority: 'low', defaultHistory: [] }
522 522
                     ]
@@ -719,7 +719,7 @@ var ApiProvider = /** @class */ (function () {
719 719
         return this.http.get('http:localhost:8080/user');
720 720
     };
721 721
     ApiProvider.prototype.saveUser = function (createAccountInfo) {
722
-        return this.http.post("http://localhost:8080/user/add?name=" + createAccountInfo.name + "&password=" + createAccountInfo.password + "&email=" + createAccountInfo.email, {});
722
+        return this.http.post("http://localhost:8080/user/add?username=" + createAccountInfo.name + "&email=" + createAccountInfo.email + "&password=" + createAccountInfo.password, {});
723 723
     };
724 724
     ApiProvider = __decorate([
725 725
         Object(__WEBPACK_IMPORTED_MODULE_1__angular_core__["A" /* Injectable */])(),

+ 1
- 1
ionic-fb/www/build/main.js.map
Plik diff jest za duży
Wyświetl plik


+ 1
- 1
ionic-fb/www/build/vendor.js.map
Plik diff jest za duży
Wyświetl plik