Воробьев

.idea/.idea.Policlinica/.idea/avalonia.xml

@@ -4,9 +4,14 @@
     <option name="projectPerEditor">
       <map>
         <entry key="Policlinica/App.axaml" value="Policlinica/Policlinica.csproj" />
+        <entry key="Policlinica/Views/AdminWindow.axaml" value="Policlinica/Policlinica.csproj" />
+        <entry key="Policlinica/Views/AutorizationView.axaml" value="Policlinica/Policlinica.csproj" />
         <entry key="Policlinica/Views/PasswordWindow.axaml" value="Policlinica/Policlinica.csproj" />
+        <entry key="Policlinica/Views/Records.axaml" value="Policlinica/Policlinica.csproj" />
+        <entry key="Policlinica/Views/RegistrationView.axaml" value="Policlinica/Policlinica.csproj" />
         <entry key="Policlinica/Views/RegistrationWindow.axaml" value="Policlinica/Policlinica.csproj" />
         <entry key="Policlinica/Views/Rexord.axaml" value="Policlinica/Policlinica.csproj" />
+        <entry key="Policlinica/Views/StartView.axaml" value="Policlinica/Policlinica.csproj" />
         <entry key="Policlinica/Views/StartWindow.axaml" value="Policlinica/Policlinica.csproj" />
       </map>
     </option>

Policlinica/ViewModels/AutorizationViewModel.cs

@@ -13,7 +13,7 @@ public partial class AutorizationViewModel : ViewModelBase
     private readonly IServiceProvider _provider;
     private readonly Navigation _navigation;
 
-    [ObservableProperty] string _username;
+    [ObservableProperty] string _login;
     [ObservableProperty] string _password;
     [ObservableProperty] List<User> _usersList;
     [ObservableProperty] UserRepository _repository;
@@ -33,7 +33,7 @@ public partial class AutorizationViewModel : ViewModelBase
         
         var vm = ActivatorUtilities.CreateInstance<AdminWindowViewModel>(
             _provider,
-            Username);
+            Login);
         var win = _provider.GetRequiredService<AdminWindow>();
             //vm.SetClose(win.Close);
         win.DataContext = vm;
@@ -44,13 +44,7 @@ public partial class AutorizationViewModel : ViewModelBase
     [RelayCommand]
     public void SaveDB()
     {
-        User user = new User
+         _repository.CheckLoginAndPassword(Login,Password);
-        {
-            Name = Username,
-            Password = Password
-        };
-       // if(Users user )
-        _repository.CheckLoginAndPassword(Username,Password);
         var vm = _provider.GetRequiredService<AdminWindowViewModel>();
         var win = _provider.GetRequiredService<AdminWindow>();
         

Policlinica/ViewModels/RegistrationViewModel.cs

@@ -48,7 +48,6 @@ public partial class RegistrationViewModel:ViewModelBase
           win.DataContext = vm;
           win.Show(); 
             _navigation.Close();
-        
     }
     
 

Policlinica/ViewModels/StartViewModel.cs

@@ -13,7 +13,7 @@ public partial class StartViewModel:ViewModelBase
     {
         _navigation = navigation;
         _navigation.SetCurrentView(this);
-        _navigation.Navigate(sv.GetRequiredService<RegistrationViewModel>());
+        _navigation.Navigate(sv.GetRequiredService<AutorizationViewModel>());
     }
 
     Action closeAction;

Policlinica/Views/AutorizationView.axaml

@@ -7,12 +7,13 @@
         x:Class="Policlinica.Views.AutorizationView"
         x:DataType="vm:AutorizationViewModel">
 
+    <Border BorderBrush="Aqua" CornerRadius="8"  BorderThickness="2"  HorizontalAlignment="Center" VerticalAlignment="Center" Margin="10"> 
     <StackPanel HorizontalAlignment="Center" VerticalAlignment="Center">
         
