PrototypWPFHAG/MainWindow.xaml

@@ -28,10 +28,6 @@
                     <PasswordBox Width="170" Height="30" Margin="0,5,34,0" x:Name="PasswordTextBox"
                     PasswordChanged="PasswordTextBox_PasswordChanged"/>
 
-<<<<<<< HEAD
-                <!-- 登录按钮 -->
-                <Button Height="30" Width="100" Content="Log in" Margin="0,20,0,0" Click="LoginButton_Click" />
-=======
                     <!-- Textbox for visible password (hidden at default) -->
                     <TextBox Width="170" Height="30" Margin="0,5,34,0" x:Name="PasswordVisibleTextBox"
                     Visibility="Collapsed" IsReadOnly="True"/>
@@ -45,7 +41,6 @@
                 <!-- Login Button -->
                 <Button Height="30" Width="100" Content="Zur Suche" Margin="0,20,0,0" 
                         Click="loginButton_Click" IsDefault="True" />
->>>>>>> 1195250b98172d34b8c49b85a81c21d1f26cdbac
             </StackPanel>
         </Border>
     </Grid>

PrototypWPFHAG/MainWindow.xaml.cs

@@ -1,6 +1,4 @@
 using System.Data;
-using System.Runtime.InteropServices;
-using System.Security.Principal;
 using System.Text;
 using System.Windows;
 using System.Windows.Controls;
@@ -25,14 +23,6 @@ public partial class MainWindow : MetroWindow
     public MainWindow()
     {
         InitializeComponent();
-<<<<<<< HEAD
-        //TestConnection();
-        //Console.ReadKey();
-
-    }
-
-    private static void TestConnection()
-=======
     }
 
     private void Window_Loaded(object sender, RoutedEventArgs e)
@@ -46,7 +36,6 @@ public partial class MainWindow : MetroWindow
     }
 
     private string ValidateUser(string username, string password)
->>>>>>> 1195250b98172d34b8c49b85a81c21d1f26cdbac
     {
         using (NpgsqlConnection con = GetConnection())
         {
@@ -79,15 +68,8 @@ public partial class MainWindow : MetroWindow
                 }
             }
         }
-<<<<<<< HEAD
-    }
-    private static NpgsqlConnection GetConnection()
-    {
-        return new NpgsqlConnection(@"Server=localhost;Port=7854;User Id=postgres;Database=postgres;");
-=======
 
         return "Erfolgreich";
->>>>>>> 1195250b98172d34b8c49b85a81c21d1f26cdbac
     }
 
     private void ShowPasswordButton_PreviewMouseDown(object sender, RoutedEventArgs e)

PrototypWPFHAG/PrototypWPFHAG.csproj

@@ -24,9 +24,7 @@
 
   <ItemGroup>
     <PackageReference Include="MahApps.Metro" Version="2.4.10" />
-    <PackageReference Include="Microsoft.AspNetCore.Authentication" Version="2.3.0" />
     <PackageReference Include="Microsoft.AspNetCore.Authentication.Negotiate" Version="9.0.3" />
-    <PackageReference Include="Microsoft.Identity.Client" Version="4.69.1" />
     <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
     <PackageReference Include="Npgsql" Version="9.0.3" />
     <PackageReference Include="PdfPig" Version="0.1.10" />