From 5fefdfdef1caf8dd1133620eea7ec7e95fa5d0f8 Mon Sep 17 00:00:00 2001 From: Pat Hartl Date: Sat, 6 Sep 2025 13:09:47 -0500 Subject: [PATCH] Move components into subfolders --- .../{ => BootstrapIcon}/BootstrapIcon.razor | 2 ++ .../Components/{ => ByteSize}/ByteSize.razor | 2 ++ LANCommander.UI/Components/{ => Chat}/Chat.razor | 1 + LANCommander.UI/Components/Chat/ChatList.razor | 1 + .../Components/{ => Chat}/ChatMessage.razor | 2 ++ .../Components/{ => Chat}/ChatMessageGroup.razor | 1 + .../Components/{ => Chat}/ChatThread.razor | 1 + LANCommander.UI/Components/ChatList.razor | 0 .../{Scripts => Components/ChunkUploader}/Chunk.ts | 0 .../{ => ChunkUploader}/ChunkUploader.razor | 1 + .../ChunkUploader/ChunkUploader.razor.scss} | 0 .../ChunkUploader}/UploadInitRequest.ts | 0 .../ChunkUploader}/UploadInitResponse.ts | 0 .../ChunkUploader}/Uploader.ts | 0 .../Components/{ => ErrorHandler}/ErrorHandler.razor | 2 +- .../FileManager/FileManager.razor.scss} | 0 .../Components/{ => HelpButton}/HelpButton.razor | 2 ++ .../Components/{ => Loaders}/ScriptLoader.razor | 4 +++- .../Components/Loaders/StylesheetLoader.razor | 4 ++++ .../Components/{ => LocalTime}/LocalTime.razor | 1 + .../{ => LocalTime}/LocalTimeInitializer.razor | 1 + .../LocalTime}/TimeProvider.ts | 0 .../{ => MonacoCodeEditor}/MonacoCodeEditor.cs | 0 .../Components/{ => SafeImage}/SafeImage.razor | 3 ++- .../Components/SafeImage/SafeImage.razor.scss | 9 +++++++++ .../Components/{ => SplitPane}/Pane.razor | 4 +++- .../Components/{ => SplitPane}/SplitPane.razor | 1 + .../{Scripts => Components/SplitPane}/SplitPane.ts | 2 +- .../SplitPane}/_split-pane.scss | 0 LANCommander.UI/Components/StylesheetLoader.razor | 2 -- .../Components/{ => TagsInput}/TagsInput.razor | 12 +++++++++++- LANCommander.UI/Main.ts | 6 +++--- LANCommander.UI/Styles/ui.scss | 11 ----------- LANCommander.UI/_Imports.razor.scss | 12 ++++++++++++ LANCommander.UI/webpack.config.js | 2 +- 35 files changed, 66 insertions(+), 23 deletions(-) rename LANCommander.UI/Components/{ => BootstrapIcon}/BootstrapIcon.razor (92%) rename LANCommander.UI/Components/{ => ByteSize}/ByteSize.razor (73%) rename LANCommander.UI/Components/{ => Chat}/Chat.razor (96%) create mode 100644 LANCommander.UI/Components/Chat/ChatList.razor rename LANCommander.UI/Components/{ => Chat}/ChatMessage.razor (76%) rename LANCommander.UI/Components/{ => Chat}/ChatMessageGroup.razor (93%) rename LANCommander.UI/Components/{ => Chat}/ChatThread.razor (97%) delete mode 100644 LANCommander.UI/Components/ChatList.razor rename LANCommander.UI/{Scripts => Components/ChunkUploader}/Chunk.ts (100%) rename LANCommander.UI/Components/{ => ChunkUploader}/ChunkUploader.razor (99%) rename LANCommander.UI/{Styles/_chunk-uploader.scss => Components/ChunkUploader/ChunkUploader.razor.scss} (100%) rename LANCommander.UI/{Scripts => Components/ChunkUploader}/UploadInitRequest.ts (100%) rename LANCommander.UI/{Scripts => Components/ChunkUploader}/UploadInitResponse.ts (100%) rename LANCommander.UI/{Scripts => Components/ChunkUploader}/Uploader.ts (100%) rename LANCommander.UI/Components/{ => ErrorHandler}/ErrorHandler.razor (98%) rename LANCommander.UI/{Styles/_file-manager.scss => Components/FileManager/FileManager.razor.scss} (100%) rename LANCommander.UI/Components/{ => HelpButton}/HelpButton.razor (94%) rename LANCommander.UI/Components/{ => Loaders}/ScriptLoader.razor (63%) create mode 100644 LANCommander.UI/Components/Loaders/StylesheetLoader.razor rename LANCommander.UI/Components/{ => LocalTime}/LocalTime.razor (98%) rename LANCommander.UI/Components/{ => LocalTime}/LocalTimeInitializer.razor (95%) rename LANCommander.UI/{Scripts => Components/LocalTime}/TimeProvider.ts (100%) rename LANCommander.UI/Components/{ => MonacoCodeEditor}/MonacoCodeEditor.cs (100%) rename LANCommander.UI/Components/{ => SafeImage}/SafeImage.razor (91%) create mode 100644 LANCommander.UI/Components/SafeImage/SafeImage.razor.scss rename LANCommander.UI/Components/{ => SplitPane}/Pane.razor (76%) rename LANCommander.UI/Components/{ => SplitPane}/SplitPane.razor (94%) rename LANCommander.UI/{Scripts => Components/SplitPane}/SplitPane.ts (95%) rename LANCommander.UI/{Styles => Components/SplitPane}/_split-pane.scss (100%) delete mode 100644 LANCommander.UI/Components/StylesheetLoader.razor rename LANCommander.UI/Components/{ => TagsInput}/TagsInput.razor (73%) delete mode 100644 LANCommander.UI/Styles/ui.scss create mode 100644 LANCommander.UI/_Imports.razor.scss diff --git a/LANCommander.UI/Components/BootstrapIcon.razor b/LANCommander.UI/Components/BootstrapIcon/BootstrapIcon.razor similarity index 92% rename from LANCommander.UI/Components/BootstrapIcon.razor rename to LANCommander.UI/Components/BootstrapIcon/BootstrapIcon.razor index 8500ce7b..e59befaf 100644 --- a/LANCommander.UI/Components/BootstrapIcon.razor +++ b/LANCommander.UI/Components/BootstrapIcon/BootstrapIcon.razor @@ -1,3 +1,5 @@ +@namespace LANCommander.UI.Components + diff --git a/LANCommander.UI/Components/ByteSize.razor b/LANCommander.UI/Components/ByteSize/ByteSize.razor similarity index 73% rename from LANCommander.UI/Components/ByteSize.razor rename to LANCommander.UI/Components/ByteSize/ByteSize.razor index 892d02b3..cdef04ee 100644 --- a/LANCommander.UI/Components/ByteSize.razor +++ b/LANCommander.UI/Components/ByteSize/ByteSize.razor @@ -1,3 +1,5 @@ +@namespace LANCommander.UI.Components + @ByteSizeLib.ByteSize.FromBytes(@Value).ToString() @code { diff --git a/LANCommander.UI/Components/Chat.razor b/LANCommander.UI/Components/Chat/Chat.razor similarity index 96% rename from LANCommander.UI/Components/Chat.razor rename to LANCommander.UI/Components/Chat/Chat.razor index 217e9e63..7928fffb 100644 --- a/LANCommander.UI/Components/Chat.razor +++ b/LANCommander.UI/Components/Chat/Chat.razor @@ -2,6 +2,7 @@ @using Microsoft.AspNetCore.Components.Authorization @inject Client Client @inject AuthenticationStateProvider AuthenticationStateProvider +@namespace LANCommander.UI.Components diff --git a/LANCommander.UI/Components/Chat/ChatList.razor b/LANCommander.UI/Components/Chat/ChatList.razor new file mode 100644 index 00000000..d5f88baa --- /dev/null +++ b/LANCommander.UI/Components/Chat/ChatList.razor @@ -0,0 +1 @@ +@namespace LANCommander.UI.Components \ No newline at end of file diff --git a/LANCommander.UI/Components/ChatMessage.razor b/LANCommander.UI/Components/Chat/ChatMessage.razor similarity index 76% rename from LANCommander.UI/Components/ChatMessage.razor rename to LANCommander.UI/Components/Chat/ChatMessage.razor index 647eae5e..e19b811a 100644 --- a/LANCommander.UI/Components/ChatMessage.razor +++ b/LANCommander.UI/Components/Chat/ChatMessage.razor @@ -1,3 +1,5 @@ +@namespace LANCommander.UI.Components +

@Content

diff --git a/LANCommander.UI/Components/ChatMessageGroup.razor b/LANCommander.UI/Components/Chat/ChatMessageGroup.razor similarity index 93% rename from LANCommander.UI/Components/ChatMessageGroup.razor rename to LANCommander.UI/Components/Chat/ChatMessageGroup.razor index 4eba210d..125bb804 100644 --- a/LANCommander.UI/Components/ChatMessageGroup.razor +++ b/LANCommander.UI/Components/Chat/ChatMessageGroup.razor @@ -1,4 +1,5 @@ @using System.Globalization +@namespace LANCommander.UI.Components diff --git a/LANCommander.UI/Components/ChatThread.razor b/LANCommander.UI/Components/Chat/ChatThread.razor similarity index 97% rename from LANCommander.UI/Components/ChatThread.razor rename to LANCommander.UI/Components/Chat/ChatThread.razor index d8d5ccf1..fe5a3f13 100644 --- a/LANCommander.UI/Components/ChatThread.razor +++ b/LANCommander.UI/Components/Chat/ChatThread.razor @@ -2,6 +2,7 @@ @using LANCommander.SDK @using Microsoft.AspNetCore.Components.Web.Virtualization @inject Client Client +@namespace LANCommander.UI.Components
diff --git a/LANCommander.UI/Components/ChatList.razor b/LANCommander.UI/Components/ChatList.razor deleted file mode 100644 index e69de29b..00000000 diff --git a/LANCommander.UI/Scripts/Chunk.ts b/LANCommander.UI/Components/ChunkUploader/Chunk.ts similarity index 100% rename from LANCommander.UI/Scripts/Chunk.ts rename to LANCommander.UI/Components/ChunkUploader/Chunk.ts diff --git a/LANCommander.UI/Components/ChunkUploader.razor b/LANCommander.UI/Components/ChunkUploader/ChunkUploader.razor similarity index 99% rename from LANCommander.UI/Components/ChunkUploader.razor rename to LANCommander.UI/Components/ChunkUploader/ChunkUploader.razor index e57f5222..b2ecfcf8 100644 --- a/LANCommander.UI/Components/ChunkUploader.razor +++ b/LANCommander.UI/Components/ChunkUploader/ChunkUploader.razor @@ -4,6 +4,7 @@ @inject NavigationManager Navigator @inject IJSRuntime JS @inject IMessageService MessageService +@namespace LANCommander.UI.Components
diff --git a/LANCommander.UI/Styles/_chunk-uploader.scss b/LANCommander.UI/Components/ChunkUploader/ChunkUploader.razor.scss similarity index 100% rename from LANCommander.UI/Styles/_chunk-uploader.scss rename to LANCommander.UI/Components/ChunkUploader/ChunkUploader.razor.scss diff --git a/LANCommander.UI/Scripts/UploadInitRequest.ts b/LANCommander.UI/Components/ChunkUploader/UploadInitRequest.ts similarity index 100% rename from LANCommander.UI/Scripts/UploadInitRequest.ts rename to LANCommander.UI/Components/ChunkUploader/UploadInitRequest.ts diff --git a/LANCommander.UI/Scripts/UploadInitResponse.ts b/LANCommander.UI/Components/ChunkUploader/UploadInitResponse.ts similarity index 100% rename from LANCommander.UI/Scripts/UploadInitResponse.ts rename to LANCommander.UI/Components/ChunkUploader/UploadInitResponse.ts diff --git a/LANCommander.UI/Scripts/Uploader.ts b/LANCommander.UI/Components/ChunkUploader/Uploader.ts similarity index 100% rename from LANCommander.UI/Scripts/Uploader.ts rename to LANCommander.UI/Components/ChunkUploader/Uploader.ts diff --git a/LANCommander.UI/Components/ErrorHandler.razor b/LANCommander.UI/Components/ErrorHandler/ErrorHandler.razor similarity index 98% rename from LANCommander.UI/Components/ErrorHandler.razor rename to LANCommander.UI/Components/ErrorHandler/ErrorHandler.razor index e0e59c2e..d4c0b48b 100644 --- a/LANCommander.UI/Components/ErrorHandler.razor +++ b/LANCommander.UI/Components/ErrorHandler/ErrorHandler.razor @@ -1,6 +1,6 @@ @using Microsoft.JSInterop @inject IJSRuntime JS -@inject NavigationManager NavigationManager +@namespace LANCommander.UI.Components diff --git a/LANCommander.UI/Styles/_file-manager.scss b/LANCommander.UI/Components/FileManager/FileManager.razor.scss similarity index 100% rename from LANCommander.UI/Styles/_file-manager.scss rename to LANCommander.UI/Components/FileManager/FileManager.razor.scss diff --git a/LANCommander.UI/Components/HelpButton.razor b/LANCommander.UI/Components/HelpButton/HelpButton.razor similarity index 94% rename from LANCommander.UI/Components/HelpButton.razor rename to LANCommander.UI/Components/HelpButton/HelpButton.razor index 74ba928c..40bf5349 100644 --- a/LANCommander.UI/Components/HelpButton.razor +++ b/LANCommander.UI/Components/HelpButton/HelpButton.razor @@ -1,3 +1,5 @@ +@namespace LANCommander.UI.Components + @ChildContent diff --git a/LANCommander.UI/Components/ScriptLoader.razor b/LANCommander.UI/Components/Loaders/ScriptLoader.razor similarity index 63% rename from LANCommander.UI/Components/ScriptLoader.razor rename to LANCommander.UI/Components/Loaders/ScriptLoader.razor index 6ae22594..97eef8bc 100644 --- a/LANCommander.UI/Components/ScriptLoader.razor +++ b/LANCommander.UI/Components/Loaders/ScriptLoader.razor @@ -1,3 +1,5 @@ - +@namespace LANCommander.UI.Components + + \ No newline at end of file diff --git a/LANCommander.UI/Components/Loaders/StylesheetLoader.razor b/LANCommander.UI/Components/Loaders/StylesheetLoader.razor new file mode 100644 index 00000000..2aa9e904 --- /dev/null +++ b/LANCommander.UI/Components/Loaders/StylesheetLoader.razor @@ -0,0 +1,4 @@ +@namespace LANCommander.UI.Components + + + \ No newline at end of file diff --git a/LANCommander.UI/Components/LocalTime.razor b/LANCommander.UI/Components/LocalTime/LocalTime.razor similarity index 98% rename from LANCommander.UI/Components/LocalTime.razor rename to LANCommander.UI/Components/LocalTime/LocalTime.razor index 207ea7e1..6cf98a50 100644 --- a/LANCommander.UI/Components/LocalTime.razor +++ b/LANCommander.UI/Components/LocalTime/LocalTime.razor @@ -1,6 +1,7 @@ @using LANCommander.UI.Providers @implements IDisposable @inject TimeProvider TimeProvider +@namespace LANCommander.UI.Components @if (Value.HasValue && Value.Value != DateTime.MinValue) { diff --git a/LANCommander.UI/Components/LocalTimeInitializer.razor b/LANCommander.UI/Components/LocalTime/LocalTimeInitializer.razor similarity index 95% rename from LANCommander.UI/Components/LocalTimeInitializer.razor rename to LANCommander.UI/Components/LocalTime/LocalTimeInitializer.razor index 4a37e4bf..c8666680 100644 --- a/LANCommander.UI/Components/LocalTimeInitializer.razor +++ b/LANCommander.UI/Components/LocalTime/LocalTimeInitializer.razor @@ -2,6 +2,7 @@ @using Microsoft.JSInterop @inject TimeProvider TimeProvider @inject IJSRuntime JS +@namespace LANCommander.UI.Components @code { protected override async Task OnAfterRenderAsync(bool firstRender) diff --git a/LANCommander.UI/Scripts/TimeProvider.ts b/LANCommander.UI/Components/LocalTime/TimeProvider.ts similarity index 100% rename from LANCommander.UI/Scripts/TimeProvider.ts rename to LANCommander.UI/Components/LocalTime/TimeProvider.ts diff --git a/LANCommander.UI/Components/MonacoCodeEditor.cs b/LANCommander.UI/Components/MonacoCodeEditor/MonacoCodeEditor.cs similarity index 100% rename from LANCommander.UI/Components/MonacoCodeEditor.cs rename to LANCommander.UI/Components/MonacoCodeEditor/MonacoCodeEditor.cs diff --git a/LANCommander.UI/Components/SafeImage.razor b/LANCommander.UI/Components/SafeImage/SafeImage.razor similarity index 91% rename from LANCommander.UI/Components/SafeImage.razor rename to LANCommander.UI/Components/SafeImage/SafeImage.razor index 82f77aef..770c2172 100644 --- a/LANCommander.UI/Components/SafeImage.razor +++ b/LANCommander.UI/Components/SafeImage/SafeImage.razor @@ -1,7 +1,8 @@ @using LANCommander.SDK.Models @inject SDK.Client Client +@namespace LANCommander.UI.Components - + @if (!_error) { if (!String.IsNullOrWhiteSpace(Source)) diff --git a/LANCommander.UI/Components/SafeImage/SafeImage.razor.scss b/LANCommander.UI/Components/SafeImage/SafeImage.razor.scss new file mode 100644 index 00000000..666f7510 --- /dev/null +++ b/LANCommander.UI/Components/SafeImage/SafeImage.razor.scss @@ -0,0 +1,9 @@ +.safe-image { + & > div, + .ant-spin-container, + img { + display: inline-block; + max-width: 100%; + max-height: 100%; + } +} \ No newline at end of file diff --git a/LANCommander.UI/Components/Pane.razor b/LANCommander.UI/Components/SplitPane/Pane.razor similarity index 76% rename from LANCommander.UI/Components/Pane.razor rename to LANCommander.UI/Components/SplitPane/Pane.razor index 8859b324..717f28f7 100644 --- a/LANCommander.UI/Components/Pane.razor +++ b/LANCommander.UI/Components/SplitPane/Pane.razor @@ -1,4 +1,6 @@ -
+@namespace LANCommander.UI.Components + +
@ChildContent
diff --git a/LANCommander.UI/Components/SplitPane.razor b/LANCommander.UI/Components/SplitPane/SplitPane.razor similarity index 94% rename from LANCommander.UI/Components/SplitPane.razor rename to LANCommander.UI/Components/SplitPane/SplitPane.razor index a0d6cf36..b262d494 100644 --- a/LANCommander.UI/Components/SplitPane.razor +++ b/LANCommander.UI/Components/SplitPane/SplitPane.razor @@ -1,5 +1,6 @@ @using Microsoft.JSInterop @inject IJSRuntime JS +@namespace LANCommander.UI.Components
diff --git a/LANCommander.UI/Scripts/SplitPane.ts b/LANCommander.UI/Components/SplitPane/SplitPane.ts similarity index 95% rename from LANCommander.UI/Scripts/SplitPane.ts rename to LANCommander.UI/Components/SplitPane/SplitPane.ts index 67f2cebc..1ff11cf9 100644 --- a/LANCommander.UI/Scripts/SplitPane.ts +++ b/LANCommander.UI/Components/SplitPane/SplitPane.ts @@ -1,4 +1,4 @@ -import Split from 'split.js' +import Split from 'split.js' export class SplitPane { SplitPanes: HTMLElement[] = []; diff --git a/LANCommander.UI/Styles/_split-pane.scss b/LANCommander.UI/Components/SplitPane/_split-pane.scss similarity index 100% rename from LANCommander.UI/Styles/_split-pane.scss rename to LANCommander.UI/Components/SplitPane/_split-pane.scss diff --git a/LANCommander.UI/Components/StylesheetLoader.razor b/LANCommander.UI/Components/StylesheetLoader.razor deleted file mode 100644 index c29493ec..00000000 --- a/LANCommander.UI/Components/StylesheetLoader.razor +++ /dev/null @@ -1,2 +0,0 @@ - - \ No newline at end of file diff --git a/LANCommander.UI/Components/TagsInput.razor b/LANCommander.UI/Components/TagsInput/TagsInput.razor similarity index 73% rename from LANCommander.UI/Components/TagsInput.razor rename to LANCommander.UI/Components/TagsInput/TagsInput.razor index 4d06aa9d..89fa5cbc 100644 --- a/LANCommander.UI/Components/TagsInput.razor +++ b/LANCommander.UI/Components/TagsInput/TagsInput.razor @@ -1,12 +1,14 @@ @using LANCommander.SDK.Models @typeparam TItem where TItem : IKeyedModel +@namespace LANCommander.UI.Components