Skip to content

D
dcarfixers_angular
Commit 947d01ff by amal
Options

Merge branch 'amal' into 'master'

Amal See merge request !35
parents ccda95a6 a916ef9e
Showing with 281 additions and 27 deletions
package-lock.json
......@@ -400,12 +400,14 @@
"balanced-match": {
"version": "1.0.0",
"bundled": true,
"dev": true
"dev": true,
"optional": true
},
"brace-expansion": {
"version": "1.1.11",
"bundled": true,
"dev": true,
"optional": true,
"requires": {
"balanced-match": "^1.0.0",
"concat-map": "0.0.1"
......@@ -420,17 +422,20 @@
"code-point-at": {
"version": "1.1.0",
"bundled": true,
"dev": true
"dev": true,
"optional": true
},
"concat-map": {
"version": "0.0.1",
"bundled": true,
"dev": true
"dev": true,
"optional": true
},
"console-control-strings": {
"version": "1.1.0",
"bundled": true,
"dev": true
"dev": true,
"optional": true
},
"core-util-is": {
"version": "1.0.2",
......@@ -547,7 +552,8 @@
"inherits": {
"version": "2.0.3",
"bundled": true,
"dev": true
"dev": true,
"optional": true
},
"ini": {
"version": "1.3.5",
......@@ -559,6 +565,7 @@
"version": "1.0.0",
"bundled": true,
"dev": true,
"optional": true,
"requires": {
"number-is-nan": "^1.0.0"
}
......@@ -573,6 +580,7 @@
"version": "3.0.4",
"bundled": true,
"dev": true,
"optional": true,
"requires": {
"brace-expansion": "^1.1.7"
}
......@@ -580,12 +588,14 @@
"minimist": {
"version": "0.0.8",
"bundled": true,
"dev": true
"dev": true,
"optional": true
},
"minipass": {
"version": "2.3.5",
"bundled": true,
"dev": true,
"optional": true,
"requires": {
"safe-buffer": "^5.1.2",
"yallist": "^3.0.0"
......@@ -604,6 +614,7 @@
"version": "0.5.1",
"bundled": true,
"dev": true,
"optional": true,
"requires": {
"minimist": "0.0.8"
}
......@@ -684,7 +695,8 @@
"number-is-nan": {
"version": "1.0.1",
"bundled": true,
"dev": true
"dev": true,
"optional": true
},
"object-assign": {
"version": "4.1.1",
......@@ -696,6 +708,7 @@
"version": "1.4.0",
"bundled": true,
"dev": true,
"optional": true,
"requires": {
"wrappy": "1"
}
......@@ -817,6 +830,7 @@
"version": "1.0.2",
"bundled": true,
"dev": true,
"optional": true,
"requires": {
"code-point-at": "^1.0.0",
"is-fullwidth-code-point": "^1.0.0",
......@@ -4330,7 +4344,8 @@
"code-point-at": {
"version": "1.1.0",
"bundled": true,
"dev": true
"dev": true,
"optional": true
},
"concat-map": {
"version": "0.0.1",
......@@ -4341,7 +4356,8 @@
"console-control-strings": {
"version": "1.1.0",
"bundled": true,
"dev": true
"dev": true,
"optional": true
},
"core-util-is": {
"version": "1.0.2",
......@@ -4458,7 +4474,8 @@
"inherits": {
"version": "2.0.3",
"bundled": true,
"dev": true
"dev": true,
"optional": true
},
"ini": {
"version": "1.3.5",
......@@ -4470,6 +4487,7 @@
"version": "1.0.0",
"bundled": true,
"dev": true,
"optional": true,
"requires": {
"number-is-nan": "^1.0.0"
}
......@@ -4492,12 +4510,14 @@
"minimist": {
"version": "0.0.8",
"bundled": true,
"dev": true
"dev": true,
"optional": true
},
"minipass": {
"version": "2.3.5",
"bundled": true,
"dev": true,
"optional": true,
"requires": {
"safe-buffer": "^5.1.2",
"yallist": "^3.0.0"
......@@ -4516,6 +4536,7 @@
"version": "0.5.1",
"bundled": true,
"dev": true,
"optional": true,
"requires": {
"minimist": "0.0.8"
}
......@@ -4596,7 +4617,8 @@
"number-is-nan": {
"version": "1.0.1",
"bundled": true,
"dev": true
"dev": true,
"optional": true
},
"object-assign": {
"version": "4.1.1",
......@@ -4608,6 +4630,7 @@
"version": "1.4.0",
"bundled": true,
"dev": true,
"optional": true,
"requires": {
"wrappy": "1"
}
......@@ -4729,6 +4752,7 @@
"version": "1.0.2",
"bundled": true,
"dev": true,
"optional": true,
"requires": {
"code-point-at": "^1.0.0",
"is-fullwidth-code-point": "^1.0.0",
......@@ -4952,12 +4976,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": {
......@@ -9813,7 +9839,7 @@
"integrity": "sha1-jk0qJWwOIYXGsYrWlK7JaLg8sdE=",
"requires": {
"block-stream": "*",
"fstream": "^1.0.12",
"fstream": "^1.0.2",
"inherits": "2"
}
},
......@@ -10286,6 +10312,33 @@
"integrity": "sha1-tlQ6g8/Iwr77P0yPumiW9bDJvmg=",
"dev": true
},
"uglify-js": {
"version": "3.5.15",
"resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.5.15.tgz",
"integrity": "sha512-fe7aYFotptIddkwcm6YuA0HmknBZ52ZzOsUxZEdhhkSsz7RfjHDX2QDxwKTiv4JQ5t5NhfmpgAK+J7LiDhKSqg==",
"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
......@@ -7,7 +7,7 @@
<h5>FILTERS</h5>
<div *ngIf="productBrand && productBrand.length > 0">
<h6 href="#ac1" data-toggle="collapse">Brands</h6>
<ul id="ac1" class="collapse in show" malihu-scrollbar [scrollbarOptions]="scrollbarOptions">
<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">
......
src/app/purchase/productlist/productlist.component.scss
......@@ -44,7 +44,6 @@
padding:0px;
padding-top: 10px;
padding-bottom: 10px;
height: 150px;
li{
list-style: none;
padding-left: 25px;
......
src/app/purchase/searchbar/searchbar.component.html
......@@ -5,13 +5,19 @@
<button class="search_btn" (click)="productSearchFunClick(productSearch.value)">Search</button>
<div class="clear"></div>
</div>
<div *ngIf="!productArray && productSearch.value != ''" style="text-align: center;">
<div *ngIf="!productArray && productSearch.value != ''" class="nav_bar_search_list">
<!-- <img class="imageSize" src="assets/images/no_result.png"><br> -->
<small>No Data Found</small>
<ul>
<li class="textCenter">No Data Found</li>
</ul>
</div>
<div *ngIf="productArray && productArray.length > 0" class="nav_bar_search_list">
<ul class="filter-select">
<li class="cpoint" *ngFor="let prdt of productArray" (click)="clickProduct(prdt.product_id)">{{prdt.product_name}}</li>
<li class="cpoint" *ngFor="let prdt of productArray" (click)="clickProduct(prdt.product_id)">
<div class="search_list_image"></div>
<p>{{prdt.product_name}}</p>
<div class="clear"></div>
</li>
</ul>
</div>
</div>
......
src/app/purchase/searchbar/searchbar.component.scss
......@@ -5,7 +5,54 @@
.purchase_searchbar{
width:calc(100% - 60%);
float: left;
position: relative;
.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.75);
-moz-box-shadow: -1px 9px 14px -5px rgba(0,0,0,0.75);
box-shadow: -1px 9px 14px -5px rgba(0,0,0,0.75);
ul{
margin: 0px;
padding: 0px;
li{
list-style: none;
padding: 8px;
cursor: pointer;
.search_list_image{
width:40px;
height:40px;
background: #a8a8a8;
border-radius: 50%;
float: left;
img{
width:100%;
height:100%;
border-radius: 50%;
object-fit: cover;
object-position: center;
}
}
p{
width: calc(100% - 40px);
padding: 10px;
margin: 0px;
float: left;
}
&:hover{
background: #2655bf;
color: #fff;
}
&:focus{
background: #2655bf;
color: #fff;
}
}
}
}
.purchase_inner_search_bar{
background: #ffffff;
border-radius: 30px;
......
src/app/purchase/track/track.component.html
......@@ -16,7 +16,8 @@
<div class="col-md-8">
<div class="product_details" *ngIf="orderDetails">
<h1>{{orderDetails.product_name}}</h1>
<div class="review" (click)="reviewBtn()">Write review</div>
<!-- <div class="review" (click)="reviewBtn()">Write review</div> -->
<div class="review" data-toggle="modal" data-target="#review">Write review</div>
<div class="clear"></div>
<h2>{{orderDetails.short_description}}</h2>
<div class="others">
......@@ -80,3 +81,64 @@
</div>
</div>
</div>
<!-- START-RATTING-DIV -->
<div class="modal" id="review">
<div class="modal-dialog modal-lg">
<div class="modal-content">
<div class="ratting_inner">
<div class="">
<p>Rate this Product</p>
<div class="ratting_star">
<fieldset class="rating">
<input type="radio" id="star5" name="rating" value="5" formControlName="rating"/>
<label class = "full" for="star5" title="Awesome - 5 stars"></label>
<input type="radio" id="star4half" name="rating" value="4.5" formControlName="rating"/>
<label class="half" for="star4half" title="Pretty good - 4.5 stars"></label>
<input type="radio" id="star4" name="rating" value="4" formControlName="rating"/>
<label class = "full" for="star4" title="Pretty good - 4 stars"></label>
<input type="radio" id="star3half" name="rating" value="3.5" formControlName="rating"/>
<label class="half" for="star3half" title="Meh - 3.5 stars"></label>
<input type="radio" id="star3" name="rating" value="3" formControlName="rating"/>
<label class = "full" for="star3" title="Meh - 3 stars"></label>
<input type="radio" id="star2half" name="rating" value="2.5" formControlName="rating"/>
<label class="half" for="star2half" title="Kinda bad - 2.5 stars"></label>
<input type="radio" id="star2" name="rating" value="2" formControlName="rating"/>
<label class = "full" for="star2" title="Kinda bad - 2 stars"></label>
<input type="radio" id="star1half" name="rating" value="1.5" formControlName="rating" />
<label class="half" for="star1half" title="Meh - 1.5 stars"></label>
<input type="radio" id="star1" name="rating" value="1" formControlName="rating"/>
<label class = "full" for="star1" title="Sucks big time - 1 star"></label>
<input type="radio" id="starhalf" name="rating" value="0.5" formControlName="rating" />
<label class="half" for="starhalf" title="Sucks big time - 0.5 stars"></label>
</fieldset>
<div class="clear"></div>
</div>
</div>
<hr>
<div class="">
<p>Give a Title</p>
<input class="title_input" placeholder="Type Here">
</div>
<hr>
<div class="">
<p>Write a Review</p>
<input class="title_input" placeholder="Type Here">
</div>
<hr>
<button class="submit_btn">Submit</button>
</div>
</div>
</div>
</div>
<!-- END-RATTING-DIV -->
\ No newline at end of file
src/app/purchase/track/track.component.scss
......@@ -486,3 +486,84 @@
}
}
}
.ratting_inner{
padding: 20px;
p{
color: #000000;
margin: 0px;
padding:0px;
font-size: 20px;
border-left:6px solid #fef160;
padding-left: 20px;
width: 100%;
margin-bottom: 20px;
}
hr{
margin: 0px;
margin-bottom: 20px;
margin-top: 20px;
}
.submit_btn{
background: #2655bf;
color: #fff;
border:none;
height:50px;
padding-left: 8%;
padding-right: 8%;
font-size: 18px;
}
.title_input{
border:none;
width: 100%;
height:50px;
font-size: 20px;
padding-left: 20px;
font-weight: 300;
&:focus{
outline: none;
}
&::placeholder{
color: #cad2db;
font-weight: 300;
}
}
.ratting_star{
.rating {
border: none;
float: left;
}
.rating > input { display: none; }
.rating > label:before {
margin: 6px;
font-size: 30px;
font-family: FontAwesome;
display: inline-block;
content: "\f005";
}
.rating > .half:before {
content: "\f089";
position: absolute;
}
.rating > label {
color: #ddd;
float: right;
margin:0px;
}
/***** CSS Magic to Highlight Stars on Hover *****/
.rating > input:checked ~ label, /* show gold star when clicked */
.rating:not(:checked) > label:hover, /* hover current star */
.rating:not(:checked) > label:hover ~ label { color: #FFD700; } /* hover previous stars in list */
.rating > input:checked + label:hover, /* hover current star when changing rating */
.rating > input:checked ~ label:hover,
.rating > label:hover ~ input:checked ~ label, /* lighten current selection */
.rating > input:checked ~ label:hover ~ label { color: #FFED85; }
}
}
\ No newline at end of file
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/';
apiConfigUrl = 'https://techlabz.in/dcarfixers/Webservices/';
imageStorageUrl = 'https://techlabz.in/dcarfixers/';
// carfixxers.com
// apiConfigUrl = 'https://carfixxers.com/admin/Webservices/';
......
src/styles.scss
......@@ -89,7 +89,7 @@ body {
}
.purchase_wrapper{
padding-top:85px;
padding-top:120px;
background: #f1f3f6;
.container-fluid {
max-width: calc(100% - 15%);
......@@ -843,3 +843,7 @@ bs-datepicker-container{
background-color: #7e7f7fc9 !important;
}
.purchase_content_wrapper{
padding-bottom: 50px;
}
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