no delete option.

added patreon link and version number.

.env

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

.github/workflows/docker-image.yml

@@ -25,7 +25,7 @@ jobs:
       uses: docker/build-push-action@v5
       with:
           context: .
-          platforms: linux/amd64
+          platforms: linux/amd64,linux/arm64
           push: true
           tags: |
-            ghcr.io/hargata/lubelogger:latest
+            ghcr.io/hargata/lubelogger:latest

Controllers/APIController.cs

@@ -0,0 +1,158 @@
+using CarCareTracker.External.Interfaces;
+using CarCareTracker.Filter;
+using CarCareTracker.Helper;
+using CarCareTracker.Logic;
+using CarCareTracker.Models;
+using Microsoft.AspNetCore.Authorization;
+using Microsoft.AspNetCore.Mvc;
+using System.Security.Claims;
+
+namespace CarCareTracker.Controllers
+{
+    [Authorize]
+    public class APIController : Controller
+    {
+        private readonly IVehicleDataAccess _dataAccess;
+        private readonly INoteDataAccess _noteDataAccess;
+        private readonly IServiceRecordDataAccess _serviceRecordDataAccess;
+        private readonly IGasRecordDataAccess _gasRecordDataAccess;
+        private readonly ICollisionRecordDataAccess _collisionRecordDataAccess;
+        private readonly ITaxRecordDataAccess _taxRecordDataAccess;
+        private readonly IReminderRecordDataAccess _reminderRecordDataAccess;
+        private readonly IUpgradeRecordDataAccess _upgradeRecordDataAccess;
+        private readonly IReminderHelper _reminderHelper;
+        private readonly IGasHelper _gasHelper;
+        private readonly IUserLogic _userLogic;
+        public APIController(IVehicleDataAccess dataAccess,
+            IGasHelper gasHelper,
+            IReminderHelper reminderHelper,
+            INoteDataAccess noteDataAccess,
+            IServiceRecordDataAccess serviceRecordDataAccess,
+            IGasRecordDataAccess gasRecordDataAccess,
+            ICollisionRecordDataAccess collisionRecordDataAccess,
+            ITaxRecordDataAccess taxRecordDataAccess,
+            IReminderRecordDataAccess reminderRecordDataAccess,
+            IUpgradeRecordDataAccess upgradeRecordDataAccess,
+            IUserLogic userLogic) 
+        {
+            _dataAccess = dataAccess;
+            _noteDataAccess = noteDataAccess;
+            _serviceRecordDataAccess = serviceRecordDataAccess;
+            _gasRecordDataAccess = gasRecordDataAccess;
+            _collisionRecordDataAccess = collisionRecordDataAccess;
+            _taxRecordDataAccess = taxRecordDataAccess;
+            _reminderRecordDataAccess = reminderRecordDataAccess;
+            _upgradeRecordDataAccess = upgradeRecordDataAccess;
+            _gasHelper = gasHelper;
+            _reminderHelper = reminderHelper;
+            _userLogic = userLogic;
+        }
+        public IActionResult Index()
+        {
+            return View();
+        }
+        private int GetUserID()
+        {
+            return int.Parse(User.FindFirstValue(ClaimTypes.NameIdentifier));
+        }
+        [HttpGet]
+        [Route("/api/vehicles")]
+        public IActionResult Vehicles()
+        {
+            var result = _dataAccess.GetVehicles();
+            if (!User.IsInRole(nameof(UserData.IsRootUser)))
+            {
+                result = _userLogic.FilterUserVehicles(result, GetUserID());
+            }
+            return Json(result);
+        }
+        [TypeFilter(typeof(CollaboratorFilter))]
+        [HttpGet]
+        [Route("/api/vehicle/servicerecords")]
+        public IActionResult ServiceRecords(int vehicleId)
+        {
+            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() });
+            return Json(result);
+        }
+        [TypeFilter(typeof(CollaboratorFilter))]
+        [HttpGet]
+        [Route("/api/vehicle/repairrecords")]
+        public IActionResult RepairRecords(int vehicleId)
+        {
+            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() });
+            return Json(result);
+        }
+        [TypeFilter(typeof(CollaboratorFilter))]
+        [HttpGet]
+        [Route("/api/vehicle/upgraderecords")]
+        public IActionResult UpgradeRecords(int vehicleId)
+        {
+            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() });
+            return Json(result);
+        }
+        [TypeFilter(typeof(CollaboratorFilter))]
+        [HttpGet]
+        [Route("/api/vehicle/taxrecords")]
+        public IActionResult TaxRecords(int vehicleId)
+        {
+            var result = _taxRecordDataAccess.GetTaxRecordsByVehicleId(vehicleId);
+            return Json(result);
+        }
+        [TypeFilter(typeof(CollaboratorFilter))]
+        [HttpGet]
+        [Route("/api/vehicle/gasrecords")]
+        public IActionResult GasRecords(int vehicleId, bool useMPG, bool useUKMPG)
+        {
+            var vehicleRecords = _gasRecordDataAccess.GetGasRecordsByVehicleId(vehicleId);
+            var result = _gasHelper.GetGasRecordViewModels(vehicleRecords, useMPG, useUKMPG)
+                .Select(x => new GasRecordExportModel { 
+                    Date = x.Date, 
+                    Odometer = x.Mileage.ToString(), 
+                    Cost = x.Cost.ToString(), 
+                    FuelConsumed = x.Gallons.ToString(), 
+                    FuelEconomy = x.MilesPerGallon.ToString(),
+                    IsFillToFull = x.IsFillToFull.ToString(),
+                    MissedFuelUp = x.MissedFuelUp.ToString()
+                });
+            return Json(result);
+        }
+        [TypeFilter(typeof(CollaboratorFilter))]
+        [HttpGet]
+        [Route("/api/vehicle/reminders")]
+        public IActionResult Reminders(int vehicleId)
+        {
+            var currentMileage = 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});
+            return Json(results);
+        }
+        private int GetMaxMileage(int vehicleId)
+        {
+            var numbersArray = new List<int>();
+            var serviceRecords = _serviceRecordDataAccess.GetServiceRecordsByVehicleId(vehicleId);
+            if (serviceRecords.Any())
+            {
+                numbersArray.Add(serviceRecords.Max(x => x.Mileage));
+            }
+            var repairRecords = _collisionRecordDataAccess.GetCollisionRecordsByVehicleId(vehicleId);
+            if (repairRecords.Any())
+            {
+                numbersArray.Add(repairRecords.Max(x => x.Mileage));
+            }
+            var gasRecords = _gasRecordDataAccess.GetGasRecordsByVehicleId(vehicleId);
+            if (gasRecords.Any())
+            {
+                numbersArray.Add(gasRecords.Max(x => x.Mileage));
+            }
+            var upgradeRecords = _upgradeRecordDataAccess.GetUpgradeRecordsByVehicleId(vehicleId);
+            if (upgradeRecords.Any())
+            {
+                numbersArray.Add(upgradeRecords.Max(x => x.Mileage));
+            }
+            return numbersArray.Any() ? numbersArray.Max() : 0;
+        }
+    }
+}

Controllers/AdminController.cs

@@ -0,0 +1,56 @@
+using CarCareTracker.Helper;
+using CarCareTracker.Logic;
+using CarCareTracker.Models;
+using Microsoft.AspNetCore.Authorization;
+using Microsoft.AspNetCore.Mvc;
+using System.Net;
+using System.Net.Mail;
+
+namespace CarCareTracker.Controllers
+{
+    [Authorize(Roles = nameof(UserData.IsAdmin))]
+    public class AdminController : Controller
+    {
+        private ILoginLogic _loginLogic;
+        private IUserLogic _userLogic;
+        private IConfigHelper _configHelper;
+        public AdminController(ILoginLogic loginLogic, IUserLogic userLogic, IConfigHelper configHelper)
+        {
+            _loginLogic = loginLogic;
+            _userLogic = userLogic;
+            _configHelper = configHelper;
+        }
+        public IActionResult Index()
+        {
+            var viewModel = new AdminViewModel
+            {
+                Users = _loginLogic.GetAllUsers(),
+                Tokens = _loginLogic.GetAllTokens()
+            };
+            return View(viewModel);
+        }
+        public IActionResult GenerateNewToken(string emailAddress, bool autoNotify)
+        {
+            var result = _loginLogic.GenerateUserToken(emailAddress, autoNotify);
+            return Json(result);
+        }
+        [HttpPost]
+        public IActionResult DeleteToken(int tokenId)
+        {
+            var result = _loginLogic.DeleteUserToken(tokenId);
+            return Json(result);
+        }
+        [HttpPost]
+        public IActionResult DeleteUser(int userId)
+        {
+            var result =_userLogic.DeleteAllAccessToUser(userId) && _configHelper.DeleteUserConfig(userId) && _loginLogic.DeleteUser(userId);
+            return Json(result);
+        }
+        [HttpPost]
+        public IActionResult UpdateUserAdminStatus(int userId, bool isAdmin)
+        {
+            var result = _loginLogic.MakeUserAdmin(userId, isAdmin);
+            return Json(result);
+        }
+    }
+}

Controllers/Error.cs

@@ -0,0 +1,12 @@
+using Microsoft.AspNetCore.Mvc;
+
+namespace CarCareTracker.Controllers
+{
+    public class ErrorController : Controller
+    {
+        public IActionResult Unauthorized()
+        {
+            return View("401");
+        }
+    }
+}

Controllers/FilesController.cs

@@ -46,12 +46,25 @@ namespace CarCareTracker.Controllers
         }
 
         [HttpPost]
-        public ActionResult DeleteFiles(string fileLocation)
+        public IActionResult DeleteFiles(string fileLocation)
         {
             var result = _fileHelper.DeleteFile(fileLocation);
             return Json(result);
         }
-
+        [Authorize(Roles = nameof(UserData.IsRootUser))]
+        [HttpGet]
+        public IActionResult MakeBackup()
+        {
+            var result = _fileHelper.MakeBackup();
+            return Json(result);
+        }
+        [Authorize(Roles = nameof(UserData.IsRootUser))]
+        [HttpPost]
+        public IActionResult RestoreBackup(string fileName)
+        {
+            var result = _fileHelper.RestoreBackup(fileName);
+            return Json(result);
+        }
         private string UploadFile(IFormFile fileToUpload)
         {
             string uploadDirectory = "temp/";

Controllers/HomeController.cs

@@ -1,14 +1,11 @@
 using CarCareTracker.External.Interfaces;
 using CarCareTracker.Models;
-using LiteDB;
 using Microsoft.AspNetCore.Mvc;
 using System.Diagnostics;
-using static System.Net.Mime.MediaTypeNames;
-using System.Drawing;
-using System.Linq.Expressions;
-using Microsoft.Extensions.Logging;
 using CarCareTracker.Helper;
 using Microsoft.AspNetCore.Authorization;
+using System.Security.Claims;
+using CarCareTracker.Logic;
 
 namespace CarCareTracker.Controllers
 {
@@ -17,17 +14,23 @@ namespace CarCareTracker.Controllers
     {
         private readonly ILogger<HomeController> _logger;
         private readonly IVehicleDataAccess _dataAccess;
-        private readonly IFileHelper _fileHelper;
-        private readonly IConfiguration _config;
+        private readonly IUserLogic _userLogic;
+        private readonly IConfigHelper _config;
 
-        public HomeController(ILogger<HomeController> logger, IVehicleDataAccess dataAccess, IFileHelper fileHelper, IConfiguration configuration)
+        public HomeController(ILogger<HomeController> logger, 
+            IVehicleDataAccess dataAccess,
+            IUserLogic userLogic,
+            IConfigHelper configuration)
         {
             _logger = logger;
             _dataAccess = dataAccess;
-            _fileHelper = fileHelper;
             _config = configuration;
+            _userLogic = userLogic;
+        }
+        private int GetUserID()
+        {
+            return int.Parse(User.FindFirstValue(ClaimTypes.NameIdentifier));
         }
-
         public IActionResult Index(string tab = "garage")
         {
             return View(model: tab);
@@ -35,53 +38,22 @@ namespace CarCareTracker.Controllers
         public IActionResult Garage()
         {
             var vehiclesStored = _dataAccess.GetVehicles();
+            if (!User.IsInRole(nameof(UserData.IsRootUser)))
+            {
+                vehiclesStored = _userLogic.FilterUserVehicles(vehiclesStored, GetUserID());
+            }
             return PartialView("_GarageDisplay", vehiclesStored);
         }
         public IActionResult Settings()
         {
-            var userConfig = new UserConfig
-            {
-                EnableCsvImports = bool.Parse(_config[nameof(UserConfig.EnableCsvImports)]),
-                UseDarkMode = bool.Parse(_config[nameof(UserConfig.UseDarkMode)]),
-                UseMPG = bool.Parse(_config[nameof(UserConfig.UseMPG)]),
-                UseDescending = bool.Parse(_config[nameof(UserConfig.UseDescending)]),
-                EnableAuth = bool.Parse(_config[nameof(UserConfig.EnableAuth)]),
-                HideZero = bool.Parse(_config[nameof(UserConfig.HideZero)]),
-                UseUKMPG = bool.Parse(_config[nameof(UserConfig.UseUKMPG)])
-            };
+            var userConfig = _config.GetUserConfig(User);
             return PartialView("_Settings", userConfig);
         }
         [HttpPost]
         public IActionResult WriteToSettings(UserConfig userConfig)
         {
-            try
-            { 
-                if (!System.IO.File.Exists(StaticHelper.UserConfigPath))
-                {
-                    //if file doesn't exist it might be because it's running on a mounted volume in docker.
-                    System.IO.File.WriteAllText(StaticHelper.UserConfigPath, System.Text.Json.JsonSerializer.Serialize(new UserConfig()));
-                }
-               var configFileContents = System.IO.File.ReadAllText(StaticHelper.UserConfigPath);
-                var existingUserConfig = System.Text.Json.JsonSerializer.Deserialize<UserConfig>(configFileContents);
-                if (existingUserConfig is not null)
-                {
-                    //copy over settings that are off limits on the settings page.
-                    userConfig.EnableAuth = existingUserConfig.EnableAuth;
-                    userConfig.UserNameHash = existingUserConfig.UserNameHash;
-                    userConfig.UserPasswordHash = existingUserConfig.UserPasswordHash;
-                } else
-                {
-                    userConfig.EnableAuth = false;
-                    userConfig.UserNameHash = string.Empty;
-                    userConfig.UserPasswordHash = string.Empty;
-                }
-                System.IO.File.WriteAllText(StaticHelper.UserConfigPath, System.Text.Json.JsonSerializer.Serialize(userConfig));
-                return Json(true);
-            } catch (Exception ex)
-            {
-                _logger.LogError(ex, "Error on saving config file.");
-            }
-            return Json(false);
+            var result = _config.SaveUserConfig(User, userConfig);
+            return Json(result);
         }
         public IActionResult Privacy()
         {

Controllers/LoginController.cs

@@ -1,4 +1,5 @@
 using CarCareTracker.Helper;
+using CarCareTracker.Logic;
 using CarCareTracker.Models;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.DataProtection;
@@ -13,19 +14,34 @@ namespace CarCareTracker.Controllers
     public class LoginController : Controller
     {
         private IDataProtector _dataProtector;
+        private ILoginLogic _loginLogic;
         private readonly ILogger<LoginController> _logger;
         public LoginController(
             ILogger<LoginController> logger,
-            IDataProtectionProvider securityProvider
+            IDataProtectionProvider securityProvider,
+            ILoginLogic loginLogic
             ) 
         {
             _dataProtector = securityProvider.CreateProtector("login");
             _logger = logger;
+            _loginLogic = loginLogic;
         }
         public IActionResult Index()
         {
             return View();
         }
+        public IActionResult Registration()
+        {
+            return View();
+        }
+        public IActionResult ForgotPassword()
+        {
+            return View();
+        }
+        public IActionResult ResetPassword()
+        {
+            return View();
+        }
         [HttpPost]
         public IActionResult Login(LoginModel credentials)
         {
@@ -37,30 +53,18 @@ namespace CarCareTracker.Controllers
             //compare it against hashed credentials
             try
             {
-                var configFileContents = System.IO.File.ReadAllText(StaticHelper.UserConfigPath);
-                var existingUserConfig = System.Text.Json.JsonSerializer.Deserialize<UserConfig>(configFileContents);
-                if (existingUserConfig is not null)
+                var userData = _loginLogic.ValidateUserCredentials(credentials);
+                if (userData.Id != default)
                 {
-                    //create hashes of the login credentials.
-                    var hashedUserName = Sha256_hash(credentials.UserName);
-                    var hashedPassword = Sha256_hash(credentials.Password);
-                    //compare against stored hash.
-                    if (hashedUserName == existingUserConfig.UserNameHash &&
-                        hashedPassword == existingUserConfig.UserPasswordHash)
+                    AuthCookie authCookie = new AuthCookie
                     {
-                        //auth success, create auth cookie
-                        //encrypt stuff.
-                        AuthCookie authCookie = new AuthCookie
-                        {
-                            Id = 1, //this is hardcoded for now
-                            UserName = credentials.UserName,
-                            ExpiresOn = DateTime.Now.AddDays(credentials.IsPersistent ? 30 : 1)
-                        };
-                        var serializedCookie = JsonSerializer.Serialize(authCookie);
-                        var encryptedCookie = _dataProtector.Protect(serializedCookie);
-                        Response.Cookies.Append("ACCESS_TOKEN", encryptedCookie, new CookieOptions { Expires = new DateTimeOffset(authCookie.ExpiresOn) });
-                        return Json(true);
-                    }
+                        UserData = userData,
+                        ExpiresOn = DateTime.Now.AddDays(credentials.IsPersistent ? 30 : 1)
+                    };
+                    var serializedCookie = JsonSerializer.Serialize(authCookie);
+                    var encryptedCookie = _dataProtector.Protect(serializedCookie);
+                    Response.Cookies.Append("ACCESS_TOKEN", encryptedCookie, new CookieOptions { Expires = new DateTimeOffset(authCookie.ExpiresOn) });
+                    return Json(true);
                 }
             }
             catch (Exception ex)
@@ -69,26 +73,33 @@ namespace CarCareTracker.Controllers
             }
             return Json(false);
         }
+
+        [HttpPost]
+        public IActionResult Register(LoginModel credentials)
+        {
+            var result = _loginLogic.RegisterNewUser(credentials);
+            return Json(result);
+        }
+        [HttpPost]
+        public IActionResult RequestResetPassword(LoginModel credentials)
+        {
+            var result = _loginLogic.RequestResetPassword(credentials);
+            return Json(result);
+        }
+        [HttpPost]
+        public IActionResult PerformPasswordReset(LoginModel credentials)
+        {
+            var result = _loginLogic.ResetPasswordByUser(credentials);
+            return Json(result);
+        }
         [Authorize] //User must already be logged in to do this.
         [HttpPost]
         public IActionResult CreateLoginCreds(LoginModel credentials)
         {
             try
             {
-                var configFileContents = System.IO.File.ReadAllText(StaticHelper.UserConfigPath);
-                var existingUserConfig = JsonSerializer.Deserialize<UserConfig>(configFileContents);
-                if (existingUserConfig is not null)
-                {
-                    //create hashes of the login credentials.
-                    var hashedUserName = Sha256_hash(credentials.UserName);
-                    var hashedPassword = Sha256_hash(credentials.Password);
-                    //copy over settings that are off limits on the settings page.
-                    existingUserConfig.EnableAuth = true;
-                    existingUserConfig.UserNameHash = hashedUserName;
-                    existingUserConfig.UserPasswordHash = hashedPassword;
-                }
-                System.IO.File.WriteAllText(StaticHelper.UserConfigPath, JsonSerializer.Serialize(existingUserConfig));
-                return Json(true);
+                var result = _loginLogic.CreateRootUserCredentials(credentials);
+                return Json(result);
             }
             catch (Exception ex)
             {
@@ -102,19 +113,13 @@ namespace CarCareTracker.Controllers
         {
             try
             {
-                var configFileContents = System.IO.File.ReadAllText(StaticHelper.UserConfigPath);
-                var existingUserConfig = JsonSerializer.Deserialize<UserConfig>(configFileContents);
-                if (existingUserConfig is not null)
-                {
-                    //copy over settings that are off limits on the settings page.
-                    existingUserConfig.EnableAuth = false;
-                    existingUserConfig.UserNameHash = string.Empty;
-                    existingUserConfig.UserPasswordHash = string.Empty;
-                }
-                System.IO.File.WriteAllText(StaticHelper.UserConfigPath, JsonSerializer.Serialize(existingUserConfig));
+                var result = _loginLogic.DeleteRootUserCredentials();
                 //destroy any login cookies.
-                Response.Cookies.Delete("ACCESS_TOKEN");
-                return Json(true);
+                if (result)
+                {
+                    Response.Cookies.Delete("ACCESS_TOKEN");
+                }
+                return Json(result);
             }
             catch (Exception ex)
             {
@@ -129,20 +134,5 @@ namespace CarCareTracker.Controllers
             Response.Cookies.Delete("ACCESS_TOKEN");
             return Json(true);
         }
-        private static string Sha256_hash(string value)
-        {
-            StringBuilder Sb = new StringBuilder();
-
-            using (var hash = SHA256.Create())
-            {
-                Encoding enc = Encoding.UTF8;
-                byte[] result = hash.ComputeHash(enc.GetBytes(value));
-
-                foreach (byte b in result)
-                    Sb.Append(b.ToString("x2"));
-            }
-
-            return Sb.ToString();
-        }
     }
 }

Controllers/VehicleController.cs

@@ -6,8 +6,10 @@ using CarCareTracker.Helper;
 using CsvHelper;
 using System.Globalization;
 using Microsoft.AspNetCore.Authorization;
-using CarCareTracker.External.Implementations;
 using CarCareTracker.MapProfile;
+using System.Security.Claims;
+using CarCareTracker.Logic;
+using CarCareTracker.Filter;
 
 namespace CarCareTracker.Controllers
 {
@@ -23,13 +25,21 @@ namespace CarCareTracker.Controllers
         private readonly ITaxRecordDataAccess _taxRecordDataAccess;
         private readonly IReminderRecordDataAccess _reminderRecordDataAccess;
         private readonly IUpgradeRecordDataAccess _upgradeRecordDataAccess;
+        private readonly ISupplyRecordDataAccess _supplyRecordDataAccess;
         private readonly IWebHostEnvironment _webEnv;
         private readonly bool _useDescending;
-        private readonly IConfiguration _config;
+        private readonly IConfigHelper _config;
         private readonly IFileHelper _fileHelper;
+        private readonly IGasHelper _gasHelper;
+        private readonly IReminderHelper _reminderHelper;
+        private readonly IReportHelper _reportHelper;
+        private readonly IUserLogic _userLogic;
 
         public VehicleController(ILogger<VehicleController> logger,
             IFileHelper fileHelper,
+            IGasHelper gasHelper,
+            IReminderHelper reminderHelper,
+            IReportHelper reportHelper,
             IVehicleDataAccess dataAccess,
             INoteDataAccess noteDataAccess,
             IServiceRecordDataAccess serviceRecordDataAccess,
@@ -38,23 +48,35 @@ namespace CarCareTracker.Controllers
             ITaxRecordDataAccess taxRecordDataAccess,
             IReminderRecordDataAccess reminderRecordDataAccess,
             IUpgradeRecordDataAccess upgradeRecordDataAccess,
+            ISupplyRecordDataAccess supplyRecordDataAccess,
+            IUserLogic userLogic,
             IWebHostEnvironment webEnv,
-            IConfiguration config)
+            IConfigHelper config)
         {
             _logger = logger;
             _dataAccess = dataAccess;
             _noteDataAccess = noteDataAccess;
             _fileHelper = fileHelper;
+            _gasHelper = gasHelper;
+            _reminderHelper = reminderHelper;
+            _reportHelper = reportHelper;
             _serviceRecordDataAccess = serviceRecordDataAccess;
             _gasRecordDataAccess = gasRecordDataAccess;
             _collisionRecordDataAccess = collisionRecordDataAccess;
             _taxRecordDataAccess = taxRecordDataAccess;
             _reminderRecordDataAccess = reminderRecordDataAccess;
             _upgradeRecordDataAccess = upgradeRecordDataAccess;
+            _supplyRecordDataAccess = supplyRecordDataAccess;
+            _userLogic = userLogic;
             _webEnv = webEnv;
             _config = config;
-            _useDescending = bool.Parse(config[nameof(UserConfig.UseDescending)]);
+            _useDescending = config.GetUserConfig(User).UseDescending;
         }
+        private int GetUserID()
+        {
+            return int.Parse(User.FindFirstValue(ClaimTypes.NameIdentifier));
+        }
+        [TypeFilter(typeof(CollaboratorFilter))]
         [HttpGet]
         public IActionResult Index(int vehicleId)
         {
@@ -66,6 +88,7 @@ namespace CarCareTracker.Controllers
         {
             return PartialView("_VehicleModal", new Vehicle());
         }
+        [TypeFilter(typeof(CollaboratorFilter))]
         [HttpGet]
         public IActionResult GetEditVehiclePartialViewById(int vehicleId)
         {
@@ -77,10 +100,22 @@ namespace CarCareTracker.Controllers
         {
             try
             {
+                bool isNewAddition = vehicleInput.Id == default;
+                if (!isNewAddition)
+                {
+                    if (!_userLogic.UserCanEditVehicle(GetUserID(), vehicleInput.Id))
+                    {
+                        return View("401");
+                    }
+                }
                 //move image from temp folder to images folder.
                 vehicleInput.ImageLocation = _fileHelper.MoveFileFromTemp(vehicleInput.ImageLocation, "images/");
                 //save vehicle.
                 var result = _dataAccess.SaveVehicle(vehicleInput);
+                if (isNewAddition)
+                {
+                    _userLogic.AddUserAccessToVehicle(GetUserID(), vehicleInput.Id);
+                }
                 return Json(result);
             }
             catch (Exception ex)
@@ -89,6 +124,7 @@ namespace CarCareTracker.Controllers
                 return Json(false);
             }
         }
+        [TypeFilter(typeof(CollaboratorFilter))]
         [HttpPost]
         public IActionResult DeleteVehicle(int vehicleId)
         {
@@ -97,40 +133,160 @@ namespace CarCareTracker.Controllers
                 _serviceRecordDataAccess.DeleteAllServiceRecordsByVehicleId(vehicleId) &&
                 _collisionRecordDataAccess.DeleteAllCollisionRecordsByVehicleId(vehicleId) &&
                 _taxRecordDataAccess.DeleteAllTaxRecordsByVehicleId(vehicleId) &&
-                _noteDataAccess.DeleteNoteByVehicleId(vehicleId) &&
+                _noteDataAccess.DeleteAllNotesByVehicleId(vehicleId) &&
                 _reminderRecordDataAccess.DeleteAllReminderRecordsByVehicleId(vehicleId) &&
                 _upgradeRecordDataAccess.DeleteAllUpgradeRecordsByVehicleId(vehicleId) &&
+                _supplyRecordDataAccess.DeleteAllSupplyRecordsByVehicleId(vehicleId) &&
+                _userLogic.DeleteAllAccessToVehicle(vehicleId) &&
                 _dataAccess.DeleteVehicle(vehicleId);
             return Json(result);
         }
-        [HttpPost]
-        public IActionResult SaveNoteToVehicle(Note newNote)
-        {
-            //check if there is already an existing note for this vehicle.
-            var existingNote = _noteDataAccess.GetNoteByVehicleId(newNote.VehicleId);
-            if (existingNote.Id != default)
-            {
-                newNote.Id = existingNote.Id;
-            }
-            var result = _noteDataAccess.SaveNoteToVehicleId(newNote);
-            return Json(result);
-        }
-        [HttpGet]
-        public IActionResult GetNoteByVehicleId(int vehicleId)
-        {
-            var existingNote = _noteDataAccess.GetNoteByVehicleId(vehicleId);
-            if (existingNote.Id != default)
-            {
-                return Json(existingNote.NoteText);
-            }
-            return Json("");
-        }
         #region "Bulk Imports"
         [HttpGet]
         public IActionResult GetBulkImportModalPartialView(ImportMode mode)
         {
             return PartialView("_BulkDataImporter", mode);
         }
+        [TypeFilter(typeof(CollaboratorFilter))]
+        [HttpGet]
+        public IActionResult ExportFromVehicleToCsv(int vehicleId, ImportMode mode)
+        {
+            if (vehicleId == default)
+            {
+                return Json(false);
+            }
+            string uploadDirectory = "temp/";
+            string uploadPath = Path.Combine(_webEnv.WebRootPath, uploadDirectory);
+            if (!Directory.Exists(uploadPath))
+                Directory.CreateDirectory(uploadPath);
+            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() });
+                    using (var writer = new StreamWriter(fullExportFilePath))
+                    {
+                        using (var csv = new CsvWriter(writer, CultureInfo.InvariantCulture))
+                        {
+                            csv.WriteRecords(exportData);
+                        }
+                    }
+                    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() });
+                    using (var writer = new StreamWriter(fullExportFilePath))
+                    {
+                        using (var csv = new CsvWriter(writer, CultureInfo.InvariantCulture))
+                        {
+                            csv.WriteRecords(exportData);
+                        }
+                    }
+                    return Json($"/{fileNameToExport}");
+                }
+            }
+            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() });
+                    using (var writer = new StreamWriter(fullExportFilePath))
+                    {
+                        using (var csv = new CsvWriter(writer, CultureInfo.InvariantCulture))
+                        {
+                            csv.WriteRecords(exportData);
+                        }
+                    }
+                    return Json($"/{fileNameToExport}");
+                }
+            }
+            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())
+                {
+                    var exportData = vehicleRecords.Select(x => new SupplyRecordExportModel { 
+                        Date = x.Date.ToShortDateString(), 
+                        Description = x.Description, 
+                        Cost = x.Cost.ToString("C"), 
+                        PartNumber = x.PartNumber,
+                        PartQuantity = x.Quantity.ToString(),
+                        PartSupplier = x.PartSupplier,
+                        Notes = x.Notes });
+                    using (var writer = new StreamWriter(fullExportFilePath))
+                    {
+                        using (var csv = new CsvWriter(writer, CultureInfo.InvariantCulture))
+                        {
+                            csv.WriteRecords(exportData);
+                        }
+                    }
+                    return Json($"/{fileNameToExport}");
+                }
+            }
+            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 });
+                    using (var writer = new StreamWriter(fullExportFilePath))
+                    {
+                        using (var csv = new CsvWriter(writer, CultureInfo.InvariantCulture))
+                        {
+                            csv.WriteRecords(exportData);
+                        }
+                    }
+                    return Json($"/{fileNameToExport}");
+                }
+            }
+            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;
+                vehicleRecords = vehicleRecords.OrderBy(x => x.Date).ThenBy(x => x.Mileage).ToList();
+                var convertedRecords = _gasHelper.GetGasRecordViewModels(vehicleRecords, useMPG, useUKMPG);
+                var exportData = convertedRecords.Select(x => new GasRecordExportModel
+                {
+                    Date = x.Date.ToString(),
+                    Cost = x.Cost.ToString(),
+                    FuelConsumed = x.Gallons.ToString(),
+                    FuelEconomy = x.MilesPerGallon.ToString(),
+                    Odometer = x.Mileage.ToString(),
+                    IsFillToFull = x.IsFillToFull.ToString(),
+                    MissedFuelUp = x.MissedFuelUp.ToString()
+                });
+                using (var writer = new StreamWriter(fullExportFilePath))
+                {
+                    using (var csv = new CsvWriter(writer, CultureInfo.InvariantCulture))
+                    {
+                        csv.WriteRecords(exportData);
+                    }
+                }
+                return Json($"/{fileNameToExport}");
+            }
+            return Json(false);
+        }
+        [TypeFilter(typeof(CollaboratorFilter))]
         [HttpPost]
         public IActionResult ImportToVehicleIdFromCsv(int vehicleId, ImportMode mode, string fileName)
         {
@@ -153,7 +309,7 @@ namespace CarCareTracker.Controllers
                     config.PrepareHeaderForMatch = args => { return args.Header.Trim().ToLower(); };
                     using (var csv = new CsvReader(reader, config))
                     {
-                        csv.Context.RegisterClassMap<FuellyMapper>();
+                        csv.Context.RegisterClassMap<ImportMapper>();
                         var records = csv.GetRecords<ImportModel>().ToList();
                         if (records.Any())
                         {
@@ -175,7 +331,8 @@ namespace CarCareTracker.Controllers
                                         //fuelly sometimes exports CSVs without total cost.
                                         var parsedPrice = decimal.Parse(importModel.Price, NumberStyles.Any);
                                         convertedRecord.Cost = convertedRecord.Gallons * parsedPrice;
-                                    } else
+                                    }
+                                    else
                                     {
                                         convertedRecord.Cost = decimal.Parse(importModel.Cost, NumberStyles.Any);
                                     }
@@ -183,11 +340,19 @@ namespace CarCareTracker.Controllers
                                     {
                                         var parsedBool = importModel.PartialFuelUp.Trim() == "1";
                                         convertedRecord.IsFillToFull = !parsedBool;
-                                    } else if (!string.IsNullOrWhiteSpace(importModel.IsFillToFull))
+                                    }
+                                    else if (!string.IsNullOrWhiteSpace(importModel.IsFillToFull))
                                     {
-                                        var parsedBool = importModel.IsFillToFull.Trim() == "1" || importModel.IsFillToFull.Trim() == "Full";
+                                        var possibleFillToFullValues = new List<string> { "1", "true", "full" };
+                                        var parsedBool = possibleFillToFullValues.Contains(importModel.IsFillToFull.Trim().ToLower());
                                         convertedRecord.IsFillToFull = parsedBool;
                                     }
