Skip to content

D
dcarfixers_angular
Commit ed7bccb9 by Jansa Jose
Options

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

# Conflicts: # src/app/home/index/index.component.scss
parents e72f456b d0074a18
Showing with 180 additions and 36 deletions
src/app/home/index/index.component.scss
......@@ -411,11 +411,11 @@
text-align: center;
width: 100%;
height: 45px;
border-radius: 20px;
-webkit-border-radius: 20px;
-moz-border-radius: 20px;
-ms-border-radius: 20px;
-o-border-radius: 20px;
border-radius: 10px;
-webkit-border-radius: 10px;
-moz-border-radius: 10px;
-ms-border-radius: 10px;
-o-border-radius: 10px;
border: none;
font-size: 20px;
font-weight: 300;
......@@ -434,21 +434,160 @@
padding-bottom: 10px;
}
.search {
background: url("/assets/images/asset_search.png");
background-position: right 10px top 5px;
text-align: center;
background-repeat: no-repeat;
padding-right: 50px;
border:none;
border-bottom: 1px solid #f4f4f4;
font-size: 28px;
padding-bottom: 20px;
&::placeholder{
color: #e7e7e7;
}
}
.service_tab_inner{
width: 100%;
padding-top:10px;
.arrow_btn{
width: 35px;
height: 35px;
background-position: center !important;
background-repeat: no-repeat !important;
position: relative;
left: 20px;
cursor: pointer;
}
.up_arrow{
background: url("../../../assets/images/asset_scroll_up.png");
}
.down_arrow{
background: url("../../../assets/images/asset_scroll_down.png");
}
.services_tab{
padding:0px;
padding-top: 10px;
padding-bottom: 10px;
margin:0px;
overflow: scroll;
overflow-x: hidden;
padding-right: 20px;
width: 100%;
height: 250px;
&::-webkit-scrollbar {
display: none;
}
li{
width:100%;
margin-bottom: 10px;
a{
padding:8px;
padding-left:15px;
border-radius: 8px;
color: #272a31;
background-image: url("../../../assets/images/asset_arrow.png");
background-size: 17px;
background-position: right 12px top 11px;
background-repeat: no-repeat;
img{
margin-right: 10px;
position: relative;
bottom: 2px;
}
}
.active{
background-color: #f2f2f2;
padding:8px;
padding-left: 15px;
border-radius: 8px;
}
}
}
.tab-content{
padding-top: 10px;
padding-bottom: 10px;
ul{
padding:0px;
margin:0px;
height: 230px;
overflow: scroll;
overflow-x: hidden;
padding-right: 20px;
li{
list-style: none;
display: inline-block;
position: relative;
min-width:300px;
white-space: nowrap;
overflow: hidden;
text-overflow: ellipsis;
margin: 0px;
padding: 0px;
border: none;
background-image: none;
margin-bottom:0px;
#custom_check_button {
margin: 0px;
height: 40px;
background-color: #fff;
border-radius: 0px !important;
overflow: auto;
color: #2655bf;
border: 1px solid transparent;
position: relative;
outline: none;
border-radius: 8px !important;
width: 100%;
}
#custom_check_button p {
padding:8px;
padding-left: 15px;
border-radius: 8px;
margin: 0px;
position: absolute;
left: 0px;
right: 0px;
top: 0px;
bottom: 0px;
color: #2655bf;
text-align: left;
}
#custom_check_button label {
width: 100%;
margin: 0px;
}
#custom_check_button label span {
text-align:left;
display: block;
}
#custom_check_button label input {
position: absolute;
left: 0px;
bottom: 0px;
right: 0px;
opacity: 0;
}
#custom_check_button input:checked+p {
background-color: #2655bf;
color: #fff;
border-radius: 0px !important;
margin: 0px;
}
}
}
}
}
input {
border: 1px solid #1e1e1e;
height: 40px;
width: 100%;
border-radius: 25px;
border-radius: 10px;
padding-left: 15px;
-webkit-border-radius: 25px;
-moz-border-radius: 25px;
-ms-border-radius: 25px;
-o-border-radius: 25px;
-webkit-border-radius: 10px;
-moz-border-radius: 10px;
-ms-border-radius: 10px;
-o-border-radius: 10px;
text-align: left;
font-size: 16px;
&::placeholder {
......@@ -464,11 +603,11 @@
height: 40px;
width: 100%;
padding-left: 15px;
border-radius: 25px;
-webkit-border-radius: 25px;
-moz-border-radius: 25px;
-ms-border-radius: 25px;
-o-border-radius: 25px;
border-radius: 10px;
-webkit-border-radius: 10px;
-moz-border-radius: 10px;
-ms-border-radius: 10px;
-o-border-radius: 10px;
text-align: center;
-webkit-appearance: none;
-moz-appearance: none;
......@@ -497,7 +636,7 @@
.log_btn {
height: 40px;
width: 160px;
border-radius: 25px;
border-radius: 10px;
color: #fff;
background-color: #2655bf;
border: none;
......@@ -1122,4 +1261,4 @@
agm-map {
height: 100%;
}
\ No newline at end of file
}
src/app/home/index/index.component.ts
......@@ -24,7 +24,9 @@ export class IndexComponent implements OnInit {
public carouselTile: NgxCarousel;
@ViewChild('wizardModal') wizardModalTrrigerInput;
//Default Map Location
lat: number = 51.678418;
lng: number = 7.809007;
......@@ -32,6 +34,7 @@ export class IndexComponent implements OnInit {
loginDetails: any;
//Basic Location Search: TAB 1
autocomplete: any;
cfautocomplete: any;
searchLocError: boolean;
......@@ -104,6 +107,9 @@ export class IndexComponent implements OnInit {
}
ngOnInit() {
// this.wizardModalTrrigerInput.nativeElement.click();
this.vehicleDataForm = new FormGroup({
trim: new FormControl(''), milage: new FormControl(''), emgine: new FormControl(''),
last_date: new FormControl(''),
......
src/app/navbar/navbar.component.scss
......@@ -191,11 +191,11 @@
text-align: center;
width: 100%;
height: 40px;
border-radius: 20px;
-webkit-border-radius: 20px;
-moz-border-radius: 20px;
-ms-border-radius: 20px;
-o-border-radius: 20px;
border-radius: 10px;
-webkit-border-radius: 10px;
-moz-border-radius: 10px;
-ms-border-radius: 10px;
-o-border-radius: 10px;
border: none;
font-size: 20px;
font-weight: 300;
......@@ -216,12 +216,12 @@
border: 1px solid #1e1e1e;
height: 40px;
width: 100%;
border-radius: 25px;
border-radius: 10px;
font-size: 16px;
-webkit-border-radius: 25px;
-moz-border-radius: 25px;
-ms-border-radius: 25px;
-o-border-radius: 25px;
-webkit-border-radius: 10px;
-moz-border-radius: 10px;
-ms-border-radius:10px;
-o-border-radius: 10px;
text-align: center;
&::placeholder {
color: #bbbbbb;
......@@ -236,7 +236,7 @@
.log_btn {
height: 45px;
width: 100%;
border-radius: 25px;
border-radius: 10px;
color: #fff;
background: #2655bf;
border: none;
......
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 = 'http://techlabz.in/dcarfixers/Webservices/';
imageStorageUrl = 'http://techlabz.in/dcarfixers/';
// apiConfigUrl = 'http://techlabz.in/dcarfixers/Webservices/';
// imageStorageUrl = 'http://techlabz.in/dcarfixers/';
// carfixxers.com
// apiConfigUrl = 'https://carfixxers.com/admin/Webservices/';
......
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