diff --git a/app/MindWork AI Studio/Components/Layout/MainLayout.razor.cs b/app/MindWork AI Studio/Components/Layout/MainLayout.razor.cs index abc206cb..17551892 100644 --- a/app/MindWork AI Studio/Components/Layout/MainLayout.razor.cs +++ b/app/MindWork AI Studio/Components/Layout/MainLayout.razor.cs @@ -51,12 +51,12 @@ public partial class MainLayout : LayoutComponentBase, IMessageBusReceiver, IDis private static readonly IReadOnlyCollection NAV_ITEMS = new List { - new("Home", Icons.Material.Filled.Home, Color.Default, "/", true), - new("Chat", Icons.Material.Filled.Chat, Color.Default, "/chat", false), - new("Assistants", Icons.Material.Filled.Apps, Color.Default ,"/assistants", false), - new("Supporters", Icons.Material.Filled.Favorite, Color.Error ,"/supporters", false), - new("About", Icons.Material.Filled.Info, Color.Default ,"/about", false), - new("Settings", Icons.Material.Filled.Settings, Color.Default ,"/settings", false), + 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), }; #region Overrides of ComponentBase diff --git a/app/MindWork AI Studio/Components/Pages/About.razor b/app/MindWork AI Studio/Components/Pages/About.razor index 02f6ab71..41b8f81b 100644 --- a/app/MindWork AI Studio/Components/Pages/About.razor +++ b/app/MindWork AI Studio/Components/Pages/About.razor @@ -1,4 +1,4 @@ -@page "/about" +@attribute [Route(Path.ABOUT)] @using AIStudio.Tools About MindWork AI Studio diff --git a/app/MindWork AI Studio/Components/Pages/Agenda/AssistantAgenda.razor b/app/MindWork AI Studio/Components/Pages/Agenda/AssistantAgenda.razor index 5674dbf5..499ae17c 100644 --- a/app/MindWork AI Studio/Components/Pages/Agenda/AssistantAgenda.razor +++ b/app/MindWork AI Studio/Components/Pages/Agenda/AssistantAgenda.razor @@ -1,4 +1,4 @@ -@page "/assistant/agenda" +@attribute [Route(Path.ASSISTANT_AGENDA)] @using AIStudio.Tools @inherits AssistantBaseCore diff --git a/app/MindWork AI Studio/Components/Pages/Assistants.razor b/app/MindWork AI Studio/Components/Pages/Assistants.razor index b57af180..9b8bb425 100644 --- a/app/MindWork AI Studio/Components/Pages/Assistants.razor +++ b/app/MindWork AI Studio/Components/Pages/Assistants.razor @@ -1,4 +1,4 @@ -@page "/assistants" +@attribute [Route(Path.ASSISTANTS)] Assistants @@ -10,25 +10,25 @@ General - - - - + + + + Business - - + + Software Engineering - + \ No newline at end of file diff --git a/app/MindWork AI Studio/Components/Pages/Chat.razor b/app/MindWork AI Studio/Components/Pages/Chat.razor index 7decafff..612897db 100644 --- a/app/MindWork AI Studio/Components/Pages/Chat.razor +++ b/app/MindWork AI Studio/Components/Pages/Chat.razor @@ -1,4 +1,4 @@ -@page "/chat" +@attribute [Route(Path.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/Components/Pages/Chat.razor.cs index b040d9f7..c52c4af6 100644 --- a/app/MindWork AI Studio/Components/Pages/Chat.razor.cs +++ b/app/MindWork AI Studio/Components/Pages/Chat.razor.cs @@ -250,11 +250,11 @@ public partial class Chat : MSGComponentBase, IAsyncDisposable string chatPath; if (this.chatThread.WorkspaceId == Guid.Empty) { - chatPath = Path.Join(SettingsManager.DataDirectory, "tempChats", this.chatThread.ChatId.ToString()); + chatPath = System.IO.Path.Join(SettingsManager.DataDirectory, "tempChats", this.chatThread.ChatId.ToString()); } else { - chatPath = Path.Join(SettingsManager.DataDirectory, "workspaces", this.chatThread.WorkspaceId.ToString(), this.chatThread.ChatId.ToString()); + chatPath = System.IO.Path.Join(SettingsManager.DataDirectory, "workspaces", this.chatThread.WorkspaceId.ToString(), this.chatThread.ChatId.ToString()); } await this.workspaces.DeleteChat(chatPath, askForConfirmation: false, unloadChat: true); @@ -327,12 +327,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(Path.Join(SettingsManager.DataDirectory, "tempChats", this.chatThread.ChatId.ToString()), askForConfirmation: false, unloadChat: false); + await this.workspaces.DeleteChat(System.IO.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(Path.Join(SettingsManager.DataDirectory, "workspaces", this.chatThread.WorkspaceId.ToString(), this.chatThread.ChatId.ToString()), askForConfirmation: false, unloadChat: false); + await this.workspaces.DeleteChat(System.IO.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/Coding/AssistantCoding.razor b/app/MindWork AI Studio/Components/Pages/Coding/AssistantCoding.razor index 9d110343..b387c4eb 100644 --- a/app/MindWork AI Studio/Components/Pages/Coding/AssistantCoding.razor +++ b/app/MindWork AI Studio/Components/Pages/Coding/AssistantCoding.razor @@ -1,4 +1,4 @@ -@page "/assistant/coding" +@attribute [Route(Path.ASSISTANT_CODING)] @inherits AssistantBaseCore diff --git a/app/MindWork AI Studio/Components/Pages/GrammarSpelling/AssistantGrammarSpelling.razor b/app/MindWork AI Studio/Components/Pages/GrammarSpelling/AssistantGrammarSpelling.razor index 647cb947..989ebce7 100644 --- a/app/MindWork AI Studio/Components/Pages/GrammarSpelling/AssistantGrammarSpelling.razor +++ b/app/MindWork AI Studio/Components/Pages/GrammarSpelling/AssistantGrammarSpelling.razor @@ -1,5 +1,5 @@ @using AIStudio.Tools -@page "/assistant/grammar-spelling" +@attribute [Route(Path.ASSISTANT_GRAMMAR_SPELLING)] @inherits AssistantBaseCore diff --git a/app/MindWork AI Studio/Components/Pages/Home.razor b/app/MindWork AI Studio/Components/Pages/Home.razor index 5064ac16..34d2080e 100644 --- a/app/MindWork AI Studio/Components/Pages/Home.razor +++ b/app/MindWork AI Studio/Components/Pages/Home.razor @@ -1,4 +1,4 @@ -@page "/" +@attribute [Route(Path.HOME)] @using AIStudio.Tools diff --git a/app/MindWork AI Studio/Components/Pages/IconFinder/AssistantIconFinder.razor b/app/MindWork AI Studio/Components/Pages/IconFinder/AssistantIconFinder.razor index 97dc5bc2..b6345ba6 100644 --- a/app/MindWork AI Studio/Components/Pages/IconFinder/AssistantIconFinder.razor +++ b/app/MindWork AI Studio/Components/Pages/IconFinder/AssistantIconFinder.razor @@ -1,4 +1,4 @@ -@page "/assistant/icons" +@attribute [Route(Path.ASSISTANT_ICON_FINDER)] @inherits AssistantBaseCore diff --git a/app/MindWork AI Studio/Components/Pages/Path.cs b/app/MindWork AI Studio/Components/Pages/Path.cs new file mode 100644 index 00000000..99d31e5a --- /dev/null +++ b/app/MindWork AI Studio/Components/Pages/Path.cs @@ -0,0 +1,19 @@ +namespace AIStudio.Components.Pages; + +public static class Path +{ + public const string HOME = "/"; + public const string CHAT = "/chat"; + public const string ABOUT = "/about"; + public const string ASSISTANTS = "/assistants"; + public const string SETTINGS = "/settings"; + public const string SUPPORTERS = "/supporters"; + + public const string ASSISTANT_TRANSLATION = "/assistant/translation"; + public const string ASSISTANT_REWRITE = "/assistant/rewrite-improve"; + public const string ASSISTANT_ICON_FINDER = "/assistant/icons"; + public const string ASSISTANT_GRAMMAR_SPELLING = "/assistant/grammar-spelling"; + public const string ASSISTANT_SUMMARIZER = "/assistant/summarizer"; + public const string ASSISTANT_CODING = "/assistant/coding"; + public const string ASSISTANT_AGENDA = "/assistant/agenda"; +} diff --git a/app/MindWork AI Studio/Components/Pages/RewriteImprove/AssistantRewriteImprove.razor b/app/MindWork AI Studio/Components/Pages/RewriteImprove/AssistantRewriteImprove.razor index ba6c2116..f8dd4ecd 100644 --- a/app/MindWork AI Studio/Components/Pages/RewriteImprove/AssistantRewriteImprove.razor +++ b/app/MindWork AI Studio/Components/Pages/RewriteImprove/AssistantRewriteImprove.razor @@ -1,5 +1,5 @@ @using AIStudio.Tools -@page "/assistant/rewrite-improve" +@attribute [Route(Path.ASSISTANT_REWRITE)] @inherits AssistantBaseCore diff --git a/app/MindWork AI Studio/Components/Pages/Settings.razor b/app/MindWork AI Studio/Components/Pages/Settings.razor index 55789d6d..19bcd2f9 100644 --- a/app/MindWork AI Studio/Components/Pages/Settings.razor +++ b/app/MindWork AI Studio/Components/Pages/Settings.razor @@ -1,4 +1,4 @@ -@page "/settings" +@attribute [Route(Path.SETTINGS)] @using AIStudio.Components.Pages.Coding @using AIStudio.Components.Pages.TextSummarizer @using AIStudio.Provider diff --git a/app/MindWork AI Studio/Components/Pages/Supporters.razor b/app/MindWork AI Studio/Components/Pages/Supporters.razor index 1ecc606a..2cf9d06d 100644 --- a/app/MindWork AI Studio/Components/Pages/Supporters.razor +++ b/app/MindWork AI Studio/Components/Pages/Supporters.razor @@ -1,4 +1,4 @@ -@page "/Supporters" +@attribute [Route(Path.SUPPORTERS)] Supporters diff --git a/app/MindWork AI Studio/Components/Pages/TextSummarizer/AssistantTextSummarizer.razor b/app/MindWork AI Studio/Components/Pages/TextSummarizer/AssistantTextSummarizer.razor index dc2b130b..d6045354 100644 --- a/app/MindWork AI Studio/Components/Pages/TextSummarizer/AssistantTextSummarizer.razor +++ b/app/MindWork AI Studio/Components/Pages/TextSummarizer/AssistantTextSummarizer.razor @@ -1,4 +1,4 @@ -@page "/assistant/summarizer" +@attribute [Route(Path.ASSISTANT_SUMMARIZER)] @using AIStudio.Tools @inherits AssistantBaseCore diff --git a/app/MindWork AI Studio/Components/Pages/Translation/AssistantTranslation.razor b/app/MindWork AI Studio/Components/Pages/Translation/AssistantTranslation.razor index df54b13d..b30c7130 100644 --- a/app/MindWork AI Studio/Components/Pages/Translation/AssistantTranslation.razor +++ b/app/MindWork AI Studio/Components/Pages/Translation/AssistantTranslation.razor @@ -1,4 +1,4 @@ -@page "/assistant/translation" +@attribute [Route(Path.ASSISTANT_TRANSLATION)] @using AIStudio.Tools @inherits AssistantBaseCore