Component de menu para logout e perfil add

GabrielVictorF · Apr 21, 2019 · c208bbf · c208bbf
1 parent 6d8dda2
commit c208bbf
Show file tree

Hide file tree

Showing 17 changed files with 40 additions and 204 deletions.
diff --git a/src/app/app.component.ts b/src/app/app.component.ts
@@ -17,14 +17,13 @@ export class MyApp {
     public alertCtrl: AlertController, public loadingCtrl: LoadingController) {
     platform.ready().then(() => {
       if (localStorage.userToken) {
-        console.log("Tem token!");
         this.api.validaToken().subscribe(res => {
           if (res) {
             this.rootPage = TabsPage;
           } else {
             this.logout();
           } 
-        });
+        }, Error => this.rootPage = LoginPage);
       } else {
         this.rootPage = LoginPage;
       } 

diff --git a/src/components/menu/menu.html b/src/components/menu/menu.html
@@ -1,2 +1,8 @@
-<ion-item>Meu Perfil</ion-item>
-<ion-item (click)="logout()">Sair</ion-item>
+<button ion-item icon-end>
+	Meu Perfil
+	<ion-icon name="contact"></ion-icon>
+</button>
+<button ion-item icon-end (click)="logout()">
+	Sair
+	<ion-icon name="exit"></ion-icon>
+</button>
diff --git a/src/pages/alimentos/alimentos.html b/src/pages/alimentos/alimentos.html
@@ -5,11 +5,14 @@
   Ionic pages and navigation.
 -->
 <ion-header>
-
   <ion-navbar>
-    <ion-title>alimentos</ion-title>
+    <ion-title>Alimentos</ion-title>
+    <ion-buttons right>
+      <button ion-button icon-only menuToggle>
+        <ion-icon name='menu'></ion-icon>
+      </button>
+    </ion-buttons>
   </ion-navbar>
-
 </ion-header>
 
 

diff --git a/src/pages/cadastrar/cadastrar.html b/src/pages/cadastrar/cadastrar.html
@@ -3,6 +3,11 @@
     <ion-title>
       Cadastro de usuário
     </ion-title>
+    <ion-buttons right>
+      <button ion-button icon-only menuToggle>
+        <ion-icon name='menu'></ion-icon>
+      </button>
+    </ion-buttons>
   </ion-navbar>
 </ion-header>
 

diff --git a/src/pages/detalhe/detalhe.html b/src/pages/detalhe/detalhe.html
@@ -1,8 +1,8 @@
 <ion-header>
   <ion-navbar>
-    <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>Detalhe do item</ion-title>

diff --git a/src/pages/detalhe/detalhe.ts b/src/pages/detalhe/detalhe.ts
@@ -36,34 +36,6 @@ export class DetalhePage {
       this.state[1] = "arrow-round-up";
   }
 
-  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();
-  }
-
   actionSheet() {
     const action = this.actionSheetCtrl.create({
       title: "Selecione a operação",

diff --git a/src/pages/edita/edita.html b/src/pages/edita/edita.html
@@ -1,8 +1,8 @@
 <ion-header>
   <ion-navbar>
-    <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>

diff --git a/src/pages/edita/edita.ts b/src/pages/edita/edita.ts
@@ -29,32 +29,4 @@ export class EditaPage {
       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.ts b/src/pages/home/home.ts
@@ -1,6 +1,5 @@
 import { Component } from '@angular/core';
 import { NavController, LoadingController, AlertController } from 'ionic-angular';
-import { App } from 'ionic-angular';
 
 import { MedicoesPage } from '../medicoes/medicoes';
 import { LoginPage } from '../login/login';
@@ -18,7 +17,7 @@ export class HomePage {
   protected turno: string;
   constructor(public navCtrl: NavController, public api: ApiProvider, 
     public functions: FunctionsProvider, public loadingCtrl: LoadingController,
-    public alertCtrl: AlertController, public app: App) {
+    public alertCtrl: AlertController) {
     var turnoAgora = new Date().getHours();
     if (turnoAgora <= 5)
       this.turno = "Boa madrugada";
@@ -32,8 +31,6 @@ export class HomePage {
   	this.navCtrl.push(MedicoesPage);
   }
 
-
-
   relatorios() {
     this.navCtrl.push(RelatoriosPage);
   }

diff --git a/src/pages/medicoes/medicoes.html b/src/pages/medicoes/medicoes.html
@@ -1,14 +1,8 @@
-<!--
-  Generated template for the MedicoesPage page.
-
-  See http://ionicframework.com/docs/components/#navigation for more info on
-  Ionic pages and navigation.
--->
 <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><span class="titulo">Medições</span></ion-title>

diff --git a/src/pages/medicoes/medicoes.ts b/src/pages/medicoes/medicoes.ts
@@ -58,32 +58,4 @@ export class MedicoesPage {
       console.log(res);
     });
   }
-
-  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/relatorio-resultado/relatorio-resultado.html b/src/pages/relatorio-resultado/relatorio-resultado.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">Relatórios</span></ion-title>

diff --git a/src/pages/relatorio-resultado/relatorio-resultado.ts b/src/pages/relatorio-resultado/relatorio-resultado.ts
@@ -48,34 +48,6 @@ export class RelatorioResultadoPage {
     });   
   }
 
-  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();
-  }
-
   filtraFuncao() {
     switch(this.funcao) {
       case 1: //Relatorio do mes

diff --git a/src/pages/relatorios/relatorios.html b/src/pages/relatorios/relatorios.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">Relatórios</span></ion-title>

diff --git a/src/pages/relatorios/relatorios.ts b/src/pages/relatorios/relatorios.ts
@@ -26,32 +26,4 @@ export class RelatoriosPage {
   relatorioSemana() {
     this.navCtrl.push(RelatorioResultadoPage, {"funcao": 3});
   }
-
-  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/resultado/resultado.html b/src/pages/resultado/resultado.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">Resultado</span></ion-title>

diff --git a/src/pages/resultado/resultado.ts b/src/pages/resultado/resultado.ts
@@ -134,7 +134,7 @@ export class ResultadoPage {
         }, Error => {
           let erro = this.functions.filtraErro(Error.error.code);
           this.functions.showAlert("Ops!", erro);
-          this.loading.dismiss().then(this.logout());
+          this.loading.dismiss();
         });
       break;
       case 2: //Desativado
@@ -230,32 +230,4 @@ export class ResultadoPage {
     this.medias.pos = soma.pos / length;
     this.medias.injetado = soma.injetado / length;
   }
-
-  logoutInterface() {
-    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();
-  }
 }