bump to beta 9

YAFNET · May 19, 2024 · 7ffce06 · 7ffce06
1 parent c50bb6e
commit 7ffce06
Show file tree

Hide file tree

Showing 7 changed files with 37 additions and 19 deletions.
diff --git a/.gitignore b/.gitignore
@@ -3,3 +3,5 @@
 *.cache
 YAF.SampleWebApplication/package-lock.json
 YAF.SampleApp/package-lock.json
+/YAF.SampleApp/bin
+/YAF.SampleApp/obj
diff --git a/YAF.SampleApp/Areas/Chat/Pages/Shared/_Layout.cshtml b/YAF.SampleApp/Areas/Chat/Pages/Shared/_Layout.cshtml
@@ -18,6 +18,7 @@
     <link href="~/favicons/site.webmanifest" rel="manifest" />
     <link href="~/favicons/safari-pinned-tab.svg" rel="mask-icon" color="#5bbad5" />
     <link href="~/favicons/favicon.ico" rel="shortcut icon" />
+    <script src="~/js/themeSelector.min.js"></script>
 </head>
 <body>
     <header>
@@ -30,21 +31,21 @@
                 </button>
                 <div class="navbar-collapse collapse d-sm-inline-flex justify-content-between">
                     <ul class="navbar-nav flex-grow-1">
-                        <li class="nav-item">
-                            <a class="nav-link" asp-area="" asp-page="/Index">Home</a>
-                        </li>
-                        <li class="nav-item">
-                            <a class="nav-link" asp-area="Forums" asp-page="/Index">Forums</a>
-                        </li>
-                        <li class="nav-item">
-                            <a class="nav-link" asp-area="Chat" asp-page="/Index">Chat</a>
-                        </li>
+	                    <li class="nav-item">
+		                    <a class="nav-link" asp-area="" asp-page="/Index">Home</a>
+	                    </li>
+	                    <li class="nav-item">
+		                    <a class="nav-link" asp-area="Forums" asp-page="/Index">Forums</a>
+	                    </li>
+	                    <li class="nav-item">
+                            <a class="nav-link active" asp-area="Chat" asp-page="/Index">Chat</a>
+	                    </li>
                     </ul>
                     <div class="form-inline mt-2 mt-md-0">
                         @if (Current.IsGuest)
                         {
-                            <a class="btn btn-outline-success my-2 my-sm-0 me-sm-2" asp-page="/Account/Login" asp-area="Forums">Login</a>
-                            <a class="btn btn-outline-success my-2 my-sm-0" asp-page="@(Current.BoardSettings.ShowRulesForRegistration ? "/Privacy" : "/Account/Register")" asp-area="Forums">Register</a>
+                            <a class="btn btn-outline-primary my-2 my-sm-0 me-sm-2" asp-page="/Account/Login" asp-area="Forums">Login</a>
+                            <a class="btn btn-outline-secondary my-2 my-sm-0" asp-page="@(Current.BoardSettings.ShowRulesForRegistration ? "/Privacy" : "/Account/Register")" asp-area="Forums">Register</a>
                         }
                         else
                         {

diff --git a/YAF.SampleApp/Areas/Chat/Pages/_ViewImports.cshtml b/YAF.SampleApp/Areas/Chat/Pages/_ViewImports.cshtml
@@ -0,0 +1,4 @@
+@using YAF.SampleApp
+@namespace YAF.SampleApp.Pages
+@addTagHelper *, Microsoft.AspNetCore.Mvc.TagHelpers
+@addTagHelper YAF.Web.TagHelpers.*, YAF.Web
diff --git a/YAF.SampleApp/Areas/Forums/Pages/Shared/_Layout.cshtml b/YAF.SampleApp/Areas/Forums/Pages/Shared/_Layout.cshtml
@@ -38,7 +38,8 @@
           type="text/css" />
     <link rel="stylesheet"
           href="~/css/@Html.Raw($"{ViewBag.ForumCss}.css?v={ViewBag.CdvVersion}")" />
-    @await RenderSectionAsync("StyleSheets", required: false)
+        @await RenderSectionAsync("StyleSheets", required: false)
+    <script src="~/js/themeSelector.min.js"></script>
     <link href="~/favicons/apple-touch-icon.png" rel="apple-touch-icon" sizes="180x180" />
     <link href="~/favicons/favicon-32x32.png" rel="icon" sizes="32x32" />
     <link href="~/favicons/favicon-16x16.png" rel="icon" sizes="16x16" />
@@ -182,7 +183,6 @@
                                                     @title
                                                 </span>
                                             </span>
-                                            // this.GetTextFormatted("MODERATE_NEW", this.PageContext.ModeratePosts)
                                         }
                                     </a>
                                 </li>
