three windows

2025-01-28 13:26:49 +03:00 · 2025-01-28 13:26:49 +03:00 · d823905d6c
commit d823905d6c
parent 3db87ed23d
27 changed files with 114 additions and 55 deletions
--- a/.DS_Store
+++ b/.DS_Store
--- a/demo15012025/.DS_Store
+++ b/demo15012025/.DS_Store
--- a/demo15012025/Auth.axaml
+++ b/demo15012025/Auth.axaml
@ -7,7 +7,7 @@
        Title="Auth">
    <DockPanel Background="Bisque">
        <StackPanel Spacing="5" HorizontalAlignment="Center" VerticalAlignment="Center">
-            <TextBox x:Name="Email" Width="200" Watermark="login"/>
+            <TextBox x:Name="Id" Width="200" Watermark="id"/>
            <TextBox x:Name="Password" Width="200" Watermark="password"/>
            <Button Click="AuthButton_OnClick" Content="auth" Foreground="Black" Background="LightGray"/>
        </StackPanel>
--- a/demo15012025/Auth.axaml.cs
+++ b/demo15012025/Auth.axaml.cs
@ -13,26 +13,32 @@ public partial class Auth : Window
    {
        InitializeComponent();
    }
-
    private void AuthButton_OnClick(object? sender, RoutedEventArgs e)
    {
-        var email = Email?.Text;
+        var idText = Id?.Text;
        var password = Password?.Text;

-        var client = MainWindow.ClientAuthList?.FirstOrDefault(it => it.Email == email);
-
-        if (client != null && client.Password == password)
+        if (int.TryParse(idText, out var id))
        {
-            Console.WriteLine("success");
-            if (client.Role == 1)
+            var client = MainWindow.ClientAuthList?.FirstOrDefault(it => it.Id == id);
+
+            if (client != null && client.Password == password)
            {
-                OrganizatorWindow organizatorWindow = new OrganizatorWindow();
-                organizatorWindow.ShowDialog(this);
+                Console.WriteLine("success");
+                if (client.Role == 1)
+                {
+                    OrganizatorWindow organizatorWindow = new OrganizatorWindow(client);
+                    organizatorWindow.ShowDialog(this);
+                }
+            }
+            else
+            {
+                Console.WriteLine("wrong");
            }
        }
        else
        {
-            Console.WriteLine("wrong");
+            Console.WriteLine("Invalid ID format");
        }
    }
 }
--- a/demo15012025/MainWindow.axaml.cs
+++ b/demo15012025/MainWindow.axaml.cs
@ -41,10 +41,11 @@ public partial class MainWindow : Window
        
        dataSourceClient = context.Clients.Select(it => new ClientAuth
        {
-            Email = it.Email,
+            Id = it.Id,
            Password = it.Password,
            Role = it.Role,
            FIO = it.Fio,
+            PhotoPath = it.Photopath,
        }).ToList();
        
        DirectionsList = context.Directions.Select(it => it.Name).ToList();
--- a/demo15012025/ModelsMine/ClientAuth.cs
+++ b/demo15012025/ModelsMine/ClientAuth.cs
@ -1,11 +1,30 @@
+using System;
+using System.IO;
+using Avalonia.Media.Imaging;
 using demo15012025.Models;

 namespace demo15012025.ModelsMine;

 public class ClientAuth: Client
 {
-    public string Email { get; set; } = null!;
+    public int Id { get; set; }
    public string Password { get; set; } = null!;
    public int Role { get; set; }
    public string FIO { get; set; } = null!;
+    public string PhotoPath { get; set; } = null!;
+    public Bitmap? Image
+    {
+        get
+        {
+            try
+            {
+                string absolutePath = Path.Combine(AppContext.BaseDirectory, PhotoPath);
+                return new Bitmap(absolutePath);
+            }
+            catch
+            {
+                return null;
+            }
+        }
+    }
 }
--- a/demo15012025/OrganizatorWindow.axaml
+++ b/demo15012025/OrganizatorWindow.axaml
@ -4,37 +4,43 @@
        xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
        mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
        x:Class="demo15012025.OrganizatorWindow"
