Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Apollo.Client/Apollo.Client.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" />
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" />
<PackageReference Include="Microsoft.Extensions.Configuration.FileExtensions" />
<PackageReference Include="Mythetech.Components.WebAssembly" />
<PackageReference Include="Mythetech.Framework.WebAssembly" />
<PackageReference Include="System.Reflection.MetadataLoadContext" />
<PackageReference Include="System.Security.Permissions" />
<PackageReference Include="xunit" />
Expand Down
7 changes: 4 additions & 3 deletions Apollo.Client/Program.cs
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,13 @@
using Apollo.Client.Code;
using Apollo.Client.Hosting;
using Apollo.Client.Infrastructure;
using Apollo.Components;
using Apollo.Components.Analysis;
using Apollo.Components.Code;
using Apollo.Components.Hosting;
using Apollo.Components.Infrastructure;
using Apollo.Components.Infrastructure.Environment;
using Apollo.Components.Infrastructure.MessageBus;
using Mythetech.Framework.Infrastructure.MessageBus;
using Apollo.Infrastructure.Resources;

var builder = WebAssemblyHostBuilder.CreateDefault(args);
Expand All @@ -19,7 +20,7 @@

builder.Services.AddScoped(sp => new HttpClient { BaseAddress = new Uri(builder.HostEnvironment.BaseAddress) });

builder.Services.AddMessageBus(typeof(Program).Assembly, typeof(IConsumer<>).Assembly);
builder.Services.AddMessageBus(typeof(Program).Assembly, typeof(AppState).Assembly, typeof(IConsumer<>).Assembly);

builder.Services.AddSingleton<IRuntimeEnvironment, WebAssemblyRuntimeEnvironment>();

Expand All @@ -33,6 +34,6 @@

var app = builder.Build();

app.Services.UseMessageBus(typeof(Program).Assembly, typeof(IConsumer<>).Assembly);
app.Services.UseMessageBus(typeof(Program).Assembly, typeof(AppState).Assembly, typeof(IConsumer<>).Assembly);

await app.RunAsync();
2 changes: 1 addition & 1 deletion Apollo.Client/wwwroot/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<base href="/" />
<link rel="stylesheet" href="css/app.css" />
<link href="_content/MudBlazor/MudBlazor.min.css" rel="stylesheet" />
<link href="_content/Mythetech.Components/mythetech.css" rel="stylesheet" />
<link href="_content/Mythetech.Framework/mythetech.css" rel="stylesheet" />
<link rel="stylesheet" href="_content/Apollo.Components/app.css" />
<link href="https://fonts.googleapis.com/css2?family=Gotu&display=swap" rel="stylesheet">

Expand Down
2 changes: 1 addition & 1 deletion Apollo.Components/Analysis/CodeAnalysisState.cs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
using System.Text.Json;
using Apollo.Components.Console;
using Apollo.Components.Infrastructure.MessageBus;
using Mythetech.Framework.Infrastructure.MessageBus;
using Apollo.Components.NuGet;
using Apollo.Components.Solutions;
using Apollo.Contracts.Analysis;
Expand Down
2 changes: 1 addition & 1 deletion Apollo.Components/Apollo.Components.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<PackageReference Include="KristofferStrube.Blazor.FileSystemAccess" />
<PackageReference Include="Microsoft.FluentUI.AspNetCore.Components" />
<PackageReference Include="Microsoft.TestPlatform.ObjectModel" />
<PackageReference Include="Mythetech.Components" />
<PackageReference Include="Mythetech.Framework" />
<PackageReference Include="NUnit" />
<PackageReference Include="OmniSharp.Abstractions" />
<PackageReference Include="xunit.extensibility.execution" />
Expand Down
2 changes: 1 addition & 1 deletion Apollo.Components/Code/ActiveTypeState.cs
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
using System.Reflection;
using Apollo.Components.Infrastructure.MessageBus;
using Mythetech.Framework.Infrastructure.MessageBus;
using Apollo.Components.Solutions.Events;

