diff --git a/demo15012025/RegJhuri.axaml b/demo15012025/RegJhuri.axaml
index 8e7c1fa..f140318 100644
--- a/demo15012025/RegJhuri.axaml
+++ b/demo15012025/RegJhuri.axaml
@@ -51,7 +51,10 @@
-
+
+
+
+
diff --git a/demo15012025/RegJhuri.axaml.cs b/demo15012025/RegJhuri.axaml.cs
index 0d02405..e8aadc2 100644
--- a/demo15012025/RegJhuri.axaml.cs
+++ b/demo15012025/RegJhuri.axaml.cs
@@ -98,8 +98,16 @@ public partial class RegJhuri : Window
var returnPassword = TextPassword.Text;
var returnPassword2 = TextRePassword.Text;
if (returnPassword != returnPassword2)
+
+ if (returnPassword != returnPassword2)
+ {
+ Console.WriteLine("Пароли не совпадают.");
+ return;
+ }
+
+ if (!ValidatePassword(returnPassword))
{
- Console.WriteLine("Пароли не совпадают.");
+ Console.WriteLine("Пароль не соответствует требованиям.");
return;
}
@@ -160,4 +168,43 @@ public partial class RegJhuri : Window
return null;
}
}
+
+ private bool ValidatePassword(string password)
+ {
+ if (password.Length < 6)
+ {
+ PasswordErrorText.Text = "Пароль должен быть не менее 6 символов.";
+ PasswordErrorText.IsVisible = true;
+ return false;
+ }
+
+ if (!password.Any(char.IsDigit))
+ {
+ PasswordErrorText.Text = "Пароль должен содержать хотя бы одну цифру.";
+ PasswordErrorText.IsVisible = true;
+ return false;
+ }
+
+ if (!password.Any(char.IsLetter))
+ {
+ PasswordErrorText.Text = "Пароль должен содержать хотя бы одну букву.";
+ PasswordErrorText.IsVisible = true;
+ return false;
+ }
+
+ PasswordErrorText.IsVisible = false;
+ return true;
+ }
+
+ private void PasswordVisibilityCheckBox_Checked(object sender, RoutedEventArgs e)
+ {
+ TextPassword.PasswordChar = '\0';
+ TextRePassword.PasswordChar = '\0';
+ }
+
+ private void PasswordVisibilityCheckBox_Unchecked(object sender, RoutedEventArgs e)
+ {
+ TextPassword.PasswordChar = '•';
+ TextRePassword.PasswordChar = '•';
+ }
}
diff --git a/demo15012025/bin/Debug/net8.0/5713847c-f9ee-44d6-a0dc-591b091fa87e.jpg b/demo15012025/bin/Debug/net8.0/5713847c-f9ee-44d6-a0dc-591b091fa87e.jpg
new file mode 100644
index 0000000..0c5ba4f
Binary files /dev/null and b/demo15012025/bin/Debug/net8.0/5713847c-f9ee-44d6-a0dc-591b091fa87e.jpg differ
diff --git a/demo15012025/bin/Debug/net8.0/96f35242-6944-45b6-8645-e5228356fc68.jpg b/demo15012025/bin/Debug/net8.0/96f35242-6944-45b6-8645-e5228356fc68.jpg
new file mode 100644
index 0000000..2e3aa3b
Binary files /dev/null and b/demo15012025/bin/Debug/net8.0/96f35242-6944-45b6-8645-e5228356fc68.jpg differ
diff --git a/demo15012025/bin/Debug/net8.0/demo15012025.dll b/demo15012025/bin/Debug/net8.0/demo15012025.dll
index d44ba7f..6640b25 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 f98dc28..1fcdedb 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/demo15012025.dll b/demo15012025/obj/Debug/net8.0/Avalonia/demo15012025.dll
index d44ba7f..6640b25 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 f98dc28..1fcdedb 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 f0234f1..e2725c8 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 e930696..3650143 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+fe0ba9320c7b42e3e952670b2be10fb55490eb04")]
+[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+1057a643f8eed5ef9fa1dce6f12c003e060abdd6")]
[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 a7aafae..5cefedd 100644
--- a/demo15012025/obj/Debug/net8.0/demo15012025.AssemblyInfoInputs.cache
+++ b/demo15012025/obj/Debug/net8.0/demo15012025.AssemblyInfoInputs.cache
@@ -1 +1 @@
-9be47889b8d73cd0463d35e7868addd6cbb3ce57cb06c77fc2cd288c4821de5c
+4588be067bf91c0cab9d42363e9d335da1e75434b3d2935fdcac2bcc10f05682
diff --git a/demo15012025/obj/Debug/net8.0/demo15012025.dll b/demo15012025/obj/Debug/net8.0/demo15012025.dll
index 87d554a..68bc9e5 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 9f44e84..34c96fa 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 0d946d6..ad833de 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 0d946d6..ad833de 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 46941e2..75de094 100644
Binary files a/demo15012025/obj/Debug/net8.0/refint/demo15012025.dll and b/demo15012025/obj/Debug/net8.0/refint/demo15012025.dll differ