| @@ -1,7 +1,7 @@ | |||
| @page "/account" | |||
| @page "/fundvelo/account/{FromRoute}" | |||
| @using CaritasPWA.Shared.Models; | |||
| @using CaritasPWA.Shared.Services; | |||
| @using cwebplusApp.Shared.Models; | |||
| @using cwebplusApp.Shared.Services; | |||
| @inject NavigationManager NavigationManager | |||
| @inject UserDataProvider UserDataProvider | |||
| @inject IStringLocalizer<Resources> i18n | |||
| @@ -1,5 +1,5 @@ | |||
| @page "/fundvelo/conclusion_found" | |||
| @using CaritasPWA.Shared.Services; | |||
| @using cwebplusApp.Shared.Services; | |||
| @inject NavigationManager NavigationManager | |||
| @inject IStringLocalizer<Resources> i18n | |||
| @inject PageHistoryManager PageHistoryManager | |||
| @@ -2,8 +2,8 @@ | |||
| @inherits CaritasServiceFundVeloKeyDataPageBase | |||
| @using CaritasPWA.Shared.Models; | |||
| @using CaritasPWA.Shared.Services; | |||
| @using cwebplusApp.Shared.Models; | |||
| @using cwebplusApp.Shared.Services; | |||
| @using System.Globalization; | |||
| @using Microsoft.AspNetCore.Components.Forms; | |||
| @using System.IO; | |||
| @@ -1,14 +1,14 @@ | |||
| using BlazorGeolocation; | |||
| using CaritasPWA.Shared.Models; | |||
| using CaritasPWA.Shared.ResourceFiles; | |||
| using CaritasPWA.Shared.Services; | |||
| using cwebplusApp.Shared.Models; | |||
| using cwebplusApp.Shared.ResourceFiles; | |||
| using cwebplusApp.Shared.Services; | |||
| using FisSst.BlazorMaps; | |||
| using Microsoft.AspNetCore.Components; | |||
| using Microsoft.Extensions.Localization; | |||
| using System; | |||
| using System.Threading.Tasks; | |||
| namespace CaritasPWA.Pages { | |||
| namespace cwebplusApp.Pages { | |||
| public partial class CaritasServiceFundVeloKeyDataPageBase : ComponentBase { | |||
| protected readonly LatLng center; | |||
| @@ -1,5 +1,5 @@ | |||
| @page "/fundvelo/lost_found" | |||
| @using CaritasPWA.Shared.Services; | |||
| @using cwebplusApp.Shared.Services; | |||
| @inject NavigationManager NavigationManager | |||
| @inject PageHistoryManager PageHistoryManager | |||
| @@ -1,5 +1,5 @@ | |||
| @page "/fundvelo/conclusion_missing" | |||
| @using CaritasPWA.Shared.Services; | |||
| @using cwebplusApp.Shared.Services; | |||
| @inject NavigationManager NavigationManager | |||
| @inject IStringLocalizer<Resources> i18n | |||
| @inject PageHistoryManager PageHistoryManager | |||
| @@ -1,5 +1,5 @@ | |||
| @page "/caritas_services" | |||
| @using CaritasPWA.Shared.Services; | |||
| @using cwebplusApp.Shared.Services; | |||
| @inject NavigationManager NavigationManager | |||
| @inject PageHistoryManager PageHistoryManager | |||
| @@ -1,5 +1,5 @@ | |||
| @page "/" | |||
| @using CaritasPWA.Shared.Services; | |||
| @using cwebplusApp.Shared.Services; | |||
| @using System.Threading; | |||
| @inject NavigationManager NavigationManager; | |||
| @inject AppState AppState; | |||
| @@ -48,7 +48,7 @@ | |||
| StateHasChanged(); | |||
| try { | |||
| await MasterDataService.SynchronizeMasterdata(); | |||
| } catch (Exception ex) { | |||
| } catch (Exception) { | |||
| Toaster.ShowWarning(i18n.GetString("Warning.Masterdata.Title"), i18n.GetString("Warning.Masterdata.Msg")); | |||
| } finally { | |||
| showProgressCircle = false; | |||
| @@ -1,6 +1,6 @@ | |||
| @page "/info" | |||
| @using CaritasPWA.Shared.Services; | |||
| @using cwebplusApp.Shared.Services; | |||
| @inject NavigationManager NavigationManager; | |||
| @inject IStringLocalizer<Resources> i18n | |||
| @inject PageHistoryManager PageHistoryManager | |||
| @@ -1,6 +1,7 @@ | |||
| using BlazorGeolocation; | |||
| using CaritasPWA.Shared; | |||
| using CaritasPWA.Shared.Services; | |||
| using cwebplusApp; | |||
| using cwebplusApp.Shared; | |||
| using cwebplusApp.Shared.Services; | |||
| using FisSst.BlazorMaps.DependencyInjection; | |||
| using MatBlazor; | |||
| using Microsoft.AspNetCore.Components.WebAssembly.Hosting; | |||
| @@ -1,6 +1,6 @@ | |||
| using System; | |||
| namespace CaritasPWA.Shared { | |||
| namespace cwebplusApp.Shared { | |||
| public class AppState { | |||
| private bool _loggedIn; | |||
| @@ -1,4 +1,4 @@ | |||
| namespace CaritasPWA.Shared.Models { | |||
| namespace cwebplusApp.Shared.Models { | |||
| public class BicycleType { | |||
| public int Id { get; set; } | |||
| @@ -1,4 +1,4 @@ | |||
| namespace CaritasPWA.Shared.Models { | |||
| namespace cwebplusApp.Shared.Models { | |||
| public class Brand { | |||
| public int Id { get; set; } | |||
| @@ -1,4 +1,4 @@ | |||
| namespace CaritasPWA.Shared.Models { | |||
| namespace cwebplusApp.Shared.Models { | |||
| public class ColorItem { | |||
| @@ -1,8 +1,8 @@ | |||
| using CaritasPWA.Shared.ResourceFiles; | |||
| using cwebplusApp.Shared.ResourceFiles; | |||
| using Microsoft.Extensions.Localization; | |||
| using System.Collections.Generic; | |||
| namespace CaritasPWA.Shared.Models { | |||
| namespace cwebplusApp.Shared.Models { | |||
| public class Defaults { | |||
| private static readonly ColorItem[] ColorItems = { | |||
| @@ -102,7 +102,7 @@ namespace CaritasPWA.Shared.Models { | |||
| public static List<Brand> GetBrandDefaults(IStringLocalizer<Resources> _i18n) { | |||
| List<Brand> brands = new(); | |||
| foreach (Brand brand in Brands) { | |||
| brands.Add(new Brand(brand.Id, brand.Id == 0 ? _i18n.GetString("Brand." + brand.Bezeichnung): brand.Bezeichnung)); | |||
| brands.Add(new Brand(brand.Id, brand.Id == 0 ? _i18n.GetString("Brand." + brand.Bezeichnung) : brand.Bezeichnung)); | |||
| } | |||
| return brands; | |||
| } | |||
| @@ -1,4 +1,4 @@ | |||
| namespace CaritasPWA.Shared.Models { | |||
| namespace cwebplusApp.Shared.Models { | |||
| public class BicycleGeoPosition { | |||
| public BicycleGeoPosition() { | |||
| @@ -1,4 +1,4 @@ | |||
| namespace CaritasPWA.Shared.Models { | |||
| namespace cwebplusApp.Shared.Models { | |||
| public class NominatimReverseAddress { | |||
| public string place_id; | |||
| @@ -1,4 +1,4 @@ | |||
| namespace CaritasPWA.Shared.Models { | |||
| namespace cwebplusApp.Shared.Models { | |||
| // The class that stores the user settings | |||
| public class UserData { | |||
| private string salutation; | |||
| @@ -1,4 +1,4 @@ | |||
| @using CaritasPWA.Shared.Services; | |||
| @using cwebplusApp.Shared.Services; | |||
| @inject AppState AppState; | |||
| @inject NavigationManager NavigationManager; | |||
| @inject IStringLocalizer<Resources> i18n | |||
| @@ -8,7 +8,7 @@ | |||
| // </auto-generated> | |||
| //------------------------------------------------------------------------------ | |||
| namespace CaritasPWA.Shared.ResourceFiles { | |||
| namespace cwebplusApp.Shared.ResourceFiles { | |||
| using System; | |||
| @@ -39,7 +39,7 @@ namespace CaritasPWA.Shared.ResourceFiles { | |||
| public static global::System.Resources.ResourceManager ResourceManager { | |||
| get { | |||
| if (object.ReferenceEquals(resourceMan, null)) { | |||
| global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("CaritasPWA.Shared.ResourceFiles.Resources", typeof(Resources).Assembly); | |||
| global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("cwebplusApp.Shared.ResourceFiles.Resources", typeof(Resources).Assembly); | |||
| resourceMan = temp; | |||
| } | |||
| return resourceMan; | |||
| @@ -1,8 +1,8 @@ | |||
| using CaritasPWA.Shared.Models; | |||
| using cwebplusApp.Shared.Models; | |||
| using System.Collections.Generic; | |||
| using System.Threading.Tasks; | |||
| namespace CaritasPWA.Shared.Services { | |||
| namespace cwebplusApp.Shared.Services { | |||
| public interface ILFBicycleRest { | |||
| Task<List<ColorItem>> GetColors(); | |||
| @@ -1,4 +1,4 @@ | |||
| using CaritasPWA.Shared.Models; | |||
| using cwebplusApp.Shared.Models; | |||
| using Json.Net; | |||
| using System; | |||
| using System.Collections.Generic; | |||
| @@ -6,7 +6,7 @@ using System.Globalization; | |||
| using System.Net.Http; | |||
| using System.Threading.Tasks; | |||
| namespace CaritasPWA.Shared.Services { | |||
| namespace cwebplusApp.Shared.Services { | |||
| // REST interface responsible to submit lost or found reports and get the available master data. | |||
| public class LFBicycleRest : ILFBicycleRest { | |||
| @@ -1,14 +1,13 @@ | |||
| using CaritasPWA.Shared.Models; | |||
| using CaritasPWA.Shared.ResourceFiles; | |||
| using cwebplusApp.Shared.Models; | |||
| using cwebplusApp.Shared.ResourceFiles; | |||
| using Json.Net; | |||
| using Microsoft.Extensions.Localization; | |||
| using Microsoft.JSInterop; | |||
| using System; | |||
| using System.Collections.Generic; | |||
| using System.Runtime.CompilerServices; | |||
| using System.Threading.Tasks; | |||
| namespace CaritasPWA.Shared.Services { | |||
| namespace cwebplusApp.Shared.Services { | |||
| public class MasterDataService { | |||
| private readonly ILFBicycleRest _lFBicycleRest; | |||
| @@ -1,11 +1,11 @@ | |||
| using CaritasPWA.Shared.Models; | |||
| using cwebplusApp.Shared.Models; | |||
| using Json.Net; | |||
| using System; | |||
| using System.Globalization; | |||
| using System.Net.Http; | |||
| using System.Threading.Tasks; | |||
| namespace CaritasPWA.Shared.Services { | |||
| namespace cwebplusApp.Shared.Services { | |||
| public class NominatimService { | |||
| public static async Task<NominatimReverseAddress> GetAddressForCoordinates(double latitude, double longitude) { | |||
| @@ -22,7 +22,7 @@ namespace CaritasPWA.Shared.Services { | |||
| } | |||
| return null; | |||
| } catch (Exception ex) { | |||
| } catch (Exception) { | |||
| return null; | |||
| } | |||
| } | |||
| @@ -1,7 +1,7 @@ | |||
| using System.Collections.Generic; | |||
| using System.Linq; | |||
| namespace CaritasPWA.Shared.Services { | |||
| namespace cwebplusApp.Shared.Services { | |||
| public class PageHistoryManager { | |||
| private readonly List<string> previousPages; | |||
| @@ -1,10 +1,6 @@ | |||
| using MatBlazor; | |||
| using System; | |||
| using System.Collections.Generic; | |||
| using System.Linq; | |||
| using System.Threading.Tasks; | |||
| namespace CaritasPWA.Shared.Services { | |||
| namespace cwebplusApp.Shared.Services { | |||
| public class Toaster { | |||
| private readonly IMatToaster matToaster; | |||
| @@ -1,9 +1,9 @@ | |||
| using CaritasPWA.Shared.Models; | |||
| using cwebplusApp.Shared.Models; | |||
| using Microsoft.JSInterop; | |||
| using System; | |||
| using System.Threading.Tasks; | |||
| namespace CaritasPWA.Shared.Services { | |||
| namespace cwebplusApp.Shared.Services { | |||
| public sealed class UserDataProvider { | |||
| private const string KeyName = "account"; | |||
| @@ -11,5 +11,5 @@ | |||
| @using FisSst.BlazorMaps | |||
| @using BlazorGeolocation | |||
| @using CaritasPWA | |||
| @using CaritasPWA.Shared | |||
| @using CaritasPWA.Shared.ResourceFiles | |||
| @using cwebplusApp.Shared | |||
| @using cwebplusApp.Shared.ResourceFiles | |||
| @@ -1,5 +1,12 @@ | |||
| <Project Sdk="Microsoft.NET.Sdk.BlazorWebAssembly"> | |||
| <PropertyGroup Label="Globals"> | |||
| <SccProjectName>SAK</SccProjectName> | |||
| <SccProvider>SAK</SccProvider> | |||
| <SccAuxPath>SAK</SccAuxPath> | |||
| <SccLocalPath>SAK</SccLocalPath> | |||
| </PropertyGroup> | |||
| <PropertyGroup> | |||
| <TargetFramework>net5.0</TargetFramework> | |||
| <ServiceWorkerAssetsManifest>service-worker-assets.js</ServiceWorkerAssetsManifest> | |||
| @@ -0,0 +1,10 @@ | |||
| "" | |||
| { | |||
| "FILE_VERSION" = "9237" | |||
| "ENLISTMENT_CHOICE" = "NEVER" | |||
| "PROJECT_FILE_RELATIVE_PATH" = "" | |||
| "NUMBER_OF_EXCLUDED_FILES" = "0" | |||
| "ORIGINAL_PROJECT_FILE_PATH" = "" | |||
| "NUMBER_OF_NESTED_PROJECTS" = "0" | |||
| "SOURCE_CONTROL_SETTINGS_PROVIDER" = "PROVIDER" | |||
| } | |||
| @@ -3,7 +3,7 @@ Microsoft Visual Studio Solution File, Format Version 12.00 | |||
| # Visual Studio Version 16 | |||
| VisualStudioVersion = 16.0.31321.278 | |||
| MinimumVisualStudioVersion = 10.0.40219.1 | |||
| Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CaritasPWA", "CaritasPWA.csproj", "{D258170F-7153-4503-AAB9-6B5699A58B53}" | |||
| Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "cwebplusApp", "cwebplusApp.csproj", "{D258170F-7153-4503-AAB9-6B5699A58B53}" | |||
| EndProject | |||
| Global | |||
| GlobalSection(SolutionConfigurationPlatforms) = preSolution | |||
| @@ -22,4 +22,12 @@ Global | |||
| GlobalSection(ExtensibilityGlobals) = postSolution | |||
| SolutionGuid = {727FFEFC-2F79-4A3E-B3E6-495767058A34} | |||
| EndGlobalSection | |||
| GlobalSection(TeamFoundationVersionControl) = preSolution | |||
| SccNumberOfProjects = 2 | |||
| SccEnterpriseProvider = {4CA58AB2-18FA-4F8D-95D4-32DDF27D184C} | |||
| SccTeamFoundationServer = https://integrateinformatik.visualstudio.com/ | |||
| SccLocalPath0 = . | |||
| SccProjectUniqueName1 = cwebplusApp.csproj | |||
| SccLocalPath1 = . | |||
| EndGlobalSection | |||
| EndGlobal | |||
| @@ -0,0 +1,10 @@ | |||
| "" | |||
| { | |||
| "FILE_VERSION" = "9237" | |||
| "ENLISTMENT_CHOICE" = "NEVER" | |||
| "PROJECT_FILE_RELATIVE_PATH" = "" | |||
| "NUMBER_OF_EXCLUDED_FILES" = "0" | |||
| "ORIGINAL_PROJECT_FILE_PATH" = "" | |||
| "NUMBER_OF_NESTED_PROJECTS" = "0" | |||
| "SOURCE_CONTROL_SETTINGS_PROVIDER" = "PROJECT" | |||
| } | |||