Moonlight-Panel/Moonlight
2
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #113 from Moonlight-Panel/DesignFixes

Browse Source 
fixed server settings design
This commit is contained in:
Daniel Balk
2023-05-05 17:33:38 +02:00
committed by GitHub
parent fde3bc29e4 928f29f505
commit 09a80db09c
10 changed files with 261 additions and 154 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
Moonlight/Shared/Components/Forms/SmartForm.razor
View File

@@ -1,6 +1,6 @@
@using Moonlight.App.Helpers @using Moonlight.App.Helpers
<div class="form"> <div class="form @CssClass">
<EditForm @ref="EditForm" Model="Model" OnValidSubmit="ValidSubmit" OnInvalidSubmit="InvalidSubmit"> <EditForm @ref="EditForm" Model="Model" OnValidSubmit="ValidSubmit" OnInvalidSubmit="InvalidSubmit">
<DataAnnotationsValidator></DataAnnotationsValidator> <DataAnnotationsValidator></DataAnnotationsValidator>
@if (Working) @if (Working)
@@ -44,6 +44,9 @@
[Parameter] [Parameter]
public RenderFragment ChildContent { get; set; } public RenderFragment ChildContent { get; set; }
[Parameter]
public string CssClass { get; set; }
private EditForm EditForm; private EditForm EditForm;
private List<string> ErrorMessages = new(); private List<string> ErrorMessages = new();

41
Moonlight/Shared/Components/ServerControl/Settings/FabricVersionSetting.razor
View File

@@ -13,19 +13,42 @@
@inject SmartTranslateService TranslationService @inject SmartTranslateService TranslationService
<div class="col"> <div class="col">
<div class="card card-body"> <div class="card card-body p-0">
<LazyLoader Load="Load"> <LazyLoader Load="Load">
<label class="mb-2 form-label"> <table class="w-100">
<tr>
<td colspan="2">
<label class="form-label mb-0">
<TL>Fabric version</TL> <TL>Fabric version</TL>
</label> </label>
</td>
</tr>
<tr>
<td class="w-100" colspan="2">
<input class="mb-2 form-control" disabled="" value="@(FabricVersion)"/> <input class="mb-2 form-control" disabled="" value="@(FabricVersion)"/>
<label class="mb-2 form-label"> </td>
</tr>
<tr>
<td colspan="2">
<label class="form-label mb-0">
<TL>Fabric loader version</TL> <TL>Fabric loader version</TL>
</label> </label>
</td>
</tr>
<tr>
<td class="w-100" colspan="2">
<input class="mb-2 form-control" disabled="" value="@(LoaderVersion)"/> <input class="mb-2 form-control" disabled="" value="@(LoaderVersion)"/>
<label class="mb-2 form-label"> </td>
</tr>
<tr>
<td colspan="2">
<label class="form-label mb-0">
<TL>Minecraft version</TL> <TL>Minecraft version</TL>
</label> </label>
</td>
</tr>
<tr>
<td class="w-100" colspan="2">
<select class="mb-2 form-select" @bind="CurrentVersion"> <select class="mb-2 form-select" @bind="CurrentVersion">
@foreach (var version in Versions) @foreach (var version in Versions)
{ {
@@ -39,12 +62,20 @@
} }
} }
</select> </select>
</td>
</tr>
<tr>
<td class="w-100"></td>
<td>
<WButton <WButton
OnClick="Save" OnClick="Save"
Text="@(TranslationService.Translate("Change"))" Text="@(TranslationService.Translate("Change"))"
WorkingText="@(TranslationService.Translate("Changing"))" WorkingText="@(TranslationService.Translate("Changing"))"
CssClasses="btn-primary"> CssClasses="btn-primary mt-2">
</WButton> </WButton>
</td>
</tr>
</table>
</LazyLoader> </LazyLoader>
</div> </div>
</div> </div>

14
Moonlight/Shared/Components/ServerControl/Settings/ForgeVersionSetting.razor
View File

@@ -14,10 +14,13 @@
@inject SmartTranslateService TranslationService @inject SmartTranslateService TranslationService
<div class="col"> <div class="col">
<div class="card card-body"> <div class="card card-body p-0">
<LazyLoader Load="Load"> <LazyLoader Load="Load">
<label class="mb-2 form-label"><TL>Forge version</TL></label> <label class="mb-2 form-label"><TL>Forge version</TL></label>
<select class="mb-2 form-select" @bind="CurrentVersion"> <table class="w-100">
<tr>
<td class="w-100">
<select class="form-select" @bind="CurrentVersion">
@foreach (var version in Versions.Keys) @foreach (var version in Versions.Keys)
{ {
if (DisplayToData(version) == CurrentVersion) if (DisplayToData(version) == CurrentVersion)
@@ -30,12 +33,17 @@
} }
} }
</select> </select>
</td>
<td>
<WButton <WButton
OnClick="Save" OnClick="Save"
Text="@(TranslationService.Translate("Change"))" Text="@(TranslationService.Translate("Change"))"
WorkingText="@(TranslationService.Translate("Changing"))" WorkingText="@(TranslationService.Translate("Changing"))"
CssClasses="btn-primary"> CssClasses="btn-primary ms-2">
</WButton> </WButton>
</td>
</tr>
</table>
</LazyLoader> </LazyLoader>
</div> </div>
</div> </div>

