From c9777042c090dc38d825f8eef669991c1a7aeda9 Mon Sep 17 00:00:00 2001
From: Dimitar Byalkov <CapitalRhino@users.noreply.github.com>
Date: Fri, 8 Apr 2022 20:55:29 +0300
Subject: [PATCH] Design changes

---
 .../WebApp/Controllers/RentsController.cs     |  2 +-
 RentACar/WebApp/Views/Cars/Create.cshtml      |  5 +--
 RentACar/WebApp/Views/Cars/Delete.cshtml      |  4 +--
 RentACar/WebApp/Views/Cars/Details.cshtml     |  4 +--
 RentACar/WebApp/Views/Cars/Edit.cshtml        |  5 +--
 RentACar/WebApp/Views/Cars/Index.cshtml       | 11 +++---
 RentACar/WebApp/Views/Home/Index.cshtml       | 23 ++++++++++---
 RentACar/WebApp/Views/Rents/Create.cshtml     |  6 +---
 RentACar/WebApp/Views/Rents/DateSelect.cshtml | 34 -------------------
 RentACar/WebApp/Views/Rents/Delete.cshtml     |  2 +-
 RentACar/WebApp/Views/Rents/Edit.cshtml       |  2 +-
 RentACar/WebApp/Views/Rents/Index.cshtml      |  2 +-
 12 files changed, 36 insertions(+), 64 deletions(-)
 delete mode 100644 RentACar/WebApp/Views/Rents/DateSelect.cshtml

diff --git a/RentACar/WebApp/Controllers/RentsController.cs b/RentACar/WebApp/Controllers/RentsController.cs
index 9d4d9be..574d066 100644
--- a/RentACar/WebApp/Controllers/RentsController.cs
+++ b/RentACar/WebApp/Controllers/RentsController.cs
@@ -60,7 +60,7 @@ namespace WebApp.Controllers
         [HttpPost]
         [ValidateAntiForgeryToken]
 
