init map and device/bicycle postion on page show, enhanced navigation

Pages/AccountPage.razor

     protected async override void OnInitialized() {
         base.OnInitialized();
         PageHistoryManager.OnBeforeNavigateBack = new EventCallback(this, (Action)OnBeforeNavigateBack);
-        PageHistoryManager.AddPageToHistory(NavigationManager.Uri);
         Account = await GetUserData();
         if (!string.IsNullOrEmpty(FromRoute) && ReportDataProvider.Report != null) {
             UserDataProvider.MapUserData(Account, ReportDataProvider.Report);
     }
 
     private void Next() {
+        PageHistoryManager.AddPageToHistory(NavigationManager.Uri);
         if ("Found".Equals(FromRoute)) {
             UserDataProvider.MapReport(ReportDataProvider.Report, Account);
             NavigationManager.NavigateTo("fundvelo/conclusion_found");

Pages/CaritasServicesPage.razor

     protected override void OnInitialized() {
         base.OnInitialized();
         PageHistoryManager.Reset();
-        PageHistoryManager.AddPageToHistory(NavigationManager.Uri);
     }
 
     private void FundVelo_LostFound() {
+        PageHistoryManager.AddPageToHistory(NavigationManager.Uri);
         NavigationManager.NavigateTo("fundvelo/lost_found");
     }
 

Pages/Fundvelo/CaritasServiceFundVeloAlternatePickupContactPage.razor

     protected override void OnInitialized() {
         base.OnInitialized();
         PageHistoryManager.OnBeforeNavigateBack = new EventCallback(this, (Action)OnBeforeNavigateBack);
-        PageHistoryManager.AddPageToHistory(NavigationManager.Uri);
         refreshGUIFromDto();
         StateHasChanged();
     }
 
     private void Next() {
         updateDtoFromGUI();
+        PageHistoryManager.AddPageToHistory(NavigationManager.Uri);
         NavigationManager.NavigateTo("fundvelo/account/Found");
     }
 

Pages/Fundvelo/CaritasServiceFundVeloFoundConclusion.razor

 
     protected async override void OnInitialized() {
         base.OnInitialized();
-        PageHistoryManager.AddPageToHistory(NavigationManager.Uri);
         try {
             if (ReportDataProvider.ReportRepositoryItem != null) {
                 response = await IBicycleRestService.SendFoundReport((FoundReportRepositoryItem)ReportDataProvider.ReportRepositoryItem);

Pages/Fundvelo/CaritasServiceFundVeloFoundKeyDataPage.razor

         await GetBicycleTypes();
         await GetBrands();
         refreshGUIFromDto();
-        PageHistoryManager.AddPageToHistory(NavigationManager.Uri);
         OnlineStatusProvider.AddOnlineStatusChangeCallBack(OnOnlineStatusChanged);
         StateHasChanged();
     }
 
     private async void AfterRenderMap() {
         FoundReport report = ReportDataProvider.GetFoundReport();
-        if (report.GeographicInfo.Latitude != 0 && report.GeographicInfo.Longitude != 0) {
+        MouseEvent mouseEvent = new MouseEvent();
+        LatLng coordinates;
+        LatLng devicePosition = await InitializeDeviceMapPosition();
+        if (report != null && report.GeographicInfo.Latitude != 0 && report.GeographicInfo.Longitude != 0) {
             bicycleGeoPosition.DisplayCity = await GetFormattedAddressZipAndTown(ReportDataProvider);
-            LatLng coordinates = new LatLng(report.GeographicInfo.Latitude, report.GeographicInfo.Longitude);
-            MouseEvent mouseEvent = new MouseEvent();
+            coordinates = new LatLng(report.GeographicInfo.Latitude, report.GeographicInfo.Longitude);
             mouseEvent.LatLng = coordinates;
             await InitializeBicycleMapPosition();
             await AddBicycleMarkerOnClickPosition(mouseEvent);
             StateHasChanged();
+        } else {  // Set bicycle postion equal to device position
+            coordinates = new LatLng(devicePosition.Lat, devicePosition.Lng);
+            mouseEvent.LatLng = coordinates;
+            await OnMouseMapClicked(mouseEvent);
         }
+        StateHasChanged();
     }
 
     private Brand getBrand(Brand brand) {
 
     private void Next() {
         updateDtoFromGUI();
+        PageHistoryManager.AddPageToHistory(NavigationManager.Uri);
         if (abholadresseIsNotContact) {
             NavigationManager.NavigateTo("fundvelo/alternate_pickup");
         } else {

Pages/Fundvelo/CaritasServiceFundVeloFoundKeyDataPage.razor.cs

             await this.mapRef.OnClick(async (MouseEvent mouseEvent) => await OnMouseMapClicked(mouseEvent));
         }
 
-        protected async Task InitializeDeviceMapPosition() {
+        protected async Task<LatLng> InitializeDeviceMapPosition() {
             CreateBicycleMarkerOptions();
             await AddEventsToMap();
-            await ShowDeviceGeoLocation();
+            return await ShowDeviceGeoLocation();
         }
 
         protected async Task InitializeBicycleMapPosition() {
             this.bicyclePositionMarker = await this.MarkerFactory.CreateAndAddToMap(mouseEvent.LatLng, this.mapRef, this.bicycleMarkerOptions);
         }
 
+        protected async Task<LatLng> GetDeviceGeoLocation() {
+            LatLng geoPosition;
+            BlazorGeolocationPosition position = await this.BlazorGeolocationService.GetPositionAsync();
+            if (position.ErrorCode != null) {
+                Toaster.ShowError(I18n.GetString("Error.GeoLocation.Title", position.ErrorCode), I18n.GetString("Error.GeoLocation.Msg", position.ErrorMessage));
+                geoPosition = new(0, 0);
+            } else {
+                geoPosition = new((double)position.Latitude, (double)position.Longitude);
+            }
+            return geoPosition;
+        }
+
         private async void CreateBicycleMarkerOptions() {
             this.bicycleMarkerOptions = new MarkerOptions() {
                 IconRef = await this.IconFactory.Create(new IconOptions() {
             };
         }
 
-        private async Task ShowDeviceGeoLocation() {
-            BlazorGeolocationPosition position = await this.BlazorGeolocationService.GetPositionAsync();
-            if (position.ErrorCode != null) {
-                Toaster.ShowError(I18n.GetString("Error.GeoLocation.Title", position.ErrorCode), I18n.GetString("Error.GeoLocation.Msg", position.ErrorMessage));
-            } else {
-                LatLng geoPosition = new((double)position.Latitude, (double)position.Longitude);
-
-                if (this.devicePositionMarker != null) {
-                    await devicePositionMarker.Remove();
-                }
-                this.devicePositionMarker = await this.MarkerFactory.CreateAndAddToMap(geoPosition, this.mapRef);
+        private async Task<LatLng> ShowDeviceGeoLocation() {
+            LatLng geoPosition = await GetDeviceGeoLocation();
 
-                await this.mapRef.SetZoom(16);
-                await this.mapRef.SetView(geoPosition);
+            if (this.devicePositionMarker != null) {
+                await devicePositionMarker.Remove();
             }
+            this.devicePositionMarker = await this.MarkerFactory.CreateAndAddToMap(geoPosition, this.mapRef);
+
+            await this.mapRef.SetZoom(16);
+            await this.mapRef.SetView(geoPosition);
+            return geoPosition;
         }
 
         private async Task ShowBicycleGeoLocation() {
             return String.IsNullOrEmpty(postcode) ? "" : postcode.Split("-", StringSplitOptions.RemoveEmptyEntries | StringSplitOptions.TrimEntries)[0];
         }
 
-        private async Task OnMouseMapClicked(MouseEvent mouseEvent) {
+        protected async Task OnMouseMapClicked(MouseEvent mouseEvent) {
             await AddBicycleMarkerOnClickPosition(mouseEvent);
 
             this.bicycleGeoPosition.Latitude = mouseEvent.LatLng.Lat;

Pages/Fundvelo/CaritasServiceFundVeloHistoryPage.razor

 
     protected override void OnInitialized() {
         base.OnInitialized();
-        PageHistoryManager.AddPageToHistory(NavigationManager.Uri);
         StateHasChanged();
     }
 

Pages/Fundvelo/CaritasServiceFundVeloLostFoundPage.razor

 
         protected async override void OnInitialized() {
             base.OnInitialized();
-            PageHistoryManager.AddPageToHistory(NavigationManager.Uri);
             ReportDataProvider.Report = null;
             ReportDataProvider.ReportRepositoryItem = null;
             StateHasChanged();
             Report report = new FoundReport();
             UserDataProvider.MapReport(report, await UserDataProvider.Get());
             ReportDataProvider.Report = report;
+            PageHistoryManager.AddPageToHistory(NavigationManager.Uri);
             NavigationManager.NavigateTo("fundvelo/keydata/Found");
         }
 
             Report report = new MissingReport();
             UserDataProvider.MapReport(report, await UserDataProvider.Get());
             ReportDataProvider.Report = report;
+            PageHistoryManager.AddPageToHistory(NavigationManager.Uri);
             NavigationManager.NavigateTo("fundvelo/keydata/Missing");
         }
 

Pages/Fundvelo/CaritasServiceFundVeloMissingConclusion.razor

 
     protected async override void OnInitialized() {
         base.OnInitialized();
-        PageHistoryManager.AddPageToHistory(NavigationManager.Uri);
         try {
             if (ReportDataProvider.ReportRepositoryItem != null) {
                 response = await IBicycleRestService.SendMissingReport((MissingReportRepositoryItem)ReportDataProvider.ReportRepositoryItem);

Pages/Fundvelo/CaritasServiceFundVeloMissingKeyDataPage.razor

         await GetBrands();
         await GetSearchServices();
         refreshGUIFromDto();
-        PageHistoryManager.AddPageToHistory(NavigationManager.Uri);
         StateHasChanged();
     }
 
 
     private void Next() {
         updateDtoFromGUI();
+        PageHistoryManager.AddPageToHistory(NavigationManager.Uri);
         NavigationManager.NavigateTo("fundvelo/account/Missing");
     }
 

Pages/Fundvelo/CaritasServiceFundVeloPendingOverviewPage.razor

 
     protected async override void OnInitialized() {
         base.OnInitialized();
-        PageHistoryManager.AddPageToHistory(NavigationManager.Uri);
         pendingReports.AddRange(await ReportRepositoryService.GetPendingFoundReports());
         pendingReports.AddRange(await ReportRepositoryService.GetPendingMissingReports());
         StateHasChanged();

Pages/InfoPage.razor

 
     protected override void OnInitialized() {
         base.OnInitialized();
-        PageHistoryManager.AddPageToHistory(NavigationManager.Uri);
         version = Assembly.GetExecutingAssembly().GetCustomAttribute<AssemblyInformationalVersionAttribute>().InformationalVersion;
     }
 

Shared/NavMenu.razor

         base.OnInitialized();
         AppState.OnChange += StateHasChanged;
         NavigationManager.LocationChanged += LocationChanged;
-        PageHistoryManager.AddPageToHistory(NavigationManager.Uri);
         locUrl = I18n.GetString(NavigationManager.Uri.Replace(NavigationManager.BaseUri, ""));
         StateHasChanged();
     }
     private void ButtonClicked(int _Index) {
         index = _Index;
         navSubMenuOpen = (index == 3 || index == 4);
+        PageHistoryManager.AddPageToHistory(NavigationManager.Uri);
         StateHasChanged();
         ButtonClicked();
     }

Shared/Services/PageHistoryManager.cs

         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);
+                string previousPage = previousPages.ElementAt(previousPages.Count - 1);
                 previousPages.RemoveAt(previousPages.Count - 1);
                 return previousPage;
             }
         }
 
         public bool CanGoBack() {
-            return previousPages.Count > 1;
+            return previousPages.Count >= 1;
         }
 
         public async void NavigateBack() {

wwwroot/css/app.css

 .mdc-nav-item.selected {
     background-color: var(--primary);
     color: #fff !important;
+}
+
+.mat-drawer {
+    border-right-width: 0px;
+    width: var(--mat-drawer-custom-width, 300px);
 }