From d5fe0df39736419ff947f26dd818e9c4cab19e20 Mon Sep 17 00:00:00 2001 From: rahassou Date: Sat, 17 Dec 2022 09:21:51 +0100 Subject: [PATCH] Connexion et inscription marche --- src/CraftSharp/Models/ConnexionModel.cs | 2 +- src/CraftSharp/Models/InscriptionModel.cs | 9 ++---- src/CraftSharp/Pages/Connexion.razor | 4 +-- src/CraftSharp/Pages/Index.razor | 23 ++++++++++++++- src/CraftSharp/Pages/Inscription.razor | 9 +++--- src/CraftSharp/Pages/Inscription.razor.cs | 10 ++----- src/CraftSharp/Shared/HeaderLayout.razor | 1 + src/CraftSharp/Shared/HeaderLayout.razor.cs | 27 +++++++++++++++++- src/CraftSharp/Shared/InscriptionLayout.razor | 1 - .../Shared/InscriptionLayout.razor.cs | 5 +--- .../Shared/InscriptionLayout.razor.css | 13 ++++++--- src/CraftSharp/_Imports.razor | 3 +- .../wwwroot/{font => fonts}/Minecraft.ttf | Bin src/CraftSharp/wwwroot/fonts/Minecraft.zip | Bin 0 -> 4717 bytes 14 files changed, 74 insertions(+), 33 deletions(-) rename src/CraftSharp/wwwroot/{font => fonts}/Minecraft.ttf (100%) create mode 100644 src/CraftSharp/wwwroot/fonts/Minecraft.zip diff --git a/src/CraftSharp/Models/ConnexionModel.cs b/src/CraftSharp/Models/ConnexionModel.cs index 91115fc..bd4dd73 100644 --- a/src/CraftSharp/Models/ConnexionModel.cs +++ b/src/CraftSharp/Models/ConnexionModel.cs @@ -9,7 +9,7 @@ namespace CraftSharp.Models public string? UserName { get; set; } [Required(ErrorMessage = "Le mot de passe est obligatoire.")] - [MinLength(6, ErrorMessage = "Le mot de passe est trop court")] + [MinLength(4, ErrorMessage = "Le mot de passe est trop court")] public string? Password { get; set; } } } diff --git a/src/CraftSharp/Models/InscriptionModel.cs b/src/CraftSharp/Models/InscriptionModel.cs index 561be78..65b9f6f 100644 --- a/src/CraftSharp/Models/InscriptionModel.cs +++ b/src/CraftSharp/Models/InscriptionModel.cs @@ -6,15 +6,12 @@ namespace CraftSharp.Models { [Required(ErrorMessage = "Le pseudo est obligatoire.")] - [MinLength(4, ErrorMessage = "Le pseudo est trop long")] + [MinLength(4, ErrorMessage = "Le pseudo est trop court")] + [MaxLength(50, ErrorMessage = "Le pseudo est trop long")] public string? UserName { get; set; } - [Required(ErrorMessage = "L'email est obligatoire.")] - [RegularExpression(@"^[A-Z0-9._%+-]+@[A-Z0-9.-]+\.[A-Z]{2,}$", ErrorMessage = "Le format de l'email n'est pas correcte.")] - public string? Email { get; set; } - [Required(ErrorMessage = "Le mot de passe est obligatoire.")] - [StringLength(50, ErrorMessage = "Le mot de passe est trop long")] + [MinLength(4, ErrorMessage = "Le mot de passe est trop court")] public string? Password { get; set; } [Required(ErrorMessage = "Vous devez confirmer votre mot de passe")] diff --git a/src/CraftSharp/Pages/Connexion.razor b/src/CraftSharp/Pages/Connexion.razor index 8860eb4..3ed8ca3 100644 --- a/src/CraftSharp/Pages/Connexion.razor +++ b/src/CraftSharp/Pages/Connexion.razor @@ -18,11 +18,11 @@
- +
- +
Creer un compte
 diff --git a/src/CraftSharp/Pages/Index.razor b/src/CraftSharp/Pages/Index.razor index 9e483fe..b469fd4 100644 --- a/src/CraftSharp/Pages/Index.razor +++ b/src/CraftSharp/Pages/Index.razor @@ -12,6 +12,27 @@
-Welcome to your new app. + + +

Hello @context.User.Identity.Name !!

+ +

Welcome to Blazor Learner.

+ +
    + @foreach (var claim in context.User.Claims) + { +
  • @claim.Type: @claim.Value
    • + } +
+ + + +

Loading ...

+ + +

Echec de la connexion!

+

Vous n'etes pas connecté

+ + diff --git a/src/CraftSharp/Pages/Inscription.razor b/src/CraftSharp/Pages/Inscription.razor index 89f3a6c..4a7394d 100644 --- a/src/CraftSharp/Pages/Inscription.razor +++ b/src/CraftSharp/Pages/Inscription.razor @@ -5,11 +5,12 @@

Inscription

-
diff --git a/src/CraftSharp/Shared/HeaderLayout.razor.cs b/src/CraftSharp/Shared/HeaderLayout.razor.cs index 6141ebf..a6e8983 100644 --- a/src/CraftSharp/Shared/HeaderLayout.razor.cs +++ b/src/CraftSharp/Shared/HeaderLayout.razor.cs @@ -1,4 +1,6 @@ -using Microsoft.AspNetCore.Components; +using CraftSharp.Services; +using Microsoft.AspNetCore.Components; +using Microsoft.AspNetCore.Components.Authorization; using Microsoft.Extensions.Localization; @@ -9,6 +11,15 @@ namespace CraftSharp.Shared [Inject] public IStringLocalizer Localizer { get; set; } + [Inject] + public CustomStateProvider AuthStateProvider { get; set; } + + [Inject] + public NavigationManager NavigationManager { get; set; } + + [CascadingParameter] + private Task AuthenticationState { get; set; } + void goInscription() { navigationManager.NavigateTo("inscription"); @@ -18,5 +29,19 @@ namespace CraftSharp.Shared { navigationManager.NavigateTo("connexion"); } + + protected override async Task OnParametersSetAsync() + { + if (!(await AuthenticationState).User.Identity.IsAuthenticated) + { + NavigationManager.NavigateTo("/inscription"); + } + } + + private async Task LogoutClick() + { + await AuthStateProvider.Logout(); + NavigationManager.NavigateTo("/inscription"); + } } } diff --git a/src/CraftSharp/Shared/InscriptionLayout.razor b/src/CraftSharp/Shared/InscriptionLayout.razor index 978904d..eb6b7a0 100644 --- a/src/CraftSharp/Shared/InscriptionLayout.razor +++ b/src/CraftSharp/Shared/InscriptionLayout.razor @@ -2,7 +2,6 @@ @inject NavigationManager navigationManager
-
diff --git a/src/CraftSharp/Shared/InscriptionLayout.razor.cs b/src/CraftSharp/Shared/InscriptionLayout.razor.cs index cb4739f..e89d3b4 100644 --- a/src/CraftSharp/Shared/InscriptionLayout.razor.cs +++ b/src/CraftSharp/Shared/InscriptionLayout.razor.cs @@ -6,9 +6,6 @@ namespace CraftSharp.Shared { public partial class InscriptionLayout { - void getBack() - { - navigationManager.NavigateTo(""); - } + } } diff --git a/src/CraftSharp/Shared/InscriptionLayout.razor.css b/src/CraftSharp/Shared/InscriptionLayout.razor.css index fd35265..bb16e76 100644 --- a/src/CraftSharp/Shared/InscriptionLayout.razor.css +++ b/src/CraftSharp/Shared/InscriptionLayout.razor.css @@ -29,10 +29,10 @@ footer { justify-content: space-between; } - footer p { - color: white; - font-family: Minecraft; - } +footer p { + color: white; + font-family: Minecraft; +} .p2 { float: right; @@ -50,3 +50,8 @@ button { padding-top: 6px; font-family: Minecraft; } + +h1 { + color: white; + font-family: Minecraft; +} \ No newline at end of file diff --git a/src/CraftSharp/_Imports.razor b/src/CraftSharp/_Imports.razor index b191629..db445a0 100644 --- a/src/CraftSharp/_Imports.razor +++ b/src/CraftSharp/_Imports.razor @@ -10,4 +10,5 @@ @using CraftSharp.Shared @using Blazorise.DataGrid @using Blazored.Modal -@using Blazored.Modal.Services \ No newline at end of file +@using Blazored.Modal.Services +@using Microsoft.AspNetCore.Components.Authorization \ No newline at end of file diff --git a/src/CraftSharp/wwwroot/font/Minecraft.ttf b/src/CraftSharp/wwwroot/fonts/Minecraft.ttf similarity index 100% rename from src/CraftSharp/wwwroot/font/Minecraft.ttf rename to src/CraftSharp/wwwroot/fonts/Minecraft.ttf diff --git a/src/CraftSharp/wwwroot/fonts/Minecraft.zip b/src/CraftSharp/wwwroot/fonts/Minecraft.zip new file mode 100644 index 0000000000000000000000000000000000000000..60082877d05fa74068d5f24c10308e5bd90b2d4d GIT binary patch literal 4717 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 literal 0 HcmV?d00001