Skip to content

G
getme
Commit d879de5e by muhsin
Options

conflict fix

parents edb13016 5fb85ba7
Showing with 398 additions and 390 deletions
src/app/app.component.html
<ion-app> <ion-app>
<ion-split-pane> <ion-split-pane>
<ion-menu> <ion-menu>
<ion-content> <ion-content>
<div class="side_menu_wrapper"> <div class="side_menu_wrapper">
<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" </div>
onerror="this.src='./../assets/asset_avatar.png'" <div class="top_detail">
/> <h4>{{ userData.name }}</h4>
</div> <p>{{ userData.emailId }}</p>
<div class="top_detail"> </div>
<h4>{{ userData.name }}</h4> <div class="clear"></div>
<p>{{ userData.emailId }}</p> </div>
</div> </ion-menu-toggle>
<div class="clear"></div> <div class="sidemenu_list">
</div> <ul>
</ion-menu-toggle> <ion-menu-toggle (click)="hideTab()">
<div class="sidemenu_list"> <li (click)="vieworder('home')">Shop</li>
<ul> </ion-menu-toggle>
<ion-menu-toggle (click)="hideTab()"> <!-- <li>About us</li> -->
<li (click)="vieworder('home')">Shop</li> <ion-menu-toggle>
</ion-menu-toggle> <li (click)="vieworder('myorder')">View Order</li>
<!-- <li>About us</li> --> </ion-menu-toggle>
<ion-menu-toggle>
<li (click)="vieworder('myorder')">View Order</li>
</ion-menu-toggle>
<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" {{ category.catName }}
(click)="goToPage('catstorelist', category)" </li>
> </ion-menu-toggle>
{{ category.catName }} <!-- <li>Women's Fashion</li>
</li>
</ion-menu-toggle>
<!-- <li>Women's Fashion</li>
<li>Features</li> <li>Features</li>
<li>Bags</li> <li>Bags</li>
<li>Shoes</li> <li>Shoes</li>
<li>Electronics</li> --> <li>Electronics</li> -->
</ul> </ul>
</div> </div>
<ion-menu-toggle> <ion-menu-toggle>
<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>
> <div class="clear"></div>
<span class="floatRight version">Version 0.1.0.2</span> </li>
<div class="clear"></div> </ul>
</li> </div>
</ul> </div>
</div> </ion-content>
</div> </ion-menu>
</ion-content> <ion-router-outlet main></ion-router-outlet>
</ion-menu> </ion-split-pane>
<ion-router-outlet main></ion-router-outlet>
</ion-split-pane>
</ion-app> </ion-app>
<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" </li>
[class.m1_icon_act]="sec_active1" <li (click)="goToPage('catagory')">
(click)="setActive1()" <div class="icon_sec m2_icon" [class.m2_icon_act]="sec_active2" (click)="setActive2()"></div>
></div> </li>
</li> <li (click)="searchModal()">
<li (click)="goToPage('catagory')"> <div class="icon_sec m3_icon" [class.m3_icon_act]="sec_active3" (click)="setActive3()"></div>
<div </li>
class="icon_sec m2_icon" <li (click)="goToPage('cart')">
[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>
</li>
<!-- <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" </li>
[class.m5_icon_act]="sec_active5" <li (click)="goToPage('profile')">
(click)="setActive5()" <div class="icon_sec m6_icon" [class.m6_icon_act]="sec_active6" (click)="setActive6()" menuClose></div>
></div> </li>
</li> </ul>
<li (click)="goToPage('profile')"> </div>
<div \ No newline at end of file
class="icon_sec m6_icon"
[class.m6_icon_act]="sec_active6"
(click)="setActive6()"
menuClose
></div>
</li>
</ul>
</div>
src/app/app.component.scss
@import url('https://fonts.googleapis.com/css?family=Abel&display=swap'); @import url('https://fonts.googleapis.com/css?family=Abel&display=swap');
@import url(//netdna.bootstrapcdn.com/font-awesome/3.2.1/css/font-awesome.css); @import url(//netdna.bootstrapcdn.com/font-awesome/3.2.1/css/font-awesome.css);
* { * {
font-family: 'Abel', sans-serif; font-family: 'Abel', sans-serif;
-webkit-font-smoothing: antialiased; -webkit-font-smoothing: antialiased;
} }
.side_menu_wrapper { .side_menu_wrapper {
background: rgba(41, 40, 91, 1); background: rgba(41, 40, 91, 1);
width: 100%; width: 100%;
height: 100vh; height: 100vh;
padding-left: 20px; padding-left: 20px;
padding-top: 20px; padding-top: 20px;
padding-right: 10px; padding-right: 10px;
.top_banner { .top_banner {
.top_image { .top_image {
width: 60px; width: 60px;
height: 60px; height: 60px;
float: left; float: left;
border-radius: 50%; border-radius: 50%;
background-color: #fff; background-color: #fff;
img { img {
width: 100%; width: 100%;
height: 100%; height: 100%;
object-fit: cover; object-fit: cover;
object-position: center; object-position: center;
border-radius: 50%; border-radius: 50%;
} }
} }
.top_detail { .top_detail {
width: calc(100% - 60px); width: calc(100% - 60px);
float: left; float: left;
padding: 7px; padding: 7px;
padding-left: 15px; padding-left: 15px;
h4 { h4 {
margin: 0px; margin: 0px;
padding: 0px; padding: 0px;
color: #fff; color: #fff;
} }
p { p {
margin: 0px; margin: 0px;
padding: 0px; padding: 0px;
color: #fff; color: #fff;
color: rgba(176, 174, 199, 1); color: rgba(176, 174, 199, 1);
} }
}
} }
}
} }
.sidemenu_list { .sidemenu_list {
padding-top: 30px; padding-top: 30px;
ul { ul {
margin: 0px;
padding: 0px;
li {
list-style: none;
color: #fff;
font-weight: 200;
font-size: 15px;
padding: 10px;
font-size: 16px;
&:focus {
background-color: rgba(40, 36, 88, 1);
}
&:hover {
background-color: rgba(40, 36, 88, 1);
}
.version {
color: rgba(176, 174, 199, 1);
font-size: 14px;
}
}
.sub_menu {
padding-left: 25px;
margin-bottom: 40px;
padding-top: 10px;
ul {
margin: 0px; margin: 0px;
padding: 0px; padding: 0px;
li { li {
list-style: none; list-style: none;
color: rgba(176, 174, 199, 1); color: #fff;
font-weight: 200;
font-size: 15px;
padding: 10px;
font-size: 16px;
&:focus {
background-color: rgba(40, 36, 88, 1);
}
&:hover {
background-color: rgba(40, 36, 88, 1);
}
.version {
color: rgba(176, 174, 199, 1);
font-size: 14px;
}
}
.sub_menu {
padding-left: 25px;
margin-bottom: 40px;
padding-top: 10px;
ul {
margin: 0px;
padding: 0px;
li {
list-style: none;
color: rgba(176, 174, 199, 1);
}
}
} }
}
} }
}
} }
.common_tab { .common_tab {
position: fixed; position: fixed;
bottom: 0px; bottom: 0px;
left: 0px; left: 0px;
right: 0px; right: 0px;
width: 100%;
height: 50px;
background-color: #fff;
-webkit-box-shadow: 0px 0px 5px 7px rgba(215, 213, 228, 0.5);
-moz-box-shadow: 0px 0px 5px 7px rgba(215, 213, 228, 0.5);
box-shadow: 0px 0px 5px 7px rgba(215, 213, 228, 0.5);
ul {
margin: 0px;
padding: 0px;
width: 100%; width: 100%;
height: 100%; height: 50px;
li { background-color: #fff;
list-style: none; -webkit-box-shadow: 0px 0px 5px 7px rgba(215, 213, 228, 0.5);
display: inline-block; -moz-box-shadow: 0px 0px 5px 7px rgba(215, 213, 228, 0.5);
width: 20%; box-shadow: 0px 0px 5px 7px rgba(215, 213, 228, 0.5);
height: 100%; ul {
text-align: center; margin: 0px;
background-repeat: no-repeat; padding: 0px;
background-position: center; width: 100%;
background-size: 25px; height: 100%;
} display: flex;
.icon_sec { justify-content: space-between;
width: 50px; li {
height: 50px; list-style: none;
background-image: url('../assets/icon_sprite.png'); display: inline-block;
margin: 0 auto; height: 100%;
background-repeat: no-repeat; text-align: center;
background-size: 450px; background-repeat: no-repeat;
} background-position: center;
.m1_icon { background-size: 25px;
background-position: top -6px left -249px; }
} .icon_sec {
.m1_icon_act { width: 50px;
background-image: url('../assets/icon_sprite_active.png') !important; height: 50px;
background-position: top -6px left -249px; background-image: url('../assets/icon_sprite.png');
} margin: 0 auto;
.m2_icon { background-repeat: no-repeat;
background-position: top -3px left -88px; background-size: 450px;
} }
.m2_icon_act { .m1_icon {
background-image: url('../assets/icon_sprite_active.png') !important; background-position: top -6px left -249px;
background-position: top -3px left -88px; }
} .m1_icon_act {
.m3_icon { background-image: url('../assets/icon_sprite_active.png') !important;
background-position: top -6px left -167px; background-position: top -6px left -249px;
} }
.m3_icon_act { .m2_icon {
background-image: url('../assets/icon_sprite_active.png') !important; background-position: top -3px left -88px;
background-position: top -6px left -167px; }
} .m2_icon_act {
.m4_icon { background-image: url('../assets/icon_sprite_active.png') !important;
background-position: top -6px left -5px; background-position: top -3px left -88px;
} }
.m4_icon_act { .m3_icon {
background-image: url('../assets/icon_sprite_active.png') !important; background-position: top -6px left -167px;
background-position: top -6px left -5px; }
} .m3_icon_act {
.m5_icon { background-image: url('../assets/icon_sprite_active.png') !important;
background-position: top -6px left -325px; background-position: top -6px left -167px;
} }
.m5_icon_act { .m4_icon {
background-image: url('../assets/icon_sprite_active.png') !important; background-position: top -6px left -5px;
background-position: top -6px left -325px; }
} .m4_icon_act {
.m6_icon { background-image: url('../assets/icon_sprite_active.png') !important;
background-position: top -6px left -398px; background-position: top -6px left -5px;
} }
.m6_icon_act { .m5_icon {
background-image: url('../assets/icon_sprite_active.png') !important; background-position: top -6px left -325px;
background-position: top -6px left -398px; }
.m5_icon_act {
background-image: url('../assets/icon_sprite_active.png') !important;
background-position: top -6px left -325px;
}
.m6_icon {
background-position: top -6px left -398px;
}
.m6_icon_act {
background-image: url('../assets/icon_sprite_active.png') !important;
background-position: top -6px left -398px;
}
} }
} }
} \ 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);
width: 100%; padding-top: 5px;
height: 45px; padding-bottom: 5px;
background-color: #29285B; }
color: #fff; .styled-checkbox {
border-radius: 4px; position: absolute; // take it out of document flow
opacity: 0; // hide it
&+label {
position: relative;
cursor: pointer;
padding: 0;
width: 100%;
}
// 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
<div class="nav_header"> <div class="nav_header">
<ion-menu-toggle> <ion-menu-toggle>
<button class="nav_btn nav_menu floatLeft"></button> <button class="nav_btn nav_menu floatLeft"></button>
</ion-menu-toggle> </ion-menu-toggle>
<div class="nav_title floatLeft"> <div class="nav_title floatLeft">
<img src="../../assets/Group [email protected]" /> <img src="../../assets/Group [email protected]" />
</div> </div>
<div class="clear"></div> <div class="clear"></div>
</div> </div>
<ion-content> <ion-content>
<div class="profile_wrapper" *ngIf="loggedUser"> <div class="profile_wrapper" *ngIf="loggedUser">
<div class="profile_banner"> <div class="profile_banner">
<!-- <div class="profile_circle"> <!-- <div class="profile_circle">
<div class="edit"></div> <div class="edit"></div>
</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" <div class="edit"></div>
onerror="this.src='./../../assets/profile_banner.png'" <input type="file" accept="image/*" (change)="fileChange($event)" />
/> </div>
<div class="edit"></div>
<input type="file" accept="image/*" (change)="fileChange($event)" />
</div>
<h5>{{loggedUser.name}}</h5> <h5>{{loggedUser.name}}</h5>
<p (click)="istoggle()">LOGOUT</p> <p (click)="istoggle()">LOGOUT</p>
</div> </div>
<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)" <div class="clear"></div>
><img src="../../assets/edit.png" </div>
/></span> <div class="row">
<div class="clear"></div> <ion-row>
</div> <ion-col class="textLeft p0">
<div class="row"> <p>
<ion-row> Phone
<ion-col class="textLeft p0">
<p> </p>
Phone </ion-col>
<span *ngIf="loggedUser.phoneVerified == true">Verified</span> <ion-col class="textRight p0">
<span *ngIf="loggedUser.phoneVerified == false" <h6>{{loggedUser.phone}}</h6>
>Not Verified yet</span <span class="ar-span" *ngIf="loggedUser.phoneVerified == true">Verified</span>
> <span class="ar-span" *ngIf="loggedUser.phoneVerified == false">Not Verified yet</span>
</p> </ion-col>
</ion-col> </ion-row>
<ion-col class="textRight p0"> </div>
<h6>{{loggedUser.phone}}</h6> <div class="row">
</ion-col> <ion-row>
</ion-row> <ion-col class="textLeft p0">
</div> <p>
<div class="row"> Email
<ion-row> </p>
<ion-col class="textLeft p0"> </ion-col>
<p> <ion-col class="textRight p0">
Email<span *ngIf="userData && userData.emailVerified == true" <h6>{{loggedUser.emailId}}</h6>
>Verified</span <span class="ar-span" *ngIf="loggedUser.emailVerified == true">Verified</span>
> <span class="ar-span" *ngIf="loggedUser.emailVerified == false">Not Verified yet</span>
<span *ngIf="loggedUser.emailVerified == false" </ion-col>
>Not Verified yet</span </ion-row>
> </div>
</p> <hr />
</ion-col> <ion-row (click)="goToPage('wishlist')">
<ion-col class="textRight p0"> <ion-col class="textLeft p0">
<h6>{{loggedUser.emailId}}</h6> <p>Wishlist</p>
</ion-col> </ion-col>
</ion-row> <ion-col class="textRight p0">
</div> <h6>(0)</h6>
<hr /> </ion-col>
<ion-row (click)="goToPage('wishlist')"> </ion-row>
<ion-col class="textLeft p0"> <hr />
<p>Wishlist</p> <ion-row (click)="goToPage('address')">
</ion-col> <ion-col class="textLeft p0">
<ion-col class="textRight p0"> <p>Address</p>
<h6>(0)</h6> </ion-col>
</ion-col> <ion-col class="textRight p0">
</ion-row> <h6 *ngIf="addressService.addList">
<hr /> ({{addressService.addressList.length}})
<ion-row (click)="goToPage('address')"> </h6>
<ion-col class="textLeft p0"> </ion-col>
<p>Address</p> </ion-row>
</ion-col> <hr />
<ion-col class="textRight p0"> <!-- <ion-row>
<h6 *ngIf="addressService.addList">
({{addressService.addressList.length}})
</h6>
</ion-col>
</ion-row>
<hr />
<!-- <ion-row>
<ion-col class="textLeft p0"> <ion-col class="textLeft p0">
<p>My Cards</p> <p>My Cards</p>
</ion-col> </ion-col>
...@@ -102,46 +92,43 @@ ...@@ -102,46 +92,43 @@
</ion-col> </ion-col>
</ion-row> </ion-row>
<hr /> --> <hr /> -->
<ion-row (click)="goToPage('myorder')"> <ion-row (click)="goToPage('myorder')">
<ion-col class="textLeft p0"> <ion-col class="textLeft p0">
<p>My Order</p> <p>My Order</p>
</ion-col> </ion-col>
<ion-col class="textRight p0"> <ion-col class="textRight p0">
<h6> <h6>
<ion-icon name="arrow-forward"></ion-icon> <ion-icon name="arrow-forward"></ion-icon>
</h6> </h6>
</ion-col> </ion-col>
</ion-row> </ion-row>
<hr /> <hr />
<ion-row> <ion-row>
<ion-col class="textLeft p0"> <ion-col class="textLeft p0">
<p>Currency</p> <p>Currency</p>
</ion-col> </ion-col>
<ion-col class="textRight p0"> <ion-col class="textRight p0">
<h6> <h6>
<span>AUD</span> <span>AUD</span>
</h6> </h6>
</ion-col> </ion-col>
</ion-row> </ion-row>
</div> </div>
<div class="logout-pop-wrapper" *ngIf="isShow" [@slideInOut]> <div class="logout-pop-wrapper" *ngIf="isShow" [@slideInOut]>
<div class="logout_inner"> <div class="logout_inner">
<h4>Logout</h4> <h4>Logout</h4>
<p>Are you sure to Logout ?</p> <p>Are you sure to Logout ?</p>
<div class="logout_footer"> <div class="logout_footer">
<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>
<div class="clear"></div> <div class="clear"></div>
</div> </div>
</div>
</div> </div>
</div> </ion-content>
</ion-content> \ No newline at end of file
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
...@@ -312,7 +312,7 @@ export class AuthService { ...@@ -312,7 +312,7 @@ export class AuthService {
.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', { replaceUrl: true }); this.router.navigateByUrl('home');
document.body.scrollTop = document.documentElement.scrollTop = 0; document.body.scrollTop = document.documentElement.scrollTop = 0;
}) })
.catch(err => { .catch(err => {
......
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