Merge pull request #107 from LD-Reborn/86-add-embeddingsearch-logo-and-improve-navbar

Added logo to navbar, reworked navbar layout

src/Server/Tools/CriticalCSS/CriticalCSSGenerator.js

@@ -91,8 +91,8 @@ async function generateCriticalCSSForViews() {
           forceExclude: ['.btn'], // Otherwise buttons end up colorless and .btn overrides other classes like .btn-warning, etc. - so it has to be force-excluded here and re-added later
           forceInclude: [
             '[data-bs-theme="dark"]', '[data-bs-theme="dark"] body', '[data-bs-theme="dark"] .navbar', '[data-bs-theme="dark"] .card', '[data-bs-theme="dark"] .btn',
-            '.navbar',
             '.col-md-4',
+            '.navbar', '.ms-auto', '.dropdown', '.dropdown-menu',
             '.visually-hidden', // visually hidden headings
             '.bi-info-circle-fill', '.text-info', // info icon
             '.container', '.col-md-6', '.row', '.g-4', '.row>*',

src/Server/Tools/CriticalCSS/README.md

@@ -1,5 +1,5 @@
 # How to use CriticalCSS
-1. Install it here
+1. Install the dependencies from here
 ```bash
 npm i -D critical
 npm install puppeteer
@@ -7,5 +7,4 @@ npm install puppeteer
 2. Run the css generator:
 ```bash
 node CriticalCSSGenerator.js
-```
-3. Move the `.css` files from the current directory to the `CriticalCSS/` folder (overwrite existing files)
+```

src/Server/Views/Shared/_Layout.cshtml

@@ -52,7 +52,9 @@
     <header>
         <nav class="navbar navbar-expand-sm navbar-toggleable-sm navbar-light border-bottom box-shadow mb-3">
             <div class="container-fluid">
-                <a class="navbar-brand" asp-area="" asp-controller="Home" asp-action="Index">embeddingsearch</a>
+                <a class="navbar-brand" asp-area="" asp-controller="Home" asp-action="Index">
+                    <img fetchpriority="high" alt="Logo" src="/logo.png" width="40" height="40" style="width: 40px; height: 40px;">
+                </a>
                 <button class="navbar-toggler" type="button" data-bs-toggle="collapse" data-bs-target=".navbar-collapse" aria-controls="navbarSupportedContent"
                         aria-expanded="false" aria-label="Toggle navigation">
                     <span class="navbar-toggler-icon"></span>
@@ -69,17 +71,20 @@
                             </li>
                             @if (User.IsInRole("Admin") || User.IsInRole("Swagger"))
                             {
-                                <li class="nav-item">
-                                    <a class="nav-link text" href="/swagger/index.html?ReturnUrl=@(currentUrl)">@T["Swagger"]</a>
+                                <li class="nav-item dropdown">
+                                    <a class="nav-link dropdown-toggle" href="#" id="navbarDropdownMenuLink" data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+                                        @T["Tools"]
+                                    </a>
+                                    <div class="dropdown-menu" aria-labelledby="navbarDropdownMenuLink">
+                                        <a class="dropdown-item" href="/swagger/index.html?ReturnUrl=@(currentUrl)">@T["Swagger"]</a>
+                                        @if (User.IsInRole("Admin"))
+                                        {
+                                            <a class="dropdown-item" href="/elmah?ReturnUrl=@(currentUrl)">@T["Elmah"]</a>
+                                        }
+                                    </div>
                                 </li>
                             }
-                            @if (User.IsInRole("Admin"))
-                            {
-                                <li class="nav-item">
-                                    <a class="nav-link text" href="/elmah?ReturnUrl=@(currentUrl)">@T["Elmah"]</a>
-                                </li>
-                            }
-                            <li class="nav-item">
+                            <li class="nav-item ms-auto">
                                 <a class="nav-link text" asp-area="" asp-controller="Account" asp-action="Logout">@T["Logout"]</a>
                             </li>
                         }