Skip to content

G
getme
Commit b96e3946 by Adarsh K
Options

Merge branch 'arjunlatest' into 'master'

Bug fixed See merge request !75
parents 6f2da630 87561df4
Showing with 91 additions and 87 deletions
src/app/address/address.page.html
<div class="nav_header"> <div class="nav_header">
<button class="nav_btn nav_back floatLeft" (click)="goBack()"> <button class="nav_btn nav_back floatLeft" (click)="goBack()">
<img src="../assets/Group17_2.png" /> <img src="../assets/Group17_2.png" />
</button> </button>
<div class="nav_title floatLeft"> <div class="nav_title floatLeft">
<h4>Address</h4> <h4>Address</h4>
</div> </div>
<div class="clear"></div> <div class="clear"></div>
</div> </div>
<ion-content> <ion-content>
<div class="address-wrapper" *ngIf="addressService.addressList"> <div class="address-wrapper" *ngIf="addressService.addressList">
<ion-grid *ngFor="let address of addressService.addressList; let i = index"> <ion-grid *ngFor="let address of addressService.addressList; let i = index">
<ion-row> <ion-row>
<ion-col size="1"> <ion-col size="1">
<input type="radio" id="address_{{i}}" class="address-radio" name="address" <input type="radio" id="address_{{i}}" class="address-radio" name="address" (change)="setDefault(address.addressId)" [checked]="address.defaultVal == 1" />
(change)="setDefault(address.addressId)" [checked]="address.defaultVal == 1" /> </ion-col>
</ion-col> <ion-col size="9">
<ion-col size="9"> <h1>{{address.addressType}}</h1>
<h1>{{address.addressType}}</h1> <h1>{{address.address}}</h1>
<h1>{{address.address}}</h1> <p>{{address.building}}, {{address.landmark}}</p>
<p>{{address.building}}, {{address.landmark}}</p> </ion-col>
</ion-col> <ion-col size="2" [hidden]="address.defaultVal == 1"><button class="show-btn" (click)="addressService.deleteAddress(address.addressId)">
<ion-col size="2" [hidden]="address.defaultVal == 1"><button class="show-btn"
(click)="addressService.deleteAddress(address.addressId)">
<img src="../../assets/delete.png" /></button></ion-col> <img src="../../assets/delete.png" /></button></ion-col>
</ion-row> </ion-row>
</ion-grid> </ion-grid>
<div class="address-btn-wrapper">
<button class="show-btn" (click)="goToPage('nearby')">
Add New Address
</button>
</div> </div>
</div>
</ion-content> </ion-content>
<ion-footer>
<div class="address-btn-wrapper">
<button class="show-btn" (click)="goToPage('nearby')">
Add New Address
</button>
</div>
</ion-footer>
<div class="loader" *ngIf="loader"> <div class="loader" *ngIf="loader">
<div class="lds-ripple"> <div class="lds-ripple">
<div></div> <div></div>
<div></div> <div></div>
</div> </div>
</div> </div>
\ No newline at end of file
src/app/address/address.page.scss
.address-wrapper { .address-wrapper {
padding: 15px;
padding-bottom: 11%;
.address-radio {
background-image: url('../../assets/radio.png');
-webkit-appearance: none;
background-repeat: no-repeat;
background-position: center;
background-size: 25px;
height: auto;
padding: 15px; padding: 15px;
border-radius: 5px; padding-bottom: 11%;
outline: none; .address-radio {
transition: all 0.6s ease-in-out; background-image: url('../../assets/radio.png');
} -webkit-appearance: none;
.address-radio:checked { background-repeat: no-repeat;
background-image: url('../../assets/radio-checked.png'); background-position: center;
} background-size: 25px;
.address-radio:checked + .show-btn { height: auto;
opacity: 1; padding: 15px;
} border-radius: 50%;
h1 { outline: none;
font-size: 18px; transition: all 0.6s ease-in-out;
margin-top: 6px; }
padding-left: 10px; .address-radio:checked {
} background-image: url('../../assets/radio-checked.png');
p { }
margin-top: 20px; .address-radio:checked+.show-btn {
padding-left: 10px; opacity: 1;
color: #b0aec7; }
} h1 {
button { font-size: 18px;
background: none; margin-top: 6px;
outline: none; padding-left: 10px;
} }
img { p {
width: 35px; margin-top: 20px;
} padding-left: 10px;
color: #b0aec7;
}
button {
background: none;
outline: none;
}
img {
width: 35px;
}
} }
.address-btn-wrapper { .address-btn-wrapper {
padding: 15px; position: fixed;
padding-top: 0; bottom: 0;
padding-bottom: 10px; left: 0;
background-color: #fff; right: 0;
position: fixed; background-color: #fff;
bottom: 0px; padding: 20px;
left: 0; text-align: center;
right: 0; z-index: 9;
button { button {
width: 100%; width: 100%;
background-color: #29285b; background-color: #29285b;
color: #fff; color: #fff;
border-radius: 8px; border-radius: 8px;
height: 45px; height: 45px;
font-size: 16px; font-size: 16px;
text-transform: uppercase; text-transform: uppercase;
} }
} }
\ No newline at end of file
src/app/app.component.html
...@@ -57,7 +57,7 @@ ...@@ -57,7 +57,7 @@
</ion-app> </ion-app>
<div class="common_tab" [hidden]="fetchCase() === true" *ngIf="!isSearchOpen"> <div class="common_tab" [hidden]="fetchCase() === true" *ngIf="!isSearchOpen">
<button (click)="istoggle()"></button> <!-- <button (click)="istoggle()"></button> -->
<ul> <ul>
<li (click)="goToPage('home')"> <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>
......
src/app/storelist/storelist.page.scss
...@@ -145,12 +145,12 @@ ...@@ -145,12 +145,12 @@
width: 120px; width: 120px;
height: 125px; height: 125px;
float: left; float: left;
background-color: #a8a8a8; // background-color: #f1f1f1;
border-radius: 8px; border-radius: 8px;
img { img {
width: 100%; width: 100%;
height: 100%; height: 100%;
object-fit: cover; object-fit: contain;
object-position: center; object-position: center;
} }
} }
......
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