Merge pull request #635 from hargata/Hargata/update.demo

Update demo defaults.

.env

@@ -2,7 +2,6 @@ LC_ALL=en_US.UTF-8
 LANG=en_US.UTF-8
 MailConfig__EmailServer=""
 MailConfig__EmailFrom=""
-MailConfig__UseSSL="false"
 MailConfig__Port=587
 MailConfig__Username=""
 MailConfig__Password=""

.github/ISSUE_TEMPLATE/bug_report.md

@@ -10,7 +10,7 @@ assignees: ''
 **Checklist**
 Please make sure you have performed the following steps before opening a new bug ticket, change `[ ]` to `[x]` to mark it as done
 
-- [ ] I have read and tried the steps outlined in the [Troubleshooting Guide](https://docs.lubelogger.com/Troubleshooting)
+- [ ] I have read and tried the steps outlined in the [Troubleshooting Guide](https://docs.lubelogger.com/Installation/Troubleshooting)
 - [ ] I have searched through existing issues.
 
 **Description**

CarCareTracker.csproj

@@ -13,7 +13,8 @@
   <ItemGroup>
     <PackageReference Include="CsvHelper" Version="30.0.1" />
     <PackageReference Include="LiteDB" Version="5.0.17" />
-    <PackageReference Include="Npgsql" Version="8.0.2" />
+    <PackageReference Include="MailKit" Version="4.5.0" />
+    <PackageReference Include="Npgsql" Version="8.0.3" />
     <PackageReference Include="System.IdentityModel.Tokens.Jwt" Version="7.3.1" />
   </ItemGroup>
 

Controllers/APIController.cs

@@ -21,6 +21,9 @@ namespace CarCareTracker.Controllers
         private readonly IReminderRecordDataAccess _reminderRecordDataAccess;
         private readonly IUpgradeRecordDataAccess _upgradeRecordDataAccess;
         private readonly IOdometerRecordDataAccess _odometerRecordDataAccess;
+        private readonly ISupplyRecordDataAccess _supplyRecordDataAccess;
+        private readonly IPlanRecordDataAccess _planRecordDataAccess;
+        private readonly IPlanRecordTemplateDataAccess _planRecordTemplateDataAccess;
         private readonly IUserAccessDataAccess _userAccessDataAccess;
         private readonly IUserRecordDataAccess _userRecordDataAccess;
         private readonly IReminderHelper _reminderHelper;
@@ -42,6 +45,9 @@ namespace CarCareTracker.Controllers
             IReminderRecordDataAccess reminderRecordDataAccess,
             IUpgradeRecordDataAccess upgradeRecordDataAccess,
             IOdometerRecordDataAccess odometerRecordDataAccess,
+            ISupplyRecordDataAccess supplyRecordDataAccess,
+            IPlanRecordDataAccess planRecordDataAccess,
+            IPlanRecordTemplateDataAccess planRecordTemplateDataAccess,
             IUserAccessDataAccess userAccessDataAccess,
             IUserRecordDataAccess userRecordDataAccess,
             IMailHelper mailHelper,
@@ -60,6 +66,9 @@ namespace CarCareTracker.Controllers
             _reminderRecordDataAccess = reminderRecordDataAccess;
             _upgradeRecordDataAccess = upgradeRecordDataAccess;
             _odometerRecordDataAccess = odometerRecordDataAccess;
+            _supplyRecordDataAccess = supplyRecordDataAccess;
+            _planRecordDataAccess = planRecordDataAccess;
+            _planRecordTemplateDataAccess = planRecordTemplateDataAccess;
             _userAccessDataAccess = userAccessDataAccess;
             _userRecordDataAccess = userRecordDataAccess;
             _mailHelper = mailHelper;
@@ -90,19 +99,119 @@ namespace CarCareTracker.Controllers
             }
             return Json(result);
         }
+
+        [HttpGet]
+        [Route("/api/vehicle/info")]
+        public IActionResult VehicleInfo(int vehicleId)
+        {
+            //stats for a specific or all vehicles
+            List<Vehicle> vehicles = new List<Vehicle>();
+            if (vehicleId != default)
+            {
+                if (_userLogic.UserCanEditVehicle(GetUserID(), vehicleId))
+                {
+                    vehicles.Add(_dataAccess.GetVehicleById(vehicleId));
+                } else
+                {
+                    return new RedirectResult("/Error/Unauthorized");
+                }
+            } else
+            {
+                var result = _dataAccess.GetVehicles();
+                if (!User.IsInRole(nameof(UserData.IsRootUser)))
+                {
+                    result = _userLogic.FilterUserVehicles(result, GetUserID());
+                }
+                vehicles.AddRange(result);
+            }
+
+            List<VehicleInfo> apiResult = new List<VehicleInfo>();
+
+            foreach(Vehicle vehicle in vehicles)
+            {
+                var currentMileage = _vehicleLogic.GetMaxMileage(vehicle.Id);
+                var reminders = _reminderRecordDataAccess.GetReminderRecordsByVehicleId(vehicle.Id);
+                var results = _reminderHelper.GetReminderRecordViewModels(reminders, currentMileage, DateTime.Now);
+
+                var serviceRecords = _serviceRecordDataAccess.GetServiceRecordsByVehicleId(vehicle.Id);
+                var repairRecords = _collisionRecordDataAccess.GetCollisionRecordsByVehicleId(vehicle.Id);
+                var upgradeRecords = _upgradeRecordDataAccess.GetUpgradeRecordsByVehicleId(vehicle.Id);
+                var gasRecords = _gasRecordDataAccess.GetGasRecordsByVehicleId(vehicle.Id);
+                var taxRecords = _taxRecordDataAccess.GetTaxRecordsByVehicleId(vehicle.Id);
+                var planRecords = _planRecordDataAccess.GetPlanRecordsByVehicleId(vehicle.Id);
+
+                var resultToAdd = new VehicleInfo()
+                {
+                    VehicleData = vehicle,
+                    LastReportedOdometer = currentMileage,
+                    ServiceRecordCount = serviceRecords.Count(),
+                    ServiceRecordCost = serviceRecords.Sum(x=>x.Cost),
+                    RepairRecordCount = repairRecords.Count(),
+                    RepairRecordCost = repairRecords.Sum(x=>x.Cost),
+                    UpgradeRecordCount = upgradeRecords.Count(),
+                    UpgradeRecordCost = upgradeRecords.Sum(x=>x.Cost),
+                    GasRecordCount = gasRecords.Count(),
+                    GasRecordCost = gasRecords.Sum(x=>x.Cost),
+                    TaxRecordCount = taxRecords.Count(),
+                    TaxRecordCost = taxRecords.Sum(x=> x.Cost),
+                    VeryUrgentReminderCount = results.Count(x => x.Urgency == ReminderUrgency.VeryUrgent),
+                    PastDueReminderCount = results.Count(x => x.Urgency == ReminderUrgency.PastDue),
+                    UrgentReminderCount = results.Count(x => x.Urgency == ReminderUrgency.Urgent),
+                    NotUrgentReminderCount = results.Count(x => x.Urgency == ReminderUrgency.NotUrgent),
+                    PlanRecordBackLogCount = planRecords.Count(x=>x.Progress == PlanProgress.Backlog),
+                    PlanRecordInProgressCount = planRecords.Count(x=>x.Progress == PlanProgress.InProgress),
+                    PlanRecordTestingCount = planRecords.Count(x=>x.Progress == PlanProgress.Testing),
+                    PlanRecordDoneCount = planRecords.Count(x=>x.Progress == PlanProgress.Done)
+                };
+                //set next reminder
+                if (results.Any(x => (x.Metric == ReminderMetric.Date || x.Metric == ReminderMetric.Both) && x.Date >= DateTime.Now.Date))
+                {
+                    resultToAdd.NextReminder = results.Where(x => x.Date >= DateTime.Now.Date).OrderBy(x => x.Date).Select(x => new ReminderExportModel { Description = x.Description, Urgency = x.Urgency.ToString(), Metric = x.Metric.ToString(), Notes = x.Notes, DueDate = x.Date.ToShortDateString(), DueOdometer = x.Mileage.ToString() }).First();
+                }
+                else if (results.Any(x => (x.Metric == ReminderMetric.Odometer || x.Metric == ReminderMetric.Both) && x.Mileage >= currentMileage))
+                {
+                    resultToAdd.NextReminder = results.Where(x => x.Mileage >= currentMileage).OrderBy(x => x.Mileage).Select(x => new ReminderExportModel { Description = x.Description, Urgency = x.Urgency.ToString(), Metric = x.Metric.ToString(), Notes = x.Notes, DueDate = x.Date.ToShortDateString(), DueOdometer = x.Mileage.ToString() }).First();
+                }
+                apiResult.Add(resultToAdd);
+            }
+            return Json(apiResult);
+        }
+        [TypeFilter(typeof(CollaboratorFilter))]
+        [HttpGet]
+        [Route("/api/vehicle/adjustedodometer")]
+        public IActionResult AdjustedOdometer(int vehicleId, int odometer)
+        {
+            var vehicle = _dataAccess.GetVehicleById(vehicleId);
+            if (vehicle == null || !vehicle.HasOdometerAdjustment)
+            {
+                return Json(odometer);
+            } else
+            {
+                var convertedOdometer = (odometer + int.Parse(vehicle.OdometerDifference)) * int.Parse(vehicle.OdometerMultiplier);
+                return Json(convertedOdometer);
+            }
+        }
         [TypeFilter(typeof(CollaboratorFilter))]
         [HttpGet]
         [Route("/api/vehicle/servicerecords")]
         public IActionResult ServiceRecords(int vehicleId)
         {
+            if (vehicleId == default)
+            {
+                var response = new OperationResponse();
+                response.Success = false;
+                response.Message = "Must provide a valid vehicle id";
+                Response.StatusCode = 400;
+                return Json(response);
+            }
             var vehicleRecords = _serviceRecordDataAccess.GetServiceRecordsByVehicleId(vehicleId);
-            var result = vehicleRecords.Select(x => new ServiceRecordExportModel { Date = x.Date.ToShortDateString(), Description = x.Description, Cost = x.Cost.ToString(), Notes = x.Notes, Odometer = x.Mileage.ToString() });
+            var result = vehicleRecords.Select(x => new GenericRecordExportModel { Date = x.Date.ToShortDateString(), Description = x.Description, Cost = x.Cost.ToString(), Notes = x.Notes, Odometer = x.Mileage.ToString(), ExtraFields = x.ExtraFields });
             return Json(result);
         }
         [TypeFilter(typeof(CollaboratorFilter))]
         [HttpPost]
         [Route("/api/vehicle/servicerecords/add")]
-        public IActionResult AddServiceRecord(int vehicleId, ServiceRecordExportModel input)
+        public IActionResult AddServiceRecord(int vehicleId, GenericRecordExportModel input)
         {
             var response = new OperationResponse();
             if (vehicleId == default)
@@ -131,7 +240,8 @@ namespace CarCareTracker.Controllers
                     Mileage = int.Parse(input.Odometer),
                     Description = input.Description,
                     Notes = string.IsNullOrWhiteSpace(input.Notes) ? "" : input.Notes,
-                    Cost = decimal.Parse(input.Cost)
+                    Cost = decimal.Parse(input.Cost),
+                    ExtraFields = input.ExtraFields
                 };
                 _serviceRecordDataAccess.SaveServiceRecordToVehicle(serviceRecord);
                 if (_config.GetUserConfig(User).EnableAutoOdometerInsert)
@@ -163,14 +273,22 @@ namespace CarCareTracker.Controllers
         [Route("/api/vehicle/repairrecords")]
         public IActionResult RepairRecords(int vehicleId)
         {
+            if (vehicleId == default)
+            {
+                var response = new OperationResponse();
+                response.Success = false;
+                response.Message = "Must provide a valid vehicle id";
+                Response.StatusCode = 400;
+                return Json(response);
+            }
             var vehicleRecords = _collisionRecordDataAccess.GetCollisionRecordsByVehicleId(vehicleId);
-            var result = vehicleRecords.Select(x => new ServiceRecordExportModel { Date = x.Date.ToShortDateString(), Description = x.Description, Cost = x.Cost.ToString(), Notes = x.Notes, Odometer = x.Mileage.ToString() });
+            var result = vehicleRecords.Select(x => new GenericRecordExportModel { Date = x.Date.ToShortDateString(), Description = x.Description, Cost = x.Cost.ToString(), Notes = x.Notes, Odometer = x.Mileage.ToString(), ExtraFields = x.ExtraFields });
             return Json(result);
         }
         [TypeFilter(typeof(CollaboratorFilter))]
         [HttpPost]
         [Route("/api/vehicle/repairrecords/add")]
-        public IActionResult AddRepairRecord(int vehicleId, ServiceRecordExportModel input)
+        public IActionResult AddRepairRecord(int vehicleId, GenericRecordExportModel input)
         {
             var response = new OperationResponse();
             if (vehicleId == default)
@@ -199,7 +317,8 @@ namespace CarCareTracker.Controllers
                     Mileage = int.Parse(input.Odometer),
                     Description = input.Description,
                     Notes = string.IsNullOrWhiteSpace(input.Notes) ? "" : input.Notes,
-                    Cost = decimal.Parse(input.Cost)
+                    Cost = decimal.Parse(input.Cost),
+                    ExtraFields = input.ExtraFields
                 };
                 _collisionRecordDataAccess.SaveCollisionRecordToVehicle(repairRecord);
                 if (_config.GetUserConfig(User).EnableAutoOdometerInsert)
@@ -231,14 +350,22 @@ namespace CarCareTracker.Controllers
         [Route("/api/vehicle/upgraderecords")]
         public IActionResult UpgradeRecords(int vehicleId)
         {
+            if (vehicleId == default)
+            {
+                var response = new OperationResponse();
+                response.Success = false;
+                response.Message = "Must provide a valid vehicle id";
+                Response.StatusCode = 400;
+                return Json(response);
+            }
             var vehicleRecords = _upgradeRecordDataAccess.GetUpgradeRecordsByVehicleId(vehicleId);
-            var result = vehicleRecords.Select(x => new ServiceRecordExportModel { Date = x.Date.ToShortDateString(), Description = x.Description, Cost = x.Cost.ToString(), Notes = x.Notes, Odometer = x.Mileage.ToString() });
+            var result = vehicleRecords.Select(x => new GenericRecordExportModel { Date = x.Date.ToShortDateString(), Description = x.Description, Cost = x.Cost.ToString(), Notes = x.Notes, Odometer = x.Mileage.ToString(), ExtraFields = x.ExtraFields });
             return Json(result);
         }
         [TypeFilter(typeof(CollaboratorFilter))]
         [HttpPost]
         [Route("/api/vehicle/upgraderecords/add")]
-        public IActionResult AddUpgradeRecord(int vehicleId, ServiceRecordExportModel input)
+        public IActionResult AddUpgradeRecord(int vehicleId, GenericRecordExportModel input)
         {
             var response = new OperationResponse();
             if (vehicleId == default)
@@ -267,7 +394,8 @@ namespace CarCareTracker.Controllers
                     Mileage = int.Parse(input.Odometer),
                     Description = input.Description,
                     Notes = string.IsNullOrWhiteSpace(input.Notes) ? "" : input.Notes,
-                    Cost = decimal.Parse(input.Cost)
+                    Cost = decimal.Parse(input.Cost),
+                    ExtraFields = input.ExtraFields
                 };
                 _upgradeRecordDataAccess.SaveUpgradeRecordToVehicle(upgradeRecord);
                 if (_config.GetUserConfig(User).EnableAutoOdometerInsert)
@@ -299,7 +427,15 @@ namespace CarCareTracker.Controllers
         [Route("/api/vehicle/taxrecords")]
         public IActionResult TaxRecords(int vehicleId)
         {
-            var result = _taxRecordDataAccess.GetTaxRecordsByVehicleId(vehicleId);
+            if (vehicleId == default)
+            {
+                var response = new OperationResponse();
+                response.Success = false;
+                response.Message = "Must provide a valid vehicle id";
+                Response.StatusCode = 400;
+                return Json(response);
+            }
+            var result = _taxRecordDataAccess.GetTaxRecordsByVehicleId(vehicleId).Select(x => new TaxRecordExportModel { Date = x.Date.ToShortDateString(), Description = x.Description, Cost = x.Cost.ToString(), Notes = x.Notes, ExtraFields = x.ExtraFields });
             return Json(result);
         }
         [TypeFilter(typeof(CollaboratorFilter))]
@@ -332,7 +468,8 @@ namespace CarCareTracker.Controllers
                     Date = DateTime.Parse(input.Date),
                     Description = input.Description,
                     Notes = string.IsNullOrWhiteSpace(input.Notes) ? "" : input.Notes,
-                    Cost = decimal.Parse(input.Cost)
+                    Cost = decimal.Parse(input.Cost),
+                    ExtraFields = input.ExtraFields
                 };
                 _taxRecordDataAccess.SaveTaxRecordToVehicle(taxRecord);
                 StaticHelper.NotifyAsync(_config.GetWebHookUrl(), vehicleId, User.Identity.Name, $"Added Tax Record via API - Description: {taxRecord.Description}");
@@ -353,6 +490,14 @@ namespace CarCareTracker.Controllers
         [Route("/api/vehicle/odometerrecords/latest")]
         public IActionResult LastOdometer(int vehicleId)
         {
+            if (vehicleId == default)
+            {
+                var response = new OperationResponse();
+                response.Success = false;
+                response.Message = "Must provide a valid vehicle id";
+                Response.StatusCode = 400;
+                return Json(response);
+            }
             var result = _vehicleLogic.GetMaxMileage(vehicleId);
             return Json(result);
         }
@@ -361,13 +506,21 @@ namespace CarCareTracker.Controllers
         [Route("/api/vehicle/odometerrecords")]
         public IActionResult OdometerRecords(int vehicleId)
         {
+            if (vehicleId == default)
+            {
+                var response = new OperationResponse();
+                response.Success = false;
+                response.Message = "Must provide a valid vehicle id";
+                Response.StatusCode = 400;
+                return Json(response);
+            }
             var vehicleRecords = _odometerRecordDataAccess.GetOdometerRecordsByVehicleId(vehicleId);
             //determine if conversion is needed.
             if (vehicleRecords.All(x => x.InitialMileage == default))
             {
                 vehicleRecords = _odometerLogic.AutoConvertOdometerRecord(vehicleRecords);
             }
-            var result = vehicleRecords.Select(x => new OdometerRecordExportModel { Date = x.Date.ToShortDateString(), InitialOdometer = x.InitialMileage.ToString(), Odometer = x.Mileage.ToString(), Notes = x.Notes });
+            var result = vehicleRecords.Select(x => new OdometerRecordExportModel { Date = x.Date.ToShortDateString(), InitialOdometer = x.InitialMileage.ToString(), Odometer = x.Mileage.ToString(), Notes = x.Notes, ExtraFields = x.ExtraFields });
             return Json(result);
         }
         [TypeFilter(typeof(CollaboratorFilter))]
@@ -399,7 +552,8 @@ namespace CarCareTracker.Controllers
                     Date = DateTime.Parse(input.Date),
                     Notes = string.IsNullOrWhiteSpace(input.Notes) ? "" : input.Notes,
                     InitialMileage = (string.IsNullOrWhiteSpace(input.InitialOdometer) || int.Parse(input.InitialOdometer) == default) ? _odometerLogic.GetLastOdometerRecordMileage(vehicleId, new List<OdometerRecord>()) : int.Parse(input.InitialOdometer),
-                    Mileage = int.Parse(input.Odometer)
+                    Mileage = int.Parse(input.Odometer),
+                    ExtraFields = input.ExtraFields
                 };
                 _odometerRecordDataAccess.SaveOdometerRecordToVehicle(odometerRecord);
                 StaticHelper.NotifyAsync(_config.GetWebHookUrl(), vehicleId, User.Identity.Name, $"Added Odometer Record via API - Mileage: {odometerRecord.Mileage.ToString()}");
@@ -419,6 +573,14 @@ namespace CarCareTracker.Controllers
         [Route("/api/vehicle/gasrecords")]
         public IActionResult GasRecords(int vehicleId, bool useMPG, bool useUKMPG)
         {
+            if (vehicleId == default)
+            {
+                var response = new OperationResponse();
+                response.Success = false;
+                response.Message = "Must provide a valid vehicle id";
+                Response.StatusCode = 400;
+                return Json(response);
+            }
             var vehicleRecords = _gasRecordDataAccess.GetGasRecordsByVehicleId(vehicleId);
             var result = _gasHelper.GetGasRecordViewModels(vehicleRecords, useMPG, useUKMPG)
                 .Select(x => new GasRecordExportModel { 
@@ -429,7 +591,8 @@ namespace CarCareTracker.Controllers
                     FuelEconomy = x.MilesPerGallon.ToString(),
                     IsFillToFull = x.IsFillToFull.ToString(),
                     MissedFuelUp = x.MissedFuelUp.ToString(),
-                    Notes = x.Notes
+                    Notes = x.Notes,
+                    ExtraFields = x.ExtraFields
                 });
             return Json(result);
         }
@@ -470,7 +633,8 @@ namespace CarCareTracker.Controllers
                     IsFillToFull = bool.Parse(input.IsFillToFull),
                     MissedFuelUp = bool.Parse(input.MissedFuelUp),
                     Notes = string.IsNullOrWhiteSpace(input.Notes) ? "" : input.Notes,
-                    Cost = decimal.Parse(input.Cost)
+                    Cost = decimal.Parse(input.Cost),
+                    ExtraFields = input.ExtraFields
                 };
                 _gasRecordDataAccess.SaveGasRecordToVehicle(gasRecord);
                 if (_config.GetUserConfig(User).EnableAutoOdometerInsert)
@@ -502,9 +666,17 @@ namespace CarCareTracker.Controllers
         [Route("/api/vehicle/reminders")]
         public IActionResult Reminders(int vehicleId)
         {
+            if (vehicleId == default)
+            {
+                var response = new OperationResponse();
+                response.Success = false;
+                response.Message = "Must provide a valid vehicle id";
+                Response.StatusCode = 400;
+                return Json(response);
+            }
             var currentMileage = _vehicleLogic.GetMaxMileage(vehicleId);
             var reminders = _reminderRecordDataAccess.GetReminderRecordsByVehicleId(vehicleId);
-            var results = _reminderHelper.GetReminderRecordViewModels(reminders, currentMileage, DateTime.Now).Select(x=> new ReminderExportModel {  Description = x.Description, Urgency = x.Urgency.ToString(), Metric = x.Metric.ToString(), Notes = x.Notes});
+            var results = _reminderHelper.GetReminderRecordViewModels(reminders, currentMileage, DateTime.Now).Select(x=> new ReminderExportModel {  Description = x.Description, Urgency = x.Urgency.ToString(), Metric = x.Metric.ToString(), Notes = x.Notes, DueDate = x.Date.ToShortDateString(), DueOdometer = x.Mileage.ToString()});
             return Json(results);
         }
         [Authorize(Roles = nameof(UserData.IsRootUser))]
@@ -514,6 +686,7 @@ namespace CarCareTracker.Controllers
         {
             var vehicles = _dataAccess.GetVehicles();
             List<OperationResponse> operationResponses = new List<OperationResponse>();
+            var defaultEmailAddress = _config.GetUserConfig(User).DefaultReminderEmail;
             foreach(Vehicle vehicle in vehicles)
             {
                 var vehicleId = vehicle.Id;
@@ -529,6 +702,10 @@ namespace CarCareTracker.Controllers
                 //get list of recipients.
                 var userIds = _userAccessDataAccess.GetUserAccessByVehicleId(vehicleId).Select(x => x.Id.UserId);
                 List<string> emailRecipients = new List<string>();
+                if (!string.IsNullOrWhiteSpace(defaultEmailAddress))
+                {
+                    emailRecipients.Add(defaultEmailAddress);
+                }
                 foreach (int userId in userIds)
                 {
                     var userData = _userRecordDataAccess.GetUserRecordById(userId);
@@ -541,15 +718,19 @@ namespace CarCareTracker.Controllers
                 var result = _mailHelper.NotifyUserForReminders(vehicle, emailRecipients, results);
                 operationResponses.Add(result);
             }
-            if (operationResponses.All(x => x.Success))
+            if (!operationResponses.Any())
             {
-                return Json(new OperationResponse { Success = true, Message = "Emails sent" });
+                return Json(new OperationResponse { Success = false, Message = "No Emails Sent, No Vehicles Available or No Recipients Configured" });
+            }
+            else if (operationResponses.All(x => x.Success))
+            {
+                return Json(new OperationResponse { Success = true, Message = $"Emails Sent({operationResponses.Count()})" });
             } else if (operationResponses.All(x => !x.Success))
             {
-                return Json(new OperationResponse { Success = false, Message = "All emails failed, check SMTP settings" });
+                return Json(new OperationResponse { Success = false, Message = $"All Emails Failed({operationResponses.Count()}), Check SMTP Settings" });
             } else
             {
-                return Json(new OperationResponse { Success = true, Message = "Some emails sent, some failed, check recipient settings" });
+                return Json(new OperationResponse { Success = true, Message = $"Emails Sent({operationResponses.Count(x => x.Success)}), Emails Failed({operationResponses.Count(x => !x.Success)}), Check Recipient Settings" });
             }
         }
         [Authorize(Roles = nameof(UserData.IsRootUser))]
@@ -562,6 +743,49 @@ namespace CarCareTracker.Controllers
         }
         [Authorize(Roles = nameof(UserData.IsRootUser))]
         [HttpGet]
+        [Route("/api/cleanup")]
+        public IActionResult CleanUp(bool deepClean = false)
+        {
+            var jsonResponse = new Dictionary<string, string>();
+            //Clear out temp folder
+            var tempFilesDeleted = _fileHelper.ClearTempFolder();
+            jsonResponse.Add("temp_files_deleted", tempFilesDeleted.ToString());
+            if (deepClean)
+            {
+                //clear out unused vehicle thumbnails
+                var vehicles = _dataAccess.GetVehicles();
+                var vehicleImages = vehicles.Select(x => x.ImageLocation).Where(x => x.StartsWith("/images/")).Select(x=>Path.GetFileName(x)).ToList();
+                if (vehicleImages.Any())
+                {
+                    var thumbnailsDeleted = _fileHelper.ClearUnlinkedThumbnails(vehicleImages);
+                    jsonResponse.Add("unlinked_thumbnails_deleted", thumbnailsDeleted.ToString());
+                }
+                var vehicleDocuments = new List<string>();
+                foreach(Vehicle vehicle in vehicles)
+                {
+                    vehicleDocuments.AddRange(_serviceRecordDataAccess.GetServiceRecordsByVehicleId(vehicle.Id).SelectMany(x => x.Files).Select(y=>Path.GetFileName(y.Location)));
+                    vehicleDocuments.AddRange(_collisionRecordDataAccess.GetCollisionRecordsByVehicleId(vehicle.Id).SelectMany(x => x.Files).Select(y => Path.GetFileName(y.Location)));
+                    vehicleDocuments.AddRange(_upgradeRecordDataAccess.GetUpgradeRecordsByVehicleId(vehicle.Id).SelectMany(x => x.Files).Select(y => Path.GetFileName(y.Location)));
+                    vehicleDocuments.AddRange(_taxRecordDataAccess.GetTaxRecordsByVehicleId(vehicle.Id).SelectMany(x => x.Files).Select(y => Path.GetFileName(y.Location)));
+                    vehicleDocuments.AddRange(_gasRecordDataAccess.GetGasRecordsByVehicleId(vehicle.Id).SelectMany(x => x.Files).Select(y => Path.GetFileName(y.Location)));
+                    vehicleDocuments.AddRange(_noteDataAccess.GetNotesByVehicleId(vehicle.Id).SelectMany(x => x.Files).Select(y => Path.GetFileName(y.Location)));
+                    vehicleDocuments.AddRange(_odometerRecordDataAccess.GetOdometerRecordsByVehicleId(vehicle.Id).SelectMany(x => x.Files).Select(y => Path.GetFileName(y.Location)));
+                    vehicleDocuments.AddRange(_supplyRecordDataAccess.GetSupplyRecordsByVehicleId(vehicle.Id).SelectMany(x => x.Files).Select(y => Path.GetFileName(y.Location)));
+                    vehicleDocuments.AddRange(_planRecordDataAccess.GetPlanRecordsByVehicleId(vehicle.Id).SelectMany(x => x.Files).Select(y => Path.GetFileName(y.Location)));
+                    vehicleDocuments.AddRange(_planRecordTemplateDataAccess.GetPlanRecordTemplatesByVehicleId(vehicle.Id).SelectMany(x => x.Files).Select(y => Path.GetFileName(y.Location)));
+                }
+                //shop supplies
+                vehicleDocuments.AddRange(_supplyRecordDataAccess.GetSupplyRecordsByVehicleId(0).SelectMany(x => x.Files).Select(y => Path.GetFileName(y.Location)));
+                if (vehicleDocuments.Any())
+                {
+                    var documentsDeleted = _fileHelper.ClearUnlinkedDocuments(vehicleDocuments);
+                    jsonResponse.Add("unlinked_documents_deleted", documentsDeleted.ToString());
+                }
+            }
+            return Json(jsonResponse);
+        }
+        [Authorize(Roles = nameof(UserData.IsRootUser))]
+        [HttpGet]
         [Route("/api/demo/restore")]
         public IActionResult RestoreDemo()
         {

Controllers/HomeController.cs

@@ -59,21 +59,50 @@ namespace CarCareTracker.Controllers
             {
                 vehiclesStored = _userLogic.FilterUserVehicles(vehiclesStored, GetUserID());
             }
-            var vehicleViewModels = vehiclesStored.Select(x => new VehicleViewModel
-            {
-                Id = x.Id,
-                ImageLocation = x.ImageLocation,
-                Year = x.Year,
-                Make = x.Make,
-                Model = x.Model,
-                LicensePlate = x.LicensePlate,
-                SoldDate = x.SoldDate,
-                IsElectric = x.IsElectric,
-                UseHours = x.UseHours,
-                ExtraFields = x.ExtraFields,
-                Tags = x.Tags,
-                LastReportedMileage = _vehicleLogic.GetMaxMileage(x.Id),
-                HasReminders = _vehicleLogic.GetVehicleHasUrgentOrPastDueReminders(x.Id)
+            var vehicleViewModels = vehiclesStored.Select(x => {
+                var vehicleVM = new VehicleViewModel
+                {
+                    Id = x.Id,
+                    ImageLocation = x.ImageLocation,
+                    Year = x.Year,
+                    Make = x.Make,
+                    Model = x.Model,
+                    LicensePlate = x.LicensePlate,
+                    SoldDate = x.SoldDate,
+                    IsElectric = x.IsElectric,
+                    IsDiesel = x.IsDiesel,
+                    UseHours = x.UseHours,
+                    OdometerOptional = x.OdometerOptional,
+                    ExtraFields = x.ExtraFields,
+                    Tags = x.Tags,
+                    DashboardMetrics = x.DashboardMetrics
+                };
+                //dashboard metrics
+                if (x.DashboardMetrics.Any())
+                {
+                    var vehicleRecords = _vehicleLogic.GetVehicleRecords(x.Id);
+                    var userConfig = _config.GetUserConfig(User);
+                    var distanceUnit = x.UseHours ? "h" : userConfig.UseMPG ? "mi." : "km";
+                    if (vehicleVM.DashboardMetrics.Contains(DashboardMetric.Default))
+                    {
+                        vehicleVM.LastReportedMileage = _vehicleLogic.GetMaxMileage(vehicleRecords);
+                        vehicleVM.HasReminders = _vehicleLogic.GetVehicleHasUrgentOrPastDueReminders(x.Id, vehicleVM.LastReportedMileage);
+                    }
+                    if (vehicleVM.DashboardMetrics.Contains(DashboardMetric.CostPerMile))
+                    {
+                        var vehicleTotalCost = _vehicleLogic.GetVehicleTotalCost(vehicleRecords);
+                        var maxMileage = _vehicleLogic.GetMaxMileage(vehicleRecords);
+                        var minMileage = _vehicleLogic.GetMinMileage(vehicleRecords);
+                        var totalDistance = maxMileage - minMileage;
+                        vehicleVM.CostPerMile = totalDistance != default ? vehicleTotalCost / totalDistance : 0.00M;
+                        vehicleVM.DistanceUnit = distanceUnit;
+                    }
+                    if (vehicleVM.DashboardMetrics.Contains(DashboardMetric.TotalCost))
+                    {
+                        vehicleVM.TotalCost = _vehicleLogic.GetVehicleTotalCost(vehicleRecords);
+                    }
+                }
+                return vehicleVM;
             }).ToList();
             return PartialView("_GarageDisplay", vehicleViewModels);
         }
@@ -105,7 +134,7 @@ namespace CarCareTracker.Controllers
             var reminderUrgency = _reminderHelper.GetReminderRecordViewModels(new List<ReminderRecord> { reminder }, 0, DateTime.Now).FirstOrDefault();
             return PartialView("_ReminderRecordCalendarModal", reminderUrgency);
         }
-        public IActionResult Settings()
+        public async Task<IActionResult> Settings()
         {
             var userConfig = _config.GetUserConfig(User);
             var languages = _fileHelper.GetLanguages();
@@ -114,6 +143,16 @@ namespace CarCareTracker.Controllers
                 UserConfig = userConfig,
                 UILanguages = languages
             };
+            try
+            {
+                var httpClient = new HttpClient();
+                var sponsorsData = await httpClient.GetFromJsonAsync<Sponsors>(StaticHelper.SponsorsPath) ?? new Sponsors();
+                viewModel.Sponsors = sponsorsData;
+            }
+            catch (Exception ex)
+            {
+                _logger.LogError($"Unable to retrieve sponsors: {ex.Message}");
+            }
             return PartialView("_Settings", viewModel);
         }
         [HttpPost]
