Skip to content

D
dcarfixers_angular
Commit cd9470bb by Jansa Jose
Options

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

parents 08ba2501 d990c9c9
Showing with 98 additions and 52 deletions
package-lock.json
......@@ -379,7 +379,8 @@
"ansi-regex": {
"version": "2.1.1",
"bundled": true,
"dev": true
"dev": true,
"optional": true
},
"aproba": {
"version": "1.2.0",
......@@ -400,12 +401,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 +423,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 +553,8 @@
"inherits": {
"version": "2.0.3",
"bundled": true,
"dev": true
"dev": true,
"optional": true
},
"ini": {
"version": "1.3.5",
......@@ -559,6 +566,7 @@
"version": "1.0.0",
"bundled": true,
"dev": true,
"optional": true,
"requires": {
"number-is-nan": "^1.0.0"
}
......@@ -573,6 +581,7 @@
"version": "3.0.4",
"bundled": true,
"dev": true,
"optional": true,
"requires": {
"brace-expansion": "^1.1.7"
}
......@@ -586,6 +595,7 @@
"version": "2.3.5",
"bundled": true,
"dev": true,
"optional": true,
"requires": {
"safe-buffer": "^5.1.2",
"yallist": "^3.0.0"
......@@ -684,7 +694,8 @@
"number-is-nan": {
"version": "1.0.1",
"bundled": true,
"dev": true
"dev": true,
"optional": true
},
"object-assign": {
"version": "4.1.1",
......@@ -696,6 +707,7 @@
"version": "1.4.0",
"bundled": true,
"dev": true,
"optional": true,
"requires": {
"wrappy": "1"
}
......@@ -781,7 +793,8 @@
"safe-buffer": {
"version": "5.1.2",
"bundled": true,
"dev": true
"dev": true,
"optional": true
},
"safer-buffer": {
"version": "2.1.2",
......@@ -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",
......@@ -836,6 +850,7 @@
"version": "3.0.1",
"bundled": true,
"dev": true,
"optional": true,
"requires": {
"ansi-regex": "^2.0.0"
}
......@@ -879,12 +894,14 @@
"wrappy": {
"version": "1.0.2",
"bundled": true,
"dev": true
"dev": true,
"optional": true
},
"yallist": {
"version": "3.0.3",
"bundled": true,
"dev": true
"dev": true,
"optional": true
}
}
},
......@@ -2576,7 +2593,7 @@
},
"camelcase-keys": {
"version": "2.1.0",
"resolved": "http://registry.npmjs.org/camelcase-keys/-/camelcase-keys-2.1.0.tgz",
"resolved": "https://registry.npmjs.org/camelcase-keys/-/camelcase-keys-2.1.0.tgz",
"integrity": "sha1-MIvur/3ygRkFHvodkyITyRuPkuc=",
"requires": {
"camelcase": "^2.0.0",
......@@ -4948,12 +4965,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": {
......@@ -6379,7 +6398,7 @@
},
"load-json-file": {
"version": "1.1.0",
"resolved": "http://registry.npmjs.org/load-json-file/-/load-json-file-1.1.0.tgz",
"resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-1.1.0.tgz",
"integrity": "sha1-lWkFcI1YtLq0wiYbBPWfMcmTdMA=",
"requires": {
"graceful-fs": "^4.1.2",
......@@ -6391,7 +6410,7 @@
"dependencies": {
"pify": {
"version": "2.3.0",
"resolved": "http://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
"resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
"integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw="
}
}
......@@ -6729,7 +6748,7 @@
},
"meow": {
"version": "3.7.0",
"resolved": "http://registry.npmjs.org/meow/-/meow-3.7.0.tgz",
"resolved": "https://registry.npmjs.org/meow/-/meow-3.7.0.tgz",
"integrity": "sha1-cstmi0JSKCkKu/qFaJJYcwioAfs=",
"requires": {
"camelcase-keys": "^2.0.0",
......@@ -6746,7 +6765,7 @@
"dependencies": {
"minimist": {
"version": "1.2.0",
"resolved": "http://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz",
"resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz",
"integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ="
}
}
......@@ -7156,7 +7175,7 @@
"dependencies": {
"semver": {
"version": "5.3.0",
"resolved": "http://registry.npmjs.org/semver/-/semver-5.3.0.tgz",
"resolved": "https://registry.npmjs.org/semver/-/semver-5.3.0.tgz",
"integrity": "sha1-myzl094C0XxgEq0yaqa00M9U+U8="
}
}
......@@ -7240,7 +7259,7 @@
},
"chalk": {
"version": "1.1.3",
"resolved": "http://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
"resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
"integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
"requires": {
"ansi-styles": "^2.2.1",
......@@ -7257,7 +7276,7 @@
},
"supports-color": {
"version": "2.0.0",
"resolved": "http://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz",
"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz",
"integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc="
}
}
......@@ -7552,7 +7571,7 @@
},
"os-locale": {
"version": "1.4.0",
"resolved": "http://registry.npmjs.org/os-locale/-/os-locale-1.4.0.tgz",
"resolved": "https://registry.npmjs.org/os-locale/-/os-locale-1.4.0.tgz",
"integrity": "sha1-IPnxeuKe00XoveWDsT0gCYA8FNk=",
"requires": {
"lcid": "^1.0.0"
......@@ -8418,7 +8437,7 @@
},
"pify": {
"version": "2.3.0",
"resolved": "http://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
"resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
"integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw="
}
}
......@@ -8842,7 +8861,7 @@
"dependencies": {
"source-map": {
"version": "0.4.4",
"resolved": "http://registry.npmjs.org/source-map/-/source-map-0.4.4.tgz",
"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.4.4.tgz",
"integrity": "sha1-66T12pwNyZneaAMti092FzZSA2s=",
"requires": {
"amdefine": ">=0.0.4"
......@@ -10295,6 +10314,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/address/address.component.scss
.purchase_wrapper{
padding-top: 115px;
.address_wrapper{
h3{
font-size: 20px;
......
src/app/purchase/productdetails/productdetails.component.scss
......@@ -304,7 +304,7 @@
padding: 10px;
img{
height: 180px;
width: auto;
max-width: 100%;
}
}
h5{
......
src/app/purchase/purchase-home/purchase-home.component.html
......@@ -5,18 +5,7 @@
<div class="purchase_content_wrapper">
<div class="purchase_content_section">
<div class="search_list_header">
<div class="row">
<div class="col-md-8">
<p>Latest Products</p>
</div>
<!-- <div class="col-md-4">
<select class="floatRight">
<option>Select by popularity</option>
<option>Select by price</option>
</select>
<div class="clear"></div>
</div> -->
</div>
<h4>Latest Products</h4>
</div>
<div class="bottom_product_list">
<div class="loader_overlay" *ngIf="loader"></div>
......@@ -53,14 +42,14 @@
<button NgxCarouselNext class='rightRs'>&gt;</button>
</ngx-carousel>
</div>
</div>
<div class="purchase_content_section">
<div class="search_list_header">
<h4>Trending Products</h4>
</div>
<div class="search_listing_content">
<div class="loader_overlay" *ngIf="trend_loader"></div>
<div class="row">
<div class="col-md-8">
<p>Trending Products</p>
</div>
</div>
<ul *ngIf="trendingProductData"
infiniteScroll [infiniteScrollDistance]="2" [infiniteScrollThrottle]="50" (scrolled)="onScroll()" [scrollWindow]="false" style="max-height: 700px; overflow: scroll">
<li (click)="latestPrdtDtls(prdt.product_id)" *ngFor="let prdt of trendingProductData" >
......
src/app/purchase/purchase-home/purchase-home.component.scss
......@@ -198,12 +198,17 @@
}
}
.purchase_content_section{
float:right;
width:100%;
margin-left: 10px;
background: #fff;
padding:20px;
margin-bottom: 20px;
.search_list_header{
padding-left: 15px;
h4{
margin:0px;
padding:0px;
}
p{
margin:0px;
padding:0px;
......@@ -230,6 +235,7 @@
}
.search_listing_content{
width:100%;
padding-top:20px;
ul{
margin:0px;
padding:0px;
......@@ -275,6 +281,7 @@
.star_ratting{
padding-top: 2px;
display: none;
span{
float: right;
color: #000000;
......
src/app/purchase/searchbar/searchbar.component.scss
.purchase_taskbar{
width:100%;
padding-top: 30px;
padding-top: 115px;
padding-bottom: 30px;
.purchase_searchbar{
width:calc(100% - 60%);
......@@ -12,19 +12,21 @@
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);
-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{
list-style: none;
padding: 8px;
padding: 5px;
padding-left: 10px;
cursor: pointer;
border-bottom: 1px solid #f8f8f8;
.search_list_image{
width:40px;
height:40px;
width:30px;
height:30px;
background: #a8a8a8;
border-radius: 50%;
float: left;
......@@ -37,8 +39,9 @@ box-shadow: -1px 9px 14px -5px rgba(0,0,0,0.75);
}
}
p{
width: calc(100% - 40px);
padding: 10px;
width: calc(100% - 30px);
padding:3px;
padding-left:15px;
margin: 0px;
float: left;
}
......
src/app/purchase/summary/summary.component.scss
.purchase_wrapper{
padding-top: 115px;
.summary_wrapper{
h3{
font-size: 20px;
......
src/assets/images/user_avatar.jpg
src/assets/images/user_avatar.jpg

4.14 KB | W: | H:

src/assets/images/user_avatar.jpg

18 KB | W: | H:

src/assets/images/user_avatar.jpg
src/assets/images/user_avatar.jpg
src/assets/images/user_avatar.jpg
src/assets/images/user_avatar.jpg
  • 2-up
  • Swipe
  • Onion skin
src/styles.scss
......@@ -89,7 +89,6 @@ body {
}
.purchase_wrapper{
padding-top:120px;
background: #f1f3f6;
.container-fluid {
max-width: calc(100% - 15%);
......
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