Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Layout improvements #9

Merged
merged 3 commits into from
May 31, 2024
Merged

Layout improvements #9

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9d4e40d
Shrink layout of SystemNodes for a neater appearance.
rdymade May 28, 2024
d733c42
Shrink system size and add space for short system description
rdymade May 31, 2024
1a21538
Fix middle part of system node
rdymade May 31, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 8 additions & 1 deletion src/WHMapper/Models/Custom/Node/EveSystemNodeModel.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,14 @@ public String? NameExtension
}
}


public String SystemShortDesc
{
get
{
return "";
}
}

public int SolarSystemId
{
get
Expand Down
39 changes: 21 additions & 18 deletions src/WHMapper/Pages/Mapper/CustomNode/EveSystemNode.razor
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,23 +4,23 @@


<MudCard Outlined="true" Style="@systemStyle" Class="_class">
<MudCardHeader Class="mb-n5">
<MudCardHeader Class="mb-n2 pa-1 mx-1">
<CardHeaderAvatar>
<MudBadge Origin="Origin.TopRight" Overlap="true" [email protected] Visible=@((Node.NameExtension!=null) ? true : false) Bordered="true" Color="Color.Dark">
<MudAvatar class="mt-1" Style="@($"color:{_systemColor}; border-color:{_systemColor}; font-weight:bold;")" Size="Size.Small" Variant="Variant.Outlined">@Node.SystemType.ToDescriptionString()</MudAvatar>
<MudBadge Origin="Origin.TopRight" Overlap="false" [email protected] Visible=@((Node.NameExtension!=null) ? true : false) Bordered="true" Color="Color.Dark">
<MudText Typo="Typo.body1" Style="@($"color:{_systemColor}; border-color:{_systemColor}; font-weight:bold;")">@Node.SystemType.ToDescriptionString()</MudText>
</MudBadge>
</CardHeaderAvatar>
<CardHeaderContent>
<MudText class="ml-n1 pr-2 mt-1" Typo="Typo.body2" Style="font-weight:bold;">@Node.Name</MudText>
<MudText class="ml-n3 mr-2" Typo="Typo.body1" Style="font-weight:bold;">@Node.Name</MudText>
</CardHeaderContent>
<CardHeaderActions>
@if (Locked)
{
<MudIcon Icon="@Icons.Material.Sharp.Lock" DisableElevation="true" Size="Size.Small" Style="margin-top:-3px" />
<MudIcon Class="mt-3 mr-2" Icon="@Icons.Material.Sharp.Lock" DisableElevation="true" Size="Size.Small" Style="margin-top:-3px" />
}
@if (Node != null && Node.Effect != WHMapper.Models.DTO.EveMapper.Enums.WHEffect.None)
{
<MudTooltip Text="@Node.Effect.ToString()" Arrow="true" Placement="Placement.Bottom">
<MudTooltip Class="mt-3 mr-2" Text="@Node.Effect.ToString()" Arrow="true" Placement="Placement.Bottom">
<ChildContent>
<MudIcon Icon="@Icons.Material.Filled.Square" DisableElevation="true" Style="@($"color:{_whEffectColor};")" Size="Size.Small" />
</ChildContent>
Expand All @@ -40,8 +40,20 @@
</CardHeaderActions>
</MudCardHeader>

<MudCardContent Class="d-flex pa-1 pr-2 justify-space-between">
<div Class="d-flex justify-start">
<MudCardContent Class="d-flex pa-1 mx-1 flex-column justify-space-between">
<div Class="d-flex flex-row justify-space-between">
<MudText Class="d-flex" Typo="Typo.caption">@Node.SystemShortDesc.ToString()</MudText>
<div Class="d-flex">
@if (Node != null && Node.Statics != null && Node?.Statics.Count() > 0)
{
@foreach (var item in Node.Statics)
{
<MudText Class="ml-1" Typo="Typo.body2" Style="@($"color:{WHColorHelper.GetSystemTypeColor(@item.EveSystemDestinationType)};")">@item.EveSystemDestinationType.ToString()</MudText>
}
}
</div>
</div>
<div Class="d-flex">
@if (Node != null && Node.ConnectedUsers != null && Node.ConnectedUsers.FirstOrDefault() != null)
{
<MudTooltip Typo="Typo.caption" Arrow="true" Placement="Placement.Bottom">
Expand All @@ -52,7 +64,7 @@
<MudPaper Class="d-flex flex-column flex-grow-1 gap-0" Elevation="0">
@foreach (var user in @Node.ConnectedUsers)
{
<MudText class="ml-1 mr-1" Typo="Typo.caption">@user</MudText>
<MudText class="mx-1" Typo="Typo.caption">@user</MudText>
}
</MudPaper>
</TooltipContent>
Expand All @@ -64,15 +76,6 @@
}
<MudText Class="align-self-stretch ml-1 mt-1" Typo="Typo.caption">@Node?.ConnectedUsers?.FirstOrDefault()</MudText>
</div>
<div Class="d-flex justify-end">
@if (Node != null && Node.Statics != null && Node?.Statics.Count() > 0)
{
@foreach (var item in Node.Statics)
{
<MudText Class="align-self-stretch mt-1 ml-1" Typo="Typo.body2" Style="@($"color:{WHColorHelper.GetSystemTypeColor(@item.EveSystemDestinationType)};")">@item.EveSystemDestinationType.ToString()</MudText>
}
}
</div>
</MudCardContent>
</MudCard>

Expand Down
Loading