namespace Apollo.Components.Code;
Expand Down
2 changes: 1 addition & 1 deletion Apollo.Components/Code/CompilerState.cs
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
using Apollo.Components.Analysis;
using Apollo.Components.Console;
using Apollo.Components.DynamicTabs.Commands;
using Apollo.Components.Infrastructure.MessageBus;
using Mythetech.Framework.Infrastructure.MessageBus;
using Apollo.Components.NuGet;
using Apollo.Components.Solutions;
using Apollo.Components.Solutions.Events;
Expand Down
2 changes: 1 addition & 1 deletion Apollo.Components/Code/Consumers/ConsoleProjectBuilder.cs
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
using Apollo.Components.DynamicTabs.Commands;
using Apollo.Components.Infrastructure.MessageBus;
using Mythetech.Framework.Infrastructure.MessageBus;
using Apollo.Components.Solutions;
using Apollo.Components.Solutions.Commands;
using Apollo.Contracts.Solutions;
Expand Down
2 changes: 1 addition & 1 deletion Apollo.Components/Code/Consumers/ConsoleRunner.cs
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
using Apollo.Components.DynamicTabs.Commands;
using Apollo.Components.Infrastructure.MessageBus;
using Mythetech.Framework.Infrastructure.MessageBus;
using Apollo.Components.Solutions;
using Apollo.Components.Solutions.Commands;
using Apollo.Contracts.Solutions;
Expand Down
2 changes: 1 addition & 1 deletion Apollo.Components/Code/Consumers/LibraryProjectBuilder.cs
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
using Apollo.Components.DynamicTabs.Commands;
using Apollo.Components.Infrastructure.MessageBus;
using Mythetech.Framework.Infrastructure.MessageBus;
using Apollo.Components.Solutions;
using Apollo.Components.Solutions.Commands;
using Apollo.Contracts.Solutions;
Expand Down
2 changes: 1 addition & 1 deletion Apollo.Components/Code/Consumers/LibraryRunner.cs
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
using Apollo.Components.DynamicTabs.Commands;
using Apollo.Components.Infrastructure.MessageBus;
using Mythetech.Framework.Infrastructure.MessageBus;
using Apollo.Components.Solutions;
using Apollo.Components.Solutions.Commands;
using Apollo.Contracts.Solutions;
Expand Down
2 changes: 1 addition & 1 deletion Apollo.Components/DynamicClient/ClientPreviewTab.razor
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
@using Apollo.Components.DynamicClient.Commands
@using Apollo.Components.Hosting
@using Apollo.Components.Hosting.Commands
@using Apollo.Components.Infrastructure.MessageBus
@using Mythetech.Framework.Infrastructure.MessageBus
@using Apollo.Components.Shared
@using Apollo.Components.Solutions
@using Apollo.Components.Solutions.Commands
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
using Apollo.Components.DynamicTabs;
using Apollo.Components.DynamicTabs.Commands;
using Apollo.Components.Hosting.Events;
using Apollo.Components.Infrastructure.MessageBus;
using Mythetech.Framework.Infrastructure.MessageBus;
using Apollo.Components.Solutions;

namespace Apollo.Components.DynamicClient.Consumers;
Expand Down
2 changes: 1 addition & 1 deletion Apollo.Components/DynamicTabs/Consumers/DockCloser.cs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
using Apollo.Components.DynamicTabs.Commands;
using Apollo.Components.Editor;
using Apollo.Components.Infrastructure.MessageBus;
using Mythetech.Framework.Infrastructure.MessageBus;

namespace Apollo.Components.DynamicTabs.Consumers;

Expand Down
2 changes: 1 addition & 1 deletion Apollo.Components/DynamicTabs/Consumers/DockOpener.cs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
using Apollo.Components.DynamicTabs.Commands;
using Apollo.Components.Editor;
using Apollo.Components.Infrastructure.MessageBus;
using Mythetech.Framework.Infrastructure.MessageBus;

namespace Apollo.Components.DynamicTabs.Consumers;

