diff --git a/Pages/Portfolio-Review.razor b/Pages/Portfolio-Review.razor
index b893b0f..6ee040c 100644
--- a/Pages/Portfolio-Review.razor
+++ b/Pages/Portfolio-Review.razor
@@ -63,7 +63,7 @@ Portfolio Review@(stepPath==null?"":": "+stepPath.Replace('-',' ')) - bogle.tool
familyData.UpdatePercentages();
- Portfolio Review
+ Portfolio Review (@appData.CurrentProfileName)
Bogleheads.org forum enables you to Ask Portfolio Questions ↗️. This tool makes it easy to collect your information and format it properly.
@@ -338,7 +338,7 @@ Portfolio Review@(stepPath==null?"":": "+stepPath.Replace('-',' ')) - bogle.tool
string nextPage = folderName + nextStep?.step;
- Portfolio Review > @step.title (@step.number)
+ Portfolio Review (@appData.CurrentProfileName) > @step.title (@step.number)
diff --git a/Pages/Profiles.razor b/Pages/Profiles.razor
index ec16b0f..1709474 100644
--- a/Pages/Profiles.razor
+++ b/Pages/Profiles.razor
@@ -8,7 +8,7 @@
bogle.tools profiles
-Click on profile name to make it the active profile, then navigate to which ever tool you'd like to use.
+Click on profile name to make it the active profile. You'll be navigated back to your prior page.
@@ -27,6 +27,7 @@ Click on profile name to make it the active profile, then navigate to which ever
{
appData.CurrentProfileName = profileName;
await ProfileUtilities.Load(appData);
+ Navigation.NavigateTo(appData.LastPageUri);
}
private async Task createProfile()
diff --git a/Pages/Saving.razor b/Pages/Saving.razor
index 5794f7b..26d262a 100644
--- a/Pages/Saving.razor
+++ b/Pages/Saving.razor
@@ -59,7 +59,7 @@ Saving@(stepPath==null?": review":": "+stepPath.Replace('-',' ')) - bogle.tools
int itemTotal = 0;
- Saving Plan
+ Saving Plan (@appData.CurrentProfileName)
@@ -411,7 +411,7 @@ Saving@(stepPath==null?": review":": "+stepPath.Replace('-',' ')) - bogle.tools
string nextPage = folderName + nextStep?.step;
- Saving Plan > @step.title (@step.number)
+ Saving Plan (@appData.CurrentProfileName) > @step.title (@step.number)
diff --git a/Shared/Models/FamilyData/AppData.cs b/Shared/Models/FamilyData/AppData.cs
index af65bda..7f7d278 100644
--- a/Shared/Models/FamilyData/AppData.cs
+++ b/Shared/Models/FamilyData/AppData.cs
@@ -7,7 +7,7 @@ public AppData(FamilyData familyData) {
public FamilyData FamilyData { get; set; }
public List ProfileNames {get; set;}
public string CurrentProfileName {get; set;}
-
+ public string LastPageUri {get; set;}
public string CurrentProfileKey
{
get {
diff --git a/Shared/Models/FamilyData/IAppData.cs b/Shared/Models/FamilyData/IAppData.cs
index 7f4973a..ae1c1e1 100644
--- a/Shared/Models/FamilyData/IAppData.cs
+++ b/Shared/Models/FamilyData/IAppData.cs
@@ -3,5 +3,7 @@ public interface IAppData {
public List ProfileNames {get; set;}
public string CurrentProfileName {get; set;}
public string CurrentProfileKey { get; }
+ public string LastPageUri {get; set;}
+
}
\ No newline at end of file
diff --git a/Shared/TopLine.razor b/Shared/TopLine.razor
index 3994899..2b1a9dc 100644
--- a/Shared/TopLine.razor
+++ b/Shared/TopLine.razor
@@ -6,16 +6,22 @@
@inject IRSData irsData
@inject IJSRuntime JS
-
- Data is kept private : Save or
- Erase
+
+@code{
-@code{
-
+ private void navWithBackStack()
+ {
+ appData.LastPageUri = Navigation.Uri;
+ Navigation.NavigateTo("/profiles");
+ }
private async Task Save() {
await ProfileUtilities.Save(appData.CurrentProfileKey, appData.FamilyData);
}