Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
G
getme
Project
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
1
Issues
1
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
amal
getme
Commits
6203fa66
Commit
6203fa66
authored
Feb 05, 2020
by
Arjun
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
style fix
parent
86664af8
Show whitespace changes
Inline
Side-by-side
Showing
9 changed files
with
187 additions
and
253 deletions
+187
-253
app.component.html
src/app/app.component.html
+11
-39
app.component.scss
src/app/app.component.scss
+3
-1
home.page.html
src/app/home/home.page.html
+20
-85
home.page.scss
src/app/home/home.page.scss
+17
-28
nearby.page.scss
src/app/nearby/nearby.page.scss
+61
-16
profile.page.html
src/app/profile/profile.page.html
+10
-23
profile.page.scss
src/app/profile/profile.page.scss
+4
-4
auth.service.ts
src/config/auth.service.ts
+55
-55
global.scss
src/global.scss
+6
-2
No files found.
src/app/app.component.html
View file @
6203fa66
...
...
@@ -6,10 +6,7 @@
<ion-menu-toggle
*
ngIf=
"userData"
>
<div
class=
"top_banner"
>
<div
class=
"top_image"
>
<img
[
src
]="
userData
.
profilePhoto
"
onerror=
"this.src='./../assets/asset_avatar.png'"
/>
<img
[
src
]="
userData
.
profilePhoto
"
onerror=
"this.src='./../assets/asset_avatar.png'"
/>
</div>
<div
class=
"top_detail"
>
<h4>
{{ userData.name }}
</h4>
...
...
@@ -31,10 +28,7 @@
<div
class=
"sub_menu"
>
<ul
*
ngIf=
"categoryService.activecategories"
>
<ion-menu-toggle>
<li
*
ngFor=
"let category of categoryService.activecategories"
(
click
)="
goToPage
('
catstorelist
',
category
)"
>
<li
*
ngFor=
"let category of categoryService.activecategories"
(
click
)="
goToPage
('
catstorelist
',
category
)"
>
{{ category.catName }}
</li>
</ion-menu-toggle>
...
...
@@ -49,9 +43,7 @@
<li
(
click
)="
vieworder
('
feedback
')"
>
Complaints
&
Feedback
</li>
</ion-menu-toggle>
<li>
<span
class=
"floatLeft"
(
click
)="
authService
.
SignOut
()"
>
Logout
</span
>
<span
class=
"floatLeft"
(
click
)="
authService
.
SignOut
()"
>
Logout
</span>
<span
class=
"floatRight version"
>
Version 0.1.0.2
</span>
<div
class=
"clear"
></div>
</li>
...
...
@@ -67,43 +59,22 @@
<div
class=
"common_tab"
[
hidden
]="
fetchCase
()
===
true
"
*
ngIf=
"!isSearchOpen"
>
<ul>
<li
(
click
)="
goToPage
('
home
')"
>
<div
class=
"icon_sec m1_icon"
[
class
.
m1_icon_act
]="
sec_active1
"
(
click
)="
setActive1
()"
></div>
<div
class=
"icon_sec m1_icon"
[
class
.
m1_icon_act
]="
sec_active1
"
(
click
)="
setActive1
()"
></div>
</li>
<li
(
click
)="
goToPage
('
catagory
')"
>
<div
class=
"icon_sec m2_icon"
[
class
.
m2_icon_act
]="
sec_active2
"
(
click
)="
setActive2
()"
></div>
<div
class=
"icon_sec m2_icon"
[
class
.
m2_icon_act
]="
sec_active2
"
(
click
)="
setActive2
()"
></div>
</li>
<li
(
click
)="
searchModal
()"
>
<div
class=
"icon_sec m3_icon"
[
class
.
m3_icon_act
]="
sec_active3
"
(
click
)="
setActive3
()"
></div>
<div
class=
"icon_sec m3_icon"
[
class
.
m3_icon_act
]="
sec_active3
"
(
click
)="
setActive3
()"
></div>
</li>
<!--
<li (click)="goToPage('cart')">
<li
(
click
)="
goToPage
('
cart
')"
>
<div
class=
"icon_sec m4_icon"
[
class
.
m4_icon_act
]="
sec_active4
"
(
click
)="
setActive4
()"
></div>
</li>
-->
</li>
<li
(
click
)="
goToPage
('
myorder
')"
>
<div
class=
"icon_sec m5_icon"
[
class
.
m5_icon_act
]="
sec_active5
"
(
click
)="
setActive5
()"
></div>
<div
class=
"icon_sec m5_icon"
[
class
.
m5_icon_act
]="
sec_active5
"
(
click
)="
setActive5
()"
></div>
</li>
<li
(
click
)="
goToPage
('
profile
')"
>
<div
class=
"icon_sec m6_icon"
[
class
.
m6_icon_act
]="
sec_active6
"
(
click
)="
setActive6
()"
menuClose
></div>
<div
class=
"icon_sec m6_icon"
[
class
.
m6_icon_act
]="
sec_active6
"
(
click
)="
setActive6
()"
menuClose
></div>
</li>
</ul>
</div>
\ No newline at end of file
src/app/app.component.scss
View file @
6203fa66
...
...
@@ -46,6 +46,7 @@
}
}
}
.sidemenu_list
{
padding-top
:
30px
;
ul
{
...
...
@@ -101,10 +102,11 @@
padding
:
0px
;
width
:
100%
;
height
:
100%
;
display
:
flex
;
justify-content
:
space-between
;
li
{
list-style
:
none
;
display
:
inline-block
;
width
:
20%
;
height
:
100%
;
text-align
:
center
;
background-repeat
:
no-repeat
;
...
...
src/app/home/home.page.html
View file @
6203fa66
...
...
@@ -6,22 +6,10 @@
<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
)="
searchModal
()"
/>
</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>
<input
class=
"search_bar"
placeholder=
"Search here.. eg:shirts, retailers etc..."
(
click
)="
searchModal
()"
/>
</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>
<ion-content>
...
...
@@ -37,19 +25,13 @@
</ion-col>
</ion-row>
</div>
<ion-slides
pager=
"true"
*
ngIf=
"centerService.centers && centerService.centers.length > 0"
>
<ion-slides
pager=
"true"
*
ngIf=
"centerService.centers && centerService.centers.length > 0"
>
<ion-slide
*
ngFor=
"let center of centerService.centers"
>
<div
class=
"banner_slide"
(
click
)="
goToPage
('
storelist
',
center
)"
>
<h5>
{{center.centerName}}
</h5>
<p>
{{center.description}}
</p>
</div>
<img
[
src
]="
center
.
centerImg
"
onerror=
"this.src='./../../assets/getmi_malls/mall_banner/mall_4.png'"
/>
<img
[
src
]="
center
.
centerImg
"
onerror=
"this.src='./../../assets/getmi_malls/mall_banner/mall_4.png'"
/>
</ion-slide>
</ion-slides>
</div>
...
...
@@ -57,20 +39,10 @@
Featured Stores
</div>
<div
class=
"featured_slider"
>
<ion-slides
pager=
"false"
[
options
]="
slideOpts
"
*
ngIf=
"shopperService.activeshoppers && shopperService.activeshoppers.length > 0"
>
<ion-slides
pager=
"false"
[
options
]="
slideOpts
"
*
ngIf=
"shopperService.activeshoppers && shopperService.activeshoppers.length > 0"
>
<ion-slide
*
ngFor=
"let shopper of shopperService.activeshoppers"
>
<div
class=
"feature_product"
(
click
)="
goToPage
('
productlist
',
shopper
)"
>
<img
[
src
]="
shopper
.
featuredImage
"
onerror=
"this.src='./../../assets/getmi_malls/featured/featured1.png'"
/>
<div
class=
"feature_product"
(
click
)="
goToPage
('
productlist
',
shopper
)"
>
<img
[
src
]="
shopper
.
featuredImage
"
onerror=
"this.src='./../../assets/getmi_malls/featured/featured1.png'"
/>
<div
class=
"feature_overlay"
>
<h5>
{{shopper.name}}
</h5>
<p>
{{shopper.caption}}
</p>
...
...
@@ -96,24 +68,15 @@
<div
class=
"clear"
></div>
</div>
<div
class=
"nearby_shop_list"
>
<ul
*
ngIf=
"centerService.nearcenters && centerService.nearcenters.length > 0"
>
<li
*
ngFor=
"let center of centerService.nearcenters"
(
click
)="
goToPage
('
storelist
',
center
)"
>
<ul
*
ngIf=
"centerService.nearcenters && centerService.nearcenters.length > 0"
>
<li
*
ngFor=
"let center of centerService.nearcenters"
(
click
)="
goToPage
('
storelist
',
center
)"
>
<div
class=
"nearby_image"
>
<img
[
src
]="
center
.
centerImg
"
onerror=
"this.src='./../../assets/getmi_malls/mall_298/mall2.png'"
/>
<img
[
src
]="
center
.
centerImg
"
onerror=
"this.src='./../../assets/getmi_malls/mall_298/mall2.png'"
/>
</div>
<div
class=
"nearby_detail"
>
<h5>
<span
class=
"floatLeft"
>
{{center.centerName}}
</span>
<span
class=
"floatRight"
>
0
<span
class=
"floatRight"
>
0
<img
src=
"../assets/Path61_2.png"
/>
</span>
<div
class=
"clear"
></div>
...
...
@@ -128,17 +91,9 @@
Featured Catagories
</div>
<div
class=
"featured_catagory_list"
>
<ul
*
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'"
/>
<ul
*
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'"
/>
<div
class=
"featured_overlay"
>
<h4>
{{categories.catName}}
</h4>
</div>
...
...
@@ -158,40 +113,20 @@
<div
class=
"clear"
></div>
</div>
<ion-content
class=
"sort_wrappper"
>
<agm-map
[
zoom
]="
20
"
[
latitude
]="
lat
"
[
longitude
]="
lng
"
[
disableDefaultUI
]="
false
"
[
zoomControl
]="
false
"
[
backgroundColor
]="'
rgba
(
29
,
27
,
130
,
0
.
2
)'"
>
<agm-map
[
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-map>
<div
class=
"add_address_wrapper"
>
<h5>
<span
class=
"floatLeft"
>
NEW ADDRESS
</span>
<span
class=
"floatRight"
(
click
)="
istoggle
();
goToPage
('
nearby
')"
>
ADD NEW
</span
>
<span
class=
"floatRight"
(
click
)="
istoggle
();
goToPage
('
nearby
')"
>
ADD NEW
</span>
<div
class=
"clear"
></div>
</h5>
<ul
*
ngIf=
"addressService.addressList && addressService.addressList.length > 0"
>
<ul
class=
"address-ul"
*
ngIf=
"addressService.addressList && addressService.addressList.length > 0"
>
<li
*
ngFor=
"let address of addressService.addressList; let i = index"
>
<div
class=
"floatLeft"
>
{{address.default}}
<input
class=
"styled-checkbox"
name=
"addressId"
id=
"styled-checkbox-{{i}}"
type=
"radio"
(
click
)="
setDefault
(
address
.
addressId
)"
[
value
]="
address
.
addressId
"
#
addressType
[
checked
]="
address
.
defaultVal =
=
1
"
/>
<input
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>
</div>
<div
class=
"floatLeft"
>
...
...
src/app/home/home.page.scss
View file @
6203fa66
...
...
@@ -258,25 +258,9 @@
width
:
100%
;
height
:
100vh
;
}
.add_address_wrapper
{
position
:
fixed
;
bottom
:
0px
;
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
{
}
.add_address_wrapper
{
position
:
fixed
;
bottom
:
0px
;
left
:
0px
;
...
...
@@ -297,14 +281,14 @@
.styled-checkbox
{
position
:
absolute
;
// take it out of document flow
opacity
:
0
;
// hide it
&
+
label
{
&
+
label
{
position
:
relative
;
cursor
:
pointer
;
padding
:
0
;
width
:
100%
;
}
// Box.
&
+
label
:before
{
&
+
label
:before
{
content
:
''
;
margin-right
:
10px
;
display
:
inline-block
;
...
...
@@ -315,21 +299,21 @@
background
:
white
;
border
:
1px
solid
rgba
(
215
,
213
,
228
,
1
);
}
&
:checked
+
label
:before
{
&
:checked
+
label
:before
{
background
:
#29285b
;
}
// Disabled state label.
&
:disabled
+
label
{
&
:disabled
+
label
{
color
:
#b8b8b8
;
cursor
:
auto
;
}
// Disabled box.
&
:disabled
+
label
:before
{
&
:disabled
+
label
:before
{
box-shadow
:
none
;
background
:
#ddd
;
}
// Checkmark. Could be replaced with an image
&
:checked
+
label
:after
{
&
:checked
+
label
:after
{
content
:
''
;
position
:
absolute
;
left
:
6px
;
...
...
@@ -337,11 +321,15 @@
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
;
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
);
}
}
}
}
.address-ul
{
padding-left
:
0
!
important
;
li
{
list-style
:
none
;
}
}
\ No newline at end of file
src/app/nearby/nearby.page.scss
View file @
6203fa66
...
...
@@ -46,24 +46,69 @@
padding
:
0px
;
font-weight
:
800
;
}
p
{}
input
{
width
:
100%
;
height
:
45px
;
border
:
1px
solid
#E1E0EB
;
border-radius
:
4px
;
padding-left
:
10px
;
padding-right
:
10px
;
margin-bottom
:
20px
;
}
.add_btn
{
ul
{
margin
:
0px
;
padding
:
0px
;
padding-top
:
30px
;
li
{
list-style
:
none
;
margin-bottom
:
15px
;
p
{
margin
:
0px
;
padding
:
0px
;
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%
;
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
{
...
...
src/app/profile/profile.page.html
View file @
6203fa66
...
...
@@ -16,10 +16,7 @@
</div> -->
<div
class=
"profile_circle"
>
<img
[
src
]="
loggedUser
.
profilePhoto
"
onerror=
"this.src='./../../assets/profile_banner.png'"
/>
<img
[
src
]="
loggedUser
.
profilePhoto
"
onerror=
"this.src='./../../assets/profile_banner.png'"
/>
<div
class=
"edit"
></div>
<input
type=
"file"
accept=
"image/*"
(
change
)="
fileChange
($
event
)"
/>
</div>
...
...
@@ -30,11 +27,8 @@
<div
class=
"account_wrapper"
>
<div
class=
"account_header"
>
<h5
class=
"floatLeft"
>
ACCOUNT INFORMATION
</h5>
<span
class=
"floatRight"
(
click
)="
goToPage
('
changedetails
',
user
&&
user
)"
><img
src=
"../../assets/edit.png"
/></span>
<span
class=
"floatRight"
(
click
)="
goToPage
('
changedetails
',
user
&&
user
)"
><img
src=
"../../assets/edit.png"
/></span>
<div
class=
"clear"
></div>
</div>
<div
class=
"row"
>
...
...
@@ -42,14 +36,13 @@
<ion-col
class=
"textLeft p0"
>
<p>
Phone
<span
*
ngIf=
"loggedUser.phoneVerified == true"
>
Verified
</span>
<span
*
ngIf=
"loggedUser.phoneVerified == false"
>
Not Verified yet
</span
>
</p>
</ion-col>
<ion-col
class=
"textRight p0"
>
<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-row>
</div>
...
...
@@ -57,16 +50,13 @@
<ion-row>
<ion-col
class=
"textLeft p0"
>
<p>
Email
<span
*
ngIf=
"userData && userData.emailVerified == true"
>
Verified
</span
>
<span
*
ngIf=
"loggedUser.emailVerified == false"
>
Not Verified yet
</span
>
Email
</p>
</ion-col>
<ion-col
class=
"textRight p0"
>
<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-row>
</div>
...
...
@@ -132,10 +122,7 @@
<button
class=
"btn-cancel floatLeft"
(
click
)="
istoggle
();"
>
Cancel
</button>
<button
class=
"btn-logout floatRight"
(
click
)="
authService
.
SignOut
();
istoggle
()"
>
<button
class=
"btn-logout floatRight"
(
click
)="
authService
.
SignOut
();
istoggle
()"
>
Logout
</button>
</div>
...
...
src/app/profile/profile.page.scss
View file @
6203fa66
...
...
@@ -82,16 +82,16 @@
width
:
20px
;
}
}
.ar-span
{
color
:
rgba
(
206
,
153
,
76
,
1
);
margin-left
:
10px
;
}
}
p
{
margin
:
0px
;
padding
:
0px
;
color
:
rgba
(
176
,
174
,
199
,
1
);
font-size
:
18px
;
span
{
color
:
rgba
(
206
,
153
,
76
,
1
);
margin-left
:
10px
;
}
}
h6
{
margin
:
0px
;
...
...
src/config/auth.service.ts
View file @
6203fa66
import
{
Injectable
}
from
'@angular/core'
;
import
{
User
,
Signup
,
Address
}
from
'./services/user'
;
import
{
auth
}
from
'firebase/app'
;
import
{
Router
,
ActivatedRoute
}
from
'@angular/router'
;
import
{
AngularFireAuth
}
from
'@angular/fire/auth'
;
import
{
Injectable
}
from
"@angular/core"
;
import
{
User
,
Signup
,
Address
}
from
"./services/user"
;
import
{
auth
}
from
"firebase/app"
;
import
{
Router
,
ActivatedRoute
}
from
"@angular/router"
;
import
{
AngularFireAuth
}
from
"@angular/fire/auth"
;
import
{
AngularFirestore
,
AngularFirestoreDocument
,
AngularFirestoreCollection
}
from
'@angular/fire/firestore'
;
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'
;
}
from
"@angular/fire/firestore"
;
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
({
providedIn
:
'root'
providedIn
:
"root"
})
export
class
AuthService
{
loader
:
boolean
;
...
...
@@ -30,33 +30,33 @@ export class AuthService {
this
.
loader
=
true
;
this
.
type
=
1
;
this
.
afAuth
.
authState
.
subscribe
(
user
=>
{
console
.
log
(
'here'
);
console
.
log
(
"here"
);
console
.
log
(
user
);
if
(
user
)
{
this
.
subjectService
.
sendLoginData
(
false
);
this
.
userData
=
user
;
console
.
log
(
this
.
userData
);
this
.
service
.
set
(
'user'
,
JSON
.
stringify
(
this
.
userData
));
this
.
service
.
set
(
"user"
,
JSON
.
stringify
(
this
.
userData
));
this
.
SetUserData
(
user
);
this
.
loader
=
false
;
if
(
this
.
type
===
1
)
{
this
.
router
.
navigateByUrl
(
'home'
);
this
.
router
.
navigateByUrl
(
"home"
);
}
else
{
this
.
router
.
navigateByUrl
(
'verification'
);
this
.
router
.
navigateByUrl
(
"verification"
);
}
}
else
{
console
.
log
(
'here too'
);
console
.
log
(
"here too"
);
this
.
loader
=
false
;
this
.
subjectService
.
sendLoginData
(
true
);
this
.
service
.
set
(
'user'
,
null
);
JSON
.
parse
(
localStorage
.
getItem
(
'user'
));
this
.
router
.
navigateByUrl
(
'login'
);
this
.
service
.
set
(
"user"
,
null
);
JSON
.
parse
(
localStorage
.
getItem
(
"user"
));
this
.
router
.
navigateByUrl
(
"login"
);
}
});
}
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
;
}
userData
:
any
;
...
...
@@ -70,21 +70,21 @@ export class AuthService {
return
this
.
afAuth
.
auth
.
signInWithEmailAndPassword
(
email
,
password
)
.
then
(
result
=>
{
console
.
log
(
'success'
);
console
.
log
(
"success"
);
document
.
body
.
scrollTop
=
document
.
documentElement
.
scrollTop
=
0
;
this
.
SetUserData
(
result
.
user
);
})
.
catch
(
error
=>
{
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
)
{
this
.
loader
=
true
;
const
custRef
:
AngularFirestoreCollection
<
any
>
=
this
.
afs
.
collection
(
'customers'
,
ref
=>
ref
.
where
(
'otp'
,
'=='
,
otp
).
where
(
'uid'
,
'=='
,
this
.
userData
.
uid
)
"customers"
,
ref
=>
ref
.
where
(
"otp"
,
"=="
,
otp
).
where
(
"uid"
,
"=="
,
this
.
userData
.
uid
)
);
custRef
.
valueChanges
()
...
...
@@ -92,18 +92,18 @@ export class AuthService {
.
subscribe
((
value
:
User
[])
=>
{
if
(
value
.
length
>
0
)
{
this
.
afs
.
collection
(
'customers'
)
.
collection
(
"customers"
)
.
doc
(
this
.
userData
.
uid
)
.
update
({
otp
:
''
,
phoneVerified
:
true
});
this
.
service
.
set
(
'type'
,
1
);
.
update
({
otp
:
""
,
phoneVerified
:
true
});
this
.
service
.
set
(
"type"
,
1
);
this
.
loader
=
false
;
this
.
router
.
navigateByUrl
(
'nearby'
);
this
.
router
.
navigateByUrl
(
"nearby"
);
}
else
{
this
.
loader
=
false
;
this
.
service
.
showToast
(
'Please input valid OTP'
,
'bottom'
,
'my-error'
,
"Please input valid OTP"
,
"bottom"
,
"my-error"
,
1000
);
}
...
...
@@ -112,7 +112,7 @@ export class AuthService {
profilePic
(
pic
)
{
this
.
afs
.
collection
(
'customers'
)
.
collection
(
"customers"
)
.
doc
(
this
.
userData
.
uid
)
.
update
({
profilePhoto
:
pic
});
}
...
...
@@ -123,7 +123,7 @@ export class AuthService {
this
.
afAuth
.
auth
.
signInWithPopup
(
new
auth
.
GoogleAuthProvider
())
.
then
(
result
=>
{
console
.
log
(
'success'
);
console
.
log
(
"success"
);
console
.
log
(
result
.
additionalUserInfo
.
isNewUser
);
if
(
result
.
additionalUserInfo
&&
...
...
@@ -150,11 +150,11 @@ export class AuthService {
.
signInWithPopup
(
new
auth
.
FacebookAuthProvider
())
.
then
(
result
=>
{
this
.
loader
=
false
;
console
.
log
(
'success'
);
console
.
log
(
"success"
);
console
.
log
(
result
);
})
.
catch
(
err
=>
{
this
.
service
.
showToast
(
err
.
message
,
'bottom'
,
'my-error'
,
1000
);
this
.
service
.
showToast
(
err
.
message
,
"bottom"
,
"my-error"
,
1000
);
});
}
catch
(
error
)
{
This
.
loader
=
false
;
...
...
@@ -181,7 +181,7 @@ export class AuthService {
loginType
:
value
.
loginType
};
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
));
console
.
log
(
this
.
loggedUser
);
});
...
...
@@ -191,9 +191,9 @@ export class AuthService {
this
.
loader
=
true
;
return
this
.
afAuth
.
auth
.
signOut
().
then
(()
=>
{
this
.
subjectService
.
sendLoginData
(
true
);
this
.
service
.
remove
(
'user'
);
this
.
service
.
remove
(
"user"
);
this
.
loader
=
false
;
console
.
log
(
'logout'
);
console
.
log
(
"logout"
);
});
}
...
...
@@ -201,9 +201,9 @@ export class AuthService {
this
.
type
=
2
;
console
.
log
(
userData
.
user
);
const
currencyData
=
{
currId
:
'123'
,
currName
:
'Australian dollar'
,
symbol
:
'A$'
currId
:
"123"
,
currName
:
"Australian dollar"
,
symbol
:
"A$"
};
const
otp
=
Math
.
floor
(
1000
+
Math
.
random
()
*
9000
);
userData
=
userData
.
user
;
...
...
@@ -223,11 +223,11 @@ export class AuthService {
this
.
userPostData
=
postData
;
console
.
log
(
postData
);
this
.
afs
.
collection
(
'customers'
)
.
collection
(
"customers"
)
.
doc
(
userData
.
uid
)
.
set
(
postData
)
.
then
(()
=>
{
console
.
log
(
'successs'
);
console
.
log
(
"successs"
);
});
}
...
...
@@ -242,15 +242,15 @@ export class AuthService {
console
.
log
(
result
.
user
);
this
.
afAuth
.
auth
.
currentUser
.
sendEmailVerification
();
const
currencyData
=
{
currId
:
'123'
,
currName
:
'Australian dollar'
,
symbol
:
'A$'
currId
:
"123"
,
currName
:
"Australian dollar"
,
symbol
:
"A$"
};
const
custData
=
result
.
user
;
const
postData
:
User
=
{
uid
:
custData
.
uid
,
status
:
true
,
profilePhoto
:
''
,
profilePhoto
:
""
,
phoneVerified
:
false
,
phone
:
userData
.
phone
,
name
:
userData
.
name
,
...
...
@@ -263,11 +263,11 @@ export class AuthService {
this
.
userPostData
=
postData
;
console
.
log
(
postData
);
this
.
afs
.
collection
(
'customers'
)
.
collection
(
"customers"
)
.
doc
(
custData
.
uid
)
.
set
(
postData
)
.
then
(()
=>
{
console
.
log
(
'successs'
);
console
.
log
(
"successs"
);
});
this
.
loader
=
false
;
})
...
...
@@ -282,7 +282,7 @@ export class AuthService {
console
.
log
(
this
.
userData
.
uid
);
this
.
loader
=
true
;
this
.
afs
.
collection
(
'address'
)
.
collection
(
"address"
)
.
add
({
uid
:
this
.
userData
.
uid
})
...
...
@@ -306,13 +306,13 @@ export class AuthService {
const
neworderId
=
docRef
.
id
;
console
.
log
(
addrData
);
this
.
afs
.
collection
(
'address'
)
.
collection
(
"address"
)
.
doc
(
neworderId
)
.
set
(
addrData
)
.
then
(()
=>
{
console
.
log
(
'Address add Successfully'
);
this
.
service
.
set
(
'user'
,
JSON
.
stringify
(
this
.
userData
));
this
.
router
.
navigateByUrl
(
'home'
);
console
.
log
(
"Address add Successfully"
);
this
.
service
.
set
(
"user"
,
JSON
.
stringify
(
this
.
userData
));
this
.
router
.
navigateByUrl
(
"home"
);
document
.
body
.
scrollTop
=
document
.
documentElement
.
scrollTop
=
0
;
})
.
catch
(
err
=>
{
...
...
src/global.scss
View file @
6203fa66
...
...
@@ -9,6 +9,7 @@
* https://ionicframework.com/docs/layout/global-stylesheets
*/
/* Core CSS required for Ionic components to work properly */
@import
'~@ionic/angular/css/core.css'
;
...
...
@@ -53,6 +54,7 @@
*/
/*-------------------------------
01. FONTS-N-SIZES
...
...
@@ -163,6 +165,7 @@ button {
}
}
/*-------------------------------
02. FONTS-SETTINGS
...
...
@@ -213,6 +216,7 @@ button {
font-weight
:
600
!
important
;
}
/*-------------------------------
03. THEMES-N-BACKGROUNDS
...
...
@@ -244,6 +248,7 @@ button {
background-color
:
rgba
(
243
,
243
,
243
,
0
.6
)
!
important
;
}
/*-------------------------------
04. SPACING-N-POSITIONS
...
...
@@ -362,6 +367,7 @@ button {
border
:
none
!
important
;
}
/*-------------------------------
05. ALIGMENTS
...
...
@@ -656,10 +662,8 @@ ion-header {
// .successToast {
// color: #29285b;
// }
// .toast-content {
// }
.my-toast
{
--background
:
#29285b
;
--border-radius
:
4px
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment