|
|
@@ -20,39 +20,50 @@ var __metadata = (this && this.__metadata) || function (k, v) {
|
|
20
|
20
|
|
|
21
|
21
|
|
|
22
|
22
|
|
|
23
|
|
-/**
|
|
24
|
|
- * Generated class for the ChatPage page.
|
|
25
|
|
- *
|
|
26
|
|
- * See https://ionicframework.com/docs/components/#navigation for more info on
|
|
27
|
|
- * Ionic pages and navigation.
|
|
28
|
|
- */
|
|
|
23
|
+// import {OnInit} from '@angular/core';
|
|
|
24
|
+// import { interval } from '../../../node_modules/rxjs/observable/interval';
|
|
|
25
|
+// import { startWith } from '../../../node_modules/rxjs/operators';
|
|
|
26
|
+// import { switchMap } from '../../../node_modules/rxjs/operator/switchMap';
|
|
29
|
27
|
var ChatPage = /** @class */ (function () {
|
|
30
|
28
|
function ChatPage(navCtrl, navParams, messageApi) {
|
|
31
|
29
|
this.navCtrl = navCtrl;
|
|
32
|
30
|
this.navParams = navParams;
|
|
33
|
31
|
this.messageApi = messageApi;
|
|
|
32
|
+ this.mApi = messageApi;
|
|
34
|
33
|
}
|
|
35
|
34
|
ChatPage.prototype.ionViewDidLoad = function () {
|
|
36
|
35
|
console.log('ionViewDidLoad ChatPage');
|
|
37
|
|
- this.getMessages();
|
|
|
36
|
+ this.getMessages(this);
|
|
38
|
37
|
};
|
|
39
|
38
|
ChatPage.prototype.send = function (createAccountInfo) {
|
|
40
|
39
|
console.log("clicked");
|
|
41
|
40
|
console.log(createAccountInfo);
|
|
42
|
41
|
this.messageApi.saveMessage(createAccountInfo).subscribe(console.log);
|
|
43
|
|
- this.getMessages();
|
|
|
42
|
+ this.test = '';
|
|
|
43
|
+ this.getMessages(this);
|
|
44
|
44
|
};
|
|
45
|
|
- ChatPage.prototype.getMessages = function () {
|
|
|
45
|
+ ChatPage.prototype.getMessages = function (chatPage) {
|
|
46
|
46
|
var _this = this;
|
|
47
|
|
- this.messageApi.getMessages().subscribe(function (data) {
|
|
|
47
|
+ chatPage.messageApi.getMessages().subscribe(function (data) {
|
|
48
|
48
|
_this.msg = data;
|
|
49
|
|
- console.log(data);
|
|
|
49
|
+ console.log(_this.msg);
|
|
50
|
50
|
});
|
|
51
|
|
- this.test = this.messageApi.getCurrentMessage();
|
|
52
|
51
|
};
|
|
|
52
|
+ ChatPage.prototype.ngOnInit = function () {
|
|
|
53
|
+ var _this = this;
|
|
|
54
|
+ setInterval(function () { _this.getMessages(_this); }, 500);
|
|
|
55
|
+ };
|
|
|
56
|
+ __decorate([
|
|
|
57
|
+ Object(__WEBPACK_IMPORTED_MODULE_0__angular_core__["D" /* Input */])(),
|
|
|
58
|
+ __metadata("design:type", Array)
|
|
|
59
|
+ ], ChatPage.prototype, "messages", void 0);
|
|
53
|
60
|
ChatPage = __decorate([
|
|
54
|
61
|
Object(__WEBPACK_IMPORTED_MODULE_0__angular_core__["m" /* Component */])({
|
|
|
62
|
+<<<<<<< HEAD
|
|
55
|
63
|
selector: 'page-chat',template:/*ion-inline-start:"/Users/jasong/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<!-- *ngFor="let m of msg">{{ m }} -->\n\n<ion-content padding >\n <div *ngFor="let m of msg">\n {{ m.message }}\n </div>\n\n <form #test1="ngForm" ng-submit="send(test1.value)">\n <ion-textarea type="text" name="message" [(ngModel)]="test" ></ion-textarea>\n <button ion-button (click)="send(test1.value)"(click)="getMessages()">send</button>\n </form>\n</ion-content>\n'/*ion-inline-end:"/Users/jasong/Labs/ZipTeam/ZipTeamOrange-ionic-UI/src/pages/chat/chat.html"*/,
|
|
|
64
|
+=======
|
|
|
65
|
+ selector: 'page-chat',template:/*ion-inline-start:"/Users/alizalang/Desktop/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<!-- *ngFor="let m of msg">{{ m }} -->\n\n<ion-content padding >\n <div *ngFor="let m of msg" class="message-wrapper">\n <div class="name">\n <b>{{m.username}}Nhu</b> <span class="timestamp"><small>{{m.timestamp}}8:40</small></span> <div class="message">{{m.message}}</div> \n <p></p> \n </div>\n </div>\n\n <form #test1="ngForm" ng-submit="send(test1.value)">\n <ion-textarea type="text" name="message" [(ngModel)]="test" class="user-message"></ion-textarea>\n <button ion-button (click)="send(test1.value)" >send</button>\n </form>\n</ion-content>\n'/*ion-inline-end:"/Users/alizalang/Desktop/ZipTeam/ZipTeamOrange-ionic-UI/src/pages/chat/chat.html"*/,
|
|
|
66
|
+>>>>>>> e9af7a6a8011fcb914952fcfb97bc9d9550b2637
|
|
56
|
67
|
}),
|
|
57
|
68
|
__metadata("design:paramtypes", [__WEBPACK_IMPORTED_MODULE_1_ionic_angular__["e" /* NavController */], __WEBPACK_IMPORTED_MODULE_1_ionic_angular__["f" /* NavParams */], __WEBPACK_IMPORTED_MODULE_2__providers_message_service_message_service__["a" /* MessageServiceProvider */]])
|
|
58
|
69
|
], ChatPage);
|
|
|
@@ -67,12 +78,10 @@ var ChatPage = /** @class */ (function () {
|
|
67
|
78
|
/***/ (function(module, __webpack_exports__, __webpack_require__) {
|
|
68
|
79
|
|
|
69
|
80
|
"use strict";
|
|
70
|
|
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return FirstPage; });
|
|
|
81
|
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return SignUpPage; });
|
|
71
|
82
|
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__angular_core__ = __webpack_require__(0);
|
|
72
|
83
|
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1_ionic_angular__ = __webpack_require__(20);
|
|
73
|
|
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__sign_up_sign_up__ = __webpack_require__(103);
|
|
74
|
|
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_3__providers_auth_service_auth_service__ = __webpack_require__(159);
|
|
75
|
|
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_4__chat_chat__ = __webpack_require__(101);
|
|
|
84
|
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__providers_api_service_api_service__ = __webpack_require__(158);
|
|
76
|
85
|
var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
|
|
77
|
86
|
var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
|
|
78
|
87
|
if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
|
|
|
@@ -85,20 +94,22 @@ var __metadata = (this && this.__metadata) || function (k, v) {
|
|
85
|
94
|
|
|
86
|
95
|
|
|
87
|
96
|
|
|
88
|
|
-
|
|
89
|
|
-
|
|
|
97
|
+"";
|
|
90
|
98
|
/**
|
|
91
|
|
- * Generated class for the FirstPage page.
|
|
|
99
|
+ * Generated class for the SignUpPage page.
|
|
92
|
100
|
*
|
|
93
|
101
|
* See https://ionicframework.com/docs/components/#navigation for more info on
|
|
94
|
102
|
* Ionic pages and navigation.
|
|
95
|
103
|
*/
|
|
96
|
|
-var FirstPage = /** @class */ (function () {
|
|
97
|
|
- function FirstPage(navCtrl, navParams, authService) {
|
|
|
104
|
+var SignUpPage = /** @class */ (function () {
|
|
|
105
|
+ function SignUpPage(navCtrl, navParams, apiProvider, toastCtrl) {
|
|
98
|
106
|
this.navCtrl = navCtrl;
|
|
99
|
107
|
this.navParams = navParams;
|
|
100
|
|
- this.authService = authService;
|
|
|
108
|
+ this.apiProvider = apiProvider;
|
|
|
109
|
+ this.toastCtrl = toastCtrl;
|
|
|
110
|
+ this.user = {};
|
|
101
|
111
|
}
|
|
|
112
|
+<<<<<<< HEAD
|
|
102
|
113
|
FirstPage.prototype.ionViewDidLoad = function () {
|
|
103
|
114
|
console.log('ionViewDidLoad FirstPage');
|
|
104
|
115
|
};
|
|
|
@@ -114,21 +125,38 @@ var FirstPage = /** @class */ (function () {
|
|
114
|
125
|
console.log("check your info");
|
|
115
|
126
|
}
|
|
116
|
127
|
}).catch(console.log);
|
|
|
128
|
+=======
|
|
|
129
|
+ // ngOnInit(){
|
|
|
130
|
+ // this.loadUsers();
|
|
|
131
|
+ // }
|
|
|
132
|
+ // loadUsers(){
|
|
|
133
|
+ // this.apiProvider.getUsers().subscribe(data => this.user =data["_embedded"]["users"],
|
|
|
134
|
+ // err => {
|
|
|
135
|
+ // console.log(err);
|
|
|
136
|
+ // });
|
|
|
137
|
+ // }
|
|
|
138
|
+ SignUpPage.prototype.ionViewDidLoad = function () {
|
|
|
139
|
+ console.log('ionViewDidLoad SignUpPage');
|
|
|
140
|
+>>>>>>> e9af7a6a8011fcb914952fcfb97bc9d9550b2637
|
|
117
|
141
|
};
|
|
118
|
|
- FirstPage.prototype.createAccount = function () {
|
|
119
|
|
- this.navCtrl.push(__WEBPACK_IMPORTED_MODULE_2__sign_up_sign_up__["a" /* SignUpPage */]);
|
|
120
|
|
- console.log("clicked");
|
|
|
142
|
+ SignUpPage.prototype.save = function (createAccountInfo) {
|
|
|
143
|
+ // console.log(createAccountInfo)
|
|
|
144
|
+ this.apiProvider.save(createAccountInfo).subscribe(console.log);
|
|
121
|
145
|
};
|
|
122
|
|
- FirstPage = __decorate([
|
|
|
146
|
+ SignUpPage = __decorate([
|
|
123
|
147
|
Object(__WEBPACK_IMPORTED_MODULE_0__angular_core__["m" /* Component */])({
|
|
|
148
|
+<<<<<<< HEAD
|
|
124
|
149
|
selector: 'page-first',template:/*ion-inline-start:"/Users/jasong/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/jasong/Labs/ZipTeam/ZipTeamOrange-ionic-UI/src/pages/firstPage/first.html"*/,
|
|
|
150
|
+=======
|
|
|
151
|
+ selector: 'page-sign-up',template:/*ion-inline-start:"/Users/alizalang/Desktop/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/alizalang/Desktop/ZipTeam/ZipTeamOrange-ionic-UI/src/pages/sign-up/sign-up.html"*/,
|
|
|
152
|
+>>>>>>> e9af7a6a8011fcb914952fcfb97bc9d9550b2637
|
|
125
|
153
|
}),
|
|
126
|
|
- __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 */]])
|
|
127
|
|
- ], FirstPage);
|
|
128
|
|
- return FirstPage;
|
|
|
154
|
+ __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 */]])
|
|
|
155
|
+ ], SignUpPage);
|
|
|
156
|
+ return SignUpPage;
|
|
129
|
157
|
}());
|
|
130
|
158
|
|
|
131
|
|
-//# sourceMappingURL=first.js.map
|
|
|
159
|
+//# sourceMappingURL=sign-up.js.map
|
|
132
|
160
|
|
|
133
|
161
|
/***/ }),
|
|
134
|
162
|
|
|
|
@@ -136,10 +164,12 @@ var FirstPage = /** @class */ (function () {
|
|
136
|
164
|
/***/ (function(module, __webpack_exports__, __webpack_require__) {
|
|
137
|
165
|
|
|
138
|
166
|
"use strict";
|
|
139
|
|
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return SignUpPage; });
|
|
|
167
|
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return FirstPage; });
|
|
140
|
168
|
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__angular_core__ = __webpack_require__(0);
|
|
141
|
169
|
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1_ionic_angular__ = __webpack_require__(20);
|
|
142
|
|
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__providers_api_service_api_service__ = __webpack_require__(158);
|
|
|
170
|
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__sign_up_sign_up__ = __webpack_require__(102);
|
|
|
171
|
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_3__providers_auth_service_auth_service__ = __webpack_require__(159);
|
|
|
172
|
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_4__chat_chat__ = __webpack_require__(101);
|
|
143
|
173
|
var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
|
|
144
|
174
|
var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
|
|
145
|
175
|
if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
|
|
|
@@ -152,47 +182,54 @@ var __metadata = (this && this.__metadata) || function (k, v) {
|
|
152
|
182
|
|
|
153
|
183
|
|
|
154
|
184
|
|
|
155
|
|
-"";
|
|
|
185
|
+
|
|
|
186
|
+
|
|
156
|
187
|
/**
|
|
157
|
|
- * Generated class for the SignUpPage page.
|
|
|
188
|
+ * Generated class for the FirstPage page.
|
|
158
|
189
|
*
|
|
159
|
190
|
* See https://ionicframework.com/docs/components/#navigation for more info on
|
|
160
|
191
|
* Ionic pages and navigation.
|
|
161
|
192
|
*/
|
|
162
|
|
-var SignUpPage = /** @class */ (function () {
|
|
163
|
|
- function SignUpPage(navCtrl, navParams, apiProvider, toastCtrl) {
|
|
|
193
|
+var FirstPage = /** @class */ (function () {
|
|
|
194
|
+ function FirstPage(navCtrl, navParams, authService) {
|
|
164
|
195
|
this.navCtrl = navCtrl;
|
|
165
|
196
|
this.navParams = navParams;
|
|
166
|
|
- this.apiProvider = apiProvider;
|
|
167
|
|
- this.toastCtrl = toastCtrl;
|
|
168
|
|
- this.user = {};
|
|
|
197
|
+ this.authService = authService;
|
|
169
|
198
|
}
|
|
170
|
|
- // ngOnInit(){
|
|
171
|
|
- // this.loadUsers();
|
|
172
|
|
- // }
|
|
173
|
|
- // loadUsers(){
|
|
174
|
|
- // this.apiProvider.getUsers().subscribe(data => this.user =data["_embedded"]["users"],
|
|
175
|
|
- // err => {
|
|
176
|
|
- // console.log(err);
|
|
177
|
|
- // });
|
|
178
|
|
- // }
|
|
179
|
|
- SignUpPage.prototype.ionViewDidLoad = function () {
|
|
180
|
|
- console.log('ionViewDidLoad SignUpPage');
|
|
|
199
|
+ FirstPage.prototype.ionViewDidLoad = function () {
|
|
|
200
|
+ console.log('ionViewDidLoad FirstPage');
|
|
181
|
201
|
};
|
|
182
|
|
- SignUpPage.prototype.save = function (createAccountInfo) {
|
|
183
|
|
- // console.log(createAccountInfo)
|
|
184
|
|
- this.apiProvider.save(createAccountInfo).subscribe(console.log);
|
|
|
202
|
+ FirstPage.prototype.loginButton = function (createAccountInfo) {
|
|
|
203
|
+ var _this = this;
|
|
|
204
|
+ this.authService.postData(createAccountInfo).then(function (result) {
|
|
|
205
|
+ _this.responseData = result;
|
|
|
206
|
+ console.log(createAccountInfo);
|
|
|
207
|
+ if (!_this.responseData.createAccountInfo) {
|
|
|
208
|
+ _this.navCtrl.push(__WEBPACK_IMPORTED_MODULE_4__chat_chat__["a" /* ChatPage */]);
|
|
|
209
|
+ }
|
|
|
210
|
+ else {
|
|
|
211
|
+ console.log("check your info");
|
|
|
212
|
+ }
|
|
|
213
|
+ }).catch(console.log);
|
|
185
|
214
|
};
|
|
186
|
|
- SignUpPage = __decorate([
|
|
|
215
|
+ FirstPage.prototype.createAccount = function () {
|
|
|
216
|
+ this.navCtrl.push(__WEBPACK_IMPORTED_MODULE_2__sign_up_sign_up__["a" /* SignUpPage */]);
|
|
|
217
|
+ console.log("clicked");
|
|
|
218
|
+ };
|
|
|
219
|
+ FirstPage = __decorate([
|
|
187
|
220
|
Object(__WEBPACK_IMPORTED_MODULE_0__angular_core__["m" /* Component */])({
|
|
|
221
|
+<<<<<<< HEAD
|
|
188
|
222
|
selector: 'page-sign-up',template:/*ion-inline-start:"/Users/jasong/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/jasong/Labs/ZipTeam/ZipTeamOrange-ionic-UI/src/pages/sign-up/sign-up.html"*/,
|
|
|
223
|
+=======
|
|
|
224
|
+ selector: 'page-first',template:/*ion-inline-start:"/Users/alizalang/Desktop/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/alizalang/Desktop/ZipTeam/ZipTeamOrange-ionic-UI/src/pages/firstPage/first.html"*/,
|
|
|
225
|
+>>>>>>> e9af7a6a8011fcb914952fcfb97bc9d9550b2637
|
|
189
|
226
|
}),
|
|
190
|
|
- __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 */]])
|
|
191
|
|
- ], SignUpPage);
|
|
192
|
|
- return SignUpPage;
|
|
|
227
|
+ __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 */]])
|
|
|
228
|
+ ], FirstPage);
|
|
|
229
|
+ return FirstPage;
|
|
193
|
230
|
}());
|
|
194
|
231
|
|
|
195
|
|
-//# sourceMappingURL=sign-up.js.map
|
|
|
232
|
+//# sourceMappingURL=first.js.map
|
|
196
|
233
|
|
|
197
|
234
|
/***/ }),
|
|
198
|
235
|
|
|
|
@@ -222,11 +259,11 @@ var map = {
|
|
222
|
259
|
2
|
|
223
|
260
|
],
|
|
224
|
261
|
"../pages/firstPage/first.module": [
|
|
225
|
|
- 285,
|
|
|
262
|
+ 286,
|
|
226
|
263
|
1
|
|
227
|
264
|
],
|
|
228
|
265
|
"../pages/sign-up/sign-up.module": [
|
|
229
|
|
- 286,
|
|
|
266
|
+ 285,
|
|
230
|
267
|
0
|
|
231
|
268
|
]
|
|
232
|
269
|
};
|
|
|
@@ -277,13 +314,13 @@ var MessageServiceProvider = /** @class */ (function () {
|
|
277
|
314
|
console.log('Hello MessageServiceProvider Provider');
|
|
278
|
315
|
}
|
|
279
|
316
|
MessageServiceProvider.prototype.getMessages = function () {
|
|
280
|
|
- return this.http.get('http://localhost:8080/message/all');
|
|
|
317
|
+ return this.http.get('https://arcane-ridge.herokuapp.com//message/all');
|
|
281
|
318
|
};
|
|
282
|
319
|
MessageServiceProvider.prototype.getCurrentMessage = function () {
|
|
283
|
320
|
return this.messages;
|
|
284
|
321
|
};
|
|
285
|
322
|
MessageServiceProvider.prototype.saveMessage = function (createAccountInfo) {
|
|
286
|
|
- return this.http.post("http://localhost:8080/message/add", createAccountInfo);
|
|
|
323
|
+ return this.http.post('https://arcane-ridge.herokuapp.com//message/add', createAccountInfo);
|
|
287
|
324
|
};
|
|
288
|
325
|
MessageServiceProvider = __decorate([
|
|
289
|
326
|
Object(__WEBPACK_IMPORTED_MODULE_1__angular_core__["A" /* Injectable */])(),
|
|
|
@@ -326,11 +363,11 @@ var ApiServiceProvider = /** @class */ (function () {
|
|
326
|
363
|
console.log('Hello ApiServiceProvider Provider');
|
|
327
|
364
|
}
|
|
328
|
365
|
ApiServiceProvider.prototype.getUsers = function () {
|
|
329
|
|
- return this.http.get('http:localhost:8080/users');
|
|
|
366
|
+ return this.http.get('https://arcane-ridge.herokuapp.com/users');
|
|
330
|
367
|
};
|
|
331
|
368
|
ApiServiceProvider.prototype.save = function (createAccountInfo) {
|
|
332
|
369
|
//return this.http.post(`http://localhost:8080/ZipTeamOrange/add?username=${createAccountInfo.name}&email=${createAccountInfo.email}&password=${createAccountInfo.password}`, {})
|
|
333
|
|
- return this.http.post("http://localhost:8080/user/add", createAccountInfo);
|
|
|
370
|
+ return this.http.post("https://arcane-ridge.herokuapp.com/user/add", createAccountInfo);
|
|
334
|
371
|
};
|
|
335
|
372
|
ApiServiceProvider = __decorate([
|
|
336
|
373
|
Object(__WEBPACK_IMPORTED_MODULE_1__angular_core__["A" /* Injectable */])(),
|
|
|
@@ -378,7 +415,7 @@ var AuthServiceProvider = /** @class */ (function () {
|
|
378
|
415
|
AuthServiceProvider.prototype.postData = function (createAccountInfo) {
|
|
379
|
416
|
var _this = this;
|
|
380
|
417
|
return new Promise(function (resolve, reject) {
|
|
381
|
|
- _this.http.post("http://localhost:8080/user/add", createAccountInfo, { responseType: 'text' }).subscribe(function (res) {
|
|
|
418
|
+ _this.http.post("https://arcane-ridge.herokuapp.com/user/add", createAccountInfo, { responseType: 'text' }).subscribe(function (res) {
|
|
382
|
419
|
console.log(JSON.parse(res));
|
|
383
|
420
|
resolve(JSON.parse(res));
|
|
384
|
421
|
}, function (err) {
|
|
|
@@ -406,7 +443,7 @@ var AuthServiceProvider = /** @class */ (function () {
|
|
406
|
443
|
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__about_about__ = __webpack_require__(204);
|
|
407
|
444
|
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__contact_contact__ = __webpack_require__(205);
|
|
408
|
445
|
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_3__home_home__ = __webpack_require__(206);
|
|
409
|
|
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_4__firstPage_first__ = __webpack_require__(102);
|
|
|
446
|
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_4__firstPage_first__ = __webpack_require__(103);
|
|
410
|
447
|
var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
|
|
411
|
448
|
var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
|
|
412
|
449
|
if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
|
|
|
@@ -574,8 +611,8 @@ Object(__WEBPACK_IMPORTED_MODULE_0__angular_platform_browser_dynamic__["a" /* pl
|
|
574
|
611
|
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_7__pages_tabs_tabs__ = __webpack_require__(203);
|
|
575
|
612
|
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_8__ionic_native_status_bar__ = __webpack_require__(199);
|
|
576
|
613
|
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_9__ionic_native_splash_screen__ = __webpack_require__(202);
|
|
577
|
|
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_10__pages_firstPage_first__ = __webpack_require__(102);
|
|
578
|
|
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_11__pages_sign_up_sign_up__ = __webpack_require__(103);
|
|
|
614
|
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_10__pages_firstPage_first__ = __webpack_require__(103);
|
|
|
615
|
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_11__pages_sign_up_sign_up__ = __webpack_require__(102);
|
|
579
|
616
|
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_12__providers_api_service_api_service__ = __webpack_require__(158);
|
|
580
|
617
|
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_13__node_modules_angular_common_http__ = __webpack_require__(46);
|
|
581
|
618
|
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_14__providers_auth_service_auth_service__ = __webpack_require__(159);
|
|
|
@@ -625,8 +662,8 @@ var AppModule = /** @class */ (function () {
|
|
625
|
662
|
__WEBPACK_IMPORTED_MODULE_2_ionic_angular__["c" /* IonicModule */].forRoot(__WEBPACK_IMPORTED_MODULE_3__app_component__["a" /* MyApp */], {}, {
|
|
626
|
663
|
links: [
|
|
627
|
664
|
{ loadChildren: '../pages/chat/chat.module#ChatPageModule', name: 'ChatPage', segment: 'chat', priority: 'low', defaultHistory: [] },
|
|
628
|
|
- { loadChildren: '../pages/firstPage/first.module#FirstPageModule', name: 'FirstPage', segment: 'first', priority: 'low', defaultHistory: [] },
|
|
629
|
|
- { loadChildren: '../pages/sign-up/sign-up.module#SignUpPageModule', name: 'SignUpPage', segment: 'sign-up', priority: 'low', defaultHistory: [] }
|
|
|
665
|
+ { loadChildren: '../pages/sign-up/sign-up.module#SignUpPageModule', name: 'SignUpPage', segment: 'sign-up', priority: 'low', defaultHistory: [] },
|
|
|
666
|
+ { loadChildren: '../pages/firstPage/first.module#FirstPageModule', name: 'FirstPage', segment: 'first', priority: 'low', defaultHistory: [] }
|
|
630
|
667
|
]
|
|
631
|
668
|
})
|
|
632
|
669
|
],
|
