From bc35a3c1158c880cc4e38ad007c67c4823b5f651 Mon Sep 17 00:00:00 2001
From: "johnny@pittpc.com" <admin@app.pittpc.com>
Date: Fri, 18 Dec 2020 19:35:27 -0500
Subject: [PATCH] Update Trips Icon

---
 add_trip_copy_modal.php |  2 +-
 add_trip_modal.php      |  6 +++---
 client_side_nav.php     |  2 +-
 client_trips.php        |  2 +-
 dashboard.php           | 28 +++++++++++++---------------
 edit_trip_modal.php     |  2 +-
 side_nav.php            |  2 +-
 trips.php               |  2 +-
 8 files changed, 22 insertions(+), 24 deletions(-)

diff --git a/add_trip_copy_modal.php b/add_trip_copy_modal.php
index 2400ff16..1487096b 100644
--- a/add_trip_copy_modal.php
+++ b/add_trip_copy_modal.php
@@ -2,7 +2,7 @@
   <div class="modal-dialog">
     <div class="modal-content bg-dark">
       <div class="modal-header">
-        <h5 class="modal-title text-white"><i class="fa fa-fw fa-bicycle mr-2"></i>Copy Trip</h5>
+        <h5 class="modal-title text-white"><i class="fa fa-fw fa-route mr-2"></i>Copy Trip</h5>
         <button type="button" class="close text-white" data-dismiss="modal">
           <span aria-hidden="true">&times;</span>
         </button>
diff --git a/add_trip_modal.php b/add_trip_modal.php
index ec4634e4..c1cc7156 100644
--- a/add_trip_modal.php
+++ b/add_trip_modal.php
@@ -2,7 +2,7 @@
   <div class="modal-dialog">
     <div class="modal-content bg-dark">
       <div class="modal-header text-white">
-        <h5 class="modal-title"><i class="fa fa-fw fa-bicycle mr-2"></i>New Trip</h5>
+        <h5 class="modal-title"><i class="fa fa-fw fa-route mr-2"></i>New Trip</h5>
         <button type="button" class="close text-white" data-dismiss="modal">
           <span aria-hidden="true">&times;</span>
         </button>
@@ -10,9 +10,9 @@
       <form action="post.php" method="post" autocomplete="off">
         <div class="modal-body bg-white">
           
-          <ul class="nav nav-pills nav-justified mb-3" id="pills-tab" role="tablist">
+          <ul class="nav nav-pills nav-justified mb-3" id="pills-tab">
             <li class="nav-item">
-              <a class="nav-link active" id="pills-basic-tab" data-toggle="pill" href="#pills-basic" role="tab" aria-controls="pills-basic" aria-selected="true">Basic</a>
+              <a class="nav-link active" id="pills-basic-tab" data-toggle="pill" href="#pills-basic">Basic</a>
             </li>
             <li class="nav-item">
               <a class="nav-link" id="pills-link-tab" data-toggle="pill" href="#pills-link" role="tab" aria-controls="pills-link" aria-selected="false">Link</a>
diff --git a/client_side_nav.php b/client_side_nav.php
index d58d432a..31005a26 100644
--- a/client_side_nav.php
+++ b/client_side_nav.php
@@ -231,7 +231,7 @@
 
         <li class="nav-item">
           <a href="?client_id=<?php echo $client_id; ?>&tab=trips" class="nav-link <?php if($_GET['tab'] == "trips") { echo "active"; } ?>">
-            <i class="nav-icon fas fa-bicycle"></i>
+            <i class="nav-icon fas fa-route"></i>
             <p>
               Trips
               <?php 
diff --git a/client_trips.php b/client_trips.php
index a3aff1e9..11b73c09 100644
--- a/client_trips.php
+++ b/client_trips.php
@@ -63,7 +63,7 @@ $total_pages = ceil($total_found_rows / 10);
 
 <div class="card mb-3">
   <div class="card-header bg-dark text-white">
-    <h6 class="float-left mt-1"><i class="fa fa-fw fa-bicycle mr-2"></i>Trips</h6>
+    <h6 class="float-left mt-1"><i class="fa fa-fw fa-route mr-2"></i>Trips</h6>
     <button type="button" class="btn btn-primary btn-sm float-right" data-toggle="modal" data-target="#addTripModal"><i class="fas fa-plus"></i></button>
   </div>
   <div class="card-body">
diff --git a/dashboard.php b/dashboard.php
index d2b1661d..ce1c00d4 100644
--- a/dashboard.php
+++ b/dashboard.php
@@ -115,7 +115,7 @@ $total_recurring_invoice_amount = $row['total_recurring_invoice_amount'];
     <a class="small-box bg-primary" href="payments.php?dtf=<?php echo $year; ?>-01-01&dtt=<?php echo $year; ?>-12-31">
       <div class="inner">
         <h3>$<?php echo number_format($total_income,2); ?></h3>
-        <p>TOTAL INCOME</p>
+        <p>Total Income</p>
         <hr>
         <small>Recievables: $<?php echo number_format($recievables,2); ?></small>
       </div>
@@ -131,7 +131,7 @@ $total_recurring_invoice_amount = $row['total_recurring_invoice_amount'];
     <a class="small-box bg-danger" href="expenses.php?dtf=<?php echo $year; ?>-01-01&dtt=<?php echo $year; ?>-12-31">
       <div class="inner">
         <h3>$<?php echo number_format($total_expenses,2); ?></h3>
-        <p>TOTAL EXPENSES</p>
+        <p>Total Expenses</p>
       </div>
       <div class="icon">
         <i class="fa fa-shopping-cart"></i>
