Adam
/
TourIAm
1
0
Fork 0
Code Issues 1 Pull Requests Projects Releases Wiki Activity

fixes, upgrades

This commit is contained in:
Adam 2024-08-22 12:55:52 +02:00
parent a82bf9a287
commit 4463be7507
18 changed files with 299 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
DeployReadme.txt
View File

@ -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

1
TIAM.Core/Consts/TiamConst.cs
View File

@ -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]

8
TIAMMobileApp/Services/SecureStorageHandler.cs
View File

@ -20,7 +20,13 @@ namespace TIAMMobileApp.Services
public async Task<string> 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)

54
TIAMResources/TIAMResources.Designer.cs generated
View File

@ -249,6 +249,15 @@ namespace TIAM.Resources {
}
}
/// <summary>
/// Looks up a localized string similar to Drivers.
/// </summary>
public static string Drivers_title {
get {
return ResourceManager.GetString("Drivers.title", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to Email.
/// </summary>
@ -411,6 +420,24 @@ namespace TIAM.Resources {
}
}
/// <summary>
/// Looks up a localized string similar to Manage your transfer here.
/// </summary>
public static string MyTransfers_Subtitle {
get {
return ResourceManager.GetString("MyTransfers.Subtitle", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to Transfer details.
/// </summary>
public static string MyTransfers_Title {
get {
return ResourceManager.GetString("MyTransfers.Title", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to About us.
/// </summary>
@ -465,6 +492,15 @@ namespace TIAM.Resources {
}
}
/// <summary>
/// Looks up a localized string similar to Roadmap.
/// </summary>
public static string NavMenu_Roadmap {
get {
return ResourceManager.GetString("NavMenu.Roadmap", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to Settings.
/// </summary>
@ -753,6 +789,24 @@ namespace TIAM.Resources {
}
}
/// <summary>
/// Looks up a localized string similar to Manage transfers here.
/// </summary>
public static string Transfers_Subtitle {
get {
return ResourceManager.GetString("Transfers.Subtitle", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to Transfers.
/// </summary>
public static string Transfers_Title {
get {
return ResourceManager.GetString("Transfers.Title", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to Let&apos;s book a transfer!.
/// </summary>

18
TIAMResources/TIAMResources.hu.resx
View File

@ -180,6 +180,9 @@
<data name="Driver" xml:space="preserve">
<value>Sofőr</value>
</data>
<data name="Drivers.title" xml:space="preserve">
<value>Sofőrök</value>
</data>
<data name="EmailAddress" xml:space="preserve">
<value>E-mail</value>
</data>
@ -234,6 +237,12 @@
<data name="LoginTitleText" xml:space="preserve">
<value>Lépjünk csak be!</value>
</data>
<data name="MyTransfers.Subtitle" xml:space="preserve">
<value>Utazás kezelése</value>
</data>
<data name="MyTransfers.Title" xml:space="preserve">
<value>Transzfer részletei</value>
</data>
<data name="NavMenu.About" xml:space="preserve">
<value>Rólunk</value>
</data>
@ -252,6 +261,9 @@
<data name="NavMenu.Login" xml:space="preserve">
<value>Belépés</value>
</data>
<data name="NavMenu.Roadmap" xml:space="preserve">
<value>Ütemterv</value>
</data>
<data name="NavMenu.Settings" xml:space="preserve">
<value>Beállítások</value>
</data>
@ -348,6 +360,12 @@
<data name="TransferDestinationTitle" xml:space="preserve">
<value>Új uticél</value>
</data>
<data name="Transfers.Subtitle" xml:space="preserve">
<value>Transzferek kezelése</value>
</data>
<data name="Transfers.Title" xml:space="preserve">
<value>Transzferek</value>
</data>
<data name="TransferSubtitle" xml:space="preserve">
<value>Rendeljünk egy transzfert!</value>
</data>

18
TIAMResources/TIAMResources.resx
View File

@ -180,6 +180,9 @@
<data name="Driver" xml:space="preserve">
<value>Driver</value>
</data>
<data name="Drivers.title" xml:space="preserve">
<value>Drivers</value>
</data>
<data name="EmailAddress" xml:space="preserve">
<value>Email</value>
</data>
@ -234,6 +237,12 @@
<data name="LoginTitleText" xml:space="preserve">
<value>Let's get you inside!</value>
</data>
<data name="MyTransfers.Subtitle" xml:space="preserve">
<value>Manage your transfer here</value>
</data>
<data name="MyTransfers.Title" xml:space="preserve">
<value>Transfer details</value>
</data>
<data name="NavMenu.About" xml:space="preserve">
<value>About us</value>
</data>
@ -252,6 +261,9 @@
<data name="NavMenu.Login" xml:space="preserve">
<value>Login</value>
</data>
<data name="NavMenu.Roadmap" xml:space="preserve">
<value>Roadmap</value>
</data>
<data name="NavMenu.Settings" xml:space="preserve">
<value>Settings</value>
</data>
@ -348,6 +360,12 @@
<data name="TransferDestinationTitle" xml:space="preserve">
<value>New destination</value>
</data>
<data name="Transfers.Subtitle" xml:space="preserve">
<value>Manage transfers here</value>
</data>
<data name="Transfers.Title" xml:space="preserve">
<value>Transfers</value>
</data>
<data name="TransferSubtitle" xml:space="preserve">
<value>Let's book a transfer!</value>
</data>

6
TIAMSharedUI/Pages/EditTransfers.razor
View File

@ -28,10 +28,10 @@
@inject IWizardProcessor wizardProcessor
@inject AdminSignalRClient _adminSignalRClient
<PageTitle>Transfer details</PageTitle>
<PageTitle>@localizer.GetString("MyTransfers.Subtitle")</PageTitle>
<div class="text-center m-5">
<h1>Transfer details</h1>
<h2 style="font-size:small">Manage your transfer here</h2>
<h1>@localizer.GetString("MyTransfers.Title")</h1>
<h2 style="font-size:small">@localizer.GetString("MyTransfers.Subtitle")</h2>
</div>
<DxPopup CssClass="popup-demo-events"

19
TIAMSharedUI/Pages/Login.razor
View File

@ -14,13 +14,13 @@
</div>
<div class="container mt-3">
<div class="container-fluid mt-3">
<div class="row d-flex justify-content-center align-items-center h-100">
<div class="col-12 col-sm-6 px-5">
<div class="col-12 col-sm-6">
<Animation Effect="@Effect.FadeIn" Speed="@Speed.Fast" Delay="@TimeSpan.FromMilliseconds(250)">
<div class="card glass inputwizardwrapper my-5">
<div class="card inputwizardwrapper no-border my-5">
<div class="wrapper">
<div class="wrapper no-border">
<div class="my-logo">
<img src="_content/TIAMSharedUI/images/png-logo-0.png" alt="">
</div>
@ -45,7 +45,7 @@
</form>
<p>@_currentStep</p>
@* <p>@_currentStep</p>
@{
if (!_loggedIn)
{
@ -56,7 +56,7 @@
<p>@_loginModel.Password</p>
</div>
}
}
} *@
<div class="text-center fs-6">
No account yet? <a href="register">Sign up here!</a>
</div>
@ -67,15 +67,18 @@
</div>
</Animation>
</div>
<div class="col-12 col-sm-6 px-5">
<div class="col-1"></div>
<div class="col-10 col-sm-4 px-5">
<Animation Effect="@Effect.FadeIn" Speed="@Speed.Fast" Delay="@TimeSpan.FromMilliseconds(250)">
<p>
<p class="text-center">
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.
</p>
</Animation>
</div>
<div class="col-1"></div>
</div>
</div>

73
TIAMSharedUI/Pages/RoadmapPage.razor Normal file
View File

@ -0,0 +1,73 @@
@page "/roadmap"
<PageTitle>Roadmap</PageTitle>
<div class="text-center m-5">
<h1>Roadmap</h1>
<h2 style="font-size:small">Learn more about Tour I am!</h2>
</div>
<div class="py-8 bg-white py-5">
<div class="container ">
<div class="row align-items-center">
<!-- para -->
<div class="col-xl-6 col-lg-6 col-12">
<div class="mb-5 ">
<p class="mb-4 pe-xl-12 ">
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.
</p>
<p class="mb-4 pe-xl-12 ">
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.
</p>
<p class="mb-4 pe-xl-12 ">
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.
</p>
<a href="/index" class="btn btn-primary ">
Learn More
</a>
</div>
</div>
<div class="col-lg-6 col-12">
<div class="row">
<!-- images -->
<div class="col-md-4 col-4 px-1">
<div class="bg-cover rounded-3 mb-2 h-12rem" style="background-image:url(_content/TIAMSharedUI/images/about1.jpg); "></div>
<div class="bg-cover rounded-3 mb-2 h-18rem" style="background-image:url(_content/TIAMSharedUI/images/about2.jpg);"></div>
</div>
<!-- images -->
<div class="col-md-4 col-4 px-1">
<div class="bg-cover rounded-3 mb-2 h-18rem" style="background-image:url(_content/TIAMSharedUI/images/about3.jpg);"></div>
<div class="bg-cover rounded-3 mb-2 h-18rem" style="background-image:url(_content/TIAMSharedUI/images/about4.jpg);"></div>
</div>
<!-- images -->
<div class="col-md-4 col-4 px-1">
<div class="bg-cover rounded-3 mb-2 h-13rem" style="background-image:url(_content/TIAMSharedUI/images/about5.jpg);"></div>
<div class="bg-cover rounded-3 mb-2 h-13rem" style="background-image:url(_content/TIAMSharedUI/images/about6.jpg);"></div>
<div class="bg-cover rounded-3 mb-2 h-13rem" style="background-image:url(_content/TIAMSharedUI/images/about7.jpg);"></div>
</div>
</div>
</div>
</div>
</div>
</div>
<TIAMSharedUI.Pages.Components.CallToActionComponent></TIAMSharedUI.Pages.Components.CallToActionComponent>
@code {
}

27
TIAMSharedUI/Pages/Settings.razor
View File

@ -2,23 +2,26 @@
@using TIAMSharedUI.Pages.Components
<div class="container-fluid">
<h3>@localizer["Settings.Title"]</h3>
<div class="row">
<!--SettingsBasic LanguageChanged="Refresh"></SettingsBasic-->
<SettingsBasic></SettingsBasic>
</div>
@if (@UserIsLoggedIn)
{
<hr />
<div class="row">
<SettingsMember></SettingsMember>
<div class="col-12 col-md-6">
<SettingsBasic></SettingsBasic>
</div>
}
@if (@UserIsLoggedIn)
{
<div class="col-12 col-md-6">
<SettingsMember></SettingsMember>
</div>
}
<!--SettingsBasic LanguageChanged="Refresh"></SettingsBasic-->
</div>
</div>
@code {
}

7
TIAMSharedUI/Pages/Settings.razor.cs
View File

@ -17,23 +17,22 @@ namespace TIAMSharedUI.Pages
public IStringLocalizer<MyResources>? 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()

60
TIAMSharedUI/Pages/TransferPage.razor
View File

@ -25,14 +25,25 @@
<div class="container-fluid" style="position: relative; z-index: 2;">
<div class="row d-flex justify-content-center">
<div class="col-12 col-lg-6">
<DxTabs>
<DxTabPage TabIconCssClass="fa-solid fa-plane-departure" Click="ToAirport" Text="To the Airport">
<DynamicEditForm Data="myModel" TitleString="@($"To: {myModel.Destination}")" isEditing="true" IgnoreReflection="TransferIgnorList1" OnSubmit="SubmitForm"></DynamicEditForm>
</DxTabPage>
<DxTabPage TabIconCssClass="fa-solid fa-plane-arrival" Click="FromAirport" Text="From the Airport">
<DynamicEditForm Data="myModel" TitleString="@($"From: {myModel.Destination}")" isEditing="true" IgnoreReflection="TransferIgnorList2" OnSubmit="SubmitForm"></DynamicEditForm>
</DxTabPage>
</DxTabs>
@* <InputWizard Data=@myModel
OnSubmit="SubmitForm"
IgnoreReflection="@TransferIgnorList"
SubmitButtonText="ButtonSend"
TitleResourceString="TransferTitle"
SubtitleResourceString="TransferSubtitle"></InputWizard> *@
<DynamicEditForm Data="myModel" isEditing="true" IgnoreReflection="TransferIgnorList" OnSubmit="SubmitForm"></DynamicEditForm>
</div>
</div>
@ -100,9 +111,10 @@ new HeroSliderItem
},
};
public List<string> TransferIgnorList = new List<string>
public List<string> TransferIgnorList1 = new List<string>
{
"Id",
"Destination",
"UserId",
"ProductId",
"PaymentId",
@ -113,12 +125,42 @@ new HeroSliderItem
"UserProductToCarId",
"ReferralId",
"Price"
};
};
public List<string> TransferIgnorList2 = new List<string>
{
"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();
}
}

2
TIAMSharedUI/Pages/User/SysAdmins/MessageDetailGridComponent.razor
View File

@ -26,7 +26,7 @@
@inject AdminSignalRClient AdminSignalRClient;
<MessageDetailGrid @ref="_messageGrid"
<MessageDetailGrid CssClass="my-grid" @ref="_messageGrid"
Logger="_logger"
SignalRClient="AdminSignalRClient"
GetAllMessageTag="GetAllMessageTag"

11
TIAMSharedUI/Shared/Components/Navbar.razor
View File

@ -6,7 +6,7 @@
<nav class="navbar sticky-top navbar-expand-lg">
<nav class="navbar sticky-top navbar-expand-lg px-2">
<div class="container-fluid">
<NavLink class="navbar-brand" href="/">
<img height="25" src="_content/TIAMSharedUI/images/logo_wide.png" alt="TourIam Logo" title="TourIAm Logo" />
@ -29,7 +29,7 @@
</NavLink>
</li>
@if (isSysAdmin)
@if (isDevAdmin)
{
<li class="nav-item">
<NavLink class="nav-link" href="swagger">
@ -55,6 +55,13 @@
@localizer.GetString("NavMenu.About")
</NavLink>
</li>
<li class="nav-item">
<NavLink class="nav-link" href="roadmap">
@localizer.GetString("NavMenu.Roadmap")
</NavLink>
</li>
</ul>
<ul class="nav navbar-nav navbar-right">
@if (enableLogin)

3
TIAMSharedUI/TIAMSharedUI.csproj
View File

@ -79,6 +79,9 @@
</ItemGroup>
<ItemGroup>
<Content Update="Pages\RoadmapPage.razor">
<ExcludeFromSingleFile>true</ExcludeFromSingleFile>
</Content>
<Content Update="Pages\User\CardComponents\CompanyCardComponent.razor">
<ExcludeFromSingleFile>true</ExcludeFromSingleFile>
</Content>

18
TIAMSharedUI/wwwroot/css/TourIAm.css
View File

@ -107,6 +107,11 @@ select {
margin: 0px !important;
}
.no-border {
border: unset !important!;
border-width: 0px !important;
}
.bg-red {
background-color: #f7279f !important;
}
@ -398,6 +403,17 @@ select:focus-visible {
background-color: #5f1a37;
}
.my-grid {
border: 0px;
}
.my-grid.dxbl-grid .dxbl-grid-table > tbody > tr > td {
border-width: 0px;
}
.my-grid.dxbl-grid .dxbl-grid-table > thead > tr > th {
border-width: 0px;
}
/*forms*/
@ -502,7 +518,7 @@ select:focus-visible {
@media (max-width: 576px) {
.wrapper {
margin: 30px 20px;
/*margin: 30px 20px;*/
padding: 40px 15px 15px 15px;
}

9
TIAMWebApp/Client/Services/SecureStorageHandler.cs
View File

@ -1,5 +1,6 @@
using AyCode.Interfaces.StorageHandlers;
using Blazored.LocalStorage;
using TIAM.Core.Consts;
namespace TIAMWebApp.Client.Services
{
@ -25,7 +26,13 @@ namespace TIAMWebApp.Client.Services
public async Task<string> GetFromSecureStorageAsync(string key)
{
return await localStoragService.GetItemAsync<string>(key);
var result = await localStoragService.GetItemAsync<string>(key);
if (result != null)
{
return result;
}
else return string.Empty;
//return await ssa.GetValueAsync<string>(key);
}

2
TIAMWebApp/Shared/Models/ClientSide/Setting.cs
View File

@ -8,6 +8,8 @@
#if RELEASE
public const string BaseUrl = "https://test.touriam.com";
public const string ApiBaseUrl = "https://test.touriam.com";
//public const string BaseUrl = "https://touriam.com";
//public const string ApiBaseUrl = "https://touriam.com";
//public const string BaseUrl = "https://qa.touriam.com";
//public const string ApiBaseUrl = "https://qa.touriam.com";
#else