4 Revize

Autor SHA1 Zpráva Datum
  Chad 650043c909 minor fix před 6 roky
  Chad 8b9ea69fa4 updates from group meeting added a lot před 6 roky
  Chad 95520e3d8a changed the application properties před 6 roky
  Chad 1144cf70e7 all classes built out před 6 roky
28 změnil soubory, kde provedl 9184 přidání a 8896 odebrání
  1. 1
    0
      ZipTeamOrange-ionic-UI/.sourcemaps/2.js.map
  2. 1
    1
      ZipTeamOrange-ionic-UI/.sourcemaps/main.js.map
  3. 1075
    1075
      ZipTeamOrange-ionic-UI/package-lock.json
  4. 9
    0
      ZipTeamOrange-ionic-UI/src/Classes/Chat.ts
  5. 9
    0
      ZipTeamOrange-ionic-UI/src/Classes/Messsage.ts
  6. 11
    0
      ZipTeamOrange-ionic-UI/src/Classes/User.ts
  7. 8
    3
      ZipTeamOrange-ionic-UI/src/app/app.module.ts
  8. 18
    0
      ZipTeamOrange-ionic-UI/src/pages/chat/chat.html
  9. 13
    0
      ZipTeamOrange-ionic-UI/src/pages/chat/chat.module.ts
  10. 3
    0
      ZipTeamOrange-ionic-UI/src/pages/chat/chat.scss
  11. 29
    0
      ZipTeamOrange-ionic-UI/src/pages/chat/chat.ts
  12. 2
    1
      ZipTeamOrange-ionic-UI/src/pages/firstPage/first.ts
  13. 26
    0
      ZipTeamOrange-ionic-UI/src/providers/message-service/message-service.ts
  14. 12
    12
      ZipTeamOrange-ionic-UI/www/build/0.js
  15. 1
    1
      ZipTeamOrange-ionic-UI/www/build/0.js.map
  16. 12
    12
      ZipTeamOrange-ionic-UI/www/build/1.js
  17. 1
    1
      ZipTeamOrange-ionic-UI/www/build/1.js.map
  18. 42
    0
      ZipTeamOrange-ionic-UI/www/build/2.js
  19. 1
    0
      ZipTeamOrange-ionic-UI/www/build/2.js.map
  20. 155
    49
      ZipTeamOrange-ionic-UI/www/build/main.js
  21. 1
    1
      ZipTeamOrange-ionic-UI/www/build/main.js.map
  22. 7729
    7728
      ZipTeamOrange-ionic-UI/www/build/vendor.js
  23. 1
    1
      ZipTeamOrange-ionic-UI/www/build/vendor.js.map
  24. 2
    3
      ZipTeamOrange-server/src/main/java/ZipTeamOrange/chat/Chat.java
  25. 5
    5
      ZipTeamOrange-server/src/main/java/ZipTeamOrange/chat/ChatController.java
  26. 5
    1
      ZipTeamOrange-server/src/main/java/ZipTeamOrange/message/Message.java
  27. 8
    1
      ZipTeamOrange-server/src/main/java/ZipTeamOrange/user/User.java
  28. 4
    1
      ZipTeamOrange-server/src/main/resources/application.properties

+ 1
- 0
ZipTeamOrange-ionic-UI/.sourcemaps/2.js.map Zobrazit soubor