@@ -197,6 +197,11 @@
 
                         </ul>
                         @await Html.PartialAsync("_QuickSearch")
+
+                        @if (Current.BoardSettings.AllowUserTheme)
+                        {
+	                        @await Html.PartialAsync("_ThemeModeSelector")
+                        }
                     </div>
                 </div>
             </nav>

diff --git a/YAF.SampleApp/Pages/Shared/_Layout.cshtml b/YAF.SampleApp/Pages/Shared/_Layout.cshtml
@@ -20,6 +20,7 @@
     <link href="~/favicons/site.webmanifest" rel="manifest" />
     <link href="~/favicons/safari-pinned-tab.svg" rel="mask-icon" color="#5bbad5" />
     <link href="~/favicons/favicon.ico" rel="shortcut icon" />
+    <script src="~/js/themeSelector.min.js"></script>
 </head>
 <body>
     <header>
@@ -33,7 +34,7 @@
                 <div class="navbar-collapse collapse d-sm-inline-flex justify-content-between">
                     <ul class="navbar-nav flex-grow-1">
                         <li class="nav-item">
-                            <a class="nav-link" asp-area="" asp-page="/Index">Home</a>
+                            <a class="nav-link" asp-page="/Index">Home</a>
                         </li>
                         <li class="nav-item">
                             <a class="nav-link" asp-area="Forums" asp-page="/Index">Forums</a>
@@ -45,8 +46,8 @@
                     <div class="form-inline mt-2 mt-md-0">
                         @if (Current.IsGuest)
                         {
-                            <a class="btn btn-outline-success my-2 my-sm-0 me-sm-2" asp-page="/Account/Login" asp-area="Forums">Login</a>
-                            <a class="btn btn-outline-success my-2 my-sm-0" asp-page="@(Current.BoardSettings.ShowRulesForRegistration ? "/Privacy" : "/Account/Register")" asp-area="Forums">Register</a>
+                            <a class="btn btn-outline-primary my-2 my-sm-0 me-sm-2" asp-page="/Account/Login" asp-area="Forums">Login</a>
+                            <a class="btn btn-outline-secondary my-2 my-sm-0" asp-page="@(Current.BoardSettings.ShowRulesForRegistration ? "/Privacy" : "/Account/Register")" asp-area="Forums">Register</a>
                         }
                         else
                         {

diff --git a/YAF.SampleApp/YAF.SampleApp.csproj b/YAF.SampleApp/YAF.SampleApp.csproj
@@ -6,9 +6,9 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="YAFNET.Data.SqlServer" Version="4.0.0-beta07" />
-    <PackageReference Include="YAFNET.RazorPages" Version="4.0.0-beta07" />
-    <PackageReference Include="YAFNET.UI.Chat" Version="4.0.0-beta07" />
+    <PackageReference Include="YAFNET.Data.SqlServer" Version="4.0.0-beta09" />
+    <PackageReference Include="YAFNET.RazorPages" Version="4.0.0-beta09" />
+    <PackageReference Include="YAFNET.UI.Chat" Version="4.0.0-beta09" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/YAF.SampleApp/libman.json b/YAF.SampleApp/libman.json
@@ -0,0 +1,5 @@
+{
+  "version": "1.0",
+  "defaultProvider": "cdnjs",
+  "libraries": []
+}