diff --git a/Project.Persistence/SQLite.cs b/Project.Persistence/SQLite.cs
index d8d053b..73b5e35 100644
--- a/Project.Persistence/SQLite.cs
+++ b/Project.Persistence/SQLite.cs
@@ -5,9 +5,9 @@ namespace Project.Persistence;
public partial class SQLite
{
//filepath for home-pc:
- private static string _dbPath = "C:/Users/Soi/Desktop/keywi.db";
+ //private static string _dbPath = "C:/Users/Soi/Desktop/keywi.db";
//filepath for work-laptop:
- //private static string _dbPath = "C:/Users/lowns/Desktop/keywi.db";
+ private static string _dbPath = "C:/Users/lowns/Desktop/keywi.db";
//KLASSENVARIABLEN ERSTELLEN
//private static string loginname;
diff --git a/Project.View/Login Page/LoginPage.axaml b/Project.View/Login Page/LoginPage.axaml
index b2c369b..989fe77 100644
--- a/Project.View/Login Page/LoginPage.axaml
+++ b/Project.View/Login Page/LoginPage.axaml
@@ -2,50 +2,74 @@
x:Class="Project.View.LoginPage"
xmlns="https://github.com/avaloniaui"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-
-
-
-
-
- Your Login Name:
-
- Password:
+
+
+
+
+
+
+
+
+
+
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
\ No newline at end of file
diff --git a/Project.View/Login Page/LoginPage.axaml.cs b/Project.View/Login Page/LoginPage.axaml.cs
index a28b529..1cd3232 100644
--- a/Project.View/Login Page/LoginPage.axaml.cs
+++ b/Project.View/Login Page/LoginPage.axaml.cs
@@ -25,7 +25,7 @@ public partial class LoginPage : UserControl
string? loginName = LoginNameBox.Text ?? string.Empty;
string? loginPassword = LoginPasswordBox.Text ?? string.Empty;
bool allowLogin = AppController.CompareLogin(loginName, loginPassword);
- var newPopUp = new PopUp();
+ var newPopUp = new LoginErrorPopUp();
if (allowLogin)
{
//show menuview
diff --git a/Project.View/LoginErrorPopup/LoginPageError.axaml b/Project.View/LoginErrorPopup/LoginPageError.axaml
new file mode 100644
index 0000000..a59e5c0
--- /dev/null
+++ b/Project.View/LoginErrorPopup/LoginPageError.axaml
@@ -0,0 +1,56 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/Project.View/LoginErrorPopup/LoginPageError.axaml.cs b/Project.View/LoginErrorPopup/LoginPageError.axaml.cs
new file mode 100644
index 0000000..c18d28f
--- /dev/null
+++ b/Project.View/LoginErrorPopup/LoginPageError.axaml.cs
@@ -0,0 +1,22 @@
+using System;
+using Avalonia.Controls;
+using Avalonia.Interactivity;
+using Avalonia.Media;
+using Project.Controller;
+using Project.Model;
+using Project.Persistence;
+namespace Project.View;
+
+public partial class LoginErrorPopUp : Window
+
+{
+ public LoginErrorPopUp()
+ {
+ InitializeComponent();
+ }
+
+ private void LoginError_Click(object? sender, RoutedEventArgs e)
+ {
+ Close();
+ }
+}
\ No newline at end of file
diff --git a/Project.View/MenuView/MenuView.axaml b/Project.View/MenuView/MenuView.axaml
index a7b5ef5..41bfca9 100644
--- a/Project.View/MenuView/MenuView.axaml
+++ b/Project.View/MenuView/MenuView.axaml
@@ -2,103 +2,114 @@
x:Class="Project.View.MenuView"
xmlns="https://github.com/avaloniaui"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+
+
+
+
+
+
+
-
+
-
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
\ No newline at end of file
diff --git a/Project.View/MenuView/MenuView.axaml.cs b/Project.View/MenuView/MenuView.axaml.cs
index 8f8fc4a..b4337f1 100644
--- a/Project.View/MenuView/MenuView.axaml.cs
+++ b/Project.View/MenuView/MenuView.axaml.cs
@@ -45,7 +45,8 @@ public partial class MenuView : Window
Content = entry.Name, // Display the entry name on the button
Margin = new Thickness(5),
Padding = new Thickness(10),
- Width = 200
+ Width = 200,
+ Background = Brushes.SlateGray,
};
// add click handler for the button
button.Click += (object? sender, Avalonia.Interactivity.RoutedEventArgs e) => EntryDetails(entry);
diff --git a/Project.View/NewEntry/NewEntry.axaml b/Project.View/NewEntry/NewEntry.axaml
index ee061a9..2a824dc 100644
--- a/Project.View/NewEntry/NewEntry.axaml
+++ b/Project.View/NewEntry/NewEntry.axaml
@@ -4,73 +4,110 @@
x:Class="Project.View.NewEntry"
xmlns="https://github.com/avaloniaui"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ PasswordChar="•"
+ Watermark="Enter password"
+ x:Name="PassBox" />
+
+ Background="#4CAF50"
+ Foreground="White"
+ Grid.Column="1"
+ IsEnabled="False"
+ Name="newentry_generate_password"
+ ToolTip.Tip="Generate secure password (WORK IN PROGRESS)">
+ 🔒
+
+
-
-
-
-
+
+
+
+
+
+
-
+
+
-
-
-
-
-
+
+
\ No newline at end of file
diff --git a/Project.View/NewLogin/NewLogin.axaml b/Project.View/NewLogin/NewLogin.axaml
index 744581d..d3eff68 100644
--- a/Project.View/NewLogin/NewLogin.axaml
+++ b/Project.View/NewLogin/NewLogin.axaml
@@ -1,57 +1,85 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
-
+
+ FontSize="24"
+ FontWeight="Bold"
+ HorizontalAlignment="Center"
+ Margin="0,0,0,20"
+ Text="Neuer Benutzer" />
+
+
-
+
+
-
+
+
-
+
+
+
-
+ Content="Abbrechen" />
-
-
-
\ No newline at end of file
diff --git a/Project.View/PopUp/PopUp.axaml b/Project.View/PopUp/PopUp.axaml
index b3b9887..85972a9 100644
--- a/Project.View/PopUp/PopUp.axaml
+++ b/Project.View/PopUp/PopUp.axaml
@@ -1,5 +1,5 @@
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/Project.View/PopUp/PopUp.axaml.cs b/Project.View/PopUp/PopUp.axaml.cs
index d9dffe1..ef78af2 100644
--- a/Project.View/PopUp/PopUp.axaml.cs
+++ b/Project.View/PopUp/PopUp.axaml.cs
@@ -9,7 +9,8 @@ using Project.Persistence;
namespace Project.View;
public partial class PopUp : Window
-{ public PopUp()
+{
+ public PopUp()
{
InitializeComponent();
}
diff --git a/Project.View/Project.View.csproj b/Project.View/Project.View.csproj
index e5741c1..f4f84d1 100644
--- a/Project.View/Project.View.csproj
+++ b/Project.View/Project.View.csproj
@@ -36,6 +36,10 @@
NewEntry.axaml
Code
+
+ PopUp.axaml
+ Code
+