PBG2H23ASA/HAG_BIB_Projekt
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'main' of https://git.bib.de/PBG2H23ASA/HAG_BIB_Projekt

Browse Source
This commit is contained in:
Luis Sander 2025-04-09 10:00:36 +02:00
commit c6b6a2359c
3 changed files with 25 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
PrototypWPFHAG/MainWindow.xaml
View File

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

18
PrototypWPFHAG/MainWindow.xaml.cs
View File

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

2
PrototypWPFHAG/PrototypWPFHAG.csproj
View File

@ -25,7 +25,9 @@
<ItemGroup> <ItemGroup>
<PackageReference Include="MahApps.Metro" Version="2.4.10" /> <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.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="Newtonsoft.Json" Version="13.0.3" />
<PackageReference Include="Npgsql" Version="9.0.3" /> <PackageReference Include="Npgsql" Version="9.0.3" />
<PackageReference Include="PdfPig" Version="0.1.10" /> <PackageReference Include="PdfPig" Version="0.1.10" />