14
Moonlight/Shared/Components/ServerControl/Settings/JavascriptFileSetting.razor
View File

@@ -10,13 +10,21 @@
@inject ServerService ServerService @inject ServerService ServerService
<div class="col"> <div class="col">
<div class="card card-body"> <div class="card card-body p-0">
<LazyLoader @ref="LazyLoader" Load="Load"> <LazyLoader @ref="LazyLoader" Load="Load">
<label class="mb-2 form-label"> <label class="mb-2 form-label">
<TL>Javascript file</TL> <TL>Javascript file</TL>
</label> </label>
<input type="text" class="mb-2 form-control disabled" disabled="" value="@(PathAndFile)"/> <table class="w-100">
<button @onclick="Show" class="btn btn-primary"><TL>Change</TL></button> <tr>
<td class="w-100">
<input type="text" class="form-control disabled" disabled="" value="@(PathAndFile)"/>
</td>
<td>
<button @onclick="Show" class="ms-2 btn btn-primary"><TL>Change</TL></button>
</td>
</tr>
</table>
</LazyLoader> </LazyLoader>
</div> </div>
</div> </div>

14
Moonlight/Shared/Components/ServerControl/Settings/JavascriptVersionSetting.razor
View File

@@ -10,10 +10,13 @@
@inject SmartTranslateService TranslationService @inject SmartTranslateService TranslationService
<div class="col"> <div class="col">
<div class="card card-body"> <div class="card card-body p-0">
<LazyLoader @ref="LazyLoader" Load="Load"> <LazyLoader @ref="LazyLoader" Load="Load">
<label class="mb-2 form-label"><TL>Javascript version</TL></label> <label class="mb-2 form-label"><TL>Javascript version</TL></label>
<select @bind="ImageIndex" class="form-select mb-2"> <table class="w-100">
<tr>
<td class="w-100">
<select @bind="ImageIndex" class="form-select ">
@foreach (var image in DockerImages) @foreach (var image in DockerImages)
{ {
if (image.Id == SelectedImage.Id) if (image.Id == SelectedImage.Id)
@@ -30,12 +33,17 @@
} }
} }
</select> </select>
</td>
<td>
<WButton <WButton
OnClick="Save" OnClick="Save"
Text="@(TranslationService.Translate("Change"))" Text="@(TranslationService.Translate("Change"))"
WorkingText="@(TranslationService.Translate("Changing"))" WorkingText="@(TranslationService.Translate("Changing"))"
CssClasses="btn-primary"> CssClasses="ms-2 btn-primary">
</WButton> </WButton>
</td>
</tr>
</table>
</LazyLoader> </LazyLoader>
</div> </div>
</div> </div>

10
Moonlight/Shared/Components/ServerControl/Settings/Join2StartSetting.razor
View File

@@ -11,19 +11,27 @@
@inject SmartTranslateService TranslationService @inject SmartTranslateService TranslationService
<div class="col"> <div class="col">
<div class="card card-body"> <div class="card card-body p-0">
<LazyLoader @ref="Loader" Load="Load"> <LazyLoader @ref="Loader" Load="Load">
<table class="w-100">
<tr>
<td class="w-100">
<div class="form-check form-check-custom form-check-solid mb-3"> <div class="form-check form-check-custom form-check-solid mb-3">
<input @bind="Value" class="form-check-input" type="checkbox" value="1" id="j2sCheck"/> <input @bind="Value" class="form-check-input" type="checkbox" value="1" id="j2sCheck"/>
<label class="form-check-label" for="j2sCheck"> <label class="form-check-label" for="j2sCheck">
<TL>Join2Start</TL> <TL>Join2Start</TL>
</label> </label>
</div> </div>
</td>
<td>
<WButton <WButton
OnClick="Save" OnClick="Save"
Text="@(TranslationService.Translate("Change"))" Text="@(TranslationService.Translate("Change"))"
WorkingText="@(TranslationService.Translate("Changing"))" WorkingText="@(TranslationService.Translate("Changing"))"
CssClasses="btn-primary"></WButton> CssClasses="btn-primary"></WButton>
</td>
</tr>
</table>
</LazyLoader> </LazyLoader>
</div> </div>
</div> </div>

31
Moonlight/Shared/Components/ServerControl/Settings/PaperVersionSetting.razor
View File

