Merge pull request #233 from hargata/Hargata/increase.upload.size

1.1.3

Controllers/LoginController.cs

@@ -26,9 +26,9 @@ namespace CarCareTracker.Controllers
             _logger = logger;
             _loginLogic = loginLogic;
         }
-        public IActionResult Index()
+        public IActionResult Index(string redirectURL = "")
         {
-            return View();
+            return View(model: redirectURL);
         }
         public IActionResult Registration()
         {

Helper/ConfigHelper.cs

@@ -10,6 +10,7 @@ namespace CarCareTracker.Helper
         UserConfig GetUserConfig(ClaimsPrincipal user);
         bool SaveUserConfig(ClaimsPrincipal user, UserConfig configData);
         string GetLogoUrl();
+        string GetServerLanguage();
         public bool DeleteUserConfig(int userId);
     }
     public class ConfigHelper : IConfigHelper
@@ -34,6 +35,11 @@ namespace CarCareTracker.Helper
             }
             return logoUrl;
         }
+        public string GetServerLanguage()
+        {
+            var serverLanguage = _config[nameof(UserConfig.UserLanguage)] ?? "en_US";
+            return serverLanguage;
+        }
         public bool SaveUserConfig(ClaimsPrincipal user, UserConfig configData)
         {
             var storedUserId = user.FindFirstValue(ClaimTypes.NameIdentifier);

Middleware/Authen.cs

@@ -157,7 +157,13 @@ namespace CarCareTracker.Middleware
                     return Task.CompletedTask;
                 }
             }
-            Response.Redirect("/Login/Index");
+            if (Request.Path.Value == "/Vehicle/Index" && Request.QueryString.HasValue)
+            {
+                Response.Redirect($"/Login/Index?redirectURL={Request.Path.Value}{Request.QueryString.Value}");
+            } else
+            {
+                Response.Redirect("/Login/Index");
+            }
             return Task.CompletedTask;
         }
         protected override Task HandleForbiddenAsync(AuthenticationProperties properties)

Models/Note.cs

@@ -8,5 +8,6 @@
         public string NoteText { get; set; }
         public bool Pinned { get; set; }
         public List<string> Tags { get; set; } = new List<string>();
+        public List<UploadedFiles> Files { get; set; } = new List<UploadedFiles>();
     }
 }

Program.cs

@@ -5,6 +5,8 @@ using CarCareTracker.Logic;
 using CarCareTracker.Middleware;
 using Microsoft.AspNetCore.Authentication;
 using Microsoft.AspNetCore.Authorization;
+using Microsoft.AspNetCore.Http.Features;
+using Microsoft.AspNetCore.Server.Kestrel.Core;
 
 var builder = WebApplication.CreateBuilder(args);
 
@@ -55,6 +57,17 @@ builder.Services.AddAuthorization(options =>
 {
     options.DefaultPolicy = new AuthorizationPolicyBuilder().AddAuthenticationSchemes("AuthN").RequireAuthenticatedUser().Build();
 });
+//Configure max file upload size
+builder.Services.Configure<KestrelServerOptions>(options =>
+{
+    options.Limits.MaxRequestBodySize = int.MaxValue; // if don't set default value is: 30 MB
+});
+builder.Services.Configure<FormOptions>(options =>
+{
+    options.ValueLengthLimit = int.MaxValue;
+    options.MultipartBodyLengthLimit = int.MaxValue; // if don't set default value is: 128 MB
+    options.MultipartHeadersLengthLimit = int.MaxValue;
+});
 
 var app = builder.Build();
 

Views/Login/ForgotPassword.cshtml

@@ -1,7 +1,9 @@
 @using CarCareTracker.Helper
 @inject IConfigHelper config
