Tela de token invalido melhorado

GabrielVictorF · Apr 20, 2019 · 6d8dda2 · 6d8dda2
1 parent ee91507
commit 6d8dda2
Show file tree

Hide file tree

Showing 12 changed files with 127 additions and 105 deletions.
diff --git a/src/app/app.component.ts b/src/app/app.component.ts
@@ -1,5 +1,5 @@
 import { Component } from '@angular/core';
-import { Platform } from 'ionic-angular';
+import { Platform, LoadingController, AlertController } from 'ionic-angular';
 
 import { TabsPage } from '../pages/tabs/tabs';
 import { LoginPage } from '../pages/login/login';
@@ -13,22 +13,43 @@ import { FunctionsProvider } from '../providers/functions/functions';
 export class MyApp {
   rootPage: any;
 
-  constructor(platform: Platform, public api: ApiProvider, public functions: FunctionsProvider) {
+  constructor(platform: Platform, public api: ApiProvider, public functions: FunctionsProvider,
+    public alertCtrl: AlertController, public loadingCtrl: LoadingController) {
     platform.ready().then(() => {
       if (localStorage.userToken) {
-        console.log(localStorage.userToken);
+        console.log("Tem token!");
         this.api.validaToken().subscribe(res => {
-           console.log(res);
           if (res) {
             this.rootPage = TabsPage;
           } else {
-            this.functions.logout();
-            this.rootPage = LoginPage;
+            this.logout();
           } 
         });
       } else {
         this.rootPage = LoginPage;
       } 
     });
   }
+
+  logout() {
+    let load =  this.alertCtrl.create({
+      title: 'Sessão expirou!',
+      message: 'Sua sessão expirou, por favor logue novamente.',
+      buttons: [{
+      text: 'OK',
+      handler: () => {
+        const load = this.loadingCtrl.create({
+          content: 'Saindo...'
+        });
+        load.present();            
+        this.api.logout().subscribe(res => {
+          load.dismiss();
+          this.rootPage = LoginPage;
+          localStorage.removeItem("userToken");
+        });
+      }
+      }]
+    });
+    load.present();
+  }
 }
diff --git a/src/app/app.html b/src/app/app.html
@@ -1 +1,14 @@
-<ion-nav [root]="rootPage"></ion-nav>
+<ion-menu [content]="menu">
+  <ion-header>
+    <ion-toolbar>
+      <ion-title>
+      Menu
+      </ion-title>
+    </ion-toolbar>
+  </ion-header>
+  <ion-content>
+    <menu></menu>
+  </ion-content>
+</ion-menu>
+
+<ion-nav [root]="rootPage" #menu></ion-nav>
diff --git a/src/app/app.module.ts b/src/app/app.module.ts
@@ -26,6 +26,8 @@ import { DiaSemanaPipe } from '../pipes/dia-semana/dia-semana';
 import { MesPipe } from '../pipes/mes/mes';
 import { HorarioPipe } from '../pipes/horario/horario';
 
+import { MenuComponent } from '../components/menu/menu';
+
 @NgModule({
   declarations: [
     MyApp,
@@ -45,7 +47,8 @@ import { HorarioPipe } from '../pipes/horario/horario';
     DataPipe,
     DiaSemanaPipe,
     MesPipe,
-    HorarioPipe
+    HorarioPipe,
+    MenuComponent
   ],
   imports: [
     BrowserModule,

diff --git a/src/components/components.module.ts b/src/components/components.module.ts
@@ -0,0 +1,8 @@
+import { NgModule } from '@angular/core';
+import { MenuComponent } from './menu/menu';
+@NgModule({
+	declarations: [MenuComponent],
+	imports: [],
+	exports: [MenuComponent]
+})
+export class ComponentsModule {}
diff --git a/src/components/menu/menu.html b/src/components/menu/menu.html
@@ -0,0 +1,2 @@
+<ion-item>Meu Perfil</ion-item>
+<ion-item (click)="logout()">Sair</ion-item>
diff --git a/src/components/menu/menu.scss b/src/components/menu/menu.scss
@@ -0,0 +1,3 @@
+menu {
+
+}
diff --git a/src/components/menu/menu.ts b/src/components/menu/menu.ts
@@ -0,0 +1,56 @@
+import { Component } from '@angular/core';
+
+import { AlertController, LoadingController, MenuController, App } from 'ionic-angular';
+
+import { LoginPage } from '../../pages/login/login';
+
+import { ApiProvider } from '../../providers/api/api';
+
+/**
+ * Generated class for the MenuComponent component.
+ *
+ * See https://angular.io/api/core/Component for more info on Angular
+ * Components.
+ */
+@Component({
+  selector: 'menu',
+  templateUrl: 'menu.html'
+})
+export class MenuComponent {
+
+  text: string;
+
+  constructor(public alertCtrl: AlertController, public loadingCtrl: LoadingController, 
+  	public app: App, public api: ApiProvider, public menuCtrl: MenuController) {
+    console.log('Hello MenuComponent Component');
+    this.text = 'Hello World';
+  }
+logout() {
+    const confirm = this.alertCtrl.create({
+      title: 'Um momento',
+      message: 'Tem certeza que deseja sair?',
+      buttons: [{
+        text: 'Sim',
+        handler: () => {
+          const load = this.loadingCtrl.create({
+          content: 'Saindo...'
+        });
+          load.present();
+          this.api.logout().subscribe(res => {
+            load.dismiss();
+            this.menuCtrl.close();
+            localStorage.removeItem("userToken");
+            this.app.getRootNavs()[0].setRoot(LoginPage); //Erro de tabs solved
+          },
+          Error => {
+            console.log(Error);
+          });          
+        }  
+      },
+      {
+        text: 'Não'
+      }]                                                                
+    });
+    confirm.present();
+  }
+}
diff --git a/src/pages/adicionar/adicionar.html b/src/pages/adicionar/adicionar.html
@@ -1,10 +1,11 @@
 <ion-header>
   <ion-navbar color="light">
-    <ion-buttons start>
-      <button ion-button icon-only (click)="logout()">
-        <ion-icon name="exit"></ion-icon>
+   <ion-buttons right>
+      <button ion-button icon-only menuToggle>
+        <ion-icon name='menu'></ion-icon>
       </button>
     </ion-buttons>
+
     <ion-title text-center><span class="titulo">Registrar</span></ion-title>
   </ion-navbar>
 </ion-header>

diff --git a/src/pages/adicionar/adicionar.ts b/src/pages/adicionar/adicionar.ts
@@ -87,33 +87,4 @@ import { DetalhePage } from '../detalhe/detalhe';
        console.log(Error);
      });        
    } 
-
-   logout() {
-     const confirm = this.alertCtrl.create({
-       title: 'Um momento',
-       message: 'Tem certeza que deseja sair?',
-       buttons: [{
-         text: 'Sim',
-         handler: () => {
-           const load = this.loadingCtrl.create({
-             content: 'Saindo...'
-           });
-           load.present();
-           this.api.logout().subscribe(res => {
-             load.dismiss();
-             localStorage.removeItem("userToken");
-             this.navCtrl.setRoot(LoginPage);
-           },
-           Error => {
-             console.log(Error);
-           });
-         }
-       },
-       {
-         text: 'Não'
-       }]
-     });
-     confirm.present();
-   }
-   //}
  }
