From 1d1af91f3efe7cdf8dba0dd87a0669a6a96d119d Mon Sep 17 00:00:00 2001 From: Thorsten Sommer Date: Wed, 21 Aug 2024 08:30:01 +0200 Subject: [PATCH] Refactor components (#80) --- app/MindWork AI Studio/App.razor | 30 +++++++++++++++++++ .../Agenda/AssistantAgenda.razor | 3 +- .../Agenda/AssistantAgenda.razor.cs | 2 +- .../Agenda/NumberParticipants.cs | 2 +- .../Agenda/NumberParticipantsExtensions.cs | 2 +- .../AssistantBase.razor | 5 ++-- .../AssistantBase.razor.cs | 27 ++++++++--------- .../AssistantBaseCore.cs | 2 +- .../Coding/AssistantCoding.razor | 2 +- .../Coding/AssistantCoding.razor.cs | 2 +- .../Coding/CodingContext.cs | 2 +- .../Coding/CodingContextItem.razor | 0 .../Coding/CodingContextItem.razor.cs | 2 +- .../Coding/CommonCodingLanguageExtensions.cs | 2 +- .../Coding/CommonCodingLanguages.cs | 2 +- .../AssistantGrammarSpelling.razor | 3 +- .../AssistantGrammarSpelling.razor.cs | 2 +- .../IconFinder/AssistantIconFinder.razor | 2 +- .../IconFinder/AssistantIconFinder.razor.cs | 2 +- .../IconFinder/IconSourceExtensions.cs | 2 +- .../IconFinder/IconSources.cs | 2 +- .../AssistantRewriteImprove.razor | 3 +- .../AssistantRewriteImprove.razor.cs | 2 +- .../RewriteImprove/WritingStyles.cs | 2 +- .../RewriteImprove/WritingStylesExtensions.cs | 2 +- .../AssistantTextSummarizer.razor | 3 +- .../AssistantTextSummarizer.razor.cs | 2 +- .../TextSummarizer/Complexity.cs | 2 +- .../TextSummarizer/ComplexityExtensions.cs | 2 +- .../Translation/AssistantTranslation.razor | 3 +- .../Translation/AssistantTranslation.razor.cs | 2 +- .../Assistants/_Imports.razor | 4 +++ app/MindWork AI Studio/Components/App.razor | 28 ----------------- .../{Blocks => }/AssistantBlock.razor | 0 .../{Blocks => }/AssistantBlock.razor.cs | 2 +- .../Components/Blocks/ITreeItem.cs | 3 -- .../Components/Blocks/TreeDivider.cs | 3 -- .../Components/{Blocks => }/Changelog.Logs.cs | 2 +- .../Components/{Blocks => }/Changelog.razor | 1 - .../{Blocks => }/Changelog.razor.cs | 2 +- .../{Blocks => }/ConfigurationOption.razor | 0 .../{Blocks => }/ConfigurationOption.razor.cs | 2 +- .../ConfigurationProviderSelection.razor | 0 .../ConfigurationProviderSelection.razor.cs | 2 +- .../{Blocks => }/ConfigurationSelect.razor | 0 .../{Blocks => }/ConfigurationSelect.razor.cs | 2 +- .../{Blocks => }/ConfigurationSlider.razor | 0 .../{Blocks => }/ConfigurationSlider.razor.cs | 2 +- .../{Blocks => }/ConfigurationText.razor | 0 .../{Blocks => }/ConfigurationText.razor.cs | 2 +- .../{Blocks => }/EnumSelection.razor | 0 .../{Blocks => }/EnumSelection.razor.cs | 2 +- .../{Blocks => }/EnumSelectionBase.cs | 2 +- .../{Blocks => }/ExpansionPanel.razor | 0 .../{Blocks => }/ExpansionPanel.razor.cs | 2 +- .../Components/ITreeItem.cs | 3 ++ .../{Blocks => }/InnerScrolling.razor | 0 .../{Blocks => }/InnerScrolling.razor.cs | 4 +-- .../Components/{Blocks => }/Issues.razor | 0 .../Components/{Blocks => }/Issues.razor.cs | 2 +- .../Components/Layout/NavBarItem.cs | 3 -- .../Components/{Blocks => }/Motivation.razor | 0 .../{Blocks => }/Motivation.razor.cs | 2 +- .../Components/{Blocks => }/MudTextList.razor | 0 .../{Blocks => }/MudTextList.razor.cs | 2 +- .../{Blocks => }/MudTextSlider.razor | 0 .../{Blocks => }/MudTextSlider.razor.cs | 2 +- .../{Blocks => }/MudTextSwitch.razor | 0 .../{Blocks => }/MudTextSwitch.razor.cs | 2 +- .../Components/Pages/Assistants.razor.cs | 5 ---- .../{Blocks => }/ProcessComponent.razor | 0 .../{Blocks => }/ProcessComponent.razor.cs | 2 +- .../{Blocks => }/ProviderSelection.razor | 0 .../{Blocks => }/ProviderSelection.razor.cs | 2 +- .../{Blocks => }/ReadWebContent.razor | 0 .../{Blocks => }/ReadWebContent.razor.cs | 2 +- .../{Blocks => }/ReadWebContentSteps.cs | 2 +- .../Components/{Blocks => }/SplitButton.razor | 0 .../{Blocks => }/SplitButton.razor.cs | 2 +- .../{Blocks => }/ThirdPartyComponent.razor | 0 .../{Blocks => }/ThirdPartyComponent.razor.cs | 2 +- .../Components/{Blocks => }/TreeButton.cs | 2 +- .../Components/TreeDivider.cs | 3 ++ .../Components/{Blocks => }/TreeItemData.cs | 4 +-- .../Components/{Blocks => }/TreeItemType.cs | 2 +- .../Components/{Blocks => }/Vision.razor | 0 .../Components/{Blocks => }/Vision.razor.cs | 2 +- .../{Blocks => }/WorkspaceBranch.cs | 2 +- .../Components/{Blocks => }/Workspaces.razor | 0 .../{Blocks => }/Workspaces.razor.cs | 6 ++-- .../Components/_Imports.razor | 13 ++------ .../ConfirmDialog.razor | 0 .../ConfirmDialog.razor.cs | 2 +- .../DialogOptions.cs | 2 +- .../SingleInputDialog.razor | 0 .../SingleInputDialog.razor.cs | 2 +- .../UpdateDialog.razor | 1 - .../UpdateDialog.razor.cs | 2 +- .../WorkspaceSelectionDialog.razor | 0 .../WorkspaceSelectionDialog.razor.cs | 2 +- app/MindWork AI Studio/Dialogs/_Imports.razor | 4 +++ .../{Components => }/Layout/MainLayout.razor | 3 ++ .../Layout/MainLayout.razor.cs | 19 ++++++------ app/MindWork AI Studio/Layout/NavBarItem.cs | 3 ++ .../{Components => }/Pages/About.razor | 3 +- .../{Components => }/Pages/About.razor.cs | 2 +- .../{Components => }/Pages/Assistants.razor | 16 +++++----- .../Pages/Assistants.razor.cs | 5 ++++ .../{Components => }/Pages/Chat.razor | 2 +- .../{Components => }/Pages/Chat.razor.cs | 16 +++++----- .../{Components => }/Pages/Home.razor | 3 +- .../{Components => }/Pages/Home.razor.cs | 6 ++-- .../{Components => }/Pages/Settings.razor | 7 ++--- .../{Components => }/Pages/Settings.razor.cs | 6 ++-- .../{Components => }/Pages/Supporters.razor | 2 +- .../Pages/Supporters.razor.cs | 2 +- app/MindWork AI Studio/Pages/_Imports.razor | 5 ++++ app/MindWork AI Studio/Program.cs | 2 +- .../{Components => }/Routes.razor | 5 +++- .../Pages/Path.cs => Routes.razor.cs} | 8 +++-- .../Settings/ConfigurationSelectData.cs | 10 +++---- .../Settings/DataModel/DataAgenda.cs | 2 +- .../Settings/DataModel/DataCoding.cs | 2 +- .../Settings/DataModel/DataIconFinder.cs | 2 +- .../Settings/DataModel/DataRewriteImprove.cs | 2 +- .../Settings/DataModel/DataTextSummarizer.cs | 2 +- .../DataModel/PreviousModels/DataV1V3.cs | 6 ++-- .../Settings/ProviderDialog.razor | 2 +- .../Tools/JsRuntimeExtensions.cs | 4 +-- .../{Components/Pages => Tools}/SendTo.cs | 2 +- app/MindWork AI Studio/Tools/SendToButton.cs | 2 -- .../Pages => Tools}/SendToExtensions.cs | 2 +- .../Services}/MarkdownClipboardService.cs | 6 ++-- .../{ => Services}/TemporaryChatService.cs | 2 +- .../Tools/{ => Services}/UpdateService.cs | 2 +- app/MindWork AI Studio/build.nu | 6 ++-- .../wwwroot/changelog/v0.8.11.md | 3 +- 137 files changed, 220 insertions(+), 220 deletions(-) create mode 100644 app/MindWork AI Studio/App.razor rename app/MindWork AI Studio/{Components/Pages => Assistants}/Agenda/AssistantAgenda.razor (99%) rename app/MindWork AI Studio/{Components/Pages => Assistants}/Agenda/AssistantAgenda.razor.cs (99%) rename app/MindWork AI Studio/{Components/Pages => Assistants}/Agenda/NumberParticipants.cs (92%) rename app/MindWork AI Studio/{Components/Pages => Assistants}/Agenda/NumberParticipantsExtensions.cs (95%) rename app/MindWork AI Studio/{Components => Assistants}/AssistantBase.razor (96%) rename app/MindWork AI Studio/{Components => Assistants}/AssistantBase.razor.cs (90%) rename app/MindWork AI Studio/{Components => Assistants}/AssistantBaseCore.cs (94%) rename app/MindWork AI Studio/{Components/Pages => Assistants}/Coding/AssistantCoding.razor (96%) rename app/MindWork AI Studio/{Components/Pages => Assistants}/Coding/AssistantCoding.razor.cs (99%) rename app/MindWork AI Studio/{Components/Pages => Assistants}/Coding/CodingContext.cs (90%) rename app/MindWork AI Studio/{Components/Pages => Assistants}/Coding/CodingContextItem.razor (100%) rename app/MindWork AI Studio/{Components/Pages => Assistants}/Coding/CodingContextItem.razor.cs (96%) rename app/MindWork AI Studio/{Components/Pages => Assistants}/Coding/CommonCodingLanguageExtensions.cs (97%) rename app/MindWork AI Studio/{Components/Pages => Assistants}/Coding/CommonCodingLanguages.cs (89%) rename app/MindWork AI Studio/{Components/Pages => Assistants}/GrammarSpelling/AssistantGrammarSpelling.razor (91%) rename app/MindWork AI Studio/{Components/Pages => Assistants}/GrammarSpelling/AssistantGrammarSpelling.razor.cs (98%) rename app/MindWork AI Studio/{Components/Pages => Assistants}/IconFinder/AssistantIconFinder.razor (95%) rename app/MindWork AI Studio/{Components/Pages => Assistants}/IconFinder/AssistantIconFinder.razor.cs (98%) rename app/MindWork AI Studio/{Components/Pages => Assistants}/IconFinder/IconSourceExtensions.cs (97%) rename app/MindWork AI Studio/{Components/Pages => Assistants}/IconFinder/IconSources.cs (75%) rename app/MindWork AI Studio/{Components/Pages => Assistants}/RewriteImprove/AssistantRewriteImprove.razor (93%) rename app/MindWork AI Studio/{Components/Pages => Assistants}/RewriteImprove/AssistantRewriteImprove.razor.cs (98%) rename app/MindWork AI Studio/{Components/Pages => Assistants}/RewriteImprove/WritingStyles.cs (78%) rename app/MindWork AI Studio/{Components/Pages => Assistants}/RewriteImprove/WritingStylesExtensions.cs (98%) rename app/MindWork AI Studio/{Components/Pages => Assistants}/TextSummarizer/AssistantTextSummarizer.razor (96%) rename app/MindWork AI Studio/{Components/Pages => Assistants}/TextSummarizer/AssistantTextSummarizer.razor.cs (98%) rename app/MindWork AI Studio/{Components/Pages => Assistants}/TextSummarizer/Complexity.cs (80%) rename app/MindWork AI Studio/{Components/Pages => Assistants}/TextSummarizer/ComplexityExtensions.cs (97%) rename app/MindWork AI Studio/{Components/Pages => Assistants}/Translation/AssistantTranslation.razor (96%) rename app/MindWork AI Studio/{Components/Pages => Assistants}/Translation/AssistantTranslation.razor.cs (98%) create mode 100644 app/MindWork AI Studio/Assistants/_Imports.razor delete mode 100644 app/MindWork AI Studio/Components/App.razor rename app/MindWork AI Studio/Components/{Blocks => }/AssistantBlock.razor (100%) rename app/MindWork AI Studio/Components/{Blocks => }/AssistantBlock.razor.cs (92%) delete mode 100644 app/MindWork AI Studio/Components/Blocks/ITreeItem.cs delete mode 100644 app/MindWork AI Studio/Components/Blocks/TreeDivider.cs rename app/MindWork AI Studio/Components/{Blocks => }/Changelog.Logs.cs (98%) rename app/MindWork AI Studio/Components/{Blocks => }/Changelog.razor (90%) rename app/MindWork AI Studio/Components/{Blocks => }/Changelog.razor.cs (94%) rename app/MindWork AI Studio/Components/{Blocks => }/ConfigurationOption.razor (100%) rename app/MindWork AI Studio/Components/{Blocks => }/ConfigurationOption.razor.cs (96%) rename app/MindWork AI Studio/Components/{Blocks => }/ConfigurationProviderSelection.razor (100%) rename app/MindWork AI Studio/Components/{Blocks => }/ConfigurationProviderSelection.razor.cs (98%) rename app/MindWork AI Studio/Components/{Blocks => }/ConfigurationSelect.razor (100%) rename app/MindWork AI Studio/Components/{Blocks => }/ConfigurationSelect.razor.cs (96%) rename app/MindWork AI Studio/Components/{Blocks => }/ConfigurationSlider.razor (100%) rename app/MindWork AI Studio/Components/{Blocks => }/ConfigurationSlider.razor.cs (97%) rename app/MindWork AI Studio/Components/{Blocks => }/ConfigurationText.razor (100%) rename app/MindWork AI Studio/Components/{Blocks => }/ConfigurationText.razor.cs (96%) rename app/MindWork AI Studio/Components/{Blocks => }/EnumSelection.razor (100%) rename app/MindWork AI Studio/Components/{Blocks => }/EnumSelection.razor.cs (98%) rename app/MindWork AI Studio/Components/{Blocks => }/EnumSelectionBase.cs (82%) rename app/MindWork AI Studio/Components/{Blocks => }/ExpansionPanel.razor (100%) rename app/MindWork AI Studio/Components/{Blocks => }/ExpansionPanel.razor.cs (93%) create mode 100644 app/MindWork AI Studio/Components/ITreeItem.cs rename app/MindWork AI Studio/Components/{Blocks => }/InnerScrolling.razor (100%) rename app/MindWork AI Studio/Components/{Blocks => }/InnerScrolling.razor.cs (96%) rename app/MindWork AI Studio/Components/{Blocks => }/Issues.razor (100%) rename app/MindWork AI Studio/Components/{Blocks => }/Issues.razor.cs (80%) delete mode 100644 app/MindWork AI Studio/Components/Layout/NavBarItem.cs rename app/MindWork AI Studio/Components/{Blocks => }/Motivation.razor (100%) rename app/MindWork AI Studio/Components/{Blocks => }/Motivation.razor.cs (70%) rename app/MindWork AI Studio/Components/{Blocks => }/MudTextList.razor (100%) rename app/MindWork AI Studio/Components/{Blocks => }/MudTextList.razor.cs (92%) rename app/MindWork AI Studio/Components/{Blocks => }/MudTextSlider.razor (100%) rename app/MindWork AI Studio/Components/{Blocks => }/MudTextSlider.razor.cs (97%) rename app/MindWork AI Studio/Components/{Blocks => }/MudTextSwitch.razor (100%) rename app/MindWork AI Studio/Components/{Blocks => }/MudTextSwitch.razor.cs (94%) delete mode 100644 app/MindWork AI Studio/Components/Pages/Assistants.razor.cs rename app/MindWork AI Studio/Components/{Blocks => }/ProcessComponent.razor (100%) rename app/MindWork AI Studio/Components/{Blocks => }/ProcessComponent.razor.cs (90%) rename app/MindWork AI Studio/Components/{Blocks => }/ProviderSelection.razor (100%) rename app/MindWork AI Studio/Components/{Blocks => }/ProviderSelection.razor.cs (94%) rename app/MindWork AI Studio/Components/{Blocks => }/ReadWebContent.razor (100%) rename app/MindWork AI Studio/Components/{Blocks => }/ReadWebContent.razor.cs (99%) rename app/MindWork AI Studio/Components/{Blocks => }/ReadWebContentSteps.cs (72%) rename app/MindWork AI Studio/Components/{Blocks => }/SplitButton.razor (100%) rename app/MindWork AI Studio/Components/{Blocks => }/SplitButton.razor.cs (97%) rename app/MindWork AI Studio/Components/{Blocks => }/ThirdPartyComponent.razor (100%) rename app/MindWork AI Studio/Components/{Blocks => }/ThirdPartyComponent.razor.cs (94%) rename app/MindWork AI Studio/Components/{Blocks => }/TreeButton.cs (75%) create mode 100644 app/MindWork AI Studio/Components/TreeDivider.cs rename app/MindWork AI Studio/Components/{Blocks => }/TreeItemData.cs (81%) rename app/MindWork AI Studio/Components/{Blocks => }/TreeItemType.cs (63%) rename app/MindWork AI Studio/Components/{Blocks => }/Vision.razor (100%) rename app/MindWork AI Studio/Components/{Blocks => }/Vision.razor.cs (97%) rename app/MindWork AI Studio/Components/{Blocks => }/WorkspaceBranch.cs (68%) rename app/MindWork AI Studio/Components/{Blocks => }/Workspaces.razor (100%) rename app/MindWork AI Studio/Components/{Blocks => }/Workspaces.razor.cs (99%) rename app/MindWork AI Studio/{Components/CommonDialogs => Dialogs}/ConfirmDialog.razor (100%) rename app/MindWork AI Studio/{Components/CommonDialogs => Dialogs}/ConfirmDialog.razor.cs (91%) rename app/MindWork AI Studio/{Components/CommonDialogs => Dialogs}/DialogOptions.cs (90%) rename app/MindWork AI Studio/{Components/CommonDialogs => Dialogs}/SingleInputDialog.razor (100%) rename app/MindWork AI Studio/{Components/CommonDialogs => Dialogs}/SingleInputDialog.razor.cs (96%) rename app/MindWork AI Studio/{Components/CommonDialogs => Dialogs}/UpdateDialog.razor (95%) rename app/MindWork AI Studio/{Components/CommonDialogs => Dialogs}/UpdateDialog.razor.cs (94%) rename app/MindWork AI Studio/{Components/CommonDialogs => Dialogs}/WorkspaceSelectionDialog.razor (100%) rename app/MindWork AI Studio/{Components/CommonDialogs => Dialogs}/WorkspaceSelectionDialog.razor.cs (97%) create mode 100644 app/MindWork AI Studio/Dialogs/_Imports.razor rename app/MindWork AI Studio/{Components => }/Layout/MainLayout.razor (97%) rename app/MindWork AI Studio/{Components => }/Layout/MainLayout.razor.cs (94%) create mode 100644 app/MindWork AI Studio/Layout/NavBarItem.cs rename app/MindWork AI Studio/{Components => }/Pages/About.razor (99%) rename app/MindWork AI Studio/{Components => }/Pages/About.razor.cs (99%) rename app/MindWork AI Studio/{Components => }/Pages/Assistants.razor (77%) create mode 100644 app/MindWork AI Studio/Pages/Assistants.razor.cs rename app/MindWork AI Studio/{Components => }/Pages/Chat.razor (99%) rename app/MindWork AI Studio/{Components => }/Pages/Chat.razor.cs (94%) rename app/MindWork AI Studio/{Components => }/Pages/Home.razor (96%) rename app/MindWork AI Studio/{Components => }/Pages/Home.razor.cs (98%) rename app/MindWork AI Studio/{Components => }/Pages/Settings.razor (99%) rename app/MindWork AI Studio/{Components => }/Pages/Settings.razor.cs (97%) rename app/MindWork AI Studio/{Components => }/Pages/Supporters.razor (97%) rename app/MindWork AI Studio/{Components => }/Pages/Supporters.razor.cs (70%) create mode 100644 app/MindWork AI Studio/Pages/_Imports.razor rename app/MindWork AI Studio/{Components => }/Routes.razor (66%) rename app/MindWork AI Studio/{Components/Pages/Path.cs => Routes.razor.cs} (84%) rename app/MindWork AI Studio/{Components/Pages => Tools}/SendTo.cs (86%) rename app/MindWork AI Studio/{Components/Pages => Tools}/SendToExtensions.cs (95%) rename app/MindWork AI Studio/{ => Tools/Services}/MarkdownClipboardService.cs (87%) rename app/MindWork AI Studio/Tools/{ => Services}/TemporaryChatService.cs (98%) rename app/MindWork AI Studio/Tools/{ => Services}/UpdateService.cs (99%) diff --git a/app/MindWork AI Studio/App.razor b/app/MindWork AI Studio/App.razor new file mode 100644 index 0000000..fdfd775 --- /dev/null +++ b/app/MindWork AI Studio/App.razor @@ -0,0 +1,30 @@ +@using Microsoft.AspNetCore.Components.Web + +@* ReSharper disable Html.PathError *@ + + + + + MindWork AI Studio + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/MindWork AI Studio/Components/Pages/Agenda/AssistantAgenda.razor b/app/MindWork AI Studio/Assistants/Agenda/AssistantAgenda.razor similarity index 99% rename from app/MindWork AI Studio/Components/Pages/Agenda/AssistantAgenda.razor rename to app/MindWork AI Studio/Assistants/Agenda/AssistantAgenda.razor index 499ae17..ca0aca8 100644 --- a/app/MindWork AI Studio/Components/Pages/Agenda/AssistantAgenda.razor +++ b/app/MindWork AI Studio/Assistants/Agenda/AssistantAgenda.razor @@ -1,5 +1,4 @@ -@attribute [Route(Path.ASSISTANT_AGENDA)] -@using AIStudio.Tools +@attribute [Route(Routes.ASSISTANT_AGENDA)] @inherits AssistantBaseCore diff --git a/app/MindWork AI Studio/Components/Pages/Agenda/AssistantAgenda.razor.cs b/app/MindWork AI Studio/Assistants/Agenda/AssistantAgenda.razor.cs similarity index 99% rename from app/MindWork AI Studio/Components/Pages/Agenda/AssistantAgenda.razor.cs rename to app/MindWork AI Studio/Assistants/Agenda/AssistantAgenda.razor.cs index 8fc405a..c6d9acb 100644 --- a/app/MindWork AI Studio/Components/Pages/Agenda/AssistantAgenda.razor.cs +++ b/app/MindWork AI Studio/Assistants/Agenda/AssistantAgenda.razor.cs @@ -3,7 +3,7 @@ using System.Text; using AIStudio.Chat; using AIStudio.Tools; -namespace AIStudio.Components.Pages.Agenda; +namespace AIStudio.Assistants.Agenda; public partial class AssistantAgenda : AssistantBaseCore { diff --git a/app/MindWork AI Studio/Components/Pages/Agenda/NumberParticipants.cs b/app/MindWork AI Studio/Assistants/Agenda/NumberParticipants.cs similarity index 92% rename from app/MindWork AI Studio/Components/Pages/Agenda/NumberParticipants.cs rename to app/MindWork AI Studio/Assistants/Agenda/NumberParticipants.cs index 7e0e99e..a805f01 100644 --- a/app/MindWork AI Studio/Components/Pages/Agenda/NumberParticipants.cs +++ b/app/MindWork AI Studio/Assistants/Agenda/NumberParticipants.cs @@ -1,4 +1,4 @@ -namespace AIStudio.Components.Pages.Agenda; +namespace AIStudio.Assistants.Agenda; public enum NumberParticipants { diff --git a/app/MindWork AI Studio/Components/Pages/Agenda/NumberParticipantsExtensions.cs b/app/MindWork AI Studio/Assistants/Agenda/NumberParticipantsExtensions.cs similarity index 95% rename from app/MindWork AI Studio/Components/Pages/Agenda/NumberParticipantsExtensions.cs rename to app/MindWork AI Studio/Assistants/Agenda/NumberParticipantsExtensions.cs index f0966a2..0f3aaa9 100644 --- a/app/MindWork AI Studio/Components/Pages/Agenda/NumberParticipantsExtensions.cs +++ b/app/MindWork AI Studio/Assistants/Agenda/NumberParticipantsExtensions.cs @@ -1,4 +1,4 @@ -namespace AIStudio.Components.Pages.Agenda; +namespace AIStudio.Assistants.Agenda; public static class NumberParticipantsExtensions { diff --git a/app/MindWork AI Studio/Components/AssistantBase.razor b/app/MindWork AI Studio/Assistants/AssistantBase.razor similarity index 96% rename from app/MindWork AI Studio/Components/AssistantBase.razor rename to app/MindWork AI Studio/Assistants/AssistantBase.razor index a0a5b26..a961587 100644 --- a/app/MindWork AI Studio/Components/AssistantBase.razor +++ b/app/MindWork AI Studio/Assistants/AssistantBase.razor @@ -1,6 +1,5 @@ @using AIStudio.Chat -@using AIStudio.Components.Pages -@using AIStudio.Tools + @(this.Title) @@ -23,7 +22,7 @@ { } -
+
@if (this.ShowResult && this.resultingContentBlock is not null) { diff --git a/app/MindWork AI Studio/Components/AssistantBase.razor.cs b/app/MindWork AI Studio/Assistants/AssistantBase.razor.cs similarity index 90% rename from app/MindWork AI Studio/Components/AssistantBase.razor.cs rename to app/MindWork AI Studio/Assistants/AssistantBase.razor.cs index a4441f9..b993a05 100644 --- a/app/MindWork AI Studio/Components/AssistantBase.razor.cs +++ b/app/MindWork AI Studio/Assistants/AssistantBase.razor.cs @@ -1,14 +1,11 @@ using AIStudio.Chat; -using AIStudio.Components.Pages; using AIStudio.Provider; using AIStudio.Settings; using AIStudio.Tools; using Microsoft.AspNetCore.Components; -using Path = AIStudio.Components.Pages.Path; - -namespace AIStudio.Components; +namespace AIStudio.Assistants; public abstract partial class AssistantBase : ComponentBase { @@ -31,7 +28,7 @@ public abstract partial class AssistantBase : ComponentBase protected NavigationManager NavigationManager { get; init; } = null!; internal const string AFTER_RESULT_DIV_ID = "afterAssistantResult"; - internal const string ASSISTANT_RESULT_DIV_ID = "assistantResult"; + internal const string RESULT_DIV_ID = "assistantResult"; protected abstract string Title { get; } @@ -184,17 +181,17 @@ public abstract partial class AssistantBase : ComponentBase var (eventItem, path) = destination switch { - SendTo.AGENDA_ASSISTANT => (Event.SEND_TO_AGENDA_ASSISTANT, Path.ASSISTANT_AGENDA), - SendTo.CODING_ASSISTANT => (Event.SEND_TO_CODING_ASSISTANT, Path.ASSISTANT_CODING), - SendTo.REWRITE_ASSISTANT => (Event.SEND_TO_REWRITE_ASSISTANT, Path.ASSISTANT_REWRITE), - SendTo.TRANSLATION_ASSISTANT => (Event.SEND_TO_TRANSLATION_ASSISTANT, Path.ASSISTANT_TRANSLATION), - SendTo.ICON_FINDER_ASSISTANT => (Event.SEND_TO_ICON_FINDER_ASSISTANT, Path.ASSISTANT_ICON_FINDER), - SendTo.GRAMMAR_SPELLING_ASSISTANT => (Event.SEND_TO_GRAMMAR_SPELLING_ASSISTANT, Path.ASSISTANT_GRAMMAR_SPELLING), - SendTo.TEXT_SUMMARIZER_ASSISTANT => (Event.SEND_TO_TEXT_SUMMARIZER_ASSISTANT, Path.ASSISTANT_SUMMARIZER), + SendTo.AGENDA_ASSISTANT => (Event.SEND_TO_AGENDA_ASSISTANT, Routes.ASSISTANT_AGENDA), + SendTo.CODING_ASSISTANT => (Event.SEND_TO_CODING_ASSISTANT, Routes.ASSISTANT_CODING), + SendTo.REWRITE_ASSISTANT => (Event.SEND_TO_REWRITE_ASSISTANT, Routes.ASSISTANT_REWRITE), + SendTo.TRANSLATION_ASSISTANT => (Event.SEND_TO_TRANSLATION_ASSISTANT, Routes.ASSISTANT_TRANSLATION), + SendTo.ICON_FINDER_ASSISTANT => (Event.SEND_TO_ICON_FINDER_ASSISTANT, Routes.ASSISTANT_ICON_FINDER), + SendTo.GRAMMAR_SPELLING_ASSISTANT => (Event.SEND_TO_GRAMMAR_SPELLING_ASSISTANT, Routes.ASSISTANT_GRAMMAR_SPELLING), + SendTo.TEXT_SUMMARIZER_ASSISTANT => (Event.SEND_TO_TEXT_SUMMARIZER_ASSISTANT, Routes.ASSISTANT_SUMMARIZER), - SendTo.CHAT => (Event.SEND_TO_CHAT, Path.CHAT), + SendTo.CHAT => (Event.SEND_TO_CHAT, Routes.CHAT), - _ => (Event.NONE, Path.ASSISTANTS), + _ => (Event.NONE, Routes.ASSISTANTS), }; switch (destination) @@ -217,7 +214,7 @@ public abstract partial class AssistantBase : ComponentBase this.resultingContentBlock = null; this.providerSettings = default; - await this.JsRuntime.ClearDiv(ASSISTANT_RESULT_DIV_ID); + await this.JsRuntime.ClearDiv(RESULT_DIV_ID); await this.JsRuntime.ClearDiv(AFTER_RESULT_DIV_ID); this.ResetFrom(); diff --git a/app/MindWork AI Studio/Components/AssistantBaseCore.cs b/app/MindWork AI Studio/Assistants/AssistantBaseCore.cs similarity index 94% rename from app/MindWork AI Studio/Components/AssistantBaseCore.cs rename to app/MindWork AI Studio/Assistants/AssistantBaseCore.cs index d6fe7f7..96b16a1 100644 --- a/app/MindWork AI Studio/Components/AssistantBaseCore.cs +++ b/app/MindWork AI Studio/Assistants/AssistantBaseCore.cs @@ -1,7 +1,7 @@ using Microsoft.AspNetCore.Components; using Microsoft.AspNetCore.Components.Rendering; -namespace AIStudio.Components; +namespace AIStudio.Assistants; // // See https://stackoverflow.com/a/77300384/2258393 for why this class is necessary diff --git a/app/MindWork AI Studio/Components/Pages/Coding/AssistantCoding.razor b/app/MindWork AI Studio/Assistants/Coding/AssistantCoding.razor similarity index 96% rename from app/MindWork AI Studio/Components/Pages/Coding/AssistantCoding.razor rename to app/MindWork AI Studio/Assistants/Coding/AssistantCoding.razor index b387c4e..b369271 100644 --- a/app/MindWork AI Studio/Components/Pages/Coding/AssistantCoding.razor +++ b/app/MindWork AI Studio/Assistants/Coding/AssistantCoding.razor @@ -1,4 +1,4 @@ -@attribute [Route(Path.ASSISTANT_CODING)] +@attribute [Route(Routes.ASSISTANT_CODING)] @inherits AssistantBaseCore diff --git a/app/MindWork AI Studio/Components/Pages/Coding/AssistantCoding.razor.cs b/app/MindWork AI Studio/Assistants/Coding/AssistantCoding.razor.cs similarity index 99% rename from app/MindWork AI Studio/Components/Pages/Coding/AssistantCoding.razor.cs rename to app/MindWork AI Studio/Assistants/Coding/AssistantCoding.razor.cs index 8b577fe..660ae8f 100644 --- a/app/MindWork AI Studio/Components/Pages/Coding/AssistantCoding.razor.cs +++ b/app/MindWork AI Studio/Assistants/Coding/AssistantCoding.razor.cs @@ -2,7 +2,7 @@ using AIStudio.Tools; -namespace AIStudio.Components.Pages.Coding; +namespace AIStudio.Assistants.Coding; public partial class AssistantCoding : AssistantBaseCore { diff --git a/app/MindWork AI Studio/Components/Pages/Coding/CodingContext.cs b/app/MindWork AI Studio/Assistants/Coding/CodingContext.cs similarity index 90% rename from app/MindWork AI Studio/Components/Pages/Coding/CodingContext.cs rename to app/MindWork AI Studio/Assistants/Coding/CodingContext.cs index 726ecca..5ef42ed 100644 --- a/app/MindWork AI Studio/Components/Pages/Coding/CodingContext.cs +++ b/app/MindWork AI Studio/Assistants/Coding/CodingContext.cs @@ -1,4 +1,4 @@ -namespace AIStudio.Components.Pages.Coding; +namespace AIStudio.Assistants.Coding; public sealed class CodingContext(string id, CommonCodingLanguages language, string otherLanguage, string code) { diff --git a/app/MindWork AI Studio/Components/Pages/Coding/CodingContextItem.razor b/app/MindWork AI Studio/Assistants/Coding/CodingContextItem.razor similarity index 100% rename from app/MindWork AI Studio/Components/Pages/Coding/CodingContextItem.razor rename to app/MindWork AI Studio/Assistants/Coding/CodingContextItem.razor diff --git a/app/MindWork AI Studio/Components/Pages/Coding/CodingContextItem.razor.cs b/app/MindWork AI Studio/Assistants/Coding/CodingContextItem.razor.cs similarity index 96% rename from app/MindWork AI Studio/Components/Pages/Coding/CodingContextItem.razor.cs rename to app/MindWork AI Studio/Assistants/Coding/CodingContextItem.razor.cs index bb425de..0b59993 100644 --- a/app/MindWork AI Studio/Components/Pages/Coding/CodingContextItem.razor.cs +++ b/app/MindWork AI Studio/Assistants/Coding/CodingContextItem.razor.cs @@ -2,7 +2,7 @@ using Microsoft.AspNetCore.Components; -namespace AIStudio.Components.Pages.Coding; +namespace AIStudio.Assistants.Coding; public partial class CodingContextItem : ComponentBase { diff --git a/app/MindWork AI Studio/Components/Pages/Coding/CommonCodingLanguageExtensions.cs b/app/MindWork AI Studio/Assistants/Coding/CommonCodingLanguageExtensions.cs similarity index 97% rename from app/MindWork AI Studio/Components/Pages/Coding/CommonCodingLanguageExtensions.cs rename to app/MindWork AI Studio/Assistants/Coding/CommonCodingLanguageExtensions.cs index 9d47105..1010105 100644 --- a/app/MindWork AI Studio/Components/Pages/Coding/CommonCodingLanguageExtensions.cs +++ b/app/MindWork AI Studio/Assistants/Coding/CommonCodingLanguageExtensions.cs @@ -1,4 +1,4 @@ -namespace AIStudio.Components.Pages.Coding; +namespace AIStudio.Assistants.Coding; public static class CommonCodingLanguageExtensions { diff --git a/app/MindWork AI Studio/Components/Pages/Coding/CommonCodingLanguages.cs b/app/MindWork AI Studio/Assistants/Coding/CommonCodingLanguages.cs similarity index 89% rename from app/MindWork AI Studio/Components/Pages/Coding/CommonCodingLanguages.cs rename to app/MindWork AI Studio/Assistants/Coding/CommonCodingLanguages.cs index 58d9d80..f42f539 100644 --- a/app/MindWork AI Studio/Components/Pages/Coding/CommonCodingLanguages.cs +++ b/app/MindWork AI Studio/Assistants/Coding/CommonCodingLanguages.cs @@ -1,4 +1,4 @@ -namespace AIStudio.Components.Pages.Coding; +namespace AIStudio.Assistants.Coding; public enum CommonCodingLanguages { diff --git a/app/MindWork AI Studio/Components/Pages/GrammarSpelling/AssistantGrammarSpelling.razor b/app/MindWork AI Studio/Assistants/GrammarSpelling/AssistantGrammarSpelling.razor similarity index 91% rename from app/MindWork AI Studio/Components/Pages/GrammarSpelling/AssistantGrammarSpelling.razor rename to app/MindWork AI Studio/Assistants/GrammarSpelling/AssistantGrammarSpelling.razor index 989ebce..d09355c 100644 --- a/app/MindWork AI Studio/Components/Pages/GrammarSpelling/AssistantGrammarSpelling.razor +++ b/app/MindWork AI Studio/Assistants/GrammarSpelling/AssistantGrammarSpelling.razor @@ -1,5 +1,4 @@ -@using AIStudio.Tools -@attribute [Route(Path.ASSISTANT_GRAMMAR_SPELLING)] +@attribute [Route(Routes.ASSISTANT_GRAMMAR_SPELLING)] @inherits AssistantBaseCore diff --git a/app/MindWork AI Studio/Components/Pages/GrammarSpelling/AssistantGrammarSpelling.razor.cs b/app/MindWork AI Studio/Assistants/GrammarSpelling/AssistantGrammarSpelling.razor.cs similarity index 98% rename from app/MindWork AI Studio/Components/Pages/GrammarSpelling/AssistantGrammarSpelling.razor.cs rename to app/MindWork AI Studio/Assistants/GrammarSpelling/AssistantGrammarSpelling.razor.cs index eef9cd5..b650f86 100644 --- a/app/MindWork AI Studio/Components/Pages/GrammarSpelling/AssistantGrammarSpelling.razor.cs +++ b/app/MindWork AI Studio/Assistants/GrammarSpelling/AssistantGrammarSpelling.razor.cs @@ -1,7 +1,7 @@ using AIStudio.Chat; using AIStudio.Tools; -namespace AIStudio.Components.Pages.GrammarSpelling; +namespace AIStudio.Assistants.GrammarSpelling; public partial class AssistantGrammarSpelling : AssistantBaseCore { diff --git a/app/MindWork AI Studio/Components/Pages/IconFinder/AssistantIconFinder.razor b/app/MindWork AI Studio/Assistants/IconFinder/AssistantIconFinder.razor similarity index 95% rename from app/MindWork AI Studio/Components/Pages/IconFinder/AssistantIconFinder.razor rename to app/MindWork AI Studio/Assistants/IconFinder/AssistantIconFinder.razor index b6345ba..de8425e 100644 --- a/app/MindWork AI Studio/Components/Pages/IconFinder/AssistantIconFinder.razor +++ b/app/MindWork AI Studio/Assistants/IconFinder/AssistantIconFinder.razor @@ -1,4 +1,4 @@ -@attribute [Route(Path.ASSISTANT_ICON_FINDER)] +@attribute [Route(Routes.ASSISTANT_ICON_FINDER)] @inherits AssistantBaseCore diff --git a/app/MindWork AI Studio/Components/Pages/IconFinder/AssistantIconFinder.razor.cs b/app/MindWork AI Studio/Assistants/IconFinder/AssistantIconFinder.razor.cs similarity index 98% rename from app/MindWork AI Studio/Components/Pages/IconFinder/AssistantIconFinder.razor.cs rename to app/MindWork AI Studio/Assistants/IconFinder/AssistantIconFinder.razor.cs index 2b98724..c45dce4 100644 --- a/app/MindWork AI Studio/Components/Pages/IconFinder/AssistantIconFinder.razor.cs +++ b/app/MindWork AI Studio/Assistants/IconFinder/AssistantIconFinder.razor.cs @@ -1,6 +1,6 @@ using AIStudio.Tools; -namespace AIStudio.Components.Pages.IconFinder; +namespace AIStudio.Assistants.IconFinder; public partial class AssistantIconFinder : AssistantBaseCore { diff --git a/app/MindWork AI Studio/Components/Pages/IconFinder/IconSourceExtensions.cs b/app/MindWork AI Studio/Assistants/IconFinder/IconSourceExtensions.cs similarity index 97% rename from app/MindWork AI Studio/Components/Pages/IconFinder/IconSourceExtensions.cs rename to app/MindWork AI Studio/Assistants/IconFinder/IconSourceExtensions.cs index 42acf8c..f7112cf 100644 --- a/app/MindWork AI Studio/Components/Pages/IconFinder/IconSourceExtensions.cs +++ b/app/MindWork AI Studio/Assistants/IconFinder/IconSourceExtensions.cs @@ -1,4 +1,4 @@ -namespace AIStudio.Components.Pages.IconFinder; +namespace AIStudio.Assistants.IconFinder; public static class IconSourceExtensions { diff --git a/app/MindWork AI Studio/Components/Pages/IconFinder/IconSources.cs b/app/MindWork AI Studio/Assistants/IconFinder/IconSources.cs similarity index 75% rename from app/MindWork AI Studio/Components/Pages/IconFinder/IconSources.cs rename to app/MindWork AI Studio/Assistants/IconFinder/IconSources.cs index fe477f9..1b8f0e5 100644 --- a/app/MindWork AI Studio/Components/Pages/IconFinder/IconSources.cs +++ b/app/MindWork AI Studio/Assistants/IconFinder/IconSources.cs @@ -1,4 +1,4 @@ -namespace AIStudio.Components.Pages.IconFinder; +namespace AIStudio.Assistants.IconFinder; public enum IconSources { diff --git a/app/MindWork AI Studio/Components/Pages/RewriteImprove/AssistantRewriteImprove.razor b/app/MindWork AI Studio/Assistants/RewriteImprove/AssistantRewriteImprove.razor similarity index 93% rename from app/MindWork AI Studio/Components/Pages/RewriteImprove/AssistantRewriteImprove.razor rename to app/MindWork AI Studio/Assistants/RewriteImprove/AssistantRewriteImprove.razor index f8dd4ec..5000c1f 100644 --- a/app/MindWork AI Studio/Components/Pages/RewriteImprove/AssistantRewriteImprove.razor +++ b/app/MindWork AI Studio/Assistants/RewriteImprove/AssistantRewriteImprove.razor @@ -1,5 +1,4 @@ -@using AIStudio.Tools -@attribute [Route(Path.ASSISTANT_REWRITE)] +@attribute [Route(Routes.ASSISTANT_REWRITE)] @inherits AssistantBaseCore diff --git a/app/MindWork AI Studio/Components/Pages/RewriteImprove/AssistantRewriteImprove.razor.cs b/app/MindWork AI Studio/Assistants/RewriteImprove/AssistantRewriteImprove.razor.cs similarity index 98% rename from app/MindWork AI Studio/Components/Pages/RewriteImprove/AssistantRewriteImprove.razor.cs rename to app/MindWork AI Studio/Assistants/RewriteImprove/AssistantRewriteImprove.razor.cs index ce60f25..5d7e3e8 100644 --- a/app/MindWork AI Studio/Components/Pages/RewriteImprove/AssistantRewriteImprove.razor.cs +++ b/app/MindWork AI Studio/Assistants/RewriteImprove/AssistantRewriteImprove.razor.cs @@ -1,7 +1,7 @@ using AIStudio.Chat; using AIStudio.Tools; -namespace AIStudio.Components.Pages.RewriteImprove; +namespace AIStudio.Assistants.RewriteImprove; public partial class AssistantRewriteImprove : AssistantBaseCore { diff --git a/app/MindWork AI Studio/Components/Pages/RewriteImprove/WritingStyles.cs b/app/MindWork AI Studio/Assistants/RewriteImprove/WritingStyles.cs similarity index 78% rename from app/MindWork AI Studio/Components/Pages/RewriteImprove/WritingStyles.cs rename to app/MindWork AI Studio/Assistants/RewriteImprove/WritingStyles.cs index 62d82bd..f2fc7ee 100644 --- a/app/MindWork AI Studio/Components/Pages/RewriteImprove/WritingStyles.cs +++ b/app/MindWork AI Studio/Assistants/RewriteImprove/WritingStyles.cs @@ -1,4 +1,4 @@ -namespace AIStudio.Components.Pages.RewriteImprove; +namespace AIStudio.Assistants.RewriteImprove; public enum WritingStyles { diff --git a/app/MindWork AI Studio/Components/Pages/RewriteImprove/WritingStylesExtensions.cs b/app/MindWork AI Studio/Assistants/RewriteImprove/WritingStylesExtensions.cs similarity index 98% rename from app/MindWork AI Studio/Components/Pages/RewriteImprove/WritingStylesExtensions.cs rename to app/MindWork AI Studio/Assistants/RewriteImprove/WritingStylesExtensions.cs index ab2027c..184346a 100644 --- a/app/MindWork AI Studio/Components/Pages/RewriteImprove/WritingStylesExtensions.cs +++ b/app/MindWork AI Studio/Assistants/RewriteImprove/WritingStylesExtensions.cs @@ -1,4 +1,4 @@ -namespace AIStudio.Components.Pages.RewriteImprove; +namespace AIStudio.Assistants.RewriteImprove; public static class WritingStylesExtensions { diff --git a/app/MindWork AI Studio/Components/Pages/TextSummarizer/AssistantTextSummarizer.razor b/app/MindWork AI Studio/Assistants/TextSummarizer/AssistantTextSummarizer.razor similarity index 96% rename from app/MindWork AI Studio/Components/Pages/TextSummarizer/AssistantTextSummarizer.razor rename to app/MindWork AI Studio/Assistants/TextSummarizer/AssistantTextSummarizer.razor index d604535..69a7de9 100644 --- a/app/MindWork AI Studio/Components/Pages/TextSummarizer/AssistantTextSummarizer.razor +++ b/app/MindWork AI Studio/Assistants/TextSummarizer/AssistantTextSummarizer.razor @@ -1,5 +1,4 @@ -@attribute [Route(Path.ASSISTANT_SUMMARIZER)] -@using AIStudio.Tools +@attribute [Route(Routes.ASSISTANT_SUMMARIZER)] @inherits AssistantBaseCore @if (!this.SettingsManager.ConfigurationData.TextSummarizer.HideWebContentReader) diff --git a/app/MindWork AI Studio/Components/Pages/TextSummarizer/AssistantTextSummarizer.razor.cs b/app/MindWork AI Studio/Assistants/TextSummarizer/AssistantTextSummarizer.razor.cs similarity index 98% rename from app/MindWork AI Studio/Components/Pages/TextSummarizer/AssistantTextSummarizer.razor.cs rename to app/MindWork AI Studio/Assistants/TextSummarizer/AssistantTextSummarizer.razor.cs index 41936ac..5d120c8 100644 --- a/app/MindWork AI Studio/Components/Pages/TextSummarizer/AssistantTextSummarizer.razor.cs +++ b/app/MindWork AI Studio/Assistants/TextSummarizer/AssistantTextSummarizer.razor.cs @@ -1,7 +1,7 @@ using AIStudio.Chat; using AIStudio.Tools; -namespace AIStudio.Components.Pages.TextSummarizer; +namespace AIStudio.Assistants.TextSummarizer; public partial class AssistantTextSummarizer : AssistantBaseCore { diff --git a/app/MindWork AI Studio/Components/Pages/TextSummarizer/Complexity.cs b/app/MindWork AI Studio/Assistants/TextSummarizer/Complexity.cs similarity index 80% rename from app/MindWork AI Studio/Components/Pages/TextSummarizer/Complexity.cs rename to app/MindWork AI Studio/Assistants/TextSummarizer/Complexity.cs index 0c9125e..dbf4796 100644 --- a/app/MindWork AI Studio/Components/Pages/TextSummarizer/Complexity.cs +++ b/app/MindWork AI Studio/Assistants/TextSummarizer/Complexity.cs @@ -1,4 +1,4 @@ -namespace AIStudio.Components.Pages.TextSummarizer; +namespace AIStudio.Assistants.TextSummarizer; public enum Complexity { diff --git a/app/MindWork AI Studio/Components/Pages/TextSummarizer/ComplexityExtensions.cs b/app/MindWork AI Studio/Assistants/TextSummarizer/ComplexityExtensions.cs similarity index 97% rename from app/MindWork AI Studio/Components/Pages/TextSummarizer/ComplexityExtensions.cs rename to app/MindWork AI Studio/Assistants/TextSummarizer/ComplexityExtensions.cs index 19a335c..d4b7517 100644 --- a/app/MindWork AI Studio/Components/Pages/TextSummarizer/ComplexityExtensions.cs +++ b/app/MindWork AI Studio/Assistants/TextSummarizer/ComplexityExtensions.cs @@ -1,4 +1,4 @@ -namespace AIStudio.Components.Pages.TextSummarizer; +namespace AIStudio.Assistants.TextSummarizer; public static class ComplexityExtensions { diff --git a/app/MindWork AI Studio/Components/Pages/Translation/AssistantTranslation.razor b/app/MindWork AI Studio/Assistants/Translation/AssistantTranslation.razor similarity index 96% rename from app/MindWork AI Studio/Components/Pages/Translation/AssistantTranslation.razor rename to app/MindWork AI Studio/Assistants/Translation/AssistantTranslation.razor index b30c713..f05f662 100644 --- a/app/MindWork AI Studio/Components/Pages/Translation/AssistantTranslation.razor +++ b/app/MindWork AI Studio/Assistants/Translation/AssistantTranslation.razor @@ -1,5 +1,4 @@ -@attribute [Route(Path.ASSISTANT_TRANSLATION)] -@using AIStudio.Tools +@attribute [Route(Routes.ASSISTANT_TRANSLATION)] @inherits AssistantBaseCore @if (!this.SettingsManager.ConfigurationData.Translation.HideWebContentReader) diff --git a/app/MindWork AI Studio/Components/Pages/Translation/AssistantTranslation.razor.cs b/app/MindWork AI Studio/Assistants/Translation/AssistantTranslation.razor.cs similarity index 98% rename from app/MindWork AI Studio/Components/Pages/Translation/AssistantTranslation.razor.cs rename to app/MindWork AI Studio/Assistants/Translation/AssistantTranslation.razor.cs index e718e88..97b3ed3 100644 --- a/app/MindWork AI Studio/Components/Pages/Translation/AssistantTranslation.razor.cs +++ b/app/MindWork AI Studio/Assistants/Translation/AssistantTranslation.razor.cs @@ -1,7 +1,7 @@ using AIStudio.Chat; using AIStudio.Tools; -namespace AIStudio.Components.Pages.Translation; +namespace AIStudio.Assistants.Translation; public partial class AssistantTranslation : AssistantBaseCore { diff --git a/app/MindWork AI Studio/Assistants/_Imports.razor b/app/MindWork AI Studio/Assistants/_Imports.razor new file mode 100644 index 0000000..33063ff --- /dev/null +++ b/app/MindWork AI Studio/Assistants/_Imports.razor @@ -0,0 +1,4 @@ +@using AIStudio +@using AIStudio.Tools +@using AIStudio.Components +@using MudBlazor \ No newline at end of file diff --git a/app/MindWork AI Studio/Components/App.razor b/app/MindWork AI Studio/Components/App.razor deleted file mode 100644 index b173c9a..0000000 --- a/app/MindWork AI Studio/Components/App.razor +++ /dev/null @@ -1,28 +0,0 @@ -@* ReSharper disable Html.PathError *@ - - - - - MindWork AI Studio - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/MindWork AI Studio/Components/Blocks/AssistantBlock.razor b/app/MindWork AI Studio/Components/AssistantBlock.razor similarity index 100% rename from app/MindWork AI Studio/Components/Blocks/AssistantBlock.razor rename to app/MindWork AI Studio/Components/AssistantBlock.razor diff --git a/app/MindWork AI Studio/Components/Blocks/AssistantBlock.razor.cs b/app/MindWork AI Studio/Components/AssistantBlock.razor.cs similarity index 92% rename from app/MindWork AI Studio/Components/Blocks/AssistantBlock.razor.cs rename to app/MindWork AI Studio/Components/AssistantBlock.razor.cs index 1efe6ec..4a15ddb 100644 --- a/app/MindWork AI Studio/Components/Blocks/AssistantBlock.razor.cs +++ b/app/MindWork AI Studio/Components/AssistantBlock.razor.cs @@ -1,6 +1,6 @@ using Microsoft.AspNetCore.Components; -namespace AIStudio.Components.Blocks; +namespace AIStudio.Components; public partial class AssistantBlock : ComponentBase { diff --git a/app/MindWork AI Studio/Components/Blocks/ITreeItem.cs b/app/MindWork AI Studio/Components/Blocks/ITreeItem.cs deleted file mode 100644 index ad718e7..0000000 --- a/app/MindWork AI Studio/Components/Blocks/ITreeItem.cs +++ /dev/null @@ -1,3 +0,0 @@ -namespace AIStudio.Components.Blocks; - -public interface ITreeItem; \ No newline at end of file diff --git a/app/MindWork AI Studio/Components/Blocks/TreeDivider.cs b/app/MindWork AI Studio/Components/Blocks/TreeDivider.cs deleted file mode 100644 index 6c31127..0000000 --- a/app/MindWork AI Studio/Components/Blocks/TreeDivider.cs +++ /dev/null @@ -1,3 +0,0 @@ -namespace AIStudio.Components.Blocks; - -public readonly record struct TreeDivider : ITreeItem; \ No newline at end of file diff --git a/app/MindWork AI Studio/Components/Blocks/Changelog.Logs.cs b/app/MindWork AI Studio/Components/Changelog.Logs.cs similarity index 98% rename from app/MindWork AI Studio/Components/Blocks/Changelog.Logs.cs rename to app/MindWork AI Studio/Components/Changelog.Logs.cs index 472a68d..e2ca3ed 100644 --- a/app/MindWork AI Studio/Components/Blocks/Changelog.Logs.cs +++ b/app/MindWork AI Studio/Components/Changelog.Logs.cs @@ -1,4 +1,4 @@ -namespace AIStudio.Components.Blocks; +namespace AIStudio.Components; public partial class Changelog { diff --git a/app/MindWork AI Studio/Components/Blocks/Changelog.razor b/app/MindWork AI Studio/Components/Changelog.razor similarity index 90% rename from app/MindWork AI Studio/Components/Blocks/Changelog.razor rename to app/MindWork AI Studio/Components/Changelog.razor index 1c75ce9..407aa9e 100644 --- a/app/MindWork AI Studio/Components/Blocks/Changelog.razor +++ b/app/MindWork AI Studio/Components/Changelog.razor @@ -1,4 +1,3 @@ -@using AIStudio.Tools @foreach (var log in LOGS) { diff --git a/app/MindWork AI Studio/Components/Blocks/Changelog.razor.cs b/app/MindWork AI Studio/Components/Changelog.razor.cs similarity index 94% rename from app/MindWork AI Studio/Components/Blocks/Changelog.razor.cs rename to app/MindWork AI Studio/Components/Changelog.razor.cs index 97631b7..c90a46c 100644 --- a/app/MindWork AI Studio/Components/Blocks/Changelog.razor.cs +++ b/app/MindWork AI Studio/Components/Changelog.razor.cs @@ -1,6 +1,6 @@ using Microsoft.AspNetCore.Components; -namespace AIStudio.Components.Blocks; +namespace AIStudio.Components; public partial class Changelog : ComponentBase { diff --git a/app/MindWork AI Studio/Components/Blocks/ConfigurationOption.razor b/app/MindWork AI Studio/Components/ConfigurationOption.razor similarity index 100% rename from app/MindWork AI Studio/Components/Blocks/ConfigurationOption.razor rename to app/MindWork AI Studio/Components/ConfigurationOption.razor diff --git a/app/MindWork AI Studio/Components/Blocks/ConfigurationOption.razor.cs b/app/MindWork AI Studio/Components/ConfigurationOption.razor.cs similarity index 96% rename from app/MindWork AI Studio/Components/Blocks/ConfigurationOption.razor.cs rename to app/MindWork AI Studio/Components/ConfigurationOption.razor.cs index 68d5cd4..b3bed55 100644 --- a/app/MindWork AI Studio/Components/Blocks/ConfigurationOption.razor.cs +++ b/app/MindWork AI Studio/Components/ConfigurationOption.razor.cs @@ -1,6 +1,6 @@ using Microsoft.AspNetCore.Components; -namespace AIStudio.Components.Blocks; +namespace AIStudio.Components; /// /// Configuration component for any boolean option. diff --git a/app/MindWork AI Studio/Components/Blocks/ConfigurationProviderSelection.razor b/app/MindWork AI Studio/Components/ConfigurationProviderSelection.razor similarity index 100% rename from app/MindWork AI Studio/Components/Blocks/ConfigurationProviderSelection.razor rename to app/MindWork AI Studio/Components/ConfigurationProviderSelection.razor diff --git a/app/MindWork AI Studio/Components/Blocks/ConfigurationProviderSelection.razor.cs b/app/MindWork AI Studio/Components/ConfigurationProviderSelection.razor.cs similarity index 98% rename from app/MindWork AI Studio/Components/Blocks/ConfigurationProviderSelection.razor.cs rename to app/MindWork AI Studio/Components/ConfigurationProviderSelection.razor.cs index c860377..5921320 100644 --- a/app/MindWork AI Studio/Components/Blocks/ConfigurationProviderSelection.razor.cs +++ b/app/MindWork AI Studio/Components/ConfigurationProviderSelection.razor.cs @@ -3,7 +3,7 @@ using AIStudio.Tools; using Microsoft.AspNetCore.Components; -namespace AIStudio.Components.Blocks; +namespace AIStudio.Components; public partial class ConfigurationProviderSelection : ComponentBase, IMessageBusReceiver, IDisposable { diff --git a/app/MindWork AI Studio/Components/Blocks/ConfigurationSelect.razor b/app/MindWork AI Studio/Components/ConfigurationSelect.razor similarity index 100% rename from app/MindWork AI Studio/Components/Blocks/ConfigurationSelect.razor rename to app/MindWork AI Studio/Components/ConfigurationSelect.razor diff --git a/app/MindWork AI Studio/Components/Blocks/ConfigurationSelect.razor.cs b/app/MindWork AI Studio/Components/ConfigurationSelect.razor.cs similarity index 96% rename from app/MindWork AI Studio/Components/Blocks/ConfigurationSelect.razor.cs rename to app/MindWork AI Studio/Components/ConfigurationSelect.razor.cs index 4f0fe49..8fb876c 100644 --- a/app/MindWork AI Studio/Components/Blocks/ConfigurationSelect.razor.cs +++ b/app/MindWork AI Studio/Components/ConfigurationSelect.razor.cs @@ -2,7 +2,7 @@ using AIStudio.Settings; using Microsoft.AspNetCore.Components; -namespace AIStudio.Components.Blocks; +namespace AIStudio.Components; /// /// Configuration component for selecting a value from a list. diff --git a/app/MindWork AI Studio/Components/Blocks/ConfigurationSlider.razor b/app/MindWork AI Studio/Components/ConfigurationSlider.razor similarity index 100% rename from app/MindWork AI Studio/Components/Blocks/ConfigurationSlider.razor rename to app/MindWork AI Studio/Components/ConfigurationSlider.razor diff --git a/app/MindWork AI Studio/Components/Blocks/ConfigurationSlider.razor.cs b/app/MindWork AI Studio/Components/ConfigurationSlider.razor.cs similarity index 97% rename from app/MindWork AI Studio/Components/Blocks/ConfigurationSlider.razor.cs rename to app/MindWork AI Studio/Components/ConfigurationSlider.razor.cs index 238aad3..7d91cb8 100644 --- a/app/MindWork AI Studio/Components/Blocks/ConfigurationSlider.razor.cs +++ b/app/MindWork AI Studio/Components/ConfigurationSlider.razor.cs @@ -2,7 +2,7 @@ using System.Numerics; using Microsoft.AspNetCore.Components; -namespace AIStudio.Components.Blocks; +namespace AIStudio.Components; public partial class ConfigurationSlider : ConfigurationBase where T : struct, INumber { diff --git a/app/MindWork AI Studio/Components/Blocks/ConfigurationText.razor b/app/MindWork AI Studio/Components/ConfigurationText.razor similarity index 100% rename from app/MindWork AI Studio/Components/Blocks/ConfigurationText.razor rename to app/MindWork AI Studio/Components/ConfigurationText.razor diff --git a/app/MindWork AI Studio/Components/Blocks/ConfigurationText.razor.cs b/app/MindWork AI Studio/Components/ConfigurationText.razor.cs similarity index 96% rename from app/MindWork AI Studio/Components/Blocks/ConfigurationText.razor.cs rename to app/MindWork AI Studio/Components/ConfigurationText.razor.cs index 228fa13..e6cd379 100644 --- a/app/MindWork AI Studio/Components/Blocks/ConfigurationText.razor.cs +++ b/app/MindWork AI Studio/Components/ConfigurationText.razor.cs @@ -1,6 +1,6 @@ using Microsoft.AspNetCore.Components; -namespace AIStudio.Components.Blocks; +namespace AIStudio.Components; public partial class ConfigurationText : ConfigurationBase { diff --git a/app/MindWork AI Studio/Components/Blocks/EnumSelection.razor b/app/MindWork AI Studio/Components/EnumSelection.razor similarity index 100% rename from app/MindWork AI Studio/Components/Blocks/EnumSelection.razor rename to app/MindWork AI Studio/Components/EnumSelection.razor diff --git a/app/MindWork AI Studio/Components/Blocks/EnumSelection.razor.cs b/app/MindWork AI Studio/Components/EnumSelection.razor.cs similarity index 98% rename from app/MindWork AI Studio/Components/Blocks/EnumSelection.razor.cs rename to app/MindWork AI Studio/Components/EnumSelection.razor.cs index d87384f..a7d93dd 100644 --- a/app/MindWork AI Studio/Components/Blocks/EnumSelection.razor.cs +++ b/app/MindWork AI Studio/Components/EnumSelection.razor.cs @@ -2,7 +2,7 @@ using AIStudio.Settings; using Microsoft.AspNetCore.Components; -namespace AIStudio.Components.Blocks; +namespace AIStudio.Components; public partial class EnumSelection : EnumSelectionBase where T : struct, Enum { diff --git a/app/MindWork AI Studio/Components/Blocks/EnumSelectionBase.cs b/app/MindWork AI Studio/Components/EnumSelectionBase.cs similarity index 82% rename from app/MindWork AI Studio/Components/Blocks/EnumSelectionBase.cs rename to app/MindWork AI Studio/Components/EnumSelectionBase.cs index f84478d..635069a 100644 --- a/app/MindWork AI Studio/Components/Blocks/EnumSelectionBase.cs +++ b/app/MindWork AI Studio/Components/EnumSelectionBase.cs @@ -1,6 +1,6 @@ using Microsoft.AspNetCore.Components; -namespace AIStudio.Components.Blocks; +namespace AIStudio.Components; public abstract class EnumSelectionBase : ComponentBase { diff --git a/app/MindWork AI Studio/Components/Blocks/ExpansionPanel.razor b/app/MindWork AI Studio/Components/ExpansionPanel.razor similarity index 100% rename from app/MindWork AI Studio/Components/Blocks/ExpansionPanel.razor rename to app/MindWork AI Studio/Components/ExpansionPanel.razor diff --git a/app/MindWork AI Studio/Components/Blocks/ExpansionPanel.razor.cs b/app/MindWork AI Studio/Components/ExpansionPanel.razor.cs similarity index 93% rename from app/MindWork AI Studio/Components/Blocks/ExpansionPanel.razor.cs rename to app/MindWork AI Studio/Components/ExpansionPanel.razor.cs index e1a54e0..47d8b70 100644 --- a/app/MindWork AI Studio/Components/Blocks/ExpansionPanel.razor.cs +++ b/app/MindWork AI Studio/Components/ExpansionPanel.razor.cs @@ -1,6 +1,6 @@ using Microsoft.AspNetCore.Components; -namespace AIStudio.Components.Blocks; +namespace AIStudio.Components; public partial class ExpansionPanel : ComponentBase { diff --git a/app/MindWork AI Studio/Components/ITreeItem.cs b/app/MindWork AI Studio/Components/ITreeItem.cs new file mode 100644 index 0000000..e2fdc27 --- /dev/null +++ b/app/MindWork AI Studio/Components/ITreeItem.cs @@ -0,0 +1,3 @@ +namespace AIStudio.Components; + +public interface ITreeItem; \ No newline at end of file diff --git a/app/MindWork AI Studio/Components/Blocks/InnerScrolling.razor b/app/MindWork AI Studio/Components/InnerScrolling.razor similarity index 100% rename from app/MindWork AI Studio/Components/Blocks/InnerScrolling.razor rename to app/MindWork AI Studio/Components/InnerScrolling.razor diff --git a/app/MindWork AI Studio/Components/Blocks/InnerScrolling.razor.cs b/app/MindWork AI Studio/Components/InnerScrolling.razor.cs similarity index 96% rename from app/MindWork AI Studio/Components/Blocks/InnerScrolling.razor.cs rename to app/MindWork AI Studio/Components/InnerScrolling.razor.cs index 22483e7..b204f4e 100644 --- a/app/MindWork AI Studio/Components/Blocks/InnerScrolling.razor.cs +++ b/app/MindWork AI Studio/Components/InnerScrolling.razor.cs @@ -1,9 +1,9 @@ -using AIStudio.Components.Layout; +using AIStudio.Layout; using AIStudio.Tools; using Microsoft.AspNetCore.Components; -namespace AIStudio.Components.Blocks; +namespace AIStudio.Components; public partial class InnerScrolling : MSGComponentBase { diff --git a/app/MindWork AI Studio/Components/Blocks/Issues.razor b/app/MindWork AI Studio/Components/Issues.razor similarity index 100% rename from app/MindWork AI Studio/Components/Blocks/Issues.razor rename to app/MindWork AI Studio/Components/Issues.razor diff --git a/app/MindWork AI Studio/Components/Blocks/Issues.razor.cs b/app/MindWork AI Studio/Components/Issues.razor.cs similarity index 80% rename from app/MindWork AI Studio/Components/Blocks/Issues.razor.cs rename to app/MindWork AI Studio/Components/Issues.razor.cs index 4a0c291..effd20f 100644 --- a/app/MindWork AI Studio/Components/Blocks/Issues.razor.cs +++ b/app/MindWork AI Studio/Components/Issues.razor.cs @@ -1,6 +1,6 @@ using Microsoft.AspNetCore.Components; -namespace AIStudio.Components.Blocks; +namespace AIStudio.Components; public partial class Issues : ComponentBase { diff --git a/app/MindWork AI Studio/Components/Layout/NavBarItem.cs b/app/MindWork AI Studio/Components/Layout/NavBarItem.cs deleted file mode 100644 index 668634c..0000000 --- a/app/MindWork AI Studio/Components/Layout/NavBarItem.cs +++ /dev/null @@ -1,3 +0,0 @@ -namespace AIStudio.Components.Layout; - -public record NavBarItem(string Name, string Icon, Color IconColor, string Path, bool MatchAll); \ No newline at end of file diff --git a/app/MindWork AI Studio/Components/Blocks/Motivation.razor b/app/MindWork AI Studio/Components/Motivation.razor similarity index 100% rename from app/MindWork AI Studio/Components/Blocks/Motivation.razor rename to app/MindWork AI Studio/Components/Motivation.razor diff --git a/app/MindWork AI Studio/Components/Blocks/Motivation.razor.cs b/app/MindWork AI Studio/Components/Motivation.razor.cs similarity index 70% rename from app/MindWork AI Studio/Components/Blocks/Motivation.razor.cs rename to app/MindWork AI Studio/Components/Motivation.razor.cs index 5a16e13..23e1a76 100644 --- a/app/MindWork AI Studio/Components/Blocks/Motivation.razor.cs +++ b/app/MindWork AI Studio/Components/Motivation.razor.cs @@ -1,6 +1,6 @@ using Microsoft.AspNetCore.Components; -namespace AIStudio.Components.Blocks; +namespace AIStudio.Components; public partial class Motivation : ComponentBase { diff --git a/app/MindWork AI Studio/Components/Blocks/MudTextList.razor b/app/MindWork AI Studio/Components/MudTextList.razor similarity index 100% rename from app/MindWork AI Studio/Components/Blocks/MudTextList.razor rename to app/MindWork AI Studio/Components/MudTextList.razor diff --git a/app/MindWork AI Studio/Components/Blocks/MudTextList.razor.cs b/app/MindWork AI Studio/Components/MudTextList.razor.cs similarity index 92% rename from app/MindWork AI Studio/Components/Blocks/MudTextList.razor.cs rename to app/MindWork AI Studio/Components/MudTextList.razor.cs index 4c94284..551878b 100644 --- a/app/MindWork AI Studio/Components/Blocks/MudTextList.razor.cs +++ b/app/MindWork AI Studio/Components/MudTextList.razor.cs @@ -1,6 +1,6 @@ using Microsoft.AspNetCore.Components; -namespace AIStudio.Components.Blocks; +namespace AIStudio.Components; public partial class MudTextList : ComponentBase { diff --git a/app/MindWork AI Studio/Components/Blocks/MudTextSlider.razor b/app/MindWork AI Studio/Components/MudTextSlider.razor similarity index 100% rename from app/MindWork AI Studio/Components/Blocks/MudTextSlider.razor rename to app/MindWork AI Studio/Components/MudTextSlider.razor diff --git a/app/MindWork AI Studio/Components/Blocks/MudTextSlider.razor.cs b/app/MindWork AI Studio/Components/MudTextSlider.razor.cs similarity index 97% rename from app/MindWork AI Studio/Components/Blocks/MudTextSlider.razor.cs rename to app/MindWork AI Studio/Components/MudTextSlider.razor.cs index c3e2411..27f37a5 100644 --- a/app/MindWork AI Studio/Components/Blocks/MudTextSlider.razor.cs +++ b/app/MindWork AI Studio/Components/MudTextSlider.razor.cs @@ -2,7 +2,7 @@ using System.Numerics; using Microsoft.AspNetCore.Components; -namespace AIStudio.Components.Blocks; +namespace AIStudio.Components; public partial class MudTextSlider : ComponentBase where T : struct, INumber { diff --git a/app/MindWork AI Studio/Components/Blocks/MudTextSwitch.razor b/app/MindWork AI Studio/Components/MudTextSwitch.razor similarity index 100% rename from app/MindWork AI Studio/Components/Blocks/MudTextSwitch.razor rename to app/MindWork AI Studio/Components/MudTextSwitch.razor diff --git a/app/MindWork AI Studio/Components/Blocks/MudTextSwitch.razor.cs b/app/MindWork AI Studio/Components/MudTextSwitch.razor.cs similarity index 94% rename from app/MindWork AI Studio/Components/Blocks/MudTextSwitch.razor.cs rename to app/MindWork AI Studio/Components/MudTextSwitch.razor.cs index 30492d3..2bce2c2 100644 --- a/app/MindWork AI Studio/Components/Blocks/MudTextSwitch.razor.cs +++ b/app/MindWork AI Studio/Components/MudTextSwitch.razor.cs @@ -1,6 +1,6 @@ using Microsoft.AspNetCore.Components; -namespace AIStudio.Components.Blocks; +namespace AIStudio.Components; public partial class MudTextSwitch : ComponentBase { diff --git a/app/MindWork AI Studio/Components/Pages/Assistants.razor.cs b/app/MindWork AI Studio/Components/Pages/Assistants.razor.cs deleted file mode 100644 index 9a71f4e..0000000 --- a/app/MindWork AI Studio/Components/Pages/Assistants.razor.cs +++ /dev/null @@ -1,5 +0,0 @@ -using Microsoft.AspNetCore.Components; - -namespace AIStudio.Components.Pages; - -public partial class Assistants : ComponentBase; \ No newline at end of file diff --git a/app/MindWork AI Studio/Components/Blocks/ProcessComponent.razor b/app/MindWork AI Studio/Components/ProcessComponent.razor similarity index 100% rename from app/MindWork AI Studio/Components/Blocks/ProcessComponent.razor rename to app/MindWork AI Studio/Components/ProcessComponent.razor diff --git a/app/MindWork AI Studio/Components/Blocks/ProcessComponent.razor.cs b/app/MindWork AI Studio/Components/ProcessComponent.razor.cs similarity index 90% rename from app/MindWork AI Studio/Components/Blocks/ProcessComponent.razor.cs rename to app/MindWork AI Studio/Components/ProcessComponent.razor.cs index 6d71132..bbcd6e5 100644 --- a/app/MindWork AI Studio/Components/Blocks/ProcessComponent.razor.cs +++ b/app/MindWork AI Studio/Components/ProcessComponent.razor.cs @@ -2,7 +2,7 @@ using AIStudio.Tools; using Microsoft.AspNetCore.Components; -namespace AIStudio.Components.Blocks; +namespace AIStudio.Components; public partial class ProcessComponent : ComponentBase where T : struct, Enum { diff --git a/app/MindWork AI Studio/Components/Blocks/ProviderSelection.razor b/app/MindWork AI Studio/Components/ProviderSelection.razor similarity index 100% rename from app/MindWork AI Studio/Components/Blocks/ProviderSelection.razor rename to app/MindWork AI Studio/Components/ProviderSelection.razor diff --git a/app/MindWork AI Studio/Components/Blocks/ProviderSelection.razor.cs b/app/MindWork AI Studio/Components/ProviderSelection.razor.cs similarity index 94% rename from app/MindWork AI Studio/Components/Blocks/ProviderSelection.razor.cs rename to app/MindWork AI Studio/Components/ProviderSelection.razor.cs index 96204d0..ad2249f 100644 --- a/app/MindWork AI Studio/Components/Blocks/ProviderSelection.razor.cs +++ b/app/MindWork AI Studio/Components/ProviderSelection.razor.cs @@ -2,7 +2,7 @@ using AIStudio.Settings; using Microsoft.AspNetCore.Components; -namespace AIStudio.Components.Blocks; +namespace AIStudio.Components; public partial class ProviderSelection : ComponentBase { diff --git a/app/MindWork AI Studio/Components/Blocks/ReadWebContent.razor b/app/MindWork AI Studio/Components/ReadWebContent.razor similarity index 100% rename from app/MindWork AI Studio/Components/Blocks/ReadWebContent.razor rename to app/MindWork AI Studio/Components/ReadWebContent.razor diff --git a/app/MindWork AI Studio/Components/Blocks/ReadWebContent.razor.cs b/app/MindWork AI Studio/Components/ReadWebContent.razor.cs similarity index 99% rename from app/MindWork AI Studio/Components/Blocks/ReadWebContent.razor.cs rename to app/MindWork AI Studio/Components/ReadWebContent.razor.cs index c4a3497..c681dc1 100644 --- a/app/MindWork AI Studio/Components/Blocks/ReadWebContent.razor.cs +++ b/app/MindWork AI Studio/Components/ReadWebContent.razor.cs @@ -5,7 +5,7 @@ using AIStudio.Tools; using Microsoft.AspNetCore.Components; -namespace AIStudio.Components.Blocks; +namespace AIStudio.Components; public partial class ReadWebContent : ComponentBase { diff --git a/app/MindWork AI Studio/Components/Blocks/ReadWebContentSteps.cs b/app/MindWork AI Studio/Components/ReadWebContentSteps.cs similarity index 72% rename from app/MindWork AI Studio/Components/Blocks/ReadWebContentSteps.cs rename to app/MindWork AI Studio/Components/ReadWebContentSteps.cs index 3dafa01..d1ca45e 100644 --- a/app/MindWork AI Studio/Components/Blocks/ReadWebContentSteps.cs +++ b/app/MindWork AI Studio/Components/ReadWebContentSteps.cs @@ -1,4 +1,4 @@ -namespace AIStudio.Components.Blocks; +namespace AIStudio.Components; public enum ReadWebContentSteps { diff --git a/app/MindWork AI Studio/Components/Blocks/SplitButton.razor b/app/MindWork AI Studio/Components/SplitButton.razor similarity index 100% rename from app/MindWork AI Studio/Components/Blocks/SplitButton.razor rename to app/MindWork AI Studio/Components/SplitButton.razor diff --git a/app/MindWork AI Studio/Components/Blocks/SplitButton.razor.cs b/app/MindWork AI Studio/Components/SplitButton.razor.cs similarity index 97% rename from app/MindWork AI Studio/Components/Blocks/SplitButton.razor.cs rename to app/MindWork AI Studio/Components/SplitButton.razor.cs index 9a5e243..c85d7d6 100644 --- a/app/MindWork AI Studio/Components/Blocks/SplitButton.razor.cs +++ b/app/MindWork AI Studio/Components/SplitButton.razor.cs @@ -1,6 +1,6 @@ using Microsoft.AspNetCore.Components; -namespace AIStudio.Components.Blocks; +namespace AIStudio.Components; public partial class SplitButton : ComponentBase { diff --git a/app/MindWork AI Studio/Components/Blocks/ThirdPartyComponent.razor b/app/MindWork AI Studio/Components/ThirdPartyComponent.razor similarity index 100% rename from app/MindWork AI Studio/Components/Blocks/ThirdPartyComponent.razor rename to app/MindWork AI Studio/Components/ThirdPartyComponent.razor diff --git a/app/MindWork AI Studio/Components/Blocks/ThirdPartyComponent.razor.cs b/app/MindWork AI Studio/Components/ThirdPartyComponent.razor.cs similarity index 94% rename from app/MindWork AI Studio/Components/Blocks/ThirdPartyComponent.razor.cs rename to app/MindWork AI Studio/Components/ThirdPartyComponent.razor.cs index d12399e..77fdc3c 100644 --- a/app/MindWork AI Studio/Components/Blocks/ThirdPartyComponent.razor.cs +++ b/app/MindWork AI Studio/Components/ThirdPartyComponent.razor.cs @@ -1,6 +1,6 @@ using Microsoft.AspNetCore.Components; -namespace AIStudio.Components.Blocks; +namespace AIStudio.Components; public partial class ThirdPartyComponent : ComponentBase { diff --git a/app/MindWork AI Studio/Components/Blocks/TreeButton.cs b/app/MindWork AI Studio/Components/TreeButton.cs similarity index 75% rename from app/MindWork AI Studio/Components/Blocks/TreeButton.cs rename to app/MindWork AI Studio/Components/TreeButton.cs index ff7eaa5..19aa316 100644 --- a/app/MindWork AI Studio/Components/Blocks/TreeButton.cs +++ b/app/MindWork AI Studio/Components/TreeButton.cs @@ -1,3 +1,3 @@ -namespace AIStudio.Components.Blocks; +namespace AIStudio.Components; public readonly record struct TreeButton(WorkspaceBranch Branch, int Depth, string Text, string Icon, Func Action) : ITreeItem; \ No newline at end of file diff --git a/app/MindWork AI Studio/Components/TreeDivider.cs b/app/MindWork AI Studio/Components/TreeDivider.cs new file mode 100644 index 0000000..5266d26 --- /dev/null +++ b/app/MindWork AI Studio/Components/TreeDivider.cs @@ -0,0 +1,3 @@ +namespace AIStudio.Components; + +public readonly record struct TreeDivider : ITreeItem; \ No newline at end of file diff --git a/app/MindWork AI Studio/Components/Blocks/TreeItemData.cs b/app/MindWork AI Studio/Components/TreeItemData.cs similarity index 81% rename from app/MindWork AI Studio/Components/Blocks/TreeItemData.cs rename to app/MindWork AI Studio/Components/TreeItemData.cs index 1eaa7d5..9ae74da 100644 --- a/app/MindWork AI Studio/Components/Blocks/TreeItemData.cs +++ b/app/MindWork AI Studio/Components/TreeItemData.cs @@ -1,4 +1,4 @@ -namespace AIStudio.Components.Blocks; +namespace AIStudio.Components; public class TreeItemData : ITreeItem { @@ -8,7 +8,7 @@ public class TreeItemData : ITreeItem public string Text { get; init; } = string.Empty; - public string ShortenedText => Text.Length > 30 ? this.Text[..30] + "..." : this.Text; + public string ShortenedText => this.Text.Length > 30 ? this.Text[..30] + "..." : this.Text; public string Icon { get; init; } = string.Empty; diff --git a/app/MindWork AI Studio/Components/Blocks/TreeItemType.cs b/app/MindWork AI Studio/Components/TreeItemType.cs similarity index 63% rename from app/MindWork AI Studio/Components/Blocks/TreeItemType.cs rename to app/MindWork AI Studio/Components/TreeItemType.cs index de860ab..f43823b 100644 --- a/app/MindWork AI Studio/Components/Blocks/TreeItemType.cs +++ b/app/MindWork AI Studio/Components/TreeItemType.cs @@ -1,4 +1,4 @@ -namespace AIStudio.Components.Blocks; +namespace AIStudio.Components; public enum TreeItemType { diff --git a/app/MindWork AI Studio/Components/Blocks/Vision.razor b/app/MindWork AI Studio/Components/Vision.razor similarity index 100% rename from app/MindWork AI Studio/Components/Blocks/Vision.razor rename to app/MindWork AI Studio/Components/Vision.razor diff --git a/app/MindWork AI Studio/Components/Blocks/Vision.razor.cs b/app/MindWork AI Studio/Components/Vision.razor.cs similarity index 97% rename from app/MindWork AI Studio/Components/Blocks/Vision.razor.cs rename to app/MindWork AI Studio/Components/Vision.razor.cs index 233e4b0..649ebdf 100644 --- a/app/MindWork AI Studio/Components/Blocks/Vision.razor.cs +++ b/app/MindWork AI Studio/Components/Vision.razor.cs @@ -1,6 +1,6 @@ using Microsoft.AspNetCore.Components; -namespace AIStudio.Components.Blocks; +namespace AIStudio.Components; public partial class Vision : ComponentBase { diff --git a/app/MindWork AI Studio/Components/Blocks/WorkspaceBranch.cs b/app/MindWork AI Studio/Components/WorkspaceBranch.cs similarity index 68% rename from app/MindWork AI Studio/Components/Blocks/WorkspaceBranch.cs rename to app/MindWork AI Studio/Components/WorkspaceBranch.cs index 1b19bd3..a491f21 100644 --- a/app/MindWork AI Studio/Components/Blocks/WorkspaceBranch.cs +++ b/app/MindWork AI Studio/Components/WorkspaceBranch.cs @@ -1,4 +1,4 @@ -namespace AIStudio.Components.Blocks; +namespace AIStudio.Components; public enum WorkspaceBranch { diff --git a/app/MindWork AI Studio/Components/Blocks/Workspaces.razor b/app/MindWork AI Studio/Components/Workspaces.razor similarity index 100% rename from app/MindWork AI Studio/Components/Blocks/Workspaces.razor rename to app/MindWork AI Studio/Components/Workspaces.razor diff --git a/app/MindWork AI Studio/Components/Blocks/Workspaces.razor.cs b/app/MindWork AI Studio/Components/Workspaces.razor.cs similarity index 99% rename from app/MindWork AI Studio/Components/Blocks/Workspaces.razor.cs rename to app/MindWork AI Studio/Components/Workspaces.razor.cs index 964e3ed..ee33e64 100644 --- a/app/MindWork AI Studio/Components/Blocks/Workspaces.razor.cs +++ b/app/MindWork AI Studio/Components/Workspaces.razor.cs @@ -3,15 +3,15 @@ using System.Text.Json; using System.Text.Json.Serialization; using AIStudio.Chat; -using AIStudio.Components.CommonDialogs; +using AIStudio.Dialogs; using AIStudio.Settings; using AIStudio.Tools; using Microsoft.AspNetCore.Components; -using DialogOptions = AIStudio.Components.CommonDialogs.DialogOptions; +using DialogOptions = AIStudio.Dialogs.DialogOptions; -namespace AIStudio.Components.Blocks; +namespace AIStudio.Components; public partial class Workspaces : ComponentBase { diff --git a/app/MindWork AI Studio/Components/_Imports.razor b/app/MindWork AI Studio/Components/_Imports.razor index 28a7839..170680c 100644 --- a/app/MindWork AI Studio/Components/_Imports.razor +++ b/app/MindWork AI Studio/Components/_Imports.razor @@ -1,12 +1,3 @@ -@using System.Net.Http -@using System.Net.Http.Json -@using Microsoft.AspNetCore.Components.Forms -@using Microsoft.AspNetCore.Components.Routing -@using Microsoft.AspNetCore.Components.Web -@using static Microsoft.AspNetCore.Components.Web.RenderMode -@using Microsoft.AspNetCore.Components.Web.Virtualization -@using Microsoft.JSInterop -@using AIStudio -@using AIStudio.Components -@using AIStudio.Components.Blocks +@using AIStudio +@using AIStudio.Tools @using MudBlazor \ No newline at end of file diff --git a/app/MindWork AI Studio/Components/CommonDialogs/ConfirmDialog.razor b/app/MindWork AI Studio/Dialogs/ConfirmDialog.razor similarity index 100% rename from app/MindWork AI Studio/Components/CommonDialogs/ConfirmDialog.razor rename to app/MindWork AI Studio/Dialogs/ConfirmDialog.razor diff --git a/app/MindWork AI Studio/Components/CommonDialogs/ConfirmDialog.razor.cs b/app/MindWork AI Studio/Dialogs/ConfirmDialog.razor.cs similarity index 91% rename from app/MindWork AI Studio/Components/CommonDialogs/ConfirmDialog.razor.cs rename to app/MindWork AI Studio/Dialogs/ConfirmDialog.razor.cs index d75d6a8..05fd6be 100644 --- a/app/MindWork AI Studio/Components/CommonDialogs/ConfirmDialog.razor.cs +++ b/app/MindWork AI Studio/Dialogs/ConfirmDialog.razor.cs @@ -1,6 +1,6 @@ using Microsoft.AspNetCore.Components; -namespace AIStudio.Components.CommonDialogs; +namespace AIStudio.Dialogs; /// /// A confirmation dialog that can be used to ask the user for confirmation. diff --git a/app/MindWork AI Studio/Components/CommonDialogs/DialogOptions.cs b/app/MindWork AI Studio/Dialogs/DialogOptions.cs similarity index 90% rename from app/MindWork AI Studio/Components/CommonDialogs/DialogOptions.cs rename to app/MindWork AI Studio/Dialogs/DialogOptions.cs index 02a0e8c..0f8e97f 100644 --- a/app/MindWork AI Studio/Components/CommonDialogs/DialogOptions.cs +++ b/app/MindWork AI Studio/Dialogs/DialogOptions.cs @@ -1,4 +1,4 @@ -namespace AIStudio.Components.CommonDialogs; +namespace AIStudio.Dialogs; public static class DialogOptions { diff --git a/app/MindWork AI Studio/Components/CommonDialogs/SingleInputDialog.razor b/app/MindWork AI Studio/Dialogs/SingleInputDialog.razor similarity index 100% rename from app/MindWork AI Studio/Components/CommonDialogs/SingleInputDialog.razor rename to app/MindWork AI Studio/Dialogs/SingleInputDialog.razor diff --git a/app/MindWork AI Studio/Components/CommonDialogs/SingleInputDialog.razor.cs b/app/MindWork AI Studio/Dialogs/SingleInputDialog.razor.cs similarity index 96% rename from app/MindWork AI Studio/Components/CommonDialogs/SingleInputDialog.razor.cs rename to app/MindWork AI Studio/Dialogs/SingleInputDialog.razor.cs index 7f35056..5b0e8e8 100644 --- a/app/MindWork AI Studio/Components/CommonDialogs/SingleInputDialog.razor.cs +++ b/app/MindWork AI Studio/Dialogs/SingleInputDialog.razor.cs @@ -2,7 +2,7 @@ using AIStudio.Settings; using Microsoft.AspNetCore.Components; -namespace AIStudio.Components.CommonDialogs; +namespace AIStudio.Dialogs; public partial class SingleInputDialog : ComponentBase { diff --git a/app/MindWork AI Studio/Components/CommonDialogs/UpdateDialog.razor b/app/MindWork AI Studio/Dialogs/UpdateDialog.razor similarity index 95% rename from app/MindWork AI Studio/Components/CommonDialogs/UpdateDialog.razor rename to app/MindWork AI Studio/Dialogs/UpdateDialog.razor index 8054449..f355142 100644 --- a/app/MindWork AI Studio/Components/CommonDialogs/UpdateDialog.razor +++ b/app/MindWork AI Studio/Dialogs/UpdateDialog.razor @@ -1,4 +1,3 @@ -@using AIStudio.Tools diff --git a/app/MindWork AI Studio/Components/CommonDialogs/UpdateDialog.razor.cs b/app/MindWork AI Studio/Dialogs/UpdateDialog.razor.cs similarity index 94% rename from app/MindWork AI Studio/Components/CommonDialogs/UpdateDialog.razor.cs rename to app/MindWork AI Studio/Dialogs/UpdateDialog.razor.cs index 340788d..dccad89 100644 --- a/app/MindWork AI Studio/Components/CommonDialogs/UpdateDialog.razor.cs +++ b/app/MindWork AI Studio/Dialogs/UpdateDialog.razor.cs @@ -4,7 +4,7 @@ using AIStudio.Tools; using Microsoft.AspNetCore.Components; -namespace AIStudio.Components.CommonDialogs; +namespace AIStudio.Dialogs; /// /// The update dialog that is used to inform the user about an available update. diff --git a/app/MindWork AI Studio/Components/CommonDialogs/WorkspaceSelectionDialog.razor b/app/MindWork AI Studio/Dialogs/WorkspaceSelectionDialog.razor similarity index 100% rename from app/MindWork AI Studio/Components/CommonDialogs/WorkspaceSelectionDialog.razor rename to app/MindWork AI Studio/Dialogs/WorkspaceSelectionDialog.razor diff --git a/app/MindWork AI Studio/Components/CommonDialogs/WorkspaceSelectionDialog.razor.cs b/app/MindWork AI Studio/Dialogs/WorkspaceSelectionDialog.razor.cs similarity index 97% rename from app/MindWork AI Studio/Components/CommonDialogs/WorkspaceSelectionDialog.razor.cs rename to app/MindWork AI Studio/Dialogs/WorkspaceSelectionDialog.razor.cs index b958229..f123fc8 100644 --- a/app/MindWork AI Studio/Components/CommonDialogs/WorkspaceSelectionDialog.razor.cs +++ b/app/MindWork AI Studio/Dialogs/WorkspaceSelectionDialog.razor.cs @@ -4,7 +4,7 @@ using AIStudio.Settings; using Microsoft.AspNetCore.Components; -namespace AIStudio.Components.CommonDialogs; +namespace AIStudio.Dialogs; public partial class WorkspaceSelectionDialog : ComponentBase { diff --git a/app/MindWork AI Studio/Dialogs/_Imports.razor b/app/MindWork AI Studio/Dialogs/_Imports.razor new file mode 100644 index 0000000..584bbf9 --- /dev/null +++ b/app/MindWork AI Studio/Dialogs/_Imports.razor @@ -0,0 +1,4 @@ +@using AIStudio +@using AIStudio.Components +@using AIStudio.Tools +@using MudBlazor \ No newline at end of file diff --git a/app/MindWork AI Studio/Components/Layout/MainLayout.razor b/app/MindWork AI Studio/Layout/MainLayout.razor similarity index 97% rename from app/MindWork AI Studio/Components/Layout/MainLayout.razor rename to app/MindWork AI Studio/Layout/MainLayout.razor index 63c4a46..9fbb328 100644 --- a/app/MindWork AI Studio/Components/Layout/MainLayout.razor +++ b/app/MindWork AI Studio/Layout/MainLayout.razor @@ -1,4 +1,7 @@ @using AIStudio.Settings.DataModel +@using Microsoft.AspNetCore.Components.Routing +@using MudBlazor + @inherits LayoutComponentBase diff --git a/app/MindWork AI Studio/Components/Layout/MainLayout.razor.cs b/app/MindWork AI Studio/Layout/MainLayout.razor.cs similarity index 94% rename from app/MindWork AI Studio/Components/Layout/MainLayout.razor.cs rename to app/MindWork AI Studio/Layout/MainLayout.razor.cs index 1755189..11fa724 100644 --- a/app/MindWork AI Studio/Components/Layout/MainLayout.razor.cs +++ b/app/MindWork AI Studio/Layout/MainLayout.razor.cs @@ -1,14 +1,15 @@ -using AIStudio.Components.CommonDialogs; +using AIStudio.Dialogs; using AIStudio.Settings; using AIStudio.Settings.DataModel; using AIStudio.Tools; +using AIStudio.Tools.Services; using Microsoft.AspNetCore.Components; using Microsoft.AspNetCore.Components.Routing; -using DialogOptions = AIStudio.Components.CommonDialogs.DialogOptions; +using DialogOptions = AIStudio.Dialogs.DialogOptions; -namespace AIStudio.Components.Layout; +namespace AIStudio.Layout; public partial class MainLayout : LayoutComponentBase, IMessageBusReceiver, IDisposable { @@ -51,12 +52,12 @@ public partial class MainLayout : LayoutComponentBase, IMessageBusReceiver, IDis private static readonly IReadOnlyCollection NAV_ITEMS = new List { - new("Home", Icons.Material.Filled.Home, Color.Default, Pages.Path.HOME, true), - new("Chat", Icons.Material.Filled.Chat, Color.Default, Pages.Path.CHAT, false), - new("Assistants", Icons.Material.Filled.Apps, Color.Default, Pages.Path.ASSISTANTS, false), - new("Supporters", Icons.Material.Filled.Favorite, Color.Error, Pages.Path.SUPPORTERS, false), - new("About", Icons.Material.Filled.Info, Color.Default, Pages.Path.ABOUT, false), - new("Settings", Icons.Material.Filled.Settings, Color.Default, Pages.Path.SETTINGS, false), + new("Home", Icons.Material.Filled.Home, Color.Default, Routes.HOME, true), + new("Chat", Icons.Material.Filled.Chat, Color.Default, Routes.CHAT, false), + new("Assistants", Icons.Material.Filled.Apps, Color.Default, Routes.ASSISTANTS, false), + new("Supporters", Icons.Material.Filled.Favorite, Color.Error, Routes.SUPPORTERS, false), + new("About", Icons.Material.Filled.Info, Color.Default, Routes.ABOUT, false), + new("Settings", Icons.Material.Filled.Settings, Color.Default, Routes.SETTINGS, false), }; #region Overrides of ComponentBase diff --git a/app/MindWork AI Studio/Layout/NavBarItem.cs b/app/MindWork AI Studio/Layout/NavBarItem.cs new file mode 100644 index 0000000..d76a806 --- /dev/null +++ b/app/MindWork AI Studio/Layout/NavBarItem.cs @@ -0,0 +1,3 @@ +namespace AIStudio.Layout; + +public record NavBarItem(string Name, string Icon, Color IconColor, string Path, bool MatchAll); \ No newline at end of file diff --git a/app/MindWork AI Studio/Components/Pages/About.razor b/app/MindWork AI Studio/Pages/About.razor similarity index 99% rename from app/MindWork AI Studio/Components/Pages/About.razor rename to app/MindWork AI Studio/Pages/About.razor index 41b8f81..5f4f6d1 100644 --- a/app/MindWork AI Studio/Components/Pages/About.razor +++ b/app/MindWork AI Studio/Pages/About.razor @@ -1,5 +1,4 @@ -@attribute [Route(Path.ABOUT)] -@using AIStudio.Tools +@attribute [Route(Routes.ABOUT)] About MindWork AI Studio diff --git a/app/MindWork AI Studio/Components/Pages/About.razor.cs b/app/MindWork AI Studio/Pages/About.razor.cs similarity index 99% rename from app/MindWork AI Studio/Components/Pages/About.razor.cs rename to app/MindWork AI Studio/Pages/About.razor.cs index e9f74fe..5c31a69 100644 --- a/app/MindWork AI Studio/Components/Pages/About.razor.cs +++ b/app/MindWork AI Studio/Pages/About.razor.cs @@ -4,7 +4,7 @@ using AIStudio.Tools; using Microsoft.AspNetCore.Components; -namespace AIStudio.Components.Pages; +namespace AIStudio.Pages; public partial class About : ComponentBase { diff --git a/app/MindWork AI Studio/Components/Pages/Assistants.razor b/app/MindWork AI Studio/Pages/Assistants.razor similarity index 77% rename from app/MindWork AI Studio/Components/Pages/Assistants.razor rename to app/MindWork AI Studio/Pages/Assistants.razor index 9b8bb42..82acbfe 100644 --- a/app/MindWork AI Studio/Components/Pages/Assistants.razor +++ b/app/MindWork AI Studio/Pages/Assistants.razor @@ -1,4 +1,4 @@ -@attribute [Route(Path.ASSISTANTS)] +@attribute [Route(Routes.ASSISTANTS)] Assistants @@ -10,25 +10,25 @@ General - - - - + + + + Business - - + + Software Engineering - + \ No newline at end of file diff --git a/app/MindWork AI Studio/Pages/Assistants.razor.cs b/app/MindWork AI Studio/Pages/Assistants.razor.cs new file mode 100644 index 0000000..0a8b343 --- /dev/null +++ b/app/MindWork AI Studio/Pages/Assistants.razor.cs @@ -0,0 +1,5 @@ +using Microsoft.AspNetCore.Components; + +namespace AIStudio.Pages; + +public partial class Assistants : ComponentBase; \ No newline at end of file diff --git a/app/MindWork AI Studio/Components/Pages/Chat.razor b/app/MindWork AI Studio/Pages/Chat.razor similarity index 99% rename from app/MindWork AI Studio/Components/Pages/Chat.razor rename to app/MindWork AI Studio/Pages/Chat.razor index 612897d..d8e2d99 100644 --- a/app/MindWork AI Studio/Components/Pages/Chat.razor +++ b/app/MindWork AI Studio/Pages/Chat.razor @@ -1,4 +1,4 @@ -@attribute [Route(Path.CHAT)] +@attribute [Route(Routes.CHAT)] @using AIStudio.Chat @using AIStudio.Settings.DataModel diff --git a/app/MindWork AI Studio/Components/Pages/Chat.razor.cs b/app/MindWork AI Studio/Pages/Chat.razor.cs similarity index 94% rename from app/MindWork AI Studio/Components/Pages/Chat.razor.cs rename to app/MindWork AI Studio/Pages/Chat.razor.cs index 7cf84d9..9d22184 100644 --- a/app/MindWork AI Studio/Components/Pages/Chat.razor.cs +++ b/app/MindWork AI Studio/Pages/Chat.razor.cs @@ -1,6 +1,6 @@ using AIStudio.Chat; -using AIStudio.Components.Blocks; -using AIStudio.Components.CommonDialogs; +using AIStudio.Components; +using AIStudio.Dialogs; using AIStudio.Provider; using AIStudio.Settings; using AIStudio.Settings.DataModel; @@ -9,9 +9,9 @@ using AIStudio.Tools; using Microsoft.AspNetCore.Components; using Microsoft.AspNetCore.Components.Web; -using DialogOptions = AIStudio.Components.CommonDialogs.DialogOptions; +using DialogOptions = AIStudio.Dialogs.DialogOptions; -namespace AIStudio.Components.Pages; +namespace AIStudio.Pages; /// /// The chat page. @@ -268,11 +268,11 @@ public partial class Chat : MSGComponentBase, IAsyncDisposable string chatPath; if (this.chatThread.WorkspaceId == Guid.Empty) { - chatPath = System.IO.Path.Join(SettingsManager.DataDirectory, "tempChats", this.chatThread.ChatId.ToString()); + chatPath = Path.Join(SettingsManager.DataDirectory, "tempChats", this.chatThread.ChatId.ToString()); } else { - chatPath = System.IO.Path.Join(SettingsManager.DataDirectory, "workspaces", this.chatThread.WorkspaceId.ToString(), this.chatThread.ChatId.ToString()); + chatPath = Path.Join(SettingsManager.DataDirectory, "workspaces", this.chatThread.WorkspaceId.ToString(), this.chatThread.ChatId.ToString()); } await this.workspaces.DeleteChat(chatPath, askForConfirmation: false, unloadChat: true); @@ -345,12 +345,12 @@ public partial class Chat : MSGComponentBase, IAsyncDisposable if (this.chatThread!.WorkspaceId == Guid.Empty) { // Case: The chat is stored in the temporary storage: - await this.workspaces.DeleteChat(System.IO.Path.Join(SettingsManager.DataDirectory, "tempChats", this.chatThread.ChatId.ToString()), askForConfirmation: false, unloadChat: false); + await this.workspaces.DeleteChat(Path.Join(SettingsManager.DataDirectory, "tempChats", this.chatThread.ChatId.ToString()), askForConfirmation: false, unloadChat: false); } else { // Case: The chat is stored in a workspace. - await this.workspaces.DeleteChat(System.IO.Path.Join(SettingsManager.DataDirectory, "workspaces", this.chatThread.WorkspaceId.ToString(), this.chatThread.ChatId.ToString()), askForConfirmation: false, unloadChat: false); + await this.workspaces.DeleteChat(Path.Join(SettingsManager.DataDirectory, "workspaces", this.chatThread.WorkspaceId.ToString(), this.chatThread.ChatId.ToString()), askForConfirmation: false, unloadChat: false); } this.chatThread!.WorkspaceId = workspaceId; diff --git a/app/MindWork AI Studio/Components/Pages/Home.razor b/app/MindWork AI Studio/Pages/Home.razor similarity index 96% rename from app/MindWork AI Studio/Components/Pages/Home.razor rename to app/MindWork AI Studio/Pages/Home.razor index 34d2080..a86b837 100644 --- a/app/MindWork AI Studio/Components/Pages/Home.razor +++ b/app/MindWork AI Studio/Pages/Home.razor @@ -1,5 +1,4 @@ -@attribute [Route(Path.HOME)] -@using AIStudio.Tools +@attribute [Route(Routes.HOME)] Let's get started diff --git a/app/MindWork AI Studio/Components/Pages/Home.razor.cs b/app/MindWork AI Studio/Pages/Home.razor.cs similarity index 98% rename from app/MindWork AI Studio/Components/Pages/Home.razor.cs rename to app/MindWork AI Studio/Pages/Home.razor.cs index 5e79609..3202f46 100644 --- a/app/MindWork AI Studio/Components/Pages/Home.razor.cs +++ b/app/MindWork AI Studio/Pages/Home.razor.cs @@ -1,8 +1,10 @@ -using AIStudio.Components.Blocks; +using AIStudio.Components; using Microsoft.AspNetCore.Components; -namespace AIStudio.Components.Pages; +using Changelog = AIStudio.Components.Changelog; + +namespace AIStudio.Pages; public partial class Home : ComponentBase { diff --git a/app/MindWork AI Studio/Components/Pages/Settings.razor b/app/MindWork AI Studio/Pages/Settings.razor similarity index 99% rename from app/MindWork AI Studio/Components/Pages/Settings.razor rename to app/MindWork AI Studio/Pages/Settings.razor index 19bcd2f..7c6145e 100644 --- a/app/MindWork AI Studio/Components/Pages/Settings.razor +++ b/app/MindWork AI Studio/Pages/Settings.razor @@ -1,9 +1,8 @@ -@attribute [Route(Path.SETTINGS)] -@using AIStudio.Components.Pages.Coding -@using AIStudio.Components.Pages.TextSummarizer +@attribute [Route(Routes.SETTINGS)] +@using AIStudio.Assistants.Coding +@using AIStudio.Assistants.TextSummarizer @using AIStudio.Provider @using AIStudio.Settings -@using AIStudio.Tools @using Host = AIStudio.Provider.SelfHosted.Host Settings diff --git a/app/MindWork AI Studio/Components/Pages/Settings.razor.cs b/app/MindWork AI Studio/Pages/Settings.razor.cs similarity index 97% rename from app/MindWork AI Studio/Components/Pages/Settings.razor.cs rename to app/MindWork AI Studio/Pages/Settings.razor.cs index 1d72669..fee38ab 100644 --- a/app/MindWork AI Studio/Components/Pages/Settings.razor.cs +++ b/app/MindWork AI Studio/Pages/Settings.razor.cs @@ -1,15 +1,15 @@ -using AIStudio.Components.CommonDialogs; +using AIStudio.Dialogs; using AIStudio.Provider; using AIStudio.Settings; using AIStudio.Tools; using Microsoft.AspNetCore.Components; -using DialogOptions = AIStudio.Components.CommonDialogs.DialogOptions; +using DialogOptions = AIStudio.Dialogs.DialogOptions; // ReSharper disable ClassNeverInstantiated.Global -namespace AIStudio.Components.Pages; +namespace AIStudio.Pages; public partial class Settings : ComponentBase, IMessageBusReceiver, IDisposable { diff --git a/app/MindWork AI Studio/Components/Pages/Supporters.razor b/app/MindWork AI Studio/Pages/Supporters.razor similarity index 97% rename from app/MindWork AI Studio/Components/Pages/Supporters.razor rename to app/MindWork AI Studio/Pages/Supporters.razor index 2cf9d06..760be05 100644 --- a/app/MindWork AI Studio/Components/Pages/Supporters.razor +++ b/app/MindWork AI Studio/Pages/Supporters.razor @@ -1,4 +1,4 @@ -@attribute [Route(Path.SUPPORTERS)] +@attribute [Route(Routes.SUPPORTERS)] Supporters diff --git a/app/MindWork AI Studio/Components/Pages/Supporters.razor.cs b/app/MindWork AI Studio/Pages/Supporters.razor.cs similarity index 70% rename from app/MindWork AI Studio/Components/Pages/Supporters.razor.cs rename to app/MindWork AI Studio/Pages/Supporters.razor.cs index 90c0fad..45065ad 100644 --- a/app/MindWork AI Studio/Components/Pages/Supporters.razor.cs +++ b/app/MindWork AI Studio/Pages/Supporters.razor.cs @@ -1,6 +1,6 @@ using Microsoft.AspNetCore.Components; -namespace AIStudio.Components.Pages; +namespace AIStudio.Pages; public partial class Supporters : ComponentBase { diff --git a/app/MindWork AI Studio/Pages/_Imports.razor b/app/MindWork AI Studio/Pages/_Imports.razor new file mode 100644 index 0000000..8831463 --- /dev/null +++ b/app/MindWork AI Studio/Pages/_Imports.razor @@ -0,0 +1,5 @@ +@using AIStudio +@using AIStudio.Components +@using AIStudio.Tools +@using Microsoft.AspNetCore.Components.Routing +@using MudBlazor \ No newline at end of file diff --git a/app/MindWork AI Studio/Program.cs b/app/MindWork AI Studio/Program.cs index 5bc114a..8e8441b 100644 --- a/app/MindWork AI Studio/Program.cs +++ b/app/MindWork AI Studio/Program.cs @@ -1,8 +1,8 @@ using AIStudio; using AIStudio.Agents; -using AIStudio.Components; using AIStudio.Settings; using AIStudio.Tools; +using AIStudio.Tools.Services; using MudBlazor.Services; diff --git a/app/MindWork AI Studio/Components/Routes.razor b/app/MindWork AI Studio/Routes.razor similarity index 66% rename from app/MindWork AI Studio/Components/Routes.razor rename to app/MindWork AI Studio/Routes.razor index fca6735..4a026ad 100644 --- a/app/MindWork AI Studio/Components/Routes.razor +++ b/app/MindWork AI Studio/Routes.razor @@ -1,4 +1,7 @@ - +@using Microsoft.AspNetCore.Components.Routing +@using MudBlazor + + diff --git a/app/MindWork AI Studio/Components/Pages/Path.cs b/app/MindWork AI Studio/Routes.razor.cs similarity index 84% rename from app/MindWork AI Studio/Components/Pages/Path.cs rename to app/MindWork AI Studio/Routes.razor.cs index 99d31e5..3d77083 100644 --- a/app/MindWork AI Studio/Components/Pages/Path.cs +++ b/app/MindWork AI Studio/Routes.razor.cs @@ -1,6 +1,6 @@ -namespace AIStudio.Components.Pages; +namespace AIStudio; -public static class Path +public sealed partial class Routes { public const string HOME = "/"; public const string CHAT = "/chat"; @@ -9,6 +9,7 @@ public static class Path public const string SETTINGS = "/settings"; public const string SUPPORTERS = "/supporters"; + // ReSharper disable InconsistentNaming public const string ASSISTANT_TRANSLATION = "/assistant/translation"; public const string ASSISTANT_REWRITE = "/assistant/rewrite-improve"; public const string ASSISTANT_ICON_FINDER = "/assistant/icons"; @@ -16,4 +17,5 @@ public static class Path public const string ASSISTANT_SUMMARIZER = "/assistant/summarizer"; public const string ASSISTANT_CODING = "/assistant/coding"; public const string ASSISTANT_AGENDA = "/assistant/agenda"; -} + // ReSharper restore InconsistentNaming +} \ No newline at end of file diff --git a/app/MindWork AI Studio/Settings/ConfigurationSelectData.cs b/app/MindWork AI Studio/Settings/ConfigurationSelectData.cs index 6293844..d3873d5 100644 --- a/app/MindWork AI Studio/Settings/ConfigurationSelectData.cs +++ b/app/MindWork AI Studio/Settings/ConfigurationSelectData.cs @@ -1,8 +1,8 @@ -using AIStudio.Components.Pages.Agenda; -using AIStudio.Components.Pages.Coding; -using AIStudio.Components.Pages.IconFinder; -using AIStudio.Components.Pages.RewriteImprove; -using AIStudio.Components.Pages.TextSummarizer; +using AIStudio.Assistants.Agenda; +using AIStudio.Assistants.Coding; +using AIStudio.Assistants.IconFinder; +using AIStudio.Assistants.RewriteImprove; +using AIStudio.Assistants.TextSummarizer; using AIStudio.Settings.DataModel; using AIStudio.Tools; diff --git a/app/MindWork AI Studio/Settings/DataModel/DataAgenda.cs b/app/MindWork AI Studio/Settings/DataModel/DataAgenda.cs index 4ab8ae7..aa59871 100644 --- a/app/MindWork AI Studio/Settings/DataModel/DataAgenda.cs +++ b/app/MindWork AI Studio/Settings/DataModel/DataAgenda.cs @@ -1,4 +1,4 @@ -using AIStudio.Components.Pages.Agenda; +using AIStudio.Assistants.Agenda; using AIStudio.Tools; namespace AIStudio.Settings.DataModel; diff --git a/app/MindWork AI Studio/Settings/DataModel/DataCoding.cs b/app/MindWork AI Studio/Settings/DataModel/DataCoding.cs index 052c319..7608f61 100644 --- a/app/MindWork AI Studio/Settings/DataModel/DataCoding.cs +++ b/app/MindWork AI Studio/Settings/DataModel/DataCoding.cs @@ -1,4 +1,4 @@ -using AIStudio.Components.Pages.Coding; +using AIStudio.Assistants.Coding; namespace AIStudio.Settings.DataModel; diff --git a/app/MindWork AI Studio/Settings/DataModel/DataIconFinder.cs b/app/MindWork AI Studio/Settings/DataModel/DataIconFinder.cs index d47c3df..6a0257e 100644 --- a/app/MindWork AI Studio/Settings/DataModel/DataIconFinder.cs +++ b/app/MindWork AI Studio/Settings/DataModel/DataIconFinder.cs @@ -1,4 +1,4 @@ -using AIStudio.Components.Pages.IconFinder; +using AIStudio.Assistants.IconFinder; namespace AIStudio.Settings.DataModel; diff --git a/app/MindWork AI Studio/Settings/DataModel/DataRewriteImprove.cs b/app/MindWork AI Studio/Settings/DataModel/DataRewriteImprove.cs index 19fe925..7be49dc 100644 --- a/app/MindWork AI Studio/Settings/DataModel/DataRewriteImprove.cs +++ b/app/MindWork AI Studio/Settings/DataModel/DataRewriteImprove.cs @@ -1,4 +1,4 @@ -using AIStudio.Components.Pages.RewriteImprove; +using AIStudio.Assistants.RewriteImprove; using AIStudio.Tools; namespace AIStudio.Settings.DataModel; diff --git a/app/MindWork AI Studio/Settings/DataModel/DataTextSummarizer.cs b/app/MindWork AI Studio/Settings/DataModel/DataTextSummarizer.cs index e6ee9ea..b3ad839 100644 --- a/app/MindWork AI Studio/Settings/DataModel/DataTextSummarizer.cs +++ b/app/MindWork AI Studio/Settings/DataModel/DataTextSummarizer.cs @@ -1,4 +1,4 @@ -using AIStudio.Components.Pages.TextSummarizer; +using AIStudio.Assistants.TextSummarizer; using AIStudio.Tools; namespace AIStudio.Settings.DataModel; diff --git a/app/MindWork AI Studio/Settings/DataModel/PreviousModels/DataV1V3.cs b/app/MindWork AI Studio/Settings/DataModel/PreviousModels/DataV1V3.cs index b19c7b4..3419ccb 100644 --- a/app/MindWork AI Studio/Settings/DataModel/PreviousModels/DataV1V3.cs +++ b/app/MindWork AI Studio/Settings/DataModel/PreviousModels/DataV1V3.cs @@ -1,6 +1,6 @@ -using AIStudio.Components.Pages.Coding; -using AIStudio.Components.Pages.IconFinder; -using AIStudio.Components.Pages.TextSummarizer; +using AIStudio.Assistants.Coding; +using AIStudio.Assistants.IconFinder; +using AIStudio.Assistants.TextSummarizer; using AIStudio.Tools; namespace AIStudio.Settings.DataModel.PreviousModels; diff --git a/app/MindWork AI Studio/Settings/ProviderDialog.razor b/app/MindWork AI Studio/Settings/ProviderDialog.razor index 9d850e4..3a64b92 100644 --- a/app/MindWork AI Studio/Settings/ProviderDialog.razor +++ b/app/MindWork AI Studio/Settings/ProviderDialog.razor @@ -1,7 +1,7 @@ +@using AIStudio.Components @using AIStudio.Provider @using AIStudio.Provider.SelfHosted @using MudBlazor -@using AIStudio.Components.Blocks diff --git a/app/MindWork AI Studio/Tools/JsRuntimeExtensions.cs b/app/MindWork AI Studio/Tools/JsRuntimeExtensions.cs index 7264fc0..f7f4c00 100644 --- a/app/MindWork AI Studio/Tools/JsRuntimeExtensions.cs +++ b/app/MindWork AI Studio/Tools/JsRuntimeExtensions.cs @@ -1,4 +1,4 @@ -using AIStudio.Components; +using AIStudio.Assistants; namespace AIStudio.Tools; @@ -6,7 +6,7 @@ public static class JsRuntimeExtensions { public static async Task GenerateAndShowDiff(this IJSRuntime jsRuntime, string text1, string text2) { - await jsRuntime.InvokeVoidAsync("generateDiff", text1, text2, AssistantBase.ASSISTANT_RESULT_DIV_ID, AssistantBase.AFTER_RESULT_DIV_ID); + await jsRuntime.InvokeVoidAsync("generateDiff", text1, text2, AssistantBase.RESULT_DIV_ID, AssistantBase.AFTER_RESULT_DIV_ID); } public static async Task ClearDiv(this IJSRuntime jsRuntime, string divId) diff --git a/app/MindWork AI Studio/Components/Pages/SendTo.cs b/app/MindWork AI Studio/Tools/SendTo.cs similarity index 86% rename from app/MindWork AI Studio/Components/Pages/SendTo.cs rename to app/MindWork AI Studio/Tools/SendTo.cs index 8694667..477f3b6 100644 --- a/app/MindWork AI Studio/Components/Pages/SendTo.cs +++ b/app/MindWork AI Studio/Tools/SendTo.cs @@ -1,4 +1,4 @@ -namespace AIStudio.Components.Pages; +namespace AIStudio.Tools; public enum SendTo { diff --git a/app/MindWork AI Studio/Tools/SendToButton.cs b/app/MindWork AI Studio/Tools/SendToButton.cs index 2bce3ce..bc6e1ac 100644 --- a/app/MindWork AI Studio/Tools/SendToButton.cs +++ b/app/MindWork AI Studio/Tools/SendToButton.cs @@ -1,5 +1,3 @@ -using AIStudio.Components.Pages; - namespace AIStudio.Tools; public readonly record struct SendToButton() : IButtonData diff --git a/app/MindWork AI Studio/Components/Pages/SendToExtensions.cs b/app/MindWork AI Studio/Tools/SendToExtensions.cs similarity index 95% rename from app/MindWork AI Studio/Components/Pages/SendToExtensions.cs rename to app/MindWork AI Studio/Tools/SendToExtensions.cs index 49699aa..9e8a360 100644 --- a/app/MindWork AI Studio/Components/Pages/SendToExtensions.cs +++ b/app/MindWork AI Studio/Tools/SendToExtensions.cs @@ -1,4 +1,4 @@ -namespace AIStudio.Components.Pages; +namespace AIStudio.Tools; public static class SendToExtensions { diff --git a/app/MindWork AI Studio/MarkdownClipboardService.cs b/app/MindWork AI Studio/Tools/Services/MarkdownClipboardService.cs similarity index 87% rename from app/MindWork AI Studio/MarkdownClipboardService.cs rename to app/MindWork AI Studio/Tools/Services/MarkdownClipboardService.cs index 3d9740c..126c13f 100644 --- a/app/MindWork AI Studio/MarkdownClipboardService.cs +++ b/app/MindWork AI Studio/Tools/Services/MarkdownClipboardService.cs @@ -1,11 +1,9 @@ -using AIStudio.Tools; - // ReSharper disable ClassNeverInstantiated.Global -namespace AIStudio; +namespace AIStudio.Tools.Services; /// -/// Wire up the clipboard service to copy markdown to the clipboard. +/// Wire up the clipboard service to copy Markdown to the clipboard. /// We use our own Rust-based clipboard service for this. /// public sealed class MarkdownClipboardService(Rust rust, IJSRuntime jsRuntime, ISnackbar snackbar) : IMudMarkdownClipboardService diff --git a/app/MindWork AI Studio/Tools/TemporaryChatService.cs b/app/MindWork AI Studio/Tools/Services/TemporaryChatService.cs similarity index 98% rename from app/MindWork AI Studio/Tools/TemporaryChatService.cs rename to app/MindWork AI Studio/Tools/Services/TemporaryChatService.cs index 0e76279..0290298 100644 --- a/app/MindWork AI Studio/Tools/TemporaryChatService.cs +++ b/app/MindWork AI Studio/Tools/Services/TemporaryChatService.cs @@ -1,7 +1,7 @@ using AIStudio.Settings; using AIStudio.Settings.DataModel; -namespace AIStudio.Tools; +namespace AIStudio.Tools.Services; public class TemporaryChatService(SettingsManager settingsManager) : BackgroundService { diff --git a/app/MindWork AI Studio/Tools/UpdateService.cs b/app/MindWork AI Studio/Tools/Services/UpdateService.cs similarity index 99% rename from app/MindWork AI Studio/Tools/UpdateService.cs rename to app/MindWork AI Studio/Tools/Services/UpdateService.cs index 6f6c07d..c8cfef6 100644 --- a/app/MindWork AI Studio/Tools/UpdateService.cs +++ b/app/MindWork AI Studio/Tools/Services/UpdateService.cs @@ -3,7 +3,7 @@ using AIStudio.Settings.DataModel; using Microsoft.AspNetCore.Components; -namespace AIStudio.Tools; +namespace AIStudio.Tools.Services; public sealed class UpdateService : BackgroundService, IMessageBusReceiver { diff --git a/app/MindWork AI Studio/build.nu b/app/MindWork AI Studio/build.nu index 3fc3a05..3f791db 100755 --- a/app/MindWork AI Studio/build.nu +++ b/app/MindWork AI Studio/build.nu @@ -43,7 +43,7 @@ def "main metadata" []: nothing -> nothing { update_tauri_version update_project_commit_hash update_license_year "../../LICENSE.md" - update_license_year "Components/Pages/About.razor.cs" + update_license_year "Pages/About.razor.cs" } def "main fix_web_assets" []: nothing -> nothing { @@ -370,11 +370,11 @@ def update_changelog []: nothing -> nothing { let code = ($"LOGS = \n($tab)[\n($code_rows)\n($tab)];") # Next, update the Changelog.Logs.cs file: - let changelog_logs_source_file = open --raw "Components/Blocks/Changelog.Logs.cs" + let changelog_logs_source_file = open --raw "Components/Changelog.Logs.cs" let result = $changelog_logs_source_file | str replace --regex '(?ms)LOGS =\s+\[[\w\s".,-:()?]+\];' $code # Save the updated file: - $result | save --raw --force "Components/Blocks/Changelog.Logs.cs" + $result | save --raw --force "Components/Changelog.Logs.cs" let number_change_logs = $table | length print $"Updated Changelog.Logs.cs with ($number_change_logs) change logs." diff --git a/app/MindWork AI Studio/wwwroot/changelog/v0.8.11.md b/app/MindWork AI Studio/wwwroot/changelog/v0.8.11.md index 4b068c2..8381961 100644 --- a/app/MindWork AI Studio/wwwroot/changelog/v0.8.11.md +++ b/app/MindWork AI Studio/wwwroot/changelog/v0.8.11.md @@ -1,2 +1,3 @@ # v0.8.11, build 173 -- Fixed a bug where the chats in the workspace component were not sorted by date. \ No newline at end of file +- Fixed a bug where the chats in the workspace component were not sorted by date. +- Refactored code base to improve maintainability. \ No newline at end of file