Back navigation and some translations

Pages/AccountPage.razor

 @page "/account"
-@page "/account/{FromRoute}"
+@page "/fundvelo/account/{FromRoute}"
 @inject NavigationManager NavigationManager
 @inject UserDataProvider UserDataProvider
 @inject IStringLocalizer<Resources> i18n
+@inject PageHistoryManager PageHistoryManager
 
 <div class="row px-3 h-100">
     <div class="row no-gutters align-items-start w-100">
     public string FromRoute { get; set; }
 
     protected async override void OnInitialized() {
+        PageHistoryManager.AddPageToHistory(NavigationManager.Uri);
+        base.OnInitialized();
         await GetUserData();
     }
 
 
     private void Next() {
         if ("Found".Equals(FromRoute)) {
-            NavigationManager.NavigateTo("conclusion_found/");
+            NavigationManager.NavigateTo("fundvelo/conclusion_found");
         } else {
-            NavigationManager.NavigateTo("conclusion_missing/");
+            NavigationManager.NavigateTo("fundvelo/conclusion_missing");
         }
     }
 
     private void Cancel() {
         NavigationManager.NavigateTo("caritas_services");
     }
+
 }
 
 

Pages/CaritasServiceFundVeloFoundConclusion.razor

-@page "/conclusion_found"
+@page "/fundvelo/conclusion_found"
 @inject NavigationManager NavigationManager
 @inject IStringLocalizer<Resources> i18n
