From 318ec99ad48aa1bf30ec7f06620017dca8af00ad Mon Sep 17 00:00:00 2001 From: Robert Date: Sat, 2 Sep 2023 10:57:18 +0200 Subject: [PATCH] Workshop library - Match browser design after all --- .../Library/Tabs/LibrarySubmissionsView.axaml | 95 ++++++++++++++----- .../Tabs/LibrarySubmissionsViewModel.cs | 1 + .../Queries/GetSubmittedEntries.graphql | 4 + 3 files changed, 78 insertions(+), 22 deletions(-) diff --git a/src/Artemis.UI/Screens/Workshop/Library/Tabs/LibrarySubmissionsView.axaml b/src/Artemis.UI/Screens/Workshop/Library/Tabs/LibrarySubmissionsView.axaml index e40bf95f9..b57eee7d1 100644 --- a/src/Artemis.UI/Screens/Workshop/Library/Tabs/LibrarySubmissionsView.axaml +++ b/src/Artemis.UI/Screens/Workshop/Library/Tabs/LibrarySubmissionsView.axaml @@ -3,13 +3,16 @@ xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:tabs="clr-namespace:Artemis.UI.Screens.Workshop.Library.Tabs" - xmlns:controls="clr-namespace:FluentAvalonia.UI.Controls;assembly=FluentAvalonia" xmlns:workshop="clr-namespace:Artemis.WebClient.Workshop;assembly=Artemis.WebClient.Workshop" + xmlns:avalonia="clr-namespace:Material.Icons.Avalonia;assembly=Material.Icons.Avalonia" + xmlns:asyncImageLoader="clr-namespace:AsyncImageLoader;assembly=AsyncImageLoader.Avalonia" + xmlns:converters="clr-namespace:Artemis.UI.Converters" mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="650" x:Class="Artemis.UI.Screens.Workshop.Library.Tabs.LibrarySubmissionsView" x:DataType="tabs:LibrarySubmissionsViewModel"> - + + @@ -41,27 +44,75 @@ - - - - - - - - + + + + + + + + + diff --git a/src/Artemis.UI/Screens/Workshop/Library/Tabs/LibrarySubmissionsViewModel.cs b/src/Artemis.UI/Screens/Workshop/Library/Tabs/LibrarySubmissionsViewModel.cs index 3421b6aff..a43448109 100644 --- a/src/Artemis.UI/Screens/Workshop/Library/Tabs/LibrarySubmissionsViewModel.cs +++ b/src/Artemis.UI/Screens/Workshop/Library/Tabs/LibrarySubmissionsViewModel.cs @@ -69,6 +69,7 @@ public class LibrarySubmissionsViewModel : ActivatableViewModelBase, IWorkshopVi private async Task ExecuteLogin(CancellationToken ct) { await _windowService.CreateContentDialog().WithViewModel(out WorkshopLoginViewModel _).WithTitle("Workshop login").ShowAsync(); + await GetEntries(ct); } private async Task ExecuteAddSubmission(CancellationToken arg) diff --git a/src/Artemis.WebClient.Workshop/Queries/GetSubmittedEntries.graphql b/src/Artemis.WebClient.Workshop/Queries/GetSubmittedEntries.graphql index 422fcaf90..d4199e074 100644 --- a/src/Artemis.WebClient.Workshop/Queries/GetSubmittedEntries.graphql +++ b/src/Artemis.WebClient.Workshop/Queries/GetSubmittedEntries.graphql @@ -6,5 +6,9 @@ query GetSubmittedEntries($filter: EntryFilterInput) { entryType downloads createdAt + categories { + name + icon + } } } \ No newline at end of file