From 546c2485357fb4de937a21398b4c08cc76436b01 Mon Sep 17 00:00:00 2001
From: xiangbing <nails-totems0k@icloud.com>
Date: Mon, 23 Dec 2024 10:22:20 +0800
Subject: [PATCH] update

---
 Models/MainWindowModel.cs         |  4 +-
 ViewModels/MainWindowViewModel.cs |  4 +-
 Views/MainWindow.xaml             | 86 +++++++++++++++++++------------
 3 files changed, 57 insertions(+), 37 deletions(-)

diff --git a/Models/MainWindowModel.cs b/Models/MainWindowModel.cs
index b3a10d6..634fe0a 100644
--- a/Models/MainWindowModel.cs
+++ b/Models/MainWindowModel.cs
@@ -8,7 +8,7 @@ namespace VideoConcat.Models
 {
     internal class MainWindowModel
     {
-        public string? UserName { get; set; }
-        public string? PassWord { get; set; }
+        public string? Username { get; set; }
+        public string? Password { get; set; }
     }
 }
diff --git a/ViewModels/MainWindowViewModel.cs b/ViewModels/MainWindowViewModel.cs
index 3dacd12..677a9ce 100644
--- a/ViewModels/MainWindowViewModel.cs
+++ b/ViewModels/MainWindowViewModel.cs
@@ -14,8 +14,8 @@ namespace VideoConcat.ViewModels
 
         public void Login()
         {
-            string userName = MainWindowsModel.UserName;
-            string passWord = MainWindowsModel.PassWord;
+            string? userName = MainWindowsModel.Username;
+            string? passWord = MainWindowsModel.Password;
         }
     }
 }
diff --git a/Views/MainWindow.xaml b/Views/MainWindow.xaml
index 2d89ce7..d43bd81 100644
--- a/Views/MainWindow.xaml
+++ b/Views/MainWindow.xaml
@@ -6,59 +6,79 @@
         xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
         xmlns:local="clr-namespace:VideoConcat"
         mc:Ignorable="d"
-        Title="登录" Height="300" Width="500"
-        ResizeMode="NoResize" WindowStartupLocation="CenterScreen"
-      >
+        Title="登录"
+        Height="300"
+        Width="500"
+        ResizeMode="NoResize"
+        WindowStartupLocation="CenterScreen">
     <Window.Resources>
         <ResourceDictionary>
             <ResourceDictionary.MergedDictionaries>
                 <ResourceDictionary Source="pack://application:,,,/MaterialDesignThemes.Wpf;component/Themes/MaterialDesignTheme.Light.xaml"/>
-                <ResourceDictionary Source="pack://application:,,,/MaterialDesignThemes.Wpf;component/Themes/MaterialDesignTheme.Defaults.xaml" />
-                <ResourceDictionary Source="pack://application:,,,/MaterialDesignColors;component/Themes/Recommended/Primary/MaterialDesignColor.Red.xaml" />
-                <ResourceDictionary Source="pack://application:,,,/MaterialDesignColors;component/Themes/Recommended/Accent/MaterialDesignColor.Lime.xaml" />
+                <ResourceDictionary Source="pack://application:,,,/MaterialDesignThemes.Wpf;component/Themes/MaterialDesignTheme.Defaults.xaml"/>
+                <ResourceDictionary Source="pack://application:,,,/MaterialDesignColors;component/Themes/Recommended/Primary/MaterialDesignColor.Red.xaml"/>
+                <ResourceDictionary Source="pack://application:,,,/MaterialDesignColors;component/Themes/Recommended/Accent/MaterialDesignColor.Lime.xaml"/>
 
             </ResourceDictionary.MergedDictionaries>
         </ResourceDictionary>
     </Window.Resources>
-    <Grid >
+    <Grid>
         <Border>
-            <StackPanel Orientation="Horizontal" >
+            <StackPanel Orientation="Horizontal">
                 <StackPanel Width="500">
-                    <StackPanel >
-                        <TextBlock Margin="20" FontFamily="Great Vibes"
-                                   FontSize="38"  TextAlignment="Center">
+                    <StackPanel>
+                        <TextBlock Margin="20"
+                                   FontFamily="Great Vibes"
+                                   FontSize="38"
+                                   TextAlignment="Center">
                             用户登录
                         </TextBlock>
-                        <StackPanel Margin="10" Orientation="Horizontal">
+                        <StackPanel Margin="10"
+                                    Orientation="Horizontal">
                             <materialDesign:PackIcon
-                                Width="30" Height="30" 
-                                Kind="User" Margin="10,0,10,0"/>
-                            <TextBox Text="{Binding MainWindowModel.UserName}" Width="400"
-                                     Margin="10,0" BorderBrush="White"
-                                     CaretBrush="#FFD94448" 
+                                Width="30"
+                                Height="30"
+                                Kind="User"
+                                Margin="10,0,10,0"/>
+                            <TextBox Text="{Binding MainWindowModel.Username}"
+                                     Width="400"
+                                     Margin="10,0"
+                                     BorderBrush="White"
+                                     CaretBrush="#FFD94448"
                                      SelectionBrush="#FFD94448"
                                      materialDesign:HintAssist.Hint="输入 用户名"/>
                         </StackPanel>
-                        <StackPanel Margin="10" Orientation="Horizontal">
+                        <StackPanel Margin="10"
+                                    Orientation="Horizontal">
                             <materialDesign:PackIcon
-                                 Width="30" Height="30"
-                                 Kind="Lock" Margin="10,0,10,0"/>
-                            <PasswordBox  
-                                      Width="400"
-                                      Margin="10,0" BorderBrush="White"
-                                      CaretBrush="#FFD94448" 
-                                      SelectionBrush="#FFD94448"
-                                      materialDesign:HintAssist.Hint="输入 密码"
-                                     local:MainWindowModel="{Binding MainWindowModel.Password}"
-                                      >
+                                Width="30"
+                                Height="30"
+                                Kind="Lock"
+                                Margin="10,0,10,0"/>
+                            <PasswordBox
+                                Width="400"
+                                Margin="10,0"
+                                BorderBrush="White"
+                                CaretBrush="#FFD94448"
+                                SelectionBrush="#FFD94448"
+                                materialDesign:HintAssist.Hint="输入 密码"
+                                Password="{Binding MainWindowModel.Password}">
                             </PasswordBox>
                         </StackPanel>
-                        <StackPanel Margin="10" HorizontalAlignment="Center" VerticalAlignment="Center">
-                            <Button  x:Name="btnLogin" Width="100" Height="40"
+                        <StackPanel Margin="10"
+                                    HorizontalAlignment="Center"
+                                    VerticalAlignment="Center">
+                            <Button  x:Name="btnLogin"
+                                     Width="100"
+                                     Height="40"
                                      materialDesign:ButtonAssist.CornerRadius="5"
-                                     Background="#40568D" BorderBrush="#7F7F7F" BorderThickness="2"
-                                     Content="登录" ToolTip="登录"
-                                     Style="{StaticResource MaterialDesignRaisedButton}" Click="BtnLogin_Click"/>
+                                     Background="#40568D"
+                                     BorderBrush="#7F7F7F"
+                                     BorderThickness="2"
+                                     Content="登录"
+                                     ToolTip="登录"
+                                     Style="{StaticResource MaterialDesignRaisedButton}"
+                                     Click="BtnLogin_Click"/>
                         </StackPanel>
                     </StackPanel>
                 </StackPanel>