design fix
Showing
| ... | @@ -5,7 +5,9 @@ | ... | @@ -5,7 +5,9 @@ |
| <div class="side_menu_wrapper"> | <div class="side_menu_wrapper"> | ||
| <ion-menu-toggle> | <ion-menu-toggle> | ||
| <div class="top_banner"> | <div class="top_banner"> | ||
| <div class="top_image"></div> | <div class="top_image"> | ||
| <img src="../assets/avatar.png"> | |||
| </div> | |||
| <div class="top_detail"> | <div class="top_detail"> | ||
| <h4>John Doe</h4> | <h4>John Doe</h4> | ||
| <p>[email protected]</p> | <p>[email protected]</p> | ||
| ... | @@ -26,10 +28,7 @@ | ... | @@ -26,10 +28,7 @@ |
| <div class="sub_menu"> | <div class="sub_menu"> | ||
| <ul *ngIf="categoryService.activecategories"> | <ul *ngIf="categoryService.activecategories"> | ||
| <ion-menu-toggle> | <ion-menu-toggle> | ||
| <li | <li *ngFor="let category of categoryService.activecategories" (click)="goToPage('catstorelist', category)"> | ||
| *ngFor="let category of categoryService.activecategories" | |||
| (click)="goToPage('catstorelist', category)" | |||
| > | |||
| {{ category.catName }} | {{ category.catName }} | ||
| </li> | </li> | ||
| </ion-menu-toggle> | </ion-menu-toggle> | ||
| ... | @@ -42,9 +41,7 @@ | ... | @@ -42,9 +41,7 @@ |
| </div> | </div> | ||
| <li>Complaints & Feedback</li> | <li>Complaints & Feedback</li> | ||
| <li> | <li> | ||
| <span class="floatLeft" (click)="authService.SignOut()" | <span class="floatLeft" (click)="authService.SignOut()">Logout</span> | ||
| >Logout</span | |||
| > | |||
| <span class="floatRight version">Version 0.1.0.2</span> | <span class="floatRight version">Version 0.1.0.2</span> | ||
| <div class="clear"></div> | <div class="clear"></div> | ||
| </li> | </li> | ||
| ... | @@ -60,42 +57,22 @@ | ... | @@ -60,42 +57,22 @@ |
| <div class="common_tab" [hidden]="fetchCase() === true"> | <div class="common_tab" [hidden]="fetchCase() === true"> | ||
| <ul> | <ul> | ||
| <li (click)="goToPage('home')"> | <li (click)="goToPage('home')"> | ||
| <div | <div class="icon_sec m1_icon" [class.m1_icon_act]="sec_active1" (click)="setActive1()"></div> | ||
| class="icon_sec m1_icon" | |||
| [class.m1_icon_act]="sec_active1" | |||
| (click)="setActive1()" | |||
| ></div> | |||
| </li> | </li> | ||
| <li (click)="goToPage('catagory')"> | <li (click)="goToPage('catagory')"> | ||
| <div | <div class="icon_sec m2_icon" [class.m2_icon_act]="sec_active2" (click)="setActive2()"></div> | ||
| class="icon_sec m2_icon" | |||
| [class.m2_icon_act]="sec_active2" | |||
| (click)="setActive2()" | |||
| ></div> | |||
| </li> | </li> | ||
| <li (click)="searchModal()"> | <li (click)="searchModal()"> | ||
| <div | <div class="icon_sec m3_icon" [class.m3_icon_act]="sec_active3" (click)="setActive3()"></div> | ||
| class="icon_sec m3_icon" | |||
| [class.m3_icon_act]="sec_active3" | |||
| (click)="setActive3()" | |||
| ></div> | |||
| </li> | </li> | ||
| <!-- <li (click)="goToPage('cart')"> | <!-- <li (click)="goToPage('cart')"> | ||
| <div class="icon_sec m4_icon" [class.m4_icon_act]="sec_active4" (click)="setActive4()"></div> | <div class="icon_sec m4_icon" [class.m4_icon_act]="sec_active4" (click)="setActive4()"></div> | ||
| </li> --> | </li> --> | ||
| <li (click)="goToPage('myorder')"> | <li (click)="goToPage('myorder')"> | ||
| <div | <div class="icon_sec m5_icon" [class.m5_icon_act]="sec_active5" (click)="setActive5()"></div> | ||
| class="icon_sec m5_icon" | |||
| [class.m5_icon_act]="sec_active5" | |||
| (click)="setActive5()" | |||
| ></div> | |||
| </li> | </li> | ||
| <li (click)="goToPage('profile')"> | <li (click)="goToPage('profile')"> | ||
| <div | <div class="icon_sec m6_icon" [class.m6_icon_act]="sec_active6" (click)="setActive6()"></div> | ||
| class="icon_sec m6_icon" | |||
| [class.m6_icon_act]="sec_active6" | |||
| (click)="setActive6()" | |||
| ></div> | |||
| </li> | </li> | ||
| </ul> | </ul> | ||
| </div> | </div> | ||
| \ No newline at end of file |
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/avatar.png
0 → 100644
26.5 KB
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 { SubjectService } from './../config/subject.service'; | AngularFirestoreDocument, | ||
| import { GooglePlus } from '@ionic-native/google-plus/ngx'; | AngularFirestoreCollection | ||
| import { take } from 'rxjs/operators'; | } from "@angular/fire/firestore"; | ||
| import { from } from 'rxjs'; | import { ServiceService } from "./../config/service.service"; | ||
| import { SubjectService } from "./../config/subject.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; | ||
| ... | @@ -32,27 +36,30 @@ export class AuthService { | ... | @@ -32,27 +36,30 @@ export class AuthService { |
| this.subjectService.sendLoginData(false); | this.subjectService.sendLoginData(false); | ||
| 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 { | } else { | ||
| this.router.navigateByUrl('verification'); | this.router.navigateByUrl("verification"); | ||
| } | } | ||
| } else { | } else { | ||
| this.subjectService.sendLoginData(true); | this.subjectService.sendLoginData(true); | ||
| this.service.set('user', null); | this.service.set("user", null); | ||
| JSON.parse(localStorage.getItem('user')); | JSON.parse(localStorage.getItem("user")); | ||
| this.router.navigateByUrl('login'); | 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) | ||
| .then(result => { | |||
| console.log("success"); | |||
| document.body.scrollTop = document.documentElement.scrollTop = 0; | document.body.scrollTop = document.documentElement.scrollTop = 0; | ||
| this.SetUserData(result.user); | this.SetUserData(result.user); | ||
| }).catch((error) => { | }) | ||
| .catch(error => { | |||
| window.alert(error.message); | window.alert(error.message); | ||
| }); | }); | ||
| } | } | ||
| ... | @@ -61,27 +68,34 @@ export class AuthService { | ... | @@ -61,27 +68,34 @@ export class AuthService { |
| 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 | ||
| .valueChanges() | |||
| .pipe(take(1)) | |||
| .subscribe((value: User[]) => { | |||
| if (value.length > 0) { | if (value.length > 0) { | ||
| this.afs.collection('customers').doc(this.userData.uid).update({otp: ''}); | this.afs | ||
| this.service.set('type', 1); | .collection("customers") | ||
| this.router.navigateByUrl('nearby'); | .doc(this.userData.uid) | ||
| .update({ otp: "" }); | |||
| this.service.set("type", 1); | |||
| this.router.navigateByUrl("nearby"); | |||
| } else { | } else { | ||
| window.alert('Please input valid OTP'); | 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()) | ||
| .then(result => { | |||
| console.log("success"); | |||
| console.log(result); | console.log(result); | ||
| this.socialSignUp(result); | this.socialSignUp(result); | ||
| }); | }); | ||
| ... | @@ -89,21 +103,24 @@ export class AuthService { | ... | @@ -89,21 +103,24 @@ export class AuthService { |
| 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()) | ||
| .then(result => { | |||
| console.log("success"); | |||
| console.log(result); | 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, | ||
| ... | @@ -124,8 +141,8 @@ export class AuthService { | ... | @@ -124,8 +141,8 @@ export class AuthService { |
| public async SignOut() { | public async SignOut() { | ||
| return this.afAuth.auth.signOut().then(() => { | return this.afAuth.auth.signOut().then(() => { | ||
| this.subjectService.sendLoginData(true); | this.subjectService.sendLoginData(true); | ||
| this.service.remove('user'); | this.service.remove("user"); | ||
| console.log('logout'); | console.log("logout"); | ||
| }); | }); | ||
| } | } | ||
| ... | @@ -133,9 +150,9 @@ export class AuthService { | ... | @@ -133,9 +150,9 @@ 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; | ||
| ... | @@ -154,8 +171,12 @@ export class AuthService { | ... | @@ -154,8 +171,12 @@ 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"); | |||
| }); | }); | ||
| } | } | ||
| ... | @@ -163,19 +184,21 @@ export class AuthService { | ... | @@ -163,19 +184,21 @@ export class AuthService { |
| 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 | ||
| .createUserWithEmailAndPassword(userData.emailId, userData.password) | |||
| .then(result => { | |||
| console.log(result.user); | console.log(result.user); | ||
| this.afAuth.auth.currentUser.sendEmailVerification(); | this.afAuth.auth.currentUser.sendEmailVerification(); | ||
| const currencyData = { | const currencyData = { | ||
| currId: '123', | currId: "123", | ||
| currName: 'Australian dollar', | currName: "Australian dollar", | ||
| symbol: 'A$' | symbol: "A$" | ||
| }; | }; | ||
| const custData = result.user; | const custData = result.user; | ||
| const postData: User = { | const postData: User = { | ||
| uid: custData.uid, | uid: custData.uid, | ||
| status: true, | status: true, | ||
| profilePhoto: '', | profilePhoto: "", | ||
| phoneVerified: false, | phoneVerified: false, | ||
| phone: userData.phone, | phone: userData.phone, | ||
| name: userData.name, | name: userData.name, | ||
| ... | @@ -187,10 +210,15 @@ export class AuthService { | ... | @@ -187,10 +210,15 @@ export class AuthService { |
| }; | }; | ||
| this.userPostData = postData; | this.userPostData = postData; | ||
| console.log(postData); | console.log(postData); | ||
| this.afs.collection('customers').doc(custData.uid).set(postData).then(() => { | this.afs | ||
| console.log('successs'); | .collection("customers") | ||
| .doc(custData.uid) | |||
| .set(postData) | |||
| .then(() => { | |||
| console.log("successs"); | |||
| }); | }); | ||
| }).catch((error) => { | }) | ||
| .catch(error => { | |||
| window.alert(error.message); | window.alert(error.message); | ||
| }); | }); | ||
| } | } | ||
| ... | @@ -199,9 +227,12 @@ export class AuthService { | ... | @@ -199,9 +227,12 @@ export class AuthService { |
| console.log(addressData); | console.log(addressData); | ||
| console.log(this.userData.uid); | console.log(this.userData.uid); | ||
| this.afs.collection('address').add({ | this.afs | ||
| .collection("address") | |||
| .add({ | |||
| uid: this.userData.uid | uid: this.userData.uid | ||
| }).then((docRef) => { | }) | ||
| .then(docRef => { | |||
| console.log(docRef); | console.log(docRef); | ||
| const addrData = { | const addrData = { | ||
| uid: this.userData.uid, | uid: this.userData.uid, | ||
| ... | @@ -220,10 +251,14 @@ export class AuthService { | ... | @@ -220,10 +251,14 @@ export class AuthService { |
| }; | }; | ||
| const neworderId = docRef.id; | const neworderId = docRef.id; | ||
| console.log(addrData); | console.log(addrData); | ||
| this.afs.collection('address').doc(neworderId).set(addrData).then(() => { | this.afs | ||
| console.log('Address add Successfully'); | .collection("address") | ||
| this.service.set('user', JSON.stringify(this.userData)); | .doc(neworderId) | ||
| this.router.navigateByUrl('home'); | .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; | document.body.scrollTop = document.documentElement.scrollTop = 0; | ||
| }); | }); | ||
| }); | }); | ||
| ... | @@ -231,14 +266,9 @@ export class AuthService { | ... | @@ -231,14 +266,9 @@ export class AuthService { |
| } | } | ||
| } | } | ||
| /*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]*/ | ||