@@ -209,6 +248,13 @@ namespace CarCareTracker.Controllers
             var userName = User.Identity.Name;
             return PartialView("_AccountModal", new UserData() { EmailAddress = emailAddress, UserName = userName });
         }
+        [Authorize(Roles = nameof(UserData.IsRootUser))]
+        [HttpGet]
+        public IActionResult GetRootAccountInformationModal()
+        {
+            var userName = User.Identity.Name;
+            return PartialView("_RootAccountModal", new UserData() { UserName = userName });
+        }
         [ResponseCache(Duration = 0, Location = ResponseCacheLocation.None, NoStore = true)]
         public IActionResult Error()
         {

Controllers/LoginController.cs

@@ -34,10 +34,16 @@ namespace CarCareTracker.Controllers
             {
                 var generatedState = Guid.NewGuid().ToString().Substring(0, 8);
                 remoteAuthConfig.State = generatedState;
+                var pkceKeyPair = _loginLogic.GetPKCEChallengeCode();
+                remoteAuthConfig.CodeChallenge = pkceKeyPair.Value;
                 if (remoteAuthConfig.ValidateState)
                 {
                     Response.Cookies.Append("OIDC_STATE", remoteAuthConfig.State, new CookieOptions { Expires = new DateTimeOffset(DateTime.Now.AddMinutes(5)) });
                 }
+                if (remoteAuthConfig.UsePKCE)
+                {
+                    Response.Cookies.Append("OIDC_VERIFIER", pkceKeyPair.Key, new CookieOptions { Expires = new DateTimeOffset(DateTime.Now.AddMinutes(5)) });
+                }
                 var remoteAuthURL = remoteAuthConfig.RemoteAuthURL;
                 return Redirect(remoteAuthURL);
             }
@@ -45,6 +51,10 @@ namespace CarCareTracker.Controllers
         }
         public IActionResult Registration()
         {
+            if (_config.GetServerDisabledRegistration())
+            {
+                return RedirectToAction("Index");
+            }
             return View();
         }
         public IActionResult ForgotPassword()
@@ -60,10 +70,16 @@ namespace CarCareTracker.Controllers
             var remoteAuthConfig = _config.GetOpenIDConfig();
             var generatedState = Guid.NewGuid().ToString().Substring(0, 8);
             remoteAuthConfig.State = generatedState;
+            var pkceKeyPair = _loginLogic.GetPKCEChallengeCode();
+            remoteAuthConfig.CodeChallenge = pkceKeyPair.Value;
             if (remoteAuthConfig.ValidateState)
             {
                 Response.Cookies.Append("OIDC_STATE", remoteAuthConfig.State, new CookieOptions { Expires = new DateTimeOffset(DateTime.Now.AddMinutes(5)) });
             }
+            if (remoteAuthConfig.UsePKCE)
+            {
+                Response.Cookies.Append("OIDC_VERIFIER", pkceKeyPair.Key, new CookieOptions { Expires = new DateTimeOffset(DateTime.Now.AddMinutes(5)) });
+            }
             var remoteAuthURL = remoteAuthConfig.RemoteAuthURL;
             return Json(remoteAuthURL);
         }
@@ -99,6 +115,16 @@ namespace CarCareTracker.Controllers
                      new KeyValuePair<string, string>("client_secret", openIdConfig.ClientSecret),
                      new KeyValuePair<string, string>("redirect_uri", openIdConfig.RedirectURL)
                 };
+                    if (openIdConfig.UsePKCE)
+                    {
+                        //retrieve stored challenge verifier
+                        var storedVerifier = Request.Cookies["OIDC_VERIFIER"];
+                        if (!string.IsNullOrWhiteSpace(storedVerifier))
+                        {
+                            httpParams.Add(new KeyValuePair<string, string>("code_verifier", storedVerifier));
+                            Response.Cookies.Delete("OIDC_VERIFIER");
+                        }
+                    }
                     var httpRequest = new HttpRequestMessage(HttpMethod.Post, openIdConfig.TokenURL)
                     {
                         Content = new FormUrlEncodedContent(httpParams)
@@ -137,6 +163,11 @@ namespace CarCareTracker.Controllers
                     } else
                     {
                         _logger.LogInformation("OpenID Provider did not provide a valid id_token");
+                        if (!string.IsNullOrWhiteSpace(tokenResult))
+                        {
+                            //if something was returned from the IdP but it's invalid, we want to log it as an error.
+                            _logger.LogError($"Expected id_token, received {tokenResult}");
+                        }
                     }
                 } else
                 {
@@ -220,7 +251,7 @@ namespace CarCareTracker.Controllers
             var result = _loginLogic.ResetPasswordByUser(credentials);
             return Json(result);
         }
-        [Authorize] //User must already be logged in to do this.
+        [Authorize(Roles = nameof(UserData.IsRootUser))] //User must already be logged in as root user to do this.
         [HttpPost]
         public IActionResult CreateLoginCreds(LoginModel credentials)
         {
@@ -235,7 +266,7 @@ namespace CarCareTracker.Controllers
             }
             return Json(false);
         }
-        [Authorize]
+        [Authorize(Roles = nameof(UserData.IsRootUser))]
         [HttpPost]
         public IActionResult DestroyLoginCreds()
         {

Controllers/VehicleController.cs

@@ -219,37 +219,53 @@ namespace CarCareTracker.Controllers
             string uploadPath = Path.Combine(_webEnv.WebRootPath, uploadDirectory);
             if (!Directory.Exists(uploadPath))
                 Directory.CreateDirectory(uploadPath);
+            var fileNameToExport = $"temp/{Guid.NewGuid()}.csv";
+            var fullExportFilePath = _fileHelper.GetFullFilePath(fileNameToExport, false);
             if (mode == ImportMode.ServiceRecord)
             {
-                var fileNameToExport = $"temp/{Guid.NewGuid()}.csv";
-                var fullExportFilePath = _fileHelper.GetFullFilePath(fileNameToExport, false);
                 var vehicleRecords = _serviceRecordDataAccess.GetServiceRecordsByVehicleId(vehicleId);
                 if (vehicleRecords.Any())
                 {
-                    var exportData = vehicleRecords.Select(x => new ServiceRecordExportModel { Date = x.Date.ToShortDateString(), Description = x.Description, Cost = x.Cost.ToString("C"), Notes = x.Notes, Odometer = x.Mileage.ToString(), Tags = string.Join(" ", x.Tags) });
+                    var exportData = vehicleRecords.Select(x => new GenericRecordExportModel { 
+                        Date = x.Date.ToShortDateString(), 
+                        Description = x.Description, 
+                        Cost = x.Cost.ToString("C"), 
+                        Notes = x.Notes, 
+                        Odometer = x.Mileage.ToString(), 
+                        Tags = string.Join(" ", x.Tags), 
+                        ExtraFields = x.ExtraFields 
+                    });
                     using (var writer = new StreamWriter(fullExportFilePath))
                     {
                         using (var csv = new CsvWriter(writer, CultureInfo.InvariantCulture))
                         {
-                            csv.WriteRecords(exportData);
+                            //custom writer
+                            StaticHelper.WriteGenericRecordExportModel(csv, exportData);
                         }
+                        writer.Dispose();
                     }
                     return Json($"/{fileNameToExport}");
                 }
             }
             else if (mode == ImportMode.RepairRecord)
             {
-                var fileNameToExport = $"temp/{Guid.NewGuid()}.csv";
-                var fullExportFilePath = _fileHelper.GetFullFilePath(fileNameToExport, false);
                 var vehicleRecords = _collisionRecordDataAccess.GetCollisionRecordsByVehicleId(vehicleId);
                 if (vehicleRecords.Any())
                 {
-                    var exportData = vehicleRecords.Select(x => new ServiceRecordExportModel { Date = x.Date.ToShortDateString(), Description = x.Description, Cost = x.Cost.ToString("C"), Notes = x.Notes, Odometer = x.Mileage.ToString(), Tags = string.Join(" ", x.Tags) });
+                    var exportData = vehicleRecords.Select(x => new GenericRecordExportModel { 
+                        Date = x.Date.ToShortDateString(), 
+                        Description = x.Description, 
+                        Cost = x.Cost.ToString("C"), 
+                        Notes = x.Notes, 
+                        Odometer = x.Mileage.ToString(), 
+                        Tags = string.Join(" ", x.Tags), 
+                        ExtraFields = x.ExtraFields 
+                    });
                     using (var writer = new StreamWriter(fullExportFilePath))
                     {
                         using (var csv = new CsvWriter(writer, CultureInfo.InvariantCulture))
                         {
-                            csv.WriteRecords(exportData);
+                            StaticHelper.WriteGenericRecordExportModel(csv, exportData);
                         }
                     }
                     return Json($"/{fileNameToExport}");
@@ -257,17 +273,23 @@ namespace CarCareTracker.Controllers
             }
             else if (mode == ImportMode.UpgradeRecord)
             {
-                var fileNameToExport = $"temp/{Guid.NewGuid()}.csv";
-                var fullExportFilePath = _fileHelper.GetFullFilePath(fileNameToExport, false);
                 var vehicleRecords = _upgradeRecordDataAccess.GetUpgradeRecordsByVehicleId(vehicleId);
                 if (vehicleRecords.Any())
                 {
-                    var exportData = vehicleRecords.Select(x => new ServiceRecordExportModel { Date = x.Date.ToShortDateString(), Description = x.Description, Cost = x.Cost.ToString("C"), Notes = x.Notes, Odometer = x.Mileage.ToString(), Tags = string.Join(" ", x.Tags) });
+                    var exportData = vehicleRecords.Select(x => new GenericRecordExportModel { 
+                        Date = x.Date.ToShortDateString(), 
+                        Description = x.Description, 
+                        Cost = x.Cost.ToString("C"), 
+                        Notes = x.Notes, 
+                        Odometer = x.Mileage.ToString(), 
+                        Tags = string.Join(" ", x.Tags), 
+                        ExtraFields = x.ExtraFields 
+                    });
                     using (var writer = new StreamWriter(fullExportFilePath))
                     {
                         using (var csv = new CsvWriter(writer, CultureInfo.InvariantCulture))
                         {
-                            csv.WriteRecords(exportData);
+                            StaticHelper.WriteGenericRecordExportModel(csv, exportData);
                         }
                     }
                     return Json($"/{fileNameToExport}");
@@ -275,17 +297,22 @@ namespace CarCareTracker.Controllers
             }
             else if (mode == ImportMode.OdometerRecord)
             {
-                var fileNameToExport = $"temp/{Guid.NewGuid()}.csv";
-                var fullExportFilePath = _fileHelper.GetFullFilePath(fileNameToExport, false);
                 var vehicleRecords = _odometerRecordDataAccess.GetOdometerRecordsByVehicleId(vehicleId);
                 if (vehicleRecords.Any())
                 {
-                    var exportData = vehicleRecords.Select(x => new OdometerRecordExportModel { Date = x.Date.ToShortDateString(), Notes = x.Notes, InitialOdometer = x.InitialMileage.ToString(), Odometer = x.Mileage.ToString(), Tags = string.Join(" ", x.Tags) });
+                    var exportData = vehicleRecords.Select(x => new OdometerRecordExportModel { 
+                        Date = x.Date.ToShortDateString(), 
+                        Notes = x.Notes, 
+                        InitialOdometer = x.InitialMileage.ToString(), 
+                        Odometer = x.Mileage.ToString(), 
+                        Tags = string.Join(" ", x.Tags), 
+                        ExtraFields = x.ExtraFields 
+                    });
                     using (var writer = new StreamWriter(fullExportFilePath))
                     {
                         using (var csv = new CsvWriter(writer, CultureInfo.InvariantCulture))
                         {
-                            csv.WriteRecords(exportData);
+                            StaticHelper.WriteOdometerRecordExportModel(csv, exportData);
                         }
                     }
                     return Json($"/{fileNameToExport}");
@@ -293,8 +320,6 @@ namespace CarCareTracker.Controllers
             }
             else if (mode == ImportMode.SupplyRecord)
             {
-                var fileNameToExport = $"temp/{Guid.NewGuid()}.csv";
-                var fullExportFilePath = _fileHelper.GetFullFilePath(fileNameToExport, false);
                 var vehicleRecords = _supplyRecordDataAccess.GetSupplyRecordsByVehicleId(vehicleId);
                 if (vehicleRecords.Any())
                 {
@@ -307,13 +332,14 @@ namespace CarCareTracker.Controllers
                         PartQuantity = x.Quantity.ToString(),
                         PartSupplier = x.PartSupplier,
                         Notes = x.Notes,
-                        Tags = string.Join(" ", x.Tags)
+                        Tags = string.Join(" ", x.Tags),
+                        ExtraFields = x.ExtraFields
                     });
                     using (var writer = new StreamWriter(fullExportFilePath))
                     {
                         using (var csv = new CsvWriter(writer, CultureInfo.InvariantCulture))
                         {
-                            csv.WriteRecords(exportData);
+                            StaticHelper.WriteSupplyRecordExportModel(csv, exportData);
                         }
                     }
                     return Json($"/{fileNameToExport}");
@@ -321,17 +347,22 @@ namespace CarCareTracker.Controllers
             }
             else if (mode == ImportMode.TaxRecord)
             {
-                var fileNameToExport = $"temp/{Guid.NewGuid()}.csv";
-                var fullExportFilePath = _fileHelper.GetFullFilePath(fileNameToExport, false);
                 var vehicleRecords = _taxRecordDataAccess.GetTaxRecordsByVehicleId(vehicleId);
                 if (vehicleRecords.Any())
                 {
-                    var exportData = vehicleRecords.Select(x => new TaxRecordExportModel { Date = x.Date.ToShortDateString(), Description = x.Description, Cost = x.Cost.ToString("C"), Notes = x.Notes, Tags = string.Join(" ", x.Tags) });
+                    var exportData = vehicleRecords.Select(x => new TaxRecordExportModel { 
+                        Date = x.Date.ToShortDateString(), 
+                        Description = x.Description, 
+                        Cost = x.Cost.ToString("C"), 
+                        Notes = x.Notes, 
+                        Tags = string.Join(" ", x.Tags), 
+                        ExtraFields = x.ExtraFields 
+                    });
                     using (var writer = new StreamWriter(fullExportFilePath))
                     {
                         using (var csv = new CsvWriter(writer, CultureInfo.InvariantCulture))
                         {
-                            csv.WriteRecords(exportData);
+                            StaticHelper.WriteTaxRecordExportModel(csv, exportData);
                         }
                     }
                     return Json($"/{fileNameToExport}");
@@ -339,8 +370,6 @@ namespace CarCareTracker.Controllers
             }
             else if (mode == ImportMode.PlanRecord)
             {
-                var fileNameToExport = $"temp/{Guid.NewGuid()}.csv";
-                var fullExportFilePath = _fileHelper.GetFullFilePath(fileNameToExport, false);
                 var vehicleRecords = _planRecordDataAccess.GetPlanRecordsByVehicleId(vehicleId);
                 if (vehicleRecords.Any())
                 {
@@ -353,13 +382,14 @@ namespace CarCareTracker.Controllers
                         Type = x.ImportMode.ToString(),
                         Priority = x.Priority.ToString(),
                         Progress = x.Progress.ToString(),
-                        Notes = x.Notes
+                        Notes = x.Notes,
+                        ExtraFields = x.ExtraFields
                     });
                     using (var writer = new StreamWriter(fullExportFilePath))
                     {
                         using (var csv = new CsvWriter(writer, CultureInfo.InvariantCulture))
                         {
-                            csv.WriteRecords(exportData);
+                            StaticHelper.WritePlanRecordExportModel(csv, exportData);
                         }
                     }
                     return Json($"/{fileNameToExport}");
@@ -367,8 +397,6 @@ namespace CarCareTracker.Controllers
             }
             else if (mode == ImportMode.GasRecord)
             {
-                var fileNameToExport = $"temp/{Guid.NewGuid()}.csv";
-                var fullExportFilePath = _fileHelper.GetFullFilePath(fileNameToExport, false);
                 var vehicleRecords = _gasRecordDataAccess.GetGasRecordsByVehicleId(vehicleId);
                 bool useMPG = _config.GetUserConfig(User).UseMPG;
                 bool useUKMPG = _config.GetUserConfig(User).UseUKMPG;
@@ -383,13 +411,14 @@ namespace CarCareTracker.Controllers
                     IsFillToFull = x.IsFillToFull.ToString(),
                     MissedFuelUp = x.MissedFuelUp.ToString(),
                     Notes = x.Notes,
-                    Tags = string.Join(" ", x.Tags)
+                    Tags = string.Join(" ", x.Tags),
+                    ExtraFields = x.ExtraFields
                 });
                 using (var writer = new StreamWriter(fullExportFilePath))
                 {
                     using (var csv = new CsvWriter(writer, CultureInfo.InvariantCulture))
                     {
-                        csv.WriteRecords(exportData);
+                        StaticHelper.WriteGasRecordExportModel(csv, exportData);
                     }
                 }
                 return Json($"/{fileNameToExport}");
@@ -417,7 +446,7 @@ namespace CarCareTracker.Controllers
             {
                 using (var reader = new StreamReader(fullFileName))
                 {
-                    var config = new CsvHelper.Configuration.CsvConfiguration(System.Globalization.CultureInfo.InvariantCulture);
+                    var config = new CsvHelper.Configuration.CsvConfiguration(CultureInfo.InvariantCulture);
                     config.MissingFieldFound = null;
                     config.HeaderValidated = null;
                     config.PrepareHeaderForMatch = args => { return args.Header.Trim().ToLower(); };
@@ -427,6 +456,7 @@ namespace CarCareTracker.Controllers
                         var records = csv.GetRecords<ImportModel>().ToList();
                         if (records.Any())
                         {
+                            var requiredExtraFields = _extraFieldDataAccess.GetExtraFieldsById((int)mode).ExtraFields.Where(x=>x.IsRequired).Select(y=>y.Name);
                             foreach (ImportModel importModel in records)
                             {
                                 if (mode == ImportMode.GasRecord)
@@ -439,7 +469,8 @@ namespace CarCareTracker.Controllers
                                         Mileage = decimal.ToInt32(decimal.Parse(importModel.Odometer, NumberStyles.Any)),
                                         Gallons = decimal.Parse(importModel.FuelConsumed, NumberStyles.Any),
                                         Notes = string.IsNullOrWhiteSpace(importModel.Notes) ? "" : importModel.Notes,
-                                        Tags = string.IsNullOrWhiteSpace(importModel.Tags) ? [] : importModel.Tags.Split(" ").ToList()
+                                        Tags = string.IsNullOrWhiteSpace(importModel.Tags) ? [] : importModel.Tags.Split(" ").ToList(),
+                                        ExtraFields = importModel.ExtraFields.Any() ? importModel.ExtraFields.Select(x => new ExtraField { Name = x.Key, Value = x.Value, IsRequired = requiredExtraFields.Contains(x.Key) }).ToList() : new List<ExtraField>()
                                     };
                                     if (string.IsNullOrWhiteSpace(importModel.Cost) && !string.IsNullOrWhiteSpace(importModel.Price))
                                     {
@@ -495,7 +526,8 @@ namespace CarCareTracker.Controllers
                                         Description = string.IsNullOrWhiteSpace(importModel.Description) ? $"Service Record on {importModel.Date}" : importModel.Description,
                                         Notes = string.IsNullOrWhiteSpace(importModel.Notes) ? "" : importModel.Notes,
                                         Cost = decimal.Parse(importModel.Cost, NumberStyles.Any),
-                                        Tags = string.IsNullOrWhiteSpace(importModel.Tags) ? [] : importModel.Tags.Split(" ").ToList()
+                                        Tags = string.IsNullOrWhiteSpace(importModel.Tags) ? [] : importModel.Tags.Split(" ").ToList(),
+                                        ExtraFields = importModel.ExtraFields.Any() ? importModel.ExtraFields.Select(x => new ExtraField { Name = x.Key, Value = x.Value, IsRequired = requiredExtraFields.Contains(x.Key) }).ToList() : new List<ExtraField>()
                                     };
                                     _serviceRecordDataAccess.SaveServiceRecordToVehicle(convertedRecord);
                                     if (_config.GetUserConfig(User).EnableAutoOdometerInsert)
@@ -518,7 +550,8 @@ namespace CarCareTracker.Controllers
                                         InitialMileage = string.IsNullOrWhiteSpace(importModel.InitialOdometer) ? 0 : decimal.ToInt32(decimal.Parse(importModel.InitialOdometer, NumberStyles.Any)),
                                         Mileage = decimal.ToInt32(decimal.Parse(importModel.Odometer, NumberStyles.Any)),
                                         Notes = string.IsNullOrWhiteSpace(importModel.Notes) ? "" : importModel.Notes,
-                                        Tags = string.IsNullOrWhiteSpace(importModel.Tags) ? [] : importModel.Tags.Split(" ").ToList()
+                                        Tags = string.IsNullOrWhiteSpace(importModel.Tags) ? [] : importModel.Tags.Split(" ").ToList(),
+                                        ExtraFields = importModel.ExtraFields.Any() ? importModel.ExtraFields.Select(x => new ExtraField { Name = x.Key, Value = x.Value, IsRequired = requiredExtraFields.Contains(x.Key) }).ToList() : new List<ExtraField>()
                                     };
                                     _odometerRecordDataAccess.SaveOdometerRecordToVehicle(convertedRecord);
                                 }
@@ -537,7 +570,8 @@ namespace CarCareTracker.Controllers
                                         Priority = parsedPriority,
                                         Description = string.IsNullOrWhiteSpace(importModel.Description) ? $"Plan Record on {importModel.DateCreated}" : importModel.Description,
                                         Notes = string.IsNullOrWhiteSpace(importModel.Notes) ? "" : importModel.Notes,
-                                        Cost = decimal.Parse(importModel.Cost, NumberStyles.Any)
+                                        Cost = decimal.Parse(importModel.Cost, NumberStyles.Any),
+                                        ExtraFields = importModel.ExtraFields.Any() ? importModel.ExtraFields.Select(x => new ExtraField { Name = x.Key, Value = x.Value, IsRequired = requiredExtraFields.Contains(x.Key) }).ToList() : new List<ExtraField>()
                                     };
                                     _planRecordDataAccess.SavePlanRecordToVehicle(convertedRecord);
                                 }
@@ -551,7 +585,8 @@ namespace CarCareTracker.Controllers
                                         Description = string.IsNullOrWhiteSpace(importModel.Description) ? $"Repair Record on {importModel.Date}" : importModel.Description,
                                         Notes = string.IsNullOrWhiteSpace(importModel.Notes) ? "" : importModel.Notes,
                                         Cost = decimal.Parse(importModel.Cost, NumberStyles.Any),
-                                        Tags = string.IsNullOrWhiteSpace(importModel.Tags) ? [] : importModel.Tags.Split(" ").ToList()
+                                        Tags = string.IsNullOrWhiteSpace(importModel.Tags) ? [] : importModel.Tags.Split(" ").ToList(),
+                                        ExtraFields = importModel.ExtraFields.Any() ? importModel.ExtraFields.Select(x => new ExtraField { Name = x.Key, Value = x.Value, IsRequired = requiredExtraFields.Contains(x.Key) }).ToList() : new List<ExtraField>()
                                     };
                                     _collisionRecordDataAccess.SaveCollisionRecordToVehicle(convertedRecord);
                                     if (_config.GetUserConfig(User).EnableAutoOdometerInsert)
@@ -575,7 +610,8 @@ namespace CarCareTracker.Controllers
                                         Description = string.IsNullOrWhiteSpace(importModel.Description) ? $"Upgrade Record on {importModel.Date}" : importModel.Description,
                                         Notes = string.IsNullOrWhiteSpace(importModel.Notes) ? "" : importModel.Notes,
                                         Cost = decimal.Parse(importModel.Cost, NumberStyles.Any),
-                                        Tags = string.IsNullOrWhiteSpace(importModel.Tags) ? [] : importModel.Tags.Split(" ").ToList()
+                                        Tags = string.IsNullOrWhiteSpace(importModel.Tags) ? [] : importModel.Tags.Split(" ").ToList(),
+                                        ExtraFields = importModel.ExtraFields.Any() ? importModel.ExtraFields.Select(x => new ExtraField { Name = x.Key, Value = x.Value, IsRequired = requiredExtraFields.Contains(x.Key) }).ToList() : new List<ExtraField>()
                                     };
                                     _upgradeRecordDataAccess.SaveUpgradeRecordToVehicle(convertedRecord);
                                     if (_config.GetUserConfig(User).EnableAutoOdometerInsert)
@@ -601,7 +637,8 @@ namespace CarCareTracker.Controllers
                                         Description = importModel.Description,
                                         Cost = decimal.Parse(importModel.Cost, NumberStyles.Any),
                                         Notes = importModel.Notes,
-                                        Tags = string.IsNullOrWhiteSpace(importModel.Tags) ? [] : importModel.Tags.Split(" ").ToList()
+                                        Tags = string.IsNullOrWhiteSpace(importModel.Tags) ? [] : importModel.Tags.Split(" ").ToList(),
+                                        ExtraFields = importModel.ExtraFields.Any() ? importModel.ExtraFields.Select(x => new ExtraField { Name = x.Key, Value = x.Value, IsRequired = requiredExtraFields.Contains(x.Key) }).ToList() : new List<ExtraField>()
                                     };
                                     _supplyRecordDataAccess.SaveSupplyRecordToVehicle(convertedRecord);
                                 }
@@ -614,7 +651,8 @@ namespace CarCareTracker.Controllers
                                         Description = string.IsNullOrWhiteSpace(importModel.Description) ? $"Tax Record on {importModel.Date}" : importModel.Description,
                                         Notes = string.IsNullOrWhiteSpace(importModel.Notes) ? "" : importModel.Notes,
                                         Cost = decimal.Parse(importModel.Cost, NumberStyles.Any),
-                                        Tags = string.IsNullOrWhiteSpace(importModel.Tags) ? [] : importModel.Tags.Split(" ").ToList()
+                                        Tags = string.IsNullOrWhiteSpace(importModel.Tags) ? [] : importModel.Tags.Split(" ").ToList(),
+                                        ExtraFields = importModel.ExtraFields.Any() ? importModel.ExtraFields.Select(x => new ExtraField { Name = x.Key, Value = x.Value, IsRequired = requiredExtraFields.Contains(x.Key) }).ToList() : new List<ExtraField>()
                                     };
                                     _taxRecordDataAccess.SaveTaxRecordToVehicle(convertedRecord);
                                 }
@@ -1102,6 +1140,7 @@ namespace CarCareTracker.Controllers
             var taxRecords = _taxRecordDataAccess.GetTaxRecordsByVehicleId(vehicleId);
             var upgradeRecords = _upgradeRecordDataAccess.GetUpgradeRecordsByVehicleId(vehicleId);
             var odometerRecords = _odometerRecordDataAccess.GetOdometerRecordsByVehicleId(vehicleId);
+            var userConfig = _config.GetUserConfig(User);
             var viewModel = new ReportViewModel();
             //get totalCostMakeUp
             viewModel.CostMakeUpForVehicle = new CostMakeUpForVehicle
@@ -1153,6 +1192,10 @@ namespace CarCareTracker.Controllers
             {
                 numbersArray.Add(upgradeRecords.Min(x => x.Date.Year));
             }
