diff --git a/Appview/App.xaml b/Appview/App.xaml index 2d168a7..d81b381 100644 --- a/Appview/App.xaml +++ b/Appview/App.xaml @@ -4,6 +4,13 @@ xmlns:local="clr-namespace:Appview" StartupUri="MainWindow.xaml"> - + + diff --git a/Appview/Appview.csproj b/Appview/Appview.csproj index cfccdb7..2de054f 100644 --- a/Appview/Appview.csproj +++ b/Appview/Appview.csproj @@ -16,6 +16,12 @@ + + + + + + @@ -26,4 +32,10 @@ + + + + + + diff --git a/Appview/Fonts/Parkinsans-VariableFont_wght.ttf b/Appview/Fonts/Parkinsans-VariableFont_wght.ttf new file mode 100644 index 0000000..2755c05 Binary files /dev/null and b/Appview/Fonts/Parkinsans-VariableFont_wght.ttf differ diff --git a/Appview/Fonts/Poppins-Bold.ttf b/Appview/Fonts/Poppins-Bold.ttf new file mode 100644 index 0000000..00559ee Binary files /dev/null and b/Appview/Fonts/Poppins-Bold.ttf differ diff --git a/Appview/Fonts/Poppins-Regular.ttf b/Appview/Fonts/Poppins-Regular.ttf new file mode 100644 index 0000000..9f0c71b Binary files /dev/null and b/Appview/Fonts/Poppins-Regular.ttf differ diff --git a/Appview/Views/Login.xaml b/Appview/Views/Login.xaml index 9537b57..f558b37 100644 --- a/Appview/Views/Login.xaml +++ b/Appview/Views/Login.xaml @@ -138,10 +138,12 @@ - - + + + + + + diff --git a/Appview/Views/Login.xaml.cs b/Appview/Views/Login.xaml.cs index cce8c0e..1233b40 100644 --- a/Appview/Views/Login.xaml.cs +++ b/Appview/Views/Login.xaml.cs @@ -17,6 +17,7 @@ using System.Windows.Shapes; using static Appview.ViewModel.UserSession; using Appview.Services; +using System.Globalization; namespace Appview.Views @@ -50,6 +51,7 @@ private async void LoginButton_Click(object sender, RoutedEventArgs e) var db = new Database(); string username = txtUsername.Text; // Replace with the actual name of the Username TextBox string password = txtPassword.Text; // Replace with the actual name of the Password TextBox + //string password = txtPassword.Password; // Replace with the actual name of the Password TextBox bool isHotel = radioHotel.IsChecked == true; if (!radioCustomer.IsChecked == true && !isHotel) @@ -103,5 +105,18 @@ private async void LoginButton_Click(object sender, RoutedEventArgs e) } } } + public class EmptyPasswordToVisibilityConverter : IValueConverter + { + public object Convert(object value, Type targetType, object parameter, CultureInfo culture) + { + return string.IsNullOrEmpty(value?.ToString()) ? Visibility.Visible : Visibility.Collapsed; + } + + public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture) + { + return null; + } + } + } } diff --git a/Appview/Views/RecommendedFood.xaml b/Appview/Views/RecommendedFood.xaml index 458a4b4..ccf7369 100644 --- a/Appview/Views/RecommendedFood.xaml +++ b/Appview/Views/RecommendedFood.xaml @@ -19,7 +19,7 @@ - + diff --git a/Appview/Views/Register.xaml b/Appview/Views/Register.xaml index 45f3987..41a04ce 100644 --- a/Appview/Views/Register.xaml +++ b/Appview/Views/Register.xaml @@ -36,22 +36,22 @@ + local:Placeholder.Placeholder="Username" x:Name="txtUsername" /> + local:Placeholder.Placeholder="Email" x:Name="txtEmail" /> + local:Placeholder.Placeholder="Password" x:Name="txtPassword" /> + local:Placeholder.Placeholder="Confirm Password" x:Name="txtPasswordConfirm" />