diff --git a/.gitignore b/.gitignore index 53835d71..bd04776c 100644 --- a/.gitignore +++ b/.gitignore @@ -366,3 +366,4 @@ LANCommander.Server/Launcher LANCommander.Server/Settings.yml LANCommander.Server/LANCommander.db* LANCommander.Launcher/package-lock.json +package-lock.json diff --git a/LANCommander.Components/LANCommander.Components.csproj b/LANCommander.Components/LANCommander.Components.csproj deleted file mode 100644 index 480aae49..00000000 --- a/LANCommander.Components/LANCommander.Components.csproj +++ /dev/null @@ -1,27 +0,0 @@ - - - - net8.0 - enable - enable - - - - - - - - - - - - - - - - - - - - - diff --git a/LANCommander.Launcher.Data/Models/BaseModel.cs b/LANCommander.Launcher.Data/Models/BaseModel.cs index 9cac172c..c1190774 100644 --- a/LANCommander.Launcher.Data/Models/BaseModel.cs +++ b/LANCommander.Launcher.Data/Models/BaseModel.cs @@ -1,9 +1,10 @@ -using System.ComponentModel.DataAnnotations; +using LANCommander.SDK.Models; +using System.ComponentModel.DataAnnotations; using System.ComponentModel.DataAnnotations.Schema; namespace LANCommander.Launcher.Data.Models { - public abstract class BaseModel + public abstract class BaseModel : IKeyedModel { [Key] public Guid Id { get; set; } diff --git a/LANCommander.Launcher/LANCommander.Launcher.csproj b/LANCommander.Launcher/LANCommander.Launcher.csproj index 1bdacdf3..17c6291c 100644 --- a/LANCommander.Launcher/LANCommander.Launcher.csproj +++ b/LANCommander.Launcher/LANCommander.Launcher.csproj @@ -16,8 +16,6 @@ - - @@ -27,7 +25,6 @@ - @@ -35,6 +32,7 @@ + diff --git a/LANCommander.Launcher/_Imports.razor b/LANCommander.Launcher/_Imports.razor index 40b5bdfb..4bd9b4df 100644 --- a/LANCommander.Launcher/_Imports.razor +++ b/LANCommander.Launcher/_Imports.razor @@ -6,6 +6,7 @@ @using Microsoft.AspNetCore.Components.Web.Virtualization @using Microsoft.Extensions.Logging @using Microsoft.JSInterop +@using LANCommander.UI.Components @using LANCommander.Launcher @using LANCommander.Launcher.Extensions @using LANCommander.Launcher.UI.Components \ No newline at end of file diff --git a/LANCommander.SDK/Models/IKeyedModel.cs b/LANCommander.SDK/Models/IKeyedModel.cs new file mode 100644 index 00000000..3289c554 --- /dev/null +++ b/LANCommander.SDK/Models/IKeyedModel.cs @@ -0,0 +1,13 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace LANCommander.SDK.Models +{ + public interface IKeyedModel + { + Guid Id { get; set; } + } +} diff --git a/LANCommander.SDK/Models/KeyedModel.cs b/LANCommander.SDK/Models/KeyedModel.cs index a5968a23..e5144eee 100644 --- a/LANCommander.SDK/Models/KeyedModel.cs +++ b/LANCommander.SDK/Models/KeyedModel.cs @@ -2,7 +2,7 @@ namespace LANCommander.SDK.Models { - public abstract class KeyedModel + public abstract class KeyedModel : IKeyedModel { public Guid Id { get; set; } } diff --git a/LANCommander.Server/LANCommander.Server.csproj b/LANCommander.Server/LANCommander.Server.csproj index bad12ebc..98d4cec3 100644 --- a/LANCommander.Server/LANCommander.Server.csproj +++ b/LANCommander.Server/LANCommander.Server.csproj @@ -29,11 +29,8 @@ - - - @@ -71,7 +68,6 @@ - @@ -84,10 +80,10 @@ - + diff --git a/LANCommander.Server/UI/Components/Pane.razor b/LANCommander.Server/UI/Components/Pane.razor deleted file mode 100644 index 8859b324..00000000 --- a/LANCommander.Server/UI/Components/Pane.razor +++ /dev/null @@ -1,10 +0,0 @@ -
- @ChildContent -
- -@code { - [CascadingParameter] public SplitPane Parent { get; set; } - [Parameter] public RenderFragment ChildContent { get; set; } - [Parameter] public string Class { get; set; } = ""; - [Parameter] public string Size { get; set; } = "50%"; -} diff --git a/LANCommander.Server/UI/Components/SplitPane.razor b/LANCommander.Server/UI/Components/SplitPane.razor deleted file mode 100644 index 91ca39a8..00000000 --- a/LANCommander.Server/UI/Components/SplitPane.razor +++ /dev/null @@ -1,22 +0,0 @@ -@inject IJSRuntime JS - - -
- @ChildContent -
- - -@code { - [Parameter] public RenderFragment ChildContent { get; set; } - [Parameter] public string Class { get; set; } = ""; - - private IList Panes = new List(); - - private Guid PaneId = Guid.NewGuid(); - - protected override async Task OnAfterRenderAsync(bool firstRender) - { - if (firstRender) - await JS.InvokeVoidAsync("SplitPane.Init", PaneId); - } -} \ No newline at end of file diff --git a/LANCommander.Server/UI/Components/TagsInput.razor b/LANCommander.Server/UI/Components/TagsInput.razor deleted file mode 100644 index c5a60b62..00000000 --- a/LANCommander.Server/UI/Components/TagsInput.razor +++ /dev/null @@ -1,39 +0,0 @@ -@typeparam TItem where TItem : BaseModel - - - -@code { - [Parameter] public Func OptionLabelSelector { get; set; } - [Parameter] public IEnumerable Entities { get; set; } - - [Parameter] public ICollection Values { get; set; } - [Parameter] public EventCallback> ValuesChanged { get; set; } - - Select Select; - - private IEnumerable SelectedValues - { - get - { - return Values?.Select(e => e.Id); - } - set - { - if (value != null) - { - Values = Entities.Where(e => value.Contains(e.Id)).ToList(); - - if (ValuesChanged.HasDelegate) - ValuesChanged.InvokeAsync(Values); - } - } - } -} diff --git a/LANCommander.Server/_Imports.razor b/LANCommander.Server/_Imports.razor index 7fbf356e..388aaca9 100644 --- a/LANCommander.Server/_Imports.razor +++ b/LANCommander.Server/_Imports.razor @@ -10,7 +10,7 @@ @using AntDesign @using BlazorMonaco @using BlazorMonaco.Editor -@using LANCommander.Components +@using LANCommander.UI.Components @using LANCommander.Server.UI.Components @using LANCommander.Server.UI.Components.FileManagerComponents @using LANCommander.Server.UI.Shared diff --git a/LANCommander.Launcher/UI/Components/Pane.razor b/LANCommander.UI/Components/Pane.razor similarity index 100% rename from LANCommander.Launcher/UI/Components/Pane.razor rename to LANCommander.UI/Components/Pane.razor diff --git a/LANCommander.Components/ScriptLoader.razor b/LANCommander.UI/Components/ScriptLoader.razor similarity index 100% rename from LANCommander.Components/ScriptLoader.razor rename to LANCommander.UI/Components/ScriptLoader.razor diff --git a/LANCommander.Launcher/UI/Components/SplitPane.razor b/LANCommander.UI/Components/SplitPane.razor similarity index 91% rename from LANCommander.Launcher/UI/Components/SplitPane.razor rename to LANCommander.UI/Components/SplitPane.razor index 2a282fa0..cbe1f232 100644 --- a/LANCommander.Launcher/UI/Components/SplitPane.razor +++ b/LANCommander.UI/Components/SplitPane.razor @@ -1,4 +1,5 @@ -@inject IJSRuntime JS +@using Microsoft.JSInterop +@inject IJSRuntime JS
diff --git a/LANCommander.Components/StylesheetLoader.razor b/LANCommander.UI/Components/StylesheetLoader.razor similarity index 100% rename from LANCommander.Components/StylesheetLoader.razor rename to LANCommander.UI/Components/StylesheetLoader.razor diff --git a/LANCommander.Launcher/UI/Components/TagsInput.razor b/LANCommander.UI/Components/TagsInput.razor similarity index 91% rename from LANCommander.Launcher/UI/Components/TagsInput.razor rename to LANCommander.UI/Components/TagsInput.razor index 2cc53561..36fc555c 100644 --- a/LANCommander.Launcher/UI/Components/TagsInput.razor +++ b/LANCommander.UI/Components/TagsInput.razor @@ -1,5 +1,5 @@ -@using LANCommander.Launcher.Data.Models -@typeparam TItem where TItem : BaseModel +@using LANCommander.SDK.Models +@typeparam TItem where TItem : IKeyedModel