-        x:CompileBindings="False"
        Title="OrganizatorWindow">
-        <DockPanel>
-                <Border DockPanel.Dock="Top" Background="Aqua" Height="50">
-                        <TextBlock Text="Окно организатора" HorizontalAlignment="Center" VerticalAlignment="Center" FontSize="20"/>
-                </Border> 
+    <DockPanel>
+        <Border DockPanel.Dock="Top" Background="Aqua" Height="50">
+            <TextBlock Text="Окно организатора" HorizontalAlignment="Center" VerticalAlignment="Center" FontSize="20"/>
+        </Border>
+
+        <Border Background="BlanchedAlmond">
+            <Grid>
                <Grid ColumnDefinitions="Auto, 1*" VerticalAlignment="Center" Margin="10,0,0,0">
-                        <StackPanel HorizontalAlignment="Left" VerticalAlignment="Center" Grid.Column="1" MaxWidth="250">
-                                <Image Width="150" Height="250"/>
-                                <Border BorderBrush="Gray" BorderThickness="1" Padding="5">
-                                        <TextBlock HorizontalAlignment="Center" Width="150" Height="50" FontSize="20" TextAlignment="Center" >
-                                                <Run Text="Мой" />
-                                                <LineBreak />
-                                                <Run Text="профиль" />
-                                        </TextBlock>
-                                </Border>
-                        </StackPanel>
+                    <StackPanel HorizontalAlignment="Left" VerticalAlignment="Center" Grid.Column="1" MaxWidth="250">
+                        <Image Width="150" Height="250" x:Name="imageOrg"/>
+                        <Border BorderBrush="Gray" BorderThickness="1" Padding="5">
+                            <TextBlock HorizontalAlignment="Center" Width="150" Height="50" FontSize="20" TextAlignment="Center" Foreground="Black">
+                                <Run Text="Мой" />
+                                <LineBreak />
+                                <Run Text="профиль" />
+                            </TextBlock>
+                        </Border>
+                    </StackPanel>
                </Grid>
+
                <Grid ColumnDefinitions="Auto, 1*" HorizontalAlignment="Center" VerticalAlignment="Center">
-                        <StackPanel HorizontalAlignment="Left" VerticalAlignment="Center" Grid.Column="1" MaxWidth="250" Spacing="15">
-                                <!-- <TextBlock Text="{Binding output}"/> -->
-                                <Button x:Name="Button1" Height="80" Width="300" Click="_1Button_OnClick">
-                                        <TextBlock Text="Мероприятия" HorizontalAlignment="Center" VerticalAlignment="Center"/>
-                                </Button>
-                                <Button x:Name="Button2" Height="80" Width="300" Click="_2Button_OnClick">
-                                        <TextBlock Text="Участники" HorizontalAlignment="Center" VerticalAlignment="Center"/>
-                                </Button>
-                                <Button x:Name="Button3" Height="80" Width="300" Click="_3Button_OnClick">
-                                        <TextBlock Text="Жюри" HorizontalAlignment="Center" VerticalAlignment="Center"/>
-                                </Button>
-                        </StackPanel>
+                    <StackPanel HorizontalAlignment="Left" VerticalAlignment="Center" Grid.Column="1" MaxWidth="250" Spacing="15">
+                        <TextBlock x:Name="textHello" Foreground="Black" FontSize="16"/>
+
+                        <Button x:Name="Button1" Height="80" Width="300" Background="Beige" Foreground="Black" BorderBrush="DarkGoldenrod" BorderThickness="2" Click="_1Button_OnClick">
+                            <TextBlock Text="Мероприятия" HorizontalAlignment="Center" VerticalAlignment="Center"/>
+                        </Button>
+                        <Button x:Name="Button2" Height="80" Width="300" Background="Beige" Foreground="Black" BorderBrush="DarkGoldenrod" BorderThickness="2" Click="_2Button_OnClick">
+                            <TextBlock Text="Участники" HorizontalAlignment="Center" VerticalAlignment="Center"/>
+                        </Button>
+                        <Button x:Name="Button3" Height="80" Width="300" Background="Beige" Foreground="Black" BorderBrush="DarkGoldenrod" BorderThickness="2" Click="_3Button_OnClick">
+                            <TextBlock Text="Жюри" HorizontalAlignment="Center" VerticalAlignment="Center"/>
+                        </Button>
+                    </StackPanel>
                </Grid>