-        <TextBlock Text="Создание заказа" FontSize="20" FontWeight="Bold" HorizontalAlignment="Center"/>
+        <TextBlock Text="Вход" FontSize="20" FontWeight="Bold" HorizontalAlignment="Center"/>
         
         <TextBlock Text="Логин:" />
-        <TextBox Text="{Binding Username}"/>
+        <TextBox Text="{Binding Login}"/>
         <TextBlock Text="Пароль:" />
         <TextBox Text="{Binding Password}"/>
         <StackPanel Orientation="Horizontal">
@@ -22,4 +23,5 @@
                     Command="{Binding OpenRegWinCommand}"/>
          </StackPanel>
     </StackPanel>
+    </Border>
 </UserControl>

Policlinica/Views/RegistrationView.axaml

@@ -8,15 +8,12 @@
         x:DataType="viewModels:RegistrationViewModel">
   
     <Border BorderBrush="Aqua" CornerRadius="8"  BorderThickness="2"  HorizontalAlignment="Center" VerticalAlignment="Center" Margin="10">
-        
-        
-        
         <StackPanel Spacing="5">
            <Label FontWeight="Bold" Content="Регистрация" HorizontalAlignment="Center"/>
-           <TextBlock Text="ИМЯ" HorizontalAlignment="Center"/>
-           <TextBox Watermark="Придумайте пароль" Text="{Binding Password}"/>
            <TextBlock Text="Логин" HorizontalAlignment="Center"/>
-           <TextBox Watermark="Придумайте логин" Text="{Binding Login}"/>
+           <TextBox Watermark="Придумайте имя" Text="{Binding Login}"/>
+           <TextBlock Text="Пароль" HorizontalAlignment="Center"/>
+           <TextBox Watermark="Придумайте пароль" Text="{Binding Password}"/>
            <StackPanel Orientation="Horizontal">
                <Button Content= "Зарегистрироваться" Command="{Binding RegistrationCommand}"/>
                <HyperlinkButton Command="{Binding OpenAutorizationCommand}" Content="Авторизоваться"/>

Policlinica/bin/Debug/net9.0/Policlinica.deps.json

@@ -23,6 +23,7 @@
       },
       "Avalonia/11.3.11": {
         "dependencies": {
+          "Avalonia.BuildServices": "11.3.2",
           "Avalonia.Remote.Protocol": "11.3.11",
           "MicroCom.Runtime": "0.11.0"
         },
@@ -78,20 +79,21 @@
           "runtimes/win-arm64/native/av_libglesv2.dll": {
             "rid": "win-arm64",
             "assetType": "native",
-            "fileVersion": "2.1.25606.0"
+            "fileVersion": "0.0.0.0"
           },
           "runtimes/win-x64/native/av_libglesv2.dll": {
             "rid": "win-x64",
             "assetType": "native",
-            "fileVersion": "2.1.25606.0"
+            "fileVersion": "0.0.0.0"
           },
           "runtimes/win-x86/native/av_libglesv2.dll": {
             "rid": "win-x86",
             "assetType": "native",
-            "fileVersion": "2.1.25606.0"
+            "fileVersion": "0.0.0.0"
           }
         }
       },
+      "Avalonia.BuildServices/11.3.2": {},
       "Avalonia.Controls.ColorPicker/11.3.11": {
         "dependencies": {
           "Avalonia": "11.3.11",
@@ -186,8 +188,10 @@
           "Avalonia": "11.3.11",
           "HarfBuzzSharp": "8.3.1.1",
           "HarfBuzzSharp.NativeAssets.Linux": "8.3.1.1",
+          "HarfBuzzSharp.NativeAssets.WebAssembly": "8.3.1.1",
           "SkiaSharp": "2.88.9",
-          "SkiaSharp.NativeAssets.Linux": "2.88.9"
+          "SkiaSharp.NativeAssets.Linux": "2.88.9",
+          "SkiaSharp.NativeAssets.WebAssembly": "2.88.9"
         },
         "runtime": {
           "lib/net8.0/Avalonia.Skia.dll": {
@@ -335,6 +339,7 @@
           }
         }
       },
