Update navbar menu

* Update the nav menu spec * Add search page links to navbar * Add redirects in empty web page folders * Change search results link button color * Add background color to close/reopen pages * Rename Compliance Monitoring search page
gaepdit · Nov 1, 2024 · 3dfad86 · 3dfad86
1 parent bfe9457
commit 3dfad86
Show file tree

Hide file tree

Showing 18 changed files with 239 additions and 199 deletions.
diff --git a/docs/Navigation-menu.md b/docs/Navigation-menu.md
@@ -14,21 +14,18 @@ Shown when staff is logged in.
 
 * {Logo} Title (`/Staff`)
 * ▼ 🔍︎ Search
-    * Facilities (`/Staff/Facility`)
-    * Compliance Events/FCEs (`/Staff/Compliance`)
-    * Source Tests (`/Staff/SourceTests`)
-    * Enforcement (`/Staff/Enforcement`)
+    * Facilities (`/Facility`)
+    * —
+    * Compliance Monitoring (`/Compliance/Work`)
+    * Compliance FCEs (`/Compliance/FCE`)
+    * Enforcement (`/Compliance/Enforcement`)
 - ▭ *(flexible space)*
 * ▼ 🡽 Go To
     * Facility *(form)*
     * —
     * Compliance Event *(form)*
     * Source Test *(form)*
     * Enforcement *(form)*
-* ▼ ＋Add New
-    * Compliance Work Entry (`/Staff/Compliance/WorkEntry/Add`)
-    * Full Compliance Evaluation (`/Staff/Compliance/FCE/Add`)
-    * Enforcement (`/Staff/Enforcement/Add`)
 * ▼ More
     * Reports (`/Admin/Reporting`)
     * Users (`/Admin/Users`)

diff --git a/src/WebApp/Pages/Admin/Index.cshtml b/src/WebApp/Pages/Admin/Index.cshtml
@@ -0,0 +1,2 @@
+@page
+@model IndexModel
diff --git a/src/WebApp/Pages/Admin/Index.cshtml.cs b/src/WebApp/Pages/Admin/Index.cshtml.cs
@@ -0,0 +1,6 @@
+namespace AirWeb.WebApp.Pages.Admin;
+
+public class IndexModel : PageModel
+{
+    public IActionResult OnGet() => RedirectToPage("../Index");
+}
diff --git a/src/WebApp/Pages/Admin/Users/Index.cshtml b/src/WebApp/Pages/Admin/Users/Index.cshtml
@@ -106,7 +106,7 @@
                     <td>@Html.DisplayFor(_ => item.OfficeName, DisplayTemplate.TextOrPlaceholder, new { Placeholder = "none" })</td>
                     <td>@Html.DisplayFor(_ => item.Active, DisplayTemplate.BoolActive)</td>
                     <td>
-                        <a asp-page="Details" asp-route-id="@item.Id" class="btn btn-sm btn-outline-info text-body-emphasis">View</a>
+                        <a asp-page="Details" asp-route-id="@item.Id" class="btn btn-sm btn-outline-primary">View</a>
                     </td>
                 </tr>
             }

diff --git a/src/WebApp/Pages/Compliance/Index.cshtml b/src/WebApp/Pages/Compliance/Index.cshtml
@@ -0,0 +1,2 @@
+@page
+@model IndexModel
diff --git a/src/WebApp/Pages/Compliance/Index.cshtml.cs b/src/WebApp/Pages/Compliance/Index.cshtml.cs
@@ -0,0 +1,6 @@
+namespace AirWeb.WebApp.Pages.Compliance;
+
+public class IndexModel : PageModel
+{
+    public IActionResult OnGet() => RedirectToPage("../Index");
+}
diff --git a/src/WebApp/Pages/Compliance/Work/Close.cshtml b/src/WebApp/Pages/Compliance/Work/Close.cshtml
@@ -12,7 +12,7 @@
     <em>Confirm:</em> @ViewData["Title"]
 </h1>
 
-<div class="p-3 border rounded-3">
+<div class="p-3 border rounded-3 bg-light-subtle">
     <p class="lead font-weight-medium">Are you sure you want to close this @Model.ItemSummary.ItemName?</p>
     <dl class="row">
         <dt class="col-sm-4 col-lg-3">Facility</dt>

diff --git a/src/WebApp/Pages/Compliance/Work/Index.cshtml b/src/WebApp/Pages/Compliance/Work/Index.cshtml
@@ -4,7 +4,7 @@
 @using GaEpd.AppLibrary.Extensions
 @model ComplianceIndexModel
 @{
-    ViewData["Title"] = "Compliance Work Entry Search";
+    ViewData["Title"] = "Compliance Monitoring Search";
 }
 
 <h1>@ViewData["Title"]</h1>

