From b25949a8f32bc94999c2e0e61931bc6bf2a0cd72 Mon Sep 17 00:00:00 2001 From: limited_dev Date: Tue, 14 Feb 2023 12:46:52 +0100 Subject: [PATCH] v0.1.3 release fixed some issues, forgot which ones --- ImageBoardServerApp/App.razor | 3 ++- .../Data/Repository/UsersRepository.cs | 8 ++++++++ ImageBoardServerApp/Data/TheManager.cs | 9 +++++++-- ImageBoardServerApp/Pages/Accounts/Login.razor | 2 +- ImageBoardServerApp/Pages/Accounts/Register.razor | 2 +- ImageBoardServerApp/Pages/_Host.cshtml | 2 +- .../Shared/Components/Forms/PostForm.razor | 1 + ImageBoardServerApp/Shared/Components/Post.razor | 13 +++++++++++++ ImageBoardServerApp/Shared/NavMenu.razor | 2 +- 9 files changed, 35 insertions(+), 7 deletions(-) diff --git a/ImageBoardServerApp/App.razor b/ImageBoardServerApp/App.razor index 95375bd..29ae568 100644 --- a/ImageBoardServerApp/App.razor +++ b/ImageBoardServerApp/App.razor @@ -1,4 +1,5 @@ - + + diff --git a/ImageBoardServerApp/Data/Repository/UsersRepository.cs b/ImageBoardServerApp/Data/Repository/UsersRepository.cs index 77750b1..2b3141d 100644 --- a/ImageBoardServerApp/Data/Repository/UsersRepository.cs +++ b/ImageBoardServerApp/Data/Repository/UsersRepository.cs @@ -20,6 +20,14 @@ public static class UsersRepository await using var db = new AppDBContext(); return await db.Users.FirstOrDefaultAsync(user => user.UserID == userId); } + + public static async Task getUserByEmailRawAsync(string email) + { + await using var db = new AppDBContext(); + return await db.Users + .Where(user => user.Email == email) + .FirstOrDefaultAsync(); + } public static async Task getUserByEmailAsync(string email) { diff --git a/ImageBoardServerApp/Data/TheManager.cs b/ImageBoardServerApp/Data/TheManager.cs index b901ce5..f011cd4 100644 --- a/ImageBoardServerApp/Data/TheManager.cs +++ b/ImageBoardServerApp/Data/TheManager.cs @@ -10,6 +10,11 @@ public class TheManager return (DateTimeOffset.Now.ToUnixTimeMilliseconds() - post.CreatedAt); } + /// + /// Returns the value without a minus, if it exists + /// + /// + /// private static long getValue(long num) { return num < 0 ? num * -1 : num; @@ -17,13 +22,13 @@ public class TheManager public static long getBumpValue(PostData post) { - return getValue( 10 * 60000 - getDiff(post)) + getDiff(post) / post.Comments.Count; + return 10 * 60000 - getDiff(post) + ( 60000 * (post.Comments.Count + 1)); } public static async Task> getPostList(string boardTag) { List threads = await PostsRepository.getPostsByBoardAsync(boardTag); - return threads.OrderBy(getBumpValue).ToList(); + return threads.OrderBy(getBumpValue).Reverse().ToList(); } public static async Task bumpThreads(BoardData board) diff --git a/ImageBoardServerApp/Pages/Accounts/Login.razor b/ImageBoardServerApp/Pages/Accounts/Login.razor index 28bc4cb..534c231 100644 --- a/ImageBoardServerApp/Pages/Accounts/Login.razor +++ b/ImageBoardServerApp/Pages/Accounts/Login.razor @@ -30,7 +30,7 @@ private async Task login() { Console.WriteLine("loggin you in..."); - var user = await UsersRepository.getUserByEmailAsync(Email); + var user = await UsersRepository.getUserByEmailRawAsync(Email); if (user == null) { await js.InvokeVoidAsync("alert", "User does not exist"); diff --git a/ImageBoardServerApp/Pages/Accounts/Register.razor b/ImageBoardServerApp/Pages/Accounts/Register.razor index a5b1fd6..adbdfc1 100644 --- a/ImageBoardServerApp/Pages/Accounts/Register.razor +++ b/ImageBoardServerApp/Pages/Accounts/Register.razor @@ -43,7 +43,7 @@ } await UsersRepository.createUserAsync(userToCreate); - var user = await UsersRepository.getUserByEmailAsync(Email); + var user = await UsersRepository.getUserByEmailRawAsync(Email); if (user == null) { await js.InvokeVoidAsync("alert", "User does not exist"); diff --git a/ImageBoardServerApp/Pages/_Host.cshtml b/ImageBoardServerApp/Pages/_Host.cshtml index 6886334..630ed2f 100644 --- a/ImageBoardServerApp/Pages/_Host.cshtml +++ b/ImageBoardServerApp/Pages/_Host.cshtml @@ -4,7 +4,7 @@ @addTagHelper *, Microsoft.AspNetCore.Mvc.TagHelpers - + diff --git a/ImageBoardServerApp/Shared/Components/Forms/PostForm.razor b/ImageBoardServerApp/Shared/Components/Forms/PostForm.razor index 0c7b999..b88a9a3 100644 --- a/ImageBoardServerApp/Shared/Components/Forms/PostForm.razor +++ b/ImageBoardServerApp/Shared/Components/Forms/PostForm.razor @@ -153,6 +153,7 @@ { //Open post successfull NavigationManager.NavigateTo($"/{board.Tag}/thread/{postId}", true, true); + await TheManager.bumpThreads(board); Console.WriteLine("Post created"); } else diff --git a/ImageBoardServerApp/Shared/Components/Post.razor b/ImageBoardServerApp/Shared/Components/Post.razor index 7d1613e..80fd4c7 100644 --- a/ImageBoardServerApp/Shared/Components/Post.razor +++ b/ImageBoardServerApp/Shared/Components/Post.razor @@ -21,6 +21,12 @@ @getTimeFromUnix(post.CreatedAt) No.@post.PostID + + + + (@value) + + @if (opened) { @@ -99,12 +105,19 @@ private string toggleText = "-"; + private string value; + private void ToggleOpened() { opened = !opened; toggleText = opened ? "-" : "+"; } + protected override async Task OnInitializedAsync() + { + value = TheManager.getBumpValue(post) + "v"; + } + [Parameter] [Required] public PostData post { get; set; } diff --git a/ImageBoardServerApp/Shared/NavMenu.razor b/ImageBoardServerApp/Shared/NavMenu.razor index e0a844f..17f546d 100644 --- a/ImageBoardServerApp/Shared/NavMenu.razor +++ b/ImageBoardServerApp/Shared/NavMenu.razor @@ -4,7 +4,7 @@
- ImageBoard + IB v0.1.3 [Logout]