@@ -145,7 +145,7 @@ $total_recurring_invoice_amount = $row['total_recurring_invoice_amount'];
     <div class="small-box bg-success">
       <div class="inner">
         <h3>$<?php echo number_format($profit,2); ?></h3>
-        <p>TOTAL PROFIT</p>
+        <p>Total Profit</p>
       </div>
       <div class="icon">
         <i class="fa fa-heart"></i>
@@ -159,10 +159,10 @@ $total_recurring_invoice_amount = $row['total_recurring_invoice_amount'];
     <a class="small-box bg-secondary" href="trips.php?dtf=<?php echo $year; ?>-01-01&dtt=<?php echo $year; ?>-12-31">
       <div class="inner">
         <h3><?php echo number_format($total_miles,2); ?></h3>
-        <p>MILE TRAVELED</p>
+        <p>Miles Traveled</p>
       </div>
       <div class="icon">
-        <i class="fa fa-bicycle"></i>
+        <i class="fa fa-route"></i>
       </div>
     </a>
   </div>
@@ -173,7 +173,7 @@ $total_recurring_invoice_amount = $row['total_recurring_invoice_amount'];
     <a class="small-box bg-secondary" href="clients.php?dtf=<?php echo $year; ?>-01-01&dtt=<?php echo $year; ?>-12-31">
       <div class="inner">
         <h3><?php echo $clients_added; ?></h3>
-        <p>NEW CLIENT</p>
+        <p>New Clients</p>
       </div>
       <div class="icon">
         <i class="fa fa-users"></i>
@@ -187,7 +187,7 @@ $total_recurring_invoice_amount = $row['total_recurring_invoice_amount'];
     <a class="small-box bg-secondary" href="vendors.php?dtf=<?php echo $year; ?>-01-01&dtt=<?php echo $year; ?>-12-31">
       <div class="inner">
         <h3><?php echo $vendors_added; ?></h3>
-        <p>NEW VENDORS</p>
+        <p>New Vendors</p>
       </div>
       <div class="icon">
         <i class="fa fa-building"></i>
@@ -218,7 +218,7 @@ $total_recurring_invoice_amount = $row['total_recurring_invoice_amount'];
   <div class="col-md-12">
     <div class="card mb-3">
       <div class="card-header">
-        <h3 class="card-title"><i class="fas fa-fw fa-chart-area"></i> Trip Flow</h3>
+        <h3 class="card-title"><i class="fas fa-fw fa-route"></i> Trip Flow</h3>
         <div class="card-tools">
           <a href="trips.php" class="btn btn-tool">
             <i class="fas fa-eye"></i>
@@ -435,14 +435,13 @@ var myLineChart = new Chart(ctx, {
     labels: ["Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec"],
     datasets: [{
       label: "Income",
-      lineTension: 0.3,
+     
       fill: false,
-      borderColor: "rgba(2,117,216,1)",
-      pointRadius: 5,
-      pointBackgroundColor: "rgba(2,117,216,1)",
-      pointBorderColor: "rgba(255,255,255,0.8)",
+      borderColor: "#007bff",
+      pointBackgroundColor: "#007bff",
+      pointBorderColor: "#007bff",
       pointHoverRadius: 5,
-      pointHoverBackgroundColor: "rgba(2,117,216,1)",
+      pointHoverBackgroundColor: "#007bff",
       pointHitRadius: 50,
       pointBorderWidth: 2,
       data: [
@@ -478,7 +477,6 @@ var myLineChart = new Chart(ctx, {
       lineTension: 0.3,
       fill: false,
       borderColor: "#dc3545",
-      pointRadius: 5,
       pointBackgroundColor: "#dc3545",
       pointBorderColor: "#dc3545",
       pointHoverRadius: 5,
diff --git a/edit_trip_modal.php b/edit_trip_modal.php
index cb632f63..05bf2cd2 100644
--- a/edit_trip_modal.php
+++ b/edit_trip_modal.php
@@ -2,7 +2,7 @@
   <div class="modal-dialog">
     <div class="modal-content bg-dark">
       <div class="modal-header">
-        <h5 class="modal-title text-white"><i class="fa fa-fw fa-bicycle mr-2"></i>Edit Trip</h5>
+        <h5 class="modal-title text-white"><i class="fa fa-fw fa-route mr-2"></i>Edit Trip</h5>
         <button type="button" class="close text-white" data-dismiss="modal">
           <span aria-hidden="true">&times;</span>
         </button>
diff --git a/side_nav.php b/side_nav.php
index 0a8649c7..2fcbb5b7 100644
--- a/side_nav.php
+++ b/side_nav.php
@@ -93,7 +93,7 @@
         </li>
         <li class="nav-item">
           <a href="trips.php" class="nav-link <?php if(basename($_SERVER["PHP_SELF"]) == "trips.php") { echo "active"; } ?>">
-            <i class="nav-icon fas fa-bicycle"></i>
+            <i class="nav-icon fas fa-route"></i>
             <p>Trips</p>
           </a>
         </li>
diff --git a/trips.php b/trips.php
index a671101a..bae3d045 100644
--- a/trips.php
+++ b/trips.php
@@ -62,7 +62,7 @@
 
 <div class="card mb-3">
   <div class="card-header bg-dark text-white">
-    <h6 class="float-left mt-1"><i class="fa fa-fw fa-bicycle mr-2"></i>Trips</h6>
+    <h6 class="float-left mt-1"><i class="fa fa-fw fa-route mr-2"></i>Trips</h6>
     <button type="button" class="btn btn-primary btn-sm float-right" data-toggle="modal" data-target="#addTripModal"><i class="fas fa-plus"></i></button>
   </div>
   <div class="card-body">