Merge pull request 'modif probleme lors du chagement de langue' (#14) from modif into master

Reviewed-on: #14
arthur_userkeys^2
Rayhân HASSOU 2 years ago
commit 2f7ed1c01a

@ -1,4 +1,5 @@
@page "/connexion"
@page "/"
@page "/connexion"
@layout InscriptionLayout
@inject NavigationManager NavManager

@ -25,7 +25,7 @@ namespace CraftSharp.Pages
try
{
await AuthStateProvider.Login(loginRequest);
NavigationManager.NavigateTo("");
NavigationManager.NavigateTo("index");
}
catch (Exception ex)
{

@ -1,4 +1,4 @@
@page "/"
@page "/index"
@using System.Globalization
<p>

@ -23,7 +23,7 @@ namespace CraftSharp.Pages
{
await AuthStateProvider.Register(registerRequest);
NavigationManager.NavigateTo("");
NavigationManager.NavigateTo("index");
}
}

@ -6,3 +6,4 @@
}
<component type="typeof(App)" render-mode="ServerPrerendered" />

@ -8,7 +8,7 @@
<div class="collapse navbar-collapse @NavBarCssClass" id="navbarCollapse" @onclick="ToggleNavMenu">
<ul class="navbar-nav me-auto mb-0 mb-md-0 topbar_content" >
<li class="nav-item">
<NavLink class="nav-link" href="List">
<NavLink class="nav-link" href="tabledecraft">
<span class="topbar_item">
<img src="/Images/inventory_icon.png" class="topbar_itemimg"/> @Localizer["Inventory"]
</span>
@ -35,10 +35,7 @@
</span>
</NavLink>
</li>
<span class="btn_wrap">
<div class="button"> @Localizer["Login"]</div>
<div class="button"> @Localizer["Register"]</div>
</span>
<button type="button" class="btn btn-link ml-md-auto" @onclick="@LogoutClick">Logout</button>
</ul>
</div>
</div>

@ -30,13 +30,13 @@ namespace CraftSharp.Shared
NavigationManager.NavigateTo("connexion");
}
protected override async Task OnParametersSetAsync()
/* protected override async Task OnParametersSetAsync()
{
if (!(await AuthenticationState).User.Identity.IsAuthenticated)
{
NavigationManager.NavigateTo("/inscription");
}
}
}*/
private async Task LogoutClick()
{

@ -78,7 +78,7 @@ nav-link {
align-items: center;
}
.button {
button {
width: 11rem;
text-decoration: none;
text-align: center;
@ -92,7 +92,7 @@ nav-link {
font-family: Minecraft;
}
.button:hover {
button:hover {
background: url('Images/btn2.png')center center/contain no-repeat;
background-size: 100% 100%;
}

@ -9,7 +9,7 @@
<div class="@NavMenuCssClass" @onclick="ToggleNavMenu">
<nav>
<div class="nav-item px-2">
<NavLink class="nav-link" href="" Match="NavLinkMatch.All">
<NavLink class="nav-link" href="opening" Match="NavLinkMatch.All">
<span class="oi oi-key"></span> Ouverture
</NavLink>
</div>

@ -12,3 +12,4 @@
@using Blazored.Modal
@using Blazored.Modal.Services
@using Microsoft.AspNetCore.Components.Authorization
@using System.Web
Loading…
Cancel
Save