updated to yaf 4.0.0 beta 7

YAFNET · Mar 28, 2024 · c50bb6e · c50bb6e
1 parent afdff70
commit c50bb6e
Show file tree

Hide file tree

Showing 16 changed files with 96 additions and 435 deletions.
diff --git a/YAF.SampleApp/AllChatHub.cs b/YAF.SampleApp/AllChatHub.cs
diff --git a/YAF.SampleApp/Areas/Chat/Pages/Shared/_Layout.cshtml b/YAF.SampleApp/Areas/Chat/Pages/Shared/_Layout.cshtml
@@ -0,0 +1,84 @@
+@using YAF.Core.Context
+@using YAF.Core.Extensions
+@using YAF.Core.Services
+
+@inject BoardContext Current
+
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="utf-8" />
+    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+    <title>@ViewData["Title"] - YAF.SampleApp</title>
+    <link rel="stylesheet" href="@Html.Raw(Current.Get<ITheme>().BuildThemePath("bootstrap-forum.min.css"))"
+          type="text/css" asp-append-version="true" />
+    <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" />
+    <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" />
+</head>
+<body>
+    <header>
+        <nav class="navbar navbar-expand-sm navbar-toggleable-sm border-bottom box-shadow mb-3">
+            <div class="container">
+                <a class="navbar-brand" asp-area="" asp-page="/Index">YAF.SampleApp</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>
+                </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>
+                    </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>
+                        }
+                        else
+                        {
+                            @("Welcome ")<span class="fw-bold">@HtmlEncoder.Encode(Current.PageUser.DisplayOrUserName())</span>
+                            <a class="btn btn-outline-secondary"
+                               role="button"
+                               href="javascript:LogOutClick()"
+                               aria-label="sign-out-alt">Logout
+                            </a>
+                        }
+                    </div>
+                </div>
+            </div>
+        </nav>
+    </header>
+    <div class="container">
+        <main role="main" class="pb-3">
+            @RenderBody()
+        </main>
+    </div>
+
+<footer class="border-top footer text-muted">
+    <div class="container">
+        &copy; 2024 - YAF.SampleApp
+    </div>
+</footer>
+
+<script src="@(Current.Get<BoardInfo>().GetUrlToScripts("forumExtensions.min.js"))" asp-append-version="true"></script>
+
+@if (!Current.IsGuest)
+{
+    @await Html.PartialAsync("_LogoutConfirm")
+}
+
+@await RenderSectionAsync("Scripts", required: false)
+</body>
+</html>
diff --git a/YAF.SampleApp/Areas/Forums/Pages/Shared/_Layout.cshtml b/YAF.SampleApp/Areas/Forums/Pages/Shared/_Layout.cshtml
@@ -68,10 +68,7 @@
                             <a class="nav-link active" asp-area="Forums" asp-page="/Index">Forums</a>
                         </li>
                         <li class="nav-item">
-                            <a class="nav-link" asp-page="/Chat">Chat</a>
-                        </li>
-                        <li class="nav-item">
-                            <a class="nav-link" asp-area="" asp-page="/Privacy">Privacy</a>
+                            <a class="nav-link" asp-area="Chat" asp-page="/Index">Chat</a>
                         </li>
                     </ul> 
                     <div class="form-inline mt-2 mt-md-0">

diff --git a/YAF.SampleApp/Areas/Forums/Pages/_ViewImports.cshtml b/YAF.SampleApp/Areas/Forums/Pages/_ViewImports.cshtml
@@ -1,5 +1,4 @@
-@namespace YAF.Pages
-
+@using YAF.SampleApp
+@namespace YAF.SampleApp.Pages
 @addTagHelper *, Microsoft.AspNetCore.Mvc.TagHelpers
 @addTagHelper YAF.Web.TagHelpers.*, YAF.Web
-@addTagHelper *, YetAnotherForum.NET
diff --git a/YAF.SampleApp/Areas/Forums/Pages/_ViewStart.cshtml b/YAF.SampleApp/Areas/Forums/Pages/_ViewStart.cshtml
diff --git a/YAF.SampleApp/ChatMessage.cs b/YAF.SampleApp/ChatMessage.cs
diff --git a/YAF.SampleApp/GlobalUsings.cs b/YAF.SampleApp/GlobalUsings.cs
@@ -1,6 +1,5 @@
 // Global using directives
 
-global using YAF.Configuration;
 global using YAF.Core.Context;
 global using YAF.Types.Interfaces;
 global using YAF.Types.Interfaces.Services;
diff --git a/YAF.SampleApp/Pages/Chat.cshtml b/YAF.SampleApp/Pages/Chat.cshtml