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

Compare commits

base: Adam:8e33abbf7bb190e6173afc20a47bf8d9f9883fdb
Branches Tags
Adam:master
Adam:TIAM_v0.0.6.0
Adam:v0.0.5.1
Adam:Fullepi_Sandbox
...
compare: Adam:7c320a939e3f66e8b7bef963fadf5d5a4cb48558
Branches Tags
Adam:TIAM_v0.0.6.0
Adam:v0.0.5.1
Adam:master
Adam:Fullepi_Sandbox

5 Commits
8e33abbf7b ... 7c320a939e

Author SHA1 Message Date
Adam 7c320a939e gghjghjghj 2025-09-26 15:47:32 +02:00
Adam dd78844f08 merge 2025-09-26 15:37:33 +02:00
Adam a1de704cef Merge branch 'v0.0.5.1' of https://git.aycode.com/Adam/TourIAm into v0.0.5.1 2025-09-26 15:37:29 +02:00
Adam eda1da7cca Merge branch 'v0.0.5.1' of https://git.aycode.com/Adam/TourIAm into v0.0.5.1 2025-09-26 11:40:44 +02:00
Adam 5fad939eb2 ui fixes 2025-09-26 11:40:38 +02:00
7 changed files with 153 additions and 66 deletions
Show Stats Expand all files Collapse all files

2
TIAMSharedUI/Pages/Components/LoginStep1.razor
View File

@ -10,7 +10,7 @@
<DxMaskedInput @bind-Value="@LoginModel.Email"
Id="Email"
style="width: 100%;"
Mask="@EmailMask"
MaskMode="MaskMode.RegEx">
<DxRegExMaskProperties MaskAutoCompleteMode="@((MaskAutoCompleteMode)AutoCompleteMode)"

21
TIAMSharedUI/Pages/EditTransfers.razor
View File

@ -104,7 +104,7 @@ else if (!string.IsNullOrEmpty(_errorMessage))
else
{
<div class="container mt-4">
<DxTabs>
<DxTabs ActiveTabIndex="@activeTab">
<DxTabPage Visible="@displayCard" Text="Details">
@ -167,12 +167,12 @@ else
<div class="card-footer p-4">
<div class="d-flex justify-content-between align-items-center">
<h5 class="fw-normal mb-0"><a href="#!" class="text-decoration-none">Contact driver</a></h5>
<DxButton RenderStyle="ButtonRenderStyle.Warning" Click="OpenMessages">Contact driver</DxButton>
<div class="vr"></div>
@{
if (_transfer.TransferStatusType != TransferStatusType.UserCanceled)
{
<h5 class="fw-normal mb-0"><DxButton RenderStyle="ButtonRenderStyle.Warning" Click="CancelTransfer">Cancel</DxButton></h5>
<DxButton RenderStyle="ButtonRenderStyle.Warning" Click="CancelTransfer">Cancel</DxButton>
}
}
@ -186,7 +186,7 @@ else
}
@*<h5 class="fw-normal mb-0"><a class="btn btn-secondary" @onclick="SetEditMode">Modify</a></h5>*@
<h5 class="fw-normal mb-0"><DxButton RenderStyle="ButtonRenderStyle.Secondary" Click="SetEditMode">Modify</DxButton></h5>
<DxButton RenderStyle="ButtonRenderStyle.Secondary" Click="SetEditMode">Modify</DxButton>
</div>
</div>
</div>
@ -292,6 +292,7 @@ else
<DxTabPage Visible="@displayCard" Text="Messages">
<div style="margin-top: 10px; margin-bottom: 10px;">
<DxButton Click="() => SendMail(_transfer)" Text="Send a message" RenderStyle="ButtonRenderStyle.Primary" />
<DxButton RenderStyle="ButtonRenderStyle.Warning" Click="OpenDetails">Back to transfer</DxButton>
</div>
<MessageDetailGridComponent ContextId="_transfer.Id" GetAllMessageTag="SignalRTags.GetMessagesByContextId" IsSenderEmailVisible="false" IsMessageTextVisible="false"></MessageDetailGridComponent>
</DxTabPage>
@ -336,6 +337,8 @@ else
private bool _editMode = false;
private readonly List<string> _statusTypes = [];
private int activeTab = 0;
void SendMail(Transfer item)
{
_logger.Info($"Preparing mail to {item.ContactEmail}, {item.Id}");
@ -397,6 +400,16 @@ else
var result = await UpdateTransfer(true);
}
private void OpenMessages()
{
activeTab = 1;
}
private void OpenDetails()
{
activeTab = 0;
}
private async Task Pay()
{
if (_transfer != null)

4
TIAMSharedUI/Pages/User/SysAdmins/ManageTransfers.razor
View File

@ -136,12 +136,12 @@
if (!firstDriverName.IsNullOrWhiteSpace())
{
driverBgStyle += $" background-color: $#{firstDriverName.GetHashCode():X8} !important";
driverBgStyle += $" background-color: #{firstDriverName.GetHashCode():X8} !important";
}
<div>
<div style="@driverBgStyle"></div>
<div style="position: relative; float: left;">@(string.Join(", ", tranferItem.TransferToDrivers.Select(x => x.UserProductMapping?.User?.Profile?.Name)))</div>
<div style="position: relative; float: left; width: calc(100% - 28px)">@(string.Join(", ", tranferItem.TransferToDrivers.Select(x => x.UserProductMapping?.User?.Profile?.Name)))</div>
</div>
}
</CellDisplayTemplate>

