ios/w8 builds + various improvments

Toolwatchapp · Jul 5, 2016 · 36afca1 · 36afca1
1 parent 0ec2842
commit 36afca1
Show file tree

Hide file tree

Showing 71 changed files with 173 additions and 50 deletions.
diff --git a/README.md b/README.md
@@ -6,16 +6,16 @@ Mobile Apps
 - [x] Dashboard
 - [x] Add Watch
 - [x] Edit / Delete watch
-- [ ] Result
+- [x] Result
 - [x] Login
-- [ ] Signup
-- [ ] Time
+- [x] Signup
+- [x] Time
 
 ### Functionalities
 
 - [x] List watches
 - [x] Add/edit/delete watches
 - [x] Login (email)
-- [ ] Signup (email)
+- [x] Signup (email)
 - [ ] Login fb
-- [ ] Social share
+- [x] Social share
diff --git a/app/pages/about/about.scss b/app/pages/about/about.scss
@@ -1,6 +1,10 @@
 .about-page{
 	background-color: white;
 	ion-content{
+
+		scroll-content{
+			height: 60%;
+		}
 		height: 50%;
 		top:30%;
 		width: 90%;

diff --git a/app/pages/dashboard/dashboard.ts b/app/pages/dashboard/dashboard.ts
@@ -49,21 +49,21 @@ export class DashboardPage {
 
 		this.twapi.accurateTime();
 
-		// this.twapi.login("mathieu[email protected]", "qwerty").then(
-		// 	res => {
-		// 		this.user = res;
-		// 		console.log(this.user);
-
-		// 		for (var i = 0; i < this.user.watches.length; i++) {
-		// 			console.log(this.user.watches[i]);
-		// 			for (var y = 0; y < this.user.watches[i].measures.length; y++) {
-		// 				console.log(this.user.watches[i].measures[y].status == 8);
-
-		// 				console.log(this.user.watches[i].measures[y]);
-		// 			}
-		// 		}
-		// 	}  
-		// );
+		this.twapi.login("mathieu@toolwatch.io", "qwerty").then(
+			res => {
+				this.user = res;
+				console.log(this.user);
+
+				for (var i = 0; i < this.user.watches.length; i++) {
+					console.log(this.user.watches[i]);
+					for (var y = 0; y < this.user.watches[i].measures.length; y++) {
+						console.log(this.user.watches[i].measures[y].status == 8);
+
+						console.log(this.user.watches[i].measures[y]);
+					}
+				}
+			}  
+		);
 	}
 
 	updateWatch(watch:Watch){

diff --git a/app/pages/footer/footer.scss b/app/pages/footer/footer.scss
@@ -1,5 +1,9 @@
 footer-nav{
 
+	.button-icon-only, .button-icon-left{
+		box-shadow: none;
+	}
+
 	tab{
 		z-index: 10;
 		color:white;
@@ -22,26 +26,34 @@ footer-nav{
 			.tab-label{
 				float:left;
 				width: 100%;
-				margin-top: -20%;
+				margin-top: -15%;
+				margin-left: 2%;
 				z-index: 10;
-				font-size: 10px;
+				font-size: 1.5vh;
 				text-align: center;
 			}
 
 			.button-icon-only{
 				margin-top: 0;
-				padding-left: 5%;
+				-webkit-transition: none;
+                transition: none;
 				background-color: transparent;
+				box-shadow: none;
 			}
 
 			button{
+
 				ion-icon{
 					width: 100%;
 					height: 70%;
 					text-align: center;
 					padding-left: 3%;
 					font-size: 5vh;
 				}
+
+				width: 100%;
+				-webkit-transition: none;
+                transition: none;
 			}
 		}
 	}

diff --git a/app/pages/footer/footer.ts b/app/pages/footer/footer.ts
@@ -172,7 +172,9 @@ export class Footer {
 	}
 
 	onTime(){
-		this.nav.push(TimePage);
+		this.nav.push(TimePage, {
+			user:this.user
+		});
 	}
 
 	onTips(){

diff --git a/app/pages/header/header.html b/app/pages/header/header.html
@@ -1,7 +1,7 @@
 <ion-icon (click)="onBack()"  *ngIf="back" class="header left" name="md-arrow-back"></ion-icon>
  <ion-icon (click)="onChat()" *ngIf="chat" class="header right" name="ios-chatbubbles"></ion-icon>
 
-<top-nav>
+<top-nav  [class]="topBg">
   <logo>
     <logo-bg></logo-bg>
   </logo>

diff --git a/app/pages/header/header.scss b/app/pages/header/header.scss
@@ -1,5 +1,31 @@
+.handBg{
+	background-image: url('../assets/images/hands.png'), linear-gradient(180deg, #4d77a7 75%, white 76%);
+}
+
+.addWatch-background{
+	background-image: url('../assets/images/add-watch.png'), linear-gradient(180deg, #4d77a7 75%, white 76%);
+	background-size: contain;
+	width: 100%;
+
+	h1{
+		padding-top: 8%;
+	}
+}
+
+.time-background{
+	background-image: linear-gradient(180deg, #4d77a7 75%, white 76%);
+	width: 100%;
+}
+
+.account-background{
+	h1{
+		padding-top: 5%;
+	}
+	width: 100%;
+	background-image: url('../assets/images/account-back.png'), linear-gradient(180deg, #4d77a7 75%, white 76%);
+}
+
 top-nav{
-		background-image: url('../assets/images/hands.png'), linear-gradient(180deg, #4d77a7 75%, white 76%);
 		background-repeat: no-repeat;
 		background-size: cover;
 		height: 40%;

diff --git a/app/pages/header/header.ts b/app/pages/header/header.ts
@@ -25,9 +25,13 @@ export class Header {
 	chat: boolean = false;
 	@Input()
 	back:boolean = false;
+	@Input()
+	topBg:string = "handBg";
 
 	constructor(private nav: NavController, private elementRef: ElementRef) {
 
+		console.log(this.topBg);
+		console.log(this.slogan);
 	}
 
 	onBack(){

diff --git a/app/pages/login/login.html b/app/pages/login/login.html
@@ -58,7 +58,7 @@
         <button id="login" toggle md-raised-button color="primary" type="submit"> {{ 'login' | translate:{value: param} }}</button>
       </div>
 </form>
-        <button id="login-fb" toggle md-raised-button color="primary">
+        <button id="login-fb" toggle md-raised-button color="primary" disabled>
           <ion-icon name="logo-facebook"></ion-icon>
            {{ 'facebook-login' | translate:{value: param} }}
         </button>

diff --git a/app/pages/login/login.ts b/app/pages/login/login.ts
@@ -19,23 +19,35 @@ import {Facebook} from 'ionic-native';
 })
 export class LogInPage extends LoginComponent {
 
-
+	laoding:Loading;
 
 	constructor(private nav: NavController, translate: TranslateService,
 		twapi: TwAPIService, builder: FormBuilder) {
 		super(translate, twapi, builder);
 
-
+
+		translate.get('logging-in').subscribe(
+			sentence => this.laoding = Loading.create({
+					content: sentence
+				}
+			)
+		);
+
 		this.userLogged.subscribe(
 			user => this.nav.setRoot(DashboardPage, {
 				user:user
 			})
 		);
 
-
 	}
 
+	// onSubmit(user:{email:string, password:string}){
+	// 	super.onSubmit(user);
+	// 	this.laoding.dismiss();
+	// }
+
 	onSignup(){
+
 		this.nav.push(SignupPage, {
 			email:this.email.value,
 			password:this.password.value

diff --git a/app/pages/signup/signup.html b/app/pages/signup/signup.html
@@ -1,4 +1,4 @@
-<header-nav [back]="true"></header-nav>
+<header-nav [slogan]="slogan" [topBg]="background" [back]="true"></header-nav>
 
 <ion-content>
 <form 

diff --git a/app/pages/signup/signup.ts b/app/pages/signup/signup.ts
@@ -21,6 +21,9 @@ import {Header} from '../header/header';
 })
 export class SignupPage extends SignupComponent{
 
+  background:string = "account-background";
+  slogan:string = "signin-slogan";
+
   constructor(private nav: NavController, private navParams: NavParams, translate: TranslateService, 
      twapi: TwAPIService,  builder: FormBuilder) {
 

diff --git a/app/pages/time/time.html b/app/pages/time/time.html
@@ -1,5 +1,5 @@
 
-<header-nav [back]="true"></header-nav>
+<header-nav [slogan]="slogan" [topBg]="background" [back]="true"></header-nav>
 
 <ion-content>
 

diff --git a/app/pages/time/time.scss b/app/pages/time/time.scss
@@ -60,6 +60,7 @@
 			}
 
 			.details{
+				font-size: 2.5vh;
 				margin-top: 3%;
 				background-color: white;
 				width: 100%;
@@ -116,12 +117,13 @@
 
 	.clock {
 	  margin: auto;
+	  margin-top: 8%;
 	  border-radius: 50%;
-	  background: #4d77a7 url(../assets/images/clock-face-bg.png) no-repeat center;
-	  background-size: 98%;
+	  background: url(../assets/images/clock-face-bg.png) no-repeat center;
+	  background-size: contain;
 	  height: 45%;
 	  position: relative;
-	  width: 80%;
+	  width: 90%;
 	}
 
 	.logo{
@@ -135,6 +137,8 @@
 	}
 
 	.date{
+	  padding-top: 2%;
+	  font-size: 1.8vh;
 	  background-color: #21446f;
 	  height: 20px;
 	  font-family: 'Nunito', sans-serif;
@@ -147,7 +151,7 @@
 	.month{
 	  width: 40px;
 	  left: 15%;
-	  padding-left: 2%;
+	  padding-left: 4%;
 	}
 
 	.day{
@@ -242,7 +246,7 @@
 	  height: 100%;
 	  z-index: 1;
 	  position: absolute;
-	  top:2%;
+	  top:6%;
 	  background: url(../assets/images/clock-cadran.png) no-repeat center;
 	  background-size: 100%;
 	}
@@ -253,7 +257,7 @@
 	  position: absolute;
 	  top:0%;
 	  background: url(../assets/images/clock-disque.png) no-repeat center;
-	  background-size: cover;
+	  background-size: contain;
 	}
 
 	.moon-phase-container{

diff --git a/app/pages/time/time.ts b/app/pages/time/time.ts
@@ -8,6 +8,7 @@ import {Header}  from '../header/header';
 import {ClockComponent} from 'tw-common/dist/app/directives/clock/clock.component';
 import {MoonPhases} from './moon/moon-phases';
 import {Footer} from '../footer/footer';
+import {User} from 'tw-common/dist/app/models/user.model';
 
 
 @Component({
@@ -23,6 +24,8 @@ export class TimePage extends ClockComponent{
 	Math:any = Math;
 	interval:number = 100;
 	offset:number;
+	user:User;
+	background:string = "time-background";
 
 	constructor(elementRef: ElementRef, private nav: NavController, private navParams: NavParams,
 		private twapi: TwAPIService, private translate: TranslateService) {
@@ -43,6 +46,8 @@ export class TimePage extends ClockComponent{
 			}, 
 			this.interval, this.interval, this
 		);
+
+		this.user = this.navParams.get('user');
 	}
 
 	addZero(i:number):string {

diff --git a/app/pages/tips/tips.scss b/app/pages/tips/tips.scss
@@ -1,7 +1,10 @@
 .tips-page{
 	background-color: white;
 	ion-content{
-		height: 60%;
+		scroll-content{
+			height: 60%;
+		}
+		height: 55%;
 		top:30%;
 		width: 90%;
 		margin-left: 5%;

diff --git a/app/pages/watch/watch.html b/app/pages/watch/watch.html
@@ -1,5 +1,5 @@
 
-<header-nav [back]="true"></header-nav>
+<header-nav [slogan]= "slogan" [back]="true" [topBg]='background'  ></header-nav>
 
 <ion-content>
 

diff --git a/app/pages/watch/watch.ts b/app/pages/watch/watch.ts
@@ -19,6 +19,8 @@ import 'gsap';
 })
 export class WatchPage extends WatchComponent {
 
+	background:string = "addWatch-background";
+	slogan:string ="add-new-watch";
 
 	constructor(private nav: NavController, private navParams: NavParams, 
 		translate: TranslateService,
@@ -33,6 +35,7 @@ export class WatchPage extends WatchComponent {
 		let receivedWatch:Watch = this.navParams.get('watch');
 		if (receivedWatch !== undefined){
 			this.watchModel = receivedWatch;
+			this.slogan = "edit-watch";
 		}