@@ -0,0 +1 @@
1
+{"version":3,"sources":["../../src/pages/chat/chat.module.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;AAAyC;AACO;AACd;AAUlC;IAAA;IAA6B,CAAC;IAAjB,cAAc;QAR1B,uEAAQ,CAAC;YACR,YAAY,EAAE;gBACZ,uDAAQ;aACT;YACD,OAAO,EAAE;gBACP,sEAAe,CAAC,QAAQ,CAAC,uDAAQ,CAAC;aACnC;SACF,CAAC;OACW,cAAc,CAAG;IAAD,qBAAC;CAAA;AAAH","file":"2.js","sourcesContent":["import { NgModule } from '@angular/core';\nimport { IonicPageModule } from 'ionic-angular';\nimport { ChatPage } from './chat';\n\n@NgModule({\n  declarations: [\n    ChatPage,\n  ],\n  imports: [\n    IonicPageModule.forChild(ChatPage),\n  ],\n})\nexport class ChatPageModule {}\n\n\n\n// WEBPACK FOOTER //\n// ./src/pages/chat/chat.module.ts"],"sourceRoot":""}

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


+ 1075
- 1075
ZipTeamOrange-ionic-UI/package-lock.json
Diff nebyl zobrazen, protože je příliš veliký
Zobrazit soubor


+ 9
- 0
ZipTeamOrange-ionic-UI/src/Classes/Chat.ts Zobrazit soubor

@@ -0,0 +1,9 @@
1
+import { Message } from "./Messsage";
2
+import { User } from "./user";
3
+
4
+export class Chat{
5
+    id: number;
6
+    name: String;
7
+    private messages: Message[];
8
+    private users: User[];
9
+}

+ 9
- 0
ZipTeamOrange-ionic-UI/src/Classes/Messsage.ts Zobrazit soubor

@@ -0,0 +1,9 @@
1
+import { Chat } from "./Chat";
2
+import { User } from "./user";
3
+
4
+export class Message{
5
+    id: number;
6
+    message: String;
7
+    private chat: Chat;
8
+    private user: User;
9
+}

+ 11
- 0
ZipTeamOrange-ionic-UI/src/Classes/User.ts Zobrazit soubor

@@ -0,0 +1,11 @@
1
+import { Message } from "./Messsage";
2
+import { Chat } from "./Chat";
3
+
4
+export class User{
5
+    id: number;
6
+    userName: String;
7
+    email: String;
8
+    password: String;
9
+    messages: Message[];
10
+    chats: Chat[];
11
+}

+ 8
- 3
ZipTeamOrange-ionic-UI/src/app/app.module.ts Zobrazit soubor

@@ -16,6 +16,8 @@ import { SignUpPage } from '../pages/sign-up/sign-up';
16 16
 import { ApiServiceProvider } from '../providers/api-service/api-service';
17 17
 import { HttpClientModule } from '../../node_modules/@angular/common/http';
18 18
 import { AuthServiceProvider } from '../providers/auth-service/auth-service';
19
+import { MessageServiceProvider } from '../providers/message-service/message-service';
20
+import { ChatPage } from '../pages/chat/chat';
19 21
 
20 22
 @NgModule({
21 23
   declarations: [
@@ -25,7 +27,8 @@ import { AuthServiceProvider } from '../providers/auth-service/auth-service';
25 27
     ContactPage,
26 28
     HomePage,
27 29
     TabsPage,
28
-    SignUpPage
30
+    SignUpPage,
31
+    ChatPage
29 32
   ],
30 33
   imports: [
31 34
     BrowserModule,
@@ -40,14 +43,16 @@ import { AuthServiceProvider } from '../providers/auth-service/auth-service';
40 43
     ContactPage,
41 44
     HomePage,
42 45
     TabsPage,
43
-    SignUpPage
46
+    SignUpPage,
47
+    ChatPage
44 48
   ],
45 49
   providers: [
46 50
     StatusBar,
47 51
     SplashScreen,
48 52
     {provide: ErrorHandler, useClass: IonicErrorHandler},
49 53
     ApiServiceProvider,
50
-    AuthServiceProvider
54
+    AuthServiceProvider,
55
+    MessageServiceProvider
51 56
   ]
52 57
 })
53 58
 export class AppModule {}

+ 18
- 0
ZipTeamOrange-ionic-UI/src/pages/chat/chat.html Zobrazit soubor

@@ -0,0 +1,18 @@
1
+<!--
2
+  Generated template for the ChatPage page.
3
+
4
+  See http://ionicframework.com/docs/components/#navigation for more info on
5
+  Ionic pages and navigation.
6
+-->
7
+<ion-header>
8
+
9
+  <ion-navbar>
10
+    <ion-title>chatPage</ion-title>
11
+  </ion-navbar>
12
+
13
+</ion-header>
14
+
15
+
16
+<ion-content padding>
17
+  <input type="text"><button ion-button (click)="send()">send</button>
18
+</ion-content>

+ 13
- 0
ZipTeamOrange-ionic-UI/src/pages/chat/chat.module.ts Zobrazit soubor

@@ -0,0 +1,13 @@
1
+import { NgModule } from '@angular/core';
2
+import { IonicPageModule } from 'ionic-angular';
3
+import { ChatPage } from './chat';
4
+
5
+@NgModule({
6
+  declarations: [
7
+    ChatPage,
8
+  ],
9
+  imports: [
10
+    IonicPageModule.forChild(ChatPage),
11
+  ],
12
+})
13
+export class ChatPageModule {}

+ 3
- 0
ZipTeamOrange-ionic-UI/src/pages/chat/chat.scss Zobrazit soubor

@@ -0,0 +1,3 @@
1
+page-chat {
2
+
3
+}

+ 29
- 0
ZipTeamOrange-ionic-UI/src/pages/chat/chat.ts Zobrazit soubor

@@ -0,0 +1,29 @@
1
+import { Component } from '@angular/core';
2
+import { IonicPage, NavController, NavParams } from 'ionic-angular';
3
+
4
+/**
5
+ * Generated class for the ChatPage page.
6
+ *
7
+ * See https://ionicframework.com/docs/components/#navigation for more info on
8
+ * Ionic pages and navigation.
9
+ */
10
+
11
+@IonicPage()
12
+@Component({
13
+  selector: 'page-chat',
14
+  templateUrl: 'chat.html',
15
+})
16
+export class ChatPage {
17
+
18
+  constructor(public navCtrl: NavController, public navParams: NavParams) {
19
+  }
20
+
21
+  ionViewDidLoad() {
22
+    console.log('ionViewDidLoad ChatPage');
23
+  }
24
+
25
+  send(){
26
+    console.log("clicked");
27
+  }
28
+
29
+}

+ 2
- 1
ZipTeamOrange-ionic-UI/src/pages/firstPage/first.ts Zobrazit soubor

@@ -4,6 +4,7 @@ import { SignUpPage } from '../sign-up/sign-up';
4 4
 import { AuthServiceProvider } from '../../providers/auth-service/auth-service';
5 5
 import { NgForm } from '@angular/forms';
6 6
 import { HomePage } from '../home/home';
7
+import { ChatPage } from '../chat/chat';
7 8
 
8 9
 /**
9 10
  * Generated class for the FirstPage page.
@@ -33,7 +34,7 @@ export class FirstPage {
33 34
       this.responseData = result;
34 35
       console.log(createAccountInfo);
35 36
       if(!this.responseData.createAccountInfo){
36
-        this.navCtrl.push(HomePage);
37
+        this.navCtrl.push(ChatPage);
37 38
       }else{
38 39
         console.log("check your info");
39 40
       }

+ 26
- 0
ZipTeamOrange-ionic-UI/src/providers/message-service/message-service.ts Zobrazit soubor

@@ -0,0 +1,26 @@
1
+import { HttpClient } from '@angular/common/http';
2
+import { Injectable } from '@angular/core';
3
+import { Observable } from 'rxjs';
4
+
5
+/*
6
+  Generated class for the MessageServiceProvider provider.
7
+
8
+  See https://angular.io/guide/dependency-injection for more info on providers
9
+  and Angular DI.
10
+*/
11
+@Injectable()
12
+export class MessageServiceProvider {
13
+
14
+  constructor(public http: HttpClient) {
15
+    console.log('Hello MessageServiceProvider Provider');
16
+  }
17
+
18
+  getMessages(){
19
+    return this.http.get('http:localhost:8080/messages')
20
+  }
21
+
22
+  saveMessage(createAccountInfo: any) : Observable<Object> {
23
+    return this.http.post(`http://localhost:8080/message/add`, createAccountInfo);
24
+  }
25
+
26
+}

+ 12
- 12
ZipTeamOrange-ionic-UI/www/build/0.js Zobrazit soubor

@@ -1,14 +1,14 @@
1 1
 webpackJsonp([0],{
2 2
 
3
-/***/ 283:
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__, "SignUpPageModule", function() { return SignUpPageModule; });
8
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "ChatPageModule", function() { return ChatPageModule; });
9 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__(25);
11
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__sign_up__ = __webpack_require__(103);
10
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1_ionic_angular__ = __webpack_require__(20);
11
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__chat__ = __webpack_require__(101);
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 ChatPageModule = /** @class */ (function () {
22
+    function ChatPageModule() {
23 23
     }
24
-    SignUpPageModule = __decorate([
24
+    ChatPageModule = __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__chat__["a" /* ChatPage */],
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__chat__["a" /* ChatPage */]),
31 31
             ],
32 32
         })
33
-    ], SignUpPageModule);
34
-    return SignUpPageModule;
33
+    ], ChatPageModule);
34
+    return ChatPageModule;
35 35
 }());
36 36
 
37
-//# sourceMappingURL=sign-up.module.js.map
37
+//# sourceMappingURL=chat.module.js.map
38 38
 
39 39
 /***/ })
40 40
 

+ 1
- 1
ZipTeamOrange-ionic-UI/www/build/0.js.map Zobrazit soubor

@@ -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/chat/chat.module.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;AAAyC;AACO;AACd;AAUlC;IAAA;IAA6B,CAAC;IAAjB,cAAc;QAR1B,uEAAQ,CAAC;YACR,YAAY,EAAE;gBACZ,uDAAQ;aACT;YACD,OAAO,EAAE;gBACP,sEAAe,CAAC,QAAQ,CAAC,uDAAQ,CAAC;aACnC;SACF,CAAC;OACW,cAAc,CAAG;IAAD,qBAAC;CAAA;AAAH","file":"0.js","sourcesContent":["import { NgModule } from '@angular/core';\nimport { IonicPageModule } from 'ionic-angular';\nimport { ChatPage } from './chat';\n\n@NgModule({\n  declarations: [\n    ChatPage,\n  ],\n  imports: [\n    IonicPageModule.forChild(ChatPage),\n  ],\n})\nexport class ChatPageModule {}\n\n\n\n// WEBPACK FOOTER //\n// ./src/pages/chat/chat.module.ts"],"sourceRoot":""}

+ 12
- 12
ZipTeamOrange-ionic-UI/www/build/1.js Zobrazit soubor

