Skip to content

D
dcarfixers_angular
Commit 2e756211 by amalk
Options

Amal | 09-04-2019|14:29

parent 6472a2ef
Showing with 211 additions and 35 deletions
package-lock.json
...@@ -394,7 +394,8 @@ ...@@ -394,7 +394,8 @@
"ansi-regex": { "ansi-regex": {
"version": "2.1.1", "version": "2.1.1",
"bundled": true, "bundled": true,
"dev": true "dev": true,
"optional": true
}, },
"aproba": { "aproba": {
"version": "1.2.0", "version": "1.2.0",
...@@ -603,7 +604,8 @@ ...@@ -603,7 +604,8 @@
"minimist": { "minimist": {
"version": "0.0.8", "version": "0.0.8",
"bundled": true, "bundled": true,
"dev": true "dev": true,
"optional": true
}, },
"minipass": { "minipass": {
"version": "2.3.5", "version": "2.3.5",
...@@ -628,6 +630,7 @@ ...@@ -628,6 +630,7 @@
"version": "0.5.1", "version": "0.5.1",
"bundled": true, "bundled": true,
"dev": true, "dev": true,
"optional": true,
"requires": { "requires": {
"minimist": "0.0.8" "minimist": "0.0.8"
} }
...@@ -807,7 +810,8 @@ ...@@ -807,7 +810,8 @@
"safe-buffer": { "safe-buffer": {
"version": "5.1.2", "version": "5.1.2",
"bundled": true, "bundled": true,
"dev": true "dev": true,
"optional": true
}, },
"safer-buffer": { "safer-buffer": {
"version": "2.1.2", "version": "2.1.2",
...@@ -863,6 +867,7 @@ ...@@ -863,6 +867,7 @@
"version": "3.0.1", "version": "3.0.1",
"bundled": true, "bundled": true,
"dev": true, "dev": true,
"optional": true,
"requires": { "requires": {
"ansi-regex": "^2.0.0" "ansi-regex": "^2.0.0"
} }
...@@ -906,12 +911,14 @@ ...@@ -906,12 +911,14 @@
"wrappy": { "wrappy": {
"version": "1.0.2", "version": "1.0.2",
"bundled": true, "bundled": true,
"dev": true "dev": true,
"optional": true
}, },
"yallist": { "yallist": {
"version": "3.0.3", "version": "3.0.3",
"bundled": true, "bundled": true,
"dev": true "dev": true,
"optional": true
} }
} }
}, },
...@@ -4336,12 +4343,14 @@ ...@@ -4336,12 +4343,14 @@
"balanced-match": { "balanced-match": {
"version": "1.0.0", "version": "1.0.0",
"bundled": true, "bundled": true,
"dev": true "dev": true,
"optional": true
}, },
"brace-expansion": { "brace-expansion": {
"version": "1.1.11", "version": "1.1.11",
"bundled": true, "bundled": true,
"dev": true, "dev": true,
"optional": true,
"requires": { "requires": {
"balanced-match": "^1.0.0", "balanced-match": "^1.0.0",
"concat-map": "0.0.1" "concat-map": "0.0.1"
...@@ -4356,17 +4365,20 @@ ...@@ -4356,17 +4365,20 @@
"code-point-at": { "code-point-at": {
"version": "1.1.0", "version": "1.1.0",
"bundled": true, "bundled": true,
"dev": true "dev": true,
"optional": true
}, },
"concat-map": { "concat-map": {
"version": "0.0.1", "version": "0.0.1",
"bundled": true, "bundled": true,
"dev": true "dev": true,
"optional": true
}, },
"console-control-strings": { "console-control-strings": {
"version": "1.1.0", "version": "1.1.0",
"bundled": true, "bundled": true,
"dev": true "dev": true,
"optional": true
}, },
"core-util-is": { "core-util-is": {
"version": "1.0.2", "version": "1.0.2",
...@@ -4483,7 +4495,8 @@ ...@@ -4483,7 +4495,8 @@
"inherits": { "inherits": {
"version": "2.0.3", "version": "2.0.3",
"bundled": true, "bundled": true,
"dev": true "dev": true,
"optional": true
}, },
"ini": { "ini": {
"version": "1.3.5", "version": "1.3.5",
...@@ -4495,6 +4508,7 @@ ...@@ -4495,6 +4508,7 @@
"version": "1.0.0", "version": "1.0.0",
"bundled": true, "bundled": true,
"dev": true, "dev": true,
"optional": true,
"requires": { "requires": {
"number-is-nan": "^1.0.0" "number-is-nan": "^1.0.0"
} }
...@@ -4509,6 +4523,7 @@ ...@@ -4509,6 +4523,7 @@
"version": "3.0.4", "version": "3.0.4",
"bundled": true, "bundled": true,
"dev": true, "dev": true,
"optional": true,
"requires": { "requires": {
"brace-expansion": "^1.1.7" "brace-expansion": "^1.1.7"
} }
...@@ -4516,12 +4531,14 @@ ...@@ -4516,12 +4531,14 @@
"minimist": { "minimist": {
"version": "0.0.8", "version": "0.0.8",
"bundled": true, "bundled": true,
"dev": true "dev": true,
"optional": true
}, },
"minipass": { "minipass": {
"version": "2.2.4", "version": "2.2.4",
"bundled": true, "bundled": true,
"dev": true, "dev": true,
"optional": true,
"requires": { "requires": {
"safe-buffer": "^5.1.1", "safe-buffer": "^5.1.1",
"yallist": "^3.0.0" "yallist": "^3.0.0"
...@@ -4540,6 +4557,7 @@ ...@@ -4540,6 +4557,7 @@
"version": "0.5.1", "version": "0.5.1",
"bundled": true, "bundled": true,
"dev": true, "dev": true,
"optional": true,
"requires": { "requires": {
"minimist": "0.0.8" "minimist": "0.0.8"
} }
...@@ -4620,7 +4638,8 @@ ...@@ -4620,7 +4638,8 @@
"number-is-nan": { "number-is-nan": {
"version": "1.0.1", "version": "1.0.1",
"bundled": true, "bundled": true,
"dev": true "dev": true,
"optional": true
}, },
"object-assign": { "object-assign": {
"version": "4.1.1", "version": "4.1.1",
...@@ -4632,6 +4651,7 @@ ...@@ -4632,6 +4651,7 @@
"version": "1.4.0", "version": "1.4.0",
"bundled": true, "bundled": true,
"dev": true, "dev": true,
"optional": true,
"requires": { "requires": {
"wrappy": "1" "wrappy": "1"
} }
...@@ -4753,6 +4773,7 @@ ...@@ -4753,6 +4773,7 @@
"version": "1.0.2", "version": "1.0.2",
"bundled": true, "bundled": true,
"dev": true, "dev": true,
"optional": true,
"requires": { "requires": {
"code-point-at": "^1.0.0", "code-point-at": "^1.0.0",
"is-fullwidth-code-point": "^1.0.0", "is-fullwidth-code-point": "^1.0.0",
......
src/app/home/dashboard/dashboard.component.html
...@@ -231,7 +231,8 @@ ...@@ -231,7 +231,8 @@
<tr> <tr>
<th>Orders</th> <th>Orders</th>
<th>Order Date</th> <th>Order Date</th>
<th>Vehicle</th> <th>Vehicle Model</th>
<th>Vehicle Make</th>
<th>Mechanic</th> <th>Mechanic</th>
<th>Cost</th> <th>Cost</th>
<th>Action</th> <th>Action</th>
...@@ -242,14 +243,55 @@ ...@@ -242,14 +243,55 @@
<td>{{i+1}}</td> <td>{{i+1}}</td>
<td>{{bookData.scheduled_date+' '+bookData.scheduled_time}}</td> <td>{{bookData.scheduled_date+' '+bookData.scheduled_time}}</td>
<td>{{bookData.car_name}}</td> <td>{{bookData.car_name}}</td>
<td>{{bookData.car_name}}</td>
<td>{{bookData.first_name+' '+bookData.last_name}}</td> <td>{{bookData.first_name+' '+bookData.last_name}}</td>
<td>{{bookData.cost}}</td> <td>{{bookData.cost}}</td>
<td> <td>
<div class="floatLeft">
<div class="btn-group btn-group-justified">
<button (click)="cancelBooking(bookData.booking_id)" class="btn btn-danger btn-sm">Reject</button>
</div>
</div>
<div class="booking_drop" data-toggle="collapse" data-target="#quote_list">
</div>
</td>
</tr>
</tbody>
</table>
<table id="quote_list" class="collapse">
<thead>
<tr>
<th>Sl no</th>
<th>Mechanic Name</th>
<th>Contact</th>
<th>Shop name</th>
<th>Rating</th>
<th>Location</th>
<th>Amount</th>
<th>Action</th>
</tr>
</thead>
<tbody>
<tr>
<td>01</td>
<td>John Doe</td>
<td>96153214859</td>
<td>Shop Name</td>
<td>6.4/10</td>
<td>East Bouliward Sydney</td>
<td>$400</td>
<td>
<div class="btn-group btn-group-justified"> <div class="btn-group btn-group-justified">
<button (click)="cancelBooking(bookData.booking_id)" class="btn btn-danger btn-sm">Cancel</button> <button class="btn btn-default btn-sm">Waiting for Approval</button>
<button class="btn btn-success btn-sm">Accept</button>
<button class="btn btn-danger btn-sm">Reject</button>
<button class="btn btn-info btn-sm" data-toggle="modal" data-target="#success">View Quote</button>
</div> </div>
</td> </td>
</tr> </tr>
</tbody> </tbody>
</table> </table>
</ng-template> </ng-template>
...@@ -831,7 +873,51 @@ ...@@ -831,7 +873,51 @@
<div class="modal" id="success"> <div class="modal" id="success">
<div class="modal-dialog modal-full"> <div class="modal-dialog modal-full">
<div class="modal-content login_modal_wrapper"> <div class="modal-content login_modal_wrapper">
GDGDG <div class="modal_close" data-dismiss="modal"> × </div>
<div class="modal-body quote_modal">
<div class="login_modal_content">
<div class="login_modal_inner">
<h3>View quotes</h3>
<table>
<thead>
<tr>
<th width= 20%;>Issues</th>
<th>Description</th>
<th>Amount</th>
</tr>
</thead>
<tbody>
<tr>
<td>Oil Change</td>
<td>
Lorem Ipsum is simply dummy text of the printing and typesetting industry. Lorem Ipsum has been the industry's standard dummy text ever since the 1500s,
</td>
<td>$340</td>
</tr>
<tr>
<td>Oil Change</td>
<td>
Lorem Ipsum is simply dummy text of the printing and typesetting industry. Lorem Ipsum has been the industry's standard dummy text ever since the 1500s,
</td>
<td>$340</td>
</tr>
<tr>
<td>Oil Change</td>
<td>
Lorem Ipsum is simply dummy text of the printing and typesetting industry. Lorem Ipsum has been the industry's standard dummy text ever since the 1500s,
</td>
<td>$340</td>
</tr>
</tbody>
</table>
<div class="row">
<div class="col-md-12 textCenter" style="padding-top:40px;">
<button class="log_btn">Close</button>
</div>
</div>
</div>
</div>
</div>
</div> </div>
</div> </div>
</div> </div>
......
src/app/home/dashboard/dashboard.component.scss
...@@ -94,6 +94,25 @@ ...@@ -94,6 +94,25 @@
} }
.dashboard_tab_content { .dashboard_tab_content {
padding-bottom: 80px; padding-bottom: 80px;
#quote_list{
thead {
background:#2655bf;
tr {
th {
color: #fff;
font-size: 18px;
font-weight: 400;
padding: 5px;
padding-left:20px;
}
}
}
tbody {
}
}
table { table {
width: 100%; width: 100%;
thead { thead {
...@@ -103,11 +122,12 @@ ...@@ -103,11 +122,12 @@
color: #fff; color: #fff;
font-size: 18px; font-size: 18px;
font-weight: 400; font-weight: 400;
padding: 10px; padding: 5px;
padding-left: 25px; padding-left: 20px;
} }
} }
} }
tbody { tbody {
tr { tr {
border-bottom: 1px solid rgba(0, 0, 0, 0.2); border-bottom: 1px solid rgba(0, 0, 0, 0.2);
...@@ -115,7 +135,7 @@ ...@@ -115,7 +135,7 @@
font-size: 16px; font-size: 16px;
font-weight: 400; font-weight: 400;
padding: 10px; padding: 10px;
padding-left: 25px; padding-left: 20px;
p { p {
margin: 0px !important; margin: 0px !important;
padding: 0px !important; padding: 0px !important;
...@@ -129,6 +149,9 @@ ...@@ -129,6 +149,9 @@
.canceled_status { .canceled_status {
color: #b21f2d !important; color: #b21f2d !important;
} }
.btn_set{
padding: 7px;
}
} }
} }
} }
...@@ -578,12 +601,13 @@ ...@@ -578,12 +601,13 @@
display: none; display: none;
} }
.modal_close { .modal_close {
width: 50px; width: 40px;
height: 50px; height: 40px;
border: 1px solid #fff; border: 1px solid #fff;
position: fixed; position: fixed;
top: 10px; top: 20px;
right: 10px; right: 20px;
cursor: pointer;
border-radius: 50%; border-radius: 50%;
-webkit-border-radius: 50%; -webkit-border-radius: 50%;
-moz-border-radius: 50%; -moz-border-radius: 50%;
...@@ -592,7 +616,7 @@ ...@@ -592,7 +616,7 @@
z-index: 999; z-index: 999;
color: #fff; color: #fff;
text-align: center; text-align: center;
font-size: 30px; font-size: 24px;
padding: 0px; padding: 0px;
font-weight: 700; font-weight: 700;
cursor: pointer; cursor: pointer;
...@@ -1498,4 +1522,48 @@ ...@@ -1498,4 +1522,48 @@
agm-map { agm-map {
height: 100%; height: 100%;
} }
\ No newline at end of file
.booking_drop{
width:30px;
height:30px;
background: url("/assets/images/asset_down_time_arrow.png");
float: right;
cursor: pointer;
background-position: center;
background-repeat:no-repeat;
background-size:35px;
}
.quote_modal{
.login_modal_content{
.login_modal_inner{
width:100% !important;
table{
thead{
background: rgba(0, 0, 0, 0.3);
th{
color: #fff;
font-weight: 400;
padding: 5px;
border: 1px solid rgba(0, 0, 0, 0.2);
padding-left: 15px;
}
}
tbody{
tr{
td{
padding:5px;
padding-left: 15px;
border: 1px solid rgba(0, 0, 0, 0.2);
}
}
}
}
}
}
}
\ No newline at end of file
src/app/home/index/index.component.scss
...@@ -362,12 +362,13 @@ ...@@ -362,12 +362,13 @@
} }
.modal_close { .modal_close {
width: 50px; width: 40px;
height: 50px; height: 40px;
border: 1px solid #fff; border: 1px solid #fff;
position: fixed; position: fixed;
top: 10px; top: 20px;
right: 10px; right: 20px;
cursor: pointer;
border-radius: 50%; border-radius: 50%;
-webkit-border-radius: 50%; -webkit-border-radius: 50%;
-moz-border-radius: 50%; -moz-border-radius: 50%;
...@@ -376,7 +377,7 @@ ...@@ -376,7 +377,7 @@
z-index: 999; z-index: 999;
color: #fff; color: #fff;
text-align: center; text-align: center;
font-size: 30px; font-size: 24px;
padding: 0px; padding: 0px;
font-weight: 700; font-weight: 700;
cursor: pointer; cursor: pointer;
......
src/app/navbar/navbar.component.ts
...@@ -231,7 +231,7 @@ export class NavbarComponent implements OnInit { ...@@ -231,7 +231,7 @@ export class NavbarComponent implements OnInit {
$(window).scroll(function() { $(window).scroll(function() {
var sticky = $('.navbar'), var sticky = $('.navbar'),
scroll = $(window).scrollTop(); scroll = $(window).scrollTop();
if (scroll > 10) sticky.addClass('scrolled_navbar'); if (scroll > 1) sticky.addClass('scrolled_navbar');
else sticky.removeClass('scrolled_navbar'); else sticky.removeClass('scrolled_navbar');
}); });
} }
......
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 = 'http://techlabz.in/dcarfixers/Webservices/'; apiConfigUrl = 'http://techlabz.in/dcarfixers/Webservices/';
// imageStorageUrl = 'http://techlabz.in/dcarfixers/'; imageStorageUrl = 'http://techlabz.in/dcarfixers/';
// carfixxers.com // carfixxers.com
// apiConfigUrl = 'https://carfixxers.com/admin/Webservices/'; // 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