ok

src/app/app.component.ts

@@ -1,6 +1,5 @@
 import { Component } from '@angular/core';
 import { Platform, LoadingController, AlertController } from 'ionic-angular';
-
 import { TabsPage } from '../pages/tabs/tabs';
 import { LoginPage } from '../pages/login/login';
 
@@ -16,7 +15,7 @@ export class MyApp {
   constructor(platform: Platform, public api: ApiProvider, public functions: FunctionsProvider,
     public alertCtrl: AlertController, public loadingCtrl: LoadingController) {
     platform.ready().then(() => {
-      if (localStorage.userToken) {
+      if (localStorage.getItem('userToken')) {
         this.api.validaToken().subscribe(res => {
           if (res) {
             this.rootPage = TabsPage;
@@ -43,8 +42,8 @@ export class MyApp {
           load.present();
           this.api.logout().subscribe(res => {
             load.dismiss();
+            localStorage.clear();
             this.rootPage = LoginPage;
-            localStorage.removeItem("userToken");
           });
         }
       }]

src/app/app.html

@@ -1,4 +1,4 @@
-<ion-menu [content]="menu">
+<ion-menu [content]="menu" type="reveal">
   <ion-header>
     <ion-toolbar>
       <ion-title>

src/app/app.module.ts

@@ -1,6 +1,7 @@
 import { NgModule, ErrorHandler } from '@angular/core';
 import { BrowserModule } from '@angular/platform-browser';
 import { IonicApp, IonicModule, IonicErrorHandler, Navbar } from 'ionic-angular';
+
 import { MyApp } from './app.component';
 import { HttpClientModule } from '@angular/common/http';
 
@@ -22,6 +23,7 @@ import { AlimentosPage } from '../pages/alimentos/alimentos';
 import { CadastrarPage } from '../pages/cadastrar/cadastrar';
 import { PerfilPage } from '../pages/perfil/perfil';
 import { ModalRelatorioPage } from '../pages/relatorio-resultado/modal-relatorio/modal-relatorio';
+import { ModalEditarPerfilPage } from '../pages/perfil/modal-editar-perfil/modal-editar-perfil';
 import { FeedbackPage } from '../pages/feedback/feedback';
 import { HelpPage } from '../pages/help/help';
 import { DicasPage } from '../pages/dicas/dicas';
@@ -83,6 +85,7 @@ export class SentryIonicErrorHandler extends IonicErrorHandler {
     CadastrarPage,
     PerfilPage,
     ModalRelatorioPage,
+    ModalEditarPerfilPage,
     FeedbackPage,
     HelpPage,
     DicasPage,
@@ -121,6 +124,7 @@ export class SentryIonicErrorHandler extends IonicErrorHandler {
     CadastrarPage,
     PerfilPage,
     ModalRelatorioPage,
+    ModalEditarPerfilPage,
     FeedbackPage,
     HelpPage,
     DicasPage

src/components/menu/menu.html

@@ -1,20 +1,20 @@
-<button ion-item icon-end (click)="pagePerfil()">
+<button ion-item icon-end (click)="pagePerfil()" menuClose>
 	Meu Perfil
 	<ion-icon name="contact" ></ion-icon>
 </button>
-<button ion-item icon-end (click)="feedback()">
+<button ion-item icon-end (click)="feedback()" menuClose>
 	Feedback
 	<ion-icon name="megaphone" ></ion-icon>
 </button>
-<button ion-item icon-end (click)="ajuda()">
+<button ion-item icon-end (click)="ajuda()" menuClose>
 	Sobre o app
 	<ion-icon name="help-circle" ></ion-icon>
 </button>
-<button ion-item icon-end (click)="dicas()">
+<button ion-item icon-end (click)="dicas()" menuClose>
 	Dicas e dúvidas
 	<ion-icon name="md-bulb"></ion-icon>
 </button>
-<button ion-item icon-end (click)="logout()">
+<button ion-item icon-end (click)="logout()" menuClose>
 	Sair
 	<ion-icon name="exit" ></ion-icon>
 </button>

src/components/menu/menu.ts

@@ -37,7 +37,9 @@ logout() {
           this.api.logout().subscribe(res => {
             load.dismiss();
             this.menuCtrl.close();
-            localStorage.removeItem("userToken");
+            //console.log("TOKEN ANTES DE LOGAR:" + localStorage.getItem("userToken"));
+            //localStorage.removeItem("userToken");
+            localStorage.clear();
             this.app.getRootNavs()[0].setRoot(LoginPage); //Erro de tabs solved
           },
           Error => {

src/pages/login/login.ts

@@ -43,8 +43,9 @@ export class LoginPage {
     }); load.present();
     this.api.login(this.user.email, this.user.password).subscribe(res => {
       load.dismiss();
-      localStorage.setItem("userToken", res["user-token"]); //Token para reqs posteriores           
-      localStorage.setItem("userId", res.objectId); // Id do usuário atual logado
+      localStorage.setItem('userToken', res["user-token"]); //Token para reqs posteriores           
+      localStorage.setItem('userId', res.objectId); // Id do usuário atual logado
+      console.log("TOKEN DEPOIS DE LOGAR:" + localStorage.getItem("userToken"));
       this.navCtrl.setRoot(TabsPage);
     },
       Error => { //Login  

src/pages/medicoes/medicoes.ts

@@ -26,6 +26,7 @@ export class MedicoesPage {
     total: 0,
     semana: 0
   }
+  private error = 0;
 
   constructor(public navCtrl: NavController, public navParams: NavParams, private api: ApiProvider,
     public functions: FunctionsProvider, public loadingCtrl: LoadingController, public alertCtrl: AlertController) {
@@ -58,13 +59,21 @@ export class MedicoesPage {
     let hoje = this.functions.toEpoch();
     let intervalo = this.functions.calculaEssaSemana();
     console.log(hoje)    
-    this.api.getQuantidadeObjDia(hoje).subscribe(res => this.qtdObj.hoje = res);
-    this.api.getQuantidadeObjSemana(intervalo.i1, intervalo.i2).subscribe(res => this.qtdObj.semana = res);
+    this.api.getQuantidadeObjDia(hoje).subscribe(
+      res => this.qtdObj.hoje = res,
+      Error => console.log("ERRRRRRRRRRRRRRO")
+    );
+    this.api.getQuantidadeObjSemana(intervalo.i1, intervalo.i2).subscribe(
+      res => this.qtdObj.semana = res,
+       Error => this.error++
+    );
     this.api.getQuantidadeObj().subscribe(res => {
       this.qtdObj.total = res;
-      console.log(res);
     }, Error => {
-      this.functions.showAlert("Ops!", this.functions.filtraErro(Error.error.code));
+      Error => this.error++;
     });
+
+   if (this.error > 0)
+     this.functions.showAlert("Ops", "foram encontrados erro ao exibir esta página");
   }
 }

src/pages/perfil/modal-editar-perfil/modal-editar-perfil.html

@@ -0,0 +1,31 @@
+<ion-header>
+    <ion-navbar color="navBarColor">
+        <ion-buttons right>
+            <button ion-button (click)="dismiss()">
+                <span ion-text color="primary" showWhen="ios">Cancel</span>
+                <ion-icon name="md-close" showWhen="android, windows"></ion-icon>
+            </button>
+        </ion-buttons>
+        <ion-title text-center><span class="titulo">Alterar Perfil</span></ion-title>
+    </ion-navbar>
+</ion-header>
+<ion-content>
+	<ion-item>	
+		<ion-label stacked>
+			<ion-icon name="body" item-start></ion-icon><b>Nome</b>
+		</ion-label>
+		<ion-input type="text" name="" placeholder="Insira seu nome..." [(ngModel)]="user.name"></ion-input>
+	</ion-item>
+	<ion-item>
+		<ion-label stacked>
+			<ion-icon name="calendar" item-start></ion-icon> <b>Data de nascimento</b>
+		</ion-label>
+		<ion-datetime displayFormat="DD-MM-YYYY" pickerFormat="DD MMMM YYYY" [(ngModel)]="user.nascimento"
+			monthNames="{{functions.monthNames}}" cancelText="Cancelar" doneText="Feito"
+			placeholder="Digite sua data de nascimento">
+		</ion-datetime>
+	</ion-item>
+	<ion-item>
+		<button ion-button full color="primary" (click)="cadastrar()">Cadastrar</button>
+	</ion-item>
+</ion-content>

src/pages/perfil/modal-editar-perfil/modal-editar-perfil.ts

@@ -0,0 +1,26 @@
+import { Component } from '@angular/core';
+import { NavParams, ViewController } from 'ionic-angular';
+
+import { FunctionsProvider } from '../../../providers/functions/functions';
+import { ApiProvider } from '../../../providers/api/api';
+
+@Component({
+	selector: 'modal-editar-perfil',
+	templateUrl: 'modal-editar-perfil.html',
+})
+
+export class ModalEditarPerfilPage {
+	public user = this.navParams.get('data');
+	private password = {
+		password: '',
+		password2: ''
+	};
+
+	constructor(public navParams: NavParams, public viewCtrl: ViewController, 
+		public functions: FunctionsProvider, public api: ApiProvider) {
+	}
+
+	public dismiss() {
+		this.viewCtrl.dismiss();
+	}
+}

src/pages/perfil/perfil.html

@@ -15,7 +15,7 @@
     <input type="file" ion-input>
   </ion-item> -->
   <ion-item>
-    <strong>Ùltimo login: </strong>{{ dadosUser?.lastLogin | data}}
+    <strong>Último login: </strong>{{ dadosUser?.lastLogin | data}}
   </ion-item>
   <ion-item>
     <strong>Status da conta: </strong>{{ dadosUser?.userStatus }}
@@ -33,6 +33,17 @@
     <strong>Nome do usuário: </strong>{{ dadosUser?.name }}
   </ion-item>
   <ion-item>
-    <strong>Ùltima modificação: </strong>{{ dadosUser?.updated | data}}
+    <strong>Última modificação: </strong>{{ dadosUser?.updated | data}}
+  </ion-item>
+  <ion-item>
+    <button ion-button full rounded (click)="alterarSenha()">
+      Quero alterar minha senha
+    </button>
+  </ion-item>
+  <ion-item>
+    <button ion-button full rounded (click)="alterarPerfil()" icon-end>
+      Quero alterar meu perfil
+      <ion-icon name="send"></ion-icon>
+    </button>
   </ion-item>
 </ion-content>

src/pages/perfil/perfil.ts

@@ -1,7 +1,10 @@
 import { Component } from '@angular/core';
-import { IonicPage, NavController, NavParams } from 'ionic-angular';
+import { IonicPage, NavController, NavParams, ModalController } from 'ionic-angular';
 
 import { ApiProvider } from '../../providers/api/api';
+import { FunctionsProvider } from '../../providers/functions/functions';
+
+import { ModalEditarPerfilPage } from './modal-editar-perfil/modal-editar-perfil';
 
 /**
  * Generated class for the PerfilPage page.
@@ -19,7 +22,7 @@ export class PerfilPage {
   private dadosUser;
 
   constructor(public navCtrl: NavController, public navParams: NavParams,
-    public api: ApiProvider) {
+    public api: ApiProvider, public modalCtrl: ModalController, public functions: FunctionsProvider) {
       this.getInfoUserLogado()
   }
 
@@ -32,4 +35,16 @@ export class PerfilPage {
       this.dadosUser = res;
     });
   }
+
+  public alterarPerfil() {
+     let modal = this.modalCtrl.create(ModalEditarPerfilPage, { "data": this.dadosUser });
+      modal.present();
+  }
+
+    public alterarSenha() {
+    console.log("Ok")
+    this.api.getAlterPassword().subscribe(() =>
+      this.functions.showAlert("Sucesso", "Um link de alteração da sua senha foi enviado ao seu e-mail!")
+    );
+  }
 }

src/providers/api/api.ts

@@ -73,7 +73,7 @@ export class ApiProvider {
 
   public logout() {
     const url = `${this.REST_API}/users/logout`;
-    return this.http.get(url, this.httpOptionsNoToken);
+    return this.http.get(url, this.httpOptions);
   }
 
   public getQuantidadeObj() { //Retorna a quantidade de objetos na tabela medicoes
@@ -190,4 +190,9 @@ export class ApiProvider {
     };
     return this.http.post(url, body, this.httpOptions);
   }
+
+  public getAlterPassword() {
+    const url = `${this.REST_API}/users/restorepassword/${localStorage.getItem("userId")}`;
+    return this.http.get(url, this.httpOptionsNoToken);
+  }
 }