@@ -1,14 +1,14 @@
1 1
 webpackJsonp([1],{
2 2
 
3
-/***/ 282:
3
+/***/ 286:
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__, "FirstPageModule", function() { return FirstPageModule; });
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
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1_ionic_angular__ = __webpack_require__(25);
11
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__first__ = __webpack_require__(102);
10
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1_ionic_angular__ = __webpack_require__(20);
11
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__sign_up__ = __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 FirstPageModule = /** @class */ (function () {
22
-    function FirstPageModule() {
21
+var SignUpPageModule = /** @class */ (function () {
22
+    function SignUpPageModule() {
23 23
     }
24
-    FirstPageModule = __decorate([
24
+    SignUpPageModule = __decorate([
25 25
         Object(__WEBPACK_IMPORTED_MODULE_0__angular_core__["I" /* NgModule */])({
26 26
             declarations: [
27
-                __WEBPACK_IMPORTED_MODULE_2__first__["a" /* FirstPage */],
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__first__["a" /* FirstPage */]),
30
+                __WEBPACK_IMPORTED_MODULE_1_ionic_angular__["d" /* IonicPageModule */].forChild(__WEBPACK_IMPORTED_MODULE_2__sign_up__["a" /* SignUpPage */]),
31 31
             ],
32 32
         })
33
-    ], FirstPageModule);
34
-    return FirstPageModule;
33
+    ], SignUpPageModule);
34
+    return SignUpPageModule;
35 35
 }());
36 36
 
37
-//# sourceMappingURL=first.module.js.map
37
+//# sourceMappingURL=sign-up.module.js.map
38 38
 
39 39
 /***/ })
40 40
 

+ 1
- 1
ZipTeamOrange-ionic-UI/www/build/1.js.map Zobrazit soubor

@@ -1 +1 @@
1
-{"version":3,"sources":["../../src/pages/firstPage/first.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 { FirstPage } from './first';\n\n@NgModule({\n  declarations: [\n    FirstPage,\n  ],\n  imports: [\n    IonicPageModule.forChild(FirstPage),\n  ],\n})\nexport class FirstPageModule {}\n\n\n\n// WEBPACK FOOTER //\n// ./src/pages/firstPage/first.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":"1.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":""}

+ 42
- 0
ZipTeamOrange-ionic-UI/www/build/2.js Zobrazit soubor

@@ -0,0 +1,42 @@
1
+webpackJsonp([2],{
2
+
3
+/***/ 285:
4
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
5
+
6
+"use strict";
7
+Object.defineProperty(__webpack_exports__, "__esModule", { value: true });
8
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "FirstPageModule", function() { return FirstPageModule; });
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__(20);
11
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__first__ = __webpack_require__(102);
12
+var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
13
+    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
14
+    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
15
+    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;
16
+    return c > 3 && r && Object.defineProperty(target, key, r), r;
17
+};
18
+
19
+
20
+
21
+var FirstPageModule = /** @class */ (function () {
22
+    function FirstPageModule() {
23
+    }
24
+    FirstPageModule = __decorate([
25
+        Object(__WEBPACK_IMPORTED_MODULE_0__angular_core__["I" /* NgModule */])({
26
+            declarations: [
27
+                __WEBPACK_IMPORTED_MODULE_2__first__["a" /* FirstPage */],
28
+            ],
29
+            imports: [
30
+                __WEBPACK_IMPORTED_MODULE_1_ionic_angular__["d" /* IonicPageModule */].forChild(__WEBPACK_IMPORTED_MODULE_2__first__["a" /* FirstPage */]),
31
+            ],
32
+        })
33
+    ], FirstPageModule);
34
+    return FirstPageModule;
35
+}());
36
+
37
+//# sourceMappingURL=first.module.js.map
38
+
39
+/***/ })
40
+
41
+});
42
+//# sourceMappingURL=2.js.map

+ 1
- 0
ZipTeamOrange-ionic-UI/www/build/2.js.map Zobrazit soubor

@@ -0,0 +1 @@
1
+{"version":3,"sources":["../../src/pages/firstPage/first.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":"2.js","sourcesContent":["import { NgModule } from '@angular/core';\nimport { IonicPageModule } from 'ionic-angular';\nimport { FirstPage } from './first';\n\n@NgModule({\n  declarations: [\n    FirstPage,\n  ],\n  imports: [\n    IonicPageModule.forChild(FirstPage),\n  ],\n})\nexport class FirstPageModule {}\n\n\n\n// WEBPACK FOOTER //\n// ./src/pages/firstPage/first.module.ts"],"sourceRoot":""}

+ 155
- 49
ZipTeamOrange-ionic-UI/www/build/main.js Zobrazit soubor

@@ -1,4 +1,52 @@
1
-webpackJsonp([2],{
1
+webpackJsonp([3],{
2
+
3
+/***/ 101:
4
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
5
+
6
+"use strict";
7
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return ChatPage; });
8
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__angular_core__ = __webpack_require__(0);
9
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1_ionic_angular__ = __webpack_require__(20);
10
+var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
11
+    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
12
+    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
13
+    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;
14
+    return c > 3 && r && Object.defineProperty(target, key, r), r;
15
+};
16
+var __metadata = (this && this.__metadata) || function (k, v) {
17
+    if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
18
+};
19
+
20
+
21
+/**
22
+ * Generated class for the ChatPage page.
23
+ *
24
+ * See https://ionicframework.com/docs/components/#navigation for more info on
25
+ * Ionic pages and navigation.
26
+ */
27
+var ChatPage = /** @class */ (function () {
28
+    function ChatPage(navCtrl, navParams) {
29
+        this.navCtrl = navCtrl;
30
+        this.navParams = navParams;
31
+    }
32
+    ChatPage.prototype.ionViewDidLoad = function () {
33
+        console.log('ionViewDidLoad ChatPage');
34
+    };
35
+    ChatPage.prototype.send = function () {
36
+        console.log("clicked");
37
+    };
38
+    ChatPage = __decorate([
39
+        Object(__WEBPACK_IMPORTED_MODULE_0__angular_core__["m" /* Component */])({
40
+            selector: 'page-chat',template:/*ion-inline-start:"/Users/ChadH/Labs/ZipTeam/ZipTeamOrange-ionic-UI/src/pages/chat/chat.html"*/'<!--\n  Generated template for the ChatPage 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>chatPage</ion-title>\n  </ion-navbar>\n\n</ion-header>\n\n\n<ion-content padding>\n  <input type="text"><button ion-button (click)="send()">send</button>\n</ion-content>\n'/*ion-inline-end:"/Users/ChadH/Labs/ZipTeam/ZipTeamOrange-ionic-UI/src/pages/chat/chat.html"*/,
41
+        }),
42
+        __metadata("design:paramtypes", [__WEBPACK_IMPORTED_MODULE_1_ionic_angular__["e" /* NavController */], __WEBPACK_IMPORTED_MODULE_1_ionic_angular__["f" /* NavParams */]])
43
+    ], ChatPage);
44
+    return ChatPage;
45
+}());
46
+
47
+//# sourceMappingURL=chat.js.map
48
+
49
+/***/ }),
2 50
 
3 51
 /***/ 102:
4 52
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
@@ -6,10 +54,10 @@ webpackJsonp([2],{
6 54
 "use strict";
7 55
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return FirstPage; });
8 56
 /* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__angular_core__ = __webpack_require__(0);
9
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1_ionic_angular__ = __webpack_require__(25);
57
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1_ionic_angular__ = __webpack_require__(20);
10 58
 /* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__sign_up_sign_up__ = __webpack_require__(103);
11 59
 /* harmony import */ var __WEBPACK_IMPORTED_MODULE_3__providers_auth_service_auth_service__ = __webpack_require__(158);
12
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_4__home_home__ = __webpack_require__(79);
60
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_4__chat_chat__ = __webpack_require__(101);
13 61
 var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
14 62
     var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
15 63
     if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
