all kinds of updates to make decimal odometer input possible.

# Conflicts:
#	Controllers/APIController.cs
#	Controllers/VehicleController.cs
#	Helper/ReminderHelper.cs

.github/CONTRIBUTING.md

@@ -8,8 +8,6 @@ Ideally, the Issues tab should only consist of bug reports and feature requests
 ## Feature Requests
 Feature Requests are cool, but we do want to avoid bloat and scope/feature creep.
 
-Read [this](https://github.com/hargata/lubelog/wiki/Scope-and-Purpose) to better understand the scope and purpose of this project.
-
 LubeLogger is a Vehicle Maintenance and Fuel Mileage Tracker. 
 It is not and should not be used for the following:
 - Project Management Software(e.g.: Jira)

.github/ISSUE_TEMPLATE/bug_report.md

@@ -1,7 +1,7 @@
 ---
 name: Bug report
 about: Report a bug
-title: "[BUG]"
+title: ''
 labels: ''
 assignees: ''
 
@@ -18,7 +18,7 @@ Please make sure you have performed the following steps before opening a new bug
 
 **Platform**
 - [ ] Docker Image
-- [ ] Windows/Linux Standalone Executable
+- [ ] Windows Standalone Executable
 
 **Browser Console Errors(F12)**
 <!-- Attach a screenshot or codeblock containing the browser console error -->

.github/ISSUE_TEMPLATE/feature_request.md

@@ -1,17 +0,0 @@
----
-name: Feature request
-about: Suggest an idea for this project
-title: "[FEATURE REQUEST]"
-labels: ''
-assignees: ''
-
----
-
-**Checklist**
-Please make sure you have performed the following steps before submitting a new feature request, change `[ ]` to `[x]` to mark it as done
-
-- [ ] I have read the [Contributing Guidelines](https://github.com/hargata/lubelog/blob/main/.github/CONTRIBUTING.md) and [Scope and Purpose](https://github.com/hargata/lubelog/wiki/Scope-and-Purpose)
-- [ ] I have searched through existing issues.
-
-**Description**
-<!-- Describe the feature request below this line -->

.gitignore

@@ -1,6 +1,15 @@
 .vs/
 bin/
 obj/
-data/
+wwwroot/images/
+cartracker.db
+data/cartracker.db
+wwwroot/documents/
+wwwroot/temp/
+wwwroot/imports/
+wwwroot/translations/
+config/userConfig.json
 CarCareTracker.csproj.user
 Properties/launchSettings.json
+data/cartracker-log.db
+data/widgets.html

CarCareTracker.csproj

@@ -11,10 +11,10 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="CsvHelper" Version="33.0.1" />
+    <PackageReference Include="CsvHelper" Version="30.0.1" />
     <PackageReference Include="LiteDB" Version="5.0.17" />
-    <PackageReference Include="MailKit" Version="4.11.0" />
-    <PackageReference Include="Npgsql" Version="9.0.3" />
+    <PackageReference Include="MailKit" Version="4.8.0" />
+    <PackageReference Include="Npgsql" Version="8.0.5" />
     <PackageReference Include="System.IdentityModel.Tokens.Jwt" Version="7.3.1" />
   </ItemGroup>
 

Controllers/AdminController.cs

@@ -55,7 +55,7 @@ namespace CarCareTracker.Controllers
                         }
                     }
                 }
-                var successResponse = OperationResponse.Succeed("Token Generated!");
+                var successResponse = new OperationResponse { Success = true, Message = "Token Generated!" };
                 return Json(successResponse);
             } else
             {

Controllers/ErrorController.cs

@@ -6,7 +6,7 @@ namespace CarCareTracker.Controllers
     {
         public IActionResult Unauthorized()
         {
-            if (User.IsInRole("APIAuth"))
+            if (!User.IsInRole("CookieAuth"))
             {
                 Response.StatusCode = 403;
                 return new EmptyResult();

Controllers/FilesController.cs

@@ -32,7 +32,7 @@ namespace CarCareTracker.Controllers
             var originalFileName = Path.GetFileNameWithoutExtension(file.FileName);
             if (originalFileName == "en_US")
             {
-                return Json(OperationResponse.Failed("The translation file name en_US is reserved."));
+                return Json(new OperationResponse { Success = false, Message = "The translation file name en_US is reserved." });
             }
             var fileName = UploadFile(file);
             //move file from temp to translation folder.
@@ -41,9 +41,9 @@ namespace CarCareTracker.Controllers
             if (!string.IsNullOrWhiteSpace(uploadedFilePath))
             {
                 var result = _fileHelper.RenameFile(uploadedFilePath, originalFileName);
-                return Json(OperationResponse.Conditional(result));
+                return Json(new OperationResponse { Success = result, Message = string.Empty });
             }
-            return Json(OperationResponse.Failed());
+            return Json(new OperationResponse { Success = false, Message = StaticHelper.GenericErrorMessage });
         }
 
         [HttpPost]
@@ -81,7 +81,7 @@ namespace CarCareTracker.Controllers
         private string UploadFile(IFormFile fileToUpload)
         {
             string uploadDirectory = "temp/";
-            string uploadPath = Path.Combine(_webEnv.ContentRootPath, "data", uploadDirectory);
+            string uploadPath = Path.Combine(_webEnv.WebRootPath, uploadDirectory);
             if (!Directory.Exists(uploadPath))
                 Directory.CreateDirectory(uploadPath);
             string fileName = Guid.NewGuid() + Path.GetExtension(fileToUpload.FileName);
@@ -95,7 +95,7 @@ namespace CarCareTracker.Controllers
         public IActionResult UploadCoordinates(List<string> coordinates)
         {
             string uploadDirectory = "temp/";
-            string uploadPath = Path.Combine(_webEnv.ContentRootPath, "data", uploadDirectory);
+            string uploadPath = Path.Combine(_webEnv.WebRootPath, uploadDirectory);
             if (!Directory.Exists(uploadPath))
                 Directory.CreateDirectory(uploadPath);
             string fileName = Guid.NewGuid() + ".csv";

Controllers/HomeController.cs

@@ -23,7 +23,6 @@ namespace CarCareTracker.Controllers
         private readonly IReminderRecordDataAccess _reminderRecordDataAccess;
         private readonly IReminderHelper _reminderHelper;
         private readonly ITranslationHelper _translationHelper;
-        private readonly IMailHelper _mailHelper;
         public HomeController(ILogger<HomeController> logger,
             IVehicleDataAccess dataAccess,
             IUserLogic userLogic,
@@ -34,8 +33,7 @@ namespace CarCareTracker.Controllers
             IExtraFieldDataAccess extraFieldDataAccess,
             IReminderRecordDataAccess reminderRecordDataAccess,
             IReminderHelper reminderHelper,
-            ITranslationHelper translationHelper,
-            IMailHelper mailHelper)
+            ITranslationHelper translationHelper)
         {
             _logger = logger;
             _dataAccess = dataAccess;
@@ -48,7 +46,6 @@ namespace CarCareTracker.Controllers
             _loginLogic = loginLogic;
             _vehicleLogic = vehicleLogic;
             _translationHelper = translationHelper;
-            _mailHelper = mailHelper;
         }
         private int GetUserID()
         {
@@ -101,6 +98,7 @@ namespace CarCareTracker.Controllers
                         var kioskResult = _vehicleLogic.GetPlans(vehiclesStored, true);
                         return PartialView("_KioskPlan", kioskResult);
                     }
+                    break;
                 case KioskMode.Reminder:
                     {
                         var kioskResult = _vehicleLogic.GetReminders(vehiclesStored, false);
@@ -282,12 +280,12 @@ namespace CarCareTracker.Controllers
                     var result = _loginLogic.UpdateUserDetails(userId, userAccount);
                     return Json(result);
                 }
-                return Json(OperationResponse.Failed());
+                return Json(new OperationResponse { Success = false, Message = StaticHelper.GenericErrorMessage });
             }
             catch (Exception ex)
             {
                 _logger.LogError(ex.Message);
-                return Json(OperationResponse.Failed());
+                return Json(new OperationResponse { Success = false, Message = StaticHelper.GenericErrorMessage });
             }
         }
         [HttpGet]
@@ -495,16 +493,16 @@ namespace CarCareTracker.Controllers
                 }
                 if (translationsDownloaded > 0)
                 {
-                    return Json(OperationResponse.Succeed($"{translationsDownloaded} Translations Downloaded"));
+                    return Json(new OperationResponse() { Success = true, Message = $"{translationsDownloaded} Translations Downloaded" });
                 } else
                 {
-                    return Json(OperationResponse.Failed("No Translations Downloaded"));
+                    return Json(new OperationResponse() { Success = false, Message = "No Translations Downloaded" });
                 }
             }
             catch (Exception ex)
             {
                 _logger.LogError($"Unable to retrieve translations: {ex.Message}");
-                return Json(OperationResponse.Failed());
+                return Json(new OperationResponse() { Success = false, Message = StaticHelper.GenericErrorMessage });
             }
         }
         public ActionResult GetVehicleSelector(int vehicleId)
@@ -558,29 +556,6 @@ namespace CarCareTracker.Controllers
             }
             return Json(false);
         }
-        [Authorize(Roles = nameof(UserData.IsRootUser))]
-        public IActionResult GetServerConfiguration()
-        {
-            var viewModel = new ServerSettingsViewModel
-            {
-                PostgresConnection = _config.GetServerPostgresConnection(),
-                AllowedFileExtensions = _config.GetAllowedFileUploadExtensions(),
-                CustomLogoURL = _config.GetLogoUrl(),
-                MessageOfTheDay = _config.GetMOTD(),
-                WebHookURL = _config.GetWebHookUrl(),
-                CustomWidgetsEnabled = _config.GetCustomWidgetsEnabled(),
-                InvariantAPIEnabled = _config.GetInvariantApi(),
-                SMTPConfig = _config.GetMailConfig(),
-                OIDCConfig = _config.GetOpenIDConfig()
-            };
-            return PartialView("_ServerConfig", viewModel);
-        }
-        [Authorize(Roles = nameof(UserData.IsRootUser))]
-        public IActionResult SendTestEmail(string emailAddress)
-        {
-            var result = _mailHelper.SendTestEmail(emailAddress);
-            return Json(result);
-        }
         [ResponseCache(Duration = 0, Location = ResponseCacheLocation.None, NoStore = true)]
         public IActionResult Error()
         {

Controllers/LoginController.cs

@@ -49,31 +49,21 @@ namespace CarCareTracker.Controllers
             }
             return View(model: redirectURL);
         }
-        public IActionResult Registration(string token = "", string email = "")
+        public IActionResult Registration()
         {
             if (_config.GetServerDisabledRegistration())
             {
                 return RedirectToAction("Index");
             }
-            var viewModel = new LoginModel
-            {
-                EmailAddress = string.IsNullOrWhiteSpace(email) ? string.Empty : email,
-                Token = string.IsNullOrWhiteSpace(token) ? string.Empty : token
-            };
-            return View(viewModel);
+            return View();
         }
         public IActionResult ForgotPassword()
         {
             return View();
         }
-        public IActionResult ResetPassword(string token = "", string email = "")
+        public IActionResult ResetPassword()
         {
-            var viewModel = new LoginModel
-            {
-                EmailAddress = string.IsNullOrWhiteSpace(email) ? string.Empty : email,
-                Token = string.IsNullOrWhiteSpace(token) ? string.Empty : token
-            };
-            return View(viewModel);
+            return View();
         }
         public IActionResult GetRemoteLoginLink()
         {
@@ -140,39 +130,13 @@ namespace CarCareTracker.Controllers
                         Content = new FormUrlEncodedContent(httpParams)
                     };
                     var tokenResult = await httpClient.SendAsync(httpRequest).Result.Content.ReadAsStringAsync();
-                    var decodedToken = JsonSerializer.Deserialize<OpenIDResult>(tokenResult);
-                    var userJwt = decodedToken?.id_token ?? string.Empty;
-                    var userAccessToken = decodedToken?.access_token ?? string.Empty;
+                    var userJwt = JsonSerializer.Deserialize<OpenIDResult>(tokenResult)?.id_token ?? string.Empty;
                     if (!string.IsNullOrWhiteSpace(userJwt))
                     {
                         //validate JWT token
                         var tokenParser = new JwtSecurityTokenHandler();
                         var parsedToken = tokenParser.ReadJwtToken(userJwt);
-                        var userEmailAddress = string.Empty;
-                        if (parsedToken.Claims.Any(x => x.Type == "email"))
-                        {
-                            userEmailAddress = parsedToken.Claims.First(x => x.Type == "email").Value;
-                        }
-                        else if (!string.IsNullOrWhiteSpace(openIdConfig.UserInfoURL) && !string.IsNullOrWhiteSpace(userAccessToken))
-                        {
-                            //retrieve claims from userinfo endpoint if no email claims are returned within id_token
-                            var userInfoHttpRequest = new HttpRequestMessage(HttpMethod.Get, openIdConfig.UserInfoURL);
-                            userInfoHttpRequest.Headers.Add("Authorization", $"Bearer {userAccessToken}");
-                            var userInfoResult = await httpClient.SendAsync(userInfoHttpRequest).Result.Content.ReadAsStringAsync();
-                            var userInfo = JsonSerializer.Deserialize<OpenIDUserInfo>(userInfoResult);
-                            if (!string.IsNullOrWhiteSpace(userInfo?.email ?? string.Empty))
-                            {
-                                userEmailAddress = userInfo?.email ?? string.Empty;
-                            } else
-                            {
-                                _logger.LogError($"OpenID Provider did not provide an email claim via UserInfo endpoint");
-                            }
-                        }
-                        else
-                        {
-                            var returnedClaims = parsedToken.Claims.Select(x => x.Type);
-                            _logger.LogError($"OpenID Provider did not provide an email claim, claims returned: {string.Join(",", returnedClaims)}");
-                        }
+                        var userEmailAddress = parsedToken.Claims.First(x => x.Type == "email").Value;
                         if (!string.IsNullOrWhiteSpace(userEmailAddress))
                         {
                             var userData = _loginLogic.ValidateOpenIDUser(new LoginModel() { EmailAddress = userEmailAddress });
@@ -216,126 +180,6 @@ namespace CarCareTracker.Controllers
             }
             return new RedirectResult("/Login");
         }
-        public async Task<IActionResult> RemoteAuthDebug(string code, string state = "")
-        {
-            List<OperationResponse> results = new List<OperationResponse>();
-            try
-            {
-                if (!string.IsNullOrWhiteSpace(code))
-                {
-                    results.Add(OperationResponse.Succeed($"Received code from OpenID Provider: {code}"));
-                    //received code from OIDC provider
-                    //create http client to retrieve user token from OIDC
-                    var httpClient = new HttpClient();
-                    var openIdConfig = _config.GetOpenIDConfig();
-                    //check if validate state is enabled.
-                    if (openIdConfig.ValidateState)
-                    {
-                        var storedStateValue = Request.Cookies["OIDC_STATE"];
-                        if (!string.IsNullOrWhiteSpace(storedStateValue))
-                        {
-                            Response.Cookies.Delete("OIDC_STATE");
-                        }
-                        if (string.IsNullOrWhiteSpace(storedStateValue) || string.IsNullOrWhiteSpace(state) || storedStateValue != state)
-                        {
-                            results.Add(OperationResponse.Failed($"Failed State Validation - Expected: {storedStateValue} Received: {state}"));
-                        } else
-                        {
-                            results.Add(OperationResponse.Succeed($"Passed State Validation - Expected: {storedStateValue} Received: {state}"));
-                        }
-                    }
-                    var httpParams = new List<KeyValuePair<string, string>>
-                {
-                     new KeyValuePair<string, string>("code", code),
-                     new KeyValuePair<string, string>("grant_type", "authorization_code"),
-                     new KeyValuePair<string, string>("client_id", openIdConfig.ClientId),
-                     new KeyValuePair<string, string>("client_secret", openIdConfig.ClientSecret),
-                     new KeyValuePair<string, string>("redirect_uri", openIdConfig.RedirectURL)
-                };
-                    if (openIdConfig.UsePKCE)
-                    {
-                        //retrieve stored challenge verifier
-                        var storedVerifier = Request.Cookies["OIDC_VERIFIER"];
-                        if (!string.IsNullOrWhiteSpace(storedVerifier))
-                        {
-                            httpParams.Add(new KeyValuePair<string, string>("code_verifier", storedVerifier));
-                            Response.Cookies.Delete("OIDC_VERIFIER");
-                        }
-                    }
-                    var httpRequest = new HttpRequestMessage(HttpMethod.Post, openIdConfig.TokenURL)
-                    {
-                        Content = new FormUrlEncodedContent(httpParams)
-                    };
-                    var tokenResult = await httpClient.SendAsync(httpRequest).Result.Content.ReadAsStringAsync();
-                    var decodedToken = JsonSerializer.Deserialize<OpenIDResult>(tokenResult);
-                    var userJwt = decodedToken?.id_token ?? string.Empty;
-                    var userAccessToken = decodedToken?.access_token ?? string.Empty;
-                    if (!string.IsNullOrWhiteSpace(userJwt))
-                    {
-                        results.Add(OperationResponse.Succeed($"Passed JWT Parsing - id_token: {userJwt}"));
-                        //validate JWT token
-                        var tokenParser = new JwtSecurityTokenHandler();
-                        var parsedToken = tokenParser.ReadJwtToken(userJwt);
-                        var userEmailAddress = string.Empty;
-                        if (parsedToken.Claims.Any(x => x.Type == "email"))
-                        {
-                            userEmailAddress = parsedToken.Claims.First(x => x.Type == "email").Value;
-                            results.Add(OperationResponse.Succeed($"Passed Claim Validation - email"));
-                        }
-                        else if (!string.IsNullOrWhiteSpace(openIdConfig.UserInfoURL) && !string.IsNullOrWhiteSpace(userAccessToken))
-                        {
-                            //retrieve claims from userinfo endpoint if no email claims are returned within id_token
-                            var userInfoHttpRequest = new HttpRequestMessage(HttpMethod.Get, openIdConfig.UserInfoURL);
-                            userInfoHttpRequest.Headers.Add("Authorization", $"Bearer {userAccessToken}");
-                            var userInfoResult = await httpClient.SendAsync(userInfoHttpRequest).Result.Content.ReadAsStringAsync();
-                            var userInfo = JsonSerializer.Deserialize<OpenIDUserInfo>(userInfoResult);
-                            if (!string.IsNullOrWhiteSpace(userInfo?.email ?? string.Empty))
-                            {
-                                userEmailAddress = userInfo?.email ?? string.Empty;
-                                results.Add(OperationResponse.Succeed($"Passed Claim Validation - Retrieved email via UserInfo endpoint"));
-                            } else
-                            {
-                                results.Add(OperationResponse.Failed($"Failed Claim Validation - Unable to retrieve email via UserInfo endpoint: {openIdConfig.UserInfoURL} using access_token: {userAccessToken} - Received {userInfoResult}"));
-                            }
-                        }
-                        else
-                        {
-                            var returnedClaims = parsedToken.Claims.Select(x => x.Type);
-                            results.Add(OperationResponse.Failed($"Failed Claim Validation - Expected: email Received: {string.Join(",", returnedClaims)}"));
-                        }
-                        if (!string.IsNullOrWhiteSpace(userEmailAddress))
-                        {
-                            var userData = _loginLogic.ValidateOpenIDUser(new LoginModel() { EmailAddress = userEmailAddress });
-                            if (userData.Id != default)
-                            {
-                                results.Add(OperationResponse.Succeed($"Passed User Validation - Email: {userEmailAddress} Username: {userData.UserName}"));
-                            }
-                            else
-                            {
-                                results.Add(OperationResponse.Succeed($"Passed Email Validation - Email: {userEmailAddress} User not registered"));
-                            }
-                        }
-                        else
-                        {
-                            results.Add(OperationResponse.Failed($"Failed Email Validation - No email received from OpenID Provider"));
-                        }
-                    }
-                    else
-                    {
-                        results.Add(OperationResponse.Failed($"Failed to parse JWT - Expected: id_token Received: {tokenResult}"));
-                    }
-                }
-                else
-                {
-                    results.Add(OperationResponse.Failed("No code received from OpenID Provider"));
-                }
-            }
-            catch (Exception ex)
-            {
-                results.Add(OperationResponse.Failed($"Exception: {ex.Message}"));
-            }
-            return View(results);
-        }
         [HttpPost]
         public IActionResult Login(LoginModel credentials)
         {
@@ -396,12 +240,6 @@ namespace CarCareTracker.Controllers
             return Json(result);
         }
         [HttpPost]
-        public IActionResult SendRegistrationToken(LoginModel credentials)
-        {
-            var result = _loginLogic.SendRegistrationToken(credentials);
-            return Json(result);
-        }
-        [HttpPost]
         public IActionResult RequestResetPassword(LoginModel credentials)
         {
             var result = _loginLogic.RequestResetPassword(credentials);

Controllers/MigrationController.cs

@@ -15,7 +15,7 @@ namespace CarCareTracker.Controllers
         private IConfigHelper _configHelper;
         private IFileHelper _fileHelper;
         private readonly ILogger<MigrationController> _logger;
-        public MigrationController(IConfigHelper configHelper, IFileHelper fileHelper, ILogger<MigrationController> logger)
+        public MigrationController(IConfigHelper configHelper, IFileHelper fileHelper, IConfiguration serverConfig, ILogger<MigrationController> logger)
         {
             _configHelper = configHelper;
             _fileHelper = fileHelper;
@@ -66,7 +66,7 @@ namespace CarCareTracker.Controllers
         {
             if (string.IsNullOrWhiteSpace(_configHelper.GetServerPostgresConnection()))
             {
-                return Json(OperationResponse.Failed("Postgres connection not set up"));
+                return Json(new OperationResponse { Success = false, Message = "Postgres connection not set up" });
             }
             var tempFolder = $"temp/{Guid.NewGuid()}";
             var tempPath = $"{tempFolder}/cartracker.db";
@@ -419,24 +419,24 @@ namespace CarCareTracker.Controllers
                 #endregion
                 var destFilePath = $"{fullFolderPath}.zip";
                 ZipFile.CreateFromDirectory(fullFolderPath, destFilePath);
-                return Json(OperationResponse.Succeed($"/{tempFolder}.zip"));
+                return Json(new OperationResponse { Success = true, Message = $"/{tempFolder}.zip" });
             }
             catch (Exception ex)
             {
                 _logger.LogError(ex.Message);
-                return Json(OperationResponse.Failed());
+                return Json(new OperationResponse { Success = false, Message = StaticHelper.GenericErrorMessage });
             }
         }
         public IActionResult Import(string fileName)
         {
             if (string.IsNullOrWhiteSpace(_configHelper.GetServerPostgresConnection()))
             {
-                return Json(OperationResponse.Failed("Postgres connection not set up"));
+                return Json(new OperationResponse { Success = false, Message = "Postgres connection not set up" });
             }
             var fullFileName = _fileHelper.GetFullFilePath(fileName);
             if (string.IsNullOrWhiteSpace(fullFileName))
             {
-                return Json(OperationResponse.Failed());
+                return Json(new OperationResponse { Success = false, Message = StaticHelper.GenericErrorMessage });
             }
             try
             {
@@ -744,12 +744,12 @@ namespace CarCareTracker.Controllers
                     }
                 }
                 #endregion
-                return Json(OperationResponse.Succeed("Data Imported Successfully"));
+                return Json(new OperationResponse { Success = true, Message = "Data Imported Successfully" });
             }
             catch (Exception ex)
             {
                 _logger.LogError(ex.Message);
-                return Json(OperationResponse.Failed());
+                return Json(new OperationResponse { Success = false, Message = StaticHelper.GenericErrorMessage });
             }
         }
     }

Controllers/Vehicle/GasController.cs

@@ -35,11 +35,6 @@ namespace CarCareTracker.Controllers
         [HttpPost]
         public IActionResult SaveGasRecordToVehicleId(GasRecordInput gasRecord)
         {
-            //security check.
-            if (!_userLogic.UserCanEditVehicle(GetUserID(), gasRecord.VehicleId))
-            {
-                return Json(false);
-            }
             if (gasRecord.Id == default && _config.GetUserConfig(User).EnableAutoOdometerInsert)
             {
                 _odometerLogic.AutoInsertOdometerRecord(new OdometerRecord
@@ -54,11 +49,10 @@ namespace CarCareTracker.Controllers
             var result = _gasRecordDataAccess.SaveGasRecordToVehicle(gasRecord.ToGasRecord());
             if (result)
             {
-                StaticHelper.NotifyAsync(_config.GetWebHookUrl(), WebHookPayload.FromGasRecord(gasRecord.ToGasRecord(), gasRecord.Id == default ? "gasrecord.add" : "gasrecord.update", User.Identity.Name));
+                StaticHelper.NotifyAsync(_config.GetWebHookUrl(), gasRecord.VehicleId, User.Identity.Name, $"{(gasRecord.Id == default ? "Created" : "Edited")} Gas Record - Mileage: {gasRecord.Mileage.ToString()}");
             }
             return Json(result);
         }
-        [TypeFilter(typeof(CollaboratorFilter))]
         [HttpGet]
         public IActionResult GetAddGasRecordPartialView(int vehicleId)
         {
@@ -71,11 +65,6 @@ namespace CarCareTracker.Controllers
         public IActionResult GetGasRecordForEditById(int gasRecordId)
         {
             var result = _gasRecordDataAccess.GetGasRecordById(gasRecordId);
-            //security check.
-            if (!_userLogic.UserCanEditVehicle(GetUserID(), result.VehicleId))
-            {
-                return Redirect("/Error/Unauthorized");
-            }
             var convertedResult = new GasRecordInput
             {
                 Id = result.Id,
@@ -102,25 +91,14 @@ namespace CarCareTracker.Controllers
             };
             return PartialView("_GasModal", viewModel);
         }
-        private bool DeleteGasRecordWithChecks(int gasRecordId)
-        {
-            var existingRecord = _gasRecordDataAccess.GetGasRecordById(gasRecordId);
-            //security check.
-            if (!_userLogic.UserCanEditVehicle(GetUserID(), existingRecord.VehicleId))
-            {
-                return false;
-            }
-            var result = _gasRecordDataAccess.DeleteGasRecordById(existingRecord.Id);
-            if (result)
-            {
-                StaticHelper.NotifyAsync(_config.GetWebHookUrl(), WebHookPayload.FromGasRecord(existingRecord, "gasrecord.delete", User.Identity.Name));
-            }
-            return result;
-        }
         [HttpPost]
         public IActionResult DeleteGasRecordById(int gasRecordId)
         {
-            var result = DeleteGasRecordWithChecks(gasRecordId);
+            var result = _gasRecordDataAccess.DeleteGasRecordById(gasRecordId);
+            if (result)
+            {
+                StaticHelper.NotifyAsync(_config.GetWebHookUrl(), 0, User.Identity.Name, $"Deleted Gas Record - Id: {gasRecordId}");
+            }
             return Json(result);
         }
         [HttpPost]

Controllers/Vehicle/ImportController.cs

@@ -16,176 +16,6 @@ namespace CarCareTracker.Controllers
         {
             return PartialView("_BulkDataImporter", mode);
         }
-        [HttpGet]
-        public IActionResult GenerateCsvSample(ImportMode mode)
-        {
-            string uploadDirectory = "temp/";
-            string uploadPath = Path.Combine(_webEnv.ContentRootPath, "data", uploadDirectory);
-            if (!Directory.Exists(uploadPath))
-                Directory.CreateDirectory(uploadPath);
-            var fileNameToExport = $"temp/{Guid.NewGuid()}.csv";
-            var fullExportFilePath = _fileHelper.GetFullFilePath(fileNameToExport, false);
-            switch (mode)
-            {
-                case ImportMode.ServiceRecord:
-                case ImportMode.RepairRecord:
-                case ImportMode.UpgradeRecord:
-                    {
-                        var exportData = new List<GenericRecordExportModel> { new GenericRecordExportModel
-                        {
-                            Date = DateTime.Now.ToShortDateString(),
-                            Description = "Test",
-                            Cost = 123.45M.ToString("C"),
-                            Notes = "Test Note",
-                            Odometer = 12345.ToString(),
-                            Tags = "test1 test2"
-                        } };
-                        using (var writer = new StreamWriter(fullExportFilePath))
-                        {
-                            using (var csv = new CsvWriter(writer, CultureInfo.InvariantCulture))
-                            {
-                                //custom writer
-                                StaticHelper.WriteGenericRecordExportModel(csv, exportData);
-                            }
-                            writer.Dispose();
-                        }
-                    }
-                    break;
-                case ImportMode.GasRecord:
-                    {
-                        var exportData = new List<GasRecordExportModel> { new GasRecordExportModel
-                        {
-                            Date = DateTime.Now.ToShortDateString(),
-                            Odometer = 12345.ToString(),
-                            FuelConsumed = 12.34M.ToString(),
-                            Cost = 45.67M.ToString("C"),
-                            IsFillToFull = true.ToString(),
-                            MissedFuelUp = false.ToString(),
-                            Notes = "Test Note",
-                            Tags = "test1 test2"
-                        } };
-                        using (var writer = new StreamWriter(fullExportFilePath))
-                        {
-                            using (var csv = new CsvWriter(writer, CultureInfo.InvariantCulture))
-                            {
-                                //custom writer
-                                StaticHelper.WriteGasRecordExportModel(csv, exportData);
-                            }
-                            writer.Dispose();
-                        }
-                    }
-                    break;
-                case ImportMode.OdometerRecord:
-                    {
-                        var exportData = new List<OdometerRecordExportModel> {  new OdometerRecordExportModel
-                        {
-                            Date = DateTime.Now.ToShortDateString(),
-                            InitialOdometer = 12345.ToString(),
-                            Odometer = 12345.ToString(),
-                            Notes = "Test Note",
-                            Tags = "test1 test2"
-                        } };
-                        using (var writer = new StreamWriter(fullExportFilePath))
-                        {
-                            using (var csv = new CsvWriter(writer, CultureInfo.InvariantCulture))
-                            {
-                                //custom writer
-                                StaticHelper.WriteOdometerRecordExportModel(csv, exportData);
-                            }
-                            writer.Dispose();
-                        }
-                    }
-                    break;
-                case ImportMode.TaxRecord:
-                    {
-                        var exportData = new List<TaxRecordExportModel> {  new TaxRecordExportModel
-                        {
-                            Date = DateTime.Now.ToShortDateString(),
-                            Description = "Test",
-                            Cost = 123.45M.ToString("C"),
-                            Notes = "Test Note",
-                            Tags = "test1 test2"
-                        } };
-                        using (var writer = new StreamWriter(fullExportFilePath))
-                        {
-                            using (var csv = new CsvWriter(writer, CultureInfo.InvariantCulture))
-                            {
-                                //custom writer
-                                StaticHelper.WriteTaxRecordExportModel(csv, exportData);
-                            }
-                            writer.Dispose();
-                        }
-                    }
-                    break;
-                case ImportMode.SupplyRecord:
-                    {
-                        var exportData = new List<SupplyRecordExportModel> { new SupplyRecordExportModel
-                        {
-                            Date = DateTime.Now.ToShortDateString(),
-                            PartNumber = "TEST-123456",
-                            PartSupplier = "Test Supplier",
-                            PartQuantity = 1.5M.ToString(),
-                            Description = "Test",
-                            Cost = 123.45M.ToString("C"),
-                            Notes = "Test Note",
-                            Tags = "test1 test2"
-                        } };
-                        using (var writer = new StreamWriter(fullExportFilePath))
-                        {
-                            using (var csv = new CsvWriter(writer, CultureInfo.InvariantCulture))
-                            {
-                                //custom writer
-                                StaticHelper.WriteSupplyRecordExportModel(csv, exportData);
-                            }
-                            writer.Dispose();
-                        }
-                    }
-                    break;
-                case ImportMode.PlanRecord:
-                    {
-                        var exportData = new List<PlanRecordExportModel> {  new PlanRecordExportModel
-                        {
-                            DateCreated = DateTime.Now.ToString(),
-                            DateModified = DateTime.Now.ToString(),
-                            Description = "Test",
-                            Type = ImportMode.RepairRecord.ToString(),
-                            Priority = PlanPriority.Normal.ToString(),
-                            Progress = PlanProgress.Testing.ToString(),
-                            Cost = 123.45M.ToString("C"),
-                            Notes = "Test Note"
-                        } };
-                        using (var writer = new StreamWriter(fullExportFilePath))
-                        {
-                            using (var csv = new CsvWriter(writer, CultureInfo.InvariantCulture))
-                            {
-                                //custom writer
-                                StaticHelper.WritePlanRecordExportModel(csv, exportData);
-                            }
-                            writer.Dispose();
-                        }
-                    }
-                    break;
-                default:
-                    return Json(OperationResponse.Failed("No parameters"));
-            }
-            try
-            {
-                var fileBytes = _fileHelper.GetFileBytes(fullExportFilePath, true);
-                if (fileBytes.Length > 0)
-                {
-                    return File(fileBytes, "text/csv", $"{mode.ToString().ToLower()}sample.csv");
-                }
-                else
-                {
-                    return Json(OperationResponse.Failed("An error has occurred while generating CSV sample: file has zero bytes"));
-                }
-            }
-            catch (Exception ex)
-            {
-                _logger.LogError(ex.Message);
-                return Json(OperationResponse.Failed($"An error has occurred while generating CSV sample: {ex.Message}"));
-            }
-        }
         [TypeFilter(typeof(CollaboratorFilter))]
         [HttpGet]
         public IActionResult ExportFromVehicleToCsv(int vehicleId, ImportMode mode)
@@ -195,7 +25,7 @@ namespace CarCareTracker.Controllers
                 return Json(false);
             }
             string uploadDirectory = "temp/";
-            string uploadPath = Path.Combine(_webEnv.ContentRootPath, "data", uploadDirectory);
+            string uploadPath = Path.Combine(_webEnv.WebRootPath, uploadDirectory);
             if (!Directory.Exists(uploadPath))
                 Directory.CreateDirectory(uploadPath);
             var fileNameToExport = $"temp/{Guid.NewGuid()}.csv";
@@ -443,22 +273,13 @@ namespace CarCareTracker.Controllers
                             var requiredExtraFields = _extraFieldDataAccess.GetExtraFieldsById((int)mode).ExtraFields.Where(x => x.IsRequired).Select(y => y.Name);
                             foreach (ImportModel importModel in records)
                             {
-                                var parsedDate = DateTime.Now.Date;
-                                if (!string.IsNullOrWhiteSpace(importModel.Date))
-                                {
-                                    parsedDate = DateTime.Parse(importModel.Date);
-                                }
-                                else if (!string.IsNullOrWhiteSpace(importModel.Day) && !string.IsNullOrWhiteSpace(importModel.Month) && !string.IsNullOrWhiteSpace(importModel.Year))
-                                {
-                                    parsedDate = new DateTime(int.Parse(importModel.Year), int.Parse(importModel.Month), int.Parse(importModel.Day));
-                                }
                                 if (mode == ImportMode.GasRecord)
                                 {
                                     //convert to gas model.
                                     var convertedRecord = new GasRecord()
                                     {
                                         VehicleId = vehicleId,
-                                        Date = parsedDate,
+                                        Date = DateTime.Parse(importModel.Date),
                                         Mileage = decimal.ToInt32(decimal.Parse(importModel.Odometer, NumberStyles.Any)),
                                         Gallons = decimal.Parse(importModel.FuelConsumed, NumberStyles.Any),
                                         Notes = string.IsNullOrWhiteSpace(importModel.Notes) ? "" : importModel.Notes,
@@ -514,9 +335,9 @@ namespace CarCareTracker.Controllers
                                     var convertedRecord = new ServiceRecord()
                                     {
                                         VehicleId = vehicleId,
-                                        Date = parsedDate,
+                                        Date = DateTime.Parse(importModel.Date),
                                         Mileage = decimal.ToInt32(decimal.Parse(importModel.Odometer, NumberStyles.Any)),
-                                        Description = string.IsNullOrWhiteSpace(importModel.Description) ? $"Service Record on {parsedDate.ToShortDateString()}" : importModel.Description,
+                                        Description = string.IsNullOrWhiteSpace(importModel.Description) ? $"Service Record on {importModel.Date}" : importModel.Description,
                                         Notes = string.IsNullOrWhiteSpace(importModel.Notes) ? "" : importModel.Notes,
                                         Cost = decimal.Parse(importModel.Cost, NumberStyles.Any),
                                         Tags = string.IsNullOrWhiteSpace(importModel.Tags) ? [] : importModel.Tags.Split(" ").ToList(),
@@ -539,7 +360,7 @@ namespace CarCareTracker.Controllers
                                     var convertedRecord = new OdometerRecord()
                                     {
                                         VehicleId = vehicleId,
-                                        Date = parsedDate,
+                                        Date = DateTime.Parse(importModel.Date),
                                         InitialMileage = string.IsNullOrWhiteSpace(importModel.InitialOdometer) ? 0 : decimal.ToInt32(decimal.Parse(importModel.InitialOdometer, NumberStyles.Any)),
                                         Mileage = decimal.ToInt32(decimal.Parse(importModel.Odometer, NumberStyles.Any)),
                                         Notes = string.IsNullOrWhiteSpace(importModel.Notes) ? "" : importModel.Notes,
@@ -573,9 +394,9 @@ namespace CarCareTracker.Controllers
                                     var convertedRecord = new CollisionRecord()
                                     {
                                         VehicleId = vehicleId,
-                                        Date = parsedDate,
+                                        Date = DateTime.Parse(importModel.Date),
                                         Mileage = decimal.ToInt32(decimal.Parse(importModel.Odometer, NumberStyles.Any)),
-                                        Description = string.IsNullOrWhiteSpace(importModel.Description) ? $"Repair Record on {parsedDate.ToShortDateString()}" : importModel.Description,
+                                        Description = string.IsNullOrWhiteSpace(importModel.Description) ? $"Repair Record on {importModel.Date}" : importModel.Description,
                                         Notes = string.IsNullOrWhiteSpace(importModel.Notes) ? "" : importModel.Notes,
                                         Cost = decimal.Parse(importModel.Cost, NumberStyles.Any),
                                         Tags = string.IsNullOrWhiteSpace(importModel.Tags) ? [] : importModel.Tags.Split(" ").ToList(),
@@ -598,9 +419,9 @@ namespace CarCareTracker.Controllers
                                     var convertedRecord = new UpgradeRecord()
                                     {
                                         VehicleId = vehicleId,
-                                        Date = parsedDate,
+                                        Date = DateTime.Parse(importModel.Date),
                                         Mileage = decimal.ToInt32(decimal.Parse(importModel.Odometer, NumberStyles.Any)),
-                                        Description = string.IsNullOrWhiteSpace(importModel.Description) ? $"Upgrade Record on {parsedDate.ToShortDateString()}" : importModel.Description,
+                                        Description = string.IsNullOrWhiteSpace(importModel.Description) ? $"Upgrade Record on {importModel.Date}" : importModel.Description,
                                         Notes = string.IsNullOrWhiteSpace(importModel.Notes) ? "" : importModel.Notes,
                                         Cost = decimal.Parse(importModel.Cost, NumberStyles.Any),
                                         Tags = string.IsNullOrWhiteSpace(importModel.Tags) ? [] : importModel.Tags.Split(" ").ToList(),
@@ -623,7 +444,7 @@ namespace CarCareTracker.Controllers
                                     var convertedRecord = new SupplyRecord()
                                     {
                                         VehicleId = vehicleId,
-                                        Date = parsedDate,
+                                        Date = DateTime.Parse(importModel.Date),
                                         PartNumber = importModel.PartNumber,
                                         PartSupplier = importModel.PartSupplier,
                                         Quantity = decimal.Parse(importModel.PartQuantity, NumberStyles.Any),
@@ -640,8 +461,8 @@ namespace CarCareTracker.Controllers
                                     var convertedRecord = new TaxRecord()
                                     {
                                         VehicleId = vehicleId,
-                                        Date = parsedDate,
-                                        Description = string.IsNullOrWhiteSpace(importModel.Description) ? $"Tax Record on {parsedDate.ToShortDateString()}" : importModel.Description,
+                                        Date = DateTime.Parse(importModel.Date),
+                                        Description = string.IsNullOrWhiteSpace(importModel.Description) ? $"Tax Record on {importModel.Date}" : importModel.Description,
                                         Notes = string.IsNullOrWhiteSpace(importModel.Notes) ? "" : importModel.Notes,
                                         Cost = decimal.Parse(importModel.Cost, NumberStyles.Any),
                                         Tags = string.IsNullOrWhiteSpace(importModel.Tags) ? [] : importModel.Tags.Split(" ").ToList(),

Controllers/Vehicle/NoteController.cs

@@ -12,7 +12,7 @@ namespace CarCareTracker.Controllers
         public IActionResult GetNotesByVehicleId(int vehicleId)
         {
             var result = _noteDataAccess.GetNotesByVehicleId(vehicleId);
-            result = result.OrderByDescending(x => x.Pinned).ThenBy(x => x.Description).ToList();
+            result = result.OrderByDescending(x => x.Pinned).ToList();
             return PartialView("_Notes", result);
         }
         [TypeFilter(typeof(CollaboratorFilter))]
@@ -26,17 +26,11 @@ namespace CarCareTracker.Controllers
         [HttpPost]
         public IActionResult SaveNoteToVehicleId(Note note)
         {
-            //security check.
-            if (!_userLogic.UserCanEditVehicle(GetUserID(), note.VehicleId))
-            {
-                return Json(false);
-            }
             note.Files = note.Files.Select(x => { return new UploadedFiles { Name = x.Name, Location = _fileHelper.MoveFileFromTemp(x.Location, "documents/") }; }).ToList();
-            bool isCreate = note.Id == default; //needed here since Notes don't use an input object.
             var result = _noteDataAccess.SaveNoteToVehicle(note);
             if (result)
             {
-                StaticHelper.NotifyAsync(_config.GetWebHookUrl(), WebHookPayload.FromNoteRecord(note, isCreate ? "noterecord.add" : "noterecord.update", User.Identity.Name));
+                StaticHelper.NotifyAsync(_config.GetWebHookUrl(), note.VehicleId, User.Identity.Name, $"{(note.Id == default ? "Created" : "Edited")} Note - Description: {note.Description}");
             }
             return Json(result);
         }
@@ -49,32 +43,16 @@ namespace CarCareTracker.Controllers
         public IActionResult GetNoteForEditById(int noteId)
         {
             var result = _noteDataAccess.GetNoteById(noteId);
-            //security check.
-            if (!_userLogic.UserCanEditVehicle(GetUserID(), result.VehicleId))
-            {
-                return Redirect("/Error/Unauthorized");
-            }
             return PartialView("_NoteModal", result);
         }
-        private bool DeleteNoteWithChecks(int noteId)
-        {
-            var existingRecord = _noteDataAccess.GetNoteById(noteId);
-            //security check.
-            if (!_userLogic.UserCanEditVehicle(GetUserID(), existingRecord.VehicleId))
-            {
-                return false;
-            }
-            var result = _noteDataAccess.DeleteNoteById(existingRecord.Id);
-            if (result)
-            {
-                StaticHelper.NotifyAsync(_config.GetWebHookUrl(), WebHookPayload.FromNoteRecord(existingRecord, "noterecord.delete", User.Identity.Name));
-            }
-            return result;
-        }
         [HttpPost]
         public IActionResult DeleteNoteById(int noteId)
         {
-            var result = DeleteNoteWithChecks(noteId);
+            var result = _noteDataAccess.DeleteNoteById(noteId);
+            if (result)
+            {
+                StaticHelper.NotifyAsync(_config.GetWebHookUrl(), 0, User.Identity.Name, $"Deleted Note - Id: {noteId}");
+            }
             return Json(result);
         }
         [HttpPost]

Controllers/Vehicle/OdometerController.cs

@@ -39,21 +39,15 @@ namespace CarCareTracker.Controllers
         [HttpPost]
         public IActionResult SaveOdometerRecordToVehicleId(OdometerRecordInput odometerRecord)
         {
-            //security check.
-            if (!_userLogic.UserCanEditVehicle(GetUserID(), odometerRecord.VehicleId))
-            {
-                return Json(false);
-            }
             //move files from temp.
             odometerRecord.Files = odometerRecord.Files.Select(x => { return new UploadedFiles { Name = x.Name, Location = _fileHelper.MoveFileFromTemp(x.Location, "documents/") }; }).ToList();
             var result = _odometerRecordDataAccess.SaveOdometerRecordToVehicle(odometerRecord.ToOdometerRecord());
             if (result)
             {
-                StaticHelper.NotifyAsync(_config.GetWebHookUrl(), WebHookPayload.FromOdometerRecord(odometerRecord.ToOdometerRecord(), odometerRecord.Id == default ? "odometerrecord.add" : "odometerrecord.update", User.Identity.Name));
+                StaticHelper.NotifyAsync(_config.GetWebHookUrl(), odometerRecord.VehicleId, User.Identity.Name, $"{(odometerRecord.Id == default ? "Created" : "Edited")} Odometer Record - Mileage: {odometerRecord.Mileage.ToString()}");
             }
             return Json(result);
         }
-        [TypeFilter(typeof(CollaboratorFilter))]
         [HttpGet]
         public IActionResult GetAddOdometerRecordPartialView(int vehicleId)
         {
@@ -131,11 +125,6 @@ namespace CarCareTracker.Controllers
         public IActionResult GetOdometerRecordForEditById(int odometerRecordId)
         {
             var result = _odometerRecordDataAccess.GetOdometerRecordById(odometerRecordId);
-            //security check.
-            if (!_userLogic.UserCanEditVehicle(GetUserID(), result.VehicleId))
-            {
-                return Redirect("/Error/Unauthorized");
-            }
             //convert to Input object.
             var convertedResult = new OdometerRecordInput
             {
@@ -151,25 +140,14 @@ namespace CarCareTracker.Controllers
             };
             return PartialView("_OdometerRecordModal", convertedResult);
         }
-        private bool DeleteOdometerRecordWithChecks(int odometerRecordId)
-        {
-            var existingRecord = _odometerRecordDataAccess.GetOdometerRecordById(odometerRecordId);
-            //security check.
-            if (!_userLogic.UserCanEditVehicle(GetUserID(), existingRecord.VehicleId))
-            {
-                return false;
-            }
-            var result = _odometerRecordDataAccess.DeleteOdometerRecordById(existingRecord.Id);
-            if (result)
-            {
-                StaticHelper.NotifyAsync(_config.GetWebHookUrl(), WebHookPayload.FromOdometerRecord(existingRecord, "odometerrecord.delete", User.Identity.Name));
-            }
-            return result;
-        }
         [HttpPost]
         public IActionResult DeleteOdometerRecordById(int odometerRecordId)
         {
-            var result = DeleteOdometerRecordWithChecks(odometerRecordId);
+            var result = _odometerRecordDataAccess.DeleteOdometerRecordById(odometerRecordId);
+            if (result)
+            {
+                StaticHelper.NotifyAsync(_config.GetWebHookUrl(), 0, User.Identity.Name, $"Deleted Odometer Record - Id: {odometerRecordId}");
+            }
             return Json(result);
         }
     }

Controllers/Vehicle/PlanController.cs

@@ -17,11 +17,6 @@ namespace CarCareTracker.Controllers
         [HttpPost]
         public IActionResult SavePlanRecordToVehicleId(PlanRecordInput planRecord)
         {
-            //security check.
-            if (!_userLogic.UserCanEditVehicle(GetUserID(), planRecord.VehicleId))
-            {
-                return Json(false);
-            }
             //populate createdDate
             if (planRecord.Id == default)
             {
@@ -32,40 +27,31 @@ namespace CarCareTracker.Controllers
             planRecord.Files = planRecord.Files.Select(x => { return new UploadedFiles { Name = x.Name, Location = _fileHelper.MoveFileFromTemp(x.Location, "documents/") }; }).ToList();
             if (planRecord.Supplies.Any())
             {
-                planRecord.RequisitionHistory.AddRange(RequisitionSupplyRecordsByUsage(planRecord.Supplies, DateTime.Parse(planRecord.DateCreated), planRecord.Description));
+                planRecord.RequisitionHistory = RequisitionSupplyRecordsByUsage(planRecord.Supplies, DateTime.Parse(planRecord.DateCreated), planRecord.Description);
                 if (planRecord.CopySuppliesAttachment)
                 {
                     planRecord.Files.AddRange(GetSuppliesAttachments(planRecord.Supplies));
                 }
             }
-            if (planRecord.DeletedRequisitionHistory.Any())
-            {
-                _vehicleLogic.RestoreSupplyRecordsByUsage(planRecord.DeletedRequisitionHistory, planRecord.Description);
-            }
             var result = _planRecordDataAccess.SavePlanRecordToVehicle(planRecord.ToPlanRecord());
             if (result)
             {
-                StaticHelper.NotifyAsync(_config.GetWebHookUrl(), WebHookPayload.FromPlanRecord(planRecord.ToPlanRecord(), planRecord.Id == default ? "planrecord.add" : "planrecord.update", User.Identity.Name));
+                StaticHelper.NotifyAsync(_config.GetWebHookUrl(), planRecord.VehicleId, User.Identity.Name, $"{(planRecord.Id == default ? "Created" : "Edited")} Plan Record - Description: {planRecord.Description}");
             }
             return Json(result);
         }
         [HttpPost]
         public IActionResult SavePlanRecordTemplateToVehicleId(PlanRecordInput planRecord)
         {
-            //security check.
-            if (!_userLogic.UserCanEditVehicle(GetUserID(), planRecord.VehicleId))
-            {
-                return Json(OperationResponse.Failed("Access Denied"));
-            }
             //check if template name already taken.
             var existingRecord = _planRecordTemplateDataAccess.GetPlanRecordTemplatesByVehicleId(planRecord.VehicleId).Where(x => x.Description == planRecord.Description).Any();
             if (planRecord.Id == default && existingRecord)
             {
-                return Json(OperationResponse.Failed("A template with that description already exists for this vehicle"));
+                return Json(new OperationResponse { Success = false, Message = "A template with that description already exists for this vehicle" });
             }
             planRecord.Files = planRecord.Files.Select(x => { return new UploadedFiles { Name = x.Name, Location = _fileHelper.MoveFileFromTemp(x.Location, "documents/") }; }).ToList();
             var result = _planRecordTemplateDataAccess.SavePlanRecordTemplateToVehicle(planRecord);
-            return Json(OperationResponse.Conditional(result, "Template Added", string.Empty));
+            return Json(new OperationResponse { Success = result, Message = result ? "Template Added" : StaticHelper.GenericErrorMessage });
         }
         [TypeFilter(typeof(CollaboratorFilter))]
         [HttpGet]
@@ -77,16 +63,6 @@ namespace CarCareTracker.Controllers
         [HttpPost]
         public IActionResult DeletePlanRecordTemplateById(int planRecordTemplateId)
         {
-            var existingRecord = _planRecordTemplateDataAccess.GetPlanRecordTemplateById(planRecordTemplateId);
-            if (existingRecord.Id == default)
-            {
-                return Json(false);
-            }
-            //security check.
-            if (!_userLogic.UserCanEditVehicle(GetUserID(), existingRecord.VehicleId))
-            {
-                return Json(false);
-            }
             var result = _planRecordTemplateDataAccess.DeletePlanRecordTemplateById(planRecordTemplateId);
             return Json(result);
         }
@@ -96,12 +72,7 @@ namespace CarCareTracker.Controllers
             var existingRecord = _planRecordTemplateDataAccess.GetPlanRecordTemplateById(planRecordTemplateId);
             if (existingRecord.Id == default)
             {
-                return Json(OperationResponse.Failed("Unable to find template"));
-            }
-            //security check.
-            if (!_userLogic.UserCanEditVehicle(GetUserID(), existingRecord.VehicleId))
-            {
-                return Json(OperationResponse.Failed("Access Denied"));
+                return Json(new OperationResponse { Success = false, Message = "Unable to find template" });
             }
             if (existingRecord.Supplies.Any())
             {
@@ -110,7 +81,7 @@ namespace CarCareTracker.Controllers
             } 
             else
             {
-                return Json(OperationResponse.Failed("Template has No Supplies"));
+                return Json(new OperationResponse { Success = false, Message = "Template has No Supplies" });
             }
         }
         [HttpPost]
@@ -119,12 +90,7 @@ namespace CarCareTracker.Controllers
             var existingRecord = _planRecordTemplateDataAccess.GetPlanRecordTemplateById(planRecordTemplateId);
             if (existingRecord.Id == default)
             {
-                return Json(OperationResponse.Failed("Unable to find template"));
-            }
-            //security check.
-            if (!_userLogic.UserCanEditVehicle(GetUserID(), existingRecord.VehicleId))
-            {
-                return Json(OperationResponse.Failed("Access Denied"));
+                return Json(new OperationResponse { Success = false, Message = "Unable to find template" });
             }
             if (existingRecord.Supplies.Any())
             {
@@ -132,11 +98,11 @@ namespace CarCareTracker.Controllers
                 var supplyAvailability = CheckSupplyRecordsAvailability(existingRecord.Supplies);
                 if (supplyAvailability.Any(x => x.Missing))
                 {
-                    return Json(OperationResponse.Failed("Missing Supplies, Please Delete This Template and Recreate It."));
+                    return Json(new OperationResponse { Success = false, Message = "Missing Supplies, Please Delete This Template and Recreate It." });
                 }
                 else if (supplyAvailability.Any(x => x.Insufficient))
                 {
-                    return Json(OperationResponse.Failed("Insufficient Supplies"));
+                    return Json(new OperationResponse { Success = false, Message = "Insufficient Supplies" });
                 }
             }
             if (existingRecord.ReminderRecordId != default)
@@ -145,7 +111,7 @@ namespace CarCareTracker.Controllers
                 var existingReminder = _reminderRecordDataAccess.GetReminderRecordById(existingRecord.ReminderRecordId);
                 if (existingReminder is null || existingReminder.Id == default || !existingReminder.IsRecurring)
                 {
-                    return Json(OperationResponse.Failed("Missing or Non-recurring Reminder, Please Delete This Template and Recreate It."));
+                    return Json(new OperationResponse { Success = false, Message = "Missing or Non-recurring Reminder, Please Delete This Template and Recreate It." });
                 }
             }
             //populate createdDate
@@ -161,7 +127,7 @@ namespace CarCareTracker.Controllers
                 }
             }
             var result = _planRecordDataAccess.SavePlanRecordToVehicle(existingRecord.ToPlanRecord());
-            return Json(OperationResponse.Conditional(result, "Plan Record Added", string.Empty));
+            return Json(new OperationResponse { Success = result, Message = result ? "Plan Record Added" : StaticHelper.GenericErrorMessage });
         }
         [HttpGet]
         public IActionResult GetAddPlanRecordPartialView()
@@ -181,16 +147,7 @@ namespace CarCareTracker.Controllers
         [HttpPost]
         public IActionResult UpdatePlanRecordProgress(int planRecordId, PlanProgress planProgress, int odometer = 0)
         {
-            if (planRecordId == default)
-            {
-                return Json(false);
-            }
             var existingRecord = _planRecordDataAccess.GetPlanRecordById(planRecordId);
-            //security check.
-            if (!_userLogic.UserCanEditVehicle(GetUserID(), existingRecord.VehicleId))
-            {
-                return Json(false);
-            }
             existingRecord.Progress = planProgress;
             existingRecord.DateModified = DateTime.Now;
             var result = _planRecordDataAccess.SavePlanRecordToVehicle(existingRecord);
@@ -274,11 +231,6 @@ namespace CarCareTracker.Controllers
         public IActionResult GetPlanRecordForEditById(int planRecordId)
         {
             var result = _planRecordDataAccess.GetPlanRecordById(planRecordId);
-            //security check.
-            if (!_userLogic.UserCanEditVehicle(GetUserID(), result.VehicleId))
-            {
-                return Redirect("/Error/Unauthorized");
-            }
             //convert to Input object.
             var convertedResult = new PlanRecordInput
             {
@@ -302,21 +254,10 @@ namespace CarCareTracker.Controllers
         [HttpPost]
         public IActionResult DeletePlanRecordById(int planRecordId)
         {
-            var existingRecord = _planRecordDataAccess.GetPlanRecordById(planRecordId);
-            //security check.
-            if (!_userLogic.UserCanEditVehicle(GetUserID(), existingRecord.VehicleId))
-            {
-                return Json(false);
-            }
-            //restore any requisitioned supplies if it has not been converted to other record types.
-            if (existingRecord.RequisitionHistory.Any() && existingRecord.Progress != PlanProgress.Done)
-            {
-                _vehicleLogic.RestoreSupplyRecordsByUsage(existingRecord.RequisitionHistory, existingRecord.Description);
-            }
-            var result = _planRecordDataAccess.DeletePlanRecordById(existingRecord.Id);
+            var result = _planRecordDataAccess.DeletePlanRecordById(planRecordId);
             if (result)
             {
-                StaticHelper.NotifyAsync(_config.GetWebHookUrl(), WebHookPayload.FromPlanRecord(existingRecord, "planrecord.delete", User.Identity.Name));
+                StaticHelper.NotifyAsync(_config.GetWebHookUrl(), 0, User.Identity.Name, $"Deleted Plan Record - Id: {planRecordId}");
             }
             return Json(result);
         }

Controllers/Vehicle/ReminderController.cs

@@ -60,13 +60,11 @@ namespace CarCareTracker.Controllers
             result = result.OrderByDescending(x => x.Urgency).ToList();
             return PartialView("_ReminderRecords", result);
         }
-        [TypeFilter(typeof(CollaboratorFilter))]
         [HttpGet]
         public IActionResult GetRecurringReminderRecordsByVehicleId(int vehicleId)
         {
-            var result = GetRemindersAndUrgency(vehicleId, DateTime.Now);
+            var result = _reminderRecordDataAccess.GetReminderRecordsByVehicleId(vehicleId);
             result.RemoveAll(x => !x.IsRecurring);
-            result = result.OrderByDescending(x => x.Urgency).ThenBy(x => x.Description).ToList();
             return PartialView("_RecurringReminderSelector", result);
         }
         [HttpPost]
@@ -75,7 +73,7 @@ namespace CarCareTracker.Controllers
             var result = PushbackRecurringReminderRecordWithChecks(reminderRecordId, null, null);
             return Json(result);
         }
-        private bool PushbackRecurringReminderRecordWithChecks(int reminderRecordId, DateTime? currentDate, int? currentMileage)
+        private bool PushbackRecurringReminderRecordWithChecks(int reminderRecordId, DateTime? currentDate, decimal? currentMileage)
         {
             try
             {
@@ -107,15 +105,10 @@ namespace CarCareTracker.Controllers
         [HttpPost]
         public IActionResult SaveReminderRecordToVehicleId(ReminderRecordInput reminderRecord)
         {
-            //security check.
-            if (!_userLogic.UserCanEditVehicle(GetUserID(), reminderRecord.VehicleId))
-            {
-                return Json(false);
-            }
             var result = _reminderRecordDataAccess.SaveReminderRecordToVehicle(reminderRecord.ToReminderRecord());
             if (result)
             {
-                StaticHelper.NotifyAsync(_config.GetWebHookUrl(), WebHookPayload.FromReminderRecord(reminderRecord.ToReminderRecord(), reminderRecord.Id == default ? "reminderrecord.add" : "reminderrecord.update", User.Identity.Name));
+                StaticHelper.NotifyAsync(_config.GetWebHookUrl(), reminderRecord.VehicleId, User.Identity.Name, $"{(reminderRecord.Id == default ? "Created" : "Edited")} Reminder - Description: {reminderRecord.Description}");
             }
             return Json(result);
         }
@@ -135,11 +128,6 @@ namespace CarCareTracker.Controllers
         public IActionResult GetReminderRecordForEditById(int reminderRecordId)
         {
             var result = _reminderRecordDataAccess.GetReminderRecordById(reminderRecordId);
-            //security check.
-            if (!_userLogic.UserCanEditVehicle(GetUserID(), result.VehicleId))
-            {
-                return Redirect("/Error/Unauthorized");
-            }
             //convert to Input object.
             var convertedResult = new ReminderRecordInput
             {
@@ -157,30 +145,18 @@ namespace CarCareTracker.Controllers
                 ReminderMonthInterval = result.ReminderMonthInterval,
                 CustomMileageInterval = result.CustomMileageInterval,
                 CustomMonthInterval = result.CustomMonthInterval,
-                CustomMonthIntervalUnit = result.CustomMonthIntervalUnit,
                 Tags = result.Tags
             };
             return PartialView("_ReminderRecordModal", convertedResult);
         }
-        private bool DeleteReminderRecordWithChecks(int reminderRecordId)
-        {
-            var existingRecord = _reminderRecordDataAccess.GetReminderRecordById(reminderRecordId);
-            //security check.
-            if (!_userLogic.UserCanEditVehicle(GetUserID(), existingRecord.VehicleId))
-            {
-                return false;
-            }
-            var result = _reminderRecordDataAccess.DeleteReminderRecordById(existingRecord.Id);
-            if (result)
-            {
-                StaticHelper.NotifyAsync(_config.GetWebHookUrl(), WebHookPayload.FromReminderRecord(existingRecord, "reminderrecord.delete", User.Identity.Name));
-            }
-            return result;
-        }
         [HttpPost]
         public IActionResult DeleteReminderRecordById(int reminderRecordId)
         {
-            var result = DeleteReminderRecordWithChecks(reminderRecordId);
+            var result = _reminderRecordDataAccess.DeleteReminderRecordById(reminderRecordId);
+            if (result)
+            {
+                StaticHelper.NotifyAsync(_config.GetWebHookUrl(), 0, User.Identity.Name, $"Deleted Reminder - Id: {reminderRecordId}");
+            }
             return Json(result);
         }
     }

Controllers/Vehicle/RepairController.cs

@@ -26,11 +26,6 @@ namespace CarCareTracker.Controllers
         [HttpPost]
         public IActionResult SaveCollisionRecordToVehicleId(CollisionRecordInput collisionRecord)
         {
-            //security check.
-            if (!_userLogic.UserCanEditVehicle(GetUserID(), collisionRecord.VehicleId))
-            {
-                return Json(false);
-            }
             if (collisionRecord.Id == default && _config.GetUserConfig(User).EnableAutoOdometerInsert)
             {
                 _odometerLogic.AutoInsertOdometerRecord(new OdometerRecord
@@ -45,16 +40,12 @@ namespace CarCareTracker.Controllers
             collisionRecord.Files = collisionRecord.Files.Select(x => { return new UploadedFiles { Name = x.Name, Location = _fileHelper.MoveFileFromTemp(x.Location, "documents/") }; }).ToList();
             if (collisionRecord.Supplies.Any())
             {
-                collisionRecord.RequisitionHistory.AddRange(RequisitionSupplyRecordsByUsage(collisionRecord.Supplies, DateTime.Parse(collisionRecord.Date), collisionRecord.Description));
+                collisionRecord.RequisitionHistory = RequisitionSupplyRecordsByUsage(collisionRecord.Supplies, DateTime.Parse(collisionRecord.Date), collisionRecord.Description);
                 if (collisionRecord.CopySuppliesAttachment)
                 {
                     collisionRecord.Files.AddRange(GetSuppliesAttachments(collisionRecord.Supplies));
                 }
             }
-            if (collisionRecord.DeletedRequisitionHistory.Any())
-            {
-                _vehicleLogic.RestoreSupplyRecordsByUsage(collisionRecord.DeletedRequisitionHistory, collisionRecord.Description);
-            }
             //push back any reminders
             if (collisionRecord.ReminderRecordId.Any())
             {
@@ -66,7 +57,7 @@ namespace CarCareTracker.Controllers
             var result = _collisionRecordDataAccess.SaveCollisionRecordToVehicle(collisionRecord.ToCollisionRecord());
             if (result)
             {
-                StaticHelper.NotifyAsync(_config.GetWebHookUrl(), WebHookPayload.FromGenericRecord(collisionRecord.ToCollisionRecord(), collisionRecord.Id == default ? "repairrecord.add" : "repairrecord.update", User.Identity.Name));
+                StaticHelper.NotifyAsync(_config.GetWebHookUrl(), collisionRecord.VehicleId, User.Identity.Name, $"{(collisionRecord.Id == default ? "Created" : "Edited")} Repair Record - Description: {collisionRecord.Description}");
             }
             return Json(result);
         }
@@ -79,11 +70,6 @@ namespace CarCareTracker.Controllers
         public IActionResult GetCollisionRecordForEditById(int collisionRecordId)
         {
             var result = _collisionRecordDataAccess.GetCollisionRecordById(collisionRecordId);
-            //security check.
-            if (!_userLogic.UserCanEditVehicle(GetUserID(), result.VehicleId))
-            {
-                return Redirect("/Error/Unauthorized");
-            }
             //convert to Input object.
             var convertedResult = new CollisionRecordInput
             {
@@ -101,30 +87,14 @@ namespace CarCareTracker.Controllers
             };
             return PartialView("_CollisionRecordModal", convertedResult);
         }
-        private bool DeleteCollisionRecordWithChecks(int collisionRecordId)
-        {
-            var existingRecord = _collisionRecordDataAccess.GetCollisionRecordById(collisionRecordId);
-            //security check.
-            if (!_userLogic.UserCanEditVehicle(GetUserID(), existingRecord.VehicleId))
-            {
-                return false;
-            }
-            //restore any requisitioned supplies.
-            if (existingRecord.RequisitionHistory.Any())
-            {
-                _vehicleLogic.RestoreSupplyRecordsByUsage(existingRecord.RequisitionHistory, existingRecord.Description);
-            }
-            var result = _collisionRecordDataAccess.DeleteCollisionRecordById(existingRecord.Id);
-            if (result)
-            {
-                StaticHelper.NotifyAsync(_config.GetWebHookUrl(), WebHookPayload.FromGenericRecord(existingRecord, "repairrecord.delete", User.Identity.Name));
-            }
-            return result;
-        }
         [HttpPost]
         public IActionResult DeleteCollisionRecordById(int collisionRecordId)
         {
-            var result = DeleteCollisionRecordWithChecks(collisionRecordId);
+            var result = _collisionRecordDataAccess.DeleteCollisionRecordById(collisionRecordId);
+            if (result)
+            {
+                StaticHelper.NotifyAsync(_config.GetWebHookUrl(), 0, User.Identity.Name, $"Deleted Repair Record - Id: {collisionRecordId}");
+            }
             return Json(result);
         }
     }

Controllers/Vehicle/ReportController.cs

@@ -14,15 +14,14 @@ namespace CarCareTracker.Controllers
         {
             //get records
             var vehicleData = _dataAccess.GetVehicleById(vehicleId);
-            var vehicleRecords = _vehicleLogic.GetVehicleRecords(vehicleId);
-            var serviceRecords = vehicleRecords.ServiceRecords;
-            var gasRecords = vehicleRecords.GasRecords;
-            var collisionRecords = vehicleRecords.CollisionRecords;
-            var taxRecords = vehicleRecords.TaxRecords;
-            var upgradeRecords = vehicleRecords.UpgradeRecords;
-            var odometerRecords = vehicleRecords.OdometerRecords;
+            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 odometerRecords = _odometerRecordDataAccess.GetOdometerRecordsByVehicleId(vehicleId);
             var userConfig = _config.GetUserConfig(User);
-            var viewModel = new ReportViewModel() { ReportHeaderForVehicle = new ReportHeader() };
+            var viewModel = new ReportViewModel();
             //check if custom widgets are configured
             viewModel.CustomWidgetsConfigured = _fileHelper.WidgetsExist();
             //get totalCostMakeUp
@@ -92,7 +91,6 @@ namespace CarCareTracker.Controllers
             var mileageData = _gasHelper.GetGasRecordViewModels(gasRecords, userConfig.UseMPG, userConfig.UseUKMPG);
             string preferredFuelMileageUnit = _config.GetUserConfig(User).PreferredGasMileageUnit;
             var fuelEconomyMileageUnit = StaticHelper.GetFuelEconomyUnit(vehicleData.IsElectric, vehicleData.UseHours, userConfig.UseMPG, userConfig.UseUKMPG);
-            var averageMPG = _gasHelper.GetAverageGasMileage(mileageData, userConfig.UseMPG);
             mileageData.RemoveAll(x => x.MilesPerGallon == default);
             bool invertedFuelMileageUnit = fuelEconomyMileageUnit == "l/100km" && preferredFuelMileageUnit == "km/l";
             var monthlyMileageData = StaticHelper.GetBaseLineCostsNoMonthName();
@@ -116,12 +114,6 @@ namespace CarCareTracker.Controllers
                         monthMileage.Cost = 100 / monthMileage.Cost;
                     }
                 }
-                var newAverageMPG = decimal.Parse(averageMPG, NumberStyles.Any);
-                if (newAverageMPG != 0)
-                {
-                    newAverageMPG = 100 / newAverageMPG;
-                }
-                averageMPG = newAverageMPG.ToString("F");
             }
             var mpgViewModel = new MPGForVehicleByMonth {
                 CostData = monthlyMileageData,
@@ -129,15 +121,6 @@ namespace CarCareTracker.Controllers
                 SortedCostData = (userConfig.UseMPG || invertedFuelMileageUnit) ? monthlyMileageData.OrderByDescending(x => x.Cost).ToList() : monthlyMileageData.OrderBy(x => x.Cost).ToList()
             };
             viewModel.FuelMileageForVehicleByMonth = mpgViewModel;
-            //report header
-
-            var maxMileage = _vehicleLogic.GetMaxMileage(vehicleRecords);
-            var minMileage = _vehicleLogic.GetMinMileage(vehicleRecords);
-
-            viewModel.ReportHeaderForVehicle.TotalCost = _vehicleLogic.GetVehicleTotalCost(vehicleRecords);
-            viewModel.ReportHeaderForVehicle.AverageMPG = $"{averageMPG} {mpgViewModel.Unit}";
-            viewModel.ReportHeaderForVehicle.MaxOdometer = maxMileage;
-            viewModel.ReportHeaderForVehicle.DistanceTraveled = maxMileage - minMileage;
             return PartialView("_Report", viewModel);
         }
         [TypeFilter(typeof(CollaboratorFilter))]
@@ -162,63 +145,6 @@ namespace CarCareTracker.Controllers
             return Json(result);
         }
         [TypeFilter(typeof(CollaboratorFilter))]
-        [HttpPost]
-        public IActionResult GetSummaryForVehicle(int vehicleId, int year = 0)
-        {
-            var vehicleData = _dataAccess.GetVehicleById(vehicleId);
-            var vehicleRecords = _vehicleLogic.GetVehicleRecords(vehicleId);
-
-            var serviceRecords = vehicleRecords.ServiceRecords;
-            var gasRecords = vehicleRecords.GasRecords;
-            var collisionRecords = vehicleRecords.CollisionRecords;
-            var taxRecords = vehicleRecords.TaxRecords;
-            var upgradeRecords = vehicleRecords.UpgradeRecords;
-            var odometerRecords = vehicleRecords.OdometerRecords;
-
-            if (year != default)
-            {
-                serviceRecords.RemoveAll(x => x.Date.Year != year);
-                gasRecords.RemoveAll(x => x.Date.Year != year);
-                collisionRecords.RemoveAll(x => x.Date.Year != year);
-                taxRecords.RemoveAll(x => x.Date.Year != year);
-                upgradeRecords.RemoveAll(x => x.Date.Year != year);
-                odometerRecords.RemoveAll(x => x.Date.Year != year);
-            }
-
-            var userConfig = _config.GetUserConfig(User);
-
-            var mileageData = _gasHelper.GetGasRecordViewModels(gasRecords, userConfig.UseMPG, userConfig.UseUKMPG);
-            string preferredFuelMileageUnit = _config.GetUserConfig(User).PreferredGasMileageUnit;
-            var fuelEconomyMileageUnit = StaticHelper.GetFuelEconomyUnit(vehicleData.IsElectric, vehicleData.UseHours, userConfig.UseMPG, userConfig.UseUKMPG);
-            var averageMPG = _gasHelper.GetAverageGasMileage(mileageData, userConfig.UseMPG);
-            bool invertedFuelMileageUnit = fuelEconomyMileageUnit == "l/100km" && preferredFuelMileageUnit == "km/l";
-
-            if (invertedFuelMileageUnit)
-            {
-                var newAverageMPG = decimal.Parse(averageMPG, NumberStyles.Any);
-                if (newAverageMPG != 0)
-                {
-                    newAverageMPG = 100 / newAverageMPG;
-                }
-                averageMPG = newAverageMPG.ToString("F");
-            }
-
-            var mpgUnit = invertedFuelMileageUnit ? preferredFuelMileageUnit : fuelEconomyMileageUnit;
-
-            var maxMileage = _vehicleLogic.GetMaxMileage(vehicleRecords);
-            var minMileage = _vehicleLogic.GetMinMileage(vehicleRecords);
-
-            var viewModel = new ReportHeader()
-            {
-                TotalCost = _vehicleLogic.GetVehicleTotalCost(vehicleRecords),
-                AverageMPG = $"{averageMPG} {mpgUnit}",
-                MaxOdometer = maxMileage,
-                DistanceTraveled = maxMileage - minMileage
-            };
-
-            return PartialView("_ReportHeader", viewModel);
-        }
-        [TypeFilter(typeof(CollaboratorFilter))]
         [HttpGet]
         public IActionResult GetCostMakeUpForVehicle(int vehicleId, int year = 0)
         {
@@ -270,7 +196,7 @@ namespace CarCareTracker.Controllers
             var vehicleData = _dataAccess.GetVehicleById(vehicleId);
             var userConfig = _config.GetUserConfig(User);
             var totalDistanceTraveled = maxMileage - minMileage;
-            var totalDays = _vehicleLogic.GetOwnershipDays(vehicleData.PurchaseDate, vehicleData.SoldDate, year, serviceRecords, collisionRecords, gasRecords, upgradeRecords, odometerRecords, taxRecords);
+            var totalDays = _vehicleLogic.GetOwnershipDays(vehicleData.PurchaseDate, vehicleData.SoldDate, serviceRecords, collisionRecords, gasRecords, upgradeRecords, odometerRecords, taxRecords);
             var viewModel = new CostTableForVehicle
             {
                 ServiceRecordSum = serviceRecords.Sum(x => x.Cost),
@@ -385,13 +311,13 @@ namespace CarCareTracker.Controllers
                 var result = _fileHelper.MakeAttachmentsExport(attachmentData);
                 if (string.IsNullOrWhiteSpace(result))
                 {
-                    return Json(OperationResponse.Failed());
+                    return Json(new OperationResponse { Success = false, Message = StaticHelper.GenericErrorMessage });
                 }
-                return Json(OperationResponse.Succeed(result));
+                return Json(new OperationResponse { Success = true, Message = result });
             }
             else
             {
-                return Json(OperationResponse.Failed("No Attachments Found"));
+                return Json(new OperationResponse { Success = false, Message = "No Attachments Found" });
             }
         }
         public IActionResult GetReportParameters()
@@ -423,57 +349,9 @@ namespace CarCareTracker.Controllers
             var vehicleHistory = new VehicleHistoryViewModel();
             vehicleHistory.ReportParameters = reportParameter;
             vehicleHistory.VehicleData = _dataAccess.GetVehicleById(vehicleId);
-            var vehicleRecords = _vehicleLogic.GetVehicleRecords(vehicleId);
-            bool useMPG = _config.GetUserConfig(User).UseMPG;
-            bool useUKMPG = _config.GetUserConfig(User).UseUKMPG;
-            var gasViewModels = _gasHelper.GetGasRecordViewModels(vehicleRecords.GasRecords, useMPG, useUKMPG);
-            //filter by tags
-            if (reportParameter.Tags.Any())
-            {
-                if (reportParameter.TagFilter == TagFilter.Exclude)
-                {
-                    vehicleRecords.OdometerRecords.RemoveAll(x => x.Tags.Any(y => reportParameter.Tags.Contains(y)));
-                    vehicleRecords.ServiceRecords.RemoveAll(x => x.Tags.Any(y => reportParameter.Tags.Contains(y)));
-                    vehicleRecords.CollisionRecords.RemoveAll(x => x.Tags.Any(y => reportParameter.Tags.Contains(y)));
-                    vehicleRecords.UpgradeRecords.RemoveAll(x => x.Tags.Any(y => reportParameter.Tags.Contains(y)));
-                    vehicleRecords.TaxRecords.RemoveAll(x => x.Tags.Any(y => reportParameter.Tags.Contains(y)));
-                    gasViewModels.RemoveAll(x => x.Tags.Any(y => reportParameter.Tags.Contains(y)));
-                    vehicleRecords.GasRecords.RemoveAll(x => x.Tags.Any(y => reportParameter.Tags.Contains(y)));
-                }
-                else if (reportParameter.TagFilter == TagFilter.IncludeOnly)
-                {
-                    vehicleRecords.OdometerRecords.RemoveAll(x => !x.Tags.Any(y => reportParameter.Tags.Contains(y)));
-                    vehicleRecords.ServiceRecords.RemoveAll(x => !x.Tags.Any(y => reportParameter.Tags.Contains(y)));
-                    vehicleRecords.CollisionRecords.RemoveAll(x => !x.Tags.Any(y => reportParameter.Tags.Contains(y)));
-                    vehicleRecords.UpgradeRecords.RemoveAll(x => !x.Tags.Any(y => reportParameter.Tags.Contains(y)));
-                    vehicleRecords.TaxRecords.RemoveAll(x => !x.Tags.Any(y => reportParameter.Tags.Contains(y)));
-                    gasViewModels.RemoveAll(x => !x.Tags.Any(y => reportParameter.Tags.Contains(y)));
-                    vehicleRecords.GasRecords.RemoveAll(x => !x.Tags.Any(y => reportParameter.Tags.Contains(y)));
-                }
-            }
-            //filter by date range.
-            if (reportParameter.FilterByDateRange && !string.IsNullOrWhiteSpace(reportParameter.StartDate) && !string.IsNullOrWhiteSpace(reportParameter.EndDate))
-            {
-                var startDate = DateTime.Parse(reportParameter.StartDate).Date;
-                var endDate = DateTime.Parse(reportParameter.EndDate).Date;
-                //validate date range
-                if (endDate >= startDate) //allow for same day.
-                {
-                    vehicleHistory.StartDate = reportParameter.StartDate;
-                    vehicleHistory.EndDate = reportParameter.EndDate;
-                    //remove all records with dates after the end date and dates before the start date.
-                    vehicleRecords.OdometerRecords.RemoveAll(x => x.Date.Date > endDate || x.Date.Date < startDate);
-                    vehicleRecords.ServiceRecords.RemoveAll(x => x.Date.Date > endDate || x.Date.Date < startDate);
-                    vehicleRecords.CollisionRecords.RemoveAll(x => x.Date.Date > endDate || x.Date.Date < startDate);
-                    vehicleRecords.UpgradeRecords.RemoveAll(x => x.Date.Date > endDate || x.Date.Date < startDate);
-                    vehicleRecords.TaxRecords.RemoveAll(x => x.Date.Date > endDate || x.Date.Date < startDate);
-                    gasViewModels.RemoveAll(x => DateTime.Parse(x.Date).Date > endDate || DateTime.Parse(x.Date).Date < startDate);
-                    vehicleRecords.GasRecords.RemoveAll(x => x.Date.Date > endDate || x.Date.Date < startDate);
-                }
-            }
-            var maxMileage = _vehicleLogic.GetMaxMileage(vehicleRecords);
-            vehicleHistory.Odometer = maxMileage.ToString("N0");
-            var minMileage = _vehicleLogic.GetMinMileage(vehicleRecords);
+            var maxMileage = _vehicleLogic.GetMaxMileage(vehicleId);
+            vehicleHistory.Odometer = maxMileage.ToString("N1");
+            var minMileage = _vehicleLogic.GetMinMileage(vehicleId);
             var distanceTraveled = maxMileage - minMileage;
             if (!string.IsNullOrWhiteSpace(vehicleHistory.VehicleData.PurchaseDate))
             {
@@ -486,7 +364,7 @@ namespace CarCareTracker.Controllers
                 try
                 {
                     daysOwned = (DateTime.Parse(endDate) - DateTime.Parse(vehicleHistory.VehicleData.PurchaseDate)).Days;
-                    vehicleHistory.DaysOwned = daysOwned.ToString("N0");
+                    vehicleHistory.DaysOwned = daysOwned.ToString("N1");
                 }
                 catch (Exception ex)
                 {
@@ -510,17 +388,25 @@ namespace CarCareTracker.Controllers
                 }
             }
             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;
             string preferredFuelMileageUnit = _config.GetUserConfig(User).PreferredGasMileageUnit;
             vehicleHistory.DistanceUnit = vehicleHistory.VehicleData.UseHours ? "h" : useMPG ? "mi." : "km";
-            vehicleHistory.TotalGasCost = gasViewModels.Sum(x => x.Cost);
-            vehicleHistory.TotalCost = vehicleRecords.ServiceRecords.Sum(x => x.Cost) + vehicleRecords.CollisionRecords.Sum(x => x.Cost) + vehicleRecords.UpgradeRecords.Sum(x => x.Cost) + vehicleRecords.TaxRecords.Sum(x => x.Cost);
+            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);
             if (distanceTraveled != default)
             {
-                vehicleHistory.DistanceTraveled = distanceTraveled.ToString("N0");
+                vehicleHistory.DistanceTraveled = distanceTraveled.ToString("N1");
                 vehicleHistory.TotalCostPerMile = vehicleHistory.TotalCost / distanceTraveled;
                 vehicleHistory.TotalGasCostPerMile = vehicleHistory.TotalGasCost / distanceTraveled;
             }
             var averageMPG = "0";
+            var gasViewModels = _gasHelper.GetGasRecordViewModels(gasRecords, useMPG, useUKMPG);
             if (gasViewModels.Any())
             {
                 averageMPG = _gasHelper.GetAverageGasMileage(gasViewModels, useMPG);
@@ -539,7 +425,7 @@ namespace CarCareTracker.Controllers
             }
             vehicleHistory.MPG = $"{averageMPG} {fuelEconomyMileageUnit}";
             //insert servicerecords
-            reportData.AddRange(vehicleRecords.ServiceRecords.Select(x => new GenericReportModel
+            reportData.AddRange(serviceRecords.Select(x => new GenericReportModel
             {
                 Date = x.Date,
                 Odometer = x.Mileage,
@@ -547,11 +433,10 @@ namespace CarCareTracker.Controllers
                 Notes = x.Notes,
                 Cost = x.Cost,
                 DataType = ImportMode.ServiceRecord,
-                ExtraFields = x.ExtraFields,
-                RequisitionHistory = x.RequisitionHistory
+                ExtraFields = x.ExtraFields
             }));
             //repair records
-            reportData.AddRange(vehicleRecords.CollisionRecords.Select(x => new GenericReportModel
+            reportData.AddRange(repairRecords.Select(x => new GenericReportModel
             {
                 Date = x.Date,
                 Odometer = x.Mileage,
@@ -559,10 +444,9 @@ namespace CarCareTracker.Controllers
                 Notes = x.Notes,
                 Cost = x.Cost,
                 DataType = ImportMode.RepairRecord,
-                ExtraFields = x.ExtraFields,
-                RequisitionHistory = x.RequisitionHistory
+                ExtraFields = x.ExtraFields
             }));
-            reportData.AddRange(vehicleRecords.UpgradeRecords.Select(x => new GenericReportModel
+            reportData.AddRange(upgradeRecords.Select(x => new GenericReportModel
             {
                 Date = x.Date,
                 Odometer = x.Mileage,
@@ -570,10 +454,9 @@ namespace CarCareTracker.Controllers
                 Notes = x.Notes,
                 Cost = x.Cost,
                 DataType = ImportMode.UpgradeRecord,
-                ExtraFields = x.ExtraFields,
-                RequisitionHistory = x.RequisitionHistory
+                ExtraFields = x.ExtraFields
             }));
-            reportData.AddRange(vehicleRecords.TaxRecords.Select(x => new GenericReportModel
+            reportData.AddRange(taxRecords.Select(x => new GenericReportModel
             {
                 Date = x.Date,
                 Odometer = 0,
@@ -675,55 +558,6 @@ namespace CarCareTracker.Controllers
             }).ToList();
             return PartialView("_GasCostByMonthReport", groupedRecord);
         }
-        [TypeFilter(typeof(CollaboratorFilter))]
-        [HttpPost]
-        public IActionResult GetCostByMonthAndYearByVehicle(int vehicleId, List<ImportMode> selectedMetrics, int year = 0)
-        {
-            List<CostForVehicleByMonth> allCosts = StaticHelper.GetBaseLineCosts();
-            if (selectedMetrics.Contains(ImportMode.ServiceRecord))
-            {
-                var serviceRecords = _serviceRecordDataAccess.GetServiceRecordsByVehicleId(vehicleId);
-                allCosts.AddRange(_reportHelper.GetServiceRecordSum(serviceRecords, year, true));
-            }
-            if (selectedMetrics.Contains(ImportMode.RepairRecord))
-            {
-                var repairRecords = _collisionRecordDataAccess.GetCollisionRecordsByVehicleId(vehicleId);
-                allCosts.AddRange(_reportHelper.GetRepairRecordSum(repairRecords, year, true));
-            }
-            if (selectedMetrics.Contains(ImportMode.UpgradeRecord))
-            {
-                var upgradeRecords = _upgradeRecordDataAccess.GetUpgradeRecordsByVehicleId(vehicleId);
-                allCosts.AddRange(_reportHelper.GetUpgradeRecordSum(upgradeRecords, year, true));
-            }
-            if (selectedMetrics.Contains(ImportMode.GasRecord))
-            {
-                var gasRecords = _gasRecordDataAccess.GetGasRecordsByVehicleId(vehicleId);
-                allCosts.AddRange(_reportHelper.GetGasRecordSum(gasRecords, year, true));
-            }
-            if (selectedMetrics.Contains(ImportMode.TaxRecord))
-            {
-                var taxRecords = _taxRecordDataAccess.GetTaxRecordsByVehicleId(vehicleId);
-                allCosts.AddRange(_reportHelper.GetTaxRecordSum(taxRecords, year, true));
-            }
-            if (selectedMetrics.Contains(ImportMode.OdometerRecord))
-            {
-                var odometerRecords = _odometerRecordDataAccess.GetOdometerRecordsByVehicleId(vehicleId);
-                allCosts.AddRange(_reportHelper.GetOdometerRecordSum(odometerRecords, year, true));
-            }
-            var groupedRecord = allCosts.GroupBy(x => new { x.MonthName, x.MonthId, x.Year }).OrderByDescending(x=>x.Key.Year).Select(x => new CostForVehicleByMonth
-            {
-                Year = x.Key.Year,
-                MonthName = x.Key.MonthName,
-                Cost = x.Sum(y => y.Cost),
-                DistanceTraveled = x.Max(y => y.DistanceTraveled),
-                MonthId = x.Key.MonthId
-            }).ToList();
-            var vehicleData = _dataAccess.GetVehicleById(vehicleId);
-            var userConfig = _config.GetUserConfig(User);
-            var viewModel = new CostDistanceTableForVehicle { CostData = groupedRecord };
-            viewModel.DistanceUnit = vehicleData.UseHours ? "h" : userConfig.UseMPG ? "mi." : "km";
-            return PartialView("_CostDistanceTableReport", viewModel);
-        }
         [HttpGet]
         public IActionResult GetAdditionalWidgets()
         {

Controllers/Vehicle/ServiceController.cs

@@ -26,11 +26,6 @@ namespace CarCareTracker.Controllers
         [HttpPost]
         public IActionResult SaveServiceRecordToVehicleId(ServiceRecordInput serviceRecord)
         {
-            //security check.
-            if (!_userLogic.UserCanEditVehicle(GetUserID(), serviceRecord.VehicleId))
-            {
-                return Json(false);
-            }
             if (serviceRecord.Id == default && _config.GetUserConfig(User).EnableAutoOdometerInsert)
             {
                 _odometerLogic.AutoInsertOdometerRecord(new OdometerRecord
@@ -45,16 +40,12 @@ namespace CarCareTracker.Controllers
             serviceRecord.Files = serviceRecord.Files.Select(x => { return new UploadedFiles { Name = x.Name, Location = _fileHelper.MoveFileFromTemp(x.Location, "documents/") }; }).ToList();
             if (serviceRecord.Supplies.Any())
             {
-                serviceRecord.RequisitionHistory.AddRange(RequisitionSupplyRecordsByUsage(serviceRecord.Supplies, DateTime.Parse(serviceRecord.Date), serviceRecord.Description));
+                serviceRecord.RequisitionHistory = RequisitionSupplyRecordsByUsage(serviceRecord.Supplies, DateTime.Parse(serviceRecord.Date), serviceRecord.Description);
                 if (serviceRecord.CopySuppliesAttachment)
                 {
                     serviceRecord.Files.AddRange(GetSuppliesAttachments(serviceRecord.Supplies));
                 }
             }
-            if (serviceRecord.DeletedRequisitionHistory.Any())
-            {
-                _vehicleLogic.RestoreSupplyRecordsByUsage(serviceRecord.DeletedRequisitionHistory, serviceRecord.Description);
-            }
             //push back any reminders
             if (serviceRecord.ReminderRecordId.Any())
             {
@@ -66,7 +57,7 @@ namespace CarCareTracker.Controllers
             var result = _serviceRecordDataAccess.SaveServiceRecordToVehicle(serviceRecord.ToServiceRecord());
             if (result)
             {
-                StaticHelper.NotifyAsync(_config.GetWebHookUrl(), WebHookPayload.FromGenericRecord(serviceRecord.ToServiceRecord(), serviceRecord.Id == default ? "servicerecord.add" : "servicerecord.update", User.Identity.Name));
+                StaticHelper.NotifyAsync(_config.GetWebHookUrl(), serviceRecord.VehicleId, User.Identity.Name, $"{(serviceRecord.Id == default ? "Created" : "Edited")} Service Record - Description: {serviceRecord.Description}");
             }
             return Json(result);
         }
@@ -79,11 +70,6 @@ namespace CarCareTracker.Controllers
         public IActionResult GetServiceRecordForEditById(int serviceRecordId)
         {
             var result = _serviceRecordDataAccess.GetServiceRecordById(serviceRecordId);
-            //security check.
-            if (!_userLogic.UserCanEditVehicle(GetUserID(), result.VehicleId))
-            {
-                return Redirect("/Error/Unauthorized");
-            }
             //convert to Input object.
             var convertedResult = new ServiceRecordInput
             {
@@ -101,30 +87,14 @@ namespace CarCareTracker.Controllers
             };
             return PartialView("_ServiceRecordModal", convertedResult);
         }
-        private bool DeleteServiceRecordWithChecks(int serviceRecordId)
-        {
-            var existingRecord = _serviceRecordDataAccess.GetServiceRecordById(serviceRecordId);
-            //security check.
-            if (!_userLogic.UserCanEditVehicle(GetUserID(), existingRecord.VehicleId))
-            {
-                return false;
-            }
-            //restore any requisitioned supplies.
-            if (existingRecord.RequisitionHistory.Any())
-            {
-                _vehicleLogic.RestoreSupplyRecordsByUsage(existingRecord.RequisitionHistory, existingRecord.Description);
-            }
-            var result = _serviceRecordDataAccess.DeleteServiceRecordById(existingRecord.Id);
-            if (result)
-            {
-                StaticHelper.NotifyAsync(_config.GetWebHookUrl(), WebHookPayload.FromGenericRecord(existingRecord, "servicerecord.delete", User.Identity.Name));
-            }
-            return result;
-        }
         [HttpPost]
         public IActionResult DeleteServiceRecordById(int serviceRecordId)
         {
-            var result = DeleteServiceRecordWithChecks(serviceRecordId);
+            var result = _serviceRecordDataAccess.DeleteServiceRecordById(serviceRecordId);
+            if (result)
+            {
+                StaticHelper.NotifyAsync(_config.GetWebHookUrl(), 0, User.Identity.Name, $"Deleted Service Record - Id: {serviceRecordId}");
+            }
             return Json(result);
         }
     }

Controllers/Vehicle/SupplyController.cs

@@ -58,7 +58,6 @@ namespace CarCareTracker.Controllers
                 //create new requisitionrrecord
                 var requisitionRecord = new SupplyUsageHistory
                 {
-                    Id = supply.SupplyId,
                     Date = dateRequisitioned,
                     Description = usageDescription,
                     Quantity = supply.Quantity,
@@ -73,7 +72,6 @@ namespace CarCareTracker.Controllers
             }
             return results;
         }
-        
         [TypeFilter(typeof(CollaboratorFilter))]
         [HttpGet]
         public IActionResult GetSupplyRecordsByVehicleId(int vehicleId)
@@ -150,7 +148,7 @@ namespace CarCareTracker.Controllers
             var result = _supplyRecordDataAccess.SaveSupplyRecordToVehicle(supplyRecord.ToSupplyRecord());
             if (result)
             {
-                StaticHelper.NotifyAsync(_config.GetWebHookUrl(), WebHookPayload.FromSupplyRecord(supplyRecord.ToSupplyRecord(), supplyRecord.Id == default ? "supplyrecord.add" : "supplyrecord.update", User.Identity.Name));
+                StaticHelper.NotifyAsync(_config.GetWebHookUrl(), supplyRecord.VehicleId, User.Identity.Name, $"{(supplyRecord.Id == default ? "Created" : "Edited")} Supply Record - Description: {supplyRecord.Description}");
             }
             return Json(result);
         }
@@ -163,11 +161,6 @@ namespace CarCareTracker.Controllers
         public IActionResult GetSupplyRecordForEditById(int supplyRecordId)
         {
             var result = _supplyRecordDataAccess.GetSupplyRecordById(supplyRecordId);
-            if (result.RequisitionHistory.Any())
-            {
-                //requisition history when viewed through the supply is always immutable.
-                result.RequisitionHistory = result.RequisitionHistory.Select(x => new SupplyUsageHistory { Id = default, Cost = x.Cost, Description = x.Description, Date = x.Date, PartNumber = x.PartNumber, Quantity = x.Quantity }).ToList();
-            }
             //convert to Input object.
             var convertedResult = new SupplyRecordInput
             {
@@ -187,28 +180,14 @@ namespace CarCareTracker.Controllers
             };
             return PartialView("_SupplyRecordModal", convertedResult);
         }
-        private bool DeleteSupplyRecordWithChecks(int supplyRecordId)
-        {
-            var existingRecord = _supplyRecordDataAccess.GetSupplyRecordById(supplyRecordId);
-            if (existingRecord.VehicleId != default)
-            {
-                //security check only if not editing shop supply.
-                if (!_userLogic.UserCanEditVehicle(GetUserID(), existingRecord.VehicleId))
-                {
-                    return false;
-                }
-            }
-            var result = _supplyRecordDataAccess.DeleteSupplyRecordById(existingRecord.Id);
-            if (result)
-            {
-                StaticHelper.NotifyAsync(_config.GetWebHookUrl(), WebHookPayload.FromSupplyRecord(existingRecord, "supplyrecord.delete", User.Identity.Name));
-            }
-            return result;
-        }
         [HttpPost]
         public IActionResult DeleteSupplyRecordById(int supplyRecordId)
         {
-            var result = DeleteSupplyRecordWithChecks(supplyRecordId);
+            var result = _supplyRecordDataAccess.DeleteSupplyRecordById(supplyRecordId);
+            if (result)
+            {
+                StaticHelper.NotifyAsync(_config.GetWebHookUrl(), 0, User.Identity.Name, $"Deleted Supply Record - Id: {supplyRecordId}");
+            }
             return Json(result);
         }
     }

Controllers/Vehicle/TaxController.cs

@@ -23,29 +23,49 @@ namespace CarCareTracker.Controllers
             }
             return PartialView("_TaxRecords", result);
         }
-
-        [TypeFilter(typeof(CollaboratorFilter))]
-        [HttpPost]
-        public IActionResult CheckRecurringTaxRecords(int vehicleId)
+        private void UpdateRecurringTaxes(int vehicleId)
         {
-            try
+            var result = _taxRecordDataAccess.GetTaxRecordsByVehicleId(vehicleId);
+            var recurringFees = result.Where(x => x.IsRecurring);
+            if (recurringFees.Any())
             {
-                var result = _vehicleLogic.UpdateRecurringTaxes(vehicleId);
-                return Json(result);
-            } catch (Exception ex)
-            {
-                _logger.LogError(ex.Message);
-                return Json(false);
+                foreach (TaxRecord recurringFee in recurringFees)
+                {
+                    var newDate = new DateTime();
+                    if (recurringFee.RecurringInterval != ReminderMonthInterval.Other)
+                    {
+                        newDate = recurringFee.Date.AddMonths((int)recurringFee.RecurringInterval);
+                    }
+                    else
+                    {
+                        newDate = recurringFee.Date.AddMonths(recurringFee.CustomMonthInterval);
+                    }
+                    if (DateTime.Now > newDate)
+                    {
+                        recurringFee.IsRecurring = false;
+                        var newRecurringFee = new TaxRecord()
+                        {
+                            VehicleId = recurringFee.VehicleId,
+                            Date = newDate,
+                            Description = recurringFee.Description,
+                            Cost = recurringFee.Cost,
+                            IsRecurring = true,
+                            Notes = recurringFee.Notes,
+                            RecurringInterval = recurringFee.RecurringInterval,
+                            CustomMonthInterval = recurringFee.CustomMonthInterval,
+                            Files = recurringFee.Files,
+                            Tags = recurringFee.Tags,
+                            ExtraFields = recurringFee.ExtraFields
+                        };
+                        _taxRecordDataAccess.SaveTaxRecordToVehicle(recurringFee);
+                        _taxRecordDataAccess.SaveTaxRecordToVehicle(newRecurringFee);
+                    }
+                }
             }
         }
         [HttpPost]
         public IActionResult SaveTaxRecordToVehicleId(TaxRecordInput taxRecord)
         {
-            //security check.
-            if (!_userLogic.UserCanEditVehicle(GetUserID(), taxRecord.VehicleId))
-            {
-                return Json(false);
-            }
             //move files from temp.
             taxRecord.Files = taxRecord.Files.Select(x => { return new UploadedFiles { Name = x.Name, Location = _fileHelper.MoveFileFromTemp(x.Location, "documents/") }; }).ToList();
             //push back any reminders
@@ -57,10 +77,9 @@ namespace CarCareTracker.Controllers
                 }
             }
             var result = _taxRecordDataAccess.SaveTaxRecordToVehicle(taxRecord.ToTaxRecord());
-            _vehicleLogic.UpdateRecurringTaxes(taxRecord.VehicleId);
             if (result)
             {
-                StaticHelper.NotifyAsync(_config.GetWebHookUrl(), WebHookPayload.FromTaxRecord(taxRecord.ToTaxRecord(), taxRecord.Id == default ? "taxrecord.add" : "taxrecord.update", User.Identity.Name));
+                StaticHelper.NotifyAsync(_config.GetWebHookUrl(), taxRecord.VehicleId, User.Identity.Name, $"{(taxRecord.Id == default ? "Created" : "Edited")} Tax Record - Description: {taxRecord.Description}");
             }
             return Json(result);
         }
@@ -73,11 +92,6 @@ namespace CarCareTracker.Controllers
         public IActionResult GetTaxRecordForEditById(int taxRecordId)
         {
             var result = _taxRecordDataAccess.GetTaxRecordById(taxRecordId);
-            //security check.
-            if (!_userLogic.UserCanEditVehicle(GetUserID(), result.VehicleId))
-            {
-                return Redirect("/Error/Unauthorized");
-            }
             //convert to Input object.
             var convertedResult = new TaxRecordInput
             {
@@ -90,32 +104,20 @@ namespace CarCareTracker.Controllers
                 IsRecurring = result.IsRecurring,
                 RecurringInterval = result.RecurringInterval,
                 CustomMonthInterval = result.CustomMonthInterval,
-                CustomMonthIntervalUnit = result.CustomMonthIntervalUnit,
                 Files = result.Files,
                 Tags = result.Tags,
                 ExtraFields = StaticHelper.AddExtraFields(result.ExtraFields, _extraFieldDataAccess.GetExtraFieldsById((int)ImportMode.TaxRecord).ExtraFields)
             };
             return PartialView("_TaxRecordModal", convertedResult);
         }
-        private bool DeleteTaxRecordWithChecks(int taxRecordId)
-        {
-            var existingRecord = _taxRecordDataAccess.GetTaxRecordById(taxRecordId);
-            //security check.
-            if (!_userLogic.UserCanEditVehicle(GetUserID(), existingRecord.VehicleId))
-            {
-                return false;
-            }
-            var result = _taxRecordDataAccess.DeleteTaxRecordById(existingRecord.Id);
-            if (result)
-            {
-                StaticHelper.NotifyAsync(_config.GetWebHookUrl(), WebHookPayload.FromTaxRecord(existingRecord, "taxrecord.delete", User.Identity.Name));
-            }
-            return result;
-        }
         [HttpPost]
         public IActionResult DeleteTaxRecordById(int taxRecordId)
         {
-            var result = DeleteTaxRecordWithChecks(taxRecordId);
+            var result = _taxRecordDataAccess.DeleteTaxRecordById(taxRecordId);
+            if (result)
+            {
+                StaticHelper.NotifyAsync(_config.GetWebHookUrl(), 0, User.Identity.Name, $"Deleted Tax Record - Id: {taxRecordId}");
+            }
             return Json(result);
         }
     }

Controllers/Vehicle/UpgradeController.cs

@@ -26,11 +26,6 @@ namespace CarCareTracker.Controllers
         [HttpPost]
         public IActionResult SaveUpgradeRecordToVehicleId(UpgradeRecordInput upgradeRecord)
         {
-            //security check.
-            if (!_userLogic.UserCanEditVehicle(GetUserID(), upgradeRecord.VehicleId))
-            {
-                return Json(false);
-            }
             if (upgradeRecord.Id == default && _config.GetUserConfig(User).EnableAutoOdometerInsert)
             {
                 _odometerLogic.AutoInsertOdometerRecord(new OdometerRecord
@@ -45,16 +40,12 @@ namespace CarCareTracker.Controllers
             upgradeRecord.Files = upgradeRecord.Files.Select(x => { return new UploadedFiles { Name = x.Name, Location = _fileHelper.MoveFileFromTemp(x.Location, "documents/") }; }).ToList();
             if (upgradeRecord.Supplies.Any())
             {
-                upgradeRecord.RequisitionHistory.AddRange(RequisitionSupplyRecordsByUsage(upgradeRecord.Supplies, DateTime.Parse(upgradeRecord.Date), upgradeRecord.Description));
+                upgradeRecord.RequisitionHistory = RequisitionSupplyRecordsByUsage(upgradeRecord.Supplies, DateTime.Parse(upgradeRecord.Date), upgradeRecord.Description);
                 if (upgradeRecord.CopySuppliesAttachment)
                 {
                     upgradeRecord.Files.AddRange(GetSuppliesAttachments(upgradeRecord.Supplies));
                 }
             }
-            if (upgradeRecord.DeletedRequisitionHistory.Any())
-            {
-                _vehicleLogic.RestoreSupplyRecordsByUsage(upgradeRecord.DeletedRequisitionHistory, upgradeRecord.Description);
-            }
             //push back any reminders
             if (upgradeRecord.ReminderRecordId.Any())
             {
@@ -66,7 +57,7 @@ namespace CarCareTracker.Controllers
             var result = _upgradeRecordDataAccess.SaveUpgradeRecordToVehicle(upgradeRecord.ToUpgradeRecord());
             if (result)
             {
-                StaticHelper.NotifyAsync(_config.GetWebHookUrl(), WebHookPayload.FromGenericRecord(upgradeRecord.ToUpgradeRecord(), upgradeRecord.Id == default ? "upgraderecord.add" : "upgraderecord.update", User.Identity.Name));
+                StaticHelper.NotifyAsync(_config.GetWebHookUrl(), upgradeRecord.VehicleId, User.Identity.Name, $"{(upgradeRecord.Id == default ? "Created" : "Edited")} Upgrade Record - Description: {upgradeRecord.Description}");
             }
             return Json(result);
         }
@@ -79,11 +70,6 @@ namespace CarCareTracker.Controllers
         public IActionResult GetUpgradeRecordForEditById(int upgradeRecordId)
         {
             var result = _upgradeRecordDataAccess.GetUpgradeRecordById(upgradeRecordId);
-            //security check.
-            if (!_userLogic.UserCanEditVehicle(GetUserID(), result.VehicleId))
-            {
-                return Redirect("/Error/Unauthorized");
-            }
             //convert to Input object.
             var convertedResult = new UpgradeRecordInput
             {
@@ -101,30 +87,14 @@ namespace CarCareTracker.Controllers
             };
             return PartialView("_UpgradeRecordModal", convertedResult);
         }
-        private bool DeleteUpgradeRecordWithChecks(int upgradeRecordId)
-        {
-            var existingRecord = _upgradeRecordDataAccess.GetUpgradeRecordById(upgradeRecordId);
-            //security check.
-            if (!_userLogic.UserCanEditVehicle(GetUserID(), existingRecord.VehicleId))
-            {
-                return false;
-            }
-            //restore any requisitioned supplies.
-            if (existingRecord.RequisitionHistory.Any())
-            {
-                _vehicleLogic.RestoreSupplyRecordsByUsage(existingRecord.RequisitionHistory, existingRecord.Description);
-            }
-            var result = _upgradeRecordDataAccess.DeleteUpgradeRecordById(existingRecord.Id);
-            if (result)
-            {
-                StaticHelper.NotifyAsync(_config.GetWebHookUrl(), WebHookPayload.FromGenericRecord(existingRecord, "upgraderecord.delete", User.Identity.Name));
-            }
-            return result;
-        }
         [HttpPost]
         public IActionResult DeleteUpgradeRecordById(int upgradeRecordId)
         {
-            var result = DeleteUpgradeRecordWithChecks(upgradeRecordId);
+            var result = _upgradeRecordDataAccess.DeleteUpgradeRecordById(upgradeRecordId);
+            if (result)
+            {
+                StaticHelper.NotifyAsync(_config.GetWebHookUrl(), 0, User.Identity.Name, $"Deleted Upgrade Record - Id: {upgradeRecordId}");
+            }
             return Json(result);
         }
     }

Controllers/VehicleController.cs

@@ -1,12 +1,12 @@
 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 CarCareTracker.Helper;
 using System.Globalization;
+using Microsoft.AspNetCore.Authorization;
 using System.Security.Claims;
+using CarCareTracker.Logic;
+using CarCareTracker.Filter;
 using System.Text.Json;
 
 namespace CarCareTracker.Controllers
@@ -95,6 +95,7 @@ namespace CarCareTracker.Controllers
         public IActionResult Index(int vehicleId)
         {
             var data = _dataAccess.GetVehicleById(vehicleId);
+            UpdateRecurringTaxes(vehicleId);
             return View(data);
         }
         [HttpGet]
@@ -130,11 +131,10 @@ namespace CarCareTracker.Controllers
                 if (isNewAddition)
                 {
                     _userLogic.AddUserAccessToVehicle(GetUserID(), vehicleInput.Id);
-                    StaticHelper.NotifyAsync(_config.GetWebHookUrl(), WebHookPayload.Generic($"Created Vehicle {vehicleInput.Year} {vehicleInput.Make} {vehicleInput.Model}({StaticHelper.GetVehicleIdentifier(vehicleInput)})", "vehicle.add", User.Identity.Name, vehicleInput.Id.ToString()));
-                }
-                else
+                    StaticHelper.NotifyAsync(_config.GetWebHookUrl(), vehicleInput.Id, User.Identity.Name, $"Added Vehicle - Description: {vehicleInput.Year} {vehicleInput.Make} {vehicleInput.Model}");
+                } else
                 {
-                    StaticHelper.NotifyAsync(_config.GetWebHookUrl(), WebHookPayload.Generic($"Updated Vehicle {vehicleInput.Year} {vehicleInput.Make} {vehicleInput.Model}({StaticHelper.GetVehicleIdentifier(vehicleInput)})", "vehicle.update", User.Identity.Name, vehicleInput.Id.ToString()));
+                    StaticHelper.NotifyAsync(_config.GetWebHookUrl(), vehicleInput.Id, User.Identity.Name, $"Edited Vehicle - Description: {vehicleInput.Year} {vehicleInput.Make} {vehicleInput.Model}");
                 }
                 return Json(result);
             }
@@ -164,7 +164,7 @@ namespace CarCareTracker.Controllers
                 _dataAccess.DeleteVehicle(vehicleId);
             if (result)
             {
-                StaticHelper.NotifyAsync(_config.GetWebHookUrl(), WebHookPayload.Generic(string.Empty, "vehicle.delete", User.Identity.Name, vehicleId.ToString()));
+                StaticHelper.NotifyAsync(_config.GetWebHookUrl(), vehicleId, User.Identity.Name, "Deleted Vehicle");
             }
             return Json(result);
         }
@@ -188,18 +188,17 @@ namespace CarCareTracker.Controllers
                     }
                     else
                     {
-                        return Json(OperationResponse.Failed("Both vehicles already have identical collaborators"));
+                        return Json(new OperationResponse { Success = false, Message = "Both vehicles already have identical collaborators" });
                     }
                 }
-                return Json(OperationResponse.Succeed("Collaborators Copied"));
+                return Json(new OperationResponse { Success = true, Message = "Collaborators Copied" });
             }
             catch (Exception ex)
             {
                 _logger.LogError(ex.Message);
-                return Json(OperationResponse.Failed());
+                return Json(new OperationResponse { Success = false, Message = StaticHelper.GenericErrorMessage });
             }
         }
-
         #region "Shared Methods"
         [HttpPost]
         public IActionResult GetFilesPendingUpload(List<UploadedFiles> uploadedFiles)
@@ -216,7 +215,7 @@ namespace CarCareTracker.Controllers
             {
                 return Json(searchResults);
             }
-            foreach (ImportMode visibleTab in _config.GetUserConfig(User).VisibleTabs)
+            foreach(ImportMode visibleTab in _config.GetUserConfig(User).VisibleTabs)
             {
                 switch (visibleTab)
                 {
@@ -389,7 +388,7 @@ namespace CarCareTracker.Controllers
             }
             if (result)
             {
-                StaticHelper.NotifyAsync(_config.GetWebHookUrl(), WebHookPayload.Generic($"Moved multiple {source.ToString()} to {destination.ToString()} - Ids: {string.Join(",", recordIds)}", "bulk.move", User.Identity.Name, string.Empty));
+                StaticHelper.NotifyAsync(_config.GetWebHookUrl(), 0, User.Identity.Name, $"Moved multiple {source.ToString()} to {destination.ToString()} - Ids: {string.Join(",", recordIds)}");
             }
             return Json(result);
         }
@@ -401,37 +400,37 @@ namespace CarCareTracker.Controllers
                 switch (importMode)
                 {
                     case ImportMode.ServiceRecord:
-                        result = DeleteServiceRecordWithChecks(recordId);
+                        result = _serviceRecordDataAccess.DeleteServiceRecordById(recordId);
                         break;
                     case ImportMode.RepairRecord:
-                        result = DeleteCollisionRecordWithChecks(recordId);
+                        result = _collisionRecordDataAccess.DeleteCollisionRecordById(recordId);
                         break;
                     case ImportMode.UpgradeRecord:
-                        result = DeleteUpgradeRecordWithChecks(recordId);
+                        result = _upgradeRecordDataAccess.DeleteUpgradeRecordById(recordId);
                         break;
                     case ImportMode.GasRecord:
-                        result = DeleteGasRecordWithChecks(recordId);
+                        result = _gasRecordDataAccess.DeleteGasRecordById(recordId);
                         break;
                     case ImportMode.TaxRecord:
-                        result = DeleteTaxRecordWithChecks(recordId);
+                        result = _taxRecordDataAccess.DeleteTaxRecordById(recordId);
                         break;
                     case ImportMode.SupplyRecord:
-                        result = DeleteSupplyRecordWithChecks(recordId);
+                        result = _supplyRecordDataAccess.DeleteSupplyRecordById(recordId);
                         break;
                     case ImportMode.NoteRecord:
-                        result = DeleteNoteWithChecks(recordId);
+                        result = _noteDataAccess.DeleteNoteById(recordId);
                         break;
                     case ImportMode.OdometerRecord:
-                        result = DeleteOdometerRecordWithChecks(recordId);
+                        result = _odometerRecordDataAccess.DeleteOdometerRecordById(recordId);
                         break;
                     case ImportMode.ReminderRecord:
-                        result = DeleteReminderRecordWithChecks(recordId);
+                        result = _reminderRecordDataAccess.DeleteReminderRecordById(recordId);
                         break;
                 }
             }
             if (result)
             {
-                StaticHelper.NotifyAsync(_config.GetWebHookUrl(), WebHookPayload.Generic($"Deleted multiple {importMode.ToString()} - Ids: {string.Join(", ", recordIds)}", "bulk.delete", User.Identity.Name, string.Empty));
+                StaticHelper.NotifyAsync(_config.GetWebHookUrl(), 0, User.Identity.Name, $"Deleted multiple {importMode.ToString()} - Ids: {string.Join(",", recordIds)}");
             }
             return Json(result);
         }
@@ -450,7 +449,7 @@ namespace CarCareTracker.Controllers
                         {
                             var existingRecord = _serviceRecordDataAccess.GetServiceRecordById(recordId);
                             existingRecord.Mileage += int.Parse(vehicleData.OdometerDifference);
-                            existingRecord.Mileage = decimal.ToInt32(existingRecord.Mileage * decimal.Parse(vehicleData.OdometerMultiplier, NumberStyles.Any));
+                            existingRecord.Mileage = existingRecord.Mileage * decimal.Parse(vehicleData.OdometerMultiplier, NumberStyles.Any);
                             result = _serviceRecordDataAccess.SaveServiceRecordToVehicle(existingRecord);
                         }
                         break;
@@ -458,7 +457,7 @@ namespace CarCareTracker.Controllers
                         {
                             var existingRecord = _collisionRecordDataAccess.GetCollisionRecordById(recordId);
                             existingRecord.Mileage += int.Parse(vehicleData.OdometerDifference);
-                            existingRecord.Mileage = decimal.ToInt32(existingRecord.Mileage * decimal.Parse(vehicleData.OdometerMultiplier, NumberStyles.Any));
+                            existingRecord.Mileage = existingRecord.Mileage * decimal.Parse(vehicleData.OdometerMultiplier, NumberStyles.Any);
                             result = _collisionRecordDataAccess.SaveCollisionRecordToVehicle(existingRecord);
                         }
                         break;
@@ -466,7 +465,7 @@ namespace CarCareTracker.Controllers
                         {
                             var existingRecord = _upgradeRecordDataAccess.GetUpgradeRecordById(recordId);
                             existingRecord.Mileage += int.Parse(vehicleData.OdometerDifference);
-                            existingRecord.Mileage = decimal.ToInt32(existingRecord.Mileage * decimal.Parse(vehicleData.OdometerMultiplier, NumberStyles.Any));
+                            existingRecord.Mileage = existingRecord.Mileage * decimal.Parse(vehicleData.OdometerMultiplier, NumberStyles.Any);
                             result = _upgradeRecordDataAccess.SaveUpgradeRecordToVehicle(existingRecord);
                         }
                         break;
@@ -474,7 +473,7 @@ namespace CarCareTracker.Controllers
                         {
                             var existingRecord = _gasRecordDataAccess.GetGasRecordById(recordId);
                             existingRecord.Mileage += int.Parse(vehicleData.OdometerDifference);
-                            existingRecord.Mileage = decimal.ToInt32(existingRecord.Mileage * decimal.Parse(vehicleData.OdometerMultiplier, NumberStyles.Any));
+                            existingRecord.Mileage = existingRecord.Mileage * decimal.Parse(vehicleData.OdometerMultiplier, NumberStyles.Any);
                             result = _gasRecordDataAccess.SaveGasRecordToVehicle(existingRecord);
                         }
                         break;
@@ -482,7 +481,7 @@ namespace CarCareTracker.Controllers
                         {
                             var existingRecord = _odometerRecordDataAccess.GetOdometerRecordById(recordId);
                             existingRecord.Mileage += int.Parse(vehicleData.OdometerDifference);
-                            existingRecord.Mileage = decimal.ToInt32(existingRecord.Mileage * decimal.Parse(vehicleData.OdometerMultiplier, NumberStyles.Any));
+                            existingRecord.Mileage = existingRecord.Mileage * decimal.Parse(vehicleData.OdometerMultiplier, NumberStyles.Any);
                             result = _odometerRecordDataAccess.SaveOdometerRecordToVehicle(existingRecord);
                         }
                         break;
@@ -490,7 +489,7 @@ namespace CarCareTracker.Controllers
             }
             if (result)
             {
-                StaticHelper.NotifyAsync(_config.GetWebHookUrl(), WebHookPayload.Generic($"Adjusted odometer for multiple {importMode.ToString()} - Ids: {string.Join(",", recordIds)}", "bulk.odometer.adjust", User.Identity.Name, string.Empty));
+                StaticHelper.NotifyAsync(_config.GetWebHookUrl(), 0, User.Identity.Name, $"Adjusted odometer for multiple {importMode.ToString()} - Ids: {string.Join(",", recordIds)}");
             }
             return Json(result);
         }
@@ -506,7 +505,6 @@ namespace CarCareTracker.Controllers
                         {
                             var existingRecord = _serviceRecordDataAccess.GetServiceRecordById(recordId);
                             existingRecord.Id = default;
-                            existingRecord.RequisitionHistory = new List<SupplyUsageHistory>();
                             result = _serviceRecordDataAccess.SaveServiceRecordToVehicle(existingRecord);
                         }
                         break;
@@ -514,7 +512,6 @@ namespace CarCareTracker.Controllers
                         {
                             var existingRecord = _collisionRecordDataAccess.GetCollisionRecordById(recordId);
                             existingRecord.Id = default;
-                            existingRecord.RequisitionHistory = new List<SupplyUsageHistory>();
                             result = _collisionRecordDataAccess.SaveCollisionRecordToVehicle(existingRecord);
                         }
                         break;
@@ -522,7 +519,6 @@ namespace CarCareTracker.Controllers
                         {
                             var existingRecord = _upgradeRecordDataAccess.GetUpgradeRecordById(recordId);
                             existingRecord.Id = default;
-                            existingRecord.RequisitionHistory = new List<SupplyUsageHistory>();
                             result = _upgradeRecordDataAccess.SaveUpgradeRecordToVehicle(existingRecord);
                         }
                         break;
@@ -544,7 +540,6 @@ namespace CarCareTracker.Controllers
                         {
                             var existingRecord = _supplyRecordDataAccess.GetSupplyRecordById(recordId);
                             existingRecord.Id = default;
-                            existingRecord.RequisitionHistory = new List<SupplyUsageHistory>();
                             result = _supplyRecordDataAccess.SaveSupplyRecordToVehicle(existingRecord);
                         }
                         break;
@@ -569,20 +564,11 @@ namespace CarCareTracker.Controllers
                             result = _reminderRecordDataAccess.SaveReminderRecordToVehicle(existingRecord);
                         }
                         break;
-                    case ImportMode.PlanRecord:
-                        {
-                            var existingRecord = _planRecordDataAccess.GetPlanRecordById(recordId);
-                            existingRecord.Id = default;
-                            existingRecord.ReminderRecordId = default;
-                            existingRecord.RequisitionHistory = new List<SupplyUsageHistory>();
-                            result = _planRecordDataAccess.SavePlanRecordToVehicle(existingRecord);
-                        }
-                        break;
                 }
             }
             if (result)
             {
-                StaticHelper.NotifyAsync(_config.GetWebHookUrl(), WebHookPayload.Generic($"Duplicated multiple {importMode.ToString()} - Ids: {string.Join(",", recordIds)}", "bulk.duplicate", User.Identity.Name, string.Empty));
+                StaticHelper.NotifyAsync(_config.GetWebHookUrl(), 0, User.Identity.Name, $"Duplicated multiple {importMode.ToString()} - Ids: {string.Join(",", recordIds)}");
             }
             return Json(result);
         }
@@ -602,8 +588,7 @@ namespace CarCareTracker.Controllers
                         {
                             var existingRecord = _serviceRecordDataAccess.GetServiceRecordById(recordId);
                             existingRecord.Id = default;
-                            existingRecord.RequisitionHistory = new List<SupplyUsageHistory>();
-                            foreach (int vehicleId in vehicleIds)
+                            foreach(int vehicleId in vehicleIds)
                             {
                                 existingRecord.VehicleId = vehicleId;
                                 result = _serviceRecordDataAccess.SaveServiceRecordToVehicle(existingRecord);
@@ -614,7 +599,6 @@ namespace CarCareTracker.Controllers
                         {
                             var existingRecord = _collisionRecordDataAccess.GetCollisionRecordById(recordId);
                             existingRecord.Id = default;
-                            existingRecord.RequisitionHistory = new List<SupplyUsageHistory>();
                             foreach (int vehicleId in vehicleIds)
                             {
                                 existingRecord.VehicleId = vehicleId;
@@ -626,7 +610,6 @@ namespace CarCareTracker.Controllers
                         {
                             var existingRecord = _upgradeRecordDataAccess.GetUpgradeRecordById(recordId);
                             existingRecord.Id = default;
-                            existingRecord.RequisitionHistory = new List<SupplyUsageHistory>();
                             foreach (int vehicleId in vehicleIds)
                             {
                                 existingRecord.VehicleId = vehicleId;
@@ -700,88 +683,11 @@ namespace CarCareTracker.Controllers
                             }
                         }
                         break;
-                    case ImportMode.PlanRecord:
-                        {
-                            var existingRecord = _planRecordDataAccess.GetPlanRecordById(recordId);
-                            existingRecord.Id = default;
-                            existingRecord.ReminderRecordId = default;
-                            existingRecord.RequisitionHistory = new List<SupplyUsageHistory>();
-                            foreach (int vehicleId in vehicleIds)
-                            {
-                                existingRecord.VehicleId = vehicleId;
-                                result = _planRecordDataAccess.SavePlanRecordToVehicle(existingRecord);
-                            }
-                        }
-                        break;
                 }
             }
             if (result)
             {
-                StaticHelper.NotifyAsync(_config.GetWebHookUrl(), WebHookPayload.Generic($"Duplicated multiple {importMode.ToString()} - Ids: {string.Join(",", recordIds)} - to Vehicle Ids: {string.Join(",", vehicleIds)}", "bulk.duplicate.to.vehicles", User.Identity.Name, string.Join(",", vehicleIds)));
-            }
-            return Json(result);
-        }
-        [HttpPost]
-        public IActionResult BulkCreateOdometerRecords(List<int> recordIds, ImportMode importMode)
-        {
-            bool result = false;
-            foreach (int recordId in recordIds)
-            {
-                switch (importMode)
-                {
-                    case ImportMode.ServiceRecord:
-                        {
-                            var existingRecord = _serviceRecordDataAccess.GetServiceRecordById(recordId);
-                            result = _odometerLogic.AutoInsertOdometerRecord(new OdometerRecord
-                            {
-                                Date = existingRecord.Date,
-                                VehicleId = existingRecord.VehicleId,
-                                Mileage = existingRecord.Mileage,
-                                Notes = $"Auto Insert From Service Record: {existingRecord.Description}"
-                            });
-                        }
-                        break;
-                    case ImportMode.RepairRecord:
-                        {
-                            var existingRecord = _collisionRecordDataAccess.GetCollisionRecordById(recordId);
-                            result = _odometerLogic.AutoInsertOdometerRecord(new OdometerRecord
-                            {
-                                Date = existingRecord.Date,
-                                VehicleId = existingRecord.VehicleId,
-                                Mileage = existingRecord.Mileage,
-                                Notes = $"Auto Insert From Repair Record: {existingRecord.Description}"
-                            });
-                        }
-                        break;
-                    case ImportMode.UpgradeRecord:
-                        {
-                            var existingRecord = _upgradeRecordDataAccess.GetUpgradeRecordById(recordId);
-                            result = _odometerLogic.AutoInsertOdometerRecord(new OdometerRecord
-                            {
-                                Date = existingRecord.Date,
-                                VehicleId = existingRecord.VehicleId,
-                                Mileage = existingRecord.Mileage,
-                                Notes = $"Auto Insert From Upgrade Record: {existingRecord.Description}"
-                            });
-                        }
-                        break;
-                    case ImportMode.GasRecord:
-                        {
-                            var existingRecord = _gasRecordDataAccess.GetGasRecordById(recordId);
-                            result = _odometerLogic.AutoInsertOdometerRecord(new OdometerRecord
-                            {
-                                Date = existingRecord.Date,
-                                VehicleId = existingRecord.VehicleId,
-                                Mileage = existingRecord.Mileage,
-                                Notes = $"Auto Insert From Gas Record. {existingRecord.Notes}"
-                            });
-                        }
-                        break;
-                }
-            }
-            if (result)
-            {
-                StaticHelper.NotifyAsync(_config.GetWebHookUrl(), WebHookPayload.Generic($"Created Odometer Records based on {importMode.ToString()} - Ids: {string.Join(",", recordIds)}", "bulk.odometer.insert", User.Identity.Name, string.Empty));
+                StaticHelper.NotifyAsync(_config.GetWebHookUrl(), 0, User.Identity.Name, $"Duplicated multiple {importMode.ToString()} - Ids: {string.Join(",", recordIds)} - to Vehicle Ids: {string.Join(",", vehicleIds)}");
             }
             return Json(result);
         }
@@ -844,15 +750,14 @@ namespace CarCareTracker.Controllers
                             }
                             if (extraFieldIsEdited)
                             {
-                                foreach (ExtraField extraField in genericRecordEditModel.EditRecord.ExtraFields)
+                                foreach(ExtraField extraField in genericRecordEditModel.EditRecord.ExtraFields)
                                 {
-                                    if (existingRecord.ExtraFields.Any(x => x.Name == extraField.Name))
+                                    if (existingRecord.ExtraFields.Any(x=>x.Name == extraField.Name))
                                     {
                                         var insertIndex = existingRecord.ExtraFields.FindIndex(x => x.Name == extraField.Name);
                                         existingRecord.ExtraFields.RemoveAll(x => x.Name == extraField.Name);
                                         existingRecord.ExtraFields.Insert(insertIndex, extraField);
-                                    }
-                                    else
+                                    } else
                                     {
                                         existingRecord.ExtraFields.Add(extraField);
                                     }
@@ -958,167 +863,6 @@ namespace CarCareTracker.Controllers
             return Json(result);
         }
         [HttpPost]
-        public IActionResult PrintRecordStickers(int vehicleId, List<int> recordIds, ImportMode importMode)
-        {
-            bool result = false;
-            if (!recordIds.Any())
-            {
-                return Json(result);
-            }
-            var stickerViewModel = new StickerViewModel() { RecordType = importMode };
-            if (vehicleId != default)
-            {
-                var vehicleData = _dataAccess.GetVehicleById(vehicleId);
-                if (vehicleData != null && vehicleData.Id != default)
-                {
-                    stickerViewModel.VehicleData = vehicleData;
-                }
-            }
-
-            int recordsAdded = 0;
-            switch (importMode)
-            {
-                case ImportMode.ServiceRecord:
-                    {
-                        foreach (int recordId in recordIds)
-                        {
-                            stickerViewModel.GenericRecords.Add(_serviceRecordDataAccess.GetServiceRecordById(recordId));
-                            recordsAdded++;
-                        }
-
-                    }
-                    break;
-                case ImportMode.RepairRecord:
-                    {
-                        foreach (int recordId in recordIds)
-                        {
-                            stickerViewModel.GenericRecords.Add(_collisionRecordDataAccess.GetCollisionRecordById(recordId));
-                            recordsAdded++;
-                        }
-                    }
-                    break;
-                case ImportMode.UpgradeRecord:
-                    {
-                        foreach (int recordId in recordIds)
-                        {
-                            stickerViewModel.GenericRecords.Add(_upgradeRecordDataAccess.GetUpgradeRecordById(recordId));
-                            recordsAdded++;
-                        }
-                    }
-                    break;
-                case ImportMode.GasRecord:
-                    {
-                        foreach (int recordId in recordIds)
-                        {
-                            var record = _gasRecordDataAccess.GetGasRecordById(recordId);
-                            stickerViewModel.GenericRecords.Add(new GenericRecord
-                            {
-                                Cost = record.Cost,
-                                Date = record.Date,
-                                Notes = record.Notes,
-                                Mileage = record.Mileage,
-                                ExtraFields = record.ExtraFields
-                            });
-                            recordsAdded++;
-                        }
-
-                    }
-                    break;
-                case ImportMode.TaxRecord:
-                    {
-                        foreach (int recordId in recordIds)
-                        {
-                            var record = _taxRecordDataAccess.GetTaxRecordById(recordId);
-                            stickerViewModel.GenericRecords.Add(new GenericRecord
-                            {
-                                Description = record.Description,
-                                Cost = record.Cost,
-                                Notes = record.Notes,
-                                Date = record.Date,
-                                ExtraFields = record.ExtraFields
-                            });
-                            recordsAdded++;
-                        }
-                    }
-                    break;
-                case ImportMode.SupplyRecord:
-                    {
-                        foreach (int recordId in recordIds)
-                        {
-                            var record = _supplyRecordDataAccess.GetSupplyRecordById(recordId);
-                            stickerViewModel.SupplyRecords.Add(record);
-                            recordsAdded++;
-                        }
-                    }
-                    break;
-                case ImportMode.NoteRecord:
-                    {
-                        foreach (int recordId in recordIds)
-                        {
-                            var record = _noteDataAccess.GetNoteById(recordId);
-                            stickerViewModel.GenericRecords.Add(new GenericRecord
-                            {
-                                Description = record.Description,
-                                Notes = record.NoteText
-                            });
-                            recordsAdded++;
-                        }
-
-                    }
-                    break;
-                case ImportMode.OdometerRecord:
-                    {
-                        foreach (int recordId in recordIds)
-                        {
-                            var record = _odometerRecordDataAccess.GetOdometerRecordById(recordId);
-                            stickerViewModel.GenericRecords.Add(new GenericRecord
-                            {
-                                Date = record.Date,
-                                Mileage = record.Mileage,
-                                Notes = record.Notes,
-                                ExtraFields = record.ExtraFields
-                            });
-                            recordsAdded++;
-                        }
-
-                    }
-                    break;
-                case ImportMode.ReminderRecord:
-                    {
-                        foreach (int recordId in recordIds)
-                        {
-                            stickerViewModel.ReminderRecords.Add(_reminderRecordDataAccess.GetReminderRecordById(recordId));
-                            recordsAdded++;
-                        }
-
-                    }
-                    break;
-                case ImportMode.PlanRecord:
-                    {
-                        foreach (int recordId in recordIds)
-                        {
-                            var record = _planRecordDataAccess.GetPlanRecordById(recordId);
-                            stickerViewModel.GenericRecords.Add(new GenericRecord
-                            {
-                                Description = record.Description,
-                                Cost = record.Cost,
-                                Notes = record.Notes,
-                                Date = record.DateModified,
-                                ExtraFields = record.ExtraFields,
-                                RequisitionHistory = record.RequisitionHistory
-                            });
-                            recordsAdded++;
-                        }
-                    }
-                    break;
-            }
-            if (recordsAdded > 0)
-            {
-                return PartialView("_Stickers", stickerViewModel);
-            }
-            return Json(result);
-        }
-        [HttpPost]
         public IActionResult SaveUserColumnPreferences(UserColumnPreference columnPreference)
         {
             try
@@ -1129,7 +873,6 @@ namespace CarCareTracker.Controllers
                 {
                     var existingPreference = existingUserColumnPreference.Single();
                     existingPreference.VisibleColumns = columnPreference.VisibleColumns;
-                    existingPreference.ColumnOrder = columnPreference.ColumnOrder;
                 }
                 else
                 {

Enum/ExtraFieldType.cs

@@ -1,12 +0,0 @@
-namespace CarCareTracker.Models
-{
-    public enum ExtraFieldType
-    {
-        Text = 0,
-        Number = 1,
-        Decimal = 2,
-        Date = 3,
-        Time = 4,
-        Location = 5
-    }
-}

Enum/ReminderIntervalUnit.cs

@@ -1,8 +0,0 @@
-namespace CarCareTracker.Models
-{
-    public enum ReminderIntervalUnit
-    {
-        Months = 1,
-        Days = 2
-    }
-}

Enum/TagFilter.cs

@@ -1,8 +0,0 @@
-namespace CarCareTracker.Models
-{
-    public enum TagFilter
-    {
-        Exclude = 0,
-        IncludeOnly = 1
-    }
-}

Filter/CollaboratorFilter.cs

@@ -19,34 +19,27 @@ namespace CarCareTracker.Filter
         {
             if (!filterContext.HttpContext.User.IsInRole(nameof(UserData.IsRootUser)))
             {
-                if (filterContext.ActionArguments.ContainsKey("vehicleId"))
+                var vehicleId = int.Parse(filterContext.ActionArguments["vehicleId"].ToString());
+                if (vehicleId != default)
                 {
-                    var vehicleId = int.Parse(filterContext.ActionArguments["vehicleId"].ToString());
-                    if (vehicleId != default)
+                    var userId = int.Parse(filterContext.HttpContext.User.FindFirstValue(ClaimTypes.NameIdentifier));
+                    if (!_userLogic.UserCanEditVehicle(userId, vehicleId))
                     {
-                        var userId = int.Parse(filterContext.HttpContext.User.FindFirstValue(ClaimTypes.NameIdentifier));
-                        if (!_userLogic.UserCanEditVehicle(userId, vehicleId))
-                        {
-                            filterContext.Result = new RedirectResult("/Error/Unauthorized");
-                        }
-                    }
-                    else
-                    {
-                        var shopSupplyEndpoints = new List<string> { "ImportToVehicleIdFromCsv", "GetSupplyRecordsByVehicleId", "ExportFromVehicleToCsv" };
-                        if (shopSupplyEndpoints.Contains(filterContext.RouteData.Values["action"].ToString()) && !_config.GetServerEnableShopSupplies())
-                        {
-                            //user trying to access shop supplies but shop supplies is not enabled by root user.
-                            filterContext.Result = new RedirectResult("/Error/Unauthorized");
-                        }
-                        else if (!shopSupplyEndpoints.Contains(filterContext.RouteData.Values["action"].ToString()))
-                        {
-                            //user trying to access any other endpoints using 0 as vehicle id.
-                            filterContext.Result = new RedirectResult("/Error/Unauthorized");
-                        }
+                        filterContext.Result = new RedirectResult("/Error/Unauthorized");
                     }
                 } else
                 {
-                    filterContext.Result = new RedirectResult("/Error/Unauthorized");
+                    var shopSupplyEndpoints = new List<string> { "ImportToVehicleIdFromCsv", "GetSupplyRecordsByVehicleId", "ExportFromVehicleToCsv" };
+                    if (shopSupplyEndpoints.Contains(filterContext.RouteData.Values["action"].ToString()) && !_config.GetServerEnableShopSupplies())
+                    {
+                        //user trying to access shop supplies but shop supplies is not enabled by root user.
+                        filterContext.Result = new RedirectResult("/Error/Unauthorized");
+                    }
+                    else if (!shopSupplyEndpoints.Contains(filterContext.RouteData.Values["action"].ToString()))
+                    {
+                        //user trying to access any other endpoints using 0 as vehicle id.
+                        filterContext.Result = new RedirectResult("/Error/Unauthorized");
+                    }
                 }
             }
         }

Helper/ConfigHelper.cs

@@ -10,7 +10,6 @@ namespace CarCareTracker.Helper
     {
         OpenIDConfig GetOpenIDConfig();
         ReminderUrgencyConfig GetReminderUrgencyConfig();
-        MailConfig GetMailConfig();
         UserConfig GetUserConfig(ClaimsPrincipal user);
         bool SaveUserConfig(ClaimsPrincipal user, UserConfig configData);
         bool AuthenticateRootUser(string username, string password);
@@ -19,60 +18,48 @@ namespace CarCareTracker.Helper
         bool GetCustomWidgetsEnabled();
         string GetMOTD();
         string GetLogoUrl();
-        string GetSmallLogoUrl();
         string GetServerLanguage();
         bool GetServerDisabledRegistration();
         bool GetServerEnableShopSupplies();
         string GetServerPostgresConnection();
         string GetAllowedFileUploadExtensions();
-        string GetServerDomain();
-        bool DeleteUserConfig(int userId);
-        bool GetInvariantApi();
-        bool GetServerOpenRegistration();
+        public bool DeleteUserConfig(int userId);
     }
     public class ConfigHelper : IConfigHelper
     {
         private readonly IConfiguration _config;
         private readonly IUserConfigDataAccess _userConfig;
-        private readonly ILogger<IConfigHelper> _logger;
         private IMemoryCache _cache;
         public ConfigHelper(IConfiguration serverConfig, 
             IUserConfigDataAccess userConfig,
-            IMemoryCache memoryCache,
-            ILogger<IConfigHelper> logger)
+            IMemoryCache memoryCache)
         {
             _config = serverConfig;
             _userConfig = userConfig;
             _cache = memoryCache;
-            _logger = logger;
         }
         public string GetWebHookUrl()
         {
-            var webhook = CheckString("LUBELOGGER_WEBHOOK");
+            var webhook = _config["LUBELOGGER_WEBHOOK"];
+            if (string.IsNullOrWhiteSpace(webhook))
+            {
+                webhook = "";
+            }
             return webhook;
         }
         public bool GetCustomWidgetsEnabled()
         {
-            return CheckBool(CheckString("LUBELOGGER_CUSTOM_WIDGETS"));
-        }
-        public bool GetInvariantApi()
-        {
-            return CheckBool(CheckString("LUBELOGGER_INVARIANT_API"));
+            return bool.Parse(_config["LUBELOGGER_CUSTOM_WIDGETS"] ?? "false");
         }
         public string GetMOTD()
         {
-            var motd = CheckString("LUBELOGGER_MOTD");
+            var motd = _config["LUBELOGGER_MOTD"];
+            if (string.IsNullOrWhiteSpace(motd))
+            {
+                motd = "";
+            }
             return motd;
         }
-        public string GetServerDomain()
-        {
-            var domain = CheckString("LUBELOGGER_DOMAIN");
-            return domain;
-        }
-        public bool GetServerOpenRegistration()
-        {
-            return CheckBool(CheckString("LUBELOGGER_OPEN_REGISTRATION"));
-        }
         public OpenIDConfig GetOpenIDConfig()
         {
             OpenIDConfig openIdConfig = _config.GetSection("OpenIDConfig").Get<OpenIDConfig>() ?? new OpenIDConfig();
@@ -83,30 +70,27 @@ namespace CarCareTracker.Helper
             ReminderUrgencyConfig reminderUrgencyConfig = _config.GetSection("ReminderUrgencyConfig").Get<ReminderUrgencyConfig>() ?? new ReminderUrgencyConfig();
             return reminderUrgencyConfig;
         }
-        public MailConfig GetMailConfig()
-        {
-            MailConfig mailConfig = _config.GetSection("MailConfig").Get<MailConfig>() ?? new MailConfig();
-            return mailConfig;
-        }
         public string GetLogoUrl()
         {
-            var logoUrl = CheckString("LUBELOGGER_LOGO_URL", "/defaults/lubelogger_logo.png");
-            return logoUrl;
-        }
-        public string GetSmallLogoUrl()
-        {
-            var logoUrl = CheckString("LUBELOGGER_LOGO_SMALL_URL", "/defaults/lubelogger_logo_small.png");
+            var logoUrl = _config["LUBELOGGER_LOGO_URL"];
+            if (string.IsNullOrWhiteSpace(logoUrl))
+            {
+                logoUrl = "/defaults/lubelogger_logo.png";
+            }
             return logoUrl;
         }
         public string GetAllowedFileUploadExtensions()
         {
-            var allowedFileExtensions = CheckString("LUBELOGGER_ALLOWED_FILE_EXTENSIONS", StaticHelper.DefaultAllowedFileExtensions);
+            var allowedFileExtensions = _config["LUBELOGGER_ALLOWED_FILE_EXTENSIONS"];
+            if (string.IsNullOrWhiteSpace(allowedFileExtensions)){
+                return StaticHelper.DefaultAllowedFileExtensions;
+            }
             return allowedFileExtensions;
         }
         public bool AuthenticateRootUser(string username, string password)
         {
-            var rootUsername = CheckString(nameof(UserConfig.UserNameHash));
-            var rootPassword = CheckString(nameof(UserConfig.UserPasswordHash));
+            var rootUsername = _config[nameof(UserConfig.UserNameHash)] ?? string.Empty;
+            var rootPassword = _config[nameof(UserConfig.UserPasswordHash)] ?? string.Empty;
             if (string.IsNullOrWhiteSpace(rootUsername) || string.IsNullOrWhiteSpace(rootPassword))
             {
                 return false;
@@ -115,8 +99,8 @@ namespace CarCareTracker.Helper
         }
         public bool AuthenticateRootUserOIDC(string email)
         {
-            var rootEmail = CheckString(nameof(UserConfig.DefaultReminderEmail));
-            var rootUserOIDC = CheckBool(CheckString(nameof(UserConfig.EnableRootUserOIDC)));
+            var rootEmail = _config[nameof(UserConfig.DefaultReminderEmail)] ?? string.Empty;
+            var rootUserOIDC = bool.Parse(_config[nameof(UserConfig.EnableRootUserOIDC)]);
             if (!rootUserOIDC || string.IsNullOrWhiteSpace(rootEmail))
             {
                 return false;
@@ -125,22 +109,27 @@ namespace CarCareTracker.Helper
         }
         public string GetServerLanguage()
         {
-            var serverLanguage = CheckString(nameof(UserConfig.UserLanguage), "en_US");
+            var serverLanguage = _config[nameof(UserConfig.UserLanguage)] ?? "en_US";
             return serverLanguage;
         }
         public bool GetServerDisabledRegistration()
         {
-            var registrationDisabled = CheckBool(CheckString(nameof(UserConfig.DisableRegistration)));
+            var registrationDisabled = bool.Parse(_config[nameof(UserConfig.DisableRegistration)]);
             return registrationDisabled;
         }
         public string GetServerPostgresConnection()
         {
-            var postgresConnection = CheckString("POSTGRES_CONNECTION");
-            return postgresConnection;
+            if (!string.IsNullOrWhiteSpace(_config["POSTGRES_CONNECTION"]))
+            {
+                return _config["POSTGRES_CONNECTION"];
+            } else
+            {
+                return string.Empty;
+            }
         }
         public bool GetServerEnableShopSupplies()
         {
-            return CheckBool(CheckString(nameof(UserConfig.EnableShopSupplies)));
+            return bool.Parse(_config[nameof(UserConfig.EnableShopSupplies)] ?? "false");
         }
         public bool SaveUserConfig(ClaimsPrincipal user, UserConfig configData)
         {
@@ -170,7 +159,6 @@ namespace CarCareTracker.Helper
                 }
                 catch (Exception ex)
                 {
-                    _logger.LogWarning(ex.Message);
                     return false;
                 }
             } else
@@ -191,75 +179,37 @@ namespace CarCareTracker.Helper
             var result = _userConfig.DeleteUserConfig(userId);
             return result;
         }
-        private bool CheckBool(string value, bool defaultValue = false)
-        {
-            try
-            {
-                if (string.IsNullOrWhiteSpace(value))
-                {
-                    return defaultValue;
-                }
-                else if (bool.TryParse(value, out bool result))
-                {
-                    return result;
-                }
-                else
-                {
-                    return defaultValue;
-                }
-            } catch (Exception ex)
-            {
-                _logger.LogWarning($"ConfigHelper Warning: You might be missing keys in appsettings.json, Message: ${ex.Message}");
-                return defaultValue;
-            }
-        }
-        private string CheckString(string configName, string defaultValue = "")
-        {
-            try
-            {
-                var configValue = _config[configName] ?? defaultValue;
-                return configValue;
-            } catch(Exception ex)
-            {
-                _logger.LogWarning($"ConfigHelper Warning: You might be missing keys in appsettings.json, Message: ${ex.Message}");
-                return defaultValue;
-            }
-        }
         public UserConfig GetUserConfig(ClaimsPrincipal user)
         {
             var serverConfig = new UserConfig
             {
-                EnableCsvImports = CheckBool(CheckString(nameof(UserConfig.EnableCsvImports)), true),
-                UseDarkMode = CheckBool(CheckString(nameof(UserConfig.UseDarkMode))),
-                UseSystemColorMode = CheckBool(CheckString(nameof(UserConfig.UseSystemColorMode))),
-                UseMPG = CheckBool(CheckString(nameof(UserConfig.UseMPG)), true),
-                UseDescending = CheckBool(CheckString(nameof(UserConfig.UseDescending))),
-                EnableAuth = CheckBool(CheckString(nameof(UserConfig.EnableAuth))),
-                EnableRootUserOIDC = CheckBool(CheckString(nameof(UserConfig.EnableRootUserOIDC))),
-                HideZero = CheckBool(CheckString(nameof(UserConfig.HideZero))),
-                AutomaticDecimalFormat = CheckBool(CheckString(nameof(UserConfig.AutomaticDecimalFormat))),
-                UseUKMPG = CheckBool(CheckString(nameof(UserConfig.UseUKMPG))),
-                UseMarkDownOnSavedNotes = CheckBool(CheckString(nameof(UserConfig.UseMarkDownOnSavedNotes))),
-                UseThreeDecimalGasCost = CheckBool(CheckString(nameof(UserConfig.UseThreeDecimalGasCost)), true),
-                UseThreeDecimalGasConsumption = CheckBool(CheckString(nameof(UserConfig.UseThreeDecimalGasConsumption)), true),
-                EnableAutoReminderRefresh = CheckBool(CheckString(nameof(UserConfig.EnableAutoReminderRefresh))),
-                EnableAutoOdometerInsert = CheckBool(CheckString(nameof(UserConfig.EnableAutoOdometerInsert))),
-                PreferredGasMileageUnit = CheckString(nameof(UserConfig.PreferredGasMileageUnit)),
-                PreferredGasUnit = CheckString(nameof(UserConfig.PreferredGasUnit)),
-                UseUnitForFuelCost = CheckBool(CheckString(nameof(UserConfig.UseUnitForFuelCost))),
-                UserLanguage = CheckString(nameof(UserConfig.UserLanguage), "en_US"),
-                HideSoldVehicles = CheckBool(CheckString(nameof(UserConfig.HideSoldVehicles))),
-                EnableShopSupplies = CheckBool(CheckString(nameof(UserConfig.EnableShopSupplies))),
-                ShowCalendar = CheckBool(CheckString(nameof(UserConfig.ShowCalendar))),
-                EnableExtraFieldColumns = CheckBool(CheckString(nameof(UserConfig.EnableExtraFieldColumns))),
-                VisibleTabs = _config.GetSection(nameof(UserConfig.VisibleTabs)).Get<List<ImportMode>>() ?? new UserConfig().VisibleTabs,
-                TabOrder = _config.GetSection(nameof(UserConfig.TabOrder)).Get<List<ImportMode>>() ?? new UserConfig().TabOrder,
+                EnableCsvImports = bool.Parse(_config[nameof(UserConfig.EnableCsvImports)]),
+                UseDarkMode = bool.Parse(_config[nameof(UserConfig.UseDarkMode)]),
+                UseSystemColorMode = bool.Parse(_config[nameof(UserConfig.UseSystemColorMode)]),
+                UseMPG = bool.Parse(_config[nameof(UserConfig.UseMPG)]),
+                UseDescending = bool.Parse(_config[nameof(UserConfig.UseDescending)]),
+                EnableAuth = bool.Parse(_config[nameof(UserConfig.EnableAuth)]),
+                EnableRootUserOIDC = bool.Parse(_config[nameof(UserConfig.EnableRootUserOIDC)]),
+                HideZero = bool.Parse(_config[nameof(UserConfig.HideZero)]),
+                AutomaticDecimalFormat = bool.Parse(_config[nameof(UserConfig.AutomaticDecimalFormat)]),
+                UseUKMPG = bool.Parse(_config[nameof(UserConfig.UseUKMPG)]),
+                UseMarkDownOnSavedNotes = bool.Parse(_config[nameof(UserConfig.UseMarkDownOnSavedNotes)]),
+                UseThreeDecimalGasCost = bool.Parse(_config[nameof(UserConfig.UseThreeDecimalGasCost)]),
+                EnableAutoReminderRefresh = bool.Parse(_config[nameof(UserConfig.EnableAutoReminderRefresh)]),
+                EnableAutoOdometerInsert = bool.Parse(_config[nameof(UserConfig.EnableAutoOdometerInsert)]),
+                PreferredGasMileageUnit = _config[nameof(UserConfig.PreferredGasMileageUnit)],
+                PreferredGasUnit = _config[nameof(UserConfig.PreferredGasUnit)],
+                UserLanguage = _config[nameof(UserConfig.UserLanguage)],
+                HideSoldVehicles = bool.Parse(_config[nameof(UserConfig.HideSoldVehicles)]),
+                EnableShopSupplies = bool.Parse(_config[nameof(UserConfig.EnableShopSupplies)]),
+                EnableExtraFieldColumns = bool.Parse(_config[nameof(UserConfig.EnableExtraFieldColumns)]),
+                VisibleTabs = _config.GetSection(nameof(UserConfig.VisibleTabs)).Get<List<ImportMode>>(),
+                TabOrder = _config.GetSection(nameof(UserConfig.TabOrder)).Get<List<ImportMode>>(),
                 UserColumnPreferences = _config.GetSection(nameof(UserConfig.UserColumnPreferences)).Get<List<UserColumnPreference>>() ?? new List<UserColumnPreference>(),
                 ReminderUrgencyConfig = _config.GetSection(nameof(UserConfig.ReminderUrgencyConfig)).Get<ReminderUrgencyConfig>() ?? new ReminderUrgencyConfig(),
-                DefaultTab = (ImportMode)int.Parse(CheckString(nameof(UserConfig.DefaultTab), "8")),
-                DefaultReminderEmail = CheckString(nameof(UserConfig.DefaultReminderEmail)),
-                DisableRegistration = CheckBool(CheckString(nameof(UserConfig.DisableRegistration))),
-                ShowVehicleThumbnail = CheckBool(CheckString(nameof(UserConfig.ShowVehicleThumbnail)))
+                DefaultTab = (ImportMode)int.Parse(_config[nameof(UserConfig.DefaultTab)]),
+                DefaultReminderEmail = _config[nameof(UserConfig.DefaultReminderEmail)],
+                DisableRegistration = bool.Parse(_config[nameof(UserConfig.DisableRegistration)])
             };
             int userId = 0;
             if (user != null)

Helper/FileHelper.cs

@@ -6,7 +6,6 @@ namespace CarCareTracker.Helper
     public interface IFileHelper
     {
         string GetFullFilePath(string currentFilePath, bool mustExist = true);
-        byte[] GetFileBytes(string fullFilePath, bool deleteFile = false);
         string MoveFileFromTemp(string currentFilePath, string newFolder);
         bool RenameFile(string currentFilePath, string newName);
         bool DeleteFile(string currentFilePath);
@@ -35,7 +34,7 @@ namespace CarCareTracker.Helper
         }
         public List<string> GetLanguages()
         {
-            var languagePath = Path.Combine(_webEnv.ContentRootPath, "data", "translations");
+            var languagePath = Path.Combine(_webEnv.WebRootPath, "translations");
             var defaultList = new List<string>() { "en_US" };
             if (Directory.Exists(languagePath))
             {
@@ -73,7 +72,7 @@ namespace CarCareTracker.Helper
             {
                 currentFilePath = currentFilePath.Substring(1);
             }
-            string oldFilePath = currentFilePath.StartsWith("defaults/") ? Path.Combine(_webEnv.WebRootPath, currentFilePath) : Path.Combine(_webEnv.ContentRootPath, "data", currentFilePath);
+            string oldFilePath = Path.Combine(_webEnv.WebRootPath, currentFilePath);
             if (File.Exists(oldFilePath))
             {
                 return oldFilePath;
@@ -86,19 +85,6 @@ namespace CarCareTracker.Helper
                 return string.Empty;
             }
         }
-        public byte[] GetFileBytes(string fullFilePath, bool deleteFile = false)
-        {
-            if (File.Exists(fullFilePath))
-            {
-                var fileBytes = File.ReadAllBytes(fullFilePath);
-                if (deleteFile)
-                {
-                    File.Delete(fullFilePath);
-                }
-                return fileBytes;
-            }
-            return Array.Empty<byte>();
-        }
         public bool RestoreBackup(string fileName, bool clearExisting = false)
         {
             var fullFilePath = GetFullFilePath(fileName);
@@ -108,7 +94,7 @@ namespace CarCareTracker.Helper
             }
             try
             {
-                var tempPath = Path.Combine(_webEnv.ContentRootPath, "data", $"temp/{Guid.NewGuid()}");
+                var tempPath = Path.Combine(_webEnv.WebRootPath, $"temp/{Guid.NewGuid()}");
                 if (!Directory.Exists(tempPath))
                     Directory.CreateDirectory(tempPath);
                 //extract zip file
@@ -119,10 +105,10 @@ namespace CarCareTracker.Helper
                 var translationPath = Path.Combine(tempPath, "translations");
                 var dataPath = Path.Combine(tempPath, StaticHelper.DbName);
                 var widgetPath = Path.Combine(tempPath, StaticHelper.AdditionalWidgetsPath);
-                var configPath = Path.Combine(tempPath, StaticHelper.LegacyUserConfigPath);
+                var configPath = Path.Combine(tempPath, StaticHelper.UserConfigPath);
                 if (Directory.Exists(imagePath))
                 {
-                    var existingPath = Path.Combine(_webEnv.ContentRootPath, "data", "images");
+                    var existingPath = Path.Combine(_webEnv.WebRootPath, "images");
                     if (!Directory.Exists(existingPath))
                     {
                         Directory.CreateDirectory(existingPath);
@@ -144,7 +130,7 @@ namespace CarCareTracker.Helper
                 }
                 if (Directory.Exists(documentPath))
                 {
-                    var existingPath = Path.Combine(_webEnv.ContentRootPath, "data", "documents");
+                    var existingPath = Path.Combine(_webEnv.WebRootPath, "documents");
                     if (!Directory.Exists(existingPath))
                     {
                         Directory.CreateDirectory(existingPath);
@@ -166,7 +152,7 @@ namespace CarCareTracker.Helper
                 }
                 if (Directory.Exists(translationPath))
                 {
-                    var existingPath = Path.Combine(_webEnv.ContentRootPath, "data", "translations");
+                    var existingPath = Path.Combine(_webEnv.WebRootPath, "translations");
                     if (!Directory.Exists(existingPath))
                     {
                         Directory.CreateDirectory(existingPath);
@@ -200,9 +186,9 @@ namespace CarCareTracker.Helper
                 if (File.Exists(configPath))
                 {
                     //check if config folder exists.
-                    if (!Directory.Exists("data/config"))
+                    if (!Directory.Exists("config/"))
                     {
-                        Directory.CreateDirectory("data/config");
+                        Directory.CreateDirectory("config/");
                     }
                     File.Move(configPath, StaticHelper.UserConfigPath, true);
                 }
@@ -217,7 +203,7 @@ namespace CarCareTracker.Helper
         public string MakeAttachmentsExport(List<GenericReportModel> exportData)
         {
             var folderName = Guid.NewGuid();
-            var tempPath = Path.Combine(_webEnv.ContentRootPath, "data", $"temp/{folderName}");
+            var tempPath = Path.Combine(_webEnv.WebRootPath, $"temp/{folderName}");
             if (!Directory.Exists(tempPath))
                 Directory.CreateDirectory(tempPath);
             int fileIndex = 0;
@@ -241,10 +227,10 @@ namespace CarCareTracker.Helper
         public string MakeBackup()
         {
             var folderName = $"db_backup_{DateTime.Now.ToString("yyyy-MM-dd-HH-mm-ss")}";
-            var tempPath = Path.Combine(_webEnv.ContentRootPath, "data", $"temp/{folderName}");
-            var imagePath = Path.Combine(_webEnv.ContentRootPath, "data", "images");
-            var documentPath = Path.Combine(_webEnv.ContentRootPath, "data", "documents");
-            var translationPath = Path.Combine(_webEnv.ContentRootPath, "data", "translations");
+            var tempPath = Path.Combine(_webEnv.WebRootPath, $"temp/{folderName}");
+            var imagePath = Path.Combine(_webEnv.WebRootPath, "images");
+            var documentPath = Path.Combine(_webEnv.WebRootPath, "documents");
+            var translationPath = Path.Combine(_webEnv.WebRootPath, "translations");
             var dataPath = StaticHelper.DbName;
             var widgetPath = StaticHelper.AdditionalWidgetsPath;
             var configPath = StaticHelper.UserConfigPath;
@@ -315,8 +301,8 @@ namespace CarCareTracker.Helper
             {
                 currentFilePath = currentFilePath.Substring(1);
             }
-            string uploadPath = Path.Combine(_webEnv.ContentRootPath, "data", newFolder);
-            string oldFilePath = Path.Combine(_webEnv.ContentRootPath, "data", currentFilePath);
+            string uploadPath = Path.Combine(_webEnv.WebRootPath, newFolder);
+            string oldFilePath = Path.Combine(_webEnv.WebRootPath, currentFilePath);
             if (!Directory.Exists(uploadPath))
                 Directory.CreateDirectory(uploadPath);
             string newFileUploadPath = oldFilePath.Replace(tempPath, newFolder);
@@ -333,7 +319,7 @@ namespace CarCareTracker.Helper
             {
                 currentFilePath = currentFilePath.Substring(1);
             }
-            string filePath = Path.Combine(_webEnv.ContentRootPath, "data", currentFilePath);
+            string filePath = Path.Combine(_webEnv.WebRootPath, currentFilePath);
             if (File.Exists(filePath))
             {
                 File.Delete(filePath);

Helper/GasHelper.cs

@@ -36,9 +36,9 @@ namespace CarCareTracker.Helper
             //need to order by to get correct results
             result = result.OrderBy(x => x.Date).ThenBy(x => x.Mileage).ToList();
             var computedResults = new List<GasRecordViewModel>();
-            int previousMileage = 0;
+            decimal previousMileage = 0.00M;
             decimal unFactoredConsumption = 0.00M;
-            int unFactoredMileage = 0;
+            decimal unFactoredMileage = 0.00M;
             //perform computation.
             for (int i = 0; i < result.Count; i++)
             {
@@ -76,8 +76,7 @@ namespace CarCareTracker.Helper
                         MissedFuelUp = currentObject.MissedFuelUp,
                         Notes = currentObject.Notes,
                         Tags = currentObject.Tags,
-                        ExtraFields = currentObject.ExtraFields,
-                        Files = currentObject.Files
+                        ExtraFields = currentObject.ExtraFields
                     };
                     if (currentObject.MissedFuelUp)
                     {
@@ -87,9 +86,9 @@ namespace CarCareTracker.Helper
                         unFactoredConsumption = 0;
                         unFactoredMileage = 0;
                     }
-                    else if (currentObject.IsFillToFull && currentObject.Mileage != default)
+                    else if (currentObject.IsFillToFull)
                     {
-                        //if user filled to full and an odometer is provided, otherwise we will defer calculations
+                        //if user filled to full.
                         if (convertedConsumption > 0.00M && deltaMileage > 0)
                         {
                             try
@@ -131,14 +130,10 @@ namespace CarCareTracker.Helper
                         MissedFuelUp = currentObject.MissedFuelUp,
                         Notes = currentObject.Notes,
                         Tags = currentObject.Tags,
-                        ExtraFields = currentObject.ExtraFields,
-                        Files = currentObject.Files
+                        ExtraFields = currentObject.ExtraFields
                     });
                 }
-                if (currentObject.Mileage != default)
-                {
-                    previousMileage = currentObject.Mileage;
-                }
+                previousMileage = currentObject.Mileage;
             }
             return computedResults;
         }

Helper/LiteDBHelper.cs

@@ -1,4 +1,5 @@
-using LiteDB;
+using CarCareTracker.Models;
+using LiteDB;
 
 namespace CarCareTracker.Helper;
 
@@ -15,6 +16,29 @@ public class LiteDBHelper: ILiteDBHelper
         if (db == null)
         {
             db = new LiteDatabase(StaticHelper.DbName);
+            if (db.UserVersion == 0)
+            {
+                //migration required to convert ints to decimals
+                var collections = db.GetCollectionNames();
+                foreach (string collection in collections)
+                {
+                    var documents = db.GetCollection(collection);
+                    foreach (var document in documents.FindAll())
+                    {
+                        if (document.ContainsKey(nameof(GenericRecord.Mileage)))
+                        {
+                            document[nameof(GenericRecord.Mileage)] = Convert.ToDecimal(document[nameof(GenericRecord.Mileage)].AsInt32);
+                            //check for initial mileage as well
+                            if (document.ContainsKey(nameof(OdometerRecord.InitialMileage)))
+                            {
+                                document[nameof(OdometerRecord.InitialMileage)] = Convert.ToDecimal(document[nameof(OdometerRecord.InitialMileage)].AsInt32);
+                            }
+                            documents.Update(document);
+                        }
+                    }
+                }
+                db.UserVersion = 1;
+            }
         }
     }
     public LiteDatabase GetLiteDB()

Helper/MailHelper.cs

@@ -11,171 +11,126 @@ namespace CarCareTracker.Helper
         OperationResponse NotifyUserForPasswordReset(string emailAddress, string token);
         OperationResponse NotifyUserForAccountUpdate(string emailAddress, string token);
         OperationResponse NotifyUserForReminders(Vehicle vehicle, List<string> emailAddresses, List<ReminderRecordViewModel> reminders);
-        OperationResponse SendTestEmail(string emailAddress);
     }
     public class MailHelper : IMailHelper
     {
         private readonly MailConfig mailConfig;
-        private readonly string serverLanguage;
-        private readonly string serverDomain;
         private readonly IFileHelper _fileHelper;
-        private readonly ITranslationHelper _translator;
         private readonly ILogger<MailHelper> _logger;
         public MailHelper(
-            IConfigHelper config,
+            IConfiguration config,
             IFileHelper fileHelper,
-            ITranslationHelper translationHelper,
             ILogger<MailHelper> logger
             ) {
             //load mailConfig from Configuration
-            mailConfig = config.GetMailConfig();
-            serverLanguage = config.GetServerLanguage();
-            serverDomain = config.GetServerDomain();
+            mailConfig = config.GetSection("MailConfig").Get<MailConfig>() ?? new MailConfig();
             _fileHelper = fileHelper;
-            _translator = translationHelper;
             _logger = logger;
         }
         public OperationResponse NotifyUserForRegistration(string emailAddress, string token)
         {
             if (string.IsNullOrWhiteSpace(mailConfig.EmailServer))
             {
-                return OperationResponse.Failed("SMTP Server Not Setup");
+                return new OperationResponse { Success = false, Message = "SMTP Server Not Setup" };
             }
             if (string.IsNullOrWhiteSpace(emailAddress) || string.IsNullOrWhiteSpace(token)) {
-                return OperationResponse.Failed("Email Address or Token is invalid");
+                return new OperationResponse { Success = false, Message = "Email Address or Token is invalid" };
             }
-            string emailSubject = _translator.Translate(serverLanguage, "Your Registration Token for LubeLogger");
-            string tokenHtml = token;
-            if (!string.IsNullOrWhiteSpace(serverDomain))
-            {
-                string cleanedURL = serverDomain.EndsWith('/') ? serverDomain.TrimEnd('/') : serverDomain;
-                //construct registration URL.
-                tokenHtml = $"<a href='{cleanedURL}/Login/Registration?email={emailAddress}&token={token}' target='_blank'>{token}</a>";
-            }
-            string emailBody = $"<span>{_translator.Translate(serverLanguage, "A token has been generated on your behalf, please complete your registration for LubeLogger using the token")}: {tokenHtml}</span>";
+            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(new List<string> { emailAddress }, emailSubject, emailBody);
             if (result)
             {
-                return OperationResponse.Succeed("Email Sent!");
+                return new OperationResponse { Success = true, Message = "Email Sent!" };
             } else
             {
-                return OperationResponse.Failed();
+                return new OperationResponse { Success = false, Message = StaticHelper.GenericErrorMessage };
             }
         }
         public OperationResponse NotifyUserForPasswordReset(string emailAddress, string token)
         {
             if (string.IsNullOrWhiteSpace(mailConfig.EmailServer))
             {
-                return OperationResponse.Failed("SMTP Server Not Setup");
+                return new OperationResponse { Success = false, Message = "SMTP Server Not Setup" };
             }
             if (string.IsNullOrWhiteSpace(emailAddress) || string.IsNullOrWhiteSpace(token))
             {
-                return OperationResponse.Failed("Email Address or Token is invalid");
+                return new OperationResponse { Success = false, Message = "Email Address or Token is invalid" };
             }
-            string emailSubject = _translator.Translate(serverLanguage, "Your Password Reset Token for LubeLogger");
-            string tokenHtml = token;
-            if (!string.IsNullOrWhiteSpace(serverDomain))
-            {
-                string cleanedURL = serverDomain.EndsWith('/') ? serverDomain.TrimEnd('/') : serverDomain;
-                //construct registration URL.
-                tokenHtml = $"<a href='{cleanedURL}/Login/ResetPassword?email={emailAddress}&token={token}' target='_blank'>{token}</a>";
-            }
-            string emailBody = $"<span>{_translator.Translate(serverLanguage, "A token has been generated on your behalf, please reset your password for LubeLogger using the token")}: {tokenHtml}</span>";
+            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(new List<string> { emailAddress }, emailSubject, emailBody);
             if (result)
             {
-                return OperationResponse.Succeed("Email Sent!");
+                return new OperationResponse { Success = true, Message = "Email Sent!" };
             }
             else
             {
-                return OperationResponse.Failed();
-            }
-        }
-        public OperationResponse SendTestEmail(string emailAddress)
-        {
-            if (string.IsNullOrWhiteSpace(mailConfig.EmailServer))
-            {
-                return OperationResponse.Failed("SMTP Server Not Setup");
-            }
-            if (string.IsNullOrWhiteSpace(emailAddress))
-            {
-                return OperationResponse.Failed("Email Address or Token is invalid");
-            }
-            string emailSubject = _translator.Translate(serverLanguage, "Test Email from LubeLogger");
-            string emailBody = _translator.Translate(serverLanguage, "If you are seeing this email it means your SMTP configuration is functioning correctly");
-            var result = SendEmail(new List<string> { emailAddress }, emailSubject, emailBody);
-            if (result)
-            {
-                return OperationResponse.Succeed("Email Sent!");
-            }
-            else
-            {
-                return OperationResponse.Failed();
+                return new OperationResponse { Success = false, Message = StaticHelper.GenericErrorMessage };
             }
         }
         public OperationResponse NotifyUserForAccountUpdate(string emailAddress, string token)
         {
             if (string.IsNullOrWhiteSpace(mailConfig.EmailServer))
             {
-                return OperationResponse.Failed("SMTP Server Not Setup");
+                return new OperationResponse { Success = false, Message = "SMTP Server Not Setup" };
             }
             if (string.IsNullOrWhiteSpace(emailAddress) || string.IsNullOrWhiteSpace(token))
             {
-                return OperationResponse.Failed("Email Address or Token is invalid");
+                return new OperationResponse { Success = false, Message = "Email Address or Token is invalid" };
             }
-            string emailSubject = _translator.Translate(serverLanguage, "Your User Account Update Token for LubeLogger");
-            string emailBody = $"{_translator.Translate(serverLanguage, "A token has been generated on your behalf, please update your account for LubeLogger using the token")}: {token}";
+            string emailSubject = "Your User Account Update Token for LubeLogger";
+            string emailBody = $"A token has been generated on your behalf, please update your account for LubeLogger using the token: {token}";
             var result = SendEmail(new List<string> { emailAddress}, emailSubject, emailBody);
             if (result)
             {
-                return OperationResponse.Succeed("Email Sent!");
+                return new OperationResponse { Success = true, Message = "Email Sent!" };
             }
             else
             {
-                return OperationResponse.Failed();
+                return new OperationResponse { Success = false, Message = StaticHelper.GenericErrorMessage };
             }
         }
         public OperationResponse NotifyUserForReminders(Vehicle vehicle, List<string> emailAddresses, List<ReminderRecordViewModel> reminders)
         {
             if (string.IsNullOrWhiteSpace(mailConfig.EmailServer))
             {
-                return OperationResponse.Failed("SMTP Server Not Setup");
+                return new OperationResponse { Success = false, Message = "SMTP Server Not Setup" };
             }
             if (!emailAddresses.Any())
             {
-                return OperationResponse.Failed("No recipients could be found");
+                return new OperationResponse { Success = false, Message = "No recipients could be found" };
             }
             if (!reminders.Any())
             {
-                return OperationResponse.Failed("No reminders could be found");
+                return new OperationResponse { Success = false, Message = "No reminders could be found" };
             }
             //get email template, this file has to exist since it's a static file.
             var emailTemplatePath = _fileHelper.GetFullFilePath(StaticHelper.ReminderEmailTemplate);
-            string emailSubject = $"{_translator.Translate(serverLanguage, "Vehicle Reminders From LubeLogger")} - {DateTime.Now.ToShortDateString()}";
+            string emailSubject = $"Vehicle Reminders From LubeLogger - {DateTime.Now.ToShortDateString()}";
             //construct html table.
             string emailBody = File.ReadAllText(emailTemplatePath);
             emailBody = emailBody.Replace("{VehicleInformation}", $"{vehicle.Year} {vehicle.Make} {vehicle.Model} #{StaticHelper.GetVehicleIdentifier(vehicle)}");
-            string tableHeader = $"<th>{_translator.Translate(serverLanguage, "Urgency")}</th><th>{_translator.Translate(serverLanguage, "Description")}</th><th>{_translator.Translate(serverLanguage, "Due")}</th>";
             string tableBody = "";
             foreach(ReminderRecordViewModel reminder in reminders)
             {
                 var dueOn = reminder.Metric == ReminderMetric.Both ? $"{reminder.Date.ToShortDateString()} or {reminder.Mileage}" : reminder.Metric == ReminderMetric.Date ? $"{reminder.Date.ToShortDateString()}" : $"{reminder.Mileage}";
-                tableBody += $"<tr class='{reminder.Urgency}'><td>{_translator.Translate(serverLanguage, StaticHelper.GetTitleCaseReminderUrgency(reminder.Urgency))}</td><td>{reminder.Description}</td><td>{dueOn}</td></tr>";
+                tableBody += $"<tr class='{reminder.Urgency}'><td>{StaticHelper.GetTitleCaseReminderUrgency(reminder.Urgency)}</td><td>{reminder.Description}</td><td>{dueOn}</td></tr>";
             }
-            emailBody = emailBody.Replace("{TableHeader}", tableHeader).Replace("{TableBody}", tableBody);
+            emailBody = emailBody.Replace("{TableBody}", tableBody);
             try
             {
                 var result = SendEmail(emailAddresses, emailSubject, emailBody);
                 if (result)
                 {
-                    return OperationResponse.Succeed("Email Sent!");
+                    return new OperationResponse { Success = true, Message = "Email Sent!" };
                 } else
                 {
-                    return OperationResponse.Failed();
+                    return new OperationResponse { Success = false, Message = StaticHelper.GenericErrorMessage };
                 }
             } catch (Exception ex)
             {
-                return OperationResponse.Failed(ex.Message);
+                return new OperationResponse { Success = false, Message = ex.Message };
             }
         }
         private bool SendEmail(List<string> emailTo, string emailSubject, string emailBody) {

Helper/ReminderHelper.cs

@@ -4,8 +4,8 @@ namespace CarCareTracker.Helper
 {
     public interface IReminderHelper
     {
-        ReminderRecord GetUpdatedRecurringReminderRecord(ReminderRecord existingReminder, DateTime? currentDate, int? currentMileage);
-        List<ReminderRecordViewModel> GetReminderRecordViewModels(List<ReminderRecord> reminders, int currentMileage, DateTime dateCompare);
+        ReminderRecord GetUpdatedRecurringReminderRecord(ReminderRecord existingReminder, DateTime? currentDate, decimal? currentMileage);
+        List<ReminderRecordViewModel> GetReminderRecordViewModels(List<ReminderRecord> reminders, decimal currentMileage, DateTime dateCompare);
     }
     public class ReminderHelper: IReminderHelper
     {
@@ -14,7 +14,7 @@ namespace CarCareTracker.Helper
         {
             _config = config;
         }
-        public ReminderRecord GetUpdatedRecurringReminderRecord(ReminderRecord existingReminder, DateTime? currentDate, int? currentMileage)
+        public ReminderRecord GetUpdatedRecurringReminderRecord(ReminderRecord existingReminder, DateTime? currentDate, decimal? currentMileage)
         {
             var newDate = currentDate ?? existingReminder.Date;
             var newMileage = currentMileage ?? existingReminder.Mileage;
@@ -25,14 +25,7 @@ namespace CarCareTracker.Helper
                     existingReminder.Date = newDate.AddMonths((int)existingReminder.ReminderMonthInterval);
                 } else
                 {
-                    if (existingReminder.CustomMonthIntervalUnit == ReminderIntervalUnit.Months)
-                    {
-                        existingReminder.Date = newDate.Date.AddMonths(existingReminder.CustomMonthInterval);
-                    } 
-                    else if (existingReminder.CustomMonthIntervalUnit == ReminderIntervalUnit.Days)
-                    {
-                        existingReminder.Date = newDate.Date.AddDays(existingReminder.CustomMonthInterval);
-                    }
+                    existingReminder.Date = newDate.Date.AddMonths(existingReminder.CustomMonthInterval);
                 }
                
                 if (existingReminder.ReminderMileageInterval != ReminderMileageInterval.Other)
@@ -62,19 +55,12 @@ namespace CarCareTracker.Helper
                 }
                 else
                 {
-                    if (existingReminder.CustomMonthIntervalUnit == ReminderIntervalUnit.Months)
-                    {
-                        existingReminder.Date = newDate.AddMonths(existingReminder.CustomMonthInterval);
-                    }
-                    else if (existingReminder.CustomMonthIntervalUnit == ReminderIntervalUnit.Days)
-                    {
-                        existingReminder.Date = newDate.AddDays(existingReminder.CustomMonthInterval);
-                    }
+                    existingReminder.Date = newDate.AddMonths(existingReminder.CustomMonthInterval);
                 }
             }
             return existingReminder;
         }
-        public List<ReminderRecordViewModel> GetReminderRecordViewModels(List<ReminderRecord> reminders, int currentMileage, DateTime dateCompare)
+        public List<ReminderRecordViewModel> GetReminderRecordViewModels(List<ReminderRecord> reminders, decimal currentMileage, DateTime dateCompare)
         {
             List<ReminderRecordViewModel> reminderViewModels = new List<ReminderRecordViewModel>();
             var reminderUrgencyConfig = _config.GetReminderUrgencyConfig();
@@ -93,7 +79,6 @@ namespace CarCareTracker.Helper
                     Description = reminder.Description,
                     Notes = reminder.Notes,
                     Metric = reminder.Metric,
-                    UserMetric = reminder.Metric,
                     IsRecurring = reminder.IsRecurring,
                     Tags = reminder.Tags
                 };

Helper/ReportHelper.cs

@@ -5,166 +5,93 @@ namespace CarCareTracker.Helper
 {
     public interface IReportHelper
     {
-        IEnumerable<CostForVehicleByMonth> GetOdometerRecordSum(List<OdometerRecord> odometerRecords, int year = 0, bool sortIntoYear = false);
-        IEnumerable<CostForVehicleByMonth> GetServiceRecordSum(List<ServiceRecord> serviceRecords, int year = 0, bool sortIntoYear = false);
-        IEnumerable<CostForVehicleByMonth> GetRepairRecordSum(List<CollisionRecord> repairRecords, int year = 0, bool sortIntoYear = false);
-        IEnumerable<CostForVehicleByMonth> GetUpgradeRecordSum(List<UpgradeRecord> upgradeRecords, int year = 0, bool sortIntoYear = false);
-        IEnumerable<CostForVehicleByMonth> GetGasRecordSum(List<GasRecord> gasRecords, int year = 0, bool sortIntoYear = false);
-        IEnumerable<CostForVehicleByMonth> GetTaxRecordSum(List<TaxRecord> taxRecords, int year = 0, bool sortIntoYear = false);
+        IEnumerable<CostForVehicleByMonth> GetOdometerRecordSum(List<OdometerRecord> odometerRecords, int year = 0);
+        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> GetOdometerRecordSum(List<OdometerRecord> odometerRecords, int year = 0, bool sortIntoYear = false)
+        public IEnumerable<CostForVehicleByMonth> GetOdometerRecordSum(List<OdometerRecord> odometerRecords, int year = 0)
         {
             if (year != default)
             {
                 odometerRecords.RemoveAll(x => x.Date.Year != year);
             }
-            if (sortIntoYear)
+            return odometerRecords.GroupBy(x => x.Date.Month).OrderBy(x => x.Key).Select(x => new CostForVehicleByMonth
             {
-                return odometerRecords.GroupBy(x => new { x.Date.Month, x.Date.Year }).OrderBy(x => x.Key.Month).Select(x => new CostForVehicleByMonth
-                {
-                    MonthId = x.Key.Month,
-                    MonthName = CultureInfo.CurrentCulture.DateTimeFormat.GetMonthName(x.Key.Month),
-                    Year = x.Key.Year,
-                    Cost = 0,
-                    DistanceTraveled = x.Sum(y => y.DistanceTraveled)
-                });
-            } else
-            {
-                return odometerRecords.GroupBy(x => x.Date.Month).OrderBy(x => x.Key).Select(x => new CostForVehicleByMonth
-                {
-                    MonthId = x.Key,
-                    MonthName = CultureInfo.CurrentCulture.DateTimeFormat.GetMonthName(x.Key),
-                    Cost = 0,
-                    DistanceTraveled = x.Sum(y => y.DistanceTraveled)
-                });
-            }
+                MonthId = x.Key,
+                MonthName = CultureInfo.CurrentCulture.DateTimeFormat.GetMonthName(x.Key),
+                Cost = 0,
+                DistanceTraveled = x.Sum(y=>y.DistanceTraveled)
+            });
         }
-        public IEnumerable<CostForVehicleByMonth> GetServiceRecordSum(List<ServiceRecord> serviceRecords, int year = 0, bool sortIntoYear = false)
+        public IEnumerable<CostForVehicleByMonth> GetServiceRecordSum(List<ServiceRecord> serviceRecords, int year = 0)
         {
             if (year != default)
             {
                 serviceRecords.RemoveAll(x => x.Date.Year != year);
             }
-            if (sortIntoYear)
+            return serviceRecords.GroupBy(x => x.Date.Month).OrderBy(x => x.Key).Select(x => new CostForVehicleByMonth
             {
-                return serviceRecords.GroupBy(x => new { x.Date.Month, x.Date.Year }).OrderBy(x => x.Key.Month).Select(x => new CostForVehicleByMonth
-                {
-                    MonthId = x.Key.Month,
-                    MonthName = CultureInfo.CurrentCulture.DateTimeFormat.GetMonthName(x.Key.Month),
-                    Year = x.Key.Year,
-                    Cost = x.Sum(y => y.Cost)
-                });
-            } else
-            {
-                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)
-                });
-            }
+                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, bool sortIntoYear = false)
+        public IEnumerable<CostForVehicleByMonth> GetRepairRecordSum(List<CollisionRecord> repairRecords, int year = 0)
         {
             if (year != default)
             {
                 repairRecords.RemoveAll(x => x.Date.Year != year);
             }
-            if (sortIntoYear)
+            return repairRecords.GroupBy(x => x.Date.Month).OrderBy(x => x.Key).Select(x => new CostForVehicleByMonth
             {
-                return repairRecords.GroupBy(x => new { x.Date.Month, x.Date.Year }).OrderBy(x => x.Key.Month).Select(x => new CostForVehicleByMonth
-                {
-                    MonthId = x.Key.Month,
-                    MonthName = CultureInfo.CurrentCulture.DateTimeFormat.GetMonthName(x.Key.Month),
-                    Year = x.Key.Year,
-                    Cost = x.Sum(y => y.Cost)
-                });
-            } else
-            {
-                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)
-                });
-            }
+                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, bool sortIntoYear = false)
+        public IEnumerable<CostForVehicleByMonth> GetUpgradeRecordSum(List<UpgradeRecord> upgradeRecords, int year = 0)
         {
             if (year != default)
             {
                 upgradeRecords.RemoveAll(x => x.Date.Year != year);
             }
-            if (sortIntoYear)
+            return upgradeRecords.GroupBy(x => x.Date.Month).OrderBy(x => x.Key).Select(x => new CostForVehicleByMonth
             {
-                return upgradeRecords.GroupBy(x => new { x.Date.Month, x.Date.Year }).OrderBy(x => x.Key.Month).Select(x => new CostForVehicleByMonth
-                {
-                    MonthId = x.Key.Month,
-                    MonthName = CultureInfo.CurrentCulture.DateTimeFormat.GetMonthName(x.Key.Month),
-                    Year = x.Key.Year,
-                    Cost = x.Sum(y => y.Cost)
-                });
-            } else
-            {
-                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)
-                });
-            }
+                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, bool sortIntoYear = false)
+        public IEnumerable<CostForVehicleByMonth> GetGasRecordSum(List<GasRecord> gasRecords, int year = 0)
         {
             if (year != default)
             {
                 gasRecords.RemoveAll(x => x.Date.Year != year);
             }
-            if (sortIntoYear)
+            return gasRecords.GroupBy(x => x.Date.Month).OrderBy(x => x.Key).Select(x => new CostForVehicleByMonth
             {
-                return gasRecords.GroupBy(x => new { x.Date.Month, x.Date.Year }).OrderBy(x => x.Key.Month).Select(x => new CostForVehicleByMonth
-                {
-                    MonthId = x.Key.Month,
-                    MonthName = CultureInfo.CurrentCulture.DateTimeFormat.GetMonthName(x.Key.Month),
-                    Year = x.Key.Year,
-                    Cost = x.Sum(y => y.Cost)
-                });
-            } else
-            {
-                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)
-                });
-            }
+                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, bool sortIntoYear = false)
+        public IEnumerable<CostForVehicleByMonth> GetTaxRecordSum(List<TaxRecord> taxRecords, int year = 0)
         {
             if (year != default)
             {
                 taxRecords.RemoveAll(x => x.Date.Year != year);
             }
-            if (sortIntoYear)
+            return taxRecords.GroupBy(x => x.Date.Month).OrderBy(x => x.Key).Select(x => new CostForVehicleByMonth
             {
-                return taxRecords.GroupBy(x => new { x.Date.Month, x.Date.Year }).OrderBy(x => x.Key.Month).Select(x => new CostForVehicleByMonth
-                {
-                    MonthId = x.Key.Month,
-                    MonthName = CultureInfo.CurrentCulture.DateTimeFormat.GetMonthName(x.Key.Month),
-                    Year = x.Key.Year,
-                    Cost = x.Sum(y => y.Cost)
-                });
-            } else
-            {
-                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)
-                });
-            }
+                MonthId = x.Key,
+                MonthName = CultureInfo.CurrentCulture.DateTimeFormat.GetMonthName(x.Key),
+                Cost = x.Sum(y => y.Cost)
+            });
         }
     }
 }

Helper/StaticHelper.cs

@@ -1,9 +1,6 @@
 using CarCareTracker.Models;
 using CsvHelper;
 using System.Globalization;
-using System.Security.Cryptography;
-using System.Text;
-using System.Text.Json;
 
 namespace CarCareTracker.Helper
 {
@@ -12,18 +9,16 @@ namespace CarCareTracker.Helper
     /// </summary>
     public static class StaticHelper
     {
-        public const string VersionNumber = "1.4.8";
-        public const string DbName = "data/cartracker.db";
-        public const string UserConfigPath = "data/config/userConfig.json";
-        public const string LegacyUserConfigPath = "config/userConfig.json";
-        public const string AdditionalWidgetsPath = "data/widgets.html";
-        public const string GenericErrorMessage = "An error occurred, please try again later";
-        public const string ReminderEmailTemplate = "defaults/reminderemailtemplate.txt";
-        public const string DefaultAllowedFileExtensions = ".png,.jpg,.jpeg,.pdf,.xls,.xlsx,.docx";
-        public const string SponsorsPath = "https://hargata.github.io/hargata/sponsors.json";
-        public const string TranslationPath = "https://hargata.github.io/lubelog_translations";
-        public const string ReleasePath = "https://api.github.com/repos/hargata/lubelog/releases/latest";
-        public const string TranslationDirectoryPath = $"{TranslationPath}/directory.json";
+        public static string VersionNumber = "1.4.0";
+        public static string DbName = "data/cartracker.db";
+        public static string UserConfigPath = "config/userConfig.json";
+        public static string AdditionalWidgetsPath = "data/widgets.html";
+        public static string GenericErrorMessage = "An error occurred, please try again later";
+        public static string ReminderEmailTemplate = "defaults/reminderemailtemplate.txt";
+        public static string DefaultAllowedFileExtensions = ".png,.jpg,.jpeg,.pdf,.xls,.xlsx,.docx";
+        public static string SponsorsPath = "https://hargata.github.io/hargata/sponsors.json";
+        public static string TranslationPath = "https://hargata.github.io/lubelog_translations";
+        public static string TranslationDirectoryPath = $"{TranslationPath}/directory.json";
         public const string ReportNote = "Report generated by LubeLogger, a Free and Open Source Vehicle Maintenance Tracker - LubeLogger.com";
         public static string GetTitleCaseReminderUrgency(ReminderUrgency input)
         {
@@ -244,8 +239,7 @@ namespace CarCareTracker.Helper
 
         public static List<ExtraField> AddExtraFields(List<ExtraField> recordExtraFields, List<ExtraField> templateExtraFields)
         {
-            if (!templateExtraFields.Any())
-            {
+            if (!templateExtraFields.Any()) {
                 return new List<ExtraField>();
             }
             if (!recordExtraFields.Any())
@@ -263,12 +257,10 @@ namespace CarCareTracker.Helper
             //update isrequired setting
             foreach (ExtraField extraField in recordExtraFields)
             {
-                var firstMatchingField = templateExtraFields.First(x => x.Name == extraField.Name);
-                extraField.IsRequired = firstMatchingField.IsRequired;
-                extraField.FieldType = firstMatchingField.FieldType;
+                extraField.IsRequired = templateExtraFields.Where(x => x.Name == extraField.Name).First().IsRequired;
             }
             //append extra fields
-            foreach (ExtraField extraField in templateExtraFields)
+            foreach(ExtraField extraField in templateExtraFields)
             {
                 if (!recordFieldNames.Contains(extraField.Name))
                 {
@@ -316,8 +308,7 @@ namespace CarCareTracker.Helper
             if (mailConfig != null && !string.IsNullOrWhiteSpace(mailConfig.EmailServer))
             {
                 Console.WriteLine($"SMTP Configured for {mailConfig.EmailServer}");
-            }
-            else
+            } else
             {
                 Console.WriteLine("SMTP Not Configured");
             }
@@ -325,113 +316,23 @@ namespace CarCareTracker.Helper
             Console.WriteLine($"Message Of The Day: {motd}");
             if (string.IsNullOrWhiteSpace(CultureInfo.CurrentCulture.Name))
             {
-                Console.WriteLine("WARNING: No Locale or Culture Configured for LubeLogger, Check Environment Variables");
-            }
-            //Create folders if they don't exist.
-            if (!Directory.Exists("data"))
-            {
-                Directory.CreateDirectory("data");
-                Console.WriteLine("Created data directory");
-            }
-            if (!Directory.Exists("data/images"))
-            {
-                Console.WriteLine("Created images directory");
-                Directory.CreateDirectory("data/images");
-            }
-            if (!Directory.Exists("data/documents"))
-            {
-                Directory.CreateDirectory("data/documents");
-                Console.WriteLine("Created documents directory");
-            }
-            if (!Directory.Exists("data/translations"))
-            {
-                Directory.CreateDirectory("data/translations");
-                Console.WriteLine("Created translations directory");
-            }
-            if (!Directory.Exists("data/temp"))
-            {
-                Directory.CreateDirectory("data/temp");
-                Console.WriteLine("Created translations directory");
-            }
-            if (!Directory.Exists("data/config"))
-            {
-                Directory.CreateDirectory("data/config");
-                Console.WriteLine("Created config directory");
+                Console.WriteLine("No Locale or Culture Configured for LubeLogger, Check Environment Variables");
             }
         }
-        public static void CheckMigration(string webRootPath, string webContentPath)
-        {
-            //check if current working directory differs from content root.
-            if (Directory.GetCurrentDirectory() != webContentPath)
-            {
-                Console.WriteLine("WARNING: The Working Directory differs from the Web Content Path");
-                Console.WriteLine($"Working Directory: {Directory.GetCurrentDirectory()}");
-                Console.WriteLine($"Web Content Path: {webContentPath}");
-            }
-            //migrates all user-uploaded files from webroot to new data folder
-            //images
-            var imagePath = Path.Combine(webRootPath, "images");
-            var docsPath = Path.Combine(webRootPath, "documents");
-            var translationPath = Path.Combine(webRootPath, "translations");
-            var tempPath = Path.Combine(webRootPath, "temp");
-            if (File.Exists(LegacyUserConfigPath))
-            {
-                File.Move(LegacyUserConfigPath, UserConfigPath, true);
-            }
-            if (Directory.Exists(imagePath))
-            {
-                foreach (string fileToMove in Directory.GetFiles(imagePath))
-                {
-                    var newFilePath = $"data/images/{Path.GetFileName(fileToMove)}";
-                    File.Move(fileToMove, newFilePath, true);
-                    Console.WriteLine($"Migrated Image: {Path.GetFileName(fileToMove)}");
-                }
-            }
-            if (Directory.Exists(docsPath))
-            {
-                foreach (string fileToMove in Directory.GetFiles(docsPath))
-                {
-                    var newFilePath = $"data/documents/{Path.GetFileName(fileToMove)}";
-                    File.Move(fileToMove, newFilePath, true);
-                    Console.WriteLine($"Migrated Document: {Path.GetFileName(fileToMove)}");
-                }
-            }
-            if (Directory.Exists(translationPath))
-            {
-                foreach (string fileToMove in Directory.GetFiles(translationPath))
-                {
-                    var newFilePath = $"data/translations/{Path.GetFileName(fileToMove)}";
-                    File.Move(fileToMove, newFilePath, true);
-                    Console.WriteLine($"Migrated Translation: {Path.GetFileName(fileToMove)}");
-                }
-            }
-            if (Directory.Exists(tempPath))
-            {
-                foreach (string fileToMove in Directory.GetFiles(tempPath))
-                {
-                    var newFilePath = $"data/temp/{Path.GetFileName(fileToMove)}";
-                    File.Move(fileToMove, newFilePath, true);
-                    Console.WriteLine($"Migrated Temp File: {Path.GetFileName(fileToMove)}");
-                }
-            }
-        }
-        public static async void NotifyAsync(string webhookURL, WebHookPayload webHookPayload)
+        public static async void NotifyAsync(string webhookURL, int vehicleId, string username, string action)
         {
             if (string.IsNullOrWhiteSpace(webhookURL))
             {
                 return;
             }
             var httpClient = new HttpClient();
-            if (webhookURL.StartsWith("discord://"))
-            {
-                webhookURL = webhookURL.Replace("discord://", "https://"); //cleanurl
-                //format to discord
-                httpClient.PostAsJsonAsync(webhookURL, DiscordWebHook.FromWebHookPayload(webHookPayload));
-            }
-            else
-            {
-                httpClient.PostAsJsonAsync(webhookURL, webHookPayload);
-            }
+            var httpParams = new Dictionary<string, string>
+                {
+                { "vehicleId", vehicleId.ToString() },
+                     { "username", username },
+                     { "action", action },
+                };
+            httpClient.PostAsJsonAsync(webhookURL, httpParams);
         }
         public static string GetImportModeIcon(ImportMode importMode)
         {
@@ -466,14 +367,12 @@ namespace CarCareTracker.Helper
             if (vehicle.VehicleIdentifier == "LicensePlate")
             {
                 return vehicle.LicensePlate;
-            }
-            else
+            } else
             {
-                if (vehicle.ExtraFields.Any(x => x.Name == vehicle.VehicleIdentifier))
+                if (vehicle.ExtraFields.Any(x=>x.Name == vehicle.VehicleIdentifier))
                 {
-                    return vehicle.ExtraFields?.FirstOrDefault(x => x.Name == vehicle.VehicleIdentifier)?.Value;
-                }
-                else
+                    return vehicle.ExtraFields?.FirstOrDefault(x=>x.Name == vehicle.VehicleIdentifier)?.Value;
+                } else
                 {
                     return "N/A";
                 }
@@ -500,11 +399,10 @@ namespace CarCareTracker.Helper
         //Translations
         public static string GetTranslationDownloadPath(string continent, string name)
         {
-            if (string.IsNullOrWhiteSpace(continent) || string.IsNullOrWhiteSpace(name))
-            {
+            if (string.IsNullOrWhiteSpace(continent) || string.IsNullOrWhiteSpace(name)){
                 return string.Empty;
-            }
-            else
+            } 
+            else 
             {
                 switch (continent)
                 {
@@ -523,9 +421,8 @@ namespace CarCareTracker.Helper
             if (string.IsNullOrWhiteSpace(name))
             {
                 return string.Empty;
-            }
-            else
-            {
+            } else
+            { 
                 try
                 {
                     string cleanedName = name.Contains("_") ? name.Replace("_", "-") : name;
@@ -538,8 +435,7 @@ namespace CarCareTracker.Helper
                     {
                         return displayName;
                     }
-                }
-                catch (Exception ex)
+                } catch (Exception ex)
                 {
                     return name;
                 }
@@ -705,35 +601,6 @@ namespace CarCareTracker.Helper
                 _csv.NextRecord();
             }
         }
-        public static string HideZeroCost(string input, bool hideZero, string decorations = "")
-        {
-            if (input == 0M.ToString("C2") && hideZero)
-            {
-                return "---";
-            }
-            else
-            {
-                return string.IsNullOrWhiteSpace(decorations) ? input : $"{input}{decorations}";
-            }
-        }
-        public static string HideZeroCost(decimal input, bool hideZero, string decorations = "")
-        {
-            if (input == default && hideZero)
-            {
-                return "---";
-            }
-            else
-            {
-                return string.IsNullOrWhiteSpace(decorations) ? input.ToString("C2") : $"{input.ToString("C2")}{decorations}";
-            }
-        }
-        public static JsonSerializerOptions GetInvariantOption()
-        {
-            var serializerOption = new JsonSerializerOptions();
-            serializerOption.PropertyNamingPolicy = JsonNamingPolicy.CamelCase;
-            serializerOption.Converters.Add(new InvariantConverter());
-            return serializerOption;
-        }
         public static void WriteGasRecordExportModel(CsvWriter _csv, IEnumerable<GasRecordExportModel> genericRecords)
         {
             var extraHeaders = genericRecords.SelectMany(x => x.ExtraFields).Select(y => y.Name).Distinct();
@@ -771,52 +638,5 @@ namespace CarCareTracker.Helper
                 _csv.NextRecord();
             }
         }
-        public static byte[] RemindersToCalendar(List<ReminderRecordViewModel> reminders)
-        {
-            //converts reminders to iCal file
-            StringBuilder sb = new StringBuilder();
-            //start the calendar item
-            sb.AppendLine("BEGIN:VCALENDAR");
-            sb.AppendLine("VERSION:2.0");
-            sb.AppendLine("PRODID:lubelogger.com");
-            sb.AppendLine("CALSCALE:GREGORIAN");
-            sb.AppendLine("METHOD:PUBLISH");
-
-            //create events.
-            foreach(ReminderRecordViewModel reminder in reminders)
-            {
-                var dtStart = reminder.Date.Date.ToString("yyyyMMddTHHmm00");
-                var dtEnd = reminder.Date.Date.AddDays(1).AddMilliseconds(-1).ToString("yyyyMMddTHHmm00");
-                var calendarUID = new Guid(MD5.HashData(Encoding.UTF8.GetBytes($"{dtStart}_{reminder.Description}")));
-                sb.AppendLine("BEGIN:VEVENT");
-                sb.AppendLine("DTSTAMP:" + DateTime.Now.ToString("yyyyMMddTHHmm00"));
-                sb.AppendLine("UID:" + calendarUID);
-                sb.AppendLine("DTSTART:" + dtStart);
-                sb.AppendLine("DTEND:" + dtEnd);
-                sb.AppendLine($"SUMMARY:{reminder.Description}");
-                sb.AppendLine($"DESCRIPTION:{reminder.Description}");
-                switch (reminder.Urgency)
-                {
-                    case ReminderUrgency.NotUrgent:
-                        sb.AppendLine("PRIORITY:3");
-                        break;
-                    case ReminderUrgency.Urgent:
-                        sb.AppendLine("PRIORITY:2");
-                        break;
-                    case ReminderUrgency.VeryUrgent:
-                        sb.AppendLine("PRIORITY:1");
-                        break;
-                    case ReminderUrgency.PastDue:
-                        sb.AppendLine("PRIORITY:1");
-                        break;
-                }
-                sb.AppendLine("END:VEVENT");
-            }
-
-            //end calendar item
-            sb.AppendLine("END:VCALENDAR");
-            string calendarContent = sb.ToString();
-            return Encoding.UTF8.GetBytes(calendarContent);
-        }
     }
 }

Helper/TranslationHelper.cs

@@ -130,15 +130,15 @@ namespace CarCareTracker.Helper
             bool isDefaultLanguage = userLanguage == "en_US";
             if (isDefaultLanguage && !create)
             {
-                return OperationResponse.Failed("The translation file name en_US is reserved.");
+                return new OperationResponse { Success = false, Message = "The translation file name en_US is reserved." };
             }
             if (string.IsNullOrWhiteSpace(userLanguage))
             {
-                return OperationResponse.Failed("File name is not provided.");
+                return new OperationResponse { Success = false, Message = "File name is not provided." };
             }
             if (!translations.Any())
             {
-                return OperationResponse.Failed("Translation has no data.");
+                return new OperationResponse { Success = false, Message = "Translation has no data." };
             }
             var translationFilePath = isDefaultLanguage ? _fileHelper.GetFullFilePath($"/defaults/en_US.json") : _fileHelper.GetFullFilePath($"/translations/{userLanguage}.json", false);
             try
@@ -159,12 +159,12 @@ namespace CarCareTracker.Helper
                     //write to file
                     File.WriteAllText(translationFilePath, JsonSerializer.Serialize(translations));
                 }
-                return OperationResponse.Succeed("Translation Updated");
+                return new OperationResponse { Success = true, Message = "Translation Updated" };
             }
             catch (Exception ex)
             {
                 _logger.LogError(ex.Message);
-                return OperationResponse.Failed();
+                return new OperationResponse { Success = false, Message = StaticHelper.GenericErrorMessage };
             }
         }
         public string ExportTranslation(Dictionary<string, string> translations)

Logic/LoginLogic.cs

@@ -21,7 +21,6 @@ namespace CarCareTracker.Logic
         OperationResponse RequestResetPassword(LoginModel credentials);
         OperationResponse ResetPasswordByUser(LoginModel credentials);
         OperationResponse ResetUserPassword(LoginModel credentials);
-        OperationResponse SendRegistrationToken(LoginModel credentials);
         UserData ValidateUserCredentials(LoginModel credentials);
         UserData ValidateOpenIDUser(LoginModel credentials);
         bool CheckIfUserIsValid(int userId);
@@ -72,13 +71,13 @@ namespace CarCareTracker.Logic
             var existingUser = _userData.GetUserRecordById(userId);
             if (existingUser.Id == default)
             {
-                return OperationResponse.Failed("Invalid user");
+                return new OperationResponse { Success = false, Message = "Invalid user" };
             }
             //validate user token
             var existingToken = _tokenData.GetTokenRecordByBody(credentials.Token);
             if (existingToken.Id == default || existingToken.EmailAddress != existingUser.EmailAddress)
             {
-                return OperationResponse.Failed("Invalid Token");
+                return new OperationResponse { Success = false, Message = "Invalid Token" };
             }
             if (!string.IsNullOrWhiteSpace(credentials.UserName) && existingUser.UserName != credentials.UserName)
             {
@@ -86,7 +85,7 @@ namespace CarCareTracker.Logic
                 var existingUserWithUserName = _userData.GetUserRecordByUserName(credentials.UserName);
                 if (existingUserWithUserName.Id != default)
                 {
-                    return OperationResponse.Failed("Username already taken");
+                    return new OperationResponse { Success = false, Message = "Username already taken" };
                 }
                 existingUser.UserName = credentials.UserName;
             }
@@ -96,7 +95,7 @@ namespace CarCareTracker.Logic
                 var existingUserWithEmailAddress = _userData.GetUserRecordByEmailAddress(credentials.EmailAddress);
                 if (existingUserWithEmailAddress.Id != default)
                 {
-                    return OperationResponse.Failed("A user with that email already exists");
+                    return new OperationResponse { Success = false, Message = "A user with that email already exists" };
                 }
                 existingUser.EmailAddress = credentials.EmailAddress;
             }
@@ -108,7 +107,7 @@ namespace CarCareTracker.Logic
             //delete token
             _tokenData.DeleteToken(existingToken.Id);
             var result = _userData.SaveUserRecord(existingUser);
-            return OperationResponse.Conditional(result, "User Updated", string.Empty);
+            return new OperationResponse { Success = result, Message = result ? "User Updated" : StaticHelper.GenericErrorMessage };
         }
         public OperationResponse RegisterOpenIdUser(LoginModel credentials)
         {
@@ -116,21 +115,21 @@ namespace CarCareTracker.Logic
             var existingToken = _tokenData.GetTokenRecordByBody(credentials.Token);
             if (existingToken.Id == default || existingToken.EmailAddress != credentials.EmailAddress)
             {
-                return OperationResponse.Failed("Invalid Token");
+                return new OperationResponse { Success = false, Message = "Invalid Token" };
             }
             if (string.IsNullOrWhiteSpace(credentials.EmailAddress) || string.IsNullOrWhiteSpace(credentials.UserName))
             {
-                return OperationResponse.Failed("Username cannot be blank");
+                return new OperationResponse { Success = false, Message = "Username cannot be blank" };
             }
             var existingUser = _userData.GetUserRecordByUserName(credentials.UserName);
             if (existingUser.Id != default)
             {
-                return OperationResponse.Failed("Username already taken");
+                return new OperationResponse { Success = false, Message = "Username already taken" };
             }
             var existingUserWithEmail = _userData.GetUserRecordByEmailAddress(credentials.EmailAddress);
             if (existingUserWithEmail.Id != default)
             {
-                return OperationResponse.Failed("A user with that email already exists");
+                return new OperationResponse { Success = false, Message = "A user with that email already exists" };
             }
             _tokenData.DeleteToken(existingToken.Id);
             var newUser = new UserData()
@@ -142,11 +141,11 @@ namespace CarCareTracker.Logic
             var result = _userData.SaveUserRecord(newUser);
             if (result)
             {
-                return OperationResponse.Succeed("You will be logged in briefly.");
+                return new OperationResponse { Success = true, Message = "You will be logged in briefly." };
             }
             else
             {
-                return OperationResponse.Failed("Something went wrong, please try again later.");
+                return new OperationResponse { Success = false, Message = "Something went wrong, please try again later." };
             }
         }
         //handles user registration
@@ -156,22 +155,22 @@ namespace CarCareTracker.Logic
             var existingToken = _tokenData.GetTokenRecordByBody(credentials.Token);
             if (existingToken.Id == default || existingToken.EmailAddress != credentials.EmailAddress)
             {
-                return OperationResponse.Failed("Invalid Token");
+                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 OperationResponse.Failed("Neither username nor password can be blank");
+                return new OperationResponse { Success = false, Message = "Neither username nor password can be blank" };
             }
             var existingUser = _userData.GetUserRecordByUserName(credentials.UserName);
             if (existingUser.Id != default)
             {
-                return OperationResponse.Failed("Username already taken");
+                return new OperationResponse { Success = false, Message = "Username already taken" };
             }
             var existingUserWithEmail = _userData.GetUserRecordByEmailAddress(credentials.EmailAddress);
             if (existingUserWithEmail.Id != default)
             {
-                return OperationResponse.Failed("A user with that email already exists");
+                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);
@@ -184,21 +183,11 @@ namespace CarCareTracker.Logic
             var result = _userData.SaveUserRecord(newUser);
             if (result)
             {
-                return OperationResponse.Succeed("You will be redirected to the login page briefly.");
+                return new OperationResponse { Success = true, Message = "You will be redirected to the login page briefly." };
             }
             else
             {
-                return OperationResponse.Failed();
-            }
-        }
-        public OperationResponse SendRegistrationToken(LoginModel credentials)
-        {
-            if (_configHelper.GetServerOpenRegistration())
-            {
-                return GenerateUserToken(credentials.EmailAddress, true);
-            } else
-            {
-                return OperationResponse.Failed("Open Registration Disabled");
+                return new OperationResponse { Success = false, Message = "Something went wrong, please try again later." };
             }
         }
         /// <summary>
@@ -216,24 +205,24 @@ namespace CarCareTracker.Logic
             }
             //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 OperationResponse.Succeed("If your user exists in the system you should receive an email shortly with instructions on how to proceed.");
+            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 OperationResponse.Failed("Invalid Token");
+                return new OperationResponse { Success = false, Message = "Invalid Token" };
             }
             if (string.IsNullOrWhiteSpace(credentials.Password))
             {
-                return OperationResponse.Failed("New Password cannot be blank");
+                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 OperationResponse.Failed("Unable to locate user");
+                return new OperationResponse { Success = false, Message = "Unable to locate user" };
             }
             existingUser.Password = GetHash(credentials.Password);
             var result = _userData.SaveUserRecord(existingUser);
@@ -241,10 +230,10 @@ namespace CarCareTracker.Logic
             _tokenData.DeleteToken(existingToken.Id);
             if (result)
             {
-                return OperationResponse.Succeed("Password resetted, you will be redirected to login page shortly.");
+                return new OperationResponse { Success = true, Message = "Password resetted, you will be redirected to login page shortly." };
             } else
             {
-                return OperationResponse.Failed();
+                return new OperationResponse { Success = false, Message = StaticHelper.GenericErrorMessage };
             }
         }
         /// <summary>
@@ -321,18 +310,7 @@ namespace CarCareTracker.Logic
             var existingToken = _tokenData.GetTokenRecordByEmailAddress(emailAddress);
             if (existingToken.Id != default)
             {
-                if (autoNotify) //re-send email
-                {
-                    var notificationResult = _mailHelper.NotifyUserForRegistration(emailAddress, existingToken.Body);
-                    if (notificationResult.Success)
-                    {
-                        return OperationResponse.Failed($"There is an existing token tied to {emailAddress}, a new email has been sent out");
-                    } else
-                    {
-                        return notificationResult;
-                    }
-                }
-                return OperationResponse.Failed($"There is an existing token tied to {emailAddress}");
+                return new OperationResponse { Success = false, Message = "There is an existing token tied to this email address" };
             }
             var token = new Token()
             {
@@ -345,16 +323,16 @@ namespace CarCareTracker.Logic
                 result = _mailHelper.NotifyUserForRegistration(emailAddress, token.Body).Success;
                 if (!result)
                 {
-                    return OperationResponse.Failed("Token Generated, but Email failed to send, please check your SMTP settings.");
+                    return new OperationResponse { Success = false, Message = "Token Generated, but Email failed to send, please check your SMTP settings." };
                 }
             }
             if (result)
             {
-                return OperationResponse.Succeed("Token Generated!");
+                return new OperationResponse { Success = true, Message = "Token Generated!" };
             }
             else
             {
-                return OperationResponse.Failed();
+                return new OperationResponse { Success = false, Message = StaticHelper.GenericErrorMessage };
             }
         }
         public bool DeleteUserToken(int tokenId)
@@ -373,18 +351,18 @@ namespace CarCareTracker.Logic
             var existingUser = _userData.GetUserRecordByUserName(credentials.UserName);
             if (existingUser.Id == default)
             {
-                return OperationResponse.Failed("Unable to find user");
+                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 OperationResponse.Succeed(newPassword);
+                return new OperationResponse { Success = true, Message = newPassword };
             }
             else
             {
-                return OperationResponse.Failed();
+                return new OperationResponse { Success = false, Message = "Something went wrong, please try again later." };
             }
         }
         #endregion

Logic/OdometerLogic.cs

@@ -5,7 +5,7 @@ namespace CarCareTracker.Logic
 {
     public interface IOdometerLogic
     {
-        int GetLastOdometerRecordMileage(int vehicleId, List<OdometerRecord> odometerRecords);
+        decimal GetLastOdometerRecordMileage(int vehicleId, List<OdometerRecord> odometerRecords);
         bool AutoInsertOdometerRecord(OdometerRecord odometer);
         List<OdometerRecord> AutoConvertOdometerRecord(List<OdometerRecord> odometerRecords);
     }
@@ -18,7 +18,7 @@ namespace CarCareTracker.Logic
             _odometerRecordDataAccess = odometerRecordDataAccess;
             _logger = logger;
         }
-        public int GetLastOdometerRecordMileage(int vehicleId, List<OdometerRecord> odometerRecords)
+        public decimal GetLastOdometerRecordMileage(int vehicleId, List<OdometerRecord> odometerRecords)
         {
             if (!odometerRecords.Any())
             {
@@ -47,7 +47,7 @@ namespace CarCareTracker.Logic
         {
             //perform ordering
             odometerRecords = odometerRecords.OrderBy(x => x.Date).ThenBy(x => x.Mileage).ToList();
-            int previousMileage = 0;
+            decimal previousMileage = 0.00M;
             for (int i = 0; i < odometerRecords.Count; i++)
             {
                 var currentObject = odometerRecords[i];

Logic/UserLogic.cs

@@ -51,16 +51,16 @@ namespace CarCareTracker.Logic
                 var userAccess = _userAccess.GetUserAccessByVehicleAndUserId(existingUser.Id, vehicleId);
                 if (userAccess != null)
                 {
-                    return OperationResponse.Failed("User is already a collaborator");
+                    return new OperationResponse { Success = false, Message = "User is already a collaborator" };
                 }
                 var result = AddUserAccessToVehicle(existingUser.Id, vehicleId);
                 if (result)
                 {
-                    return OperationResponse.Succeed("Collaborator Added");
+                    return new OperationResponse { Success = true, Message = "Collaborator Added" };
                 }
-                return OperationResponse.Failed();
+                return new OperationResponse { Success = false, Message = StaticHelper.GenericErrorMessage };
             }
-            return OperationResponse.Failed($"Unable to find user {username} in the system");
+            return new OperationResponse { Success = false, Message = $"Unable to find user {username} in the system" };
         }
         public bool DeleteCollaboratorFromVehicle(int userId, int vehicleId)
         {

Logic/VehicleLogic.cs

@@ -1,5 +1,4 @@
-using CarCareTracker.Controllers;
-using CarCareTracker.External.Interfaces;
+using CarCareTracker.External.Interfaces;
 using CarCareTracker.Helper;
 using CarCareTracker.Models;
 
@@ -9,17 +8,15 @@ namespace CarCareTracker.Logic
     {
         VehicleRecords GetVehicleRecords(int vehicleId);
         decimal GetVehicleTotalCost(VehicleRecords vehicleRecords);
-        int GetMaxMileage(int vehicleId);
-        int GetMaxMileage(VehicleRecords vehicleRecords);
-        int GetMinMileage(int vehicleId);
-        int GetMinMileage(VehicleRecords vehicleRecords);
-        int GetOwnershipDays(string purchaseDate, string soldDate, int year, List<ServiceRecord> serviceRecords, List<CollisionRecord> repairRecords, List<GasRecord> gasRecords, List<UpgradeRecord> upgradeRecords, List<OdometerRecord> odometerRecords, List<TaxRecord> taxRecords);
-        bool GetVehicleHasUrgentOrPastDueReminders(int vehicleId, int currentMileage);
+        decimal GetMaxMileage(int vehicleId);
+        decimal GetMaxMileage(VehicleRecords vehicleRecords);
+        decimal GetMinMileage(int vehicleId);
+        decimal GetMinMileage(VehicleRecords vehicleRecords);
+        int GetOwnershipDays(string purchaseDate, string soldDate, List<ServiceRecord> serviceRecords, List<CollisionRecord> repairRecords, List<GasRecord> gasRecords, List<UpgradeRecord> upgradeRecords, List<OdometerRecord> odometerRecords, List<TaxRecord> taxRecords);
+        bool GetVehicleHasUrgentOrPastDueReminders(int vehicleId, decimal currentMileage);
         List<VehicleInfo> GetVehicleInfo(List<Vehicle> vehicles);
         List<ReminderRecordViewModel> GetReminders(List<Vehicle> vehicles, bool isCalendar);
         List<PlanRecord> GetPlans(List<Vehicle> vehicles, bool excludeDone);
-        bool UpdateRecurringTaxes(int vehicleId);
-        void RestoreSupplyRecordsByUsage(List<SupplyUsageHistory> supplyUsage, string usageDescription);
     }
     public class VehicleLogic: IVehicleLogic
     {
@@ -32,10 +29,6 @@ namespace CarCareTracker.Logic
         private readonly IReminderRecordDataAccess _reminderRecordDataAccess;
         private readonly IPlanRecordDataAccess _planRecordDataAccess;
         private readonly IReminderHelper _reminderHelper;
-        private readonly IVehicleDataAccess _dataAccess;
-        private readonly ISupplyRecordDataAccess _supplyRecordDataAccess;
-        private readonly ILogger<VehicleLogic> _logger;
-
         public VehicleLogic(
             IServiceRecordDataAccess serviceRecordDataAccess,
             IGasRecordDataAccess gasRecordDataAccess,
@@ -45,10 +38,7 @@ namespace CarCareTracker.Logic
             IOdometerRecordDataAccess odometerRecordDataAccess,
             IReminderRecordDataAccess reminderRecordDataAccess,
             IPlanRecordDataAccess planRecordDataAccess,
-            IReminderHelper reminderHelper,
-            IVehicleDataAccess dataAccess,
-            ISupplyRecordDataAccess supplyRecordDataAccess,
-            ILogger<VehicleLogic> logger
+            IReminderHelper reminderHelper
             ) {
             _serviceRecordDataAccess = serviceRecordDataAccess;
             _gasRecordDataAccess = gasRecordDataAccess;
@@ -59,9 +49,6 @@ namespace CarCareTracker.Logic
             _planRecordDataAccess = planRecordDataAccess;
             _reminderRecordDataAccess = reminderRecordDataAccess;
             _reminderHelper = reminderHelper;
-            _dataAccess = dataAccess;
-            _supplyRecordDataAccess = supplyRecordDataAccess;
-            _logger = logger;
         }
         public VehicleRecords GetVehicleRecords(int vehicleId)
         {
@@ -84,9 +71,9 @@ namespace CarCareTracker.Logic
             var gasRecordSum = vehicleRecords.GasRecords.Sum(x => x.Cost);
             return serviceRecordSum + repairRecordSum + upgradeRecordSum + taxRecordSum + gasRecordSum;
         }
-        public int GetMaxMileage(int vehicleId)
+        public decimal GetMaxMileage(int vehicleId)
         {
-            var numbersArray = new List<int>();
+            var numbersArray = new List<decimal>();
             var serviceRecords = _serviceRecordDataAccess.GetServiceRecordsByVehicleId(vehicleId);
             if (serviceRecords.Any())
             {
@@ -112,11 +99,11 @@ namespace CarCareTracker.Logic
             {
                 numbersArray.Add(odometerRecords.Max(x => x.Mileage));
             }
-            return numbersArray.Any() ? numbersArray.Max() : 0;
+            return numbersArray.Any() ? numbersArray.Max() : 0.00M;
         }
-        public int GetMaxMileage(VehicleRecords vehicleRecords)
+        public decimal GetMaxMileage(VehicleRecords vehicleRecords)
         {
-            var numbersArray = new List<int>();
+            var numbersArray = new List<decimal>();
             if (vehicleRecords.ServiceRecords.Any())
             {
                 numbersArray.Add(vehicleRecords.ServiceRecords.Max(x => x.Mileage));
@@ -139,9 +126,9 @@ namespace CarCareTracker.Logic
             }
             return numbersArray.Any() ? numbersArray.Max() : 0;
         }
-        public int GetMinMileage(int vehicleId)
+        public decimal GetMinMileage(int vehicleId)
         {
-            var numbersArray = new List<int>();
+            var numbersArray = new List<decimal>();
             var serviceRecords = _serviceRecordDataAccess.GetServiceRecordsByVehicleId(vehicleId).Where(x => x.Mileage != default);
             if (serviceRecords.Any())
             {
@@ -169,9 +156,9 @@ namespace CarCareTracker.Logic
             }
             return numbersArray.Any() ? numbersArray.Min() : 0;
         }
-        public int GetMinMileage(VehicleRecords vehicleRecords)
+        public decimal GetMinMileage(VehicleRecords vehicleRecords)
         {
-            var numbersArray = new List<int>();
+            var numbersArray = new List<decimal>();
             var _serviceRecords = vehicleRecords.ServiceRecords.Where(x => x.Mileage != default).ToList();
             if (_serviceRecords.Any())
             {
@@ -199,44 +186,22 @@ namespace CarCareTracker.Logic
             }
             return numbersArray.Any() ? numbersArray.Min() : 0;
         }
-        public int GetOwnershipDays(string purchaseDate, string soldDate, int year, List<ServiceRecord> serviceRecords, List<CollisionRecord> repairRecords, List<GasRecord> gasRecords, List<UpgradeRecord> upgradeRecords, List<OdometerRecord> odometerRecords, List<TaxRecord> taxRecords)
+        public int GetOwnershipDays(string purchaseDate, string soldDate, List<ServiceRecord> serviceRecords, List<CollisionRecord> repairRecords, List<GasRecord> gasRecords, List<UpgradeRecord> upgradeRecords, List<OdometerRecord> odometerRecords, List<TaxRecord> taxRecords)
         {
             var startDate = DateTime.Now;
             var endDate = DateTime.Now;
-            bool usePurchaseDate = false;
-            bool useSoldDate = false;
-            if (!string.IsNullOrWhiteSpace(soldDate) && DateTime.TryParse(soldDate, out DateTime vehicleSoldDate))
+            if (!string.IsNullOrWhiteSpace(soldDate))
             {
-                if (year == default || year >= vehicleSoldDate.Year) //All Time is selected or the selected year is greater or equal to the year the vehicle is sold
-                {
-                    endDate = vehicleSoldDate; //cap end date to vehicle sold date.
-                    useSoldDate = true;
-                }
+                endDate = DateTime.Parse(soldDate);
             }
-            if (!string.IsNullOrWhiteSpace(purchaseDate) && DateTime.TryParse(purchaseDate, out DateTime vehiclePurchaseDate))
+            if (!string.IsNullOrWhiteSpace(purchaseDate))
             {
-                if (year == default || year <= vehiclePurchaseDate.Year) //All Time is selected or the selected year is less or equal to the year the vehicle is purchased
-                {
-                    startDate = vehiclePurchaseDate; //cap start date to vehicle purchase date
-                    usePurchaseDate = true;
-                }
-            }
-            if (year != default)
-            {
-                var calendarYearStart = new DateTime(year, 1, 1);
-                var calendarYearEnd = new DateTime(year + 1, 1, 1);
-                if (!useSoldDate)
-                {
-                    endDate = endDate > calendarYearEnd ? calendarYearEnd : endDate;
-                }
-                if (!usePurchaseDate)
-                {
-                    startDate = startDate > calendarYearStart ? calendarYearStart : startDate;
-                }
+                //if purchase date is provided, then we just have to subtract the begin date to end date and return number of months
+                startDate = DateTime.Parse(purchaseDate);
                 var timeElapsed = (int)Math.Floor((endDate - startDate).TotalDays);
                 return timeElapsed;
             }
-            var dateArray = new List<DateTime>() { startDate };
+            var dateArray = new List<DateTime>();
             dateArray.AddRange(serviceRecords.Select(x => x.Date));
             dateArray.AddRange(repairRecords.Select(x => x.Date));
             dateArray.AddRange(gasRecords.Select(x => x.Date));
@@ -253,7 +218,7 @@ namespace CarCareTracker.Logic
                 return 1;
             }
         }
-        public bool GetVehicleHasUrgentOrPastDueReminders(int vehicleId, int currentMileage)
+        public bool GetVehicleHasUrgentOrPastDueReminders(int vehicleId, decimal currentMileage)
         {
             var reminders = _reminderRecordDataAccess.GetReminderRecordsByVehicleId(vehicleId);
             var results = _reminderHelper.GetReminderRecordViewModels(reminders, currentMileage, DateTime.Now);
@@ -303,11 +268,11 @@ namespace CarCareTracker.Logic
                 //set next reminder
                 if (results.Any(x => (x.Metric == ReminderMetric.Date || x.Metric == ReminderMetric.Both) && x.Date >= DateTime.Now.Date))
                 {
-                    resultToAdd.NextReminder = results.Where(x => x.Date >= DateTime.Now.Date).OrderBy(x => x.Date).Select(x => new ReminderExportModel { Id = x.Id.ToString(), Description = x.Description, Urgency = x.Urgency.ToString(), Metric = x.Metric.ToString(), Notes = x.Notes, DueDate = x.Date.ToShortDateString(), DueOdometer = x.Mileage.ToString(), Tags = string.Join(' ', x.Tags) }).First();
+                    resultToAdd.NextReminder = results.Where(x => x.Date >= DateTime.Now.Date).OrderBy(x => x.Date).Select(x => new ReminderExportModel { Description = x.Description, Urgency = x.Urgency.ToString(), Metric = x.Metric.ToString(), Notes = x.Notes, DueDate = x.Date.ToShortDateString(), DueOdometer = x.Mileage.ToString() }).First();
                 }
                 else if (results.Any(x => (x.Metric == ReminderMetric.Odometer || x.Metric == ReminderMetric.Both) && x.Mileage >= currentMileage))
                 {
-                    resultToAdd.NextReminder = results.Where(x => x.Mileage >= currentMileage).OrderBy(x => x.Mileage).Select(x => new ReminderExportModel { Id = x.Id.ToString(), Description = x.Description, Urgency = x.Urgency.ToString(), Metric = x.Metric.ToString(), Notes = x.Notes, DueDate = x.Date.ToShortDateString(), DueOdometer = x.Mileage.ToString(), Tags = string.Join(' ', x.Tags) }).First();
+                    resultToAdd.NextReminder = results.Where(x => x.Mileage >= currentMileage).OrderBy(x => x.Mileage).Select(x => new ReminderExportModel { Description = x.Description, Urgency = x.Urgency.ToString(), Metric = x.Metric.ToString(), Notes = x.Notes, DueDate = x.Date.ToShortDateString(), DueOdometer = x.Mileage.ToString() }).First();
                 }
                 apiResult.Add(resultToAdd);
             }
@@ -346,104 +311,11 @@ namespace CarCareTracker.Logic
                 }
                 if (vehiclePlans.Any())
                 {
-                    var convertedPlans = vehiclePlans.Select(x => new PlanRecord { ImportMode = x.ImportMode, Priority = x.Priority, Progress = x.Progress, Notes = x.Notes, RequisitionHistory = x.RequisitionHistory, Description = $"{vehicle.Year} {vehicle.Make} {vehicle.Model} #{StaticHelper.GetVehicleIdentifier(vehicle)} - {x.Description}" });
+                    var convertedPlans = vehiclePlans.Select(x => new PlanRecord { Priority = x.Priority, Progress = x.Progress, Notes = x.Notes, RequisitionHistory = x.RequisitionHistory, Description = $"{vehicle.Year} {vehicle.Make} {vehicle.Model} #{StaticHelper.GetVehicleIdentifier(vehicle)} - {x.Description}" });
                     plans.AddRange(convertedPlans);
                 }
             }
             return plans.OrderBy(x => x.Priority).ThenBy(x=>x.Progress).ToList();
         }
-        public bool UpdateRecurringTaxes(int vehicleId)
-        {
-            var vehicleData = _dataAccess.GetVehicleById(vehicleId);
-            if (!string.IsNullOrWhiteSpace(vehicleData.SoldDate))
-            {
-                return false;
-            }
-            bool RecurringTaxIsOutdated(TaxRecord taxRecord)
-            {
-                var monthInterval = taxRecord.RecurringInterval != ReminderMonthInterval.Other ? (int)taxRecord.RecurringInterval : taxRecord.CustomMonthInterval;
-                bool addDays = taxRecord.RecurringInterval == ReminderMonthInterval.Other && taxRecord.CustomMonthIntervalUnit == ReminderIntervalUnit.Days;
-                return addDays ? DateTime.Now > taxRecord.Date.AddDays(monthInterval) : DateTime.Now > taxRecord.Date.AddMonths(monthInterval);
-            }
-            var result = _taxRecordDataAccess.GetTaxRecordsByVehicleId(vehicleId);
-            var outdatedRecurringFees = result.Where(x => x.IsRecurring && RecurringTaxIsOutdated(x));
-            if (outdatedRecurringFees.Any())
-            {
-                var success = false;
-                foreach (TaxRecord recurringFee in outdatedRecurringFees)
-                {
-                    var monthInterval = recurringFee.RecurringInterval != ReminderMonthInterval.Other ? (int)recurringFee.RecurringInterval : recurringFee.CustomMonthInterval;
-                    bool isOutdated = true;
-                    bool addDays = recurringFee.RecurringInterval == ReminderMonthInterval.Other && recurringFee.CustomMonthIntervalUnit == ReminderIntervalUnit.Days;
-                    //update the original outdated tax record
-                    recurringFee.IsRecurring = false;
-                    _taxRecordDataAccess.SaveTaxRecordToVehicle(recurringFee);
-                    //month multiplier for severely outdated monthly tax records.
-                    int monthMultiplier = 1;
-                    var originalDate = recurringFee.Date;
-                    while (isOutdated)
-                    {
-                        try
-                        {
-                            var nextDate = addDays ? originalDate.AddDays(monthInterval * monthMultiplier) : originalDate.AddMonths(monthInterval * monthMultiplier);
-                            monthMultiplier++;
-                            var nextnextDate = addDays ? originalDate.AddDays(monthInterval * monthMultiplier) : originalDate.AddMonths(monthInterval * monthMultiplier);
-                            recurringFee.Date = nextDate;
-                            recurringFee.Id = default; //new record
-                            recurringFee.IsRecurring = DateTime.Now <= nextnextDate;
-                            _taxRecordDataAccess.SaveTaxRecordToVehicle(recurringFee);
-                            isOutdated = !recurringFee.IsRecurring;
-                            success = true;
-                        }
-                        catch (Exception)
-                        {
-                            isOutdated = false; //break out of loop if something broke.
-                            success = false;
-                        }
-                    }
-                }
-                return success;
-            }
-            return false; //no outdated recurring tax records.
-        }
-        public void RestoreSupplyRecordsByUsage(List<SupplyUsageHistory> supplyUsage, string usageDescription)
-        {
-            foreach (SupplyUsageHistory supply in supplyUsage)
-            {
-                try
-                {
-                    if (supply.Id == default)
-                    {
-                        continue; //no id, skip current supply.
-                    }
-                    var result = _supplyRecordDataAccess.GetSupplyRecordById(supply.Id);
-                    if (result != null && result.Id != default)
-                    {
-                        //supply exists, re-add the quantity and cost
-                        result.Quantity += supply.Quantity;
-                        result.Cost += supply.Cost;
-                        var requisitionRecord = new SupplyUsageHistory
-                        {
-                            Id = supply.Id,
-                            Date = DateTime.Now.Date,
-                            Description = $"Restored from {usageDescription}",
-                            Quantity = supply.Quantity,
-                            Cost = supply.Cost
-                        };
-                        result.RequisitionHistory.Add(requisitionRecord);
-                        //save
-                        _supplyRecordDataAccess.SaveSupplyRecordToVehicle(result);
-                    }
-                    else
-                    {
-                        _logger.LogError($"Unable to find supply with id {supply.Id}");
-                    }
-                }
-                catch (Exception ex)
-                {
-                    _logger.LogError($"Error restoring supply with id {supply.Id} : {ex.Message}");
-                }
-            }
-        }
     }
 }

MapProfile/ImportMappers.cs

@@ -8,21 +8,18 @@ namespace CarCareTracker.MapProfile
         public ImportMapper()
         {
             Map(m => m.Date).Name(["date", "fuelup_date"]);
-            Map(m => m.Day).Name(["day"]);
-            Map(m => m.Month).Name(["month"]);
-            Map(m => m.Year).Name(["year"]);
             Map(m => m.DateCreated).Name(["datecreated"]);
             Map(m => m.DateModified).Name(["datemodified"]);
             Map(m => m.InitialOdometer).Name(["initialodometer"]);
-            Map(m => m.Odometer).Name(["odometer", "odo"]);
-            Map(m => m.FuelConsumed).Name(["gallons", "liters", "litres", "consumption", "quantity", "fuelconsumed", "qty"]);
+            Map(m => m.Odometer).Name(["odometer"]);
+            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", "partial tank", "partial_fill"]);
+            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", "missed fill up", "missed_fill"]);
+            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

@@ -28,7 +28,7 @@ namespace CarCareTracker.Middleware
             _httpContext = httpContext;
             _dataProtector = securityProvider.CreateProtector("login");
             _loginLogic = loginLogic;
-            enableAuth = bool.Parse(configuration["EnableAuth"] ?? "false");
+            enableAuth = bool.Parse(configuration["EnableAuth"]);
         }
         protected override async Task<AuthenticateResult> HandleAuthenticateAsync()
         {
@@ -75,9 +75,7 @@ namespace CarCareTracker.Middleware
                             var userIdentity = new List<Claim>
                             {
                                 new(ClaimTypes.Name, splitString[0]),
-                                new(ClaimTypes.NameIdentifier, userData.Id.ToString()),
-                                new(ClaimTypes.Email, userData.EmailAddress),
-                                new(ClaimTypes.Role, "APIAuth")
+                                new(ClaimTypes.NameIdentifier, userData.Id.ToString())
                             };
                             if (userData.IsAdmin)
                             {
@@ -156,7 +154,6 @@ namespace CarCareTracker.Middleware
                 if (value.ToString().ToLower() == "api")
                 {
                     Response.StatusCode = 401;
-                    Response.Headers.Append("WWW-Authenticate", "Basic");
                     return Task.CompletedTask;
                 }
             }

Models/API/ReleaseVersion.cs

@@ -1,18 +0,0 @@
-namespace CarCareTracker.Models
-{
-    /// <summary>
-    /// For deserializing GitHub response for latest version
-    /// </summary>
-    public class ReleaseResponse
-    {
-        public string tag_name { get; set; }
-    }
-    /// <summary>
-    /// For returning the version numbers via API.
-    /// </summary>
-    public class ReleaseVersion
-    {
-        public string CurrentVersion { get; set; }
-        public string LatestVersion { get; set; }
-    }
-}

Models/API/TypeConverter.cs

@@ -1,138 +0,0 @@
-using System.Text.Json;
-using System.Text.Json.Serialization;
-
-namespace CarCareTracker.Models
-{
-    public class DummyType
-    {
-
-    }
-    class InvariantConverter : JsonConverter<DummyType>
-    {
-        public override void Write(Utf8JsonWriter writer, DummyType value, JsonSerializerOptions options)
-        {
-            throw new NotImplementedException();
-        }
-        public override DummyType? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
-        {
-            throw new NotImplementedException();
-        }
-    }
-    class FromDateOptional: JsonConverter<string>
-    {
-        public override string? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
-        {
-            var tokenType = reader.TokenType;
-            if (tokenType == JsonTokenType.String)
-            {
-                return reader.GetString();
-            }
-            else if (tokenType == JsonTokenType.Number)
-            {
-                if (reader.TryGetInt64(out long intInput))
-                {
-                    return DateTimeOffset.FromUnixTimeSeconds(intInput).Date.ToShortDateString();
-                }
-            }
-            return reader.GetString();
-        }
-        public override void Write(Utf8JsonWriter writer, string value, JsonSerializerOptions options)
-        {
-            if (options.Converters.Any(x => x.Type == typeof(DummyType)))
-            {
-                writer.WriteStringValue(DateTime.Parse(value).ToString("yyyy-MM-dd"));
-            }
-            else
-            {
-                writer.WriteStringValue(value);
-            }
-        }
-    }
-    class FromDecimalOptional : JsonConverter<string>
-    {
-        public override string? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
-        {
-            var tokenType = reader.TokenType;
-            if (tokenType == JsonTokenType.String)
-            {
-                return reader.GetString();
-            }
-            else if (tokenType == JsonTokenType.Number) {
-                if (reader.TryGetDecimal(out decimal decimalInput))
-                {
-                    return decimalInput.ToString();
-                }
-            }
-            return reader.GetString();
-        }
-        public override void Write(Utf8JsonWriter writer, string value, JsonSerializerOptions options)
-        {
-            if (options.Converters.Any(x=>x.Type == typeof(DummyType)))
-            {
-                writer.WriteNumberValue(decimal.Parse(value));
-            } else
-            {
-                writer.WriteStringValue(value);
-            }
-        }
-    }
-    class FromIntOptional : JsonConverter<string>
-    {
-        public override string? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
-        {
-            var tokenType = reader.TokenType;
-            if (tokenType == JsonTokenType.String)
-            {
-                return reader.GetString();
-            }
-            else if (tokenType == JsonTokenType.Number)
-            {
-                if (reader.TryGetInt32(out int intInput))
-                {
-                    return intInput.ToString();
-                }
-            }
-            return reader.GetString();
-        }
-        public override void Write(Utf8JsonWriter writer, string value, JsonSerializerOptions options)
-        {
-            if (options.Converters.Any(x => x.Type == typeof(DummyType)))
-            {
-                writer.WriteNumberValue(int.Parse(value));
-            }
-            else
-            {
-                writer.WriteStringValue(value);
-            }
-        }
-    }
-    class FromBoolOptional : JsonConverter<string>
-    {
-        public override string? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
-        {
-            var tokenType = reader.TokenType;
-            switch (tokenType)
-            {
-                case JsonTokenType.String: 
-                    return reader.GetString();
-                case JsonTokenType.True:
-                    return "True";
-                case JsonTokenType.False:
-                    return "False";
-                default:
-                    return reader.GetString();
-            }
-        }
-        public override void Write(Utf8JsonWriter writer, string value, JsonSerializerOptions options)
-        {
-            if (options.Converters.Any(x => x.Type == typeof(DummyType)))
-            {
-                writer.WriteBooleanValue(bool.Parse(value));
-            }
-            else
-            {
-                writer.WriteStringValue(value);
-            }
-        }
-    }
-}

Models/API/VehicleInfo.cs

@@ -18,7 +18,7 @@
         public decimal TaxRecordCost { get; set; }
         public int GasRecordCount { get; set; }
         public decimal GasRecordCost { get; set; }
-        public int LastReportedOdometer { get; set; }
+        public decimal LastReportedOdometer { get; set; }
         public int PlanRecordBackLogCount { get; set; }
         public int PlanRecordInProgressCount { get; set; }
         public int PlanRecordTestingCount { get; set; }

Models/Collision/CollisionRecordInput.cs

@@ -6,7 +6,7 @@
         public int VehicleId { get; set; }
         public List<int> ReminderRecordId { get; set; } = new List<int>();
         public string Date { get; set; } = DateTime.Now.ToShortDateString();
-        public int Mileage { get; set; }
+        public decimal Mileage { get; set; }
         public string Description { get; set; }
         public decimal Cost { get; set; }
         public string Notes { get; set; }
@@ -15,7 +15,6 @@
         public List<string> Tags { get; set; } = new List<string>();
         public List<ExtraField> ExtraFields { get; set; } = new List<ExtraField>();
         public List<SupplyUsageHistory> RequisitionHistory { get; set; } = new List<SupplyUsageHistory>();
-        public List<SupplyUsageHistory> DeletedRequisitionHistory { get; set; } = new List<SupplyUsageHistory>();
         public bool CopySuppliesAttachment { get; set; } = false;
         public CollisionRecord ToCollisionRecord() { return new CollisionRecord { 
             Id = Id, 

Models/GasRecord/GasRecord.cs

@@ -8,7 +8,7 @@
         /// <summary>
         /// American moment
         /// </summary>
-        public int Mileage { get; set; }
+        public decimal Mileage { get; set; }
         /// <summary>
         /// Wtf is a kilometer?
         /// </summary>

Models/GasRecord/GasRecordInput.cs

@@ -8,7 +8,7 @@
         /// <summary>
         /// American moment
         /// </summary>
-        public int Mileage { get; set; }
+        public decimal Mileage { get; set; }
         /// <summary>
         /// Wtf is a kilometer?
         /// </summary>

Models/GasRecord/GasRecordViewModel.cs

@@ -9,13 +9,13 @@
         /// <summary>
         /// American moment
         /// </summary>
-        public int Mileage { get; set; }
+        public decimal Mileage { get; set; }
         /// <summary>
         /// Wtf is a kilometer?
         /// </summary>
         public decimal Gallons { get; set; }
         public decimal Cost { get; set; }
-        public int DeltaMileage { get; set; }
+        public decimal DeltaMileage { get; set; }
         public decimal MilesPerGallon { get; set; }
         public decimal CostPerGallon { get; set; }
         public bool IsFillToFull { get; set; }
@@ -23,7 +23,6 @@
         public string Notes { get; set; }
         public List<string> Tags { get; set; } = new List<string>();
         public List<ExtraField> ExtraFields { get; set; } = new List<ExtraField>();
-        public List<UploadedFiles> Files { get; set; } = new List<UploadedFiles>();
-        public bool IncludeInAverage { get { return MilesPerGallon > 0 || (!IsFillToFull && !MissedFuelUp) || (Mileage == default && !MissedFuelUp); } }
+        public bool IncludeInAverage { get { return MilesPerGallon > 0 || (!IsFillToFull && !MissedFuelUp); } }
     }
 }

Models/OIDC/OpenIDConfig.cs

@@ -8,14 +8,13 @@
         public string AuthURL { get; set; }
         public string TokenURL { get; set; }
         public string RedirectURL { get; set; }
-        public string Scope { get; set; } = "openid email";
+        public string Scope { get; set; }
         public string State { get; set; }
         public string CodeChallenge { get; set; }
         public bool ValidateState { get; set; } = false;
         public bool DisableRegularLogin { get; set; } = false;
         public bool UsePKCE { get; set; } = false;
         public string LogOutURL { get; set; } = "";
-        public string UserInfoURL { get; set; } = "";
         public string RemoteAuthURL { get {
                 var redirectUrl = $"{AuthURL}?client_id={ClientId}&response_type=code&redirect_uri={RedirectURL}&scope={Scope}&state={State}";
                 if (UsePKCE)

Models/OIDC/OpenIDResult.cs

@@ -3,6 +3,5 @@
     public class OpenIDResult
     {
         public string id_token { get; set; }
-        public string access_token { get; set; }
     }
 }

Models/OIDC/OpenIDUserInfo.cs

@@ -1,7 +0,0 @@
-namespace CarCareTracker.Models
-{
-    public class OpenIDUserInfo
-    {
-        public string email { get; set; } = "";
-    }
-}

Models/OdometerRecord/OdometerRecord.cs

@@ -5,9 +5,9 @@
         public int Id { get; set; }
         public int VehicleId { get; set; }
         public DateTime Date { get; set; }
-        public int InitialMileage { get; set; }
-        public int Mileage { get; set; }
-        public int DistanceTraveled { get { return Mileage - InitialMileage; } }
+        public decimal InitialMileage { get; set; }
+        public decimal Mileage { get; set; }
+        public decimal DistanceTraveled { get { return Mileage - InitialMileage; } }
         public string Notes { get; set; }
         public List<string> Tags { get; set; } = new List<string>();
         public List<UploadedFiles> Files { get; set; } = new List<UploadedFiles>();

Models/OdometerRecord/OdometerRecordInput.cs

@@ -5,8 +5,8 @@
         public int Id { get; set; }
         public int VehicleId { get; set; }
         public string Date { get; set; } = DateTime.Now.ToShortDateString();
-        public int InitialMileage { get; set; }
-        public int Mileage { get; set; }
+        public decimal InitialMileage { get; set; }
+        public decimal Mileage { get; set; }
         public string Notes { get; set; }
         public List<UploadedFiles> Files { get; set; } = new List<UploadedFiles>();
         public List<string> Tags { get; set; } = new List<string>();

Models/OperationResponse.cs

@@ -1,33 +1,8 @@
-using CarCareTracker.Helper;
-
-namespace CarCareTracker.Models
+namespace CarCareTracker.Models
 {
-    public class OperationResponseBase
+    public class OperationResponse
     {
         public bool Success { get; set; }
         public string Message { get; set; }
     }
-    public class OperationResponse: OperationResponseBase
-    {
-        public static OperationResponse Succeed(string message = "")
-        {
-            return new OperationResponse { Success = true, Message = message };
-        }
-        public static OperationResponse Failed(string message = "")
-        {
-            if (string.IsNullOrWhiteSpace(message))
-            {
-                message = StaticHelper.GenericErrorMessage;
-            }
-            return new OperationResponse { Success = false, Message = message};
-        }
-        public static OperationResponse Conditional(bool result, string successMessage = "", string errorMessage = "")
-        {
-            if (string.IsNullOrWhiteSpace(errorMessage))
-            {
-                errorMessage = StaticHelper.GenericErrorMessage;
-            }
-            return new OperationResponse { Success = result, Message = result ? successMessage : errorMessage };
-        }
-    }    
 }

Models/PlanRecord/PlanRecordInput.cs

@@ -17,7 +17,6 @@
         public decimal Cost { get; set; }
         public List<ExtraField> ExtraFields { get; set; } = new List<ExtraField>();
         public List<SupplyUsageHistory> RequisitionHistory { get; set; } = new List<SupplyUsageHistory>();
-        public List<SupplyUsageHistory> DeletedRequisitionHistory { get; set; } = new List<SupplyUsageHistory>();
         public bool CopySuppliesAttachment { get; set; } = false;
         public PlanRecord ToPlanRecord() { return new PlanRecord { 
             Id = Id, 

Models/Reminder/ReminderRecord.cs

@@ -5,7 +5,7 @@
         public int Id { get; set; }
         public int VehicleId { get; set; }
         public DateTime Date { get; set; }
-        public int Mileage { get; set; }
+        public decimal Mileage { get; set; }
         public string Description { get; set; }
         public string Notes { get; set; }
         public bool IsRecurring { get; set; } = false;
@@ -13,7 +13,6 @@
         public ReminderUrgencyConfig CustomThresholds { get; set; } = new ReminderUrgencyConfig();
         public int CustomMileageInterval { get; set; } = 0;
         public int CustomMonthInterval { get; set; } = 0;
-        public ReminderIntervalUnit CustomMonthIntervalUnit { get; set; } = ReminderIntervalUnit.Months;
         public ReminderMileageInterval ReminderMileageInterval { get; set; } = ReminderMileageInterval.FiveThousandMiles;
         public ReminderMonthInterval ReminderMonthInterval { get; set; } = ReminderMonthInterval.OneYear;
         public ReminderMetric Metric { get; set; } = ReminderMetric.Date;

Models/Reminder/ReminderRecordInput.cs

@@ -5,7 +5,7 @@
         public int Id { get; set; }
         public int VehicleId { get; set; }
         public string Date { get; set; } = DateTime.Now.AddDays(1).ToShortDateString();
-        public int Mileage { get; set; }
+        public decimal Mileage { get; set; }
         public string Description { get; set; }
         public string Notes { get; set; }
         public bool IsRecurring { get; set; } = false;
@@ -13,7 +13,6 @@
         public ReminderUrgencyConfig CustomThresholds { get; set; } = new ReminderUrgencyConfig();
         public int CustomMileageInterval { get; set; } = 0;
         public int CustomMonthInterval { get; set; } = 0;
-        public ReminderIntervalUnit CustomMonthIntervalUnit { get; set; } = ReminderIntervalUnit.Months;
         public ReminderMileageInterval ReminderMileageInterval { get; set; } = ReminderMileageInterval.FiveThousandMiles;
         public ReminderMonthInterval ReminderMonthInterval { get; set; } = ReminderMonthInterval.OneYear;
         public ReminderMetric Metric { get; set; } = ReminderMetric.Date;
@@ -35,7 +34,6 @@
                 ReminderMonthInterval = ReminderMonthInterval,
                 CustomMileageInterval = CustomMileageInterval,
                 CustomMonthInterval = CustomMonthInterval,
-                CustomMonthIntervalUnit = CustomMonthIntervalUnit,
                 Notes = Notes,
                 Tags = Tags
             };

Models/Reminder/ReminderRecordViewModel.cs

@@ -5,14 +5,10 @@
         public int Id { get; set; }
         public int VehicleId { get; set; }
         public DateTime Date { get; set; }
-        public int Mileage { get; set; }
+        public decimal Mileage { get; set; }
         public string Description { get; set; }
         public string Notes { get; set; }
         /// <summary>
-        /// The metric the user selected to calculate the urgency of this reminder.
-        /// </summary>
-        public ReminderMetric UserMetric { get; set; } = ReminderMetric.Date;
-        /// <summary>
         /// Reason why this reminder is urgent
         /// </summary>
         public ReminderMetric Metric { get; set; } = ReminderMetric.Date;

Models/Report/CostDistanceTableForVehicle.cs

@@ -1,8 +0,0 @@
-namespace CarCareTracker.Models
-{
-    public class CostDistanceTableForVehicle
-    {
-        public string DistanceUnit { get; set; } = "mi.";
-        public List<CostForVehicleByMonth> CostData { get; set; } = new List<CostForVehicleByMonth>();
-    }
-}

Models/Report/CostForVehicleByMonth.cs

@@ -2,11 +2,9 @@
 {
     public class CostForVehicleByMonth
     {
-        public int Year { get; set; }
         public int MonthId { get; set; }
         public string MonthName { get; set; }
         public decimal Cost { get; set; }
-        public int DistanceTraveled { get; set; }
-        public decimal CostPerDistanceTraveled { get { if (DistanceTraveled > 0) { return Cost / DistanceTraveled; } else { return 0M; } } }
+        public decimal DistanceTraveled { get; set; }
     }
 }

Models/Report/CostTableForVehicle.cs

@@ -3,7 +3,7 @@
     public class CostTableForVehicle
     {
         public string DistanceUnit { get; set; } = "Cost Per Mile";
-        public int TotalDistance { get; set; }
+        public decimal TotalDistance { get; set; }
         public int NumberOfDays { get; set; }
         public decimal ServiceRecordSum { get; set; }
         public decimal GasRecordSum { get; set; }

Models/Report/GenericReportModel.cs

@@ -7,12 +7,11 @@
     {
         public ImportMode DataType { get; set; }
         public DateTime Date { get; set; }
-        public int Odometer { get; set; }
+        public decimal Odometer { get; set; }
         public string Description { get; set; }
         public string Notes { get; set; }
         public decimal Cost { get; set; }
         public List<UploadedFiles> Files { get; set; } = new List<UploadedFiles>();
         public List<ExtraField> ExtraFields { get; set; } = new List<ExtraField>();
-        public List<SupplyUsageHistory> RequisitionHistory { get; set; } = new List<SupplyUsageHistory>();
     }
 }

Models/Report/ReportHeader.cs

@@ -1,10 +0,0 @@
-namespace CarCareTracker.Models
-{
-    public class ReportHeader
-    {
-        public int MaxOdometer { get; set; }
-        public int DistanceTraveled { get; set; }
-        public decimal TotalCost { get; set; }
-        public string AverageMPG { get; set; }
-    }
-}

Models/Report/ReportParameter.cs

@@ -2,13 +2,7 @@
 {
     public class ReportParameter
     {
-        public List<string> VisibleColumns { get; set; } = new List<string>();
-        public List<string> ExtraFields { get; set; } = new List<string>();
-        public TagFilter TagFilter { get; set; } = TagFilter.Exclude;
-        public List<string> Tags { get; set; } = new List<string>();
-        public bool FilterByDateRange { get; set; } = false;
-        public string StartDate { get; set; } = "";
-        public string EndDate { get; set; } = "";
-        public bool PrintIndividualRecords { get; set; } = false;
+       public List<string> VisibleColumns { get; set; } = new List<string>();
+       public List<string> ExtraFields { get; set; } = new List<string>();
     }
 }

Models/Report/ReportViewModel.cs

@@ -2,7 +2,6 @@
 {
     public class ReportViewModel
     {
-        public ReportHeader ReportHeaderForVehicle { get; set; } = new ReportHeader();
         public List<CostForVehicleByMonth> CostForVehicleByMonth { get; set; } = new List<CostForVehicleByMonth>();
         public MPGForVehicleByMonth FuelMileageForVehicleByMonth { get; set; } = new MPGForVehicleByMonth();
         public CostMakeUpForVehicle CostMakeUpForVehicle { get; set; } = new CostMakeUpForVehicle();

Models/Report/VehicleHistoryViewModel.cs

@@ -17,7 +17,5 @@
         public decimal TotalDepreciation { get; set; }
         public decimal DepreciationPerDay { get; set; }
         public decimal DepreciationPerMile { get; set; }
-        public string StartDate { get; set; }
-        public string EndDate { get; set; }
     }
 }

Models/ServiceRecord/ServiceRecordInput.cs

@@ -6,7 +6,7 @@
         public int VehicleId { get; set; }
         public List<int> ReminderRecordId { get; set; } = new List<int>();
         public string Date { get; set; } = DateTime.Now.ToShortDateString();
-        public int Mileage { get; set; }
+        public decimal Mileage { get; set; }
         public string Description { get; set; }
         public decimal Cost { get; set; }
         public string Notes { get; set; }
@@ -15,7 +15,6 @@
         public List<string> Tags { get; set; } = new List<string>();
         public List<ExtraField> ExtraFields { get; set; } = new List<ExtraField>();
         public List<SupplyUsageHistory> RequisitionHistory { get; set; } = new List<SupplyUsageHistory>();
-        public List<SupplyUsageHistory> DeletedRequisitionHistory { get; set; } = new List<SupplyUsageHistory>();
         public bool CopySuppliesAttachment { get; set; } = false;
         public ServiceRecord ToServiceRecord() { return new ServiceRecord { 
             Id = Id, 

Models/Settings/ServerSettingsViewModel.cs

@@ -1,17 +0,0 @@
-namespace CarCareTracker.Models
-{
-    public class ServerSettingsViewModel
-    {
-        public string LocaleInfo { get; set; }
-        public string PostgresConnection { get; set; }
-        public string AllowedFileExtensions { get; set; }
-        public string CustomLogoURL { get; set; }
-        public string MessageOfTheDay { get; set; }
-        public string WebHookURL { get; set; }
-        public bool CustomWidgetsEnabled { get; set; }
-        public bool InvariantAPIEnabled { get; set; }
-        public MailConfig SMTPConfig { get; set; } = new MailConfig();
-        public OpenIDConfig OIDCConfig { get; set; } = new OpenIDConfig();
-
-    }
-}

Models/Shared/ExtraField.cs

@@ -5,6 +5,5 @@
         public string Name { get; set; }
         public string Value { get; set; }
         public bool IsRequired { get; set; }
-        public ExtraFieldType FieldType { get; set; } = ExtraFieldType.Text;
     }
 }

Models/Shared/GenericRecord.cs

@@ -5,7 +5,7 @@
         public int Id { get; set; }
         public int VehicleId { get; set; }
         public DateTime Date { get; set; }
-        public int Mileage { get; set; }
+        public decimal Mileage { get; set; }
         public string Description { get; set; }
         public decimal Cost { get; set; }
         public string Notes { get; set; }

Models/Shared/ImportModel.cs

@@ -1,6 +1,4 @@
-using System.Text.Json.Serialization;
-
-namespace CarCareTracker.Models
+namespace CarCareTracker.Models
 {
     /// <summary>
     /// Import model used for importing records via CSV.
@@ -8,9 +6,6 @@ namespace CarCareTracker.Models
     public class ImportModel
     {
         public string Date { get; set; }
-        public string Day { get; set; }
-        public string Month { get; set; }
-        public string Year { get; set; }
         public string DateCreated { get; set; }
         public string DateModified { get; set; }
         public string Type { get; set; }
@@ -43,115 +38,68 @@ namespace CarCareTracker.Models
         public string Cost { get; set; }
         public string Notes { get; set; }
         public string Tags { get; set; }
-        public List<ExtraField> ExtraFields { get; set; } = new List<ExtraField>();
+        public List<ExtraField> ExtraFields { get; set; }
     }
     public class GenericRecordExportModel
     {
-        [JsonConverter(typeof(FromIntOptional))]
-        public string Id { get; set; }
-        [JsonConverter(typeof(FromDateOptional))]
         public string Date { get; set; }
-        [JsonConverter(typeof(FromIntOptional))]
         public string Odometer { get; set; }
         public string Description { get; set; }
         public string Notes { get; set; }
-        [JsonConverter(typeof(FromDecimalOptional))]
         public string Cost { get; set; }
         public string Tags { get; set; }
-        public List<ExtraField> ExtraFields { get; set; } = new List<ExtraField>();
-        public List<UploadedFiles> Files { get; set; } = new List<UploadedFiles>();
+        public List<ExtraField> ExtraFields { get; set; }
     }
     public class OdometerRecordExportModel
     {
-        [JsonConverter(typeof(FromIntOptional))]
-        public string Id { get; set; }
-        [JsonConverter(typeof(FromDateOptional))]
         public string Date { get; set; }
-        [JsonConverter(typeof(FromIntOptional))]
         public string InitialOdometer { get; set; }
-        [JsonConverter(typeof(FromIntOptional))]
         public string Odometer { get; set; }
         public string Notes { get; set; }
         public string Tags { get; set; }
-        public List<ExtraField> ExtraFields { get; set; } = new List<ExtraField>();
-        public List<UploadedFiles> Files { get; set; } = new List<UploadedFiles>();
+        public List<ExtraField> ExtraFields { get; set; }
     }
     public class TaxRecordExportModel
     {
-        [JsonConverter(typeof(FromIntOptional))]
-        public string Id { get; set; }
-        [JsonConverter(typeof(FromDateOptional))]
         public string Date { get; set; }
         public string Description { get; set; }
         public string Notes { get; set; }
-        [JsonConverter(typeof(FromDecimalOptional))]
         public string Cost { get; set; }
         public string Tags { get; set; }
-        public List<ExtraField> ExtraFields { get; set; } = new List<ExtraField>();
-        public List<UploadedFiles> Files { get; set; } = new List<UploadedFiles>();
+        public List<ExtraField> ExtraFields { get; set; }
     }
     public class GasRecordExportModel
     {
-        [JsonConverter(typeof(FromIntOptional))]
-        public string Id { get; set; }
-        [JsonConverter(typeof(FromDateOptional))]
         public string Date { get; set; }
-        [JsonConverter(typeof(FromIntOptional))]
         public string Odometer { get; set; }
-        [JsonConverter(typeof(FromDecimalOptional))]
         public string FuelConsumed { get; set; }
-        [JsonConverter(typeof(FromDecimalOptional))]
         public string Cost { get; set; }
-        [JsonConverter(typeof(FromDecimalOptional))]
         public string FuelEconomy { get; set; }
-        [JsonConverter(typeof(FromBoolOptional))]
         public string IsFillToFull { get; set; }
-        [JsonConverter(typeof(FromBoolOptional))]
         public string MissedFuelUp { get; set; }
         public string Notes { get; set; }
         public string Tags { get; set; }
-        public List<ExtraField> ExtraFields { get; set; } = new List<ExtraField>();
-        public List<UploadedFiles> Files { get; set; } = new List<UploadedFiles>();
+        public List<ExtraField> ExtraFields { get; set; }
     }
     public class ReminderExportModel
     {
-        [JsonConverter(typeof(FromIntOptional))]
-        public string Id { get; set; }
         public string Description { get; set; }
         public string Urgency { get; set; }
         public string Metric { get; set; }
         public string Notes { get; set; }
-        [JsonConverter(typeof(FromDateOptional))]
         public string DueDate { get; set; }
-        [JsonConverter(typeof(FromIntOptional))]
         public string DueOdometer { get; set; }
-        public string Tags { get; set; }
     }
     public class PlanRecordExportModel 
     {
-        [JsonConverter(typeof(FromIntOptional))]
-        public string Id { get; set; }
-        [JsonConverter(typeof(FromDateOptional))]
         public string DateCreated { get; set; }
-        [JsonConverter(typeof(FromDateOptional))]
         public string DateModified { get; set; }
         public string Description { get; set; }
         public string Notes { get; set; }
         public string Type { get; set; }
         public string Priority { get; set; }
         public string Progress { get; set; }
-        [JsonConverter(typeof(FromDecimalOptional))]
         public string Cost { get; set; }
-        public List<ExtraField> ExtraFields { get; set; } = new List<ExtraField>();
-        public List<UploadedFiles> Files { get; set; } = new List<UploadedFiles>();
-    }
-    public class UserExportModel
-    {
-        public string Username { get; set; }
-        public string EmailAddress { get; set; }
-        [JsonConverter(typeof(FromBoolOptional))]
-        public string IsAdmin { get; set; }
-        [JsonConverter(typeof(FromBoolOptional))]
-        public string IsRoot { get; set; }
+        public List<ExtraField> ExtraFields { get; set; }
     }
 }

Models/Shared/StickerViewModel.cs

@@ -1,11 +0,0 @@
-namespace CarCareTracker.Models
-{
-    public class StickerViewModel
-    {
-        public ImportMode RecordType { get; set; }
-        public Vehicle VehicleData { get; set; } = new Vehicle();
-        public List<ReminderRecord> ReminderRecords { get; set; } = new List<ReminderRecord>();
-        public List<GenericRecord> GenericRecords { get; set; } = new List<GenericRecord>();
-        public List<SupplyRecord> SupplyRecords { get; set; } = new List<SupplyRecord>();
-    }
-}

Models/Shared/WebHookPayload.cs

@@ -1,253 +0,0 @@
-using System.Text.Json.Serialization;
-
-namespace CarCareTracker.Models
-{
-    /// <summary>
-    /// WebHookPayload Object
-    /// </summary>
-    public class WebHookPayloadBase
-    {
-        public string Type { get; set; } = "";
-        public string Timestamp
-        {
-            get { return DateTime.UtcNow.ToString("O"); }
-        }
-        public Dictionary<string, string> Data { get; set; } = new Dictionary<string, string>();
-        /// <summary>
-        /// Legacy attributes below
-        /// </summary>
-        public string VehicleId { get; set; } = "";
-        public string Username { get; set; } = "";
-        public string Action { get; set; } = "";
-    }
-    public class DiscordWebHook
-    {
-        public string Username { get { return "LubeLogger"; } }
-        [JsonPropertyName("avatar_url")]
-        public string AvatarUrl { get { return "https://hargata.github.io/hargata/lubelogger_logo_small.png"; } }
-        public string Content { get; set; } = "";
-        public static DiscordWebHook FromWebHookPayload(WebHookPayload webHookPayload)
-        {
-            return new DiscordWebHook
-            {
-                Content = webHookPayload.Action,
-            };
-        } 
-    }
-    public class WebHookPayload: WebHookPayloadBase
-    {
-        private static string GetFriendlyActionType(string actionType)
-        {
-            var actionTypeParts = actionType.Split('.');
-            if (actionTypeParts.Length == 2)
-            {
-                var recordType = actionTypeParts[0];
-                var recordAction = actionTypeParts[1];
-                switch (recordAction)
-                {
-                    case "add":
-                        recordAction = "Added";
-                        break;
-                    case "update":
-                        recordAction = "Updated";
-                        break;
-                    case "delete":
-                        recordAction = "Deleted";
-                        break;
-                }
-                if (recordType.ToLower().Contains("record"))
-                {
-                    var cleanedRecordType = recordType.ToLower().Replace("record", "");
-                    cleanedRecordType = $"{char.ToUpper(cleanedRecordType[0])}{cleanedRecordType.Substring(1)} Record";
-                    recordType = cleanedRecordType;
-                } else
-                {
-                    recordType = $"{char.ToUpper(recordType[0])}{recordType.Substring(1)}";
-                }
-                return $"{recordAction} {recordType}";
-            } else if (actionTypeParts.Length == 3)
-            {
-                var recordType = actionTypeParts[0];
-                var recordAction = actionTypeParts[1];
-                var thirdPart = actionTypeParts[2];
-                switch (recordAction)
-                {
-                    case "add":
-                        recordAction = "Added";
-                        break;
-                    case "update":
-                        recordAction = "Updated";
-                        break;
-                    case "delete":
-                        recordAction = "Deleted";
-                        break;
-                }
-                if (recordType.ToLower().Contains("record"))
-                {
-                    var cleanedRecordType = recordType.ToLower().Replace("record", "");
-                    cleanedRecordType = $"{char.ToUpper(cleanedRecordType[0])}{cleanedRecordType.Substring(1)} Record";
-                    recordType = cleanedRecordType;
-                }
-                else
-                {
-                    recordType = $"{char.ToUpper(recordType[0])}{recordType.Substring(1)}";
-                }
-                if (thirdPart == "api")
-                {
-                    return $"{recordAction} {recordType} via API";
-                } else
-                {
-                    return $"{recordAction} {recordType}";
-                }
-            }
-            return actionType;
-        }
-        public static WebHookPayload FromGenericRecord(GenericRecord genericRecord, string actionType, string userName)
-        {
-            Dictionary<string, string> payloadDictionary = new Dictionary<string, string>();
-            payloadDictionary.Add("user", userName);
-            payloadDictionary.Add("description", genericRecord.Description);
-            payloadDictionary.Add("odometer", genericRecord.Mileage.ToString());
-            payloadDictionary.Add("vehicleId", genericRecord.VehicleId.ToString());
-            payloadDictionary.Add("cost", genericRecord.Cost.ToString("F2"));
-            return new WebHookPayload
-            {
-                Type = actionType,
-                Data = payloadDictionary,
-                VehicleId = genericRecord.VehicleId.ToString(),
-                Username = userName,
-                Action = $"{userName} {GetFriendlyActionType(actionType)} Description: {genericRecord.Description}"
-            };
-        }
-        public static WebHookPayload FromGasRecord(GasRecord gasRecord, string actionType, string userName)
-        {
-            Dictionary<string, string> payloadDictionary = new Dictionary<string, string>();
-            payloadDictionary.Add("user", userName);
-            payloadDictionary.Add("odometer", gasRecord.Mileage.ToString());
-            payloadDictionary.Add("fuelconsumed", gasRecord.Gallons.ToString());
-            payloadDictionary.Add("vehicleId", gasRecord.VehicleId.ToString());
-            payloadDictionary.Add("cost", gasRecord.Cost.ToString("F2"));
-            return new WebHookPayload
-            {
-                Type = actionType,
-                Data = payloadDictionary,
-                VehicleId = gasRecord.VehicleId.ToString(),
-                Username = userName,
-                Action = $"{userName} {GetFriendlyActionType(actionType)} Odometer: {gasRecord.Mileage}"
-            };
-        }
-        public static WebHookPayload FromOdometerRecord(OdometerRecord odometerRecord, string actionType, string userName)
-        {
-            Dictionary<string, string> payloadDictionary = new Dictionary<string, string>();
-            payloadDictionary.Add("user", userName);
-            payloadDictionary.Add("initialodometer", odometerRecord.InitialMileage.ToString());
-            payloadDictionary.Add("odometer", odometerRecord.Mileage.ToString());
-            payloadDictionary.Add("vehicleId", odometerRecord.VehicleId.ToString());
-            return new WebHookPayload
-            {
-                Type = actionType,
-                Data = payloadDictionary,
-                VehicleId = odometerRecord.VehicleId.ToString(),
-                Username = userName,
-                Action = $"{userName} {GetFriendlyActionType(actionType)} Odometer: {odometerRecord.Mileage}"
-            };
-        }
-        public static WebHookPayload FromTaxRecord(TaxRecord taxRecord, string actionType, string userName)
-        {
-            Dictionary<string, string> payloadDictionary = new Dictionary<string, string>();
-            payloadDictionary.Add("user", userName);
-            payloadDictionary.Add("description", taxRecord.Description);
-            payloadDictionary.Add("vehicleId", taxRecord.VehicleId.ToString());
-            payloadDictionary.Add("cost", taxRecord.Cost.ToString("F2"));
-            return new WebHookPayload
-            {
-                Type = actionType,
-                Data = payloadDictionary,
-                VehicleId = taxRecord.VehicleId.ToString(),
-                Username = userName,
-                Action = $"{userName} {GetFriendlyActionType(actionType)} Description: {taxRecord.Description}"
-            };
-        }
-        public static WebHookPayload FromPlanRecord(PlanRecord planRecord, string actionType, string userName)
-        {
-            Dictionary<string, string> payloadDictionary = new Dictionary<string, string>();
-            payloadDictionary.Add("user", userName);
-            payloadDictionary.Add("description", planRecord.Description);
-            payloadDictionary.Add("vehicleId", planRecord.VehicleId.ToString());
-            payloadDictionary.Add("cost", planRecord.Cost.ToString("F2"));
-            return new WebHookPayload
-            {
-                Type = actionType,
-                Data = payloadDictionary,
-                VehicleId = planRecord.VehicleId.ToString(),
-                Username = userName,
-                Action = $"{userName} {GetFriendlyActionType(actionType)} Description: {planRecord.Description}"
-            };
-        }
-        public static WebHookPayload FromReminderRecord(ReminderRecord reminderRecord, string actionType, string userName)
-        {
-            Dictionary<string, string> payloadDictionary = new Dictionary<string, string>();
-            payloadDictionary.Add("user", userName);
-            payloadDictionary.Add("description", reminderRecord.Description);
-            payloadDictionary.Add("vehicleId", reminderRecord.VehicleId.ToString());
-            payloadDictionary.Add("metric", reminderRecord.Metric.ToString());
-            return new WebHookPayload
-            {
-                Type = actionType,
-                Data = payloadDictionary,
-                VehicleId = reminderRecord.VehicleId.ToString(),
-                Username = userName,
-                Action = $"{userName} {GetFriendlyActionType(actionType)} Description: {reminderRecord.Description}"
-            };
-        }
-        public static WebHookPayload FromSupplyRecord(SupplyRecord supplyRecord, string actionType, string userName)
-        {
-            Dictionary<string, string> payloadDictionary = new Dictionary<string, string>();
-            payloadDictionary.Add("user", userName);
-            payloadDictionary.Add("description", supplyRecord.Description);
-            payloadDictionary.Add("vehicleId", supplyRecord.VehicleId.ToString());
-            payloadDictionary.Add("cost", supplyRecord.Cost.ToString("F2"));
-            payloadDictionary.Add("quantity", supplyRecord.Quantity.ToString("F2"));
-            return new WebHookPayload
-            {
-                Type = actionType,
-                Data = payloadDictionary,
-                VehicleId = supplyRecord.VehicleId.ToString(),
-                Username = userName,
-                Action = $"{userName} {GetFriendlyActionType(actionType)} Description: {supplyRecord.Description}"
-            };
-        }
-        public static WebHookPayload FromNoteRecord(Note noteRecord, string actionType, string userName)
-        {
-            Dictionary<string, string> payloadDictionary = new Dictionary<string, string>();
-            payloadDictionary.Add("user", userName);
-            payloadDictionary.Add("description", noteRecord.Description);
-            payloadDictionary.Add("vehicleId", noteRecord.VehicleId.ToString());
-            return new WebHookPayload
-            {
-                Type = actionType,
-                Data = payloadDictionary,
-                VehicleId = noteRecord.VehicleId.ToString(),
-                Username = userName,
-                Action = $"{userName} {GetFriendlyActionType(actionType)} Description: {noteRecord.Description}"
-            };
-        }
-        public static WebHookPayload Generic(string payload, string actionType, string userName, string vehicleId)
-        {
-            Dictionary<string, string> payloadDictionary = new Dictionary<string, string>();
-            payloadDictionary.Add("user", userName);
-            if (!string.IsNullOrWhiteSpace(payload))
-            {
-                payloadDictionary.Add("description", payload);
-            }
-            return new WebHookPayload
-            {
-                Type = actionType,
-                Data = payloadDictionary,
-                VehicleId = string.IsNullOrWhiteSpace(vehicleId) ? "N/A" : vehicleId,
-                Username = userName,
-                Action = string.IsNullOrWhiteSpace(payload) ? $"{userName} {GetFriendlyActionType(actionType)}" : $"{userName} {payload}"
-            };
-        }
-    }
-}

Models/Supply/SupplyRequisitionHistory.cs

@@ -1,8 +0,0 @@
-namespace CarCareTracker.Models
-{
-    public class SupplyRequisitionHistory
-    {
-        public string CostInputId { get; set; }
-        public List<SupplyUsageHistory> RequisitionHistory { get; set; } = new List<SupplyUsageHistory>();
-    }
-}

Models/Supply/SupplyStore.cs

@@ -1,8 +0,0 @@
-namespace CarCareTracker.Models
-{
-    public class SupplyStore
-    {
-        public string Tab { get; set; }
-        public bool AdditionalSupplies { get; set; }
-    }
-}

Models/Supply/SupplyUsageHistory.cs

@@ -1,7 +1,6 @@
 namespace CarCareTracker.Models
 {
     public class SupplyUsageHistory {
-        public int Id { get; set; }
         public DateTime Date { get; set; }
         public string PartNumber { get; set; }
         public string Description { get; set; }

Models/TaxRecord/TaxRecord.cs

@@ -11,7 +11,6 @@
         public bool IsRecurring { get; set; } = false;
         public ReminderMonthInterval RecurringInterval { get; set; } = ReminderMonthInterval.OneYear;
         public int CustomMonthInterval { get; set; } = 0;
-        public ReminderIntervalUnit CustomMonthIntervalUnit { get; set; } = ReminderIntervalUnit.Months;
         public List<UploadedFiles> Files { get; set; } = new List<UploadedFiles>();
         public List<string> Tags { get; set; } = new List<string>();
         public List<ExtraField> ExtraFields { get; set; } = new List<ExtraField>();

Models/TaxRecord/TaxRecordInput.cs

@@ -12,7 +12,6 @@
         public bool IsRecurring { get; set; } = false;
         public ReminderMonthInterval RecurringInterval { get; set; } = ReminderMonthInterval.ThreeMonths;
         public int CustomMonthInterval { get; set; } = 0;
-        public ReminderIntervalUnit CustomMonthIntervalUnit { get; set; } = ReminderIntervalUnit.Months;
         public List<UploadedFiles> Files { get; set; } = new List<UploadedFiles>();
         public List<string> Tags { get; set; } = new List<string>();
         public List<ExtraField> ExtraFields { get; set; } = new List<ExtraField>();
@@ -26,7 +25,6 @@
             IsRecurring = IsRecurring,
             RecurringInterval = RecurringInterval,
             CustomMonthInterval = CustomMonthInterval,
-            CustomMonthIntervalUnit = CustomMonthIntervalUnit,
             Files = Files,
             Tags = Tags,
             ExtraFields = ExtraFields

Models/UpgradeRecord/UpgradeReportInput.cs

@@ -6,7 +6,7 @@
         public int VehicleId { get; set; }
         public List<int> ReminderRecordId { get; set; } = new List<int>();
         public string Date { get; set; } = DateTime.Now.ToShortDateString();
-        public int Mileage { get; set; }
+        public decimal Mileage { get; set; }
         public string Description { get; set; }
         public decimal Cost { get; set; }
         public string Notes { get; set; }
@@ -15,7 +15,6 @@
         public List<string> Tags { get; set; } = new List<string>();
         public List<ExtraField> ExtraFields { get; set; } = new List<ExtraField>();
         public List<SupplyUsageHistory> RequisitionHistory { get; set; } = new List<SupplyUsageHistory>();
-        public List<SupplyUsageHistory> DeletedRequisitionHistory { get; set; } = new List<SupplyUsageHistory>();
         public bool CopySuppliesAttachment { get; set; } = false;
         public UpgradeRecord ToUpgradeRecord() { return new UpgradeRecord { 
             Id = Id, 

Models/User/UserColumnPreference.cs

@@ -4,6 +4,5 @@
     {
         public ImportMode Tab { get; set; }
         public List<string> VisibleColumns { get; set; } = new List<string>();
-        public List<string> ColumnOrder { get; set; } = new List<string>();
     }
 }

Models/UserConfig.cs

@@ -13,7 +13,6 @@
         public bool HideZero { get; set; }
         public bool UseUKMPG {get;set;}
         public bool UseThreeDecimalGasCost { get; set; }
-        public bool UseThreeDecimalGasConsumption { get; set; }
         public bool UseMarkDownOnSavedNotes { get; set; }
         public bool EnableAutoReminderRefresh { get; set; }
         public bool EnableAutoOdometerInsert { get; set; }
@@ -23,9 +22,6 @@
         public bool AutomaticDecimalFormat { get; set; }
         public string PreferredGasUnit { get; set; } = string.Empty;
         public string PreferredGasMileageUnit { get; set; } = string.Empty;
-        public bool UseUnitForFuelCost { get; set; }
-        public bool ShowCalendar { get; set; }
-        public bool ShowVehicleThumbnail { get; set; }
         public List<UserColumnPreference> UserColumnPreferences { get; set; } = new List<UserColumnPreference>();
         public ReminderUrgencyConfig ReminderUrgencyConfig { get; set; } = new ReminderUrgencyConfig();
         public string UserNameHash { get; set; }

Models/Vehicle.cs

@@ -1,6 +1,4 @@
-using System.Text.Json.Serialization;
-
-namespace CarCareTracker.Models
+namespace CarCareTracker.Models
 {
     public class Vehicle
     {
@@ -10,9 +8,7 @@ namespace CarCareTracker.Models
         public string Make { get; set; }
         public string Model { get; set; }
         public string LicensePlate { get; set; }
-        [JsonConverter(typeof(FromDateOptional))]
         public string PurchaseDate { get; set; }
-        [JsonConverter(typeof(FromDateOptional))]
         public string SoldDate { get; set; }
         public decimal PurchasePrice { get; set; }
         public decimal SoldPrice { get; set; }
@@ -26,12 +22,10 @@ namespace CarCareTracker.Models
         /// <summary>
         /// Primarily used for vehicles with odometer units different from user's settings.
         /// </summary>
-        [JsonConverter(typeof(FromDecimalOptional))]
         public string OdometerMultiplier { get; set; } = "1";
         /// <summary>
         /// Primarily used for vehicles where the odometer does not reflect actual mileage.
         /// </summary>
-        [JsonConverter(typeof(FromIntOptional))]
         public string OdometerDifference { get; set; } = "0";
         public List<DashboardMetric> DashboardMetrics { get; set; } = new List<DashboardMetric>();
         /// <summary>

Models/VehicleViewModel.cs

@@ -18,7 +18,7 @@
         public string VehicleIdentifier { get; set; } = "LicensePlate";
         //Dashboard Metric Attributes
         public List<DashboardMetric> DashboardMetrics { get; set; } = new List<DashboardMetric>();
-        public int LastReportedMileage { get; set; }
+        public decimal LastReportedMileage { get; set; }
         public bool HasReminders { get; set; } = false;
         public decimal CostPerMile { get; set; }
         public decimal TotalCost { get; set; }

Program.cs

@@ -7,14 +7,11 @@ using Microsoft.AspNetCore.Authentication;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Http.Features;
 using Microsoft.AspNetCore.Server.Kestrel.Core;
-using Microsoft.Extensions.FileProviders;
 
 var builder = WebApplication.CreateBuilder(args);
 
 //Print Messages
 StaticHelper.InitMessage(builder.Configuration);
-//Check Migration
-StaticHelper.CheckMigration(builder.Environment.WebRootPath, builder.Environment.ContentRootPath);
 
 // Add services to the container.
 builder.Services.AddControllersWithViews();
@@ -68,9 +65,9 @@ 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>();
 builder.Services.AddSingleton<ITranslationHelper, TranslationHelper>();
-builder.Services.AddSingleton<IMailHelper, MailHelper>();
 
 //configure logic
 builder.Services.AddSingleton<ILoginLogic, LoginLogic>();
@@ -78,6 +75,15 @@ builder.Services.AddSingleton<IUserLogic, UserLogic>();
 builder.Services.AddSingleton<IOdometerLogic, OdometerLogic>();
 builder.Services.AddSingleton<IVehicleLogic, VehicleLogic>();
 
+if (!Directory.Exists("data"))
+{
+    Directory.CreateDirectory("data");
+}
+if (!Directory.Exists("config"))
+{
+    Directory.CreateDirectory("config");
+}
+
 //Additional JsonFile
 builder.Configuration.AddJsonFile(StaticHelper.UserConfigPath, optional: true, reloadOnChange: true);
 
@@ -106,57 +112,13 @@ var app = builder.Build();
 // Configure the HTTP request pipeline.
 app.UseExceptionHandler("/Home/Error");
 
-app.UseStaticFiles();
 app.UseStaticFiles(new StaticFileOptions
 {
-    FileProvider = new PhysicalFileProvider(
-           Path.Combine(builder.Environment.ContentRootPath, "data", "images")),
-    RequestPath = "/images",
     OnPrepareResponse = ctx =>
     {
-        if (ctx.Context.Request.Path.StartsWithSegments("/images"))
+        if (ctx.Context.Request.Path.StartsWithSegments("/images") || ctx.Context.Request.Path.StartsWithSegments("/documents"))
         {
-            ctx.Context.Response.Headers.Append("Cache-Control", "no-store");
-            if (!ctx.Context.User.Identity.IsAuthenticated)
-            {
-                ctx.Context.Response.Redirect("/Login");
-            }
-        }
-    }
-});
-app.UseStaticFiles(new StaticFileOptions
-{
-    FileProvider = new PhysicalFileProvider(
-           Path.Combine(builder.Environment.ContentRootPath, "data", "documents")),
-    RequestPath = "/documents",
-    OnPrepareResponse = ctx =>
-    {
-        if (ctx.Context.Request.Path.StartsWithSegments("/documents"))
-        {
-            ctx.Context.Response.Headers.Append("Cache-Control", "no-store");
-            if (!ctx.Context.User.Identity.IsAuthenticated)
-            {
-                ctx.Context.Response.Redirect("/Login");
-            }
-        }
-    }
-});
-app.UseStaticFiles(new StaticFileOptions
-{
-    FileProvider = new PhysicalFileProvider(
-           Path.Combine(builder.Environment.ContentRootPath, "data", "translations")),
-    RequestPath = "/translations"
-});
-app.UseStaticFiles(new StaticFileOptions
-{
-    FileProvider = new PhysicalFileProvider(
-           Path.Combine(builder.Environment.ContentRootPath, "data", "temp")),
-    RequestPath = "/temp",
-    OnPrepareResponse = ctx =>
-    {
-        if (ctx.Context.Request.Path.StartsWithSegments("/temp"))
-        {
-            ctx.Context.Response.Headers.Append("Cache-Control", "no-store");
+            ctx.Context.Response.Headers.Add("Cache-Control", "no-store");
             if (!ctx.Context.User.Identity.IsAuthenticated)
             {
                 ctx.Context.Response.Redirect("/Login");

Views/API/Index.cshtml

@@ -28,37 +28,9 @@
 </div>
 <div class="row api-method">
     <div class="col-1">
-        <span class="badge bg-success">GET</span>
+        GET
     </div>
-    <div class="col-5 copyable testable">
-        <code>/api/whoami</code>
-    </div>
-    <div class="col-3">
-        Returns information for current user
-    </div>
-    <div class="col-3">
-        No Params
-    </div>
-</div>
-<div class="row api-method">
-    <div class="col-1">
-        <span class="badge bg-success">GET</span>
-    </div>
-    <div class="col-5 copyable testable">
-        <code>/api/version</code>
-    </div>
-    <div class="col-3">
-        Returns current version of LubeLogger and checks for updates
-    </div>
-    <div class="col-3">
-        CheckForUpdate(bool) - checks for update(optional)
-    </div>
-</div>
-<div class="row api-method">
-    <div class="col-1">
-        <span class="badge bg-success">GET</span>
-    </div>
-    <div class="col-5 copyable testable">
+    <div class="col-5 copyable">
         <code>/api/vehicles</code>
     </div>
     <div class="col-3">
@@ -70,9 +42,9 @@
 </div>
 <div class="row api-method">
     <div class="col-1">
-        <span class="badge bg-success">GET</span>
+        GET
     </div>
-    <div class="col-5 copyable testable">
+    <div class="col-5 copyable">
         <code>/api/vehicle/info</code>
     </div>
     <div class="col-3">
@@ -84,7 +56,7 @@
 </div>
 <div class="row api-method">
     <div class="col-1">
-        <span class="badge bg-success">GET</span>
+        GET
     </div>
     <div class="col-5 copyable">
         <code>/api/vehicle/adjustedodometer</code>
@@ -100,7 +72,7 @@
 </div>
 <div class="row api-method">
     <div class="col-1">
-        <span class="badge bg-success">GET</span>
+        GET
     </div>
     <div class="col-5 copyable">
         <code>/api/vehicle/odometerrecords</code>
@@ -114,7 +86,7 @@
 </div>
 <div class="row api-method">
     <div class="col-1">
-        <span class="badge bg-success">GET</span>
+        GET
     </div>
     <div class="col-5 copyable">
         <code>/api/vehicle/odometerrecords/latest</code>
@@ -128,7 +100,7 @@
 </div>
 <div class="row api-method">
     <div class="col-1">
-        <span class="badge bg-primary">POST</span>
+        POST
     </div>
     <div class="col-5 copyable">
         <code>/api/vehicle/odometerrecords/add</code>
@@ -146,127 +118,12 @@
         notes - notes(optional)<br />
         tags - tags separated by space(optional)<br />
         extrafields - <a class="link-body-emphasis link-offset-2 link-underline-opacity-25 link-underline-opacity-100-hover reminder-calendar-item" onclick="showExtraFieldsInfo()">extrafields(optional)</a><br />
-        files - <a class="link-body-emphasis link-offset-2 link-underline-opacity-25 link-underline-opacity-100-hover reminder-calendar-item" onclick="showAttachmentsInfo()">attachments(optional)</a><br />
         }
     </div>
 </div>
 <div class="row api-method">
     <div class="col-1">
-        <span class="badge text-bg-warning">PUT</span>
-    </div>
-    <div class="col-5 copyable">
-        <code>/api/vehicle/odometerrecords/update</code>
-    </div>
-    <div class="col-3">
-        Updates Odometer Record
-    </div>
-    <div class="col-3">
-        Body(form-data): {<br />
-        Id - Id of Odometer Record<br />
-        date - Date to be entered<br />
-        initialOdometer - Initial Odometer reading<br />
-        odometer - Odometer reading<br />
-        notes - notes(optional)<br />
-        tags - tags separated by space(optional)<br />
-        extrafields - <a class="link-body-emphasis link-offset-2 link-underline-opacity-25 link-underline-opacity-100-hover reminder-calendar-item" onclick="showExtraFieldsInfo()">extrafields(optional)</a><br />
-        files - <a class="link-body-emphasis link-offset-2 link-underline-opacity-25 link-underline-opacity-100-hover reminder-calendar-item" onclick="showAttachmentsInfo()">attachments(optional)</a><br />
-        }
-    </div>
-</div>
-<div class="row api-method">
-    <div class="col-1">
-        <span class="badge text-bg-danger">DELETE</span>
-    </div>
-    <div class="col-5 copyable">
-        <code>/api/vehicle/odometerrecords/delete</code>
-    </div>
-    <div class="col-3">
-        Deletes Odometer Record
-    </div>
-    <div class="col-3">
-        Id - Id of Odometer Record
-    </div>
-</div>
-<div class="row api-method">
-    <div class="col-1">
-        <span class="badge bg-success">GET</span>
-    </div>
-    <div class="col-5 copyable">
-        <code>/api/vehicle/planrecords</code>
-    </div>
-    <div class="col-3">
-        Returns a list of plan records for the vehicle
-    </div>
-    <div class="col-3">
-        vehicleId - Id of Vehicle
-    </div>
-</div>
-<div class="row api-method">
-    <div class="col-1">
-        <span class="badge bg-primary">POST</span>
-    </div>
-    <div class="col-5 copyable">
-        <code>/api/vehicle/planrecords/add</code>
-    </div>
-    <div class="col-3">
-        Adds Plan Record to the vehicle
-    </div>
-    <div class="col-3">
-        vehicleId - Id of Vehicle
-        <br />
-        Body(form-data): {<br />
-        description - Description<br />
-        cost - Cost<br />
-        type - ServiceRecord/RepairRecord/UpgradeRecord<br />
-        priority - Low/Normal/Critical<br />
-        progress - Backlog/InProgress/Testing<br />
-        notes - notes(optional)<br />
-        extrafields - <a class="link-body-emphasis link-offset-2 link-underline-opacity-25 link-underline-opacity-100-hover reminder-calendar-item" onclick="showExtraFieldsInfo()">extrafields(optional)</a><br />
-        files - <a class="link-body-emphasis link-offset-2 link-underline-opacity-25 link-underline-opacity-100-hover reminder-calendar-item" onclick="showAttachmentsInfo()">attachments(optional)</a><br />
-        }
-    </div>
-</div>
-<div class="row api-method">
-    <div class="col-1">
-        <span class="badge text-bg-warning">PUT</span>
-    </div>
-    <div class="col-5 copyable">
-        <code>/api/vehicle/planrecords/update</code>
-    </div>
-    <div class="col-3">
-        Updates Plan Record
-    </div>
-    <div class="col-3">
-        Body(form-data): {<br />
-        Id - Id of Plan Record<br />
-        description - Description<br />
-        cost - Cost<br />
-        type - ServiceRecord/RepairRecord/UpgradeRecord<br />
-        priority - Low/Normal/Critical<br />
-        progress - Backlog/InProgress/Testing<br />
-        notes - notes(optional)<br />
-        extrafields - <a class="link-body-emphasis link-offset-2 link-underline-opacity-25 link-underline-opacity-100-hover reminder-calendar-item" onclick="showExtraFieldsInfo()">extrafields(optional)</a><br />
-        files - <a class="link-body-emphasis link-offset-2 link-underline-opacity-25 link-underline-opacity-100-hover reminder-calendar-item" onclick="showAttachmentsInfo()">attachments(optional)</a><br />
-        }
-    </div>
-</div>
-<div class="row api-method">
-    <div class="col-1">
-        <span class="badge text-bg-danger">DELETE</span>
-    </div>
-    <div class="col-5 copyable">
-        <code>/api/vehicle/planrecords/delete</code>
-    </div>
-    <div class="col-3">
-        Deletes Plan Record
-    </div>
-    <div class="col-3">
-        Id - Id of Plan Record
-    </div>
-</div>
-<div class="row api-method">
-    <div class="col-1">
-        <span class="badge bg-success">GET</span>
+        GET
     </div>
     <div class="col-5 copyable">
         <code>/api/vehicle/servicerecords</code>
@@ -280,7 +137,7 @@
 </div>
 <div class="row api-method">
     <div class="col-1">
-        <span class="badge bg-primary">POST</span>
+        POST
     </div>
     <div class="col-5 copyable">
         <code>/api/vehicle/servicerecords/add</code>
@@ -299,51 +156,12 @@
         notes - notes(optional)<br />
         tags - tags separated by space(optional)<br />
         extrafields - <a class="link-body-emphasis link-offset-2 link-underline-opacity-25 link-underline-opacity-100-hover reminder-calendar-item" onclick="showExtraFieldsInfo()">extrafields(optional)</a><br />
-        files - <a class="link-body-emphasis link-offset-2 link-underline-opacity-25 link-underline-opacity-100-hover reminder-calendar-item" onclick="showAttachmentsInfo()">attachments(optional)</a><br />
         }
     </div>
 </div>
 <div class="row api-method">
     <div class="col-1">
-        <span class="badge text-bg-warning">PUT</span>
-    </div>
-    <div class="col-5 copyable">
-        <code>/api/vehicle/servicerecords/update</code>
-    </div>
-    <div class="col-3">
-        Updates Service Record
-    </div>
-    <div class="col-3">
-        Body(form-data): {<br />
-        Id - Id of Service Record<br />
-        date - Date to be entered<br />
-        odometer - Odometer reading<br />
-        description - Description<br />
-        cost - Cost<br />
-        notes - notes(optional)<br />
-        tags - tags separated by space(optional)<br />
-        extrafields - <a class="link-body-emphasis link-offset-2 link-underline-opacity-25 link-underline-opacity-100-hover reminder-calendar-item" onclick="showExtraFieldsInfo()">extrafields(optional)</a><br />
-        files - <a class="link-body-emphasis link-offset-2 link-underline-opacity-25 link-underline-opacity-100-hover reminder-calendar-item" onclick="showAttachmentsInfo()">attachments(optional)</a><br />
-        }
-    </div>
-</div>
-<div class="row api-method">
-    <div class="col-1">
-        <span class="badge text-bg-danger">DELETE</span>
-    </div>
-    <div class="col-5 copyable">
-        <code>/api/vehicle/servicerecords/delete</code>
-    </div>
-    <div class="col-3">
-        Deletes Service Record
-    </div>
-    <div class="col-3">
-        Id - Id of Service Record
-    </div>
-</div>
-<div class="row api-method">
-    <div class="col-1">
-        <span class="badge bg-success">GET</span>
+        GET
     </div>
     <div class="col-5 copyable">
         <code>/api/vehicle/repairrecords</code>
@@ -357,7 +175,7 @@
 </div>
 <div class="row api-method">
     <div class="col-1">
-        <span class="badge bg-primary">POST</span>
+        POST
     </div>
     <div class="col-5 copyable">
         <code>/api/vehicle/repairrecords/add</code>
@@ -376,51 +194,12 @@
         notes - notes(optional)<br />
         tags - tags separated by space(optional)<br />
         extrafields - <a class="link-body-emphasis link-offset-2 link-underline-opacity-25 link-underline-opacity-100-hover reminder-calendar-item" onclick="showExtraFieldsInfo()">extrafields(optional)</a><br />
-        files - <a class="link-body-emphasis link-offset-2 link-underline-opacity-25 link-underline-opacity-100-hover reminder-calendar-item" onclick="showAttachmentsInfo()">attachments(optional)</a><br />
         }
     </div>
 </div>
 <div class="row api-method">
     <div class="col-1">
-        <span class="badge text-bg-warning">PUT</span>
-    </div>
-    <div class="col-5 copyable">
-        <code>/api/vehicle/repairrecords/update</code>
-    </div>
-    <div class="col-3">
-        Updates Repair Record
-    </div>
-    <div class="col-3">
-        Body(form-data): {<br />
-        Id - Id of Repair Record <br />
-        date - Date to be entered<br />
-        odometer - Odometer reading<br />
-        description - Description<br />
-        cost - Cost<br />
-        notes - notes(optional)<br />
-        tags - tags separated by space(optional)<br />
-        extrafields - <a class="link-body-emphasis link-offset-2 link-underline-opacity-25 link-underline-opacity-100-hover reminder-calendar-item" onclick="showExtraFieldsInfo()">extrafields(optional)</a><br />
-        files - <a class="link-body-emphasis link-offset-2 link-underline-opacity-25 link-underline-opacity-100-hover reminder-calendar-item" onclick="showAttachmentsInfo()">attachments(optional)</a><br />
-        }
-    </div>
-</div>
-<div class="row api-method">
-    <div class="col-1">
-        <span class="badge text-bg-danger">DELETE</span>
-    </div>
-    <div class="col-5 copyable">
-        <code>/api/vehicle/repairrecords/delete</code>
-    </div>
-    <div class="col-3">
-        Deletes Repair Record
-    </div>
-    <div class="col-3">
-        Id - Id of Repair Record
-    </div>
-</div>
-<div class="row api-method">
-    <div class="col-1">
-        <span class="badge bg-success">GET</span>
+        GET
     </div>
     <div class="col-5 copyable">
         <code>/api/vehicle/upgraderecords</code>
@@ -434,7 +213,7 @@
 </div>
 <div class="row api-method">
     <div class="col-1">
-        <span class="badge bg-primary">POST</span>
+        POST
     </div>
     <div class="col-5 copyable">
         <code>/api/vehicle/upgraderecords/add</code>
@@ -453,51 +232,12 @@
         notes - notes(optional)<br />
         tags - tags separated by space(optional)<br />
         extrafields - <a class="link-body-emphasis link-offset-2 link-underline-opacity-25 link-underline-opacity-100-hover reminder-calendar-item" onclick="showExtraFieldsInfo()">extrafields(optional)</a><br />
-        files - <a class="link-body-emphasis link-offset-2 link-underline-opacity-25 link-underline-opacity-100-hover reminder-calendar-item" onclick="showAttachmentsInfo()">attachments(optional)</a><br />
         }
     </div>
 </div>
 <div class="row api-method">
     <div class="col-1">
-        <span class="badge text-bg-warning">PUT</span>
-    </div>
-    <div class="col-5 copyable">
-        <code>/api/vehicle/upgraderecords/update</code>
-    </div>
-    <div class="col-3">
-        Updates Upgrade Record
-    </div>
-    <div class="col-3">
-        Body(form-data): {<br />
-        Id - Id of Upgrade Record<br />
-        date - Date to be entered<br />
-        odometer - Odometer reading<br />
-        description - Description<br />
-        cost - Cost<br />
-        notes - notes(optional)<br />
-        tags - tags separated by space(optional)<br />
-        extrafields - <a class="link-body-emphasis link-offset-2 link-underline-opacity-25 link-underline-opacity-100-hover reminder-calendar-item" onclick="showExtraFieldsInfo()">extrafields(optional)</a><br />
-        files - <a class="link-body-emphasis link-offset-2 link-underline-opacity-25 link-underline-opacity-100-hover reminder-calendar-item" onclick="showAttachmentsInfo()">attachments(optional)</a><br />
-        }
-    </div>
-</div>
-<div class="row api-method">
-    <div class="col-1">
-        <span class="badge text-bg-danger">DELETE</span>
-    </div>
-    <div class="col-5 copyable">
-        <code>/api/vehicle/upgraderecords/delete</code>
-    </div>
-    <div class="col-3">
-        Deletes Upgrade Record
-    </div>
-    <div class="col-3">
-        Id - Id of Upgrade Record
-    </div>
-</div>
-<div class="row api-method">
-    <div class="col-1">
-        <span class="badge bg-success">GET</span>
+        GET
     </div>
     <div class="col-5 copyable">
         <code>/api/vehicle/taxrecords</code>
@@ -511,21 +251,7 @@
 </div>
 <div class="row api-method">
     <div class="col-1">
-        <span class="badge bg-success">GET</span>
-    </div>
-    <div class="col-5 copyable testable">
-        <code>/api/vehicle/taxrecords/check</code>
-    </div>
-    <div class="col-3">
-        Updates Outdated Recurring Tax Records
-    </div>
-    <div class="col-3">
-        No Params
-    </div>
-</div>
-<div class="row api-method">
-    <div class="col-1">
-        <span class="badge bg-primary">POST</span>
+        POST
     </div>
     <div class="col-5 copyable">
         <code>/api/vehicle/taxrecords/add</code>
@@ -543,50 +269,12 @@
         notes - notes(optional)<br />
         tags - tags separated by space(optional)<br />
         extrafields - <a class="link-body-emphasis link-offset-2 link-underline-opacity-25 link-underline-opacity-100-hover reminder-calendar-item" onclick="showExtraFieldsInfo()">extrafields(optional)</a><br />
-        files - <a class="link-body-emphasis link-offset-2 link-underline-opacity-25 link-underline-opacity-100-hover reminder-calendar-item" onclick="showAttachmentsInfo()">attachments(optional)</a><br />
         }
     </div>
 </div>
 <div class="row api-method">
     <div class="col-1">
-        <span class="badge text-bg-warning">PUT</span>
-    </div>
-    <div class="col-5 copyable">
-        <code>/api/vehicle/taxrecords/update</code>
-    </div>
-    <div class="col-3">
-        Updates Tax Record
-    </div>
-    <div class="col-3">
-        Body(form-data): {<br />
-        Id - Id of Tax Record<br />
-        date - Date to be entered<br />
-        description - Description<br />
-        cost - Cost<br />
-        notes - notes(optional)<br />
-        tags - tags separated by space(optional)<br />
-        extrafields - <a class="link-body-emphasis link-offset-2 link-underline-opacity-25 link-underline-opacity-100-hover reminder-calendar-item" onclick="showExtraFieldsInfo()">extrafields(optional)</a><br />
-        files - <a class="link-body-emphasis link-offset-2 link-underline-opacity-25 link-underline-opacity-100-hover reminder-calendar-item" onclick="showAttachmentsInfo()">attachments(optional)</a><br />
-        }
-    </div>
-</div>
-<div class="row api-method">
-    <div class="col-1">
-        <span class="badge text-bg-danger">DELETE</span>
-    </div>
-    <div class="col-5 copyable">
-        <code>/api/vehicle/taxrecords/delete</code>
-    </div>
-    <div class="col-3">
-        Deletes Tax Record
-    </div>
-    <div class="col-3">
-        Id - Id of Tax Record
-    </div>
-</div>
-<div class="row api-method">
-    <div class="col-1">
-        <span class="badge bg-success">GET</span>
+        GET
     </div>
     <div class="col-5 copyable">
         <code>/api/vehicle/gasrecords</code>
@@ -604,7 +292,7 @@
 </div>
 <div class="row api-method">
     <div class="col-1">
-        <span class="badge bg-primary">POST</span>
+        POST
     </div>
     <div class="col-5 copyable">
         <code>/api/vehicle/gasrecords/add</code>
@@ -625,53 +313,12 @@
         notes - notes(optional)<br />
         tags - tags separated by space(optional)<br />
         extrafields - <a class="link-body-emphasis link-offset-2 link-underline-opacity-25 link-underline-opacity-100-hover reminder-calendar-item" onclick="showExtraFieldsInfo()">extrafields(optional)</a><br />
-        files - <a class="link-body-emphasis link-offset-2 link-underline-opacity-25 link-underline-opacity-100-hover reminder-calendar-item" onclick="showAttachmentsInfo()">attachments(optional)</a><br />
         }
     </div>
 </div>
 <div class="row api-method">
     <div class="col-1">
-        <span class="badge text-bg-warning">PUT</span>
-    </div>
-    <div class="col-5 copyable">
-        <code>/api/vehicle/gasrecords/update</code>
-    </div>
-    <div class="col-3">
-        Updates Gas Record
-    </div>
-    <div class="col-3">
-        Body(form-data): {<br />
-        Id - Id of Gas Record<br />
-        date - Date to be entered<br />
-        odometer - Odometer reading<br />
-        fuelConsumed - Fuel Consumed<br />
-        cost - Cost<br />
-        isFillToFull(bool) - Filled To Full<br />
-        missedFuelUp(bool) - Missed Fuel Up<br />
-        notes - notes(optional)<br />
-        tags - tags separated by space(optional)<br />
-        extrafields - <a class="link-body-emphasis link-offset-2 link-underline-opacity-25 link-underline-opacity-100-hover reminder-calendar-item" onclick="showExtraFieldsInfo()">extrafields(optional)</a><br />
-        files - <a class="link-body-emphasis link-offset-2 link-underline-opacity-25 link-underline-opacity-100-hover reminder-calendar-item" onclick="showAttachmentsInfo()">attachments(optional)</a><br />
-        }
-    </div>
-</div>
-<div class="row api-method">
-    <div class="col-1">
-        <span class="badge text-bg-danger">DELETE</span>
-    </div>
-    <div class="col-5 copyable">
-        <code>/api/vehicle/gasrecords/delete</code>
-    </div>
-    <div class="col-3">
-        Deletes Gas Record
-    </div>
-    <div class="col-3">
-        Id - Id of Gas Record
-    </div>
-</div>
-<div class="row api-method">
-    <div class="col-1">
-        <span class="badge bg-success">GET</span>
+        GET
     </div>
     <div class="col-5 copyable">
         <code>/api/vehicle/reminders</code>
@@ -683,102 +330,13 @@
         vehicleId - Id of Vehicle
     </div>
 </div>
-<div class="row api-method">
-    <div class="col-1">
-        <span class="badge bg-primary">POST</span>
-    </div>
-    <div class="col-5 copyable">
-        <code>/api/vehicle/reminders/add</code>
-    </div>
-    <div class="col-3">
-        Adds Reminder Record to the vehicle
-    </div>
-    <div class="col-3">
-        vehicleId - Id of Vehicle
-        <br />
-        Body(form-data): {<br />
-        description - Description<br />
-        dueDate - Due Date<br />
-        dueOdometer - Due Odometer reading<br />
-        metric - Date/Odometer/Both<br />
-        notes - notes(optional)<br />
-        tags - tags separated by space(optional)<br />
-        }
-    </div>
-</div>
-<div class="row api-method">
-    <div class="col-1">
-        <span class="badge text-bg-warning">PUT</span>
-    </div>
-    <div class="col-5 copyable">
-        <code>/api/vehicle/reminders/update</code>
-    </div>
-    <div class="col-3">
-        Updates Reminder Record
-    </div>
-    <div class="col-3">
-        Body(form-data): {<br />
-        Id - Id of Reminder Record<br />
-        description - Description<br />
-        dueDate - Due Date<br />
-        dueOdometer - Due Odometer reading<br />
-        metric - Date/Odometer/Both<br />
-        notes - notes(optional)<br />
-        tags - tags separated by space(optional)<br />
-        }
-    </div>
-</div>
-<div class="row api-method">
-    <div class="col-1">
-        <span class="badge text-bg-danger">DELETE</span>
-    </div>
-    <div class="col-5 copyable">
-        <code>/api/vehicle/reminders/delete</code>
-    </div>
-    <div class="col-3">
-        Deletes Reminder Record
-    </div>
-    <div class="col-3">
-        Id - Id of Reminder Record
-    </div>
-</div>
-<div class="row api-method">
-    <div class="col-1">
-        <span class="badge bg-success">GET</span>
-    </div>
-    <div class="col-5 copyable testable">
-        <code>/api/calendar</code>
-    </div>
-    <div class="col-3">
-        Returns reminder calendar in ICS format
-    </div>
-    <div class="col-3">
-        No Params
-    </div>
-</div>
-<div class="row api-method">
-    <div class="col-1">
-        <span class="badge bg-primary">POST</span>
-    </div>
-    <div class="col-5 copyable">
-        <code>/api/documents/upload</code>
-    </div>
-    <div class="col-3">
-        Upload Documents
-    </div>
-    <div class="col-3">
-        Body(form-data): {<br />
-        documents[] - Files to Upload<br />
-        }
-    </div>
-</div>
 @if (User.IsInRole(nameof(UserData.IsRootUser)))
 {
     <div class="row api-method">
         <div class="col-1">
-            <span class="badge bg-success">GET</span>
+            GET
         </div>
-        <div class="col-5 copyable testable">
+        <div class="col-5 copyable">
             <code>/api/vehicle/reminders/send</code>
         </div>
         <div class="col-3">
@@ -786,14 +344,14 @@
         </div>
         <div class="col-3">
             (must be root user)<br />
-            urgencies[]=[NotUrgent,Urgent,VeryUrgent,PastDue](optional)
+            urgencies[]=[NotUrgent,Urgent,VeryUrgent,PastDue]
         </div>
     </div>
     <div class="row api-method">
         <div class="col-1">
-            <span class="badge bg-success">GET</span>
+            GET
         </div>
-        <div class="col-5 copyable testable">
+        <div class="col-5 copyable">
             <code>/api/makebackup</code>
         </div>
         <div class="col-3">
@@ -805,9 +363,9 @@
     </div>
     <div class="row api-method">
         <div class="col-1">
-            <span class="badge bg-success">GET</span>
+            GET
         </div>
-        <div class="col-5 copyable testable">
+        <div class="col-5 copyable">
             <code>/api/cleanup</code>
         </div>
         <div class="col-3">
@@ -815,20 +373,13 @@
         </div>
         <div class="col-3">
             (must be root user)<br />
-            deepClean(bool) - Perform deep clean(optional)
+            deepClean(bool) - Perform deep clean
         </div>
     </div>
 }
 <script>
     $('.copyable').on('click', function (e) {
-        if (e.ctrlKey || e.metaKey){
-            let targetElement = $(e.currentTarget);
-            if (targetElement.hasClass("testable")){
-                window.location = targetElement.text().trim();
-            }
-        } else {
-            copyToClipboard(e.currentTarget);
-        }
+        copyToClipboard(e.currentTarget);
     })
     function showExtraFieldsInfo(){
         Swal.fire({
@@ -837,11 +388,4 @@
             icon: "info"
         });
     }
-    function showAttachmentsInfo(){
-        Swal.fire({
-            title: "Attaching Files",
-            html: "The Document Upload Endpoint will upload the files and provide a formatted output which you can pass into this method",
-            icon: "info"
-        });
-    }
 </script>

Views/Admin/Index.cshtml

@@ -2,32 +2,28 @@
 @{
     ViewData["Title"] = "Admin Panel";
 }
-@inject IConfigHelper config
+@inject IConfiguration config;
 @inject ITranslationHelper translator
 @{
     bool emailServerIsSetup = true;
-    var mailConfig = config.GetMailConfig();
-    var userLanguage = config.GetServerLanguage();
+    var mailConfig = config.GetSection("MailConfig").Get<MailConfig>();
+    var userLanguage = config[nameof(UserConfig.UserLanguage)] ?? "en_US";
     if (mailConfig is null || string.IsNullOrWhiteSpace(mailConfig.EmailServer))
     {
         emailServerIsSetup = false;
     }
 }
-@section Nav {
-    <div class="container-fluid">
-        <div class="row mt-2">
-            <div class="d-flex lubelogger-navbar">
-                <div class="me-2" style="cursor:pointer;" onclick="returnToGarage()">
-                    <img src="@config.GetSmallLogoUrl()" class="lubelogger-logo" />
-                </div>
-                <span class="text-truncate lead">@translator.Translate(userLanguage, "Admin Panel")</span>
-            </div>
-        </div>
-        <hr />
-    </div>
-}
 @model AdminViewModel
 <div class="container">
+    <div class="row d-flex align-items-center justify-content-between justify-content-md-start">
+        <div class="col-2 col-md-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-6 col-md-7 text-end text-md-start">
+            <span class="display-6">@translator.Translate(userLanguage, "Admin Panel")</span>
+        </div>
+    </div>
+    <hr />
     <div class="row">
         <div class="col-12">
             <div class="row">
@@ -60,23 +56,23 @@
         <div class="modal-dialog modal-lg" role="document">
             <div class="modal-content">
                 <div class="modal-header">
-                    <div class="d-flex align-items-center">
-                        <span class="lead">@translator.Translate(userLanguage, "Tokens")</span>
-                    </div>
-                    <div class="d-flex align-items-center ms-auto">
-                        <div class="btn-group">
-                            <button onclick="generateNewToken()" class="btn btn-primary btn-md mt-1 mb-1">
-                                <i class="bi bi-pencil-square me-2"></i>@translator.Translate(userLanguage, "Generate")
-                            </button>
-                            <button class="btn btn-outline-primary btn-md mt-1 mb-1" @(emailServerIsSetup ? "" : "disabled") onclick="toggleAutoNotify(event)">
-                                <div class="form-check">
-                                    <input class="form-check-input" type="checkbox" role="switch" id="enableAutoNotify" @(emailServerIsSetup ? "checked" : "disabled")>
-                                    <label class="form-check-label" for="enableAutoNotify">@translator.Translate(userLanguage, "Notify")</label>
-                                </div>
-                            </button>
+                        <div class="d-flex align-items-center">
+                            <span class="lead">@translator.Translate(userLanguage, "Tokens")</span>
                         </div>
+                        <div class="d-flex align-items-center ms-auto">
+                            <div class="btn-group">
+                                <button onclick="generateNewToken()" class="btn btn-primary btn-md mt-1 mb-1">
+                                    <i class="bi bi-pencil-square me-2"></i>@translator.Translate(userLanguage, "Generate")
+                                </button>
+                                <button class="btn btn-outline-primary btn-md mt-1 mb-1" @(emailServerIsSetup ? "" : "disabled") onclick="toggleAutoNotify(event)">
+                                    <div class="form-check">
+                                        <input class="form-check-input" type="checkbox" role="switch" id="enableAutoNotify" @(emailServerIsSetup ? "checked" : "disabled")>
+                                        <label class="form-check-label" for="enableAutoNotify">@translator.Translate(userLanguage, "Notify")</label>
+                                    </div>
+                                </button>
+                            </div>
                         <button class="btn btn-close btn-md mt-1 mb-1 ms-2" onclick="hideTokenModal()" aria-label="Close"></button>
-                    </div>
+                        </div>
                 </div>
                 <div class="modal-body">
                     <table class="table table-hover">

Views/Home/Index.cshtml

@@ -16,71 +16,6 @@
     <script src="~/js/supplyrecord.js?v=@StaticHelper.VersionNumber"></script>
     <script src="~/lib/drawdown/drawdown.js"></script>
 }
-@section Nav {
-    <div class="container-fluid">
-        <div class="row mt-2">
-            <div class="d-flex lubelogger-navbar">
-                <div class="me-2" style="cursor:pointer;" onclick="returnToGarage()">
-                    <img src="@config.GetSmallLogoUrl()" class="lubelogger-logo lubelogger-tab" />
-                    <img src="@config.GetLogoUrl()" class="lubelogger-logo lubelogger-mobile-nav-show" />
-                </div>
-                <ul class="nav nav-tabs lubelogger-tab flex-grow-1" id="homeTab" role="tablist">
-                    <li class="nav-item" role="presentation">
-                        <button class="nav-link resizable-nav-link @(Model == "garage" ? "active" : "")" oncontextmenu="sortGarage(this)" id="garage-tab" data-bs-toggle="tab" data-bs-target="#garage-tab-pane" type="button" role="tab"><i class="bi bi-car-front"></i><span class="ms-2 d-sm-none d-md-inline">@translator.Translate(userLanguage, "Garage")</span></button>
-                    </li>
-                    @if (config.GetServerEnableShopSupplies())
-                    {
-                        <li class="nav-item" role="presentation">
-                            <button class="nav-link resizable-nav-link" 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"></i><span class="ms-2 d-sm-none d-md-inline">@translator.Translate(userLanguage, "Supplies")</span></button>
-                        </li>
-                    }
-                    @if (userConfig.ShowCalendar)
-                    {
-                        <li class="nav-item" role="presentation">
-                            <button class="nav-link resizable-nav-link" id="calendar-tab" data-bs-toggle="tab" data-bs-target="#calendar-tab-pane" type="button" role="tab" aria-selected="false"><i class="bi bi-calendar-week"></i><span class="ms-2 d-sm-none d-md-inline">@translator.Translate(userLanguage, "Calendar")</span></button>
-                        </li>
-                    }
-                    <li class="nav-item ms-auto" role="presentation">
-                        <button class="nav-link resizable-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"></i><span class="ms-2 d-sm-none d-md-inline">@translator.Translate(userLanguage, "Settings")</span></button>
-                    </li>
-                    @if (User.IsInRole("CookieAuth") || User.IsInRole("APIAuth"))
-                    {
-                        <li class="nav-item dropdown" role="presentation">
-                            <a class="nav-link resizable-nav-link dropdown-toggle" data-bs-toggle="dropdown" href="#" role="button" aria-expanded="false"><i class="bi bi-person"></i><span class="ms-2 d-sm-none d-md-inline">@User.Identity.Name</span></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>@translator.Translate(userLanguage, "Admin Panel")</a>
-                                    </li>
-                                }
-                                @if (User.IsInRole(nameof(UserData.IsRootUser)))
-                                {
-                                    <li>
-                                        <button class="dropdown-item" onclick="showRootAccountInformationModal()"><i class="bi bi-person-gear me-2"></i>@translator.Translate(userLanguage, "Profile")</button>
-                                    </li>
-                                }
-                                else
-                                {
-                                    <li>
-                                        <button class="dropdown-item" onclick="showAccountInformationModal()"><i class="bi bi-person-gear me-2"></i>@translator.Translate(userLanguage, "Profile")</button>
-                                    </li>
-                                }
-                                <li>
-                                    <button class="dropdown-item" onclick="performLogOut()"><i class="bi bi-box-arrow-right me-2"></i>@translator.Translate(userLanguage, "Logout")</button>
-                                </li>
-                            </ul>
-                        </li>
-                    }
-                </ul>
-                <div class="lubelogger-navbar-button">
-                    <button type="button" class="btn btn-adaptive" onclick="showMobileNav()"><i class="bi bi-list lubelogger-menu-icon"></i></button>
-                </div>
-            </div>
-        </div>
-        <hr />
-    </div>
-}
 <div class="lubelogger-mobile-nav" onclick="hideMobileNav()">
     <ul class="navbar-nav" id="homeTab" role="tablist">
         <li class="nav-item" role="presentation">
@@ -92,15 +27,13 @@
                 <button class="nav-link" id="supply-tab" data-bs-toggle="tab" data-bs-target="#supply-tab-pane" type="button" role="tab"><span class="ms-2 display-3"><i class="bi bi-shop me-2"></i>@translator.Translate(userLanguage, "Supplies")</span></button>
             </li>
         }
-        @if(userConfig.ShowCalendar){
-            <li class="nav-item" role="presentation">
-                <button class="nav-link" id="calendar-tab" data-bs-toggle="tab" data-bs-target="#calendar-tab-pane" type="button" role="tab"><span class="ms-2 display-3"><i class="bi bi-calendar-week me-2"></i>@translator.Translate(userLanguage, "Calendar")</span></button>
-            </li>
-        }
+        <li class="nav-item" role="presentation">
+            <button class="nav-link" id="calendar-tab" data-bs-toggle="tab" data-bs-target="#calendar-tab-pane" type="button" role="tab"><span class="ms-2 display-3"><i class="bi bi-calendar-week me-2"></i>@translator.Translate(userLanguage, "Calendar")</span></button>
+        </li>
         <li class="nav-item" 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"><span class="ms-2 display-3"><i class="bi bi-gear me-2"></i>@translator.Translate(userLanguage,"Settings")</span></button>
         </li>
-        @if (User.IsInRole("CookieAuth") || User.IsInRole("APIAuth"))
+        @if (User.IsInRole("CookieAuth"))
         {
             @if (User.IsInRole(nameof(UserData.IsAdmin)))
             {
@@ -126,6 +59,60 @@
     </ul>
 </div>
 <div class="container">
+    <div class="row mt-2">
+        <div class="d-flex lubelogger-navbar">
+            <img src="@config.GetLogoUrl()" class="lubelogger-logo" />
+            <div class="lubelogger-navbar-button">
+                <button type="button" class="btn btn-adaptive" onclick="showMobileNav()"><i class="bi bi-list lubelogger-menu-icon"></i></button>
+            </div>
+        </div>
+    </div>
+    <hr />
+    <ul class="nav nav-tabs lubelogger-tab" id="homeTab" role="tablist">
+        <li class="nav-item" role="presentation">
+            <button class="nav-link resizable-nav-link @(Model == "garage" ? "active" : "")" oncontextmenu="sortGarage(this)" id="garage-tab" data-bs-toggle="tab" data-bs-target="#garage-tab-pane" type="button" role="tab"><i class="bi bi-car-front"></i><span class="ms-2 d-sm-none d-md-inline">@translator.Translate(userLanguage, "Garage")</span></button>
+        </li>
+        @if (config.GetServerEnableShopSupplies())
+        {
+            <li class="nav-item" role="presentation">
+                <button class="nav-link resizable-nav-link" 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"></i><span class="ms-2 d-sm-none d-md-inline">@translator.Translate(userLanguage, "Supplies")</span></button>
+            </li>
+        }
+        <li class="nav-item" role="presentation">
+            <button class="nav-link resizable-nav-link" id="calendar-tab" data-bs-toggle="tab" data-bs-target="#calendar-tab-pane" type="button" role="tab" aria-selected="false"><i class="bi bi-calendar-week"></i><span class="ms-2 d-sm-none d-md-inline">@translator.Translate(userLanguage, "Calendar")</span></button>
+        </li>
+        <li class="nav-item ms-auto" role="presentation">
+            <button class="nav-link resizable-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"></i><span class="ms-2 d-sm-none d-md-inline">@translator.Translate(userLanguage, "Settings")</span></button>
+        </li>
+        @if (User.IsInRole("CookieAuth"))
+        {
+            <li class="nav-item dropdown" role="presentation">
+                <a class="nav-link resizable-nav-link dropdown-toggle" data-bs-toggle="dropdown" href="#" role="button" aria-expanded="false"><i class="bi bi-person"></i><span class="ms-2 d-sm-none d-md-inline">@User.Identity.Name</span></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>@translator.Translate(userLanguage,"Admin Panel")</a>
+                        </li>
+                    }
+                    @if (User.IsInRole(nameof(UserData.IsRootUser)))
+                    {
+                        <li>
+                            <button class="dropdown-item" onclick="showRootAccountInformationModal()"><i class="bi bi-person-gear me-2"></i>@translator.Translate(userLanguage, "Profile")</button>
+                        </li>
+                    } else
+                    {
+                        <li>
+                            <button class="dropdown-item" onclick="showAccountInformationModal()"><i class="bi bi-person-gear me-2"></i>@translator.Translate(userLanguage, "Profile")</button>
+                        </li>
+                    }
+                    <li>
+                        <button class="dropdown-item" onclick="performLogOut()"><i class="bi bi-box-arrow-right me-2"></i>@translator.Translate(userLanguage,"Logout")</button>
+                    </li>
+                </ul>
+            </li>
+        }
+    </ul>
     <div class="tab-content" id="homeTab">
         <div class="tab-pane fade @(Model == "garage" ? "show active" : "")" id="garage-tab-pane" role="tabpanel" tabindex="0">
             <div id="garageContainer">
@@ -159,8 +146,6 @@
         </div>
     </div>
 </div>
-<div class="stickerPrintContainer hideOnPrint">
-</div>
 <script>
     loadGarage();
     bindWindowResize();

Views/Home/Kiosk.cshtml

@@ -4,7 +4,6 @@
 @model KioskViewModel
 @section Scripts {
     <script src="~/lib/masonry/masonry.min.js"></script>
-    <script src="~/lib/drawdown/drawdown.js"></script>
 }
 <div class="progress" role="progressbar" aria-label="Refresh Progress" aria-valuenow="25" aria-valuemin="0" aria-valuemax="100" style="height: 1px">
     <div class="progress-bar" style="width: 0%"></div>
@@ -124,15 +123,9 @@
     }
     function toggleReminderNote(sender){
         var reminderNote = $(sender).find('.reminder-note');
-        var reminderNoteText = reminderNote.text().trim();
-        if (reminderNoteText != ''){
+        if (reminderNote.text().trim() != ''){
             if (reminderNote.hasClass('d-none')) {
                 reminderNote.removeClass('d-none');
-                if (!reminderNote.hasClass('reminder-note-markdown')){
-                    let markedDownReminderNote = markdown(reminderNoteText);
-                    reminderNote.html(markedDownReminderNote);
-                    reminderNote.addClass('reminder-note-markdown');
-                }
             } else {
                 reminderNote.addClass('d-none');
             }

Views/Home/_ExtraFields.cshtml

@@ -36,9 +36,8 @@
                     <table class="table table-hover">
                         <thead class="sticky-top">
                             <tr class="d-flex">
-                                <th scope="col" class="col-5">@translator.Translate(userLanguage, "Name")</th>
+                                <th scope="col" class="col-8">@translator.Translate(userLanguage, "Name")</th>
                                 <th scope="col" class="col-2">@translator.Translate(userLanguage, "Required")</th>
-                                <th scope="col" class="col-3">@translator.Translate(userLanguage, "Type")</th>
                                 <th scope="col" class="col-2">@translator.Translate(userLanguage, "Delete")</th>
                             </tr>
                         </thead>
@@ -48,21 +47,11 @@
                                 @foreach (ExtraField extraField in Model.ExtraFields)
                                 {
                                     <script>
-                                        extraFields.push({ name: decodeHTMLEntities('@extraField.Name'), isRequired: @extraField.IsRequired.ToString().ToLower(), fieldType: decodeHTMLEntities('@extraField.FieldType')});
+                                        extraFields.push({ name: decodeHTMLEntities('@extraField.Name'), isRequired: @extraField.IsRequired.ToString().ToLower()});
                                     </script>
                                     <tr class="d-flex">
-                                        <td class="col-5">@extraField.Name</td>
+                                        <td class="col-8">@extraField.Name</td>
                                         <td class="col-2"><input class="form-check-input" type="checkbox" onchange="updateExtraFieldIsRequired(decodeHTMLEntities('@extraField.Name'), this)" value="" @(extraField.IsRequired ? "checked" : "") /></td>
-                                        <td class="col-3">
-                                            <select class="form-select" onchange="updateExtraFieldType(decodeHTMLEntities('@extraField.Name'), this)">
-                                                <!option @(extraField.FieldType == ExtraFieldType.Text ? "selected" : "") value="@((int)ExtraFieldType.Text)">@translator.Translate(userLanguage, "Text")</!option>
-                                                <!option @(extraField.FieldType == ExtraFieldType.Number ? "selected" : "") value="@((int)ExtraFieldType.Number)">@translator.Translate(userLanguage, "Number")</!option>
-                                                <!option @(extraField.FieldType == ExtraFieldType.Decimal ? "selected" : "") value="@((int)ExtraFieldType.Decimal)">@translator.Translate(userLanguage, "Decimal")</!option>
-                                                <!option @(extraField.FieldType == ExtraFieldType.Date ? "selected" : "") value="@((int)ExtraFieldType.Date)">@translator.Translate(userLanguage, "Date")</!option>
-                                                <!option @(extraField.FieldType == ExtraFieldType.Time ? "selected" : "") value="@((int)ExtraFieldType.Time)">@translator.Translate(userLanguage, "Time")</!option>
-                                                <!option @(extraField.FieldType == ExtraFieldType.Location ? "selected" : "") value="@((int)ExtraFieldType.Location)">@translator.Translate(userLanguage, "Location")</!option>
-                                            </select>
-                                        </td>
                                         <td class="col-2"><button type="button" onclick="deleteExtraField(decodeHTMLEntities('@extraField.Name'))" class="btn btn-danger"><i class="bi bi-trash"></i></button></td>
                                     </tr>
                                 }
@@ -110,12 +99,6 @@
         extraFieldToEdit.isRequired = $(checkbox).is(":checked");
         updateExtraFields();
     }
-    function updateExtraFieldType(fieldId, dropDown){
-        var indexToEdit = extraFields.findIndex(x => x.name == fieldId);
-        var extraFieldToEdit = extraFields[indexToEdit];
-        extraFieldToEdit.fieldType = $(dropDown).val();
-        updateExtraFields();
-    }
     function deleteExtraField(fieldId) {
         extraFields = extraFields.filter(x => x.name != fieldId);
         updateExtraFields();

Views/Home/_GarageDisplay.cshtml

@@ -10,10 +10,10 @@
 @if (recordTags.Any())
 {
     <div class='row'>
-        <div class="col-12 d-flex align-items-center flex-wrap mt-2 mb-2">
+        <div class="d-flex align-items-center flex-wrap mt-4">
             @foreach (string recordTag in recordTags)
             {
-                <span onclick="filterGarage(this)" class="user-select-none ms-1 me-1 mt-1 mb-1 rounded-pill badge bg-secondary tagfilter" style="cursor:pointer;">@recordTag</span>
+                <span onclick="filterGarage(this)" class="user-select-none ms-2 rounded-pill badge bg-secondary tagfilter" style="cursor:pointer;">@recordTag</span>
             }
             <datalist id="tagList">
                 @foreach (string recordTag in recordTags)
@@ -24,12 +24,13 @@
         </div>
     </div>
 }
-    <div class="row gy-3 align-items-stretch vehiclesContainer pb-2 @(recordTags.Any() ? "" : "mt-2")">
+<div class="row">
+    <div class="row gy-3 align-items-stretch vehiclesContainer">
         @foreach (VehicleViewModel vehicle in Model)
         {
             @if (!(userConfig.HideSoldVehicles && !string.IsNullOrWhiteSpace(vehicle.SoldDate)))
             {
-                <div class="col-xl-2 col-lg-3 col-md-4 col-sm-4 col-6 user-select-none garage-item" ondragover="dragOver(event)" ondrop="dropBox(event, @vehicle.Id)" draggable="true" ondragstart="dragStart(event, @vehicle.Id)" data-tags='@string.Join(" ", vehicle.Tags)' id="gridVehicle_@vehicle.Id" data-bs-toggle="tooltip" data-bs-html="true" data-bs-title="@await Html.PartialAsync("_VehicleExtraFields", vehicle.ExtraFields)" data-bs-placement="bottom" data-bs-trigger="manual" onmouseenter="loadPinnedNotes(@vehicle.Id)" ontouchstart="loadPinnedNotes(@vehicle.Id)" ontouchcancel="hidePinnedNotes(@vehicle.Id)" ontouchend="hidePinnedNotes(@vehicle.Id)" onmouseleave="hidePinnedNotes(@vehicle.Id)">
+                <div class="col-xl-2 col-lg-3 col-md-4 col-sm-4 col-4 user-select-none garage-item" ondragover="dragOver(event)" ondrop="dropBox(event, @vehicle.Id)" draggable="true" ondragstart="dragStart(event, @vehicle.Id)" data-tags='@string.Join(" ", vehicle.Tags)' id="gridVehicle_@vehicle.Id" data-bs-toggle="tooltip" data-bs-html="true" data-bs-title="@await Html.PartialAsync("_VehicleExtraFields", vehicle.ExtraFields)" data-bs-placement="bottom" data-bs-trigger="manual" onmouseenter="loadPinnedNotes(@vehicle.Id)" ontouchstart="loadPinnedNotes(@vehicle.Id)" ontouchcancel="hidePinnedNotes(@vehicle.Id)" ontouchend="hidePinnedNotes(@vehicle.Id)" onmouseleave="hidePinnedNotes(@vehicle.Id)">
                     <div class="card" onclick="viewVehicle(@vehicle.Id)">
                         <img src="@vehicle.ImageLocation" style="height:145px; object-fit:scale-down; pointer-events:none; @(string.IsNullOrWhiteSpace(vehicle.SoldDate) ? "" : "filter: grayscale(100%);")" />
                         @if (!string.IsNullOrWhiteSpace(vehicle.SoldDate))
@@ -43,7 +44,7 @@
                                 
                                     <div class="d-flex justify-content-between">
                                         <div>
-                                            <span class="ms-2"><i class="bi bi-speedometer me-2"></i>@vehicle.LastReportedMileage.ToString("N0")</span>
+                                            <span class="ms-2"><i class="bi bi-speedometer me-2"></i>@vehicle.LastReportedMileage.ToString("N1")</span>
                                         </div>
                                         @if (vehicle.HasReminders)
                                         {
@@ -81,9 +82,10 @@
                 </div>
             }
         }
-    <div class="col-xl-2 col-lg-3 col-md-4 col-sm-4 col-6 garage-item-add user-select-none">
+        <div class="col-xl-2 col-lg-3 col-md-4 col-sm-4 col-4 garage-item-add">
             <div class="card" onclick="showAddVehicleModal()" style="height:100%;">
-                <img src="/defaults/addnew_vehicle.png" style="object-fit:scale-down;height:100%;pointer-events:none;" />
+                <img src="/defaults/addnew_vehicle.png" style="object-fit:scale-down;height:100%;" />
             </div>
         </div>
-    </div>
+    </div>
+</div>

Views/Home/_ServerConfig.cshtml

@@ -1,227 +0,0 @@
-@using CarCareTracker.Helper
-@inject IConfigHelper config
-@inject ITranslationHelper translator
-@model ServerSettingsViewModel
-@{
-    var userConfig = config.GetUserConfig(User);
-    var userLanguage = userConfig.UserLanguage;
-}
-<div class="modal-header">
-    <h5 class="modal-title" id="serverConfigModalLabel">@translator.Translate(userLanguage, "Review Server Configurations")</h5>
-    <button type="button" class="btn-close" onclick="hideServerConfigModal()" aria-label="Close"></button>
-</div>
-<div class="modal-body">
-    <form class="form-inline">
-        <div class="form-group">
-            <div class="row mb-2">
-                <div class="col-md-6 col-12">
-                    <label for="inputPostgres">@translator.Translate(userLanguage, "Postgres Connection")</label>
-                </div>
-                <div class="col-md-6 col-12">
-                    <input type="text" readonly id="inputPostgres" class="form-control" placeholder="@translator.Translate(userLanguage, "Not Configured")" value="@Model.PostgresConnection">
-                </div>
-            </div>
-            <div class="row mb-2">
-                <div class="col-md-6 col-12">
-                    <label for="inputFileExt">@translator.Translate(userLanguage, "Allowed File Extensions")</label>
-                </div>
-                <div class="col-md-6 col-12">
-                    <input type="text" readonly id="inputFileExt" class="form-control" placeholder="@translator.Translate(userLanguage, "Not Configured")" value="@Model.AllowedFileExtensions">
-                </div>
-            </div>
-            <div class="row mb-2">
-                <div class="col-md-6 col-12">
-                    <label for="inputLogoURL">@translator.Translate(userLanguage, "Logo URL")</label>
-                </div>
-                <div class="col-md-6 col-12">
-                    <input type="text" readonly id="inputLogoURL" class="form-control" placeholder="@translator.Translate(userLanguage, "Not Configured")" value="@Model.CustomLogoURL">
-                </div>
-            </div>
-            <div class="row mb-2">
-                <div class="col-md-6 col-12">
-                    <label for="inputMOTD">@translator.Translate(userLanguage, "Message of the Day")</label>
-                </div>
-                <div class="col-md-6 col-12">
-                    <input type="text" readonly id="inputMOTD" class="form-control" placeholder="@translator.Translate(userLanguage, "Not Configured")" value="@Model.MessageOfTheDay">
-                </div>
-            </div>
-            <div class="row mb-2">
-                <div class="col-md-6 col-12">
-                    <label for="inputWebHook">@translator.Translate(userLanguage, "WebHook URL")</label>
-                </div>
-                <div class="col-md-6 col-12">
-                    <input type="text" readonly id="inputWebHook" class="form-control" placeholder="@translator.Translate(userLanguage, "Not Configured")" value="@Model.WebHookURL">
-                </div>
-            </div>
-            <div class="row mb-2">
-                <div class="col-md-6 col-12">
-                    <label for="inputCustomWidget">@translator.Translate(userLanguage, "Custom Widgets")</label>
-                </div>
-                <div class="col-md-6 col-12">
-                    <input type="text" readonly id="inputCustomWidget" class="form-control" placeholder="@translator.Translate(userLanguage, "Not Configured")" value="@(Model.CustomWidgetsEnabled ? translator.Translate(userLanguage, "Enabled") : translator.Translate(userLanguage, "Disabled"))">
-                </div>
-            </div>
-            <div class="row mb-2">
-                <div class="col-md-6 col-12">
-                    <label for="inputInvariantAPI">@translator.Translate(userLanguage, "Invariant API")</label>
-                </div>
-                <div class="col-md-6 col-12">
-                    <input type="text" readonly id="inputInvariantAPI" class="form-control" placeholder="@translator.Translate(userLanguage, "Not Configured")" value="@(Model.InvariantAPIEnabled ? translator.Translate(userLanguage, "Enabled") : translator.Translate(userLanguage, "Disabled"))">
-                </div>
-            </div>
-            <hr />
-            <div class="row mb-2">
-                <div class="col-md-6 col-12">
-                    <label for="inputSMTPServer">@translator.Translate(userLanguage, "SMTP Server")</label>
-                </div>
-                <div class="col-md-6 col-12">
-                    <div class="input-group">
-                        <input type="text" readonly id="inputSMTPServer" class="form-control" placeholder="@translator.Translate(userLanguage, "Not Configured")" value="@Model.SMTPConfig.EmailServer">
-                        <div class="input-group-text">
-                            <button type="button" @(string.IsNullOrWhiteSpace(Model.SMTPConfig.EmailServer) ? "disabled" : "") class="btn btn-sm text-secondary password-visible-button" onclick="sendTestEmail()"><i class="bi bi-send"></i></button>
-                        </div>
-                    </div>
-                </div>
-            </div>
-            <div class="row mb-2">
-                <div class="col-md-6 col-12">
-                    <label for="inputSMTPPort">@translator.Translate(userLanguage, "SMTP Server Port")</label>
-                </div>
-                <div class="col-md-6 col-12">
-                    <input type="text" readonly id="inputSMTPPort" class="form-control" placeholder="@translator.Translate(userLanguage, "Not Configured")" value="@Model.SMTPConfig.Port">
-                </div>
-            </div>
-            <div class="row mb-2">
-                <div class="col-md-6 col-12">
-                    <label for="inputSMTPFrom">@translator.Translate(userLanguage, "SMTP Sender Address")</label>
-                </div>
-                <div class="col-md-6 col-12">
-                    <input type="text" readonly id="inputSMTPFrom" class="form-control" placeholder="@translator.Translate(userLanguage, "Not Configured")" value="@Model.SMTPConfig.EmailFrom">
-                </div>
-            </div>
-            <div class="row mb-2">
-                <div class="col-md-6 col-12">
-                    <label for="inputSMTPUsername">@translator.Translate(userLanguage, "SMTP Username")</label>
-                </div>
-                <div class="col-md-6 col-12">
-                    <input type="text" readonly id="inputSMTPUsername" class="form-control" placeholder="@translator.Translate(userLanguage, "Not Configured")" value="@Model.SMTPConfig.Username">
-                </div>
-            </div>
-            <div class="row mb-2">
-                <div class="col-md-6 col-12">
-                    <label for="inputSMTPPassword">@translator.Translate(userLanguage, "SMTP Password")</label>
-                </div>
-                <div class="col-md-6 col-12">
-                    <div class="input-group">
-                        <input type="password" readonly id="inputSMTPPassword" class="form-control" placeholder="@translator.Translate(userLanguage, "Not Configured")" value="@Model.SMTPConfig.Password">
-                        <div class="input-group-text">
-                            <button type="button" class="btn btn-sm text-secondary password-visible-button" onclick="togglePasswordVisibility(this)"><i class="bi bi-eye"></i></button>
-                        </div>
-                    </div>
-                </div>
-            </div>
-            <hr />
-            <div class="row mb-2">
-                <div class="col-md-6 col-12">
-                    <label for="inputOIDCProvider">@translator.Translate(userLanguage, "OIDC Provider")</label>
-                </div>
-                <div class="col-md-6 col-12">
-                    <input type="text" readonly id="inputOIDCProvider" class="form-control" placeholder="@translator.Translate(userLanguage, "Not Configured")" value="@Model.OIDCConfig.Name">
-                </div>
-            </div>
-            <div class="row mb-2">
-                <div class="col-md-6 col-12">
-                    <label for="inputOIDCClient">@translator.Translate(userLanguage, "OIDC Client ID")</label>
-                </div>
-                <div class="col-md-6 col-12">
-                    <input type="text" readonly id="inputOIDCClient" class="form-control" placeholder="@translator.Translate(userLanguage, "Not Configured")" value="@Model.OIDCConfig.ClientId">
-                </div>
-            </div>
-             <div class="row mb-2">
-                <div class="col-md-6 col-12">
-                    <label for="inputOIDCSecret">@translator.Translate(userLanguage, "OIDC Client Secret")</label>
-                </div>
-                <div class="col-md-6 col-12">
-                    <div class="input-group">
-                        <input type="password" readonly id="inputOIDCSecret" class="form-control" placeholder="@translator.Translate(userLanguage, "Not Configured")" value="@Model.OIDCConfig.ClientSecret">
-                        <div class="input-group-text">
-                            <button type="button" class="btn btn-sm text-secondary password-visible-button" onclick="togglePasswordVisibility(this)"><i class="bi bi-eye"></i></button>
-                        </div>
-                    </div>
-                </div>
-            </div>
-            <div class="row mb-2">
-                <div class="col-md-6 col-12">
-                    <label for="inputOIDCAuth">@translator.Translate(userLanguage, "OIDC Auth URL")</label>
-                </div>
-                <div class="col-md-6 col-12">
-                    <input type="text" readonly id="inputOIDCAuth" class="form-control" placeholder="@translator.Translate(userLanguage, "Not Configured")" value="@Model.OIDCConfig.AuthURL">
-                </div>
-            </div>
-            <div class="row mb-2">
-                <div class="col-md-6 col-12">
-                    <label for="inputOIDCToken">@translator.Translate(userLanguage, "OIDC Token URL")</label>
-                </div>
-                <div class="col-md-6 col-12">
-                    <input type="text" readonly id="inputOIDCToken" class="form-control" placeholder="@translator.Translate(userLanguage, "Not Configured")" value="@Model.OIDCConfig.TokenURL">
-                </div>
-            </div>
-            <div class="row mb-2">
-                <div class="col-md-6 col-12">
-                    <label for="inputOIDCUserInfo">@translator.Translate(userLanguage, "OIDC UserInfo URL")</label>
-                </div>
-                <div class="col-md-6 col-12">
-                    <input type="text" readonly id="inputOIDCUserInfo" class="form-control" placeholder="@translator.Translate(userLanguage, "Not Configured")" value="@Model.OIDCConfig.UserInfoURL">
-                </div>
-            </div>
-             <div class="row mb-2">
-                <div class="col-md-6 col-12">
-                    <label for="inputOIDCRedirect">@translator.Translate(userLanguage, "OIDC Redirect URL")</label>
-                </div>
-                <div class="col-md-6 col-12">
-                    <input type="text" readonly id="inputOIDCRedirect" class="form-control" placeholder="@translator.Translate(userLanguage, "Not Configured")" value="@Model.OIDCConfig.RedirectURL">
-                </div>
-            </div>
-             <div class="row mb-2">
-                <div class="col-md-6 col-12">
-                    <label for="inputOIDCScope">@translator.Translate(userLanguage, "OIDC Scope")</label>
-                </div>
-                <div class="col-md-6 col-12">
-                    <input type="text" readonly id="inputOIDCScope" class="form-control" placeholder="@translator.Translate(userLanguage, "Not Configured")" value="@Model.OIDCConfig.Scope">
-                </div>
-            </div>
-             <div class="row mb-2">
-                <div class="col-md-6 col-12">
-                    <label for="inputOIDCLogout">@translator.Translate(userLanguage, "OIDC Logout URL")</label>
-                </div>
-                <div class="col-md-6 col-12">
-                    <input type="text" readonly id="inputOIDCLogout" class="form-control" placeholder="@translator.Translate(userLanguage, "Not Configured")" value="@Model.OIDCConfig.LogOutURL">
-                </div>
-            </div>
-             <div class="row mb-2">
-                <div class="col-md-6 col-12">
-                    <label for="inputOIDCState">@translator.Translate(userLanguage, "OIDC Validate State")</label>
-                </div>
-                <div class="col-md-6 col-12">
-                    <input type="text" readonly id="inputOIDCState" class="form-control" placeholder="@translator.Translate(userLanguage, "Not Configured")" value="@(Model.OIDCConfig.ValidateState ? translator.Translate(userLanguage, "Enabled") : translator.Translate(userLanguage, "Disabled"))">
-                </div>
-            </div>
-            <div class="row mb-2">
-                <div class="col-md-6 col-12">
-                    <label for="inputOIDCPKCE">@translator.Translate(userLanguage, "OIDC Use PKCE")</label>
-                </div>
-                <div class="col-md-6 col-12">
-                    <input type="text" readonly id="inputOIDCPKCE" class="form-control" placeholder="@translator.Translate(userLanguage, "Not Configured")" value="@(Model.OIDCConfig.UsePKCE ? translator.Translate(userLanguage, "Enabled") : translator.Translate(userLanguage, "Disabled"))">
-                </div>
-            </div>
-            <div class="row mb-2">
-                <div class="col-md-6 col-12">
-                    <label for="inputOIDCDisable">@translator.Translate(userLanguage, "OIDC Login Only")</label>
-                </div>
-                <div class="col-md-6 col-12">
-                    <input type="text" readonly id="inputOIDCDisable" class="form-control" placeholder="@translator.Translate(userLanguage, "Not Configured")" value="@(Model.OIDCConfig.DisableRegularLogin ? translator.Translate(userLanguage, "Enabled") : translator.Translate(userLanguage, "Disabled"))">
-                </div>
-            </div>
-        </div>
-    </form>
-</div>

Views/Home/_Settings.cshtml

@@ -37,29 +37,17 @@
             <input class="form-check-input" onChange="updateSettings()" type="checkbox" role="switch" id="useDescending" checked="@Model.UserConfig.UseDescending">
             <label class="form-check-label" for="useDescending">@translator.Translate(userLanguage, "Sort lists in Descending Order(Newest to Oldest)")</label>
         </div>
-        <div>
-            <div class="form-check form-switch form-check-inline">
-                <input class="form-check-input" onChange="updateSettings()" type="checkbox" role="switch" id="hideZero" checked="@Model.UserConfig.HideZero">
-                <label class="form-check-label" for="hideZero">@translator.Translate(userLanguage, "Replace $0.00 Costs with ---")</label>
-            </div>
-            <div class="form-check form-switch form-check-inline">
-                <input class="form-check-input" onChange="updateSettings()" type="checkbox" role="switch" id="automaticDecimalFormat" checked="@Model.UserConfig.AutomaticDecimalFormat">
-                <label class="form-check-label" for="automaticDecimalFormat">@translator.Translate(userLanguage, "Automatically Format Decimal Inputs")</label>
-            </div>
+        <div class="form-check form-switch form-check-inline">
+            <input class="form-check-input" onChange="updateSettings()" type="checkbox" role="switch" id="hideZero" checked="@Model.UserConfig.HideZero">
+            <label class="form-check-label" for="hideZero">@translator.Translate(userLanguage, "Replace $0.00 Costs with ---")</label>
         </div>
-        <div>
-            <div class="form-check form-switch form-check-inline">
-                <input class="form-check-input" onChange="updateSettings()" type="checkbox" role="switch" id="useThreeDecimal" checked="@Model.UserConfig.UseThreeDecimalGasCost">
-                <label class="form-check-label" for="useThreeDecimal">@translator.Translate(userLanguage, "Use Three Decimals For Fuel Cost")</label>
-            </div>
-            <div class="form-check form-switch form-check-inline">
-                <input class="form-check-input" onChange="updateSettings()" type="checkbox" role="switch" id="useUnitForFuelCost" checked="@Model.UserConfig.UseUnitForFuelCost">
-                <label class="form-check-label" for="useUnitForFuelCost">@translator.Translate(userLanguage, "Default to Fuel Unit Cost")</label>
-            </div>
+        <div class="form-check form-switch form-check-inline">
+            <input class="form-check-input" onChange="updateSettings()" type="checkbox" role="switch" id="automaticDecimalFormat" checked="@Model.UserConfig.AutomaticDecimalFormat">
+            <label class="form-check-label" for="automaticDecimalFormat">@translator.Translate(userLanguage, "Automatically Format Decimal Inputs")</label>
         </div>
         <div class="form-check form-switch">
-            <input class="form-check-input" onChange="updateSettings()" type="checkbox" role="switch" id="useThreeDecimalGasConsumption" checked="@Model.UserConfig.UseThreeDecimalGasConsumption">
-            <label class="form-check-label" for="useThreeDecimalGasConsumption">@translator.Translate(userLanguage, "Use Three Decimals For Fuel Consumption")</label>
+            <input class="form-check-input" onChange="updateSettings()" type="checkbox" role="switch" id="useThreeDecimal" checked="@Model.UserConfig.UseThreeDecimalGasCost">
+            <label class="form-check-label" for="useThreeDecimal">@translator.Translate(userLanguage, "Use Three Decimals For Fuel Cost")</label>
         </div>
         <div class="form-check form-switch">
             <input class="form-check-input" onChange="updateSettings()" type="checkbox" role="switch" id="useMarkDownOnSavedNotes" checked="@Model.UserConfig.UseMarkDownOnSavedNotes">
@@ -77,23 +65,13 @@
             <input class="form-check-input" onChange="updateSettings()" type="checkbox" role="switch" id="enableExtraFieldColumns" checked="@Model.UserConfig.EnableExtraFieldColumns">
             <label class="form-check-label" for="enableExtraFieldColumns">@translator.Translate(userLanguage, "Show Extra Field Columns")<br /><small class="text-body-secondary">@translator.Translate(userLanguage, "Enabling this may cause performance issues")</small></label>
         </div>
-        <div>
-            <div class="form-check form-switch form-check-inline">
-                <input class="form-check-input" onChange="updateSettings()" type="checkbox" role="switch" id="hideSoldVehicles" checked="@Model.UserConfig.HideSoldVehicles">
-                <label class="form-check-label" for="hideSoldVehicles">@translator.Translate(userLanguage, "Hide Sold Vehicles")</label>
-            </div>
-            <div class="form-check form-switch form-check-inline @(User.IsInRole(nameof(UserData.IsRootUser)) ? "" : "d-none")">
-                <input class="form-check-input" onChange="updateSettings()" type="checkbox" role="switch" id="enableShopSupplies" checked="@Model.UserConfig.EnableShopSupplies">
-                <label class="form-check-label" for="enableShopSupplies">@translator.Translate(userLanguage, "Shop Supplies")</label>
-            </div>
-            <div class="form-check form-switch form-check-inline">
-                <input class="form-check-input" onChange="updateSettings()" type="checkbox" role="switch" id="showCalendar" checked="@Model.UserConfig.ShowCalendar">
-                <label class="form-check-label" for="showCalendar">@translator.Translate(userLanguage, "Show Calendar")</label>
-            </div>
-            <div class="form-check form-switch form-check-inline">
-                <input class="form-check-input" onChange="updateSettings()" type="checkbox" role="switch" id="showVehicleThumbnail" checked="@Model.UserConfig.ShowVehicleThumbnail">
-                <label class="form-check-label" for="showCalendar">@translator.Translate(userLanguage, "Show Vehicle Thumbnail in Header")</label>
-            </div>
+        <div class="form-check form-switch">
+            <input class="form-check-input" onChange="updateSettings()" type="checkbox" role="switch" id="hideSoldVehicles" checked="@Model.UserConfig.HideSoldVehicles">
+            <label class="form-check-label" for="hideSoldVehicles">@translator.Translate(userLanguage, "Hide Sold Vehicles")</label>
+        </div>
+        <div class="form-check form-switch @(User.IsInRole(nameof(UserData.IsRootUser)) ? "" : "d-none")">
+            <input class="form-check-input" onChange="updateSettings()" type="checkbox" role="switch" id="enableShopSupplies" checked="@Model.UserConfig.EnableShopSupplies">
+            <label class="form-check-label" for="enableShopSupplies">@translator.Translate(userLanguage, "Shop Supplies")</label>
         </div>
         @if (User.IsInRole(nameof(UserData.IsRootUser)))
         {
@@ -261,14 +239,7 @@
             </div>
             <div class="row">
                 <div class="col-12 col-md-6">
-                    <div class="row">
-                        <div class="col-10">
-                            <span class="lead text-wrap">@translator.Translate(userLanguage, "Server-wide Settings")</span>
-                        </div>
-                        <div class="col-2">
-                            <button onclick="showServerConfigModal()" class="btn text-secondary btn-sm"><i class="bi bi-eyeglasses"></i></button>
-                        </div>
-                    </div>
+                    <span class="lead text-wrap">@translator.Translate(userLanguage, "Server-wide Settings")</span>
                     <div class="row">
                         <div class="col-6 d-grid">
                             <button onclick="showExtraFieldModal()" class="btn btn-primary btn-md text-truncate">@translator.Translate(userLanguage, "Extra Fields")</button>
@@ -370,12 +341,6 @@
         </div>
     </div>
 </div>
-<div class="modal fade" data-bs-focus="false" id="serverConfigModal" tabindex="-1" role="dialog" aria-hidden="true">
-    <div class="modal-dialog modal-lg" role="document">
-        <div class="modal-content" id="serverConfigModalContent">
-        </div>
-    </div>
-</div>
 <div class="modal fade" data-bs-focus="false" id="tabReorderModal" tabindex="-1" role="dialog" aria-hidden="true">
     <div class="modal-dialog modal-lg" role="document">
         <div class="modal-content" id="tabReorderModalContent">

Views/Login/ForgotPassword.cshtml

@@ -16,7 +16,7 @@
             <img src="@config.GetLogoUrl()" class="lubelogger-logo" />
             <div class="form-group">
                 <label for="inputUserName">@translator.Translate(userLanguage, "Username")</label>
-                <input type="text" onkeyup="callBackOnEnter(event, requestPasswordReset)" id="inputUserName" class="form-control">
+                <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>@translator.Translate(userLanguage, "Request")</button>

Views/Login/Index.cshtml

@@ -24,7 +24,7 @@
             <div class="form-group">
                 <label for="inputUserPassword">@translator.Translate(userLanguage, "Password")</label> 
                 <div class="input-group">
-                    <input type="password" id="inputUserPassword" onkeyup="callBackOnEnter(event, performLogin)" class="form-control">
+                    <input type="password" id="inputUserPassword" onkeyup="handlePasswordKeyPress(event)" class="form-control">
                     <div class="input-group-text">
                         <button type="button" class="btn btn-sm text-secondary password-visible-button" onclick="togglePasswordVisibility(this)"><i class="bi bi-eye"></i></button>
                     </div>

Views/Login/OpenIDRegistration.cshtml

@@ -3,7 +3,6 @@
 @inject ITranslationHelper translator
 @{
     var userLanguage = config.GetServerLanguage();
-    var openRegistrationEnabled = config.GetServerOpenRegistration();
 }
 @model string
 @{
@@ -18,23 +17,11 @@
             <img src="@config.GetLogoUrl()" class="lubelogger-logo" />
             <div class="form-group">
                 <label for="inputToken">@translator.Translate(userLanguage, "Token")</label>
-                @if (openRegistrationEnabled)
-                {
-                    <div class="input-group">
-                        <input type="text" id="inputToken" class="form-control">
-                        <div class="input-group-text">
-                            <button type="button" class="btn btn-sm text-secondary password-visible-button" onclick="sendOpenIdRegistrationToken()"><i class="bi bi-send"></i></button>
-                        </div>
-                    </div>
-                }
-                else
-                {
-                    <input type="text" id="inputToken" class="form-control">
-                }
+                <input type="text" id="inputToken" class="form-control">
             </div>
             <div class="form-group">
                 <label for="inputUserName">@translator.Translate(userLanguage, "Username")</label>
-                <input type="text" id="inputUserName" class="form-control" value="@Model" onkeyup="callBackOnEnter(event, performOpenIdRegistration)">
+                <input type="text" id="inputUserName" class="form-control" value="@Model">
             </div>
             <div class="d-grid">
                 <button type="button" class="btn btn-warning mt-2" onclick="performOpenIdRegistration()"><i class="bi bi-box-arrow-in-right me-2"></i>@translator.Translate(userLanguage, "Register")</button>
@@ -59,14 +46,4 @@
             }
         });
     }
-    function sendOpenIdRegistrationToken(){
-        var userEmail = decodeHTMLEntities('@Model');
-        $.post('/Login/SendRegistrationToken', { emailAddress: userEmail }, function (data) {
-            if (data.success) {
-                successToast(data.message);
-            } else {
-                errorToast(data.message);
-            }
-        });
-    }
 </script>

Views/Login/Registration.cshtml

@@ -3,9 +3,7 @@
 @inject ITranslationHelper translator
 @{
     var userLanguage = config.GetServerLanguage();
-    var openRegistrationEnabled = config.GetServerOpenRegistration();
 }
-@model LoginModel
 @{
     ViewData["Title"] = "Register";
 }
@@ -18,20 +16,11 @@
             <img src="@config.GetLogoUrl()" class="lubelogger-logo" />
             <div class="form-group">
                 <label for="inputToken">@translator.Translate(userLanguage, "Token")</label>
-                @if (openRegistrationEnabled) {
-                    <div class="input-group">
-                        <input type="text" id="inputToken" class="form-control" value="@Model.Token">
-                        <div class="input-group-text">
-                            <button type="button" class="btn btn-sm text-secondary password-visible-button" onclick="sendRegistrationToken()"><i class="bi bi-send"></i></button>
-                        </div>
-                    </div>
-                } else {
-                    <input type="text" id="inputToken" class="form-control" value="@Model.Token">
-                }
+                <input type="text" id="inputToken" class="form-control">
             </div>
             <div class="form-group">
-                <label for="inputEmail">@translator.Translate(userLanguage, "Email Address")</label>
-                <input type="text" id="inputEmail" class="form-control" value="@Model.EmailAddress">
+                <label for="inputUserName">@translator.Translate(userLanguage, "Email Address")</label>
+                <input type="text" id="inputEmail" class="form-control">
             </div>
             <div class="form-group">
                 <label for="inputUserName">@translator.Translate(userLanguage, "Username")</label>
@@ -40,7 +29,7 @@
             <div class="form-group">
                 <label for="inputUserPassword">@translator.Translate(userLanguage, "Password")</label>
                 <div class="input-group">
-                    <input type="password" id="inputUserPassword" class="form-control" onkeyup="callBackOnEnter(event, performRegistration)">
+                    <input type="password" id="inputUserPassword" class="form-control">
                     <div class="input-group-text">
                         <button type="button" class="btn btn-sm text-secondary password-visible-button" onclick="togglePasswordVisibility(this)"><i class="bi bi-eye"></i></button>
                     </div>

Views/Login/RemoteAuthDebug.cshtml

@@ -1,17 +0,0 @@
-@model List<OperationResponse>
-@{
-    ViewData["Title"] = "Remote Auth Debug";
-}
-<div class="mt-2">
-    @foreach (OperationResponse result in Model)
-    {
-        <div class="row">
-            <div class="col-12">
-                <div class="alert text-wrap text-break @(result.Success ? "alert-success" : "alert-danger")" role="alert">
-                    @result.Message
-                </div>
-            </div>
-        </div>
-    }
-</div>
-