diff --git a/TIAMMobileApp/Services/TransferDataService.cs b/TIAMMobileApp/Services/TransferDataService.cs deleted file mode 100644 index 9478a038..00000000 --- a/TIAMMobileApp/Services/TransferDataService.cs +++ /dev/null @@ -1,60 +0,0 @@ -using System.Net.Http.Json; -using TIAM.Entities.TransferDestinations; -using TIAMWebApp.Shared.Application.Interfaces; -using TIAMWebApp.Shared.Application.Models; -using TIAMWebApp.Shared.Application.Models.ClientSide; -using TIAMWebApp.Shared.Application.Models.ClientSide.UI.WizardModels; - -namespace TIAMMobileApp.Services -{ - - public class TransferDataService : ITransferDataService - { - private readonly HttpClient http; - - public TransferDataService(HttpClient http) - { - this.http = http; - } - - public async Task CreateTransferDestination(TransferDestinationWizardModel model) - { - var url = $"{Setting.BaseUrl}/{APIUrls.CreateTransferDestination}"; - var response = await http.PostAsJsonAsync(url, model); - - //var result = new WizardProcessorResult(); - - //if (response.IsSuccessStatusCode) - //{ - // result.IsSucces = true; - // result.ResultJson = await response.Content.ReadAsStringAsync(); - //} - - if (!response.IsSuccessStatusCode) - return null; - - var result = (TransferDestination)(await response.Content.ReadFromJsonAsync(typeof(TransferDestination)))!; - - return result; - } - - /// - /// calls the TransferDataAPI to get the list of destinations - public async Task GetDestinationsAsync() - { - var url = $"{Setting.BaseUrl}/{APIUrls.GetTransferDestinations}"; - return await http.GetFromJsonAsync(url); - } - - public Task GetTransferDestinationbyAddressAsync(string destinationId) - { - throw new NotImplementedException(); - } - - public async Task GetTransferDestinationbyCoordinatesAsync(string destinationId) - { - var url = $"{Setting.BaseUrl}/{APIUrls.GetTransferDestinationByCoordinates}"; - return await http.GetFromJsonAsync(url); - } - } -} diff --git a/TIAMMobileApp/TIAMMobileApp.csproj b/TIAMMobileApp/TIAMMobileApp.csproj index 36a70503..1a49aa23 100644 --- a/TIAMMobileApp/TIAMMobileApp.csproj +++ b/TIAMMobileApp/TIAMMobileApp.csproj @@ -52,6 +52,8 @@ + + diff --git a/TIAMMobileApp/wwwroot/index.html b/TIAMMobileApp/wwwroot/index.html index 703517a8..aac7bce8 100644 --- a/TIAMMobileApp/wwwroot/index.html +++ b/TIAMMobileApp/wwwroot/index.html @@ -11,11 +11,13 @@ + + @@ -32,7 +34,7 @@ - + diff --git a/TIAMResources/TIAMResources.Designer.cs b/TIAMResources/TIAMResources.Designer.cs index 2a11c46e..1d32329c 100644 --- a/TIAMResources/TIAMResources.Designer.cs +++ b/TIAMResources/TIAMResources.Designer.cs @@ -420,6 +420,15 @@ namespace TIAM.Resources { } } + /// + /// Looks up a localized string similar to Transfer destination object. + /// + public static string TransferDestination { + get { + return ResourceManager.GetString("TransferDestination", resourceCulture); + } + } + /// /// Looks up a localized string similar to New destination. /// diff --git a/TIAMResources/TIAMResources.hu.resx b/TIAMResources/TIAMResources.hu.resx index 42e71df7..47659a34 100644 --- a/TIAMResources/TIAMResources.hu.resx +++ b/TIAMResources/TIAMResources.hu.resx @@ -237,6 +237,9 @@ Müxik! + + Transzfer uticél + Új uticél diff --git a/TIAMResources/TIAMResources.resx b/TIAMResources/TIAMResources.resx index 0ab4d72a..525a9471 100644 --- a/TIAMResources/TIAMResources.resx +++ b/TIAMResources/TIAMResources.resx @@ -237,6 +237,9 @@ This works! + + Transfer destination object + New destination diff --git a/TIAMSharedUI/Pages/AppLaunch.razor b/TIAMSharedUI/Pages/AppLaunch.razor index 7baff830..8eb450d7 100644 --- a/TIAMSharedUI/Pages/AppLaunch.razor +++ b/TIAMSharedUI/Pages/AppLaunch.razor @@ -16,10 +16,25 @@ @inject HttpClient http;

AppLaunch

+@{ + if (string.IsNullOrWhiteSpace(TrackingId)) + { + TrackingId = ""; +

Loading...

+ } + else + { +

Loading with trackingId: @TrackingId

+ } +} + Loading.... @code { + [Parameter] + public string TrackingId { get; set; } + string userDetailsStr; string locale; @@ -42,7 +57,7 @@ Loading.... logToBrowserConsole = new LogToBrowserConsole(JSRuntime); //wait for 5 seconds - await Task.Delay(0001); + await Task.Delay(1000); if (!string.IsNullOrWhiteSpace(userDetailsStr)) { diff --git a/TIAMSharedUI/Pages/Components/AuthComponent.razor.cs b/TIAMSharedUI/Pages/Components/AuthComponent.razor.cs index 4cd5a498..24243fcd 100644 --- a/TIAMSharedUI/Pages/Components/AuthComponent.razor.cs +++ b/TIAMSharedUI/Pages/Components/AuthComponent.razor.cs @@ -26,12 +26,12 @@ namespace TIAMSharedUI.Pages.Components IsLoggedIn = sessionService.IsAuthenticated; await PopupMessageBox.ShowAsync("AuthComponent", "Initialized", null, null, null, PopupMessageBox.ButtonOk); - if (await PopupMessageBox.Show("Cancel", "Cancel this stuff", - PopupMessageBox.ButtonNo, PopupMessageBox.ButtonYes) == PopupMessageBox.ButtonNo) - { + //if (await PopupMessageBox.Show("Cancel", "Cancel this stuff", + //PopupMessageBox.ButtonNo, PopupMessageBox.ButtonYes) == PopupMessageBox.ButtonNo) + //{ //Something is cancelled //args.Cancel = true; - } + //} componentUpdateService.CallRequestRefresh(); StateHasChanged(); } diff --git a/TIAMSharedUI/Pages/Index.razor b/TIAMSharedUI/Pages/Index.razor index 01fe871c..60eb2bac 100644 --- a/TIAMSharedUI/Pages/Index.razor +++ b/TIAMSharedUI/Pages/Index.razor @@ -1,5 +1,6 @@ @page "/index" @using AyCode.Interfaces.StorageHandlers; +@using BlazorAnimation @using Newtonsoft.Json; @using TIAMWebApp.Shared.Application.Interfaces @using TIAMWebApp.Shared.Application.Models.ClientSide; @@ -21,58 +22,61 @@
- +

@localizer.GetString("Index.Title")

@localizer.GetString("Index.Subtitle")

-
- -
- - - -
- Card image -
- -

@localizer.GetString("Index.Transfer")

- -

@localizer.GetString("Index.Transfer.Desc")

- -
-
- - - -
- Card image -
-

@localizer.GetString("Index.Tours")

-

@localizer.GetString("Index.Tours.Desc")

-
-
- - -
- Card image -
-

@localizer.GetString("Index.Clubcards")

-

@localizer.GetString("Index.Clubcards.Desc")

- -
-
- +
+ + + +
+ Card image +
+ +

@localizer.GetString("Index.Transfer")

+ +

@localizer.GetString("Index.Transfer.Desc")

+ +
+
+ + + + +
+ Card image +
+

@localizer.GetString("Index.Tours")

+

@localizer.GetString("Index.Tours.Desc")

+ +
+
+ + + + +
+ Card image +
+

@localizer.GetString("Index.Clubcards")

+

@localizer.GetString("Index.Clubcards.Desc")

+ +
+
+ +
@code { - + } diff --git a/TIAMSharedUI/Pages/User/HotelComponent.razor b/TIAMSharedUI/Pages/User/HotelComponent.razor index 4e477967..6b4ff38d 100644 --- a/TIAMSharedUI/Pages/User/HotelComponent.razor +++ b/TIAMSharedUI/Pages/User/HotelComponent.razor @@ -1,4 +1,5 @@ -@using TIAMSharedUI.Shared +@using BlazorAnimation +@using TIAMSharedUI.Shared @using TIAMWebApp.Shared.Application.Models; @using TIAMWebApp.Shared.Application.Interfaces; @using TIAMSharedUI.Pages.User; @@ -8,225 +9,273 @@
-
-
-
-
- Hotel details + +
+
+
+
+ Hotel details + +
+
+ +
+
+
+
+
+
+

Your QR code

+

Use this in printed material, to gain referrals

+
+
-
- + +
+

Hotel name: Example hotel

+

Address: Budapest, Minta u. 46

+

Phone number: +36 1 123 4567

+
+
+
+
+ + Modify +
+ +
-
-
-
-

Your QR code

-

Use this in printed material, to gain referrals

-
-
- -
- -
- -
-

Hotel name: Example hotel

-

Address: Budapest, Minta u. 46

-

Phone number: +36 1 123 4567

-
-
-
-
- - Modify -
- - -
-
-
+
-
-
-
-
- My orders + +
+
+
+
+ My orders + +
+ +
+
+
+
+ + + + + + @context.Value + + + + + + + + + +
-
-
All transfers
+ +
+

Some conclusion

+
+
+
+
+ + Modify +
+ +
-
-
+ +
+
+ +
+
+
+
+ Messagess - +
+ +
+
+
+
+ + + +
+ +

+ username + Donec id elit non mi porta gravida at eget metus... +

+
+
+ +

+ username + Donec id elit non mi porta gravida at eget metus... +

+
+
+ +

+ username + Donec id elit non mi porta gravida at eget metus... +

+
+
+ +

+ username + Donec id elit non mi porta gravida at eget metus... +

+
+ + + + +
+
+
+
+ + Modify +
+ + +
+
+
+ +
+ +
+ +
+
+
+
+ Panel title +

Subtitle

+
+ +
+
+
+
+
+
Some info
+

Budapest, Dózsa György út 35, 1146

+
+
+ +
+ +
+
    +
  • + PLACED +
    • +
  • WAITING FOR PICK UP
    • +
  • + FINISHED +
    • +
+ +
+

Some conclusion

+
+
+
+
+ + Modify +
+ + +
+
+
+ +
+
+ +
+
+
+
+ Affiliates +

Details

+
+ +
+
+
+ + + + - - - @context.Value - - - - - - + + + + + + + - -
+
+
-
-

Some conclusion

-
-
-
-
- - Modify -
+ Modify +
-
-
-
-
-
-
-
-
-
- Hotel details - -
-
-
-
-
-
-
-
- - Modify -
- - -
-
-
-
- -
-
-
-
-
- Panel title -

Subtitle

-
- -
-
-
-
-
-
Some info
-

Budapest, Dózsa György út 35, 1146

-
-
- -
- -
-
    -
  • - PLACED -
    • -
  • WAITING FOR PICK UP
    • -
  • - FINISHED -
    • -
- -
-

Some conclusion

-
-
-
-
- - Modify -
- - -
-
-
-
-
-
-
-
-
- Affiliates -

Details

-
- -
-
-
- - - - - - - - - - - - - - - -
-
-
- - Modify -
- - -
-
-
+
diff --git a/TIAMSharedUI/Pages/User/HotelComponent.razor.cs b/TIAMSharedUI/Pages/User/HotelComponent.razor.cs index b1d9a57d..212a16ed 100644 --- a/TIAMSharedUI/Pages/User/HotelComponent.razor.cs +++ b/TIAMSharedUI/Pages/User/HotelComponent.razor.cs @@ -1,5 +1,7 @@ using Microsoft.AspNetCore.Components; +using SkiaSharp; using System; +using System.Buffers.Text; using System.Collections.Generic; using System.Linq; using System.Text; @@ -21,6 +23,9 @@ namespace TIAMSharedUI.Pages.User [Inject] IUserDataService UserDataService { get; set; } + [Inject] + IServiceProviderDataService ServiceProviderDataService { get; set; } + object? OrderData { get; set; } object? AffiliateData { get; set; } @@ -29,6 +34,8 @@ namespace TIAMSharedUI.Pages.User bool isUserLoggedIn; int userType = 0; + public string ImageSource { get; set; } = ""; + @@ -98,6 +105,9 @@ namespace TIAMSharedUI.Pages.User Phone = s.Phone }; }); + + //SKBitmap bitmap = await ServiceProviderDataService.GetQRCodeByProductIdAsync(Guid.NewGuid()); + ImageSource = await ServiceProviderDataService.GetQRCodeByProductIdAsync(Guid.NewGuid()); } [Parameter] public bool ShowSeriesPointMarkers { get; set; } [Parameter] public bool ShowSeriesLabels { get; set; } diff --git a/TIAMSharedUI/Pages/User/Messages.razor b/TIAMSharedUI/Pages/User/Messages.razor new file mode 100644 index 00000000..e208054c --- /dev/null +++ b/TIAMSharedUI/Pages/User/Messages.razor @@ -0,0 +1,44 @@ +
+
+ + + +
+ +

+ username + Donec id elit non mi porta gravida at eget metus... +

+
+
+ +

+ username + Donec id elit non mi porta gravida at eget metus... +

+
+
+ +

+ username + Donec id elit non mi porta gravida at eget metus... +

+
+
+ +

+ username + Donec id elit non mi porta gravida at eget metus... +

+
+ + + + +
+
+ + +@code { + +} diff --git a/TIAMSharedUI/Pages/User/Messages.razor.cs b/TIAMSharedUI/Pages/User/Messages.razor.cs new file mode 100644 index 00000000..860f7381 --- /dev/null +++ b/TIAMSharedUI/Pages/User/Messages.razor.cs @@ -0,0 +1,12 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace TIAMSharedUI.Pages.User +{ + public partial class Messages + { + } +} diff --git a/TIAMSharedUI/Pages/User/Profile.razor b/TIAMSharedUI/Pages/User/Profile.razor new file mode 100644 index 00000000..3e3be258 --- /dev/null +++ b/TIAMSharedUI/Pages/User/Profile.razor @@ -0,0 +1,16 @@ +@page "/user/profile" + +
+

Profile

+

Have a nice day!

+
+ +
+ + + +
+ +@code { + +} diff --git a/TIAMSharedUI/Pages/User/ProfileComponent.razor b/TIAMSharedUI/Pages/User/ProfileComponent.razor index b7d6d303..fe43ef5a 100644 --- a/TIAMSharedUI/Pages/User/ProfileComponent.razor +++ b/TIAMSharedUI/Pages/User/ProfileComponent.razor @@ -1,4 +1,171 @@ -

ProfileComponent

+ + + +
+
+
+
+ +
+
+
+ +
+
+
+
+
+
+
+
+
+
+ 140x140 +
+
+
+
+
+

John Smith

+

johnny.s

+
Last seen 2 hours ago
+
+ +
+
+
+ administrator +
Joined 09 Dec 2017
+
+
+
+ +
+
+
+
+
+
+
+
+ + +
+
+
+
+ + +
+
+
+
+
+
+ + +
+
+
+
+
+
+ + +
+
+
+
+
+
+
+
Change Password
+
+
+
+ + +
+
+
+
+
+
+ + +
+
+
+
+
+
+ + +
+
+
+
+
+
Keeping in Touch
+
+
+ +
+
+ + +
+
+ + +
+
+ + +
+
+
+
+
+
+
+
+ +
+
+
+ +
+
+
+
+
+
+ +
+ +
+
+
Support
+

Get fast, free help from our friendly assistants.

+ +
+
+
+
+ +
+
+ @code { diff --git a/TIAMSharedUI/Pages/User/TransferDestinations.razor b/TIAMSharedUI/Pages/User/TransferDestinations.razor new file mode 100644 index 00000000..986a50fa --- /dev/null +++ b/TIAMSharedUI/Pages/User/TransferDestinations.razor @@ -0,0 +1,104 @@ +@page "/user/destinations" +@using AyCode.Models.Messages +@using TIAM.Entities.ServiceProviders +@using TIAM.Resources +@using TIAMSharedUI.Pages.Components +@using TIAMSharedUI.Shared +@using TIAMWebApp.Shared.Application.Models +@using TIAMWebApp.Shared.Application.Models.ClientSide.UI.WizardModels +@using TIAMWebApp.Shared.Application.Models.ClientSide.Messages +@using TIAMWebApp.Shared.Application.Utility +@layout AdminLayout +@inject LogToBrowserConsole logToBrowserConsole +@inject IStringLocalizer localizer +Transfers + +
+

Destination management

+

Manage transfers here!

+
+ +
+
+
+

@localizer.GetString("TransferDestination")

+ + +
+
+ +
+ + + + + + + + @{ + var keyField = context.Value; + @context.Value + } + + + + + + + + + + + @{ + var transfer = (TransferDestinationWizardModel)EditFormContext.EditModel; + } + + + @EditFormContext.GetEditor("Name") + + + @EditFormContext.GetEditor("Destination") + + + @EditFormContext.GetEditor("AddressString") + + + @EditFormContext.GetEditor("Price") + + + + + + + + +
+ +
+ +
+
+ +
+
+ + +@code { + + +} diff --git a/TIAMSharedUI/Pages/User/TransferDestinations.razor.cs b/TIAMSharedUI/Pages/User/TransferDestinations.razor.cs new file mode 100644 index 00000000..09afd052 --- /dev/null +++ b/TIAMSharedUI/Pages/User/TransferDestinations.razor.cs @@ -0,0 +1,174 @@ +using DevExpress.Blazor; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using TIAMWebApp.Shared.Application.Models.ClientSide.UI.WizardModels; +using TIAMWebApp.Shared.Application.Models; +using TIAMWebApp.Shared.Application.Interfaces; +using Microsoft.AspNetCore.Components; +using TIAM.Entities.TransferDestinations; + +namespace TIAMSharedUI.Pages.User +{ + public partial class TransferDestinations + { + + IGrid Grid { get; set; } + //object? TransferData { get; set; } + + public TransferDestinationWizardModel myModel = new TransferDestinationWizardModel(); + + bool PopupVisible { get; set; } + public List ignoreList = new List + { + "ReceiverId" + }; + + public MessageWizardModel messageWizardModel = new MessageWizardModel(); + + [Inject] + public ITransferDataService transferDataService { get; set; } + + + object? TransferData = new TransferDestinationWizardModel[] + { + new TransferDestinationWizardModel(Guid.NewGuid(), "Liszt Ferenc Airport", "International airport of Budapest", "1185, Budapest, Liszt Ferenc Repülőtér" ), + new TransferDestinationWizardModel(Guid.NewGuid(), "Buda Castle", "Historical site in the heart of Budapest", "1014 Budapest, Szent György tér 2" ), + new TransferDestinationWizardModel(Guid.NewGuid(), "Hungarian National Museum", "Historical site in the heart of Budapest", "1088 Budapest, Múzeum krt. 14-16" ), + new TransferDestinationWizardModel(Guid.NewGuid(), "Parliament of Hungary", "Historical site in the heart of Budapest", "1055 Budapest, Kossuth Lajos tér 1-3" ), + new TransferDestinationWizardModel(Guid.NewGuid(), "Heroes square", "Historical site in the heart of Budapest", "1146 Budapest, Hősök tere" ), + new TransferDestinationWizardModel(Guid.NewGuid(), "Gellert Hill", "Historical site in the heart of Budapest", "1118 Budapest, Gellérthegy" ), + new TransferDestinationWizardModel(Guid.NewGuid(), "Margaret Island", "Historical site in the heart of Budapest", "1138 Budapest, Margitsziget" ), + }; + + object? TransferDataFromDb = new TransferDestinationWizardModel[] { }; + + void CancelCreateClick() + { + + + PopupVisible = false; + } + void EulaPopupClosed() + { + //cancel clicked + + } + void EulaPopupClosing(PopupClosingEventArgs args) + { + //myModel = new TransferWizardModel(); + messageWizardModel = new MessageWizardModel(); + } + + //----------------------------------------------------------------------------------- + + + public async Task SubmitForm(object Result) + { + //await WizardProcessor.ProcessWizardAsync(Result.GetType(), Result); + logToBrowserConsole.LogToBC($"Submitted nested form: {Result.GetType().FullName}"); + } + + + protected override async Task OnAfterRenderAsync(bool firstRender) + { + //if (firstRender) + // await Grid.StartEditRowAsync(0); + } + + void Grid_CustomizeEditModel(GridCustomizeEditModelEventArgs e) + { + if (e.IsNew) + { + var newDestination = (TransferDestinationWizardModel)e.EditModel; + newDestination.Id = Guid.NewGuid().ToString(); + newDestination.Name = "ghjgkg hkgh ghjkghgkjgh"; + newDestination.Description = "ghjgkg hkgh ghjkghgkjgh"; + newDestination.AddressString = "ghjgkg hkgh ghjkghgkjgh"; + + + } + } + + void Grid_CustomizeElement(GridCustomizeElementEventArgs e) + { + + } + + async Task Grid_EditModelSaving(GridEditModelSavingEventArgs e) + { + if (e.IsNew) + { + //add new row to grid + myModel = (TransferDestinationWizardModel)e.EditModel; + //add mymodel to transferData array + TransferData = ((TransferDestinationWizardModel[])TransferData).Append(myModel); + + //add new orderData to orderData array + logToBrowserConsole.LogToBC("New orderData added"); + //await NwindDataService.InsertEmployeeAsync((EditableEmployee)e.EditModel); + + } + else + { + logToBrowserConsole.LogToBC("orderData updated"); + //modify transferData where transferData.Id == e.EditModel.Id + //get transfer from TransferData by Id + + foreach (var transferToModify in (TransferDestinationWizardModel[])TransferData) + { + myModel = (TransferDestinationWizardModel)e.EditModel; + + if (transferToModify.Id == myModel.Id) + { + myModel = (TransferDestinationWizardModel)e.EditModel; + transferToModify.Name = myModel.Name; + transferToModify.Description = myModel.Description; + transferToModify.AddressString = myModel.AddressString; + transferToModify.Price = myModel.Price; + } + } + + } + + //await NwindDataService.UpdateEmployeeAsync((EditableEmployee)e.DataItem, (EditableEmployee)e.EditModel); + + await UpdateDataAsync(); + } + async Task Grid_DataItemDeleting(GridDataItemDeletingEventArgs e) + { + //await NwindDataService.RemoveEmployeeAsync((EditableEmployee)e.DataItem); + //remove orderData from orderData array + logToBrowserConsole.LogToBC("orderData deleted"); + //await UpdateDataAsync(); + } + async Task UpdateDataAsync() + { + //DataSource = await NwindDataService.GetEmployeesEditableAsync(); + //refresh grid + logToBrowserConsole.LogToBC("orderData grid refreshed"); + } + + protected override async Task OnInitializedAsync() + { + base.OnInitialized(); + var a = await transferDataService.GetDestinationsAsync(); + logToBrowserConsole.LogToBC($"TransferDataFromDb: {((TransferDestinationWizardModel[])TransferDataFromDb).Length}"); + foreach (var item in a) + { + //add new transferwizardmodel to transferData array + TransferDataFromDb = ((TransferDestinationWizardModel[])TransferDataFromDb).Append( + new TransferDestinationWizardModel(Guid.NewGuid(), item.Name, item.Description, item.AddressString)); + logToBrowserConsole.LogToBC($"TransferDataFromDb: {item.Name}"); + } + } + + void ColumnChooserButton_Click() + { + Grid.ShowColumnChooser(); + } + + } +} diff --git a/TIAMSharedUI/Shared/HeroSlider.razor b/TIAMSharedUI/Shared/HeroSlider.razor index 4fe7ba0e..e3d1b3bb 100644 --- a/TIAMSharedUI/Shared/HeroSlider.razor +++ b/TIAMSharedUI/Shared/HeroSlider.razor @@ -1,5 +1,6 @@ -
- +@using BlazorAnimation +
+ - +