149
TIAMSharedUI/Pages/User/SysAdmins/ToursFromTransferDestinations.razor
View File

@ -1,10 +1,13 @@
@page "/sysadmin/manage-tours"
@using System.ComponentModel.DataAnnotations
@using DevExpress.Blazor.Internal
@using DevExpress.Blazor.Office
@using TIAM.Entities.Transfers
@using TIAMWebApp.Shared.Application.Interfaces
@using TIAMWebApp.Shared.Application.Models
@using TIAMWebApp.Shared.Application.Services
@using TIAMSharedUI.Shared
@using DevExpress.Blazor
@inject ITransferDataService TransferDataService
@inject TourService TourService
@inject NavigationManager Navigation
@ -41,12 +44,24 @@
<div class="mb-3">
<label>Short Description</label>
<InputTextArea @bind-Value="newTour.Bio" class="form-control" />
<DxHtmlEditor @bind-Markup="@newTour.Bio"
Height="200px"
CustomizeToolbar="@OnCustomizeToolbar">
<DxHtmlEditorToolbar>
</DxHtmlEditorToolbar>
</DxHtmlEditor>
</div>
<div class="mb-3">
<label>Description</label>
<InputTextArea @bind-Value="newTour.Description" class="form-control" />
<DxHtmlEditor @bind-Markup="@newTour.Description"
Height="300px"
CustomizeToolbar="@OnCustomizeToolbar">
<DxHtmlEditorToolbar>
</DxHtmlEditorToolbar>
</DxHtmlEditor>
</div>
<div class="mb-3">
@ -74,23 +89,55 @@
<h4>Existing Tours</h4>
@if (Tours.Any())
{
<ul class="list-group">
<div class="row">
@foreach (var tour in Tours)
{
var dest = TransferDestinations.FirstOrDefault(d => d.Id == tour.TransferDestinationId);
<li class="list-group-item d-flex justify-content-between align-items-center">
<img src="@tour.CoverImageUrl" style="max-height: 100px;"/>
<span>
<strong>@tour?.Title</strong> — @tour.FancyDescription
</span>
<span>
@tour.Bio
</span>
<div class="col-lg-6 col-xl-4 mb-4">
<div class="card h-100">
@if (!string.IsNullOrEmpty(tour.CoverImageUrl))
{
<img src="@tour.CoverImageUrl" class="card-img-top" style="height: 200px; object-fit: cover;" alt="Tour cover image"/>
}
<div class="card-body d-flex flex-column">
<h5 class="card-title">@tour?.Title</h5>
@if (!string.IsNullOrEmpty(tour.Bio))
{
<div class="card-text mb-3">
<strong>Short Description:</strong>
<div class="html-content">
@((MarkupString)tour.Bio)
</div>
</div>
}
@if (!string.IsNullOrEmpty(tour.FancyDescription))
{
<div class="card-text mb-3">
<strong>Description:</strong>
<div class="html-content">
@((MarkupString)tour.FancyDescription)
</div>
</div>
}
@if (dest != null)
{
<div class="card-text mb-3">
<strong>Destination:</strong> @dest.Name (@dest.AddressString)
</div>
}
<div class="mt-auto">
<button class="btn btn-sm btn-secondary me-2" @onclick="() => EditTour(tour)">Edit</button>
<button class="btn btn-sm btn-danger" @onclick="() => DeleteTourAsync(tour.Id)">Delete</button>
</li>
</div>
</div>
</div>
</div>
}
</ul>
</div>
}
else
{
@ -99,6 +146,35 @@
</div>
</div>
<style>
.html-content {
max-height: 150px;
overflow-y: auto;
border: 1px solid #dee2e6;
border-radius: 0.25rem;
padding: 0.5rem;
background-color: #f8f9fa;
}
.html-content p {
margin-bottom: 0.5rem;
}
.html-content p:last-child {
margin-bottom: 0;
}
.html-content ul, .html-content ol {
margin-bottom: 0.5rem;
padding-left: 1.5rem;
}
.html-content img {
max-width: 100%;
height: auto;
}
</style>
@code {
private List<TransferDestination> TransferDestinations = [];
private List<TourInfo> Tours = [];
@ -110,6 +186,13 @@
private bool IsEditing = false;
private Guid? EditingTourId = null;
void OnCustomizeToolbar(IToolbar toolbar)
{
// Returns the first group
IBarGroup firstGroup = toolbar.Groups[0];
// Returns the "Table" group
IBarGroup tableGroup = toolbar.Groups[HtmlEditorToolbarGroupNames.Table];
}
protected override async Task OnInitializedAsync()
{
@ -123,8 +206,8 @@
{
TransferDestinationId = tour.TransferDestinationId,
Name = tour.Title,
Bio = tour.Bio,
Description = tour.FancyDescription,
Bio = tour.Bio ?? string.Empty,
Description = tour.FancyDescription ?? string.Empty,
ImageBytes = null,
ImageFileName = tour.CoverImageUrl
};
@ -143,34 +226,6 @@
UploadStatus = string.Empty;
}
// private async Task SaveTourAsync()
// {
// if (uploadedFile is not null)
// {
// using var stream = uploadedFile.OpenReadStream(maxAllowedSize: 5 * 1024 * 1024);
// using var ms = new MemoryStream();
// await stream.CopyToAsync(ms);
// newTour.ImageBytes = ms.ToArray();
// newTour.ImageFileName = uploadedFile.Name;
// }
// TourInfo tourToCreate = new TourInfo();
// tourToCreate.TransferDestinationId = newTour.TransferDestinationId;
// tourToCreate.FancyDescription = newTour.Description;
// tourToCreate.Title = newTour.Name;
// tourToCreate.CoverImageUrl = "";
// if (tourToCreate.TransferDestinationId == Guid.Empty)
// {
// throw new InvalidOperationException("Transfer Destination must be selected.");
// }
// await TourService.CreateAsync(tourToCreate, uploadedFile);
// newTour = new();
// uploadedFile = null;
// UploadStatus = string.Empty;
// Tours = (await TourService.GetAllAsync()).ToList();
// }
private async Task HandleSubmit()
{
if (uploadedFile is not null)
@ -182,7 +237,6 @@
newTour.ImageFileName = uploadedFile.Name;
}
if (IsEditing && EditingTourId.HasValue)
{
var updatedTour = new TourInfo
@ -203,6 +257,7 @@
{
TransferDestinationId = newTour.TransferDestinationId,
Title = newTour.Name,
Bio = newTour.Bio,
FancyDescription = newTour.Description,
CoverImageUrl = newTour.ImageFileName
};
@ -241,12 +296,10 @@
[StringLength(100, ErrorMessage = "Tour name cannot exceed 100 characters.")]
public string Name { get; set; } = string.Empty;
public string? Bio { get; set; }
public string? Description { get; set; }
public string Bio { get; set; } = string.Empty;
public string Description { get; set; } = string.Empty;
public byte[]? ImageBytes { get; set; }
public string? ImageFileName { get; set; }
}
}

6
TIAMSharedUI/Shared/Components/ToursComponent.razor
View File

@ -18,14 +18,14 @@
{
<div class="item" style="background-image: url(@item.CoverImageUrl); height: 600px !important">
<div class="added" style="position: absolute; top: 100px; left:0px; text-align:center; padding:10px; width:100%">
<p>@item.Bio</p>
<div class="added" style="position: absolute; top: 0px; left:0px; text-align:center; padding:10px; width:100%;">
@((MarkupString)item.Bio)
</div>
<div class="item-desc" style="height: 100%; background-color: rgba(0,0,0,0.3);">
@* <p style="padding-top:70px">@item.Created</p> *@
<div style="margin-top:70px; position: relative; z-index: 10; height:450px; overflow-y: scroll;">
<p style="">@item.FancyDescription</p>
@((MarkupString)item.FancyDescription)
</div>
@* <p>@item.TransferDestinationId</p> *@
<div>

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

@ -171,6 +171,27 @@ select {
background: no-repeat 50% / cover;
}
/* ===== Scrollbar CSS ===== */
/* Firefox */
* {
scrollbar-width: auto;
scrollbar-color: #643172 rgba( 31, 38, 135, 0 );
}
/* Chrome, Edge, and Safari */
*::-webkit-scrollbar {
width: 16px;
}
*::-webkit-scrollbar-track {
background: rgba( 31, 38, 135, 0 );
}
*::-webkit-scrollbar-thumb {
background-color: #643172;
border-radius: 10px;
border: 0px solid #ffffff;
}
.inputwizardwrapper {
/*max-width: 450px;*/

6
TIAMWebApp/Server/wwwroot/data/tours/171fcca4-ffd5-4380-9402-f27447af1e08.json
View File

File diff suppressed because one or more lines are too long