From 426dbf27b39a706df96735e1b465716c5b2aa353 Mon Sep 17 00:00:00 2001 From: Thorsten Sommer Date: Mon, 19 Aug 2024 21:04:05 +0200 Subject: [PATCH] Refactored pages into their own namespace --- .../Assistants/Agenda/AssistantAgenda.razor.cs | 1 - app/MindWork AI Studio/Assistants/AssistantBase.razor | 1 - .../Assistants/AssistantBase.razor.cs | 1 - .../Assistants/Coding/AssistantCoding.razor.cs | 1 - .../GrammarSpelling/AssistantGrammarSpelling.razor.cs | 1 - .../IconFinder/AssistantIconFinder.razor.cs | 1 - .../RewriteImprove/AssistantRewriteImprove.razor.cs | 1 - .../TextSummarizer/AssistantTextSummarizer.razor.cs | 1 - .../Translation/AssistantTranslation.razor.cs | 1 - .../Components/Pages/Assistants.razor.cs | 5 ----- .../{Components => }/Pages/About.razor | 1 - .../{Components => }/Pages/About.razor.cs | 2 +- .../{Components => }/Pages/Assistants.razor | 0 app/MindWork AI Studio/Pages/Assistants.razor.cs | 5 +++++ .../{Components => }/Pages/Chat.razor | 0 .../{Components => }/Pages/Chat.razor.cs | 3 ++- .../{Components => }/Pages/Home.razor | 1 - .../{Components => }/Pages/Home.razor.cs | 2 +- .../{Components => }/Pages/Settings.razor | 1 - .../{Components => }/Pages/Settings.razor.cs | 2 +- .../{Components => }/Pages/Supporters.razor | 0 .../{Components => }/Pages/Supporters.razor.cs | 2 +- app/MindWork AI Studio/Pages/_Imports.razor | 11 +++++++++++ .../{Components/Pages => Tools}/SendTo.cs | 2 +- app/MindWork AI Studio/Tools/SendToButton.cs | 2 -- .../{Components/Pages => Tools}/SendToExtensions.cs | 2 +- 26 files changed, 24 insertions(+), 26 deletions(-) delete mode 100644 app/MindWork AI Studio/Components/Pages/Assistants.razor.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 (100%) create mode 100644 app/MindWork AI Studio/Pages/Assistants.razor.cs rename app/MindWork AI Studio/{Components => }/Pages/Chat.razor (100%) rename app/MindWork AI Studio/{Components => }/Pages/Chat.razor.cs (99%) rename app/MindWork AI Studio/{Components => }/Pages/Home.razor (98%) rename app/MindWork AI Studio/{Components => }/Pages/Home.razor.cs (99%) rename app/MindWork AI Studio/{Components => }/Pages/Settings.razor (99%) rename app/MindWork AI Studio/{Components => }/Pages/Settings.razor.cs (99%) rename app/MindWork AI Studio/{Components => }/Pages/Supporters.razor (100%) 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/Pages => Tools}/SendTo.cs (86%) rename app/MindWork AI Studio/{Components/Pages => Tools}/SendToExtensions.cs (95%) diff --git a/app/MindWork AI Studio/Assistants/Agenda/AssistantAgenda.razor.cs b/app/MindWork AI Studio/Assistants/Agenda/AssistantAgenda.razor.cs index 14ea8331..c6d9acb6 100644 --- a/app/MindWork AI Studio/Assistants/Agenda/AssistantAgenda.razor.cs +++ b/app/MindWork AI Studio/Assistants/Agenda/AssistantAgenda.razor.cs @@ -1,7 +1,6 @@ using System.Text; using AIStudio.Chat; -using AIStudio.Components.Pages; using AIStudio.Tools; namespace AIStudio.Assistants.Agenda; diff --git a/app/MindWork AI Studio/Assistants/AssistantBase.razor b/app/MindWork AI Studio/Assistants/AssistantBase.razor index 60c560d3..5534a58f 100644 --- a/app/MindWork AI Studio/Assistants/AssistantBase.razor +++ b/app/MindWork AI Studio/Assistants/AssistantBase.razor @@ -1,5 +1,4 @@ @using AIStudio.Chat -@using AIStudio.Components.Pages @(this.Title) diff --git a/app/MindWork AI Studio/Assistants/AssistantBase.razor.cs b/app/MindWork AI Studio/Assistants/AssistantBase.razor.cs index 668a283c..3d17fa85 100644 --- a/app/MindWork AI Studio/Assistants/AssistantBase.razor.cs +++ b/app/MindWork AI Studio/Assistants/AssistantBase.razor.cs @@ -1,5 +1,4 @@ using AIStudio.Chat; -using AIStudio.Components.Pages; using AIStudio.Provider; using AIStudio.Settings; using AIStudio.Tools; diff --git a/app/MindWork AI Studio/Assistants/Coding/AssistantCoding.razor.cs b/app/MindWork AI Studio/Assistants/Coding/AssistantCoding.razor.cs index 3f8f461e..660ae8f0 100644 --- a/app/MindWork AI Studio/Assistants/Coding/AssistantCoding.razor.cs +++ b/app/MindWork AI Studio/Assistants/Coding/AssistantCoding.razor.cs @@ -1,6 +1,5 @@ using System.Text; -using AIStudio.Components.Pages; using AIStudio.Tools; namespace AIStudio.Assistants.Coding; diff --git a/app/MindWork AI Studio/Assistants/GrammarSpelling/AssistantGrammarSpelling.razor.cs b/app/MindWork AI Studio/Assistants/GrammarSpelling/AssistantGrammarSpelling.razor.cs index add44121..b650f861 100644 --- a/app/MindWork AI Studio/Assistants/GrammarSpelling/AssistantGrammarSpelling.razor.cs +++ b/app/MindWork AI Studio/Assistants/GrammarSpelling/AssistantGrammarSpelling.razor.cs @@ -1,5 +1,4 @@ using AIStudio.Chat; -using AIStudio.Components.Pages; using AIStudio.Tools; namespace AIStudio.Assistants.GrammarSpelling; diff --git a/app/MindWork AI Studio/Assistants/IconFinder/AssistantIconFinder.razor.cs b/app/MindWork AI Studio/Assistants/IconFinder/AssistantIconFinder.razor.cs index 829636f1..c45dce41 100644 --- a/app/MindWork AI Studio/Assistants/IconFinder/AssistantIconFinder.razor.cs +++ b/app/MindWork AI Studio/Assistants/IconFinder/AssistantIconFinder.razor.cs @@ -1,4 +1,3 @@ -using AIStudio.Components.Pages; using AIStudio.Tools; namespace AIStudio.Assistants.IconFinder; diff --git a/app/MindWork AI Studio/Assistants/RewriteImprove/AssistantRewriteImprove.razor.cs b/app/MindWork AI Studio/Assistants/RewriteImprove/AssistantRewriteImprove.razor.cs index ee3b9c87..5d7e3e83 100644 --- a/app/MindWork AI Studio/Assistants/RewriteImprove/AssistantRewriteImprove.razor.cs +++ b/app/MindWork AI Studio/Assistants/RewriteImprove/AssistantRewriteImprove.razor.cs @@ -1,5 +1,4 @@ using AIStudio.Chat; -using AIStudio.Components.Pages; using AIStudio.Tools; namespace AIStudio.Assistants.RewriteImprove; diff --git a/app/MindWork AI Studio/Assistants/TextSummarizer/AssistantTextSummarizer.razor.cs b/app/MindWork AI Studio/Assistants/TextSummarizer/AssistantTextSummarizer.razor.cs index 19f95166..5d120c86 100644 --- a/app/MindWork AI Studio/Assistants/TextSummarizer/AssistantTextSummarizer.razor.cs +++ b/app/MindWork AI Studio/Assistants/TextSummarizer/AssistantTextSummarizer.razor.cs @@ -1,5 +1,4 @@ using AIStudio.Chat; -using AIStudio.Components.Pages; using AIStudio.Tools; namespace AIStudio.Assistants.TextSummarizer; diff --git a/app/MindWork AI Studio/Assistants/Translation/AssistantTranslation.razor.cs b/app/MindWork AI Studio/Assistants/Translation/AssistantTranslation.razor.cs index 6aee9036..97b3ed3b 100644 --- a/app/MindWork AI Studio/Assistants/Translation/AssistantTranslation.razor.cs +++ b/app/MindWork AI Studio/Assistants/Translation/AssistantTranslation.razor.cs @@ -1,5 +1,4 @@ using AIStudio.Chat; -using AIStudio.Components.Pages; using AIStudio.Tools; namespace AIStudio.Assistants.Translation; 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 9a71f4ef..00000000 --- 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/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 65317383..3bb3ff94 100644 --- a/app/MindWork AI Studio/Components/Pages/About.razor +++ b/app/MindWork AI Studio/Pages/About.razor @@ -1,5 +1,4 @@ @attribute [Route(PagePath.ABOUT)] -@using AIStudio.Tools 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 e9f74fea..5c31a69a 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 100% rename from app/MindWork AI Studio/Components/Pages/Assistants.razor rename to app/MindWork AI Studio/Pages/Assistants.razor 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 00000000..0a8b3430 --- /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 100% rename from app/MindWork AI Studio/Components/Pages/Chat.razor rename to app/MindWork AI Studio/Pages/Chat.razor diff --git a/app/MindWork AI Studio/Components/Pages/Chat.razor.cs b/app/MindWork AI Studio/Pages/Chat.razor.cs similarity index 99% rename from app/MindWork AI Studio/Components/Pages/Chat.razor.cs rename to app/MindWork AI Studio/Pages/Chat.razor.cs index 07189767..cb53fe3e 100644 --- a/app/MindWork AI Studio/Components/Pages/Chat.razor.cs +++ b/app/MindWork AI Studio/Pages/Chat.razor.cs @@ -1,4 +1,5 @@ using AIStudio.Chat; +using AIStudio.Components; using AIStudio.Components.Blocks; using AIStudio.Dialogs; using AIStudio.Provider; @@ -11,7 +12,7 @@ using Microsoft.AspNetCore.Components.Web; using DialogOptions = AIStudio.Dialogs.DialogOptions; -namespace AIStudio.Components.Pages; +namespace AIStudio.Pages; /// /// The chat page. diff --git a/app/MindWork AI Studio/Components/Pages/Home.razor b/app/MindWork AI Studio/Pages/Home.razor similarity index 98% rename from app/MindWork AI Studio/Components/Pages/Home.razor rename to app/MindWork AI Studio/Pages/Home.razor index 5590307e..a0b865a0 100644 --- a/app/MindWork AI Studio/Components/Pages/Home.razor +++ b/app/MindWork AI Studio/Pages/Home.razor @@ -1,5 +1,4 @@ @attribute [Route(PagePath.HOME)] -@using AIStudio.Tools 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 99% rename from app/MindWork AI Studio/Components/Pages/Home.razor.cs rename to app/MindWork AI Studio/Pages/Home.razor.cs index 5e796093..a370eea0 100644 --- a/app/MindWork AI Studio/Components/Pages/Home.razor.cs +++ b/app/MindWork AI Studio/Pages/Home.razor.cs @@ -2,7 +2,7 @@ using AIStudio.Components.Blocks; using Microsoft.AspNetCore.Components; -namespace AIStudio.Components.Pages; +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 e029143f..007d727f 100644 --- a/app/MindWork AI Studio/Components/Pages/Settings.razor +++ b/app/MindWork AI Studio/Pages/Settings.razor @@ -3,7 +3,6 @@ @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 99% rename from app/MindWork AI Studio/Components/Pages/Settings.razor.cs rename to app/MindWork AI Studio/Pages/Settings.razor.cs index aee842ac..fee38abb 100644 --- a/app/MindWork AI Studio/Components/Pages/Settings.razor.cs +++ b/app/MindWork AI Studio/Pages/Settings.razor.cs @@ -9,7 +9,7 @@ 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 100% rename from app/MindWork AI Studio/Components/Pages/Supporters.razor rename to app/MindWork AI Studio/Pages/Supporters.razor 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 90c0fad1..45065ad9 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 00000000..702a7c45 --- /dev/null +++ b/app/MindWork AI Studio/Pages/_Imports.razor @@ -0,0 +1,11 @@ +@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.Tools +@using AIStudio.Components +@using AIStudio.Components.Blocks +@using MudBlazor \ No newline at end of file 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 86946673..477f3b6e 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 2bce3ce0..bc6e1acf 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 49699aa0..9e8a360a 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 {