diff --git a/src/pages/home/home.html b/src/pages/home/home.html
@@ -1,8 +1,8 @@
 <ion-header>
   <ion-navbar color="light">
-    <ion-buttons start>
-      <button ion-button icon-only (click)="logout()">
-        <ion-icon name="exit"></ion-icon>
+    <ion-buttons right>
+      <button ion-button icon-only menuToggle>
+        <ion-icon name='menu'></ion-icon>
       </button>
     </ion-buttons>
     <ion-title text-center><span class="titulo">Home Glique</span></ion-title>

diff --git a/src/pages/home/home.ts b/src/pages/home/home.ts
@@ -32,33 +32,7 @@ export class HomePage {
   	this.navCtrl.push(MedicoesPage);
   }
 
-  logout() {
-    const confirm = this.alertCtrl.create({
-      title: 'Um momento',
-      message: 'Tem certeza que deseja sair?',
-      buttons: [{
-        text: 'Sim',
-        handler: () => {
-          const load = this.loadingCtrl.create({
-          content: 'Saindo...'
-        });
-          load.present();
-          this.api.logout().subscribe(res => {
-            load.dismiss();
-            localStorage.removeItem("userToken");
-            this.app.getRootNavs()[0].setRoot(LoginPage); //Erro de tabs solved
-          },
-          Error => {
-            console.log(Error);
-          });          
-        }  
-      },
-      {
-        text: 'Não'
-      }]                                                                
-    });
-    confirm.present();
-  }
+
 
   relatorios() {
     this.navCtrl.push(RelatoriosPage);

diff --git a/src/providers/functions/functions.ts b/src/providers/functions/functions.ts
@@ -1,8 +1,11 @@
 import { HttpClient, HttpHeaders } from '@angular/common/http';
 import { Injectable } from '@angular/core';
-import { ToastController, AlertController, LoadingController } from 'ionic-angular';
+import { ToastController, AlertController, LoadingController, NavController } from 'ionic-angular';
 
 
+import { LoginPage } from '../../pages/login/login';
+import { ApiProvider } from '../api/api';
+
 @Injectable()
 export class FunctionsProvider {
    private monthNames =  ["Janeiro, Fevereiro, Março, Abril, Maio, Junho, Julho, Agosto, Setembro, Outubro, Novembro, Dezembro"];
@@ -115,40 +118,7 @@ export class FunctionsProvider {
     });
     alert.present();
   }
-  logoutServidor() {
-   const url = this.REST_API + '/users/logout';
-    const httpOptions = ({
-      headers: new HttpHeaders({
-        'user-token': localStorage.userToken
-      })
-    });
-
-    return this.http.get(url, httpOptions);
-  }
-
-  logout() {
-    let load =  this.alertCtrl.create({
-      title: 'Sessão expirou!',
-      message: 'Sua sessão expirou, por favor logue novamente.',
-      buttons: [{
-      text: 'OK',
-      handler: () => {
-        const load = this.loadingCtrl.create({
-          content: 'Saindo...'
-        });
-        load.present();            
-        this.logoutServidor().subscribe(res => {
-          console.log("OK, deslogado");
-          load.dismiss();
-         localStorage.removeItem("userToken");
-        });
-      }
-      }]
-    });
-    load.present();
-    return load; 
-  }
-
+
   public formataData(tipo: number, data: Date) {
     data = new Date(data);
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		<ion-item>Meu Perfil</ion-item>
		<ion-item (click)="logout()">Sair</ion-item>