Skip to content

G
getme
Commit 523b5916 by Adarsh K
Options

Merge branch 'arjunlatest' into 'master'

Arjunlatest See merge request !83
parents 13bbafef acd12c15
Showing with 145 additions and 78 deletions
config.xml
......@@ -99,11 +99,11 @@
<plugin name="cordova-plugin-device" spec="2.0.2" />
<plugin name="cordova-plugin-splashscreen" spec="5.0.2" />
<plugin name="cordova-plugin-ionic-webview" spec="^4.0.0" />
<plugin name="cordova-plugin-ionic-keyboard" spec="^2.0.5" />
<plugin name="cordova-plugin-geolocation" spec="4.0.2">
<variable name="GEOLOCATION_USAGE_DESCRIPTION" value="To locate you" />
</plugin>
<plugin name="cordova-plugin-nativegeocoder" spec="3.2.2" />
<plugin name="cordova-plugin-statusbar" spec="^2.4.2" />
<engine name="android" spec="8.0.0" />
<plugin name="cordova-plugin-ionic-keyboard" spec="2.2.0" />
<engine name="android" spec="7.1.4" />
</widget>
package.json
......@@ -27,6 +27,7 @@
"@ionic-native/core": "^5.19.1",
"@ionic-native/geolocation": "^5.19.1",
"@ionic-native/google-plus": "^5.19.1",
"@ionic-native/keyboard": "^5.21.6",
"@ionic-native/native-geocoder": "^5.19.1",
"@ionic-native/social-sharing": "^5.20.0",
"@ionic-native/splash-screen": "^5.19.1",
......@@ -36,11 +37,11 @@
"@types/googlemaps": "^3.39.2",
"agm-direction": "^0.7.9",
"call-number": "^1.0.1",
"cordova-android": "8.0.0",
"cordova-android": "7.1.4",
"cordova-plugin-device": "^2.0.3",
"cordova-plugin-geolocation": "^4.0.2",
"cordova-plugin-googleplus": "^8.4.0",
"cordova-plugin-ionic-keyboard": "^2.2.0",
"cordova-plugin-ionic-keyboard": "2.2.0",
"cordova-plugin-ionic-webview": "^4.1.3",
"cordova-plugin-nativegeocoder": "^3.2.2",
"cordova-plugin-splashscreen": "^5.0.3",
......@@ -93,7 +94,6 @@
"cordova-plugin-ionic-webview": {
"ANDROID_SUPPORT_ANNOTATIONS_VERSION": "27.+"
},
"cordova-plugin-ionic-keyboard": {},
"cordova-plugin-geolocation": {
"GEOLOCATION_USAGE_DESCRIPTION": "To locate you"
},
......@@ -107,7 +107,8 @@
"ANDROID_SUPPORT_V4_VERSION": "24.1.1+"
},
"mx.ferreyra.callnumber": {},
"call-number": {}
"call-number": {},
"cordova-plugin-ionic-keyboard": {}
},
"platforms": [
"android"
......
src/app/app.module.ts
......@@ -31,6 +31,7 @@ import { SearchmodalPageModule } from './searchmodal/searchmodal.module';
import { SocialSharing } from '@ionic-native/social-sharing/ngx';
import { CallNumber } from '@ionic-native/call-number/ngx';
import { sanitizeHtmlPipe } from './../config/safehtml';
import { Keyboard } from '@ionic-native/keyboard/ngx';
@NgModule({
declarations: [AppComponent],
......@@ -60,7 +61,8 @@ import { sanitizeHtmlPipe } from './../config/safehtml';
AuthService,
GooglePlus,
SocialSharing,
sanitizeHtmlPipe
sanitizeHtmlPipe,
Keyboard
],
bootstrap: [AppComponent]
})
......
src/app/catstorelist/catstorelist.page.scss
.home_wrapper {
width: 100%;
padding-bottom: 50px;
.home_banner {
width: 100%;
height: 300px;
......@@ -150,12 +151,11 @@
width: 120px;
height: 125px;
float: left;
background-color: #a8a8a8;
border-radius: 8px;
img {
width: 100%;
height: 100%;
object-fit: cover;
object-fit: contain;
object-position: center;
}
}
......@@ -296,14 +296,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;
......@@ -314,21 +314,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;
......@@ -336,8 +336,7 @@
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);
}
}
......
src/app/forgot/forgot.page.html
<div class="nav_header">
<button class="nav_btn nav_back floatLeft" (click)="goBack()">
<button class="nav_btn nav_back floatLeft" (click)="goToPage('login')">
<img src="../assets/Group17_2.png" />
</button>
<div class="nav_title floatLeft">
......
src/app/home/home.page.html
......@@ -6,8 +6,7 @@
<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)="goToPage('searchmodal')" />
<input class="search_bar" placeholder="Search here.. eg:shirts, retailers etc..." (click)="goToPage('searchmodal')" />
</div>
<button class="nav_btn nav_search floatRight" *ngIf="!searchShow" (click)="goToPage('searchmodal')"></button>
<button class="nav_btn nav_close floatRight" *ngIf="searchShow" (click)="searchClose()"></button>
......@@ -32,8 +31,7 @@
<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>
......@@ -41,12 +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'" />
<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>
......@@ -66,17 +62,16 @@
</div>
<div class="home_sub_header">
<span class="floatLeft">Nearby Shopping Centers</span>
<span class="floatRight">
<!-- <span class="floatRight">
<div class="nearby_icon" (click)="goToPage('nearby')"></div>
</span>
</span> -->
<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)">
<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>
......@@ -97,10 +92,8 @@
</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'" />
<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>
......@@ -120,12 +113,17 @@
<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-marker [latitude]="lat" [longitude]="lng"></agm-marker>
<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" [iconUrl]="
{
url: './assets/pin.svg',
scaledSize: {
width: 28,
height: 40
}}"></agm-marker>
</agm-map>
<div class="add_address_wrapper">
<h5 class="floatLeft">NEW ADDRESS</h5>
<h5 class="floatLeft">ADDRESS LIST</h5>
<h5 class="floatRight" (click)="istoggle(); goToPage('nearby')">
ADD NEW
</h5>
......@@ -135,9 +133,7 @@
<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)" [value]="address.addressId" #addressType
[checked]="address.defaultVal == 1" />
<input class="styled-checkbox" name="addressId" id="styled-checkbox-{{i}}" type="radio" (click)="setDefault(address)" [value]="address.addressId" #addressType [checked]="address.defaultVal == 1" />
<label for="styled-checkbox-{{i}}">
{{address.addressType}}
</label>
......
src/app/home/home.page.ts
......@@ -104,7 +104,7 @@ export class HomePage implements OnInit {
console.log(status);
if (status === 'OK') {
if (results[0]) {
const addressData = results[0].formatted_address.split(', ');
const addressData = results[1].formatted_address.split(', ');
this.address = addressData[0] + ', ' + addressData[1];
console.log(this.address);
} else {
......@@ -119,14 +119,26 @@ export class HomePage implements OnInit {
setDefault(address: any) {
this.loader = true;
this.addressService.setDefaultAddress(address.addressId, this.custId).then(() => {
this.addressService
.setDefaultAddress(address.addressId, this.custId)
.then(() => {
this.address = address.address;
console.log(address.latLng);
this.centerService.getNearBy(address.latLng._lat, address.latLng._long, this.service.distance);
this.centerService.getNearBy(
address.latLng._lat,
address.latLng._long,
this.service.distance
);
this.loader = false;
}).catch(err => {
})
.catch(err => {
this.loader = false;
this.service.showToast('Something went wrong please try again!', 'top', 'my-error', 1000);
this.service.showToast(
'Something went wrong please try again!',
'top',
'my-error',
1000
);
});
}
......@@ -153,7 +165,6 @@ export class HomePage implements OnInit {
} else if (path === 'catstorelist') {
this.service.set('catParams', data);
} else {
}
this.router.navigateByUrl(path, { queryParams: data });
document.body.scrollTop = document.documentElement.scrollTop = 0;
......
src/app/nearby/nearby.page.html
......@@ -3,28 +3,30 @@
<img src="../assets/Group17_2.png" />
</button>
<div class="nav_title floatLeft">
<h4>NEAR BY STORES</h4>
<h4>NEW ADDRESS</h4>
</div>
<div class="clear"></div>
</div>
<ion-content>
<div class="nearby_map">
<agm-map [latitude]="latitude" [longitude]="longitude" [zoom]="8" [backgroundColor]="'rgba(29, 27, 130,0.2)'">
<agm-marker [latitude]="latitude" [longitude]="longitude" [markerDraggable]="true"
(dragEnd)="markerDragEnd($event)"></agm-marker>
<agm-marker [latitude]="latitude" [longitude]="longitude" [markerDraggable]="true" (dragEnd)="markerDragEnd($event)" [iconUrl]="
{
url: './assets/pin.svg',
scaledSize: {
width: 28,
height: 40
}}"></agm-marker>
</agm-map>
<form (ngSubmit)="onSubmit(addressForm.value); addressForm.reset()" #addressForm="ngForm" method="post"
class="form-horizontal">
<form (ngSubmit)="onSubmit(addressForm.value); addressForm.reset()" #addressForm="ngForm" method="post" class="form-horizontal">
<div class="add_address_wrapper">
<h5>DELIVERY</h5>
<p>{{address}}</p>
<input [(ngModel)]="addressForm.building" name="building" #building="ngModel" name="building" required
placeholder="House No./ Building No" />
<input [(ngModel)]="addressForm.building" name="building" #building="ngModel" name="building" required placeholder="House No./ Building No" />
<div class="md-errors-spacer" [hidden]="building.valid || landmark.pristine" class="ion-padding-start">
Building Name is required
</div>
<input [(ngModel)]="addressForm.landmark" name="landmark" #landmark="ngModel" name="landmark" required
placeholder="Landmark" />
<input [(ngModel)]="addressForm.landmark" name="landmark" #landmark="ngModel" name="landmark" required placeholder="Landmark" />
<div class="md-errors-spacer" [hidden]="landmark.valid || landmark.pristine" class="ion-padding-start">
Landmark is required
</div>
......@@ -32,22 +34,19 @@
<ion-row>
<ion-col>
<h6>
<input class="styled-checkbox" id="styled-check-1" type="radio" value="Home"
[(ngModel)]="addressForm.addressType" name="addressType" #addressType="ngModel" required />
<input class="styled-checkbox" id="styled-check-1" type="radio" value="Home" [(ngModel)]="addressForm.addressType" name="addressType" #addressType="ngModel" required />
<label for="styled-check-1"><span>Home</span></label>
</h6>
</ion-col>
<ion-col>
<h6>
<input class="styled-checkbox" id="styled-check-2" type="radio" value="Work"
[(ngModel)]="addressForm.addressType" name="addressType" #addressType="ngModel" required />
<input class="styled-checkbox" id="styled-check-2" type="radio" value="Work" [(ngModel)]="addressForm.addressType" name="addressType" #addressType="ngModel" required />
<label for="styled-check-2"><span>Office</span></label>
</h6>
</ion-col>
<ion-col>
<h6>
<input class="styled-checkbox" id="styled-check-3" type="radio" value="Other"
[(ngModel)]="addressForm.addressType" name="addressType" #addressType="ngModel" required />
<input class="styled-checkbox" id="styled-check-3" type="radio" value="Other" [(ngModel)]="addressForm.addressType" name="addressType" #addressType="ngModel" required />
<label for="styled-check-3"><span>Others</span></label>
</h6>
</ion-col>
......
src/app/nearby/nearby.page.scss
.nearby_map {
.nearby_map {
width: 100%;
height: 100%;
.overlay {
......@@ -11,7 +11,7 @@
}
agm-map {
width: 100%;
height: 100vh;
height: calc(100% - 330px);
.overlay {
position: absolute;
top: 0px;
......@@ -130,4 +130,25 @@
transform: rotate(45deg);
}
}
}
\ No newline at end of file
}
@media only screen and (max-width: 350px) {
.nearby_map {
.add_address_wrapper {
padding: 10px 20px !important;
p {
margin: 2px 0;
}
input {
margin-bottom: 5px;
}
h6 {
margin: 0;
}
}
agm-map {
width: 100%;
height: calc(100% - 235px);
}
}
}
\ No newline at end of file
src/app/productlist/productlist.page.scss
......@@ -289,3 +289,11 @@
margin-top: 10px;
}
}
@media only screen and (max-width: 350px) {
.product_list {
.ellipse {
width: 135px !important;
}
}
}
\ No newline at end of file
src/app/profile/profile.page.html
......@@ -27,8 +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">
......@@ -40,9 +40,11 @@
</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>
<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>
......@@ -55,8 +57,12 @@
</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>
<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>
......
src/app/signup/signup.page.html
<div class="nav_header">
<button class="nav_btn nav_back floatLeft" (click)="goBack()">
<button class="nav_btn nav_back floatLeft" (click)="goToPage('login')">
<img src="../assets/Group17_2.png" />
</button>
<div class="nav_title floatLeft">
......
src/app/signup/signup.page.scss
......@@ -98,7 +98,7 @@
font-weight: 900;
}
.styled-checkbox {
position: absolute; // take it out of document flow
// take it out of document flow
opacity: 0; // hide it
&+label {
position: relative;
......
src/assets/asset_avatar.png
src/assets/asset_avatar.png

26.5 KB | W: | H:

src/assets/asset_avatar.png

21.3 KB | W: | H:

src/assets/asset_avatar.png
src/assets/asset_avatar.png
src/assets/asset_avatar.png
src/assets/asset_avatar.png
  • 2-up
  • Swipe
  • Onion skin
src/assets/pin.svg 0 → 100644
<svg xmlns="http://www.w3.org/2000/svg" width="65.533" height="99" viewBox="0 0 65.533 99">
<g id="Group_6" data-name="Group 6" transform="translate(-20 0)">
<g id="Group_5" data-name="Group 5" transform="translate(-2.935 1.022)">
<ellipse id="Ellipse_4" data-name="Ellipse 4" cx="17" cy="6" rx="17" ry="6" transform="translate(38.935 85.978)" fill="#b5b5cd"/>
<ellipse id="Ellipse_6" data-name="Ellipse 6" cx="17" cy="6" rx="17" ry="6" transform="translate(38.935 85.978)" fill="#b5b5cd"/>
</g>
<g id="Group_2" data-name="Group 2" transform="translate(3 -3)">
<circle id="Ellipse_1" data-name="Ellipse 1" cx="24.5" cy="24.5" r="24.5" transform="translate(25 11)" fill="#fff"/>
<g id="pin" transform="translate(-0.222 -0.104)">
<path id="Path_1" data-name="Path 1" d="M49.8,96.9c-3.7-4.7-7.4-9.2-10.9-13.9A147.669,147.669,0,0,1,22.5,56.1a55.361,55.361,0,0,1-4.9-15.4,31.919,31.919,0,0,1,7.4-26A31.406,31.406,0,0,1,44.9,3.5,32.726,32.726,0,0,1,82,28.8c1.6,7.1.5,13.9-1.8,20.7A111.792,111.792,0,0,1,67.3,74.2,205.419,205.419,0,0,1,50.7,96,3.74,3.74,0,0,1,49.8,96.9Zm.3-84.6A23.6,23.6,0,1,0,73.6,35.9,23.475,23.475,0,0,0,50.1,12.3Z" fill="#242052"/>
<g id="Group_1" data-name="Group 1">
<path id="Path_2" data-name="Path 2" d="M33.3,45.1V25.6L50,16.1l4.7,2.2L37.6,28l-.1,14.6,12.6,7,12.4-6.9-.2-9.4-7.9,4.5v6.1L50.7,46l-9.4-5.1V29.7l16.2-9.2,4.7,2.2L45.5,32.2v6.1L50.1,41l.1-5.7,16.5-9.4V45.1L50.1,54.5Z" fill="#c9974d"/>
</g>
</g>
</g>
</g>
</svg>
src/config/auth.service.ts
......@@ -350,13 +350,19 @@ export class AuthService {
resetPassword(email: string) {
this.loader = true;
this.afAuth.auth.sendPasswordResetEmail(email)
this.afAuth.auth
.sendPasswordResetEmail(email)
.then(() => {
this.service.showToast('Password reset mail has been sent your mail Id', 'top', 'my-toast', 2000);
this.service.showToast(
'Password reset mail has been sent your mail Id',
'top',
'my-toast',
2000
);
this.loader = false;
this.router.navigateByUrl('login', { replaceUrl: true });
})
.catch((error) => {
.catch(error => {
this.service.showToast(error, 'top', 'my-error', 1000);
this.loader = false;
});
......
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