diff --git a/.DS_Store b/.DS_Store index f069a31..a6fcfac 100644 Binary files a/.DS_Store and b/.DS_Store differ diff --git a/demo15012025/.DS_Store b/demo15012025/.DS_Store index f8bfa21..77a0c29 100644 Binary files a/demo15012025/.DS_Store and b/demo15012025/.DS_Store differ diff --git a/demo15012025/Auth.axaml b/demo15012025/Auth.axaml index 9ee6a66..b26131a 100644 --- a/demo15012025/Auth.axaml +++ b/demo15012025/Auth.axaml @@ -7,7 +7,7 @@ Title="Auth"> - + - - - + + + + + + + - - + + + + \ No newline at end of file diff --git a/demo15012025/OrganizatorWindow.axaml.cs b/demo15012025/OrganizatorWindow.axaml.cs index d0bb3eb..96dc1fe 100644 --- 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) diff --git a/demo15012025/Zaglushka.axaml b/demo15012025/Zaglushka.axaml new file mode 100644 index 0000000..8dd032b --- /dev/null +++ b/demo15012025/Zaglushka.axaml @@ -0,0 +1,9 @@ + + Welcome to Avalonia! + diff --git a/demo15012025/Zaglushka.axaml.cs b/demo15012025/Zaglushka.axaml.cs new file mode 100644 index 0000000..d4daa90 --- /dev/null +++ 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(); + } +} \ No newline at end of file diff --git a/demo15012025/bin/.DS_Store b/demo15012025/bin/.DS_Store index e48203f..a18af76 100644 Binary files a/demo15012025/bin/.DS_Store and b/demo15012025/bin/.DS_Store differ diff --git a/demo15012025/bin/Debug/.DS_Store b/demo15012025/bin/Debug/.DS_Store index b3fb3c0..587ac90 100644 Binary files a/demo15012025/bin/Debug/.DS_Store and b/demo15012025/bin/Debug/.DS_Store differ diff --git a/demo15012025/bin/Debug/net8.0/demo15012025.dll b/demo15012025/bin/Debug/net8.0/demo15012025.dll index 6c9b9a7..cb8ac1b 100644 Binary files a/demo15012025/bin/Debug/net8.0/demo15012025.dll and b/demo15012025/bin/Debug/net8.0/demo15012025.dll differ diff --git a/demo15012025/bin/Debug/net8.0/demo15012025.pdb b/demo15012025/bin/Debug/net8.0/demo15012025.pdb index ca93841..2ac2a82 100644 Binary files a/demo15012025/bin/Debug/net8.0/demo15012025.pdb and b/demo15012025/bin/Debug/net8.0/demo15012025.pdb differ diff --git a/demo15012025/obj/Debug/net8.0/Avalonia/Resources.Inputs.cache b/demo15012025/obj/Debug/net8.0/Avalonia/Resources.Inputs.cache index 3cc687b..8e4fcea 100644 --- a/demo15012025/obj/Debug/net8.0/Avalonia/Resources.Inputs.cache +++ b/demo15012025/obj/Debug/net8.0/Avalonia/Resources.Inputs.cache @@ -1 +1 @@ -6ba651331e2d52a468e8ce9a93040cd15b1ed1d04dc3b8bfd4b6f1066e860cec +6ca666c1542ca9238c67dd1a54ec89d3bccc3454bd741e4b3adaf5b5f952d81a diff --git a/demo15012025/obj/Debug/net8.0/Avalonia/demo15012025.dll b/demo15012025/obj/Debug/net8.0/Avalonia/demo15012025.dll index 6c9b9a7..cb8ac1b 100644 Binary files a/demo15012025/obj/Debug/net8.0/Avalonia/demo15012025.dll and b/demo15012025/obj/Debug/net8.0/Avalonia/demo15012025.dll differ diff --git a/demo15012025/obj/Debug/net8.0/Avalonia/demo15012025.pdb b/demo15012025/obj/Debug/net8.0/Avalonia/demo15012025.pdb index ca93841..2ac2a82 100644 Binary files a/demo15012025/obj/Debug/net8.0/Avalonia/demo15012025.pdb and b/demo15012025/obj/Debug/net8.0/Avalonia/demo15012025.pdb differ diff --git a/demo15012025/obj/Debug/net8.0/Avalonia/resources b/demo15012025/obj/Debug/net8.0/Avalonia/resources index d8a560a..fe783ba 100644 Binary files a/demo15012025/obj/Debug/net8.0/Avalonia/resources and b/demo15012025/obj/Debug/net8.0/Avalonia/resources differ diff --git a/demo15012025/obj/Debug/net8.0/demo15012025.AssemblyInfo.cs b/demo15012025/obj/Debug/net8.0/demo15012025.AssemblyInfo.cs index 021fadb..ecb155f 100644 --- 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")] diff --git a/demo15012025/obj/Debug/net8.0/demo15012025.AssemblyInfoInputs.cache b/demo15012025/obj/Debug/net8.0/demo15012025.AssemblyInfoInputs.cache index ab27933..edf4a35 100644 --- a/demo15012025/obj/Debug/net8.0/demo15012025.AssemblyInfoInputs.cache +++ b/demo15012025/obj/Debug/net8.0/demo15012025.AssemblyInfoInputs.cache @@ -1 +1 @@ -41005c7534528e296b01f2da27e8d291f7195ca9115a03f21b2481a4440c0335 +24a6a02c857323065555cf2adff2f30d21c3351bda097b2a5c06f3a37503196d diff --git a/demo15012025/obj/Debug/net8.0/demo15012025.GeneratedMSBuildEditorConfig.editorconfig b/demo15012025/obj/Debug/net8.0/demo15012025.GeneratedMSBuildEditorConfig.editorconfig index 91fa22d..a778bbd 100644 --- 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 diff --git a/demo15012025/obj/Debug/net8.0/demo15012025.csproj.CoreCompileInputs.cache b/demo15012025/obj/Debug/net8.0/demo15012025.csproj.CoreCompileInputs.cache index 6e9cb45..0dd9ac4 100644 --- a/demo15012025/obj/Debug/net8.0/demo15012025.csproj.CoreCompileInputs.cache +++ b/demo15012025/obj/Debug/net8.0/demo15012025.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -031ebb689cc6e87e8f89ef8dd7d8adc363e1a99b8c788e0af1f816c4dde16bae +c421778bb34eea18f587a2c14ad2e4633a2b2fd80de3dd47f078eebc41303934 diff --git a/demo15012025/obj/Debug/net8.0/demo15012025.dll b/demo15012025/obj/Debug/net8.0/demo15012025.dll index 1bcc070..18e7444 100644 Binary files a/demo15012025/obj/Debug/net8.0/demo15012025.dll and b/demo15012025/obj/Debug/net8.0/demo15012025.dll differ diff --git a/demo15012025/obj/Debug/net8.0/demo15012025.pdb b/demo15012025/obj/Debug/net8.0/demo15012025.pdb index 9250b17..b44ec2d 100644 Binary files a/demo15012025/obj/Debug/net8.0/demo15012025.pdb and b/demo15012025/obj/Debug/net8.0/demo15012025.pdb differ diff --git a/demo15012025/obj/Debug/net8.0/ref/demo15012025.dll b/demo15012025/obj/Debug/net8.0/ref/demo15012025.dll index 1b93aff..09057a3 100644 Binary files a/demo15012025/obj/Debug/net8.0/ref/demo15012025.dll and b/demo15012025/obj/Debug/net8.0/ref/demo15012025.dll differ diff --git a/demo15012025/obj/Debug/net8.0/refint/Avalonia/demo15012025.dll b/demo15012025/obj/Debug/net8.0/refint/Avalonia/demo15012025.dll index 1b93aff..09057a3 100644 Binary files a/demo15012025/obj/Debug/net8.0/refint/Avalonia/demo15012025.dll and b/demo15012025/obj/Debug/net8.0/refint/Avalonia/demo15012025.dll differ diff --git a/demo15012025/obj/Debug/net8.0/refint/demo15012025.dll b/demo15012025/obj/Debug/net8.0/refint/demo15012025.dll index 225940d..6b31d65 100644 Binary files a/demo15012025/obj/Debug/net8.0/refint/demo15012025.dll and b/demo15012025/obj/Debug/net8.0/refint/demo15012025.dll differ