PunkPC 5 ヶ月 前
コミット
d36ff89681
3 ファイル変更14 行追加5 行削除
  1. 1 1
      Models/FilePath.cs
  2. 7 2
      Views/DataOutput.axaml
  3. 6 2
      Views/GeneratePage.axaml

+ 1 - 1
Models/FilePath.cs

@@ -8,6 +8,6 @@ namespace LoginGenerator.Models
 {
     public static class FilePath
     {
-        public const string PATH = "D:\\RegistrationAssistant.txt";
+        public const string PATH = "C:\\Users\\PunkPC\\Reg.txt";
     }
 }

+ 7 - 2
Views/DataOutput.axaml

@@ -12,6 +12,7 @@
     <Grid.RowDefinitions>
       <RowDefinition Height="50"/>
       <RowDefinition Height="*"/>
+      <RowDefinition Height="50"/>
     </Grid.RowDefinitions>
 
     <StackPanel Grid.Row="0" VerticalAlignment="Center" HorizontalAlignment="Center" Orientation="Horizontal">
@@ -19,8 +20,7 @@
       <TextBox Height="10" Width="236" Margin="10 0 0 0" Watermark="Поиск по логину" Text="{Binding DataOutputVM.FindLogin}"/>
       <TextBox Height="10" Width="236" Margin="10 0 0 0" Watermark="Поиск по паролю" Text="{Binding DataOutputVM.FindPass}"/>
       <ComboBox SelectedIndex="0" Width="236" Margin="10 0 0 0" ItemsSource="{Binding DataOutputVM.Sort}" SelectedItem="{Binding DataOutputVM.SelectedSort}"/>
-      <Button Content="↻" Command="{Binding DataOutputVM.FillingUsersList}"/>
-      <Button Content="На страницу генерации" Command="{Binding ViewGeneratePage}"/>
+      
     </StackPanel>
     
     <ListBox Background="#F9F8FF" Grid.Row="1" ItemsSource="{Binding DataOutputVM.Userss}">
@@ -48,5 +48,10 @@
         </DataTemplate>
       </ListBox.ItemTemplate>
     </ListBox>
+
+    <StackPanel Grid.Row="2" Orientation="Horizontal">
+      <Button Margin="10 0 0 0" HorizontalContentAlignment="Center" FontWeight="Bold" BorderBrush="Black" Background="White" Foreground="#545454" Content="↻" Command="{Binding DataOutputVM.FillingUsersList}"/>
+      <Button Margin="10 0 0 0" HorizontalContentAlignment="Center" FontWeight="Bold" BorderBrush="Black" Background="White" Foreground="#545454" Content="На страницу генерации" Command="{Binding ViewGeneratePage}"/>
+    </StackPanel>
   </Grid>
 </UserControl>

+ 6 - 2
Views/GeneratePage.axaml

@@ -11,7 +11,11 @@
   <StackPanel  VerticalAlignment="Center" Background="{Binding }">
     <TextBlock FontSize="24" FontWeight="Bold" HorizontalAlignment="Center">АССИСТЕНТ РЕГИСТРАЦИИ</TextBlock>
     <StackPanel>
-      <TextBox Width="700" Watermark="Введите ФИО" Name="FIO"/>
+      <StackPanel Orientation="Horizontal" HorizontalAlignment="Center">
+        <TextBox Width="615" Watermark="Введите ФИО" Name="FIO"/>
+        <Button Margin="10 0 0 0" Width="75" HorizontalContentAlignment="Center" FontWeight="Bold" BorderBrush="Black" Background="White" Foreground="#545454" Content="🌗" Click=""/>
+      </StackPanel>
+     
       <StackPanel Margin="0 10 0 0" HorizontalAlignment="Center" Orientation="Horizontal">
         <Button Width="167" HorizontalContentAlignment="Center" FontWeight="Bold" BorderBrush="Black" Background="White" Foreground="#545454" Content="Ф" Click="OSurnameCopy_Click"/>
         <Button Width="167" HorizontalContentAlignment="Center" FontWeight="Bold" BorderBrush="Black" Background="White" Foreground="#545454" Margin="10 0 0 0" Content="И" Click="ONameCopy_Click"/>
@@ -41,7 +45,7 @@
         <Button Width="700" HorizontalContentAlignment="Center" FontWeight="Bold" BorderBrush="Black" Background="White" Foreground="#545454" Content="Посмотреть данные пользователей" Command="{Binding ViewUsersData}"/>
       </StackPanel>
       
-      <Button Content="Тёмная тема" Click=""/>
+      
     </StackPanel>