+                                    if (!string.IsNullOrWhiteSpace(importModel.MissedFuelUp))
+                                    {
+                                        var possibleMissedFuelUpValues = new List<string> { "1", "true" };
+                                        var parsedBool = possibleMissedFuelUpValues.Contains(importModel.MissedFuelUp.Trim().ToLower());
+                                        convertedRecord.MissedFuelUp = parsedBool;
+                                    }
                                     //insert record into db, check to make sure fuelconsumed is not zero so we don't get a divide by zero error.
                                     if (convertedRecord.Gallons > 0)
                                     {
@@ -220,6 +385,34 @@ namespace CarCareTracker.Controllers
                                     };
                                     _collisionRecordDataAccess.SaveCollisionRecordToVehicle(convertedRecord);
                                 }
+                                else if (mode == ImportMode.UpgradeRecord)
+                                {
+                                    var convertedRecord = new UpgradeRecord()
+                                    {
+                                        VehicleId = vehicleId,
+                                        Date = DateTime.Parse(importModel.Date),
+                                        Mileage = int.Parse(importModel.Odometer, NumberStyles.Any),
+                                        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)
+                                    };
+                                    _upgradeRecordDataAccess.SaveUpgradeRecordToVehicle(convertedRecord);
+                                }
+                                else if (mode == ImportMode.SupplyRecord)
+                                {
+                                    var convertedRecord = new SupplyRecord()
+                                    {
+                                        VehicleId = vehicleId,
+                                        Date = DateTime.Parse(importModel.Date),
+                                        PartNumber = importModel.PartNumber,
+                                        PartSupplier = importModel.PartSupplier,
+                                        Quantity = decimal.Parse(importModel.PartQuantity, NumberStyles.Any),
+                                        Description = importModel.Description,
+                                        Cost = decimal.Parse(importModel.Cost, NumberStyles.Any),
+                                        Notes = importModel.Notes
+                                    };
+                                    _supplyRecordDataAccess.SaveSupplyRecordToVehicle(convertedRecord);
+                                }
                                 else if (mode == ImportMode.TaxRecord)
                                 {
                                     var convertedRecord = new TaxRecord()
@@ -246,6 +439,7 @@ namespace CarCareTracker.Controllers
         }
         #endregion
         #region "Gas Records"
+        [TypeFilter(typeof(CollaboratorFilter))]
         [HttpGet]
         public IActionResult GetGasRecordsByVehicleId(int vehicleId)
         {
@@ -253,73 +447,9 @@ namespace CarCareTracker.Controllers
             //need it in ascending order to perform computation.
             result = result.OrderBy(x => x.Date).ThenBy(x => x.Mileage).ToList();
             //check if the user uses MPG or Liters per 100km.
-            bool useMPG = bool.Parse(_config[nameof(UserConfig.UseMPG)]);
-            bool useUKMPG = bool.Parse(_config[nameof(UserConfig.UseUKMPG)]);
-            var computedResults = new List<GasRecordViewModel>();
-            int previousMileage = 0;
-            decimal unFactoredConsumption = 0.00M;
-            int unFactoredMileage = 0;
-            //perform computation.
-            for (int i = 0; i < result.Count; i++)
-            {
-                var currentObject = result[i];
-                decimal convertedConsumption;
-                if (useUKMPG && useMPG)
-                {
-                    //if we're using UK MPG and the user wants imperial calculation insteace of l/100km
-                    //if UK MPG is selected then the gas consumption are stored in liters but need to convert into UK gallons for computation.
-                    convertedConsumption = currentObject.Gallons / 4.546M;
-                } else
-                {
-                    convertedConsumption = currentObject.Gallons;
-                }
-                if (i > 0)
-                {
-                    var deltaMileage = currentObject.Mileage - previousMileage;
-                    var gasRecordViewModel = new GasRecordViewModel()
-                    {
-                        Id = currentObject.Id,
-                        VehicleId = currentObject.VehicleId,
-                        Date = currentObject.Date.ToShortDateString(),
-                        Mileage = currentObject.Mileage,
-                        Gallons = convertedConsumption,
-                        Cost = currentObject.Cost,
-                        DeltaMileage = deltaMileage,
-                        CostPerGallon = (currentObject.Cost / convertedConsumption)
-                    };
-                    if (currentObject.IsFillToFull)
-                    {
-                        //if user filled to full.
-                        gasRecordViewModel.MilesPerGallon = useMPG ? ((unFactoredMileage + deltaMileage) / (unFactoredConsumption + convertedConsumption)) : 100 / ((unFactoredMileage + deltaMileage) / (unFactoredConsumption + convertedConsumption));
-                        //reset unFactored vars
-                        unFactoredConsumption = 0;
-                        unFactoredMileage = 0;
-                    }
-                    else
-                    {
-                        unFactoredConsumption += convertedConsumption;
-                        unFactoredMileage += deltaMileage;
-                        gasRecordViewModel.MilesPerGallon = 0;
-                    }
-                    computedResults.Add(gasRecordViewModel);
-                }
-                else
-                {
-                    computedResults.Add(new GasRecordViewModel()
-                    {
-                        Id = currentObject.Id,
-                        VehicleId = currentObject.VehicleId,
-                        Date = currentObject.Date.ToShortDateString(),
-                        Mileage = currentObject.Mileage,
-                        Gallons = convertedConsumption,
-                        Cost = currentObject.Cost,
-                        DeltaMileage = 0,
-                        MilesPerGallon = 0,
-                        CostPerGallon = (currentObject.Cost / convertedConsumption)
-                    });
-                }
-                previousMileage = currentObject.Mileage;
-            }
+            bool useMPG = _config.GetUserConfig(User).UseMPG;
+            bool useUKMPG = _config.GetUserConfig(User).UseUKMPG;
+            var computedResults = _gasHelper.GetGasRecordViewModels(result, useMPG, useUKMPG);
             if (_useDescending)
             {
                 computedResults = computedResults.OrderByDescending(x => DateTime.Parse(x.Date)).ThenByDescending(x => x.Mileage).ToList();
@@ -357,7 +487,8 @@ namespace CarCareTracker.Controllers
                 Date = result.Date.ToShortDateString(),
                 Files = result.Files,
                 Gallons = result.Gallons,
-                IsFillToFull = result.IsFillToFull
+                IsFillToFull = result.IsFillToFull,
+                MissedFuelUp = result.MissedFuelUp
             };
             var vehicleIsElectric = _dataAccess.GetVehicleById(convertedResult.VehicleId).IsElectric;
             var viewModel = new GasRecordInputContainer()
@@ -375,6 +506,7 @@ namespace CarCareTracker.Controllers
         }
         #endregion
         #region "Service Records"
+        [TypeFilter(typeof(CollaboratorFilter))]
         [HttpGet]
         public IActionResult GetServiceRecordsByVehicleId(int vehicleId)
         {
@@ -428,6 +560,7 @@ namespace CarCareTracker.Controllers
         }
         #endregion
         #region "Collision Records"
+        [TypeFilter(typeof(CollaboratorFilter))]
         [HttpGet]
         public IActionResult GetCollisionRecordsByVehicleId(int vehicleId)
         {
@@ -481,6 +614,7 @@ namespace CarCareTracker.Controllers
         }
         #endregion
         #region "Tax Records"
+        [TypeFilter(typeof(CollaboratorFilter))]
         [HttpGet]
         public IActionResult GetTaxRecordsByVehicleId(int vehicleId)
         {
@@ -533,11 +667,108 @@ namespace CarCareTracker.Controllers
         }
         #endregion
         #region "Reports"
+        [TypeFilter(typeof(CollaboratorFilter))]
         [HttpGet]
-        public IActionResult GetReportPartialView()
+        public IActionResult GetReportPartialView(int vehicleId)
         {
-            return PartialView("_Report");
+            //get records
+            var serviceRecords = _serviceRecordDataAccess.GetServiceRecordsByVehicleId(vehicleId);
+            var gasRecords = _gasRecordDataAccess.GetGasRecordsByVehicleId(vehicleId);
+            var collisionRecords = _collisionRecordDataAccess.GetCollisionRecordsByVehicleId(vehicleId);
+            var taxRecords = _taxRecordDataAccess.GetTaxRecordsByVehicleId(vehicleId);
+            var upgradeRecords = _upgradeRecordDataAccess.GetUpgradeRecordsByVehicleId(vehicleId);
+            var viewModel = new ReportViewModel();
+            //get totalCostMakeUp
+            viewModel.CostMakeUpForVehicle = new CostMakeUpForVehicle
+            {
+                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)
+            };
+            //get costbymonth
+            List<CostForVehicleByMonth> allCosts = new List<CostForVehicleByMonth>();
+            allCosts.AddRange(_reportHelper.GetServiceRecordSum(serviceRecords, 0));
+            allCosts.AddRange(_reportHelper.GetRepairRecordSum(collisionRecords, 0));
+            allCosts.AddRange(_reportHelper.GetUpgradeRecordSum(upgradeRecords, 0));
+            allCosts.AddRange(_reportHelper.GetGasRecordSum(gasRecords, 0));
+            allCosts.AddRange(_reportHelper.GetTaxRecordSum(taxRecords, 0));
+            viewModel.CostForVehicleByMonth = allCosts.GroupBy(x => new { x.MonthName, x.MonthId }).OrderBy(x => x.Key.MonthId).Select(x => new CostForVehicleByMonth
+            {
+                MonthName = x.Key.MonthName,
+                Cost = x.Sum(y => y.Cost)
+            }).ToList();
+            //get reminders
+            var reminders = GetRemindersAndUrgency(vehicleId, DateTime.Now);
+            viewModel.ReminderMakeUpForVehicle = new ReminderMakeUpForVehicle
+            {
+                NotUrgentCount = reminders.Where(x => x.Urgency == ReminderUrgency.NotUrgent).Count(),
+                UrgentCount = reminders.Where(x => x.Urgency == ReminderUrgency.Urgent).Count(),
+                VeryUrgentCount = reminders.Where(x => x.Urgency == ReminderUrgency.VeryUrgent).Count(),
+                PastDueCount = reminders.Where(x => x.Urgency == ReminderUrgency.PastDue).Count()
+            };
+            //populate year dropdown.
+            var numbersArray = new List<int>();
+            if (serviceRecords.Any())
+            {
+                numbersArray.Add(serviceRecords.Min(x => x.Date.Year));
+            }
+            if (collisionRecords.Any())
+            {
+                numbersArray.Add(collisionRecords.Min(x => x.Date.Year));
+            }
+            if (gasRecords.Any())
+            {
+                numbersArray.Add(gasRecords.Min(x => x.Date.Year));
+            }
+            if (upgradeRecords.Any())
+            {
+                numbersArray.Add(upgradeRecords.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++)
+            {
+                viewModel.Years.Add(DateTime.Now.AddYears(i * -1).Year);
+            }
+            //get collaborators
+            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 = mileageData.GroupBy(x => x.MonthId).OrderBy(x => x.Key).Select(x => new CostForVehicleByMonth
+            {
+                MonthName = CultureInfo.CurrentCulture.DateTimeFormat.GetMonthName(x.Key),
+                Cost = x.Average(y => y.MilesPerGallon)
+            }).ToList();
+            viewModel.FuelMileageForVehicleByMonth = monthlyMileageData;
+            return PartialView("_Report", viewModel);
         }
+        [TypeFilter(typeof(CollaboratorFilter))]
+        [HttpGet]
+        public IActionResult GetCollaboratorsForVehicle(int vehicleId)
+        {
+            var result = _userLogic.GetCollaboratorsForVehicle(vehicleId);
+            return PartialView("_Collaborators", result);
+        }
+        [TypeFilter(typeof(CollaboratorFilter))]
+        [HttpPost]
+        public IActionResult AddCollaboratorsToVehicle(int vehicleId, string username)
+        {
+            var result = _userLogic.AddCollaboratorToVehicle(vehicleId, username);
+            return Json(result);
+        }
+        [TypeFilter(typeof(CollaboratorFilter))]
+        [HttpPost]
+        public IActionResult DeleteCollaboratorFromVehicle(int userId, int vehicleId)
+        {
+            var result = _userLogic.DeleteCollaboratorFromVehicle(userId, vehicleId);
+            return Json(result);
+        }
+        [TypeFilter(typeof(CollaboratorFilter))]
         [HttpGet]
         public IActionResult GetCostMakeUpForVehicle(int vehicleId, int year = 0)
         {
@@ -560,26 +791,146 @@ namespace CarCareTracker.Controllers
                 GasRecordSum = gasRecords.Sum(x => x.Cost),
                 CollisionRecordSum = collisionRecords.Sum(x => x.Cost),
                 TaxRecordSum = taxRecords.Sum(x => x.Cost),
-                UpgradeRecordSum = upgradeRecords.Sum(x=>x.Cost)
+                UpgradeRecordSum = upgradeRecords.Sum(x => x.Cost)
             };
             return PartialView("_CostMakeUpReport", viewModel);
         }
-        public IActionResult GetFuelCostByMonthByVehicle(int vehicleId, int year = 0)
+        [TypeFilter(typeof(CollaboratorFilter))]
+        public IActionResult GetReminderMakeUpByVehicle(int vehicleId, int daysToAdd)
+        {
+            var reminders = GetRemindersAndUrgency(vehicleId, DateTime.Now.AddDays(daysToAdd));
+            var viewModel = new ReminderMakeUpForVehicle
+            {
+                NotUrgentCount = reminders.Where(x => x.Urgency == ReminderUrgency.NotUrgent).Count(),
+                UrgentCount = reminders.Where(x => x.Urgency == ReminderUrgency.Urgent).Count(),
+                VeryUrgentCount = reminders.Where(x => x.Urgency == ReminderUrgency.VeryUrgent).Count(),
+                PastDueCount = reminders.Where(x => x.Urgency == ReminderUrgency.PastDue).Count()
+            };
+            return PartialView("_ReminderMakeUpReport", viewModel);
+        }
+        [TypeFilter(typeof(CollaboratorFilter))]
+        public IActionResult GetVehicleHistory(int vehicleId)
+        {
+            var vehicleHistory = new VehicleHistoryViewModel();
+            vehicleHistory.VehicleData = _dataAccess.GetVehicleById(vehicleId);
+            vehicleHistory.Odometer = GetMaxMileage(vehicleId).ToString("N0");
+            List<GenericReportModel> reportData = new List<GenericReportModel>();
+            var serviceRecords = _serviceRecordDataAccess.GetServiceRecordsByVehicleId(vehicleId);
+            var repairRecords = _collisionRecordDataAccess.GetCollisionRecordsByVehicleId(vehicleId);
+            var upgradeRecords = _upgradeRecordDataAccess.GetUpgradeRecordsByVehicleId(vehicleId);
+            var taxRecords = _taxRecordDataAccess.GetTaxRecordsByVehicleId(vehicleId);
+            var gasRecords = _gasRecordDataAccess.GetGasRecordsByVehicleId(vehicleId);
+            bool useMPG = _config.GetUserConfig(User).UseMPG;
+            bool useUKMPG = _config.GetUserConfig(User).UseUKMPG;
+            vehicleHistory.TotalGasCost = gasRecords.Sum(x => x.Cost);
+            vehicleHistory.TotalCost = serviceRecords.Sum(x => x.Cost) + repairRecords.Sum(x => x.Cost) + upgradeRecords.Sum(x => x.Cost) + taxRecords.Sum(x => x.Cost);
+            var averageMPG = 0.00M;
+            var gasViewModels = _gasHelper.GetGasRecordViewModels(gasRecords, useMPG, useUKMPG);
+            if (gasViewModels.Any())
+            {
+                averageMPG = gasViewModels.Average(x => x.MilesPerGallon);
+            }
+            vehicleHistory.MPG = averageMPG;
+            //insert servicerecords
+            reportData.AddRange(serviceRecords.Select(x => new GenericReportModel
+            {
+                Date = x.Date,
+                Odometer = x.Mileage,
+                Description = x.Description,
+                Notes = x.Notes,
+                Cost = x.Cost,
+                DataType = ImportMode.ServiceRecord
+            }));
+            //repair records
+            reportData.AddRange(repairRecords.Select(x => new GenericReportModel
+            {
+                Date = x.Date,
+                Odometer = x.Mileage,
+                Description = x.Description,
+                Notes = x.Notes,
+                Cost = x.Cost,
+                DataType = ImportMode.RepairRecord
+            }));
+            reportData.AddRange(upgradeRecords.Select(x => new GenericReportModel
+            {
+                Date = x.Date,
+                Odometer = x.Mileage,
+                Description = x.Description,
+                Notes = x.Notes,
+                Cost = x.Cost,
+                DataType = ImportMode.UpgradeRecord
+            }));
+            reportData.AddRange(taxRecords.Select(x => new GenericReportModel
+            {
+                Date = x.Date,
+                Odometer = 0,
+                Description = x.Description,
+                Notes = x.Notes,
+                Cost = x.Cost,
+                DataType = ImportMode.TaxRecord
+            }));
+            vehicleHistory.VehicleHistory = reportData.OrderBy(x => x.Date).ThenBy(x => x.Odometer).ToList();
+            return PartialView("_VehicleHistory", vehicleHistory);
+        }
+        [TypeFilter(typeof(CollaboratorFilter))]
+        [HttpPost]
+        public IActionResult GetMonthMPGByVehicle(int vehicleId, int year = 0)
         {
             var gasRecords = _gasRecordDataAccess.GetGasRecordsByVehicleId(vehicleId);
-            if (year != default)
+            var userConfig = _config.GetUserConfig(User);
+            var mileageData = _gasHelper.GetGasRecordViewModels(gasRecords, userConfig.UseMPG, userConfig.UseUKMPG);
+            if (year != 0)
             {
-                gasRecords.RemoveAll(x => x.Date.Year != year);
+                mileageData.RemoveAll(x => DateTime.Parse(x.Date).Year != year);
             }
-            var groupedGasRecord = gasRecords.GroupBy(x => x.Date.Month).OrderBy(x => x.Key).Select(x => new GasCostForVehicleByMonth
+            mileageData.RemoveAll(x => x.MilesPerGallon == default);
+            var monthlyMileageData = mileageData.GroupBy(x => x.MonthId).OrderBy(x => x.Key).Select(x => new CostForVehicleByMonth
             {
                 MonthName = CultureInfo.CurrentCulture.DateTimeFormat.GetMonthName(x.Key),
+                Cost = x.Average(y => y.MilesPerGallon)
+            }).ToList();
+            return PartialView("_MPGByMonthReport", monthlyMileageData);
+        }
+        [TypeFilter(typeof(CollaboratorFilter))]
+        [HttpPost]
+        public IActionResult GetCostByMonthByVehicle(int vehicleId, List<ImportMode> selectedMetrics, int year = 0)
+        {
+            List<CostForVehicleByMonth> allCosts = new List<CostForVehicleByMonth>();
+            if (selectedMetrics.Contains(ImportMode.ServiceRecord))
+            {
+                var serviceRecords = _serviceRecordDataAccess.GetServiceRecordsByVehicleId(vehicleId);
+                allCosts.AddRange(_reportHelper.GetServiceRecordSum(serviceRecords, year));
+            }
+            if (selectedMetrics.Contains(ImportMode.RepairRecord))
+            {
+                var repairRecords = _collisionRecordDataAccess.GetCollisionRecordsByVehicleId(vehicleId);
+                allCosts.AddRange(_reportHelper.GetRepairRecordSum(repairRecords, year));
+            }
+            if (selectedMetrics.Contains(ImportMode.UpgradeRecord))
+            {
+                var upgradeRecords = _upgradeRecordDataAccess.GetUpgradeRecordsByVehicleId(vehicleId);
+                allCosts.AddRange(_reportHelper.GetUpgradeRecordSum(upgradeRecords, year));
+            }
+            if (selectedMetrics.Contains(ImportMode.GasRecord))
+            {
+                var gasRecords = _gasRecordDataAccess.GetGasRecordsByVehicleId(vehicleId);
+                allCosts.AddRange(_reportHelper.GetGasRecordSum(gasRecords, year));
+            }
+            if (selectedMetrics.Contains(ImportMode.TaxRecord))
+            {
+                var taxRecords = _taxRecordDataAccess.GetTaxRecordsByVehicleId(vehicleId);
+                allCosts.AddRange(_reportHelper.GetTaxRecordSum(taxRecords, year));
+            }
+            var groupedRecord = allCosts.GroupBy(x => new { x.MonthName, x.MonthId }).OrderBy(x => x.Key.MonthId).Select(x => new CostForVehicleByMonth
+            {
+                MonthName = x.Key.MonthName,
                 Cost = x.Sum(y => y.Cost)
             }).ToList();
-            return PartialView("_GasCostByMonthReport", groupedGasRecord);
+            return PartialView("_GasCostByMonthReport", groupedRecord);
         }
         #endregion
         #region "Reminders"
+        [TypeFilter(typeof(CollaboratorFilter))]
         private int GetMaxMileage(int vehicleId)
         {
             var numbersArray = new List<int>();
@@ -605,107 +956,29 @@ namespace CarCareTracker.Controllers
             }
             return numbersArray.Any() ? numbersArray.Max() : 0;
         }
-        private List<ReminderRecordViewModel> GetRemindersAndUrgency(int vehicleId)
+        private List<ReminderRecordViewModel> GetRemindersAndUrgency(int vehicleId, DateTime dateCompare)
         {
             var currentMileage = GetMaxMileage(vehicleId);
             var reminders = _reminderRecordDataAccess.GetReminderRecordsByVehicleId(vehicleId);
-            List<ReminderRecordViewModel> reminderViewModels = new List<ReminderRecordViewModel>();
-            foreach (var reminder in reminders)
-            {
-                var reminderViewModel = new ReminderRecordViewModel()
-                {
-                    Id = reminder.Id,
-                    VehicleId = reminder.VehicleId,
-                    Date = reminder.Date,
-                    Mileage = reminder.Mileage,
-                    Description = reminder.Description,
-                    Notes = reminder.Notes,
-                    Metric = reminder.Metric
-                };
-                if (reminder.Metric == ReminderMetric.Both)
-                {
-                    if (reminder.Date < DateTime.Now)
-                    {
-                        reminderViewModel.Urgency = ReminderUrgency.PastDue;
-                        reminderViewModel.Metric = ReminderMetric.Date;
-                    }
-                    else if (reminder.Mileage < currentMileage)
-                    {
-                        reminderViewModel.Urgency = ReminderUrgency.PastDue;
-                        reminderViewModel.Metric = ReminderMetric.Odometer;
-                    }
-                    else if (reminder.Date < DateTime.Now.AddDays(7))
-                    {
-                        //if less than a week from today or less than 50 miles from current mileage then very urgent.
-                        reminderViewModel.Urgency = ReminderUrgency.VeryUrgent;
-                        //have to specify by which metric this reminder is urgent.
-                        reminderViewModel.Metric = ReminderMetric.Date;
-                    }
-                    else if (reminder.Mileage < currentMileage + 50)
-                    {
-                        reminderViewModel.Urgency = ReminderUrgency.VeryUrgent;
-                        reminderViewModel.Metric = ReminderMetric.Odometer;
-                    }
-                    else if (reminder.Date < DateTime.Now.AddDays(30))
-                    {
-                        reminderViewModel.Urgency = ReminderUrgency.Urgent;
-                        reminderViewModel.Metric = ReminderMetric.Date;
-                    }
-                    else if (reminder.Mileage < currentMileage + 100)
-                    {
-                        reminderViewModel.Urgency = ReminderUrgency.Urgent;
-                        reminderViewModel.Metric = ReminderMetric.Odometer;
-                    }
-                }
-                else if (reminder.Metric == ReminderMetric.Date)
-                {
-                    if (reminder.Date < DateTime.Now)
-                    {
-                        reminderViewModel.Urgency = ReminderUrgency.PastDue;
-                    }
-                    else if (reminder.Date < DateTime.Now.AddDays(7))
-                    {
-                        reminderViewModel.Urgency = ReminderUrgency.VeryUrgent;
-                    }
-                    else if (reminder.Date < DateTime.Now.AddDays(30))
-                    {
-                        reminderViewModel.Urgency = ReminderUrgency.Urgent;
-                    }
-                }
-                else if (reminder.Metric == ReminderMetric.Odometer)
-                {
-                    if (reminder.Mileage < currentMileage)
-                    {
-                        reminderViewModel.Urgency = ReminderUrgency.PastDue;
-                        reminderViewModel.Metric = ReminderMetric.Odometer;
-                    }
-                    else if (reminder.Mileage < currentMileage + 50)
-                    {
-                        reminderViewModel.Urgency = ReminderUrgency.VeryUrgent;
-                    }
-                    else if (reminder.Mileage < currentMileage + 100)
-                    {
-                        reminderViewModel.Urgency = ReminderUrgency.Urgent;
-                    }
-                }
-                reminderViewModels.Add(reminderViewModel);
-            }
-            return reminderViewModels;
+            List<ReminderRecordViewModel> results = _reminderHelper.GetReminderRecordViewModels(reminders, currentMileage, dateCompare);
+            return results;
         }
+        [TypeFilter(typeof(CollaboratorFilter))]
         [HttpGet]
         public IActionResult GetVehicleHaveUrgentOrPastDueReminders(int vehicleId)
         {
-            var result = GetRemindersAndUrgency(vehicleId);
+            var result = GetRemindersAndUrgency(vehicleId, DateTime.Now);
             if (result.Where(x => x.Urgency == ReminderUrgency.VeryUrgent || x.Urgency == ReminderUrgency.PastDue).Any())
             {
                 return Json(true);
             }
             return Json(false);
         }
+        [TypeFilter(typeof(CollaboratorFilter))]
         [HttpGet]
         public IActionResult GetReminderRecordsByVehicleId(int vehicleId)
         {
-            var result = GetRemindersAndUrgency(vehicleId);
+            var result = GetRemindersAndUrgency(vehicleId, DateTime.Now);
             result = result.OrderByDescending(x => x.Urgency).ToList();
             return PartialView("_ReminderRecords", result);
         }
@@ -752,6 +1025,7 @@ namespace CarCareTracker.Controllers
         }
         #endregion
         #region "Upgrade Records"
+        [TypeFilter(typeof(CollaboratorFilter))]
         [HttpGet]
         public IActionResult GetUpgradeRecordsByVehicleId(int vehicleId)
         {
@@ -804,5 +1078,93 @@ namespace CarCareTracker.Controllers
             return Json(result);
         }
         #endregion
+        #region "Notes"
+        [TypeFilter(typeof(CollaboratorFilter))]
+        [HttpGet]
+        public IActionResult GetNotesByVehicleId(int vehicleId)
+        {
+            var result = _noteDataAccess.GetNotesByVehicleId(vehicleId);
+            return PartialView("_Notes", result);
+        }
+        [HttpPost]
+        public IActionResult SaveNoteToVehicleId(Note note)
+        {
+            var result = _noteDataAccess.SaveNoteToVehicle(note);
+            return Json(result);
+        }
+        [HttpGet]
+        public IActionResult GetAddNotePartialView()
+        {
+            return PartialView("_NoteModal", new Note());
+        }
+        [HttpGet]
+        public IActionResult GetNoteForEditById(int noteId)
+        {
+            var result = _noteDataAccess.GetNoteById(noteId);
+            return PartialView("_NoteModal", result);
+        }
+        [HttpPost]
+        public IActionResult DeleteNoteById(int noteId)
+        {
+            var result = _noteDataAccess.DeleteNoteById(noteId);
+            return Json(result);
+        }
+        #endregion
+        #region "Supply Records"
+        [TypeFilter(typeof(CollaboratorFilter))]
+        [HttpGet]
+        public IActionResult GetSupplyRecordsByVehicleId(int vehicleId)
+        {
+            var result = _supplyRecordDataAccess.GetSupplyRecordsByVehicleId(vehicleId);
+            if (_useDescending)
+            {
+                result = result.OrderByDescending(x => x.Date).ToList();
+            }
+            else
+            {
+                result = result.OrderBy(x => x.Date).ToList();
+            }
+            return PartialView("_SupplyRecords", result);
+        }
+        [HttpPost]
+        public IActionResult SaveSupplyRecordToVehicleId(SupplyRecordInput supplyRecord)
+        {
+            //move files from temp.
+            supplyRecord.Files = supplyRecord.Files.Select(x => { return new UploadedFiles { Name = x.Name, Location = _fileHelper.MoveFileFromTemp(x.Location, "documents/") }; }).ToList();
+            var result = _supplyRecordDataAccess.SaveSupplyRecordToVehicle(supplyRecord.ToSupplyRecord());
+            return Json(result);
+        }
+        [HttpGet]
+        public IActionResult GetAddSupplyRecordPartialView()
+        {
+            return PartialView("_SupplyRecordModal", new SupplyRecordInput());
+        }
+        [HttpGet]
+        public IActionResult GetSupplyRecordForEditById(int supplyRecordId)
+        {
+            var result = _supplyRecordDataAccess.GetSupplyRecordById(supplyRecordId);
+            //convert to Input object.
+            var convertedResult = new SupplyRecordInput
+            {
+                Id = result.Id,
+                Cost = result.Cost,
+                Date = result.Date.ToShortDateString(),
+                Description = result.Description,
+                PartNumber = result.PartNumber,
+                Quantity = result.Quantity,
+                PartSupplier = result.PartSupplier,
+                Notes = result.Notes,
+                VehicleId = result.VehicleId,
+                Files = result.Files
+            };
+            return PartialView("_SupplyRecordModal", convertedResult);
+        }
+        [HttpPost]
+        public IActionResult DeleteSupplyRecordById(int supplyRecordId)
+        {
+            var result = _supplyRecordDataAccess.DeleteSupplyRecordById(supplyRecordId);
+            return Json(result);
+        }
+        #endregion
     }
 }