diff --git a/src/WebApp/Pages/Compliance/Work/Reopen.cshtml b/src/WebApp/Pages/Compliance/Work/Reopen.cshtml
@@ -12,7 +12,7 @@
     <em>Confirm:</em> @ViewData["Title"]
 </h1>
 
-<div class="p-3 border rounded-3">
+<div class="p-3 border rounded-3 bg-light-subtle">
     <p class="lead font-weight-medium">Are you sure you want to reopen this @Model.ItemSummary.ItemName?</p>
     <dl class="row">
         <dt class="col-sm-4 col-lg-3">Facility</dt>

diff --git a/src/WebApp/Pages/Index.cshtml b/src/WebApp/Pages/Index.cshtml
@@ -6,30 +6,32 @@
 
 <h1>@ViewData["Title"]</h1>
 
-<div class="card mt-4 border-info shadow">
-    <div class="card-header text-bg-info">
-        <h2 class="h5">Some helpful temporary testing links</h2>
-    </div>
-    <div class="card-body">
-        <ul>
-            <li>
-                <a asp-page="/Facility/Index">List of test facilities</a>
-            </li>
-            <li>
-                <a asp-page="/Compliance/FCE/Index">FCE search page</a>
-            </li>
-            <li>
-                <a asp-page="/Compliance/Work/Index">Compliance Work search page</a>
-            </li>
-            <li>
-                <a asp-page="/Account/Index">Your account page</a>
-            </li>
-            <li>
-                <a asp-page="/Admin/Users/Index">All users</a>
-            </li>
-            <li>
-                <a asp-page="/Admin/Maintenance/Index">Site maintenance</a>
-            </li>
-        </ul>
-    </div>
-</div>
+<p>Coming Soon: Staff Dashboard</p>
+
+@* <div class="card mt-4 border-info shadow"> *@
+@*     <div class="card-header text-bg-info"> *@
+@*         <h2 class="h5">Some helpful temporary testing links</h2> *@
+@*     </div> *@
+@*     <div class="card-body"> *@
+@*         <ul> *@
+@*             <li> *@
+@*                 <a asp-page="/Facility/Index">List of test facilities</a> *@
+@*             </li> *@
+@*             <li> *@
+@*                 <a asp-page="/Compliance/FCE/Index">FCE search page</a> *@
+@*             </li> *@
+@*             <li> *@
+@*                 <a asp-page="/Compliance/Work/Index">Compliance Work search page</a> *@
+@*             </li> *@
+@*             <li> *@
+@*                 <a asp-page="/Account/Index">Your account page</a> *@
+@*             </li> *@
+@*             <li> *@
+@*                 <a asp-page="/Admin/Users/Index">All users</a> *@
+@*             </li> *@
+@*             <li> *@
+@*                 <a asp-page="/Admin/Maintenance/Index">Site maintenance</a> *@
+@*             </li> *@
+@*         </ul> *@
+@*     </div> *@
+@* </div> *@
diff --git a/src/WebApp/Pages/Shared/CompliancePartials/_FceSearchTable.cshtml b/src/WebApp/Pages/Shared/CompliancePartials/_FceSearchTable.cshtml
@@ -35,7 +35,7 @@
             <tr class="@(item.IsDeleted ? "table-danger" : "")">
                 <th scope="row">
                     <a asp-page="/Compliance/FCE/Details" asp-route-id="@item.Id.ToString()"
-                       class="btn btn-sm btn-outline-info">
+                       class="btn btn-sm btn-outline-primary">
                         @item.Id.ToString()
                     </a>
                     @if (item.IsDeleted)

diff --git a/src/WebApp/Pages/Shared/CompliancePartials/_SourceTestsTable.cshtml b/src/WebApp/Pages/Shared/CompliancePartials/_SourceTestsTable.cshtml
@@ -21,7 +21,7 @@
                 <td>
                     <a asp-page="/Compliance/TestReport/Index"
                        asp-route-referenceNumber="@summary.ReferenceNumber"
-                       class="btn btn-sm btn-outline-info">
+                       class="btn btn-sm btn-outline-primary">
                         @summary.ReferenceNumber.ToString()
                     </a>
                 </td>

diff --git a/src/WebApp/Pages/Shared/CompliancePartials/_WorkEntrySearchTable.cshtml b/src/WebApp/Pages/Shared/CompliancePartials/_WorkEntrySearchTable.cshtml
@@ -37,7 +37,10 @@
         {
             <tr class="@(item.IsDeleted ? "table-danger" : "")">
                 <th scope="row">
-                    <a asp-page="/Compliance/Work/Details" asp-route-id="@item.Id.ToString()" class="btn btn-sm btn-outline-info">@item.Id.ToString()</a>
+                    <a asp-page="/Compliance/Work/Details" asp-route-id="@item.Id.ToString()"
+                       class="btn btn-sm btn-outline-primary">
+                        @item.Id.ToString()
+                    </a>
                     @if (item.IsDeleted)
                     {
                         @:DELETED<br />