+            if (odometerRecords.Any())
+            {
+                numbersArray.Add(odometerRecords.Min(x => x.Date.Year));
+            }
             var minYear = numbersArray.Any() ? numbersArray.Min() : DateTime.Now.AddYears(-5).Year;
             var yearDifference = DateTime.Now.Year - minYear + 1;
             for (int i = 0; i < yearDifference; i++)
@@ -1163,7 +1206,6 @@ namespace CarCareTracker.Controllers
             var collaborators = _userLogic.GetCollaboratorsForVehicle(vehicleId);
             viewModel.Collaborators = collaborators;
             //get MPG per month.
-            var userConfig = _config.GetUserConfig(User);
             var mileageData = _gasHelper.GetGasRecordViewModels(gasRecords, userConfig.UseMPG, userConfig.UseUKMPG);
             mileageData.RemoveAll(x => x.MilesPerGallon == default);
             var monthlyMileageData = StaticHelper.GetBaseLineCostsNoMonthName();
@@ -1230,6 +1272,45 @@ namespace CarCareTracker.Controllers
             return PartialView("_CostMakeUpReport", viewModel);
         }
         [TypeFilter(typeof(CollaboratorFilter))]
+        [HttpGet]
+        public IActionResult GetCostTableForVehicle(int vehicleId, int year = 0)
+        {
+            var vehicleRecords = _vehicleLogic.GetVehicleRecords(vehicleId);
+            var serviceRecords = vehicleRecords.ServiceRecords;
+            var gasRecords = vehicleRecords.GasRecords;
+            var collisionRecords = vehicleRecords.CollisionRecords;
+            var taxRecords = vehicleRecords.TaxRecords;
+            var upgradeRecords = vehicleRecords.UpgradeRecords;
+            var odometerRecords = vehicleRecords.OdometerRecords;
+            if (year != default)
+            {
+                serviceRecords.RemoveAll(x => x.Date.Year != year);
+                gasRecords.RemoveAll(x => x.Date.Year != year);
+                collisionRecords.RemoveAll(x => x.Date.Year != year);
+                taxRecords.RemoveAll(x => x.Date.Year != year);
+                upgradeRecords.RemoveAll(x => x.Date.Year != year);
+                odometerRecords.RemoveAll(x => x.Date.Year != year);
+            }
+            var maxMileage = _vehicleLogic.GetMaxMileage(vehicleRecords);
+            var minMileage = _vehicleLogic.GetMinMileage(vehicleRecords);
+            var vehicleData = _dataAccess.GetVehicleById(vehicleId);
+            var userConfig = _config.GetUserConfig(User);
+            var totalDistanceTraveled = maxMileage - minMileage;
+            var totalDays = _vehicleLogic.GetOwnershipDays(vehicleData.PurchaseDate, vehicleData.SoldDate, serviceRecords, collisionRecords, gasRecords, upgradeRecords, odometerRecords, taxRecords);
+            var viewModel = new CostTableForVehicle
+            {
+                ServiceRecordSum = serviceRecords.Sum(x => x.Cost),
+                GasRecordSum = gasRecords.Sum(x => x.Cost),
+                CollisionRecordSum = collisionRecords.Sum(x => x.Cost),
+                TaxRecordSum = taxRecords.Sum(x => x.Cost),
+                UpgradeRecordSum = upgradeRecords.Sum(x => x.Cost),
+                TotalDistance = totalDistanceTraveled,
+                DistanceUnit = vehicleData.UseHours ? "Cost Per Hour" : userConfig.UseMPG ? "Cost Per Mile" : "Cost Per Kilometer",
+                NumberOfDays = totalDays
+            };
+            return PartialView("_CostTableReport", viewModel);
+        }
+        [TypeFilter(typeof(CollaboratorFilter))]
         public IActionResult GetReminderMakeUpByVehicle(int vehicleId, int daysToAdd)
         {
             var reminders = GetRemindersAndUrgency(vehicleId, DateTime.Now.AddDays(daysToAdd));
@@ -1652,6 +1733,8 @@ namespace CarCareTracker.Controllers
                 Mileage = result.Mileage,
                 Metric = result.Metric,
                 IsRecurring = result.IsRecurring,
+                UseCustomThresholds = result.UseCustomThresholds,
+                CustomThresholds = result.CustomThresholds,
                 ReminderMileageInterval = result.ReminderMileageInterval,
                 ReminderMonthInterval = result.ReminderMonthInterval,
                 CustomMileageInterval = result.CustomMileageInterval,
@@ -1783,6 +1866,7 @@ namespace CarCareTracker.Controllers
         [HttpPost]
         public IActionResult SaveNoteToVehicleId(Note note)
         {
+            note.Files = note.Files.Select(x => { return new UploadedFiles { Name = x.Name, Location = _fileHelper.MoveFileFromTemp(x.Location, "documents/") }; }).ToList();
             var result = _noteDataAccess.SaveNoteToVehicle(note);
             if (result)
             {
@@ -2379,6 +2463,12 @@ namespace CarCareTracker.Controllers
         #endregion
         #region "Shared Methods"
         [HttpPost]
+        public IActionResult GetFilesPendingUpload(List<UploadedFiles> uploadedFiles)
+        {
+            var filesPendingUpload = uploadedFiles.Where(x => x.Location.StartsWith("/temp/")).ToList();
+            return PartialView("_FilesToUpload", filesPendingUpload);
+        }
+        [HttpPost]
         [TypeFilter(typeof(CollaboratorFilter))]
         public IActionResult SearchRecords(int vehicleId, string searchQuery)
         {

Enum/DashboardMetric.cs

@@ -0,0 +1,9 @@
+namespace CarCareTracker.Models
+{
+    public enum DashboardMetric
+    {
+        Default = 0,
+        TotalCost = 1,
+        CostPerMile = 2
+    }
+}

External/Implementations/Postgres/CollisionRecordDataAccess.cs

@@ -147,7 +147,8 @@ namespace CarCareTracker.External.Implementations
                 using (var ctext = pgDataSource.CreateCommand(cmd))
                 {
                     ctext.Parameters.AddWithValue("id", vehicleId);
-                    return ctext.ExecuteNonQuery() > 0;
+                    ctext.ExecuteNonQuery();
+                    return true;
                 }
             }
             catch (Exception ex)

External/Implementations/Postgres/GasRecordDataAccess.cs

@@ -146,7 +146,8 @@ namespace CarCareTracker.External.Implementations
                 using (var ctext = pgDataSource.CreateCommand(cmd))
                 {
                     ctext.Parameters.AddWithValue("id", vehicleId);
-                    return ctext.ExecuteNonQuery() > 0;
+                    ctext.ExecuteNonQuery();
+                    return true;
                 }
             }
             catch (Exception ex)

External/Implementations/Postgres/NoteDataAccess.cs

@@ -141,7 +141,8 @@ namespace CarCareTracker.External.Implementations
                 using (var ctext = pgDataSource.CreateCommand(cmd))
                 {
                     ctext.Parameters.AddWithValue("id", vehicleId);
-                    return ctext.ExecuteNonQuery() > 0;
+                    ctext.ExecuteNonQuery();
+                    return true;
                 }
             } catch (Exception ex)
             {

External/Implementations/Postgres/OdometerRecordDataAccess.cs

@@ -146,7 +146,8 @@ namespace CarCareTracker.External.Implementations
                 using (var ctext = pgDataSource.CreateCommand(cmd))
                 {
                     ctext.Parameters.AddWithValue("id", vehicleId);
-                    return ctext.ExecuteNonQuery() > 0;
+                    ctext.ExecuteNonQuery();
+                    return true;
                 }
             }
             catch (Exception ex)

External/Implementations/Postgres/PlanRecordDataAccess.cs

@@ -146,7 +146,8 @@ namespace CarCareTracker.External.Implementations
                 using (var ctext = pgDataSource.CreateCommand(cmd))
                 {
                     ctext.Parameters.AddWithValue("id", vehicleId);
-                    return ctext.ExecuteNonQuery() > 0;
+                    ctext.ExecuteNonQuery();
+                    return true;
                 }
             }
             catch (Exception ex)

External/Implementations/Postgres/PlanRecordTemplateDataAccess.cs

@@ -146,7 +146,8 @@ namespace CarCareTracker.External.Implementations
                 using (var ctext = pgDataSource.CreateCommand(cmd))
                 {
                     ctext.Parameters.AddWithValue("id", vehicleId);
-                    return ctext.ExecuteNonQuery() > 0;
+                    ctext.ExecuteNonQuery();
+                    return true;
                 }
             }
             catch (Exception ex)

External/Implementations/Postgres/ReminderRecordDataAccess.cs

@@ -146,7 +146,8 @@ namespace CarCareTracker.External.Implementations
                 using (var ctext = pgDataSource.CreateCommand(cmd))
                 {
                     ctext.Parameters.AddWithValue("id", vehicleId);
-                    return ctext.ExecuteNonQuery() > 0;
+                    ctext.ExecuteNonQuery();
+                    return true;
                 }
             }
             catch (Exception ex)

External/Implementations/Postgres/ServiceRecordDataAccess.cs

@@ -146,7 +146,8 @@ namespace CarCareTracker.External.Implementations
                 using (var ctext = pgDataSource.CreateCommand(cmd))
                 {
                     ctext.Parameters.AddWithValue("id", vehicleId);
-                    return ctext.ExecuteNonQuery() > 0;
+                    ctext.ExecuteNonQuery();
+                    return true;
                 }
             }
             catch (Exception ex)

External/Implementations/Postgres/SupplyRecordDataAccess.cs

@@ -146,7 +146,8 @@ namespace CarCareTracker.External.Implementations
                 using (var ctext = pgDataSource.CreateCommand(cmd))
                 {
                     ctext.Parameters.AddWithValue("id", vehicleId);
-                    return ctext.ExecuteNonQuery() > 0;
+                    ctext.ExecuteNonQuery();
+                    return true;
                 }
             }
             catch (Exception ex)

External/Implementations/Postgres/TaxRecordDataAccess.cs

@@ -146,7 +146,8 @@ namespace CarCareTracker.External.Implementations
                 using (var ctext = pgDataSource.CreateCommand(cmd))
                 {
                     ctext.Parameters.AddWithValue("id", vehicleId);
-                    return ctext.ExecuteNonQuery() > 0;
+                    ctext.ExecuteNonQuery();
+                    return true;
                 }
             }
             catch (Exception ex)

External/Implementations/Postgres/UpgradeRecordDataAccess.cs

@@ -146,7 +146,8 @@ namespace CarCareTracker.External.Implementations
                 using (var ctext = pgDataSource.CreateCommand(cmd))
                 {
                     ctext.Parameters.AddWithValue("id", vehicleId);
-                    return ctext.ExecuteNonQuery() > 0;
+                    ctext.ExecuteNonQuery();
+                    return true;
                 }
             }
             catch (Exception ex)

External/Implementations/Postgres/UserAccessDataAcces.cs

@@ -176,7 +176,8 @@ namespace CarCareTracker.External.Implementations
                 using (var ctext = pgDataSource.CreateCommand(cmd))
                 {
                     ctext.Parameters.AddWithValue("vehicleId", vehicleId);
-                    return ctext.ExecuteNonQuery() > 0;
+                    ctext.ExecuteNonQuery();
+                    return true;
                 }
             }
             catch (Exception ex)
@@ -198,7 +199,8 @@ namespace CarCareTracker.External.Implementations
                 using (var ctext = pgDataSource.CreateCommand(cmd))
                 {
                     ctext.Parameters.AddWithValue("userId", userId);
-                    return ctext.ExecuteNonQuery() > 0;
+                    ctext.ExecuteNonQuery();
+                    return true;
                 }
             }
             catch (Exception ex)

External/Implementations/Postgres/UserConfigDataAccess.cs

@@ -94,7 +94,8 @@ namespace CarCareTracker.External.Implementations
                 using (var ctext = pgDataSource.CreateCommand(cmd))
                 {
                     ctext.Parameters.AddWithValue("id", userId);
-                    return ctext.ExecuteNonQuery() > 0;
+                    ctext.ExecuteNonQuery();
+                    return true;
                 }
             }
             catch (Exception ex)

Helper/ConfigHelper.cs

@@ -12,10 +12,12 @@ namespace CarCareTracker.Helper
         UserConfig GetUserConfig(ClaimsPrincipal user);
         bool SaveUserConfig(ClaimsPrincipal user, UserConfig configData);
         bool AuthenticateRootUser(string username, string password);
+        bool AuthenticateRootUserOIDC(string email);
         string GetWebHookUrl();
         string GetMOTD();
         string GetLogoUrl();
         string GetServerLanguage();
+        bool GetServerDisabledRegistration();
         bool GetServerEnableShopSupplies();
         string GetServerPostgresConnection();
         string GetAllowedFileUploadExtensions();
@@ -89,11 +91,26 @@ namespace CarCareTracker.Helper
             }
             return username == rootUsername && password == rootPassword;
         }
+        public bool AuthenticateRootUserOIDC(string email)
+        {
+            var rootEmail = _config[nameof(UserConfig.DefaultReminderEmail)] ?? string.Empty;
+            var rootUserOIDC = bool.Parse(_config[nameof(UserConfig.EnableRootUserOIDC)]);
+            if (!rootUserOIDC || string.IsNullOrWhiteSpace(rootEmail))
+            {
+                return false;
+            }
+            return email == rootEmail;
+        }
         public string GetServerLanguage()
         {
             var serverLanguage = _config[nameof(UserConfig.UserLanguage)] ?? "en_US";
             return serverLanguage;
         }
+        public bool GetServerDisabledRegistration()
+        {
+            var registrationDisabled = bool.Parse(_config[nameof(UserConfig.DisableRegistration)]);
+            return registrationDisabled;
+        }
         public string GetServerPostgresConnection()
         {
             if (!string.IsNullOrWhiteSpace(_config["POSTGRES_CONNECTION"]))
@@ -162,9 +179,11 @@ namespace CarCareTracker.Helper
             {
                 EnableCsvImports = bool.Parse(_config[nameof(UserConfig.EnableCsvImports)]),
                 UseDarkMode = bool.Parse(_config[nameof(UserConfig.UseDarkMode)]),
+                UseSystemColorMode = bool.Parse(_config[nameof(UserConfig.UseSystemColorMode)]),
                 UseMPG = bool.Parse(_config[nameof(UserConfig.UseMPG)]),
                 UseDescending = bool.Parse(_config[nameof(UserConfig.UseDescending)]),
                 EnableAuth = bool.Parse(_config[nameof(UserConfig.EnableAuth)]),
+                EnableRootUserOIDC = bool.Parse(_config[nameof(UserConfig.EnableRootUserOIDC)]),
                 HideZero = bool.Parse(_config[nameof(UserConfig.HideZero)]),
                 UseUKMPG = bool.Parse(_config[nameof(UserConfig.UseUKMPG)]),
                 UseMarkDownOnSavedNotes = bool.Parse(_config[nameof(UserConfig.UseMarkDownOnSavedNotes)]),
@@ -180,7 +199,9 @@ namespace CarCareTracker.Helper
                 VisibleTabs = _config.GetSection(nameof(UserConfig.VisibleTabs)).Get<List<ImportMode>>(),
                 UserColumnPreferences = _config.GetSection(nameof(UserConfig.UserColumnPreferences)).Get<List<UserColumnPreference>>() ?? new List<UserColumnPreference>(),
                 ReminderUrgencyConfig = _config.GetSection(nameof(UserConfig.ReminderUrgencyConfig)).Get<ReminderUrgencyConfig>() ?? new ReminderUrgencyConfig(),
-                DefaultTab = (ImportMode)int.Parse(_config[nameof(UserConfig.DefaultTab)])
+                DefaultTab = (ImportMode)int.Parse(_config[nameof(UserConfig.DefaultTab)]),
+                DefaultReminderEmail = _config[nameof(UserConfig.DefaultReminderEmail)],
+                DisableRegistration = bool.Parse(_config[nameof(UserConfig.DisableRegistration)])
             };
             int userId = 0;
             if (user != null)

Helper/FileHelper.cs

@@ -13,6 +13,9 @@ namespace CarCareTracker.Helper
         bool RestoreBackup(string fileName, bool clearExisting = false);
         string MakeAttachmentsExport(List<GenericReportModel> exportData);
         List<string> GetLanguages();
+        int ClearTempFolder();
+        int ClearUnlinkedThumbnails(List<string> linkedImages);
+        int ClearUnlinkedDocuments(List<string> linkedDocuments);
     }
     public class FileHelper : IFileHelper
     {
@@ -314,5 +317,56 @@ namespace CarCareTracker.Helper
                 return false;
             }
         }
+        public int ClearTempFolder()
+        {
+            int filesDeleted = 0;
+            var tempPath = GetFullFilePath("temp", false);
+            if (Directory.Exists(tempPath))
+            {
+                var files = Directory.GetFiles(tempPath);
+                foreach (var file in files)
+                {
+                    File.Delete(file);
+                    filesDeleted++;
+                }
+            }
+            return filesDeleted;
+        }
+        public int ClearUnlinkedThumbnails(List<string> linkedImages)
+        {
+            int filesDeleted = 0;
+            var imagePath = GetFullFilePath("images", false);
+            if (Directory.Exists(imagePath))
+            {
+                var files = Directory.GetFiles(imagePath);
+                foreach(var file in files)
+                {
+                    if (!linkedImages.Contains(Path.GetFileName(file)))
+                    {
+                        File.Delete(file);
+                        filesDeleted++;
+                    }
+                }
+            }
+            return filesDeleted;
+        }
+        public int ClearUnlinkedDocuments(List<string> linkedDocuments)
+        {
+            int filesDeleted = 0;
+            var documentPath = GetFullFilePath("documents", false);
+            if (Directory.Exists(documentPath))
+            {
+                var files = Directory.GetFiles(documentPath);
+                foreach (var file in files)
+                {
+                    if (!linkedDocuments.Contains(Path.GetFileName(file)))
+                    {
+                        File.Delete(file);
+                        filesDeleted++;
+                    }
+                }
+            }
+            return filesDeleted;
+        }
     }
 }

Helper/GasHelper.cs

