Skip to content

D
dcarfixers_angular
Commit e67faa85 by Jansa Jose
Options

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

parents b1d5e5df 4e33eab0
Showing with 277 additions and 222 deletions
package-lock.json
...@@ -4991,12 +4991,14 @@ ...@@ -4991,12 +4991,14 @@
}, },
"handlebars": { "handlebars": {
"version": "4.1.1", "version": "4.1.1",
"resolved": "", "resolved": "https://registry.npmjs.org/handlebars/-/handlebars-4.1.1.tgz",
"integrity": "sha512-3Zhi6C0euYZL5sM0Zcy7lInLXKQ+YLcF/olbN010mzGQ4XVm50JeyBnMqofHh696GrciGruC7kCcApPDJvVgwA==",
"dev": true, "dev": true,
"requires": { "requires": {
"neo-async": "^2.6.0", "neo-async": "^2.6.0",
"optimist": "^0.6.1", "optimist": "^0.6.1",
"source-map": "^0.6.1" "source-map": "^0.6.1",
"uglify-js": "^3.1.4"
}, },
"dependencies": { "dependencies": {
"source-map": { "source-map": {
...@@ -6492,7 +6494,8 @@ ...@@ -6492,7 +6494,8 @@
}, },
"lodash.mergewith": { "lodash.mergewith": {
"version": "4.6.1", "version": "4.6.1",
"resolved": "", "resolved": "https://registry.npmjs.org/lodash.mergewith/-/lodash.mergewith-4.6.1.tgz",
"integrity": "sha512-eWw5r+PYICtEBgrBE5hhlT6aAa75f411bgDz/ZL2KZqYV03USvucsxcHUIlGTDTECs1eunpI7HOV7U+WLDvNdQ==",
"dev": true, "dev": true,
"optional": true "optional": true
}, },
...@@ -10337,6 +10340,33 @@ ...@@ -10337,6 +10340,33 @@
"integrity": "sha1-tlQ6g8/Iwr77P0yPumiW9bDJvmg=", "integrity": "sha1-tlQ6g8/Iwr77P0yPumiW9bDJvmg=",
"dev": true "dev": true
}, },
"uglify-js": {
"version": "3.6.0",
"resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.6.0.tgz",
"integrity": "sha512-W+jrUHJr3DXKhrsS7NUVxn3zqMOFn0hL/Ei6v0anCIMoKC93TjcflTagwIHLW7SfMFfiQuktQyFVCFHGUE0+yg==",
"dev": true,
"optional": true,
"requires": {
"commander": "~2.20.0",
"source-map": "~0.6.1"
},
"dependencies": {
"commander": {
"version": "2.20.0",
"resolved": "https://registry.npmjs.org/commander/-/commander-2.20.0.tgz",
"integrity": "sha512-7j2y+40w61zy6YC2iRNpUe/NwhNyoXrYpHMrSunaMG64nRnaf96zO/KMQR4OyN/UnE5KLyEBnKHd4aG3rskjpQ==",
"dev": true,
"optional": true
},
"source-map": {
"version": "0.6.1",
"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
"integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
"dev": true,
"optional": true
}
}
},
"ultron": { "ultron": {
"version": "1.1.1", "version": "1.1.1",
"resolved": "https://registry.npmjs.org/ultron/-/ultron-1.1.1.tgz", "resolved": "https://registry.npmjs.org/ultron/-/ultron-1.1.1.tgz",
......
src/app/home/index/index.component.scss
...@@ -126,13 +126,13 @@ ...@@ -126,13 +126,13 @@
-o-border-radius: 25px; -o-border-radius: 25px;
margin-top: 30px; margin-top: 30px;
transition: all 0.5s ease; transition: all 0.5s ease;
&:focus{ &:focus {
outline: none; outline: none;
background: #2655bf; background: #2655bf;
color: #fff; color: #fff;
transition: all 0.5s ease; transition: all 0.5s ease;
} }
&:hover{ &:hover {
outline: none; outline: none;
background: #2655bf; background: #2655bf;
color: #fff; color: #fff;
...@@ -178,13 +178,13 @@ ...@@ -178,13 +178,13 @@
-o-border-radius: 25px; -o-border-radius: 25px;
margin-top: 30px; margin-top: 30px;
transition: all 0.5s ease; transition: all 0.5s ease;
&:focus{ &:focus {
outline: none; outline: none;
background: #2655bf; background: #2655bf;
color: #fff; color: #fff;
transition: all 0.5s ease; transition: all 0.5s ease;
} }
&:hover{ &:hover {
outline: none; outline: none;
background: #2655bf; background: #2655bf;
color: #fff; color: #fff;
...@@ -360,7 +360,6 @@ ...@@ -360,7 +360,6 @@
&::-webkit-scrollbar { &::-webkit-scrollbar {
display: none; display: none;
} }
.modal_close { .modal_close {
width: 40px; width: 40px;
height: 40px; height: 40px;
...@@ -395,7 +394,7 @@ ...@@ -395,7 +394,7 @@
padding: 30px; padding: 30px;
padding-top: 50px; padding-top: 50px;
position: relative; position: relative;
top:15px; top: 15px;
.login_modal_inner { .login_modal_inner {
width: 90%; width: 90%;
margin: 0 auto; margin: 0 auto;
...@@ -437,18 +436,18 @@ ...@@ -437,18 +436,18 @@
.search { .search {
text-align: center; text-align: center;
background-repeat: no-repeat; background-repeat: no-repeat;
border:none; border: none;
border-bottom: 1px solid #f4f4f4; border-bottom: 1px solid #f4f4f4;
font-size: 28px; font-size: 28px;
padding-bottom: 20px; padding-bottom: 20px;
&::placeholder{ &::placeholder {
color: #e7e7e7; color: #e7e7e7;
} }
} }
.service_tab_inner{ .service_tab_inner {
width: 100%; width: 100%;
padding-top:10px; padding-top: 10px;
.arrow_btn{ .arrow_btn {
width: 35px; width: 35px;
height: 35px; height: 35px;
background-position: center !important; background-position: center !important;
...@@ -457,17 +456,17 @@ ...@@ -457,17 +456,17 @@
left: 20px; left: 20px;
cursor: pointer; cursor: pointer;
} }
.up_arrow{ .up_arrow {
background: url("../../../assets/images/asset_scroll_up.png"); background: url("../../../assets/images/asset_scroll_up.png");
} }
.down_arrow{ .down_arrow {
background: url("../../../assets/images/asset_scroll_down.png"); background: url("../../../assets/images/asset_scroll_down.png");
} }
.services_tab{ .services_tab {
padding:0px; padding: 0px;
padding-top: 10px; padding-top: 10px;
padding-bottom: 10px; padding-bottom: 10px;
margin:0px; margin: 0px;
overflow: scroll; overflow: scroll;
overflow-x: hidden; overflow-x: hidden;
padding-right: 20px; padding-right: 20px;
...@@ -476,53 +475,51 @@ ...@@ -476,53 +475,51 @@
&::-webkit-scrollbar { &::-webkit-scrollbar {
display: none; display: none;
} }
li{ li {
width:100%; width: 100%;
margin-bottom: 10px; margin-bottom: 10px;
a {
padding: 8px;
a{ padding-left: 15px;
padding:8px;
padding-left:15px;
border-radius: 8px; border-radius: 8px;
padding-right: 35px !important; padding-right: 35px;
color: #272a31; color: #272a31;
background-image: url("../../../assets/images/asset_arrow.png"); background-image: url("../../../assets/images/asset_arrow.png");
background-size: 17px; background-size: 17px;
background-position: right 12px top 11px; background-position: right 12px top 11px;
background-repeat: no-repeat; background-repeat: no-repeat;
img{ img {
margin-right: 10px; margin-right: 10px;
position: relative; position: relative;
bottom: 2px; bottom: 2px;
} }
} }
.active{ .active {
background-color: #b9b9b9; background-color: #b9b9b9;
padding:8px; padding: 8px;
padding-left: 15px; padding-left: 15px;
border-radius: 8px; border-radius: 8px;
} }
} }
} }
.backgroundColor{ .backgroundColor {
background: #f2f2f275; background: #f2f2f275;
} }
.tab-content{ .tab-content {
padding-top: 10px; padding-top: 10px;
padding-bottom: 10px; padding-bottom: 10px;
ul{ ul {
padding:0px; padding: 0px;
margin:0px; margin: 0px;
height: 230px; height: 230px;
overflow: scroll; overflow: scroll;
overflow-x: hidden; overflow-x: hidden;
padding-right: 20px; padding-right: 20px;
li{ li {
list-style: none; list-style: none;
display: inline-block; display: inline-block;
position: relative; position: relative;
min-width:100%; min-width: 100%;
white-space: nowrap; white-space: nowrap;
overflow: hidden; overflow: hidden;
text-overflow: ellipsis; text-overflow: ellipsis;
...@@ -530,7 +527,7 @@ ...@@ -530,7 +527,7 @@
padding: 0px; padding: 0px;
border: none; border: none;
background-image: none; background-image: none;
margin-bottom:0px; margin-bottom: 0px;
#custom_check_button { #custom_check_button {
margin: 0px; margin: 0px;
height: 40px; height: 40px;
...@@ -545,7 +542,7 @@ ...@@ -545,7 +542,7 @@
width: 100%; width: 100%;
} }
#custom_check_button p { #custom_check_button p {
padding:8px; padding: 8px;
padding-left: 15px; padding-left: 15px;
border-radius: 8px; border-radius: 8px;
margin: 0px; margin: 0px;
...@@ -562,7 +559,7 @@ ...@@ -562,7 +559,7 @@
margin: 0px; margin: 0px;
} }
#custom_check_button label span { #custom_check_button label span {
text-align:left; text-align: left;
display: block; display: block;
} }
#custom_check_button label input { #custom_check_button label input {
...@@ -580,7 +577,6 @@ ...@@ -580,7 +577,6 @@
} }
} }
} }
} }
} }
input { input {
...@@ -775,7 +771,6 @@ ...@@ -775,7 +771,6 @@
padding: 5px; padding: 5px;
margin-bottom: 10px; margin-bottom: 10px;
padding-left: 15px; padding-left: 15px;
background-image: url("/assets/images/asset_down_time_arrow.png"); background-image: url("/assets/images/asset_down_time_arrow.png");
background-position: right 5px top 2px; background-position: right 5px top 2px;
background-repeat: no-repeat; background-repeat: no-repeat;
...@@ -889,16 +884,15 @@ ...@@ -889,16 +884,15 @@
} }
} }
.wizard_subhead{ .wizard_subhead {
font-size: 20px; font-size: 20px;
font-weight: 600; font-weight: 600;
} }
.add_more_services{ .add_more_services {
background: #2655bf; background: #2655bf;
color: #fff !important; color: #fff !important;
border:1px solid #2655bf !important; border: 1px solid #2655bf !important;
} }
.quote_service_wrapper { .quote_service_wrapper {
...@@ -912,7 +906,6 @@ ...@@ -912,7 +906,6 @@
-ms-border-radius: 5px; -ms-border-radius: 5px;
-o-border-radius: 5px; -o-border-radius: 5px;
padding: 20px; padding: 20px;
.quote_header { .quote_header {
width: 100%; width: 100%;
padding: 10px; padding: 10px;
...@@ -933,10 +926,7 @@ ...@@ -933,10 +926,7 @@
} }
} }
.quote_schedule_header { .quote_schedule_header {
border: 2px solid #2655bf; border: 2px solid #2655bf;
h4 { h4 {
margin: 0px; margin: 0px;
background: #2655bf; background: #2655bf;
...@@ -990,7 +980,7 @@ ...@@ -990,7 +980,7 @@
.quote_schedule_list { .quote_schedule_list {
border: 1px solid #a8a8a8; border: 1px solid #a8a8a8;
padding-bottom: 30px; padding-bottom: 30px;
border-top:none; border-top: none;
background: #ffffff; background: #ffffff;
ul { ul {
margin: 0px; margin: 0px;
...@@ -1023,23 +1013,21 @@ ...@@ -1023,23 +1013,21 @@
object-position: center; object-position: center;
} }
} }
.mechanic_ratting{ .mechanic_ratting {
padding: 5px; padding: 5px;
p{ p {
margin:0px; margin: 0px;
padding:0px; padding: 0px;
color: #a8a8a8; color: #a8a8a8;
font-size: 14px; font-size: 14px;
text-align: center; text-align: center;
} }
h6{ h6 {
margin: 0px; margin: 0px;
padding:0px; padding: 0px;
color: #a8a8a8; color: #a8a8a8;
font-size: 14px; font-size: 14px;
text-align: center; text-align: center;
} }
} }
} }
...@@ -1106,7 +1094,7 @@ ...@@ -1106,7 +1094,7 @@
padding-right: 15px; padding-right: 15px;
border-radius: 20px; border-radius: 20px;
height: 35px; height: 35px;
width:100%; width: 100%;
margin-top: 15px; margin-top: 15px;
font-size: 14px; font-size: 14px;
&:focus { &:focus {
...@@ -1123,7 +1111,7 @@ ...@@ -1123,7 +1111,7 @@
padding-right: 15px; padding-right: 15px;
border-radius: 20px; border-radius: 20px;
height: 35px; height: 35px;
width:100%; width: 100%;
font-size: 14px; font-size: 14px;
margin-top: 15px; margin-top: 15px;
&:focus { &:focus {
...@@ -1171,7 +1159,6 @@ ...@@ -1171,7 +1159,6 @@
} }
} }
.scheduletiming_listing { .scheduletiming_listing {
width: calc(100% - 80px); width: calc(100% - 80px);
margin: 0 auto; margin: 0 auto;
height: 200px; height: 200px;
......
src/app/purchase/productlist/productlist.component.html
...@@ -10,7 +10,7 @@ ...@@ -10,7 +10,7 @@
<ul id="ac1" class="collapse in show" malihu-scrollbar [scrollbarOptions]="scrollbarOptions" style="height:150px;"> <ul id="ac1" class="collapse in show" malihu-scrollbar [scrollbarOptions]="scrollbarOptions" style="height:150px;">
<li class="relative" *ngFor="let brands of productBrand; let i=index"> <li class="relative" *ngFor="let brands of productBrand; let i=index">
<div class="custom_checkbox_filter"> <div class="custom_checkbox_filter">
<input class="custom_checkbox" id="custom_checkbox_{{i}}" (click) ="selectBrand($event,brands.brand_id)" type="checkbox" value="value1"> <input class="custom_checkbox" id="custom_checkbox_{{i}}" (click)="selectBrand($event,brands.brand_id)" type="checkbox" value="value1">
<label for="custom_checkbox_{{i}}">{{brands.brand_name}}</label> <label for="custom_checkbox_{{i}}">{{brands.brand_name}}</label>
</div> </div>
</li> </li>
...@@ -84,16 +84,25 @@ ...@@ -84,16 +84,25 @@
<p>{{prdt.short_description}}</p> <p>{{prdt.short_description}}</p>
<div class="star_ratting"> <div class="star_ratting">
<fieldset class="rating prevent-click"> <fieldset class="rating prevent-click">
<input type="radio" [checked]="(prdt.rating >= 4.75) ? 'true':''" [attr.id]="'usrReviewId_'+prdt.product_id+'_5'" [attr.name]="'usrReviewName_'+prdt.product_id" value="5" /><label class = "full" for="secondStar5"></label> <input type="radio" [checked]="(prdt.rating >= 4.75) ? 'true':''" [attr.id]="'usrReviewId_'+prdt.product_id+'_5'" [attr.name]="'usrReviewName_'+prdt.product_id" value="5" /><label class="full" for="secondStar5"></label>
<input type="radio" [checked]="(prdt.rating >= 4.25 && prdt.rating < 4.75) ? 'true':''" [attr.id]="'usrReviewId_'+prdt.product_id+'_4half'" [attr.name]="'usrReviewName_'+prdt.product_id" value="4.5" /><label class="half" for="secondStar4half"></label> <input type="radio" [checked]="(prdt.rating >= 4.25 && prdt.rating < 4.75) ? 'true':''" [attr.id]="'usrReviewId_'+prdt.product_id+'_4half'" [attr.name]="'usrReviewName_'+prdt.product_id" value="4.5" /><label class="half"
<input type="radio" [checked]="(prdt.rating >= 3.75 && prdt.rating < 4.25) ? 'true':''" [attr.id]="'usrReviewId_'+prdt.product_id+'_4'" [attr.name]="'usrReviewName_'+prdt.product_id" value="4" /><label class = "full" for="secondStar4"></label> for="secondStar4half"></label>
<input type="radio" [checked]="(prdt.rating >= 3.25 && prdt.rating < 3.75) ? 'true':''" [attr.id]="'usrReviewId_'+prdt.product_id+'_3half'" [attr.name]="'usrReviewName_'+prdt.product_id" value="3.5" /><label class="half" for="secondStar3half"></label> <input type="radio" [checked]="(prdt.rating >= 3.75 && prdt.rating < 4.25) ? 'true':''" [attr.id]="'usrReviewId_'+prdt.product_id+'_4'" [attr.name]="'usrReviewName_'+prdt.product_id" value="4" /><label class="full"
<input type="radio" [checked]="(prdt.rating >= 2.75 && prdt.rating < 3.25) ? 'true':''" [attr.id]="'usrReviewId_'+prdt.product_id+'_3'" [attr.name]="'usrReviewName_'+prdt.product_id" value="3" /><label class = "full" for="secondStar3"></label> for="secondStar4"></label>
<input type="radio" [checked]="(prdt.rating >= 2.25 && prdt.rating < 2.75) ? 'true':''" [attr.id]="'usrReviewId_'+prdt.product_id+'_2half'" [attr.name]="'usrReviewName_'+prdt.product_id" value="2.5" /><label class="half" for="secondStar2half"></label> <input type="radio" [checked]="(prdt.rating >= 3.25 && prdt.rating < 3.75) ? 'true':''" [attr.id]="'usrReviewId_'+prdt.product_id+'_3half'" [attr.name]="'usrReviewName_'+prdt.product_id" value="3.5" /><label class="half"
<input type="radio" [checked]="(prdt.rating >= 1.75 && prdt.rating < 2.25) ? 'true':''" [attr.id]="'usrReviewId_'+prdt.product_id+'_2'" [attr.name]="'usrReviewName_'+prdt.product_id" value="2" /><label class = "full" for="secondStar2"></label> for="secondStar3half"></label>
<input type="radio" [checked]="(prdt.rating >= 1.25 && prdt.rating < 1.75) ? 'true':''" [attr.id]="'usrReviewId_'+prdt.product_id+'_1half'" [attr.name]="'usrReviewName_'+prdt.product_id" value="1.5" /><label class="half" for="secondStar1half"></label> <input type="radio" [checked]="(prdt.rating >= 2.75 && prdt.rating < 3.25) ? 'true':''" [attr.id]="'usrReviewId_'+prdt.product_id+'_3'" [attr.name]="'usrReviewName_'+prdt.product_id" value="3" /><label class="full"
<input type="radio" [checked]="(prdt.rating >= 0.75 && prdt.rating < 1.25) ? 'true':''" [attr.id]="'usrReviewId_'+prdt.product_id+'_1'" [attr.name]="'usrReviewName_'+prdt.product_id" value="1" /><label class = "full" for="secondStar1"></label> for="secondStar3"></label>
<input type="radio" [checked]="(prdt.rating < 0.75 && prdt.rating >= 0.25) ? 'true':''" [attr.id]="'usrReviewId_'+prdt.product_id+'_half'" [attr.name]="'usrReviewName_'+prdt.product_id" value="0.5" /><label class="half" for="secondStarhalf"></label> <input type="radio" [checked]="(prdt.rating >= 2.25 && prdt.rating < 2.75) ? 'true':''" [attr.id]="'usrReviewId_'+prdt.product_id+'_2half'" [attr.name]="'usrReviewName_'+prdt.product_id" value="2.5" /><label class="half"
for="secondStar2half"></label>
<input type="radio" [checked]="(prdt.rating >= 1.75 && prdt.rating < 2.25) ? 'true':''" [attr.id]="'usrReviewId_'+prdt.product_id+'_2'" [attr.name]="'usrReviewName_'+prdt.product_id" value="2" /><label class="full"
for="secondStar2"></label>
<input type="radio" [checked]="(prdt.rating >= 1.25 && prdt.rating < 1.75) ? 'true':''" [attr.id]="'usrReviewId_'+prdt.product_id+'_1half'" [attr.name]="'usrReviewName_'+prdt.product_id" value="1.5" /><label class="half"
for="secondStar1half"></label>
<input type="radio" [checked]="(prdt.rating >= 0.75 && prdt.rating < 1.25) ? 'true':''" [attr.id]="'usrReviewId_'+prdt.product_id+'_1'" [attr.name]="'usrReviewName_'+prdt.product_id" value="1" /><label class="full"
for="secondStar1"></label>
<input type="radio" [checked]="(prdt.rating < 0.75 && prdt.rating >= 0.25) ? 'true':''" [attr.id]="'usrReviewId_'+prdt.product_id+'_half'" [attr.name]="'usrReviewName_'+prdt.product_id" value="0.5" /><label class="half"
for="secondStarhalf"></label>
</fieldset> </fieldset>
<span class="floatRight">$ {{prdt.amount}}</span> <span class="floatRight">$ {{prdt.amount}}</span>
<div class="clear"></div> <div class="clear"></div>
...@@ -111,4 +120,4 @@ ...@@ -111,4 +120,4 @@
<div class="clear"></div> <div class="clear"></div>
</div> </div>
</div> </div>
</div> </div>
\ No newline at end of file \ No newline at end of file
src/app/purchase/searchbar/searchbar.component.html
<div class="purchase_taskbar"> <div class="purchase_taskbar">
<div class="purchase_searchbar"> <div class="purchase_searchbar">
<div class="purchase_inner_search_bar"> <div class="purchase_inner_search_bar" [class.redLine]="searchLine == 1">
<input #productSearch type="text" placeholder="Search here" (keyup)="productSearchfun(productSearch.value)"> <input #productSearch type="text" placeholder="Search here" (keyup)="productSearchfun(productSearch.value)">
<button class="search_btn" (click)="productSearchFunClick(productSearch.value)">Search</button> <button class="search_btn" (click)="productSearchFunClick(productSearch.value)">Search</button>
<div class="clear"></div> <div class="clear"></div>
...@@ -26,12 +26,13 @@ ...@@ -26,12 +26,13 @@
<div class="purchase_other" *ngIf="loginDetails"> <div class="purchase_other" *ngIf="loginDetails">
<ul> <ul>
<li (click)="goToPage('orders')"> <li (click)="goToPage('orders')">
<img src="assets/images/asset_cart.png"> <img src="assets/images/asset_cart.png"> My Order
My Order </li>
<li (click)="gotosearch()">
<img src="assets/images/asset_order.png"> Filter
</li> </li>
<li (click)="goToPage('cart')"> <li (click)="goToPage('cart')">
<img src="assets/images/asset_order.png"> <img src="assets/images/asset_order.png"> My Cart
My Cart
</li> </li>
</ul> </ul>
</div> </div>
......
src/app/purchase/searchbar/searchbar.component.scss
.purchase_taskbar{ .redLine {
width:100%; border: 2px solid #ff0000 !important;
transition-timing-function: ease-in-out;
transition: 1s;
}
.purchase_taskbar {
width: 100%;
padding-top: 115px; padding-top: 115px;
padding-bottom: 30px; padding-bottom: 30px;
.purchase_searchbar{ .purchase_searchbar {
width:calc(100% - 60%); width: calc(100% - 60%);
float: left; float: left;
position: relative; position: relative;
.nav_bar_search_list{ .nav_bar_search_list {
position: absolute; position: absolute;
background: #fff; background: #fff;
top: 55px; top: 55px;
width: 100%; width: 100%;
z-index: 9999; z-index: 9999;
-webkit-box-shadow: -1px 9px 14px -5px rgba(0,0,0,0.2); -webkit-box-shadow: -1px 9px 14px -5px rgba(0, 0, 0, 0.2);
-moz-box-shadow: -1px 9px 14px -5px rgba(0,0,0,0.2); -moz-box-shadow: -1px 9px 14px -5px rgba(0, 0, 0, 0.2);
box-shadow: -1px 9px 14px -5px rgba(0,0,0,0.2); box-shadow: -1px 9px 14px -5px rgba(0, 0, 0, 0.2);
ul{ ul {
margin: 0px; margin: 0px;
padding: 0px; padding: 0px;
li{ li {
list-style: none; list-style: none;
padding: 5px; padding: 5px;
padding-left: 10px; padding-left: 10px;
cursor: pointer; cursor: pointer;
border-bottom: 1px solid #f8f8f8; border-bottom: 1px solid #f8f8f8;
.search_list_image{ .search_list_image {
width:30px; width: 30px;
height:30px; height: 30px;
background: #a8a8a8; background: #a8a8a8;
border-radius: 50%; border-radius: 50%;
float: left; float: left;
img{ img {
width:100%; width: 100%;
height:100%; height: 100%;
border-radius: 50%; border-radius: 50%;
object-fit: cover; object-fit: cover;
object-position: center; object-position: center;
} }
} }
p{ p {
width: calc(100% - 30px); width: calc(100% - 30px);
padding:3px; padding: 3px;
padding-left:15px; padding-left: 15px;
margin: 0px; margin: 0px;
float: left; float: left;
} }
&:hover{ &:hover {
background: #2655bf; background: #2655bf;
color: #fff; color: #fff;
} }
&:focus{ &:focus {
background: #2655bf; background: #2655bf;
color: #fff; color: #fff;
} }
} }
} }
} }
.purchase_inner_search_bar{ .purchase_inner_search_bar {
background: #ffffff; background: #ffffff;
border-radius: 30px; border-radius: 30px;
border: 2px solid transparent;
input{ input {
width: calc(100% - 120px); width: calc(100% - 120px);
float: left; float: left;
height: 45px; height: 45px;
border:none; border: none;
border-radius: 30px; border-radius: 30px;
padding-left:30px; padding-left: 30px;
font-size: 18px; font-size: 18px;
font-weight: 300; font-weight: 300;
&:focus{ &:focus {
outline: none; outline: none;
} }
&::placeholder{ &::placeholder {
color: #cad2db; color: #cad2db;
} }
} }
.search_btn{ .search_btn {
width:120px; width: 120px;
float: right; float: right;
height: 45px; height: 45px;
border-radius: 30px; border-radius: 30px;
background: #2655bf; background: #2655bf;
color: #ffffff; color: #ffffff;
border:none; border: none;
&:focus{ &:focus {
outline: none; outline: none;
} }
} }
} }
} }
.purchase_other{ .purchase_other {
width:40%; width: 40%;
float: right; float: right;
padding: 10px; padding: 10px;
ul ul {
{ margin: 0px;
margin:0px; padding: 0px;
padding:0px;
text-align: right; text-align: right;
li{ li {
padding-left:5%; padding-left: 5%;
display: inline-block; display: inline-block;
text-align: right; text-align: right;
cursor: pointer; cursor: pointer;
img{ img {
margin-right: 10px; margin-right: 10px;
} }
} }
......
src/app/purchase/searchbar/searchbar.component.ts
...@@ -16,6 +16,8 @@ export class SearchbarComponent implements OnInit { ...@@ -16,6 +16,8 @@ export class SearchbarComponent implements OnInit {
imageServer: string; imageServer: string;
loginDetails:any; loginDetails:any;
searchLine:any;
public scrollbarOptions = { axis: 'y', theme: 'minimal-dark' }; public scrollbarOptions = { axis: 'y', theme: 'minimal-dark' };
@ViewChild("productSearch") public productSearchRef: ElementRef; @ViewChild("productSearch") public productSearchRef: ElementRef;
...@@ -26,12 +28,17 @@ export class SearchbarComponent implements OnInit { ...@@ -26,12 +28,17 @@ export class SearchbarComponent implements OnInit {
public subjectService : SubjectService) { public subjectService : SubjectService) {
this.productArray = true; this.productArray = true;
this.imageServer = ImageStorage; this.imageServer = ImageStorage;
this.searchLine = 0;
} }
ngOnInit() { ngOnInit() {
this.checkUserLogin(); this.checkUserLogin();
} }
gotosearch(){
this.searchLine = !this.searchLine;
}
checkUserLogin(){ checkUserLogin(){
this.loginDetails = JSON.parse(this.webService.getLocalStorageItem('userData')); this.loginDetails = JSON.parse(this.webService.getLocalStorageItem('userData'));
this.subjectService.getLoginData().subscribe(loginData => { this.subjectService.getLoginData().subscribe(loginData => {
......
src/assets/css/responsive.scss
...@@ -36,54 +36,82 @@ ...@@ -36,54 +36,82 @@
/* 01. Smartphones (portrait and landscape) ----------- */ /* 01. Smartphones (portrait and landscape) ----------- */
@media only screen and (min-device-width: 320px) and (max-device-width: 480px) { @media only screen and (min-device-width: 320px) and (max-device-width: 480px) {
.service_tab_inner {
.phone_img{ .tab-content {
img{ .container {
width:100% !important; padding-right: 3px;
padding-left: 3px;
} }
ul {
padding-right: 0px !important;
li {
#custom_check_button {
p {
padding-left: 5px !important;
padding-right: 5px !important;
} }
}
.purchase_filter_section{ }
}
}
.col {
padding-left: 10px;
padding-right: 10px;
}
.services_tab {
padding-right: 0px !important;
li {
a {
background-image: none !important;
padding-right: 5px !important;
padding-left: 7px !important;
}
}
}
}
.phone_img {
img {
width: 100% !important; width: 100% !important;
} }
}
.purchase_filter_section {
.purchase_wrapper{ width: 100% !important;
.purchase_content_wrapper{ }
.purchase_content_section{ .purchase_wrapper {
.search_listing_content{ .purchase_content_wrapper {
ul{ .purchase_content_section {
margin-left: 0px !important;
.search_listing_content {
ul {
li { li {
width: 100% !important;
width:100% !important;
} }
} }
} }
} }
} }
} }
.purchase_content_section{ .purchase_content_section {
width:100% !important; width: 100% !important;
height: auto !important; height: auto !important;
.search_listing_content{ .search_listing_content {
ul{ ul {
li{ li {
width:100% !important; width: 100% !important;
} }
} }
} }
} }
.purchase_taskbar{ .purchase_taskbar {
.purchase_searchbar{ .purchase_searchbar {
width:100% !important; width: 100% !important;
} }
.purchase_other{ .purchase_other {
width:100% !important; width: 100% !important;
ul{ ul {
li{ li {
width:100% !important; width: 100% !important;
padding: 10px;
text-align: left !important; text-align: left !important;
} }
} }
...@@ -118,7 +146,7 @@ ...@@ -118,7 +146,7 @@
.login_modal_wrapper { .login_modal_wrapper {
.modal_close { .modal_close {
// display: none !important; // display: none !important;
color:#333 !important; color: #333 !important;
} }
} }
.main_wrapper { .main_wrapper {
...@@ -141,36 +169,32 @@ ...@@ -141,36 +169,32 @@
padding: 15px !important; padding: 15px !important;
padding-top: 100px !important; padding-top: 100px !important;
} }
.title_banner h1{ .title_banner h1 {
font-size:21px; font-size: 21px;
} }
.log_btn{ .log_btn {
width:100px !important; width: 100px !important;
background-image: none !important; background-image: none !important;
} }
.modal-body {
.modal-body{ padding: 5px !important;
padding:5px !important; .vehicle_input_select {
.vehicle_input_select{
margin-bottom: 10px; margin-bottom: 10px;
} }
} }
.wizard_quotes {
width: 100% !important;
.wizard_quotes{
width:100% !important;
} }
.scheduletiming_listing{ .scheduletiming_listing {
width:100% !important; width: 100% !important;
} }
.scheduletiming_listing{ .scheduletiming_listing {
width:100% !important; width: 100% !important;
} }
.testimonial_div {
.testimonial_div{ padding: 5px;
padding:5px; .container-fluid {
.container-fluid{ max-width: 100% !important;
max-width:100% !important;
} }
} }
.dashboard_tab_content { .dashboard_tab_content {
...@@ -270,9 +294,10 @@ ...@@ -270,9 +294,10 @@
/* 07.0 Desktops and laptops ----------- */ /* 07.0 Desktops and laptops ----------- */
/* LOW RESOLUTION ----------- */
@media only screen and (min-width: 900px) and (max-device-width: 1249px) { /* LOW RESOLUTION ----------- */
@media only screen and (min-width: 900px) and (max-device-width: 1249px) {
.login_modal_content { .login_modal_content {
top: 0px !important; top: 0px !important;
} }
...@@ -288,33 +313,30 @@ ...@@ -288,33 +313,30 @@
.service_check p { .service_check p {
height: 100px; height: 100px;
} }
.purchase_wrapper {
.purchase_wrapper{ .purchase_content_wrapper {
.purchase_content_wrapper{ .purchase_content_section {
.purchase_content_section{ .search_listing_content {
.search_listing_content{ ul {
ul{
li { li {
list-style: none; list-style: none;
padding: 10px; padding: 10px;
width: calc(100% - 67%); width: calc(100% - 67%);
display: inline-block; display: inline-block;
} }
} }
} }
} }
} }
} }
.navbar{ .navbar {
.container-fluid { .container-fluid {
max-width: calc(100% - 2%) !important; max-width: calc(100% - 2%) !important;
} }
} }
} }
@media only screen and (min-width: 1250px) and (max-device-width: 1359px) { @media only screen and (min-width: 1250px) and (max-device-width: 1359px) {
.login_modal_content { .login_modal_content {
top: 0px !important; top: 0px !important;
} }
...@@ -330,76 +352,71 @@ ...@@ -330,76 +352,71 @@
.service_check p { .service_check p {
height: 100px; height: 100px;
} }
.purchase_wrapper{ .purchase_wrapper {
.purchase_content_wrapper{ .purchase_content_wrapper {
.purchase_content_section{ .purchase_content_section {
.search_listing_content{ .search_listing_content {
ul{ ul {
li { li {
list-style: none; list-style: none;
padding: 10px; padding: 10px;
width: calc(100% - 75%) !important; width: calc(100% - 75%) !important;
display: inline-block; display: inline-block;
} }
} }
} }
} }
} }
} }
.navbar{ .navbar {
.container-fluid { .container-fluid {
max-width: calc(100% - 2%) !important; max-width: calc(100% - 2%) !important;
} }
} }
} }
@media only screen and (min-width: 1360px) and (max-device-width: 1399px) {
.purchase_wrapper{ @media only screen and (min-width: 1360px) and (max-device-width: 1399px) {
.purchase_content_wrapper{ .purchase_wrapper {
.purchase_content_section{ .purchase_content_wrapper {
.search_listing_content{ .purchase_content_section {
ul{ .search_listing_content {
ul {
li { li {
list-style: none; list-style: none;
padding: 10px; padding: 10px;
width: calc(100% - 67%) !important; width: calc(100% - 67%) !important;
display: inline-block; display: inline-block;
} }
} }
} }
} }
} }
} }
.navbar{ .navbar {
.container-fluid { .container-fluid {
max-width: calc(100% - 2%) !important; max-width: calc(100% - 2%) !important;
} }
} }
} }
@media only screen and (min-width: 1400px) and (max-device-width: 1600px) {
.purchase_wrapper{ @media only screen and (min-width: 1400px) and (max-device-width: 1600px) {
.purchase_content_wrapper{ .purchase_wrapper {
.purchase_content_section{ .purchase_content_wrapper {
.search_listing_content{ .purchase_content_section {
ul{ .search_listing_content {
ul {
li { li {
list-style: none; list-style: none;
padding: 10px; padding: 10px;
width: calc(100% - 75%) !important; width: calc(100% - 75%) !important;
display: inline-block; display: inline-block;
} }
}
} }
} }
} }
} }
} }
}
/* 08.0 Large screens ----------- */ /* 08.0 Large screens ----------- */
......
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 = 'https://techlabz.in/dcarfixers/Webservices/'; // apiConfigUrl = 'https://techlabz.in/dcarfixers/Webservices/';
// imageStorageUrl = 'https://techlabz.in/dcarfixers/'; // imageStorageUrl = 'https://techlabz.in/dcarfixers/';
// // // carfixxers.com // // // carfixxers.com
// apiConfigUrl = 'https://carfixxers.com/admin/Webservices/'; apiConfigUrl = 'https://carfixxers.com/admin/Webservices/';
// imageStorageUrl = 'https://carfixxers.com/admin/'; imageStorageUrl = 'https://carfixxers.com/admin/';
export const apiConfig = apiConfigUrl; export const apiConfig = apiConfigUrl;
export const ImageStorage = imageStorageUrl; export const ImageStorage = imageStorageUrl;
\ No newline at end of file
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