From 4463be7507cd51972fd2f8409941fea1127e18bb Mon Sep 17 00:00:00 2001 From: Adam Date: Thu, 22 Aug 2024 12:55:52 +0200 Subject: [PATCH] fixes, upgrades --- DeployReadme.txt | 3 +- TIAM.Core/Consts/TiamConst.cs | 1 + .../Services/SecureStorageHandler.cs | 8 +- TIAMResources/TIAMResources.Designer.cs | 54 ++++++++++++++ TIAMResources/TIAMResources.hu.resx | 18 +++++ TIAMResources/TIAMResources.resx | 18 +++++ TIAMSharedUI/Pages/EditTransfers.razor | 6 +- TIAMSharedUI/Pages/Login.razor | 19 +++-- TIAMSharedUI/Pages/RoadmapPage.razor | 73 +++++++++++++++++++ TIAMSharedUI/Pages/Settings.razor | 27 ++++--- TIAMSharedUI/Pages/Settings.razor.cs | 7 +- TIAMSharedUI/Pages/TransferPage.razor | 60 +++++++++++++-- .../MessageDetailGridComponent.razor | 2 +- TIAMSharedUI/Shared/Components/Navbar.razor | 11 ++- TIAMSharedUI/TIAMSharedUI.csproj | 3 + TIAMSharedUI/wwwroot/css/TourIAm.css | 18 ++++- .../Client/Services/SecureStorageHandler.cs | 9 ++- .../Shared/Models/ClientSide/Setting.cs | 2 + 18 files changed, 299 insertions(+), 40 deletions(-) create mode 100644 TIAMSharedUI/Pages/RoadmapPage.razor diff --git a/DeployReadme.txt b/DeployReadme.txt index f6735703..69482a11 100644 --- a/DeployReadme.txt +++ b/DeployReadme.txt @@ -1,5 +1,6 @@ aycode.core rebuild product mode copy: \AyCode.Core\AyCode.Services.Server\bin\Product\net8.0 to \AyCode.Core\AyCode.Services.Server\bin\Debug\net8.0 -Setting.cs baseurl +Setting.cs baseurl átállítani: devrelease test.touriam.com, release:touriam.com +program.cs-ben átírni a kívánt portot 7116-ról megnézni a Loglevelt és ha olyan, átállítani TiamConstClient.DefaultLogLevelClient database connection, server side loglevel string átírni tiamwebappserver\appsettings.json diff --git a/TIAM.Core/Consts/TiamConst.cs b/TIAM.Core/Consts/TiamConst.cs index b4ad5cdc..f510be2c 100644 --- a/TIAM.Core/Consts/TiamConst.cs +++ b/TIAM.Core/Consts/TiamConst.cs @@ -5,6 +5,7 @@ namespace TIAM.Core.Consts; public static class TiamConstClient { + public static string DefaultLocale = "en-US"; public static Guid TransferProductId = Guid.Parse("814b5495-c2e9-4f1d-a73f-37cd5d353078"); public static Guid[] DevAdminIds = new Guid[2] { Guid.Parse("dcf451d2-cc4c-4ac2-8c1f-da00041be1fd"), Guid.Parse("4cbaed43-2465-4d99-84f1-c8bc6b7025f7") }; public static Guid[] SysAdmins = new Guid[3] diff --git a/TIAMMobileApp/Services/SecureStorageHandler.cs b/TIAMMobileApp/Services/SecureStorageHandler.cs index 57d5bb47..d8246d5d 100644 --- a/TIAMMobileApp/Services/SecureStorageHandler.cs +++ b/TIAMMobileApp/Services/SecureStorageHandler.cs @@ -20,7 +20,13 @@ namespace TIAMMobileApp.Services public async Task GetFromSecureStorageAsync(string key) { - return await SecureStorage.GetAsync(key); + + var result = await SecureStorage.GetAsync(key); + if (result != null) + { + return result; + } + else return string.Empty; } public async Task DeleteFromSecureStorageAsync(string key) diff --git a/TIAMResources/TIAMResources.Designer.cs b/TIAMResources/TIAMResources.Designer.cs index 9924db6f..f6b295db 100644 --- a/TIAMResources/TIAMResources.Designer.cs +++ b/TIAMResources/TIAMResources.Designer.cs @@ -249,6 +249,15 @@ namespace TIAM.Resources { } } + /// + /// Looks up a localized string similar to Drivers. + /// + public static string Drivers_title { + get { + return ResourceManager.GetString("Drivers.title", resourceCulture); + } + } + /// /// Looks up a localized string similar to Email. /// @@ -411,6 +420,24 @@ namespace TIAM.Resources { } } + /// + /// Looks up a localized string similar to Manage your transfer here. + /// + public static string MyTransfers_Subtitle { + get { + return ResourceManager.GetString("MyTransfers.Subtitle", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Transfer details. + /// + public static string MyTransfers_Title { + get { + return ResourceManager.GetString("MyTransfers.Title", resourceCulture); + } + } + /// /// Looks up a localized string similar to About us. /// @@ -465,6 +492,15 @@ namespace TIAM.Resources { } } + /// + /// Looks up a localized string similar to Roadmap. + /// + public static string NavMenu_Roadmap { + get { + return ResourceManager.GetString("NavMenu.Roadmap", resourceCulture); + } + } + /// /// Looks up a localized string similar to Settings. /// @@ -753,6 +789,24 @@ namespace TIAM.Resources { } } + /// + /// Looks up a localized string similar to Manage transfers here. + /// + public static string Transfers_Subtitle { + get { + return ResourceManager.GetString("Transfers.Subtitle", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Transfers. + /// + public static string Transfers_Title { + get { + return ResourceManager.GetString("Transfers.Title", resourceCulture); + } + } + /// /// Looks up a localized string similar to Let's book a transfer!. /// diff --git a/TIAMResources/TIAMResources.hu.resx b/TIAMResources/TIAMResources.hu.resx index 094cc7ab..3954816d 100644 --- a/TIAMResources/TIAMResources.hu.resx +++ b/TIAMResources/TIAMResources.hu.resx @@ -180,6 +180,9 @@ SofĹ‘r + + SofĹ‘rök + E-mail @@ -234,6 +237,12 @@ LĂ©pjĂĽnk csak be! + + Utazás kezelĂ©se + + + Transzfer rĂ©szletei + RĂłlunk @@ -252,6 +261,9 @@ BelĂ©pĂ©s + + Ăśtemterv + BeállĂ­tások @@ -348,6 +360,12 @@ Ăšj uticĂ©l + + Transzferek kezelĂ©se + + + Transzferek + RendeljĂĽnk egy transzfert! diff --git a/TIAMResources/TIAMResources.resx b/TIAMResources/TIAMResources.resx index 069cbdc2..786eb3e8 100644 --- a/TIAMResources/TIAMResources.resx +++ b/TIAMResources/TIAMResources.resx @@ -180,6 +180,9 @@ Driver + + Drivers + Email @@ -234,6 +237,12 @@ Let's get you inside! + + Manage your transfer here + + + Transfer details + About us @@ -252,6 +261,9 @@ Login + + Roadmap + Settings @@ -348,6 +360,12 @@ New destination + + Manage transfers here + + + Transfers + Let's book a transfer! diff --git a/TIAMSharedUI/Pages/EditTransfers.razor b/TIAMSharedUI/Pages/EditTransfers.razor index 3f2d6edd..d6717565 100644 --- a/TIAMSharedUI/Pages/EditTransfers.razor +++ b/TIAMSharedUI/Pages/EditTransfers.razor @@ -28,10 +28,10 @@ @inject IWizardProcessor wizardProcessor @inject AdminSignalRClient _adminSignalRClient -Transfer details +@localizer.GetString("MyTransfers.Subtitle")
-