+@inject PageHistoryManager PageHistoryManager
 
 <div class="row px-3 h-100">
     <div class="row no-gutters align-items-start justify-content-center w-100">
 
 @code {
 
+    protected override void OnInitialized() {
+        PageHistoryManager.AddPageToHistory(NavigationManager.Uri);
+        base.OnInitialized();
+    }
+
+
     private void Finished() {
         NavigationManager.NavigateTo("caritas_services");
     }

Pages/CaritasServiceFundVeloKeyDataPage.razor

-@page "/keydata/{FromRoute}"
+@page "/fundvelo/keydata/{FromRoute}"
 @inject NavigationManager NavigationManager
 @inject IStringLocalizer<Resources> i18n
+@inject PageHistoryManager PageHistoryManager
 
 <div class="row px-3 h-100">
     <div class="row no-gutters align-items-center justify-content-center w-100" style="padding-top:1em">
     public string FromRoute { get; set; }
 
     string value;
-    ColorItem selectedColor;
+    private ColorItem selectedColor;
+
+    protected override void OnInitialized() {
+        PageHistoryManager.AddPageToHistory(NavigationManager.Uri);
+        base.OnInitialized();
+    }
 
     private void Next() {
-        NavigationManager.NavigateTo("account/" + @FromRoute);
+        NavigationManager.NavigateTo("fundvelo/account/" + @FromRoute);
     }
 
     private void Cancel() {
     }
 
 
-    ColorItem[] colorItems = new[] {
+    private ColorItem[] colorItems = new[] {
         new ColorItem(3, "Blue","0,0,255"),
         new ColorItem(14, "Brown", "165,42,42"),
         new ColorItem(4, "Yellow", "255, 255, 0"),
     };
 
-    class ColorItem {
+    private class ColorItem {
         public int Index { get; }
         public string Name { get; }
         public string RGB { get; }
         }
     }
 
-    string getAddressLbl() {
+    private string getAddressLbl() {
         return i18n.GetString("Address") + " (" + getPlaceLbl() + ")";
     }
 
-    string getPlaceLbl() {
+    private string getPlaceLbl() {
         return @FromRoute == "Found" ? i18n.GetString("PlaceOfDiscovery") : i18n.GetString("PlaceOfLoss");
     }
 

Pages/CaritasServiceFundVeloLostFoundPage.razor

-@page "/lost_found"
+@page "/fundvelo/lost_found"
 @inject NavigationManager NavigationManager
+@inject PageHistoryManager PageHistoryManager
 
 <div class="row px-3 h-100">
     <div class="row no-gutters align-items-center w-100">
 
 @code {
 
+    protected override void OnInitialized() {
+        PageHistoryManager.AddPageToHistory(NavigationManager.Uri);
+        base.OnInitialized();
+    }
+
     private void Found() {
-        NavigationManager.NavigateTo("keydata/Found");
+        NavigationManager.NavigateTo("fundvelo/keydata/Found");
     }
 
     private void Missing() {
-        NavigationManager.NavigateTo("keydata/Missing");
+        NavigationManager.NavigateTo("fundvelo/keydata/Missing");
     }
 }

Pages/CaritasServiceFundVeloMissingConclusion.razor

-@page "/conclusion_missing"
+@page "/fundvelo/conclusion_missing"
 @inject NavigationManager NavigationManager
 @inject IStringLocalizer<Resources> i18n
+@inject PageHistoryManager PageHistoryManager
 
 <div class="row px-3 h-100">
     <div class="row no-gutters align-items-start justify-content-center w-100">
 
 @code {
 
+    protected override void OnInitialized() {
+        PageHistoryManager.AddPageToHistory(NavigationManager.Uri);
+        base.OnInitialized();
+    }
+
     private void Finished() {
         NavigationManager.NavigateTo("caritas_services");
     }

Pages/CaritasServicesPage.razor

 @page "/caritas_services"
 @inject NavigationManager NavigationManager
-
+@inject PageHistoryManager PageHistoryManager
 
 <div class="row px-3 h-100">
     <div class="row no-gutters align-items-center w-100">
                 <div class="mat-layout-grid-cell mat-layout-grid-cell-span-2-phone mat-layout-grid-cell-span-3-tablet mat-layout-grid-cell-span-4-desktop">
                     <MatCard class="demo-mat-card">
                         <MatCardContent>
-                            <MatCardMedia Square="true" ImageUrl="./images/batch_fundvelo.png" @onclick="Next"></MatCardMedia>
+                            <MatCardMedia Square="true" ImageUrl="./images/batch_fundvelo.png" @onclick="FundVelo_LostFound"></MatCardMedia>
                         </MatCardContent>
                     </MatCard>
                 </div>
 
 @code {
 
-    private void Next() {
-        NavigationManager.NavigateTo("lost_found");
+    protected override void OnInitialized() {
+        PageHistoryManager.Reset();
+        PageHistoryManager.AddPageToHistory(NavigationManager.Uri);
+        base.OnInitialized();
+    }
+
+    private void FundVelo_LostFound() {
+        NavigationManager.NavigateTo("fundvelo/lost_found");
     }
 
 }

Pages/IndexPage.razor

 @inject NavigationManager NavigationManager;
 @inject AppState AppState;
 @inject IStringLocalizer<Resources> i18n
+@inject PageHistoryManager PageHistoryManager
+
 
 <div class="row h-100 justify-content-center">
     <div class="row d-flex align-items-center justify-content-center px-4 w-100">
 
 @code {
 
-    void ButtonClicked() {
+    protected override void OnInitialized() {
+        PageHistoryManager.Reset();
+        base.OnInitialized();
+    }
+
+
+    private void ButtonClicked() {
         NavigationManager.NavigateTo("./caritas_services");
         AppState.LoggedIn = true;
     }

Pages/InfoPage.razor

 @page "/info"
 @inject NavigationManager NavigationManager;
 @inject IStringLocalizer<Resources> i18n
+@inject PageHistoryManager PageHistoryManager
 
 <div class="row px-3 h-100">
     <div class="text-center w-100">
             </tr>
             <tr>
                 <td class="text-right">
-                    <img src="./images/integrate_logo.png" style="max-width:200px"/>
+                    <img src="./images/integrate_logo.png" style="max-width:200px" />
                 </td>
             </tr>
             <tr>
 
 @code {
 
+    protected override void OnInitialized() {
+        PageHistoryManager.AddPageToHistory(NavigationManager.Uri);
+        base.OnInitialized();
+    }
+
     private void ShowCaritasWebpage() {
         NavigationManager.NavigateTo("http://www.caritas.ch");
     }

Program.cs

             var builder = WebAssemblyHostBuilder.CreateDefault(args);
             builder.RootComponents.Add<App>("app");
 
-            builder.Services.AddScoped(sp => new HttpClient { BaseAddress = new Uri(builder.HostEnvironment.BaseAddress) });
             builder.Services.AddMatBlazor();
-            builder.Services.AddSingleton<AppState>();
+            builder.Services.AddScoped(sp => new HttpClient { BaseAddress = new Uri(builder.HostEnvironment.BaseAddress) });
             builder.Services.AddScoped<UserDataProvider>();
+            builder.Services.AddSingleton<AppState>();
+            builder.Services.AddSingleton<PageHistoryManager>();
             builder.Services.AddLocalization();
 
             await builder.Build().RunAsync();

Shared/NavMenu.razor

 @inject AppState AppState;
 @inject NavigationManager NavigationManager;
 @inject IStringLocalizer<Resources> i18n
+@inject IJSRuntime jsRuntime;
+@inject PageHistoryManager PageHistoryManager;
 @implements IDisposable;
 
-@if (handleAppBarContainer()) {
+
+@if (HandleAppBarContainer()) {
     <div class="sidebar">
         <MatAppBarContainer>
             <MatAppBar Fixed="true">
                 <MatAppBarRow>
                     <MatAppBarSection>
                         <MatIconButton Icon="menu" OnClick="@((e) => ButtonClicked())"></MatIconButton>
-                        <MatAppBarTitle>CaritasPWA</MatAppBarTitle>
+                        @if (PageHistoryManager.CanGoBack()) {
+                            <MatIconButton Icon="keyboard_backspace" OnClick="@((e) => ButtonBackClicked())" Disabled="@BackButtonDisabled()"></MatIconButton>
+                        }
+                        <MatAppBarTitle Style="padding-left:0px; font-size:90%; font-weight:500">@LocationUrl</MatAppBarTitle>
                     </MatAppBarSection>
-                    <MatAppBarSection Align="@MatAppBarSectionAlign.End">
-                        <NavLink class="text-white" href="http://www.caritas.ch" Align="@MatAppBarSectionAlign.End" Style="padding-right:1em">About</NavLink>
+                    <MatAppBarSection align="@MatAppBarSectionAlign.End" Style="max-width:min-content">
+                        <NavLink target="_blank" class="text-white small" href="https://www.caritas.ch" align="@MatAppBarSectionAlign.End" style="padding-right:1em">@i18n["Learnmore"]</NavLink>
                     </MatAppBarSection>
                 </MatAppBarRow>
             </MatAppBar>
 }
 
 
-@code
-{
-    bool Opened = false;
+@code {
 
-    static int Index = 1;
+    private bool Opened = false;
 
-    void ButtonClicked() {
-        Opened = !Opened;
-    }
+    private static int Index = 1;
 
-    void ButtonClicked(int _Index) {
-        Index = _Index;
-        ButtonClicked();
-        if (_Index == 4) {
-            AppState.LoggedIn = false;
+    private string locUrl;
+    private string LocationUrl {
+        get => locUrl;
+        set {
+            locUrl = value;
+            StateHasChanged();
         }
     }
 
+    public void Dispose() {
+        AppState.OnChange -= StateHasChanged;
+        NavigationManager.LocationChanged -= LocationChanged;
+    }
+
     protected override void OnInitialized() {
         AppState.OnChange += StateHasChanged;
         NavigationManager.LocationChanged += LocationChanged;
+        PageHistoryManager.AddPageToHistory(NavigationManager.Uri);
         base.OnInitialized();
     }
 
-    public void Dispose() {
-        AppState.OnChange -= StateHasChanged;
-        NavigationManager.LocationChanged -= LocationChanged;
+    private void ButtonClicked() {
+        Opened = !Opened;
+    }
+
+    private void ButtonClicked(int _Index) {
+        Index = _Index;
+        ButtonClicked();
+        if (_Index == 4) {
+            AppState.LoggedIn = false;
+        }
+    }
+
+    private void ButtonBackClicked() {
+        NavigationManager.NavigateTo(PageHistoryManager.GetPreviousPage());
     }
 
 
-    void LocationChanged(object sender, LocationChangedEventArgs e) {
-        if (isInServicesUrl(e)) {
+    private void LocationChanged(object sender, LocationChangedEventArgs e) {
+        locUrl = i18n.GetString(e.Location.Replace(NavigationManager.BaseUri, ""));
+        if (IsInServicesUrl(e)) {
             Index = 1;
         } else if (e.Location.Contains("account")) {
             Index = 2;
         } else {
             Index = 4;
         }
+        StateHasChanged();
     }
 
-    bool isInServicesUrl(LocationChangedEventArgs e) {
+    private bool IsInServicesUrl(LocationChangedEventArgs e) {
         return (e.Location.Contains("caritas_services") || e.Location.Contains("lost_found") || e.Location.Contains("keydata")
             || e.Location.Contains("account/") || e.Location.Contains("conclusion_"));
     }
 
-    bool handleAppBarContainer() {
+    private bool HandleAppBarContainer() {
         string uri = NavigationManager.Uri;
         string baseUri = NavigationManager.BaseUri;
         string delta = uri.Replace(baseUri, "");
         }
     }
 
-}
+    private bool BackButtonDisabled() {
+        return !PageHistoryManager.CanGoBack();
+    }
+
+}

Shared/PageHistoryManager.cs

+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+
+namespace CaritasPWA.Shared {
+    public class PageHistoryManager {
+
+        private List<string> previousPages;
+
+        public PageHistoryManager() {
+            previousPages = new List<string>();
+        }
+
+        public void Reset() {
+            previousPages.Clear();
+        }
+
+        public void AddPageToHistory(string pageName) {
+            previousPages.Add(pageName);
+        }
+
+        public string GetPreviousPage() {
+            if (CanGoBack()) {
+                // You add a page on initialization, so you need to return the 2nd from the last
+                string previousPage = previousPages.ElementAt(previousPages.Count - 2);
+                previousPages.RemoveAt(previousPages.Count - 1);
+                previousPages.RemoveAt(previousPages.Count - 1);
+                return previousPage;
+            }
+
+            // Can't go back because you didn't navigate enough
+            return previousPages.FirstOrDefault();
+        }
+
+        public bool CanGoBack() {
+            return previousPages.Count > 1;
+        }
+    }
+}

Shared/ResourceFiles/Resources.Designer.cs

             }
         }
         
+        /// <summary>
+        ///   Sucht eine lokalisierte Zeichenfolge, die Caritas Services ähnelt.
+        /// </summary>
+        public static string caritas_services {
+            get {
+                return ResourceManager.GetString("caritas_services", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Sucht eine lokalisierte Zeichenfolge, die Caritas Services ähnelt.
         /// </summary>
             }
         }
         
+        /// <summary>
+        ///   Sucht eine lokalisierte Zeichenfolge, die Bicycle &gt; Found &gt; Founder data ähnelt.
+        /// </summary>
+        public static string fundvelo_account_Found {
+            get {
+                return ResourceManager.GetString("fundvelo/account/Found", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Sucht eine lokalisierte Zeichenfolge, die Bicycle &gt; Missing &gt; Reporter data ähnelt.
+        /// </summary>
+        public static string fundvelo_account_Missing {
+            get {
+                return ResourceManager.GetString("fundvelo/account/Missing", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Sucht eine lokalisierte Zeichenfolge, die Bicycle &gt; Found &gt; Confirmation ähnelt.
+        /// </summary>
+        public static string fundvelo_conclusion_found {
+            get {
+                return ResourceManager.GetString("fundvelo/conclusion_found", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Sucht eine lokalisierte Zeichenfolge, die Bicycle &gt; Missing &gt; Confirmation ähnelt.
+        /// </summary>
+        public static string fundvelo_conclusion_missing {
+            get {
+                return ResourceManager.GetString("fundvelo/conclusion_missing", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Sucht eine lokalisierte Zeichenfolge, die Bicycle &gt; Found &gt;Data ähnelt.
+        /// </summary>
+        public static string fundvelo_keydata_Found {
+            get {
+                return ResourceManager.GetString("fundvelo/keydata/Found", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Sucht eine lokalisierte Zeichenfolge, die Bicycle &gt; Missing &gt;Data ähnelt.
+        /// </summary>
+        public static string fundvelo_keydata_Missing {
+            get {
+                return ResourceManager.GetString("fundvelo/keydata/Missing", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Sucht eine lokalisierte Zeichenfolge, die Bicycle ähnelt.
+        /// </summary>
+        public static string fundvelo_lost_found {
+            get {
+                return ResourceManager.GetString("fundvelo/lost_found", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Sucht eine lokalisierte Zeichenfolge, die Info ähnelt.
         /// </summary>

Shared/ResourceFiles/Resources.de.resx

   <data name="CaritasServices" xml:space="preserve">
     <value>Caritas Dienste</value>
   </data>
+  <data name="caritas_services" xml:space="preserve">
+    <value>Caritas Dienste</value>
+  </data>
   <data name="City" xml:space="preserve">
     <value>Ort</value>
   </data>
   <data name="FoundBike" xml:space="preserve">
     <value>Gefundenes Velo</value>
   </data>
+  <data name="fundvelo/account/Found" xml:space="preserve">
+    <value>Fundvelo &gt; Gefunden &gt; Finderdaten</value>
+  </data>
+  <data name="fundvelo/account/Missing" xml:space="preserve">
+    <value>Fundvelo &gt; Vermisst &gt; Melderdaten</value>
+  </data>
+  <data name="fundvelo/conclusion_found" xml:space="preserve">
+    <value>Fundvelo &gt; Gefunden &gt; Bestätigung</value>
+  </data>
+  <data name="fundvelo/conclusion_missing" xml:space="preserve">
+    <value>Fundvelo &gt; Vermisst &gt; Bestätigung</value>
+  </data>
+  <data name="fundvelo/keydata/Found" xml:space="preserve">
+    <value>Fundvelo &gt; Gefunden &gt; Daten</value>
+  </data>
+  <data name="fundvelo/keydata/Missing" xml:space="preserve">
+    <value>Fundvelo &gt; Vermisst &gt; Daten</value>
+  </data>
+  <data name="fundvelo/lost_found" xml:space="preserve">
+    <value>Fundvelo</value>
+  </data>
   <data name="Info" xml:space="preserve">
     <value>Info</value>
   </data>

Shared/ResourceFiles/Resources.fr.resx

   <data name="CaritasServices" xml:space="preserve">
     <value>Services Caritas</value>
   </data>
+  <data name="caritas_services" xml:space="preserve">
+    <value>Services Caritas</value>
+  </data>
   <data name="City" xml:space="preserve">
     <value>Ville</value>
   </data>
   <data name="FoundBike" xml:space="preserve">
     <value>Velo trouvè</value>
   </data>
+  <data name="fundvelo/account/Found" xml:space="preserve">
+    <value>Velo &gt;Trouvé &gt; Data trouver</value>
+  </data>
+  <data name="fundvelo/account/Missing" xml:space="preserve">
+    <value>Velo &gt;Perdue &gt; Data trouver</value>
+  </data>
+  <data name="fundvelo/conclusion_found" xml:space="preserve">
+    <value>Velo &gt;Trouvé &gt; Confirmation</value>
+  </data>
+  <data name="fundvelo/conclusion_missing" xml:space="preserve">
+    <value>Velo &gt;Perdue &gt; Data trouver</value>
+  </data>
+  <data name="fundvelo/keydata/Found" xml:space="preserve">
+    <value>Velo &gt;Trouvé &gt; Data</value>
+  </data>
+  <data name="fundvelo/keydata/Missing" xml:space="preserve">
+    <value>Velo &gt;Perdue &gt; Data</value>
+  </data>
+  <data name="fundvelo/lost_found" xml:space="preserve">
+    <value>Velo</value>
+  </data>
   <data name="Info" xml:space="preserve">
     <value>Information</value>
   </data>

Shared/ResourceFiles/Resources.it.resx

   <data name="CaritasServices" xml:space="preserve">
     <value>Servizi Caritas</value>
   </data>
+  <data name="caritas_services" xml:space="preserve">
+    <value>Servizi Caritas</value>
+  </data>
   <data name="City" xml:space="preserve">
     <value>Città</value>
   </data>
   <data name="FoundBike" xml:space="preserve">
     <value>Bicicletta trovata</value>
   </data>
+  <data name="fundvelo/account/Found" xml:space="preserve">
+    <value>Bicicletta &gt; Trovata &gt; Dati trovatore</value>
+  </data>
+  <data name="fundvelo/account/Missing" xml:space="preserve">
+    <value>Bicicletta &gt; Perduta &gt; Dati richiedente</value>
+  </data>
+  <data name="fundvelo/conclusion_found" xml:space="preserve">
+    <value>Bicicletta &gt; Trovata &gt; Conferma</value>
+  </data>
+  <data name="fundvelo/conclusion_missing" xml:space="preserve">
+    <value>Bicicletta &gt; Perduta &gt; Conferma</value>
+  </data>
+  <data name="fundvelo/keydata/Found" xml:space="preserve">
+    <value>Bicicletta &gt; Trovata &gt; Dati</value>
+  </data>
+  <data name="fundvelo/keydata/Missing" xml:space="preserve">
+    <value>Bicicletta &gt; Perduta &gt; Dati</value>
+  </data>
+  <data name="fundvelo/lost_found" xml:space="preserve">
+    <value>Bicicletta</value>
+  </data>
   <data name="Info" xml:space="preserve">
     <value>Informazione</value>
   </data>
     <value>Latitudine</value>
   </data>
   <data name="Learnmore" xml:space="preserve">
-    <value>Per saperne di più</value>
+    <value>Saperne di più</value>
   </data>
   <data name="Login" xml:space="preserve">
     <value>Avanti!</value>

Shared/ResourceFiles/Resources.resx

   <data name="CaritasServices" xml:space="preserve">
     <value>Caritas Services</value>
   </data>
+  <data name="caritas_services" xml:space="preserve">
+    <value>Caritas Services</value>
+  </data>
   <data name="City" xml:space="preserve">
     <value>City</value>
   </data>
   <data name="FoundBike" xml:space="preserve">
     <value>Found Bike</value>
   </data>
+  <data name="fundvelo/account/Found" xml:space="preserve">
+    <value>Bicycle &gt; Found &gt; Founder data</value>
+  </data>
+  <data name="fundvelo/account/Missing" xml:space="preserve">
+    <value>Bicycle &gt; Missing &gt; Reporter data</value>
+  </data>
+  <data name="fundvelo/conclusion_found" xml:space="preserve">
+    <value>Bicycle &gt; Found &gt; Confirmation</value>
+  </data>
+  <data name="fundvelo/conclusion_missing" xml:space="preserve">
+    <value>Bicycle &gt; Missing &gt; Confirmation</value>
+  </data>
+  <data name="fundvelo/keydata/Found" xml:space="preserve">
+    <value>Bicycle &gt; Found &gt;Data</value>
+  </data>
+  <data name="fundvelo/keydata/Missing" xml:space="preserve">
+    <value>Bicycle &gt; Missing &gt;Data</value>
+  </data>
+  <data name="fundvelo/lost_found" xml:space="preserve">
+    <value>Bicycle</value>
+  </data>
   <data name="Info" xml:space="preserve">
     <value>Info</value>
   </data>