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 129 additions and 86 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/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>
<div *ngIf="!productArray && productSearch.value != ''" class="nav_bar_search_list">
<!-- <img class="imageSize" src="assets/images/no_result.png"><br> -->
<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" malihu-scrollbar [scrollbarOptions]="scrollbarOptions" style="max-height: 350px; overflow: scroll">
<li class="cpoint" *ngFor="let prdt of productArray" (click)="clickProduct(prdt.product_id)">
<div class="search_list_image">
<img src="{{imageServer + prdt.image}}" onerror="this.src='assets/images/user_avatar.jpg'">
</div>
<p>{{prdt.product_name}}</p>
<div class="clear"></div> <div class="clear"></div>
</li> </div>
</ul> <div *ngIf="!productArray && productSearch.value != ''" class="nav_bar_search_list">
<!-- <img class="imageSize" src="assets/images/no_result.png"><br> -->
<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" malihu-scrollbar [scrollbarOptions]="scrollbarOptions" style="max-height: 350px; overflow: scroll">
<li class="cpoint" *ngFor="let prdt of productArray" (click)="clickProduct(prdt.product_id)">
<div class="search_list_image">
<img src="{{imageServer + prdt.image}}" onerror="this.src='assets/images/user_avatar.jpg'">
</div>
<p>{{prdt.product_name}}</p>
<div class="clear"></div>
</li>
</ul>
</div>
</div>
<div class="purchase_other" *ngIf="loginDetails">
<ul>
<li (click)="goToPage('orders')">
<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
</li>
</ul>
</div> </div>
</div> <div class="clear"></div>
<div class="purchase_other" *ngIf="loginDetails"> </div>
<ul> \ No newline at end of file
<li (click)="goToPage('orders')">
<img src="assets/images/asset_cart.png">
My Order
</li>
<li (click)="goToPage('cart')">
<img src="assets/images/asset_order.png">
My Cart
</li>
</ul>
</div>
<div class="clear"></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/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