Merge pull request #5 from GoogolApp/loading

Loading
GoogolApp · May 25, 2018 · 0cfcaff · 0cfcaff
2 parents f9bfcaa + 387bae5
commit 0cfcaff
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 8 deletions.
diff --git a/config.xml b/config.xml
@@ -3,7 +3,7 @@
     <name>googol</name>
     <description>An awesome Ionic/Cordova app.</description>
     <author email="hi@ionicframework" href="http://ionicframework.com/">Ionic Framework Team</author>
-    <content src="index.html" />
+    <content original-src="index.html" src="http://10.0.0.9:8100" />
     <access origin="*" />
     <allow-intent href="http://*/*" />
     <allow-intent href="https://*/*" />
@@ -83,7 +83,7 @@
     <plugin name="cordova-plugin-ionic-keyboard" spec="2.0.5" />
     <plugin name="cordova-plugin-statusbar" spec="^2.4.2" />
     <allow-navigation href="http://10.0.0.9:8101" />
+    <allow-navigation href="http://10.0.0.9:8100" />
     <engine name="ios" spec="4.5.4" />
     <engine name="android" spec="7.0.0" />
-    <allow-navigation href="http://10.0.0.9:8100" />
 </widget>
diff --git a/src/app/app.config.ts b/src/app/app.config.ts
@@ -1,3 +1,3 @@
 export const appConfig = {
-    apiUrl: 'http://localhost:4040/api'
+    apiUrl: 'https://googol-api.herokuapp.com/api'
 };
diff --git a/src/pages/signin/signin.ts b/src/pages/signin/signin.ts
@@ -1,5 +1,5 @@
 import { Component } from '@angular/core';
-import { NavController, AlertController } from 'ionic-angular';
+import { NavController, AlertController, LoadingController } from 'ionic-angular';
 import { AuthService } from '../../_services/auth';
 import { HomePage } from '../home/home';
 import { SignUpPage } from '../signup/signup';
@@ -12,16 +12,24 @@ export class SignInPage {
 
   email: string = "";
   password: string = "";
+  loading = this.loadingController.create({
+    content: 'Por favor, aguarde...',
+    spinner: 'bubbles'
+  });
 
-  constructor(public navCtrl: NavController, public auth: AuthService, public alert:AlertController) {
+  constructor(public navCtrl: NavController, public auth: AuthService, public alert:AlertController, private loadingController: LoadingController) {
     if(this.auth.isAuthenticated()){
       this.navigateHome();
     }
   }
 
   signIn(){
+
+    this.loading.present();
+
     this.auth.signIn(this.email, this.password).subscribe(
       user => {
+        this.loading.dismiss();
         if(user){
           this.resetFields();
           this.navigateHome();
@@ -30,6 +38,7 @@ export class SignInPage {
         }
       },
       err => {
+        this.loading.dismiss();
         this.presentAlert("Usuário ou senha incorretos!");
       } 
     )

diff --git a/src/pages/signup/signup.ts b/src/pages/signup/signup.ts
@@ -1,5 +1,5 @@
 import { Component } from '@angular/core';
-import { NavController, AlertController } from 'ionic-angular';
+import { NavController, AlertController, LoadingController } from 'ionic-angular';
 import { SignInPage } from '../signin/signin';
 
 import { User } from '../../_models/user';
@@ -15,9 +15,14 @@ export class SignUpPage {
   email: string = "";
   username: string = "";
   password: string = "";
-  password_confirm: string = ""; 
+  password_confirm: string = "";
 
-  constructor(public navCtrl: NavController, public alert:AlertController, public usersService:UsersService) {
+  loading = this.loadingController.create({
+    content: 'Por favor, aguarde...',
+    spinner: 'bubbles'
+  });
+
+  constructor(public navCtrl: NavController, public alert:AlertController, public usersService:UsersService, public loadingController: LoadingController) {
   }
 
   validateFields() : boolean {
@@ -42,15 +47,19 @@ export class SignUpPage {
   createUser(){
     if(this.validateFields()){
 
+      this.loading.present();
+
       let user = new User(this.username, this.email, this.password);
 
       this.usersService.create(user).subscribe(
         data => {
+          this.loading.dismiss();
           this.createdUserAlert("Usuário criado com sucesso!");
           this.clearFields();
           this.goSignIn();
         },
         err => {
+          this.loading.dismiss();
           this.presentAlert("Usuário não pode ser criado!")
         }
       )