@@ -13,9 +13,16 @@
@inject SmartTranslateService TranslationService @inject SmartTranslateService TranslationService
<div class="col"> <div class="col">
<div class="card card-body"> <div class="card card-body p-0">
<LazyLoader Load="Load"> <LazyLoader Load="Load">
<label class="mb-2 form-label"><TL>Minecraft version</TL></label> <table class="w-100">
<tr>
<td colspan="2">
<label class="mb-0 form-label"><TL>Minecraft version</TL></label>
</td>
</tr>
<tr>
<td colspan="2">
<select class="mb-2 form-select" @bind="InputVersion"> <select class="mb-2 form-select" @bind="InputVersion">
@foreach (var version in Versions) @foreach (var version in Versions)
{ {
@@ -29,7 +36,15 @@
} }
} }
</select> </select>
<label class="mb-2 form-label"><TL>Build version</TL></label> </td>
</tr>
<tr>
<td colspan="2">
<label class="mb-0 form-label"><TL>Build version</TL></label>
</td>
</tr>
<tr>
<td colspan="2">
<select class="mb-2 form-select" @bind="InputBuild"> <select class="mb-2 form-select" @bind="InputBuild">
@foreach (var build in Builds) @foreach (var build in Builds)
{ {
@@ -43,11 +58,19 @@
} }
} }
</select> </select>
</td>
</tr>
<tr>
<td class="w-100"></td>
<td>
<WButton <WButton
OnClick="Save" OnClick="Save"
Text="@(TranslationService.Translate("Change"))" Text="@(TranslationService.Translate("Change"))"
WorkingText="@(TranslationService.Translate("Changing"))" WorkingText="@(TranslationService.Translate("Changing"))"
CssClasses="btn-primary"></WButton> CssClasses="btn-primary mt-2"></WButton>
</td>
</tr>
</table>
</LazyLoader> </LazyLoader>
</div> </div>
</div> </div>

16
Moonlight/Shared/Components/ServerControl/Settings/PythonFileSetting.razor
View File

@@ -11,13 +11,23 @@
@inject SmartTranslateService SmartTranslateService @inject SmartTranslateService SmartTranslateService
<div class="col"> <div class="col">
<div class="card card-body"> <div class="card card-body p-0">
<LazyLoader @ref="LazyLoader" Load="Load"> <LazyLoader @ref="LazyLoader" Load="Load">
<label class="mb-2 form-label"> <label class="mb-2 form-label">
<TL>Python file</TL> <TL>Python file</TL>
</label> </label>
<input type="text" class="mb-2 form-control disabled" disabled="" value="@(PathAndFile)"/> <table class="w-100">
<button @onclick="Show" class="btn btn-primary"><TL>Change</TL></button> <tr>
<td class="w-100">
<input type="text" class="form-control disabled" disabled="" value="@(PathAndFile)"/>
</td>
<td>
<button @onclick="Show" class="ms-2 btn btn-primary"><TL>Change</TL></button>
</td>
</tr>
</table>
</LazyLoader> </LazyLoader>
</div> </div>
</div> </div>

14
Moonlight/Shared/Components/ServerControl/Settings/PythonVersionSetting.razor
View File

@@ -10,10 +10,13 @@
@inject SmartTranslateService TranslationService @inject SmartTranslateService TranslationService
<div class="col"> <div class="col">
<div class="card card-body"> <div class="card card-body p-0">
<LazyLoader @ref="LazyLoader" Load="Load"> <LazyLoader @ref="LazyLoader" Load="Load">
<label class="mb-2 form-label"><TL>Python version</TL></label> <label class="mb-2 form-label"><TL>Python version</TL></label>
<select @bind="ImageIndex" class="form-select mb-2"> <table class="w-100">
<tr>
<td class="w-100">
<select @bind="ImageIndex" class="form-select">
@foreach (var image in DockerImages) @foreach (var image in DockerImages)
{ {
if (image.Id == SelectedImage.Id) if (image.Id == SelectedImage.Id)
@@ -30,12 +33,17 @@
} }
} }
</select> </select>
</td>
<td>
<WButton <WButton
OnClick="Save" OnClick="Save"
Text="@(TranslationService.Translate("Change"))" Text="@(TranslationService.Translate("Change"))"
WorkingText="@(TranslationService.Translate("Changing"))" WorkingText="@(TranslationService.Translate("Changing"))"
CssClasses="btn-primary"> CssClasses="btn-primary ms-2">
</WButton> </WButton>
</td>
</tr>
</table>
</LazyLoader> </LazyLoader>
</div> </div>
</div> </div>

4
Moonlight/Shared/Components/ServerControl/Settings/ServerRenameSetting.razor
View File

@@ -6,8 +6,8 @@
<div class="input-group mb-3"> <div class="input-group mb-3">
<LazyLoader @ref="LazyLoader" Load="Load"> <LazyLoader @ref="LazyLoader" Load="Load">
<SmartForm Model="Model" OnValidSubmit="Rename"> <SmartForm CssClass="w-100" Model="Model" OnValidSubmit="Rename">
<div class="input-group mb-3"> <div class="input-group mb-3 w-100">
<InputText @bind-Value="Model.Name" type="text" class="form-control"></InputText> <InputText @bind-Value="Model.Name" type="text" class="form-control"></InputText>
<button class="btn btn-primary" type="submit"><TL>Rename</TL></button> <button class="btn btn-primary" type="submit"><TL>Rename</TL></button>
</div> </div>