Transfer details

-

Manage your transfer here

+

@localizer.GetString("MyTransfers.Title")

+

@localizer.GetString("MyTransfers.Subtitle")

-
+
-
+
-
+
-
+
@@ -45,7 +45,7 @@ -

@_currentStep

+ @*

@_currentStep

@{ if (!_loggedIn) { @@ -56,7 +56,7 @@

@_loginModel.Password

} - } + } *@
No account yet? Sign up here!
@@ -67,15 +67,18 @@
-
+
+
-

+

Welcome back to Budapest Airport Transfer Services! We're delighted to have you return to our platform. Please sign in to access your account and manage your bookings effortlessly. If you're new here, feel free to create an account to unlock exclusive benefits and enjoy a seamless booking experience.

+
+
diff --git a/TIAMSharedUI/Pages/RoadmapPage.razor b/TIAMSharedUI/Pages/RoadmapPage.razor new file mode 100644 index 00000000..8de66e21 --- /dev/null +++ b/TIAMSharedUI/Pages/RoadmapPage.razor @@ -0,0 +1,73 @@ +@page "/roadmap" +Roadmap + +
+

Roadmap

+

Learn more about Tour I am!

+
+ +
+
+
+ +
+
+ +

+ + Welcome to Tour I Am! With a rich legacy spanning many years, we take immense pride in offering unparalleled airport transfer services from Budapest Liszt Ferenc Airport to hotels across Budapest. Our commitment to excellence and customer satisfaction drives every aspect of our operation. + + At Tour I Am, we understand the importance of a seamless and comfortable journey for our valued customers. Whether you're arriving in Budapest for business or leisure, our dedicated team ensures that your transfer experience is hassle-free and enjoyable. + + + + + +

+ +

