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 @@
},
"handlebars": {
"version": "4.1.1",
"resolved": "",
"resolved": "https://registry.npmjs.org/handlebars/-/handlebars-4.1.1.tgz",
"integrity": "sha512-3Zhi6C0euYZL5sM0Zcy7lInLXKQ+YLcF/olbN010mzGQ4XVm50JeyBnMqofHh696GrciGruC7kCcApPDJvVgwA==",
"dev": true,
"requires": {
"neo-async": "^2.6.0",
"optimist": "^0.6.1",
"source-map": "^0.6.1"
"source-map": "^0.6.1",
"uglify-js": "^3.1.4"
},
"dependencies": {
"source-map": {
......@@ -6492,7 +6494,8 @@
},
"lodash.mergewith": {
"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,
"optional": true
},
......@@ -10337,6 +10340,33 @@
"integrity": "sha1-tlQ6g8/Iwr77P0yPumiW9bDJvmg=",
"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": {
"version": "1.1.1",
"resolved": "https://registry.npmjs.org/ultron/-/ultron-1.1.1.tgz",
......
src/app/purchase/productlist/productlist.component.html
......@@ -10,7 +10,7 @@
<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">
<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>
</div>
</li>
......@@ -84,16 +84,25 @@
<p>{{prdt.short_description}}</p>
<div class="star_ratting">
<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.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 >= 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>
<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 >= 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>
<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>
<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 >= 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>
<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 >= 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>
<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>
<span class="floatRight">$ {{prdt.amount}}</span>
<div class="clear"></div>
......@@ -111,4 +120,4 @@
<div class="clear"></div>
</div>
</div>
</div>
\ No newline at end of file
</div>
\ No newline at end of file
src/app/purchase/searchbar/searchbar.component.html
<div class="purchase_taskbar">
<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)">
<button class="search_btn" (click)="productSearchFunClick(productSearch.value)">Search</button>
<div class="clear"></div>
......@@ -26,12 +26,13 @@
<div class="purchase_other" *ngIf="loginDetails">
<ul>
<li (click)="goToPage('orders')">
<img src="assets/images/asset_cart.png">
My Order
<img src="assets/images/asset_cart.png"> My Order
</li>
<li (click)="gotosearch()">
<img src="assets/images/asset_order.png"> Filter
</li>
<li (click)="goToPage('cart')">
<img src="assets/images/asset_order.png">
My Cart
<img src="assets/images/asset_order.png"> My Cart
</li>
</ul>
</div>
......
src/app/purchase/searchbar/searchbar.component.scss
.purchase_taskbar{
width:100%;
.redLine {
border: 2px solid #ff0000 !important;
transition-timing-function: ease-in-out;
transition: 1s;
}
.purchase_taskbar {
width: 100%;
padding-top: 115px;
padding-bottom: 30px;
.purchase_searchbar{
width:calc(100% - 60%);
.purchase_searchbar {
width: calc(100% - 60%);
float: left;
position: relative;
.nav_bar_search_list{
.nav_bar_search_list {
position: absolute;
background: #fff;
top: 55px;
width: 100%;
z-index: 9999;
-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);
box-shadow: -1px 9px 14px -5px rgba(0,0,0,0.2);
ul{
-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);
box-shadow: -1px 9px 14px -5px rgba(0, 0, 0, 0.2);
ul {
margin: 0px;
padding: 0px;
li{
li {
list-style: none;
padding: 5px;
padding-left: 10px;
cursor: pointer;
border-bottom: 1px solid #f8f8f8;
.search_list_image{
width:30px;
height:30px;
.search_list_image {
width: 30px;
height: 30px;
background: #a8a8a8;
border-radius: 50%;
float: left;
img{
width:100%;
height:100%;
img {
width: 100%;
height: 100%;
border-radius: 50%;
object-fit: cover;
object-position: center;
}
}
p{
p {
width: calc(100% - 30px);
padding:3px;
padding-left:15px;
padding: 3px;
padding-left: 15px;
margin: 0px;
float: left;
}
&:hover{
&:hover {
background: #2655bf;
color: #fff;
}
&:focus{
&:focus {
background: #2655bf;
color: #fff;
}
}
}
}
.purchase_inner_search_bar{
.purchase_inner_search_bar {
background: #ffffff;
border-radius: 30px;
input{
border: 2px solid transparent;
input {
width: calc(100% - 120px);
float: left;
height: 45px;
border:none;
border: none;
border-radius: 30px;
padding-left:30px;
padding-left: 30px;
font-size: 18px;
font-weight: 300;
&:focus{
&:focus {
outline: none;
}
&::placeholder{
&::placeholder {
color: #cad2db;
}
}
.search_btn{
width:120px;
.search_btn {
width: 120px;
float: right;
height: 45px;
border-radius: 30px;
background: #2655bf;
color: #ffffff;
border:none;
&:focus{
border: none;
&:focus {
outline: none;
}
}
}
}
.purchase_other{
width:40%;
.purchase_other {
width: 40%;
float: right;
padding: 10px;
ul
{
margin:0px;
padding:0px;
ul {
margin: 0px;
padding: 0px;
text-align: right;
li{
padding-left:5%;
li {
padding-left: 5%;
display: inline-block;
text-align: right;
cursor: pointer;
img{
img {
margin-right: 10px;
}
}
......
src/app/purchase/searchbar/searchbar.component.ts
......@@ -16,6 +16,8 @@ export class SearchbarComponent implements OnInit {
imageServer: string;
loginDetails:any;
searchLine:any;
public scrollbarOptions = { axis: 'y', theme: 'minimal-dark' };
@ViewChild("productSearch") public productSearchRef: ElementRef;
......@@ -26,12 +28,17 @@ export class SearchbarComponent implements OnInit {
public subjectService : SubjectService) {
this.productArray = true;
this.imageServer = ImageStorage;
this.searchLine = 0;
}
ngOnInit() {
this.checkUserLogin();
}
gotosearch(){
this.searchLine = !this.searchLine;
}
checkUserLogin(){
this.loginDetails = JSON.parse(this.webService.getLocalStorageItem('userData'));
this.subjectService.getLoginData().subscribe(loginData => {
......
src/assets/css/responsive.scss
......@@ -36,54 +36,82 @@
/* 01. Smartphones (portrait and landscape) ----------- */
@media only screen and (min-device-width: 320px) and (max-device-width: 480px) {
.phone_img{
img{
width:100% !important;
.service_tab_inner {
.tab-content {
.container {
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;
}
.purchase_wrapper{
.purchase_content_wrapper{
.purchase_content_section{
.search_listing_content{
ul{
}
.purchase_filter_section {
width: 100% !important;
}
.purchase_wrapper {
.purchase_content_wrapper {
.purchase_content_section {
margin-left: 0px !important;
.search_listing_content {
ul {
li {
width:100% !important;
width: 100% !important;
}
}
}
}
}
}
.purchase_content_section{
width:100% !important;
.purchase_content_section {
width: 100% !important;
height: auto !important;
.search_listing_content{
ul{
li{
width:100% !important;
.search_listing_content {
ul {
li {
width: 100% !important;
}
}
}
}
.purchase_taskbar{
.purchase_searchbar{
width:100% !important;
.purchase_taskbar {
.purchase_searchbar {
width: 100% !important;
}
.purchase_other{
width:100% !important;
ul{
li{
width:100% !important;
.purchase_other {
width: 100% !important;
ul {
li {
width: 100% !important;
padding: 10px;
text-align: left !important;
}
}
......@@ -118,7 +146,7 @@
.login_modal_wrapper {
.modal_close {
// display: none !important;
color:#333 !important;
color: #333 !important;
}
}
.main_wrapper {
......@@ -141,36 +169,32 @@
padding: 15px !important;
padding-top: 100px !important;
}
.title_banner h1{
font-size:21px;
.title_banner h1 {
font-size: 21px;
}
.log_btn{
width:100px !important;
.log_btn {
width: 100px !important;
background-image: none !important;
}
.modal-body{
padding:5px !important;
.vehicle_input_select{
.modal-body {
padding: 5px !important;
.vehicle_input_select {
margin-bottom: 10px;
}
}
.wizard_quotes{
width:100% !important;
.wizard_quotes {
width: 100% !important;
}
.scheduletiming_listing{
width:100% !important;
.scheduletiming_listing {
width: 100% !important;
}
.scheduletiming_listing{
width:100% !important;
.scheduletiming_listing {
width: 100% !important;
}
.testimonial_div{
padding:5px;
.container-fluid{
max-width:100% !important;
.testimonial_div {
padding: 5px;
.container-fluid {
max-width: 100% !important;
}
}
.dashboard_tab_content {
......@@ -270,9 +294,10 @@
/* 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 {
top: 0px !important;
}
......@@ -288,33 +313,30 @@
.service_check p {
height: 100px;
}
.purchase_wrapper{
.purchase_content_wrapper{
.purchase_content_section{
.search_listing_content{
ul{
.purchase_wrapper {
.purchase_content_wrapper {
.purchase_content_section {
.search_listing_content {
ul {
li {
list-style: none;
padding: 10px;
width: calc(100% - 67%);
display: inline-block;
}
}
}
}
}
}
.navbar{
.navbar {
.container-fluid {
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 {
top: 0px !important;
}
......@@ -330,76 +352,71 @@
.service_check p {
height: 100px;
}
.purchase_wrapper{
.purchase_content_wrapper{
.purchase_content_section{
.search_listing_content{
ul{
.purchase_wrapper {
.purchase_content_wrapper {
.purchase_content_section {
.search_listing_content {
ul {
li {
list-style: none;
padding: 10px;
width: calc(100% - 75%) !important;
display: inline-block;
}
}
}
}
}
}
.navbar{
.navbar {
.container-fluid {
max-width: calc(100% - 2%) !important;
}
}
}
@media only screen and (min-width: 1360px) and (max-device-width: 1399px) {
.purchase_wrapper{
.purchase_content_wrapper{
.purchase_content_section{
.search_listing_content{
ul{
}
@media only screen and (min-width: 1360px) and (max-device-width: 1399px) {
.purchase_wrapper {
.purchase_content_wrapper {
.purchase_content_section {
.search_listing_content {
ul {
li {
list-style: none;
padding: 10px;
width: calc(100% - 67%) !important;
display: inline-block;
}
}
}
}
}
}
.navbar{
.navbar {
.container-fluid {
max-width: calc(100% - 2%) !important;
}
}
}
@media only screen and (min-width: 1400px) and (max-device-width: 1600px) {
.purchase_wrapper{
.purchase_content_wrapper{
.purchase_content_section{
.search_listing_content{
ul{
}
@media only screen and (min-width: 1400px) and (max-device-width: 1600px) {
.purchase_wrapper {
.purchase_content_wrapper {
.purchase_content_section {
.search_listing_content {
ul {
li {
list-style: none;
padding: 10px;
width: calc(100% - 75%) !important;
display: inline-block;
}
}
}
}
}
}
}
}
/* 08.0 Large screens ----------- */
......
src/environments/server.config.ts
let apiConfigUrl,imageStorageUrl;
// Localhost
apiConfigUrl = 'http://localhost/dcarfixers/Webservices/';
imageStorageUrl = 'http://localhost/dcarfixers/';
// apiConfigUrl = 'http://localhost/dcarfixers/Webservices/';
// imageStorageUrl = 'http://localhost/dcarfixers/';
// // Techlabz
// apiConfigUrl = 'https://techlabz.in/dcarfixers/Webservices/';
// imageStorageUrl = 'https://techlabz.in/dcarfixers/';
// // // carfixxers.com
// apiConfigUrl = 'https://carfixxers.com/admin/Webservices/';
// imageStorageUrl = 'https://carfixxers.com/admin/';
apiConfigUrl = 'https://carfixxers.com/admin/Webservices/';
imageStorageUrl = 'https://carfixxers.com/admin/';
export const apiConfig = apiConfigUrl;
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