Dockerfile

@@ -1,12 +1,13 @@
-FROM mcr.microsoft.com/dotnet/sdk:8.0 AS build-env
+FROM --platform=$BUILDPLATFORM mcr.microsoft.com/dotnet/sdk:8.0 AS build-env
 WORKDIR /App
 
 COPY . ./
-RUN dotnet restore
-RUN dotnet publish -c Release -o out
+ARG TARGETARCH
+RUN dotnet restore -a $TARGETARCH
+RUN dotnet publish -a $TARGETARCH -c Release -o out
 
 FROM mcr.microsoft.com/dotnet/aspnet:8.0
 WORKDIR /App
 COPY --from=build-env /App/out .
 EXPOSE 8080
-CMD ["./CarCareTracker"]
+CMD ["./CarCareTracker"]

Enum/ImportMode.cs

@@ -5,6 +5,11 @@
         ServiceRecord = 0,
         RepairRecord = 1,
         GasRecord = 2,
-        TaxRecord = 3
+        TaxRecord = 3,
+        UpgradeRecord = 4,
+        ReminderRecord = 5,
+        NoteRecord = 6,
+        SupplyRecord = 7,
+        Dashboard = 8
     }
 }

External/Implementations/NoteDataAccess.cs

@@ -9,16 +9,24 @@ namespace CarCareTracker.External.Implementations
     {
         private static string dbName = StaticHelper.DbName;
         private static string tableName = "notes";
-        public Note GetNoteByVehicleId(int vehicleId)
+        public List<Note> GetNotesByVehicleId(int vehicleId)
         {
             using (var db = new LiteDatabase(dbName))
             {
                 var table = db.GetCollection<Note>(tableName);
-                var noteToReturn = table.FindOne(Query.EQ(nameof(Note.VehicleId), vehicleId));
-                return noteToReturn ?? new Note();
+                var noteToReturn = table.Find(Query.EQ(nameof(Note.VehicleId), vehicleId));
+                return noteToReturn.ToList() ?? new List<Note>();
             };
         }
-        public bool SaveNoteToVehicleId(Note note)
+        public Note GetNoteById(int noteId)
+        {
+            using (var db = new LiteDatabase(dbName))
+            {
+                var table = db.GetCollection<Note>(tableName);
+                return table.FindById(noteId);
+            };
+        }
+        public bool SaveNoteToVehicle(Note note)
         {
             using (var db = new LiteDatabase(dbName))
             {
@@ -27,12 +35,21 @@ namespace CarCareTracker.External.Implementations
                 return true;
             };
         }
-        public bool DeleteNoteByVehicleId(int vehicleId)
+        public bool DeleteNoteById(int noteId)
         {
             using (var db = new LiteDatabase(dbName))
             {
                 var table = db.GetCollection<Note>(tableName);
-                table.DeleteMany(Query.EQ(nameof(Note.VehicleId), vehicleId));
+                table.Delete(noteId);
+                return true;
+            };
+        }
+        public bool DeleteAllNotesByVehicleId(int vehicleId)
+        {
+            using (var db = new LiteDatabase(dbName))
+            {
+                var table = db.GetCollection<Note>(tableName);
+                var notes = table.DeleteMany(Query.EQ(nameof(Note.VehicleId), vehicleId));
                 return true;
             };
         }

External/Implementations/SupplyRecordDataAccess.cs

@@ -0,0 +1,57 @@
+using CarCareTracker.External.Interfaces;
+using CarCareTracker.Helper;
+using CarCareTracker.Models;
+using LiteDB;
+
+namespace CarCareTracker.External.Implementations
+{
+    public class SupplyRecordDataAccess : ISupplyRecordDataAccess
+    {
+        private static string dbName = StaticHelper.DbName;
+        private static string tableName = "supplyrecords";
+        public List<SupplyRecord> GetSupplyRecordsByVehicleId(int vehicleId)
+        {
+            using (var db = new LiteDatabase(dbName))
+            {
+                var table = db.GetCollection<SupplyRecord>(tableName);
+                var supplyRecords = table.Find(Query.EQ(nameof(SupplyRecord.VehicleId), vehicleId));
+                return supplyRecords.ToList() ?? new List<SupplyRecord>();
+            };
+        }
+        public SupplyRecord GetSupplyRecordById(int supplyRecordId)
+        {
+            using (var db = new LiteDatabase(dbName))
+            {
+                var table = db.GetCollection<SupplyRecord>(tableName);
+                return table.FindById(supplyRecordId);
+            };
+        }
+        public bool DeleteSupplyRecordById(int supplyRecordId)
+        {
+            using (var db = new LiteDatabase(dbName))
+            {
+                var table = db.GetCollection<SupplyRecord>(tableName);
+                table.Delete(supplyRecordId);
+                return true;
+            };
+        }
+        public bool SaveSupplyRecordToVehicle(SupplyRecord supplyRecord)
+        {
+            using (var db = new LiteDatabase(dbName))
+            {
+                var table = db.GetCollection<SupplyRecord>(tableName);
+                table.Upsert(supplyRecord);
+                return true;
+            };
+        }
+        public bool DeleteAllSupplyRecordsByVehicleId(int vehicleId)
+        {
+            using (var db = new LiteDatabase(dbName))
+            {
+                var table = db.GetCollection<SupplyRecord>(tableName);
+                var supplyRecords = table.DeleteMany(Query.EQ(nameof(SupplyRecord.VehicleId), vehicleId));
+                return true;
+            };
+        }
+    }
+}

External/Implementations/TokenRecordDataAccess.cs

@@ -0,0 +1,57 @@
+using CarCareTracker.External.Interfaces;
+using CarCareTracker.Helper;
+using CarCareTracker.Models;
+using LiteDB;
+
+namespace CarCareTracker.External.Implementations
+{
+    public class TokenRecordDataAccess : ITokenRecordDataAccess
+    {
+        private static string dbName = StaticHelper.DbName;
+        private static string tableName = "tokenrecords";
+        public List<Token> GetTokens()
+        {
+            using (var db = new LiteDatabase(dbName))
+            {
+                var table = db.GetCollection<Token>(tableName);
+                return table.FindAll().ToList();
+            };
+        }
+        public Token GetTokenRecordByBody(string tokenBody)
+        {
+            using (var db = new LiteDatabase(dbName))
+            {
+                var table = db.GetCollection<Token>(tableName);
+                var tokenRecord = table.FindOne(Query.EQ(nameof(Token.Body), tokenBody));
+                return tokenRecord ?? new Token();
+            };
+        }
+        public Token GetTokenRecordByEmailAddress(string emailAddress)
+        {
+            using (var db = new LiteDatabase(dbName))
+            {
+                var table = db.GetCollection<Token>(tableName);
+                var tokenRecord = table.FindOne(Query.EQ(nameof(Token.EmailAddress), emailAddress));
+                return tokenRecord ?? new Token();
+            };
+        }
+        public bool CreateNewToken(Token token)
+        {
+            using (var db = new LiteDatabase(dbName))
+            {
+                var table = db.GetCollection<Token>(tableName);
+                table.Insert(token);
+                return true;
+            };
+        }
+        public bool DeleteToken(int tokenId)
+        {
+            using (var db = new LiteDatabase(dbName))
+            {
+                var table = db.GetCollection<Token>(tableName);
+                table.Delete(tokenId);
+                return true;
+            };
+        }
+    }
+}

External/Implementations/UserAccessDataAcces.cs

@@ -0,0 +1,88 @@
+using CarCareTracker.External.Interfaces;
+using CarCareTracker.Helper;
+using CarCareTracker.Models;
+using LiteDB;
+
+namespace CarCareTracker.External.Implementations
+{
+    public class UserAccessDataAccess : IUserAccessDataAccess
+    {
+        private static string dbName = StaticHelper.DbName;
+        private static string tableName = "useraccessrecords";
+        /// <summary>
+        /// Gets a list of vehicles user have access to.
+        /// </summary>
+        /// <param name="userId"></param>
+        /// <returns></returns>
+        public List<UserAccess> GetUserAccessByUserId(int userId)
+        {
+            using (var db = new LiteDatabase(dbName))
+            {
+                var table = db.GetCollection<UserAccess>(tableName);
+                return table.Find(x=>x.Id.UserId == userId).ToList();
+            };
+        }
+        public UserAccess GetUserAccessByVehicleAndUserId(int userId, int vehicleId)
+        {
+            using (var db = new LiteDatabase(dbName))
+            {
+                var table = db.GetCollection<UserAccess>(tableName);
+                return table.Find(x => x.Id.UserId == userId && x.Id.VehicleId == vehicleId).FirstOrDefault();
+            };
+        }
+        public List<UserAccess> GetUserAccessByVehicleId(int vehicleId)
+        {
+            using (var db = new LiteDatabase(dbName))
+            {
+                var table = db.GetCollection<UserAccess>(tableName);
+                return table.Find(x => x.Id.VehicleId == vehicleId).ToList();
+            };
+        }
+        public bool SaveUserAccess(UserAccess userAccess)
+        {
+            using (var db = new LiteDatabase(dbName))
+            {
+                var table = db.GetCollection<UserAccess>(tableName);
+                table.Upsert(userAccess);
+                return true;
+            };
+        }
+        public bool DeleteUserAccess(int userId, int vehicleId)
+        {
+            using (var db = new LiteDatabase(dbName))
+            {
+                var table = db.GetCollection<UserAccess>(tableName);
+                table.DeleteMany(x => x.Id.UserId == userId && x.Id.VehicleId == vehicleId);
+                return true;
+            };
+        }
+        /// <summary>
+        /// Delete all access records when a vehicle is deleted.
+        /// </summary>
+        /// <param name="vehicleId"></param>
+        /// <returns></returns>
+        public bool DeleteAllAccessRecordsByVehicleId(int vehicleId)
+        {
+            using (var db = new LiteDatabase(dbName))
+            {
+                var table = db.GetCollection<UserAccess>(tableName);
+                table.DeleteMany(x=>x.Id.VehicleId == vehicleId);
+                return true;
+            };
+        }
+        /// <summary>
+        /// Delee all access records when a user is deleted.
+        /// </summary>
+        /// <param name="userId"></param>
+        /// <returns></returns>
+        public bool DeleteAllAccessRecordsByUserId(int userId)
+        {
+            using (var db = new LiteDatabase(dbName))
+            {
+                var table = db.GetCollection<UserAccess>(tableName);
+                table.DeleteMany(x => x.Id.UserId == userId);
+                return true;
+            };
+        }
+    }
+}

External/Implementations/UserConfigDataAccess.cs

@@ -0,0 +1,40 @@
+using CarCareTracker.External.Interfaces;
+using CarCareTracker.Helper;
+using CarCareTracker.Models;
+using LiteDB;
+using Microsoft.AspNetCore.Mvc.ModelBinding;
+
+namespace CarCareTracker.External.Implementations
+{
+    public class UserConfigDataAccess: IUserConfigDataAccess
+    {
+        private static string dbName = StaticHelper.DbName;
+        private static string tableName = "userconfigrecords";
+        public UserConfigData GetUserConfig(int userId)
+        {
+            using (var db = new LiteDatabase(dbName))
+            {
+                var table = db.GetCollection<UserConfigData>(tableName);
+                return table.FindById(userId);
+            };
+        }
+        public bool SaveUserConfig(UserConfigData userConfigData)
+        {
+            using (var db = new LiteDatabase(dbName))
+            {
+                var table = db.GetCollection<UserConfigData>(tableName);
+                table.Upsert(userConfigData);
+                return true;
+            };
+        }
+        public bool DeleteUserConfig(int userId)
+        {
+            using (var db = new LiteDatabase(dbName))
+            {
+                var table = db.GetCollection<UserConfigData>(tableName);
+                table.Delete(userId);
+                return true;
+            };
+        }
+    }
+}

External/Implementations/UserRecordDataAccess.cs

@@ -0,0 +1,66 @@
+using CarCareTracker.External.Interfaces;
+using CarCareTracker.Helper;
+using CarCareTracker.Models;
+using LiteDB;
+
+namespace CarCareTracker.External.Implementations
+{
+    public class UserRecordDataAccess : IUserRecordDataAccess
+    {
+        private static string dbName = StaticHelper.DbName;
+        private static string tableName = "userrecords";
+        public List<UserData> GetUsers()
+        {
+            using (var db = new LiteDatabase(dbName))
+            {
+                var table = db.GetCollection<UserData>(tableName);
+                return table.FindAll().ToList();
+            };
+        }
+        public UserData GetUserRecordByUserName(string userName)
+        {
+            using (var db = new LiteDatabase(dbName))
+            {
+                var table = db.GetCollection<UserData>(tableName);
+                var userRecord = table.FindOne(Query.EQ(nameof(UserData.UserName), userName));
+                return userRecord ?? new UserData();
+            };
+        }
+        public UserData GetUserRecordByEmailAddress(string emailAddress)
+        {
+            using (var db = new LiteDatabase(dbName))
+            {
+                var table = db.GetCollection<UserData>(tableName);
+                var userRecord = table.FindOne(Query.EQ(nameof(UserData.EmailAddress), emailAddress));
+                return userRecord ?? new UserData();
+            };
+        }
+        public UserData GetUserRecordById(int userId)
+        {
+            using (var db = new LiteDatabase(dbName))
+            {
+                var table = db.GetCollection<UserData>(tableName);
+                var userRecord = table.FindById(userId);
+                return userRecord ?? new UserData();
+            };
+        }
+        public bool SaveUserRecord(UserData userRecord)
+        {
+            using (var db = new LiteDatabase(dbName))
+            {
+                var table = db.GetCollection<UserData>(tableName);
+                table.Upsert(userRecord);
+                return true;
+            };
+        }
+        public bool DeleteUserRecord(int userId)
+        {
+            using (var db = new LiteDatabase(dbName))
+            {
+                var table = db.GetCollection<UserData>(tableName);
+                table.Delete(userId);
+                return true;
+            };
+        }
+    }
+}

External/Implementations/VehicleDataAccess.cs

@@ -14,7 +14,7 @@ namespace CarCareTracker.External.Implementations
             using (var db = new LiteDatabase(dbName))
             {
                 var table = db.GetCollection<Vehicle>(tableName);
-                table.Upsert(vehicle);
+                var result = table.Upsert(vehicle);
                 return true;
             };
         }

External/Interfaces/INoteDataAccess.cs

@@ -4,8 +4,10 @@ namespace CarCareTracker.External.Interfaces
 {
     public interface INoteDataAccess
     {
-        public Note GetNoteByVehicleId(int vehicleId);
-        public bool SaveNoteToVehicleId(Note note);
-        bool DeleteNoteByVehicleId(int vehicleId);
+        public List<Note> GetNotesByVehicleId(int vehicleId);
+        public Note GetNoteById(int noteId);
+        public bool SaveNoteToVehicle(Note note);
+        public bool DeleteNoteById(int noteId);
+        public bool DeleteAllNotesByVehicleId(int vehicleId);
     }
 }

External/Interfaces/ISupplyRecordDataAccess.cs

@@ -0,0 +1,13 @@
+using CarCareTracker.Models;
+
+namespace CarCareTracker.External.Interfaces
+{
+    public interface ISupplyRecordDataAccess
+    {
+        public List<SupplyRecord> GetSupplyRecordsByVehicleId(int vehicleId);
+        public SupplyRecord GetSupplyRecordById(int supplyRecordId);
+        public bool DeleteSupplyRecordById(int supplyRecordId);
+        public bool SaveSupplyRecordToVehicle(SupplyRecord supplyRecord);
+        public bool DeleteAllSupplyRecordsByVehicleId(int vehicleId);
+    }
+}

External/Interfaces/ITokenRecordDataAccess.cs

@@ -0,0 +1,13 @@
+using CarCareTracker.Models;
+
+namespace CarCareTracker.External.Interfaces
+{
+    public interface ITokenRecordDataAccess
+    {
+        public List<Token> GetTokens();
+        public Token GetTokenRecordByBody(string tokenBody);
+        public Token GetTokenRecordByEmailAddress(string emailAddress);
+        public bool CreateNewToken(Token token);
+        public bool DeleteToken(int tokenId);
+    }
+}

External/Interfaces/IUserAccessDataAccess.cs

@@ -0,0 +1,15 @@
+using CarCareTracker.Models;
+
+namespace CarCareTracker.External.Interfaces
+{
+    public interface IUserAccessDataAccess
+    {
+        List<UserAccess> GetUserAccessByUserId(int userId);
+        UserAccess GetUserAccessByVehicleAndUserId(int userId, int vehicleId);
+        List<UserAccess> GetUserAccessByVehicleId(int vehicleId);
+        bool SaveUserAccess(UserAccess userAccess);
+        bool DeleteUserAccess(int userId, int vehicleId);
+        bool DeleteAllAccessRecordsByVehicleId(int vehicleId);
+        bool DeleteAllAccessRecordsByUserId(int userId);
+    }
+}

External/Interfaces/IUserConfigDataAccess.cs

@@ -0,0 +1,11 @@
+using CarCareTracker.Models;
+
+namespace CarCareTracker.External.Interfaces
+{
+    public interface IUserConfigDataAccess
+    {
+        public UserConfigData GetUserConfig(int userId);
+        public bool SaveUserConfig(UserConfigData userConfigData);
+        public bool DeleteUserConfig(int userId);
+    }
+}

External/Interfaces/IUserRecordDataAccess.cs

@@ -0,0 +1,14 @@
+using CarCareTracker.Models;
+
+namespace CarCareTracker.External.Interfaces
+{
+    public interface IUserRecordDataAccess
+    {
+        public List<UserData> GetUsers();
+        public UserData GetUserRecordByUserName(string userName);
+        public UserData GetUserRecordByEmailAddress(string emailAddress);
+        public UserData GetUserRecordById(int userId);
+        public bool SaveUserRecord(UserData userRecord);
+        public bool DeleteUserRecord(int userId);
+    }
+}

Filter/CollaboratorFilter.cs

@@ -0,0 +1,28 @@
+using CarCareTracker.Logic;
+using CarCareTracker.Models;
+using Microsoft.AspNetCore.Mvc;
+using Microsoft.AspNetCore.Mvc.Filters;
+using System.Security.Claims;
+
+namespace CarCareTracker.Filter
+{
+    public class CollaboratorFilter: ActionFilterAttribute
+    {
+        private readonly IUserLogic _userLogic;
+        public CollaboratorFilter(IUserLogic userLogic) {
+            _userLogic = userLogic;
+        }
+        public override void OnActionExecuting(ActionExecutingContext filterContext)
+        {
+            if (!filterContext.HttpContext.User.IsInRole(nameof(UserData.IsRootUser)))
+            {
+                var vehicleId = int.Parse(filterContext.ActionArguments["vehicleId"].ToString());
+                var userId = int.Parse(filterContext.HttpContext.User.FindFirstValue(ClaimTypes.NameIdentifier));
+                if (!_userLogic.UserCanEditVehicle(userId, vehicleId))
+                {
+                    filterContext.Result = new RedirectResult("/Error/Unauthorized");
+                }
+            }
+        }
+    }
+}

Helper/ConfigHelper.cs

@@ -0,0 +1,140 @@
+using CarCareTracker.External.Interfaces;
+using CarCareTracker.Models;
+using Microsoft.Extensions.Caching.Memory;
+using System.Security.Claims;
+
+namespace CarCareTracker.Helper
+{
+    public interface IConfigHelper
+    {
+        UserConfig GetUserConfig(ClaimsPrincipal user);
+        bool SaveUserConfig(ClaimsPrincipal user, UserConfig configData);
+        public bool DeleteUserConfig(int userId);
+    }
+    public class ConfigHelper : IConfigHelper
+    {
+        private readonly IConfiguration _config;
+        private readonly IUserConfigDataAccess _userConfig;
+        private IMemoryCache _cache;
+        public ConfigHelper(IConfiguration serverConfig, 
+            IUserConfigDataAccess userConfig,
+            IMemoryCache memoryCache)
+        {
+            _config = serverConfig;
+            _userConfig = userConfig;
+            _cache = memoryCache;
+        }
+        public bool SaveUserConfig(ClaimsPrincipal user, UserConfig configData)
+        {
+            var storedUserId = user.FindFirstValue(ClaimTypes.NameIdentifier);
+            int userId = 0;
+            if (storedUserId != null)
+            {
+                userId = int.Parse(storedUserId);
+            }
+            bool isRootUser = user.IsInRole(nameof(UserData.IsRootUser)) || userId == -1;
+            if (isRootUser)
+            {
+                try
+                {
+                    if (!File.Exists(StaticHelper.UserConfigPath))
+                    {
+                        //if file doesn't exist it might be because it's running on a mounted volume in docker.
+                        File.WriteAllText(StaticHelper.UserConfigPath, System.Text.Json.JsonSerializer.Serialize(new UserConfig()));
+                    }
+                    var configFileContents = File.ReadAllText(StaticHelper.UserConfigPath);
+                    var existingUserConfig = System.Text.Json.JsonSerializer.Deserialize<UserConfig>(configFileContents);
+                    if (existingUserConfig is not null)
+                    {
+                        //copy over settings that are off limits on the settings page.
+                        configData.EnableAuth = existingUserConfig.EnableAuth;
+                        configData.UserNameHash = existingUserConfig.UserNameHash;
+                        configData.UserPasswordHash = existingUserConfig.UserPasswordHash;
+                    }
+                    else
+                    {
+                        configData.EnableAuth = false;
+                        configData.UserNameHash = string.Empty;
+                        configData.UserPasswordHash = string.Empty;
+                    }
+                    File.WriteAllText(StaticHelper.UserConfigPath, System.Text.Json.JsonSerializer.Serialize(configData));
+                    _cache.Set<UserConfig>($"userConfig_{userId}", configData);
+                    return true;
+                }
+                catch (Exception ex)
+                {
+                    return false;
+                }
+            } else
+            {
+                var userConfig = new UserConfigData()
+                {
+                    Id = userId,
+                    UserConfig = configData
+                };
+                var result = _userConfig.SaveUserConfig(userConfig);
+                _cache.Set<UserConfig>($"userConfig_{userId}", configData);
+                return result;
+            }
+        }
+        public bool DeleteUserConfig(int userId)
+        {
+            _cache.Remove($"userConfig_{userId}");
+            var result = _userConfig.DeleteUserConfig(userId);
+            return result;
+        }
+        public UserConfig GetUserConfig(ClaimsPrincipal user)
+        {
+            var serverConfig = new UserConfig
+            {
+                EnableCsvImports = bool.Parse(_config[nameof(UserConfig.EnableCsvImports)]),
+                UseDarkMode = bool.Parse(_config[nameof(UserConfig.UseDarkMode)]),
+                UseMPG = bool.Parse(_config[nameof(UserConfig.UseMPG)]),
+                UseDescending = bool.Parse(_config[nameof(UserConfig.UseDescending)]),
+                EnableAuth = bool.Parse(_config[nameof(UserConfig.EnableAuth)]),
+                HideZero = bool.Parse(_config[nameof(UserConfig.HideZero)]),
+                UseUKMPG = bool.Parse(_config[nameof(UserConfig.UseUKMPG)]),
+                UseThreeDecimalGasCost = bool.Parse(_config[nameof(UserConfig.UseThreeDecimalGasCost)]),
+                VisibleTabs = _config.GetSection("VisibleTabs").Get<List<ImportMode>>(),
+                DefaultTab = (ImportMode)int.Parse(_config[nameof(UserConfig.DefaultTab)])
+            };
+            int userId = 0;
+            if (user != null)
+            {
+                var storedUserId = user.FindFirstValue(ClaimTypes.NameIdentifier);
+                if (storedUserId != null)
+                {
+                    userId = int.Parse(storedUserId);
+                }
+            } else
+            {
+                return serverConfig;
+            }
+            return _cache.GetOrCreate<UserConfig>($"userConfig_{userId}", entry =>
+            {
+                entry.SlidingExpiration = TimeSpan.FromHours(1);
+                if (!user.Identity.IsAuthenticated)
+                {
+                    return serverConfig;
+                }
+                bool isRootUser = user.IsInRole(nameof(UserData.IsRootUser)) || userId == -1;
+                if (isRootUser)
+                {
+                    return serverConfig;
+                }
+                else
+                {
+                    var result = _userConfig.GetUserConfig(userId);
+                    if (result == null)
+                    {
+                        return serverConfig;
+                    }
+                    else
+                    {
+                        return result.UserConfig;
+                    }
+                }
+            });
+        }
+    }
+}

Helper/FileHelper.cs