@@ -57,6 +57,10 @@ namespace CarCareTracker.Helper
                 if (i > 0)
                 {
                     var deltaMileage = currentObject.Mileage - previousMileage;
+                    if (deltaMileage < 0)
+                    {
+                        deltaMileage = 0;
+                    }
                     var gasRecordViewModel = new GasRecordViewModel()
                     {
                         Id = currentObject.Id,

Helper/MailHelper.cs

@@ -1,6 +1,6 @@
 using CarCareTracker.Models;
-using System.Net.Mail;
-using System.Net;
+using MimeKit;
+using MailKit.Net.Smtp;
 
 namespace CarCareTracker.Helper
 {
@@ -15,13 +15,16 @@ namespace CarCareTracker.Helper
     {
         private readonly MailConfig mailConfig;
         private readonly IFileHelper _fileHelper;
+        private readonly ILogger<MailHelper> _logger;
         public MailHelper(
             IConfiguration config,
-            IFileHelper fileHelper
+            IFileHelper fileHelper,
+            ILogger<MailHelper> logger
             ) {
             //load mailConfig from Configuration
-            mailConfig = config.GetSection("MailConfig").Get<MailConfig>();
+            mailConfig = config.GetSection("MailConfig").Get<MailConfig>() ?? new MailConfig();
             _fileHelper = fileHelper;
+            _logger = logger;
         }
         public OperationResponse NotifyUserForRegistration(string emailAddress, string token)
         {
@@ -34,7 +37,7 @@ namespace CarCareTracker.Helper
             }
             string emailSubject = "Your Registration Token for LubeLogger";
             string emailBody = $"A token has been generated on your behalf, please complete your registration for LubeLogger using the token: {token}";
-            var result = SendEmail(emailAddress, emailSubject, emailBody);
+            var result = SendEmail(new List<string> { emailAddress }, emailSubject, emailBody);
             if (result)
             {
                 return new OperationResponse { Success = true, Message = "Email Sent!" };
@@ -55,7 +58,7 @@ namespace CarCareTracker.Helper
             }
             string emailSubject = "Your Password Reset Token for LubeLogger";
             string emailBody = $"A token has been generated on your behalf, please reset your password for LubeLogger using the token: {token}";
-            var result = SendEmail(emailAddress, emailSubject, emailBody);
+            var result = SendEmail(new List<string> { emailAddress }, emailSubject, emailBody);
             if (result)
             {
                 return new OperationResponse { Success = true, Message = "Email Sent!" };
@@ -77,7 +80,7 @@ namespace CarCareTracker.Helper
             }
             string emailSubject = "Your User Account Update Token for LubeLogger";
             string emailBody = $"A token has been generated on your behalf, please update your account for LubeLogger using the token: {token}";
-            var result = SendEmail(emailAddress, emailSubject, emailBody);
+            var result = SendEmail(new List<string> { emailAddress}, emailSubject, emailBody);
             if (result)
             {
                 return new OperationResponse { Success = true, Message = "Email Sent!" };
@@ -110,49 +113,60 @@ namespace CarCareTracker.Helper
             string tableBody = "";
             foreach(ReminderRecordViewModel reminder in reminders)
             {
-                var dueOn = reminder.Metric == ReminderMetric.Both ? $"{reminder.Date} or {reminder.Mileage}" : reminder.Metric == ReminderMetric.Date ? $"{reminder.Date.ToShortDateString()}" : $"{reminder.Mileage}";
+                var dueOn = reminder.Metric == ReminderMetric.Both ? $"{reminder.Date.ToShortDateString()} or {reminder.Mileage}" : reminder.Metric == ReminderMetric.Date ? $"{reminder.Date.ToShortDateString()}" : $"{reminder.Mileage}";
                 tableBody += $"<tr class='{reminder.Urgency}'><td>{StaticHelper.GetTitleCaseReminderUrgency(reminder.Urgency)}</td><td>{reminder.Description}</td><td>{dueOn}</td></tr>";
             }
             emailBody = emailBody.Replace("{TableBody}", tableBody);
             try
             {
-                foreach (string emailAddress in emailAddresses)
+                var result = SendEmail(emailAddresses, emailSubject, emailBody);
+                if (result)
                 {
-                    SendEmail(emailAddress, emailSubject, emailBody, true, true);
+                    return new OperationResponse { Success = true, Message = "Email Sent!" };
+                } else
+                {
+                    return new OperationResponse { Success = false, Message = StaticHelper.GenericErrorMessage };
                 }
-                return new OperationResponse { Success = true, Message = "Email Sent!" };
             } catch (Exception ex)
             {
                 return new OperationResponse { Success = false, Message = ex.Message };
             }
         }
-        private bool SendEmail(string emailTo, string emailSubject, string emailBody, bool isBodyHtml = false, bool useAsync = false) {
-            string to = emailTo;
+        private bool SendEmail(List<string> emailTo, string emailSubject, string emailBody) {
             string from = mailConfig.EmailFrom;
             var server = mailConfig.EmailServer;
-            MailMessage message = new MailMessage(from, to);
-            message.Subject = emailSubject;
-            message.Body = emailBody;
-            message.IsBodyHtml = isBodyHtml;
-            SmtpClient client = new SmtpClient(server);
-            client.EnableSsl = mailConfig.UseSSL;
-            client.Port = mailConfig.Port;
-            client.Credentials = new NetworkCredential(mailConfig.Username, mailConfig.Password);
-            try
+            var message = new MimeMessage();
+            message.From.Add(new MailboxAddress(from, from));
+            foreach(string emailRecipient in emailTo)
             {
-                if (useAsync)
-                {
-                    client.SendMailAsync(message, new CancellationToken());
+                message.To.Add(new MailboxAddress(emailRecipient, emailRecipient));
+            }
+            message.Subject = emailSubject;
+
+            var builder = new BodyBuilder();
+
+            builder.HtmlBody = emailBody;
+
+            message.Body = builder.ToMessageBody();
+
+            using (var client = new SmtpClient())
+            {
+                client.Connect(server, mailConfig.Port, MailKit.Security.SecureSocketOptions.Auto);
+                //perform authentication if either username or password is provided.
+                //do not perform authentication if neither are provided.
+                if (!string.IsNullOrWhiteSpace(mailConfig.Username) || !string.IsNullOrWhiteSpace(mailConfig.Password)) {
+                    client.Authenticate(mailConfig.Username, mailConfig.Password);
                 }
-                else
+                try
                 {
                     client.Send(message);
+                    client.Disconnect(true);
+                    return true;
+                } catch (Exception ex)
+                {
+                    _logger.LogError(ex.Message);
+                    return false;
                 }
-                return true;
-            }
-            catch (Exception ex)
-            {
-                return false;
             }
         }
     }

Helper/ReminderHelper.cs

@@ -66,6 +66,10 @@ namespace CarCareTracker.Helper
             var reminderUrgencyConfig = _config.GetReminderUrgencyConfig();
             foreach (var reminder in reminders)
             {
+                if (reminder.UseCustomThresholds)
+                {
+                    reminderUrgencyConfig = reminder.CustomThresholds;
+                }
                 var reminderViewModel = new ReminderRecordViewModel()
                 {
                     Id = reminder.Id,

Helper/StaticHelper.cs

@@ -1,4 +1,5 @@
 using CarCareTracker.Models;
+using CsvHelper;
 using System.Globalization;
 
 namespace CarCareTracker.Helper
@@ -8,13 +9,13 @@ namespace CarCareTracker.Helper
     /// </summary>
     public static class StaticHelper
     {
-        public static string VersionNumber = "1.3.0";
+        public static string VersionNumber = "1.3.8";
         public static string DbName = "data/cartracker.db";
         public static string UserConfigPath = "config/userConfig.json";
         public static string GenericErrorMessage = "An error occurred, please try again later";
         public static string ReminderEmailTemplate = "defaults/reminderemailtemplate.txt";
         public static string DefaultAllowedFileExtensions = ".png,.jpg,.jpeg,.pdf,.xls,.xlsx,.docx";
-
+        public static string SponsorsPath = "https://hargata.github.io/hargata/sponsors.json";
         public static string GetTitleCaseReminderUrgency(ReminderUrgency input)
         {
             switch (input)
@@ -287,5 +288,202 @@ namespace CarCareTracker.Helper
                     return "bi-file-bar-graph";
             }
         }
+        //CSV Write Methods
+        public static void WriteGenericRecordExportModel(CsvWriter _csv, IEnumerable<GenericRecordExportModel> genericRecords)
+        {
+            var extraHeaders = genericRecords.SelectMany(x => x.ExtraFields).Select(y => y.Name).Distinct();
+            //write headers
+            _csv.WriteField(nameof(GenericRecordExportModel.Date));
+            _csv.WriteField(nameof(GenericRecordExportModel.Description));
+            _csv.WriteField(nameof(GenericRecordExportModel.Cost));
+            _csv.WriteField(nameof(GenericRecordExportModel.Notes));
+            _csv.WriteField(nameof(GenericRecordExportModel.Odometer));
+            _csv.WriteField(nameof(GenericRecordExportModel.Tags));
+            foreach (string extraHeader in extraHeaders)
+            {
+                _csv.WriteField($"extrafield_{extraHeader}");
+            }
+            _csv.NextRecord();
+            foreach (GenericRecordExportModel genericRecord in genericRecords)
+            {
+                _csv.WriteField(genericRecord.Date);
+                _csv.WriteField(genericRecord.Description);
+                _csv.WriteField(genericRecord.Cost);
+                _csv.WriteField(genericRecord.Notes);
+                _csv.WriteField(genericRecord.Odometer);
+                _csv.WriteField(genericRecord.Tags);
+                foreach (string extraHeader in extraHeaders)
+                {
+                    var extraField = genericRecord.ExtraFields.Where(x => x.Name == extraHeader).FirstOrDefault();
+                    _csv.WriteField(extraField != null ? extraField.Value : string.Empty);
+                }
+                _csv.NextRecord();
+            }
+        }
+        public static void WriteOdometerRecordExportModel(CsvWriter _csv, IEnumerable<OdometerRecordExportModel> genericRecords)
+        {
+            var extraHeaders = genericRecords.SelectMany(x => x.ExtraFields).Select(y => y.Name).Distinct();
+            //write headers
+            _csv.WriteField(nameof(OdometerRecordExportModel.Date));
+            _csv.WriteField(nameof(OdometerRecordExportModel.InitialOdometer));
+            _csv.WriteField(nameof(OdometerRecordExportModel.Odometer));
+            _csv.WriteField(nameof(OdometerRecordExportModel.Notes));
+            _csv.WriteField(nameof(OdometerRecordExportModel.Tags));
+            foreach (string extraHeader in extraHeaders)
+            {
+                _csv.WriteField($"extrafield_{extraHeader}");
+            }
+            _csv.NextRecord();
+            foreach (OdometerRecordExportModel genericRecord in genericRecords)
+            {
+                _csv.WriteField(genericRecord.Date);
+                _csv.WriteField(genericRecord.InitialOdometer);
+                _csv.WriteField(genericRecord.Odometer);
+                _csv.WriteField(genericRecord.Notes);
+                _csv.WriteField(genericRecord.Tags);
+                foreach (string extraHeader in extraHeaders)
+                {
+                    var extraField = genericRecord.ExtraFields.Where(x => x.Name == extraHeader).FirstOrDefault();
+                    _csv.WriteField(extraField != null ? extraField.Value : string.Empty);
+                }
+                _csv.NextRecord();
+            }
+        }
+        public static void WriteTaxRecordExportModel(CsvWriter _csv, IEnumerable<TaxRecordExportModel> genericRecords)
+        {
+            var extraHeaders = genericRecords.SelectMany(x => x.ExtraFields).Select(y => y.Name).Distinct();
+            //write headers
+            _csv.WriteField(nameof(TaxRecordExportModel.Date));
+            _csv.WriteField(nameof(TaxRecordExportModel.Description));
+            _csv.WriteField(nameof(TaxRecordExportModel.Cost));
+            _csv.WriteField(nameof(TaxRecordExportModel.Notes));
+            _csv.WriteField(nameof(TaxRecordExportModel.Tags));
+            foreach (string extraHeader in extraHeaders)
+            {
+                _csv.WriteField($"extrafield_{extraHeader}");
+            }
+            _csv.NextRecord();
+            foreach (TaxRecordExportModel genericRecord in genericRecords)
+            {
+                _csv.WriteField(genericRecord.Date);
+                _csv.WriteField(genericRecord.Description);
+                _csv.WriteField(genericRecord.Cost);
+                _csv.WriteField(genericRecord.Notes);
+                _csv.WriteField(genericRecord.Tags);
+                foreach (string extraHeader in extraHeaders)
+                {
+                    var extraField = genericRecord.ExtraFields.Where(x => x.Name == extraHeader).FirstOrDefault();
+                    _csv.WriteField(extraField != null ? extraField.Value : string.Empty);
+                }
+                _csv.NextRecord();
+            }
+        }
+        public static void WriteSupplyRecordExportModel(CsvWriter _csv, IEnumerable<SupplyRecordExportModel> genericRecords)
+        {
+            var extraHeaders = genericRecords.SelectMany(x => x.ExtraFields).Select(y => y.Name).Distinct();
+            //write headers
+            _csv.WriteField(nameof(SupplyRecordExportModel.Date));
+            _csv.WriteField(nameof(SupplyRecordExportModel.PartNumber));
+            _csv.WriteField(nameof(SupplyRecordExportModel.PartSupplier));
+            _csv.WriteField(nameof(SupplyRecordExportModel.PartQuantity));
+            _csv.WriteField(nameof(SupplyRecordExportModel.Description));
+            _csv.WriteField(nameof(SupplyRecordExportModel.Notes));
+            _csv.WriteField(nameof(SupplyRecordExportModel.Cost));
+            _csv.WriteField(nameof(SupplyRecordExportModel.Tags));
+            foreach (string extraHeader in extraHeaders)
+            {
+                _csv.WriteField($"extrafield_{extraHeader}");
+            }
+            _csv.NextRecord();
+            foreach (SupplyRecordExportModel genericRecord in genericRecords)
+            {
+                _csv.WriteField(genericRecord.Date);
+                _csv.WriteField(genericRecord.PartNumber);
+                _csv.WriteField(genericRecord.PartSupplier);
+                _csv.WriteField(genericRecord.PartQuantity);
+                _csv.WriteField(genericRecord.Description);
+                _csv.WriteField(genericRecord.Notes);
+                _csv.WriteField(genericRecord.Cost);
+                _csv.WriteField(genericRecord.Tags);
+                foreach (string extraHeader in extraHeaders)
+                {
+                    var extraField = genericRecord.ExtraFields.Where(x => x.Name == extraHeader).FirstOrDefault();
+                    _csv.WriteField(extraField != null ? extraField.Value : string.Empty);
+                }
+                _csv.NextRecord();
+            }
+        }
+        public static void WritePlanRecordExportModel(CsvWriter _csv, IEnumerable<PlanRecordExportModel> genericRecords)
+        {
+            var extraHeaders = genericRecords.SelectMany(x => x.ExtraFields).Select(y => y.Name).Distinct();
+            //write headers
+            _csv.WriteField(nameof(PlanRecordExportModel.DateCreated));
+            _csv.WriteField(nameof(PlanRecordExportModel.DateModified));
+            _csv.WriteField(nameof(PlanRecordExportModel.Description));
+            _csv.WriteField(nameof(PlanRecordExportModel.Notes));
+            _csv.WriteField(nameof(PlanRecordExportModel.Type));
+            _csv.WriteField(nameof(PlanRecordExportModel.Priority));
+            _csv.WriteField(nameof(PlanRecordExportModel.Progress));
+            _csv.WriteField(nameof(PlanRecordExportModel.Cost));
+            foreach (string extraHeader in extraHeaders)
+            {
+                _csv.WriteField($"extrafield_{extraHeader}");
+            }
+            _csv.NextRecord();
+            foreach (PlanRecordExportModel genericRecord in genericRecords)
+            {
+                _csv.WriteField(genericRecord.DateCreated);
+                _csv.WriteField(genericRecord.DateModified);
+                _csv.WriteField(genericRecord.Description);
+                _csv.WriteField(genericRecord.Notes);
+                _csv.WriteField(genericRecord.Type);
+                _csv.WriteField(genericRecord.Priority);
+                _csv.WriteField(genericRecord.Progress);
+                _csv.WriteField(genericRecord.Cost);
+                foreach (string extraHeader in extraHeaders)
+                {
+                    var extraField = genericRecord.ExtraFields.Where(x => x.Name == extraHeader).FirstOrDefault();
+                    _csv.WriteField(extraField != null ? extraField.Value : string.Empty);
+                }
+                _csv.NextRecord();
+            }
+        }
+        public static void WriteGasRecordExportModel(CsvWriter _csv, IEnumerable<GasRecordExportModel> genericRecords)
+        {
+            var extraHeaders = genericRecords.SelectMany(x => x.ExtraFields).Select(y => y.Name).Distinct();
+            //write headers
+            _csv.WriteField(nameof(GasRecordExportModel.Date));
+            _csv.WriteField(nameof(GasRecordExportModel.Odometer));
+            _csv.WriteField(nameof(GasRecordExportModel.FuelConsumed));
+            _csv.WriteField(nameof(GasRecordExportModel.Cost));
+            _csv.WriteField(nameof(GasRecordExportModel.FuelEconomy));
+            _csv.WriteField(nameof(GasRecordExportModel.IsFillToFull));
+            _csv.WriteField(nameof(GasRecordExportModel.MissedFuelUp));
+            _csv.WriteField(nameof(GasRecordExportModel.Notes));
+            _csv.WriteField(nameof(GasRecordExportModel.Tags));
+            foreach (string extraHeader in extraHeaders)
+            {
+                _csv.WriteField($"extrafield_{extraHeader}");
+            }
+            _csv.NextRecord();
+            foreach (GasRecordExportModel genericRecord in genericRecords)
+            {
+                _csv.WriteField(genericRecord.Date);
+                _csv.WriteField(genericRecord.Odometer);
+                _csv.WriteField(genericRecord.FuelConsumed);
+                _csv.WriteField(genericRecord.Cost);
+                _csv.WriteField(genericRecord.FuelEconomy);
+                _csv.WriteField(genericRecord.IsFillToFull);
+                _csv.WriteField(genericRecord.MissedFuelUp);
+                _csv.WriteField(genericRecord.Notes);
+                _csv.WriteField(genericRecord.Tags);
+                foreach (string extraHeader in extraHeaders)
+                {
+                    var extraField = genericRecord.ExtraFields.Where(x => x.Name == extraHeader).FirstOrDefault();
+                    _csv.WriteField(extraField != null ? extraField.Value : string.Empty);
+                }
+                _csv.NextRecord();
+            }
+        }
     }
 }

LICENSE

@@ -1,11 +1,6 @@
-LubeLogger by Hargata Softworks is licensed under the MIT License for individual
-and personal use. Commercial users and/or corporate entities are required 
-to maintain an active subscription in order to continue using LubeLogger. 
-For pricing information please contact us at hargatasoftworks@gmail.com
-
 MIT License
 
-Copyright (c) 2023 Hargata Softworks
+Copyright (c) 2024 Hargata Softworks
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

Logic/LoginLogic.cs

@@ -2,6 +2,7 @@
 using CarCareTracker.Helper;
 using CarCareTracker.Models;
 using Microsoft.Extensions.Caching.Memory;
+using Microsoft.IdentityModel.Tokens;
 using System.Security.Cryptography;
 using System.Text;
 using System.Text.Json;
@@ -28,7 +29,7 @@ namespace CarCareTracker.Logic
         bool GenerateTokenForEmailAddress(string emailAddress, bool isPasswordReset);
         List<UserData> GetAllUsers();
         List<Token> GetAllTokens();
-
+        KeyValuePair<string, string> GetPKCEChallengeCode();
     }
     public class LoginLogic : ILoginLogic
     {
@@ -244,14 +245,7 @@ namespace CarCareTracker.Logic
         {
             if (UserIsRoot(credentials))
             {
-                return new UserData()
-                {
-                    Id = -1,
-                    UserName = credentials.UserName,
-                    IsAdmin = true,
-                    IsRootUser = true,
-                    EmailAddress = string.Empty
-                };
+                return GetRootUserData(credentials.UserName);
             }
             else
             {
@@ -270,6 +264,13 @@ namespace CarCareTracker.Logic
         }
         public UserData ValidateOpenIDUser(LoginModel credentials)
         {
+            //validate for root user
+            var isRootUser = _configHelper.AuthenticateRootUserOIDC(credentials.EmailAddress);
+            if (isRootUser)
+            {
+                return GetRootUserData(credentials.EmailAddress);
+            }
+
             var result = _userData.GetUserRecordByEmailAddress(credentials.EmailAddress);
             if (result.Id != default)
             {
@@ -419,6 +420,17 @@ namespace CarCareTracker.Logic
             var hashedPassword = GetHash(credentials.Password);
             return _configHelper.AuthenticateRootUser(hashedUserName, hashedPassword);
         }
+        private UserData GetRootUserData(string username)
+        {
+            return new UserData()
+            {
+                Id = -1,
+                UserName = username,
+                IsAdmin = true,
+                IsRootUser = true,
+                EmailAddress = string.Empty
+            };
+        }
         #endregion
         private static string GetHash(string value)
         {
@@ -439,6 +451,14 @@ namespace CarCareTracker.Logic
         {
             return Guid.NewGuid().ToString().Substring(0, 8);
         }
+        public KeyValuePair<string, string> GetPKCEChallengeCode()
+        {
+            var verifierCode = Base64UrlEncoder.Encode(Guid.NewGuid().ToString().Replace("-", ""));
+            var verifierBytes = Encoding.UTF8.GetBytes(verifierCode);
+            var hashedCode = SHA256.Create().ComputeHash(verifierBytes);
+            var encodedChallengeCode = Base64UrlEncoder.Encode(hashedCode);
+            return new KeyValuePair<string, string>(verifierCode, encodedChallengeCode);
+        }
         public bool GenerateTokenForEmailAddress(string emailAddress, bool isPasswordReset)
         {
             bool result = false;

Logic/OdometerLogic.cs

@@ -33,6 +33,10 @@ namespace CarCareTracker.Logic
         }
         public bool AutoInsertOdometerRecord(OdometerRecord odometer)
         {
+            if (odometer.Mileage == default)
+            {
+                return false;
+            }
             var lastReportedMileage = GetLastOdometerRecordMileage(odometer.VehicleId, new List<OdometerRecord>());
             odometer.InitialMileage = lastReportedMileage != default ? lastReportedMileage : odometer.Mileage;
 

Logic/VehicleLogic.cs

@@ -6,9 +6,14 @@ namespace CarCareTracker.Logic
 {
     public interface IVehicleLogic
     {
+        VehicleRecords GetVehicleRecords(int vehicleId);
+        decimal GetVehicleTotalCost(VehicleRecords vehicleRecords);
         int GetMaxMileage(int vehicleId);
+        int GetMaxMileage(VehicleRecords vehicleRecords);
         int GetMinMileage(int vehicleId);
-        bool GetVehicleHasUrgentOrPastDueReminders(int vehicleId);
+        int GetMinMileage(VehicleRecords vehicleRecords);
+        int GetOwnershipDays(string purchaseDate, string soldDate, List<ServiceRecord> serviceRecords, List<CollisionRecord> repairRecords, List<GasRecord> gasRecords, List<UpgradeRecord> upgradeRecords, List<OdometerRecord> odometerRecords, List<TaxRecord> taxRecords);
+        bool GetVehicleHasUrgentOrPastDueReminders(int vehicleId, int currentMileage);
     }
     public class VehicleLogic: IVehicleLogic
     {
@@ -16,6 +21,7 @@ namespace CarCareTracker.Logic
         private readonly IGasRecordDataAccess _gasRecordDataAccess;
         private readonly ICollisionRecordDataAccess _collisionRecordDataAccess;
         private readonly IUpgradeRecordDataAccess _upgradeRecordDataAccess;
+        private readonly ITaxRecordDataAccess _taxRecordDataAccess;
         private readonly IOdometerRecordDataAccess _odometerRecordDataAccess;
         private readonly IReminderRecordDataAccess _reminderRecordDataAccess;
         private readonly IReminderHelper _reminderHelper;
@@ -24,6 +30,7 @@ namespace CarCareTracker.Logic
             IGasRecordDataAccess gasRecordDataAccess,
             ICollisionRecordDataAccess collisionRecordDataAccess,
             IUpgradeRecordDataAccess upgradeRecordDataAccess,
+            ITaxRecordDataAccess taxRecordDataAccess,
             IOdometerRecordDataAccess odometerRecordDataAccess,
             IReminderRecordDataAccess reminderRecordDataAccess,
             IReminderHelper reminderHelper
@@ -32,10 +39,32 @@ namespace CarCareTracker.Logic
             _gasRecordDataAccess = gasRecordDataAccess;
             _collisionRecordDataAccess = collisionRecordDataAccess;
             _upgradeRecordDataAccess = upgradeRecordDataAccess;
+            _taxRecordDataAccess = taxRecordDataAccess;
             _odometerRecordDataAccess = odometerRecordDataAccess;
             _reminderRecordDataAccess = reminderRecordDataAccess;
             _reminderHelper = reminderHelper;
         }
+        public VehicleRecords GetVehicleRecords(int vehicleId)
+        {
+            return new VehicleRecords
+            {
+                ServiceRecords = _serviceRecordDataAccess.GetServiceRecordsByVehicleId(vehicleId),
+                GasRecords = _gasRecordDataAccess.GetGasRecordsByVehicleId(vehicleId),
+                CollisionRecords = _collisionRecordDataAccess.GetCollisionRecordsByVehicleId(vehicleId),
+                TaxRecords = _taxRecordDataAccess.GetTaxRecordsByVehicleId(vehicleId),
+                UpgradeRecords = _upgradeRecordDataAccess.GetUpgradeRecordsByVehicleId(vehicleId),
+                OdometerRecords = _odometerRecordDataAccess.GetOdometerRecordsByVehicleId(vehicleId),
+            };
+        }
+        public decimal GetVehicleTotalCost(VehicleRecords vehicleRecords)
+        {
+            var serviceRecordSum = vehicleRecords.ServiceRecords.Sum(x => x.Cost);
+            var repairRecordSum = vehicleRecords.CollisionRecords.Sum(x => x.Cost);
+            var upgradeRecordSum = vehicleRecords.UpgradeRecords.Sum(x => x.Cost);
+            var taxRecordSum = vehicleRecords.TaxRecords.Sum(x => x.Cost);
+            var gasRecordSum = vehicleRecords.GasRecords.Sum(x => x.Cost);
+            return serviceRecordSum + repairRecordSum + upgradeRecordSum + taxRecordSum + gasRecordSum;
+        }
         public int GetMaxMileage(int vehicleId)
         {
             var numbersArray = new List<int>();
@@ -66,6 +95,31 @@ namespace CarCareTracker.Logic
             }
             return numbersArray.Any() ? numbersArray.Max() : 0;
         }
+        public int GetMaxMileage(VehicleRecords vehicleRecords)
+        {
+            var numbersArray = new List<int>();
+            if (vehicleRecords.ServiceRecords.Any())
+            {
+                numbersArray.Add(vehicleRecords.ServiceRecords.Max(x => x.Mileage));
+            }
+            if (vehicleRecords.CollisionRecords.Any())
+            {
+                numbersArray.Add(vehicleRecords.CollisionRecords.Max(x => x.Mileage));
+            }
+            if (vehicleRecords.GasRecords.Any())
+            {
+                numbersArray.Add(vehicleRecords.GasRecords.Max(x => x.Mileage));
+            }
+            if (vehicleRecords.UpgradeRecords.Any())
+            {
+                numbersArray.Add(vehicleRecords.UpgradeRecords.Max(x => x.Mileage));
+            }
+            if (vehicleRecords.OdometerRecords.Any())
+            {
+                numbersArray.Add(vehicleRecords.OdometerRecords.Max(x => x.Mileage));
+            }
+            return numbersArray.Any() ? numbersArray.Max() : 0;
+        }
         public int GetMinMileage(int vehicleId)
         {
             var numbersArray = new List<int>();
@@ -96,9 +150,70 @@ namespace CarCareTracker.Logic
             }
             return numbersArray.Any() ? numbersArray.Min() : 0;
         }
-        public bool GetVehicleHasUrgentOrPastDueReminders(int vehicleId)
+        public int GetMinMileage(VehicleRecords vehicleRecords)
+        {
+            var numbersArray = new List<int>();
+            var _serviceRecords = vehicleRecords.ServiceRecords.Where(x => x.Mileage != default).ToList();
+            if (_serviceRecords.Any())
+            {
+                numbersArray.Add(_serviceRecords.Min(x => x.Mileage));
+            }
+            var _repairRecords = vehicleRecords.CollisionRecords.Where(x => x.Mileage != default).ToList();
+            if (_repairRecords.Any())
+            {
+                numbersArray.Add(_repairRecords.Min(x => x.Mileage));
+            }
+            var _gasRecords = vehicleRecords.GasRecords.Where(x => x.Mileage != default).ToList();
+            if (_gasRecords.Any())
+            {
+                numbersArray.Add(_gasRecords.Min(x => x.Mileage));
+            }
+            var _upgradeRecords = vehicleRecords.UpgradeRecords.Where(x => x.Mileage != default).ToList();
+            if (_upgradeRecords.Any())
+            {
+                numbersArray.Add(_upgradeRecords.Min(x => x.Mileage));
+            }
+            var _odometerRecords = vehicleRecords.OdometerRecords.Where(x => x.Mileage != default).ToList();
+            if (_odometerRecords.Any())
+            {
+                numbersArray.Add(_odometerRecords.Min(x => x.Mileage));
+            }
+            return numbersArray.Any() ? numbersArray.Min() : 0;
+        }
+        public int GetOwnershipDays(string purchaseDate, string soldDate, List<ServiceRecord> serviceRecords, List<CollisionRecord> repairRecords, List<GasRecord> gasRecords, List<UpgradeRecord> upgradeRecords, List<OdometerRecord> odometerRecords, List<TaxRecord> taxRecords)
+        {
+            var startDate = DateTime.Now;
+            var endDate = DateTime.Now;
+            if (!string.IsNullOrWhiteSpace(soldDate))
+            {
+                endDate = DateTime.Parse(soldDate);
+            }
+            if (!string.IsNullOrWhiteSpace(purchaseDate))
+            {
+                //if purchase date is provided, then we just have to subtract the begin date to end date and return number of months
+                startDate = DateTime.Parse(purchaseDate);
+                var timeElapsed = (int)Math.Floor((endDate - startDate).TotalDays);
+                return timeElapsed;
+            }
+            var dateArray = new List<DateTime>();
+            dateArray.AddRange(serviceRecords.Select(x => x.Date));
+            dateArray.AddRange(repairRecords.Select(x => x.Date));
+            dateArray.AddRange(gasRecords.Select(x => x.Date));
+            dateArray.AddRange(upgradeRecords.Select(x => x.Date));
+            dateArray.AddRange(odometerRecords.Select(x => x.Date));
+            dateArray.AddRange(taxRecords.Select(x => x.Date));
+            if (dateArray.Any())
+            {
+                startDate = dateArray.Min();
+                var timeElapsed = (int)Math.Floor((endDate - startDate).TotalDays);
+                return timeElapsed;
+            } else
+            {
+                return 1;
+            }
+        }
+        public bool GetVehicleHasUrgentOrPastDueReminders(int vehicleId, int currentMileage)
         {
-            var currentMileage = GetMaxMileage(vehicleId);
             var reminders = _reminderRecordDataAccess.GetReminderRecordsByVehicleId(vehicleId);
             var results = _reminderHelper.GetReminderRecordViewModels(reminders, currentMileage, DateTime.Now);
             return results.Any(x => x.Urgency == ReminderUrgency.VeryUrgent || x.Urgency == ReminderUrgency.PastDue);

MapProfile/ImportMappers.cs

@@ -27,6 +27,18 @@ namespace CarCareTracker.MapProfile
             Map(m => m.Type).Name(["type"]);
             Map(m => m.Priority).Name(["priority"]);
             Map(m => m.Tags).Name(["tags"]);
+            Map(m => m.ExtraFields).Convert(row =>
+            {
+                var attributes = new Dictionary<string, string>();
+                foreach (var header in row.Row.HeaderRecord)
+                {
+                    if (header.ToLower().StartsWith("extrafield_"))
+                    {
+                        attributes.Add(header.Substring(11), row.Row.GetField(header));
+                    }
+                }
+                return attributes;
+            });
         }
     }
 }

Models/API/VehicleInfo.cs

@@ -0,0 +1,27 @@
+namespace CarCareTracker.Models
+{
+    public class VehicleInfo
+    {
+        public Vehicle VehicleData { get; set; } = new Vehicle();
+        public int VeryUrgentReminderCount { get; set; }
+        public int UrgentReminderCount { get; set;}
+        public int NotUrgentReminderCount { get; set; }
+        public int PastDueReminderCount { get; set; }
+        public ReminderExportModel NextReminder { get; set; }
+        public int ServiceRecordCount { get; set; }
+        public decimal ServiceRecordCost { get; set; }
+        public int RepairRecordCount { get; set; }
+        public decimal RepairRecordCost { get; set; }
+        public int UpgradeRecordCount { get; set; }
+        public decimal UpgradeRecordCost { get; set; }
+        public int TaxRecordCount { get; set; }
+        public decimal TaxRecordCost { get; set; }
+        public int GasRecordCount { get; set; }
+        public decimal GasRecordCost { get; set; }
+        public int LastReportedOdometer { get; set; }
+        public int PlanRecordBackLogCount { get; set; }
+        public int PlanRecordInProgressCount { get; set; }
+        public int PlanRecordTestingCount { get; set; }
+        public int PlanRecordDoneCount { get; set; }
+    }
+}

Models/Configuration/MailConfig.cs

@@ -4,7 +4,6 @@
     {
         public string EmailServer { get; set; }
         public string EmailFrom { get; set; }
-        public bool UseSSL { get; set; }
         public int Port { get; set; }
         public string Username { get; set; }
         public string Password { get; set; }

Models/OIDC/OpenIDConfig.cs

@@ -10,9 +10,18 @@
         public string RedirectURL { get; set; }
         public string Scope { get; set; }
         public string State { get; set; }
+        public string CodeChallenge { get; set; }
         public bool ValidateState { get; set; } = false;
         public bool DisableRegularLogin { get; set; } = false;
+        public bool UsePKCE { get; set; } = false;
         public string LogOutURL { get; set; } = "";
-        public string RemoteAuthURL { get { return $"{AuthURL}?client_id={ClientId}&response_type=code&redirect_uri={RedirectURL}&scope={Scope}&state={State}"; } }
+        public string RemoteAuthURL { get {
+                var redirectUrl = $"{AuthURL}?client_id={ClientId}&response_type=code&redirect_uri={RedirectURL}&scope={Scope}&state={State}";
+                if (UsePKCE)
+                {
+                    redirectUrl += $"&code_challenge={CodeChallenge}&code_challenge_method=S256";
+                }
+                return redirectUrl; 
+            } }
     }
 }

Models/Reminder/ReminderRecord.cs

@@ -9,6 +9,8 @@
         public string Description { get; set; }
         public string Notes { get; set; }
         public bool IsRecurring { get; set; } = false;
+        public bool UseCustomThresholds { get; set; } = false;
+        public ReminderUrgencyConfig CustomThresholds { get; set; } = new ReminderUrgencyConfig();
         public int CustomMileageInterval { get; set; } = 0;
         public int CustomMonthInterval { get; set; } = 0;
         public ReminderMileageInterval ReminderMileageInterval { get; set; } = ReminderMileageInterval.FiveThousandMiles;

Models/Reminder/ReminderRecordInput.cs

@@ -9,6 +9,8 @@
         public string Description { get; set; }
         public string Notes { get; set; }
         public bool IsRecurring { get; set; } = false;
+        public bool UseCustomThresholds { get; set; } = false;
+        public ReminderUrgencyConfig CustomThresholds { get; set; } = new ReminderUrgencyConfig();
         public int CustomMileageInterval { get; set; } = 0;
         public int CustomMonthInterval { get; set; } = 0;
         public ReminderMileageInterval ReminderMileageInterval { get; set; } = ReminderMileageInterval.FiveThousandMiles;
@@ -26,6 +28,8 @@
                 Description = Description,
                 Metric = Metric,
                 IsRecurring = IsRecurring,
+                UseCustomThresholds = UseCustomThresholds,
+                CustomThresholds = CustomThresholds,
                 ReminderMileageInterval = ReminderMileageInterval,
                 ReminderMonthInterval = ReminderMonthInterval,
                 CustomMileageInterval = CustomMileageInterval,

Models/Report/CostTableForVehicle.cs

@@ -0,0 +1,27 @@
+namespace CarCareTracker.Models
+{
+    public class CostTableForVehicle
+    {
+        public string DistanceUnit { get; set; } = "Cost Per Mile";
+        public int TotalDistance { get; set; }
+        public int NumberOfDays { get; set; }
+        public decimal ServiceRecordSum { get; set; }
+        public decimal GasRecordSum { get; set; }
+        public decimal TaxRecordSum { get; set; }
+        public decimal CollisionRecordSum { get; set; }
+        public decimal UpgradeRecordSum { get; set; }
+        public decimal ServiceRecordPerMile { get { return TotalDistance != default ? ServiceRecordSum / TotalDistance : 0; } }
+        public decimal GasRecordPerMile { get { return TotalDistance != default ? GasRecordSum / TotalDistance : 0; } }
+        public decimal CollisionRecordPerMile { get { return TotalDistance != default ? CollisionRecordSum / TotalDistance : 0; } }
+        public decimal UpgradeRecordPerMile { get { return TotalDistance != default ? UpgradeRecordSum / TotalDistance : 0; } }
+        public decimal TaxRecordPerMile { get { return TotalDistance != default ? TaxRecordSum / TotalDistance : 0; } }
+        public decimal ServiceRecordPerDay { get { return NumberOfDays != default ? ServiceRecordSum / NumberOfDays : 0; } }
+        public decimal GasRecordPerDay { get { return NumberOfDays != default ? GasRecordSum / NumberOfDays : 0; } }
+        public decimal CollisionRecordPerDay { get { return NumberOfDays != default ? CollisionRecordSum / NumberOfDays : 0; } }
+        public decimal UpgradeRecordPerDay { get { return NumberOfDays != default ? UpgradeRecordSum / NumberOfDays : 0; } }
+        public decimal TaxRecordPerDay { get { return NumberOfDays != default ? TaxRecordSum / NumberOfDays : 0; } }
+        public decimal TotalPerDay { get { return ServiceRecordPerDay + CollisionRecordPerDay + UpgradeRecordPerDay + GasRecordPerDay + TaxRecordPerDay; } }
+        public decimal TotalPerMile { get { return ServiceRecordPerMile + CollisionRecordPerMile + UpgradeRecordPerMile + GasRecordPerMile + TaxRecordPerMile; } }
+        public decimal TotalCost { get { return ServiceRecordSum + CollisionRecordSum + UpgradeRecordSum + GasRecordSum + TaxRecordSum; } }
+    }
+}

Models/Settings/SettingsViewModel.cs

@@ -4,5 +4,6 @@ namespace CarCareTracker.Models
     {
         public UserConfig UserConfig { get; set; }
         public List<string> UILanguages { get; set; }
+        public Sponsors Sponsors { get; set; } = new Sponsors();
     }
 }

Models/Shared/ImportModel.cs

@@ -25,6 +25,7 @@
         public string PartSupplier { get; set; }
         public string PartQuantity { get; set; }
         public string Tags { get; set; }
+        public Dictionary<string,string> ExtraFields {get;set;}
     }
 
     public class SupplyRecordExportModel
@@ -37,9 +38,9 @@
         public string Cost { get; set; }
         public string Notes { get; set; }
         public string Tags { get; set; }
+        public List<ExtraField> ExtraFields { get; set; }
     }
-
-    public class ServiceRecordExportModel
+    public class GenericRecordExportModel
     {
         public string Date { get; set; }
         public string Odometer { get; set; }
@@ -47,6 +48,7 @@
         public string Notes { get; set; }
         public string Cost { get; set; }
         public string Tags { get; set; }
+        public List<ExtraField> ExtraFields { get; set; }
     }
     public class OdometerRecordExportModel
     {
@@ -55,6 +57,7 @@
         public string Odometer { get; set; }
         public string Notes { get; set; }
         public string Tags { get; set; }
+        public List<ExtraField> ExtraFields { get; set; }
     }
     public class TaxRecordExportModel
     {
@@ -63,6 +66,7 @@
         public string Notes { get; set; }
         public string Cost { get; set; }
         public string Tags { get; set; }
+        public List<ExtraField> ExtraFields { get; set; }
     }
     public class GasRecordExportModel
     {
@@ -75,6 +79,7 @@
         public string MissedFuelUp { get; set; }
         public string Notes { get; set; }
         public string Tags { get; set; }
+        public List<ExtraField> ExtraFields { get; set; }
     }
     public class ReminderExportModel
     {
@@ -82,6 +87,8 @@
         public string Urgency { get; set; }
         public string Metric { get; set; }
         public string Notes { get; set; }
+        public string DueDate { get; set; }
+        public string DueOdometer { get; set; }
     }
     public class PlanRecordExportModel 
     {
@@ -93,6 +100,6 @@
         public string Priority { get; set; }
         public string Progress { get; set; }
         public string Cost { get; set; }
+        public List<ExtraField> ExtraFields { get; set; }
     }
-
 }

Models/Shared/VehicleRecords.cs

@@ -0,0 +1,12 @@
+namespace CarCareTracker.Models
+{
+    public class VehicleRecords
+    {
+        public List<ServiceRecord> ServiceRecords { get; set; } = new List<ServiceRecord>();
+        public List<CollisionRecord> CollisionRecords { get; set; } = new List<CollisionRecord>();
+        public List<UpgradeRecord> UpgradeRecords { get; set; } = new List<UpgradeRecord>();
+        public List<GasRecord> GasRecords { get; set; } = new List<GasRecord>();
+        public List<TaxRecord> TaxRecords { get; set; } = new List<TaxRecord>();
+        public List<OdometerRecord> OdometerRecords { get; set; } = new List<OdometerRecord>();
+    }
+}

Models/Sponsors.cs

@@ -0,0 +1,10 @@
+namespace CarCareTracker.Models
+{
+    public class Sponsors
+    {
+        public List<string> LifeTime { get; set; } = new List<string>();
+        public List<string> Bronze { get; set; } = new List<string>();
+        public List<string> Silver { get; set; } = new List<string>();
+        public List<string> Gold { get; set; } = new List<string>(); 
+    }
+}

Models/UserConfig.cs

@@ -3,10 +3,13 @@
     public class UserConfig
     {
         public bool UseDarkMode { get; set; }
+        public bool UseSystemColorMode { get; set; }
         public bool EnableCsvImports { get; set; }
         public bool UseMPG { get; set; }
         public bool UseDescending { get; set; }
         public bool EnableAuth { get; set; }
+        public bool DisableRegistration { get; set; }
+        public bool EnableRootUserOIDC { get; set; }
         public bool HideZero { get; set; }
         public bool UseUKMPG {get;set;}
         public bool UseThreeDecimalGasCost { get; set; }
@@ -22,6 +25,7 @@
         public ReminderUrgencyConfig ReminderUrgencyConfig { get; set; } = new ReminderUrgencyConfig();
         public string UserNameHash { get; set; }
         public string UserPasswordHash { get; set;}
+        public string DefaultReminderEmail { get; set; } = string.Empty;
         public string UserLanguage { get; set; } = "en_US";
         public List<ImportMode> VisibleTabs { get; set; } = new List<ImportMode>() { 
             ImportMode.Dashboard,

Models/Vehicle.cs

@@ -13,7 +13,9 @@
         public decimal PurchasePrice { get; set; }
         public decimal SoldPrice { get; set; }
         public bool IsElectric { get; set; } = false;
+        public bool IsDiesel { get; set; } = false;
         public bool UseHours { get; set; } = false;
+        public bool OdometerOptional { get; set; } = false;
         public List<ExtraField> ExtraFields { get; set; } = new List<ExtraField>();
         public List<string> Tags { get; set; } = new List<string>();
         public bool HasOdometerAdjustment { get; set; } = false;
@@ -25,5 +27,6 @@
         /// Primarily used for vehicles where the odometer does not reflect actual mileage.
         /// </summary>
         public string OdometerDifference { get; set; } = "0";
+        public List<DashboardMetric> DashboardMetrics { get; set; } = new List<DashboardMetric>();
     }
 }

Models/VehicleViewModel.cs

@@ -10,10 +10,17 @@
         public string LicensePlate { get; set; }
         public string SoldDate { get; set; }
         public bool IsElectric { get; set; } = false;
+        public bool IsDiesel { get; set; } = false;
         public bool UseHours { get; set; } = false;
+        public bool OdometerOptional { get; set; } = false;
         public List<ExtraField> ExtraFields { get; set; } = new List<ExtraField>();
         public List<string> Tags { get; set; } = new List<string>();
-        public int LastReportedMileage;
-        public bool HasReminders = false;
+        //Dashboard Metric Attributes
+        public List<DashboardMetric> DashboardMetrics { get; set; } = new List<DashboardMetric>();
+        public int LastReportedMileage { get; set; }
+        public bool HasReminders { get; set; } = false;
+        public decimal CostPerMile { get; set; }
+        public decimal TotalCost { get; set; }
+        public string DistanceUnit { get; set; }
     }
 }

