Skip to content

G
getme
Commit 6203fa66 by Arjun
Options

style fix

parent 86664af8
Showing with 187 additions and 253 deletions
src/app/app.component.html
...@@ -6,10 +6,7 @@ ...@@ -6,10 +6,7 @@
<ion-menu-toggle *ngIf="userData"> <ion-menu-toggle *ngIf="userData">
<div class="top_banner"> <div class="top_banner">
<div class="top_image"> <div class="top_image">
<img <img [src]="userData.profilePhoto" onerror="this.src='./../assets/asset_avatar.png'" />
[src]="userData.profilePhoto"
onerror="this.src='./../assets/asset_avatar.png'"
/>
</div> </div>
<div class="top_detail"> <div class="top_detail">
<h4>{{ userData.name }}</h4> <h4>{{ userData.name }}</h4>
...@@ -31,10 +28,7 @@ ...@@ -31,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>
...@@ -49,9 +43,7 @@ ...@@ -49,9 +43,7 @@
<li (click)="vieworder('feedback')">Complaints & Feedback</li> <li (click)="vieworder('feedback')">Complaints & Feedback</li>
</ion-menu-toggle> </ion-menu-toggle>
<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>
...@@ -67,43 +59,22 @@ ...@@ -67,43 +59,22 @@
<div class="common_tab" [hidden]="fetchCase() === true" *ngIf="!isSearchOpen"> <div class="common_tab" [hidden]="fetchCase() === true" *ngIf="!isSearchOpen">
<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()" menuClose></div>
class="icon_sec m6_icon"
[class.m6_icon_act]="sec_active6"
(click)="setActive6()"
menuClose
></div>
</li> </li>
</ul> </ul>
</div> </div>
\ No newline at end of file
src/app/app.component.scss
...@@ -46,6 +46,7 @@ ...@@ -46,6 +46,7 @@
} }
} }
} }
.sidemenu_list { .sidemenu_list {
padding-top: 30px; padding-top: 30px;
ul { ul {
...@@ -101,10 +102,11 @@ ...@@ -101,10 +102,11 @@
padding: 0px; padding: 0px;
width: 100%; width: 100%;
height: 100%; height: 100%;
display: flex;
justify-content: space-between;
li { li {
list-style: none; list-style: none;
display: inline-block; display: inline-block;
width: 20%;
height: 100%; height: 100%;
text-align: center; text-align: center;
background-repeat: no-repeat; background-repeat: no-repeat;
......
src/app/home/home.page.html
...@@ -6,22 +6,10 @@ ...@@ -6,22 +6,10 @@
<div class="nav_title floatLeft relative"> <div class="nav_title floatLeft relative">
<!-- <input class="search_bar" placeholder="Search here.. eg:shirts, retailers etc..." (click)="clickSearch()" (input)="searchFun($event.target.value)" #searchText> --> <!-- <input class="search_bar" placeholder="Search here.. eg:shirts, retailers etc..." (click)="clickSearch()" (input)="searchFun($event.target.value)" #searchText> -->
<input <input class="search_bar" placeholder="Search here.. eg:shirts, retailers etc..." (click)="searchModal()" />
class="search_bar" </div>
placeholder="Search here.. eg:shirts, retailers etc..." <button class="nav_btn nav_search floatRight" *ngIf="!searchShow" (click)="searchModal()"></button>
(click)="searchModal()" <button class="nav_btn nav_close floatRight" *ngIf="searchShow" (click)="searchClose()"></button>
/>
</div>
<button
class="nav_btn nav_search floatRight"
*ngIf="!searchShow"
(click)="searchModal()"
></button>
<button
class="nav_btn nav_close floatRight"
*ngIf="searchShow"
(click)="searchClose()"
></button>
<div class="clear"></div> <div class="clear"></div>
</div> </div>
<ion-content> <ion-content>
...@@ -37,19 +25,13 @@ ...@@ -37,19 +25,13 @@
</ion-col> </ion-col>
</ion-row> </ion-row>
</div> </div>
<ion-slides <ion-slides pager="true" *ngIf="centerService.centers && centerService.centers.length > 0">
pager="true"
*ngIf="centerService.centers && centerService.centers.length > 0"
>
<ion-slide *ngFor="let center of centerService.centers"> <ion-slide *ngFor="let center of centerService.centers">
<div class="banner_slide" (click)="goToPage('storelist', center)"> <div class="banner_slide" (click)="goToPage('storelist', center)">
<h5>{{center.centerName}}</h5> <h5>{{center.centerName}}</h5>
<p>{{center.description}}</p> <p>{{center.description}}</p>
</div> </div>
<img <img [src]="center.centerImg" onerror="this.src='./../../assets/getmi_malls/mall_banner/mall_4.png'" />
[src]="center.centerImg"
onerror="this.src='./../../assets/getmi_malls/mall_banner/mall_4.png'"
/>
</ion-slide> </ion-slide>
</ion-slides> </ion-slides>
</div> </div>
...@@ -57,20 +39,10 @@ ...@@ -57,20 +39,10 @@
Featured Stores Featured Stores
</div> </div>
<div class="featured_slider"> <div class="featured_slider">
<ion-slides <ion-slides pager="false" [options]="slideOpts" *ngIf="shopperService.activeshoppers && shopperService.activeshoppers.length > 0">
pager="false"
[options]="slideOpts"
*ngIf="shopperService.activeshoppers && shopperService.activeshoppers.length > 0"
>
<ion-slide *ngFor="let shopper of shopperService.activeshoppers"> <ion-slide *ngFor="let shopper of shopperService.activeshoppers">
<div <div class="feature_product" (click)="goToPage('productlist', shopper)">
class="feature_product" <img [src]="shopper.featuredImage" onerror="this.src='./../../assets/getmi_malls/featured/featured1.png'" />
(click)="goToPage('productlist', shopper)"
>
<img
[src]="shopper.featuredImage"
onerror="this.src='./../../assets/getmi_malls/featured/featured1.png'"
/>
<div class="feature_overlay"> <div class="feature_overlay">
<h5>{{shopper.name}}</h5> <h5>{{shopper.name}}</h5>
<p>{{shopper.caption}}</p> <p>{{shopper.caption}}</p>
...@@ -96,24 +68,15 @@ ...@@ -96,24 +68,15 @@
<div class="clear"></div> <div class="clear"></div>
</div> </div>
<div class="nearby_shop_list"> <div class="nearby_shop_list">
<ul <ul *ngIf="centerService.nearcenters && centerService.nearcenters.length > 0">
*ngIf="centerService.nearcenters && centerService.nearcenters.length > 0" <li *ngFor="let center of centerService.nearcenters" (click)="goToPage('storelist', center)">
>
<li
*ngFor="let center of centerService.nearcenters"
(click)="goToPage('storelist', center)"
>
<div class="nearby_image"> <div class="nearby_image">
<img <img [src]="center.centerImg" onerror="this.src='./../../assets/getmi_malls/mall_298/mall2.png'" />
[src]="center.centerImg"
onerror="this.src='./../../assets/getmi_malls/mall_298/mall2.png'"
/>
</div> </div>
<div class="nearby_detail"> <div class="nearby_detail">
<h5> <h5>
<span class="floatLeft">{{center.centerName}}</span> <span class="floatLeft">{{center.centerName}}</span>
<span class="floatRight" <span class="floatRight">0
>0
<img src="../assets/Path61_2.png" /> <img src="../assets/Path61_2.png" />
</span> </span>
<div class="clear"></div> <div class="clear"></div>
...@@ -128,17 +91,9 @@ ...@@ -128,17 +91,9 @@
Featured Catagories Featured Catagories
</div> </div>
<div class="featured_catagory_list"> <div class="featured_catagory_list">
<ul <ul *ngIf="categoriesService.activecategories && categoriesService.activecategories.length > 0">
*ngIf="categoriesService.activecategories && categoriesService.activecategories.length > 0" <li *ngFor="let categories of categoriesService.activecategories" (click)="goToPage('catstorelist', categories)">
> <img [src]="categories.catImage" onerror="this.src='../assets/handsome-man-outdoors-drinking-coffee-with-sunglasses-guy-with-beard-instagram-effect_1212-818@3x.png'" />
<li
*ngFor="let categories of categoriesService.activecategories"
(click)="goToPage('catstorelist', categories)"
>
<img
[src]="categories.catImage"
onerror="this.src='../assets/handsome-man-outdoors-drinking-coffee-with-sunglasses-guy-with-beard-instagram-effect_1212-818@3x.png'"
/>
<div class="featured_overlay"> <div class="featured_overlay">
<h4>{{categories.catName}}</h4> <h4>{{categories.catName}}</h4>
</div> </div>
...@@ -158,40 +113,20 @@ ...@@ -158,40 +113,20 @@
<div class="clear"></div> <div class="clear"></div>
</div> </div>
<ion-content class="sort_wrappper"> <ion-content class="sort_wrappper">
<agm-map <agm-map [zoom]="20" [latitude]="lat" [longitude]="lng" [disableDefaultUI]="false" [zoomControl]="false" [backgroundColor]="'rgba(29, 27, 130,0.2)'">
[zoom]="20"
[latitude]="lat"
[longitude]="lng"
[disableDefaultUI]="false"
[zoomControl]="false"
[backgroundColor]="'rgba(29, 27, 130,0.2)'"
>
<agm-marker [latitude]="lat" [longitude]="lng"></agm-marker> <agm-marker [latitude]="lat" [longitude]="lng"></agm-marker>
</agm-map> </agm-map>
<div class="add_address_wrapper"> <div class="add_address_wrapper">
<h5> <h5>
<span class="floatLeft">NEW ADDRESS</span> <span class="floatLeft">NEW ADDRESS</span>
<span class="floatRight" (click)="istoggle(); goToPage('nearby')" <span class="floatRight" (click)="istoggle(); goToPage('nearby')">ADD NEW</span>
>ADD NEW</span
>
<div class="clear"></div> <div class="clear"></div>
</h5> </h5>
<ul <ul class="address-ul" *ngIf="addressService.addressList && addressService.addressList.length > 0">
*ngIf="addressService.addressList && addressService.addressList.length > 0"
>
<li *ngFor="let address of addressService.addressList; let i = index"> <li *ngFor="let address of addressService.addressList; let i = index">
<div class="floatLeft"> <div class="floatLeft">
{{address.default}} {{address.default}}
<input <input class="styled-checkbox" name="addressId" id="styled-checkbox-{{i}}" type="radio" (click)="setDefault(address.addressId)" [value]="address.addressId" #addressType [checked]="address.defaultVal == 1" />
class="styled-checkbox"
name="addressId"
id="styled-checkbox-{{i}}"
type="radio"
(click)="setDefault(address.addressId)"
[value]="address.addressId"
#addressType
[checked]="address.defaultVal == 1"
/>
<label for="styled-checkbox-{{i}}"> {{address.addressType}} </label> <label for="styled-checkbox-{{i}}"> {{address.addressType}} </label>
</div> </div>
<div class="floatLeft"> <div class="floatLeft">
......
src/app/home/home.page.scss
...@@ -258,25 +258,9 @@ ...@@ -258,25 +258,9 @@
width: 100%; width: 100%;
height: 100vh; height: 100vh;
} }
.add_address_wrapper { }
position: fixed;
bottom: 0px; .add_address_wrapper {
left: 0px;
right: 0px;
padding: 20px;
border-top-left-radius: 15px;
border-top-right-radius: 15px;
background: #fff;
-webkit-box-shadow: 0px -2px 5px 0px rgba(0, 0, 0, 0.2);
-moz-box-shadow: 0px -2px 5px 0px rgba(0, 0, 0, 0.2);
box-shadow: 0px -2px 5px 0px rgba(0, 0, 0, 0.2);
h5 {
color: rgba(41, 40, 91, 1);
margin: 0px;
padding: 0px;
font-weight: 800;
}
.add_address_wrapper {
position: fixed; position: fixed;
bottom: 0px; bottom: 0px;
left: 0px; left: 0px;
...@@ -297,14 +281,14 @@ ...@@ -297,14 +281,14 @@
.styled-checkbox { .styled-checkbox {
position: absolute; // take it out of document flow position: absolute; // take it out of document flow
opacity: 0; // hide it opacity: 0; // hide it
& + label { &+label {
position: relative; position: relative;
cursor: pointer; cursor: pointer;
padding: 0; padding: 0;
width: 100%; width: 100%;
} }
// Box. // Box.
& + label:before { &+label:before {
content: ''; content: '';
margin-right: 10px; margin-right: 10px;
display: inline-block; display: inline-block;
...@@ -315,21 +299,21 @@ ...@@ -315,21 +299,21 @@
background: white; background: white;
border: 1px solid rgba(215, 213, 228, 1); border: 1px solid rgba(215, 213, 228, 1);
} }
&:checked + label:before { &:checked+label:before {
background: #29285b; background: #29285b;
} }
// Disabled state label. // Disabled state label.
&:disabled + label { &:disabled+label {
color: #b8b8b8; color: #b8b8b8;
cursor: auto; cursor: auto;
} }
// Disabled box. // Disabled box.
&:disabled + label:before { &:disabled+label:before {
box-shadow: none; box-shadow: none;
background: #ddd; background: #ddd;
} }
// Checkmark. Could be replaced with an image // Checkmark. Could be replaced with an image
&:checked + label:after { &:checked+label:after {
content: ''; content: '';
position: absolute; position: absolute;
left: 6px; left: 6px;
...@@ -337,11 +321,15 @@ ...@@ -337,11 +321,15 @@
background: white; background: white;
width: 2px; width: 2px;
height: 2px; height: 2px;
box-shadow: 2px 0 0 white, 4px 0 0 white, 4px -2px 0 white, box-shadow: 2px 0 0 white, 4px 0 0 white, 4px -2px 0 white, 4px -4px 0 white, 4px -6px 0 white, 4px -8px 0 white;
4px -4px 0 white, 4px -6px 0 white, 4px -8px 0 white;
transform: rotate(45deg); transform: rotate(45deg);
} }
} }
} }
.address-ul {
padding-left: 0 !important;
li {
list-style: none;
} }
} }
\ No newline at end of file
src/app/nearby/nearby.page.scss
...@@ -46,24 +46,69 @@ ...@@ -46,24 +46,69 @@
padding: 0px; padding: 0px;
font-weight: 800; font-weight: 800;
} }
p {} ul {
input { margin: 0px;
width: 100%; padding: 0px;
height: 45px; padding-top: 30px;
border: 1px solid #E1E0EB; li {
border-radius: 4px; list-style: none;
padding-left: 10px; margin-bottom: 15px;
padding-right: 10px; p {
margin-bottom: 20px; margin: 0px;
} padding: 0px;
.add_btn { color: rgba(176, 174, 199, 1);
padding-top: 5px;
padding-bottom: 5px;
}
.styled-checkbox {
position: absolute; // take it out of document flow
opacity: 0; // hide it
&+label {
position: relative;
cursor: pointer;
padding: 0;
width: 100%; width: 100%;
height: 45px;
background-color: #29285B;
color: #fff;
border-radius: 4px;
} }
// Box.
&+label:before {
content: '';
margin-right: 10px;
display: inline-block;
vertical-align: text-top;
width: 20px;
height: 20px;
border-radius: 50%;
background: white;
border: 1px solid rgba(215, 213, 228, 1);
}
&:checked+label:before {
background: #29285b;
}
// Disabled state label.
&:disabled+label {
color: #b8b8b8;
cursor: auto;
}
// Disabled box.
&:disabled+label:before {
box-shadow: none;
background: #ddd;
}
// Checkmark. Could be replaced with an image
&:checked+label:after {
content: '';
position: absolute;
left: 6px;
top: 10px;
background: white;
width: 2px;
height: 2px;
box-shadow: 2px 0 0 white, 4px 0 0 white, 4px -2px 0 white, 4px -4px 0 white, 4px -6px 0 white, 4px -8px 0 white;
transform: rotate(45deg);
}
}
}
}
} }
.styled-checkbox { .styled-checkbox {
......
src/app/profile/profile.page.html
...@@ -16,10 +16,7 @@ ...@@ -16,10 +16,7 @@
</div> --> </div> -->
<div class="profile_circle"> <div class="profile_circle">
<img <img [src]="loggedUser.profilePhoto" onerror="this.src='./../../assets/profile_banner.png'" />
[src]="loggedUser.profilePhoto"
onerror="this.src='./../../assets/profile_banner.png'"
/>
<div class="edit"></div> <div class="edit"></div>
<input type="file" accept="image/*" (change)="fileChange($event)" /> <input type="file" accept="image/*" (change)="fileChange($event)" />
</div> </div>
...@@ -30,11 +27,8 @@ ...@@ -30,11 +27,8 @@
<div class="account_wrapper"> <div class="account_wrapper">
<div class="account_header"> <div class="account_header">
<h5 class="floatLeft">ACCOUNT INFORMATION</h5> <h5 class="floatLeft">ACCOUNT INFORMATION</h5>
<span <span class="floatRight" (click)="goToPage('changedetails', user && user)"><img
class="floatRight" src="../../assets/edit.png" /></span>
(click)="goToPage('changedetails', user && user)"
><img src="../../assets/edit.png"
/></span>
<div class="clear"></div> <div class="clear"></div>
</div> </div>
<div class="row"> <div class="row">
...@@ -42,14 +36,13 @@ ...@@ -42,14 +36,13 @@
<ion-col class="textLeft p0"> <ion-col class="textLeft p0">
<p> <p>
Phone Phone
<span *ngIf="loggedUser.phoneVerified == true">Verified</span>
<span *ngIf="loggedUser.phoneVerified == false"
>Not Verified yet</span
>
</p> </p>
</ion-col> </ion-col>
<ion-col class="textRight p0"> <ion-col class="textRight p0">
<h6>{{loggedUser.phone}}</h6> <h6>{{loggedUser.phone}}</h6>
<span class="ar-span" *ngIf="loggedUser.phoneVerified == true">Verified</span>
<span class="ar-span" *ngIf="loggedUser.phoneVerified == false">Not Verified yet</span>
</ion-col> </ion-col>
</ion-row> </ion-row>
</div> </div>
...@@ -57,16 +50,13 @@ ...@@ -57,16 +50,13 @@
<ion-row> <ion-row>
<ion-col class="textLeft p0"> <ion-col class="textLeft p0">
<p> <p>
Email<span *ngIf="userData && userData.emailVerified == true" Email
>Verified</span
>
<span *ngIf="loggedUser.emailVerified == false"
>Not Verified yet</span
>
</p> </p>
</ion-col> </ion-col>
<ion-col class="textRight p0"> <ion-col class="textRight p0">
<h6>{{loggedUser.emailId}}</h6> <h6>{{loggedUser.emailId}}</h6>
<span class="ar-span" *ngIf="loggedUser.emailVerified == true">Verified</span>
<span class="ar-span" *ngIf="loggedUser.emailVerified == false">Not Verified yet</span>
</ion-col> </ion-col>
</ion-row> </ion-row>
</div> </div>
...@@ -132,10 +122,7 @@ ...@@ -132,10 +122,7 @@
<button class="btn-cancel floatLeft" (click)="istoggle();"> <button class="btn-cancel floatLeft" (click)="istoggle();">
Cancel Cancel
</button> </button>
<button <button class="btn-logout floatRight" (click)="authService.SignOut(); istoggle()">
class="btn-logout floatRight"
(click)="authService.SignOut(); istoggle()"
>
Logout Logout
</button> </button>
</div> </div>
......
src/app/profile/profile.page.scss
...@@ -82,16 +82,16 @@ ...@@ -82,16 +82,16 @@
width: 20px; width: 20px;
} }
} }
.ar-span {
color: rgba(206, 153, 76, 1);
margin-left: 10px;
}
} }
p { p {
margin: 0px; margin: 0px;
padding: 0px; padding: 0px;
color: rgba(176, 174, 199, 1); color: rgba(176, 174, 199, 1);
font-size: 18px; font-size: 18px;
span {
color: rgba(206, 153, 76, 1);
margin-left: 10px;
}
} }
h6 { h6 {
margin: 0px; margin: 0px;
......
src/config/auth.service.ts
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 { import {
AngularFirestore, AngularFirestore,
AngularFirestoreDocument, AngularFirestoreDocument,
AngularFirestoreCollection AngularFirestoreCollection
} from '@angular/fire/firestore'; } from "@angular/fire/firestore";
import { ServiceService } from './../config/service.service'; import { ServiceService } from "./../config/service.service";
import { SubjectService } from './../config/subject.service'; import { SubjectService } from "./../config/subject.service";
import { GooglePlus } from '@ionic-native/google-plus/ngx'; import { GooglePlus } from "@ionic-native/google-plus/ngx";
import { take } from 'rxjs/operators'; import { take } from "rxjs/operators";
import { from } from 'rxjs'; import { from } from "rxjs";
@Injectable({ @Injectable({
providedIn: 'root' providedIn: "root"
}) })
export class AuthService { export class AuthService {
loader: boolean; loader: boolean;
...@@ -30,33 +30,33 @@ export class AuthService { ...@@ -30,33 +30,33 @@ export class AuthService {
this.loader = true; this.loader = true;
this.type = 1; this.type = 1;
this.afAuth.authState.subscribe(user => { this.afAuth.authState.subscribe(user => {
console.log('here'); console.log("here");
console.log(user); console.log(user);
if (user) { if (user) {
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));
this.SetUserData(user); this.SetUserData(user);
this.loader = false; this.loader = false;
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 {
console.log('here too'); console.log("here too");
this.loader = false; this.loader = false;
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");
} }
}); });
} }
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;
} }
userData: any; userData: any;
...@@ -70,21 +70,21 @@ export class AuthService { ...@@ -70,21 +70,21 @@ export class AuthService {
return this.afAuth.auth return this.afAuth.auth
.signInWithEmailAndPassword(email, password) .signInWithEmailAndPassword(email, password)
.then(result => { .then(result => {
console.log('success'); 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 => {
this.loader = false; this.loader = false;
this.service.showToast(error.message, 'bottom', 'my-error', 1000); this.service.showToast(error.message, "bottom", "my-error", 1000);
}); });
} }
public async verify(otp: string) { public async verify(otp: string) {
this.loader = true; this.loader = true;
const custRef: AngularFirestoreCollection<any> = this.afs.collection( const custRef: AngularFirestoreCollection<any> = this.afs.collection(
'customers', "customers",
ref => ref.where('otp', '==', otp).where('uid', '==', this.userData.uid) ref => ref.where("otp", "==", otp).where("uid", "==", this.userData.uid)
); );
custRef custRef
.valueChanges() .valueChanges()
...@@ -92,18 +92,18 @@ export class AuthService { ...@@ -92,18 +92,18 @@ export class AuthService {
.subscribe((value: User[]) => { .subscribe((value: User[]) => {
if (value.length > 0) { if (value.length > 0) {
this.afs this.afs
.collection('customers') .collection("customers")
.doc(this.userData.uid) .doc(this.userData.uid)
.update({ otp: '', phoneVerified: true }); .update({ otp: "", phoneVerified: true });
this.service.set('type', 1); this.service.set("type", 1);
this.loader = false; this.loader = false;
this.router.navigateByUrl('nearby'); this.router.navigateByUrl("nearby");
} else { } else {
this.loader = false; this.loader = false;
this.service.showToast( this.service.showToast(
'Please input valid OTP', "Please input valid OTP",
'bottom', "bottom",
'my-error', "my-error",
1000 1000
); );
} }
...@@ -112,7 +112,7 @@ export class AuthService { ...@@ -112,7 +112,7 @@ export class AuthService {
profilePic(pic) { profilePic(pic) {
this.afs this.afs
.collection('customers') .collection("customers")
.doc(this.userData.uid) .doc(this.userData.uid)
.update({ profilePhoto: pic }); .update({ profilePhoto: pic });
} }
...@@ -123,7 +123,7 @@ export class AuthService { ...@@ -123,7 +123,7 @@ export class AuthService {
this.afAuth.auth this.afAuth.auth
.signInWithPopup(new auth.GoogleAuthProvider()) .signInWithPopup(new auth.GoogleAuthProvider())
.then(result => { .then(result => {
console.log('success'); console.log("success");
console.log(result.additionalUserInfo.isNewUser); console.log(result.additionalUserInfo.isNewUser);
if ( if (
result.additionalUserInfo && result.additionalUserInfo &&
...@@ -150,11 +150,11 @@ export class AuthService { ...@@ -150,11 +150,11 @@ export class AuthService {
.signInWithPopup(new auth.FacebookAuthProvider()) .signInWithPopup(new auth.FacebookAuthProvider())
.then(result => { .then(result => {
this.loader = false; this.loader = false;
console.log('success'); console.log("success");
console.log(result); console.log(result);
}) })
.catch(err => { .catch(err => {
this.service.showToast(err.message, 'bottom', 'my-error', 1000); this.service.showToast(err.message, "bottom", "my-error", 1000);
}); });
} catch (error) { } catch (error) {
This.loader = false; This.loader = false;
...@@ -181,7 +181,7 @@ export class AuthService { ...@@ -181,7 +181,7 @@ export class AuthService {
loginType: value.loginType loginType: value.loginType
}; };
this.loggedUser = userData; this.loggedUser = userData;
this.service.set('userData', JSON.stringify(this.loggedUser)); this.service.set("userData", JSON.stringify(this.loggedUser));
this.subjectService.sendUserData(JSON.stringify(this.loggedUser)); this.subjectService.sendUserData(JSON.stringify(this.loggedUser));
console.log(this.loggedUser); console.log(this.loggedUser);
}); });
...@@ -191,9 +191,9 @@ export class AuthService { ...@@ -191,9 +191,9 @@ export class AuthService {
this.loader = true; this.loader = true;
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");
this.loader = false; this.loader = false;
console.log('logout'); console.log("logout");
}); });
} }
...@@ -201,9 +201,9 @@ export class AuthService { ...@@ -201,9 +201,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;
...@@ -223,11 +223,11 @@ export class AuthService { ...@@ -223,11 +223,11 @@ export class AuthService {
this.userPostData = postData; this.userPostData = postData;
console.log(postData); console.log(postData);
this.afs this.afs
.collection('customers') .collection("customers")
.doc(userData.uid) .doc(userData.uid)
.set(postData) .set(postData)
.then(() => { .then(() => {
console.log('successs'); console.log("successs");
}); });
} }
...@@ -242,15 +242,15 @@ export class AuthService { ...@@ -242,15 +242,15 @@ export class AuthService {
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,
...@@ -263,11 +263,11 @@ export class AuthService { ...@@ -263,11 +263,11 @@ export class AuthService {
this.userPostData = postData; this.userPostData = postData;
console.log(postData); console.log(postData);
this.afs this.afs
.collection('customers') .collection("customers")
.doc(custData.uid) .doc(custData.uid)
.set(postData) .set(postData)
.then(() => { .then(() => {
console.log('successs'); console.log("successs");
}); });
this.loader = false; this.loader = false;
}) })
...@@ -282,7 +282,7 @@ export class AuthService { ...@@ -282,7 +282,7 @@ export class AuthService {
console.log(this.userData.uid); console.log(this.userData.uid);
this.loader = true; this.loader = true;
this.afs this.afs
.collection('address') .collection("address")
.add({ .add({
uid: this.userData.uid uid: this.userData.uid
}) })
...@@ -306,13 +306,13 @@ export class AuthService { ...@@ -306,13 +306,13 @@ export class AuthService {
const neworderId = docRef.id; const neworderId = docRef.id;
console.log(addrData); console.log(addrData);
this.afs this.afs
.collection('address') .collection("address")
.doc(neworderId) .doc(neworderId)
.set(addrData) .set(addrData)
.then(() => { .then(() => {
console.log('Address add Successfully'); console.log("Address add Successfully");
this.service.set('user', JSON.stringify(this.userData)); this.service.set("user", JSON.stringify(this.userData));
this.router.navigateByUrl('home'); this.router.navigateByUrl("home");
document.body.scrollTop = document.documentElement.scrollTop = 0; document.body.scrollTop = document.documentElement.scrollTop = 0;
}) })
.catch(err => { .catch(err => {
......
src/global.scss
...@@ -9,6 +9,7 @@ ...@@ -9,6 +9,7 @@
* https://ionicframework.com/docs/layout/global-stylesheets * https://ionicframework.com/docs/layout/global-stylesheets
*/ */
/* Core CSS required for Ionic components to work properly */ /* Core CSS required for Ionic components to work properly */
@import '~@ionic/angular/css/core.css'; @import '~@ionic/angular/css/core.css';
...@@ -53,6 +54,7 @@ ...@@ -53,6 +54,7 @@
*/ */
/*------------------------------- /*-------------------------------
01. FONTS-N-SIZES 01. FONTS-N-SIZES
...@@ -163,6 +165,7 @@ button { ...@@ -163,6 +165,7 @@ button {
} }
} }
/*------------------------------- /*-------------------------------
02. FONTS-SETTINGS 02. FONTS-SETTINGS
...@@ -213,6 +216,7 @@ button { ...@@ -213,6 +216,7 @@ button {
font-weight: 600 !important; font-weight: 600 !important;
} }
/*------------------------------- /*-------------------------------
03. THEMES-N-BACKGROUNDS 03. THEMES-N-BACKGROUNDS
...@@ -244,6 +248,7 @@ button { ...@@ -244,6 +248,7 @@ button {
background-color: rgba(243, 243, 243, 0.6) !important; background-color: rgba(243, 243, 243, 0.6) !important;
} }
/*------------------------------- /*-------------------------------
04. SPACING-N-POSITIONS 04. SPACING-N-POSITIONS
...@@ -362,6 +367,7 @@ button { ...@@ -362,6 +367,7 @@ button {
border: none !important; border: none !important;
} }
/*------------------------------- /*-------------------------------
05. ALIGMENTS 05. ALIGMENTS
...@@ -656,10 +662,8 @@ ion-header { ...@@ -656,10 +662,8 @@ ion-header {
// .successToast { // .successToast {
// color: #29285b; // color: #29285b;
// } // }
// .toast-content { // .toast-content {
// } // }
.my-toast { .my-toast {
--background: #29285b; --background: #29285b;
--border-radius: 4px; --border-radius: 4px;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment