Skip to content

G
getme
Commit 8281ba99 by Adarsh K
Options

Merge branch 'arjunlatest' into 'master'

Arjunlatest See merge request !73
parents f9c1a3fe 05adf738
Showing with 532 additions and 165 deletions
package.json
......@@ -39,18 +39,19 @@
"cordova-android": "8.0.0",
"cordova-plugin-device": "^2.0.3",
"cordova-plugin-geolocation": "^4.0.2",
"cordova-plugin-googleplus": "^8.2.1",
"cordova-plugin-googleplus": "^8.4.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",
"cordova-plugin-statusbar": "^2.4.3",
"cordova-plugin-whitelist": "^1.3.4",
"cordova-plugin-x-socialsharing": "^5.6.3",
"cordova-plugin-x-socialsharing": "^5.6.4",
"cordova-sqlite-storage": "^3.4.1",
"core-js": "^2.6.11",
"es6-promise-plugin": "^4.2.2",
"firebase": "^6.6.2",
"mx.ferreyra.callnumber": "0.0.2",
"rxjs": "^6.5.4",
"rxjs-compat": "^6.5.4",
"tslib": "^1.9.0",
......@@ -105,7 +106,8 @@
"cordova-plugin-x-socialsharing": {
"ANDROID_SUPPORT_V4_VERSION": "24.1.1+"
},
"mx.ferreyra.callnumber": {}
"mx.ferreyra.callnumber": {},
"call-number": {}
},
"platforms": [
"android"
......
src/app/app-routing.module.ts
......@@ -125,8 +125,12 @@ const routes: Routes = [
path: 'changeaddress',
loadChildren: './changeaddress/changeaddress.module#ChangeaddressPageModule'
},
{
path: 'verficationnumber',
loadChildren:
'./verficationnumber/verficationnumber.module#VerficationnumberPageModule'
},
{ path: '', loadChildren: './firstpage/firstpage.module#FirstpagePageModule' }
];
@NgModule({
imports: [
......@@ -134,4 +138,4 @@ const routes: Routes = [
],
exports: [RouterModule]
})
export class AppRoutingModule { }
export class AppRoutingModule {}
src/app/app.component.html
......@@ -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>
......@@ -65,49 +57,40 @@
</ion-app>
<div class="common_tab" [hidden]="fetchCase() === true" *ngIf="!isSearchOpen">
<button (click)="istoggle()"></button>
<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')">
<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 (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>
<div class="common-pop-wrapper" *ngIf="isShow" [@slideInOut]>
<div class="pop_inner">
<div class="img-wrapper">
<img src="../assets/model1_2.png" alt="Product">
</div>
<div class="content">
<h1>Order Placed Successfully</h1>
<p>Order ID 123456 , Green Churidhar has been successfully orderd. </p>
</div>
<span (click)="istoggle();"><img src="../assets/close.png" alt="Close"></span>
</div>
</div>
\ No newline at end of file
src/app/app.component.scss
......@@ -12,6 +12,7 @@
padding-left: 20px;
padding-top: 20px;
padding-right: 10px;
padding-bottom: 55px;
.top_banner {
.top_image {
width: 60px;
......@@ -165,3 +166,64 @@
}
}
}
.common-pop-wrapper {
width: 100%;
height: 90px !important;
position: fixed;
top: 60px;
left: 0px;
right: 0px;
bottom: 0px;
z-index: 99;
.pop_inner {
margin: 0 auto;
width: 95%;
padding: 10px;
background-color: #fff;
box-shadow: 0px 1px 5px 0px rgba(0, 0, 0, 0.3);
border-radius: 10px;
display: flex;
position: relative;
.img-wrapper {
width: 70px;
height: 70px;
border-radius: 8px;
background-color: #f9f9f9;
display: block;
img {
width: 70px;
min-width: 70px;
height: 70px;
border-radius: 8px;
background-color: #f9f9f9;
}
}
.content {
display: flex;
-webkit-box-align: center;
flex-direction: column;
text-align: left;
justify-content: center;
padding-left: 12px;
overflow: hidden;
h1 {
color: rgba(59, 57, 77, 1);
margin: 0px;
font-weight: bold;
font-size: 18px;
}
p {
margin-bottom: 0;
line-height: 1;
margin-top: 8px;
}
}
}
span {
width: 20px;
position: absolute;
right: 4px;
top: 4px;
}
}
\ No newline at end of file
src/app/app.component.ts
......@@ -17,10 +17,23 @@ import { SubjectService } from './../config/subject.service';
import { CategoriesService } from './../config/category.service';
import { SearchmodalPage } from './searchmodal/searchmodal.page';
import { trigger, transition, animate, style } from '@angular/animations';
@Component({
selector: 'app-root',
templateUrl: 'app.component.html',
styleUrls: ['app.component.scss']
styleUrls: ['app.component.scss'],
animations: [
trigger('slideInOut', [
transition(':enter', [
style({ transform: 'translateY(100%)' }),
animate('200ms ease-in', style({ transform: 'translateY(0%)' }))
]),
transition(':leave', [
animate('200ms ease-out', style({ transform: 'translateY(100%)' }))
])
])
]
})
export class AppComponent {
isSearchOpen = false;
......@@ -40,6 +53,8 @@ export class AppComponent {
userData: any;
tabData = true;
isShow = false;
constructor(
private platform: Platform,
private splashScreen: SplashScreen,
......@@ -118,7 +133,8 @@ export class AppComponent {
'changeaddress',
'changedetails',
'contact',
'myorder'
'myorder',
'review'
];
const currentUrl = this.router.url.split('/');
const index = restrictedUrl.findIndex(x => x === currentUrl[1]);
......@@ -242,4 +258,8 @@ export class AppComponent {
});
return await modal.present();
}
istoggle() {
this.isShow = !this.isShow;
}
}
src/app/cart/cart.page.html
......@@ -166,12 +166,15 @@
</div> -->
<hr />
<div class="coupon_code">
<div class="promo-row">
<input class="" placeholder="COUPON CODE: GET50" #promo /><button class="add_btn" (click)="promoApply(promo.value)">
APPLY
</button>
<span *ngIf="discountApplied" style="color: red">Promocode applied successfully
</div>
<span *ngIf="discountApplied" class="promo-success">Promocode applied successfully
</span>
</div>
<br />
<h6>
......
src/app/cart/cart.page.scss
......@@ -205,8 +205,9 @@
}
.coupon_code {
padding-top: 20px;
padding-bottom: 50px;
padding-bottom: 40px;
border-bottom: 1px solid #b0aec7;
.promo-row {
display: flex;
justify-content: space-between;
input {
......@@ -236,6 +237,14 @@
font-weight: bolder;
}
}
.promo-success {
color: #31b131;
font-size: 16px;
text-align: left;
display: block;
margin-top: 5px;
}
}
.total_div {
p {
margin: 0px;
......
src/app/home/home.page.html
......@@ -31,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>
......@@ -40,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>
......@@ -74,8 +71,7 @@
<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>
......@@ -96,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>
......@@ -119,23 +113,21 @@
<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">
<div class="add-address-c">
<span>NEW ADDRESS</span>
<span (click)="istoggle(); goToPage('nearby')">ADD NEW</span>
</div>
<h5 class="floatLeft">NEW ADDRESS</h5>
<h5 class="floatRight" (click)="istoggle(); goToPage('nearby')">
ADD NEW
</h5>
<div class="clear"></div>
<div>
<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>
......
src/app/home/home.page.scss
......@@ -262,9 +262,9 @@
.add_address_wrapper {
position: fixed;
top: 40%;
overflow: scroll;
height: auto;
max-height: 70%;
overflow: scroll;
bottom: 0px;
left: 0px;
right: 0px;
......
src/app/nearby/nearby.page.scss
.nearby_map {
.nearby_map {
width: 100%;
height: 100%;
.overlay {
......@@ -130,4 +130,4 @@
transform: rotate(45deg);
}
}
}
\ No newline at end of file
}
\ No newline at end of file
src/app/preference/preference.page.html
......@@ -12,38 +12,28 @@
<div class="preference-wrapper">
<div class="pref-wrap-two">
<ion-grid>
<ion-row
*ngIf="categoriesService.activecategories && categoriesService.activecategories.length > 0"
>
<ion-col
size="6"
*ngFor="let categories of categoriesService.categories"
>
<ion-row *ngIf="categoriesService.activecategories && categoriesService.activecategories.length > 0">
<ion-col size="6" *ngFor="let categories of categoriesService.categories">
<div class="preference-box">
<input
type="checkbox"
class="preference"
(click)="selectPrefernce(categories.catId)"
[checked]="selectedPref(categories.catId)"
/>
<img
[src]="categories.catImage"
onerror="this.src='../assets/handsome-man-outdoors-drinking-coffee-with-sunglasses-guy-with-beard-instagram-effect_1212-818@3x.png'"
/>
<input type="checkbox" class="preference" (click)="selectPrefernce(categories.catId)" [checked]="selectedPref(categories.catId)" />
<img [src]="categories.catImage" onerror="this.src='../assets/handsome-man-outdoors-drinking-coffee-with-sunglasses-guy-with-beard-instagram-effect_1212-818@3x.png'" />
<h1>{{categories.catName}}</h1>
</div>
</ion-col>
</ion-row>
</ion-grid>
</div>
</div>
</ion-content>
<ion-footer>
<div class="bottom-button">
<button class="show-btn" (click)="onSubmit()">
Continue
</button>
<!-- <span>SKIP</span> -->
</div>
</div>
</ion-content>
</ion-footer>
<div class="loader" *ngIf="loader">
<div class="lds-ripple">
<div></div>
......
src/app/preference/preference.page.scss
.preference-wrapper {
padding: 20px 20px 110px 20px;
.bottom-button {
position: fixed;
bottom: 0;
left: 0;
right: 0;
background-color: #fff;
padding: 20px;
text-align: center;
z-index: 2;
button {
width: 100%;
background-color: #29285b;
color: #fff;
border-radius: 8px;
height: 45px;
font-size: 16px;
text-transform: uppercase;
}
span {
text-transform: uppercase;
font-size: 16px;
text-align: center;
margin-top: 10px;
display: inline-block;
font-weight: 600;
}
}
.pref-wrap-two {
.preference-box {
width: 100%;
......@@ -90,3 +63,31 @@
}
}
}
.bottom-button {
position: fixed;
bottom: 0;
left: 0;
right: 0;
background-color: #fff;
padding: 20px;
text-align: center;
z-index: 9;
button {
width: 100%;
background-color: #29285b;
color: #fff;
border-radius: 8px;
height: 45px;
font-size: 16px;
text-transform: uppercase;
}
span {
text-transform: uppercase;
font-size: 16px;
text-align: center;
margin-top: 10px;
display: inline-block;
font-weight: 600;
}
}
\ No newline at end of file
src/app/productdetail/productdetail.page.scss
......@@ -134,12 +134,11 @@
top: 0px;
bottom: 0px;
padding: 4px;
padding-top: 35px;
padding-bottom: 35px;
text-align: center;
display: flex;
align-items: center;
font-size: 14px;
justify-content: center;
}
#custom_check_button label {
width: 100%;
......
src/app/profile/profile.page.html
......@@ -16,10 +16,7 @@
</div> -->
<div class="profile_circle">
<img
[src]="loggedUser.profilePhoto"
onerror="this.src='./../assets/asset_avatar.png'"
/>
<img [src]="loggedUser.profilePhoto" onerror="this.src='./../assets/asset_avatar.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">
......@@ -46,12 +40,9 @@
</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" (click)="goToPage('verficationnumber')">Not
Verified yet</span>
</ion-col>
</ion-row>
</div>
......@@ -64,12 +55,8 @@
</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>
......@@ -148,10 +135,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/review/review.page.html
......@@ -11,22 +11,19 @@
<div class="nearby_shop_list">
<ul>
<li (click)="goToPage('productlist')">
<div class="nearby_image"></div>
<div class="nearby_image">
<img src="../../assets/2193bb91-3be9-4de9-96f4-4ce7aab8547e1558436499234-RARE-Women-Black-Printed-A-Line-Dress-6731558436495088-1@3x.png" alt="">
</div>
<div class="nearby_detail">
<h5>
<span class="floatLeft">Carnival Life</span>
<span class="floatRight">4
<img src="../assets/Path61_2.png">
</span>
<div class="clear"></div>
</h5>
<p>Men's & Women's Fashion</p>
<h5> Carnival Life</h5>
<p><span><img src="../assets/Path61_2.png"> 4</span> Men's & Women's Fashion</p>
</div>
<div class="clear"></div>
</li>
</ul>
</div>
<div class="rating_div">
<h5>Rate Us</h5>
<fieldset class="rating">
<input type="radio" id="star5" name="rating" value="5" /><label class="full" for="star5" title="Awesome - 5 stars"></label>
<input type="radio" id="star4half" name="rating" value="4 and a half" /><label class="half" for="star4half" title="Pretty good - 4.5 stars"></label>
......@@ -41,4 +38,10 @@
</fieldset>
</div>
<div class="form_div">
<p>Comments</p>
<textarea required name="message" class="form-control" rows="8" placeholder="Type here.."></textarea>
<button class="login_btn"> SUBMIT </button>
</div>
</ion-content>
\ No newline at end of file
src/app/review/review.page.scss
.nearby_shop_list {
ul {
margin: 0px;
margin-top: 25px;
padding: 10px;
padding-left: 20px;
padding-right: 20px;
......@@ -15,6 +15,7 @@
img {
width: 100%;
height: 100%;
border-radius: 8px;
object-fit: cover;
object-position: center;
}
......@@ -30,14 +31,14 @@
color: rgba(59, 57, 77, 1);
font-weight: 900;
padding-bottom: 2px;
img {
width: 16px;
}
}
p {
margin: 0px;
padding: 0px;
color: rgba(176, 174, 199);
img {
width: 16px;
}
}
}
}
......@@ -45,10 +46,22 @@
}
.rating_div {
margin: 0px;
padding: 10px;
padding-left: 20px;
padding-right: 20px;
display: flex;
h5 {
margin: 0px;
padding: 0px;
color: #3b394d;
font-weight: 900;
display: flex;
align-items: center;
}
.rating {
border: none;
width: 250px;
margin: 0 auto;
padding-top: 20px;
padding-bottom: 20px;
}
......@@ -88,3 +101,42 @@
color: rgba(41, 40, 91, 1);
}
}
.form_div {
padding: 10px;
padding-left: 20px;
padding-right: 20px;
.form-control {
border: 1px solid rgba(215, 213, 228, 1);
background: transparent;
color: #000;
width: 100%;
border-radius: 8px;
font-size: 16px;
padding: 11px 15px;
resize: none;
outline: none;
transition: all .4s ease-in-out;
&::placeholder {
color: rgba(215, 213, 228, 1);
}
&:focus {
border: 1px solid #f3d09f;
box-shadow: 3px 3px 6px 0px rgba(202, 154, 83, 0.11);
}
}
.login_btn {
width: 100%;
background-color: #29285b;
color: #fff;
border-radius: 8px;
height: 45px;
font-size: 16px;
margin-top: 30px;
}
p {
color: #3b394d;
font-weight: 900;
margin-top: 0;
}
}
\ No newline at end of file
src/app/verficationnumber/verficationnumber.module.ts 0 → 100644
import { NgModule } from '@angular/core';
import { CommonModule } from '@angular/common';
import { FormsModule } from '@angular/forms';
import { Routes, RouterModule } from '@angular/router';
import { IonicModule } from '@ionic/angular';
import { VerficationnumberPage } from './verficationnumber.page';
const routes: Routes = [
{
path: '',
component: VerficationnumberPage
}
];
@NgModule({
imports: [
CommonModule,
FormsModule,
IonicModule,
RouterModule.forChild(routes)
],
declarations: [VerficationnumberPage]
})
export class VerficationnumberPageModule {}
src/app/verficationnumber/verficationnumber.page.html 0 → 100644
<div class="nav_header">
<button class="nav_btn nav_back floatLeft" (click)="goBack()">
<img src="../assets/Group17_2.png" />
</button>
<div class="nav_title floatLeft">
<h4>VERIFICATION</h4>
</div>
<div class="clear"></div>
</div>
<ion-content>
<div class="verification_div" *ngIf="authService.userPostData">
<div class="form_div">
<div class="row">
<p>We have sent and OTP to</p>
<h6>+01 {{authService.userPostData.phone}}</h6>
</div>
<div class="row">
<input class="" type="number" placeholder="Type OTP" maxlength="4" #otp required />
</div>
<div class="row">
<button class="login_btn" (click)="authService.verify(otp.value)">
SUBMIT
</button>
</div>
<div class="row">
<button class="resend_btn" (click)="authService.resend()">
RESEND
</button>
</div>
<h6>OTP: {{authService.userPostData.otp}}</h6>
</div>
</div>
<div class="loader" *ngIf="authService.loader">
<div class="lds-ripple">
<div></div>
<div></div>
</div>
</div>
</ion-content>
\ No newline at end of file
src/app/verficationnumber/verficationnumber.page.scss 0 → 100644
.verification_div {
width: 80%;
margin: 0 auto;
.form_div {
padding-top: 30%;
.row {
margin-bottom: 20px;
input {
border: 1px solid rgba(215, 213, 228, 1);
background: transparent;
color: #000;
width: 100%;
height: 45px;
text-align: center;
border-radius: 8px;
font-size: 16px;
outline: none;
transition: all .4s ease-in-out;
&::placeholder {
color: rgba(215, 213, 228, 1);
}
&:focus {
border: 1px solid #f3d09f;
box-shadow: 3px 3px 6px 0px rgba(202, 154, 83, 0.11);
}
}
.login_btn {
width: 100%;
background-color: #29285b;
color: #fff;
border-radius: 8px;
height: 45px;
font-size: 16px;
}
.resend_btn {
width: 100%;
background-color: transparent;
color: #29285b;
border-radius: 8px;
height: 45px;
font-size: 16px;
font-weight: 900;
}
hr {
border: 1px solid rgba(215, 213, 228, 1);
border-bottom: none;
margin-top: 30px;
margin-bottom: 10px;
}
P {
text-align: center;
color: rgba(59, 57, 77, 1);
margin: 0px;
text-align: center;
span {
background-color: #fff;
padding: 10px;
font-size: 18px;
}
}
h4 {
color: rgba(59, 57, 77, 1);
text-align: center;
margin: 0px;
padding-top: 15px;
}
h6 {
color: rgba(41, 40, 91, 1);
text-align: center;
font-weight: bold;
padding-bottom: 20%;
font-size: 25px;
.styled-checkbox {
position: absolute;
opacity: 0;
&+label {
position: relative;
cursor: pointer;
padding: 0;
}
&+label:before {
content: '';
margin-right: 10px;
display: inline-block;
vertical-align: text-top;
width: 30px;
height: 30px;
border-radius: 10px;
background: white;
border: 1px solid rgba(215, 213, 228, 1);
}
// Box checked
&: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: 10px;
top: 15px;
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);
}
}
}
.social_div {
border: 1px solid rgba(215, 213, 228, 1);
height: 45px;
border-radius: 20px;
.social_btn {
display: inline-block;
width: 50%;
text-align: center;
height: 100%;
font-size: 18px;
padding: 9px;
}
}
}
}
}
\ No newline at end of file
src/app/verficationnumber/verficationnumber.page.spec.ts 0 → 100644
import { CUSTOM_ELEMENTS_SCHEMA } from '@angular/core';
import { async, ComponentFixture, TestBed } from '@angular/core/testing';
import { VerficationnumberPage } from './verficationnumber.page';
describe('VerficationnumberPage', () => {
let component: VerficationnumberPage;
let fixture: ComponentFixture<VerficationnumberPage>;
beforeEach(async(() => {
TestBed.configureTestingModule({
declarations: [ VerficationnumberPage ],
schemas: [CUSTOM_ELEMENTS_SCHEMA],
})
.compileComponents();
}));
beforeEach(() => {
fixture = TestBed.createComponent(VerficationnumberPage);
component = fixture.componentInstance;
fixture.detectChanges();
});
it('should create', () => {
expect(component).toBeTruthy();
});
});
src/app/verficationnumber/verficationnumber.page.ts 0 → 100644
import { Component, OnInit } from '@angular/core';
import { Location } from '@angular/common';
import { Router, ActivatedRoute } from '@angular/router';
import { AuthService } from './../../config/auth.service';
@Component({
selector: 'app-verficationnumber',
templateUrl: './verficationnumber.page.html',
styleUrls: ['./verficationnumber.page.scss']
})
export class VerficationnumberPage implements OnInit {
constructor(
private router: Router,
private route: ActivatedRoute,
private location: Location,
public authService: AuthService
) {}
ngOnInit() {}
goToPage(path, data = null) {
this.router.navigateByUrl(path, { queryParams: data });
document.body.scrollTop = document.documentElement.scrollTop = 0;
}
goBack() {
this.location.back();
}
}
src/global.scss
......@@ -62,7 +62,7 @@
--------------------------------*/
@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;
-webkit-font-smoothing: antialiased;
......
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