status-im/nft-faucet
2
0
Fork 0
mirror of https://github.com/status-im/nft-faucet.git synced 2025-02-23 12:08:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix navigation

Browse Source
This commit is contained in:
Ivan Yaremenchuk 2022-04-03 22:30:06 +02:00
parent 60db7a4720
commit 02282313af
8 changed files with 36 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
NftFaucet/Extensions/NavigationManagerExtensions.cs Normal file
View File

@ -0,0 +1,20 @@
using Microsoft.AspNetCore.Components;
namespace NftFaucet.Extensions;
public static class NavigationManagerExtensions
{
public static void NavigateToRelative(this NavigationManager uriHelper, string relativePath)
{
var newUri = uriHelper.BaseUri;
if (!newUri.EndsWith("/"))
newUri += "/";
if (relativePath.StartsWith("/"))
relativePath = relativePath.Substring(1);
newUri += relativePath;
uriHelper.NavigateTo(newUri);
}
}

5
NftFaucet/Models/NavigationWrapper.cs
View File

@ -1,4 +1,5 @@
using Microsoft.AspNetCore.Components; using Microsoft.AspNetCore.Components;
using NftFaucet.Extensions;
namespace NftFaucet.Models; namespace NftFaucet.Models;
@ -59,7 +60,7 @@ public class NavigationWrapper
var previousStep = CurrentStep - 1; var previousStep = CurrentStep - 1;
_beforeGoBack = null; _beforeGoBack = null;
_beforeGoForward = null; _beforeGoForward = null;
_uriHelper.NavigateTo("/step" + previousStep); _uriHelper.NavigateToRelative("/step" + previousStep);
} }
public async Task GoForward() public async Task GoForward()
@ -74,6 +75,6 @@ public class NavigationWrapper
var nextStep = CurrentStep + 1; var nextStep = CurrentStep + 1;
_beforeGoBack = null; _beforeGoBack = null;
_beforeGoForward = null; _beforeGoForward = null;
_uriHelper.NavigateTo("/step" + nextStep); _uriHelper.NavigateToRelative("/step" + nextStep);
} }
} }

5
NftFaucet/Pages/ConnectMetamask.razor.cs
View File

@ -1,4 +1,5 @@
using NftFaucet.Components; using NftFaucet.Components;
using NftFaucet.Extensions;
namespace NftFaucet.Pages; namespace NftFaucet.Pages;
@ -9,7 +10,7 @@ public class ConnectMetamaskComponent : BasicComponent
if (await Metamask.IsConnected()) if (await Metamask.IsConnected())
{ {
await Metamask.RefreshAddress(); await Metamask.RefreshAddress();
UriHelper.NavigateTo("/"); UriHelper.NavigateToRelative("/");
} }
} }
@ -18,7 +19,7 @@ public class ConnectMetamaskComponent : BasicComponent
var isConnected = await Metamask.Connect(); var isConnected = await Metamask.Connect();
if (isConnected) if (isConnected)
{ {
UriHelper.NavigateTo("/"); UriHelper.NavigateToRelative("/");
} }
} }
} }

3
NftFaucet/Pages/Index.razor.cs
View File

@ -1,4 +1,5 @@
using NftFaucet.Components; using NftFaucet.Components;
using NftFaucet.Extensions;
namespace NftFaucet.Pages; namespace NftFaucet.Pages;
@ -6,6 +7,6 @@ public class IndexComponent : BasicComponent
{ {
protected override async Task OnInitializedAsync() protected override async Task OnInitializedAsync()
{ {
UriHelper.NavigateTo(await Metamask.IsReady() ? "/step1" : "/connect-metamask"); UriHelper.NavigateToRelative(await Metamask.IsReady() ? "/step1" : "/connect-metamask");
} }
} }

3
NftFaucet/Pages/Step1Page.razor.cs
View File

@ -2,6 +2,7 @@ using AntDesign;
using Microsoft.AspNetCore.Components; using Microsoft.AspNetCore.Components;
using NftFaucet.Components; using NftFaucet.Components;
using NftFaucet.Constants; using NftFaucet.Constants;
using NftFaucet.Extensions;
using NftFaucet.Models.Enums; using NftFaucet.Models.Enums;
namespace NftFaucet.Pages; namespace NftFaucet.Pages;
@ -24,7 +25,7 @@ public class Step1Component : BasicComponent
protected override async Task OnInitializedAsync() protected override async Task OnInitializedAsync()
{ {
if (!await AppState.Metamask.IsReady()) if (!await AppState.Metamask.IsReady())
UriHelper.NavigateTo("/"); UriHelper.NavigateToRelative("/");
AppState.Navigation.SetForwardHandler(ForwardHandler); AppState.Navigation.SetForwardHandler(ForwardHandler);
} }

2
NftFaucet/Pages/Step2Page.razor.cs
View File

@ -26,7 +26,7 @@ public class Step2Component : BasicComponent
protected override async Task OnInitializedAsync() protected override async Task OnInitializedAsync()
{ {
if (!await AppState.Metamask.IsReady() || AppState.Storage.IpfsImageUrl == null) if (!await AppState.Metamask.IsReady() || AppState.Storage.IpfsImageUrl == null)
UriHelper.NavigateTo("/"); UriHelper.NavigateToRelative("/");
AppState.Navigation.SetForwardHandler(ForwardHandler); AppState.Navigation.SetForwardHandler(ForwardHandler);

3
NftFaucet/Pages/Step3Page.razor.cs
View File

@ -1,4 +1,5 @@
using NftFaucet.Components; using NftFaucet.Components;
using NftFaucet.Extensions;
using NftFaucet.Models; using NftFaucet.Models;
namespace NftFaucet.Pages; namespace NftFaucet.Pages;
@ -13,7 +14,7 @@ public class Step3Component : BasicComponent
protected override async Task OnInitializedAsync() protected override async Task OnInitializedAsync()
{ {
if (!await AppState.Metamask.IsReady() || string.IsNullOrEmpty(AppState.Storage.TokenUrl)) if (!await AppState.Metamask.IsReady() || string.IsNullOrEmpty(AppState.Storage.TokenUrl))
UriHelper.NavigateTo("/"); UriHelper.NavigateToRelative("/");
AppState.Navigation.SetForwardHandler(ForwardHandler); AppState.Navigation.SetForwardHandler(ForwardHandler);
AppState.Storage.DestinationAddress = AppState.Metamask.Address; AppState.Storage.DestinationAddress = AppState.Metamask.Address;

5
NftFaucet/Pages/Step4Page.razor.cs
View File

@ -1,6 +1,7 @@
using System.Text; using System.Text;
using Microsoft.AspNetCore.Components; using Microsoft.AspNetCore.Components;
using NftFaucet.Components; using NftFaucet.Components;
using NftFaucet.Extensions;
using NftFaucet.Models.Enums; using NftFaucet.Models.Enums;
using NftFaucet.Services; using NftFaucet.Services;
@ -20,7 +21,7 @@ public class Step4Component : BasicComponent
{ {
if (!await AppState.Metamask.IsReady() || string.IsNullOrEmpty(AppState.Storage.DestinationAddress)) if (!await AppState.Metamask.IsReady() || string.IsNullOrEmpty(AppState.Storage.DestinationAddress))
{ {
UriHelper.NavigateTo("/"); UriHelper.NavigateToRelative("/");
} }
else else
{ {
@ -46,6 +47,6 @@ public class Step4Component : BasicComponent
protected void Reset() protected void Reset()
{ {
AppState.Reset(); AppState.Reset();
UriHelper.NavigateTo("/"); UriHelper.NavigateToRelative("/");
} }
} }