From 7ef66a0b3d0e90d5fa81ae8613fdf4a3531db44a Mon Sep 17 00:00:00 2001 From: taarly Date: Sun, 29 Jun 2025 18:30:44 +0200 Subject: [PATCH] owner = user, working now --- Project.Controller/AppController.cs | 12 +++++++++++- Project.View/Login Page/LoginPage.axaml.cs | 1 + Project.View/NewLogin/NewLogin.axaml.cs | 2 ++ 3 files changed, 14 insertions(+), 1 deletion(-) diff --git a/Project.Controller/AppController.cs b/Project.Controller/AppController.cs index 7ece581..88e906c 100644 --- a/Project.Controller/AppController.cs +++ b/Project.Controller/AppController.cs @@ -16,7 +16,7 @@ public partial class AppController public static void NewEntrySave(string name, string usernameurl, string email, string password, string note) { string hashedPassword = ShaHash.HashPassword(password); - string ownerUsername = "user"; + string ownerUsername = _currentUser; SQLite.SaveEntry(name, hashedPassword, email, note, ownerUsername); //string name, string pass, string mailUsername, string? note, string ownerUsername } @@ -29,4 +29,14 @@ public partial class AppController var savedPassword = SQLite.GetLogin(Username); return hashedPassword == savedPassword; } + + //the currently logged in user + private static string _currentUser; + + public static void SetCurrentUser(string currentUser) + { + _currentUser = currentUser; + } + + } diff --git a/Project.View/Login Page/LoginPage.axaml.cs b/Project.View/Login Page/LoginPage.axaml.cs index fad8cac..369ec8a 100644 --- a/Project.View/Login Page/LoginPage.axaml.cs +++ b/Project.View/Login Page/LoginPage.axaml.cs @@ -29,6 +29,7 @@ public partial class LoginPage : UserControl if (allowLogin) { //show menuview + AppController.SetCurrentUser(loginName); newMenuView.Show(); } else diff --git a/Project.View/NewLogin/NewLogin.axaml.cs b/Project.View/NewLogin/NewLogin.axaml.cs index c48bfea..ef5419e 100644 --- a/Project.View/NewLogin/NewLogin.axaml.cs +++ b/Project.View/NewLogin/NewLogin.axaml.cs @@ -14,6 +14,7 @@ public partial class NewLogin : Window public NewLogin() { InitializeComponent(); + _controller = new(); } public NewLogin(AppController controller) @@ -31,6 +32,7 @@ public partial class NewLogin : Window bool masterLoginPasswordBool = InputSanitizer.MasterLoginPasswordBool(password); bool masterLoginEmailBool = InputSanitizer.MasterLoginEmailBool(email); bool masterLoginNameBool = InputSanitizer.MasterLoginNameBool(username); + //give strings to appcontroller and keep working on them there if (masterLoginPasswordBool && masterLoginEmailBool && masterLoginNameBool) {