Merge remote-tracking branch 'origin/Eric' into Eric
This commit is contained in:
commit
dcee1400d0
6 changed files with 14 additions and 16 deletions
|
@ -32,7 +32,11 @@
|
|||
|
||||
private async Task login()
|
||||
{
|
||||
var user = await UsersRepository.getUserByEmailRawAsync(Email);
|
||||
var user = await UsersRepository.getUserByEmailRawAsync(Email.ToLower());
|
||||
if (user == null)
|
||||
{
|
||||
user = await UsersRepository.getUserByEmailRawAsync(Email);
|
||||
}
|
||||
if (user == null)
|
||||
{
|
||||
await js.InvokeVoidAsync("alert", "User does not exist");
|
||||
|
|
|
@ -72,8 +72,8 @@
|
|||
msg = "Saving...";
|
||||
UserData userToCreate = new UserData()
|
||||
{
|
||||
Email = Email,
|
||||
ProposedEmail = Email,
|
||||
Email = Email.ToLower(),
|
||||
ProposedEmail = Email.ToLower(),
|
||||
Password = BCrypt.Net.BCrypt.HashPassword(Password),
|
||||
Role = "User",
|
||||
TimeBanned = -1,
|
||||
|
@ -94,10 +94,10 @@
|
|||
|
||||
msg = "Sending....";
|
||||
|
||||
Postman.sendMail(Email,
|
||||
Postman.sendMail(Email.ToLower(),
|
||||
"Confirm email",
|
||||
"Confirm you email:\n" +
|
||||
$"https://bulletboards.xyz/sys/click/confirmmail/{uid}/{Email}/{Email}/{hash}");
|
||||
$"https://bulletboards.xyz/sys/click/confirmmail/{uid}/{Email.ToLower()}/{Email.ToLower()}/{hash}");
|
||||
|
||||
msg = "Done. Check email.";
|
||||
|
||||
|
|
|
@ -13,7 +13,7 @@
|
|||
<br/>
|
||||
Click <a href="https://www.gnu.org/philosophy/free-sw.en.html">here</a> to learn more about free software.
|
||||
<br/>
|
||||
Check out the project on <a href="https://git.limited-dev.de/eric/imageboard">Gitlab</a>.
|
||||
Check out the project on <a href="https://git.limited-dev.de/eric/imageboard">GitLab</a>.
|
||||
<br>
|
||||
<br/>
|
||||
We're currently @amountOfUsers users, viewing @amountOfPosts post with @amountOfComments comment.
|
||||
|
|
|
@ -1,5 +1,6 @@
|
|||
@using System.ComponentModel.DataAnnotations
|
||||
@using ImageBoardServerApp.Data.Repository
|
||||
@inject NavigationManager navManager
|
||||
<span>@user.Email | </span>
|
||||
<span>@user.Posts.Count Posts | </span>
|
||||
<span>@user.Comments.Count Comments | </span>
|
||||
|
@ -14,7 +15,6 @@
|
|||
<a onclick="@updateRole()" href="javascript:void(0)">Update Role</a>
|
||||
<span> </span>
|
||||
<a onclick="@unban()" href="javascript:void(0)">Unban (if banned)</a>
|
||||
<br/>
|
||||
<span> </span>
|
||||
<span>@user.Role</span>
|
||||
<br/>
|
||||
|
|
|
@ -6,7 +6,7 @@ namespace ImageBoardServerApp.Util;
|
|||
|
||||
public class TheManager
|
||||
{
|
||||
public static string version = "v1.0.0-rc2";
|
||||
public static string version = "v1.0.0-rc3";
|
||||
|
||||
private static long getDiff(PostData post)
|
||||
{
|
||||
|
|
10
README.md
10
README.md
|
@ -1,8 +1,2 @@
|
|||
# TODO:
|
||||
- Tags
|
||||
- Search
|
||||
- Notify on Topic / Tag
|
||||
- Send thread to user before deletion
|
||||
-
|
||||
# FIXES IN NEED:
|
||||
- Finish the GET mentioning
|
||||
# BulletBoards
|
||||
A simple imageboard made in Razor
|
Loading…
Reference in a new issue