From 10a9a186a1d5c2c342493294c9c56ae97e22f6f2 Mon Sep 17 00:00:00 2001 From: Adam Date: Thu, 22 Feb 2024 09:17:20 +0100 Subject: [PATCH] wtf again --- TIAMMobileApp/MainPage.xaml.cs | 13 +- TIAMMobileApp/MauiProgram.cs | 4 +- TIAMMobileApp/Platforms/iOS/Info.plist | 4 + TIAMSharedUI/Pages/Events.razor | 84 +++++ TIAMSharedUI/Pages/Events.razor.css | 288 ++++++++++++++++++ TIAMSharedUI/Pages/Restaurants.razor.css | 2 +- TIAMSharedUI/Pages/Tours.razor | 1 + TIAMSharedUI/Pages/Tours.razor.css | 6 +- TIAMSharedUI/Pages/User/Media.razor | 175 +++++++++++ TIAMSharedUI/Pages/User/Media.razor.css | 32 ++ .../User/SysAdmins/SysAdminComponent.razor | 24 +- .../User/SysAdmins/TransferDestinations.razor | 145 ++++----- .../User/SysAdmins/TransferManagement.razor | 283 ++++++++--------- .../Resources/MyResources.Designer.cs | 9 + TIAMSharedUI/Resources/MyResources.hu.resx | 3 + TIAMSharedUI/Resources/MyResources.resx | 3 + TIAMSharedUI/Shared/Components/Navbar.razor | 8 +- TIAMSharedUI/Shared/EventsComponent.razor | 97 ++++++ TIAMSharedUI/Shared/Users/AdminNavMenu.razor | 6 + TIAMSharedUI/wwwroot/css/TourIAm.css | 23 +- TIAMSharedUI/wwwroot/filePaste.js | 16 + TIAMWebApp/Client/Program.cs | 2 + TIAMWebApp/Client/Services/WizardProcessor.cs | 27 +- TIAMWebApp/Client/TIAMWebApp.Client.csproj | 3 + .../Server/Controllers/EmailAPIController.cs | 6 +- .../Server/Controllers/FileAPIController.cs | 120 ++++++++ .../Server/Controllers/UserAPIController.cs | 2 +- TIAMWebApp/Server/Program.cs | 20 +- TIAMWebApp/Server/TIAMWebApp.Server.csproj | 3 + .../Interfaces/IClientNoticeSenderService.cs | 16 + .../Shared/Interfaces/IImageDataService.cs | 15 + TIAMWebApp/Shared/Models/APIUrls.cs | 12 + .../UI/WizardModels/MessageWizardModel.cs | 37 ++- TIAMWebApp/Shared/Models/Event.cs | 31 ++ .../Services/ClientNoticeSenderService.cs | 17 ++ .../Shared/Services/ImageDataService.cs | 79 +++++ .../TIAMWebApp.Shared.Application.csproj | 1 + 37 files changed, 1360 insertions(+), 257 deletions(-) create mode 100644 TIAMSharedUI/Pages/Events.razor create mode 100644 TIAMSharedUI/Pages/Events.razor.css create mode 100644 TIAMSharedUI/Pages/User/Media.razor create mode 100644 TIAMSharedUI/Pages/User/Media.razor.css create mode 100644 TIAMSharedUI/Shared/EventsComponent.razor create mode 100644 TIAMSharedUI/wwwroot/filePaste.js create mode 100644 TIAMWebApp/Server/Controllers/FileAPIController.cs create mode 100644 TIAMWebApp/Shared/Interfaces/IClientNoticeSenderService.cs create mode 100644 TIAMWebApp/Shared/Interfaces/IImageDataService.cs create mode 100644 TIAMWebApp/Shared/Models/Event.cs create mode 100644 TIAMWebApp/Shared/Services/ClientNoticeSenderService.cs create mode 100644 TIAMWebApp/Shared/Services/ImageDataService.cs diff --git a/TIAMMobileApp/MainPage.xaml.cs b/TIAMMobileApp/MainPage.xaml.cs index d70592bd..519b7629 100644 --- a/TIAMMobileApp/MainPage.xaml.cs +++ b/TIAMMobileApp/MainPage.xaml.cs @@ -1,9 +1,20 @@ -namespace TIAMMobileApp +using Microsoft.AspNetCore.Components.WebView.Maui; + +namespace TIAMMobileApp { public partial class MainPage : ContentPage { + + public MainPage() { + BlazorWebViewHandler.BlazorWebViewMapper.AppendToMapping("CustomBlazorWebViewMapper", (handler, view) => + { +#if IOS + var configs = handler.PlatformView.Configuration; + configs.AllowsInlineMediaPlayback = true; +#endif + }); InitializeComponent(); } } diff --git a/TIAMMobileApp/MauiProgram.cs b/TIAMMobileApp/MauiProgram.cs index 21b1cf04..9ee141c3 100644 --- a/TIAMMobileApp/MauiProgram.cs +++ b/TIAMMobileApp/MauiProgram.cs @@ -28,8 +28,8 @@ namespace TIAMMobileApp #if DEBUG builder.Services.AddBlazorWebViewDeveloperTools(); builder.Logging.AddDebug(); - builder.Services.AddLocalization(); #endif + builder.Services.AddLocalization(); var handler = new HttpClientHandler(); handler.ServerCertificateCustomValidationCallback = (message, certificate, chain, sslPolicyErrors) => true; var client = new HttpClient(handler); @@ -54,7 +54,9 @@ namespace TIAMMobileApp builder.Services.AddScoped(); builder.Services.AddSingleton(); builder.Services.AddScoped(); + builder.Services.AddScoped(); builder.Services.AddScoped(); + builder.Services.AddScoped(); builder.Services.AddSingleton(x => new ResourceManager("TIAMWebApp.Shared.Application.Resources", typeof(Main).Assembly)); builder.Services.Configure(Guid.NewGuid().ToString(), c => { }); diff --git a/TIAMMobileApp/Platforms/iOS/Info.plist b/TIAMMobileApp/Platforms/iOS/Info.plist index ecb7f719..69b98c58 100644 --- a/TIAMMobileApp/Platforms/iOS/Info.plist +++ b/TIAMMobileApp/Platforms/iOS/Info.plist @@ -28,5 +28,9 @@ XSAppIconAssets Assets.xcassets/appicon.appiconset + NSCameraUsageDescription + This app uses camera for... + NSMicrophoneUsageDescription + This app uses microphone to record videos for... diff --git a/TIAMSharedUI/Pages/Events.razor b/TIAMSharedUI/Pages/Events.razor new file mode 100644 index 00000000..9770e251 --- /dev/null +++ b/TIAMSharedUI/Pages/Events.razor @@ -0,0 +1,84 @@ +@page "/events" +@using TIAMSharedUI.Shared +@using TIAMWebApp.Shared.Application.Models + + + +
+
+
+ +

Tours

+

Please select!

+
+
+ + @{ + foreach (var item in MockEvents) + { +
+ +
+ + +

@item.Name

+

@item.DateAndTime

+

@item.Description

+

@item.Location

+
+ by + +
+ +
+ +
+ } + } + + + + + + + + + + +
+
+ + + +
+ + + + +@code { + public List MockEvents = new List + { + new Event("HONEYBEAST", "A Honeybeast egyedisége abban rejlik, hogy a popzenét rengeteg különféle irányból közelítik meg - hol vidám, hol szomorú, hol pörgős, hogy lassú, koncertjükön az érzelmek széles skáláját élhetjük át együtt.", "2024.05.03", "Budapest Park", "https://tixa.hu/kepek/0027/320/27870-1_20231214141702.jpg"), + new Event("VAD FRUTTIK", "A kék a tenger és az ég színe, a nyílt terekkel, valamint a képzelettel és tágassággal társul - végtelen kékség május 3-án a Budapest Parkban!", "2024.04.26", "Budapest Park", "https://tixa.hu/kepek/0027/768/27692-1_20231129185842.jpg"), + new Event("DEBORAH DE LUCA", "DEBORAH DE LUCA 2024-ben Magyarországon csak a Budapest Park színpadán", "2024.08.19", "Budapest Park", "https://tixa.hu/kepek/0028/768/28535-1_20240118172423.jpg"), + new Event("TOTAL DANCE CABRIO", "Ha nyár, akkor Total Dance Cabrio! Ülj be mellénk a cabrioba, és hagyd, hogy visszarepítsünk a 90-es és 2000-es évekbe! ", "2024.04.26", "Budapest Park", "https://tixa.hu/kepek/0027/768/27829-1_20231206193253.jpg"), + new Event("HONEYBEAST", "A Honeybeast egyedisége abban rejlik, hogy a popzenét rengeteg különféle irányból közelítik meg - hol vidám, hol szomorú, hol pörgős, hogy lassú, koncertjükön az érzelmek széles skáláját élhetjük át együtt.", "2024.05.03", "Budapest Park", "https://tixa.hu/kepek/0027/320/27870-1_20231214141702.jpg"), + new Event("VAD FRUTTIK", "A kék a tenger és az ég színe, a nyílt terekkel, valamint a képzelettel és tágassággal társul - végtelen kékség május 3-án a Budapest Parkban!", "2024.04.26", "Budapest Park", "https://tixa.hu/kepek/0027/768/27692-1_20231129185842.jpg"), + new Event("DEBORAH DE LUCA", "DEBORAH DE LUCA 2024-ben Magyarországon csak a Budapest Park színpadán", "2024.08.19", "Budapest Park", "https://tixa.hu/kepek/0028/768/28535-1_20240118172423.jpg"), + new Event("TOTAL DANCE CABRIO", "Ha nyár, akkor Total Dance Cabrio! Ülj be mellénk a cabrioba, és hagyd, hogy visszarepítsünk a 90-es és 2000-es évekbe! ", "2024.04.26", "Budapest Park", "https://tixa.hu/kepek/0027/768/27829-1_20231206193253.jpg"), + + + + }; + } \ No newline at end of file diff --git a/TIAMSharedUI/Pages/Events.razor.css b/TIAMSharedUI/Pages/Events.razor.css new file mode 100644 index 00000000..cbf1c4ed --- /dev/null +++ b/TIAMSharedUI/Pages/Events.razor.css @@ -0,0 +1,288 @@ + + +/******* Common Element CSS Start ******/ + + +body { + font-family: "Roboto", sans-serif; + font-size: 16px; +} + +.clear { + clear: both; +} + +img { + max-width: 100%; + border: 0px; +} + +ul, +ol { + list-style: none; +} + +a { + text-decoration: none; + color: inherit; + outline: none; + transition: all 0.4s ease-in-out; + -webkit-transition: all 0.4s ease-in-out; +} + + a:focus, + a:active, + a:visited, + a:hover { + text-decoration: none; + outline: none; + } + + a:hover { + color: #e73700; + } + +h2 { + margin-bottom: 48px; + padding-bottom: 16px; + font-size: 20px; + line-height: 28px; + font-weight: 700; + position: relative; + text-transform: capitalize; +} + +h3 { + margin: 0 0 10px; + font-size: 28px; + line-height: 36px; +} + +button { + outline: none !important; +} +/******* Common Element CSS End *********/ + +/* -------- title style ------- */ +.line-title { + position: relative; + width: 400px; +} + + .line-title::before, + .line-title::after { + content: ""; + position: absolute; + bottom: 0; + left: 0; + height: 4px; + border-radius: 2px; + } + + .line-title::before { + width: 100%; + background: #f2f2f2; + } + + .line-title::after { + width: 32px; + background: #e73700; + } + +/******* Middle section CSS Start ******/ +/* -------- Landing page ------- */ +.game-section { + /*padding: 5px 50px;*/ +} + + .game-section .owl-stage { + margin: 15px 0; + display: flex; + display: -webkit-flex; + } + + .game-section .item { + margin: 0 15px 60px; + width: 320px; + height: 400px; + display: flex; + display: -webkit-flex; + align-items: flex-end; + -webkit-align-items: flex-end; + background: #343434 no-repeat center center / cover; + border-radius: 16px; + overflow: hidden; + position: relative; + transition: all 0.4s ease-in-out; + -webkit-transition: all 0.4s ease-in-out; + cursor: pointer; + box-shadow: 0 8px 32px 0 rgba( 31, 38, 135, 0.57 ); + } + + .game-section .item.active { + width: 500px; + box-shadow: 0 8px 32px 0 rgba( 31, 38, 135, 0.57 ); + -webkit-box-shadow: 0 8px 32px 0 rgba( 31, 38, 135, 0.57 ); + } + + .game-section .item:after { + content: ""; + display: block; + position: absolute; + height: 100%; + width: 100%; + left: 0; + top: 0; + background-image: linear-gradient(rgba(0, 0, 0, 0), rgba(0, 0, 0, 1)); + } + + .game-section .item-desc { + padding: 0 24px 12px; + color: #fff; + position: relative; + z-index: 1; + overflow: hidden; + transform: translateY(calc(100% - 54px)); + -webkit-transform: translateY(calc(100% - 54px)); + transition: all 0.4s ease-in-out; + -webkit-transition: all 0.4s ease-in-out; + } + + .game-section .item.active .item-desc { + transform: none; + -webkit-transform: none; + } + + .game-section .item-desc p { + opacity: 0; + -webkit-transform: translateY(32px); + transform: translateY(32px); + transition: all 0.4s ease-in-out 0.2s; + -webkit-transition: all 0.4s ease-in-out 0.2s; + } + + .game-section .item.active .item-desc p { + opacity: 1; + -webkit-transform: translateY(0); + transform: translateY(0); + } + + .game-section .owl-theme.custom-carousel .owl-dots { + margin-top: -20px; + position: relative; + z-index: 5; + } +/******** Middle section CSS End *******/ + +/***** responsive css Start ******/ + +@media (min-width: 992px) and (max-width: 1199px) { + h2 { + margin-bottom: 32px; + } + + h3 { + margin: 0 0 8px; + font-size: 24px; + line-height: 32px; + } + + /* -------- Landing page ------- */ + .game-section { + /*padding: 50px 5px;*/ + } + + .game-section .item { + margin: 0 12px 60px; + width: 260px; + height: 360px; + } + + .game-section .item.active { + width: 400px; + } + + .game-section .item-desc { + transform: translateY(calc(100% - 46px)); + -webkit-transform: translateY(calc(100% - 46px)); + } +} + +@media (min-width: 768px) and (max-width: 991px) { + h2 { + margin-bottom: 32px; + } + + h3 { + margin: 0 0 8px; + font-size: 24px; + line-height: 32px; + } + + .line-title { + width: 330px; + } + + /* -------- Landing page ------- */ + .game-section { + /*padding: 50px 5px 40px;*/ + } + + .game-section .item { + margin: 0 12px 60px; + width: 240px; + height: 330px; + } + + .game-section .item.active { + width: 360px; + } + + .game-section .item-desc { + transform: translateY(calc(100% - 42px)); + -webkit-transform: translateY(calc(100% - 42px)); + } +} + +@media (max-width: 767px) { + body { + font-size: 14px; + } + + h2 { + margin-bottom: 20px; + } + + h3 { + margin: 0 0 8px; + font-size: 19px; + line-height: 24px; + } + + .line-title { + width: 250px; + } + + /* -------- Landing page ------- */ + .game-section { + padding: 30px 15px 20px; + } + + .game-section .item { + margin: 0 10px 40px; + width: 200px; + height: 280px; + } + + .game-section .item.active { + width: 270px; + box-shadow: 6px 10px 10px rgba(0, 0, 0, 0.25); + -webkit-box-shadow: 6px 10px 10px rgba(0, 0, 0, 0.25); + } + + .game-section .item-desc { + padding: 0 14px 5px; + transform: translateY(calc(100% - 42px)); + -webkit-transform: translateY(calc(100% - 42px)); + } +} diff --git a/TIAMSharedUI/Pages/Restaurants.razor.css b/TIAMSharedUI/Pages/Restaurants.razor.css index 8bed00ba..52c61159 100644 --- a/TIAMSharedUI/Pages/Restaurants.razor.css +++ b/TIAMSharedUI/Pages/Restaurants.razor.css @@ -116,7 +116,7 @@ button { transition: all 0.4s ease-in-out; -webkit-transition: all 0.4s ease-in-out; cursor: pointer; - box-shadow: 3px 3px 3px #b1b1b1, -3px -3px 3px #fff; + /*box-shadow: 3px 3px 3px #b1b1b1, -3px -3px 3px #141414;*/ } .game-section .item.active { diff --git a/TIAMSharedUI/Pages/Tours.razor b/TIAMSharedUI/Pages/Tours.razor index 6407f943..d2a2800c 100644 --- a/TIAMSharedUI/Pages/Tours.razor +++ b/TIAMSharedUI/Pages/Tours.razor @@ -53,6 +53,7 @@ + diff --git a/TIAMSharedUI/Pages/Tours.razor.css b/TIAMSharedUI/Pages/Tours.razor.css index b26524c3..cbf1c4ed 100644 --- a/TIAMSharedUI/Pages/Tours.razor.css +++ b/TIAMSharedUI/Pages/Tours.razor.css @@ -116,13 +116,13 @@ button { transition: all 0.4s ease-in-out; -webkit-transition: all 0.4s ease-in-out; cursor: pointer; - box-shadow: 3px 3px 3px #b1b1b1, -3px -3px 3px #fff; + box-shadow: 0 8px 32px 0 rgba( 31, 38, 135, 0.57 ); } .game-section .item.active { width: 500px; - box-shadow: 12px 40px 40px rgba(0, 0, 0, 0.25); - -webkit-box-shadow: 12px 40px 40px rgba(0, 0, 0, 0.25); + box-shadow: 0 8px 32px 0 rgba( 31, 38, 135, 0.57 ); + -webkit-box-shadow: 0 8px 32px 0 rgba( 31, 38, 135, 0.57 ); } .game-section .item:after { diff --git a/TIAMSharedUI/Pages/User/Media.razor b/TIAMSharedUI/Pages/User/Media.razor new file mode 100644 index 00000000..a7bb2218 --- /dev/null +++ b/TIAMSharedUI/Pages/User/Media.razor @@ -0,0 +1,175 @@ +@*@using TIAMWebApp.Shared.Application.Models +@page "/user/media" +@using TIAMSharedUI.Shared @using TIAMWebApp.Shared.Application.Interfaces +@layout AdminLayout + +@inject NavigationManager NavigationManager +
+
+ + Click the Select Files button to select a file +
+ + +
+ +@code { + int SelectedFilesCount { get; set; } + protected void SelectedFilesChanged(IEnumerable files) + { + SelectedFilesCount = files.ToList().Count; + InvokeAsync(StateHasChanged); + } + protected string GetUploadUrl(string url) + { + return NavigationManager.ToAbsoluteUri(url).AbsoluteUri; + } +} *@ + + +@rendermode RenderMode.InteractiveWebAssembly +@page "/user/media" +@using System.Net.Http.Headers +@using TIAMSharedUI.Shared +@using TIAMWebApp.Shared.Application.Interfaces +@using TIAMWebApp.Shared.Application.Models +@using TIAMWebApp.Shared.Application.Utility +@layout AdminLayout +@inject IJSRuntime JSRuntime; +@inject IImageDataService imageDataService; +@inject LogToBrowserConsole logToBrowserConsole; +@implements IAsyncDisposable + +

File Upload

+ +
+ +
+
+

@ErrorMessage

+
+
+ @foreach (var imageSource in imageSources) + { + + } +
+ + +@code { + ElementReference fileDropContainer; + InputFile inputFile; + + IJSObjectReference _filePasteModule; + IJSObjectReference _filePasteFunctionReference; + + private string HoverClass; + private List imageSources = new(); + private const int maxAllowedFiles = 2; + private string ErrorMessage; + + private MultipartFormDataContent multipartFormData = new MultipartFormDataContent(); + + protected override async Task OnAfterRenderAsync(bool firstRender) + { + if (firstRender) + { + _filePasteModule = await JSRuntime.InvokeAsync("import", "./_content/TIAMSharedUI/filePaste.js"); + + _filePasteFunctionReference = await _filePasteModule.InvokeAsync("initializeFilePaste", fileDropContainer, inputFile.Element); + } + } + + void OnDragEnter(DragEventArgs e) => HoverClass = "hover"; + + void OnDragLeave(DragEventArgs e) => HoverClass = string.Empty; + + async Task OnChange(InputFileChangeEventArgs e) + { + imageSources.Clear(); + ErrorMessage = string.Empty; + + if (e.FileCount > maxAllowedFiles) + { + ErrorMessage = $"Only {maxAllowedFiles} files can be uploaded"; + return; + } + + foreach (var file in e.GetMultipleFiles(maxAllowedFiles)) + { + // using var stream = file.OpenReadStream(); + // using var ms = new MemoryStream(); + // await stream.CopyToAsync(ms); + // imageSources.Add(Convert.ToBase64String(ms.ToArray())); + //imageSources.Add($"data:{file.ContentType};base64,{Convert.ToBase64String(ms.ToArray())}"); + //send the file to the server through an API + + var fileContent = new StreamContent(file.OpenReadStream()); + fileContent.Headers.ContentType = new MediaTypeHeaderValue(file.ContentType); + multipartFormData.Add(fileContent, "file", file.Name); + } + + HoverClass = string.Empty; + } + + async Task UploadFiles() + { + if (multipartFormData.Headers.Count() == 0) + { + ErrorMessage = "No files to upload"; + return; + } + try + { + + //send the files to the server through an API + + + // List streamContents = new List(); + // foreach (var base64Image in imageSources) + // { + // byte[] imageBytes = Convert.FromBase64String(base64Image); + // var streamContent = new StreamContent(new MemoryStream(imageBytes)); + // streamContents.Add(streamContent); + // } + + // var multipartContent = new MultipartFormDataContent(); + // for (int i = 0; i < streamContents.Count; i++) + // { + // multipartContent.Add(streamContents[i], $"file{i}", $"file{i}.jpg"); + // } + + //send the multipartcontent to ImageData service + + await imageDataService.UploadImageAsync(multipartFormData); + } + catch (Exception ex) + { + ErrorMessage = ex.Message; + + logToBrowserConsole.LogToBC(ex.Message); + } + } + + + + public async ValueTask DisposeAsync() + { + if (_filePasteFunctionReference != null) + { + await _filePasteFunctionReference.InvokeVoidAsync("dispose"); + await _filePasteFunctionReference.DisposeAsync(); + } + + if (_filePasteModule != null) + { + await _filePasteModule.DisposeAsync(); + } + } +} diff --git a/TIAMSharedUI/Pages/User/Media.razor.css b/TIAMSharedUI/Pages/User/Media.razor.css new file mode 100644 index 00000000..b4a63d6d --- /dev/null +++ b/TIAMSharedUI/Pages/User/Media.razor.css @@ -0,0 +1,32 @@ +.file-drop-zone { + width: 100%; + border: 3px dotted #fb275d; + display: flex; + align-items: center; + margin-bottom: 2px; + min-height: 100px; +} + +.hover { + border-style: solid; + background-color: #00ca71; +} + +.image-container { + display: flex; + justify-content: center; +} + +.image-container img { + width: 50%; +} + +::deep input[type=file] { + width: 100%; + padding: 20px; +} + +.error-message-container { + color: red; + text-align: center; +} \ No newline at end of file diff --git a/TIAMSharedUI/Pages/User/SysAdmins/SysAdminComponent.razor b/TIAMSharedUI/Pages/User/SysAdmins/SysAdminComponent.razor index 98bf905c..30092abf 100644 --- a/TIAMSharedUI/Pages/User/SysAdmins/SysAdminComponent.razor +++ b/TIAMSharedUI/Pages/User/SysAdmins/SysAdminComponent.razor @@ -8,9 +8,9 @@
- + -
+
@@ -49,8 +49,8 @@
- -
+ +
@@ -87,8 +87,8 @@
- -
+ +
@@ -125,8 +125,8 @@
- -
+ +
@@ -165,8 +165,8 @@
- -
+ +
@@ -208,8 +208,8 @@
- -
+ +
diff --git a/TIAMSharedUI/Pages/User/SysAdmins/TransferDestinations.razor b/TIAMSharedUI/Pages/User/SysAdmins/TransferDestinations.razor index fba21161..548d6d51 100644 --- a/TIAMSharedUI/Pages/User/SysAdmins/TransferDestinations.razor +++ b/TIAMSharedUI/Pages/User/SysAdmins/TransferDestinations.razor @@ -1,5 +1,6 @@ @page "/user/destinations" @using AyCode.Models.Messages +@using BlazorAnimation @using TIAM.Entities.ServiceProviders @using TIAM.Resources @using TIAMSharedUI.Pages.Components @@ -19,82 +20,82 @@
-
-
+
+

@localizer.GetString("TransferDestination")

- -
-
- + +
+
+ +
+ + + + + + + + @{ + var keyField = context.Value; + @context.Value + } + + + + + + + + + + + + @{ + var transfer = (TransferDestinationWizardModel)EditFormContext.EditModel; + } + + + @EditFormContext.GetEditor("Name") + + + @EditFormContext.GetEditor("Description") + + + @EditFormContext.GetEditor("AddressString") + + + @EditFormContext.GetEditor("PriceType") + + + @EditFormContext.GetEditor("Price") + + + + + + + +
- - - - - - - - @{ - var keyField = context.Value; - @context.Value - } - - - - - - - - - - - - @{ - var transfer = (TransferDestinationWizardModel)EditFormContext.EditModel; - } - - - @EditFormContext.GetEditor("Name") - - - @EditFormContext.GetEditor("Description") - - - @EditFormContext.GetEditor("AddressString") - - - @EditFormContext.GetEditor("PriceType") - - - @EditFormContext.GetEditor("Price") - - - - - - - - -
- +
- +
diff --git a/TIAMSharedUI/Pages/User/SysAdmins/TransferManagement.razor b/TIAMSharedUI/Pages/User/SysAdmins/TransferManagement.razor index 3b5d7f83..020ecb73 100644 --- a/TIAMSharedUI/Pages/User/SysAdmins/TransferManagement.razor +++ b/TIAMSharedUI/Pages/User/SysAdmins/TransferManagement.razor @@ -1,9 +1,11 @@ @page "/user/transfers" @using AyCode.Models.Messages +@using BlazorAnimation @using TIAM.Entities.ServiceProviders @using TIAM.Resources @using TIAMSharedUI.Pages.Components @using TIAMSharedUI.Shared +@using TIAMWebApp.Shared.Application.Interfaces @using TIAMWebApp.Shared.Application.Models @using TIAMWebApp.Shared.Application.Models.ClientSide.UI.WizardModels @using TIAMWebApp.Shared.Application.Models.ClientSide.Messages @@ -11,6 +13,7 @@ @layout AdminLayout @inject LogToBrowserConsole logToBrowserConsole @inject IStringLocalizer localizer +@inject IWizardProcessor wizardProcessor Transfers
@@ -19,147 +22,150 @@
-
+
-
- - - - - - -
- - - -
- - + +
-
-
- -
- - - + + + + + +
+ + + +
+ + - - - +
+
+ +
+ + + + + + + + @{ + var keyField = context.Value; + @context.Value + } + + + + + + + + + + @{ + var keyField = context.Value; + var keyItem = (TransferWizardModel)context.DataItem; + string buttonText = "Contact"; + + } + + + + + @{ + DriverModel keyField = (DriverModel)context.Value; + string driverText = keyField.Name; +

@driverText

+ } + + + + + + @{ - var keyField = context.Value; - @context.Value + var transfer = (TransferWizardModel)EditFormContext.EditModel; } - - - - - - - - - - @{ - var keyField = context.Value; - string buttonText = "Contact"; - - } - - - - - @{ - DriverModel keyField = (DriverModel)context.Value; - string driverText = keyField.Name; -

@driverText

- } - - - - - - - @{ - var transfer = (TransferWizardModel)EditFormContext.EditModel; - } - - - @EditFormContext.GetEditor("Destination") - - - @EditFormContext.GetEditor("PickupAddress") - - - @EditFormContext.GetEditor("TripDate") - - - @EditFormContext.GetEditor("NumberOfPassengers") - - - @EditFormContext.GetEditor("FullName") - - - @EditFormContext.GetEditor("PhoneNumber") - - - @EditFormContext.GetEditor("EmailAddress") - - - + + @EditFormContext.GetEditor("Destination") + + + @EditFormContext.GetEditor("PickupAddress") + + + @EditFormContext.GetEditor("TripDate") + + + @EditFormContext.GetEditor("NumberOfPassengers") + + + @EditFormContext.GetEditor("FullName") + + + @EditFormContext.GetEditor("PhoneNumber") + + + @EditFormContext.GetEditor("EmailAddress") + + + - - + + - - + + - + -
+
- -
+ +
+
- +
@@ -177,11 +183,15 @@ bool PopupVisible { get; set; } public List ignoreList = new List { - "ReceiverId" + "ReceiverEmailAddress", + "ReceiverId", + "SenderEmailAddress", + "SenderId", + "ContextId" }; public MessageWizardModel messageWizardModel = new MessageWizardModel(); - + //IEnumerable drivers { get; set; } @@ -189,7 +199,7 @@ new DriverModel(Guid.NewGuid(), Guid.NewGuid(), "John Doe"), new DriverModel(Guid.NewGuid(), Guid.NewGuid(), "Jane Doe"), new DriverModel(Guid.NewGuid(), Guid.NewGuid(), "James Doe") - }; + }; object? TransferData = new TransferWizardModel[] { @@ -203,9 +213,9 @@ }; - void SendMail(object emailAddress) + void SendMail(TransferWizardModel Item) { - logToBrowserConsole.LogToBC($"Sending mail to {emailAddress}"); + logToBrowserConsole.LogToBC($"Sending mail to {Item.EmailAddress}"); PopupVisible = true; } @@ -231,7 +241,8 @@ public async Task SubmitForm(object Result) { - //await WizardProcessor.ProcessWizardAsync(Result.GetType(), Result); + var email = await wizardProcessor.ProcessWizardAsync(Result.GetType(), Result); + logToBrowserConsole.LogToBC($"Submitted nested form: {Result.GetType().FullName}"); } @@ -281,9 +292,9 @@ } - - //await NwindDataService.UpdateEmployeeAsync((EditableEmployee)e.DataItem, (EditableEmployee)e.EditModel); - + + //await NwindDataService.UpdateEmployeeAsync((EditableEmployee)e.DataItem, (EditableEmployee)e.EditModel); + await UpdateDataAsync(); } async Task Grid_DataItemDeleting(GridDataItemDeletingEventArgs e) @@ -304,8 +315,8 @@ { base.OnInitialized(); - - + + } diff --git a/TIAMSharedUI/Resources/MyResources.Designer.cs b/TIAMSharedUI/Resources/MyResources.Designer.cs index 447e310b..08e6429b 100644 --- a/TIAMSharedUI/Resources/MyResources.Designer.cs +++ b/TIAMSharedUI/Resources/MyResources.Designer.cs @@ -177,6 +177,15 @@ namespace TIAMSharedUI.Resources { } } + /// + /// Looks up a localized string similar to Events. + /// + public static string NavMenu_Events { + get { + return ResourceManager.GetString("NavMenu.Events", resourceCulture); + } + } + /// /// Looks up a localized string similar to Home. /// diff --git a/TIAMSharedUI/Resources/MyResources.hu.resx b/TIAMSharedUI/Resources/MyResources.hu.resx index fb6fe0a7..c2e98cb4 100644 --- a/TIAMSharedUI/Resources/MyResources.hu.resx +++ b/TIAMSharedUI/Resources/MyResources.hu.resx @@ -156,6 +156,9 @@ Adminisztráció + + Események + Főoldal diff --git a/TIAMSharedUI/Resources/MyResources.resx b/TIAMSharedUI/Resources/MyResources.resx index 8cca7c97..86c56661 100644 --- a/TIAMSharedUI/Resources/MyResources.resx +++ b/TIAMSharedUI/Resources/MyResources.resx @@ -156,6 +156,9 @@ Admin + + Events + Home diff --git a/TIAMSharedUI/Shared/Components/Navbar.razor b/TIAMSharedUI/Shared/Components/Navbar.razor index 7759e8bd..3c33e035 100644 --- a/TIAMSharedUI/Shared/Components/Navbar.razor +++ b/TIAMSharedUI/Shared/Components/Navbar.razor @@ -23,7 +23,13 @@ @localizer.GetString("NavMenu.Transfer") -
  • +
    • +
  • + + @localizer.GetString("NavMenu.Events") + +
    • +
  • API diff --git a/TIAMSharedUI/Shared/EventsComponent.razor b/TIAMSharedUI/Shared/EventsComponent.razor new file mode 100644 index 00000000..33b35a34 --- /dev/null +++ b/TIAMSharedUI/Shared/EventsComponent.razor @@ -0,0 +1,97 @@ +@using TIAMWebApp.Shared.Application.Models + +@{ + if (ItemType == 0) + { + typeVariable = "Featured Events"; + } + + else + { + typeVariable = "Featured partner restaurants"; + } +} + +
    + + @{ + if (DisplayTitle) + { +

    @typeVariable

    + } + + + } + + + + + +
    + + @{ + foreach (var item in MockEvents) + { +
    +
    +
    + @item.Name +
    +
    +
    @item.Name
    +

    @item.DateAndTime

    +

    @item.Description

    +

    @item.Location

    +
    + by + +
    +
    +
    + See all +
    +
    +
    + } + } + + + +
    + +
    + +@code { + [Parameter] + public int ItemType { get; set; } + + [Parameter] + public bool DisplayTitle { get; set; } = true; + + public List MockEvents = new List + { + new Event("HONEYBEAST", "A Honeybeast egyedisége abban rejlik, hogy a popzenét rengeteg különféle irányból közelítik meg - hol vidám, hol szomorú, hol pörgős, hogy lassú, koncertjükön az érzelmek széles skáláját élhetjük át együtt.", "2024.05.03", "Budapest Park", "https://tixa.hu/kepek/0027/320/27870-1_20231214141702.jpg"), + new Event("VAD FRUTTIK", "A kék a tenger és az ég színe, a nyílt terekkel, valamint a képzelettel és tágassággal társul - végtelen kékség május 3-án a Budapest Parkban!", "2024.04.26", "Budapest Park", "https://tixa.hu/kepek/0027/768/27692-1_20231129185842.jpg"), + new Event("DEBORAH DE LUCA", "DEBORAH DE LUCA 2024-ben Magyarországon csak a Budapest Park színpadán", "2024.08.19", "Budapest Park", "https://tixa.hu/kepek/0028/768/28535-1_20240118172423.jpg"), + new Event("TOTAL DANCE CABRIO", "Ha nyár, akkor Total Dance Cabrio! Ülj be mellénk a cabrioba, és hagyd, hogy visszarepítsünk a 90-es és 2000-es évekbe! ", "2024.04.26", "Budapest Park", "https://tixa.hu/kepek/0027/768/27829-1_20231206193253.jpg"), + new Event("HONEYBEAST", "A Honeybeast egyedisége abban rejlik, hogy a popzenét rengeteg különféle irányból közelítik meg - hol vidám, hol szomorú, hol pörgős, hogy lassú, koncertjükön az érzelmek széles skáláját élhetjük át együtt.", "2024.05.03", "Budapest Park", "https://tixa.hu/kepek/0027/320/27870-1_20231214141702.jpg"), + new Event("VAD FRUTTIK", "A kék a tenger és az ég színe, a nyílt terekkel, valamint a képzelettel és tágassággal társul - végtelen kékség május 3-án a Budapest Parkban!", "2024.04.26", "Budapest Park", "https://tixa.hu/kepek/0027/768/27692-1_20231129185842.jpg"), + new Event("DEBORAH DE LUCA", "DEBORAH DE LUCA 2024-ben Magyarországon csak a Budapest Park színpadán", "2024.08.19", "Budapest Park", "https://tixa.hu/kepek/0028/768/28535-1_20240118172423.jpg"), + new Event("TOTAL DANCE CABRIO", "Ha nyár, akkor Total Dance Cabrio! Ülj be mellénk a cabrioba, és hagyd, hogy visszarepítsünk a 90-es és 2000-es évekbe! ", "2024.04.26", "Budapest Park", "https://tixa.hu/kepek/0027/768/27829-1_20231206193253.jpg"), + + + + }; + + + + public string typeVariable; +} diff --git a/TIAMSharedUI/Shared/Users/AdminNavMenu.razor b/TIAMSharedUI/Shared/Users/AdminNavMenu.razor index 00004a55..2ea7d92c 100644 --- a/TIAMSharedUI/Shared/Users/AdminNavMenu.razor +++ b/TIAMSharedUI/Shared/Users/AdminNavMenu.razor @@ -42,6 +42,12 @@
    • +
    + + Media + +
    +
    Cards diff --git a/TIAMSharedUI/wwwroot/css/TourIAm.css b/TIAMSharedUI/wwwroot/css/TourIAm.css index 8eb9aac5..6402c1c9 100644 --- a/TIAMSharedUI/wwwroot/css/TourIAm.css +++ b/TIAMSharedUI/wwwroot/css/TourIAm.css @@ -59,7 +59,8 @@ select { .card { border-radius: 16px; - /*box-shadow: 3px 3px 3px #b1b1b1, -3px -3px 3px #fff;*/ + box-shadow: 0 8px 32px 0 rgba( 31, 38, 135, 0.57 ); + -webkit-box-shadow: 0 8px 32px 0 rgba( 31, 38, 135, 0.57 ); overflow: hidden; background-color: rgba( 255, 255, 255, 0.15 ); /*color: #58457b;*/ @@ -67,23 +68,21 @@ select { } .glass { -border-radius: 16px; /*box-shadow: 3px 3px 3px #b1b1b1, -3px -3px 3px #fff;*/ - overflow: hidden; - background: rgba( 255, 255, 255, 0.55 ); - box-shadow: 0 8px 32px 0 rgba( 31, 38, 135, 0.57 ); + + background: rgba( 255, 255, 255, 0.25 ); + backdrop-filter: blur( 8px ); -webkit-backdrop-filter: blur( 8px ); - border-radius: 10px; - border: 1px solid rgba( 255, 255, 255, 0.18 ); /*color: #58457b;*/ - font-size: small; } - .card .card-body { - padding: 10px; - - } +.card .card-body { + padding: 10px; + + border: 1px solid rgba( 255, 255, 255, 0.18 ); + +} .inputwizardwrapper { /*max-width: 450px;*/ diff --git a/TIAMSharedUI/wwwroot/filePaste.js b/TIAMSharedUI/wwwroot/filePaste.js new file mode 100644 index 00000000..aae012af --- /dev/null +++ b/TIAMSharedUI/wwwroot/filePaste.js @@ -0,0 +1,16 @@ +export function initializeFilePaste(fileDropContainer, inputFile) { + + function onPaste(e) { + inputFile.files = e.clipboardData.files; + const event = new Event('change', { bubbles: true }); + inputFile.dispatchEvent(event); + } + + fileDropContainer.addEventListener('paste', onPaste); + + return { + dispose: () => { + fileDropContainer.removeEventListener('paste', onPaste); + } + } +} \ No newline at end of file diff --git a/TIAMWebApp/Client/Program.cs b/TIAMWebApp/Client/Program.cs index 09a316fa..41cb7347 100644 --- a/TIAMWebApp/Client/Program.cs +++ b/TIAMWebApp/Client/Program.cs @@ -28,7 +28,9 @@ builder.Services.AddBlazoredLocalStorage(); builder.Services.AddSingleton(); builder.Services.AddSingleton(); builder.Services.AddScoped(); +builder.Services.AddScoped(); builder.Services.AddScoped(); +builder.Services.AddScoped(); //WebSpecific builder.Services.AddScoped(); builder.Services.AddSingleton(x => new ResourceManager("TIAMWebApp.Client.Resources.MyResources", typeof(Program).Assembly)); diff --git a/TIAMWebApp/Client/Services/WizardProcessor.cs b/TIAMWebApp/Client/Services/WizardProcessor.cs index fe23d2db..3041e711 100644 --- a/TIAMWebApp/Client/Services/WizardProcessor.cs +++ b/TIAMWebApp/Client/Services/WizardProcessor.cs @@ -1,19 +1,26 @@ -using TIAM.Entities.TransferDestinations; +using AyCode.Interfaces.Enums; +using AyCode.Interfaces.Messages; +using AyCode.Models.Messages; +using TIAM.Entities.TransferDestinations; using TIAMWebApp.Shared.Application.Interfaces; using TIAMWebApp.Shared.Application.Models.ClientSide.UI.WizardModels; +using static AyCode.Interfaces.Enums.IMessageTypes; namespace TIAMWebApp.Client.Services { public class WizardProcessor : IWizardProcessor { - public ITransferDataService transferDataService { get; set; } - public IUserDataService userDataService { get; set; } + public ITransferDataService TransferDataService { get; set; } + public IUserDataService UserDataService { get; set; } - public WizardProcessor(ITransferDataService transferDataService, IUserDataService userDataService) + public IClientNoticeSenderService MessageSenderService { get; set; } + + public WizardProcessor(ITransferDataService transferDataService, IUserDataService userDataService, IClientNoticeSenderService messageSenderService) { - this.transferDataService = transferDataService; - this.userDataService = userDataService; + this.TransferDataService = transferDataService; + this.UserDataService = userDataService; + this.MessageSenderService = messageSenderService; } public async Task ProcessWizardAsync(Type type, object data) where TModelType: class @@ -21,13 +28,17 @@ namespace TIAMWebApp.Client.Services switch (type.Name) { case "TransferDestinationWizardModel": - var result = await transferDataService.CreateTransferDestination((TransferDestination)data); + var result = await TransferDataService.CreateTransferDestination((TransferDestination)data); return result as TModelType; case "TransferWizardModel": - var transferResult = await transferDataService.CreateTransfer((TransferWizardModel)data); + var transferResult = await TransferDataService.CreateTransfer((TransferWizardModel)data); return transferResult as TModelType; + case "MessageWizardModel": + var messageResult = await MessageSenderService.SendNoticeAsync((EmailMessage)data, 1); + return messageResult as TModelType; + case "ServiceProvider": return null; default: diff --git a/TIAMWebApp/Client/TIAMWebApp.Client.csproj b/TIAMWebApp/Client/TIAMWebApp.Client.csproj index 1d15f37a..451f6e07 100644 --- a/TIAMWebApp/Client/TIAMWebApp.Client.csproj +++ b/TIAMWebApp/Client/TIAMWebApp.Client.csproj @@ -5,6 +5,9 @@ enable enable + + false + diff --git a/TIAMWebApp/Server/Controllers/EmailAPIController.cs b/TIAMWebApp/Server/Controllers/EmailAPIController.cs index 2daac890..d17acc15 100644 --- a/TIAMWebApp/Server/Controllers/EmailAPIController.cs +++ b/TIAMWebApp/Server/Controllers/EmailAPIController.cs @@ -27,6 +27,7 @@ using AyCode.Entities.Messages; using TIAMWebApp.Shared.Application.Models.ClientSide.Messages; using AyCode.Models.Messages; using AyCode.Models.Enums; +using TIAM.Database.DataLayers.Admins; namespace TIAMWebApp.Server.Controllers { @@ -35,6 +36,7 @@ namespace TIAMWebApp.Server.Controllers [Route("api/v1/[controller]")] public class MessageAPIController : ControllerBase { + private AdminDal _adminDal; private readonly IConfiguration _configuration; private readonly IWebHostEnvironment _webHostEnvironment; private IMessageSenderService _messageSenderService; @@ -42,8 +44,9 @@ namespace TIAMWebApp.Server.Controllers private readonly ILogger _logger; - public MessageAPIController(ILogger logger, IConfiguration configuration, IWebHostEnvironment webHostEnvironment, IMessageSenderService messageSenderService) + public MessageAPIController(ILogger logger, IConfiguration configuration, IWebHostEnvironment webHostEnvironment, IMessageSenderService messageSenderService, AdminDal adminDal) { + _adminDal = adminDal; _logger = logger; _configuration = configuration; _webHostEnvironment = webHostEnvironment; @@ -66,6 +69,7 @@ namespace TIAMWebApp.Server.Controllers Console.WriteLine($"EmailMessage!!!"); var result = await _messageSenderService.SendMessageAsync(SerializedMessageSenderModel.Message, (int)SerializedMessageSenderModel.MessageType); + //_adminDal.AddEmailMessageAsync((TIAM.Entities.Emails.EmailMessage)SerializedMessageSenderModel.Message); Console.WriteLine("SendEmail result: " + result); return Ok(result); diff --git a/TIAMWebApp/Server/Controllers/FileAPIController.cs b/TIAMWebApp/Server/Controllers/FileAPIController.cs new file mode 100644 index 00000000..6769f951 --- /dev/null +++ b/TIAMWebApp/Server/Controllers/FileAPIController.cs @@ -0,0 +1,120 @@ +using AyCode.Core.Logger; +using Microsoft.AspNetCore.Authorization; +using Microsoft.AspNetCore.Cors; +using Microsoft.AspNetCore.Mvc; +using System.Drawing; +using TIAM.Database.DataLayers.Admins; +using TIAM.Database.DataLayers.Auctions; +using TIAM.Entities.Auctions; +using TIAMWebApp.Shared.Application.Models; + +namespace TIAMWebApp.Server.Controllers +{ + [Authorize] + [ApiController] + [EnableCors("_myAllowSpecificOrigins")] + [Route("api/v1/[controller]")] + public class FileAPIController : ControllerBase + { + private AdminDal _adminDal; + private readonly IConfiguration _configuration; + private readonly IWebHostEnvironment _webHostEnvironment; + + + private readonly ILogger _logger; + + public FileAPIController(ILogger logger, IConfiguration configuration, IWebHostEnvironment webHostEnvironment, AdminDal adminDal) + { + _logger = logger; + _configuration = configuration; + _webHostEnvironment = webHostEnvironment; + _adminDal = adminDal; + } + + + const long MaxFileSize = 4_000_000; + readonly string[] imageExtensions = { ".JPG", ".JPEG", ".GIF", ".PNG" }; + + + + [AllowAnonymous] + [HttpPost] + [Route(APIUrls.UploadImageRouteName)] + public ActionResult UploadImage([FromForm] IFormFile file) + { + Console.WriteLine($"Upload file called: {file.FileName}"); + if (file == null || file.Length == 0) + return BadRequest("File not selected"); + + string folderPath = @"C:\CDN"; + string fileName = Path.GetFileNameWithoutExtension(file.FileName); + string extension = Path.GetExtension(file.FileName).ToUpper(); + Console.WriteLine(extension); + var isValidExtenstion = imageExtensions.Contains(extension); + var isValidSize = file.Length <= MaxFileSize; + if (!isValidExtenstion || !isValidSize) + { + return BadRequest("Invalid file"); + } + + string filePath = Path.Combine(folderPath, file.FileName); + + if (!Directory.Exists(folderPath)) + { + Directory.CreateDirectory(folderPath); + } + + int count = 1; + while (System.IO.File.Exists(filePath)) + { + string tempFileName = string.Format("{0}({1})", fileName, count++); + filePath = Path.Combine(folderPath, tempFileName + extension); + } + + using (var stream = new FileStream(filePath, FileMode.Create)) + { + file.CopyTo(stream); + } + + return Ok(new { filePath }); + } + + + [AllowAnonymous] + [HttpGet] + [Route(APIUrls.GetImagesRouteName)] + public IActionResult GetAllMedia() + { + string folderPath = @"C:\CDN"; + + if (!Directory.Exists(folderPath)) + { + return NotFound("Directory not found"); + } + + var files = Directory.GetFiles(folderPath) + .Select(Path.GetFileName) + .ToList(); + + return Ok(files); + } + + [AllowAnonymous] + //[HttpGet("Image/{name}")] + [HttpGet("{APIUrls.GetImageRouteName}/{name}")] + public IActionResult GetImage(string name) + { + string folderPath = @"C:\CDN"; + string filePath = Path.Combine(folderPath, name); + + if (!System.IO.File.Exists(filePath)) + { + return NotFound("Image not found"); + } + + var image = System.IO.File.OpenRead(filePath); + return File(image, "image/jpeg"); + } + + } +} \ No newline at end of file diff --git a/TIAMWebApp/Server/Controllers/UserAPIController.cs b/TIAMWebApp/Server/Controllers/UserAPIController.cs index b0f7dba9..d0c9eeee 100644 --- a/TIAMWebApp/Server/Controllers/UserAPIController.cs +++ b/TIAMWebApp/Server/Controllers/UserAPIController.cs @@ -57,7 +57,7 @@ namespace TIAMWebApp.Server.Controllers [AllowAnonymous] [HttpPost] - [Route("AuthenticateUser")] + [Route(APIUrls.AuthenticateUserRouteName)] public async Task AuthenticateUser([FromBody] JsonElement SerializedLoginModel) { Console.WriteLine("AuthenticateUser called"); diff --git a/TIAMWebApp/Server/Program.cs b/TIAMWebApp/Server/Program.cs index 9a64e69c..8f4fe7d0 100644 --- a/TIAMWebApp/Server/Program.cs +++ b/TIAMWebApp/Server/Program.cs @@ -1,5 +1,6 @@ using AyCode.Interfaces.Messages; using Microsoft.AspNetCore.Authentication.JwtBearer; +using Microsoft.AspNetCore.Http.Features; using Microsoft.IdentityModel.Tokens; using Microsoft.OpenApi.Models; using System.Text; @@ -12,6 +13,8 @@ using TIAMWebApp.Server.Services; var builder = WebApplication.CreateBuilder(args); +string MyAllowSpecificOrigins = "_myAllowSpecificOrigins"; + // Add services to the container. builder.Services.AddControllersWithViews(); @@ -20,9 +23,15 @@ builder.Services.AddRazorPages(); builder.Services.AddScoped(); builder.Services.AddScoped(); builder.Services.AddScoped(); -//builder.Services.AddScoped(); builder.Services.AddScoped(); +builder.Services.AddCors(options => { + options.AddPolicy(MyAllowSpecificOrigins, + builder => { + builder.AllowAnyOrigin(); + }); +}); + builder.Services.AddSwaggerGen(swagger => { swagger.SwaggerDoc("v1", @@ -74,7 +83,10 @@ builder.Services.AddAuthentication(f => }; }); - +builder.Services.Configure(options => +{ + options.MultipartBodyLengthLimit = 200000000; // Increase the limit to 200MB +}); builder.Services.AddScoped(); builder.Services.AddEndpointsApiExplorer(); @@ -90,6 +102,8 @@ builder.Services.ConfigureApplicationCookie(options => var app = builder.Build(); + + // Configure the HTTP request pipeline. if (app.Environment.IsDevelopment()) { @@ -116,6 +130,8 @@ app.UseStaticFiles(); app.UseAuthentication(); app.UseRouting(); +//cors +app.UseCors(MyAllowSpecificOrigins); app.UseAuthorization(); app.UsePathBase("/"); app.MapRazorPages(); diff --git a/TIAMWebApp/Server/TIAMWebApp.Server.csproj b/TIAMWebApp/Server/TIAMWebApp.Server.csproj index 885b057a..2bfc8f59 100644 --- a/TIAMWebApp/Server/TIAMWebApp.Server.csproj +++ b/TIAMWebApp/Server/TIAMWebApp.Server.csproj @@ -5,6 +5,9 @@ enable enable + + false + diff --git a/TIAMWebApp/Shared/Interfaces/IClientNoticeSenderService.cs b/TIAMWebApp/Shared/Interfaces/IClientNoticeSenderService.cs new file mode 100644 index 00000000..f0fcdbff --- /dev/null +++ b/TIAMWebApp/Shared/Interfaces/IClientNoticeSenderService.cs @@ -0,0 +1,16 @@ +using AyCode.Interfaces.Messages; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using static AyCode.Interfaces.Enums.IMessageTypes; + +namespace TIAMWebApp.Shared.Application.Interfaces +{ + public interface IClientNoticeSenderService + { + public Task SendNoticeAsync(TNotice message, int messageType) where TNotice : class, INoticeBase; + + } +} diff --git a/TIAMWebApp/Shared/Interfaces/IImageDataService.cs b/TIAMWebApp/Shared/Interfaces/IImageDataService.cs new file mode 100644 index 00000000..615d5e3c --- /dev/null +++ b/TIAMWebApp/Shared/Interfaces/IImageDataService.cs @@ -0,0 +1,15 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace TIAMWebApp.Shared.Application.Interfaces +{ + public interface IImageDataService + { + Task UploadImageAsync(MultipartContent image); + Task GetImageAsync(string name); + Task> GetImagesAsync(string userId); + } +} diff --git a/TIAMWebApp/Shared/Models/APIUrls.cs b/TIAMWebApp/Shared/Models/APIUrls.cs index 587e58a7..30b8e285 100644 --- a/TIAMWebApp/Shared/Models/APIUrls.cs +++ b/TIAMWebApp/Shared/Models/APIUrls.cs @@ -13,6 +13,7 @@ namespace TIAMWebApp.Shared.Application.Models public const string TransferDataAPI = BaseUrlWithSlashAndVersion + "TransferDataAPI/"; public const string ServiceProviderAPI = BaseUrlWithSlashAndVersion + "ServiceProviderAPI/"; public const string UserPermissionAPI = BaseUrlWithSlashAndVersion + "UserPermissionAPI/"; + public const string FileAPI = BaseUrlWithSlashAndVersion + "FileAPI/"; //userdata public const string UserTestRouteName = "test1"; @@ -108,5 +109,16 @@ namespace TIAMWebApp.Shared.Application.Models //12 public const string GetPermissionGroupsForContextByContextIdRouteName = "GetPermissionGroupsForContextByContextId"; public const string GetPermissionGroupsForContextByContextId = ServiceProviderAPI+GetPermissionGroupsForContextByContextIdRouteName; + + //file upload + public const string UploadImageRouteName = "UploadImage"; + public const string UploadImage = FileAPI+UploadImageRouteName; + //get images + public const string GetImagesRouteName = "GetAllMedia"; + public const string GetImages = FileAPI+GetImagesRouteName; + //get image by name + public const string GetImageRouteName = "GetImage"; + public const string GetImage = FileAPI+GetImageRouteName; + } } diff --git a/TIAMWebApp/Shared/Models/ClientSide/UI/WizardModels/MessageWizardModel.cs b/TIAMWebApp/Shared/Models/ClientSide/UI/WizardModels/MessageWizardModel.cs index 1d8ee499..4f7ca152 100644 --- a/TIAMWebApp/Shared/Models/ClientSide/UI/WizardModels/MessageWizardModel.cs +++ b/TIAMWebApp/Shared/Models/ClientSide/UI/WizardModels/MessageWizardModel.cs @@ -1,10 +1,12 @@ -using System; +using Microsoft.EntityFrameworkCore; +using System; using System.Collections.Generic; using System.ComponentModel.DataAnnotations; using System.Linq; using System.Text; using System.Text.RegularExpressions; using System.Threading.Tasks; +using TIAM.Entities.Emails; using TIAM.Resources; namespace TIAMWebApp.Shared.Application.Models.ClientSide.UI.WizardModels @@ -12,9 +14,11 @@ namespace TIAMWebApp.Shared.Application.Models.ClientSide.UI.WizardModels public class MessageWizardModel { - [DataType(DataType.Text)] - [Display(Name = "ReceiverId", ResourceType = typeof(TIAMResources))] - public string ReceiverId { get; set; } + public string ReceiverEmailAddress { get; set; } + public Guid ReceiverId { get; set; } + public string SenderEmailAddress { get; set; } + public Guid SenderId { get; set; } + public Guid ContextId { get; set; } [Required(ErrorMessage = "The subject value should be specified.")] [DataType(DataType.Text)] [Display(Name = "Subject", ResourceType = typeof(TIAMResources))] @@ -25,11 +29,32 @@ namespace TIAMWebApp.Shared.Application.Models.ClientSide.UI.WizardModels public string Content { get; set; } public MessageWizardModel() { } - public MessageWizardModel(string receiverId, string subject, string content) + public MessageWizardModel(string receiverEmailAddress, Guid receiverId, string senderEmailAddress, Guid senderId, string subject, string content) { + ReceiverEmailAddress = receiverEmailAddress; ReceiverId = receiverId; + SenderEmailAddress = senderEmailAddress; + SenderId = senderId; Subject = subject; - Content = content; + Content = content; + } + + public static EmailMessage ConvertToNewEmailMessage(MessageWizardModel message) + { + var id = Guid.NewGuid(); + + + return new EmailMessage + { + Id = id, + SenderId = message.SenderId, + ContextId = message.ContextId, + Subject = message.Subject, + Text = message.Content, + SenderEmailAddress = message.SenderEmailAddress, + Recipients = new List { new EmailRecipient( + Guid.NewGuid(), message.ReceiverId, id) } + }; } } } diff --git a/TIAMWebApp/Shared/Models/Event.cs b/TIAMWebApp/Shared/Models/Event.cs new file mode 100644 index 00000000..5601810f --- /dev/null +++ b/TIAMWebApp/Shared/Models/Event.cs @@ -0,0 +1,31 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace TIAMWebApp.Shared.Application.Models +{ + public class Event + { + public string Name { get; set; } + public string Description { get; set; } + public string DateAndTime { get; set; } + + public string Location { get; set; } + public string ImageUrl { get; set; } + + public Event() + { + } + + public Event(string name, string description, string dateAndTime, string location, string imageUrl) + { + Name = name; + Description = description; + DateAndTime = dateAndTime; + Location = location; + ImageUrl = imageUrl; + } + } +} diff --git a/TIAMWebApp/Shared/Services/ClientNoticeSenderService.cs b/TIAMWebApp/Shared/Services/ClientNoticeSenderService.cs new file mode 100644 index 00000000..bf3655c2 --- /dev/null +++ b/TIAMWebApp/Shared/Services/ClientNoticeSenderService.cs @@ -0,0 +1,17 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using TIAMWebApp.Shared.Application.Interfaces; + +namespace TIAMWebApp.Shared.Application.Services +{ + public class ClientNoticeSenderService : IClientNoticeSenderService + { + Task IClientNoticeSenderService.SendNoticeAsync(TNotice message, int messageType) + { + throw new NotImplementedException(); + } + } +} diff --git a/TIAMWebApp/Shared/Services/ImageDataService.cs b/TIAMWebApp/Shared/Services/ImageDataService.cs new file mode 100644 index 00000000..e344db87 --- /dev/null +++ b/TIAMWebApp/Shared/Services/ImageDataService.cs @@ -0,0 +1,79 @@ +using Azure; +using Microsoft.AspNetCore.Http; +using Microsoft.EntityFrameworkCore.Storage.ValueConversion.Internal; +using Microsoft.IdentityModel.Tokens; +using Microsoft.SqlServer.Server; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Net.Http.Headers; +using System.Net.Http.Json; +using System.Text; +using System.Threading.Tasks; +using TIAM.Entities.TransferDestinations; +using TIAMWebApp.Shared.Application.Interfaces; +using TIAMWebApp.Shared.Application.Models.ClientSide; +using TIAMWebApp.Shared.Application.Models; +using static System.Net.WebRequestMethods; +using static System.Runtime.InteropServices.JavaScript.JSType; + +namespace TIAMWebApp.Shared.Application.Services +{ + public class ImageDataService : IImageDataService + { + private readonly HttpClient _http; + + public ImageDataService(HttpClient httpClient) + { + _http = httpClient; + } + + public async Task> GetImagesAsync(string userId) + { + var response = await _http.GetAsync("images"); + + if (response.IsSuccessStatusCode) + { + var fileNames = await response.Content.ReadFromJsonAsync>(); + return fileNames; + } + + throw new ApplicationException($"Status code: {response.StatusCode}, Error: {response.ReasonPhrase}"); + } + + public async Task GetImageAsync(string name) + { + var response = await _http.GetAsync($"image/{name}"); + + if (response.IsSuccessStatusCode) + { + var stream = await response.Content.ReadAsStreamAsync(); + return stream; + } + + throw new ApplicationException($"Status code: {response.StatusCode}, Error: {response.ReasonPhrase}"); + } + + public async Task UploadImageAsync(MultipartContent image) + { + var url = $"{Setting.BaseUrl}/{APIUrls.UploadImage}"; + var response = await _http.PostAsync(url, image); + + //var result = new WizardProcessorResult(); + + //if (response.IsSuccessStatusCode) + //{ + // result.IsSucces = true; + // result.ResultJson = await response.Content.ReadAsStringAsync(); + //} + + if (!response.IsSuccessStatusCode) + return "Oops, something wrong"; + + var result = await response.Content.ReadAsStringAsync(); + + return result; + } + } + +} diff --git a/TIAMWebApp/Shared/TIAMWebApp.Shared.Application.csproj b/TIAMWebApp/Shared/TIAMWebApp.Shared.Application.csproj index 318f652b..4095838e 100644 --- a/TIAMWebApp/Shared/TIAMWebApp.Shared.Application.csproj +++ b/TIAMWebApp/Shared/TIAMWebApp.Shared.Application.csproj @@ -18,6 +18,7 @@ +