-        </DockPanel>
+            </Grid>
+        </Border>
+    </DockPanel>
 </Window>
--- a/demo15012025/OrganizatorWindow.axaml.cs
+++ b/demo15012025/OrganizatorWindow.axaml.cs
@ -3,31 +3,32 @@ using Avalonia;
 using Avalonia.Controls;
 using Avalonia.Interactivity;
 using Avalonia.Markup.Xaml;
+using demo15012025.ModelsMine;
 using Npgsql.EntityFrameworkCore.PostgreSQL.Storage.Internal.Mapping;

 namespace demo15012025;

 public partial class OrganizatorWindow : Window
 {
-    
-    public OrganizatorWindow()
+    private string _output;
+    public OrganizatorWindow(ClientAuth clientAuth)
    {
-        var output = "";
        InitializeComponent();
+        var bello = "";
        DateTime currentTime = DateTime.Now;
        if (currentTime.Hour > 9 && currentTime.Hour < 11)
        {
-            output = "Доброе утро!\n";
+            bello = "Доброе утро!\n";
        } else if (currentTime.Hour > 11 && currentTime.Hour < 18)
        {
-            output = "Добрый день!\n";
+            bello = "Добрый день!\n";
        }
        else
        {
-            output = "Добрый вечер!\n";
+            bello = "Добрый вечер!\n";
        }
-        
-        //todo передавай имя из прошлого окна ++ проблемы с output
+        textHello.Text = bello+clientAuth.FIO;
+        imageOrg.Source = clientAuth.Image;
    }

    private void _3Button_OnClick(object? sender, RoutedEventArgs e)
@ -38,7 +39,8 @@ public partial class OrganizatorWindow : Window

    private void _2Button_OnClick(object? sender, RoutedEventArgs e)
    {
-        throw new System.NotImplementedException();
+        Zaglushka zaglushka = new Zaglushka();
+        zaglushka.ShowDialog(this);
    }

    private void _1Button_OnClick(object? sender, RoutedEventArgs e)
--- a/demo15012025/Zaglushka.axaml
+++ b/demo15012025/Zaglushka.axaml
@ -0,0 +1,9 @@
+<Window xmlns="https://github.com/avaloniaui"
+        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+        xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+        xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+        mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
+        x:Class="demo15012025.Zaglushka"
+        Title="Zaglushka">
+    Welcome to Avalonia!
+</Window>
--- a/demo15012025/Zaglushka.axaml.cs
+++ b/demo15012025/Zaglushka.axaml.cs
@ -0,0 +1,13 @@
+using Avalonia;
+using Avalonia.Controls;
+using Avalonia.Markup.Xaml;
+
+namespace demo15012025;
+
+public partial class Zaglushka : Window
+{
+    public Zaglushka()
+    {
+        InitializeComponent();
+    }
+}
--- a/demo15012025/bin/.DS_Store
+++ b/demo15012025/bin/.DS_Store
--- a/demo15012025/bin/Debug/.DS_Store
+++ b/demo15012025/bin/Debug/.DS_Store
--- a/demo15012025/bin/Debug/net8.0/demo15012025.dll
+++ b/demo15012025/bin/Debug/net8.0/demo15012025.dll
--- a/demo15012025/bin/Debug/net8.0/demo15012025.pdb
+++ b/demo15012025/bin/Debug/net8.0/demo15012025.pdb
--- a/demo15012025/obj/Debug/net8.0/Avalonia/Resources.Inputs.cache
+++ b/demo15012025/obj/Debug/net8.0/Avalonia/Resources.Inputs.cache
@ -1 +1 @@
-6ba651331e2d52a468e8ce9a93040cd15b1ed1d04dc3b8bfd4b6f1066e860cec
+6ca666c1542ca9238c67dd1a54ec89d3bccc3454bd741e4b3adaf5b5f952d81a
--- a/demo15012025/obj/Debug/net8.0/Avalonia/demo15012025.dll
+++ b/demo15012025/obj/Debug/net8.0/Avalonia/demo15012025.dll
--- a/demo15012025/obj/Debug/net8.0/Avalonia/demo15012025.pdb
+++ b/demo15012025/obj/Debug/net8.0/Avalonia/demo15012025.pdb
--- a/demo15012025/obj/Debug/net8.0/Avalonia/resources
+++ b/demo15012025/obj/Debug/net8.0/Avalonia/resources
--- a/demo15012025/obj/Debug/net8.0/demo15012025.AssemblyInfo.cs
+++ b/demo15012025/obj/Debug/net8.0/demo15012025.AssemblyInfo.cs
@ -13,7 +13,7 @@ using System.Reflection;
 [assembly: System.Reflection.AssemblyCompanyAttribute("demo15012025")]
 [assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")]
 [assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")]
-[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0")]
+[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+3db87ed23d758d9ce8019736887da1a5ffeb7ca9")]
 [assembly: System.Reflection.AssemblyProductAttribute("demo15012025")]
 [assembly: System.Reflection.AssemblyTitleAttribute("demo15012025")]
 [assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")]
--- a/demo15012025/obj/Debug/net8.0/demo15012025.AssemblyInfoInputs.cache
+++ b/demo15012025/obj/Debug/net8.0/demo15012025.AssemblyInfoInputs.cache
@ -1 +1 @@
-41005c7534528e296b01f2da27e8d291f7195ca9115a03f21b2481a4440c0335
+24a6a02c857323065555cf2adff2f30d21c3351bda097b2a5c06f3a37503196d
--- a/demo15012025/obj/Debug/net8.0/demo15012025.GeneratedMSBuildEditorConfig.editorconfig
+++ b/demo15012025/obj/Debug/net8.0/demo15012025.GeneratedMSBuildEditorConfig.editorconfig
@ -33,3 +33,6 @@ build_metadata.AdditionalFiles.SourceItemGroup = AvaloniaXaml

 [/Users/rinchi/RiderProjects/demo15012025/demo15012025/RegJhuri.axaml]
 build_metadata.AdditionalFiles.SourceItemGroup = AvaloniaXaml
+
+[/Users/rinchi/RiderProjects/demo15012025/demo15012025/Zaglushka.axaml]
+build_metadata.AdditionalFiles.SourceItemGroup = AvaloniaXaml
--- a/demo15012025/obj/Debug/net8.0/demo15012025.csproj.CoreCompileInputs.cache
+++ b/demo15012025/obj/Debug/net8.0/demo15012025.csproj.CoreCompileInputs.cache
@ -1 +1 @@
-031ebb689cc6e87e8f89ef8dd7d8adc363e1a99b8c788e0af1f816c4dde16bae
+c421778bb34eea18f587a2c14ad2e4633a2b2fd80de3dd47f078eebc41303934
--- a/demo15012025/obj/Debug/net8.0/demo15012025.dll
+++ b/demo15012025/obj/Debug/net8.0/demo15012025.dll
--- a/demo15012025/obj/Debug/net8.0/demo15012025.pdb
+++ b/demo15012025/obj/Debug/net8.0/demo15012025.pdb
--- a/demo15012025/obj/Debug/net8.0/ref/demo15012025.dll
+++ b/demo15012025/obj/Debug/net8.0/ref/demo15012025.dll
--- a/demo15012025/obj/Debug/net8.0/refint/Avalonia/demo15012025.dll
+++ b/demo15012025/obj/Debug/net8.0/refint/Avalonia/demo15012025.dll
--- a/demo15012025/obj/Debug/net8.0/refint/demo15012025.dll
+++ b/demo15012025/obj/Debug/net8.0/refint/demo15012025.dll