+ Our fleet of vehicles is meticulously maintained to the highest standards, providing you with a safe and luxurious travel experience. Our professional drivers are highly trained and knowledgeable, ensuring that you reach your destination efficiently and on time. +

+ +

+ We believe in transparency and reliability, which is why our pricing is competitive and transparent, with no hidden fees or surprises. From the moment you book with us until your journey's end, we strive to exceed your expectations at every step. + + Experience the difference with Tour I Am. Let us take care of your airport transfer needs, so you can focus on making unforgettable memories in Budapest. +

+ + Learn More + + +
+
+
+
+ +
+
+
+
+ +
+
+
+
+ +
+
+
+
+
+
+
+
+
+
+ + + + + +@code { + +} diff --git a/TIAMSharedUI/Pages/Settings.razor b/TIAMSharedUI/Pages/Settings.razor index edb72caf..e37fd73a 100644 --- a/TIAMSharedUI/Pages/Settings.razor +++ b/TIAMSharedUI/Pages/Settings.razor @@ -2,23 +2,26 @@ @using TIAMSharedUI.Pages.Components
- +

@localizer["Settings.Title"]

- - -
- - @if (@UserIsLoggedIn) - { -
-
- +
+
- } + @if (@UserIsLoggedIn) + { +
+ +
+ + } + +
+ +
@code { - + } diff --git a/TIAMSharedUI/Pages/Settings.razor.cs b/TIAMSharedUI/Pages/Settings.razor.cs index 2c923409..57b45548 100644 --- a/TIAMSharedUI/Pages/Settings.razor.cs +++ b/TIAMSharedUI/Pages/Settings.razor.cs @@ -17,23 +17,22 @@ namespace TIAMSharedUI.Pages public IStringLocalizer? localizer { get; set; } [Inject] - public ISessionService sessionService { get; set; } + public ISessionService SessionService { get; set; } public string Language { get; set; } = "en-US"; - private AuthComponent Auth; + private bool UserIsLoggedIn = false; protected override void OnInitialized() { base.OnInitialized(); - UserIsLoggedIn = sessionService.IsAuthenticated; + UserIsLoggedIn = SessionService.IsAuthenticated; GetCurrentSettings(); } public void SaveSettings() { secureStorageHandler?.SaveToSecureStorageAsync(Setting.Locale, "hu-HU"); - } public void GetCurrentSettings() diff --git a/TIAMSharedUI/Pages/TransferPage.razor b/TIAMSharedUI/Pages/TransferPage.razor index 3d4f36e3..72f6ef96 100644 --- a/TIAMSharedUI/Pages/TransferPage.razor +++ b/TIAMSharedUI/Pages/TransferPage.razor @@ -25,14 +25,25 @@
- + + + + + + + + + + + + @* *@ - +
@@ -100,9 +111,10 @@ new HeroSliderItem }, }; - public List TransferIgnorList = new List + public List TransferIgnorList1 = new List { "Id", + "Destination", "UserId", "ProductId", "PaymentId", @@ -113,12 +125,42 @@ new HeroSliderItem "UserProductToCarId", "ReferralId", "Price" - }; + }; + + public List TransferIgnorList2 = new List + { + "Id", + "PickupAddress", + "UserId", + "ProductId", + "PaymentId", + "TripDate", + "FirstName", + "LastName", + "UserProductMappingId", + "UserProductToCarId", + "ReferralId", + "Price" + }; /*protected override void OnAfterRender(bool isFirst) { message = " Target destination is " + slider.SliderElementId.ToString(); - }*/ + }*/ + + private bool toAirport = true; + + public void ToAirport() + { + toAirport = true; + myModel.Destination = "Budapest, 1185"; + } + + public void FromAirport() + { + toAirport = false; + myModel.PickupAddress = "Budapest, 1185"; + } public async Task SubmitForm(object Result) { @@ -162,7 +204,7 @@ new HeroSliderItem { //create a guest user and set referralId var registration = new RegistrationModel(); - + var password = AcCharsGenerator.NewPassword(AcConst.MinPasswordLength, 16); registration.Email = resModel.EmailAddress; @@ -210,5 +252,11 @@ new HeroSliderItem navManager.NavigateTo($"/transfer2/{resModel.Id}"); } + protected override Task OnInitializedAsync() + { + ToAirport(); + return base.OnInitializedAsync(); + } + } diff --git a/TIAMSharedUI/Pages/User/SysAdmins/MessageDetailGridComponent.razor b/TIAMSharedUI/Pages/User/SysAdmins/MessageDetailGridComponent.razor index be082d44..993898fb 100644 --- a/TIAMSharedUI/Pages/User/SysAdmins/MessageDetailGridComponent.razor +++ b/TIAMSharedUI/Pages/User/SysAdmins/MessageDetailGridComponent.razor @@ -26,7 +26,7 @@ @inject AdminSignalRClient AdminSignalRClient; - +