+@inject ITranslationHelper translator
 @{
     var logoUrl = config.GetLogoUrl();
+    var userLanguage = config.GetServerLanguage();
 }
 @{
     ViewData["Title"] = "LubeLogger - Login";
@@ -14,17 +16,17 @@
         <div class="col-12">
             <img src="@logoUrl" />
             <div class="form-group">
-                <label for="inputUserName">Username</label>
+                <label for="inputUserName">@translator.Translate(userLanguage, "Username")</label>
                 <input type="text" id="inputUserName" class="form-control">
             </div>
             <div class="d-grid">
-                <button type="button" class="btn btn-warning mt-2" onclick="requestPasswordReset()"><i class="bi bi-box-arrow-in-right me-2"></i>Request</button>
+                <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>
             </div>
             <div class="d-grid">
-                <a href="/Login/ResetPassword" class="btn btn-link mt-2">I Have a Token</a>
+                <a href="/Login/ResetPassword" class="btn btn-link mt-2">@translator.Translate(userLanguage, "I Have a Token")</a>
             </div>
             <div class="d-grid">
-                <a href="/Login/Index" class="btn btn-link mt-2">Back to Login</a>
+                <a href="/Login/Index" class="btn btn-link mt-2">@translator.Translate(userLanguage, "Back to Login")</a>
             </div>
         </div>
     </div>

Views/Login/Index.cshtml

@@ -1,7 +1,10 @@
 @using CarCareTracker.Helper
 @inject IConfigHelper config
+@inject ITranslationHelper translator
+@model string
 @{
     var logoUrl = config.GetLogoUrl();
+    var userLanguage = config.GetServerLanguage();
 }
 @{
     ViewData["Title"] = "LubeLogger - Login";
@@ -14,26 +17,31 @@
         <div class="col-12">
             <img src="@logoUrl" />
             <div class="form-group">
-                <label for="inputUserName">Username</label>
+                <label for="inputUserName">@translator.Translate(userLanguage, "Username")</label>
                 <input type="text" id="inputUserName" class="form-control">
             </div>
             <div class="form-group">
-                <label for="inputUserPassword">Password</label>
+                <label for="inputUserPassword">@translator.Translate(userLanguage, "Password")</label>
                 <input type="password" id="inputUserPassword" onkeyup="handlePasswordKeyPress(event)" class="form-control">
             </div>
             <div class="form-check form-switch">
                 <input class="form-check-input" type="checkbox" role="switch" id="inputPersistent">
-                <label class="form-check-label" for="inputPersistent">Remember Me</label>
+                <label class="form-check-label" for="inputPersistent">@translator.Translate(userLanguage, "Remember Me")</label>
             </div>
             <div class="d-grid">
-                <button type="button" class="btn btn-warning mt-2" onclick="performLogin()"><i class="bi bi-box-arrow-in-right me-2"></i>Login</button>
+                <button type="button" class="btn btn-warning mt-2" onclick="performLogin()"><i class="bi bi-box-arrow-in-right me-2"></i>@translator.Translate(userLanguage, "Login")</button>
             </div>
             <div class="d-grid">
-                <a href="/Login/ForgotPassword" class="btn btn-link mt-2">Forgot Password</a>
+                <a href="/Login/ForgotPassword" class="btn btn-link mt-2">@translator.Translate(userLanguage, "Forgot Password")</a>
             </div>
             <div class="d-grid">
-                <a href="/Login/Registration" class="btn btn-link mt-2">Register</a>
+                <a href="/Login/Registration" class="btn btn-link mt-2">@translator.Translate(userLanguage, "Register")</a>
             </div>
         </div>
     </div>
-</div>
+</div>
+<script>
+    function getRedirectURL(){
+        return { url: decodeHTMLEntities('@Model') };
+    }
+</script>

Views/Login/Registration.cshtml

@@ -1,7 +1,9 @@
 @using CarCareTracker.Helper
 @inject IConfigHelper config
+@inject ITranslationHelper translator
 @{
     var logoUrl = config.GetLogoUrl();
+    var userLanguage = config.GetServerLanguage();
 }
 @{
     ViewData["Title"] = "LubeLogger - Register";
@@ -14,26 +16,26 @@
         <div class="col-12">
             <img src="@logoUrl" />
             <div class="form-group">
-                <label for="inputToken">Token</label>
+                <label for="inputToken">@translator.Translate(userLanguage, "Token")</label>
                 <input type="text" id="inputToken" class="form-control">
             </div>
             <div class="form-group">
-                <label for="inputUserName">Email Address</label>
+                <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">Username</label>
+                <label for="inputUserName">@translator.Translate(userLanguage, "Username")</label>
                 <input type="text" id="inputUserName" class="form-control">
             </div>
             <div class="form-group">
-                <label for="inputUserPassword">Password</label>
+                <label for="inputUserPassword">@translator.Translate(userLanguage, "Password")</label>
                 <input type="password" id="inputUserPassword" class="form-control">
             </div>
             <div class="d-grid">
-                <button type="button" class="btn btn-warning mt-2" onclick="performRegistration()"><i class="bi bi-box-arrow-in-right me-2"></i>Register</button>
+                <button type="button" class="btn btn-warning mt-2" onclick="performRegistration()"><i class="bi bi-box-arrow-in-right me-2"></i>@translator.Translate(userLanguage, "Register")</button>
             </div>
             <div class="d-grid">
-                <a href="/Login/Index" class="btn btn-link mt-2">Back to Login</a>
+                <a href="/Login/Index" class="btn btn-link mt-2">@translator.Translate(userLanguage, "Back to Login")</a>
             </div>
         </div>
     </div>

Views/Login/ResetPassword.cshtml

@@ -1,7 +1,9 @@
 @using CarCareTracker.Helper
 @inject IConfigHelper config
+@inject ITranslationHelper translator
 @{
     var logoUrl = config.GetLogoUrl();
+    var userLanguage = config.GetServerLanguage();
 }
 @{
     ViewData["Title"] = "LubeLogger - Register";
@@ -14,22 +16,22 @@
         <div class="col-12">
             <img src="@logoUrl" />
             <div class="form-group">
-                <label for="inputToken">Token</label>
+                <label for="inputToken">@translator.Translate(userLanguage, "Token")</label>
                 <input type="text" id="inputToken" class="form-control">
             </div>
             <div class="form-group">
-                <label for="inputUserName">Email Address</label>
+                <label for="inputUserName">@translator.Translate(userLanguage, "Email Address")</label>
                 <input type="text" id="inputEmail" class="form-control">
             </div>
             <div class="form-group">
-                <label for="inputUserPassword">New Password</label>
+                <label for="inputUserPassword">@translator.Translate(userLanguage, "New Password")</label>
                 <input type="password" id="inputUserPassword" class="form-control">
             </div>
             <div class="d-grid">
-                <button type="button" class="btn btn-warning mt-2" onclick="performPasswordReset()"><i class="bi bi-box-arrow-in-right me-2"></i>Reset Password</button>
+                <button type="button" class="btn btn-warning mt-2" onclick="performPasswordReset()"><i class="bi bi-box-arrow-in-right me-2"></i>@translator.Translate(userLanguage, "Reset Password")</button>
             </div>
             <div class="d-grid">
-                <a href="/Login/Index" class="btn btn-link mt-2">Back to Login</a>
+                <a href="/Login/Index" class="btn btn-link mt-2">@translator.Translate(userLanguage, "Back to Login")</a>
             </div>
         </div>
     </div>

Views/Shared/401.cshtml

@@ -1 +1,8 @@
-<h1>Access Denied</h1>
+<div class="row">
+    <div class="col-1">
+        <a href="/Home" class="btn btn-secondary btn-md mt-1 mb-1"><i class="bi bi-arrow-left-square"></i></a>
+    </div>
+    <div class="col-11">
+        <h1>Access Denied</h1>
+    </div>
+</div>

Views/Shared/_Layout.cshtml

@@ -1,6 +1,7 @@
 @using CarCareTracker.Helper
 <!DOCTYPE html>
 @inject IConfigHelper config
+@inject ITranslationHelper translator
 @{
     var userConfig = config.GetUserConfig(User);
     var useDarkMode = userConfig.UseDarkMode;
@@ -10,6 +11,7 @@
     var useThreeDecimals = userConfig.UseThreeDecimalGasCost;
     var shortDatePattern = System.Globalization.CultureInfo.CurrentCulture.DateTimeFormat.ShortDatePattern;
     var numberFormat = System.Globalization.CultureInfo.CurrentCulture.NumberFormat;
+    var userLanguage = userConfig.UserLanguage;
     shortDatePattern = shortDatePattern.ToLower();
     if (!shortDatePattern.Contains("dd"))
     {
@@ -86,7 +88,7 @@
             return input;
         }
         function genericErrorMessage(){
-            return "An error has occurred, please try again later";
+            return decodeHTMLEntities('@translator.Translate(userLanguage, "An error has occurred, please try again later")');
         }
     </script>
     @await RenderSectionAsync("Scripts", required: false)

Views/Vehicle/_NoteModal.cshtml

@@ -28,6 +28,24 @@
                     <label for="noteTextArea">@translator.Translate(userLanguage,"Notes")<a class="link-underline link-underline-opacity-0" onclick="showLinks(this)"><i class="bi bi-markdown ms-2"></i></a></label>
                     <textarea class="form-control vehicleNoteContainer" id="noteTextArea">@Model.NoteText</textarea>
                 </div>
+                <div class="col-12">
+                    @if (Model.Files.Any())
+                    {
+                        <div>
+                            @await Html.PartialAsync("_UploadedFiles", Model.Files)
+                            <label for="serviceRecordFiles">@translator.Translate(userLanguage, "Upload more documents")</label>
+                            <input onChange="uploadVehicleFilesAsync(this)" type="file" multiple accept=".png,.jpg,.jpeg,.pdf,.xls,.xlsx,.docx" class="form-control-file" id="noteFiles">
+                            <br /><small class="text-body-secondary">@translator.Translate(userLanguage, "Max File Size: 28.6MB")</small>
+                        </div>
+                    }
+                    else
+                    {
+                        <label for="serviceRecordFiles">@translator.Translate(userLanguage, "Upload documents(optional)")</label>
+                        <input onChange="uploadVehicleFilesAsync(this)" type="file" multiple accept=".png,.jpg,.jpeg,.pdf,.xls,.xlsx,.docx" class="form-control-file" id="noteFiles">
+                        <br />
+                        <small class="text-body-secondary">@translator.Translate(userLanguage, "Max File Size: 28.6MB")</small>
+                    }
+                </div>
                 <div class="col-12">
                     <label for="noteRecordTag">@translator.Translate(userLanguage,"Tags(optional)")</label>
                     <select multiple class="form-select" id="noteRecordTag">
@@ -57,6 +75,14 @@
     }
 </div>
 <script>
+    var uploadedFiles = [];
+    getUploadedFilesFromModel();
+    function getUploadedFilesFromModel() {
+        @foreach (UploadedFiles filesUploaded in Model.Files)
+            {
+            @:uploadedFiles.push({ name: "@filesUploaded.Name", location: "@filesUploaded.Location" });
+        }
+    }
     function getNoteModelData(){
         return { id: @Model.Id}
     }

Views/Vehicle/_ReminderMakeUpReport.cshtml

@@ -16,10 +16,15 @@
             new Chart($("#donut-chart"), {
                 type: 'doughnut',
                 data: {
-                    labels: ['@translator.Translate(userLanguage,"Not Urgent")', '@translator.Translate(userLanguage,"Urgent")', '@translator.Translate(userLanguage,"Very Urgent")', '@translator.Translate(userLanguage,"Past Due")'],
+                    labels: [
+                    decodeHTMLEntities('@translator.Translate(userLanguage, "Not Urgent")'), 
+                    decodeHTMLEntities('@translator.Translate(userLanguage, "Urgent")'), 
+                    decodeHTMLEntities('@translator.Translate(userLanguage, "Very Urgent")'), 
+                    decodeHTMLEntities('@translator.Translate(userLanguage, "Past Due")')
+                    ],
                     datasets: [
                         {
-                            label: '@translator.Translate(userLanguage,"Reminders by Category")',
+                            label: decodeHTMLEntities('@translator.Translate(userLanguage, "Reminders by Category")'),
                             backgroundColor: ["#488f31", "#ffa600", "#de425b", "#cccccc"],
                             data: [
                                 @Model.NotUrgentCount,
@@ -40,7 +45,7 @@
                         },
                         title: {
                             display: true,
-                            text: '@translator.Translate(userLanguage,"Reminders by Urgency")',
+                            text: decodeHTMLEntities('@translator.Translate(userLanguage, "Reminders by Urgency")'),
                             color: useDarkMode ? "#fff" : "#000"
                         },
                     }

wwwroot/js/login.js

@@ -4,7 +4,13 @@
     var isPersistent = $("#inputPersistent").is(":checked");
     $.post('/Login/Login', {userName: userName, password: userPassword, isPersistent: isPersistent}, function (data) {
         if (data) {
-            window.location.href = '/Home';
+            //check for redirectURL
+            var redirectURL = getRedirectURL().url;
+            if (redirectURL.trim() != "") {
+                window.location.href = redirectURL;
+            } else {
+                window.location.href = '/Home';
+            }
         } else {
             errorToast("Invalid Login Credentials, please try again.");
         }

wwwroot/js/note.js

@@ -96,6 +96,7 @@ function getAndValidateNoteValues() {
         vehicleId: vehicleId,
         description: noteDescription,
         noteText: noteText,
+        files: uploadedFiles,
         pinned: noteIsPinned,
         tags: noteTags
     }