@@ -1,19 +1,25 @@
-namespace CarCareTracker.Helper
+using System.IO.Compression;
+
+namespace CarCareTracker.Helper
 {
     public interface IFileHelper
     {
-        string GetFullFilePath(string currentFilePath);
-        public string MoveFileFromTemp(string currentFilePath, string newFolder);
-        public bool DeleteFile(string currentFilePath);
+        string GetFullFilePath(string currentFilePath, bool mustExist = true);
+        string MoveFileFromTemp(string currentFilePath, string newFolder);
+        bool DeleteFile(string currentFilePath);
+        string MakeBackup();
+        bool RestoreBackup(string fileName);
     }
-    public class FileHelper: IFileHelper
+    public class FileHelper : IFileHelper
     {
         private readonly IWebHostEnvironment _webEnv;
-        public FileHelper(IWebHostEnvironment webEnv)
+        private readonly ILogger<IFileHelper> _logger;
+        public FileHelper(IWebHostEnvironment webEnv, ILogger<IFileHelper> logger)
         {
             _webEnv = webEnv;
+            _logger = logger;
         }
-        public string GetFullFilePath(string currentFilePath)
+        public string GetFullFilePath(string currentFilePath, bool mustExist = true)
         {
             if (currentFilePath.StartsWith("/"))
             {
@@ -23,11 +29,131 @@
             if (File.Exists(oldFilePath))
             {
                 return oldFilePath;
-            } else
+            }
+            else if (!mustExist)
+            {
+                return oldFilePath;
+            }
             {
                 return string.Empty;
             }
         }
+        public bool RestoreBackup(string fileName)
+        {
+            var fullFilePath = GetFullFilePath(fileName);
+            if (string.IsNullOrWhiteSpace(fullFilePath))
+            {
+                return false;
+            }
+            try
+            {
+                var tempPath = Path.Combine(_webEnv.WebRootPath, $"temp/{Guid.NewGuid()}");
+                if (!Directory.Exists(tempPath))
+                    Directory.CreateDirectory(tempPath);
+                //extract zip file
+                ZipFile.ExtractToDirectory(fullFilePath, tempPath);
+                //copy over images and documents.
+                var imagePath = Path.Combine(tempPath, "images");
+                var documentPath = Path.Combine(tempPath, "documents");
+                var dataPath = Path.Combine(tempPath, StaticHelper.DbName);
+                var configPath = Path.Combine(tempPath, StaticHelper.UserConfigPath);
+                if (Directory.Exists(imagePath))
+                {
+                    var existingPath = Path.Combine(_webEnv.WebRootPath, "images");
+                    if (!Directory.Exists(existingPath))
+                    {
+                        Directory.CreateDirectory(existingPath);
+                    }
+                    //copy each files from temp folder to newPath
+                    var filesToUpload = Directory.GetFiles(imagePath);
+                    foreach(string file in filesToUpload)
+                    {
+                        File.Copy(file, $"{existingPath}/{Path.GetFileName(file)}");
+                    }
+                }
+                if (Directory.Exists(documentPath))
+                {
+                    var existingPath = Path.Combine(_webEnv.WebRootPath, "documents");
+                    if (!Directory.Exists(existingPath))
+                    {
+                        Directory.CreateDirectory(existingPath);
+                    }
+                    //copy each files from temp folder to newPath
+                    var filesToUpload = Directory.GetFiles(documentPath);
+                    foreach (string file in filesToUpload)
+                    {
+                        File.Copy(file, $"{existingPath}/{Path.GetFileName(file)}");
+                    }
+                }
+                if (File.Exists(dataPath))
+                {
+                    //data path will always exist as it is created on startup if not.
+                    File.Move(dataPath, StaticHelper.DbName, true);
+                }
+                if (File.Exists(configPath))
+                {
+                    //check if config folder exists.
+                    if (!Directory.Exists("config/"))
+                    {
+                        Directory.CreateDirectory("config/");
+                    }
+                    File.Move(configPath, StaticHelper.UserConfigPath, true);
+                }
+                return true;
+            } catch (Exception ex)
+            {
+                _logger.LogError(ex, $"Error Restoring Database Backup: {ex.Message}");
+                return false;
+            }
+        }
+        public string MakeBackup()
+        {
+            var folderName = $"db_backup_{DateTime.Now.ToString("yyyy-MM-dd-HH-mm-ss")}";
+            var tempPath = Path.Combine(_webEnv.WebRootPath, $"temp/{folderName}");
+            var imagePath = Path.Combine(_webEnv.WebRootPath, "images");
+            var documentPath = Path.Combine(_webEnv.WebRootPath, "documents");
+            var dataPath = StaticHelper.DbName;
+            var configPath = StaticHelper.UserConfigPath;
+            if (!Directory.Exists(tempPath))
+                Directory.CreateDirectory(tempPath);
+            if (Directory.Exists(imagePath))
+            {
+                var files = Directory.GetFiles(imagePath);
+                foreach (var file in files)
+                {
+                    var newPath = Path.Combine(tempPath, "images");
+                    Directory.CreateDirectory(newPath);
+                    File.Copy(file, $"{newPath}/{Path.GetFileName(file)}");
+                }
+            }
+            if (Directory.Exists(documentPath))
+            {
+                var files = Directory.GetFiles(documentPath);
+                foreach (var file in files)
+                {
+                    var newPath = Path.Combine(tempPath, "documents");
+                    Directory.CreateDirectory(newPath);
+                    File.Copy(file, $"{newPath}/{Path.GetFileName(file)}");
+                }
+            }
+            if (File.Exists(dataPath))
+            {
+                var newPath = Path.Combine(tempPath, "data");
+                Directory.CreateDirectory(newPath);
+                File.Copy(dataPath, $"{newPath}/{Path.GetFileName(dataPath)}");
+            }
+            if (File.Exists(configPath))
+            {
+                var newPath = Path.Combine(tempPath, "config");
+                Directory.CreateDirectory(newPath);
+                File.Copy(configPath, $"{newPath}/{Path.GetFileName(configPath)}");
+            }
+            var destFilePath = $"{tempPath}.zip";
+            ZipFile.CreateFromDirectory(tempPath, destFilePath);
+            //delete temp directory
+            Directory.Delete(tempPath, true);
+            return $"/temp/{folderName}.zip";
+        }
         public string MoveFileFromTemp(string currentFilePath, string newFolder)
         {
             string tempPath = "temp/";
@@ -35,7 +161,8 @@
             {
                 return currentFilePath;
             }
-            if (currentFilePath.StartsWith("/")) { 
+            if (currentFilePath.StartsWith("/"))
+            {
                 currentFilePath = currentFilePath.Substring(1);
             }
             string uploadPath = Path.Combine(_webEnv.WebRootPath, newFolder);
@@ -64,7 +191,8 @@
             if (!File.Exists(filePath)) //verify file no longer exists.
             {
                 return true;
-            } else
+            }
+            else
             {
                 return false;
             }

Helper/GasHelper.cs

@@ -0,0 +1,96 @@
+using CarCareTracker.Models;
+
+namespace CarCareTracker.Helper
+{
+    public interface IGasHelper
+    {
+        List<GasRecordViewModel> GetGasRecordViewModels(List<GasRecord> result, bool useMPG, bool useUKMPG);
+    }
+    public class GasHelper : IGasHelper
+    {
+        public List<GasRecordViewModel> GetGasRecordViewModels(List<GasRecord> result, bool useMPG, bool useUKMPG)
+        {
+            var computedResults = new List<GasRecordViewModel>();
+            int previousMileage = 0;
+            decimal unFactoredConsumption = 0.00M;
+            int unFactoredMileage = 0;
+            //perform computation.
+            for (int i = 0; i < result.Count; i++)
+            {
+                var currentObject = result[i];
+                decimal convertedConsumption;
+                if (useUKMPG && useMPG)
+                {
+                    //if we're using UK MPG and the user wants imperial calculation insteace of l/100km
+                    //if UK MPG is selected then the gas consumption are stored in liters but need to convert into UK gallons for computation.
+                    convertedConsumption = currentObject.Gallons / 4.546M;
+                }
+                else
+                {
+                    convertedConsumption = currentObject.Gallons;
+                }
+                if (i > 0)
+                {
+                    var deltaMileage = currentObject.Mileage - previousMileage;
+                    var gasRecordViewModel = new GasRecordViewModel()
+                    {
+                        Id = currentObject.Id,
+                        VehicleId = currentObject.VehicleId,
+                        MonthId = currentObject.Date.Month,
+                        Date = currentObject.Date.ToShortDateString(),
+                        Mileage = currentObject.Mileage,
+                        Gallons = convertedConsumption,
+                        Cost = currentObject.Cost,
+                        DeltaMileage = deltaMileage,
+                        CostPerGallon = currentObject.Cost / convertedConsumption,
+                        IsFillToFull = currentObject.IsFillToFull,
+                        MissedFuelUp = currentObject.MissedFuelUp
+                    };
+                    if (currentObject.MissedFuelUp)
+                    {
+                        //if they missed a fuel up, we skip MPG calculation.
+                        gasRecordViewModel.MilesPerGallon = 0;
+                        //reset unFactored vars for missed fuel up because the numbers wont be reliable.
+                        unFactoredConsumption = 0;
+                        unFactoredMileage = 0;
+                    }
+                    else if (currentObject.IsFillToFull)
+                    {
+                        //if user filled to full.
+                        gasRecordViewModel.MilesPerGallon = useMPG ? (unFactoredMileage + deltaMileage) / (unFactoredConsumption + convertedConsumption) : 100 / ((unFactoredMileage + deltaMileage) / (unFactoredConsumption + convertedConsumption));
+                        //reset unFactored vars
+                        unFactoredConsumption = 0;
+                        unFactoredMileage = 0;
+                    }
+                    else
+                    {
+                        unFactoredConsumption += convertedConsumption;
+                        unFactoredMileage += deltaMileage;
+                        gasRecordViewModel.MilesPerGallon = 0;
+                    }
+                    computedResults.Add(gasRecordViewModel);
+                }
+                else
+                {
+                    computedResults.Add(new GasRecordViewModel()
+                    {
+                        Id = currentObject.Id,
+                        VehicleId = currentObject.VehicleId,
+                        MonthId = currentObject.Date.Month,
+                        Date = currentObject.Date.ToShortDateString(),
+                        Mileage = currentObject.Mileage,
+                        Gallons = convertedConsumption,
+                        Cost = currentObject.Cost,
+                        DeltaMileage = 0,
+                        MilesPerGallon = 0,
+                        CostPerGallon = currentObject.Cost / convertedConsumption,
+                        IsFillToFull = currentObject.IsFillToFull,
+                        MissedFuelUp = currentObject.MissedFuelUp
+                    });
+                }
+                previousMileage = currentObject.Mileage;
+            }
+            return computedResults;
+        }
+    }
+}

Helper/MailHelper.cs

@@ -0,0 +1,85 @@
+using CarCareTracker.Models;
+using System.Net.Mail;
+using System.Net;
+
+namespace CarCareTracker.Helper
+{
+    public interface IMailHelper
+    {
+        OperationResponse NotifyUserForRegistration(string emailAddress, string token);
+        OperationResponse NotifyUserForPasswordReset(string emailAddress, string token);
+    }
+    public class MailHelper : IMailHelper
+    {
+        private readonly MailConfig mailConfig;
+        public MailHelper(
+            IConfiguration config
+            ) {
+            //load mailConfig from Configuration
+            mailConfig = config.GetSection("MailConfig").Get<MailConfig>();
+        }
+        public OperationResponse NotifyUserForRegistration(string emailAddress, string token)
+        {
+            if (string.IsNullOrWhiteSpace(mailConfig.EmailServer))
+            {
+                return new OperationResponse { Success = false, Message = "SMTP Server Not Setup" };
+            }
+            if (string.IsNullOrWhiteSpace(emailAddress) || string.IsNullOrWhiteSpace(token)) {
+                return new OperationResponse { Success = false, Message = "Email Address or Token is invalid" };
+            }
+            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);
+            if (result)
+            {
+                return new OperationResponse { Success = true, Message = "Email Sent!" };
+            } else
+            {
+                return new OperationResponse { Success = false, Message = StaticHelper.GenericErrorMessage };
+            }
+        }
+        public OperationResponse NotifyUserForPasswordReset(string emailAddress, string token)
+        {
+            if (string.IsNullOrWhiteSpace(mailConfig.EmailServer))
+            {
+                return new OperationResponse { Success = false, Message = "SMTP Server Not Setup" };
+            }
+            if (string.IsNullOrWhiteSpace(emailAddress) || string.IsNullOrWhiteSpace(token))
+            {
+                return new OperationResponse { Success = false, Message = "Email Address or Token is invalid" };
+            }
+            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);
+            if (result)
+            {
+                return new OperationResponse { Success = true, Message = "Email Sent!" };
+            }
+            else
+            {
+                return new OperationResponse { Success = false, Message = StaticHelper.GenericErrorMessage };
+            }
+        }
+        private bool SendEmail(string emailTo, string emailSubject, string emailBody) {
+            string to = emailTo;
+            string from = mailConfig.EmailFrom;
+            var server = mailConfig.EmailServer;
+            MailMessage message = new MailMessage(from, to);
+            message.Subject = emailSubject;
+            message.Body = emailBody;
+            SmtpClient client = new SmtpClient(server);
+            client.EnableSsl = mailConfig.UseSSL;
+            client.Port = mailConfig.Port;
+            client.Credentials = new NetworkCredential(mailConfig.Username, mailConfig.Password);
+            try
+            {
+                client.Send(message);
+                return true;
+            }
+            catch (Exception ex)
+            {
+                return false;
+            }
+        }
+    }
+}

Helper/ReminderHelper.cs

@@ -0,0 +1,97 @@
+using CarCareTracker.Models;
+
+namespace CarCareTracker.Helper
+{
+    public interface IReminderHelper
+    {
+        List<ReminderRecordViewModel> GetReminderRecordViewModels(List<ReminderRecord> reminders, int currentMileage, DateTime dateCompare);
+    }
+    public class ReminderHelper: IReminderHelper
+    {
+        public List<ReminderRecordViewModel> GetReminderRecordViewModels(List<ReminderRecord> reminders, int currentMileage, DateTime dateCompare)
+        {
+            List<ReminderRecordViewModel> reminderViewModels = new List<ReminderRecordViewModel>();
+            foreach (var reminder in reminders)
+            {
+                var reminderViewModel = new ReminderRecordViewModel()
+                {
+                    Id = reminder.Id,
+                    VehicleId = reminder.VehicleId,
+                    Date = reminder.Date,
+                    Mileage = reminder.Mileage,
+                    Description = reminder.Description,
+                    Notes = reminder.Notes,
+                    Metric = reminder.Metric
+                };
+                if (reminder.Metric == ReminderMetric.Both)
+                {
+                    if (reminder.Date < dateCompare)
+                    {
+                        reminderViewModel.Urgency = ReminderUrgency.PastDue;
+                        reminderViewModel.Metric = ReminderMetric.Date;
+                    }
+                    else if (reminder.Mileage < currentMileage)
+                    {
+                        reminderViewModel.Urgency = ReminderUrgency.PastDue;
+                        reminderViewModel.Metric = ReminderMetric.Odometer;
+                    }
+                    else if (reminder.Date < dateCompare.AddDays(7))
+                    {
+                        //if less than a week from today or less than 50 miles from current mileage then very urgent.
+                        reminderViewModel.Urgency = ReminderUrgency.VeryUrgent;
+                        //have to specify by which metric this reminder is urgent.
+                        reminderViewModel.Metric = ReminderMetric.Date;
+                    }
+                    else if (reminder.Mileage < currentMileage + 50)
+                    {
+                        reminderViewModel.Urgency = ReminderUrgency.VeryUrgent;
+                        reminderViewModel.Metric = ReminderMetric.Odometer;
+                    }
+                    else if (reminder.Date < dateCompare.AddDays(30))
+                    {
+                        reminderViewModel.Urgency = ReminderUrgency.Urgent;
+                        reminderViewModel.Metric = ReminderMetric.Date;
+                    }
+                    else if (reminder.Mileage < currentMileage + 100)
+                    {
+                        reminderViewModel.Urgency = ReminderUrgency.Urgent;
+                        reminderViewModel.Metric = ReminderMetric.Odometer;
+                    }
+                }
+                else if (reminder.Metric == ReminderMetric.Date)
+                {
+                    if (reminder.Date < dateCompare)
+                    {
+                        reminderViewModel.Urgency = ReminderUrgency.PastDue;
+                    }
+                    else if (reminder.Date < dateCompare.AddDays(7))
+                    {
+                        reminderViewModel.Urgency = ReminderUrgency.VeryUrgent;
+                    }
+                    else if (reminder.Date < dateCompare.AddDays(30))
+                    {
+                        reminderViewModel.Urgency = ReminderUrgency.Urgent;
+                    }
+                }
+                else if (reminder.Metric == ReminderMetric.Odometer)
+                {
+                    if (reminder.Mileage < currentMileage)
+                    {
+                        reminderViewModel.Urgency = ReminderUrgency.PastDue;
+                        reminderViewModel.Metric = ReminderMetric.Odometer;
+                    }
+                    else if (reminder.Mileage < currentMileage + 50)
+                    {
+                        reminderViewModel.Urgency = ReminderUrgency.VeryUrgent;
+                    }
+                    else if (reminder.Mileage < currentMileage + 100)
+                    {
+                        reminderViewModel.Urgency = ReminderUrgency.Urgent;
+                    }
+                }
+                reminderViewModels.Add(reminderViewModel);
+            }
+            return reminderViewModels;
+        }
+    }
+}

Helper/ReportHelper.cs

@@ -0,0 +1,82 @@
+using CarCareTracker.Models;
+using System.Globalization;
+
+namespace CarCareTracker.Helper
+{
+    public interface IReportHelper
+    {
+        IEnumerable<CostForVehicleByMonth> GetServiceRecordSum(List<ServiceRecord> serviceRecords, int year = 0);
+        IEnumerable<CostForVehicleByMonth> GetRepairRecordSum(List<CollisionRecord> repairRecords, int year = 0);
+        IEnumerable<CostForVehicleByMonth> GetUpgradeRecordSum(List<UpgradeRecord> upgradeRecords, int year = 0);
+        IEnumerable<CostForVehicleByMonth> GetGasRecordSum(List<GasRecord> gasRecords, int year = 0);
+        IEnumerable<CostForVehicleByMonth> GetTaxRecordSum(List<TaxRecord> taxRecords, int year = 0);
+    }
+    public class ReportHelper: IReportHelper
+    {
+        public IEnumerable<CostForVehicleByMonth> GetServiceRecordSum(List<ServiceRecord> serviceRecords, int year = 0)
+        {
+            if (year != default)
+            {
+                serviceRecords.RemoveAll(x => x.Date.Year != year);
+            }
+            return serviceRecords.GroupBy(x => x.Date.Month).OrderBy(x => x.Key).Select(x => new CostForVehicleByMonth
+            {
+                MonthId = x.Key,
+                MonthName = CultureInfo.CurrentCulture.DateTimeFormat.GetMonthName(x.Key),
+                Cost = x.Sum(y => y.Cost)
+            });
+        }
+        public IEnumerable<CostForVehicleByMonth> GetRepairRecordSum(List<CollisionRecord> repairRecords, int year = 0)
+        {
+            if (year != default)
+            {
+                repairRecords.RemoveAll(x => x.Date.Year != year);
+            }
+            return repairRecords.GroupBy(x => x.Date.Month).OrderBy(x => x.Key).Select(x => new CostForVehicleByMonth
+            {
+                MonthId = x.Key,
+                MonthName = CultureInfo.CurrentCulture.DateTimeFormat.GetMonthName(x.Key),
+                Cost = x.Sum(y => y.Cost)
+            });
+        }
+        public IEnumerable<CostForVehicleByMonth> GetUpgradeRecordSum(List<UpgradeRecord> upgradeRecords, int year = 0)
+        {
+            if (year != default)
+            {
+                upgradeRecords.RemoveAll(x => x.Date.Year != year);
+            }
+            return upgradeRecords.GroupBy(x => x.Date.Month).OrderBy(x => x.Key).Select(x => new CostForVehicleByMonth
+            {
+                MonthId = x.Key,
+                MonthName = CultureInfo.CurrentCulture.DateTimeFormat.GetMonthName(x.Key),
+                Cost = x.Sum(y => y.Cost)
+            });
+        }
+        public IEnumerable<CostForVehicleByMonth> GetGasRecordSum(List<GasRecord> gasRecords, int year = 0)
+        {
+            if (year != default)
+            {
+                gasRecords.RemoveAll(x => x.Date.Year != year);
+            }
+            return gasRecords.GroupBy(x => x.Date.Month).OrderBy(x => x.Key).Select(x => new CostForVehicleByMonth
+            {
+                MonthId = x.Key,
+                MonthName = CultureInfo.CurrentCulture.DateTimeFormat.GetMonthName(x.Key),
+                Cost = x.Sum(y => y.Cost)
+            });
+        }
+        public IEnumerable<CostForVehicleByMonth> GetTaxRecordSum(List<TaxRecord> taxRecords, int year = 0)
+        {
+            if (year != default)
+            {
+                taxRecords.RemoveAll(x => x.Date.Year != year);
+            }
+            return taxRecords.GroupBy(x => x.Date.Month).OrderBy(x => x.Key).Select(x => new CostForVehicleByMonth
+            {
+                MonthId = x.Key,
+                MonthName = CultureInfo.CurrentCulture.DateTimeFormat.GetMonthName(x.Key),
+                Cost = x.Sum(y => y.Cost)
+            });
+        }
+    }
+}

Helper/StaticHelper.cs

@@ -1,4 +1,6 @@
-namespace CarCareTracker.Helper
+using CarCareTracker.Models;
+
+namespace CarCareTracker.Helper
 {
     /// <summary>
     /// helper method for static vars
@@ -7,5 +9,59 @@
     {
         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 TruncateStrings(string input, int maxLength = 25)
+        {
+            if (string.IsNullOrWhiteSpace(input))
+            {
+                return string.Empty;
+            }
+            if (input.Length > maxLength)
+            {
+                return (input.Substring(0, maxLength) + "...");
+            }
+            else
+            {
+                return input;
+            }
+        }
+        public static string DefaultActiveTab(UserConfig userConfig, ImportMode tab)
+        {
+            var defaultTab = userConfig.DefaultTab;
+            var visibleTabs = userConfig.VisibleTabs;
+            if (visibleTabs.Contains(tab) && tab == defaultTab)
+            {
+                return "active";
+            }
+            else if (!visibleTabs.Contains(tab))
+            {
+                return "d-none";
+            }
+            return "";
+        }
+        public static string DefaultActiveTabContent(UserConfig userConfig, ImportMode tab)
+        {
+            var defaultTab = userConfig.DefaultTab;
+            if (tab == defaultTab)
+            {
+                return "show active";
+            }
+            return "";
+        }
+        public static string DefaultTabSelected(UserConfig userConfig, ImportMode tab)
+        {
+            var defaultTab = userConfig.DefaultTab;
+            var visibleTabs = userConfig.VisibleTabs;
+            if (!visibleTabs.Contains(tab))
+            {
+                return "disabled";
+            }
+            else if (tab == defaultTab)
+            {
+                return "selected";
+            }
+            return "";
+        }
     }
 }

LICENSE

@@ -1,3 +1,8 @@
+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

Logic/LoginLogic.cs

@@ -0,0 +1,354 @@
+using CarCareTracker.External.Interfaces;
+using CarCareTracker.Helper;
+using CarCareTracker.Models;
+using Microsoft.Extensions.Caching.Memory;
+using System.Net;
+using System.Net.Mail;
+using System.Security.Cryptography;
+using System.Text;
+using System.Text.Json;
+
+namespace CarCareTracker.Logic
+{
+    public interface ILoginLogic
+    {
+        bool MakeUserAdmin(int userId, bool isAdmin);
+        OperationResponse GenerateUserToken(string emailAddress, bool autoNotify);
+        bool DeleteUserToken(int tokenId);
+        bool DeleteUser(int userId);
+        OperationResponse RegisterNewUser(LoginModel credentials);
+        OperationResponse RequestResetPassword(LoginModel credentials);
+        OperationResponse ResetPasswordByUser(LoginModel credentials);
+        OperationResponse ResetUserPassword(LoginModel credentials);
+        UserData ValidateUserCredentials(LoginModel credentials);
+        bool CheckIfUserIsValid(int userId);
+        bool CreateRootUserCredentials(LoginModel credentials);
+        bool DeleteRootUserCredentials();
+        List<UserData> GetAllUsers();
+        List<Token> GetAllTokens();
+
+    }
+    public class LoginLogic : ILoginLogic
+    {
+        private readonly IUserRecordDataAccess _userData;
+        private readonly ITokenRecordDataAccess _tokenData;
+        private readonly IMailHelper _mailHelper;
+        private IMemoryCache _cache;
+        public LoginLogic(IUserRecordDataAccess userData, 
+            ITokenRecordDataAccess tokenData, 
+            IMailHelper mailHelper,
+            IMemoryCache memoryCache)
+        {
+            _userData = userData;
+            _tokenData = tokenData;
+            _mailHelper = mailHelper;
+            _cache = memoryCache;
+        }
+        public bool CheckIfUserIsValid(int userId)
+        {
+            if (userId == -1)
+            {
+                return true;
+            }
+            var result = _userData.GetUserRecordById(userId);
+            if (result == null)
+            {
+                return false;
+            } else
+            {
+                return result.Id != 0;
+            }
+        }
+        //handles user registration
+        public OperationResponse RegisterNewUser(LoginModel credentials)
+        {
+            //validate their token.
+            var existingToken = _tokenData.GetTokenRecordByBody(credentials.Token);
+            if (existingToken.Id == default || existingToken.EmailAddress != credentials.EmailAddress)
+            {
+                return new OperationResponse { Success = false, Message = "Invalid Token" };
+            }
+            //token is valid, check if username and password is acceptable and that username is unique.
+            if (string.IsNullOrWhiteSpace(credentials.EmailAddress) || string.IsNullOrWhiteSpace(credentials.UserName) || string.IsNullOrWhiteSpace(credentials.Password))
+            {
+                return new OperationResponse { Success = false, Message = "Neither username nor password can be blank" };
+            }
+            var existingUser = _userData.GetUserRecordByUserName(credentials.UserName);
+            if (existingUser.Id != default)
+            {
+                return new OperationResponse { Success = false, Message = "Username already taken" };
+            }
+            var existingUserWithEmail = _userData.GetUserRecordByEmailAddress(credentials.EmailAddress);
+            if (existingUserWithEmail.Id != default)
+            {
+                return new OperationResponse { Success = false, Message = "A user with that email already exists" };
+            }
+            //username is unique then we delete the token and create the user.
+            _tokenData.DeleteToken(existingToken.Id);
+            var newUser = new UserData()
+            {
+                UserName = credentials.UserName,
+                Password = GetHash(credentials.Password),
+                EmailAddress = credentials.EmailAddress
+            };
+            var result = _userData.SaveUserRecord(newUser);
+            if (result)
+            {
+                return new OperationResponse { Success = true, Message = "You will be redirected to the login page briefly." };
+            }
+            else
+            {
+                return new OperationResponse { Success = false, Message = "Something went wrong, please try again later." };
+            }
+        }
+        /// <summary>
+        /// Generates a token and notifies user via email so they can reset their password.
+        /// </summary>
+        /// <param name="credentials"></param>
+        /// <returns></returns>
+        public OperationResponse RequestResetPassword(LoginModel credentials)
+        {
+            var existingUser = _userData.GetUserRecordByUserName(credentials.UserName);
+            if (existingUser.Id != default)
+            {
+                //user exists, generate a token and send email.
+                //check to see if there is an existing token sent to the user.
+                var existingToken = _tokenData.GetTokenRecordByEmailAddress(existingUser.EmailAddress);
+                if (existingToken.Id == default)
+                {
+                    var token = new Token()
+                    {
+                        Body = NewToken(),
+                        EmailAddress = existingUser.EmailAddress
+                    };
+                    var result = _tokenData.CreateNewToken(token);
+                    if (result)
+                    {
+                        result = _mailHelper.NotifyUserForPasswordReset(existingUser.EmailAddress, token.Body).Success;
+                    }
+                }
+            }
+            //for security purposes we want to always return true for this method.
+            //otherwise someone can spam the reset password method to sniff out users.
+            return new OperationResponse { Success = true, Message = "If your user exists in the system you should receive an email shortly with instructions on how to proceed." };
+        }
+        public OperationResponse ResetPasswordByUser(LoginModel credentials)
+        {
+            var existingToken = _tokenData.GetTokenRecordByBody(credentials.Token);
+            if (existingToken.Id == default || existingToken.EmailAddress != credentials.EmailAddress)
+            {
+                return new OperationResponse { Success = false, Message = "Invalid Token" };
+            }
+            if (string.IsNullOrWhiteSpace(credentials.Password))
+            {
+                return new OperationResponse { Success = false, Message = "New Password cannot be blank" };
+            }
+            //if token is valid.
+            var existingUser = _userData.GetUserRecordByEmailAddress(credentials.EmailAddress);
+            if (existingUser.Id == default)
+            {
+                return new OperationResponse { Success = false, Message = "Unable to locate user" };
+            }
+            existingUser.Password = GetHash(credentials.Password);
+            var result = _userData.SaveUserRecord(existingUser);
+            //delete token
+            _tokenData.DeleteToken(existingToken.Id);
+            if (result)
+            {
+                return new OperationResponse { Success = true, Message = "Password resetted, you will be redirected to login page shortly." };
+            } else
+            {
+                return new OperationResponse { Success = false, Message = StaticHelper.GenericErrorMessage };
+            }
+        }
+        /// <summary>
+        /// Returns an empty user if can't auth against neither root nor db user.
+        /// </summary>
+        /// <param name="credentials">credentials from login page</param>
+        /// <returns></returns>
+        public UserData ValidateUserCredentials(LoginModel credentials)
+        {
+            if (UserIsRoot(credentials))
+            {
+                return new UserData()
+                {
+                    Id = -1,
+                    UserName = credentials.UserName,
+                    IsAdmin = true,
+                    IsRootUser = true
+                };
+            }
+            else
+            {
+                //authenticate via DB.
+                var result = _userData.GetUserRecordByUserName(credentials.UserName);
+                if (GetHash(credentials.Password) == result.Password)
+                {
+                    result.Password = string.Empty;
+                    return result;
+                }
+                else
+                {
+                    return new UserData();
+                }
+            }
+        }
+        #region "Admin Functions"
+        public bool MakeUserAdmin(int userId, bool isAdmin)
+        {
+            var user = _userData.GetUserRecordById(userId);
+            if (user == default)
+            {
+                return false;
+            }
+            user.IsAdmin = isAdmin;
+            var result = _userData.SaveUserRecord(user);
+            return result;
+        }
+        public List<UserData> GetAllUsers()
+        {
+            var result = _userData.GetUsers();
+            return result;
+        }
+        public List<Token> GetAllTokens()
+        {
+            var result = _tokenData.GetTokens();
+            return result;
+        }
+        public OperationResponse GenerateUserToken(string emailAddress, bool autoNotify)
+        {
+            //check if email address already has a token attached to it.
+            var existingToken = _tokenData.GetTokenRecordByEmailAddress(emailAddress);
+            if (existingToken.Id != default)
+            {
+                return new OperationResponse { Success = false, Message = "There is an existing token tied to this email address" };
+            }
+            var token = new Token()
+            {
+                Body = NewToken(),
+                EmailAddress = emailAddress
+            };
+            var result = _tokenData.CreateNewToken(token);
+            if (result && autoNotify)
+            {
+                result = _mailHelper.NotifyUserForRegistration(emailAddress, token.Body).Success;
+                if (!result)
+                {
+                    return new OperationResponse { Success = false, Message = "Token Generated, but Email failed to send, please check your SMTP settings." };
+                }
+            }
+            if (result)
+            {
+                return new OperationResponse { Success = true, Message = "Token Generated!" };
+            }
+            else
+            {
+                return new OperationResponse { Success = false, Message = StaticHelper.GenericErrorMessage };
+            }
+        }
+        public bool DeleteUserToken(int tokenId)
+        {
+            var result = _tokenData.DeleteToken(tokenId);
+            return result;
+        }
+        public bool DeleteUser(int userId)
+        {
+            var result = _userData.DeleteUserRecord(userId);
+            return result;
+        }
+        public OperationResponse ResetUserPassword(LoginModel credentials)
+        {
+            //user might have forgotten their password.
+            var existingUser = _userData.GetUserRecordByUserName(credentials.UserName);
+            if (existingUser.Id == default)
+            {
+                return new OperationResponse { Success = false, Message = "Unable to find user" };
+            }
+            var newPassword = Guid.NewGuid().ToString().Substring(0, 8);
+            existingUser.Password = GetHash(newPassword);
+            var result = _userData.SaveUserRecord(existingUser);
+            if (result)
+            {
+                return new OperationResponse { Success = true, Message = newPassword };
+            }
+            else
+            {
+                return new OperationResponse { Success = false, Message = "Something went wrong, please try again later." };
+            }
+        }
+        #endregion
+        #region "Root User"
+        public bool CreateRootUserCredentials(LoginModel credentials)
+        {
+            var configFileContents = File.ReadAllText(StaticHelper.UserConfigPath);
+            var existingUserConfig = JsonSerializer.Deserialize<UserConfig>(configFileContents);
+            if (existingUserConfig is not null)
+            {
+                //create hashes of the login credentials.
+                var hashedUserName = GetHash(credentials.UserName);
+                var hashedPassword = GetHash(credentials.Password);
+                //copy over settings that are off limits on the settings page.
+                existingUserConfig.EnableAuth = true;
+                existingUserConfig.UserNameHash = hashedUserName;
+                existingUserConfig.UserPasswordHash = hashedPassword;
+            }
+            File.WriteAllText(StaticHelper.UserConfigPath, JsonSerializer.Serialize(existingUserConfig));
+            _cache.Remove("userConfig_-1");
+            return true;
+        }
+        public bool DeleteRootUserCredentials()
+        {
+            var configFileContents = File.ReadAllText(StaticHelper.UserConfigPath);
+            var existingUserConfig = JsonSerializer.Deserialize<UserConfig>(configFileContents);
+            if (existingUserConfig is not null)
+            {
+                //copy over settings that are off limits on the settings page.
+                existingUserConfig.EnableAuth = false;
+                existingUserConfig.UserNameHash = string.Empty;
+                existingUserConfig.UserPasswordHash = string.Empty;
+            }
+            //clear out the cached config for the root user.
+            _cache.Remove("userConfig_-1");
+            File.WriteAllText(StaticHelper.UserConfigPath, JsonSerializer.Serialize(existingUserConfig));
+            return true;
+        }
+        private bool UserIsRoot(LoginModel credentials)
+        {
+            var configFileContents = File.ReadAllText(StaticHelper.UserConfigPath);
+            var existingUserConfig = JsonSerializer.Deserialize<UserConfig>(configFileContents);
+            if (existingUserConfig is not null)
+            {
+                //create hashes of the login credentials.
+                var hashedUserName = GetHash(credentials.UserName);
+                var hashedPassword = GetHash(credentials.Password);
+                //compare against stored hash.
+                if (hashedUserName == existingUserConfig.UserNameHash &&
+                    hashedPassword == existingUserConfig.UserPasswordHash)
+                {
+                    return true;
+                }
+            }
+            return false;
+        }
+        #endregion
+        private static string GetHash(string value)
+        {
+            StringBuilder Sb = new StringBuilder();
+
+            using (var hash = SHA256.Create())
+            {
+                Encoding enc = Encoding.UTF8;
+                byte[] result = hash.ComputeHash(enc.GetBytes(value));
+
+                foreach (byte b in result)
+                    Sb.Append(b.ToString("x2"));
+            }
+
+            return Sb.ToString();
+        }
+        private string NewToken()
+        {
+            return Guid.NewGuid().ToString().Substring(0, 8);
+        }
+    }
+}

Logic/UserLogic.cs

@@ -0,0 +1,118 @@
+using CarCareTracker.External.Interfaces;
+using CarCareTracker.Helper;
+using CarCareTracker.Models;
+using Microsoft.AspNetCore.Mvc.Formatters;
+
+namespace CarCareTracker.Logic
+{
+    public interface IUserLogic
+    {
+        List<UserCollaborator> GetCollaboratorsForVehicle(int vehicleId);
+        bool AddUserAccessToVehicle(int userId, int vehicleId);
+        bool DeleteCollaboratorFromVehicle(int userId, int vehicleId);
+        OperationResponse AddCollaboratorToVehicle(int vehicleId, string username);
+        List<Vehicle> FilterUserVehicles(List<Vehicle> results, int userId);
+        bool UserCanEditVehicle(int userId, int vehicleId);
+        bool DeleteAllAccessToVehicle(int vehicleId);
+        bool DeleteAllAccessToUser(int userId);
+    }
+    public class UserLogic: IUserLogic
+    {
+        private readonly IUserAccessDataAccess _userAccess;
+        private readonly IUserRecordDataAccess _userData;
+        public UserLogic(IUserAccessDataAccess userAccess,
+            IUserRecordDataAccess userData) { 
+            _userAccess = userAccess;
+            _userData = userData;
+        }
+        public List<UserCollaborator> GetCollaboratorsForVehicle(int vehicleId)
+        {
+            var result = _userAccess.GetUserAccessByVehicleId(vehicleId);
+            var convertedResult = new List<UserCollaborator>();
+            //convert useraccess to usercollaborator
+            foreach(UserAccess userAccess in result)
+            {
+                var userCollaborator = new UserCollaborator
+                {
+                    UserName = _userData.GetUserRecordById(userAccess.Id.UserId).UserName,
+                    UserVehicle = userAccess.Id
+                };
+                convertedResult.Add(userCollaborator);
+            }
+            return convertedResult;
+        }
+        public OperationResponse AddCollaboratorToVehicle(int vehicleId, string username)
+        {
+            //try to find existing user.
+            var existingUser = _userData.GetUserRecordByUserName(username);
+            if (existingUser.Id != default)
+            {
+                //user exists.
+                var result = AddUserAccessToVehicle(existingUser.Id, vehicleId);
+                if (result)
+                {
+                    return new OperationResponse { Success = true, Message = "Collaborator Added" };
+                }
+                return new OperationResponse { Success = false, Message = StaticHelper.GenericErrorMessage };
+            }
+            return new OperationResponse { Success = false, Message = $"Unable to find user {username} in the system" };
+        }
+        public bool DeleteCollaboratorFromVehicle(int userId, int vehicleId)
+        {
+            var result = _userAccess.DeleteUserAccess(userId, vehicleId);
+            return result;
+        }
+        public bool AddUserAccessToVehicle(int userId, int vehicleId)
+        {
+            if (userId == -1)
+            {
+                return true;
+            }
+            var userVehicle = new UserVehicle { UserId = userId, VehicleId = vehicleId };
+            var userAccess = new UserAccess { Id = userVehicle };
+            var result = _userAccess.SaveUserAccess(userAccess);
+            return result;
+        }
+        public List<Vehicle> FilterUserVehicles(List<Vehicle> results, int userId)
+        {
+            //user is root user.
+            if (userId == -1)
+            {
+                return results;
+            }
+            var accessibleVehicles = _userAccess.GetUserAccessByUserId(userId);
+            if (accessibleVehicles.Any())
+            {
+                var vehicleIds = accessibleVehicles.Select(x => x.Id.VehicleId);
+                return results.Where(x => vehicleIds.Contains(x.Id)).ToList();
+            }
+            else
+            {
+                return new List<Vehicle>();
+            }
+        }
+        public bool UserCanEditVehicle(int userId, int vehicleId)
+        {
+            if (userId == -1)
+            {
+                return true;
+            }
+            var userAccess = _userAccess.GetUserAccessByVehicleAndUserId(userId, vehicleId);
+            if (userAccess != null)
+            {
+                return true;
+            }
+            return false;
+        }
+        public bool DeleteAllAccessToVehicle(int vehicleId)
+        {
+            var result = _userAccess.DeleteAllAccessRecordsByVehicleId(vehicleId);
+            return result;
+        }
+        public bool DeleteAllAccessToUser(int userId)
+        {
+            var result = _userAccess.DeleteAllAccessRecordsByUserId(userId);
+            return result;
+        }
+    }
+}

MapProfile/ImportMappers.cs

@@ -3,19 +3,23 @@ using CsvHelper.Configuration;
 
 namespace CarCareTracker.MapProfile
 {
-    public class FuellyMapper: ClassMap<ImportModel>
+    public class ImportMapper: ClassMap<ImportModel>
     {
-        public FuellyMapper()
+        public ImportMapper()
         {
             Map(m => m.Date).Name(["date", "fuelup_date"]);
             Map(m => m.Odometer).Name(["odometer"]);
-            Map(m => m.FuelConsumed).Name(["gallons", "liters", "litres", "consumption", "fuelconsumed"]);
+            Map(m => m.FuelConsumed).Name(["gallons", "liters", "litres", "consumption", "quantity", "fuelconsumed"]);
             Map(m => m.Cost).Name(["cost", "total cost", "totalcost", "total price"]);
             Map(m => m.Notes).Name("notes", "note");
             Map(m => m.Price).Name(["price"]);
             Map(m => m.PartialFuelUp).Name(["partial_fuelup"]);
             Map(m => m.IsFillToFull).Name(["isfilltofull", "filled up"]);
             Map(m => m.Description).Name(["description"]);
+            Map(m => m.MissedFuelUp).Name(["missed_fuelup", "missedfuelup"]);
+            Map(m => m.PartSupplier).Name(["partsupplier"]);
+            Map(m => m.PartQuantity).Name(["partquantity"]);
+            Map(m => m.PartNumber).Name(["partnumber"]);
         }
     }
 }

Middleware/Authen.cs

@@ -1,4 +1,5 @@
-using CarCareTracker.Models;
+using CarCareTracker.Logic;
+using CarCareTracker.Models;
 using Microsoft.AspNetCore.Authentication;
 using Microsoft.AspNetCore.Components.Web;
 using Microsoft.AspNetCore.DataProtection;
@@ -14,17 +15,20 @@ namespace CarCareTracker.Middleware
     {
         private IHttpContextAccessor _httpContext;
         private IDataProtector _dataProtector;
+        private ILoginLogic _loginLogic;
         private bool enableAuth;
         public Authen(
             IOptionsMonitor<AuthenticationSchemeOptions> options,
             UrlEncoder encoder,
             ILoggerFactory logger,
             IConfiguration configuration,
+            ILoginLogic loginLogic,
             IDataProtectionProvider securityProvider,
             IHttpContextAccessor httpContext) : base(options, logger, encoder)
         {
             _httpContext = httpContext;
             _dataProtector = securityProvider.CreateProtector("login");
+            _loginLogic = loginLogic;
             enableAuth = bool.Parse(configuration["EnableAuth"]);
         }
         protected override async Task<AuthenticateResult> HandleAuthenticateAsync()
@@ -35,7 +39,9 @@ namespace CarCareTracker.Middleware
                 var appIdentity = new ClaimsIdentity("Custom");
                 var userIdentity = new List<Claim>
                 {
-                    new(ClaimTypes.Name, "admin")
+                    new(ClaimTypes.Name, "admin"),
+                    new(ClaimTypes.NameIdentifier, "-1"),
+                    new(ClaimTypes.Role, nameof(UserData.IsRootUser))
                 };
                 appIdentity.AddClaims(userIdentity);
                 AuthenticationTicket ticket = new AuthenticationTicket(new ClaimsPrincipal(appIdentity), this.Scheme.Name);
@@ -45,45 +51,112 @@ namespace CarCareTracker.Middleware
             {
                 //auth is enabled by user, we will have to authenticate the user via a ticket retrieved from the auth cookie.
                 var access_token = _httpContext.HttpContext.Request.Cookies["ACCESS_TOKEN"];
-                if (string.IsNullOrWhiteSpace(access_token))
+                //auth using Basic Auth for API.
+                var request_header = _httpContext.HttpContext.Request.Headers["Authorization"];
+                if (string.IsNullOrWhiteSpace(access_token) && string.IsNullOrWhiteSpace(request_header))
                 {
                     return AuthenticateResult.Fail("Cookie is invalid or does not exist.");
                 }
-                else
+                else if (!string.IsNullOrWhiteSpace(request_header))
                 {
-                    //decrypt the access token.
-                    var decryptedCookie = _dataProtector.Unprotect(access_token);
-                    AuthCookie authCookie = JsonSerializer.Deserialize<AuthCookie>(decryptedCookie);
-                    if (authCookie != null)
+                    var cleanedHeader = request_header.ToString().Replace("Basic ", "").Trim();
+                    byte[] data = Convert.FromBase64String(cleanedHeader);
+                    string decodedString = System.Text.Encoding.UTF8.GetString(data);
+                    var splitString = decodedString.Split(":");
+                    if (splitString.Count() != 2)
                     {
-                        //validate auth cookie
-                        if (authCookie.ExpiresOn < DateTime.Now)
-                        {
-                            //if cookie is expired
-                            return AuthenticateResult.Fail("Expired credentials");
-                        }
-                        else if (authCookie.Id == default || string.IsNullOrWhiteSpace(authCookie.UserName))
-                        {
-                            return AuthenticateResult.Fail("Corrupted credentials");
-                        }
-                        else
+                        return AuthenticateResult.Fail("Invalid credentials");
+                    }
+                    else
+                    {
+                        var userData = _loginLogic.ValidateUserCredentials(new LoginModel { UserName = splitString[0], Password = splitString[1] });
+                        if (userData.Id != default)
                         {
                             var appIdentity = new ClaimsIdentity("Custom");
                             var userIdentity = new List<Claim>
                             {
-                                new(ClaimTypes.Name, authCookie.UserName)
+                                new(ClaimTypes.Name, splitString[0]),
+                                new(ClaimTypes.NameIdentifier, userData.Id.ToString())
                             };
+                            if (userData.IsAdmin)
+                            {
+                                userIdentity.Add(new(ClaimTypes.Role, nameof(UserData.IsAdmin)));
+                            }
+                            if (userData.IsRootUser)
+                            {
+                                userIdentity.Add(new(ClaimTypes.Role, nameof(UserData.IsRootUser)));
+                            }
                             appIdentity.AddClaims(userIdentity);
                             AuthenticationTicket ticket = new AuthenticationTicket(new ClaimsPrincipal(appIdentity), this.Scheme.Name);
                             return AuthenticateResult.Success(ticket);
                         }
                     }
                 }
+                else if (!string.IsNullOrWhiteSpace(access_token))
+                {
+                    try
+                    {
+                        //decrypt the access token.
+                        var decryptedCookie = _dataProtector.Unprotect(access_token);
+                        AuthCookie authCookie = JsonSerializer.Deserialize<AuthCookie>(decryptedCookie);
+                        if (authCookie != null)
+                        {
+                            //validate auth cookie
+                            if (authCookie.ExpiresOn < DateTime.Now)
+                            {
+                                //if cookie is expired
+                                return AuthenticateResult.Fail("Expired credentials");
+                            }
+                            else if (authCookie.UserData is null || authCookie.UserData.Id == default || string.IsNullOrWhiteSpace(authCookie.UserData.UserName))
+                            {
+                                return AuthenticateResult.Fail("Corrupted credentials");
+                            }
+                            else
+                            {
+                                if (!_loginLogic.CheckIfUserIsValid(authCookie.UserData.Id))
+                                {
+                                    return AuthenticateResult.Fail("Cookie points to non-existant user.");
+                                }
+                                //validate if user is still valid
+                                var appIdentity = new ClaimsIdentity("Custom");
+                                var userIdentity = new List<Claim>
+                                {
+                                    new(ClaimTypes.Name, authCookie.UserData.UserName),
+                                    new(ClaimTypes.NameIdentifier, authCookie.UserData.Id.ToString()),
+                                    new(ClaimTypes.Role, "CookieAuth")
+                                };
+                                if (authCookie.UserData.IsAdmin)
+                                {
+                                    userIdentity.Add(new(ClaimTypes.Role, nameof(UserData.IsAdmin)));
+                                }
+                                if (authCookie.UserData.IsRootUser)
+                                {
+                                    userIdentity.Add(new(ClaimTypes.Role, nameof(UserData.IsRootUser)));
+                                }
+                                appIdentity.AddClaims(userIdentity);
+                                AuthenticationTicket ticket = new AuthenticationTicket(new ClaimsPrincipal(appIdentity), this.Scheme.Name);
+                                return AuthenticateResult.Success(ticket);
+                            }
+                        }
+                    }
+                    catch (Exception ex)
+                    {
+                        return AuthenticateResult.Fail("Corrupted credentials");
+                    }
+                }
                 return AuthenticateResult.Fail("Invalid credentials");
             }
         }
         protected override Task HandleChallengeAsync(AuthenticationProperties properties)
         {
+            if (Request.RouteValues.TryGetValue("controller", out object value))
+            {
+                if (value.ToString().ToLower() == "api")
+                {
+                    Response.StatusCode = 401;
+                    return Task.CompletedTask;
+                }
+            }
             Response.Redirect("/Login/Index");
             return Task.CompletedTask;
         }

Models/Admin/AdminViewModel.cs

@@ -0,0 +1,8 @@
+namespace CarCareTracker.Models
+{
+    public class AdminViewModel
+    {
+        public List<UserData> Users { get; set; }
+        public List<Token> Tokens { get; set; }
+    }
+}

Models/Collision/CollisionRecordInput.cs

@@ -4,7 +4,7 @@
     {
         public int Id { get; set; }
         public int VehicleId { get; set; }
-        public string Date { get; set; }
+        public string Date { get; set; } = DateTime.Now.ToShortDateString();
         public int Mileage { get; set; }
         public string Description { get; set; }
         public decimal Cost { get; set; }

Models/Configuration/MailConfig.cs

@@ -0,0 +1,12 @@
+namespace CarCareTracker.Models
+{
+    public class MailConfig
+    {
+        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/GasRecord/GasRecord.cs

@@ -15,6 +15,7 @@
         public decimal Gallons { get; set; }
         public decimal Cost { get; set; }
         public bool IsFillToFull { get; set; } = true;
+        public bool MissedFuelUp { get; set; } = false;
         public List<UploadedFiles> Files { get; set; } = new List<UploadedFiles>();
     }
 }

Models/GasRecord/GasRecordInput.cs

@@ -4,7 +4,7 @@
     {
         public int Id { get; set; }
         public int VehicleId { get; set; }
-        public string Date { get; set; }
+        public string Date { get; set; } = DateTime.Now.ToShortDateString();
         /// <summary>
         /// American moment
         /// </summary>
@@ -15,6 +15,7 @@
         public decimal Gallons { get; set; }
         public decimal Cost { get; set; }
         public bool IsFillToFull { get; set; } = true;
+        public bool MissedFuelUp { get; set; } = false;
         public List<UploadedFiles> Files { get; set; } = new List<UploadedFiles>();
         public GasRecord ToGasRecord() { return new GasRecord { 
             Id = Id, 
@@ -24,7 +25,8 @@
             Mileage = Mileage, 
             VehicleId = VehicleId, 
             Files = Files,
-            IsFillToFull = IsFillToFull
+            IsFillToFull = IsFillToFull,
+            MissedFuelUp = MissedFuelUp
         }; }
     }
 }

Models/GasRecord/GasRecordViewModel.cs

@@ -4,6 +4,7 @@
     {
         public int Id { get; set; }
         public int VehicleId { get; set; }
+        public int MonthId { get; set; }
         public string Date { get; set; }
         /// <summary>
         /// American moment
@@ -17,5 +18,7 @@
         public int DeltaMileage { get; set; }
         public decimal MilesPerGallon { get; set; }
         public decimal CostPerGallon { get; set; }
+        public bool IsFillToFull { get; set; }
+        public bool MissedFuelUp { get; set; }
     }
 }

