From df5fe7c86e41235f99a9b0d69519a18581eddd5e Mon Sep 17 00:00:00 2001 From: Rory& Date: Thu, 8 Aug 2024 02:57:34 +0200 Subject: Further work --- ModerationClient/Views/ClientView.axaml | 42 ------- ModerationClient/Views/ClientView.axaml.cs | 27 ---- ModerationClient/Views/LoginView.axaml | 25 ---- ModerationClient/Views/LoginView.axaml.cs | 18 --- ModerationClient/Views/MainWindow.axaml | 42 ------- ModerationClient/Views/MainWindow.axaml.cs | 94 -------------- ModerationClient/Views/MainWindow/ClientView.axaml | 42 +++++++ .../Views/MainWindow/ClientView.axaml.cs | 27 ++++ ModerationClient/Views/MainWindow/LoginView.axaml | 23 ++++ .../Views/MainWindow/LoginView.axaml.cs | 18 +++ ModerationClient/Views/MainWindow/MainWindow.axaml | 39 ++++++ .../Views/MainWindow/MainWindow.axaml.cs | 124 +++++++++++++++++++ ModerationClient/Views/UserManagementWindow.axaml | 59 +++++++++ .../Views/UserManagementWindow.axaml.cs | 136 +++++++++++++++++++++ 14 files changed, 468 insertions(+), 248 deletions(-) delete mode 100644 ModerationClient/Views/ClientView.axaml delete mode 100644 ModerationClient/Views/ClientView.axaml.cs delete mode 100644 ModerationClient/Views/LoginView.axaml delete mode 100644 ModerationClient/Views/LoginView.axaml.cs delete mode 100644 ModerationClient/Views/MainWindow.axaml delete mode 100644 ModerationClient/Views/MainWindow.axaml.cs create mode 100644 ModerationClient/Views/MainWindow/ClientView.axaml create mode 100644 ModerationClient/Views/MainWindow/ClientView.axaml.cs create mode 100644 ModerationClient/Views/MainWindow/LoginView.axaml create mode 100644 ModerationClient/Views/MainWindow/LoginView.axaml.cs create mode 100644 ModerationClient/Views/MainWindow/MainWindow.axaml create mode 100644 ModerationClient/Views/MainWindow/MainWindow.axaml.cs create mode 100644 ModerationClient/Views/UserManagementWindow.axaml create mode 100644 ModerationClient/Views/UserManagementWindow.axaml.cs (limited to 'ModerationClient/Views') diff --git a/ModerationClient/Views/ClientView.axaml b/ModerationClient/Views/ClientView.axaml deleted file mode 100644 index 0ed8021..0000000 --- a/ModerationClient/Views/ClientView.axaml +++ /dev/null @@ -1,42 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/ModerationClient/Views/ClientView.axaml.cs b/ModerationClient/Views/ClientView.axaml.cs deleted file mode 100644 index 894e807..0000000 --- a/ModerationClient/Views/ClientView.axaml.cs +++ /dev/null @@ -1,27 +0,0 @@ -using Avalonia.Controls; -using Avalonia.Markup.Xaml; - -namespace ModerationClient.Views; - -public partial class ClientView : UserControl { - - public ClientView() { - InitializeComponent(); - - // PropertyChanged += (_, e) => { - // switch (e.Property.Name) { - // case nameof(Width): { - // //make sure all columns fit - // var grid = this.LogicalChildren.OfType().FirstOrDefault(); - // if(grid is null) { - // Console.WriteLine("Failed to find Grid in ClientView"); - // return; - // } - // Console.WriteLine($"ClientView width changed to {Width}"); - // var columns = grid.ColumnDefinitions; - // break; - // } - // } - // }; - } -} diff --git a/ModerationClient/Views/LoginView.axaml b/ModerationClient/Views/LoginView.axaml deleted file mode 100644 index 10e97c6..0000000 --- a/ModerationClient/Views/LoginView.axaml +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/ModerationClient/Views/LoginView.axaml.cs b/ModerationClient/Views/LoginView.axaml.cs deleted file mode 100644 index 5e84ace..0000000 --- a/ModerationClient/Views/LoginView.axaml.cs +++ /dev/null @@ -1,18 +0,0 @@ -using System; -using Avalonia.Controls; -using Avalonia.Interactivity; -using Avalonia.Markup.Xaml; -using ModerationClient.ViewModels; - -namespace ModerationClient.Views; - -public partial class LoginView : UserControl { - public LoginView() { - InitializeComponent(); - } - - // ReSharper disable once AsyncVoidMethod - private async void Login(object? _, RoutedEventArgs __) { - await (DataContext as LoginViewModel ?? throw new InvalidCastException("LoginView did not receive LoginViewModel?")).LoginAsync(); - } -} diff --git a/ModerationClient/Views/MainWindow.axaml b/ModerationClient/Views/MainWindow.axaml deleted file mode 100644 index 1c2b396..0000000 --- a/ModerationClient/Views/MainWindow.axaml +++ /dev/null @@ -1,42 +0,0 @@ - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/ModerationClient/Views/MainWindow.axaml.cs b/ModerationClient/Views/MainWindow.axaml.cs deleted file mode 100644 index 884e90c..0000000 --- a/ModerationClient/Views/MainWindow.axaml.cs +++ /dev/null @@ -1,94 +0,0 @@ -using System; -using Avalonia; -using Avalonia.Controls; -using Avalonia.Diagnostics; -using Avalonia.Input; -using Microsoft.Extensions.DependencyInjection; -using Microsoft.Extensions.Hosting; -using ModerationClient.Services; -using ModerationClient.ViewModels; - -namespace ModerationClient.Views; - -public partial class MainWindow : Window { - public MainWindow(CommandLineConfiguration cfg, MainWindowViewModel dataContext, IHostApplicationLifetime appLifetime) { - InitializeComponent(); - DataContext = dataContext; - _ = dataContext.AuthService.LoadProfileAsync(); - Console.WriteLine("mainwnd"); -#if DEBUG - this.AttachDevTools(new DevToolsOptions() { - ShowAsChildWindow = true, - LaunchView = DevToolsViewKind.LogicalTree, - }); -#endif - PropertyChanged += (sender, args) => { - // Console.WriteLine($"MainWindow PropertyChanged: {args.Property.Name} ({args.OldValue} -> {args.NewValue})"); - switch (args.Property.Name) { - case nameof(Height): - case nameof(Width): { - if (DataContext is not MainWindowViewModel viewModel) { - Console.WriteLine("WARN: MainWindowViewModel is null, ignoring height/width change!"); - return; - } - - // Console.WriteLine("height/width changed"); - viewModel.Scale = viewModel.Scale; - break; - } - } - }; - dataContext.AuthService.PropertyChanged += (sender, args) => { - if (args.PropertyName == nameof(MatrixAuthenticationService.IsLoggedIn)) { - if (dataContext.AuthService.IsLoggedIn) { - // dataContext.CurrentViewModel = new ClientViewModel(dataContext.AuthService); - dataContext.CurrentViewModel = App.Current.Host.Services.GetRequiredService(); - } - else { - dataContext.CurrentViewModel = new LoginViewModel(dataContext.AuthService); - } - } - }; - dataContext.MainWindow = this; - dataContext.Scale = cfg.Scale; - Width *= cfg.Scale; - Height *= cfg.Scale; - - appLifetime.ApplicationStopping.Register(() => { - Console.WriteLine("ApplicationStopping triggered"); - Close(); - }); - } - - protected override void OnKeyDown(KeyEventArgs e) => OnKeyDown(this, e); - - private void OnKeyDown(object? _, KeyEventArgs e) { - if (DataContext is not MainWindowViewModel viewModel) { - Console.WriteLine($"WARN: DataContext is {DataContext?.GetType().Name ?? "null"}, ignoring key press!"); - return; - } - - // Console.WriteLine("MainWindow KeyDown: " + e.Key); - if (e.Key == Key.Escape) { - viewModel.Scale = 1.0f; - } - else if (e.Key == Key.F1) { - viewModel.Scale -= 0.1f; - if (viewModel.Scale < 0.1f) { - viewModel.Scale = 0.1f; - } - } - else if (e.Key == Key.F2) { - viewModel.Scale += 0.1f; - if (viewModel.Scale > 5.0f) { - viewModel.Scale = 5.0f; - } - } - else if (e.Key == Key.K && e.KeyModifiers == KeyModifiers.Control) { - if(viewModel.CurrentViewModel is ClientViewModel clientViewModel) { - Console.WriteLine("QuickSwitcher invoked"); - } - else Console.WriteLine("WARN: CurrentViewModel is not ClientViewModel, ignoring Quick Switcher"); - } - } -} \ No newline at end of file diff --git a/ModerationClient/Views/MainWindow/ClientView.axaml b/ModerationClient/Views/MainWindow/ClientView.axaml new file mode 100644 index 0000000..ba030e4 --- /dev/null +++ b/ModerationClient/Views/MainWindow/ClientView.axaml @@ -0,0 +1,42 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/ModerationClient/Views/MainWindow/ClientView.axaml.cs b/ModerationClient/Views/MainWindow/ClientView.axaml.cs new file mode 100644 index 0000000..894e807 --- /dev/null +++ b/ModerationClient/Views/MainWindow/ClientView.axaml.cs @@ -0,0 +1,27 @@ +using Avalonia.Controls; +using Avalonia.Markup.Xaml; + +namespace ModerationClient.Views; + +public partial class ClientView : UserControl { + + public ClientView() { + InitializeComponent(); + + // PropertyChanged += (_, e) => { + // switch (e.Property.Name) { + // case nameof(Width): { + // //make sure all columns fit + // var grid = this.LogicalChildren.OfType().FirstOrDefault(); + // if(grid is null) { + // Console.WriteLine("Failed to find Grid in ClientView"); + // return; + // } + // Console.WriteLine($"ClientView width changed to {Width}"); + // var columns = grid.ColumnDefinitions; + // break; + // } + // } + // }; + } +} diff --git a/ModerationClient/Views/MainWindow/LoginView.axaml b/ModerationClient/Views/MainWindow/LoginView.axaml new file mode 100644 index 0000000..5dc6533 --- /dev/null +++ b/ModerationClient/Views/MainWindow/LoginView.axaml @@ -0,0 +1,23 @@ + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/ModerationClient/Views/MainWindow/LoginView.axaml.cs b/ModerationClient/Views/MainWindow/LoginView.axaml.cs new file mode 100644 index 0000000..5e84ace --- /dev/null +++ b/ModerationClient/Views/MainWindow/LoginView.axaml.cs @@ -0,0 +1,18 @@ +using System; +using Avalonia.Controls; +using Avalonia.Interactivity; +using Avalonia.Markup.Xaml; +using ModerationClient.ViewModels; + +namespace ModerationClient.Views; + +public partial class LoginView : UserControl { + public LoginView() { + InitializeComponent(); + } + + // ReSharper disable once AsyncVoidMethod + private async void Login(object? _, RoutedEventArgs __) { + await (DataContext as LoginViewModel ?? throw new InvalidCastException("LoginView did not receive LoginViewModel?")).LoginAsync(); + } +} diff --git a/ModerationClient/Views/MainWindow/MainWindow.axaml b/ModerationClient/Views/MainWindow/MainWindow.axaml new file mode 100644 index 0000000..ef13553 --- /dev/null +++ b/ModerationClient/Views/MainWindow/MainWindow.axaml @@ -0,0 +1,39 @@ + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/ModerationClient/Views/MainWindow/MainWindow.axaml.cs b/ModerationClient/Views/MainWindow/MainWindow.axaml.cs new file mode 100644 index 0000000..01027c1 --- /dev/null +++ b/ModerationClient/Views/MainWindow/MainWindow.axaml.cs @@ -0,0 +1,124 @@ +using System; +using Avalonia; +using Avalonia.Controls; +using Avalonia.Diagnostics; +using Avalonia.Input; +using Microsoft.Extensions.DependencyInjection; +using Microsoft.Extensions.Hosting; +using ModerationClient.Services; +using ModerationClient.ViewModels; + +namespace ModerationClient.Views.MainWindow; + +public partial class MainWindow : Window { + public MainWindow(CommandLineConfiguration cfg, MainWindowViewModel dataContext, IHostApplicationLifetime appLifetime) { + InitializeComponent(); + DataContext = dataContext; + _ = dataContext.AuthService.LoadProfileAsync().ContinueWith(x => { + if (x.IsFaulted) { + Console.WriteLine("Failed to load profile: " + x.Exception); + } + }); + Console.WriteLine("mainwnd"); +#if DEBUG + this.AttachDevTools(new DevToolsOptions() { + ShowAsChildWindow = true, + LaunchView = DevToolsViewKind.LogicalTree, + }); +#endif + PropertyChanged += (sender, args) => { + // Console.WriteLine($"MainWindow PropertyChanged: {args.Property.Name} ({args.OldValue} -> {args.NewValue})"); + switch (args.Property.Name) { + case nameof(ClientSize): { + if (DataContext is not MainWindowViewModel viewModel) { + Console.WriteLine("WARN: MainWindowViewModel is null, ignoring ClientSize change!"); + return; + } + + viewModel.PhysicalSize = new Size(ClientSize.Width, ClientSize.Height - TopPanel.Bounds.Height); + break; + } + } + }; + + TopPanel.PropertyChanged += (_, args) => { + if (args.Property.Name == nameof(Visual.Bounds)) { + if (DataContext is not MainWindowViewModel viewModel) { + Console.WriteLine("WARN: MainWindowViewModel is null, ignoring TopPanel.Bounds change!"); + return; + } + + viewModel.PhysicalSize = new Size(ClientSize.Width, ClientSize.Height - TopPanel.Bounds.Height); + } + }; + + dataContext.AuthService.PropertyChanged += (sender, args) => { + if (args.PropertyName == nameof(MatrixAuthenticationService.IsLoggedIn)) { + if (dataContext.AuthService.IsLoggedIn) { + // dataContext.CurrentViewModel = new ClientViewModel(dataContext.AuthService); + dataContext.CurrentViewModel = App.Current.Host.Services.GetRequiredService(); + var window = App.Current.Host.Services.GetRequiredService(); + window.Show(); + } + else { + dataContext.CurrentViewModel = new LoginViewModel(dataContext.AuthService); + } + } + }; + + dataContext.Scale = cfg.Scale; + Width *= cfg.Scale; + Height *= cfg.Scale; + + appLifetime.ApplicationStopping.Register(() => { + Console.WriteLine("ApplicationStopping triggered"); + Close(); + }); + } + + protected override void OnKeyDown(KeyEventArgs e) => OnKeyDown(this, e); + + private void OnKeyDown(object? _, KeyEventArgs e) { + if (DataContext is not MainWindowViewModel viewModel) { + Console.WriteLine($"WARN: DataContext is {DataContext?.GetType().Name ?? "null"}, ignoring key press!"); + return; + } + + // Console.WriteLine("MainWindow KeyDown: " + e.Key); + if (e.Key == Key.Escape) { + viewModel.Scale = 1.0f; + } + else if (e.Key == Key.F1) { + viewModel.Scale -= 0.1f; + if (viewModel.Scale < 0.1f) { + viewModel.Scale = 0.1f; + } + } + else if (e.Key == Key.F2) { + viewModel.Scale += 0.1f; + if (viewModel.Scale > 5.0f) { + viewModel.Scale = 5.0f; + } + } + else if (e.KeyModifiers == KeyModifiers.Control) { + if (e.Key == Key.K) { + if (viewModel.CurrentViewModel is ClientViewModel clientViewModel) { + Console.WriteLine("QuickSwitcher invoked"); + } + else Console.WriteLine("WARN: CurrentViewModel is not ClientViewModel, ignoring Quick Switcher"); + } + else if (e.Key == Key.U ) { + Console.WriteLine("UserManagementWindow invoked"); + var window = App.Current.Host.Services.GetRequiredService(); + window.Show(); + } + else if (e.Key == Key.F5) { + Console.WriteLine("Launching new process"); + System.Diagnostics.Process.Start(System.Diagnostics.Process.GetCurrentProcess().MainModule?.FileName, Environment.GetCommandLineArgs()); + } + else if (e.Key == Key.F9) { + + } + } + } +} \ No newline at end of file diff --git a/ModerationClient/Views/UserManagementWindow.axaml b/ModerationClient/Views/UserManagementWindow.axaml new file mode 100644 index 0000000..ef93517 --- /dev/null +++ b/ModerationClient/Views/UserManagementWindow.axaml @@ -0,0 +1,59 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/ModerationClient/Views/UserManagementWindow.axaml.cs b/ModerationClient/Views/UserManagementWindow.axaml.cs new file mode 100644 index 0000000..2d2dfb4 --- /dev/null +++ b/ModerationClient/Views/UserManagementWindow.axaml.cs @@ -0,0 +1,136 @@ +using System; +using ArcaneLibs.Extensions; +using Avalonia; +using Avalonia.Controls; +using Avalonia.Diagnostics; +using Avalonia.Input; +using Avalonia.Interactivity; +using LibMatrix.Homeservers; +using Microsoft.Extensions.DependencyInjection; +using Microsoft.Extensions.Hosting; +using ModerationClient.Services; +using ModerationClient.ViewModels; + +namespace ModerationClient.Views; + +public partial class UserManagementWindow : Window { + private readonly CommandLineConfiguration _cfg; + private readonly MatrixAuthenticationService _auth; + + public UserManagementWindow(CommandLineConfiguration cfg, MainWindowViewModel dataContext, IHostApplicationLifetime appLifetime, + UserManagementViewModel userManagementViewModel, MatrixAuthenticationService auth) { + _cfg = cfg; + _auth = auth; + InitializeComponent(); + DataContext = dataContext; + dataContext.CurrentViewModel = userManagementViewModel; + Console.WriteLine("mainwnd"); +#if DEBUG + this.AttachDevTools(new DevToolsOptions() { + ShowAsChildWindow = true, + LaunchView = DevToolsViewKind.LogicalTree, + }); +#endif + PropertyChanged += (sender, args) => { + // Console.WriteLine($"MainWindow PropertyChanged: {args.Property.Name} ({args.OldValue} -> {args.NewValue})"); + switch (args.Property.Name) { + case nameof(ClientSize): { + if (DataContext is not MainWindowViewModel viewModel) { + Console.WriteLine("WARN: MainWindowViewModel is null, ignoring ClientSize change!"); + return; + } + + viewModel.PhysicalSize = new Size(ClientSize.Width, ClientSize.Height - TopPanel.Bounds.Height); + break; + } + } + }; + + TopPanel.PropertyChanged += (_, args) => { + if (args.Property.Name == nameof(TopPanel.Bounds)) { + if (DataContext is not MainWindowViewModel viewModel) { + Console.WriteLine("WARN: MainWindowViewModel is null, ignoring TopPanel.Bounds change!"); + return; + } + + viewModel.PhysicalSize = new Size(ClientSize.Width, ClientSize.Height - TopPanel.Bounds.Height); + } + }; + + dataContext.AuthService.PropertyChanged += (sender, args) => { + if (args.PropertyName == nameof(MatrixAuthenticationService.IsLoggedIn)) { + if (dataContext.AuthService.IsLoggedIn) { + // dataContext.CurrentViewModel = new ClientViewModel(dataContext.AuthService); + dataContext.CurrentViewModel = App.Current.Host.Services.GetRequiredService(); + } + else { + dataContext.CurrentViewModel = new LoginViewModel(dataContext.AuthService); + } + } + }; + + dataContext.Scale = cfg.Scale; + Width *= cfg.Scale; + Height *= cfg.Scale; + + appLifetime.ApplicationStopping.Register(() => { + Console.WriteLine("ApplicationStopping triggered"); + Close(); + }); + } + + protected override void OnKeyDown(KeyEventArgs e) => OnKeyDown(this, e); + + private void OnKeyDown(object? _, KeyEventArgs e) { + if (DataContext is not MainWindowViewModel viewModel) { + Console.WriteLine($"WARN: DataContext is {DataContext?.GetType().Name ?? "null"}, ignoring key press!"); + return; + } + + // Console.WriteLine("MainWindow KeyDown: " + e.Key); + if (e.Key == Key.Escape) { + viewModel.Scale = 1.0f; + } + else if (e.Key == Key.F1) { + viewModel.Scale -= 0.1f; + if (viewModel.Scale < 0.1f) { + viewModel.Scale = 0.1f; + } + } + else if (e.Key == Key.F2) { + viewModel.Scale += 0.1f; + if (viewModel.Scale > 5.0f) { + viewModel.Scale = 5.0f; + } + } + else if (e.Key == Key.K && e.KeyModifiers == KeyModifiers.Control) { + if (viewModel.CurrentViewModel is ClientViewModel clientViewModel) { + Console.WriteLine("QuickSwitcher invoked"); + } + else Console.WriteLine("WARN: CurrentViewModel is not ClientViewModel, ignoring Quick Switcher"); + } + } + + // ReSharper disable once AsyncVoidMethod + private async void PuppetButtonClicked(object? sender, RoutedEventArgs e) { + if (e.Source is not Button button) { + Console.WriteLine("WARN: Source is not Button, ignoring PuppetButtonClicked!"); + return; + } + + if (button.Tag is not User user) { + Console.WriteLine("WARN: Tag is not User, ignoring PuppetButtonClicked!"); + return; + } + + if (_auth.Homeserver is not AuthenticatedHomeserverSynapse synapse) { + Console.WriteLine("WARN: Homeserver is not Synapse, ignoring PuppetButtonClicked!"); + return; + } + + var puppet = await synapse.Admin.LoginUserAsync(user.Name, TimeSpan.FromMinutes(5)); + + System.Diagnostics.Process.Start(System.Diagnostics.Process.GetCurrentProcess().MainModule!.FileName, + (_cfg with { IsTemporary = true, LoginData = puppet.ToJson() }).Serialise()); + } +} \ No newline at end of file -- cgit 1.5.1