Skip to content

Commit

Permalink
login, signup, home design updates
Browse files Browse the repository at this point in the history
  • Loading branch information
hamzaavvan committed Jan 5, 2018
1 parent 8b34978 commit 11ea3bd
Show file tree
Hide file tree
Showing 11 changed files with 36 additions and 8 deletions.
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
"@ionic-native/status-bar": "4.4.0",
"@ionic/storage": "2.1.3",
"cordova-plugin-camera": "^4.0.1",
"firebase": "^4.8.1",
"firebase": "4.8.0",
"ionic-angular": "3.9.2",
"ionicons": "3.0.0",
"rxjs": "5.5.2",
Expand Down
8 changes: 8 additions & 0 deletions src/app/app.scss
Original file line number Diff line number Diff line change
Expand Up @@ -44,4 +44,12 @@ page-home, page-login, page-reset-password, page-signup {
form {
margin-top: 5vh;
}

form, form ion-item {
background-color: transparent !important;

&, ion-label * {
color: #fff !important;
}
}
}
Binary file added src/assets/imgs/home-bg.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/assets/imgs/login-bg.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/assets/imgs/register-bg.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
5 changes: 4 additions & 1 deletion src/pages/home/home.scss
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
page-home {

.scroll-content {
background-image: url("/assets/imgs/home-bg.jpg");
background-attachment: fixed;
}
}
6 changes: 6 additions & 0 deletions src/pages/login/login.scss
Original file line number Diff line number Diff line change
Expand Up @@ -39,4 +39,10 @@ page-login {
border-bottom: 0 !important;
}
}

.scroll-content {
background-image: url("/assets/imgs/login-bg.jpg");
background-size: cover;
background-position: center center;
}
}
6 changes: 6 additions & 0 deletions src/pages/reset-password/reset-password.scss
Original file line number Diff line number Diff line change
Expand Up @@ -35,4 +35,10 @@ page-reset-password {
img {
height: 150px;
}

.scroll-content {
background-image: url("/assets/imgs/login-bg.jpg");
background-size: cover;
background-position: center center;
}
}
6 changes: 6 additions & 0 deletions src/pages/signup/signup.scss
Original file line number Diff line number Diff line change
Expand Up @@ -36,4 +36,10 @@ page-signup {
border-bottom: 0 !important;
}
}

.scroll-content {
background-image: url("/assets/imgs/register-bg.jpg");
background-size: cover;
background-position: center center;
}
}
3 changes: 1 addition & 2 deletions src/providers/auth/auth.ts
Original file line number Diff line number Diff line change
@@ -1,15 +1,14 @@
import { Injectable } from '@angular/core';

import firebase from 'firebase';
import { User } from '@firebase/auth-types';

@Injectable()
export class AuthProvider {
constructor() {
console.log('Hello AuthProvider Provider');
}

loginUser(email: string, password: string): Promise<User> {
loginUser(email: string, password: string): Promise<any> {
return firebase.auth().signInWithEmailAndPassword(email, password);
}

Expand Down
8 changes: 4 additions & 4 deletions src/providers/profile/profile.ts
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
import { Injectable } from '@angular/core';

import firebase from 'firebase';
import { Reference } from '@firebase/database-types';
import { User, AuthCredential } from '@firebase/auth-types';
import { Reference } from '@firebase/database';
import { User, AuthCredential } from 'firebase/database';

@Injectable()
export class ProfileProvider {
public userProfile: Reference;
public userProfile: firebase.database.Reference;
public currentUser: User;

constructor() {
Expand All @@ -18,7 +18,7 @@ export class ProfileProvider {
});
}

getUserProfile(): Reference {
getUserProfile(): firebase.database.Reference {
return this.userProfile;
}

Expand Down

0 comments on commit 11ea3bd

Please sign in to comment.