Models/ImportModel.cs

@@ -1,7 +1,7 @@
 namespace CarCareTracker.Models
 {
     /// <summary>
-    /// Import model used for importing Gas records.
+    /// Import model used for importing records via CSV.
     /// </summary>
     public class ImportModel
     {
@@ -14,5 +14,54 @@
         public string Price { get; set; }
         public string PartialFuelUp { get; set; }
         public string IsFillToFull { get; set; }
+        public string MissedFuelUp { get; set; }
+        public string PartNumber { get; set; }
+        public string PartSupplier { get; set; }
+        public string PartQuantity { get; set; }
+    }
+
+    public class SupplyRecordExportModel
+    {
+        public string Date { get; set; }
+        public string PartNumber { get; set; }
+        public string PartSupplier { get; set; }
+        public string PartQuantity { get; set; }
+        public string Description { get; set; }
+        public string Cost { get; set; }
+        public string Notes { get; set; }
+    }
+
+    public class ServiceRecordExportModel
+    {
+        public string Date { get; set; }
+        public string Odometer { get; set; }
+        public string Description { get; set; }
+        public string Notes { get; set; }
+        public string Cost { get; set; }
+    }
+    public class TaxRecordExportModel
+    {
+        public string Date { get; set; }
+        public string Odometer { get; set; }
+        public string Description { get; set; }
+        public string Notes { get; set; }
+        public string Cost { get; set; }
+    }
+    public class GasRecordExportModel
+    {
+        public string Date { get; set; }
+        public string Odometer { get; set; }
+        public string FuelConsumed { get; set; }
+        public string Cost { get; set; }
+        public string FuelEconomy { get; set; }
+        public string IsFillToFull { get; set; }
+        public string MissedFuelUp { get; set; }
+    }
+    public class ReminderExportModel
+    {
+        public string Description { get; set; }
+        public string Urgency { get; set; }
+        public string Metric { get; set; }
+        public string Notes { get; set; }
     }
 }

Models/Login/AuthCookie.cs

@@ -2,8 +2,7 @@
 {
     public class AuthCookie
     {
-        public int Id { get; set; }
-        public string UserName { get; set; }
+        public UserData UserData { get; set; }
         public DateTime ExpiresOn { get; set; }
     }
 }

Models/Login/LoginModel.cs

@@ -4,6 +4,8 @@
     {
         public string UserName { get; set; }
         public string Password { get; set; }
+        public string EmailAddress { get; set; }
+        public string Token { get; set; }
         public bool IsPersistent { get; set; } = false;
     }
 }

Models/Login/Token.cs

@@ -0,0 +1,9 @@
+namespace CarCareTracker.Models
+{
+    public class Token
+    {
+        public int Id { get; set; }
+        public string Body { get; set; }
+        public string EmailAddress { get; set; }
+    }
+}

Models/Note.cs

@@ -4,6 +4,7 @@
     {
         public int Id { get; set; }
         public int VehicleId { get; set; }
+        public string Description { get; set; }
         public string NoteText { get; set; }
     }
 }

Models/OperationResponse.cs

@@ -0,0 +1,8 @@
+namespace CarCareTracker.Models
+{
+    public class OperationResponse
+    {
+        public bool Success { get; set; }
+        public string Message { get; set; }
+    }
+}

Models/Report/CostForVehicleByMonth.cs