-        public async Task<IActionResult> Create([Bind("Id,CarId,StartDate,EndDate,UserId")] Rents rents)
+        public async Task<IActionResult> Create([Bind("Id,Car.Id,StartDate,EndDate,UserId")] Rents rents)
         {
             if (ModelState.IsValid)
             {
diff --git a/RentACar/WebApp/Views/Cars/Create.cshtml b/RentACar/WebApp/Views/Cars/Create.cshtml
index f459283..3cac6ec 100644
--- a/RentACar/WebApp/Views/Cars/Create.cshtml
+++ b/RentACar/WebApp/Views/Cars/Create.cshtml
@@ -43,15 +43,12 @@
             </div>
             <div class="form-group">
                 <input type="submit" value="Create" class="btn btn-primary" />
+                <a type="button" class="btn btn-secondary" asp-action="Index">Back to List</a>
             </div>
         </form>
     </div>
 </div>
 
-<div>
-    <a asp-action="Index">Back to List</a>
-</div>
-
 @section Scripts {
     @{await Html.RenderPartialAsync("_ValidationScriptsPartial");}
 }
diff --git a/RentACar/WebApp/Views/Cars/Delete.cshtml b/RentACar/WebApp/Views/Cars/Delete.cshtml
index c917cf8..800c5c4 100644
--- a/RentACar/WebApp/Views/Cars/Delete.cshtml
+++ b/RentACar/WebApp/Views/Cars/Delete.cshtml
@@ -51,7 +51,7 @@
     
     <form asp-action="Delete">
         <input type="hidden" asp-for="Id" />
-        <input type="submit" value="Delete" class="btn btn-danger" /> |
-        <a asp-action="Index">Back to List</a>
+        <input type="submit" value="Delete" class="btn btn-danger" />
+        <a type="button" class="btn btn-secondary" asp-action="Index">Back to List</a>
     </form>
 </div>
diff --git a/RentACar/WebApp/Views/Cars/Details.cshtml b/RentACar/WebApp/Views/Cars/Details.cshtml
index f0ad8cc..8dc386f 100644
--- a/RentACar/WebApp/Views/Cars/Details.cshtml
+++ b/RentACar/WebApp/Views/Cars/Details.cshtml
@@ -49,6 +49,6 @@
     </dl>
 </div>
 <div>
-    <a asp-action="Edit" asp-route-id="@Model.Id">Edit</a> |
-    <a asp-action="Index">Back to List</a>
+    <a type="button" class="btn btn-primary" asp-action="Edit" asp-route-id="@Model.Id">Edit</a>
+    <a type="button" class="btn btn-secondary" asp-action="Index">Back to List</a>
 </div>
diff --git a/RentACar/WebApp/Views/Cars/Edit.cshtml b/RentACar/WebApp/Views/Cars/Edit.cshtml
index 5300704..1c0f852 100644
--- a/RentACar/WebApp/Views/Cars/Edit.cshtml
+++ b/RentACar/WebApp/Views/Cars/Edit.cshtml
@@ -45,15 +45,12 @@
             </div>
             <div class="form-group">
                 <input type="submit" value="Save" class="btn btn-primary" />
+                <a type="button" class="btn btn-secondary" asp-action="Index">Back to List</a>
             </div>
         </form>
     </div>
 </div>
 
-<div>
-    <a asp-action="Index">Back to List</a>
-</div>
-
 @section Scripts {
     @{await Html.RenderPartialAsync("_ValidationScriptsPartial");}
 }
diff --git a/RentACar/WebApp/Views/Cars/Index.cshtml b/RentACar/WebApp/Views/Cars/Index.cshtml
index acbd785..42a1892 100644
--- a/RentACar/WebApp/Views/Cars/Index.cshtml
+++ b/RentACar/WebApp/Views/Cars/Index.cshtml
@@ -11,7 +11,7 @@
         <a type="button" class="btn btn-primary" asp-action="Create">Add new car</a>
     }
 </p>
-<table class="table">
+<table class="table table-striped">
     <thead>
         <tr>
             <th>
@@ -35,9 +35,12 @@
             <th>
                 Daily price
             </th>
-            <th>
-                Actions
-            </th>
+            @if (this.User.IsInRole("Admin"))
+            {
+                <th>
+                    Actions
+                </th>
+            }
         </tr>
     </thead>
     <tbody>
diff --git a/RentACar/WebApp/Views/Home/Index.cshtml b/RentACar/WebApp/Views/Home/Index.cshtml
index 2b4d8b1..cd7e982 100644
--- a/RentACar/WebApp/Views/Home/Index.cshtml
+++ b/RentACar/WebApp/Views/Home/Index.cshtml
@@ -3,11 +3,24 @@
 }
 
 <div class="text-center">
-    <h1 class="display-4">Welcome, @User.Identity.Name</h1>
-    <br />
-    <a type="button" class="btn btn-primary" asp-area="" asp-controller="Cars" asp-action="Index">Manage cars</a>
-    @if (this.User.IsInRole("Admin"))
+    @if (this.User.Identity.Name != null)
     {
-        <a type="button" class="btn btn-primary" asp-area="" asp-controller="Rents" asp-action="Index">Manage rents</a>
+        <h1 class="display-4">Welcome, @User.Identity.Name</h1>
+        <br />
+        @if (this.User.IsInRole("Admin"))
+        {
+            <a type="button" class="btn btn-primary" asp-area="" asp-controller="Cars" asp-action="Index">Manage cars</a>
+            <a type="button" class="btn btn-primary" asp-area="" asp-controller="Rents" asp-action="Index">Manage rents</a>
+        }
+        else
+        {
+            <a type="button" class="btn btn-primary" asp-area="" asp-controller="Cars" asp-action="Index">See all cars</a>
+            <a type="button" class="btn btn-primary" asp-area="" asp-controller="Rents" asp-action="Index">Rent a car</a>
+        }
+    }
+    else
+    {
+        <h1>Welcome to LuminousCars</h1>
+        <h2>Please register or login to access the system.</h2>
     }
 </div>
