Nicholas Maidanos vor 6 Jahren
Ursprung
Commit
effbb37ca4

+ 1
- 1
.sourcemaps/0.js.map Datei anzeigen

@@ -1 +1 @@
1
-{"version":3,"sources":["../../src/pages/channel/channel.module.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;AAAyC;AACO;AACR;AAUxC;IAAA;IAAgC,CAAC;IAApB,iBAAiB;QAR7B,uEAAQ,CAAC;YACR,YAAY,EAAE;gBACZ,6DAAW;aACZ;YACD,OAAO,EAAE;gBACP,sEAAe,CAAC,QAAQ,CAAC,6DAAW,CAAC;aACtC;SACF,CAAC;OACW,iBAAiB,CAAG;IAAD,wBAAC;CAAA;AAAH","file":"0.js","sourcesContent":["import { NgModule } from '@angular/core';\nimport { IonicPageModule } from 'ionic-angular';\nimport { ChannelPage } from './channel';\n\n@NgModule({\n  declarations: [\n    ChannelPage,\n  ],\n  imports: [\n    IonicPageModule.forChild(ChannelPage),\n  ],\n})\nexport class ChannelPageModule {}\n\n\n\n// WEBPACK FOOTER //\n// ./src/pages/channel/channel.module.ts"],"sourceRoot":""}
1
+{"version":3,"sources":["../../src/pages/register/register.module.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;AAAyC;AACO;AACN;AAU1C;IAAA;IAAiC,CAAC;IAArB,kBAAkB;QAR9B,uEAAQ,CAAC;YACR,YAAY,EAAE;gBACZ,+DAAY;aACb;YACD,OAAO,EAAE;gBACP,sEAAe,CAAC,QAAQ,CAAC,+DAAY,CAAC;aACvC;SACF,CAAC;OACW,kBAAkB,CAAG;IAAD,yBAAC;CAAA;AAAH","file":"0.js","sourcesContent":["import { NgModule } from '@angular/core';\nimport { IonicPageModule } from 'ionic-angular';\nimport { RegisterPage } from './register';\n\n@NgModule({\n  declarations: [\n    RegisterPage,\n  ],\n  imports: [\n    IonicPageModule.forChild(RegisterPage),\n  ],\n})\nexport class RegisterPageModule {}\n\n\n\n// WEBPACK FOOTER //\n// ./src/pages/register/register.module.ts"],"sourceRoot":""}

+ 1
- 0
.sourcemaps/1.js.map Datei anzeigen

@@ -0,0 +1 @@
1
+{"version":3,"sources":["../../src/pages/channel/channel.module.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;AAAyC;AACO;AACR;AAUxC;IAAA;IAAgC,CAAC;IAApB,iBAAiB;QAR7B,uEAAQ,CAAC;YACR,YAAY,EAAE;gBACZ,6DAAW;aACZ;YACD,OAAO,EAAE;gBACP,sEAAe,CAAC,QAAQ,CAAC,6DAAW,CAAC;aACtC;SACF,CAAC;OACW,iBAAiB,CAAG;IAAD,wBAAC;CAAA;AAAH","file":"1.js","sourcesContent":["import { NgModule } from '@angular/core';\nimport { IonicPageModule } from 'ionic-angular';\nimport { ChannelPage } from './channel';\n\n@NgModule({\n  declarations: [\n    ChannelPage,\n  ],\n  imports: [\n    IonicPageModule.forChild(ChannelPage),\n  ],\n})\nexport class ChannelPageModule {}\n\n\n\n// WEBPACK FOOTER //\n// ./src/pages/channel/channel.module.ts"],"sourceRoot":""}

+ 1
- 1
.sourcemaps/main.js.map
Datei-Diff unterdrückt, da er zu groß ist
Datei anzeigen


+ 5
- 2
src/app/app.module.ts Datei anzeigen

@@ -15,6 +15,7 @@ import { HttpModule } from '@angular/http';
15 15
 import { MessageProvider } from '../providers/message/message';
16 16
 import { ChannelProvider } from '../providers/channel/channel';
17 17
 import { UrlProvider } from '../providers/url/url';
18
+import { RegisterPage } from '../pages/register/register';
18 19
 
19 20
 
20 21
 @NgModule({
@@ -22,7 +23,8 @@ import { UrlProvider } from '../providers/url/url';
22 23
     MyApp,
23 24
     HomePage,
24 25
     ListPage,
25
-    ChannelPage
26
+    ChannelPage,
27
+    RegisterPage
26 28
   ],
27 29
   imports: [
28 30
     BrowserModule,
@@ -36,7 +38,8 @@ import { UrlProvider } from '../providers/url/url';
36 38
     MyApp,
37 39
     HomePage,
38 40
     ListPage,
39
-    ChannelPage
41
+    ChannelPage,
42
+    RegisterPage
40 43
   ],
41 44
   providers: [
42 45
     StatusBar,

+ 6
- 6
src/pages/channel/channel.html Datei anzeigen

@@ -38,12 +38,12 @@
38 38
 <ion-content padding>
39 39
 
40 40
 
41
-    <ion-list padding>
41
+    <!-- <ion-list padding>
42 42
         <h1>Channels</h1>
43 43
         <ion-item-sliding *ngFor="let channel of channels">
44 44
             <ion-item>{{channel.name}}</ion-item>
45 45
 
46
-          <!-- <ion-item-options side="right">
46
+          <ion-item-options side="right">
47 47
               <button ion-button>
48 48
                   <ion-icon name="settings"></ion-icon>
49 49
                 </button>
@@ -51,14 +51,14 @@
51 51
                 <ion-icon name="trash"></ion-icon>
52 52
               </button>
53 53
      
54
-          </ion-item-options> -->
54
+          </ion-item-options>
55 55
         </ion-item-sliding>
56 56
 
57 57
         <button>Create new Channel</button>
58 58
         
59
-        <!-- <ion-item>Todo 2</ion-item>
60
-        <ion-item>Todo 3</ion-item> -->
61
-      </ion-list>
59
+        <ion-item>Todo 2</ion-item>
60
+        <ion-item>Todo 3</ion-item>
61
+      </ion-list> -->
62 62
 
63 63
     <ion-list padding>
64 64
       <ion-item-sliding *ngFor="let message of messages">

+ 16
- 3
src/pages/channel/channel.ts Datei anzeigen

@@ -21,6 +21,8 @@ export class ChannelPage {
21 21
   public messages=[];
22 22
   public channels=[];
23 23
 
24
+  private timerToken: number;
25
+
24 26
   private currentChannel = {"id":1};
25 27
 
26 28
   setCurrentChannel(currentChannel){
@@ -42,6 +44,12 @@ export class ChannelPage {
42 44
 
43 45
   ionViewDidLoad() {
44 46
     console.log('ionViewDidLoad ChannelPage');
47
+    this.start();
48
+  }
49
+
50
+
51
+  start() {
52
+    this.timerToken = setInterval( ()=> this.runningLoopOfMessages(this.channelProvider), 500);
45 53
   }
46 54
 
47 55
   getMessages(){
@@ -51,14 +59,19 @@ export class ChannelPage {
51 59
   }
52 60
 
53 61
   getChannels(){
54
-    this.channelProvider.get(channels => {
62
+    this.timerToken = setInterval(this.channelProvider.get(channels => {
55 63
       this.channels = channels;
64
+    }), 5000);
65
+  }
66
+  
67
+  runningLoopOfMessages(channelProvider: ChannelProvider) {
68
+    this.messageProvider.get(1, after => {
69
+      this.messages = after.json();
56 70
     });
57 71
   }
58
- 
59 72
   deleteMessage(messageId: number){
60 73
     this.messageProvider.delete(messageId, after =>{
61
-      this.getMessages();
74
+      //this.getMessages();
62 75
     });
63 76
   }
64 77
 

+ 3
- 3
src/pages/home/home.html Datei anzeigen

@@ -47,13 +47,13 @@
47 47
 <!-- line break -->
48 48
 <br>
49 49
 
50
-<button ion-button color="danger" round>Sign Up</button>
50
+<button ion-button color="danger" (click)="registerPage()" round>Sign Up</button>
51 51
 
52 52
 
53 53
 </form>
54 54
 
55 55
 
56
-  <!-- <form [formGroup]="loginform" (ngSubmit)="sendLogin(loginForm.value)" *ngIf="loginForm">
56
+  <form [formGroup]="loginform" (ngSubmit)="sendLogin(loginForm.value)" *ngIf="loginForm">
57 57
 
58 58
     <ion-label fixed>Username</ion-label>
59 59
     <input type="text" name="name" formControlName="username">
@@ -62,7 +62,7 @@
62 62
     <input type="text" name="name" formControlName="password">
63 63
 
64 64
     <input type="submit" class="cta-btn filled" value="Submit" [disabled]="!loginForm.valid">
65
-   </form> -->
65
+   </form>
66 66
 
67 67
 
68 68
 

+ 5
- 1
src/pages/home/home.ts Datei anzeigen

@@ -4,6 +4,7 @@ import { ChannelPage } from '../channel/channel';
4 4
 import { FormGroup, FormBuilder, Validators, AbstractControl } from '@angular/forms';
5 5
 import { UserProvider } from '../../providers/user/user';
6 6
 import { MessageProvider } from '../../providers/message/message';
7
+import { RegisterPage } from '../register/register';
7 8
 
8 9
 
9 10
 
@@ -54,8 +55,11 @@ export class HomePage {
54 55
   }
55 56
 
56 57
 
57
-  setLoginForm() {
58
+  registerPage(){
59
+    this.navCtrl.push(RegisterPage);
60
+  }
58 61
 
62
+  setLoginForm() {
59 63
   }
60 64
 
61 65
 

+ 36
- 0
src/pages/register/register.html Datei anzeigen

@@ -0,0 +1,36 @@
1
+<ion-header>
2
+
3
+  <ion-navbar>
4
+    <ion-title>Register</ion-title>
5
+  </ion-navbar>
6
+
7
+</ion-header>
8
+
9
+
10
+<ion-content text-center class="register">
11
+  <ion-list>
12
+    <ion-item>
13
+      <ion-label fixed>Username</ion-label>
14
+      <ion-input type="text"></ion-input>
15
+    </ion-item>
16
+    <ion-item>
17
+      <ion-label fixed>First Name</ion-label>
18
+      <ion-input type="text"></ion-input>
19
+    </ion-item>
20
+    <ion-item>
21
+      <ion-label fixed>Last Name</ion-label>
22
+      <ion-input type="text"></ion-input>
23
+    </ion-item>
24
+    <ion-item>
25
+      <ion-label fixed>Password</ion-label>
26
+      <ion-input type="text"></ion-input>
27
+    </ion-item>
28
+    <ion-item>
29
+      <ion-label fixed>Email</ion-label>
30
+      <ion-input type="text"></ion-input>
31
+    </ion-item>
32
+  </ion-list>
33
+  <button ion-button color="danger" round (click)="register()">Confirm</button>
34
+  <br>
35
+  <button ion-button color="danger" round (click)="cancel()">Cancel</button>
36
+</ion-content>

+ 13
- 0
src/pages/register/register.module.ts Datei anzeigen

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

+ 8
- 0
src/pages/register/register.scss Datei anzeigen

@@ -0,0 +1,8 @@
1
+page-register {
2
+    .register {
3
+        background: url("../assets/imgs/background.jpg");
4
+        background-repeat: no-repeat;
5
+        background-position: center;
6
+        background-size: cover;
7
+    }
8
+}

+ 30
- 0
src/pages/register/register.ts Datei anzeigen

@@ -0,0 +1,30 @@
1
+import { Component } from '@angular/core';
2
+import { IonicPage, NavController, NavParams } from 'ionic-angular';
3
+
4
+
5
+@IonicPage()
6
+@Component({
7
+  selector: 'page-register',
8
+  templateUrl: 'register.html',
9
+})
10
+export class RegisterPage {
11
+
12
+  constructor(
13
+    public navCtrl: NavController,
14
+     public navParams: NavParams
15
+    ) {
16
+  }
17
+
18
+  ionViewDidLoad() {
19
+    console.log('ionViewDidLoad RegisterPage');
20
+  }
21
+
22
+  cancel() {
23
+    this.navCtrl.popToRoot();
24
+  }
25
+
26
+  register() {
27
+    this.navCtrl.popToRoot();
28
+  }
29
+
30
+}

+ 2
- 0
src/providers/channel/channel.ts Datei anzeigen

@@ -12,6 +12,8 @@ import { Http, RequestOptions, Headers } from '../../../node_modules/@angular/ht
12 12
 @Injectable()
13 13
 export class ChannelProvider {
14 14
 
15
+  
16
+
15 17
   constructor(
16 18
     public http: Http,
17 19
     public userProvider: UserProvider

+ 2
- 2
src/providers/url/url.ts Datei anzeigen

@@ -14,8 +14,8 @@ export class UrlProvider {
14 14
   //   console.log('Hello UrlProvider Provider');
15 15
   // }
16 16
 
17
-  private baseUrl = "http://localhost:8080";
18
-  //private baseUrl = "https://zipteampurple.herokuapp.com";
17
+  //private baseUrl = "http://localhost:8080";
18
+  private baseUrl = "https://zipteampurple.herokuapp.com";
19 19
 
20 20
   setBaseUrl(baseUrl: string){
21 21
     this.baseUrl = baseUrl;

+ 12
- 12
www/build/0.js Datei anzeigen

@@ -1,14 +1,14 @@
1 1
 webpackJsonp([0],{
2 2
 
3
-/***/ 281:
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__, "ChannelPageModule", function() { return ChannelPageModule; });
8
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "RegisterPageModule", function() { return RegisterPageModule; });
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__(32);
11
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__channel__ = __webpack_require__(52);
10
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1_ionic_angular__ = __webpack_require__(29);
11
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__register__ = __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 ChannelPageModule = /** @class */ (function () {
22
-    function ChannelPageModule() {
21
+var RegisterPageModule = /** @class */ (function () {
22
+    function RegisterPageModule() {
23 23
     }
24
-    ChannelPageModule = __decorate([
24
+    RegisterPageModule = __decorate([
25 25
         Object(__WEBPACK_IMPORTED_MODULE_0__angular_core__["I" /* NgModule */])({
26 26
             declarations: [
27
-                __WEBPACK_IMPORTED_MODULE_2__channel__["a" /* ChannelPage */],
27
+                __WEBPACK_IMPORTED_MODULE_2__register__["a" /* RegisterPage */],
28 28
             ],
29 29
             imports: [
30
-                __WEBPACK_IMPORTED_MODULE_1_ionic_angular__["e" /* IonicPageModule */].forChild(__WEBPACK_IMPORTED_MODULE_2__channel__["a" /* ChannelPage */]),
30
+                __WEBPACK_IMPORTED_MODULE_1_ionic_angular__["e" /* IonicPageModule */].forChild(__WEBPACK_IMPORTED_MODULE_2__register__["a" /* RegisterPage */]),
31 31
             ],
32 32
         })
33
-    ], ChannelPageModule);
34
-    return ChannelPageModule;
33
+    ], RegisterPageModule);
34
+    return RegisterPageModule;
35 35
 }());
36 36
 
37
-//# sourceMappingURL=channel.module.js.map
37
+//# sourceMappingURL=register.module.js.map
38 38
 
39 39
 /***/ })
40 40
 

+ 1
- 1
www/build/0.js.map Datei anzeigen

@@ -1 +1 @@
1
-{"version":3,"sources":["../../src/pages/channel/channel.module.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;AAAyC;AACO;AACR;AAUxC;IAAA;IAAgC,CAAC;IAApB,iBAAiB;QAR7B,uEAAQ,CAAC;YACR,YAAY,EAAE;gBACZ,6DAAW;aACZ;YACD,OAAO,EAAE;gBACP,sEAAe,CAAC,QAAQ,CAAC,6DAAW,CAAC;aACtC;SACF,CAAC;OACW,iBAAiB,CAAG;IAAD,wBAAC;CAAA;AAAH","file":"0.js","sourcesContent":["import { NgModule } from '@angular/core';\nimport { IonicPageModule } from 'ionic-angular';\nimport { ChannelPage } from './channel';\n\n@NgModule({\n  declarations: [\n    ChannelPage,\n  ],\n  imports: [\n    IonicPageModule.forChild(ChannelPage),\n  ],\n})\nexport class ChannelPageModule {}\n\n\n\n// WEBPACK FOOTER //\n// ./src/pages/channel/channel.module.ts"],"sourceRoot":""}
1
+{"version":3,"sources":["../../src/pages/register/register.module.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;AAAyC;AACO;AACN;AAU1C;IAAA;IAAiC,CAAC;IAArB,kBAAkB;QAR9B,uEAAQ,CAAC;YACR,YAAY,EAAE;gBACZ,+DAAY;aACb;YACD,OAAO,EAAE;gBACP,sEAAe,CAAC,QAAQ,CAAC,+DAAY,CAAC;aACvC;SACF,CAAC;OACW,kBAAkB,CAAG;IAAD,yBAAC;CAAA;AAAH","file":"0.js","sourcesContent":["import { NgModule } from '@angular/core';\nimport { IonicPageModule } from 'ionic-angular';\nimport { RegisterPage } from './register';\n\n@NgModule({\n  declarations: [\n    RegisterPage,\n  ],\n  imports: [\n    IonicPageModule.forChild(RegisterPage),\n  ],\n})\nexport class RegisterPageModule {}\n\n\n\n// WEBPACK FOOTER //\n// ./src/pages/register/register.module.ts"],"sourceRoot":""}

+ 42
- 0
www/build/1.js Datei anzeigen

@@ -0,0 +1,42 @@
1
+webpackJsonp([1],{
2
+
3
+/***/ 282:
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__, "ChannelPageModule", function() { return ChannelPageModule; });
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__(29);
11
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__channel__ = __webpack_require__(52);
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 ChannelPageModule = /** @class */ (function () {
22
+    function ChannelPageModule() {
23
+    }
24
+    ChannelPageModule = __decorate([
25
+        Object(__WEBPACK_IMPORTED_MODULE_0__angular_core__["I" /* NgModule */])({
26
+            declarations: [
27
+                __WEBPACK_IMPORTED_MODULE_2__channel__["a" /* ChannelPage */],
28
+            ],
29
+            imports: [
30
+                __WEBPACK_IMPORTED_MODULE_1_ionic_angular__["e" /* IonicPageModule */].forChild(__WEBPACK_IMPORTED_MODULE_2__channel__["a" /* ChannelPage */]),
31
+            ],
32
+        })
33
+    ], ChannelPageModule);
34
+    return ChannelPageModule;
35
+}());
36
+
37
+//# sourceMappingURL=channel.module.js.map
38
+
39
+/***/ })
40
+
41
+});
42
+//# sourceMappingURL=1.js.map

+ 1
- 0
www/build/1.js.map Datei anzeigen

@@ -0,0 +1 @@
1
+{"version":3,"sources":["../../src/pages/channel/channel.module.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;AAAyC;AACO;AACR;AAUxC;IAAA;IAAgC,CAAC;IAApB,iBAAiB;QAR7B,uEAAQ,CAAC;YACR,YAAY,EAAE;gBACZ,6DAAW;aACZ;YACD,OAAO,EAAE;gBACP,sEAAe,CAAC,QAAQ,CAAC,6DAAW,CAAC;aACtC;SACF,CAAC;OACW,iBAAiB,CAAG;IAAD,wBAAC;CAAA;AAAH","file":"1.js","sourcesContent":["import { NgModule } from '@angular/core';\nimport { IonicPageModule } from 'ionic-angular';\nimport { ChannelPage } from './channel';\n\n@NgModule({\n  declarations: [\n    ChannelPage,\n  ],\n  imports: [\n    IonicPageModule.forChild(ChannelPage),\n  ],\n})\nexport class ChannelPageModule {}\n\n\n\n// WEBPACK FOOTER //\n// ./src/pages/channel/channel.module.ts"],"sourceRoot":""}

+ 7
- 0
www/build/main.css Datei anzeigen

@@ -25692,3 +25692,10 @@ page-home img.rounded-corners {
25692 25692
 page-home .scroll-content {
25693 25693
   overflow: hidden;
25694 25694
 }
25695
+
25696
+page-register .register {
25697
+  background: url("../assets/imgs/background.jpg");
25698
+  background-repeat: no-repeat;
25699
+  background-position: center;
25700
+  background-size: cover;
25701
+}

+ 119
- 49
www/build/main.js Datei anzeigen

@@ -1,6 +1,52 @@
1
-webpackJsonp([1],{
1
+webpackJsonp([2],{
2 2
 
3
-/***/ 114:
3
+/***/ 103:
4
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
5
+
6
+"use strict";
7
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return RegisterPage; });
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__(29);
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
+var RegisterPage = /** @class */ (function () {
22
+    function RegisterPage(navCtrl, navParams) {
23
+        this.navCtrl = navCtrl;
24
+        this.navParams = navParams;
25
+    }
26
+    RegisterPage.prototype.ionViewDidLoad = function () {
27
+        console.log('ionViewDidLoad RegisterPage');
28
+    };
29
+    RegisterPage.prototype.cancel = function () {
30
+        this.navCtrl.popToRoot();
31
+    };
32
+    RegisterPage.prototype.register = function () {
33
+        this.navCtrl.popToRoot();
34
+    };
35
+    RegisterPage = __decorate([
36
+        Object(__WEBPACK_IMPORTED_MODULE_0__angular_core__["m" /* Component */])({
37
+            selector: 'page-register',template:/*ion-inline-start:"/Users/nicholasm/Labs/ZipTeamPurple-FrontEnd/src/pages/register/register.html"*/'<ion-header>\n\n  <ion-navbar>\n    <ion-title>Register</ion-title>\n  </ion-navbar>\n\n</ion-header>\n\n\n<ion-content text-center class="register">\n  <ion-list>\n    <ion-item>\n      <ion-label fixed>Username</ion-label>\n      <ion-input type="text"></ion-input>\n    </ion-item>\n    <ion-item>\n      <ion-label fixed>First Name</ion-label>\n      <ion-input type="text"></ion-input>\n    </ion-item>\n    <ion-item>\n      <ion-label fixed>Last Name</ion-label>\n      <ion-input type="text"></ion-input>\n    </ion-item>\n    <ion-item>\n      <ion-label fixed>Password</ion-label>\n      <ion-input type="text"></ion-input>\n    </ion-item>\n    <ion-item>\n      <ion-label fixed>Email</ion-label>\n      <ion-input type="text"></ion-input>\n    </ion-item>\n  </ion-list>\n  <button ion-button color="danger" round (click)="register()">Confirm</button>\n  <br>\n  <button ion-button color="danger" round (click)="cancel()">Cancel</button>\n</ion-content>'/*ion-inline-end:"/Users/nicholasm/Labs/ZipTeamPurple-FrontEnd/src/pages/register/register.html"*/,
38
+        }),
39
+        __metadata("design:paramtypes", [__WEBPACK_IMPORTED_MODULE_1_ionic_angular__["g" /* NavController */],
40
+            __WEBPACK_IMPORTED_MODULE_1_ionic_angular__["h" /* NavParams */]])
41
+    ], RegisterPage);
42
+    return RegisterPage;
43
+}());
44
+
45
+//# sourceMappingURL=register.js.map
46
+
47
+/***/ }),
48
+
49
+/***/ 115:
4 50
 /***/ (function(module, exports) {
5 51
 
6 52
 function webpackEmptyAsyncContext(req) {
@@ -13,16 +59,20 @@ function webpackEmptyAsyncContext(req) {
13 59
 webpackEmptyAsyncContext.keys = function() { return []; };
14 60
 webpackEmptyAsyncContext.resolve = webpackEmptyAsyncContext;
15 61
 module.exports = webpackEmptyAsyncContext;
16
-webpackEmptyAsyncContext.id = 114;
62
+webpackEmptyAsyncContext.id = 115;
17 63
 
18 64
 /***/ }),
19 65
 
20
-/***/ 156:
66
+/***/ 157:
21 67
 /***/ (function(module, exports, __webpack_require__) {
22 68
 
23 69
 var map = {
24 70
 	"../pages/channel/channel.module": [
25
-		281,
71
+		282,
72
+		1
73
+	],
74
+	"../pages/register/register.module": [
75
+		283,
26 76
 		0
27 77
 	]
28 78
 };
@@ -37,12 +87,12 @@ function webpackAsyncContext(req) {
37 87
 webpackAsyncContext.keys = function webpackAsyncContextKeys() {
38 88
 	return Object.keys(map);
39 89
 };
40
-webpackAsyncContext.id = 156;
90
+webpackAsyncContext.id = 157;
41 91
 module.exports = webpackAsyncContext;
42 92
 
43 93
 /***/ }),
44 94
 
45
-/***/ 157:
95
+/***/ 158:
46 96
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
47 97
 
48 98
 "use strict";
@@ -143,7 +193,7 @@ var MessageProvider = /** @class */ (function () {
143 193
 
144 194
 /***/ }),
145 195
 
146
-/***/ 158:
196
+/***/ 159:
147 197
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
148 198
 
149 199
 "use strict";
@@ -190,26 +240,27 @@ var ChannelProvider = /** @class */ (function () {
190 240
     };
191 241
     ChannelProvider = __decorate([
192 242
         Object(__WEBPACK_IMPORTED_MODULE_0__angular_core__["A" /* Injectable */])(),
193
-        __metadata("design:paramtypes", [__WEBPACK_IMPORTED_MODULE_2__node_modules_angular_http__["b" /* Http */],
194
-            __WEBPACK_IMPORTED_MODULE_1__user_user__["a" /* UserProvider */]])
243
+        __metadata("design:paramtypes", [typeof (_a = typeof __WEBPACK_IMPORTED_MODULE_2__node_modules_angular_http__["b" /* Http */] !== "undefined" && __WEBPACK_IMPORTED_MODULE_2__node_modules_angular_http__["b" /* Http */]) === "function" && _a || Object, typeof (_b = typeof __WEBPACK_IMPORTED_MODULE_1__user_user__["a" /* UserProvider */] !== "undefined" && __WEBPACK_IMPORTED_MODULE_1__user_user__["a" /* UserProvider */]) === "function" && _b || Object])
195 244
     ], ChannelProvider);
196 245
     return ChannelProvider;
246
+    var _a, _b;
197 247
 }());
198 248
 
199 249
 //# sourceMappingURL=channel.js.map
200 250
 
201 251
 /***/ }),
202 252
 
203
-/***/ 202:
253
+/***/ 203:
204 254
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
205 255
 
206 256
 "use strict";
207 257
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return HomePage; });
208 258
 /* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__angular_core__ = __webpack_require__(0);
209
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1_ionic_angular__ = __webpack_require__(32);
259
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1_ionic_angular__ = __webpack_require__(29);
210 260
 /* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__channel_channel__ = __webpack_require__(52);
211 261
 /* harmony import */ var __WEBPACK_IMPORTED_MODULE_3__angular_forms__ = __webpack_require__(15);
212 262
 /* harmony import */ var __WEBPACK_IMPORTED_MODULE_4__providers_user_user__ = __webpack_require__(47);
263
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_5__register_register__ = __webpack_require__(103);
213 264
 var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
214 265
     var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
215 266
     if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
@@ -224,6 +275,7 @@ var __metadata = (this && this.__metadata) || function (k, v) {
224 275
 
225 276
 
226 277
 
278
+
227 279
 var HomePage = /** @class */ (function () {
228 280
     function HomePage(navCtrl, formbuilder, userprovider) {
229 281
         this.navCtrl = navCtrl;
@@ -252,11 +304,14 @@ var HomePage = /** @class */ (function () {
252 304
             }
253 305
         });
254 306
     };
307
+    HomePage.prototype.registerPage = function () {
308
+        this.navCtrl.push(__WEBPACK_IMPORTED_MODULE_5__register_register__["a" /* RegisterPage */]);
309
+    };
255 310
     HomePage.prototype.setLoginForm = function () {
256 311
     };
257 312
     HomePage = __decorate([
258 313
         Object(__WEBPACK_IMPORTED_MODULE_0__angular_core__["m" /* Component */])({
259
-            selector: 'page-home',template:/*ion-inline-start:"/Users/nicholasm/Labs/ZipTeamPurple-FrontEnd/src/pages/home/home.html"*/'<ion-header>\n</ion-header>\n\n\n\n<ion-content text-center class = "login">\n\n  <br><br><br><br><br>\n  <img src="../assets/imgs/fullLogo.png" alt="SLACK" class="rounded-corners">\n\n  <br><br><br><br>\n  \n\n\n  <form [formGroup]="formgroup" (ngSubmit)="sendLogin(formgroup.value)">\n\n<ion-list>\n\n  <ion-item text-center>\n\n\n    <ion-label fixed>Username</ion-label>\n    <ion-input type="text" formControlName="username"></ion-input>\n  </ion-item>\n\n  <ion-item text-center *ngIf="username.hasError(\'required\') && username.touched">\n    <p> *Please enter your username</p>\n  </ion-item>\n\n  <ion-item text-center>\n    <ion-label fixed>Password</ion-label>\n    <ion-input type="password" formControlName="password"></ion-input>\n  </ion-item>\n\n  <ion-item text-center *ngIf="password.hasError(\'required\') && password.touched">\n      <p> *Please enter your password</p>\n    </ion-item>\n\n\n</ion-list>\n\n\n\n\n<button ion-button color="danger" round type="submit">Login</button>\n\n<!-- line break -->\n<br>\n\n<button ion-button color="danger" round>Sign Up</button>\n\n\n</form>\n\n\n  <!-- <form [formGroup]="loginform" (ngSubmit)="sendLogin(loginForm.value)" *ngIf="loginForm">\n\n    <ion-label fixed>Username</ion-label>\n    <input type="text" name="name" formControlName="username">\n\n    <ion-label fixed>Password</ion-label>\n    <input type="text" name="name" formControlName="password">\n\n    <input type="submit" class="cta-btn filled" value="Submit" [disabled]="!loginForm.valid">\n   </form> -->\n\n\n\n\n\n  <!-- Toggle menu button -->\n  <!-- <br> -->\n  <button ion-button secondary menuToggle>Toggle Menu</button> \n  \n</ion-content>\n'/*ion-inline-end:"/Users/nicholasm/Labs/ZipTeamPurple-FrontEnd/src/pages/home/home.html"*/
314
+            selector: 'page-home',template:/*ion-inline-start:"/Users/nicholasm/Labs/ZipTeamPurple-FrontEnd/src/pages/home/home.html"*/'<ion-header>\n</ion-header>\n\n\n\n<ion-content text-center class = "login">\n\n  <br><br><br><br><br>\n  <img src="../assets/imgs/fullLogo.png" alt="SLACK" class="rounded-corners">\n\n  <br><br><br><br>\n  \n\n\n  <form [formGroup]="formgroup" (ngSubmit)="sendLogin(formgroup.value)">\n\n<ion-list>\n\n  <ion-item text-center>\n\n\n    <ion-label fixed>Username</ion-label>\n    <ion-input type="text" formControlName="username"></ion-input>\n  </ion-item>\n\n  <ion-item text-center *ngIf="username.hasError(\'required\') && username.touched">\n    <p> *Please enter your username</p>\n  </ion-item>\n\n  <ion-item text-center>\n    <ion-label fixed>Password</ion-label>\n    <ion-input type="password" formControlName="password"></ion-input>\n  </ion-item>\n\n  <ion-item text-center *ngIf="password.hasError(\'required\') && password.touched">\n      <p> *Please enter your password</p>\n    </ion-item>\n\n\n</ion-list>\n\n\n\n\n<button ion-button color="danger" round type="submit">Login</button>\n\n<!-- line break -->\n<br>\n\n<button ion-button color="danger" (click)="registerPage()" round>Sign Up</button>\n\n\n</form>\n\n\n  <form [formGroup]="loginform" (ngSubmit)="sendLogin(loginForm.value)" *ngIf="loginForm">\n\n    <ion-label fixed>Username</ion-label>\n    <input type="text" name="name" formControlName="username">\n\n    <ion-label fixed>Password</ion-label>\n    <input type="text" name="name" formControlName="password">\n\n    <input type="submit" class="cta-btn filled" value="Submit" [disabled]="!loginForm.valid">\n   </form>\n\n\n\n\n\n  <!-- Toggle menu button -->\n  <!-- <br> -->\n  <button ion-button secondary menuToggle>Toggle Menu</button> \n  \n</ion-content>\n'/*ion-inline-end:"/Users/nicholasm/Labs/ZipTeamPurple-FrontEnd/src/pages/home/home.html"*/
260 315
         }),
261 316
         __metadata("design:paramtypes", [__WEBPACK_IMPORTED_MODULE_1_ionic_angular__["g" /* NavController */], __WEBPACK_IMPORTED_MODULE_3__angular_forms__["a" /* FormBuilder */], __WEBPACK_IMPORTED_MODULE_4__providers_user_user__["a" /* UserProvider */]])
262 317
     ], HomePage);
@@ -267,13 +322,13 @@ var HomePage = /** @class */ (function () {
267 322
 
268 323
 /***/ }),
269 324
 
270
-/***/ 203:
325
+/***/ 204:
271 326
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
272 327
 
273 328
 "use strict";
274 329
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return ListPage; });
275 330
 /* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__angular_core__ = __webpack_require__(0);
276
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1_ionic_angular__ = __webpack_require__(32);
331
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1_ionic_angular__ = __webpack_require__(29);
277 332
 var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
278 333
     var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
279 334
     if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
@@ -324,13 +379,13 @@ var ListPage = /** @class */ (function () {
324 379
 
325 380
 /***/ }),
326 381
 
327
-/***/ 204:
382
+/***/ 205:
328 383
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
329 384
 
330 385
 "use strict";
331 386
 Object.defineProperty(__webpack_exports__, "__esModule", { value: true });
332
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__angular_platform_browser_dynamic__ = __webpack_require__(205);
333
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__app_module__ = __webpack_require__(225);
387
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__angular_platform_browser_dynamic__ = __webpack_require__(206);
388
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__app_module__ = __webpack_require__(226);
334 389
 
335 390
 
336 391
 Object(__WEBPACK_IMPORTED_MODULE_0__angular_platform_browser_dynamic__["a" /* platformBrowserDynamic */])().bootstrapModule(__WEBPACK_IMPORTED_MODULE_1__app_module__["a" /* AppModule */]);
@@ -338,26 +393,27 @@ Object(__WEBPACK_IMPORTED_MODULE_0__angular_platform_browser_dynamic__["a" /* pl
338 393
 
339 394
 /***/ }),
340 395
 
341
-/***/ 225:
396
+/***/ 226:
342 397
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
343 398
 
344 399
 "use strict";
345 400
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return AppModule; });
346 401
 /* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__angular_platform_browser__ = __webpack_require__(26);
347 402
 /* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__angular_core__ = __webpack_require__(0);
348
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2_ionic_angular__ = __webpack_require__(32);
349
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_3__app_component__ = __webpack_require__(267);
350
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_4__pages_home_home__ = __webpack_require__(202);
351
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_5__pages_list_list__ = __webpack_require__(203);
403
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2_ionic_angular__ = __webpack_require__(29);
404
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_3__app_component__ = __webpack_require__(268);
405
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_4__pages_home_home__ = __webpack_require__(203);
406
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_5__pages_list_list__ = __webpack_require__(204);
352 407
 /* harmony import */ var __WEBPACK_IMPORTED_MODULE_6__pages_channel_channel__ = __webpack_require__(52);
353
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_7__ionic_native_status_bar__ = __webpack_require__(198);
354
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_8__ionic_native_splash_screen__ = __webpack_require__(201);
408
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_7__ionic_native_status_bar__ = __webpack_require__(199);
409
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_8__ionic_native_splash_screen__ = __webpack_require__(202);
355 410
 /* harmony import */ var __WEBPACK_IMPORTED_MODULE_9__providers_user_user__ = __webpack_require__(47);
356
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_10__angular_common_http__ = __webpack_require__(275);
411
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_10__angular_common_http__ = __webpack_require__(276);
357 412
 /* harmony import */ var __WEBPACK_IMPORTED_MODULE_11__angular_http__ = __webpack_require__(46);
358
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_12__providers_message_message__ = __webpack_require__(157);
359
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_13__providers_channel_channel__ = __webpack_require__(158);
413
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_12__providers_message_message__ = __webpack_require__(158);
414
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_13__providers_channel_channel__ = __webpack_require__(159);
360 415
 /* harmony import */ var __WEBPACK_IMPORTED_MODULE_14__providers_url_url__ = __webpack_require__(80);
416
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_15__pages_register_register__ = __webpack_require__(103);
361 417
 var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
362 418
     var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
363 419
     if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
@@ -379,6 +435,7 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
379 435
 
380 436
 
381 437
 
438
+
382 439
 var AppModule = /** @class */ (function () {
383 440
     function AppModule() {
384 441
     }
@@ -388,13 +445,15 @@ var AppModule = /** @class */ (function () {
388 445
                 __WEBPACK_IMPORTED_MODULE_3__app_component__["a" /* MyApp */],
389 446
                 __WEBPACK_IMPORTED_MODULE_4__pages_home_home__["a" /* HomePage */],
390 447
                 __WEBPACK_IMPORTED_MODULE_5__pages_list_list__["a" /* ListPage */],
391
-                __WEBPACK_IMPORTED_MODULE_6__pages_channel_channel__["a" /* ChannelPage */]
448
+                __WEBPACK_IMPORTED_MODULE_6__pages_channel_channel__["a" /* ChannelPage */],
449
+                __WEBPACK_IMPORTED_MODULE_15__pages_register_register__["a" /* RegisterPage */]
392 450
             ],
393 451
             imports: [
394 452
                 __WEBPACK_IMPORTED_MODULE_0__angular_platform_browser__["a" /* BrowserModule */],
395 453
                 __WEBPACK_IMPORTED_MODULE_2_ionic_angular__["d" /* IonicModule */].forRoot(__WEBPACK_IMPORTED_MODULE_3__app_component__["a" /* MyApp */], {}, {
396 454
                     links: [
397
-                        { loadChildren: '../pages/channel/channel.module#ChannelPageModule', name: 'ChannelPage', segment: 'channel', priority: 'low', defaultHistory: [] }
455
+                        { loadChildren: '../pages/channel/channel.module#ChannelPageModule', name: 'ChannelPage', segment: 'channel', priority: 'low', defaultHistory: [] },
456
+                        { loadChildren: '../pages/register/register.module#RegisterPageModule', name: 'RegisterPage', segment: 'register', priority: 'low', defaultHistory: [] }
398 457
                     ]
399 458
                 }),
400 459
                 __WEBPACK_IMPORTED_MODULE_10__angular_common_http__["a" /* HttpClientModule */],
@@ -405,7 +464,8 @@ var AppModule = /** @class */ (function () {
405 464
                 __WEBPACK_IMPORTED_MODULE_3__app_component__["a" /* MyApp */],
406 465
                 __WEBPACK_IMPORTED_MODULE_4__pages_home_home__["a" /* HomePage */],
407 466
                 __WEBPACK_IMPORTED_MODULE_5__pages_list_list__["a" /* ListPage */],
408
-                __WEBPACK_IMPORTED_MODULE_6__pages_channel_channel__["a" /* ChannelPage */]
467
+                __WEBPACK_IMPORTED_MODULE_6__pages_channel_channel__["a" /* ChannelPage */],
468
+                __WEBPACK_IMPORTED_MODULE_15__pages_register_register__["a" /* RegisterPage */]
409 469
             ],
410 470
             providers: [
411 471
                 __WEBPACK_IMPORTED_MODULE_7__ionic_native_status_bar__["a" /* StatusBar */],
@@ -425,17 +485,17 @@ var AppModule = /** @class */ (function () {
425 485
 
426 486
 /***/ }),
427 487
 
428
-/***/ 267:
488
+/***/ 268:
429 489
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
430 490
 
431 491
 "use strict";
432 492
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return MyApp; });
433 493
 /* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__angular_core__ = __webpack_require__(0);
434
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1_ionic_angular__ = __webpack_require__(32);
435
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__ionic_native_status_bar__ = __webpack_require__(198);
436
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_3__ionic_native_splash_screen__ = __webpack_require__(201);
437
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_4__pages_home_home__ = __webpack_require__(202);
438
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_5__pages_list_list__ = __webpack_require__(203);
494
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1_ionic_angular__ = __webpack_require__(29);
495
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__ionic_native_status_bar__ = __webpack_require__(199);
496
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_3__ionic_native_splash_screen__ = __webpack_require__(202);
497
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_4__pages_home_home__ = __webpack_require__(203);
498
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_5__pages_list_list__ = __webpack_require__(204);
439 499
 /* harmony import */ var __WEBPACK_IMPORTED_MODULE_6__pages_channel_channel__ = __webpack_require__(52);
440 500
 var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
441 501
     var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
@@ -548,10 +608,10 @@ var UserProvider = /** @class */ (function () {
548 608
     };
549 609
     UserProvider = __decorate([
550 610
         Object(__WEBPACK_IMPORTED_MODULE_0__angular_core__["A" /* Injectable */])(),
551
-        __metadata("design:paramtypes", [typeof (_a = typeof __WEBPACK_IMPORTED_MODULE_1__angular_http__["b" /* Http */] !== "undefined" && __WEBPACK_IMPORTED_MODULE_1__angular_http__["b" /* Http */]) === "function" && _a || Object, typeof (_b = typeof __WEBPACK_IMPORTED_MODULE_2__url_url__["a" /* UrlProvider */] !== "undefined" && __WEBPACK_IMPORTED_MODULE_2__url_url__["a" /* UrlProvider */]) === "function" && _b || Object])
611
+        __metadata("design:paramtypes", [__WEBPACK_IMPORTED_MODULE_1__angular_http__["b" /* Http */],
612
+            __WEBPACK_IMPORTED_MODULE_2__url_url__["a" /* UrlProvider */]])
552 613
     ], UserProvider);
553 614
     return UserProvider;
554
-    var _a, _b;
555 615
 }());
556 616
 
557 617
 //# sourceMappingURL=user.js.map
@@ -564,9 +624,9 @@ var UserProvider = /** @class */ (function () {
564 624
 "use strict";
565 625
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return ChannelPage; });
566 626
 /* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__angular_core__ = __webpack_require__(0);
567
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1_ionic_angular__ = __webpack_require__(32);
568
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__providers_message_message__ = __webpack_require__(157);
569
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_3__providers_channel_channel__ = __webpack_require__(158);
627
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1_ionic_angular__ = __webpack_require__(29);
628
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__providers_message_message__ = __webpack_require__(158);
629
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_3__providers_channel_channel__ = __webpack_require__(159);
570 630
 var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
571 631
     var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
572 632
     if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
@@ -607,6 +667,11 @@ var ChannelPage = /** @class */ (function () {
607 667
     };
608 668
     ChannelPage.prototype.ionViewDidLoad = function () {
609 669
         console.log('ionViewDidLoad ChannelPage');
670
+        this.start();
671
+    };
672
+    ChannelPage.prototype.start = function () {
673
+        var _this = this;
674
+        this.timerToken = setInterval(function () { return _this.runningLoopOfMessages(_this.channelProvider); }, 500);
610 675
     };
611 676
     ChannelPage.prototype.getMessages = function () {
612 677
         var _this = this;
@@ -616,14 +681,19 @@ var ChannelPage = /** @class */ (function () {
616 681
     };
617 682
     ChannelPage.prototype.getChannels = function () {
618 683
         var _this = this;
619
-        this.channelProvider.get(function (channels) {
684
+        this.timerToken = setInterval(this.channelProvider.get(function (channels) {
620 685
             _this.channels = channels;
686
+        }), 5000);
687
+    };
688
+    ChannelPage.prototype.runningLoopOfMessages = function (channelProvider) {
689
+        var _this = this;
690
+        this.messageProvider.get(1, function (after) {
691
+            _this.messages = after.json();
621 692
         });
622 693
     };
623 694
     ChannelPage.prototype.deleteMessage = function (messageId) {
624
-        var _this = this;
625 695
         this.messageProvider.delete(messageId, function (after) {
626
-            _this.getMessages();
696
+            //this.getMessages();
627 697
         });
628 698
     };
629 699
     ChannelPage.prototype.sendMessage = function () {
@@ -660,7 +730,7 @@ var ChannelPage = /** @class */ (function () {
660 730
     };
661 731
     ChannelPage = __decorate([
662 732
         Object(__WEBPACK_IMPORTED_MODULE_0__angular_core__["m" /* Component */])({
663
-            selector: 'page-channel',template:/*ion-inline-start:"/Users/nicholasm/Labs/ZipTeamPurple-FrontEnd/src/pages/channel/channel.html"*/'\n\n\n<!-- <ion-buttons start>\n\n  <button ion-button icon-only menuToggle>\n\n    <ion-icon name="menu"></ion-icon>\n\n  </button>\n\n</ion-buttons> -->\n\n<ion-header>\n\n  <ion-navbar>\n    <ion-title>Channel</ion-title>\n\n    <ion-buttons start>\n\n        <button ion-button icon-only menuToggle>\n          <ion-icon name="menu"></ion-icon>\n        </button>\n        <button ion-button (click)="sendMessage()">\n          <ion-icon name="add"></ion-icon>\n        </button>\n        <button ion-button (click)="getMessages()">\n          <ion-icon name="refresh"></ion-icon>\n        </button>\n      \n      </ion-buttons>\n  </ion-navbar>\n\n</ion-header>\n\n\n\n<ion-content padding>\n\n\n    <ion-list padding>\n        <h1>Channels</h1>\n        <ion-item-sliding *ngFor="let channel of channels">\n            <ion-item>{{channel.name}}</ion-item>\n\n          <!-- <ion-item-options side="right">\n              <button ion-button>\n                  <ion-icon name="settings"></ion-icon>\n                </button>\n              <button color="danger" ion-button (click)="deleteMessage(message.id)">\n                <ion-icon name="trash"></ion-icon>\n              </button>\n     \n          </ion-item-options> -->\n        </ion-item-sliding>\n\n        <button>Create new Channel</button>\n        \n        <!-- <ion-item>Todo 2</ion-item>\n        <ion-item>Todo 3</ion-item> -->\n      </ion-list>\n\n    <ion-list padding>\n      <ion-item-sliding *ngFor="let message of messages">\n          <ion-item>{{message.user.username}} - {{message.message}}</ion-item>\n    \n        <ion-item-options side="right">\n            <button ion-button>\n                <ion-icon name="settings"></ion-icon>\n              </button>\n            <button color="danger" ion-button (click)="deleteMessage(message.id)">\n              <ion-icon name="trash"></ion-icon>\n            </button>\n   \n        </ion-item-options>\n      </ion-item-sliding>\n      \n      <!-- <ion-item>Todo 2</ion-item>\n      <ion-item>Todo 3</ion-item> -->\n    </ion-list>\n   \n   </ion-content>\n\n\n'/*ion-inline-end:"/Users/nicholasm/Labs/ZipTeamPurple-FrontEnd/src/pages/channel/channel.html"*/,
733
+            selector: 'page-channel',template:/*ion-inline-start:"/Users/nicholasm/Labs/ZipTeamPurple-FrontEnd/src/pages/channel/channel.html"*/'\n\n\n<!-- <ion-buttons start>\n\n  <button ion-button icon-only menuToggle>\n\n    <ion-icon name="menu"></ion-icon>\n\n  </button>\n\n</ion-buttons> -->\n\n<ion-header>\n\n  <ion-navbar>\n    <ion-title>Channel</ion-title>\n\n    <ion-buttons start>\n\n        <button ion-button icon-only menuToggle>\n          <ion-icon name="menu"></ion-icon>\n        </button>\n        <button ion-button (click)="sendMessage()">\n          <ion-icon name="add"></ion-icon>\n        </button>\n        <button ion-button (click)="getMessages()">\n          <ion-icon name="refresh"></ion-icon>\n        </button>\n      \n      </ion-buttons>\n  </ion-navbar>\n\n</ion-header>\n\n\n\n<ion-content padding>\n\n\n    <!-- <ion-list padding>\n        <h1>Channels</h1>\n        <ion-item-sliding *ngFor="let channel of channels">\n            <ion-item>{{channel.name}}</ion-item>\n\n          <ion-item-options side="right">\n              <button ion-button>\n                  <ion-icon name="settings"></ion-icon>\n                </button>\n              <button color="danger" ion-button (click)="deleteMessage(message.id)">\n                <ion-icon name="trash"></ion-icon>\n              </button>\n     \n          </ion-item-options>\n        </ion-item-sliding>\n\n        <button>Create new Channel</button>\n        \n        <ion-item>Todo 2</ion-item>\n        <ion-item>Todo 3</ion-item>\n      </ion-list> -->\n\n    <ion-list padding>\n      <ion-item-sliding *ngFor="let message of messages">\n          <ion-item>{{message.user.username}} - {{message.message}}</ion-item>\n    \n        <ion-item-options side="right">\n            <button ion-button>\n                <ion-icon name="settings"></ion-icon>\n              </button>\n            <button color="danger" ion-button (click)="deleteMessage(message.id)">\n              <ion-icon name="trash"></ion-icon>\n            </button>\n   \n        </ion-item-options>\n      </ion-item-sliding>\n      \n      <!-- <ion-item>Todo 2</ion-item>\n      <ion-item>Todo 3</ion-item> -->\n    </ion-list>\n   \n   </ion-content>\n\n\n'/*ion-inline-end:"/Users/nicholasm/Labs/ZipTeamPurple-FrontEnd/src/pages/channel/channel.html"*/,
664 734
         }),
665 735
         __metadata("design:paramtypes", [typeof (_a = typeof __WEBPACK_IMPORTED_MODULE_1_ionic_angular__["g" /* NavController */] !== "undefined" && __WEBPACK_IMPORTED_MODULE_1_ionic_angular__["g" /* NavController */]) === "function" && _a || Object, typeof (_b = typeof __WEBPACK_IMPORTED_MODULE_1_ionic_angular__["h" /* NavParams */] !== "undefined" && __WEBPACK_IMPORTED_MODULE_1_ionic_angular__["h" /* NavParams */]) === "function" && _b || Object, typeof (_c = typeof __WEBPACK_IMPORTED_MODULE_1_ionic_angular__["a" /* AlertController */] !== "undefined" && __WEBPACK_IMPORTED_MODULE_1_ionic_angular__["a" /* AlertController */]) === "function" && _c || Object, typeof (_d = typeof __WEBPACK_IMPORTED_MODULE_2__providers_message_message__["a" /* MessageProvider */] !== "undefined" && __WEBPACK_IMPORTED_MODULE_2__providers_message_message__["a" /* MessageProvider */]) === "function" && _d || Object, typeof (_e = typeof __WEBPACK_IMPORTED_MODULE_3__providers_channel_channel__["a" /* ChannelProvider */] !== "undefined" && __WEBPACK_IMPORTED_MODULE_3__providers_channel_channel__["a" /* ChannelProvider */]) === "function" && _e || Object])
666 736
     ], ChannelPage);
@@ -696,9 +766,9 @@ var UrlProvider = /** @class */ (function () {
696 766
         // constructor(public http: HttpClient) {
697 767
         //   console.log('Hello UrlProvider Provider');
698 768
         // }
699
-        this.baseUrl = "http://localhost:8080";
769
+        //private baseUrl = "http://localhost:8080";
770
+        this.baseUrl = "https://zipteampurple.herokuapp.com";
700 771
     }
701
-    //private baseUrl = "https://zipteampurple.herokuapp.com";
702 772
     UrlProvider.prototype.setBaseUrl = function (baseUrl) {
703 773
         this.baseUrl = baseUrl;
704 774
     };
@@ -715,5 +785,5 @@ var UrlProvider = /** @class */ (function () {
715 785
 
716 786
 /***/ })
717 787
 
718
-},[204]);
788
+},[205]);
719 789
 //# sourceMappingURL=main.js.map

+ 1
- 1
www/build/main.js.map
Datei-Diff unterdrückt, da er zu groß ist
Datei anzeigen


+ 728
- 727
www/build/vendor.js
Datei-Diff unterdrückt, da er zu groß ist
Datei anzeigen


+ 1
- 1
www/build/vendor.js.map
Datei-Diff unterdrückt, da er zu groß ist
Datei anzeigen