@@ -1,7 +1,8 @@
 namespace CarCareTracker.Models
 {
-    public class GasCostForVehicleByMonth
+    public class CostForVehicleByMonth
     {
+        public int MonthId { get; set; }
         public string MonthName { get; set; }
         public decimal Cost { get; set; }
     }

Models/Report/GenericReportModel.cs

@@ -0,0 +1,15 @@
+namespace CarCareTracker.Models
+{
+    /// <summary>
+    /// Generic Model used for vehicle history report.
+    /// </summary>
+    public class GenericReportModel
+    {
+        public ImportMode DataType { get; set; }
+        public DateTime Date { get; set; }
+        public int Odometer { get; set; }
+        public string Description { get; set; }
+        public string Notes { get; set; }
+        public decimal Cost { get; set; }
+    }
+}

Models/Report/ReminderMakeUpForVehicle.cs

@@ -0,0 +1,10 @@
+namespace CarCareTracker.Models
+{
+    public class ReminderMakeUpForVehicle
+    {
+        public int NotUrgentCount { get; set; }
+        public int UrgentCount { get; set; }
+        public int VeryUrgentCount { get; set; }
+        public int PastDueCount { get; set; }
+    }
+}

Models/Report/ReportViewModel.cs

@@ -0,0 +1,12 @@
+namespace CarCareTracker.Models
+{
+    public class ReportViewModel
+    {
+        public List<CostForVehicleByMonth> CostForVehicleByMonth { get; set; } = new List<CostForVehicleByMonth>();
+        public List<CostForVehicleByMonth> FuelMileageForVehicleByMonth { get; set; } = new List<CostForVehicleByMonth>();
+        public CostMakeUpForVehicle CostMakeUpForVehicle { get; set; } = new CostMakeUpForVehicle();
+        public ReminderMakeUpForVehicle ReminderMakeUpForVehicle { get; set; } = new ReminderMakeUpForVehicle();
+        public List<int> Years { get; set; } = new List<int>();
+        public List<UserCollaborator> Collaborators { get; set; } = new List<UserCollaborator>();
+    }
+}

Models/Report/VehicleHistoryViewModel.cs

@@ -0,0 +1,12 @@
+namespace CarCareTracker.Models
+{
+    public class VehicleHistoryViewModel
+    {
+        public Vehicle VehicleData { get; set; }
+        public List<GenericReportModel> VehicleHistory { get; set; }
+        public string Odometer { get; set; }
+        public decimal MPG { get; set; }
+        public decimal TotalCost { get; set; }
+        public decimal TotalGasCost { get; set; }
+    }
+}

Models/ServiceRecord/ServiceRecordInput.cs

@@ -4,7 +4,7 @@
     {
         public int Id { get; set; }
         public int VehicleId { get; set; }
-        public string Date { get; set; }
+        public string Date { get; set; } = DateTime.Now.ToShortDateString();
         public int Mileage { get; set; }
         public string Description { get; set; }
         public decimal Cost { get; set; }

Models/Supply/SupplyRecord.cs

@@ -0,0 +1,37 @@
+namespace CarCareTracker.Models
+{
+    public class SupplyRecord
+    {
+        public int Id { get; set; }
+        public int VehicleId { get; set; }
+        /// <summary>
+        /// When the part or supplies were purchased.
+        /// </summary>
+        public DateTime Date { get; set; }
+        /// <summary>
+        /// Part number can be alphanumeric.
+        /// </summary>
+        public string PartNumber { get; set; }
+        /// <summary>
+        /// Where the part/supplies were purchased from.
+        /// </summary>
+        public string PartSupplier { get; set; }
+        /// <summary>
+        /// Amount purchased, can be partial quantities such as fluids.
+        /// </summary>
+        public decimal Quantity { get; set; }
+        /// <summary>
+        /// Description of the part/supplies purchased.
+        /// </summary>
+        public string Description { get; set; }
+        /// <summary>
+        /// How much it costs
+        /// </summary>
+        public decimal Cost { get; set; }
+        /// <summary>
+        /// Additional notes.
+        /// </summary>
+        public string Notes { get; set; }
+        public List<UploadedFiles> Files { get; set; } = new List<UploadedFiles>();
+    }
+}

Models/Supply/SupplyRecordInput.cs

@@ -0,0 +1,27 @@
+namespace CarCareTracker.Models
+{
+    public class SupplyRecordInput
+    {
+        public int Id { get; set; }
+        public int VehicleId { get; set; }
+        public string Date { get; set; } = DateTime.Now.ToShortDateString();
+        public string PartNumber { get; set; }
+        public string PartSupplier { get; set; }
+        public decimal Quantity { get; set; }
+        public string Description { get; set; }
+        public decimal Cost { get; set; }
+        public string Notes { get; set; }
+        public List<UploadedFiles> Files { get; set; } = new List<UploadedFiles>();
+        public SupplyRecord ToSupplyRecord() { return new SupplyRecord { 
+            Id = Id, 
+            VehicleId = VehicleId, 
+            Date = DateTime.Parse(Date), 
+            Cost = Cost, 
+            PartNumber = PartNumber,
+            PartSupplier = PartSupplier,
+            Quantity = Quantity,
+            Description = Description, 
+            Notes = Notes, 
+            Files = Files }; }
+    }
+}

Models/TaxRecord/TaxRecordInput.cs

@@ -4,7 +4,7 @@
     {
         public int Id { get; set; }
         public int VehicleId { get; set; }
-        public string Date { get; set; }
+        public string Date { get; set; } = DateTime.Now.ToShortDateString();
         public string Description { get; set; }
         public decimal Cost { get; set; }
         public string Notes { get; set; }

Models/Upgrades/UpgradeReportInput.cs

@@ -4,7 +4,7 @@
     {
         public int Id { get; set; }
         public int VehicleId { get; set; }
-        public string Date { get; set; }
+        public string Date { get; set; } = DateTime.Now.ToShortDateString();
         public int Mileage { get; set; }
         public string Description { get; set; }
         public decimal Cost { get; set; }

Models/User/UserAccess.cs

@@ -0,0 +1,12 @@
+namespace CarCareTracker.Models
+{
+    public class UserVehicle
+    {
+        public int UserId { get; set; }
+        public int VehicleId { get; set; }
+    }
+    public class UserAccess
+    {
+        public UserVehicle Id { get; set; }
+    }
+}

Models/User/UserCollaborator.cs

@@ -0,0 +1,8 @@
+namespace CarCareTracker.Models
+{
+    public class UserCollaborator
+    {
+        public string UserName { get; set; }
+        public UserVehicle UserVehicle { get; set; }
+    }
+}

Models/User/UserConfigData.cs

@@ -0,0 +1,11 @@
+namespace CarCareTracker.Models
+{
+    public class UserConfigData
+    {
+        /// <summary>
+        /// User ID
+        /// </summary>
+        public int Id { get; set; }
+        public UserConfig UserConfig { get; set; }
+    }
+}

Models/User/UserData.cs

@@ -0,0 +1,12 @@
+namespace CarCareTracker.Models
+{
+    public class UserData
+    {
+        public int Id { get; set; }
+        public string UserName { get; set; }
+        public string EmailAddress { get; set; }
+        public string Password { get; set; }
+        public bool IsAdmin { get; set; }
+        public bool IsRootUser { get; set; } = false;
+    }
+}

Models/UserConfig.cs

@@ -9,7 +9,18 @@
         public bool EnableAuth { get; set; }
         public bool HideZero { get; set; }
         public bool UseUKMPG {get;set;}
+        public bool UseThreeDecimalGasCost { get; set; }
         public string UserNameHash { get; set; }
         public string UserPasswordHash { get; set;}
+        public List<ImportMode> VisibleTabs { get; set; } = new List<ImportMode>() { 
+            ImportMode.Dashboard,
+            ImportMode.ServiceRecord, 
+            ImportMode.RepairRecord, 
+            ImportMode.GasRecord, 
+            ImportMode.UpgradeRecord, 
+            ImportMode.TaxRecord, 
+            ImportMode.ReminderRecord, 
+            ImportMode.NoteRecord};
+        public ImportMode DefaultTab { get; set; } = ImportMode.Dashboard;
     }
 }

Program.cs

@@ -1,6 +1,7 @@
 using CarCareTracker.External.Implementations;
 using CarCareTracker.External.Interfaces;
 using CarCareTracker.Helper;
+using CarCareTracker.Logic;
 using CarCareTracker.Middleware;
 using Microsoft.AspNetCore.Authentication;
 using Microsoft.AspNetCore.Authorization;
@@ -17,7 +18,23 @@ builder.Services.AddSingleton<ICollisionRecordDataAccess, CollisionRecordDataAcc
 builder.Services.AddSingleton<ITaxRecordDataAccess, TaxRecordDataAccess>();
 builder.Services.AddSingleton<IReminderRecordDataAccess, ReminderRecordDataAccess>();
 builder.Services.AddSingleton<IUpgradeRecordDataAccess, UpgradeRecordDataAccess>();
+builder.Services.AddSingleton<IUserRecordDataAccess, UserRecordDataAccess>();
+builder.Services.AddSingleton<ITokenRecordDataAccess, TokenRecordDataAccess>();
+builder.Services.AddSingleton<IUserAccessDataAccess, UserAccessDataAccess>();
+builder.Services.AddSingleton<IUserConfigDataAccess, UserConfigDataAccess>();
+builder.Services.AddSingleton<ISupplyRecordDataAccess, SupplyRecordDataAccess>();
+
+//configure helpers
 builder.Services.AddSingleton<IFileHelper, FileHelper>();
+builder.Services.AddSingleton<IGasHelper, GasHelper>();
+builder.Services.AddSingleton<IReminderHelper, ReminderHelper>();
+builder.Services.AddSingleton<IReportHelper, ReportHelper>();
+builder.Services.AddSingleton<IMailHelper, MailHelper>();
+builder.Services.AddSingleton<IConfigHelper, ConfigHelper>();
+
+//configure logic
+builder.Services.AddSingleton<ILoginLogic, LoginLogic>();
+builder.Services.AddSingleton<IUserLogic, UserLogic>();
 
 if (!Directory.Exists("data"))
 {

README.md

@@ -2,6 +2,8 @@
 
 A self-hosted, open-source vehicle service records and maintainence tracker.
 
+Support this project on Patreon: https://patreon.com/LubeLogger
+
 ## Why
 Because nobody should have to deal with a homemade spreadsheet or a shoebox full of receipts when it comes to vehicle maintainence.
 
@@ -16,14 +18,14 @@ Because nobody should have to deal with a homemade spreadsheet or a shoebox full
 ## Docker Setup (GHCR)
 1. Install Docker
 2. Run `docker pull ghcr.io/hargata/lubelogger:latest`
-3. CHECK culture in .env file, default is en_US, this will change the currency and date formats.
+3. CHECK culture in .env file, default is en_US, this will change the currency and date formats. You can also setup SMTP Config here.
 4. If not using traefik, use docker-compose-notraefik.yml
 5. Run `docker-compose up`
 
 ## Docker Setup (Manual Build)
 1. Install Docker
 2. Clone this repo
-3. CHECK culture in .env file, default is en_US
+3. CHECK culture in .env file, default is en_US, also setup SMTP for user management if you want that.
 4. Run `docker build -t lubelogger -f Dockerfile .`
 5. CHECK docker-compose.yml and make sure the mounting directories look correct.
 6. If not using traefik, use docker-compose-notraefik.yml

Views/API/Index.cshtml

@@ -0,0 +1,127 @@
+<div class="row">
+    <div class="d-flex justify-content-center">
+        <h6 class="display-6 mt-2">API</h6>
+    </div>
+</div>
+<div class="row">
+    <div class="d-flex justify-content-center">
+        <p class="lead">If authentication is enabled, use the credentials of the user for Basic Auth(RFC2617)</p>
+    </div>
+</div>
+<hr />
+<div class="row">
+    <div class="col-1">
+        <h6>Method</h6>
+    </div>
+    <div class="col-5">
+        <h6>Endpoint</h6>
+    </div>
+    <div class="col-3">
+        <h6>Description</h6>
+    </div>
+    <div class="col-3">
+        <h6>Parameters</h6>
+    </div>
+</div>
+<div class="row">
+    <div class="col-1">
+        GET
+    </div>
+    <div class="col-5">
+        <code>/api/vehicles</code>
+    </div>
+    <div class="col-3">
+        Returns a list of vehicles
+    </div>
+    <div class="col-3">
+        No Params
+    </div>
+</div>
+<div class="row">
+    <div class="col-1">
+        GET
+    </div>
+    <div class="col-5">
+        <code>/api/vehicle/servicerecords</code>
+    </div>
+    <div class="col-3">
+        Returns a list of service 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">
+        <code>/api/vehicle/repairrecords</code>
+    </div>
+    <div class="col-3">
+        Returns a list of repair 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">
+        <code>/api/vehicle/upgraderecords</code>
+    </div>
+    <div class="col-3">
+        Returns a list of upgrade 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">
+        <code>/api/vehicle/taxrecords</code>
+    </div>
+    <div class="col-3">
+        Returns a list of tax 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">
+        <code>/api/vehicle/gasrecords</code>
+    </div>
+    <div class="col-3">
+        Returns a list of gas records for the vehicle
+    </div>
+    <div class="col-3">
+        vehicleId - Id of Vehicle
+        <br />
+        useMPG(bool) - Use Imperial Units and Calculation
+        <br />
+        useUKMPG(bool) - Use UK Imperial Calculation
+    </div>
+</div>
+<div class="row">
+    <div class="col-1">
+        GET
+    </div>
+    <div class="col-5">
+        <code>/api/vehicle/reminders</code>
+    </div>
+    <div class="col-3">
+        Returns a list of reminders for the vehicle
+    </div>
+    <div class="col-3">
+        vehicleId - Id of Vehicle
+    </div>
+</div>

Views/Admin/Index.cshtml

@@ -0,0 +1,153 @@
+@{
+    ViewData["Title"] = "Admin";
+}
+@inject IConfiguration config;
+@{
+    bool emailServerIsSetup = true;
+    var mailConfig = config.GetSection("MailConfig").Get<MailConfig>();
+    if (mailConfig is null || string.IsNullOrWhiteSpace(mailConfig.EmailServer))
+    {
+        emailServerIsSetup = false;
+    }
+}
+@model AdminViewModel
+<div class="container">
+    <div class="row">
+        <div class="col-1">
+            <a href="/Home" class="btn btn-secondary btn-md mt-1 mb-1"><i class="bi bi-arrow-left-square"></i></a>
+        </div>
+        <div class="col-11">
+            <span class="display-6">Admin Panel</span>
+        </div>
+    </div>
+    <hr />
+    <div class="row">
+        <div class="col-md-5 col-12">
+            <span class="lead">Tokens</span>
+            <hr />
+            <div class="row">
+                <div class="col-6">
+                    <button onclick="generateNewToken()" class="btn btn-primary btn-md mt-1 mb-1"><i class="bi bi-pencil-square me-2"></i>Generate User Token</button>
+                </div>
+                <div class="col-6 d-flex align-items-center">
+                    <div class="form-check form-switch">
+                        <input class="form-check-input" type="checkbox" role="switch" id="enableAutoNotify" @(emailServerIsSetup ? "checked" : "disabled")>
+                        <label class="form-check-label" for="enableAutoNotify">Auto Notify(via Email)</label>
+                    </div>
+                </div>
+            </div>
+            <table class="table table-hover">
+                <thead class="sticky-top">
+                    <tr class="d-flex">
+                        <th scope="col" class="col-4">Token</th>
+                        <th scope="col" class="col-6">Issued To</th>
+                        <th scope="col" class="col-2">Delete</th>
+                    </tr>
+                </thead>
+                <tbody>
+                    @foreach (Token token in Model.Tokens)
+                    {
+                        <tr class="d-flex">
+                            <td class="col-4" style="cursor:pointer;" onclick="copyToClipboard(this)">@token.Body</td>
+                            <td class="col-6 text-truncate">@token.EmailAddress</td>
+                            <td class="col-2">
+                                <button type="button" class="btn btn-danger" onclick="deleteToken(@token.Id, this)"><i class="bi bi-trash"></i></button>
+                            </td>
+                        </tr>
+                    }
+                </tbody>
+            </table>
+        </div>
+        <div class="col-12 col-md-7">
+            <span class="lead">Users</span>
+            <hr />
+            <table class="table table-hover">
+                <thead class="sticky-top">
+                    <tr class="d-flex">
+                        <th scope="col" class="col-4">Username</th>
+                        <th scope="col" class="col-4">Email</th>
+                        <th scope="col" class="col-2">Is Admin</th>
+                        <th scope="col" class="col-2">Delete</th>
+                    </tr>
+                </thead>
+                <tbody>
+                    @foreach (UserData userData in Model.Users)
+                    {
+                        <tr class="d-flex" style="cursor:pointer;">
+                            <td class="col-4">@userData.UserName</td>
+                            <td class="col-4">@userData.EmailAddress</td>
+                            <td class="col-2"><input class="form-check-input" type="checkbox" value="" onchange="updateUserAdmin(@userData.Id, this)" @(userData.IsAdmin ? "checked" : "")/></td>
+                            <td class="col-2"><button type="button" class="btn btn-danger" onclick="deleteUser(@userData.Id, this)"><i class="bi bi-trash"></i></button></td>
+                        </tr>
+                    }
+                </tbody>
+            </table>
+        </div>
+    </div>
+</div>
+<script>
+    function updateUserAdmin(userId, sender){
+        var isChecked = $(sender).is(":checked");
+        $.post('/Admin/UpdateUserAdminStatus', { userId: userId, isAdmin: isChecked }, function (data) {
+            if (data){
+                reloadPage();
+            } else {
+                errorToast("An error has occurred, please try again later.");
+            }
+        });
+    }
+    function reloadPage() {
+        window.location.reload();
+    }
+    function deleteToken(tokenId) {
+        $.post(`/Admin/DeleteToken?tokenId=${tokenId}`, function (data) {
+            if (data) {
+                reloadPage();
+            } else {
+                errorToast("An error has occurred, please try again later.");
+            }
+        });
+    }
+    function deleteUser(userId) {
+        $.post(`/Admin/DeleteUser?userId=${userId}`, function (data) {
+            if (data) {
+                reloadPage();
+            } else {
+                errorToast("An error has occurred, please try again later.");
+            }
+        })
+    }
+    function copyToClipboard(e) {
+        var textToCopy = e.textContent;
+        navigator.clipboard.writeText(textToCopy);
+        successToast("Copied to Clipboard");
+    }
+    function generateNewToken() {
+        Swal.fire({
+            title: 'Generate Token',
+            html: `
+                            <input type="text" id="inputEmail" class="swal2-input" placeholder="Email Address">
+                            `,
+            confirmButtonText: 'Generate',
+            focusConfirm: false,
+            preConfirm: () => {
+                const emailAddress = $("#inputEmail").val();
+                if (!emailAddress) {
+                    Swal.showValidationMessage(`Please enter an email address`)
+                }
+                return { emailAddress }
+            },
+        }).then(function (result) {
+            if (result.isConfirmed) {
+                var autoNotify = $("#enableAutoNotify").is(":checked");
+                $.get('/Admin/GenerateNewToken', { emailAddress: result.value.emailAddress, autoNotify: autoNotify }, function (data) {
+                    if (data.success) {
+                        reloadPage();
+                    } else {
+                        errorToast(data.message)
+                    }
+                });
+            }
+        });
+    }
+</script>

Views/Home/Index.cshtml

@@ -1,6 +1,7 @@
-@inject IConfiguration Configuration
+@using CarCareTracker.Helper
+@inject IConfigHelper config
 @{
-    var enableAuth = bool.Parse(Configuration[nameof(UserConfig.EnableAuth)]);
+    var enableAuth = config.GetUserConfig(User).EnableAuth;
 }
 @model string
 @{
@@ -9,24 +10,60 @@
 @section Scripts {
     <script src="~/js/garage.js" asp-append-version="true"></script>
 }
+<div class="lubelogger-mobile-nav" onclick="hideMobileNav()">
+    <ul class="navbar-nav" id="homeTab" role="tablist">
+        <li class="nav-item" role="presentation">
+            <button class="nav-link active" id="garage-tab" data-bs-toggle="tab" data-bs-target="#garage-tab-pane" type="button" role="tab"><span class="ms-2 display-3"><i class="bi bi-car-front me-2"></i>Garage</span></button>
+        </li>
+        <li class="nav-item" role="presentation">
+            <button class="nav-link" id="settings-tab" data-bs-toggle="tab" data-bs-target="#settings-tab-pane" type="button" role="tab"><span class="ms-2 display-3"><i class="bi bi-gear me-2"></i>Settings</span></button>
+        </li>
+        @if (User.IsInRole("CookieAuth"))
+        {
+            @if (User.IsInRole(nameof(UserData.IsAdmin)))
+            {
+                <li class="nav-item" role="presentation">
+                    <a class="dropdown-item" href="/Admin"><span class="display-3 ms-2"><i class="bi bi-people me-2"></i>Admin Panel</span></a>
+                </li>
+            }
+            <li class="nav-item" role="presentation">
+                <button class="nav-link" onclick="performLogOut()"><span class="display-3 ms-2"><i class="bi bi-box-arrow-right me-2"></i>Logout</span></button>
+            </li>
+        }
+    </ul>
+</div>
 <div class="container">
     <div class="row mt-2">
-        <div class="d-flex justify-content-center">
-            <img src="/defaults/lubelogger_logo.png"/>
+        <div class="d-flex lubelogger-navbar">
+            <img src="/defaults/lubelogger_logo.png" />
+            <div class="lubelogger-navbar-button">
+                <button type="button" class="btn btn-dark" onclick="showMobileNav()"><i class="bi bi-list lubelogger-menu-icon"></i></button>
+            </div>
         </div>
     </div>
     <hr />
-    <ul class="nav nav-tabs" id="homeTab" role="tablist">
+    <ul class="nav nav-tabs lubelogger-tab" id="homeTab" role="tablist">
         <li class="nav-item" role="presentation">
             <button class="nav-link @(Model == "garage" ? "active" : "")" id="garage-tab" data-bs-toggle="tab" data-bs-target="#garage-tab-pane" type="button" role="tab"><i class="bi bi-car-front me-2"></i>Garage</button>
         </li>
         <li class="nav-item ms-auto" role="presentation">
             <button class="nav-link @(Model == "settings" ? "active" : "")" id="settings-tab" data-bs-toggle="tab" data-bs-target="#settings-tab-pane" type="button" role="tab"><i class="bi bi-gear me-2"></i>Settings</button>
         </li>
-        @if (enableAuth)
+        @if (User.IsInRole("CookieAuth"))
         {
-            <li class="nav-item">
-                <button class="nav-link" onclick="performLogOut()"><i class="bi bi-box-arrow-right me-2"></i>Logout</button>
+            <li class="nav-item dropdown" role="presentation">
+                <a class="nav-link dropdown-toggle" data-bs-toggle="dropdown" href="#" role="button" aria-expanded="false"><i class="bi bi-person me-2"></i>@User.Identity.Name</a>
+                <ul class="dropdown-menu">
+                    @if (User.IsInRole(nameof(UserData.IsAdmin)))
+                    {
+                        <li>
+                            <a class="dropdown-item" href="/Admin"><i class="bi bi-people me-2"></i>Admin Panel</a>
+                        </li>
+                    }
+                    <li>
+                        <button class="dropdown-item" onclick="performLogOut()"><i class="bi bi-box-arrow-right me-2"></i>Logout</button>
+                    </li>
+                </ul>
             </li>
         }
     </ul>
@@ -38,7 +75,6 @@
             </div>
         </div>
         <div class="tab-pane fade @(Model == "settings" ? "show active" : "")" id="settings-tab-pane" role="tabpanel" tabindex="0">
-
         </div>
     </div>
 </div>
@@ -46,11 +82,10 @@
 <div class="modal fade" id="addVehicleModal" tabindex="-1" role="dialog">
     <div class="modal-dialog" role="document">
         <div class="modal-content" id="addVehicleModalContent">
-           
         </div>
     </div>
 </div>
 <script>
     loadGarage();
-    loadSettings();
+    bindWindowResize();
 </script>

Views/Home/_Settings.cshtml

@@ -1,4 +1,5 @@
-@model UserConfig
+@using CarCareTracker.Helper
+@model UserConfig
 
 <div class="row">
     <div class="d-flex justify-content-center">
@@ -22,8 +23,6 @@
             <input class="form-check-input" onChange="updateSettings()" type="checkbox" role="switch" id="useUKMPG" checked="@Model.UseUKMPG">
             <label class="form-check-label" for="useUKMPG">Use UK MPG Calculation<br /><small class="text-body-secondary">Input Gas Consumption in Liters, it will be converted to UK Gals for MPG Calculation</small></label>
         </div>
-    </div>
-    <div class="col-12 col-md-6">
         <div class="form-check form-switch">
             <input class="form-check-input" onChange="updateSettings()" type="checkbox" role="switch" id="useDescending" checked="@Model.UseDescending">
             <label class="form-check-label" for="useDescending">Sort lists in Descending Order(Newest to Oldest)</label>
@@ -33,9 +32,98 @@
             <label class="form-check-label" for="hideZero">Replace @(0.ToString("C")) Costs with ---</label>
         </div>
         <div class="form-check form-switch">
-            <input class="form-check-input" onChange="enableAuthCheckChanged()" type="checkbox" role="switch" id="enableAuth" checked="@Model.EnableAuth">
-            <label class="form-check-label" for="enableAuth">Enable Authentication</label>
+            <input class="form-check-input" onChange="updateSettings()" type="checkbox" role="switch" id="useThreeDecimal" checked="@Model.UseThreeDecimalGasCost">
+            <label class="form-check-label" for="useThreeDecimal">Use Three Decimals For Fuel Cost</label>
         </div>
+        @if (User.IsInRole(nameof(UserData.IsRootUser)))
+        {
+            <div class="form-check form-switch">
+                <input class="form-check-input" onChange="enableAuthCheckChanged()" type="checkbox" role="switch" id="enableAuth" checked="@Model.EnableAuth">
+                <label class="form-check-label" for="enableAuth">Enable Authentication</label>
+            </div>
+        }
+    </div>
+    <div class="col-12 col-md-6">
+        <div class="row" id="visibleTabs">
+            <div class="col-12">
+                <span class="lead">Visible Tabs</span>
+            </div>
+            <div class="col-12 col-md-6">
+                <ul class="list-group">
+                    <li class="list-group-item">
+                        <input onChange="updateSettings()" class="form-check-input me-1" type="checkbox" value="ServiceRecord" id="serviceRecordTab" @(Model.VisibleTabs.Contains(ImportMode.ServiceRecord) ? "checked" : "")>
+                        <label class="form-check-label stretched-link" for="serviceRecordTab">Service Records</label>
+                    </li>
+                    <li class="list-group-item d-none">
+                        <input onChange="updateSettings()" disabled class="form-check-input me-1" type="checkbox" value="Dashboard" id="dashboardTab" @(Model.VisibleTabs.Contains(ImportMode.Dashboard) ? "checked" : "")>
+                        <label class="form-check-label stretched-link" for="dashboardTab">Dashboard</label>
+                    </li>
+                    <li class="list-group-item">
+                        <input onChange="updateSettings()" class="form-check-input me-1" type="checkbox" value="RepairRecord" id="repairRecordTab" @(Model.VisibleTabs.Contains(ImportMode.RepairRecord) ? "checked" : "")>
+                        <label class="form-check-label stretched-link" for="repairRecordTab">Repairs</label>
+                    </li>
+                    <li class="list-group-item">
+                        <input onChange="updateSettings()" class="form-check-input me-1" type="checkbox" value="UpgradeRecord" id="upgradeRecordTab" @(Model.VisibleTabs.Contains(ImportMode.UpgradeRecord) ? "checked" : "")>
+                        <label class="form-check-label stretched-link" for="upgradeRecordTab">Upgrades</label>
+                    </li>
+                    <li class="list-group-item">
+                        <input onChange="updateSettings()" class="form-check-input me-1" type="checkbox" value="GasRecord" id="gasRecordTab" @(Model.VisibleTabs.Contains(ImportMode.GasRecord) ? "checked" : "")>
+                        <label class="form-check-label stretched-link" for="gasRecordTab">Fuel</label>
+                    </li>
+                </ul>
+            </div>
+            <div class="col-12 col-md-6">
+                <ul class="list-group">
+                    <li class="list-group-item">
+                        <input onChange="updateSettings()" class="form-check-input me-1" type="checkbox" value="TaxRecord" id="taxRecordTab" @(Model.VisibleTabs.Contains(ImportMode.TaxRecord) ? "checked" : "")>
+                        <label class="form-check-label stretched-link" for="taxRecordTab">Taxes</label>
+                    </li>
+                    <li class="list-group-item">
+                        <input onChange="updateSettings()" class="form-check-input me-1" type="checkbox" value="NoteRecord" id="noteRecordTab" @(Model.VisibleTabs.Contains(ImportMode.NoteRecord) ? "checked" : "")>
+                        <label class="form-check-label stretched-link" for="noteRecordTab">Notes</label>
+                    </li>
+                    <li class="list-group-item">
+                        <input onChange="updateSettings()" class="form-check-input me-1" type="checkbox" value="ReminderRecord" id="reminderRecordTab" @(Model.VisibleTabs.Contains(ImportMode.ReminderRecord) ? "checked" : "")>
+                        <label class="form-check-label stretched-link" for="reminderRecordTab">Reminder</label>
+                    </li>
+                    <li class="list-group-item">
+                        <input onChange="updateSettings()" class="form-check-input me-1" type="checkbox" value="SupplyRecord" id="supplyRecordTab" @(Model.VisibleTabs.Contains(ImportMode.SupplyRecord) ? "checked" : "")>
+                        <label class="form-check-label stretched-link" for="supplyRecordTab">Supplies</label>
+                    </li>
+                </ul>
+            </div>
+        </div>
+       <div class="row">
+            <div class="col-12 col-md-6">
+                <span class="lead">Default Tab</span>
+                <select class="form-select" onchange="updateSettings()" id="defaultTab">
+                    <!option @(StaticHelper.DefaultTabSelected(Model, ImportMode.Dashboard)) value="Dashboard">Dashboard</!option>
+                    <!option @(StaticHelper.DefaultTabSelected(Model,ImportMode.ServiceRecord)) value="ServiceRecord">Service Record</!option>
+                    <!option @(StaticHelper.DefaultTabSelected(Model, ImportMode.RepairRecord)) value="RepairRecord">Repairs</!option>
+                    <!option @(StaticHelper.DefaultTabSelected(Model, ImportMode.UpgradeRecord)) value="UpgradeRecord">Upgrades</!option>
+                    <!option @(StaticHelper.DefaultTabSelected(Model, ImportMode.GasRecord)) value="GasRecord">Fuel</!option>
+                    <!option @(StaticHelper.DefaultTabSelected(Model, ImportMode.TaxRecord)) value="TaxRecord">Tax</!option>
+                    <!option @(StaticHelper.DefaultTabSelected(Model, ImportMode.NoteRecord)) value="NoteRecord">Notes</!option>
+                    <!option @(StaticHelper.DefaultTabSelected(Model, ImportMode.ReminderRecord)) value="ReminderRecord">Reminders</!option>
+                    <!option @(StaticHelper.DefaultTabSelected(Model, ImportMode.SupplyRecord)) value="SupplyRecord">Supplies</!option>
+                </select>
+            </div>
+            @if (User.IsInRole(nameof(UserData.IsRootUser)))
+            {
+                <div class="col-12 col-md-6">
+                    <span class="lead">Backups</span>
+                    <div class="row">
+                        <div class="col-6 d-grid">
+                            <button onclick="makeBackup()" class="btn btn-primary btn-md">Make</button>
+                        </div>
+                        <div class="col-6 d-grid">
+                            <input onChange="restoreBackup(this)" type="file" accept=".zip" class="d-none" id="inputBackup">
+                            <button onclick="openRestoreBackup()" class="btn btn-secondary btn-md">Restore</button>
+                        </div>
+                        </div>
+                </div> 
+            }
+       </div>
     </div>
 </div>
 <div class="row">
@@ -47,10 +135,16 @@
         <div class="d-flex justify-content-center">
             <img src="/defaults/lubelogger_logo.png" />
         </div>
+        <div class="d-flex justify-content-center">
+            <small class="text-body-secondary">Version 1.0.6</small>
+        </div>
         <p class="lead">
             Proudly developed in the rural town of Price, Utah by Hargata Softworks.
         </p>
-        <p class="lead">If you enjoyed using this app, please consider spreading the good word.</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>
+        </p>
         <div class="d-flex justify-content-center">
             <h6 class="display-7 mt-2">Hometown Shoutout</h6>
         </div>
@@ -79,16 +173,32 @@
     </div>
 </div>
 <script>
+    function getCheckedTabs() {
+        var visibleTabs = $("#visibleTabs :checked").map(function () {
+            return this.value;
+        });
+        return visibleTabs.toArray();
+    }
     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")
+            useUKMpg: $("#useUKMPG").is(":checked"),
+            useThreeDecimalGasCost: $("#useThreeDecimal").is(":checked"),
+            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 {
@@ -96,6 +206,40 @@
             }
         })
     }
+    function makeBackup() {
+        $.get('/Files/MakeBackup', function (data) {
+            window.location.href = data;
+        });
+    }
+    function openRestoreBackup(){
+        $("#inputBackup").click();
+    }
+    function restoreBackup(event) {
+        let formData = new FormData();
+        formData.append("file", event.files[0]);
+        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){
+                            successToast("Backup Restored");
+                            setTimeout(function () { window.location.href = '/Home/Index' }, 500);
+                        } else {
+                            errorToast("An error occurred, please try again later.");
+                        }
+                    });
+                }
+            }
+        });
+    }
     function enableAuthCheckChanged(){
         var enableAuth = $("#enableAuth").is(":checked");
         if (enableAuth) {
@@ -120,7 +264,7 @@
                 if (result.isConfirmed) {
                     $.post('/Login/CreateLoginCreds', { userName: result.value.username, password: result.value.password }, function (data) {
                         if (data) {
-                            window.location.href = '/Login';
+                            setTimeout(function () { window.location.href = '/Login' }, 500);
                         } else {
                             errorToast("An error occurred, please try again later.");
                         }

Views/Login/ForgotPassword.cshtml

@@ -0,0 +1,26 @@
+@{
+    ViewData["Title"] = "LubeLogger - Login";
+}
+@section Scripts {
+    <script src="~/js/login.js" asp-append-version="true"></script>
+}
+<div class="container d-flex align-items-center justify-content-center" style="height:100vh">
+    <div class="row">
+        <div class="col-12">
+            <img src="/defaults/lubelogger_logo.png" />
+            <div class="form-group">
+                <label for="inputUserName">Username</label>
+                <input type="text" id="inputUserName" class="form-control">
+            </div>
+            <div class="d-grid">
+                <button type="button" class="btn btn-warning mt-2" onclick="requestPasswordReset()"><i class="bi bi-box-arrow-in-right me-2"></i>Request</button>
+            </div>
+            <div class="d-grid">
+                <a href="/Login/ResetPassword" class="btn btn-link mt-2">I Have a Token</a>
+            </div>
+            <div class="d-grid">
+                <a href="/Login/Index" class="btn btn-link mt-2">Back to Login</a>
+            </div>
+        </div>
+    </div>
+</div>

Views/Login/Index.cshtml

@@ -4,7 +4,7 @@
 @section Scripts {
     <script src="~/js/login.js" asp-append-version="true"></script>
 }
-<div class="container chartContainer d-flex align-items-center justify-content-center">
+<div class="container d-flex align-items-center justify-content-center" style="height:100vh">
     <div class="row">
         <div class="col-12">
             <img src="/defaults/lubelogger_logo.png" />
@@ -23,6 +23,12 @@
             <div class="d-grid">
                 <button type="button" class="btn btn-warning mt-2" onclick="performLogin()"><i class="bi bi-box-arrow-in-right me-2"></i>Login</button>
             </div>
+            <div class="d-grid">
+                <a href="/Login/ForgotPassword" class="btn btn-link mt-2">Forgot Password</a>
+            </div>
+            <div class="d-grid">
+                <a href="/Login/Registration" class="btn btn-link mt-2">Register</a>
+            </div>
         </div>
     </div>
 </div>

Views/Login/Registration.cshtml

@@ -0,0 +1,35 @@
+@{
+    ViewData["Title"] = "LubeLogger - Register";
+}
+@section Scripts {
+    <script src="~/js/login.js" asp-append-version="true"></script>
+}
+<div class="container d-flex align-items-center justify-content-center" style="height:100vh">
+    <div class="row">
+        <div class="col-12">
+            <img src="/defaults/lubelogger_logo.png" />
+            <div class="form-group">
+                <label for="inputToken">Token</label>
+                <input type="text" id="inputToken" class="form-control">
+            </div>
+            <div class="form-group">
+                <label for="inputUserName">Email Address</label>
+                <input type="text" id="inputEmail" class="form-control">
+            </div>
+            <div class="form-group">
+                <label for="inputUserName">Username</label>
+                <input type="text" id="inputUserName" class="form-control">
+            </div>
+            <div class="form-group">
+                <label for="inputUserPassword">Password</label>
+                <input type="password" id="inputUserPassword" class="form-control">
+            </div>
+            <div class="d-grid">
+                <button type="button" class="btn btn-warning mt-2" onclick="performRegistration()"><i class="bi bi-box-arrow-in-right me-2"></i>Register</button>
+            </div>
+            <div class="d-grid">
+                <a href="/Login/Index" class="btn btn-link mt-2">Back to Login</a>
+            </div>
+        </div>
+    </div>
+</div>

Views/Login/ResetPassword.cshtml

@@ -0,0 +1,31 @@
+@{
+    ViewData["Title"] = "LubeLogger - Register";
+}
+@section Scripts {
+    <script src="~/js/login.js" asp-append-version="true"></script>
+}
+<div class="container d-flex align-items-center justify-content-center" style="height:100vh">
+    <div class="row">
+        <div class="col-12">
+            <img src="/defaults/lubelogger_logo.png" />
+            <div class="form-group">
+                <label for="inputToken">Token</label>
+                <input type="text" id="inputToken" class="form-control">
+            </div>
+            <div class="form-group">
+                <label for="inputUserName">Email Address</label>
+                <input type="text" id="inputEmail" class="form-control">
+            </div>
+            <div class="form-group">
+                <label for="inputUserPassword">New Password</label>
+                <input type="password" id="inputUserPassword" class="form-control">
+            </div>
+            <div class="d-grid">
+                <button type="button" class="btn btn-warning mt-2" onclick="performPasswordReset()"><i class="bi bi-box-arrow-in-right me-2"></i>Reset Password</button>
+            </div>
+            <div class="d-grid">
+                <a href="/Login/Index" class="btn btn-link mt-2">Back to Login</a>
+            </div>
+        </div>
+    </div>
+</div>

Views/Shared/401.cshtml

@@ -0,0 +1 @@
+<h1>Access Denied</h1>

Views/Shared/_Layout.cshtml

@@ -1,8 +1,10 @@
-<!DOCTYPE html>
-@inject IConfiguration Configuration
+@using CarCareTracker.Helper
+<!DOCTYPE html>
+@inject IConfigHelper config
 @{
-    var useDarkMode = bool.Parse(Configuration["UseDarkMode"]);
-    var enableCsvImports = bool.Parse(Configuration["EnableCsvImports"]);
+    var userConfig = config.GetUserConfig(User);
+    var useDarkMode = userConfig.UseDarkMode;
+    var enableCsvImports = userConfig.EnableCsvImports;
     var shortDatePattern = System.Globalization.CultureInfo.CurrentCulture.DateTimeFormat.ShortDatePattern;
     shortDatePattern = shortDatePattern.ToLower();
     if (!shortDatePattern.Contains("dd"))
@@ -18,6 +20,9 @@
 <head>
     <meta charset="utf-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+    <meta name="apple-mobile-web-app-title" content="LubeLogger" />
+    <meta name="apple-mobile-web-app-capable" content="yes" />
+    <meta name="apple-mobile-web-app-status-bar-style" content="black-translucent">
     <title>@ViewData["Title"] - CarCareTracker</title>
     <link rel="stylesheet" href="~/lib/bootstrap/dist/css/bootstrap.min.css" />
     <link rel="stylesheet" href="~/lib/bootstrap/dist/css/bootstrap-icons.css" />
@@ -25,6 +30,12 @@
     <link rel="stylesheet" href="~/css/site.css" asp-append-version="true" />
     <link rel="stylesheet" href="~/css/loader.css" asp-append-version="true" />
     <link rel="stylesheet" href="~/sweetalert/sweetalert2.min.css" asp-append-version="true" />
+    <link rel="icon" sizes="192x192" href="~/defaults/lubelogger_icon_192.png" />
+    <link rel="icon" sizes="128x128" href="~/defaults/lubelogger_icon_128.png" />
+    <link rel="apple-touch-icon" sizes="128x128" href="~/defaults/lubelogger_icon_128.png" />
+    <link rel="apple-touch-icon-precomposed" sizes="128x128" href="~/defaults/lubelogger_icon_128.png" />
+    <link rel="apple-touch-startup-image" href="~/defaults/lubelogger_launch.png" />
+    <link rel="manifest" href="~/manifest.json">
     <script src="~/lib/jquery/dist/jquery.min.js"></script>
     <script src="~/js/shared.js"></script>
     <script src="~/lib/bootstrap/dist/js/bootstrap.bundle.min.js"></script>

Views/Vehicle/Index.cshtml

@@ -1,6 +1,11 @@
-@{
+@using CarCareTracker.Helper
+@{
     ViewData["Title"] = "LubeLogger - View Vehicle";
 }
+@inject IConfigHelper config
+@{
+    var userConfig = config.GetUserConfig(User);
+}
 @model Vehicle
 @section Scripts {
     <script src="~/js/vehicle.js" asp-append-version="true"></script>
@@ -10,41 +15,90 @@
     <script src="~/js/taxrecord.js" asp-append-version="true"></script>
     <script src="~/js/reminderrecord.js" asp-append-version="true"></script>
     <script src="~/js/upgraderecord.js" asp-append-version="true"></script>
+    <script src="~/js/note.js" asp-append-version="true"></script>
+    <script src="~/js/reports.js" asp-append-version="true"></script>
+    <script src="~/js/supplyrecord.js" asp-append-version="true"></script>
     <script src="~/lib/chart-js/chart.umd.js"></script>
 }
+<div class="lubelogger-mobile-nav" onclick="hideMobileNav()">
+    <ul class="nav navbar-nav" id="vehicleTab" role="tablist">
+        <li class="nav-item" role="presentation">
+            <button class="nav-link" onclick="returnToGarage()"><span class="display-3 ms-2"><i class="bi bi-arrow-left-square"></i>Garage</span></button>
+        </li>
+        <li class="nav-item" role="presentation">
+            <button class="nav-link" onclick="editVehicle(@Model.Id)"><span class="display-3 ms-2"><i class="bi bi-pencil-square"></i>Edit Vehicle</span></button>
+        </li>
+        <li class="nav-item" role="presentation">
+            <button class="nav-link @StaticHelper.DefaultActiveTab(userConfig, ImportMode.Dashboard)" id="report-tab" data-bs-toggle="tab" data-bs-target="#report-tab-pane" type="button" role="tab" aria-selected="false"><span class="display-3 ms-2"><i class="bi bi-file-bar-graph me-2"></i>Dashboard</span></button>
+        </li>
+        <li class="nav-item" role="presentation">
+            <button class="nav-link @StaticHelper.DefaultActiveTab(userConfig, ImportMode.ServiceRecord)" id="servicerecord-tab" data-bs-toggle="tab" data-bs-target="#servicerecord-tab-pane" type="button" role="tab" aria-selected="true"><span class="display-3 ms-2"><i class="bi bi-card-checklist me-2"></i>Service Records</span></button>
+        </li>
+        <li class="nav-item" role="presentation">
+            <button class="nav-link @StaticHelper.DefaultActiveTab(userConfig, ImportMode.RepairRecord)" id="accident-tab" data-bs-toggle="tab" data-bs-target="#accident-tab-pane" type="button" role="tab" aria-selected="false"><span class="display-3 ms-2"><i class="bi bi-exclamation-octagon me-2"></i>Repairs</span></button>
+        </li>
+        <li class="nav-item" role="presentation">
+            <button class="nav-link @StaticHelper.DefaultActiveTab(userConfig, ImportMode.UpgradeRecord)" id="upgrade-tab" data-bs-toggle="tab" data-bs-target="#upgrade-tab-pane" type="button" role="tab" aria-selected="false"><span class="display-3 ms-2"><i class="bi bi-wrench-adjustable me-2"></i>Upgrades</span></button>
+        </li>
+        <li class="nav-item" role="presentation">
+            <button class="nav-link @StaticHelper.DefaultActiveTab(userConfig, ImportMode.GasRecord)" id="gas-tab" data-bs-toggle="tab" data-bs-target="#gas-tab-pane" type="button" role="tab" aria-selected="false"><span class="display-3 ms-2"><i class="bi bi-fuel-pump me-2"></i>Fuel</span></button>
+        </li>
+        <li class="nav-item" role="presentation">
+            <button class="nav-link @StaticHelper.DefaultActiveTab(userConfig, ImportMode.SupplyRecord)" id="supply-tab" data-bs-toggle="tab" data-bs-target="#supply-tab-pane" type="button" role="tab" aria-selected="false"><span class="display-3 ms-2"><i class="bi bi-shop me-2"></i>Supplies</span></button>
+        </li>
+        <li class="nav-item" role="presentation">
+            <button class="nav-link @StaticHelper.DefaultActiveTab(userConfig, ImportMode.TaxRecord)" id="tax-tab" data-bs-toggle="tab" data-bs-target="#tax-tab-pane" type="button" role="tab" aria-selected="false"><span class="display-3 ms-2"><i class="bi bi-currency-dollar me-2"></i>Taxes</span></button>
+        </li>
+        <li class="nav-item" role="presentation">
+            <button class="nav-link @StaticHelper.DefaultActiveTab(userConfig, ImportMode.NoteRecord)" id="notes-tab" data-bs-toggle="tab" data-bs-target="#notes-tab-pane" type="button" role="tab" aria-selected="false"><span class="display-3 ms-2"><i class="bi bi-journal-bookmark me-2"></i>Notes</span></button>
+        </li>
+        <li class="nav-item" role="presentation">
+            <button class="nav-link @StaticHelper.DefaultActiveTab(userConfig, ImportMode.ReminderRecord)" id="reminder-tab" data-bs-toggle="tab" data-bs-target="#reminder-tab-pane" type="button" role="tab" aria-selected="false"><span class="display-3 ms-2"><div class="reminderBellDiv" style="display:inline-flex;"><i class="reminderBell bi bi-bell me-2"></i></div>Reminders</span></button>
+        </li>
+        <li class="nav-item" role="presentation">
+            <button onclick="deleteVehicle(@Model.Id)" class="dropdown-item"><span class="display-3 ms-2"><i class="bi bi-trash me-2"></i>Delete Vehicle</span></button>
+        </li>
+    </ul>
+</div>
 <div class="container">
     <div class="row">
         <div class="d-flex justify-content-between">
-            <button onclick="returnToGarage()" class="btn btn-secondary btn-md mt-1 mb-1"><i class="bi bi-arrow-left-square"></i></button>
+            <button onclick="returnToGarage()" class="lubelogger-tab btn btn-secondary btn-md mt-1 mb-1"><i class="bi bi-arrow-left-square"></i></button>
             <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="btn btn-warning btn-md mt-1 mb-1"><i class="bi bi-pencil-square"></i></button>
+            <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>
+            </div>
         </div>
     </div>
     <hr />
-    <ul class="nav nav-tabs" id="vehicleTab" role="tablist">
+    <ul class="nav nav-tabs lubelogger-tab" id="vehicleTab" role="tablist">
         <li class="nav-item" role="presentation">
-            <button class="nav-link active" id="servicerecord-tab" data-bs-toggle="tab" data-bs-target="#servicerecord-tab-pane" type="button" role="tab" aria-selected="true"><i class="bi bi-card-checklist me-2"></i>Service Records</button>
+            <button class="nav-link @StaticHelper.DefaultActiveTab(userConfig, ImportMode.Dashboard)" id="report-tab" data-bs-toggle="tab" data-bs-target="#report-tab-pane" type="button" role="tab" aria-selected="false"><i class="bi bi-file-bar-graph me-2"></i>Dash</button>
         </li>
         <li class="nav-item" role="presentation">
-            <button class="nav-link" id="accident-tab" data-bs-toggle="tab" data-bs-target="#accident-tab-pane" type="button" role="tab" aria-selected="false"><i class="bi bi-exclamation-octagon me-2"></i>Repairs</button>
+            <button class="nav-link @StaticHelper.DefaultActiveTab(userConfig, ImportMode.ServiceRecord)" id="servicerecord-tab" data-bs-toggle="tab" data-bs-target="#servicerecord-tab-pane" type="button" role="tab" aria-selected="true"><i class="bi bi-card-checklist me-2"></i>Service Records</button>
         </li>
         <li class="nav-item" role="presentation">
-            <button class="nav-link" id="upgrade-tab" data-bs-toggle="tab" data-bs-target="#upgrade-tab-pane" type="button" role="tab" aria-selected="false"><i class="bi bi-wrench-adjustable me-2"></i>Upgrades</button>
+            <button class="nav-link @StaticHelper.DefaultActiveTab(userConfig, ImportMode.RepairRecord)" id="accident-tab" data-bs-toggle="tab" data-bs-target="#accident-tab-pane" type="button" role="tab" aria-selected="false"><i class="bi bi-exclamation-octagon me-2"></i>Repairs</button>
         </li>
         <li class="nav-item" role="presentation">
-            <button class="nav-link" id="gas-tab" data-bs-toggle="tab" data-bs-target="#gas-tab-pane" type="button" role="tab" aria-selected="false"><i class="bi bi-fuel-pump me-2"></i>Fuel</button>
+            <button class="nav-link @StaticHelper.DefaultActiveTab(userConfig, ImportMode.UpgradeRecord)" id="upgrade-tab" data-bs-toggle="tab" data-bs-target="#upgrade-tab-pane" type="button" role="tab" aria-selected="false"><i class="bi bi-wrench-adjustable me-2"></i>Upgrades</button>
         </li>
         <li class="nav-item" role="presentation">
-            <button class="nav-link" id="tax-tab" data-bs-toggle="tab" data-bs-target="#tax-tab-pane" type="button" role="tab" aria-selected="false"><i class="bi bi-currency-dollar me-2"></i>Taxes</button>
+            <button class="nav-link @StaticHelper.DefaultActiveTab(userConfig, ImportMode.GasRecord)" id="gas-tab" data-bs-toggle="tab" data-bs-target="#gas-tab-pane" type="button" role="tab" aria-selected="false"><i class="bi bi-fuel-pump me-2"></i>Fuel</button>
         </li>
         <li class="nav-item" role="presentation">
-            <button class="nav-link" id="notes-tab" data-bs-toggle="tab" data-bs-target="#notes-tab-pane" type="button" role="tab" aria-selected="false"><i class="bi bi-journal-bookmark me-2"></i>Notes</button>
+            <button class="nav-link @StaticHelper.DefaultActiveTab(userConfig, ImportMode.SupplyRecord)" id="supply-tab" data-bs-toggle="tab" data-bs-target="#supply-tab-pane" type="button" role="tab" aria-selected="false"><i class="bi bi-shop me-2"></i>Supplies</button>
         </li>
         <li class="nav-item" role="presentation">
-            <button class="nav-link" id="reminder-tab" data-bs-toggle="tab" data-bs-target="#reminder-tab-pane" type="button" role="tab" aria-selected="false"><div id="reminderBellDiv" style="display:inline-flex;"><i id="reminderBell" class="bi bi-bell me-2"></i></div>Reminders</button>
+            <button class="nav-link @StaticHelper.DefaultActiveTab(userConfig, ImportMode.TaxRecord)" id="tax-tab" data-bs-toggle="tab" data-bs-target="#tax-tab-pane" type="button" role="tab" aria-selected="false"><i class="bi bi-currency-dollar me-2"></i>Taxes</button>
         </li>
         <li class="nav-item" role="presentation">
-            <button class="nav-link" id="report-tab" data-bs-toggle="tab" data-bs-target="#report-tab-pane" type="button" role="tab" aria-selected="false"><i class="bi bi-file-bar-graph me-2"></i>Reports</button>
+            <button class="nav-link @StaticHelper.DefaultActiveTab(userConfig, ImportMode.NoteRecord)" id="notes-tab" data-bs-toggle="tab" data-bs-target="#notes-tab-pane" type="button" role="tab" aria-selected="false"><i class="bi bi-journal-bookmark me-2"></i>Notes</button>
+        </li>
+        <li class="nav-item" role="presentation">
+            <button class="nav-link @StaticHelper.DefaultActiveTab(userConfig, ImportMode.ReminderRecord)" id="reminder-tab" data-bs-toggle="tab" data-bs-target="#reminder-tab-pane" type="button" role="tab" aria-selected="false"><div class="reminderBellDiv" style="display:inline-flex;"><i class="reminderBell bi bi-bell me-2"></i></div>Reminders</button>
         </li>
         <li class="nav-item dropdown ms-auto" role="presentation">
             <a class="nav-link dropdown-toggle" data-bs-toggle="dropdown" href="#" role="button" aria-expanded="false">Manage Vehicle</a>
@@ -54,28 +108,15 @@
         </li>
     </ul>
     <div class="tab-content" id="vehicleTabContent">
-        <div class="tab-pane fade show active" id="servicerecord-tab-pane" role="tabpanel" tabindex="0"></div>
-        <div class="tab-pane fade" id="gas-tab-pane" role="tabpanel" tabindex="0"></div>
-        <div class="tab-pane fade" id="tax-tab-pane" role="tabpanel" tabindex="0"></div>
-        <div class="tab-pane fade" id="notes-tab-pane" role="tabpanel" tabindex="0">
-            <div class="row">
-                <div class="col-12">
-                    <label for="noteTextArea" class="form-label">This is where you can store notes related to the vehicle such as tire size, oil filter size, oil types, etc.</label>
-                    <textarea class="form-control vehicleNoteContainer" id="noteTextArea"></textarea>
-                </div>
-            </div>
-            <div class="row">
-                <div class="d-flex flex-row-reverse">
-                    <div>
-                        <button onclick="saveVehicleNote(@Model.Id)" class="btn btn-primary btn-md mt-1 mb-1"><i class="bi bi-pencil-square"></i>Save Note</button>
-                    </div>
-                </div>
-            </div>
-        </div>
-        <div class="tab-pane fade" id="accident-tab-pane" role="tabpanel" tabindex="0"></div>
-        <div class="tab-pane fade" id="reminder-tab-pane" role="tabpanel" tabindex="0"></div>
-        <div class="tab-pane fade" id="report-tab-pane" role="tabpanel" tabindex="0"></div>
-        <div class="tab-pane fade" id="upgrade-tab-pane" role="tabpanel" tabindex="0"></div>
+        <div class="tab-pane fade @StaticHelper.DefaultActiveTabContent(userConfig, ImportMode.ServiceRecord)" id="servicerecord-tab-pane" role="tabpanel" tabindex="0"></div>
+        <div class="tab-pane fade @StaticHelper.DefaultActiveTabContent(userConfig, ImportMode.GasRecord)" id="gas-tab-pane" role="tabpanel" tabindex="0"></div>
+        <div class="tab-pane fade @StaticHelper.DefaultActiveTabContent(userConfig, ImportMode.TaxRecord)" id="tax-tab-pane" role="tabpanel" tabindex="0"></div>
+        <div class="tab-pane fade @StaticHelper.DefaultActiveTabContent(userConfig, ImportMode.NoteRecord)" id="notes-tab-pane" role="tabpanel" tabindex="0"></div>
+        <div class="tab-pane fade @StaticHelper.DefaultActiveTabContent(userConfig, ImportMode.RepairRecord)" id="accident-tab-pane" role="tabpanel" tabindex="0"></div>
+        <div class="tab-pane fade @StaticHelper.DefaultActiveTabContent(userConfig, ImportMode.ReminderRecord)" id="reminder-tab-pane" role="tabpanel" tabindex="0"></div>
+        <div class="tab-pane fade @StaticHelper.DefaultActiveTabContent(userConfig, ImportMode.Dashboard)" id="report-tab-pane" role="tabpanel" tabindex="0"></div>
+        <div class="tab-pane fade @StaticHelper.DefaultActiveTabContent(userConfig, ImportMode.UpgradeRecord)" id="upgrade-tab-pane" role="tabpanel" tabindex="0"></div>
+        <div class="tab-pane fade @StaticHelper.DefaultActiveTabContent(userConfig, ImportMode.SupplyRecord)" id="supply-tab-pane" role="tabpanel" tabindex="0"></div>
     </div>
 </div>
 <div class="modal fade" id="editVehicleModal" tabindex="-1" role="dialog">
@@ -100,4 +141,8 @@
     function GetVehicleId() {
         return { vehicleId: @Model.Id};
     }
+    function GetDefaultTab() {
+        return { tab: "@userConfig.DefaultTab" };
+    }
+    bindWindowResize();
 </script>

Views/Vehicle/_BulkDataImporter.cshtml

@@ -19,12 +19,15 @@
                     @if (Model == ImportMode.GasRecord)
                     {
                         <a class="btn btn-link" href="/defaults/gassample.csv" target="_blank">Download Sample</a>
-                    } else if (Model == ImportMode.ServiceRecord || Model == ImportMode.RepairRecord)
+                    } else if (Model == ImportMode.ServiceRecord || Model == ImportMode.RepairRecord || Model == ImportMode.UpgradeRecord)
                     {
                         <a class="btn btn-link" href="/defaults/servicerecordsample.csv" target="_blank">Download Sample</a>
                     } else if (Model == ImportMode.TaxRecord)
                     {
                         <a class="btn btn-link" href="/defaults/taxrecordsample.csv" target="_blank">Download Sample</a>
+                    } else if (Model == ImportMode.SupplyRecord)
+                    {
+                        <a class="btn btn-link" href="/defaults/supplysample.csv" target="_blank">Download Sample</a>
                     }
                 </div>
             </div>
@@ -60,6 +63,10 @@
                     getVehicleCollisionRecords(vehicleId);
                 } else if (mode == "TaxRecord") {
                     getVehicleTaxRecords(vehicleId);
+                } else if (mode == "UpgradeRecord") {
+                    getVehicleUpgradeRecords(vehicleId);
+                } else if (mode == "SupplyRecord") {
+                    getVehicleSupplyRecords(vehicleId);
                 }
             } else {
                 errorToast("An error has occurred, please double check the data and try again.");

Views/Vehicle/_Collaborators.cshtml

@@ -0,0 +1,72 @@
+@model List<UserCollaborator>
+<div class="row">
+    <div class="col-8">
+        <span class="lead">Collaborators</span>
+    </div>
+    <div class="col-4">
+        <button onclick="addCollaborator()" class="btn btn-link btn-sm"><i class="bi bi-person-add"></i></button>
+    </div>
+</div>
+<div class="row">
+    <table class="table table-hover">
+        <thead>
+            <tr class="d-flex">
+                <th scope="col" class="col-8">Username</th>
+                <th scope="col" class="col-4">Delete</th>
+            </tr>
+        </thead>
+        <tbody>
+            @foreach (UserCollaborator user in Model)
+            {
+                <tr class="d-flex">
+                    <td class="col-8">@user.UserName</td>
+                    <td class="col-4">
+                        @if(User.Identity.Name != user.UserName)
+                        {
+                            <button onclick="deleteCollaborator(@user.UserVehicle.UserId, @user.UserVehicle.VehicleId)" class="btn btn-outline-danger btn-sm"><i class="bi bi-trash"></i></button>
+                        }
+                    </td>
+                </tr>
+            }
+        </tbody>
+    </table>
+</div>
+<script>
+    function deleteCollaborator(userId, vehicleId) {
+        $.post('/Vehicle/DeleteCollaboratorFromVehicle', {userId: userId, vehicleId: vehicleId}, function(data){
+            if (data) {
+                refreshCollaborators();
+            } else {
+                errorToast("An error occurred, please try again later");
+            }
+        })
+    }
+    function addCollaborator() {
+        Swal.fire({
+            title: 'Add Collaborator',
+            html: `
+                            <input type="text" id="inputUserName" class="swal2-input" placeholder="Username">
+                            `,
+            confirmButtonText: 'Add',
+            focusConfirm: false,
+            preConfirm: () => {
+                const userName = $("#inputUserName").val();
+                if (!userName) {
+                    Swal.showValidationMessage(`Please enter a username`);
+                }
+                return { userName }
+            },
+        }).then(function (result) {
+            if (result.isConfirmed) {
+                var vehicleId = GetVehicleId().vehicleId;
+                $.post('/Vehicle/AddCollaboratorsToVehicle', { username: result.value.userName, vehicleId: vehicleId }, function (data) {
+                    if (data.success) {
+                        refreshCollaborators();
+                    } else {
+                        errorToast(data.message)
+                    }
+                });
+            }
+        });
+    }
+</script>

Views/Vehicle/_CollisionRecordModal.cshtml

@@ -22,7 +22,7 @@
                     <label for="collisionRecordDescription">Description</label>
                     <input type="text" id="collisionRecordDescription" class="form-control" placeholder="Description of item(s) repaired(i.e. Alternator)" value="@Model.Description">
                     <label for="collisionRecordCost">Cost</label>
-                    <input type="number" id="collisionRecordCost" class="form-control" placeholder="Cost of the repair" value="@(isNew ? "" : Model.Cost)">
+                    <input type="text" id="collisionRecordCost" class="form-control" placeholder="Cost of the repair" value="@(isNew ? "" : Model.Cost)">
                 </div>
                 <div class="col-md-6 col-12">
                     <label for="collisionRecordNotes">Notes(optional)</label>

Views/Vehicle/_CollisionRecords.cshtml

@@ -1,7 +1,8 @@
-@inject IConfiguration Configuration
+@using CarCareTracker.Helper
+@inject IConfigHelper config
 @{
-    var enableCsvImports = bool.Parse(Configuration[nameof(UserConfig.EnableCsvImports)]);
-    var hideZero = bool.Parse(Configuration[nameof(UserConfig.HideZero)]);
+    var enableCsvImports = config.GetUserConfig(User).EnableCsvImports;
+    var hideZero = config.GetUserConfig(User).HideZero;
 }
 @model List<CollisionRecord>
 <div class="row">
@@ -20,6 +21,7 @@
                     </button>
                     <ul class="dropdown-menu">
                         <li><a class="dropdown-item" href="#" onclick="showBulkImportModal('RepairRecord')">Import via CSV</a></li>
+                        <li><a class="dropdown-item" href="#" onclick="exportVehicleData('RepairRecord')">Export to CSV</a></li>
                     </ul>
                 </div>
             }
@@ -32,8 +34,13 @@
 </div>
 <div class="row vehicleDetailTabContainer">
     <div class="col-12">
+        <div class="row mt-2 showOnPrint">
+            <div class="d-flex">
+                <img src="/defaults/lubelogger_logo.png" />
+            </div>
+        </div>
         <table class="table table-hover">
-            <thead>
+            <thead class="sticky-top">
                 <tr class="d-flex">
                     <th scope="col" class="col-1">Date</th>
                     <th scope="col" class="col-2">Odometer</th>
@@ -50,7 +57,7 @@
                         <td class="col-2">@collisionRecord.Mileage</td>
                         <td class="col-4">@collisionRecord.Description</td>
                         <td class="col-2">@((hideZero && collisionRecord.Cost == default) ? "---" : collisionRecord.Cost.ToString("C"))</td>
-                        <td class="col-3 text-truncate">@collisionRecord.Notes</td>
+                        <td class="col-3 text-truncate">@CarCareTracker.Helper.StaticHelper.TruncateStrings(collisionRecord.Notes)</td>
                     </tr>
                 }
             </tbody>

Views/Vehicle/_CostMakeUpReport.cshtml

@@ -9,7 +9,7 @@
             new Chart($("#pie-chart"), {
                 type: 'pie',
                 data: {
-                    labels: ["Planned Maintenance(Service Records)", "Unplanned Maintenance(Repairs)", "Upgrades", "Tax", "Fuel"],
+                    labels: ["Service Records", "Repairs", "Upgrades", "Tax", "Fuel"],
                     datasets: [
                         {
                             label: "Expenses by Category",
@@ -45,5 +45,7 @@
 }
 else
 {
-    <h1>No data found or all records have zero sums, insert records with non-zero sums to see visualizations here.</h1>
+    <div class="text-center">
+        <h4>No data found or all records have zero sums, insert records with non-zero sums to see visualizations here.</h4>
+    </div>
 }

Views/Vehicle/_Gas.cshtml

@@ -1,10 +1,14 @@
-@inject IConfiguration Configuration
+@using CarCareTracker.Helper
+@inject IConfigHelper config
 @model GasRecordViewModelContainer
 @{
-    var enableCsvImports = bool.Parse(Configuration[nameof(UserConfig.EnableCsvImports)]);
-    var useMPG = bool.Parse(Configuration[nameof(UserConfig.UseMPG)]);
-    var useUKMPG = bool.Parse(Configuration[nameof(UserConfig.UseUKMPG)]);
-    var hideZero = bool.Parse(Configuration[nameof(UserConfig.HideZero)]);
+    var userConfig = config.GetUserConfig(User);
+    var enableCsvImports = userConfig.EnableCsvImports;
+    var useMPG = userConfig.UseMPG;
+    var useUKMPG = userConfig.UseUKMPG;
+    var hideZero = userConfig.HideZero;
+    var useThreeDecimals = userConfig.UseThreeDecimalGasCost;
+    var gasCostFormat = useThreeDecimals ? "C3" : "C2";
     var useKwh = Model.UseKwh;
     string consumptionUnit;
     string fuelEconomyUnit;
@@ -41,7 +45,7 @@
                 <span class="ms-2 badge bg-primary">@($"Max Fuel Economy: {Model.GasRecords.Max(x => x.MilesPerGallon).ToString("F") ?? "0"}")</span>
             }
             <span class="ms-2 badge bg-success">@($"Total Fuel Consumed: {Model.GasRecords.Sum(x => x.Gallons).ToString("F")}")</span>
-            <span class="ms-2 badge bg-success">@($"Total Cost: {Model.GasRecords.Sum(x => x.Cost).ToString("C3")}")</span>
+            <span class="ms-2 badge bg-success">@($"Total Cost: {Model.GasRecords.Sum(x => x.Cost).ToString(gasCostFormat)}")</span>
         </div>
         @if (enableCsvImports)
         {
@@ -52,6 +56,7 @@
                 </button>
                 <ul class="dropdown-menu">
                     <li><a class="dropdown-item" href="#" onclick="showBulkImportModal('GasRecord')">Import via CSV</a></li>
+                    <li><a class="dropdown-item" href="#" onclick="exportVehicleData('GasRecord')">Export to CSV</a></li>
                 </ul>
             </div>
         } else {
@@ -61,8 +66,13 @@
 </div>
 <div class="row vehicleDetailTabContainer">
     <div class="col-12">
+        <div class="row mt-2 showOnPrint">
+            <div class="d-flex">
+                <img src="/defaults/lubelogger_logo.png" />
+            </div>
+        </div>
         <table class="table table-hover">
-            <thead>
+            <thead class="sticky-top">
                 <tr class="d-flex">
                     <th scope="col" class="col-2">Date Refueled</th>
                     <th scope="col" class="col-2">Odometer(@(distanceUnit))</th>
@@ -80,8 +90,8 @@
                         <td class="col-2">@gasRecord.Mileage</td>
                         <td class="col-2">@gasRecord.Gallons.ToString("F")</td>
                         <td class="col-4">@(gasRecord.MilesPerGallon == 0 ? "---" : gasRecord.MilesPerGallon.ToString("F"))</td>
-                        <td class="col-1">@((hideZero && gasRecord.Cost == default) ? "---" : gasRecord.Cost.ToString("C3"))</td>
-                        <td class="col-1">@((hideZero && gasRecord.CostPerGallon == default) ? "---" : gasRecord.CostPerGallon.ToString("C3"))</td>
+                        <td class="col-1">@((hideZero && gasRecord.Cost == default) ? "---" : gasRecord.Cost.ToString(gasCostFormat))</td>
+                        <td class="col-1">@((hideZero && gasRecord.CostPerGallon == default) ? "---" : gasRecord.CostPerGallon.ToString(gasCostFormat))</td>
                     </tr>
                 }
             </tbody>

Views/Vehicle/_GasCostByMonthReport.cshtml

@@ -1,14 +1,14 @@
-@model List<GasCostForVehicleByMonth>
+@model List<CostForVehicleByMonth>
 @if (Model.Any())
 {
-    <canvas id="bar-chart" class="vehicleDetailTabContainer"></canvas>
+    <canvas id="bar-chart"></canvas>
     <script>
         renderChart();
         function renderChart() {
             var barGraphLabels = [];
             var barGraphData = [];
             var useDarkMode = getGlobalConfig().useDarkMode;
-        @foreach (GasCostForVehicleByMonth gasCost in Model)
+        @foreach (CostForVehicleByMonth gasCost in Model)
         {
             @:barGraphLabels.push("@gasCost.MonthName");
             @:barGraphData.push(@gasCost.Cost);
@@ -19,7 +19,7 @@
                         labels: barGraphLabels,
                         datasets: [
                             {
-                                label: "Gas Expenses by Month",
+                                label: "Expenses by Month",
                                 backgroundColor: ["#00876c", "#43956e", "#67a371", "#89b177", "#a9be80", "#c8cb8b", "#e6d79b", "#e4c281", "#e3ab6b", "#e2925b", "#e07952", "#db5d4f"],
                                 data: barGraphData
                             }
@@ -52,5 +52,7 @@
     </script>
 } else
 {
-    <h1>No data found, insert some gas data to see visualizations here.</h1>
+    <div class="text-center">
+        <h4>No data found, insert/select some data to see visualizations here.</h4>
+    </div>
 }

Views/Vehicle/_GasModal.cshtml

@@ -1,8 +1,9 @@
-@inject IConfiguration Configuration
+@using CarCareTracker.Helper
+@inject IConfigHelper config
 @model GasRecordInputContainer
 @{
-    var useMPG = bool.Parse(Configuration[nameof(UserConfig.UseMPG)]);
-    var useUKMPG = bool.Parse(Configuration[nameof(UserConfig.UseUKMPG)]);
+    var useMPG = config.GetUserConfig(User).UseMPG;
+    var useUKMPG = config.GetUserConfig(User).UseUKMPG;
     var useKwh = Model.UseKwh;
     var isNew = Model.GasRecord.Id == 0;
     string consumptionUnit;
@@ -50,8 +51,12 @@
                         <input class="form-check-input" type="checkbox" role="switch" id="gasIsFillToFull" checked="@Model.GasRecord.IsFillToFull">
                         <label class="form-check-label" for="gasIsFillToFull">Is Filled To Full</label>
                     </div>
+                    <div class="form-check form-switch">
+                        <input class="form-check-input" type="checkbox" role="switch" id="gasIsMissed" checked="@Model.GasRecord.MissedFuelUp">
+                        <label class="form-check-label" for="gasIsMissed">Missed Fuel Up(Skip MPG Calculation)</label>
+                    </div>
                     <label for="GasRecordCost">Cost</label>
-                    <input type="number" id="gasRecordCost" class="form-control" placeholder="Cost of gas refueled" value="@(isNew ? "" : Model.GasRecord.Cost)">
+                    <input type="text" id="gasRecordCost" class="form-control" placeholder="Cost of gas refueled" value="@(isNew ? "" : Model.GasRecord.Cost)">
                 </div>
                 <div class="col-md-6 col-12">
                     @if (Model.GasRecord.Files.Any())

Views/Vehicle/_MPGByMonthReport.cshtml

@@ -0,0 +1,58 @@
+@model List<CostForVehicleByMonth>
+@if (Model.Any())
+{
+    <canvas id="bar-chart-mpg"></canvas>
+    <script>
+        renderChart();
+        function renderChart() {
+            var barGraphLabels = [];
+            var barGraphData = [];
+            var useDarkMode = getGlobalConfig().useDarkMode;
+        @foreach (CostForVehicleByMonth gasCost in Model)
+        {
+            @:barGraphLabels.push("@gasCost.MonthName");
+            @:barGraphData.push(@gasCost.Cost);
+        }
+                new Chart($("#bar-chart-mpg"), {
+                    type: 'bar',
+                    data: {
+                        labels: barGraphLabels,
+                        datasets: [
+                            {
+                                label: "Fuel Mileage by Month",
+                                backgroundColor: ["#00876c", "#43956e", "#67a371", "#89b177", "#a9be80", "#c8cb8b", "#e6d79b", "#e4c281", "#e3ab6b", "#e2925b", "#e07952", "#db5d4f"],
+                                data: barGraphData
+                            }
+                        ]
+                    },
+                    options: {
+                        plugins: {
+                            legend: {
+                                labels: {
+                                    color: useDarkMode ? "#fff" : "#000"
+                                }
+                            }
+                        },
+                        scales: {
+                            y: {
+                                beginAtZero: true,
+                                ticks: {
+                                    color: useDarkMode ? "#fff" : "#000"
+                                }
+                            },
+                            x: {
+                                ticks: {
+                                    color: useDarkMode ? "#fff" : "#000"
+                                }
+                            }
+                        }
+                    }
+                });
+        }
+    </script>
+} else
+{
+    <div class="text-center">
+        <h4>No data found, insert/select some data to see visualizations here.</h4>
+    </div>
+}

Views/Vehicle/_NoteModal.cshtml

@@ -0,0 +1,45 @@
+@model Note
+@{
+    var isNew = Model.Id == 0;
+}
+<div class="modal-header">
+    <h5 class="modal-title">@(isNew ? "Add New Note" : "Edit Note")</h5>
+    <button type="button" class="btn-close" onclick="hideAddNoteModal()" aria-label="Close"></button>
+</div>
+<div class="modal-body">
+    <form>
+        <div class="form-group">
+            <div class="row">
+                <div class="col-12">
+                    <input type="text" id="workAroundInput" style="height:0px; width:0px; display:none;">
+                    <label for="noteDescription">Description</label>
+                    <input type="text" id="noteDescription" class="form-control" placeholder="Description of the note" value="@(isNew ? "" : Model.Description)">
+                </div>
+                <div class="col-12">
+                    <label for="noteTextArea">Notes</label>
+                    <textarea class="form-control vehicleNoteContainer" id="noteTextArea">@Model.NoteText</textarea>
+                </div>
+            </div>
+        </div>
+    </form>
+</div>
+<div class="modal-footer">
+    @if (!isNew)
+    {
+        <button type="button" class="btn btn-danger" onclick="deleteNote(@Model.Id)" style="margin-right:auto;">Delete</button>
+    }
+    <button type="button" class="btn btn-secondary" onclick="hideAddNoteModal()">Cancel</button>
+    @if (isNew)
+    {
+        <button type="button" class="btn btn-primary" onclick="saveNoteToVehicle()">Add New Note</button>
+    }
+    else if (!isNew)
+    {
+        <button type="button" class="btn btn-primary" onclick="saveNoteToVehicle(true)">Edit Note</button>
+    }
+</div>
+<script>
+    function getNoteModelData(){
+        return { id: @Model.Id}
+    }
+</script>

Views/Vehicle/_Notes.cshtml

@@ -0,0 +1,45 @@
+@model List<Note>
+<div class="row">
+    <div class="d-flex justify-content-between">
+        <div class="d-flex align-items-center flex-wrap">
+            <span class="ms-2 badge bg-success">@($"# of Notes: {Model.Count()}")</span>
+        </div>
+        <div>
+                <button onclick="showAddNoteModal()" class="btn btn-primary btn-md mt-1 mb-1"><i class="bi bi-pencil-square me-2"></i>Add Note</button>
+        </div>
+    </div>
+</div>
+<div class="row vehicleDetailTabContainer">
+    <div class="col-12">
+        <div class="row mt-2 showOnPrint">
+            <div class="d-flex">
+                <img src="/defaults/lubelogger_logo.png" />
+            </div>
+        </div>
+        <table class="table table-hover">
+            <thead class="sticky-top">
+                <tr class="d-flex">
+                    <th scope="col" class="col-3">Description</th>
+                    <th scope="col" class="col-9">Note</th>
+                </tr>
+            </thead>
+            <tbody>
+                @foreach (Note note in Model)
+                {
+                    <tr class="d-flex" style="cursor:pointer;" onclick="showEditNoteModal(@note.Id)">
+                        <td class="col-3">@note.Description</td>
+                        <td class="col-9 text-truncate">@CarCareTracker.Helper.StaticHelper.TruncateStrings(note.NoteText, 100)</td>
+                    </tr>
+                }
+            </tbody>
+        </table>
+    </div>
+</div>
+
+
+<div class="modal fade" data-bs-focus="false" id="noteModal" tabindex="-1" role="dialog" aria-hidden="true">
+    <div class="modal-dialog" role="document">
+        <div class="modal-content" id="noteModalContent">
+        </div>
+    </div>
+</div>

Views/Vehicle/_ReminderMakeUpReport.cshtml

@@ -0,0 +1,50 @@
+@model ReminderMakeUpForVehicle
+@if (Model.UrgentCount + Model.VeryUrgentCount + Model.NotUrgentCount + Model.PastDueCount > 0)
+{
+    <canvas id="donut-chart"></canvas>
+    <script>
+        renderChart();
+        function renderChart() {
+            var useDarkMode = getGlobalConfig().useDarkMode;
+            new Chart($("#donut-chart"), {
+                type: 'doughnut',
+                data: {
+                    labels: ["Not Urgent", "Urgent", "Very Urgent", "Past Due"],
+                    datasets: [
+                        {
+                            label: "Reminders by Category",
+                            backgroundColor: ["#488f31", "#ffa600", "#de425b", "#cccccc"],
+                            data: [
+                                @Model.NotUrgentCount,
+                                @Model.UrgentCount,
+                                @Model.VeryUrgentCount,
+                                @Model.PastDueCount
+                            ]
+                        }
+                    ]
+                },
+                options: {
+                    plugins: {
+                        legend: {
+                            position: "bottom",
+                            labels: {
+                                color: useDarkMode ? "#fff" : "#000"
+                            }
+                        },
+                        title: {
+                            display: true,
+                            text: "Reminders by Urgency",
+                            color: useDarkMode ? "#fff" : "#000"
+                        },
+                    }
+                }
+            });
+        }
+    </script>
+}
+else
+{
+    <div class="text-center">
+        <h4>No data found, create reminders to see visualizations here.</h4>
+    </div>
+}

Views/Vehicle/_ReminderRecords.cshtml

@@ -15,8 +15,13 @@
 </div>
 <div class="row vehicleDetailTabContainer">
     <div class="col-12">
+        <div class="row mt-2 showOnPrint">
+            <div class="d-flex">
+                <img src="/defaults/lubelogger_logo.png" />
+            </div>
+        </div>
         <table class="table table-hover">
-            <thead>
+            <thead class="sticky-top">
                 <tr class="d-flex">
                     <th scope="col" class="col-1">Urgency</th>
                     <th scope="col" class="col-2">Metric</th>
@@ -58,7 +63,7 @@
                             <td class="col-2">@reminderRecord.Metric</td>
                         }
                         <td class="col-5">@reminderRecord.Description</td>
-                        <td class="col-3 text-truncate">@reminderRecord.Notes</td>
+                        <td class="col-3 text-truncate">@CarCareTracker.Helper.StaticHelper.TruncateStrings(reminderRecord.Notes)</td>
                         <td class="col-1 text-truncate">
                             <button type="button" class="btn btn-danger" onclick="deleteReminderRecord(@reminderRecord.Id, this)"><i class="bi bi-trash"></i></button>
                         </td>

Views/Vehicle/_Report.cshtml

@@ -1,36 +1,86 @@
-<div class="row">
-    <div class="col-sm-6 col-12">
+@model ReportViewModel
+<div class="row hideOnPrint">
+    <div class="col-md-3 col-12 mt-2">
         <div class="row">
             <div class="col-12">
-
+                <select class="form-select" id="yearOption" onchange="yearUpdated()">
+                    <option value="0">All Time</option>
+                    @foreach (int year in Model.Years)
+                    {
+                        <option value="@year">@year</option>
+                    }
+                </select>
             </div>
         </div>
         <div class="row">
             <div class="d-flex justify-content-center align-items-center col-12 chartContainer" id="costMakeUpReportContent">
+                @await Html.PartialAsync("_CostMakeUpReport", Model.CostMakeUpForVehicle)
             </div>
         </div>
     </div>
-    <div class="col-sm-6 col-12">
+    <div class="col-md-6 col-12 mt-2">
         <div class="row">
-            <div class="col-12">
-
+            <div class="col-12 d-flex justify-content-center reportsCheckBoxContainer">
+                <div class="form-check form-check-inline">
+                    <input class="form-check-input" onChange="updateCheck(this)" type="checkbox" id="serviceExpenseCheck" value="1" checked>
+                    <label class="form-check-label" for="serviceExpenseCheck">Service</label>
+                </div>
+                <div class="form-check form-check-inline">
+                    <input class="form-check-input" onChange="updateCheck(this)" type="checkbox" id="repairExpenseCheck" value="2" checked>
+                    <label class="form-check-label" for="repairExpenseCheck">Repairs</label>
+                </div>
+                <div class="form-check form-check-inline">
+                    <input class="form-check-input" onChange="updateCheck(this)" type="checkbox" id="upgradeExpenseCheck" value="3" checked>
+                    <label class="form-check-label" for="upgradeExpenseCheck">Upgrades</label>
+                </div>
+                <div class="form-check form-check-inline">
+                    <input class="form-check-input" onChange="updateCheck(this)" type="checkbox" id="gasExpenseCheck" value="4" checked>
+                    <label class="form-check-label" for="gasExpenseCheck">Gas</label>
+                </div>
+                <div class="form-check form-check-inline">
+                    <input class="form-check-input" onChange="updateCheck(this)" type="checkbox" id="taxExpenseCheck" value="5" checked>
+                    <label class="form-check-label" for="taxExpenseCheck">Tax</label>
+                </div>
             </div>
         </div>
         <div class="row">
             <div class="d-flex justify-content-center align-items-center col-12 chartContainer" id="gasCostByMonthReportContent">
+                @await Html.PartialAsync("_GasCostByMonthReport", Model.CostForVehicleByMonth)
+            </div>
+        </div>
+    </div>
+    <div class="col-md-3 col-12 mt-2">
+        <div class="row">
+            <div class="col-12">
+                <select class="form-select" onchange="updateReminderPie()" id="reminderOption">
+                    <option value="0">As of Today</option>
+                    <option value="30">+30 Days</option>
+                    <option value="60">+60 Days</option>
+                    <option value="90">+90 Days</option>
+                </select>
+            </div>
+        </div>
+        <div class="row">
+            <div class="d-flex justify-content-center align-items-center col-12 chartContainer" id="reminderMakeUpReportContent">
+                @await Html.PartialAsync("_ReminderMakeUpReport", Model.ReminderMakeUpForVehicle)
             </div>
         </div>
     </div>
 </div>
-<script>
-    initiateChart();
-    function initiateChart() {
-        var vehicleId = GetVehicleId().vehicleId;
-        $.get(`/Vehicle/GetCostMakeUpForVehicle?vehicleId=${vehicleId}`, function (data) {
-            $("#costMakeUpReportContent").html(data);
-            $.get(`/Vehicle/GetFuelCostByMonthByVehicle?vehicleId=${vehicleId}`, function (data) {
-                $("#gasCostByMonthReportContent").html(data);
-            })
-        })
-    }
-</script>
+<hr />
+<div class="row hideOnPrint">
+    <div class="col-md-3 col-12 chartContainer" id="collaboratorContent">
+        @await Html.PartialAsync("_Collaborators", Model.Collaborators)
+    </div>
+    <div class="col-md-6 col-12 chartContainer">
+        <div class="d-flex justify-content-center align-items-center col-12 chartContainer" id="monthFuelMileageReportContent">
+            @await Html.PartialAsync("_MPGByMonthReport", Model.FuelMileageForVehicleByMonth)
+        </div>
+    </div>
+    <div class="col-md-3 col-12 chartContainer">
+        <div class="d-flex justify-content-center">
+            <button onclick="generateVehicleHistoryReport()" class="btn btn-secondary btn-md mt-1 mb-1">Vehicle Maintenance Report<i class="bi ms-2 bi-box-arrow-in-up-right"></i></button>
+        </div>
+    </div>
+</div>
+<div id="vehicleHistoryReport" class="showOnPrint"></div>

Views/Vehicle/_ServiceRecordModal.cshtml

@@ -22,7 +22,7 @@
                     <label for="serviceRecordDescription">Description</label>
                     <input type="text" id="serviceRecordDescription" class="form-control" placeholder="Description of item(s) serviced(i.e. Oil Change)" value="@Model.Description">
                     <label for="serviceRecordCost">Cost</label>
-                    <input type="number" id="serviceRecordCost" class="form-control" placeholder="Cost of the service" value="@(isNew ? "" : Model.Cost)">
+                    <input type="text" id="serviceRecordCost" class="form-control" placeholder="Cost of the service" value="@(isNew ? "" : Model.Cost)">
                 </div>
                 <div class="col-md-6 col-12">
                     <label for="serviceRecordNotes">Notes(optional)</label>

Views/Vehicle/_ServiceRecords.cshtml

@@ -1,7 +1,8 @@
-@inject IConfiguration Configuration
+@using CarCareTracker.Helper
+@inject IConfigHelper config
 @{
-    var enableCsvImports = bool.Parse(Configuration[nameof(UserConfig.EnableCsvImports)]);
-    var hideZero = bool.Parse(Configuration[nameof(UserConfig.HideZero)]);
+    var enableCsvImports = config.GetUserConfig(User).EnableCsvImports;
+    var hideZero = config.GetUserConfig(User).HideZero;
 }
 @model List<ServiceRecord>
 <div class="row">
@@ -20,6 +21,7 @@
                     </button>
                     <ul class="dropdown-menu">
                         <li><a class="dropdown-item" href="#" onclick="showBulkImportModal('ServiceRecord')">Import via CSV</a></li>
+                        <li><a class="dropdown-item" href="#" onclick="exportVehicleData('ServiceRecord')">Export to CSV</a></li>
                     </ul>
                 </div>
             }
@@ -32,8 +34,13 @@
 </div>
 <div class="row vehicleDetailTabContainer">
     <div class="col-12">
+        <div class="row mt-2 showOnPrint">
+            <div class="d-flex">
+                <img src="/defaults/lubelogger_logo.png" />
+            </div>
+        </div>
         <table class="table table-hover">
-            <thead>
+            <thead class="sticky-top">
                 <tr class="d-flex">
                     <th scope="col" class="col-1">Date</th>
                     <th scope="col" class="col-2">Odometer</th>
@@ -50,7 +57,7 @@
                         <td class="col-2">@serviceRecord.Mileage</td>
                         <td class="col-4">@serviceRecord.Description</td>
                         <td class="col-2">@((hideZero && serviceRecord.Cost == default) ? "---" : serviceRecord.Cost.ToString("C"))</td>
-                        <td class="col-3 text-truncate">@serviceRecord.Notes</td>
+                        <td class="col-3 text-truncate">@CarCareTracker.Helper.StaticHelper.TruncateStrings(serviceRecord.Notes)</td>
                     </tr>
                 }
             </tbody>

Views/Vehicle/_SupplyRecordModal.cshtml

@@ -0,0 +1,85 @@
+@model SupplyRecordInput
+@{
+    var isNew = Model.Id == 0;
+}
+<div class="modal-header">
+    <h5 class="modal-title">@(isNew ? "Add New Supply Record" : "Edit Supply Record")</h5>
+    <button type="button" class="btn-close" onclick="hideAddSupplyRecordModal()" aria-label="Close"></button>
+</div>
+<div class="modal-body">
+    <form>
+        <div class="form-group">
+            <div class="row">
+                <div class="col-md-6 col-12">
+                    <input type="text" id="workAroundInput" style="height:0px; width:0px; display:none;">
+                    <label for="supplyRecordDate">Date</label>
+                    <div class="input-group">
+                        <input type="text" id="supplyRecordDate" class="form-control" placeholder="Date purchased" value="@Model.Date">
+                        <span class="input-group-text"><i class="bi bi-calendar-event"></i></span>
+                    </div>
+                    <label for="supplyRecordPartNumber">Part Number</label>
+                    <input type="text" id="supplyRecordPartNumber" class="form-control" placeholder="Part #/Model #/SKU #" value="@(isNew ? "" : Model.PartNumber)">
+                    <label for="supplyRecordDescription">Description</label>
+                    <input type="text" id="supplyRecordDescription" class="form-control" placeholder="Description of the Part/Supplies" value="@Model.Description">
+                    <label for="supplyRecordSupplier">Supplier/Vendor</label>
+                    <input type="text" id="supplyRecordSupplier" class="form-control" placeholder="Part Supplier" value="@Model.PartSupplier">
+                    <div class="row">
+                        <div class="col-md-6 col-12">
+                            <label for="supplyRecordQuantity">Quantity</label>
+                            <input type="text" id="supplyRecordQuantity" class="form-control" placeholder="Quantity" value="@(isNew ? "1" : Model.Quantity)">
+                        </div>
+                        <div class="col-md-6 col-12">
+                            <label for="supplyRecordCost">Cost</label>
+                            <input type="text" id="supplyRecordCost" class="form-control" placeholder="Cost" value="@(isNew ? "" : Model.Cost)">
+                        </div>
+                    </div>
+                </div>
+                <div class="col-md-6 col-12">
+                    <label for="supplyRecordNotes">Notes(optional)</label>
+                    <textarea id="supplyRecordNotes" class="form-control" rows="5">@Model.Notes</textarea>
+                    @if (Model.Files.Any())
+                    {
+                        <div>
+                            @await Html.PartialAsync("_UploadedFiles", Model.Files)
+                            <label for="supplyRecordFiles">Upload more documents</label>
+                            <input onChange="uploadVehicleFilesAsync(this)" type="file" multiple accept=".png,.jpg,.jpeg,.pdf,.xls,.xlsx,.docx" class="form-control-file" id="supplyRecordFiles">
+                        </div>
+                    }
+                    else
+                    {
+                        <label for="supplyRecordFiles">Upload documents(optional)</label>
+                        <input onChange="uploadVehicleFilesAsync(this)" type="file" multiple accept=".png,.jpg,.jpeg,.pdf,.xls,.xlsx,.docx" class="form-control-file" id="supplyRecordFiles">
+                    }
+                </div>
+            </div>
+        </div>
+    </form>
+</div>
+<div class="modal-footer">
+    @if (!isNew)
+    {
+        <button type="button" class="btn btn-danger" onclick="deleteSupplyRecord(@Model.Id)" style="margin-right:auto;">Delete</button>
+    }
+    <button type="button" class="btn btn-secondary" onclick="hideAddSupplyRecordModal()">Cancel</button>
+    @if (isNew)
+    {
+        <button type="button" class="btn btn-primary" onclick="saveSupplyRecordToVehicle()">Add New Supply Record</button>
+    }
+    else if (!isNew)
+    {
+        <button type="button" class="btn btn-primary" onclick="saveSupplyRecordToVehicle(true)">Edit Supply Record</button>
+    }
+</div>
+<script>
+    var uploadedFiles = [];
+    getUploadedFilesFromModel();
+    function getUploadedFilesFromModel() {
+    @foreach (UploadedFiles filesUploaded in Model.Files)
+    {
+        @:uploadedFiles.push({ name: "@filesUploaded.Name", location: "@filesUploaded.Location" });
+    }
+        }
+    function getSupplyRecordModelData() {
+        return { id: @Model.Id}
+    }
+</script>

Views/Vehicle/_SupplyRecords.cshtml

@@ -0,0 +1,78 @@
+@using CarCareTracker.Helper
+@inject IConfigHelper config
+@{
+    var enableCsvImports = config.GetUserConfig(User).EnableCsvImports;
+    var hideZero = config.GetUserConfig(User).HideZero;
+}
+@model List<SupplyRecord>
+<div class="row">
+    <div class="d-flex justify-content-between">
+        <div class="d-flex align-items-center flex-wrap">
+            <span class="ms-2 badge bg-success">@($"# of Supply Records: {Model.Count()}")</span>
+            <span class="ms-2 badge bg-primary">@($"Total: {Model.Sum(x => x.Cost).ToString("C")}")</span>
+        </div>
+        <div>
+            @if (enableCsvImports)
+            {
+                <div class="btn-group">
+                    <button onclick="showAddSupplyRecordModal()" class="btn btn-primary btn-md mt-1 mb-1"><i class="bi bi-pencil-square me-2"></i>Add Supply Record</button>
+                    <button type="button" class="btn btn-md btn-primary btn-md mt-1 mb-1 dropdown-toggle dropdown-toggle-split" data-bs-toggle="dropdown" aria-expanded="false">
+                        <span class="visually-hidden">Toggle Dropdown</span>
+                    </button>
+                    <ul class="dropdown-menu">
+                        <li><a class="dropdown-item" href="#" onclick="showBulkImportModal('SupplyRecord')">Import via CSV</a></li>
+                        <li><a class="dropdown-item" href="#" onclick="exportVehicleData('SupplyRecord')">Export to CSV</a></li>
+                    </ul>
+                </div>
+            }
+            else
+            {
+                <button onclick="showAddSupplyRecordModal()" class="btn btn-primary btn-md mt-1 mb-1"><i class="bi bi-pencil-square me-2"></i>Add Supply Record</button>
+            }
+        </div>
+    </div>
+</div>
+<div class="row vehicleDetailTabContainer">
+    <div class="col-12">
+        <div class="row mt-2 showOnPrint">
+            <div class="d-flex">
+                <img src="/defaults/lubelogger_logo.png" />
+            </div>
+        </div>
+        <table class="table table-hover">
+            <thead class="sticky-top">
+                <tr class="d-flex">
+                    <th scope="col" class="col-1">Date</th>
+                    <th scope="col" class="col-2">Part #</th>
+                    <th scope="col" class="col-2">Supplier</th>
+                    <th scope="col" class="col-3">Description</th>
+                    <th scope="col" class="col-1">Quantity</th>
+                    <th scope="col" class="col-1">Cost</th>
+                    <th scope="col" class="col-2">Notes</th>
+                </tr>
+            </thead>
+            <tbody>
+                @foreach (SupplyRecord supplyRecord in Model)
+                {
+                    <tr class="d-flex" style="cursor:pointer;" onclick="showEditSupplyRecordModal(@supplyRecord.Id)">
+                        <td class="col-1">@supplyRecord.Date.ToShortDateString()</td>
+                        <td class="col-2">@supplyRecord.PartNumber</td>
+                        <td class="col-2">@supplyRecord.PartSupplier</td>
+                        <td class="col-3">@supplyRecord.Description</td>
+                        <td class="col-1">@supplyRecord.Quantity</td>
+                        <td class="col-1">@((hideZero && supplyRecord.Cost == default) ? "---" : supplyRecord.Cost.ToString("C"))</td>
+                        <td class="col-2 text-truncate">@CarCareTracker.Helper.StaticHelper.TruncateStrings(supplyRecord.Notes)</td>
+                    </tr>
+                }
+            </tbody>
+        </table>
+    </div>
+</div>
+
+
+<div class="modal fade" data-bs-focus="false" id="supplyRecordModal" tabindex="-1" role="dialog" aria-hidden="true">
+    <div class="modal-dialog modal-lg" role="document">
+        <div class="modal-content" id="supplyRecordModalContent">
+        </div>
+    </div>
+</div>

Views/Vehicle/_TaxRecordModal.cshtml

@@ -20,7 +20,7 @@
                     <label for="taxRecordDescription">Description</label>
                     <input type="text" id="taxRecordDescription" class="form-control" placeholder="Description of tax paid(i.e. Registration)" value="@Model.Description">
                     <label for="taxRecordCost">Cost</label>
-                    <input type="number" id="taxRecordCost" class="form-control" placeholder="Cost of tax paid" value="@(isNew? "" : Model.Cost)">
+                    <input type="text" id="taxRecordCost" class="form-control" placeholder="Cost of tax paid" value="@(isNew? "" : Model.Cost)">
                 </div>
                 <div class="col-md-6 col-12">
                     <label for="taxRecordNotes">Notes(optional)</label>

Views/Vehicle/_TaxRecords.cshtml

@@ -1,7 +1,8 @@
-@inject IConfiguration Configuration
+@using CarCareTracker.Helper
+@inject IConfigHelper config
 @{
-    var enableCsvImports = bool.Parse(Configuration[nameof(UserConfig.EnableCsvImports)]);
-    var hideZero = bool.Parse(Configuration[nameof(UserConfig.HideZero)]);
+    var enableCsvImports = config.GetUserConfig(User).EnableCsvImports;
+    var hideZero = config.GetUserConfig(User).HideZero;
 }
 @model List<TaxRecord>
 <div class="row">
@@ -19,7 +20,8 @@
                         <span class="visually-hidden">Toggle Dropdown</span>
                     </button>
                     <ul class="dropdown-menu">
-                        <li><a class="dropdown-item" href="#" onclick="showBulkImportModal('taxrecord')">Import via CSV</a></li>
+                        <li><a class="dropdown-item" href="#" onclick="showBulkImportModal('TaxRecord')">Import via CSV</a></li>
+                        <li><a class="dropdown-item" href="#" onclick="exportVehicleData('TaxRecord')">Export to CSV</a></li>
                     </ul>
                 </div>
             }
@@ -32,8 +34,13 @@
 </div>
 <div class="row vehicleDetailTabContainer">
     <div class="col-12">
+        <div class="row mt-2 showOnPrint">
+            <div class="d-flex">
+                <img src="/defaults/lubelogger_logo.png" />
+            </div>
+        </div>
         <table class="table table-hover">
-            <thead>
+            <thead class="sticky-top">
                 <tr class="d-flex">
                     <th scope="col" class="col-1">Date</th>
                     <th scope="col" class="col-6">Description</th>
@@ -48,7 +55,7 @@
                         <td class="col-1">@taxRecord.Date.ToShortDateString()</td>
                         <td class="col-6">@taxRecord.Description</td>
                         <td class="col-2">@((hideZero && taxRecord.Cost == default) ? "---" : taxRecord.Cost.ToString("C"))</td>
-                        <td class="col-3 text-truncate">@taxRecord.Notes</td>
+                        <td class="col-3 text-truncate">@CarCareTracker.Helper.StaticHelper.TruncateStrings(taxRecord.Notes)</td>
                     </tr>
                 }
             </tbody>

Views/Vehicle/_UpgradeRecordModal.cshtml

@@ -22,7 +22,7 @@
                     <label for="upgradeRecordDescription">Description</label>
                     <input type="text" id="upgradeRecordDescription" class="form-control" placeholder="Description of item(s) upgraded/modded" value="@Model.Description">
                     <label for="upgradeRecordCost">Cost</label>
-                    <input type="number" id="upgradeRecordCost" class="form-control" placeholder="Cost of the upgrade/mods" value="@(isNew ? "" : Model.Cost)">
+                    <input type="text" id="upgradeRecordCost" class="form-control" placeholder="Cost of the upgrade/mods" value="@(isNew ? "" : Model.Cost)">
                 </div>
                 <div class="col-md-6 col-12">
                     <label for="upgradeRecordNotes">Notes(optional)</label>

Views/Vehicle/_UpgradeRecords.cshtml

@@ -1,7 +1,8 @@
-@inject IConfiguration Configuration
+@using CarCareTracker.Helper
+@inject IConfigHelper config
 @{
-    var enableCsvImports = bool.Parse(Configuration[nameof(UserConfig.EnableCsvImports)]);
-    var hideZero = bool.Parse(Configuration[nameof(UserConfig.HideZero)]);
+    var enableCsvImports = config.GetUserConfig(User).EnableCsvImports;
+    var hideZero = config.GetUserConfig(User).HideZero;
 }
 @model List<UpgradeRecord>
 <div class="row">
@@ -20,6 +21,7 @@
                     </button>
                     <ul class="dropdown-menu">
                         <li><a class="dropdown-item" href="#" onclick="showBulkImportModal('UpgradeRecord')">Import via CSV</a></li>
+                        <li><a class="dropdown-item" href="#" onclick="exportVehicleData('UpgradeRecord')">Export to CSV</a></li>
                     </ul>
                 </div>
             }
@@ -32,8 +34,13 @@
 </div>
 <div class="row vehicleDetailTabContainer">
     <div class="col-12">
+        <div class="row mt-2 showOnPrint">
+            <div class="d-flex">
+                <img src="/defaults/lubelogger_logo.png" />
+            </div>
+        </div>
         <table class="table table-hover">
-            <thead>
+            <thead class="sticky-top">
                 <tr class="d-flex">
                     <th scope="col" class="col-1">Date</th>
                     <th scope="col" class="col-2">Odometer</th>
@@ -50,7 +57,7 @@
                         <td class="col-2">@upgradeRecord.Mileage</td>
                         <td class="col-4">@upgradeRecord.Description</td>
                         <td class="col-2">@((hideZero && upgradeRecord.Cost == default) ? "---" : upgradeRecord.Cost.ToString("C"))</td>
-                        <td class="col-3 text-truncate">@upgradeRecord.Notes</td>
+                        <td class="col-3 text-truncate">@CarCareTracker.Helper.StaticHelper.TruncateStrings(upgradeRecord.Notes)</td>
                     </tr>
                 }
             </tbody>

Views/Vehicle/_VehicleHistory.cshtml

@@ -0,0 +1,109 @@
+@using CarCareTracker.Helper
+@inject IConfigHelper config
+@{
+    var hideZero = config.GetUserConfig(User).HideZero;
+    var useMPG = config.GetUserConfig(User).UseMPG;
+    var useUKMPG = config.GetUserConfig(User).UseUKMPG;
+    var useKwh = Model.VehicleData.IsElectric;
+    string fuelEconomyUnit;
+    if (useKwh)
+    {
+        fuelEconomyUnit = useMPG ? "mi./kWh" : "kWh/100km";
+    }
+    else if (useMPG && useUKMPG)
+    {
+        fuelEconomyUnit = "mpg";
+    }
+    else if (useUKMPG)
+    {
+        fuelEconomyUnit = "l/100mi.";
+    }
+    else
+    {
+        fuelEconomyUnit = useMPG ? "mpg" : "l/100km";
+    }
+}
+@model VehicleHistoryViewModel
+<div class="vehicleDetailTabContainer">
+    <div class="row mt-2">
+        <div class="d-flex">
+            <img src="/defaults/lubelogger_logo.png" />
+            <span class="display-6 ms-5">Vehicle Maintenance Report</span>
+        </div>
+    </div>
+    <hr />
+    <div class="row">
+        <div class="col-6">
+            <ul class="list-group">
+                <li class="list-group-item">
+                    <span class="display-6">@($"{Model.VehicleData.Year} {Model.VehicleData.Make} {Model.VehicleData.Model}")</span>
+                </li>
+                <li class="list-group-item">
+                    <span class="lead">@Model.VehicleData.LicensePlate</span>
+                </li>
+                <li class="list-group-item">
+                    @if (Model.VehicleData.IsElectric)
+                    {
+                        <span><i class="bi bi-ev-station"></i> Electric</span>
+                    }
+                    else
+                    {
+                        <span><i class="bi bi-fuel-pump"></i> Gasoline</span>
+                    }
+                </li>
+            </ul>
+        </div>
+        <div class="col-6">
+            <ul class="list-group">
+                <li class="list-group-item">Last Reported Odometer Reading: @Model.Odometer</li>
+                <li class="list-group-item">Average Fuel Economy: @($"{Model.MPG.ToString("F")} {fuelEconomyUnit}")</li>
+                <li class="list-group-item">Total Spent(excl. fuel): @Model.TotalCost.ToString("C")</li>
+                <li class="list-group-item">Total Spent on Fuel: @Model.TotalGasCost.ToString("C")</li>
+            </ul>
+        </div>
+    </div>
+    <hr />
+    <div class="row">
+        <div class="col-12">
+            <table class="table table-hover">
+                <thead>
+                    <tr class="d-flex">
+                        <th scope="col" class="col-2">Type</th>
+                        <th scope="col" class="col-1">Date</th>
+                        <th scope="col" class="col-1">Odometer</th>
+                        <th scope="col" class="col-3">Description</th>
+                        <th scope="col" class="col-1">Cost</th>
+                        <th scope="col" class="col-4">Notes</th>
+                    </tr>
+                </thead>
+                <tbody>
+                    @foreach (GenericReportModel reportData in Model.VehicleHistory)
+                    {
+                        <tr class="d-flex">
+                            <td class="col-2">
+                                @if(reportData.DataType == ImportMode.ServiceRecord)
+                                {
+                                    <span><i class="bi bi-card-checklist me-2"></i>Service</span>
+                                } else if (reportData.DataType == ImportMode.RepairRecord)
+                                {
+                                    <span><i class="bi bi-exclamation-octagon me-2"></i>Repair</span>
+                                } else if (reportData.DataType == ImportMode.UpgradeRecord)
+                                {
+                                    <span><i class="bi bi-wrench-adjustable me-2"></i>Upgrade</span>
+                                } else if (reportData.DataType == ImportMode.TaxRecord)
+                                {
+                                    <span><i class="bi bi-currency-dollar me-2"></i>Tax</span>
+                                }
+                            </td>
+                            <td class="col-1">@reportData.Date.ToShortDateString()</td>
+                            <td class="col-1">@(reportData.Odometer == default ? "---" : reportData.Odometer.ToString("N0"))</td>
+                            <td class="col-3">@reportData.Description</td>
+                            <td class="col-1">@((hideZero && reportData.Cost == default) ? "---" : reportData.Cost.ToString("C"))</td>
+                            <td class="col-4 text-wrap">@CarCareTracker.Helper.StaticHelper.TruncateStrings(reportData.Notes, 100)</td>
+                        </tr>
+                    }
+                </tbody>
+            </table>
+        </div>
+    </div>
+</div>