Skip to content

Commit

Permalink
Merge pull request #12 from tem-cafe/atualização
Browse files Browse the repository at this point in the history
Atualização
  • Loading branch information
Lucs1590 authored Oct 8, 2019
2 parents efabf06 + fa6377d commit b3f6c33
Show file tree
Hide file tree
Showing 6 changed files with 67 additions and 2 deletions.
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -84,4 +84,4 @@
"android"
]
}
}
}
5 changes: 5 additions & 0 deletions src/app/pages/login/login.page.html
Original file line number Diff line number Diff line change
Expand Up @@ -44,5 +44,10 @@
<ion-spinner name="crescent"></ion-spinner>
</ion-button>
</div>
<div padding style="text-align: center;">
<small style="text-decoration: underline;color: #ba7e64" (click)="verificarAtualizacao()">Verificar
atualização</small>
</div>
</form>
<br>
</div>
33 changes: 32 additions & 1 deletion src/app/pages/login/login.page.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@ import { Component, OnInit } from '@angular/core';
import { ThemeService } from 'src/app/services/theme/theme.service';
import { Router } from '@angular/router';
import { LoginService } from 'src/app/services/login/login.service';
import { AtualizacaoService } from 'src/app/services/atualizacao/atualizacao.service';
import { LoadingController, ToastController } from '@ionic/angular';

@Component({
selector: 'app-login',
Expand All @@ -20,7 +22,10 @@ export class LoginPage implements OnInit {
constructor(
private themeService: ThemeService,
private router: Router,
private loginService: LoginService
private loginService: LoginService,
private atualizacaoService: AtualizacaoService,
public loadingController: LoadingController,
public toastController: ToastController
) { }

ngOnInit() {
Expand Down Expand Up @@ -82,4 +87,30 @@ export class LoginPage implements OnInit {
this.themeService.setTheme(theme);
}

verificarAtualizacao() {
this.presentLoading();
this.atualizacaoService.verificarAtualizacao().subscribe(data => {
window.location.href = data['link'];
}, error => {
this.presentToast('Seu app já está atualizado!');
});
}

async presentLoading() {
const loading = await this.loadingController.create({
message: 'Loading...',
duration: 1000
});
await loading.present();

const { role, data } = await loading.onDidDismiss();
}

async presentToast(msg: string) {
const toast = await this.toastController.create({
message: msg,
duration: 5000
});
toast.present();
}
}
1 change: 1 addition & 0 deletions src/app/services/api/api.service.ts
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ import { Storage } from '@ionic/storage';
})
export class ApiService {
public API_URL = 'https://api-tem-cafe.herokuapp.com';
public VERSAO = '1.0.0';
// private API_URL = 'http://localhost:3000';

constructor(
Expand Down
12 changes: 12 additions & 0 deletions src/app/services/atualizacao/atualizacao.service.spec.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
import { TestBed } from '@angular/core/testing';

import { AtualizacaoService } from './atualizacao.service';

describe('AtualizacaoService', () => {
beforeEach(() => TestBed.configureTestingModule({}));

it('should be created', () => {
const service: AtualizacaoService = TestBed.get(AtualizacaoService);
expect(service).toBeTruthy();
});
});
16 changes: 16 additions & 0 deletions src/app/services/atualizacao/atualizacao.service.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
import { Injectable } from '@angular/core';
import { ApiService } from '../api/api.service';

@Injectable({
providedIn: 'root'
})
export class AtualizacaoService {

constructor(
private api: ApiService
) { }

verificarAtualizacao() {
return this.api.get(`/verificarAtt/${this.api.VERSAO}`);
}
}

0 comments on commit b3f6c33

Please sign in to comment.