1
0

temp update

This commit is contained in:
Ca2didi 2025-04-18 01:14:33 +08:00
parent d3071b4999
commit 0bca018ca2
6 changed files with 35 additions and 12 deletions

View File

@ -23,6 +23,7 @@
<entry key="Flawless.Client/Views/ModalBox/CreateRepositoryDialogView.axaml" value="Flawless.Client/Flawless.Client.csproj" />
<entry key="Flawless.Client/Views/ModalBox/EditRepositoryMemberDialogueView.axaml" value="Flawless.Client/Flawless.Client.csproj" />
<entry key="Flawless.Client/Views/ModalBox/IssueDetailEditView.axaml" value="Flawless.Client/Flawless.Client.csproj" />
<entry key="Flawless.Client/Views/ModalBox/MergeDialogView.axaml" value="Flawless.Client/Flawless.Client.csproj" />
<entry key="Flawless.Client/Views/ModalBox/SimpleMessageDialogView.axaml" value="Flawless.Client/Flawless.Client.csproj" />
<entry key="Flawless.Client/Views/RegisterPageView.axaml" value="Flawless.Client/Flawless.Client.csproj" />
<entry key="Flawless.Client/Views/RegisterView.axaml" value="Flawless.Client/Flawless.Client.csproj" />

View File

@ -2,16 +2,16 @@ using System;
using System.Linq;
using System.Reactive.Threading.Tasks;
using System.Threading.Tasks;
using Flawless.Client;
using Flawless.Client.Models;
using ReactiveUI;
using Flawless.Client.Service;
using Flawless.Client.ViewModels;
using Flawless.Client.ViewModels.ModalBox;
using Flawless.Client.Views.ModalBox;
using ReactiveUI.SourceGenerators;
using Ursa.Controls;
namespace Flawless.Client.ViewModels;
public partial class IssueDetailViewModel : RoutableViewModelBase
{
[Reactive] private RepositoryModel.Issue? _currentIssue;

View File

@ -4,8 +4,8 @@
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:vm="using:Flawless.Client.ViewModels"
xmlns:u="https://irihi.tech/ursa"
xmlns:global="clr-namespace:"
x:DataType="global:IssueDetailViewModel"
xmlns:viewModels="clr-namespace:Flawless.Client.ViewModels"
x:DataType="viewModels:IssueDetailViewModel"
x:Class="Flawless.Client.Views.IssueDetailView">
<DockPanel Margin="20">

View File

@ -1,6 +1,4 @@
using Avalonia;
using Avalonia.Controls;
using Avalonia.Markup.Xaml;
using Flawless.Client.ViewModels;
using Ursa.ReactiveUIExtension;
namespace Flawless.Client.Views;

View File

@ -11,7 +11,7 @@
<ListBox.ItemTemplate>
<DataTemplate>
<ListBoxItem>
<Grid Column="Auto, *, Auto">
<Grid ColumnDefinitions="Auto, *, Auto">
<Label Grid.Column="0" Content="{Binding WorkPath}"/>
<u:IconButton Command="{Binding $parent[ItemsControl].((vm:MergeDialogViewModel)DataContext).RaiseMergeToolsCommand}"
CommandParameter="{Binding WorkPath}"/>
@ -20,4 +20,4 @@
</DataTemplate>
</ListBox.ItemTemplate>
</ListBox>
</UserControl>
</UserControl>

View File

@ -18,8 +18,19 @@
<TabControl TabStripPlacement="Left" Margin="0 20">
<TabItem Header="Account">
<ScrollViewer Width="600" HorizontalAlignment="Left" Margin="6">
<u:Form HorizontalAlignment="Stretch" VerticalAlignment="Stretch">
<u:Form HorizontalAlignment="Stretch" VerticalAlignment="Stretch" LabelPosition="Top">
<Label Content="You are a server manager!"/>
<TextBox u:FormItem.Label="Username" IsReadOnly="True"/>
<TextBox u:FormItem.Label="Nickname" IsReadOnly="True"/>
<TextBox u:FormItem.Label="Email" IsReadOnly="True"/>
<TextBox u:FormItem.Label="Phone Number" IsReadOnly="True"/>
<ComboBox u:FormItem.Label="Gender">
<ComboBoxItem Content="Unset"/>
<ComboBoxItem Content="Male"/>
<ComboBoxItem Content="Female"/>
<ComboBoxItem Content="Walmart Plastic Bag"/>
</ComboBox>
<TextBox u:FormItem.Label="Bio" Classes="TextArea"/>
</u:Form>
</ScrollViewer>
</TabItem>
@ -46,12 +57,25 @@
<TabItem Header="Server">
<ScrollViewer Width="600" HorizontalAlignment="Left" Margin="6">
<u:Form HorizontalAlignment="Stretch" VerticalAlignment="Stretch">
<ToggleSwitch u:FormItem.Label="Allow Public Register"></ToggleSwitch>
<TextBox u:FormItem.Label="Server Public Name"/>
<ToggleSwitch u:FormItem.Label="Allow Public Register"/>
<u:FormGroup>
<TextBox u:FormItem.Label="IP Whitelist" Classes="TextArea"/>
<TextBox u:FormItem.Label="IP Blacklist" Classes="TextArea"/>
</u:FormGroup>
</u:Form>
</ScrollViewer>
</TabItem>
<TabItem Header="Users">
</TabItem>
<TabItem Header="Server Logfile">
<StackPanel Spacing="8" Orientation="Vertical" HorizontalAlignment="Stretch">
<StackPanel Orientation="Horizontal" Spacing="4">
<u:IconButton Icon="{StaticResource}"></u:IconButton>
</StackPanel>
</StackPanel>
</TabItem>
<TabItem Header="Server Statitics"></TabItem>
</TabControl>
</DockPanel>
</UserControl>