README.md

@@ -20,29 +20,31 @@ Try it out before you download it! The live demo resets every 20 minutes.
 ## Download
 LubeLogger is available as both a Docker Image and a Windows Standalone Executable.
 
-Read this [Getting Started Guide](https://docs.lubelogger.com/Getting%20Started) on how to download either of them
+Read this [Getting Started Guide](https://docs.lubelogger.com/Installation/Getting%20Started) on how to download either of them
+
+### Kubernetes Deployment
+[Helm Chart](https://artifacthub.io/packages/helm/anza-labs/lubelogger) provided by [Anza-Labs](https://github.com/anza-labs)
 
 ### Need Help?
 [Documentation](https://docs.lubelogger.com/)
 
-[Troubleshooting Guide](https://docs.lubelogger.com/Troubleshooting)
+[Troubleshooting Guide](https://docs.lubelogger.com/Installation/Troubleshooting)
 
 [Search Existing Issues](https://github.com/hargata/lubelog/issues)
 
 ## Dependencies
-- Bootstrap
-- LiteDB
-- Npgsql
-- Bootstrap-DatePicker
-- SweetAlert2
-- CsvHelper
-- Chart.js
-- Drawdown
+- [Bootstrap](https://github.com/twbs/bootstrap)
+- [LiteDB](https://github.com/mbdavid/litedb)
+- [Npgsql](https://github.com/npgsql/npgsql)
+- [Bootstrap-DatePicker](https://github.com/uxsolutions/bootstrap-datepicker)
+- [SweetAlert2](https://github.com/sweetalert2/sweetalert2)
+- [CsvHelper](https://github.com/JoshClose/CsvHelper)
+- [Chart.js](https://github.com/chartjs/Chart.js)
+- [Drawdown](https://github.com/adamvleggett/drawdown)
+- [MailKit](https://github.com/jstedfast/MailKit)
 
 ## License
-LubeLogger utilizes a dual-licensing model, see [License](/LICENSE) for more information
+MIT
 
 ## Support
-Support this project by [Subscribing on Patreon](https://patreon.com/LubeLogger) or [Making a Donation](https://buy.stripe.com/aEU9Egc8DdMc9bO144)
-
-Note: Commercial users are required to maintain an active Patreon subscripton to be compliant with our licensing model.
+Support this project by [Subscribing on Patreon](https://patreon.com/LubeLogger) or [Making a Donation](https://buy.stripe.com/aEU9Egc8DdMc9bO144)

Views/API/Index.cshtml

@@ -40,6 +40,86 @@
         No Params
     </div>
 </div>
+<div class="row">
+    <div class="col-1">
+        GET
+    </div>
+    <div class="col-5 copyable">
+        <code>/api/vehicle/info</code>
+    </div>
+    <div class="col-3">
+        Returns details for list of vehicles or specific vehicle
+    </div>
+    <div class="col-3">
+        VehicleId - Id of Vehicle(optional)
+    </div>
+</div>
+<div class="row">
+    <div class="col-1">
+        GET
+    </div>
+    <div class="col-5 copyable">
+        <code>/api/vehicle/adjustedodometer</code>
+    </div>
+    <div class="col-3">
+        Returns odometer reading with adjustments applied
+    </div>
+    <div class="col-3">
+        vehicleId - Id of Vehicle
+        <br />
+        odometer - Unadjusted odometer
+    </div>
+</div>
+<div class="row">
+    <div class="col-1">
+        GET
+    </div>
+    <div class="col-5 copyable">
+        <code>/api/vehicle/odometerrecords</code>
+    </div>
+    <div class="col-3">
+        Returns a list of odometer records for the vehicle
+    </div>
+    <div class="col-3">
+        vehicleId - Id of Vehicle
+    </div>
+</div>
+<div class="row">
+    <div class="col-1">
+        GET
+    </div>
+    <div class="col-5 copyable">
+        <code>/api/vehicle/odometerrecords/latest</code>
+    </div>
+    <div class="col-3">
+        Returns last reported odometer for the vehicle
+    </div>
+    <div class="col-3">
+        vehicleId - Id of Vehicle
+    </div>
+</div>
+<div class="row">
+    <div class="col-1">
+        POST
+    </div>
+    <div class="col-5 copyable">
+        <code>/api/vehicle/odometerrecords/add</code>
+    </div>
+    <div class="col-3">
+        Adds Odometer Record to the vehicle
+    </div>
+    <div class="col-3">
+        vehicleId - Id of Vehicle
+        <br />
+        Body(form-data): {<br />
+        date - Date to be entered<br />
+        initialOdometer - Initial Odometer reading(optional)<br />
+        odometer - Odometer reading<br />
+        notes - notes(optional)<br />
+        extrafields - <a class="link-body-emphasis link-offset-2 link-underline-opacity-25 link-underline-opacity-100-hover reminder-calendar-item" onclick="showExtraFieldsInfo()">extrafields(optional)</a><br />
+        }
+    </div>
+</div>
 <div class="row">
     <div class="col-1">
         GET
@@ -73,6 +153,7 @@
         description - Description<br/>
         cost - Cost<br />
         notes - notes(optional)<br />
+        extrafields - <a class="link-body-emphasis link-offset-2 link-underline-opacity-25 link-underline-opacity-100-hover reminder-calendar-item" onclick="showExtraFieldsInfo()">extrafields(optional)</a><br />
         }
     </div>
 </div>
@@ -109,6 +190,7 @@
         description - Description<br />
         cost - Cost<br />
         notes - notes(optional)<br />
+        extrafields - <a class="link-body-emphasis link-offset-2 link-underline-opacity-25 link-underline-opacity-100-hover reminder-calendar-item" onclick="showExtraFieldsInfo()">extrafields(optional)</a><br />
         }
     </div>
 </div>
@@ -145,6 +227,7 @@
         description - Description<br />
         cost - Cost<br />
         notes - notes(optional)<br />
+        extrafields - <a class="link-body-emphasis link-offset-2 link-underline-opacity-25 link-underline-opacity-100-hover reminder-calendar-item" onclick="showExtraFieldsInfo()">extrafields(optional)</a><br />
         }
     </div>
 </div>
@@ -180,6 +263,7 @@
         description - Description<br />
         cost - Cost<br />
         notes - notes(optional)<br />
+        extrafields - <a class="link-body-emphasis link-offset-2 link-underline-opacity-25 link-underline-opacity-100-hover reminder-calendar-item" onclick="showExtraFieldsInfo()">extrafields(optional)</a><br />
         }
     </div>
 </div>
@@ -222,6 +306,7 @@
         isFillToFull(bool) - Filled To Full<br />
         missedFuelUp(bool) - Missed Fuel Up<br />
         notes - notes(optional)<br />
+        extrafields - <a class="link-body-emphasis link-offset-2 link-underline-opacity-25 link-underline-opacity-100-hover reminder-calendar-item" onclick="showExtraFieldsInfo()">extrafields(optional)</a><br />
         }
     </div>
 </div>
@@ -270,58 +355,31 @@
             No Params(must be root user)
         </div>
     </div>
+    <div class="row">
+        <div class="col-1">
+            GET
+        </div>
+        <div class="col-5 copyable">
+            <code>/api/cleanup</code>
+        </div>
+        <div class="col-3">
+            Clears out temp files. Deep clean will also delete unlinked thumbnails and documents. Returns number of deleted files.
+        </div>
+        <div class="col-3">
+            (must be root user)<br />
+            deepClean(bool) - Perform deep clean
+        </div>
+    </div>
 }
-<div class="row">
-    <div class="col-1">
-        GET
-    </div>
-    <div class="col-5 copyable">
-        <code>/api/vehicle/odometerrecords</code>
-    </div>
-    <div class="col-3">
-        Returns a list of odometer records for the vehicle
-    </div>
-    <div class="col-3">
-        vehicleId - Id of Vehicle
-    </div>
-</div>
-<div class="row">
-    <div class="col-1">
-        GET
-    </div>
-    <div class="col-5 copyable">
-        <code>/api/vehicle/odometerrecords/latest</code>
-    </div>
-    <div class="col-3">
-        Returns last reported odometer for the vehicle
-    </div>
-    <div class="col-3">
-        vehicleId - Id of Vehicle
-    </div>
-</div>
-<div class="row">
-    <div class="col-1">
-        POST
-    </div>
-    <div class="col-5 copyable">
-        <code>/api/vehicle/odometerrecords/add</code>
-    </div>
-    <div class="col-3">
-        Adds Odometer Record to the vehicle
-    </div>
-    <div class="col-3">
-        vehicleId - Id of Vehicle
-        <br />
-        Body(form-data): {<br />
-            date - Date to be entered<br />
-        initialOdometer - Initial Odometer reading(optional)<br />
-        odometer - Odometer reading<br />
-        notes - notes(optional)<br />
-        }
-    </div>
-</div>
 <script>
     $('.copyable').on('click', function (e) {
         copyToClipboard(e.currentTarget);
     })
+    function showExtraFieldsInfo(){
+        Swal.fire({
+            title: "Format for Extra Fields",
+            html: "extrafields[i][name] - Name of Extra Field<br/>extrafields[i][value] - Value of Extra Field<br/>i is an integer that starts at 0 and increments with each extrafield",
+            icon: "info"
+        });
+    }
 </script>

Views/Home/Index.cshtml

@@ -13,6 +13,7 @@
 }
 @section Scripts {
     <script src="~/js/garage.js?v=@StaticHelper.VersionNumber"></script>
+    <script src="~/js/settings.js?v=@StaticHelper.VersionNumber"></script>
     <script src="~/js/supplyrecord.js?v=@StaticHelper.VersionNumber"></script>
     <script src="~/lib/drawdown/drawdown.js"></script>
 }
@@ -41,7 +42,12 @@
                     <a class="dropdown-item" href="/Admin"><span class="display-3 ms-2"><i class="bi bi-people me-2"></i>@translator.Translate(userLanguage,"Admin Panel")</span></a>
                 </li>
             }
-            @if (!User.IsInRole(nameof(UserData.IsRootUser)))
+            @if (User.IsInRole(nameof(UserData.IsRootUser)))
+            {
+                <li>
+                    <button class="nav-link" onclick="showRootAccountInformationModal()"><span class="display-3 ms-2"><i class="bi bi-person-gear me-2"></i>@translator.Translate(userLanguage, "Profile")</span></button>
+                </li>
+            } else
             {
                 <li>
                     <button class="nav-link" onclick="showAccountInformationModal()"><span class="display-3 ms-2"><i class="bi bi-person-gear me-2"></i>@translator.Translate(userLanguage, "Profile")</span></button>
@@ -58,7 +64,7 @@
         <div class="d-flex lubelogger-navbar">
             <img src="@logoUrl" />
             <div class="lubelogger-navbar-button">
-                <button type="button" class="btn btn-dark" onclick="showMobileNav()"><i class="bi bi-list lubelogger-menu-icon"></i></button>
+                <button type="button" class="btn btn-adaptive" onclick="showMobileNav()"><i class="bi bi-list lubelogger-menu-icon"></i></button>
             </div>
         </div>
     </div>
@@ -90,7 +96,12 @@
                             <a class="dropdown-item" href="/Admin"><i class="bi bi-people me-2"></i>@translator.Translate(userLanguage,"Admin Panel")</a>
                         </li>
                     }
-                    @if (!User.IsInRole(nameof(UserData.IsRootUser)))
+                    @if (User.IsInRole(nameof(UserData.IsRootUser)))
+                    {
+                        <li>
+                            <button class="dropdown-item" onclick="showRootAccountInformationModal()"><i class="bi bi-person-gear me-2"></i>@translator.Translate(userLanguage, "Profile")</button>
+                        </li>
+                    } else
                     {
                         <li>
                             <button class="dropdown-item" onclick="showAccountInformationModal()"><i class="bi bi-person-gear me-2"></i>@translator.Translate(userLanguage, "Profile")</button>

Views/Home/_AccountModal.cshtml

@@ -7,7 +7,7 @@
     var userLanguage = userConfig.UserLanguage;
 }
 <div class="modal-header">
-    <h5 class="modal-title" id="addVehicleModalLabel">@translator.Translate(userLanguage, "Update Profile")</h5>
+    <h5 class="modal-title" id="updateAccountModalLabel">@translator.Translate(userLanguage, "Update Profile")</h5>
     <button type="button" class="btn-close" onclick="hideAccountInformationModal()" aria-label="Close"></button>
 </div>
 <div class="modal-body">

Views/Home/_GarageDisplay.cshtml

@@ -36,21 +36,40 @@
                         @if (!string.IsNullOrWhiteSpace(vehicle.SoldDate))
                         {
                             <div class="vehicle-sold-banner"><p class='display-6 mb-0'>@translator.Translate(userLanguage, "SOLD")</p></div>
-                        } else if (vehicle.LastReportedMileage != default)
+                        } else if (vehicle.DashboardMetrics.Any())
                         {
                             <div class="vehicle-sold-banner">
-                                <div class="d-flex justify-content-between">
-                                    <div>
-                                        <span class="ms-2"><i class="bi bi-speedometer me-2"></i>@vehicle.LastReportedMileage.ToString("N0")</span>
-                                     </div>
-                                    @if (vehicle.HasReminders)
-                                    {
+                            @if (vehicle.DashboardMetrics.Contains(DashboardMetric.Default) && vehicle.LastReportedMileage != default)
+                            {
+                                
+                                    <div class="d-flex justify-content-between">
                                         <div>
-                                            <span class="me-2"><i class="bi bi bi-bell-fill text-warning"></i></span>
+                                            <span class="ms-2"><i class="bi bi-speedometer me-2"></i>@vehicle.LastReportedMileage.ToString("N0")</span>
                                         </div>
-                                    }
-                                </div>
-                                <span></span>
+                                        @if (vehicle.HasReminders)
+                                        {
+                                            <div>
+                                                <span class="me-2"><i class="bi bi bi-bell-fill text-warning"></i></span>
+                                            </div>
+                                        }
+                                    </div>
+                            }
+                            @if (vehicle.DashboardMetrics.Contains(DashboardMetric.CostPerMile) && vehicle.CostPerMile != default)
+                            {
+                                    <div class="d-flex justify-content-between">
+                                        <div>
+                                            <span class="ms-2"><i class="bi bi-cash-coin me-2"></i>@($"{vehicle.CostPerMile.ToString("C2")}/{vehicle.DistanceUnit}")</span>
+                                        </div>
+                                    </div>
+                            }
+                            @if (vehicle.DashboardMetrics.Contains(DashboardMetric.TotalCost) && vehicle.TotalCost != default)
+                            {
+                                    <div class="d-flex justify-content-between">
+                                        <div>
+                                            <span class="ms-2"><i class="bi bi-cash-coin me-2"></i>@($"{vehicle.TotalCost.ToString("C2")}")</span>
+                                        </div>
+                                    </div>
+                            }
                             </div>
                         }
                         <div class="card-body">

Views/Home/_RootAccountModal.cshtml

@@ -0,0 +1,26 @@
+@using CarCareTracker.Helper
+@inject IConfigHelper config
+@inject ITranslationHelper translator
+@model UserData
+@{
+    var userConfig = config.GetUserConfig(User);
+    var userLanguage = userConfig.UserLanguage;
+}
+<div class="modal-header">
+    <h5 class="modal-title" id="updateRootAccountModalLabel">@translator.Translate(userLanguage, "Update Profile")</h5>
+    <button type="button" class="btn-close" onclick="hideAccountInformationModal()" aria-label="Close"></button>
+</div>
+<div class="modal-body">
+    <form class="form-inline">
+        <div class="form-group">
+            <label for="inputUsername">@translator.Translate(userLanguage, "Username")</label>
+            <input type="text" id="inputUsername" class="form-control" placeholder="@translator.Translate(userLanguage, "Account Username")" value="@Model.UserName">
+            <label for="inputPassword">@translator.Translate(userLanguage, "Password")</label>
+            <input type="password" id="inputPassword" class="form-control" placeholder="@translator.Translate(userLanguage, "Password")" value="">
+        </div>
+    </form>
+</div>
+<div class="modal-footer">
+    <button type="button" class="btn btn-secondary" onclick="hideAccountInformationModal()">@translator.Translate(userLanguage, "Cancel")</button>
+    <button type="button" onclick="validateAndSaveRootUserAccount()" class="btn btn-primary">@translator.Translate(userLanguage, "Update")</button>
+</div>

Views/Home/_Settings.cshtml

@@ -13,10 +13,14 @@
     <div class="col-12 col-md-6">
         <input id="preferredGasUnit" style="display:none;" value="@Model.UserConfig.PreferredGasUnit" />
         <input id="preferredFuelMileageUnit" style="display:none;" value="@Model.UserConfig.PreferredGasMileageUnit" />
-        <div class="form-check form-switch">
-            <input class="form-check-input" onChange="updateSettings()" type="checkbox" role="switch" id="enableDarkMode" checked="@Model.UserConfig.UseDarkMode">
+        <div class="form-check form-switch form-check-inline">
+            <input class="form-check-input" onChange="updateColorModeSettings(this)" type="checkbox" role="switch" id="enableDarkMode" checked="@Model.UserConfig.UseDarkMode">
             <label class="form-check-label" for="enableDarkMode">@translator.Translate(userLanguage, "Dark Mode")</label>
         </div>
+        <div class="form-check form-switch form-check-inline">
+            <input class="form-check-input" onChange="updateColorModeSettings(this)" type="checkbox" role="switch" id="useSystemColorMode" checked="@Model.UserConfig.UseSystemColorMode">
+            <label class="form-check-label" for="useSystemColorMode">@translator.Translate(userLanguage, "Adaptive Color Mode")</label>
+        </div>
         <div class="form-check form-switch">
             <input class="form-check-input" onChange="updateSettings()" type="checkbox" role="switch" id="enableCsvImports" checked="@Model.UserConfig.EnableCsvImports">
             <label class="form-check-label" for="enableCsvImports">@translator.Translate(userLanguage, "Enable CSV Imports")</label>
@@ -71,6 +75,17 @@
                 <input class="form-check-input" onChange="enableAuthCheckChanged()" type="checkbox" role="switch" id="enableAuth" checked="@Model.UserConfig.EnableAuth">
                 <label class="form-check-label" for="enableAuth">@translator.Translate(userLanguage, "Enable Authentication")</label>
             </div>
+            @if (Model.UserConfig.EnableAuth)
+            {
+                <div class="form-check form-switch">
+                    <input class="form-check-input" onChange="updateSettings()" type="checkbox" role="switch" id="disableRegistration" checked="@Model.UserConfig.DisableRegistration">
+                    <label class="form-check-label" for="disableRegistration">@translator.Translate(userLanguage, "Disable Registration")</label>
+                </div>
+                <div class="form-check form-switch">
+                    <input class="form-check-input" onChange="updateSettings()" type="checkbox" role="switch" id="enableRootUserOIDC" checked="@Model.UserConfig.EnableRootUserOIDC">
+                    <label class="form-check-label" for="enableRootUserOIDC">@translator.Translate(userLanguage, "Enable OIDC for Root User")<br /><small class="text-body-secondary">@translator.Translate(userLanguage, "Uses the Default Reminder Email for OIDC Auth")</small></label>
+                </div>
+            }
         }
     </div>
     <div class="col-12 col-md-6">
@@ -198,6 +213,19 @@
                         </div>
                     </div>
                 </div>
+                <div class="col-12 col-md-6">
+                    <span class="lead">@translator.Translate(userLanguage, "Default Reminder Email")</span>
+                    <div class="row">
+                        <div class="col-12 d-grid">
+                            <div class="input-group">
+                                <input id="inputDefaultEmail" class="form-control" placeholder="@translator.Translate(userLanguage,"Default Email for Reminder")" value="@Model.UserConfig.DefaultReminderEmail">
+                                 <div class="input-group-text">
+                                    <button type="button" class="btn btn-sm btn-primary zero-y-padding" onclick="updateSettings()"><i class="bi bi-floppy"></i></button>
+                                 </div>
+                            </div>
+                        </div>
+                    </div>
+                </div>
             </div>
         }
     </div>
@@ -219,7 +247,7 @@
         </p>
         <p class="lead">
             If you enjoyed using this app, please consider spreading the good word.<br />
-            If you are a commercial user, or if you just want to support the development of this project, consider subscribing to <a class="link-light link-offset-2 link-underline-opacity-25 link-underline-opacity-100-hover" href="https://www.patreon.com/LubeLogger" target="_blank">our Patreon</a> or make a <a class="link-light link-offset-2 link-underline-opacity-25 link-underline-opacity-100-hover" href="https://buy.stripe.com/aEU9Egc8DdMc9bO144" target="_blank">donation</a>
+            If you want to support the development of this project, consider subscribing to <a class="link-body-emphasis link-offset-2 link-underline-opacity-25 link-underline-opacity-100-hover" href="https://www.patreon.com/LubeLogger" target="_blank">our Patreon</a> or make a <a class="link-body-emphasis link-offset-2 link-underline-opacity-25 link-underline-opacity-100-hover" href="https://buy.stripe.com/aEU9Egc8DdMc9bO144" target="_blank">donation</a>
         </p>
         <div class="d-flex justify-content-center">
             <h6 class="display-7 mt-2">Hometown Shoutout</h6>
@@ -247,9 +275,11 @@
             <li class="list-group-item">CsvHelper</li>
             <li class="list-group-item">Chart.js</li>
             <li class="list-group-item">Drawdown</li>
+            <li class="list-group-item">MailKit</li>
         </ul>
     </div>
 </div>
+@await Html.PartialAsync("_Sponsors", Model.Sponsors)
 <div class="modal fade" data-bs-focus="false" id="extraFieldModal" tabindex="-1" role="dialog" aria-hidden="true">
     <div class="modal-dialog modal-lg" role="document">
         <div class="modal-content" id="extraFieldModalContent">
@@ -304,137 +334,6 @@
             }
         });
     }
-    function showExtraFieldModal() {
-        $.get(`/Home/GetExtraFieldsModal?importMode=0`, function (data) {
-            $("#extraFieldModalContent").html(data);
-            $("#extraFieldModal").modal('show');
-        });
-    }
-    function hideExtraFieldModal() {
-        $("#extraFieldModal").modal('hide');
-    }
-    function getCheckedTabs() {
-        var visibleTabs = $("#visibleTabs :checked").map(function () {
-            return this.value;
-        });
-        return visibleTabs.toArray();
-    }
-    function deleteLanguage() {
-        var languageFileLocation = `/translations/${$("#defaultLanguage").val()}.json`;
-        $.post('/Files/DeleteFiles', { fileLocation: languageFileLocation }, function (data) {
-            //reset user language back to en_US
-            $("#defaultLanguage").val('en_US');
-            updateSettings();
-        });
-    }
-    function updateSettings() {
-        var visibleTabs = getCheckedTabs();
-        var defaultTab = $("#defaultTab").val();
-        if (!visibleTabs.includes(defaultTab)) {
-            defaultTab = "Dashboard"; //default to dashboard.
-        }
-        var userConfigObject = {
-            useDarkMode: $("#enableDarkMode").is(':checked'),
-            enableCsvImports: $("#enableCsvImports").is(':checked'),
-            useMPG: $("#useMPG").is(':checked'),
-            useDescending: $("#useDescending").is(':checked'),
-            hideZero: $("#hideZero").is(":checked"),
-            useUKMpg: $("#useUKMPG").is(":checked"),
-            useThreeDecimalGasCost: $("#useThreeDecimal").is(":checked"),
-            useMarkDownOnSavedNotes: $("#useMarkDownOnSavedNotes").is(":checked"),
-            enableAutoReminderRefresh: $("#enableAutoReminderRefresh").is(":checked"),
-            enableAutoOdometerInsert: $("#enableAutoOdometerInsert").is(":checked"),
-            enableShopSupplies: $("#enableShopSupplies").is(":checked"),
-            enableExtraFieldColumns: $("#enableExtraFieldColumns").is(":checked"),
-            hideSoldVehicles: $("#hideSoldVehicles").is(":checked"),
-            preferredGasUnit: $("#preferredGasUnit").val(),
-            preferredGasMileageUnit: $("#preferredFuelMileageUnit").val(),
-            userLanguage: $("#defaultLanguage").val(),
-            visibleTabs: visibleTabs,
-            defaultTab: defaultTab
-        }
-        sloader.show();
-        $.post('/Home/WriteToSettings', { userConfig: userConfigObject }, function (data) {
-            sloader.hide();
-            if (data) {
-                setTimeout(function () { window.location.href = '/Home/Index?tab=settings' }, 500);
-            } else {
-                errorToast(genericErrorMessage());
-            }
-        })
-    }
-    function makeBackup() {
-        $.get('/Files/MakeBackup', function (data) {
-            window.location.href = data;
-        });
-    }
-    function openUploadLanguage() {
-        $("#inputLanguage").click();
-    }
-    function openRestoreBackup() {
-        $("#inputBackup").click();
-    }
-    function uploadLanguage(event) {
-        let formData = new FormData();
-        formData.append("file", event.files[0]);
-        sloader.show();
-        $.ajax({
-            url: "/Files/HandleTranslationFileUpload",
-            data: formData,
-            cache: false,
-            processData: false,
-            contentType: false,
-            type: 'POST',
-            success: function (response) {
-                sloader.hide();
-                if (response.success) {
-                    setTimeout(function () { window.location.href = '/Home/Index?tab=settings' }, 500);
-                } else {
-                    errorToast(response.message);
-                }
-            },
-            error: function () {
-                sloader.hide();
-                errorToast("An error has occurred, please check the file size and try again later.");
-            }
-        });
-    }
-    function restoreBackup(event) {
-        let formData = new FormData();
-        formData.append("file", event.files[0]);
-        console.log('LubeLogger - DB Restoration Started');
-        sloader.show();
-        $.ajax({
-            url: "/Files/HandleFileUpload",
-            data: formData,
-            cache: false,
-            processData: false,
-            contentType: false,
-            type: 'POST',
-            success: function (response) {
-                if (response.trim() != '') {
-                    $.post('/Files/RestoreBackup', { fileName: response }, function (data) {
-                        sloader.hide();
-                        if (data) {
-                            console.log('LubeLogger - DB Restoration Completed');
-                            successToast("Backup Restored");
-                            setTimeout(function () { window.location.href = '/Home/Index' }, 500);
-                        } else {
-                            errorToast(genericErrorMessage());
-                            console.log('LubeLogger - DB Restoration Failed - Failed to process backup file.');
-                        }
-                    });
-                } else {
-                    console.log('LubeLogger - DB Restoration Failed - Failed to upload backup file.');
-                }
-            },
-            error: function () {
-                sloader.hide();
-                console.log('LubeLogger - DB Restoration Failed - Request failed to reach backend, please check file size.');
-                errorToast("An error has occurred, please check the file size and try again later.");
-            }
-        });
-    }
     function enableAuthCheckChanged() {
         var enableAuth = $("#enableAuth").is(":checked");
         if (enableAuth) {

Views/Home/_Sponsors.cshtml

@@ -0,0 +1,73 @@
+@using CarCareTracker.Helper
+@model Sponsors
+@inject ITranslationHelper translator
+@inject IConfigHelper config
+@{
+    var userConfig = config.GetUserConfig(User);
+    var enableAuth = userConfig.EnableAuth;
+    var userLanguage = userConfig.UserLanguage;
+}
+<div class="row">
+    <div class="d-flex justify-content-center">
+        <h6 class="display-6 mt-2">@translator.Translate(userLanguage, "Sponsors")</h6>
+    </div>
+    <hr />
+    <div class="col-12">
+        <div class="d-flex justify-content-center">
+            <p><a class="link-body-emphasis link-offset-2 link-underline-opacity-25 link-underline-opacity-100-hover" href="https://docs.lubelogger.com/Misc/Funding" target="_blank">Become a Sponsor</a></p>
+        </div>
+    </div>
+    @if (Model.LifeTime.Any())
+    {
+        <div class="col-12">
+            <div class="d-flex justify-content-center">
+                <h6 class="display-7 mt-2">Lifetime</h6>
+            </div>
+            <div class="d-flex justify-content-center">
+                <p class="lead">
+                    @string.Join(", ", Model.LifeTime)
+                </p>
+            </div>
+        </div>
+    }
+    @if (Model.Gold.Any())
+    {
+        <div class="col-12">
+            <div class="d-flex justify-content-center">
+                <h6 class="display-7 mt-2">Gold</h6>
+            </div>
+            <div class="d-flex justify-content-center">
+                <p class="lead">
+                    @string.Join(", ", Model.Gold)
+                </p>
+            </div>
+        </div>
+    }
+    @if (Model.Silver.Any())
+    {
+        <div class="col-12">
+            <div class="d-flex justify-content-center">
+                <h6 class="display-7 mt-2">Silver</h6>
+            </div>
+            <div class="d-flex justify-content-center">
+                <p class="lead">
+                    @string.Join(", ", Model.Silver)
+                </p>
+            </div>
+        </div>
+    }
+    @if (Model.Bronze.Any())
+    {
+        <div class="col-12">
+            <div class="d-flex justify-content-center">
+                <h6 class="display-7 mt-2">Bronze</h6>
+            </div>
+            <div class="d-flex justify-content-center">
+                <p class="lead">
+                    @string.Join(", ", Model.Bronze)
+                </p>
+            </div>
+        </div>
+    }
+</div>
+

Views/Login/Index.cshtml

@@ -5,6 +5,7 @@
 @{
     var logoUrl = config.GetLogoUrl();
     var userLanguage = config.GetServerLanguage();
+    var registrationDisabled = config.GetServerDisabledRegistration();
     var openIdConfigName = config.GetOpenIDConfig().Name;
 }
 @{
@@ -46,9 +47,12 @@
             <div class="d-grid">
                 <a href="/Login/ForgotPassword" class="btn btn-link mt-2">@translator.Translate(userLanguage, "Forgot Password")</a>
             </div>
-            <div class="d-grid">
-                <a href="/Login/Registration" class="btn btn-link mt-2">@translator.Translate(userLanguage, "Register")</a>
-            </div>
+            @if (!registrationDisabled)
+            {
+                <div class="d-grid">
+                    <a href="/Login/Registration" class="btn btn-link mt-2">@translator.Translate(userLanguage, "Register")</a>
+                </div>
+            }
         </div>
     </div>
 </div>

Views/Shared/_Layout.cshtml

@@ -5,6 +5,7 @@
 @{
     var userConfig = config.GetUserConfig(User);
     var useDarkMode = userConfig.UseDarkMode;
+    var useSystemColorMode = userConfig.UseSystemColorMode;
     var enableCsvImports = userConfig.EnableCsvImports;
     var useMPG = userConfig.UseMPG;
     var useMarkDown = userConfig.UseMarkDownOnSavedNotes;
@@ -54,7 +55,7 @@
     <script>
         function getGlobalConfig() {
             return {
-                useDarkMode : "@useDarkMode" == "True",
+                useDarkMode: "@useDarkMode" == "True" || ("@useSystemColorMode" == "True" && window.matchMedia('(prefers-color-scheme: dark)').matches),
                 enableCsvImport : "@enableCsvImports" == "True",
                 useMarkDown: "@useMarkDown" == "True",
                 currencySymbol: decodeHTMLEntities("@numberFormat.CurrencySymbol"),
@@ -70,8 +71,8 @@
         }
         function globalParseFloat(input){
             //remove thousands separator.
-            var thousandSeparator = "@numberFormat.NumberGroupSeparator";
-            var decimalSeparator = "@numberFormat.NumberDecimalSeparator";
+            var thousandSeparator = decodeHTMLEntities("@numberFormat.NumberGroupSeparator");
+            var decimalSeparator = decodeHTMLEntities("@numberFormat.NumberDecimalSeparator");
             var currencySymbol = decodeHTMLEntities("@numberFormat.CurrencySymbol");
             if (input == "---") {
                 input = "0";
@@ -85,13 +86,38 @@
             return parseFloat(input);
         }
         function globalFloatToString(input) {
-            var decimalSeparator = "@numberFormat.NumberDecimalSeparator";
+            var decimalSeparator = decodeHTMLEntities("@numberFormat.NumberDecimalSeparator");
             input = input.replace(".", decimalSeparator);
             return input;
         }
         function genericErrorMessage(){
             return decodeHTMLEntities('@translator.Translate(userLanguage, "An error has occurred, please try again later")');
         }
+        function globalAppendCurrency(input){
+            //check currency symbol position
+            var currencySymbolPosition = "@numberFormat.CurrencyPositivePattern";
+            var currencySymbol = decodeHTMLEntities("@numberFormat.CurrencySymbol");
+            switch (currencySymbolPosition) {
+                case "0":
+                    return `${currencySymbol}${input}`;
+                    break;
+                case "1":
+                    return `${input}${currencySymbol}`;
+                    break;
+                case "2":
+                    return `${currencySymbol} ${input}`;
+                    break;
+                case "3":
+                    return `${input} ${currencySymbol}`;
+                    break;
+            }
+        }
+        function setThemeBasedOnDevice() {
+            var systemPrefersDarkMode = window.matchMedia('(prefers-color-scheme: dark)').matches;
+            if (systemPrefersDarkMode) {
+                $(document.documentElement).attr("data-bs-theme", "dark");
+            }
+        }
     </script>
     @await RenderSectionAsync("Scripts", required: false)
 </head>
@@ -103,3 +129,9 @@
     </div>
 </body>
 </html>
+@if (useSystemColorMode)
+{
+    <script>
+        setThemeBasedOnDevice();
+    </script>
+}

Views/Vehicle/Index.cshtml

@@ -78,7 +78,7 @@
             <h1 class="text-truncate display-4">@($"{Model.Year} {Model.Make} {Model.Model}")<small class="text-body-secondary">@($"(#{Model.LicensePlate})")</small></h1>
             <button onclick="editVehicle(@Model.Id)" class="lubelogger-tab btn btn-warning btn-md mt-1 mb-1"><i class="bi bi-pencil-square"></i></button>
             <div class="lubelogger-navbar-button">
-                <button type="button" class="btn btn-dark" onclick="showMobileNav()"><i class="bi bi-list lubelogger-menu-icon"></i></button>
+                <button type="button" class="btn btn-adaptive" onclick="showMobileNav()"><i class="bi bi-list lubelogger-menu-icon"></i></button>
             </div>
         </div>
     </div>
@@ -171,6 +171,7 @@
     function GetVehicleId() {
         return { 
             vehicleId: @Model.Id, 
+            odometerOptional: @Model.OdometerOptional.ToString().ToLower(),
             hasOdometerAdjustment: @Model.HasOdometerAdjustment.ToString().ToLower(),
             odometerDifference: decodeHTMLEntities('@Model.OdometerDifference'),
             odometerMultiplier: decodeHTMLEntities('@Model.OdometerMultiplier')

Views/Vehicle/_CollisionRecordModal.cshtml

@@ -24,11 +24,11 @@
                     </div>
                     <label for="collisionRecordMileage">@translator.Translate(userLanguage, "Odometer")</label>
                     <div class="input-group">
-                        <input type="number" inputmode="numeric" id="collisionRecordMileage" class="form-control" placeholder="@translator.Translate(userLanguage,"Odometer reading when repaired")" value="@(isNew ? "" : Model.Mileage)">
+                        <input type="number" inputmode="numeric" id="collisionRecordMileage" class="form-control" placeholder="@translator.Translate(userLanguage,"Odometer reading when repaired")" value="@(isNew || Model.Mileage == default ? "" : Model.Mileage)">
                         @if (isNew)
                         {
                             <div class="input-group-text">
-                                <button type="button" class="btn btn-sm btn-primary zero-y-padding" onclick="getLastOdometerReadingAndIncrement('collisionRecordMileage')">+</button>
+                                <button type="button" class="btn btn-sm btn-primary zero-y-padding" onclick="getLastOdometerReadingAndIncrement('collisionRecordMileage')"><i class="bi bi-plus"></i></button>
                             </div>
                         }
                     </div>
@@ -89,10 +89,9 @@
                         }
                         <label for="collisionRecordFiles">@translator.Translate(userLanguage, "Upload documents(optional)")</label>
                         <input onChange="uploadVehicleFilesAsync(this)" type="file" multiple accept="@config.GetAllowedFileUploadExtensions()" class="form-control-file" id="collisionRecordFiles">
-                        <br />
-
-                        <small class="text-body-secondary">@translator.Translate(userLanguage, "Max File Size: 28.6MB")</small>
+                        <br /><small class="text-body-secondary">@translator.Translate(userLanguage, "Max File Size: 28.6MB")</small>
                     }
+                    <div id="filesPendingUpload"></div>
                 </div>
             </div>
         </div>

Views/Vehicle/_CollisionRecords.cshtml

@@ -123,7 +123,7 @@
                 {
                     <tr class="d-flex user-select-none" style="cursor:pointer;" onmouseup="stopEvent()" ontouchstart="detectRowLongTouch(this)" ontouchend="detectRowTouchEndPremature(this)" data-rowId="@collisionRecord.Id" oncontextmenu="showTableContextMenu(this)" onmousemove="rangeMouseMove(this)" onclick="handleTableRowClick(this, showEditCollisionRecordModal,@collisionRecord.Id)" data-tags='@string.Join(" ", collisionRecord.Tags)'>
                         <td class="col-2 col-xl-1 flex-grow-1" data-column="date" data-date="@StaticHelper.GetEpochFromDateTime(collisionRecord.Date)">@collisionRecord.Date.ToShortDateString()</td>
-                        <td class="col-2 flex-grow-1 flex-shrink-1" data-column="odometer">@collisionRecord.Mileage</td>
+                        <td class="col-2 flex-grow-1 flex-shrink-1" data-column="odometer">@(collisionRecord.Mileage == default ? "---" : collisionRecord.Mileage.ToString())</td>
                         <td class="col-3 col-xl-4 flex-grow-1 flex-shrink-1" data-column="description">@collisionRecord.Description</td>
                         <td class="col-2 flex-grow-1 flex-shrink-1" data-column="cost" data-record-type="cost">@((hideZero && collisionRecord.Cost == default) ? "---" : collisionRecord.Cost.ToString("C"))</td>
                         <td class="col-3 flex-grow-1 flex-shrink-1 text-truncate" data-column="notes">@CarCareTracker.Helper.StaticHelper.TruncateStrings(collisionRecord.Notes)</td>
@@ -151,7 +151,7 @@
 </div>
 
 
-<div class="modal fade" data-bs-focus="false" id="collisionRecordModal" tabindex="-1" role="dialog" aria-hidden="true">
+<div class="modal fade" data-bs-focus="false" id="collisionRecordModal" tabindex="-1" role="dialog" aria-hidden="true" onpaste="handleModalPaste(event, 'collisionRecordFiles')">
     <div class="modal-dialog modal-lg" role="document">
         <div class="modal-content" id="collisionRecordModalContent">
         </div>

Views/Vehicle/_CostMakeUpReport.cshtml

@@ -36,6 +36,9 @@
                     ]
                 },
                 options: {
+                    onClick: (e) => {
+                        showDataTable();
+                    },
                     plugins: {
                         legend: {
                             position: "bottom",

Views/Vehicle/_CostTableReport.cshtml

@@ -0,0 +1,78 @@
+@using CarCareTracker.Helper
+@inject IConfigHelper config
+@inject ITranslationHelper translator
+@{
+    var userConfig = config.GetUserConfig(User);
+    var userLanguage = userConfig.UserLanguage;
+    var hideZero = userConfig.HideZero;
+}
+@model CostTableForVehicle
+@if (Model.CollisionRecordSum + Model.ServiceRecordSum + Model.GasRecordSum + Model.TaxRecordSum + Model.UpgradeRecordSum > 0)
+{
+    <div>
+        <div class="modal-header">
+            <h5 class="modal-title">@(translator.Translate(userLanguage, "Vehicle Cost Breakdown"))</h5>
+            <button type="button" class="btn-close" onclick="hideDataTable()" aria-label="Close"></button>
+        </div>
+        <div class="modal-body">
+            <div class="row">
+                <div class="col-12">
+                    <table class="table table-hover">
+                        <thead class="sticky-top">
+                            <tr class="d-flex">
+                                <th scope="col" class="col-3 flex-grow-1">@translator.Translate(userLanguage, "Type")</th>
+                                <th scope="col" class="col-3 flex-grow-1">@translator.Translate(userLanguage, "Cost Per Day")</th>
+                                <th scope="col" class="col-3 flex-grow-1">@translator.Translate(userLanguage, Model.DistanceUnit)</th>
+                                <th scope="col" class="col-3 flex-grow-1">@translator.Translate(userLanguage, "Total")</th>
+                            </tr>
+                        </thead>
+                        <tbody>
+                                <tr class="d-flex">
+                                    <td class="col-3 flex-grow-1">@translator.Translate(userLanguage, "Service Records")</td>
+                                    <td class="col-3 flex-grow-1">@(hideZero && Model.ServiceRecordPerDay == default ? "---" : Model.ServiceRecordPerDay.ToString("C2"))</td>
+                                    <td class="col-3 flex-grow-1">@(hideZero && Model.ServiceRecordPerMile == default ? "---" :Model.ServiceRecordPerMile.ToString("C2"))</td>
+                                    <td class="col-3 flex-grow-1">@(hideZero && Model.ServiceRecordSum == default ? "---" :Model.ServiceRecordSum.ToString("C2"))</td>
+                                </tr>
+                            <tr class="d-flex">
+                                <td class="col-3 flex-grow-1">@translator.Translate(userLanguage, "Repairs")</td>
+                                <td class="col-3 flex-grow-1">@(hideZero && Model.CollisionRecordPerDay == default ? "---" :Model.CollisionRecordPerDay.ToString("C2"))</td>
+                                <td class="col-3 flex-grow-1">@(hideZero && Model.CollisionRecordPerMile == default ? "---" :Model.CollisionRecordPerMile.ToString("C2"))</td>
+                                <td class="col-3 flex-grow-1">@(hideZero && Model.CollisionRecordSum == default ? "---" :Model.CollisionRecordSum.ToString("C2"))</td>
+                            </tr>
+                            <tr class="d-flex">
+                                <td class="col-3 flex-grow-1">@translator.Translate(userLanguage, "Upgrades")</td>
+                                <td class="col-3 flex-grow-1">@(hideZero && Model.UpgradeRecordPerDay == default ? "---" :Model.UpgradeRecordPerDay.ToString("C2"))</td>
+                                <td class="col-3 flex-grow-1">@(hideZero && Model.UpgradeRecordPerMile == default ? "---" :Model.UpgradeRecordPerMile.ToString("C2"))</td>
+                                <td class="col-3 flex-grow-1">@(hideZero && Model.UpgradeRecordSum == default ? "---" :Model.UpgradeRecordSum.ToString("C2"))</td>
+                            </tr>
+                            <tr class="d-flex">
+                                <td class="col-3 flex-grow-1">@translator.Translate(userLanguage, "Fuel")</td>
+                                <td class="col-3 flex-grow-1">@(hideZero && Model.GasRecordPerDay == default ? "---" :Model.GasRecordPerDay.ToString("C2"))</td>
+                                <td class="col-3 flex-grow-1">@(hideZero && Model.GasRecordPerMile == default ? "---" :Model.GasRecordPerMile.ToString("C2"))</td>
+                                <td class="col-3 flex-grow-1">@(hideZero && Model.GasRecordSum == default ? "---" :Model.GasRecordSum.ToString("C2"))</td>
+                            </tr>
+                            <tr class="d-flex">
+                                <td class="col-3 flex-grow-1">@translator.Translate(userLanguage, "Taxes")</td>
+                                <td class="col-3 flex-grow-1">@(hideZero && Model.TaxRecordPerDay == default ? "---" :Model.TaxRecordPerDay.ToString("C2"))</td>
+                                <td class="col-3 flex-grow-1">@(hideZero && Model.TaxRecordPerMile == default ? "---" : Model.TaxRecordPerMile.ToString("C2"))</td>
+                                <td class="col-3 flex-grow-1">@(hideZero && Model.TaxRecordSum == default ? "---" :Model.TaxRecordSum.ToString("C2"))</td>
+                            </tr>
+                            <tr class="d-flex">
+                                <td class="col-3 flex-grow-1">@translator.Translate(userLanguage, "Total")</td>
+                                <td class="col-3 flex-grow-1">@(hideZero && Model.TotalPerDay == default ? "---" : Model.TotalPerDay.ToString("C2"))</td>
+                                <td class="col-3 flex-grow-1">@(hideZero && Model.TotalPerMile == default ? "---" : Model.TotalPerMile.ToString("C2"))</td>
+                                <td class="col-3 flex-grow-1">@(hideZero && Model.TotalCost == default ? "---" : Model.TotalCost.ToString("C2"))</td>
+                            </tr>
+                        </tbody>
+                    </table>
+                </div>
+            </div>
+        </div>
+    </div>
+}
+else
+{
+    <div class="text-center">
+        <h4>@translator.Translate(userLanguage, "No data found or all records have zero sums, insert records with non-zero sums to see visualizations here.")</h4>
+    </div>
+}

Views/Vehicle/_FilesToUpload.cshtml

@@ -0,0 +1,23 @@
+@using CarCareTracker.Helper
+@inject IConfigHelper config
+@inject ITranslationHelper translator
+@{
+    var userConfig = config.GetUserConfig(User);
+    var userLanguage = userConfig.UserLanguage;
+}
+@model List<UploadedFiles>
+<label id="documentsPendingUploadLabel">@translator.Translate(userLanguage, "Documents Pending Upload")</label>
+<ul class="list-group" id="documentsPendingUploadList">
+    @foreach (UploadedFiles filesUploaded in Model)
+    {
+        <li class="list-group-item">
+            <div class="d-flex justify-content-between">
+                <a type="button" class="btn btn-link text-truncate uploadedFileName" href="@filesUploaded.Location" target="_blank">@filesUploaded.Name</a>
+                <div class="d-flex align-items-center">
+                    <button type="button" class="btn btn-sm btn-outline-secondary me-2" onclick="editFileName('@filesUploaded.Location', this)"><i class="bi bi-pencil"></i></button>
+                    <button type="button" class="btn btn-sm btn-outline-danger" onclick="deleteFileFromUploadedFiles('@filesUploaded.Location', this)"><i class="bi bi-trash"></i></button>
+                </div>
+            </div>
+        </li>
+    }
+</ul>

Views/Vehicle/_Gas.cshtml

@@ -190,7 +190,7 @@
                 {
                     <tr class="d-flex user-select-none" style="cursor:pointer;" onmouseup="stopEvent()" ontouchstart="detectRowLongTouch(this)" ontouchend="detectRowTouchEndPremature(this)" data-rowId="@gasRecord.Id" oncontextmenu="showTableContextMenu(this)" onmousemove="rangeMouseMove(this)" onclick="handleTableRowClick(this, showEditGasRecordModal,@gasRecord.Id)" data-tags='@string.Join(" ", gasRecord.Tags)'>
                         <td class="col-2 flex-grow-1" data-column="daterefueled">@gasRecord.Date</td>
-                        <td class="col-2 flex-grow-1 flex-shrink-1" data-column="odometer" data-gas-type="mileage" data-gas-aggregate="@gasRecord.DeltaMileage" data-gas-original="@gasRecord.Mileage">@gasRecord.Mileage</td>
+                        <td class="col-2 flex-grow-1 flex-shrink-1" data-column="odometer" data-gas-type="mileage" data-gas-aggregate="@gasRecord.DeltaMileage" data-gas-original="@gasRecord.Mileage">@(gasRecord.Mileage == default ? "---" : gasRecord.Mileage.ToString())</td>
                         <td class="col-1 flex-grow-1 flex-shrink-1" data-column="delta">@(gasRecord.DeltaMileage == default ? "---" : gasRecord.DeltaMileage)</td>
                         <td class="col-2 flex-grow-1 flex-shrink-1" data-column="consumption" data-gas-type="consumption" data-gas-aggregate="@gasRecord.Gallons">@gasRecord.Gallons.ToString("F")</td>
                         <td class="col-3 flex-grow-1 flex-shrink-1" data-column="fueleconomy" data-gas-type="fueleconomy" data-aggregated='@(gasRecord.IncludeInAverage.ToString().ToLower())'>@(gasRecord.MilesPerGallon == 0 ? "---" : gasRecord.MilesPerGallon.ToString("F"))</td>
@@ -221,7 +221,7 @@
 </div>
 
 
-<div class="modal fade" data-bs-focus="false" id="gasRecordModal" tabindex="-1" role="dialog" aria-hidden="true">
+<div class="modal fade" data-bs-focus="false" id="gasRecordModal" tabindex="-1" role="dialog" aria-hidden="true" onpaste="handleModalPaste(event, 'gasRecordFiles')">
     <div class="modal-dialog modal-lg" role="document">
         <div class="modal-content" id="gasRecordModalContent">
         </div>

Views/Vehicle/_GasModal.cshtml

@@ -17,23 +17,23 @@
         consumptionUnit = "kWh";
     } else if (useUKMPG)
     {
-        consumptionUnit = "liters";
+        consumptionUnit = @translator.Translate(userLanguage, "liters");
     }
     else
     {
-        consumptionUnit = useMPG ? "gallons" : "liters";
+        consumptionUnit = useMPG ? @translator.Translate(userLanguage, "gallons") : @translator.Translate(userLanguage, "liters");
     }
     if (useHours)
     {
-        distanceUnit = "hours";
+        distanceUnit = @translator.Translate(userLanguage, "hours");
     }
     else if (useUKMPG)
     {
-        distanceUnit = "miles";
+        distanceUnit = @translator.Translate(userLanguage, "miles");
     }
     else
     {
-        distanceUnit = useMPG ? "miles" : "kilometers";
+        distanceUnit = useMPG ? @translator.Translate(userLanguage, "miles") : @translator.Translate(userLanguage, "kilometers");
     }
 }
 <div class="modal-header">
@@ -53,11 +53,11 @@
                     </div>
                     <label for="gasRecordMileage">@($"{translator.Translate(userLanguage,"Odometer Reading")}({distanceUnit})")</label>
                     <div class="input-group">
-                        <input type="number" inputmode="numeric" id="gasRecordMileage" class="form-control" placeholder="@translator.Translate(userLanguage,"Odometer reading when refueled")" value="@(isNew ? "" : Model.GasRecord.Mileage)">
+                        <input type="number" inputmode="numeric" id="gasRecordMileage" class="form-control" placeholder="@translator.Translate(userLanguage,"Odometer reading when refueled")" value="@(isNew || Model.GasRecord.Mileage == default ? "" : Model.GasRecord.Mileage)">
                         @if (isNew)
                         {
                             <div class="input-group-text">
-                                <button type="button" class="btn btn-sm btn-primary zero-y-padding" onclick="getLastOdometerReadingAndIncrement('gasRecordMileage')">+</button>
+                                <button type="button" class="btn btn-sm btn-primary zero-y-padding" onclick="getLastOdometerReadingAndIncrement('gasRecordMileage')"><i class="bi bi-plus"></i></button>
                             </div>
                         }
                     </div>
@@ -121,6 +121,7 @@
                         <input onChange="uploadVehicleFilesAsync(this)" type="file" multiple accept="@config.GetAllowedFileUploadExtensions()" class="form-control-file" id="gasRecordFiles">
                         <br /><small class="text-body-secondary">@translator.Translate(userLanguage,"Max File Size: 28.6MB")</small>
                     }
+                    <div id="filesPendingUpload"></div>
                 </div>
             </div>
         </div>

Views/Vehicle/_NoteModal.cshtml

@@ -45,6 +45,7 @@
                         <br />
                         <small class="text-body-secondary">@translator.Translate(userLanguage, "Max File Size: 28.6MB")</small>
                     }
+                    <div id="filesPendingUpload"></div>
                 </div>
                 <div class="col-12">
                     <label for="noteRecordTag">@translator.Translate(userLanguage,"Tags(optional)")</label>

Views/Vehicle/_Notes.cshtml

@@ -61,7 +61,7 @@
 </div>
 
 
-<div class="modal fade" data-bs-focus="false" id="noteModal" tabindex="-1" role="dialog" aria-hidden="true">
+<div class="modal fade" data-bs-focus="false" id="noteModal" tabindex="-1" role="dialog" aria-hidden="true" onpaste="handleModalPaste(event, 'noteFiles')">
     <div class="modal-dialog" role="document">
         <div class="modal-content" id="noteModalContent">
         </div>

Views/Vehicle/_OdometerRecordModal.cshtml

@@ -23,14 +23,22 @@
                         <span class="input-group-text"><i class="bi bi-calendar-event"></i></span>
                     </div>
                     <label for="initialOdometerRecordMileage">@translator.Translate(userLanguage, "Initial Odometer")</label>
-                    <input type="number" inputmode="numeric" id="initialOdometerRecordMileage" class="form-control" placeholder="@translator.Translate(userLanguage,"Initial Odometer reading")" value="@(Model.InitialMileage)">
+                    <div class="input-group">
+                        <input type="number" inputmode="numeric" id="initialOdometerRecordMileage" @(Model.InitialMileage != default ? "disabled" : "") class="form-control" placeholder="@translator.Translate(userLanguage,"Initial Odometer reading")" value="@(Model.InitialMileage)">
+                        @if (Model.InitialMileage != default)
+                        {
+                            <div class="input-group-text">
+                                <button type="button" class="btn btn-sm btn-secondary zero-y-padding" onclick="toggleInitialOdometerEnabled()"><i class="bi bi-pencil"></i></button>
+                            </div>
+                        }
+                    </div>
                     <label for="odometerRecordMileage">@translator.Translate(userLanguage,"Odometer")</label>
                     <div class="input-group">
                         <input type="number" inputmode="numeric" id="odometerRecordMileage" class="form-control" placeholder="@translator.Translate(userLanguage,"Odometer reading")" value="@(isNew ? "" : Model.Mileage)">
                         @if (isNew)
                         {
                             <div class="input-group-text">
-                                <button type="button" class="btn btn-sm btn-primary zero-y-padding" onclick="getLastOdometerReadingAndIncrement('odometerRecordMileage')">+</button>
+                                <button type="button" class="btn btn-sm btn-primary zero-y-padding" onclick="getLastOdometerReadingAndIncrement('odometerRecordMileage')"><i class="bi bi-plus"></i></button>
                             </div>
                         }
                     </div>
@@ -68,6 +76,7 @@
                         <input onChange="uploadVehicleFilesAsync(this)" type="file" multiple accept="@config.GetAllowedFileUploadExtensions()" class="form-control-file" id="odometerRecordFiles">
                         <br /><small class="text-body-secondary">@translator.Translate(userLanguage,"Max File Size: 28.6MB")</small>
                     }
+                    <div id="filesPendingUpload"></div>
                 </div>
             </div>
         </div>

Views/Vehicle/_OdometerRecords.cshtml

@@ -151,7 +151,7 @@
 </div>
 
 
-<div class="modal fade" data-bs-focus="false" id="odometerRecordModal" tabindex="-1" role="dialog" aria-hidden="true">
+<div class="modal fade" data-bs-focus="false" id="odometerRecordModal" tabindex="-1" role="dialog" aria-hidden="true" onpaste="handleModalPaste(event, 'odometerRecordFiles')">
     <div class="modal-dialog modal-lg" role="document">
         <div class="modal-content" id="odometerRecordModalContent">
         </div>

Views/Vehicle/_PlanRecordItem.cshtml

@@ -18,36 +18,36 @@
         <div class="row">
             @if (Model.ReminderRecordId != default)
             {
-                <div class="col-4 col-md-1">
-                    <i class="bi bi-bell"></i>
+                <div class="col-3 col-md-1">
+                    <span class="badge text-bg-light planner-indicator"><i class="bi bi-bell-fill text-warning"></i></span>
                 </div>
             }
-            <div class="@(Model.ReminderRecordId != default ? "col-4" : "col-6") col-md-1">
+            <div class="@(Model.ReminderRecordId != default ? "col-3" : "col-6") col-md-1">
                 @if (Model.ImportMode == ImportMode.ServiceRecord)
                 {
-                    <i class="bi bi-card-checklist"></i>
+                    <span class="badge text-bg-primary planner-indicator"><i class="bi bi-card-checklist text-white"></i></span>
                 }
                 else if (Model.ImportMode == ImportMode.UpgradeRecord)
                 {
-                    <i class="bi bi-wrench-adjustable"></i>
+                    <span class="badge text-bg-success planner-indicator"><i class="bi bi-wrench-adjustable text-white"></i></span>
                 }
                 else if (Model.ImportMode == ImportMode.RepairRecord)
                 {
-                    <i class="bi bi-exclamation-octagon"></i>
+                    <span class="badge text-bg-warning planner-indicator"><i class="bi bi-exclamation-octagon text-white"></i></span>
                 }
             </div>
-            <div class="@(Model.ReminderRecordId != default ? "col-4" : "col-6") col-md-1">
+            <div class="@(Model.ReminderRecordId != default ? "col-3" : "col-6") col-md-1">
                 @if (Model.Priority == PlanPriority.Critical)
                 {
-                    <i class="bi bi-fire"></i>
+                    <span class="badge text-bg-danger planner-indicator"><i class="bi bi-fire text-white"></i></span>
                 }
                 else if (Model.Priority == PlanPriority.Normal)
                 {
-                    <i class="bi bi-water"></i>
+                    <span class="badge text-bg-primary planner-indicator"><i class="bi bi-water text-white"></i></span>
                 }
                 else if (Model.Priority == PlanPriority.Low)
                 {
-                    <i class="bi bi-snow"></i>
+                    <span class="badge text-bg-info planner-indicator"><i class="bi bi-snow text-white"></i></span>
                 }
             </div>
         </div>

Views/Vehicle/_PlanRecordModal.cshtml

@@ -73,10 +73,9 @@
                     {
                         <label for="planRecordFiles">@translator.Translate(userLanguage, "Upload documents(optional)")</label>
                         <input onChange="uploadVehicleFilesAsync(this)" type="file" multiple accept="@config.GetAllowedFileUploadExtensions()" class="form-control-file" id="planRecordFiles">
-                        <br />
-
-                        <small class="text-body-secondary">@translator.Translate(userLanguage, "Max File Size: 28.6MB")</small>
+                        <br /><small class="text-body-secondary">@translator.Translate(userLanguage, "Max File Size: 28.6MB")</small>
                     }
+                    <div id="filesPendingUpload"></div>
                 </div>
             </div>
         </div>

Views/Vehicle/_PlanRecordTemplateEditModal.cshtml

@@ -65,10 +65,9 @@
                     {
                         <label for="planRecordFiles">@translator.Translate(userLanguage, "Upload documents(optional)")</label>
                         <input onChange="uploadVehicleFilesAsync(this)" type="file" multiple accept="@config.GetAllowedFileUploadExtensions()" class="form-control-file" id="planRecordFiles">
-                        <br />
-
-                        <small class="text-body-secondary">@translator.Translate(userLanguage, "Max File Size: 28.6MB")</small>
+                        <br /><small class="text-body-secondary">@translator.Translate(userLanguage, "Max File Size: 28.6MB")</small>
                     }
+                    <div id="filesPendingUpload"></div>
                 </div>
             </div>
         </div>

Views/Vehicle/_PlanRecords.cshtml

@@ -97,14 +97,14 @@
 </div>
 
 
-<div class="modal fade" data-bs-focus="false" id="planRecordModal" tabindex="-1" role="dialog" aria-hidden="true">
+<div class="modal fade" data-bs-focus="false" id="planRecordModal" tabindex="-1" role="dialog" aria-hidden="true" onpaste="handleModalPaste(event, 'planRecordFiles')">
     <div class="modal-dialog modal-lg" role="document">
         <div class="modal-content" id="planRecordModalContent">
         </div>
     </div>
 </div>
 
-<div class="modal fade" data-bs-focus="false" id="planRecordTemplateModal" tabindex="-1" role="dialog" aria-hidden="true">
+<div class="modal fade" data-bs-focus="false" id="planRecordTemplateModal" tabindex="-1" role="dialog" aria-hidden="true" onpaste="handleModalPaste(event, 'planRecordFiles')">
     <div class="modal-dialog modal-lg" role="document">
         <div class="modal-content" id="planRecordTemplateModalContent">
         </div>

Views/Vehicle/_ReminderRecordModal.cshtml

@@ -21,7 +21,7 @@
                     <input type="text" id="reminderDescription" class="form-control" placeholder="@translator.Translate(userLanguage,"Reminder Description")" value="@Model.Description">
                     <label>@translator.Translate(userLanguage,"Remind me on")</label>
                     <div class="form-check">
-                        <input class="form-check-input" type="radio" name="reminderMetricOptions" id="reminderMetricDate" value="@(ReminderMetric.Date)" checked="@(Model.Metric == ReminderMetric.Date)">
+                        <input class="form-check-input" onclick="enableRecurring()" type="radio" name="reminderMetricOptions" id="reminderMetricDate" value="@(ReminderMetric.Date)" checked="@(Model.Metric == ReminderMetric.Date)">
                         <label class="form-check-label" for="reminderMetricDate">@translator.Translate(userLanguage,"Date")</label>
                     </div>
                     <div class="input-group">
@@ -29,7 +29,7 @@
                         <span class="input-group-text"><i class="bi bi-calendar-event"></i></span>
                     </div>
                     <div class="form-check form-check-inline">                        
-                        <input class="form-check-input" type="radio" name="reminderMetricOptions" id="reminderMetricOdometer" value="@(ReminderMetric.Odometer)" checked="@(Model.Metric == ReminderMetric.Odometer)">
+                        <input class="form-check-input" onclick="enableRecurring()" type="radio" name="reminderMetricOptions" id="reminderMetricOdometer" value="@(ReminderMetric.Odometer)" checked="@(Model.Metric == ReminderMetric.Odometer)">
                         <label class="form-check-label" for="reminderMetricOdometer">@translator.Translate(userLanguage,"Odometer")</label>
                     </div>     
                     <div class="input-group">
@@ -37,12 +37,12 @@
                         @if (isNew)
                         {
                             <div class="input-group-text">
-                                <button type="button" class="btn btn-sm btn-primary zero-y-padding" onclick="getLastOdometerReadingAndIncrement('reminderMileage')">+</button>
+                                <button type="button" class="btn btn-sm btn-primary zero-y-padding" onclick="getLastOdometerReadingAndIncrement('reminderMileage')"><i class="bi bi-plus"></i></button>
                             </div>
                         }
                     </div>
                     <div class="form-check form-check-inline">
-                        <input class="form-check-input" type="radio" name="reminderMetricOptions" id="reminderMetricBoth" value="@(ReminderMetric.Both)" checked="@(Model.Metric == ReminderMetric.Both)">
+                        <input class="form-check-input" onclick="enableRecurring()" type="radio" name="reminderMetricOptions" id="reminderMetricBoth" value="@(ReminderMetric.Both)" checked="@(Model.Metric == ReminderMetric.Both)">
                         <label class="form-check-label" for="reminderMetricBoth">@translator.Translate(userLanguage,"Whichever comes first")</label>
                     </div>
                     <div class="d-grid"></div>
@@ -62,7 +62,7 @@
                         <label class="form-check-label" for="reminderIsRecurring">@translator.Translate(userLanguage,"Is Recurring")</label>
                     </div>
                     <label for="reminderRecurringMileage">@translator.Translate(userLanguage,"Odometer")</label>
-                    <select class="form-select" onchange="checkCustomMileageInterval()" id="reminderRecurringMileage" @(Model.IsRecurring ? "" : "disabled")>
+                    <select class="form-select" onchange="checkCustomMileageInterval()" id="reminderRecurringMileage" @(Model.IsRecurring && (Model.Metric == ReminderMetric.Odometer || Model.Metric == ReminderMetric.Both) ? "" : "disabled")>
                         <!option value="Other" @(Model.ReminderMileageInterval == ReminderMileageInterval.Other ? "selected" : "")>@(Model.ReminderMileageInterval == ReminderMileageInterval.Other && Model.CustomMileageInterval > 0 ? $"{translator.Translate(userLanguage, "Other")}: {Model.CustomMileageInterval}" : $"{translator.Translate(userLanguage, "Other")}") </!option>
                         <!option value="FiftyMiles" @(Model.ReminderMileageInterval == ReminderMileageInterval.FiftyMiles ? "selected" : "")>50 mi. / Km</!option>
                         <!option value="OneHundredMiles" @(Model.ReminderMileageInterval == ReminderMileageInterval.OneHundredMiles ? "selected" : "")>100 mi. / Km</!option>
@@ -82,8 +82,8 @@
                         <!option value="OneHundredThousandMiles" @(Model.ReminderMileageInterval == ReminderMileageInterval.OneHundredThousandMiles ? "selected" : "")>100000 mi. / Km</!option>
                         <!option value="OneHundredFiftyThousandMiles" @(Model.ReminderMileageInterval == ReminderMileageInterval.OneHundredFiftyThousandMiles ? "selected" : "")>150000 mi. / Km</!option>
                     </select>
-                    <label for="reminderRecurringMonth">Month</label>
-                    <select class="form-select" onchange="checkCustomMonthInterval()" id="reminderRecurringMonth" @(Model.IsRecurring ? "" : "disabled")>
+                    <label for="reminderRecurringMonth">@translator.Translate(userLanguage, "Month")</label>
+                    <select class="form-select" onchange="checkCustomMonthInterval()" id="reminderRecurringMonth" @(Model.IsRecurring && (Model.Metric == ReminderMetric.Date || Model.Metric == ReminderMetric.Both) ? "" : "disabled")>
                         <!option value="Other" @(Model.ReminderMonthInterval == ReminderMonthInterval.Other ? "selected" : "")>@(Model.ReminderMonthInterval == ReminderMonthInterval.Other && Model.CustomMonthInterval > 0 ? $"{translator.Translate(userLanguage, "Other")}: {Model.CustomMonthInterval}" : $"{translator.Translate(userLanguage, "Other")}") </!option>
                         <!option value="OneMonth" @(Model.ReminderMonthInterval == ReminderMonthInterval.OneMonth ? "selected" : "")>@translator.Translate(userLanguage, "1 Month")</!option>
                         <!option value="ThreeMonths" @(Model.ReminderMonthInterval == ReminderMonthInterval.ThreeMonths || isNew ? "selected" : "")>@translator.Translate(userLanguage,"3 Months")</!option>
@@ -93,6 +93,22 @@
                         <!option value="ThreeYears" @(Model.ReminderMonthInterval == ReminderMonthInterval.ThreeYears ? "selected" : "")>@translator.Translate(userLanguage, "3 Years")</!option>
                         <!option value="FiveYears" @(Model.ReminderMonthInterval == ReminderMonthInterval.FiveYears ? "selected" : "")>@translator.Translate(userLanguage, "5 Years")</!option>
                     </select>
+                    <div class="form-check form-switch">
+                        <input class="form-check-input" type="checkbox" role="switch" onchange="toggleCustomThresholds()" id="reminderUseCustomThresholds" checked="@Model.UseCustomThresholds">
+                        <label class="form-check-label" for="reminderUseCustomThresholds">@translator.Translate(userLanguage, "Use Custom Thresholds")</label>
+                    </div>
+                    <div class="collapse @(Model.UseCustomThresholds ? "show" : "")" id="reminderCustomThresholds">
+                        <div>
+                            <label for="reminderUrgentDays">@translator.Translate(userLanguage, "Urgent(Days)")</label>
+                            <input type="text" id="reminderUrgentDays" class="form-control" placeholder="@translator.Translate(userLanguage, "Urgent")" value="@Model.CustomThresholds.UrgentDays">
+                            <label for="reminderVeryUrgentDays">@translator.Translate(userLanguage, "Very Urgent(Days)")</label>
+                            <input type="text" id="reminderVeryUrgentDays" class="form-control" placeholder="@translator.Translate(userLanguage, "Very Urgent")" value="@Model.CustomThresholds.VeryUrgentDays">
+                            <label for="reminderUrgentDistance">@translator.Translate(userLanguage, "Urgent(Distance)")</label>
+                            <input type="text" id="reminderUrgentDistance" class="form-control" placeholder="@translator.Translate(userLanguage, "Urgent")" value="@Model.CustomThresholds.UrgentDistance">
+                            <label for="reminderVeryUrgentDistance">@translator.Translate(userLanguage, "Very Urgent(Distance)")</label>
+                            <input type="text" id="reminderVeryUrgentDistance" class="form-control" placeholder="@translator.Translate(userLanguage, "Very Urgent")" value="@Model.CustomThresholds.VeryUrgentDistance">
+                        </div>
+                    </div>
                 </div>
             </div>
         </div>

Views/Vehicle/_ReminderRecords.cshtml

@@ -73,18 +73,22 @@
                         {
                             <td class="col-1"><span class="text-success d-inline-block d-md-none"><i class="bi bi-hourglass-top h3"></i></span><span class="badge text-bg-success d-none d-md-inline-block">@translator.Translate(userLanguage, "Not Urgent")</span></td>
                         }
-                        @if (reminderRecord.Metric == ReminderMetric.Date)
-                        {
-                            <td class="col-2">@reminderRecord.Date.ToShortDateString()</td>
-                        }
-                        else if (reminderRecord.Metric == ReminderMetric.Odometer)
-                        {
-                            <td class="col-2">@reminderRecord.Mileage</td>
-                        }
-                        else
-                        {
-                            <td class="col-2">@reminderRecord.Metric</td>
-                        }
+                        <td class="col-2">
+                            <span data-column="metric" data-bs-toggle="tooltip" data-bs-placement="bottom" data-bs-html="true" data-bs-title="@($"<b><i class='bi bi-calendar-event me-2'></i></b>{reminderRecord.Date.ToShortDateString()}<b class='ms-2'><i class='bi bi-speedometer me-2'></i></b>{reminderRecord.Mileage}")">
+                            @if (reminderRecord.Metric == ReminderMetric.Date)
+                            {
+                            @reminderRecord.Date.ToShortDateString()
+                            }
+                            else if (reminderRecord.Metric == ReminderMetric.Odometer)
+                            {
+                            @reminderRecord.Mileage
+                            }
+                            else
+                            {
+                            @reminderRecord.Metric
+                            }
+                            </span>
+                        </td>
                         <td class="@(hasRefresh ? "col-3 col-md-4" : "col-5")" data-record-type='cost'>@reminderRecord.Description</td>
                         <td class="col-2 col-md-3 text-truncate">@CarCareTracker.Helper.StaticHelper.TruncateStrings(reminderRecord.Notes)</td>
                         @if (hasRefresh)
@@ -118,4 +122,10 @@
     <li><hr class="context-menu-multiple dropdown-divider"></li>
     <li><a class="dropdown-item" href="#" onclick="duplicateRecords(selectedRow, 'ReminderRecord')">@translator.Translate(userLanguage, "Duplicate")</a></li>
     <li><a class="dropdown-item" href="#" onclick="deleteRecords(selectedRow, 'ReminderRecord')">@translator.Translate(userLanguage, "Delete")</a></li>
-</ul>
+</ul>
+
+<script>
+    if (!getDeviceIsTouchOnly()) {
+        $("[data-column='metric']").map((x, y) => new bootstrap.Tooltip(y));
+    }
+</script>

Views/Vehicle/_Report.cshtml

@@ -12,7 +12,7 @@
             <div class="row">
                 <div class="col-12">
                     <select class="form-select" id="yearOption" onchange="yearUpdated()">
-                        <option value="0">All Time</option>
+                        <option value="0">@translator.Translate(userLanguage, "All Time")</option>
                         @foreach (int year in Model.Years)
                         {
                             <option value="@year">@year</option>
@@ -32,7 +32,7 @@
                 <div class="col-12 col-md-10">
                     <div class="dropdown d-grid dropdown-center">
                         <button class="btn btn-outline-warning dropdown-toggle" type="button" data-bs-toggle="dropdown" data-bs-auto-close="outside" aria-expanded="false">
-                            Metrics
+                            @translator.Translate(userLanguage, "Metrics")
                         </button>
                         <ul class="dropdown-menu" style="width:100%;">
                             <li class="dropdown-item">
@@ -146,4 +146,15 @@
         </div>
     </div>
 </div>
-<div id="vehicleHistoryReport" class="showOnPrint"></div>
+<div class="modal fade" data-bs-focus="false" id="vehicleDataTableModal" tabindex="-1" role="dialog" aria-hidden="true">
+    <div class="modal-dialog modal-lg" role="document">
+        <div class="modal-content" id="vehicleDataTableModalContent">
+            
+        </div>
+    </div>
+</div>
+<div id="vehicleHistoryReport" class="showOnPrint"></div>
+
+<script>
+    getSelectedMetrics();
+</script>

Views/Vehicle/_ServiceRecordModal.cshtml

@@ -24,11 +24,11 @@
                     </div>
                     <label for="serviceRecordMileage">@translator.Translate(userLanguage, "Odometer")</label>
                     <div class="input-group">
-                        <input type="number" inputmode="numeric" id="serviceRecordMileage" class="form-control" placeholder="@translator.Translate(userLanguage,"Odometer reading when serviced")" value="@(isNew ? "" : Model.Mileage)">
+                        <input type="number" inputmode="numeric" id="serviceRecordMileage" class="form-control" placeholder="@translator.Translate(userLanguage,"Odometer reading when serviced")" value="@(isNew || Model.Mileage == default ? "" : Model.Mileage)">
                         @if (isNew)
                         {
                             <div class="input-group-text">
-                                <button type="button" class="btn btn-sm btn-primary zero-y-padding" onclick="getLastOdometerReadingAndIncrement('serviceRecordMileage')">+</button>
+                                <button type="button" class="btn btn-sm btn-primary zero-y-padding" onclick="getLastOdometerReadingAndIncrement('serviceRecordMileage')"><i class="bi bi-plus"></i></button>
                             </div>
                         }
                     </div>
@@ -91,6 +91,7 @@
                         <input onChange="uploadVehicleFilesAsync(this)" type="file" multiple accept="@config.GetAllowedFileUploadExtensions()" class="form-control-file" id="serviceRecordFiles">
                         <br /><small class="text-body-secondary">@translator.Translate(userLanguage,"Max File Size: 28.6MB")</small>
                     }
+                    <div id="filesPendingUpload"></div>
                 </div>
             </div>
         </div>

Views/Vehicle/_ServiceRecords.cshtml

@@ -123,7 +123,7 @@
                 {
                     <tr class="d-flex user-select-none" style="cursor:pointer;" onmouseup="stopEvent()" ontouchstart="detectRowLongTouch(this)" ontouchend="detectRowTouchEndPremature(this)" data-rowId="@serviceRecord.Id" oncontextmenu="showTableContextMenu(this)" onmousemove="rangeMouseMove(this)" onclick="handleTableRowClick(this, showEditServiceRecordModal,@serviceRecord.Id)" data-tags='@string.Join(" ", serviceRecord.Tags)'>
                         <td class="col-2 col-xl-1 flex-grow-1" data-column="date" data-date="@StaticHelper.GetEpochFromDateTime(serviceRecord.Date)">@serviceRecord.Date.ToShortDateString()</td>
-                        <td class="col-2 flex-grow-1 flex-shrink-1" data-column="odometer">@serviceRecord.Mileage</td>
+                        <td class="col-2 flex-grow-1 flex-shrink-1" data-column="odometer">@(serviceRecord.Mileage == default ? "---" : serviceRecord.Mileage.ToString())</td>
                         <td class="col-3 col-xl-4 flex-grow-1 flex-shrink-1" data-column="description">@serviceRecord.Description</td>
                         <td class="col-2 flex-grow-1 flex-shrink-1" data-column="cost" data-record-type="cost">@((hideZero && serviceRecord.Cost == default) ? "---" : serviceRecord.Cost.ToString("C"))</td>
                         <td class="col-3 text-truncate flex-grow-1 flex-shrink-1" data-column="notes">@CarCareTracker.Helper.StaticHelper.TruncateStrings(serviceRecord.Notes)</td>
@@ -149,7 +149,7 @@
 </div>
 
 
-<div class="modal fade" data-bs-focus="false" id="serviceRecordModal" tabindex="-1" role="dialog" aria-hidden="true">
+<div class="modal fade" data-bs-focus="false" id="serviceRecordModal" tabindex="-1" role="dialog" aria-hidden="true" onpaste="handleModalPaste(event, 'serviceRecordFiles')">
     <div class="modal-dialog modal-lg" role="document">
         <div class="modal-content" id="serviceRecordModalContent">
         </div>

Views/Vehicle/_SupplyRecordModal.cshtml

@@ -34,7 +34,7 @@
                             <div class="input-group">
                                 <input type="text" inputmode="decimal" id="supplyRecordQuantity" class="form-control" placeholder="@translator.Translate(userLanguage,"Quantity")" value="@(isNew ? "1" : Model.Quantity)">
                                 <div class="input-group-text">
-                                    <button type="button" class="btn btn-sm zero-y-padding btn-primary" onclick="replenishSupplies()">+</button>
+                                    <button type="button" class="btn btn-sm zero-y-padding btn-primary" onclick="replenishSupplies()"><i class="bi bi-plus"></i></button>
                                 </div>
                             </div>
                         </div>
@@ -77,6 +77,7 @@
                         <input onChange="uploadVehicleFilesAsync(this)" type="file" multiple accept="@config.GetAllowedFileUploadExtensions()" class="form-control-file" id="supplyRecordFiles">
                         <br /><small class="text-body-secondary">@translator.Translate(userLanguage,"Max File Size: 28.6MB")</small>
                     }
+                    <div id="filesPendingUpload"></div>
                 </div>
             </div>
         </div>

Views/Vehicle/_SupplyRecords.cshtml

@@ -167,7 +167,7 @@
 </div>
 
 
-<div class="modal fade" data-bs-focus="false" id="supplyRecordModal" tabindex="-1" role="dialog" aria-hidden="true">
+<div class="modal fade" data-bs-focus="false" id="supplyRecordModal" tabindex="-1" role="dialog" aria-hidden="true" onpaste="handleModalPaste(event, 'supplyRecordFiles')">
     <div class="modal-dialog modal-lg" role="document">
         <div class="modal-content" id="supplyRecordModalContent">
         </div>

Views/Vehicle/_SupplyUsage.cshtml

@@ -110,7 +110,7 @@
             var inStockQuantity = globalParseFloat(inStock.text());
             var unitPrice = globalParseFloat(priceField.text());
             //validation
-            if (isNaN(requestedQuantity) || requestedQuantity > inStockQuantity) {
+            if (isNaN(requestedQuantity) || requestedQuantity > inStockQuantity || requestedQuantity <= 0) {
                 textField.addClass("is-invalid");
                 hasError = true;
             } else {
@@ -131,7 +131,7 @@
             var parsedFloat = globalFloatToString(totalSum);
             $("#supplySumLabel").text(`Total: ${parsedFloat}`);
         }
-        $("#selectSuppliesButton").attr('disabled', (hasError || totalSum == 0));
+        $("#selectSuppliesButton").attr('disabled', (hasError || selectedSupplies.toArray().length == 0));
         if (!hasError) {
             return {
                 totalSum: globalFloatToString(totalSum),

Views/Vehicle/_TaxRecordModal.cshtml

@@ -92,6 +92,7 @@
                         <input onChange="uploadVehicleFilesAsync(this)" type="file" multiple accept="@config.GetAllowedFileUploadExtensions()" class="form-control-file" id="taxRecordFiles">
                         <br /><small class="text-body-secondary">@translator.Translate(userLanguage,"Max File Size: 28.6MB")</small>
                     }
+                    <div id="filesPendingUpload"></div>
                 </div>
             </div>
         </div>

Views/Vehicle/_TaxRecords.cshtml

@@ -143,7 +143,7 @@
 </div>
 
 
-<div class="modal fade" data-bs-focus="false" id="taxRecordModal" tabindex="-1" role="dialog" aria-hidden="true">
+<div class="modal fade" data-bs-focus="false" id="taxRecordModal" tabindex="-1" role="dialog" aria-hidden="true" onpaste="handleModalPaste(event, 'taxRecordFiles')">
     <div class="modal-dialog modal-lg" role="document">
         <div class="modal-content" id="taxRecordModalContent">
         </div>

Views/Vehicle/_UpgradeRecordModal.cshtml

@@ -24,11 +24,11 @@
                     </div>
                     <label for="upgradeRecordMileage">@translator.Translate(userLanguage, "Odometer")</label>
                     <div class="input-group">
-                        <input type="number" inputmode="numeric" id="upgradeRecordMileage" class="form-control" placeholder="@translator.Translate(userLanguage,"Odometer reading when upgraded/modded")" value="@(isNew ? "" : Model.Mileage)">
+                        <input type="number" inputmode="numeric" id="upgradeRecordMileage" class="form-control" placeholder="@translator.Translate(userLanguage,"Odometer reading when upgraded/modded")" value="@(isNew || Model.Mileage == default ? "" : Model.Mileage)">
                         @if (isNew)
                         {
                             <div class="input-group-text">
-                                <button type="button" class="btn btn-sm btn-primary zero-y-padding" onclick="getLastOdometerReadingAndIncrement('upgradeRecordMileage')">+</button>
+                                <button type="button" class="btn btn-sm btn-primary zero-y-padding" onclick="getLastOdometerReadingAndIncrement('upgradeRecordMileage')"><i class="bi bi-plus"></i></button>
                             </div>
                         }
                     </div>
@@ -89,10 +89,9 @@
                         }
                         <label for="upgradeRecordFiles">Upload documents(optional)</label>
                         <input onChange="uploadVehicleFilesAsync(this)" type="file" multiple accept="@config.GetAllowedFileUploadExtensions()" class="form-control-file" id="upgradeRecordFiles">
-                        <br />
-
-                        <small class="text-body-secondary">@translator.Translate(userLanguage, "Max File Size: 28.6MB")</small>
+                        <br /><small class="text-body-secondary">@translator.Translate(userLanguage, "Max File Size: 28.6MB")</small>
                     }
+                    <div id="filesPendingUpload"></div>
                 </div>
             </div>
         </div>

Views/Vehicle/_UpgradeRecords.cshtml

@@ -109,7 +109,7 @@
                 <tr class="d-flex">
                     <th scope="col" class="col-2 flex-grow-1 col-xl-1" data-column="date">@translator.Translate(userLanguage, "Date")</th>
                     <th scope="col" class="col-2 flex-grow-1 flex-shrink-1" data-column="odometer">@translator.Translate(userLanguage, "Odometer")</th>
-                    <th scope="col" class="col-3 flex-grow-1 col-xl-4" data-column="description">@translator.Translate(userLanguage, "Description")</th>
+                    <th scope="col" class="col-3 flex-grow-1 flex-shrink-1 col-xl-4" data-column="description">@translator.Translate(userLanguage, "Description")</th>
                     <th scope="col" class="col-2 flex-grow-1 flex-shrink-1" data-column="cost" onclick="toggleSort('upgrade-tab-pane', this)" style="cursor:pointer;">@translator.Translate(userLanguage, "Cost")</th>
                     <th scope="col" class="col-3 flex-grow-1 flex-shrink-1" data-column="notes">@translator.Translate(userLanguage, "Notes")</th>
                     @foreach (string extraFieldColumn in extraFields)
@@ -123,8 +123,8 @@
                 {
                     <tr class="d-flex user-select-none" style="cursor:pointer;" onmouseup="stopEvent()" ontouchstart="detectRowLongTouch(this)" ontouchend="detectRowTouchEndPremature(this)" data-rowId="@upgradeRecord.Id" oncontextmenu="showTableContextMenu(this)" onmousemove="rangeMouseMove(this)" onclick="handleTableRowClick(this, showEditUpgradeRecordModal,@upgradeRecord.Id)" data-tags='@string.Join(" ", upgradeRecord.Tags)'>
                         <td class="col-2 flex-grow-1 col-xl-1" data-column="date" data-date="@StaticHelper.GetEpochFromDateTime(upgradeRecord.Date)">@upgradeRecord.Date.ToShortDateString()</td>
-                        <td class="col-2 flex-grow-1 flex-shrink-1" data-column="odometer">@upgradeRecord.Mileage</td>
-                        <td class="col-3 flex-grow-1 col-xl-4" data-column="description">@upgradeRecord.Description</td>
+                        <td class="col-2 flex-grow-1 flex-shrink-1" data-column="odometer">@(upgradeRecord.Mileage == default ? "---" : upgradeRecord.Mileage.ToString())</td>
+                        <td class="col-3 flex-grow-1 flex-shrink-1 col-xl-4" data-column="description">@upgradeRecord.Description</td>
                         <td class="col-2 flex-grow-1 flex-shrink-1" data-column="cost" data-record-type="cost">@((hideZero && upgradeRecord.Cost == default) ? "---" : upgradeRecord.Cost.ToString("C"))</td>
                         <td class="col-3 flex-grow-1 flex-shrink-1 text-truncate" data-column="notes">@CarCareTracker.Helper.StaticHelper.TruncateStrings(upgradeRecord.Notes)</td>
                         @foreach (string extraFieldColumn in extraFields)
@@ -150,7 +150,7 @@
     </div>
 </div>
 
-<div class="modal fade" data-bs-focus="false" id="upgradeRecordModal" tabindex="-1" role="dialog" aria-hidden="true">
+<div class="modal fade" data-bs-focus="false" id="upgradeRecordModal" tabindex="-1" role="dialog" aria-hidden="true" onpaste="handleModalPaste(event, 'upgradeRecordFiles')">
     <div class="modal-dialog modal-lg" role="document">
         <div class="modal-content" id="upgradeRecordModalContent">
         </div>

Views/Vehicle/_UploadedFiles.cshtml

@@ -6,8 +6,8 @@
     var userLanguage = userConfig.UserLanguage;
 }
 @model List<UploadedFiles>
-<label>@translator.Translate(userLanguage, "Uploaded Documents")</label>
-<ul class="list-group">
+<label id="uploadedDocumentsLabel">@translator.Translate(userLanguage, "Uploaded Documents")</label>
+<ul class="list-group" id="uploadedDocumentsList">
     @foreach (UploadedFiles filesUploaded in Model)
     {
         <li class="list-group-item">

Views/Vehicle/_VehicleHistory.cshtml

@@ -31,6 +31,10 @@
                             {
                                 <span><i class="bi bi-ev-station me-2"></i>@translator.Translate(userLanguage, "Electric")</span>
                             }
+                            else if (Model.VehicleData.IsDiesel)
+                            {
+                                <span><i class="bi bi-fuel-pump-diesel me-2"></i>@translator.Translate(userLanguage, "Diesel")</span>
+                            }
                             else
                             {
                                 <span><i class="bi bi-fuel-pump me-2"></i>@translator.Translate(userLanguage, "Gasoline")</span>

Views/Vehicle/_VehicleModal.cshtml

@@ -46,14 +46,20 @@
                     }
                 </div>
                 <div class="col-12 col-md-6">
-                    <div class="form-check form-switch">
-                        <input class="form-check-input" type="checkbox" role="switch" id="inputIsElectric" checked="@Model.IsElectric">
-                        <label class="form-check-label" for="inputIsElectric">@translator.Translate(userLanguage, "Electric Vehicle")</label>
-                    </div>
+                    <label for="inputFuelType">@translator.Translate(userLanguage, "Fuel Type")</label>
+                    <select class="form-select" onchange="checkCustomMonthInterval()" id="inputFuelType")>
+                        <!option value="Gasoline" @(!Model.IsDiesel && !Model.IsElectric ? "selected" : "")>@translator.Translate(userLanguage, "Gasoline")</!option>
+                        <!option value="Diesel" @(Model.IsDiesel ? "selected" : "")>@translator.Translate(userLanguage, "Diesel")</!option>
+                        <!option value="Electric" @(Model.IsElectric ? "selected" : "")>@translator.Translate(userLanguage, "Electric")</!option>
+                    </select>
                     <div class="form-check form-switch">
                         <input class="form-check-input" type="checkbox" role="switch" id="inputUseHours" checked="@Model.UseHours">
                         <label class="form-check-label" for="inputUseHours">@translator.Translate(userLanguage, "Use Engine Hours")</label>
                     </div>
+                    <div class="form-check form-switch">
+                        <input class="form-check-input" type="checkbox" role="switch" id="inputOdometerOptional" checked="@Model.OdometerOptional">
+                        <label class="form-check-label" for="inputOdometerOptional">@translator.Translate(userLanguage, "Odometer Optional")</label>
+                    </div>
                     <div class="form-check form-switch">
                         <input class="form-check-input" type="checkbox" role="switch" onchange="toggleOdometerAdjustment()" id="inputHasOdometerAdjustment" checked="@Model.HasOdometerAdjustment">
                         <label class="form-check-label" for="inputHasOdometerAdjustment">@translator.Translate(userLanguage, "Odometer Adjustments")</label>
@@ -85,6 +91,29 @@
                             </div>
                         </div>
                     </div>
+                    <div class="accordion accordion-flush" id="vehicleModalMetricAccordion">
+                        <div class="accordion-item">
+                            <div class="accordion-header">
+                                <button class="accordion-button skinny collapsed" type="button" data-bs-toggle="collapse" data-bs-target="#collapseMetricInfo">
+                                    @translator.Translate(userLanguage, "Dashboard Metrics")
+                                </button>
+                            </div>
+                            <div id="collapseMetricInfo" class="accordion-collapse collapse" data-bs-parent="#vehicleModalMetricAccordion">
+                                <div class="form-check form-switch">
+                                    <input class="form-check-input" type="checkbox" role="switch" id="inputMetricDefault" value="@DashboardMetric.Default" checked="@Model.DashboardMetrics.Contains(DashboardMetric.Default)">
+                                    <label class="form-check-label" for="inputMetricDefault">@translator.Translate(userLanguage, "Last Odometer")</label>
+                                </div>
+                                <div class="form-check form-switch">
+                                    <input class="form-check-input" type="checkbox" role="switch" id="inputMetricCostPerMile" value="@DashboardMetric.CostPerMile" checked="@Model.DashboardMetrics.Contains(DashboardMetric.CostPerMile)">
+                                    <label class="form-check-label" for="inputMetricCostPerMile">@translator.Translate(userLanguage, "Total Cost / Total Distance Driven")</label>
+                                </div>
+                                <div class="form-check form-switch">
+                                    <input class="form-check-input" type="checkbox" role="switch" id="inputMetricTotalCost" value="@DashboardMetric.TotalCost" checked="@Model.DashboardMetrics.Contains(DashboardMetric.TotalCost)">
+                                    <label class="form-check-label" for="inputMetricTotalCost">@translator.Translate(userLanguage, "Total Cost")</label>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
                     <label for="inputTag">@translator.Translate(userLanguage, "Tags(optional)")</label>
                     <select multiple class="form-select" id="inputTag">
                         @foreach (string tag in Model.Tags)

appsettings.json

@@ -7,10 +7,13 @@
   },
   "AllowedHosts": "*",
   "UseDarkMode": false,
+  "UseSystemColorMode": false,
   "EnableCsvImports": true,
   "UseMPG": true,
   "UseDescending": false,
   "EnableAuth": false,
+  "DisableRegistration": false,
+  "EnableRootUserOIDC": false,
   "HideZero": false,
   "EnableAutoReminderRefresh": false,
   "EnableAutoOdometerInsert": false,
@@ -27,5 +30,6 @@
   "VisibleTabs": [ 0, 1, 4, 2, 3, 6, 5, 8 ],
   "DefaultTab": 8,
   "UserNameHash": "",
-  "UserPasswordHash": ""
+  "UserPasswordHash": "",
+  "DefaultReminderEmail":  ""
 }

docker-compose.postgresql.yml

@@ -30,6 +30,7 @@ services:
       POSTGRES_PASSWORD: "lubepass"
       POSTGRES_DB: "lubelogger"
     volumes:
+      - ./init.sql:/docker-entrypoint-initdb.d/init.sql
       - postgres:/var/lib/postgresql/data
       - /etc/localtime:/etc/localtime:ro
 

docs/documentation/API.md

@@ -1,14 +0,0 @@
-# API
-
-LubeLogger provides API endpoints to retrieve and add records, full documentation of these endpoints can be found at `/api`.
-
-## Authentication
-If authentication is enabled, it implements Basic Auth based on RFC2617, which stipulates that the "token" is passed in as a Base64-encoded string comprising of a username and password separated by a colon(":"). Because of this, neither the username nor password can contain a colon(":") character.
-
-### Testing
-You can utilize any REST API testing tool to test your use-case.
-
-## Example Use Cases
-- Send Email Reminders, see [[Reminders|Records/Reminders#reminder-emails]]
-- Insert Odometer Records, see [[Odometer|Records/Odometer#api-integration]]
-- Create DB Backups

docs/documentation/Authentication.md

@@ -1,45 +0,0 @@
-# Authentication
-
-LubeLogger does not require authentication by default; however, it is highly recommend that you set up authentication if your LubeLogger instance is accessible vvia the Internet or if you wish to invite other users to your instance.
-
-## Enabling Authentication
-To enable authentication, all you have to do is navigate to the "Settings" tab and check "Enable Authentication".
-
-A dialog will then prompt you to enter a username and password. These are the credentials for the Root/Super User.
-
-Once you have entered the credentials, click the "Setup" button and you will be redirected to a login screen, enter the credentials of the Root/Super User here to login.
-
-## Creating / Inviting New Users
-LubeLogger relies on an invitation-only model for creating/registering new users. It is highly recommended that LubeLogger is configured with SMTP in order to make the user registration process as smooth as possible, see [[Getting Started]] for more information regarding SMTP configuration.
-
-To Create/Invite New Users, you first need to enable authentication and set up the Root User credentials. Once that is done, upon login, you will see that there is now a dropdown to the right of the "Settings" tab that has your root username on it. Click on that dropdown and select "Admin Panel"
-![](/Authentication/a/image-1706398957700.png)
-
-You will now be taken to a new page. There are two sections in this page, Tokens and Users. 
-![](/Authentication/a/image-1706398972637.png)
-
-Tokens are used for invitees to register their user account or existing users to reset their password. These tokens are single use and are validated against the email address they are issued for.
-
-Users, as the name suggests, is a list of users in the system. You can also mark or unmark existing users as Admins here, see below to understand what permissions Admin users have.
-
-To invite a user, simply click on the "Generate User Token" button and type in their email address, note that this is case-sensitive. 
-![](/Authentication/a/image-1706398926360.png)
-
-If SMTP is configured and the Auto Notify(via Email) switch is checked, the user will receive an email that looks like this:
-![](/Authentication/a/image-1706398865186.png)
-
-## Root/Super User
-You might be tempted to use your root credentials as your main credentials, and there is nothing wrong that, but you should know that there are a few caveats associated with the root user.
-1. Root/Super Users can view and edit all vehicles, this might seem like a great advantage initially, but it can be problematic if there are sufficient users and you have to sift through dozens of vehicles to get to yours.
-2. Any setting you enable/disable will become the default setting inherited by new users.
-
-For the reasons above, it is highly recommended that you create a second user for personal use and mark it as an Admin. See below for a breakdown of permissions across user tiers.
-
-| Permissions            | User                                      | Admin                                     | Root/Super User        |
-| ---------------------- | ----------------------------------------- | ----------------------------------------- | ---------------------- |
-| View/Edit Vehicles     | Only vehicles which they are collaborator | Only vehicles which they are collaborator | View/Edit All Vehicles |
-| Access API             | Yes                                       | Yes                                       | Yes                    |
-|  Personalized Settings                      |      Yes                                     |   Yes                                        |    No, settings will be set as server default                    |
-| Add/Remove Users       | No                                        | Yes                                       | Yes                    |
-| Make/Restore Backups   | No                                        | No                                        | Yes                    |
-| Disable Authentication | No                                        | No                                        | Yes                    |

docs/documentation/Dashboard.md

@@ -1,32 +0,0 @@
-# Dashboard
-
-The Dashboard is where you get an overview of your vehicle. It is the default tab that the user will see when they click into a vehicle and it is also the only tab that cannot be hidden.
-
-![](/Dashboard/a/image-1706633228249.png)
-
-The Dashboard includes the following data:
-- Expenses By Type By Year/All Time(Top-Left)
-- Total Expenses By Month By Year/All Time(Top-Center)
-- Reminders by current date or future date(Top-Right)
-- Collaborators(Bottom-Left), see [[Adding Collaborators|Vehicle Management#adding-a-collaborator]]
-- Fuel Mileage By Month By Year/All Time(Bottom-Center)
-- Vehicle Maintenance Report Generator(Bottom-Right)
-
-## Filtering Data by Year
-The year dropdown above the pie chart(top-left) allows the user to filter the aggregated data by year. The year selections are populated by retrieving all years between the year of the oldest record and the current year. If the oldest record is less than 5 years old, the selections will still be populated by the last 5 years.
-
-Note: Changing the selected year will automatically refresh the Expenses by Type Pie Chart, the Total Expenses by Month and the Fuel Mileage By Month Bar Charts.
-
-![](/Dashboard/a/image-1706477893556.png)
-
-## Vehicle Maintenance Report
-The Vehicle Maintainence Report Generator is a button that will generate a consolidated report of all work performed on the vehicle. For performance reasons, this report is designed to be printed as soon as it is generated. You can either choose to print it to paper or PDF.
-
-![](/Dashboard/a/image-1706478028103.png)
-
-## Export Attachments
-The Export Attachments button provies a convenient feature to export all attachments into a chronologically-ordered zip file. Upon clicking the button, you will be prompted to select which tabs you want attachments to be exported from.
-
-![](/Dashboard/a/image-1706574853389.png)
-
-Once you have made your selection, a zip file will be created and downloaded onto your computer. This zip file contains all of the attachments and are named in chronological order(i.e.: the oldest attachment will be named 0 and the second oldest attachment 1, 2...)

docs/documentation/FuelRecords.md

@@ -1,62 +0,0 @@
-# Fuel Records
-
-The Fuel tab keeps track of the fuel mileage for your vehicle.
-
-![](/Records/Fuel%20Records/a/image-1707455181666.png)
-
-LubeLogger supports fuel mileage calculation in the following formats:
-- American Imperial (MPG)
-- European/Asian Metric (L/100Km)
-- British(Purchase Gas in Liters and calculate fuel mileage as Miles per Imperial UK Gallons)
-- Electric Vehicles (mi./kWh or kWh/100Km)
-
-## Initial Fuel Up
-In order to calculate fuel mileage, you must first have an initial fuel entry with the current odometer reading. An odometer reading is needed so that the app can calculate the distance traveled between fuel ups. It is recommended that you fill it up to full for the first entry.
-
-## Imperfect Fuel Ups
-For the most accurate results it is recommended that you always fill your vehicle up to full and not miss any fuel ups, but sometimes things happen, which is why we provided the following:
-
-### Partial Fuel Ups
-On the occassions that you cannot fill your vehicle up to full, you can defer the fuel mileage calculation by unchecking the "Is Filled To Full" switch. Doing this tells the app to defer fuel mileage calculation until the next Full Fill Up.
-
-![](/Records/Fuel%20Records/a/image-1706406318412.png)
-
-### Missed Fuel Ups
-Check this if you have missed a fuel up record prior to adding this fuel record. This effectively resets the fuel mileage calculation and will show up as $0 or "---" in the fuel records. Checking this ensures that the average fuel mileage calculation isn't skewed due to missed fuel ups.
-
-## Calculation of Average Fuel Mileage
-Average MPG is calculated by excluding the initial and missed fuel ups, then taking the difference between the min and max odometer reading and dividing it by total amount of gas consumed(if Metric then it is further divided by 1/100). This method will include all of the gas consumed by full and partial fuel ups.
-
-## Fuel Units
-The consumption, fuel mileage, and odometer units are determined by two settings: "Use Imperial Calculation" and "Use UK MPG Calculation"
-
-| Setting | Use UK MPG Calculation Checked | Use UK MPG Calculation Unchecked |
-| -------- | -------- | -------- |
-| Use Imperial Calculation Checked    | Distance: Miles, Consumption: Liters, Fuel Mileage: Miles per UK Gallons       | Distance: Miles, Consumption: Gallons, Fuel Mileage: MPG    |
-| Use Imperial Calculation Unchecked     | Distance: Miles, Consumption: Liters, Fuel Mileage: l/100mi.    | Distance: Km, Consumption: Liters, Fuel Mileage: l/100km   |
-
-### Alternate Fuel Units
-If you wish to see alternate units which converts the calculated units within the Gas Tab, you can right click on the table headers for Consumption and Fuel Economy. These settings persists for the user, so the next time you login to LubeLogger it will automatically perform the conversion for you.
-
-![](/Records/Fuel%20Records/a/image-1706797201107.gif)
-
-#### Consumption
-For consumption, the units are cycled between US gal, Liters, and Imp Gal(UK). Changing the consumption unit will also change the unit cost.
-
-#### Fuel Economy
-The units can only toggle between l/100km and km/l, which means that this unit cannot be converted if your fuel economy unit is not l/100km. Changing the fuel economy unit will also update the values in the Average, Min, and Max Fuel Economy labels as well as the Fuel Economy Unit in the Consolidated Report.
-
-## Importing from CSV/Fuelly/SpiritMonitor.de
-LubeLogger supports importing CSV exports from other apps, below lists the column names that are acceptable/mapped to our data points:
-
-| LubeLogger Data Field                  | Imported CSV                                                   |
-| -------------------------------------- | -------------------------------------------------------------- |
-| date                                   | date, fuelup_date                                              |
-| odometer                               | odometer                                                       |
-| fuelconsumed                           | gallons, liters, litres, consumption, quantity,   fuelconsumed |
-| cost                                   | cost, total cost, totalcost,  total price                      |
-| notes                                  | notes, note                                                    |
-| partialfuelup(inverse of isfilltofull) | partial_fuelup                                                 |
-| isfilltofull                           | isfilltofull, filled up                                        |
-| missedfuelup                           | missedfuelup, missed_fuelup                                    |
-| tags                                       |        tags                                                        |

docs/documentation/GettingStarted.md

@@ -1,73 +0,0 @@
-# Getting Started
-## Docker
-The Docker Container Repository is the most reliable and up-to-date distribution channel for LubeLogger.
-You need to have Docker Windows installed and Virtualization enabled(typically a BIOS setting).
-
-You will then clone the following files onto your computer from the repository _.env_ and _docker-compose.yml_ or _docker-compose-traefik.yml_ if you're using Traefik.
-
-In the .env file you will find the following and here are the explanations for the variables.
-```
-LC_ALL=en_US.UTF-8 <- Locale and Language Settings, this will affect how numbers, currencies, and dates are formatted.
-LANG=en_US.UTF-8 <- Same as above. Note that some languages don't have UTF-8 encodings.
-MailConfig__EmailServer="" <- Email SMTP settings used only for configuring multiple users(to send their registration token and forgot password tokens)
-MailConfig__EmailFrom="" <- Same as above.
-MailConfig__UseSSL="false" <- Same as above.
-MailConfig__Port=587 <- Same as above.
-MailConfig__Username="" <- Same as above.
-MailConfig__Password="" <- Same as above.
-```
-
-Once you're happy with the configuration, run the following commands to pull down the image and run container.
-```
-docker pull ghcr.io/hargata/lubelogger:latest
-docker-compose up
-```
-By default the app will start listening at localhost:8080, this port can be configured in the docker-compose file.
-
-## Windows Standalone Executable
-Windows Standalone executables are provided on a request basis, and will usually be included with every other release.
-
-To run the server, you just have to download the zip archive attached to the release, usually named LubeLogger_vNNN_win_x64.zip, extract the archive and double click on CarCareTracker.exe
-
-Occassionally you might run into an issue regarding a missing folder, to fix that, just create a "config" folder where CarCareTracker.exe is located.
-
-If you wish to set up SMTP when using this approach, you will have to configure the environment settings in appsettings.json located in the same folder as CarCareTracker.exe
-You just have to add the MailConfig section into it, but I provided the full appsettings.json anyways as an example.
-```
-{
-  "Logging": {
-    "LogLevel": {
-      "Default": "Information",
-      "Microsoft.AspNetCore": "Warning"
-    }
-  },
-  "AllowedHosts": "*",
-  "UseDarkMode": false,
-  "EnableCsvImports": true,
-  "UseMPG": true,
-  "UseDescending": false,
-  "EnableAuth": false,
-  "HideZero": false,
-  "EnableAutoReminderRefresh": false,
-  "EnableAutoOdometerInsert": false,
-  "UseUKMPG": false,
-  "UseThreeDecimalGasCost": true,
-  "VisibleTabs": [ 0, 1, 4, 2, 3, 6, 5, 8 ],
-  "DefaultTab": 8,
-  "UserNameHash": "",
-  "UserPasswordHash": "",
-  "MailConfig": {
-    "EmailServer": "",
-    "EmailFrom": "",
-    "UseSSL": true,
-    "Port": 587,
-    "Username": "",
-    "Password": ""
-  }
-}
-
-```
-When using this approach, the default port the app will be listening on is 5000, so you will navigate to localhost:5000
-
-## Test that It Works
-Whichever path you choose, once you get the app up and running, just navigate to the IP address and port the server is listening to and you should be able to see the app

docs/documentation/HTTPS.md

@@ -1,46 +0,0 @@
-# Set Up HTTPS
-
-LubeLogger runs on Kestrel, which is a cross-platform standalone web server provided by .NET
-
-If you're running LubeLogger behind a reverse proxy(i.e. NGINX), then this walkthrough does not apply to you since the SSL certs will be served up by NGINX instead of Kestrel.
-
-This article covers the step-by-step process to set up HTTPS for a LubeLogger instance.
-
-## Docker
-If you're running LubeLogger on a Docker instance, first read [this article by Microsoft](https://learn.microsoft.com/en-us/aspnet/core/security/docker-compose-https?view=aspnetcore-8.0)
-
-1. Convert the .PEM / .CRT files into .PFX, read [this StackOverflow post](https://stackoverflow.com/questions/808669/convert-a-cert-pem-certificate-to-a-pfx-certificate)
-2. Open and modify the .env file and add the following lines(note that in this example I used bob as the password for the cert)
-```
-ASPNETCORE_Kestrel__Certificates__Default__Password=bob
-ASPNETCORE_Kestrel__Certificates__Default__Path=/https/<yourPFXCertificateName>.pfx
-ASPNETCORE_URLS=https://+:443;http://+:80
-```
-3. Open and modify docker-compose.yml. You will need to bind a new volume to the Docker container so that Kestrel can access the certificate file.
-```
-    volumes:
-      - ~/https/:/https:ro
-```
-4. Run `docker-compose up -d` to start up the container and `https://localhost` will now have a valid cert.
-
-## Windows
-If you're running LubeLogger as the standalone Windows executable, first read [this article by Microsoft](https://learn.microsoft.com/en-us/aspnet/core/fundamentals/servers/kestrel/endpoints?view=aspnetcore-8.0#configure-https-in-appsettingsjson)
-
-1. Convert the .PEM / .CRT files into .PFX, read [this StackOverflow post](https://stackoverflow.com/questions/808669/convert-a-cert-pem-certificate-to-a-pfx-certificate)
-2. Open and modify appsettings.json located in the same directory as the CarCareTracker executable and add the following lines(note that in this example I used bob as the password for the cert)
-```
-"Kestrel": {
-    "Endpoints": {
-      "Http": {
-        "Url": "http://localhost:80"
-      },
-      "HttpsInlineCertFile": {
-        "Url": "https://localhost:443",
-        "Certificate": {
-          "Path": "<path to .pfx file>",
-          "Password": "bob"
-        }
-      }
-}
-```
-3. Restart the app and `https://localhost` will now have a valid cert.

docs/documentation/Notes.md

@@ -1,25 +0,0 @@
-# Notes
-
-The Notes tab contains important notes about your vehicle.
-
-## Markdown Parsing
-Markdown formatting is supported across all Notes fields in the app. The underlying markdown parser is [Drawdown](https://github.com/adamvleggett/drawdown). To toggle between edit and preview mode, simply click on the markdown icon next to the "Notes" label.
-
-![](/Records/Notes/a/image-1706634016273.png)
-
-![](/Records/Notes/a/image-1706634022811.png)
-
-There is also a setting, that when enabled, will automatically load all notes in Markdown form when viewing existing records. The only exception is when an existing record has an empty notes field.
-
-## Pinned Notes
-Notes can be pinned by checking the "Pinned" switch when creating or editing a note.
-
-![](/Records/Notes/a/image-1706633376978.png)
-
-Pinned Notes will always show up at the very top of the list.
-
-![](/Records/Notes/a/image-1706455413890.png)
-
-On non-touchscreen devices, pinned notes can be viewed when the user hovers over the vehicle tile in the garage. On mobile, the user have to hold down on the garage tile in order for the pinned notes to show up.
-
-![](/Records/Notes/a/image-1706455460700.png)

docs/documentation/Odometer.md

@@ -1,14 +0,0 @@
-# Odometer
-
-The Odometer tab is where you can log your current odometer reading without having to insert any Service/Repair/Upgrade/Fuel records. This odometer readings entered in this tab allows Reminder urgencies to be calculated as accurately as possible since it uses the maximum mileage reported in each of the tabs to determine the last reported mileage.
-
-The Odometer tab is hidden by default and must be enabled by checking the "Odometer" switch under "Visible Tabs" in the Settings tab.
-
-## API Integration
-As with the other tabs, odometer readings can be retrieved via a GET endpoint and inserted via a POST API endpoint.
-
-Example use cases:
-- An app to integrate with OBDII and insert odometer reading from the vehicle's computer onto LubeLogger.
-- An app to keep track of distance traveled via GPS and incrementing the last reported odometer reading.
-
-These are not functionalities provided out of the box by LubeLogger, and are just examples of the possibilities achievable via the API endpoints.

docs/documentation/Planner.md

@@ -1,62 +0,0 @@
-# Planner
-
-The Planner tab is where you can plan and track progress of future or current plans for your vehicle. The planner tab consists of 4 swimlanes(vertical panels) where plans can be moved to different stages via drag and drop.
-
-![](/Records/Planner/a/image-1706459391188.png)
-
-The records stored in Service/Repair/Upgrade tabs tend to be inserted retroactively(after the work is done), hence the Planner tab was developed to keep track of To-Do's.
-
-## Adding a new Plan
-The Planner tab is hidden by default, you must enable it by checking the "Planner" switch under "Visible Tabs" within the Settings tab.
-
-To add a new plan, simply click on the "Add Plan Record" button and fill in the details of the plan.
-
-![](/Records/Planner/a/image-1707453045755.png)
-
-## Plan Type
-You are required to select at least one Plan Type - Service, Repair, or Upgrade. When the Plan Record is moved to Done, the Plan Record will be automatically converted into the selected type and it will then show up in its respective tab. The type is indicated by an icon corresponding to their respective tabs.
-
-## Plan Priority
-Within the swimlanes, plans are sorted from Critical priority to Low priority. They are also indicated by an icon - Fire for Critical, Waves for Normal, and Snowflake for Low.
-
-![](/Records/Planner/a/image-1706459640917.png)
-
-## Plan Stages
-**Planned** - This is considered the backlog, where no work has been performed yet. i.e.: Shopping for a lift kit.
-
-**Doing** - This is when work has been started on the task. i.e.: Installing the lift kit.
-
-**Testing** - This is where the work is being reviewed / tested. i.e.: Going for a test drive with the lift kit.
-
-**Done** - This is where the work is marked as completed.
-
-### Updating Plan Stages
-There are two ways you can update the stage a plan is currently in: drag and drop or updating it via the dropdown when editing a plan. You can backtrack a plan's stages within Planned, Doing, and Testing. i.e.: You can move the plan back from Testing to Doing if you find out there is more work to be done.
-
-### Moving to Done
-when a Plan is being moved to Done, it will prompt you to enter the current odometer reading. This is to ensure that the Service/Repair/Upgrade record that will be created from it contains the most up-to-date odometer reading.
-
-Once a Plan has been marked as Done, it can never be taken out of it. The only action that can be performed on it is Delete. You can delete Plans in the Done stage by clicking on them.
-
-## Plan Templates
-For records that have a fixed interval(i.e. oil changes), it is recommended that you create a Plan Template instead.
-
-### Creating a Template
-To create a template, simply fill in the details / select the supplies to requisition for the plan, but instead of clicking the "Add New Plan Record" button, you will click on the dropdown next to it and select "Save As Template"
-
-![](/Records/Planner/a/image-1707453250314.png)
-
-The template will now be created and named after the description of the plan record.
-
-### Using Templates
-To create a plan record from a template, click on the "View Templates button" and a dialog will show up with the saved templates for the vehicle
-
-![](/Records/Planner/a/image-1707453421824.png)
-
-![](/Records/Planner/a/image-1707453431731.png)
-
-The shop icon indicates if the template has supplies requisition and the paper clip icon(not shown) indicates if the template has file attachments.
-
-To use the template, simply click on the "+" button. The app will then perform a check to ensure that there are sufficient quantities of the supplies used by the template. If there are insufficient quantities, an error message will pop up telling you which supply is short.
-
-![](/Records/Planner/a/image-1707453639902.png)

docs/documentation/Postgres.md

@@ -1,53 +0,0 @@
-# Postgres
-
-For users that desire additional scalability for their backend, LubeLogger now supports a PostgreSQL backend.
-
-## Configuration
-
-To configure LubeLogger to use PostgreSQL, you must first create a database with a schema named "app" in it, in the screenshot below we created a DB named "lubelogger" and then a schema named "app".
-
-![](/Postgres/a/image-1707454502212.png)
-
-Once that is done, simply inject the environment variable `POSTGRES_CONNECTION` with your connection string, example:
-
-```
-Host=<yourserveraddress:port>;Username=<yourusername>;Password=<yourpassword>;Database=<databasename>;
-```
-
-LubeLogger will then automatically create the tables it needs, all records will then be saved and loaded from Postgres tables from now on.
-
-## Backups
-
-Once you have switched over to Postgres, LubeLogger's built in and backup function will only back up images, documents, and the server config. You are responsible for maintaining backups of the DB records.
-
-## Database Migration
-
-A tool is provided to ease the migration process between LiteDB and Postgres. This tool can be found at the `/migration` endpoint and is only accessible when a Postgres connection is provided.
-
-![](/Postgres/a/image-1707516092170.png)
-
-### Importing to Postgres
-
-To transfer all your existing data from LiteDB to Postgres:
-1. Create a backup using the "Make Backup" feature in the Settings tab.
-2. Extract the zip file.
-3. You should see a folder named "data" in the extracted folder
-4. Inside the data folder will be a .db file named `cartracker.db`
-5. Navigate to the Database Migration tool
-6. Click "Import to Postgres"
-7. Select the `cartracker.db` file
-8. Your data will be imported into your Postgres DB, and you may double check that the DB has been imported successfully using a Postgres DB Administration Tool.
-
-### Exporting from Postgres
-
-In the event that you need to transfer all your data back onto a LiteDB database file from Postgres, you may do so using the Database Migration tool:
-1. Navigate to the Database Migration Tool
-2. Click "Export from Postgres"
-3. Extract the downloaded zip file and you should find `cartracker.db` in it.
-4. Create a backup using the "Make Backup" feature in the Settings tab.
-5. Extract the zip file.
-6. You should see a folder named "data" in the extracted folder, if not, create it.
-7. Place `cartracker.db` inside the "data" folder
-8. Re-zip the extracted folder
-9. Restore the backup using the "Restore Backup" feature in the Settings tab.
-10. Make sure you remove the PostgreSQL connection from the environment variables so that all future changes will be saved in LiteDB.

docs/documentation/Reminders.md

@@ -1,49 +0,0 @@
-# Reminders
-
-Reminders are future tasks where the urgency are based on how close the user is to the due date or odometer reading.
-
-![](/Records/Reminders/a/image-1706403372050.png)
-
-## Adding Reminders
-Reminders can either be added directly on the Reminders tab by clicking the "Add Reminder" button or via adding a new [[Service/Repair/Upgrade Record|Records/Service Records#adding-reminders]].
-
-## Reminder Metrics
-Similar to the maintenance schedule outlined in your vehicle's user manual, the urgency of a Reminder can be set either via a due date, a future odometer reading, or whichever comes first.
-
-![](/Records/Reminders/a/image-1706403594197.png)
-
-## Reminder Urgency
-Depending on the metric selected, reminder urgency is calculated either via the server's current date, the max odometer reading across the Odometer/Service/Repair/Upgrade/Fuel tabs, or whichever comes first.
-
-| Urgency    | Due Date      | Future Odometer Reading |
-| ---------- | ------------- | ----------------------- |
-| Not Urgent | > 30 days out | > 100 miles out         |
-| Urgent     | < 30 days out | < 100 miles out         |
-|  Very Urgent          |     < 7 days out         |        < 50 miles out                 |
-|   Past Due         |   > 0 days past            |     > 0 miles past                    |
-
-## Recurring Reminders
-Reminders can be set to become recurring so that you don't have to create a new reminder for recurring maintenance such as oil changes. When you have completed the task set by the reminder, you can either have it automatically refresh when it lapses or by manually refreshing it. Refreshing a reminder effectively pushes out the due date or the odometer reading based on the recurring interval, i.e.: if a Reminder is due at 10000 miles and the interval is set at every 5000 miles, refreshing the Reminder will push the future odometer reading out to 15000 miles.
-
-### Automatically Refresh Past Due Reminders
-There is a setting within the Settings tab that allows users to automatically refresh past due reminders. Note that with this setting enabled, any reminder that becomes Past Due will be automatically refreshed, this requires a lot of diligence from the user to heed their reminders and stay on top of it.
-
-![](/Records/Reminders/a/image-1706404019404.png)
-
-### Manually Refresh Reminders
-When a recurring reminder falls into Very Urgent or Past Due status, there will be a button on the Reminders page that will allow the user to manually refresh the reminder.
-
-![](/Records/Reminders/a/image-1706404336137.png)
-
-This reminder is set to be recurring every 1 year, so when the "Done" button is clicked, it will push the due date of this reminder to 1/31/2025.
-
-![](/Records/Reminders/a/image-1706404394320.png)
-
-![](/Reminders/a/image-1706404403748.png)
-
-## Reminder Emails
-If SMTP is configured within LubeLogger, the Root User can set up a cron / scheduled task that runs at an interval to send out emails to collaborators of vehicles with reminders. The API endpoint allows the user to specify what level of urgencies should the user be notified of.
-
-Sample bash script: https://github.com/hargata/lubelog_scripts/blob/main/bash/sendreminders.sh
-
-The sample provided above will send email reminders out for reminders of all urgencies.

docs/documentation/ReplacingTheLogo.md

@@ -1,19 +0,0 @@
-# Replacing The LubeLogger Logo
-
-You can overwrite the LubeLogger Logo that is displayed in the Login and Home/Garage page.
-
-To do so, simply inject an environment variable with the key `LUBELOGGER_LOGO_URL` into your lubelogger instance either via the .env file or the appsettings.json file.
-
-## .env
-```
-LUBELOGGER_LOGO_URL=<URL to your Logo>
-```
-
-## appsettings.json
-```
-LUBELOGGER_LOGO_URL:<URL to your Logo>
-```
-
-## Non-replaceable Locations
-- Logo in the About section in the Settings tab
-- Logo that shows up in the top left of the Vehicle Maintenance History Report