Expand Down
2 changes: 1 addition & 1 deletion Apollo.Components/DynamicTabs/Consumers/DockedTabHider.cs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
using Apollo.Components.DynamicTabs.Commands;
using Apollo.Components.Editor;
using Apollo.Components.Infrastructure.MessageBus;
using Mythetech.Framework.Infrastructure.MessageBus;

namespace Apollo.Components.DynamicTabs.Consumers;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
using Apollo.Components.DynamicTabs.Commands;
using Apollo.Components.Editor;
using Apollo.Components.Infrastructure.MessageBus;
using Mythetech.Framework.Infrastructure.MessageBus;

namespace Apollo.Components.DynamicTabs.Consumers;

Expand Down
2 changes: 1 addition & 1 deletion Apollo.Components/DynamicTabs/Consumers/TabFocuser.cs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
using Apollo.Components.DynamicTabs.Commands;
using Apollo.Components.Editor;
using Apollo.Components.Infrastructure.MessageBus;
using Mythetech.Framework.Infrastructure.MessageBus;

namespace Apollo.Components.DynamicTabs.Consumers;

Expand Down
2 changes: 1 addition & 1 deletion Apollo.Components/DynamicTabs/Consumers/TabHider.cs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
using Apollo.Components.DynamicTabs.Commands;
using Apollo.Components.Editor;
using Apollo.Components.Infrastructure.MessageBus;
using Mythetech.Framework.Infrastructure.MessageBus;

namespace Apollo.Components.DynamicTabs.Consumers;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
using Apollo.Components.DynamicTabs.Commands;
using Apollo.Components.Editor;
using Apollo.Components.Infrastructure.MessageBus;
using Mythetech.Framework.Infrastructure.MessageBus;

namespace Apollo.Components.DynamicTabs.Consumers;

Expand Down
2 changes: 1 addition & 1 deletion Apollo.Components/DynamicTabs/TabDropZone.razor
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
@using Apollo.Components.DynamicTabs.Commands
@using Microsoft.JSInterop
@using Apollo.Components.Editor
@using Apollo.Components.Infrastructure.MessageBus
@using Mythetech.Framework.Infrastructure.MessageBus
@using Apollo.Components.Shared
@using Apollo.Components.Theme
@inherits Apollo.Components.Infrastructure.ApolloBaseComponent
Expand Down
2 changes: 1 addition & 1 deletion Apollo.Components/DynamicTabs/TabMenu.razor
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
@using Apollo.Components.DynamicTabs.Commands
@using Apollo.Components.Editor
@using Apollo.Components.Infrastructure.MessageBus
@using Mythetech.Framework.Infrastructure.MessageBus
@using Apollo.Components.Theme
@using Apollo.Components.Shared
@using MouseEvent = MudBlazor.MouseEvent
Expand Down
2 changes: 1 addition & 1 deletion Apollo.Components/Editor/ApolloCodeEditor.razor
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
@using Command = BlazorMonaco.Languages.Command
@using InsertTextRule = BlazorMonaco.Languages
@implements IDisposable
@inherits Apollo.Components.Infrastructure.MessageBus.ComponentConsumer<Apollo.Components.Settings.Events.SettingsModelChanged<EditorSettings>>
@inherits Mythetech.Framework.Infrastructure.MessageBus.ComponentConsumer<Apollo.Components.Settings.Events.SettingsModelChanged<EditorSettings>>

<StandaloneCodeEditor @ref="_editor" Id="apollo-editor" ConstructionOptions="@DefaultOptions" OnDidInit="Initialize" OnDidChangeModelContent="OnModelDidChangeHandler" />