+      "HarfBuzzSharp.NativeAssets.WebAssembly/8.3.1.1": {},
       "HarfBuzzSharp.NativeAssets.Win32/8.3.1.1": {
         "runtimeTargets": {
           "runtimes/win-arm64/native/libHarfBuzzSharp.dll": {
@@ -787,6 +792,7 @@
           }
         }
       },
+      "SkiaSharp.NativeAssets.WebAssembly/2.88.9": {},
       "SkiaSharp.NativeAssets.Win32/2.88.9": {
         "runtimeTargets": {
           "runtimes/win-arm64/native/libSkiaSharp.dll": {
@@ -826,7 +832,7 @@
             "rid": "win",
             "assetType": "runtime",
             "assemblyVersion": "10.0.0.0",
-            "fileVersion": "0.0.0.0"
+            "fileVersion": "10.0.25.52411"
           },
           "runtimes/win/lib/net9.0/System.Diagnostics.EventLog.dll": {
             "rid": "win",
@@ -911,6 +917,13 @@
       "path": "avalonia.angle.windows.natives/2.1.25547.20250602",
       "hashPath": "avalonia.angle.windows.natives.2.1.25547.20250602.nupkg.sha512"
     },
+    "Avalonia.BuildServices/11.3.2": {
+      "type": "package",
+      "serviceable": true,
+      "sha512": "sha512-qHDToxto1e3hci5YqbG9n0Ty8mlp3zBUN5wT66wKqaDVzXyQ0do3EnRILd4Ke9jpvsktaPpgE0YjEk7hornryQ==",
+      "path": "avalonia.buildservices/11.3.2",
+      "hashPath": "avalonia.buildservices.11.3.2.nupkg.sha512"
+    },
     "Avalonia.Controls.ColorPicker/11.3.11": {
       "type": "package",
       "serviceable": true,
@@ -1023,6 +1036,13 @@
       "path": "harfbuzzsharp.nativeassets.macos/8.3.1.1",
       "hashPath": "harfbuzzsharp.nativeassets.macos.8.3.1.1.nupkg.sha512"
     },
+    "HarfBuzzSharp.NativeAssets.WebAssembly/8.3.1.1": {
+      "type": "package",
+      "serviceable": true,
+      "sha512": "sha512-loJweK2u/mH/3C2zBa0ggJlITIszOkK64HLAZB7FUT670dTg965whLFYHDQo69NmC4+d9UN0icLC9VHidXaVCA==",
+      "path": "harfbuzzsharp.nativeassets.webassembly/8.3.1.1",
+      "hashPath": "harfbuzzsharp.nativeassets.webassembly.8.3.1.1.nupkg.sha512"
+    },
     "HarfBuzzSharp.NativeAssets.Win32/8.3.1.1": {
       "type": "package",
       "serviceable": true,
@@ -1254,6 +1274,13 @@
       "path": "skiasharp.nativeassets.macos/2.88.9",
       "hashPath": "skiasharp.nativeassets.macos.2.88.9.nupkg.sha512"
     },
+    "SkiaSharp.NativeAssets.WebAssembly/2.88.9": {
+      "type": "package",
+      "serviceable": true,
+      "sha512": "sha512-kt06RccBHSnAs2wDYdBSfsjIDbY3EpsOVqnlDgKdgvyuRA8ZFDaHRdWNx1VHjGgYzmnFCGiTJBnXFl5BqGwGnA==",
+      "path": "skiasharp.nativeassets.webassembly/2.88.9",
+      "hashPath": "skiasharp.nativeassets.webassembly.2.88.9.nupkg.sha512"
+    },
     "SkiaSharp.NativeAssets.Win32/2.88.9": {
       "type": "package",
       "serviceable": true,