style correction
Showing
src/app/noresult/noresult.module.ts
0 → 100644
src/app/noresult/noresult.page.html
0 → 100644
src/app/noresult/noresult.page.scss
0 → 100644
src/app/noresult/noresult.page.spec.ts
0 → 100644
src/app/noresult/noresult.page.ts
0 → 100644
src/assets/basket.png
0 → 100644
9.86 KB
| import { Injectable } from '@angular/core'; | import { Injectable } from "@angular/core"; | ||
| import { User, Signup, Address } from './services/user'; | import { User, Signup, Address } from "./services/user"; | ||
| import { auth } from 'firebase/app'; | import { auth } from "firebase/app"; | ||
| import { Router, ActivatedRoute } from '@angular/router'; | import { Router, ActivatedRoute } from "@angular/router"; | ||
| import { AngularFireAuth } from '@angular/fire/auth'; | import { AngularFireAuth } from "@angular/fire/auth"; | ||
| import { AngularFirestore, AngularFirestoreDocument, AngularFirestoreCollection } from '@angular/fire/firestore'; | import { | ||
| import { ServiceService } from './../config/service.service'; | AngularFirestore, | ||
| import { GooglePlus } from '@ionic-native/google-plus/ngx'; | AngularFirestoreDocument, | ||
| import { take } from 'rxjs/operators'; | AngularFirestoreCollection | ||
| import { from } from 'rxjs'; | } from "@angular/fire/firestore"; | ||
| import { ServiceService } from "./../config/service.service"; | |||
| import { GooglePlus } from "@ionic-native/google-plus/ngx"; | |||
| import { take } from "rxjs/operators"; | |||
| import { from } from "rxjs"; | |||
| @Injectable({ | @Injectable({ | ||
| providedIn: 'root' | providedIn: "root" | ||
| }) | }) | ||
| export class AuthService { | export class AuthService { | ||
| userData: any; | userData: any; | ||
| ... | @@ -24,82 +28,95 @@ export class AuthService { | ... | @@ -24,82 +28,95 @@ export class AuthService { |
| private service: ServiceService, | private service: ServiceService, | ||
| private googlePlus: GooglePlus | private googlePlus: GooglePlus | ||
| ) { | ) { | ||
| this.type = 1; | this.type = 1; | ||
| this.afAuth.authState.subscribe(user => { | this.afAuth.authState.subscribe(user => { | ||
| if (user) { | if (user) { | ||
| this.userData = user; | this.userData = user; | ||
| console.log(this.userData); | console.log(this.userData); | ||
| this.service.set('user', JSON.stringify(this.userData)); | this.service.set("user", JSON.stringify(this.userData)); | ||
| if (this.type === 1) { | if (this.type === 1) { | ||
| this.router.navigateByUrl('home'); | //this.router.navigateByUrl('home'); | ||
| } else { | |||
| this.router.navigateByUrl('verification'); | |||
| } | |||
| } else { | } else { | ||
| this.service.set('user', null); | this.router.navigateByUrl("verification"); | ||
| JSON.parse(localStorage.getItem('user')); | |||
| this.router.navigateByUrl('login'); | |||
| } | } | ||
| }); | } else { | ||
| this.service.set("user", null); | |||
| JSON.parse(localStorage.getItem("user")); | |||
| this.router.navigateByUrl("login"); | |||
| } | |||
| }); | |||
| } | } | ||
| public async SignIn(email: string, password: string) { | public async SignIn(email: string, password: string) { | ||
| return this.afAuth.auth.signInWithEmailAndPassword(email, password).then((result) => { | return this.afAuth.auth | ||
| console.log('success'); | .signInWithEmailAndPassword(email, password) | ||
| document.body.scrollTop = document.documentElement.scrollTop = 0; | .then(result => { | ||
| this.SetUserData(result.user); | console.log("success"); | ||
| }).catch((error) => { | document.body.scrollTop = document.documentElement.scrollTop = 0; | ||
| window.alert(error.message); | this.SetUserData(result.user); | ||
| }); | }) | ||
| .catch(error => { | |||
| window.alert(error.message); | |||
| }); | |||
| } | } | ||
| public async verify(otp: string) { | public async verify(otp: string) { | ||
| console.log(this.userData.uid, otp); | console.log(this.userData.uid, otp); | ||
| // tslint:disable-next-line:radix | // tslint:disable-next-line:radix | ||
| // const otpnew = parseInt(otp); | // const otpnew = parseInt(otp); | ||
| const custRef: AngularFirestoreCollection<any> = this.afs.collection('customers', ref => ref.where('otp', '==', otp) | const custRef: AngularFirestoreCollection<any> = this.afs.collection( | ||
| .where('uid', '==', this.userData.uid) | "customers", | ||
| ref => ref.where("otp", "==", otp).where("uid", "==", this.userData.uid) | |||
| ); | ); | ||
| custRef.valueChanges().pipe(take(1)).subscribe((value: User[]) => { | custRef | ||
| if (value.length > 0) { | .valueChanges() | ||
| this.afs.collection('customers').doc(this.userData.uid).update({otp: ''}); | .pipe(take(1)) | ||
| this.service.set('type', 1); | .subscribe((value: User[]) => { | ||
| this.router.navigateByUrl('nearby'); | if (value.length > 0) { | ||
| } else { | this.afs | ||
| window.alert('Please input valid OTP'); | .collection("customers") | ||
| } | .doc(this.userData.uid) | ||
| }); | .update({ otp: "" }); | ||
| this.service.set("type", 1); | |||
| this.router.navigateByUrl("nearby"); | |||
| } else { | |||
| window.alert("Please input valid OTP"); | |||
| } | |||
| }); | |||
| } | } | ||
| public async google(type: number) { | public async google(type: number) { | ||
| this.type = type; | this.type = type; | ||
| // this.googlePlus.login({}).then(res => console.log(res)).catch(err => console.error(err)); | // this.googlePlus.login({}).then(res => console.log(res)).catch(err => console.error(err)); | ||
| this.afAuth.auth.signInWithPopup(new auth.GoogleAuthProvider()).then((result) => { | this.afAuth.auth | ||
| console.log('success'); | .signInWithPopup(new auth.GoogleAuthProvider()) | ||
| console.log(result); | .then(result => { | ||
| this.socialSignUp(result); | console.log("success"); | ||
| }); | console.log(result); | ||
| this.socialSignUp(result); | |||
| }); | |||
| } | } | ||
| public async facebook(type: number) { | public async facebook(type: number) { | ||
| this.type = type; | this.type = type; | ||
| this.afAuth.auth.signInWithPopup(new auth.FacebookAuthProvider()).then((result) => { | this.afAuth.auth | ||
| console.log('success'); | .signInWithPopup(new auth.FacebookAuthProvider()) | ||
| console.log(result); | .then(result => { | ||
| }); | console.log("success"); | ||
| console.log(result); | |||
| }); | |||
| } | } | ||
| get isLoggedIn(): boolean { | get isLoggedIn(): boolean { | ||
| const user = JSON.parse(localStorage.getItem('user')); | const user = JSON.parse(localStorage.getItem("user")); | ||
| return(user !== null && user.emailVerified !== false) ? true : false; | return user !== null && user.emailVerified !== false ? true : false; | ||
| } | } | ||
| SetUserData(user: any) { | SetUserData(user: any) { | ||
| const userRef: AngularFirestoreDocument<any> = this.afs.doc( | |||
| const userRef: AngularFirestoreDocument<any> = this.afs.doc(`customers/${user.uid}`); | `customers/${user.uid}` | ||
| userRef.valueChanges().subscribe((value) => { | ); | ||
| userRef.valueChanges().subscribe(value => { | |||
| const userData: User = { | const userData: User = { | ||
| uid: value.uid, | uid: value.uid, | ||
| emailId: value.emailId, | emailId: value.emailId, | ||
| ... | @@ -112,15 +129,15 @@ export class AuthService { | ... | @@ -112,15 +129,15 @@ export class AuthService { |
| currency: value.currency, | currency: value.currency, | ||
| otp: value.otp, | otp: value.otp, | ||
| loginType: value.loginType | loginType: value.loginType | ||
| }; | }; | ||
| console.log(userData); | console.log(userData); | ||
| }); | }); | ||
| } | } | ||
| public async SignOut() { | public async SignOut() { | ||
| return this.afAuth.auth.signOut().then(() => { | return this.afAuth.auth.signOut().then(() => { | ||
| this.service.remove('user'); | this.service.remove("user"); | ||
| console.log('logout'); | console.log("logout"); | ||
| }); | }); | ||
| } | } | ||
| ... | @@ -128,13 +145,13 @@ export class AuthService { | ... | @@ -128,13 +145,13 @@ export class AuthService { |
| this.type = 2; | this.type = 2; | ||
| console.log(userData.user); | console.log(userData.user); | ||
| const currencyData = { | const currencyData = { | ||
| currId: '123', | currId: "123", | ||
| currName: 'Australian dollar', | currName: "Australian dollar", | ||
| symbol: 'A$' | symbol: "A$" | ||
| }; | }; | ||
| const otp = Math.floor(1000 + Math.random() * 9000); | const otp = Math.floor(1000 + Math.random() * 9000); | ||
| userData = userData.user; | userData = userData.user; | ||
| const postData: User = { | const postData: User = { | ||
| uid: userData.uid, | uid: userData.uid, | ||
| status: true, | status: true, | ||
| profilePhoto: userData.photoURL, | profilePhoto: userData.photoURL, | ||
| ... | @@ -149,91 +166,104 @@ export class AuthService { | ... | @@ -149,91 +166,104 @@ export class AuthService { |
| }; | }; | ||
| this.userPostData = postData; | this.userPostData = postData; | ||
| console.log(postData); | console.log(postData); | ||
| this.afs.collection('customers').doc(userData.uid).set(postData).then(() => { | this.afs | ||
| console.log('successs'); | .collection("customers") | ||
| }); | .doc(userData.uid) | ||
| .set(postData) | |||
| .then(() => { | |||
| console.log("successs"); | |||
| }); | |||
| } | } | ||
| signup(userData: Signup) { | signup(userData: Signup) { | ||
| this.type = 2; | this.type = 2; | ||
| console.log(userData); | console.log(userData); | ||
| const otp = Math.floor(1000 + Math.random() * 9000); | const otp = Math.floor(1000 + Math.random() * 9000); | ||
| this.afAuth.auth.createUserWithEmailAndPassword(userData.emailId, userData.password).then((result) => { | this.afAuth.auth | ||
| console.log(result.user); | .createUserWithEmailAndPassword(userData.emailId, userData.password) | ||
| this.afAuth.auth.currentUser.sendEmailVerification(); | .then(result => { | ||
| const currencyData = { | console.log(result.user); | ||
| currId: '123', | this.afAuth.auth.currentUser.sendEmailVerification(); | ||
| currName: 'Australian dollar', | const currencyData = { | ||
| symbol: 'A$' | currId: "123", | ||
| }; | currName: "Australian dollar", | ||
| const custData = result.user; | symbol: "A$" | ||
| const postData: User = { | }; | ||
| uid: custData.uid, | const custData = result.user; | ||
| status: true, | const postData: User = { | ||
| profilePhoto: '', | uid: custData.uid, | ||
| phoneVerified: false, | status: true, | ||
| phone: userData.phone, | profilePhoto: "", | ||
| name: userData.name, | phoneVerified: false, | ||
| emailVerified: false, | phone: userData.phone, | ||
| emailId: userData.emailId, | name: userData.name, | ||
| currency: currencyData, | emailVerified: false, | ||
| otp: otp.toString(), | emailId: userData.emailId, | ||
| loginType: 0 | currency: currencyData, | ||
| }; | otp: otp.toString(), | ||
| this.userPostData = postData; | loginType: 0 | ||
| console.log(postData); | }; | ||
| this.afs.collection('customers').doc(custData.uid).set(postData).then(() => { | this.userPostData = postData; | ||
| console.log('successs'); | console.log(postData); | ||
| this.afs | |||
| .collection("customers") | |||
| .doc(custData.uid) | |||
| .set(postData) | |||
| .then(() => { | |||
| console.log("successs"); | |||
| }); | |||
| }) | |||
| .catch(error => { | |||
| window.alert(error.message); | |||
| }); | }); | ||
| }).catch((error) => { | |||
| window.alert(error.message); | |||
| }); | |||
| } | } | ||
| createAddress(addressData: Address) { | createAddress(addressData: Address) { | ||
| console.log(addressData); | console.log(addressData); | ||
| console.log(this.userData.uid); | console.log(this.userData.uid); | ||
| this.afs.collection('address').add({ | this.afs | ||
| uid: this.userData.uid | .collection("address") | ||
| }).then((docRef) => { | .add({ | ||
| console.log(docRef); | uid: this.userData.uid | ||
| const addrData = { | }) | ||
| uid: this.userData.uid, | .then(docRef => { | ||
| addressType: addressData.addressType, | console.log(docRef); | ||
| area: addressData.area, | const addrData = { | ||
| city: addressData.city, | uid: this.userData.uid, | ||
| country: addressData.country, | addressType: addressData.addressType, | ||
| district: addressData.district, | area: addressData.area, | ||
| firstAddress: addressData.firstAddress, | city: addressData.city, | ||
| landmark: addressData.landmark, | country: addressData.country, | ||
| zip: addressData.zip, | district: addressData.district, | ||
| secondAddress: addressData.secondAddress, | firstAddress: addressData.firstAddress, | ||
| state: addressData.state, | landmark: addressData.landmark, | ||
| addrId: docRef.id, | zip: addressData.zip, | ||
| default: 1 | secondAddress: addressData.secondAddress, | ||
| }; | state: addressData.state, | ||
| const neworderId = docRef.id; | addrId: docRef.id, | ||
| console.log(addrData); | default: 1 | ||
| this.afs.collection('address').doc(neworderId).set(addrData).then(() => { | }; | ||
| console.log('Address add Successfully'); | const neworderId = docRef.id; | ||
| this.service.set('user', JSON.stringify(this.userData)); | console.log(addrData); | ||
| this.router.navigateByUrl('home'); | this.afs | ||
| document.body.scrollTop = document.documentElement.scrollTop = 0; | .collection("address") | ||
| .doc(neworderId) | |||
| .set(addrData) | |||
| .then(() => { | |||
| console.log("Address add Successfully"); | |||
| this.service.set("user", JSON.stringify(this.userData)); | |||
| this.router.navigateByUrl("home"); | |||
| document.body.scrollTop = document.documentElement.scrollTop = 0; | |||
| }); | |||
| }); | }); | ||
| }); | |||
| return false; | return false; | ||
| } | } | ||
| } | } | ||
| /*displayName: "Adarsh Techware" | /*displayName: "Adarsh Techware" | ||
| email: "[email protected]" | email: "[email protected]" | ||
| emailVerified: true | emailVerified: true | ||
| : "https://lh4.googleusercontent.com/-h0rs2pE-Azw/AAAAAAAAAAI/AAAAAAAAAAA/ACHi3rcjNtapRhKoG09NKifQsv_lQPC_2A/photo.jpg" | : "https://lh4.googleusercontent.com/-h0rs2pE-Azw/AAAAAAAAAAI/AAAAAAAAAAA/ACHi3rcjNtapRhKoG09NKifQsv_lQPC_2A/photo.jpg" | ||
| : "vT498Fz6X0Z6l5l5iNn5hxfwz692" | : "vT498Fz6X0Z6l5l5iNn5hxfwz692" | ||
| providerData: [Gl]*/ | providerData: [Gl]*/ | ||