Browse Source

Финиш чиназес саундрес

Ruzal 5 months ago
parent
commit
5bb9f4e454

+ 1 - 1
Esoft/MainWindow.xaml.cs

@@ -32,7 +32,7 @@ namespace Esoft
         }
         //private void ImportUsers()
         //{
-        //    var fileData = File.ReadAllLines(@"C:\Users\Desktop\user.txt");
+        //    var fileData = File.ReadAllLines(@"C:\Users\Рузаль\Desktop\Пользователь.txt");
         //    foreach (var line in fileData)
         //    {
         //        var data = line.Split('\t');

+ 13 - 5
Esoft/Model1.Context.cs

@@ -12,22 +12,30 @@ namespace Esoft
     using System;
     using System.Data.Entity;
     using System.Data.Entity.Infrastructure;
-    
+
     public partial class user6Entities : DbContext
     {
+        private static user6Entities _context;
         public user6Entities()
             : base("name=user6Entities")
         {
         }
-    
+
+        public static user6Entities GetContext()
+        {
+            if (_context == null)
+                _context = new user6Entities();
+            return _context;
+        }
+
         protected override void OnModelCreating(DbModelBuilder modelBuilder)
         {
             throw new UnintentionalCodeFirstException();
         }
     
-        public virtual DbSet<Executor> Executors { get; set; }
+        public virtual DbSet<Executor> Executor { get; set; }
         public virtual DbSet<Manager> Managers { get; set; }
-        public virtual DbSet<Task> Tasks { get; set; }
-        public virtual DbSet<User> Users { get; set; }
+        public virtual DbSet<Task> Task { get; set; }
+        public virtual DbSet<User> User { get; set; }
     }
 }

+ 19 - 8
Esoft/Pages/Authorization.xaml

@@ -4,29 +4,40 @@
       xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
       xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
       xmlns:local="clr-namespace:Esoft.Pages"
-      mc:Ignorable="d" 
+           mc:Ignorable="d" 
       Height="445" Width="720"
         ResizeMode="NoResize"
       
-      Title="Авторизация в ESOFT" Background="#b3deff">
+                  Title="Авторизация в Esoft" Background="#b3deff">
 
     <Grid x:Name="grid" Cursor="">
 
-        <Label Style="{StaticResource LabelStyle}" Margin="263,102,116,0" VerticalAlignment="Top" Height="65" FontFamily="Arial Black" FontWeight="Bold" FontStyle="Italic">
-            АВТОРИЗАЦИЯ
+        <Label Style="{StaticResource LabelStyle}" Margin="263,86,237,0" VerticalAlignment="Top" Height="51" BorderBrush="#FF25AFD2" Content="АВТОРИЗАЦИЯ" FontSize="40">
+            <Label.OpacityMask>
+                <LinearGradientBrush EndPoint="0.5,1" StartPoint="0.5,0">
+                    <GradientStop Color="Black"/>
+                    <GradientStop Color="#FF223DAB" Offset="1"/>
+                </LinearGradientBrush>
+            </Label.OpacityMask>
+            <Label.Foreground>
+                <LinearGradientBrush EndPoint="0.5,1" StartPoint="0.5,0">
+                    <GradientStop Color="Black"/>
+                    <GradientStop Color="#FF2B8FFF" Offset="1"/>
+                </LinearGradientBrush>
+            </Label.Foreground>
         </Label>
 
-        <Image Source="C:\Users\Ильяс Шафигуллин\Desktop\logo.png" Width="160" Height="60" HorizontalAlignment="Left" VerticalAlignment="Top" Margin="25,10,10,25"/>
+        <Image Source="/Resources/logo.png" Width="160" Height="60" HorizontalAlignment="Left" VerticalAlignment="Top" Margin="25,10,10,25"/>
 
         <StackPanel HorizontalAlignment="Center" VerticalAlignment="Center" Margin="10,80,10,10">
             <StackPanel Orientation="Vertical">
-                <TextBox Name="TBoxLogin" Tag="Логин" Style="{DynamicResource TextBoxStyle}" FontFamily="Arial Black" FontWeight="Bold"/>
+                <TextBox Name="TBoxLogin" Tag="Логин" Style="{DynamicResource TextBoxStyle}"/>
                 <Separator Height="15" Visibility="Hidden"/>
-                <PasswordBox Name="PBoxPassword" Tag="Пароль" Style="{DynamicResource PasswordBoxStyle}" PasswordChar="*" FontFamily="Segoe UI Black" FontWeight="Bold"  />
+                <TextBox Name="TBoxPassword" Tag="Пароль" Style="{DynamicResource TextBoxStyle}"/>
             </StackPanel>
             <Separator Height="15" Visibility="Hidden"/>
             <StackPanel>
-                <Button Name="BtnLogin" Content="Войти" Style="{DynamicResource AuthoButtons}" Click="BtnLogin_Click" FontFamily="Arial Black"/>
+                <Button Name="BtnLogin" Content="Войти" Style="{DynamicResource AuthoButtons}" Click="BtnLogin_Click" Foreground="#FF1414A9"/>
             </StackPanel>
 
         </StackPanel>

+ 3 - 3
Esoft/Pages/Authorization.xaml.cs

@@ -27,9 +27,9 @@ namespace Esoft.Pages
 
         private void BtnLogin_Click(object sender, RoutedEventArgs e)
         {
-            if (TBoxLogin.Text != "" && PBoxPassword.Password.Length != 0)
+            if (TBoxLogin.Text != "" && TBoxPassword.Text != "")
             {
-                MessageBox.Show("Заходи", "", MessageBoxButton.OK, MessageBoxImage.Asterisk);
+                MessageBox.Show("Выполняется вход", "", MessageBoxButton.OK, MessageBoxImage.Asterisk);
 
                 MainWindow mainWindow = new MainWindow();
                 mainWindow.Show();
@@ -37,7 +37,7 @@ namespace Esoft.Pages
             }
             else
             {
-                MessageBox.Show("Эй, ну ты хотя бы что-нибудь введи.","", MessageBoxButton.OK, MessageBoxImage.Warning);
+                MessageBox.Show("Введите данные","", MessageBoxButton.OK, MessageBoxImage.Warning);
             }
         } 
     }