Merge pull request #14 from GoogolApp/refactor

Refactor
GoogolApp · Jun 3, 2018 · 068613d · 068613d
2 parents f15bce3 + cd9f5ba
commit 068613d
Show file tree

Hide file tree

Showing 3 changed files with 42 additions and 32 deletions.
diff --git a/src/_services/auth.ts b/src/_services/auth.ts
@@ -3,9 +3,7 @@ import { HttpClient, HttpHeaders } from '@angular/common/http';
 import { Observable } from 'rxjs/Observable';
 import 'rxjs/add/operator/map';
 
-import { User } from '../_models/user';
 import { AppUrl } from '../_config/url.config';
-import { Owner } from '../_models/owner';
 
 @Injectable()
 export class AuthService{
@@ -27,7 +25,7 @@ export class AuthService{
 
         let body = { email: email, password: password };
 
-        return this.http.post<User>( url, body, this.httpOptions)
+        return this.http.post<any>( url, body, this.httpOptions)
             .map( user => {
                 let token = user && user.token;
                 if (token) {

diff --git a/src/pages/signin/signin.ts b/src/pages/signin/signin.ts
@@ -15,11 +15,6 @@ export class SignInPage {
   email: string = "";
   password: string = "";
 
-  loading = this.loadingController.create({
-    content: 'Por favor, aguarde...',
-    spinner: 'bubbles'
-  });
-
   constructor(
     public navCtrl: NavController,
     public auth: AuthService,
@@ -32,22 +27,22 @@ export class SignInPage {
 
   async signIn(){
 
-    this.loading.present();
+    let loading = this.loading();
 
     if(this.type === 'user'){
-      await this.userSignIn();
+      await this.userSignIn(loading);
     }
 
     if(this.type === 'owner'){
-      await this.ownerSignIn();
+      await this.ownerSignIn(loading);
     }
 
   }
 
-  userSignIn(){
+  userSignIn(loading){
     this.auth.userSignIn(this.email, this.password).subscribe(
       user => {
-        this.loading.dismiss();
+        loading.dismiss();
         if(user){
           this.resetFields();
           this.navCtrl.push(HomePage, {}, {animate: false});
@@ -56,16 +51,16 @@ export class SignInPage {
         }
       },
       err => {
-        this.loading.dismiss();
+        loading.dismiss();
         this.presentAlert("Usuário ou senha incorretos!");
       } 
     )
   }
 
-  ownerSignIn(){
+  ownerSignIn(loading){
     this.auth.ownerSignIn(this.email, this.password).subscribe(
       user => {
-        this.loading.dismiss();
+        loading.dismiss();
         if(user){
           this.resetFields();
           this.navCtrl.push(OwnerHomePage, {}, {animate: false});
@@ -74,7 +69,7 @@ export class SignInPage {
         }
       },
       err => {
-        this.loading.dismiss();
+        loading.dismiss();
         this.presentAlert("Usuário ou senha incorretos!");
       } 
     )
@@ -94,6 +89,17 @@ export class SignInPage {
     this.password = "";
   }
 
+  loading(){
+    let loading = this.loadingController.create({
+      content: 'Por favor, aguarde...',
+      spinner: 'bubbles'
+    });
+
+    loading.present();
+
+    return loading;
+  }
+
   goSignUp(){
     this.navCtrl.push(SignUpPage, {}, {animate: false});
   }

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, LoadingController, ModalController} from 'ionic-angular';
+import { NavController, AlertController, LoadingController} from 'ionic-angular';
 import { SignInPage } from '../signin/signin';
 
 import { User } from '../../_models/user';
@@ -20,11 +20,6 @@ export class SignUpPage {
   password: string = "";
   password_confirm: string = "";
 
-  loading = this.loadingController.create({
-    content: 'Por favor, aguarde...',
-    spinner: 'bubbles'
-  });
-
   constructor(
     public navCtrl: NavController,
     public alert:AlertController,
@@ -65,48 +60,48 @@ export class SignUpPage {
   async createUser(){
     if(this.validateFields()){
 
-      this.loading.present();
+      let loading = this.loading();
 
       if(this.type === 'user'){
-        await this.createNormalUser();
+        await this.createNormalUser(loading);
       }
 
       if (this.type === 'owner'){
-        await this.createOwner();
+        await this.createOwner(loading);
       }
     }
   }
 
-  async createNormalUser(){
+  async createNormalUser(loading){
     let user = new User(this.username, this.email, this.password);
 
       await this.usersService.create(user).subscribe(
         data => { 
-          this.loading.dismiss();
+          loading.dismiss();
           this.createdUserAlert("Usuário criado com sucesso!");
           this.clearFields();
           this.goSignIn();
         },
         err => {
-          this.loading.dismiss();
+          loading.dismiss();
           this.presentAlert(err.error.message);
         }
     )
   }
 
-  async createOwner(){
+  async createOwner(loading){
 
     let owner  = new Owner(this.email, this.password);
 
     await this.ownerService.create(owner).subscribe(
       data => {
-        this.loading.dismiss();
+        loading.dismiss();
         this.createdUserAlert("Empresário criado com sucesso!");
         this.clearFields();
         this.goSignIn();
       },
       err => {
-        this.loading.dismiss();
+        loading.dismiss();
         this.presentAlert("Empresário não pode ser criado!");
       }
     )
@@ -137,6 +132,17 @@ export class SignUpPage {
     alert.present();
   }
 
+  loading(){
+    let loading = this.loadingController.create({
+      content: 'Por favor, aguarde...',
+      spinner: 'bubbles'
+    });
+
+    loading.present();
+
+    return loading;
+  }
+
   goSignIn(){
     this.navCtrl.push(SignInPage, {}, {animate: false});
   }