From 121a5f3a8c83538d36cfdba458e47ec9a07c2e21 Mon Sep 17 00:00:00 2001 From: Mathieu Nayrolles Date: Thu, 18 May 2017 23:36:35 -0400 Subject: [PATCH] chore(release): 1.3.9 --- config.xml | 2 +- ionic.config.json | 5 ++--- package.json | 3 ++- src/app/app.module.ts | 2 +- src/pages/login/login.ts | 5 +++-- 5 files changed, 9 insertions(+), 8 deletions(-) diff --git a/config.xml b/config.xml index 598aae5..dea97f1 100755 --- a/config.xml +++ b/config.xml @@ -1,5 +1,5 @@ - + Toolwatch - Watch accuracy app Measure and track the accuracy of your mechanical watches. Toolwatch is a free watch accuracy app trusted by the watchmaking industry's leaders and 15 000+ monthly users. Is your watch accurate? Should it be serviced? How does it compare versus other watches? Find out now by measuring the accuracy of your watch! Mathieu Nayrolles diff --git a/ionic.config.json b/ionic.config.json index 5ff69ed..903e382 100755 --- a/ionic.config.json +++ b/ionic.config.json @@ -1,12 +1,11 @@ { "name": "Toolwatch", "app_id": "7d78873d", - "v2": true, - "typescript": true, "proxies": [ { "path": "/api/", "proxyUrl": "https://toolwatch.io/api/" } - ] + ], + "type": "ionic-angular" } diff --git a/package.json b/package.json index 5e9ec46..590a6b5 100755 --- a/package.json +++ b/package.json @@ -2,7 +2,7 @@ "name": "toolwatch-mobile", "author": "Mathieu Nayrolles", "homepage": "https://toolwatch.io/", - "version": "1.3.7", + "version": "1.3.9", "private": true, "scripts": { "build": "npm run assets && ionic-app-scripts build", @@ -51,6 +51,7 @@ }, "devDependencies": { "@ionic/app-scripts": "1.3.7", + "@ionic/cli-plugin-cordova": "1.1.2", "@ionic/cli-plugin-ionic-angular": "1.0.0", "@types/jasmine": "^2.5.41", "@types/node": "^7.0.8", diff --git a/src/app/app.module.ts b/src/app/app.module.ts index f48f097..e0ef2cc 100755 --- a/src/app/app.module.ts +++ b/src/app/app.module.ts @@ -34,7 +34,7 @@ export function HttpLoaderFactory(http: Http) { } export function ConfigurationFactory() { - return configurationProvider("https://toolwatch.io/api/", "b"); + return configurationProvider("https://toolwatch.io/api/", "./assets/"); } export class MyMissingTranslationHandler implements MissingTranslationHandler { diff --git a/src/pages/login/login.ts b/src/pages/login/login.ts index 87c4fb1..4c3e2c3 100755 --- a/src/pages/login/login.ts +++ b/src/pages/login/login.ts @@ -148,8 +148,8 @@ export class LogInPage extends LoginComponent { onSignup() { this.nav.push('SignupPage', { - email: this.loginForm.controls["email"].value, - password: this.loginForm.controls["password"].value + email: this.loginForm.controls["email"].value, + password: this.loginForm.controls["password"].value }); } @@ -159,6 +159,7 @@ export class LogInPage extends LoginComponent { * @param {boolean} attempt */ private onLoggingAttempt(attempt: boolean) { + if (attempt === true) { /** * We can't present a loader twice. Seams like dismiss() destroys it.