Expand Down
2 changes: 1 addition & 1 deletion Apollo.Components/Editor/ApolloMenu.razor
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@using Apollo.Components.Infrastructure.MessageBus
@using Mythetech.Framework.Infrastructure.MessageBus
@using Apollo.Components.Settings
@using Apollo.Components.Settings.Commands
@using Apollo.Components.Shared
Expand Down
2 changes: 1 addition & 1 deletion Apollo.Components/Editor/EditMenu.razor
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@using Apollo.Components.Infrastructure.MessageBus
@using Mythetech.Framework.Infrastructure.MessageBus
@using Apollo.Components.Solutions.Commands
@using Apollo.Components.Solutions.Consumers
@using Apollo.Components.Theme
Expand Down
2 changes: 1 addition & 1 deletion Apollo.Components/Editor/FileMenu.razor
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@using Apollo.Components.Infrastructure.MessageBus
@using Mythetech.Framework.Infrastructure.MessageBus
@using Apollo.Components.Solutions.Commands
@using Apollo.Components.Solutions.Consumers
@using Apollo.Components.Theme
Expand Down
2 changes: 1 addition & 1 deletion Apollo.Components/Editor/Home.razor
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
@using Apollo.Components.Infrastructure.Keyboard
@using KeyCode = Microsoft.FluentUI.AspNetCore.Components.KeyCode
@using Apollo.Components.Solutions.Commands
@using Apollo.Components.Infrastructure.MessageBus
@using Mythetech.Framework.Infrastructure.MessageBus
@using Apollo.Components.Terminal
@using Apollo.Components.DynamicTabs.Commands
@using Apollo.Components.Settings.Commands
Expand Down
2 changes: 1 addition & 1 deletion Apollo.Components/Editor/ToolsMenu.razor
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@using Apollo.Components.Infrastructure.MessageBus
@using Mythetech.Framework.Infrastructure.MessageBus
@using Apollo.Components.Infrastructure.Environment
@using Apollo.Components.NuGet.Commands
@using Apollo.Components.Tools.Commands
Expand Down
2 changes: 1 addition & 1 deletion Apollo.Components/Editor/ViewMenu.razor
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
@using Apollo.Components.DynamicTabs
@using Apollo.Components.DynamicTabs.Commands
@using Apollo.Components.Infrastructure.MessageBus
@using Mythetech.Framework.Infrastructure.MessageBus
@using Apollo.Components.Theme
@using MouseEvent = MudBlazor.MouseEvent

Expand Down
2 changes: 1 addition & 1 deletion Apollo.Components/Hosting/Consumers/HostingShutdown.cs
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
using Apollo.Components.Hosting.Commands;
using Apollo.Components.Infrastructure.MessageBus;
using Mythetech.Framework.Infrastructure.MessageBus;

namespace Apollo.Components.Hosting.Consumers;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
using Apollo.Components.DynamicTabs;
using Apollo.Components.DynamicTabs.Commands;
using Apollo.Components.Infrastructure.MessageBus;
using Mythetech.Framework.Infrastructure.MessageBus;
using Apollo.Components.Solutions;
using Apollo.Components.Solutions.Commands;
using Apollo.Contracts.Solutions;
Expand Down
2 changes: 1 addition & 1 deletion Apollo.Components/Hosting/IHostingService.cs
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
using Apollo.Components.Console;
using Apollo.Components.DynamicTabs.Commands;
using Apollo.Components.Hosting.Events;
using Apollo.Components.Infrastructure.MessageBus;
using Mythetech.Framework.Infrastructure.MessageBus;
using Apollo.Components.NuGet;
using Apollo.Components.Solutions;
using Apollo.Contracts.Hosting;
Expand Down
2 changes: 1 addition & 1 deletion Apollo.Components/Hosting/WebApiRouteTab.razor
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
@using Apollo.Components.DynamicTabs
@using Apollo.Components.DynamicTabs.Commands
@using Apollo.Components.Hosting.Commands
@using Apollo.Components.Infrastructure.MessageBus
@using Mythetech.Framework.Infrastructure.MessageBus
@using Apollo.Components.Shared
@using Apollo.Components.Shared.ApolloNotificationBar
@using Apollo.Components.Solutions
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
using Apollo.Components.DynamicTabs.Commands;
using Apollo.Components.Hosting.Commands;
using Apollo.Components.Infrastructure.MessageBus;
using Mythetech.Framework.Infrastructure.MessageBus;
using Apollo.Components.Settings.Commands;
using Apollo.Components.Solutions.Commands;
using Microsoft.FluentUI.AspNetCore.Components;
Expand Down

This file was deleted.

Loading
Loading