diff --git a/RentACar/WebApp/Views/Rents/Create.cshtml b/RentACar/WebApp/Views/Rents/Create.cshtml
index 0e221a3..bf11e3a 100644
--- a/RentACar/WebApp/Views/Rents/Create.cshtml
+++ b/RentACar/WebApp/Views/Rents/Create.cshtml
@@ -27,16 +27,12 @@
             </div>
             <div class="form-group">
                 <input type="submit" value="Create" class="btn btn-primary" />
+                <a type="button" class="btn btn-secondary" asp-action="Index">Back to List</a>
             </div>
         </form>
     </div>
 </div>
 
-<div>
-    <a asp-action="Index">Back to List</a>
-</div>
-
-
 
 @section Scripts {
     @{await Html.RenderPartialAsync("_ValidationScriptsPartial");}
diff --git a/RentACar/WebApp/Views/Rents/DateSelect.cshtml b/RentACar/WebApp/Views/Rents/DateSelect.cshtml
deleted file mode 100644
index f986344..0000000
--- a/RentACar/WebApp/Views/Rents/DateSelect.cshtml
+++ /dev/null
@@ -1,34 +0,0 @@
-@model Data.Entities.Rents
-
-@{
-    ViewData["Title"] = "DateSelect";
-}
-
-
-<h1>Rent a car</h1>
-<h2>Select dates</h2>
-
-<div class="row">
-    <div class="col-md-4">
-        <form asp-action="Create">
-            <div asp-validation-summary="ModelOnly" class="text-danger"></div>
-            <div class="form-group">
-                <label asp-for="StartDate" class="control-label"></label>
-                <input asp-for="StartDate" class="form-control" />
-                <span asp-validation-for="StartDate" class="text-danger"></span>
-            </div>
-            <div class="form-group">
-                <label asp-for="EndDate" class="control-label"></label>
-                <input asp-for="EndDate" class="form-control" />
-                <span asp-validation-for="EndDate" class="text-danger"></span>
-            </div>
-            <div class="form-group">
-                <input type="submit" value="Findiew" class="btn btn-primary" />
-            </div>
-        </form>
-    </div>
-</div>
-
-@section Scripts {
-    @{await Html.RenderPartialAsync("_ValidationScriptsPartial");}
-}
\ No newline at end of file
diff --git a/RentACar/WebApp/Views/Rents/Delete.cshtml b/RentACar/WebApp/Views/Rents/Delete.cshtml
index f4c1e6a..ef68092 100644
--- a/RentACar/WebApp/Views/Rents/Delete.cshtml
+++ b/RentACar/WebApp/Views/Rents/Delete.cshtml
@@ -51,6 +51,6 @@
     <form asp-action="Delete">
         <input type="hidden" asp-for="Id" />
         <input type="submit" value="Delete" class="btn btn-danger" />
-        <a class="btn btn-secondary" asp-action="Index">Back to List</a>
+        <a type="button" class="btn btn-secondary" asp-action="Index">Back to List</a>
     </form>
 </div>
diff --git a/RentACar/WebApp/Views/Rents/Edit.cshtml b/RentACar/WebApp/Views/Rents/Edit.cshtml
index 0e32495..2b0d787 100644
--- a/RentACar/WebApp/Views/Rents/Edit.cshtml
+++ b/RentACar/WebApp/Views/Rents/Edit.cshtml
@@ -28,7 +28,7 @@
             </div>
             <div class="form-group">
                 <input class="btn btn-primary" type="submit" value="Save" />
-                <a class="btn btn-secondary" asp-action="Index">Back to List</a>
+                <a type="button" class="btn btn-secondary" asp-action="Index">Back to List</a>
             </div>
         </form>
     </div>
diff --git a/RentACar/WebApp/Views/Rents/Index.cshtml b/RentACar/WebApp/Views/Rents/Index.cshtml
index afc1c5f..ca7e01d 100644
--- a/RentACar/WebApp/Views/Rents/Index.cshtml
+++ b/RentACar/WebApp/Views/Rents/Index.cshtml
@@ -11,7 +11,7 @@
 </p>
 @if (this.User.IsInRole("Admin"))
 {
-    <table class="table">
+    <table class="table table-striped">
         <thead>
             <tr>
                 <th>