Skip to content

D
dcarfixers_angular
Commit d3677ac3 by Jansa Jose
Options

Merge branch 'master' of https://gitlab.techware.co.in/tobin/dcarfixers_angular into jensa

# Conflicts: # src/styles.scss
parents 2448c5c8 b2e6ee2e
Showing with 107 additions and 7 deletions
src/app/home/dashboard/dashboard.component.html
...@@ -797,7 +797,11 @@ ...@@ -797,7 +797,11 @@
</div> </div>
</div> </div>
<div class="mechanic_detail"> <div class="mechanic_detail relative">
<div class="custom_checkbox_stack">
<input class="custom_checkbox" id="custom_checkbox-1" type="checkbox" value="value1">
<label for="custom_checkbox-1"></label>
</div>
<h4>{{mechanic.display_name}}</h4> <h4>{{mechanic.display_name}}</h4>
<div *ngIf="mechanic.shop_id != 0; else mechanicDetails"> <div *ngIf="mechanic.shop_id != 0; else mechanicDetails">
<h5>{{mechanic.shop_name}}</h5> <h5>{{mechanic.shop_name}}</h5>
...@@ -887,6 +891,7 @@ ...@@ -887,6 +891,7 @@
<div class="clear"></div> <div class="clear"></div>
<p>Estimated Price : <strong>{{estimatedPrice}}</strong></p> <p>Estimated Price : <strong>{{estimatedPrice}}</strong></p>
<div class="clear"></div> <div class="clear"></div>
<button class="request_all_btn">Request All</button>
</div> </div>
<div class="service_map"> <div class="service_map">
<agm-map #gm [latitude]="lat" [longitude]="lng" [fitBounds]="true"> <agm-map #gm [latitude]="lat" [longitude]="lng" [fitBounds]="true">
......
src/app/home/index/index.component.html
...@@ -533,10 +533,14 @@ ...@@ -533,10 +533,14 @@
</div> </div>
<div class="mechanic_ratting"> <div class="mechanic_ratting">
<p *ngIf="mechanic.rating > 0">{{mechanic.rating}} Ratings</p> <p *ngIf="mechanic.rating > 0">{{mechanic.rating}} Ratings</p>
</div> </div>
</div> </div>
<div class="mechanic_detail"> <div class="mechanic_detail relative">
<div class="custom_checkbox_stack">
<input class="custom_checkbox" id="custom_checkbox-1" type="checkbox" value="value1">
<label for="custom_checkbox-1"></label>
</div>
<h4>{{mechanic.display_name}}</h4> <h4>{{mechanic.display_name}}</h4>
<div *ngIf="mechanic.shop_id != 0; else mechanicDetails"> <div *ngIf="mechanic.shop_id != 0; else mechanicDetails">
<h5>{{mechanic.shop_name}}</h5> <h5>{{mechanic.shop_name}}</h5>
...@@ -625,6 +629,7 @@ ...@@ -625,6 +629,7 @@
<div class="clear"></div> <div class="clear"></div>
<p>Estimated Price : <strong>{{estimatedPrice}}</strong></p> <p>Estimated Price : <strong>{{estimatedPrice}}</strong></p>
<div class="clear"></div> <div class="clear"></div>
<button class="request_all_btn">Request All</button>
</div> </div>
<div class="service_map"> <div class="service_map">
<agm-map #gm [latitude]="lat" [longitude]="lng" [fitBounds]="true"> <agm-map #gm [latitude]="lat" [longitude]="lng" [fitBounds]="true">
......
src/environments/server.config.ts
let apiConfigUrl,imageStorageUrl; let apiConfigUrl,imageStorageUrl;
// // Localhost // // Localhost
// apiConfigUrl = 'http://localhost/dcarfixers/Webservices/'; apiConfigUrl = 'http://localhost/dcarfixers/Webservices/';
// imageStorageUrl = 'http://localhost/dcarfixers/'; imageStorageUrl = 'http://localhost/dcarfixers/';
// // Techlabz // // Techlabz
apiConfigUrl = 'http://techlabz.in/dcarfixers/Webservices/'; // apiConfigUrl = 'https://techlabz.in/dcarfixers/Webservices/';
imageStorageUrl = 'http://techlabz.in/dcarfixers/'; // imageStorageUrl = 'https://techlabz.in/dcarfixers/';
// carfixxers.com // carfixxers.com
// apiConfigUrl = 'https://carfixxers.com/admin/Webservices/'; // apiConfigUrl = 'https://carfixxers.com/admin/Webservices/';
......
src/styles.scss
...@@ -616,4 +616,94 @@ bs-datepicker-container{ ...@@ -616,4 +616,94 @@ bs-datepicker-container{
} }
} }
.custom_checkbox_stack{
position: absolute;
top:0px;
right:0px;
}
.custom_checkbox {
position: absolute; // take it out of document flow
opacity: 0; // hide it
& + label {
position: relative;
cursor: pointer;
padding: 0;
}
// Box.
& + label:before {
content: '';
margin-right: 10px;
display: inline-block;
vertical-align: text-top;
width: 20px;
height: 20px;
background: white;
box-shadow: 0 0 0 3px rgba(0, 0, 0, 0.12);
}
// Box hover
&:hover + label:before {
background: #2655bf;
}
// Box focus
&:focus + label:before {
box-shadow: 0 0 0 3px rgba(0, 0, 0, 0.12);
}
// Box checked
&:checked + label:before {
background: #2655bf;
}
// 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: 5px;
top: 11px;
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);
}
}
.request_all_btn{
background: #2655bf;
color: #FFF;
height: 40px;
padding-left:5%;
padding-right:5%;
border:none;
margin:5px;
margin-top:10px;
border-radius: 10px;
text-transform: capitalize;
&:focus{
outline:none;
}
}
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