@@ -45,7 +93,7 @@ var FirstPage = /** @class */ (function () {
45 93
             _this.responseData = result;
46 94
             console.log(createAccountInfo);
47 95
             if (!_this.responseData.createAccountInfo) {
48
-                _this.navCtrl.push(__WEBPACK_IMPORTED_MODULE_4__home_home__["a" /* HomePage */]);
96
+                _this.navCtrl.push(__WEBPACK_IMPORTED_MODULE_4__chat_chat__["a" /* ChatPage */]);
49 97
             }
50 98
             else {
51 99
                 console.log("check your info");
@@ -58,7 +106,7 @@ var FirstPage = /** @class */ (function () {
58 106
     };
59 107
     FirstPage = __decorate([
60 108
         Object(__WEBPACK_IMPORTED_MODULE_0__angular_core__["m" /* Component */])({
61
-            selector: 'page-first',template:/*ion-inline-start:"/Users/roym/ZIPTEAM/ZipTeam/ZipTeamOrange-ionic-UI/src/pages/firstPage/first.html"*/'<!--\n  Generated template for the FirstPage page.\n\n  See http://ionicframework.com/docs/components/#navigation for more info on\n  Ionic pages and navigation.\n-->\n<ion-header>\n  <ion-navbar color="primary">\n    <button menuToggle ion- button icon-only>\n      <ion-icon name ="menu"></ion-icon>\n    </button>\n    <ion-title text-center>ZipTeamOrange</ion-title>\n  </ion-navbar>\n\n</ion-header>\n\n\n<ion-content padding>\n  <h4>Welcome to this page</h4>\n  <div class="login-box">\n    <form #registerForm="ngForm" ng-submit="loginButton(registerForm.value)" >\n      <ion-row>\n        <ion-col>\n          <ion-list inset>\n            <ion-item>\n              <ion-input type="text" placeholder="Username" name="userName" required [(ngModel)]="Username" ></ion-input>\n            </ion-item>\n            <ion-item>\n              <ion-input type="password" placeholder="Password" name="password" required [(ngModel)]="password"></ion-input>\n            </ion-item>\n          </ion-list>\n        </ion-col>\n      </ion-row>\n      <ion-row>\n        <ion-col class="signup-col">\n          <button ion-button class="submit-btn" full type="submit" [disabled]="!registerForm.form.valid" (click)="loginButton(registerForm.value)">Login</button>\n        </ion-col>\n      </ion-row>\n    </form>\n    <ion-row>\n      <ion-col color="secondary">\n        <button ion-button class="register-btn" block clear (click)="createAccount()">Create Account</button>\n      </ion-col>\n    </ion-row>\n  </div>\n  \n</ion-content>'/*ion-inline-end:"/Users/roym/ZIPTEAM/ZipTeam/ZipTeamOrange-ionic-UI/src/pages/firstPage/first.html"*/,
109
+            selector: 'page-first',template:/*ion-inline-start:"/Users/ChadH/Labs/ZipTeam/ZipTeamOrange-ionic-UI/src/pages/firstPage/first.html"*/'<!--\n  Generated template for the FirstPage page.\n\n  See http://ionicframework.com/docs/components/#navigation for more info on\n  Ionic pages and navigation.\n-->\n<ion-header>\n  <ion-navbar color="primary">\n    <button menuToggle ion- button icon-only>\n      <ion-icon name ="menu"></ion-icon>\n    </button>\n    <ion-title text-center>ZipTeamOrange</ion-title>\n  </ion-navbar>\n\n</ion-header>\n\n\n<ion-content padding>\n  <h4>Welcome to this page</h4>\n  <div class="login-box">\n    <form #registerForm="ngForm" ng-submit="loginButton(registerForm.value)" >\n      <ion-row>\n        <ion-col>\n          <ion-list inset>\n            <ion-item>\n              <ion-input type="text" placeholder="Username" name="userName" required [(ngModel)]="Username" ></ion-input>\n            </ion-item>\n            <ion-item>\n              <ion-input type="password" placeholder="Password" name="password" required [(ngModel)]="password"></ion-input>\n            </ion-item>\n          </ion-list>\n        </ion-col>\n      </ion-row>\n      <ion-row>\n        <ion-col class="signup-col">\n          <button ion-button class="submit-btn" full type="submit" [disabled]="!registerForm.form.valid" (click)="loginButton(registerForm.value)">Login</button>\n        </ion-col>\n      </ion-row>\n    </form>\n    <ion-row>\n      <ion-col color="secondary">\n        <button ion-button class="register-btn" block clear (click)="createAccount()">Create Account</button>\n      </ion-col>\n    </ion-row>\n  </div>\n  \n</ion-content>'/*ion-inline-end:"/Users/ChadH/Labs/ZipTeam/ZipTeamOrange-ionic-UI/src/pages/firstPage/first.html"*/,
62 110
         }),
63 111
         __metadata("design:paramtypes", [__WEBPACK_IMPORTED_MODULE_1_ionic_angular__["e" /* NavController */], __WEBPACK_IMPORTED_MODULE_1_ionic_angular__["f" /* NavParams */], __WEBPACK_IMPORTED_MODULE_3__providers_auth_service_auth_service__["a" /* AuthServiceProvider */]])
64 112
     ], FirstPage);
@@ -75,7 +123,7 @@ var FirstPage = /** @class */ (function () {
75 123
 "use strict";
76 124
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return SignUpPage; });
77 125
 /* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__angular_core__ = __webpack_require__(0);
78
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1_ionic_angular__ = __webpack_require__(25);
126
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1_ionic_angular__ = __webpack_require__(20);
79 127
 /* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__providers_api_service_api_service__ = __webpack_require__(157);
80 128
 var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
81 129
     var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
@@ -122,7 +170,7 @@ var SignUpPage = /** @class */ (function () {
122 170
     };
123 171
     SignUpPage = __decorate([
124 172
         Object(__WEBPACK_IMPORTED_MODULE_0__angular_core__["m" /* Component */])({
125
-            selector: 'page-sign-up',template:/*ion-inline-start:"/Users/roym/ZIPTEAM/ZipTeam/ZipTeamOrange-ionic-UI/src/pages/sign-up/sign-up.html"*/'<!--\n  Generated template for the SignUpPage 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 color="primary">\n      <ion-title>sign-up</ion-title>\n    </ion-navbar>\n  \n  </ion-header>\n  \n  \n  <ion-content padding>\n      <div class="signUp-box">\n      <form #registerForm="ngForm" ng-submit="save(registerForm.value)">\n        <ion-row>\n          <ion-col>\n            <ion-list inset>\n              <ion-item>\n                <ion-input type="text" placeholder="Username" name="userName" required [(ngModel)]="Username" ></ion-input>\n              </ion-item>\n              <ion-item>\n                  <ion-input type="text" placeholder="Email" name="email" required [(ngModel)]="Email" ></ion-input>\n                </ion-item>\n              <ion-item>\n                <ion-input type="password" placeholder="Password" name="password" required [(ngModel)]="password"></ion-input>\n              </ion-item>\n            </ion-list>\n          </ion-col>\n        </ion-row>\n        <ion-row>\n          <ion-col class="signup-col">\n            <button ion-button class="submit-btn" full type="submit" (click)="save(registerForm.value)" [disabled]="!registerForm.form.valid">Create Account</button>\n          </ion-col>\n        </ion-row>\n      </form>\n    \n    </div>\n  \n  </ion-content>\n  \n'/*ion-inline-end:"/Users/roym/ZIPTEAM/ZipTeam/ZipTeamOrange-ionic-UI/src/pages/sign-up/sign-up.html"*/,
173
+            selector: 'page-sign-up',template:/*ion-inline-start:"/Users/ChadH/Labs/ZipTeam/ZipTeamOrange-ionic-UI/src/pages/sign-up/sign-up.html"*/'<!--\n  Generated template for the SignUpPage 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 color="primary">\n      <ion-title>sign-up</ion-title>\n    </ion-navbar>\n  \n  </ion-header>\n  \n  \n  <ion-content padding>\n      <div class="signUp-box">\n      <form #registerForm="ngForm" ng-submit="save(registerForm.value)">\n        <ion-row>\n          <ion-col>\n            <ion-list inset>\n              <ion-item>\n                <ion-input type="text" placeholder="Username" name="userName" required [(ngModel)]="Username" ></ion-input>\n              </ion-item>\n              <ion-item>\n                  <ion-input type="text" placeholder="Email" name="email" required [(ngModel)]="Email" ></ion-input>\n                </ion-item>\n              <ion-item>\n                <ion-input type="password" placeholder="Password" name="password" required [(ngModel)]="password"></ion-input>\n              </ion-item>\n            </ion-list>\n          </ion-col>\n        </ion-row>\n        <ion-row>\n          <ion-col class="signup-col">\n            <button ion-button class="submit-btn" full type="submit" (click)="save(registerForm.value)" [disabled]="!registerForm.form.valid">Create Account</button>\n          </ion-col>\n        </ion-row>\n      </form>\n    \n    </div>\n  \n  </ion-content>\n  \n'/*ion-inline-end:"/Users/ChadH/Labs/ZipTeam/ZipTeamOrange-ionic-UI/src/pages/sign-up/sign-up.html"*/,
126 174
         }),
127 175
         __metadata("design:paramtypes", [__WEBPACK_IMPORTED_MODULE_1_ionic_angular__["e" /* NavController */], __WEBPACK_IMPORTED_MODULE_1_ionic_angular__["f" /* NavParams */], __WEBPACK_IMPORTED_MODULE_2__providers_api_service_api_service__["a" /* ApiServiceProvider */], __WEBPACK_IMPORTED_MODULE_1_ionic_angular__["h" /* ToastController */]])
128 176
     ], SignUpPage);
@@ -154,13 +202,17 @@ webpackEmptyAsyncContext.id = 115;
154 202
 /***/ (function(module, exports, __webpack_require__) {
155 203
 
156 204
 var map = {
205
+	"../pages/chat/chat.module": [
206
+		284,
207
+		0
208
+	],
157 209
 	"../pages/firstPage/first.module": [
158
-		282,
159
-		1
210
+		285,
211
+		2
160 212
 	],
161 213
 	"../pages/sign-up/sign-up.module": [
162
-		283,
163
-		0
214
+		286,
215
+		1
164 216
 	]
165 217
 };
166 218
 function webpackAsyncContext(req) {
@@ -184,7 +236,7 @@ module.exports = webpackAsyncContext;
184 236
 
185 237
 "use strict";
186 238
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return ApiServiceProvider; });
187
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__angular_common_http__ = __webpack_require__(78);
239
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__angular_common_http__ = __webpack_require__(46);
188 240
 /* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__angular_core__ = __webpack_require__(0);
189 241
 var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
190 242
     var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
@@ -231,9 +283,9 @@ var ApiServiceProvider = /** @class */ (function () {
231 283
 
232 284
 "use strict";
233 285
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return AuthServiceProvider; });
234
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__angular_common_http__ = __webpack_require__(78);
286
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__angular_common_http__ = __webpack_require__(46);
235 287
 /* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__angular_core__ = __webpack_require__(0);
236
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2_rxjs_add_operator_map__ = __webpack_require__(256);
288
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2_rxjs_add_operator_map__ = __webpack_require__(257);
237 289
 /* harmony import */ var __WEBPACK_IMPORTED_MODULE_2_rxjs_add_operator_map___default = __webpack_require__.n(__WEBPACK_IMPORTED_MODULE_2_rxjs_add_operator_map__);
238 290
 var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
239 291
     var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
@@ -288,7 +340,7 @@ var AuthServiceProvider = /** @class */ (function () {
288 340
 /* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__angular_core__ = __webpack_require__(0);
289 341
 /* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__about_about__ = __webpack_require__(203);
290 342
 /* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__contact_contact__ = __webpack_require__(204);
291
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_3__home_home__ = __webpack_require__(79);
343
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_3__home_home__ = __webpack_require__(205);
292 344
 /* harmony import */ var __WEBPACK_IMPORTED_MODULE_4__firstPage_first__ = __webpack_require__(102);
293 345
 var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
294 346
     var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
@@ -312,7 +364,7 @@ var TabsPage = /** @class */ (function () {
312 364
         this.tab4Root = __WEBPACK_IMPORTED_MODULE_2__contact_contact__["a" /* ContactPage */];
313 365
     }
314 366
     TabsPage = __decorate([
315
-        Object(__WEBPACK_IMPORTED_MODULE_0__angular_core__["m" /* Component */])({template:/*ion-inline-start:"/Users/roym/ZIPTEAM/ZipTeam/ZipTeamOrange-ionic-UI/src/pages/tabs/tabs.html"*/'<ion-tabs>\n  <ion-tab [root]="tab1Root" tabTitle="Log"  tabIcon="sign-in"></ion-tab>\n  <ion-tab [root]="tab2Root" tabTitle="Home" tabIcon="home"></ion-tab>\n  <ion-tab [root]="tab3Root" tabTitle="About" tabIcon="information-circle"></ion-tab>\n  <ion-tab [root]="tab4Root" tabTitle="Contact" tabIcon="contacts"></ion-tab>\n</ion-tabs>\n'/*ion-inline-end:"/Users/roym/ZIPTEAM/ZipTeam/ZipTeamOrange-ionic-UI/src/pages/tabs/tabs.html"*/
367
+        Object(__WEBPACK_IMPORTED_MODULE_0__angular_core__["m" /* Component */])({template:/*ion-inline-start:"/Users/ChadH/Labs/ZipTeam/ZipTeamOrange-ionic-UI/src/pages/tabs/tabs.html"*/'<ion-tabs>\n  <ion-tab [root]="tab1Root" tabTitle="Log"  tabIcon="sign-in"></ion-tab>\n  <ion-tab [root]="tab2Root" tabTitle="Home" tabIcon="home"></ion-tab>\n  <ion-tab [root]="tab3Root" tabTitle="About" tabIcon="information-circle"></ion-tab>\n  <ion-tab [root]="tab4Root" tabTitle="Contact" tabIcon="contacts"></ion-tab>\n</ion-tabs>\n'/*ion-inline-end:"/Users/ChadH/Labs/ZipTeam/ZipTeamOrange-ionic-UI/src/pages/tabs/tabs.html"*/
316 368
         }),
317 369
         __metadata("design:paramtypes", [])
318 370
     ], TabsPage);
@@ -329,7 +381,7 @@ var TabsPage = /** @class */ (function () {
329 381
 "use strict";
330 382
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return AboutPage; });
331 383
 /* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__angular_core__ = __webpack_require__(0);
332
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1_ionic_angular__ = __webpack_require__(25);
384
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1_ionic_angular__ = __webpack_require__(20);
333 385
 var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
334 386
     var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
335 387
     if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
@@ -347,7 +399,7 @@ var AboutPage = /** @class */ (function () {
347 399
     }
348 400
     AboutPage = __decorate([
349 401
         Object(__WEBPACK_IMPORTED_MODULE_0__angular_core__["m" /* Component */])({
350
-            selector: 'page-about',template:/*ion-inline-start:"/Users/roym/ZIPTEAM/ZipTeam/ZipTeamOrange-ionic-UI/src/pages/about/about.html"*/'<ion-header>\n  <ion-navbar>\n    <ion-title>\n      About\n    </ion-title>\n  </ion-navbar>\n</ion-header>\n\n<ion-content padding>\n\n</ion-content>\n'/*ion-inline-end:"/Users/roym/ZIPTEAM/ZipTeam/ZipTeamOrange-ionic-UI/src/pages/about/about.html"*/
402
+            selector: 'page-about',template:/*ion-inline-start:"/Users/ChadH/Labs/ZipTeam/ZipTeamOrange-ionic-UI/src/pages/about/about.html"*/'<ion-header>\n  <ion-navbar>\n    <ion-title>\n      About\n    </ion-title>\n  </ion-navbar>\n</ion-header>\n\n<ion-content padding>\n\n</ion-content>\n'/*ion-inline-end:"/Users/ChadH/Labs/ZipTeam/ZipTeamOrange-ionic-UI/src/pages/about/about.html"*/
351 403
         }),
352 404
         __metadata("design:paramtypes", [__WEBPACK_IMPORTED_MODULE_1_ionic_angular__["e" /* NavController */]])
353 405
     ], AboutPage);
@@ -364,7 +416,7 @@ var AboutPage = /** @class */ (function () {
364 416
 "use strict";
365 417
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return ContactPage; });
366 418
 /* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__angular_core__ = __webpack_require__(0);
367
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1_ionic_angular__ = __webpack_require__(25);
419
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1_ionic_angular__ = __webpack_require__(20);
368 420
 var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
369 421
     var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
370 422
     if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
@@ -382,7 +434,7 @@ var ContactPage = /** @class */ (function () {
382 434
     }
383 435
     ContactPage = __decorate([
384 436
         Object(__WEBPACK_IMPORTED_MODULE_0__angular_core__["m" /* Component */])({
385
-            selector: 'page-contact',template:/*ion-inline-start:"/Users/roym/ZIPTEAM/ZipTeam/ZipTeamOrange-ionic-UI/src/pages/contact/contact.html"*/'<ion-header>\n  <ion-navbar>\n    <ion-title>\n      Contact\n    </ion-title>\n  </ion-navbar>\n</ion-header>\n\n<ion-content>\n  <ion-list>\n    <ion-list-header>Follow us on Twitter</ion-list-header>\n    <ion-item>\n      <ion-icon name="ionic" item-start></ion-icon>\n      @ionicframework\n    </ion-item>\n  </ion-list>\n</ion-content>\n'/*ion-inline-end:"/Users/roym/ZIPTEAM/ZipTeam/ZipTeamOrange-ionic-UI/src/pages/contact/contact.html"*/
437
+            selector: 'page-contact',template:/*ion-inline-start:"/Users/ChadH/Labs/ZipTeam/ZipTeamOrange-ionic-UI/src/pages/contact/contact.html"*/'<ion-header>\n  <ion-navbar>\n    <ion-title>\n      Contact\n    </ion-title>\n  </ion-navbar>\n</ion-header>\n\n<ion-content>\n  <ion-list>\n    <ion-list-header>Follow us on Twitter</ion-list-header>\n    <ion-item>\n      <ion-icon name="ionic" item-start></ion-icon>\n      @ionicframework\n    </ion-item>\n  </ion-list>\n</ion-content>\n'/*ion-inline-end:"/Users/ChadH/Labs/ZipTeam/ZipTeamOrange-ionic-UI/src/pages/contact/contact.html"*/
386 438
         }),
387 439
         __metadata("design:paramtypes", [__WEBPACK_IMPORTED_MODULE_1_ionic_angular__["e" /* NavController */]])
388 440
     ], ContactPage);
@@ -397,9 +449,44 @@ var ContactPage = /** @class */ (function () {
397 449
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
398 450
 
399 451
 "use strict";
452
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return HomePage; });
453
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__angular_core__ = __webpack_require__(0);
454
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1_ionic_angular__ = __webpack_require__(20);
455
+var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
456
+    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
457
+    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
458
+    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;
459
+    return c > 3 && r && Object.defineProperty(target, key, r), r;
460
+};
461
+var __metadata = (this && this.__metadata) || function (k, v) {
462
+    if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
463
+};
464
+
465
+
466
+var HomePage = /** @class */ (function () {
467
+    function HomePage(navCtrl) {
468
+        this.navCtrl = navCtrl;
469
+    }
470
+    HomePage = __decorate([
471
+        Object(__WEBPACK_IMPORTED_MODULE_0__angular_core__["m" /* Component */])({
472
+            selector: 'page-home',template:/*ion-inline-start:"/Users/ChadH/Labs/ZipTeam/ZipTeamOrange-ionic-UI/src/pages/home/home.html"*/'<ion-header>\n  <ion-navbar>\n    <ion-title>Home</ion-title>\n  </ion-navbar>\n</ion-header>\n\n<ion-content padding>\n  <h2>Welcome to Ionic!</h2>\n  <p>\n    This starter project comes with simple tabs-based layout for apps\n    that are going to primarily use a Tabbed UI.\n  </p>\n  <p>\n    Take a look at the <code>src/pages/</code> directory to add or change tabs,\n    update any existing page or create new pages.\n  </p>\n</ion-content>\n'/*ion-inline-end:"/Users/ChadH/Labs/ZipTeam/ZipTeamOrange-ionic-UI/src/pages/home/home.html"*/
473
+        }),
474
+        __metadata("design:paramtypes", [__WEBPACK_IMPORTED_MODULE_1_ionic_angular__["e" /* NavController */]])
475
+    ], HomePage);
476
+    return HomePage;
477
+}());
478
+
479
+//# sourceMappingURL=home.js.map
480
+
481
+/***/ }),
482
+
483
+/***/ 206:
484
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
485
+
486
+"use strict";
400 487
 Object.defineProperty(__webpack_exports__, "__esModule", { value: true });
401
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__angular_platform_browser_dynamic__ = __webpack_require__(206);
402
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__app_module__ = __webpack_require__(226);
488
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__angular_platform_browser_dynamic__ = __webpack_require__(207);
489
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__app_module__ = __webpack_require__(227);
403 490
 
404 491
 
405 492
 Object(__WEBPACK_IMPORTED_MODULE_0__angular_platform_browser_dynamic__["a" /* platformBrowserDynamic */])().bootstrapModule(__WEBPACK_IMPORTED_MODULE_1__app_module__["a" /* AppModule */]);
@@ -407,26 +494,28 @@ Object(__WEBPACK_IMPORTED_MODULE_0__angular_platform_browser_dynamic__["a" /* pl
407 494
 
408 495
 /***/ }),
409 496
 
410
-/***/ 226:
497
+/***/ 227:
411 498
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
412 499
 
413 500
 "use strict";
414 501
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return AppModule; });
415 502
 /* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__angular_core__ = __webpack_require__(0);
416 503
 /* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__angular_platform_browser__ = __webpack_require__(31);
417
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2_ionic_angular__ = __webpack_require__(25);
418
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_3__app_component__ = __webpack_require__(274);
504
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2_ionic_angular__ = __webpack_require__(20);
505
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_3__app_component__ = __webpack_require__(275);
419 506
 /* harmony import */ var __WEBPACK_IMPORTED_MODULE_4__pages_about_about__ = __webpack_require__(203);
420 507
 /* harmony import */ var __WEBPACK_IMPORTED_MODULE_5__pages_contact_contact__ = __webpack_require__(204);
421
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_6__pages_home_home__ = __webpack_require__(79);
508
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_6__pages_home_home__ = __webpack_require__(205);
422 509
 /* harmony import */ var __WEBPACK_IMPORTED_MODULE_7__pages_tabs_tabs__ = __webpack_require__(202);
423 510
 /* harmony import */ var __WEBPACK_IMPORTED_MODULE_8__ionic_native_status_bar__ = __webpack_require__(198);
424 511
 /* harmony import */ var __WEBPACK_IMPORTED_MODULE_9__ionic_native_splash_screen__ = __webpack_require__(201);
425 512
 /* harmony import */ var __WEBPACK_IMPORTED_MODULE_10__pages_firstPage_first__ = __webpack_require__(102);
426 513
 /* harmony import */ var __WEBPACK_IMPORTED_MODULE_11__pages_sign_up_sign_up__ = __webpack_require__(103);
427 514
 /* harmony import */ var __WEBPACK_IMPORTED_MODULE_12__providers_api_service_api_service__ = __webpack_require__(157);
428
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_13__node_modules_angular_common_http__ = __webpack_require__(78);
515
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_13__node_modules_angular_common_http__ = __webpack_require__(46);
429 516
 /* harmony import */ var __WEBPACK_IMPORTED_MODULE_14__providers_auth_service_auth_service__ = __webpack_require__(158);
517
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_15__providers_message_service_message_service__ = __webpack_require__(283);
518
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_16__pages_chat_chat__ = __webpack_require__(101);
430 519
 var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
431 520
     var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
432 521
     if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
@@ -448,6 +537,8 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
448 537
 
449 538
 
450 539
 
540
+
541
+
451 542
 var AppModule = /** @class */ (function () {
452 543
     function AppModule() {
453 544
     }
@@ -460,13 +551,15 @@ var AppModule = /** @class */ (function () {
460 551
                 __WEBPACK_IMPORTED_MODULE_5__pages_contact_contact__["a" /* ContactPage */],
461 552
                 __WEBPACK_IMPORTED_MODULE_6__pages_home_home__["a" /* HomePage */],
462 553
                 __WEBPACK_IMPORTED_MODULE_7__pages_tabs_tabs__["a" /* TabsPage */],
463
-                __WEBPACK_IMPORTED_MODULE_11__pages_sign_up_sign_up__["a" /* SignUpPage */]
554
+                __WEBPACK_IMPORTED_MODULE_11__pages_sign_up_sign_up__["a" /* SignUpPage */],
555
+                __WEBPACK_IMPORTED_MODULE_16__pages_chat_chat__["a" /* ChatPage */]
464 556
             ],
465 557
             imports: [
466 558
                 __WEBPACK_IMPORTED_MODULE_1__angular_platform_browser__["a" /* BrowserModule */],
467 559
                 __WEBPACK_IMPORTED_MODULE_13__node_modules_angular_common_http__["b" /* HttpClientModule */],
468 560
                 __WEBPACK_IMPORTED_MODULE_2_ionic_angular__["c" /* IonicModule */].forRoot(__WEBPACK_IMPORTED_MODULE_3__app_component__["a" /* MyApp */], {}, {
469 561
                     links: [
562
+                        { loadChildren: '../pages/chat/chat.module#ChatPageModule', name: 'ChatPage', segment: 'chat', priority: 'low', defaultHistory: [] },
470 563
                         { loadChildren: '../pages/firstPage/first.module#FirstPageModule', name: 'FirstPage', segment: 'first', priority: 'low', defaultHistory: [] },
471 564
                         { loadChildren: '../pages/sign-up/sign-up.module#SignUpPageModule', name: 'SignUpPage', segment: 'sign-up', priority: 'low', defaultHistory: [] }
472 565
                     ]
@@ -480,14 +573,16 @@ var AppModule = /** @class */ (function () {
480 573
                 __WEBPACK_IMPORTED_MODULE_5__pages_contact_contact__["a" /* ContactPage */],
481 574
                 __WEBPACK_IMPORTED_MODULE_6__pages_home_home__["a" /* HomePage */],
482 575
                 __WEBPACK_IMPORTED_MODULE_7__pages_tabs_tabs__["a" /* TabsPage */],
483
-                __WEBPACK_IMPORTED_MODULE_11__pages_sign_up_sign_up__["a" /* SignUpPage */]
576
+                __WEBPACK_IMPORTED_MODULE_11__pages_sign_up_sign_up__["a" /* SignUpPage */],
577
+                __WEBPACK_IMPORTED_MODULE_16__pages_chat_chat__["a" /* ChatPage */]
484 578
             ],
485 579
             providers: [
486 580
                 __WEBPACK_IMPORTED_MODULE_8__ionic_native_status_bar__["a" /* StatusBar */],
487 581
                 __WEBPACK_IMPORTED_MODULE_9__ionic_native_splash_screen__["a" /* SplashScreen */],
488 582
                 { provide: __WEBPACK_IMPORTED_MODULE_0__angular_core__["u" /* ErrorHandler */], useClass: __WEBPACK_IMPORTED_MODULE_2_ionic_angular__["b" /* IonicErrorHandler */] },
489 583
                 __WEBPACK_IMPORTED_MODULE_12__providers_api_service_api_service__["a" /* ApiServiceProvider */],
490
-                __WEBPACK_IMPORTED_MODULE_14__providers_auth_service_auth_service__["a" /* AuthServiceProvider */]
584
+                __WEBPACK_IMPORTED_MODULE_14__providers_auth_service_auth_service__["a" /* AuthServiceProvider */],
585
+                __WEBPACK_IMPORTED_MODULE_15__providers_message_service_message_service__["a" /* MessageServiceProvider */]
491 586
             ]
492 587
         })
493 588
     ], AppModule);
@@ -498,13 +593,13 @@ var AppModule = /** @class */ (function () {
498 593
 
499 594
 /***/ }),
500 595
 
501
-/***/ 274:
596
+/***/ 275:
502 597
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
503 598
 
504 599
 "use strict";
505 600
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return MyApp; });
506 601
 /* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__angular_core__ = __webpack_require__(0);
507
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1_ionic_angular__ = __webpack_require__(25);
602
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1_ionic_angular__ = __webpack_require__(20);
508 603
 /* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__ionic_native_status_bar__ = __webpack_require__(198);
509 604
 /* harmony import */ var __WEBPACK_IMPORTED_MODULE_3__ionic_native_splash_screen__ = __webpack_require__(201);
510 605
 /* harmony import */ var __WEBPACK_IMPORTED_MODULE_4__pages_tabs_tabs__ = __webpack_require__(202);
@@ -533,7 +628,7 @@ var MyApp = /** @class */ (function () {
533 628
         });
534 629
     }
535 630
     MyApp = __decorate([
536
-        Object(__WEBPACK_IMPORTED_MODULE_0__angular_core__["m" /* Component */])({template:/*ion-inline-start:"/Users/roym/ZIPTEAM/ZipTeam/ZipTeamOrange-ionic-UI/src/app/app.html"*/'<ion-nav [root]="rootPage"></ion-nav>\n'/*ion-inline-end:"/Users/roym/ZIPTEAM/ZipTeam/ZipTeamOrange-ionic-UI/src/app/app.html"*/
631
+        Object(__WEBPACK_IMPORTED_MODULE_0__angular_core__["m" /* Component */])({template:/*ion-inline-start:"/Users/ChadH/Labs/ZipTeam/ZipTeamOrange-ionic-UI/src/app/app.html"*/'<ion-nav [root]="rootPage"></ion-nav>\n'/*ion-inline-end:"/Users/ChadH/Labs/ZipTeam/ZipTeamOrange-ionic-UI/src/app/app.html"*/
537 632
         }),
538 633
         __metadata("design:paramtypes", [__WEBPACK_IMPORTED_MODULE_1_ionic_angular__["g" /* Platform */], __WEBPACK_IMPORTED_MODULE_2__ionic_native_status_bar__["a" /* StatusBar */], __WEBPACK_IMPORTED_MODULE_3__ionic_native_splash_screen__["a" /* SplashScreen */]])
539 634
     ], MyApp);
@@ -544,13 +639,13 @@ var MyApp = /** @class */ (function () {
544 639
 
545 640
 /***/ }),
546 641
 
547
-/***/ 79:
642
+/***/ 283:
548 643
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
549 644
 
550 645
 "use strict";
551
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return HomePage; });
552
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__angular_core__ = __webpack_require__(0);
553
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1_ionic_angular__ = __webpack_require__(25);
646
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return MessageServiceProvider; });
647
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__angular_common_http__ = __webpack_require__(46);
648
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__angular_core__ = __webpack_require__(0);
554 649
 var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
555 650
     var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
556 651
     if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
@@ -562,22 +657,33 @@ var __metadata = (this && this.__metadata) || function (k, v) {
562 657
 };
563 658
 
564 659
 
565
-var HomePage = /** @class */ (function () {
566
-    function HomePage(navCtrl) {
567
-        this.navCtrl = navCtrl;
660
+/*
661
+  Generated class for the MessageServiceProvider provider.
662
+
663
+  See https://angular.io/guide/dependency-injection for more info on providers
664
+  and Angular DI.
665
+*/
666
+var MessageServiceProvider = /** @class */ (function () {
667
+    function MessageServiceProvider(http) {
668
+        this.http = http;
669
+        console.log('Hello MessageServiceProvider Provider');
568 670
     }
569
-    HomePage = __decorate([
570
-        Object(__WEBPACK_IMPORTED_MODULE_0__angular_core__["m" /* Component */])({
571
-            selector: 'page-home',template:/*ion-inline-start:"/Users/roym/ZIPTEAM/ZipTeam/ZipTeamOrange-ionic-UI/src/pages/home/home.html"*/'<ion-header>\n  <ion-navbar>\n    <ion-title>Home</ion-title>\n  </ion-navbar>\n</ion-header>\n\n<ion-content padding>\n  <h2>Welcome to Ionic!</h2>\n  <p>\n    This starter project comes with simple tabs-based layout for apps\n    that are going to primarily use a Tabbed UI.\n  </p>\n  <p>\n    Take a look at the <code>src/pages/</code> directory to add or change tabs,\n    update any existing page or create new pages.\n  </p>\n</ion-content>\n'/*ion-inline-end:"/Users/roym/ZIPTEAM/ZipTeam/ZipTeamOrange-ionic-UI/src/pages/home/home.html"*/
572
-        }),
573
-        __metadata("design:paramtypes", [__WEBPACK_IMPORTED_MODULE_1_ionic_angular__["e" /* NavController */]])
574
-    ], HomePage);
575
-    return HomePage;
671
+    MessageServiceProvider.prototype.getMessages = function () {
672
+        return this.http.get('http:localhost:8080/messages');
673
+    };
674
+    MessageServiceProvider.prototype.saveMessage = function (createAccountInfo) {
675
+        return this.http.post("http://localhost:8080/message/add", createAccountInfo);
676
+    };
677
+    MessageServiceProvider = __decorate([
678
+        Object(__WEBPACK_IMPORTED_MODULE_1__angular_core__["A" /* Injectable */])(),
679
+        __metadata("design:paramtypes", [__WEBPACK_IMPORTED_MODULE_0__angular_common_http__["a" /* HttpClient */]])
680
+    ], MessageServiceProvider);
681
+    return MessageServiceProvider;
576 682
 }());
577 683
 
578
-//# sourceMappingURL=home.js.map
684
+//# sourceMappingURL=message-service.js.map
579 685
 
580 686
 /***/ })
581 687
 
582
-},[205]);
688
+},[206]);
583 689
 //# sourceMappingURL=main.js.map

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


+ 7729
- 7728
ZipTeamOrange-ionic-UI/www/build/vendor.js
Diff nebyl zobrazen, protože je příliš veliký
Zobrazit soubor


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


+ 2
- 3
ZipTeamOrange-server/src/main/java/ZipTeamOrange/chat/Chat.java Zobrazit soubor

@@ -2,7 +2,6 @@ package ZipTeamOrange.chat;
2 2
 
3 3
 import ZipTeamOrange.message.Message;
4 4
 import ZipTeamOrange.user.User;
5
-
6 5
 import javax.persistence.*;
7 6
 import java.util.Set;
8 7
 
@@ -14,10 +13,10 @@ public class Chat {
14 13
     private Long id;
15 14
     private String name;
16 15
 
17
-    @OneToMany
16
+    @OneToMany(mappedBy = "chat")
18 17
     private Set<Message> messages;
19 18
 
20
-    @ManyToMany
19
+    @ManyToMany(mappedBy = "chat")
21 20
     private Set<User> users;
22 21
 
23 22
     public Chat(String name, Set<User> users) {

+ 5
- 5
ZipTeamOrange-server/src/main/java/ZipTeamOrange/chat/ChatController.java Zobrazit soubor

@@ -6,23 +6,23 @@ import org.springframework.web.bind.annotation.*;
6 6
 
7 7
 @Controller
8 8
 @RequestMapping(path = "/chat")
9
+@CrossOrigin(origins = {"http://localhost:8103"})
9 10
 public class ChatController {
10 11
 
11 12
     @Autowired
12 13
     private ChatRepository chatRepository;
13 14
 
14 15
     @PostMapping(path="/add")
15
-    @CrossOrigin(origins = {"http://localhost:8103"})
16 16
     public @ResponseBody
17
-    String addNewChat(@RequestBody Chat chat){
17
+    Chat addNewChat(@RequestBody Chat chat){
18 18
         chatRepository.save(chat);
19
-        return  "saved";
19
+        return  chat;
20 20
     }
21 21
 
22 22
     @GetMapping(path="/all")
23
-    public @ResponseBody Iterable<Chat> getAllChat(){
23
+    public @ResponseBody Iterable<Chat> getAllChat() {
24 24
         //this returns a JSON or XML with chats
25 25
         return chatRepository.findAll();
26
-    }
27 26
 
27
+    }
28 28
 }

+ 5
- 1
ZipTeamOrange-server/src/main/java/ZipTeamOrange/message/Message.java Zobrazit soubor

@@ -1,7 +1,7 @@
1 1
 package ZipTeamOrange.message;
2 2
 
3
+import ZipTeamOrange.chat.Chat;
3 4
 import ZipTeamOrange.user.User;
4
-
5 5
 import javax.persistence.*;
6 6
 
7 7
 @Entity
@@ -15,6 +15,10 @@ public class Message {
15 15
     @JoinColumn(name="user_id")
16 16
     User user;
17 17
 
18
+    @ManyToOne
19
+    @JoinColumn(name = "chat_id")
20
+    private Chat chat;
21
+
18 22
     public Message(String message, User user) {
19 23
         this.message = message;
20 24
         this.user = user;

+ 8
- 1
ZipTeamOrange-server/src/main/java/ZipTeamOrange/user/User.java Zobrazit soubor

@@ -1,7 +1,7 @@
1 1
 package ZipTeamOrange.user;
2 2
 
3
+import ZipTeamOrange.chat.Chat;
3 4
 import ZipTeamOrange.message.Message;
4
-
5 5
 import javax.persistence.*;
6 6
 import java.util.Set;
7 7
 
@@ -17,6 +17,13 @@ public class User {
17 17
     private String password;
18 18
     @OneToMany(mappedBy = "user")
19 19
     private Set<Message> messages;
20
+    @ManyToMany
21
+    @JoinTable(
22
+            name = "USER_CHAT",
23
+            joinColumns = { @JoinColumn(name = "user_id") },
24
+            inverseJoinColumns = { @JoinColumn(name = "chat_id") }
25
+    )
26
+    private Set<Chat> chat;
20 27
 
21 28
 
22 29
     public User() {

+ 4
- 1
ZipTeamOrange-server/src/main/resources/application.properties Zobrazit soubor

@@ -1,4 +1,7 @@
1
+#spring.jpa.properties.hibernate.dialect = org.hibernate.dialect.MySQL5Dialect
1 2
 spring.jpa.hibernate.ddl-auto=create-drop
2 3
 spring.datasource.url=jdbc:mysql://localhost:3306/ZipTeamOrange?useSSL=false
3 4
 spring.datasource.username=root
4
-spring.datasource.password=password
5
+#spring.datasource.password=password
6
+logging.level.org.hibernate.SQL=DEBUG
7
+logging.level.org.hibernate.type.descriptor.sql.BasicBinder=TRACE