Skip to content

C
Callmycab-Driverapp
Commit 96d0a463 by Alen Jose
Options

july25-css

parent 4e014f9d
Showing with 48 additions and 100 deletions
src/pages/docupdate/docupdate.html
...@@ -27,6 +27,6 @@ ...@@ -27,6 +27,6 @@
</div> </div>
</ion-content> </ion-content>
<ion-footer padding> <ion-footer padding>
<button ion-button class="primary btn_primary" (click)="upload()" *ngIf="fileData?.fileStatus=='0' || fileData?.fileStatus=='3'">DONE</button> <button ion-button class="theme_dark_bg btn_primary" (click)="upload()" *ngIf="fileData?.fileStatus=='0' || fileData?.fileStatus=='3'">DONE</button>
<button ion-button class="primary btn_primary" (click)="view()" *ngIf="fileData?.fileStatus!='0'">view</button> <button ion-button class="theme_dark_bg btn_primary" (click)="view()" *ngIf="fileData?.fileStatus!='0'">view</button>
</ion-footer> </ion-footer>
src/pages/docupdate/docupdate.ts
...@@ -107,7 +107,7 @@ export class DocupdatePage { ...@@ -107,7 +107,7 @@ export class DocupdatePage {
// handle error // handle error
console.log(error) console.log(error)
}); });
// this.document.viewDocument(this.baseUrl + this.fileData.image, 'application/pdf', options) // this.document.viewDocument(this.baseUrl + this.fileData.image, 'application/pdf', options) //document viewer plugin
} }
else { else {
this.photoViewer.show(this.baseUrl + this.fileData.image); this.photoViewer.show(this.baseUrl + this.fileData.image);
......
src/pages/myprofile/myprofile.html
...@@ -50,27 +50,27 @@ ...@@ -50,27 +50,27 @@
</div> </div>
<ion-item> <ion-item>
<ion-label>DOB</ion-label> <ion-datetime displayFormat="DD MMM YYYY" placeholder="Date of Birth" min="1950" max={{maxDate}} formControlName="dob">
<ion-datetime displayFormat="DD MMM YYYY" min="1950" max={{maxDate}} formControlName="dob">
</ion-datetime> </ion-datetime>
</ion-item> </ion-item>
<div class="er_req textCenter" *ngIf="editForm.controls.dob.invalid && (editForm.get('dob').dirty || editForm.get('dob').touched)"> <div class="er_req textCenter" *ngIf="editForm.controls.dob.invalid && (editForm.get('dob').dirty || editForm.get('dob').touched)">
Select your DOB Select your DOB
</div> </div>
<div radio-group formControlName="gender" class="gender_radio">
<ion-list radio-group formControlName="gender"> <div class="floatLeft">
<div class="floatLeft"> <ion-radio value="male" checked class="floatLeft"></ion-radio>
<ion-radio value="male" checked class="floatLeft"></ion-radio> <ion-label class="floatLeft">Male</ion-label>
<ion-label class="floatLeft">Male</ion-label> <div class="clear"></div>
<div class="clear"></div> </div>
</div> <div class="floatLeft">
<div class="floatLeft"> <ion-radio value="female" class="floatLeft"></ion-radio>
<ion-radio value="female" class="floatLeft"></ion-radio> <ion-label class="floatLeft">Female</ion-label>
<ion-label class="floatLeft">Female</ion-label> <div class="clear"></div>
<div class="clear"></div> </div>
</div> <div class="clear"></div>
<div class="clear"></div> </div>
</ion-list>
<ion-item> <ion-item>
<ion-input type="text" placeholder="License Number" formControlName="license"></ion-input> <ion-input type="text" placeholder="License Number" formControlName="license"></ion-input>
...@@ -96,7 +96,7 @@ ...@@ -96,7 +96,7 @@
</div> </div>
<br> <br>
<button ion-button class="primary" (click)="updateProfile()">SAVE</button> <button ion-button class="primary theme_dark_bg" (click)="updateProfile()">SAVE</button>
<!-- <button ion-button class="changepass_btn" (click)="changepass()">CHANGE PASSWORD</button> --> <!-- <button ion-button class="changepass_btn" (click)="changepass()">CHANGE PASSWORD</button> -->
</div> </div>
</form> </form>
......
src/pages/myprofile/myprofile.scss
page-myprofile { page-myprofile {
.myprofile_wrapper{ .myprofile_wrapper{
width: 100%; width: 100%;
h4{ h4{
text-align:left; text-align:left;
...@@ -52,9 +53,11 @@ page-myprofile { ...@@ -52,9 +53,11 @@ page-myprofile {
.signup_form_content{ .signup_form_content{
width: 100%; width: 100%;
padding-top:30px; padding-top:30px;
.input { .input {
.text-input{ .text-input{
margin: 0px; margin: 0px;
width:100%;
height: 50px; height: 50px;
border-bottom:1px solid #b7b7b7; border-bottom:1px solid #b7b7b7;
font-size: 28px; font-size: 28px;
...@@ -83,10 +86,19 @@ page-myprofile { ...@@ -83,10 +86,19 @@ page-myprofile {
} }
} }
.item{ .item{
margin-bottom: 20px; margin-bottom: 0px;
padding-left:0px;
} }
.item-inner{ .item-inner{
border:none; border:none;
.datetime {
width:100%;
border-bottom:1px solid #b7b7b7;
padding:0px;
font-size: 28px;
font-weight: 300;
}
} }
p{ p{
...@@ -126,4 +138,13 @@ page-myprofile { ...@@ -126,4 +138,13 @@ page-myprofile {
// over-written // over-written
.radio-md .radio-inner{background-color: #f7941e !important;} .radio-md .radio-inner{background-color: #f7941e !important;}
.radio-md .radio-checked{border-color:#404041 !important} .radio-md .radio-checked{border-color:#404041 !important}
.label{padding-left:10px !important;font-size:28px !important;margin:0px !important; font-weight: 300;padding-right:10px;}
.radio{
top: 8px !important;
position: relative !important
}
.gender_radio{
padding-top: 30px !important;
padding-bottom: 30px !important;
}
} }
src/pages/uploaddoc/uploaddoc.html
...@@ -27,82 +27,7 @@ ...@@ -27,82 +27,7 @@
<div class="clear"></div> <div class="clear"></div>
</ion-label> </ion-label>
</ion-item> </ion-item>
<!-- <ion-item>
<ion-radio value="2">
</ion-radio>
<ion-label>
<div class="upload_doc_circle">
</div>
<div class="upload_doc_detail">
Police Clearance Certificate
</div>
<div class="clear"></div>
</ion-label>
</ion-item>
<ion-item>
<ion-radio value="3">
</ion-radio>
<ion-label>
<div class="upload_doc_circle">
</div>
<div class="upload_doc_detail">
Fitness Certificate
</div>
<div class="clear"></div>
</ion-label>
</ion-item>
<ion-item>
<ion-radio value="4">
</ion-radio>
<ion-label>
<div class="upload_doc_circle">
</div>
<div class="upload_doc_detail">
Vehicle Registration
</div>
<div class="clear"></div>
</ion-label>
</ion-item>
<ion-item>
<ion-radio value="5">
</ion-radio>
<ion-label>
<div class="upload_doc_circle">
</div>
<div class="upload_doc_detail">
Vehicle Permit
</div>
<div class="clear"></div>
</ion-label>
</ion-item>
<ion-item>
<ion-radio value="6">
</ion-radio>
<ion-label>
<div class="upload_doc_circle">
</div>
<div class="upload_doc_detail">
Commercial Insurance
</div>
<div class="clear"></div>
</ion-label>
</ion-item>
<ion-item>
<ion-radio value="7">
</ion-radio>
<ion-label>
<div class="upload_doc_circle">
</div>
<div class="upload_doc_detail">
Tax Receipt
</div>
<div class="clear"></div>
</ion-label>
</ion-item> -->
</ion-list> </ion-list>
</div> </div>
</div> </div>
</ion-content> </ion-content>
<!-- <ion-footer padding>
<button ion-button class="btn_primary" (click)="docupdate()">CONTINUE</button>
</ion-footer> -->
src/pages/uploaddoc/uploaddoc.scss
...@@ -22,10 +22,12 @@ page-uploaddoc { ...@@ -22,10 +22,12 @@ page-uploaddoc {
padding-top: 20px; padding-top: 20px;
.list{ .list{
.item { .item {
padding-left: 0px;
padding-right:0px;
.item-inner{ .item-inner{
border:none; border:none;
padding-top: 10px !important; padding-top: 0px !important;
padding-bottom: 10px !important; padding-bottom: 0px !important;
.label { .label {
margin: 0px; margin: 0px;
.upload_doc_circle{ .upload_doc_circle{
......
src/pages/userlocation/userlocation.ts
...@@ -139,9 +139,9 @@ export class UserlocationPage { ...@@ -139,9 +139,9 @@ export class UserlocationPage {
marker.setIcon(dimage); marker.setIcon(dimage);
if (google.maps.geometry.spherical.computeDistanceBetween(destLoc, driverLoc) < 100) { if (google.maps.geometry.spherical.computeDistanceBetween(destLoc, driverLoc) < 100) {
This.loc.to = This.details.drop_area This.loc.to = This.details.drop_area
This.loc.from = This.details.pickup_area This.loc.from = This.details.pickup_area
This.temp = true This.temp = true
} }
This.calculateAndDisplayRoute(directionsService, This.directionsDisplay, destLoc, driverLoc); This.calculateAndDisplayRoute(directionsService, This.directionsDisplay, destLoc, driverLoc);
......
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