diff --git a/YouTubeViewers.EntityFramework/Commands/CreateYouTubeViewerCommand.cs b/YouTubeViewers.EntityFramework/Commands/CreateYouTubeViewerCommand.cs
index c74c930..0c2559c 100644
--- a/YouTubeViewers.EntityFramework/Commands/CreateYouTubeViewerCommand.cs
+++ b/YouTubeViewers.EntityFramework/Commands/CreateYouTubeViewerCommand.cs
@@ -20,6 +20,7 @@ namespace YouTubeViewers.EntityFramework.Commands
public async Task Execute(YouTubeViewer youTubeViewer)
{
+
using (YouTubeViewersDbContext context = _contextFactory.Create())
{
YouTubeViewerDto youTubeViewerDto = new YouTubeViewerDto()
diff --git a/YouTubeViewers.EntityFramework/Commands/DeleteYouTubeViewerCommand.cs b/YouTubeViewers.EntityFramework/Commands/DeleteYouTubeViewerCommand.cs
index 52a27d3..bf4819b 100644
--- a/YouTubeViewers.EntityFramework/Commands/DeleteYouTubeViewerCommand.cs
+++ b/YouTubeViewers.EntityFramework/Commands/DeleteYouTubeViewerCommand.cs
@@ -21,7 +21,6 @@ namespace YouTubeViewers.EntityFramework.Commands
{
using (YouTubeViewersDbContext context = _contextFactory.Create())
{
- await Task.Delay(5000);
YouTubeViewerDto youTubeViewerDto = new YouTubeViewerDto()
{
Id = id,
diff --git a/YouTubeViewers.EntityFramework/Commands/UpdateYouTubeViewerCommand.cs b/YouTubeViewers.EntityFramework/Commands/UpdateYouTubeViewerCommand.cs
index afc68d9..75ed632 100644
--- a/YouTubeViewers.EntityFramework/Commands/UpdateYouTubeViewerCommand.cs
+++ b/YouTubeViewers.EntityFramework/Commands/UpdateYouTubeViewerCommand.cs
@@ -20,6 +20,7 @@ namespace YouTubeViewers.EntityFramework.Commands
public async Task Execute(YouTubeViewer youTubeViewer)
{
+
using (YouTubeViewersDbContext context = _contextFactory.Create())
{
YouTubeViewerDto youTubeViewerDto = new YouTubeViewerDto()
diff --git a/YouTubeViewers.WPF/App.xaml b/YouTubeViewers.WPF/App.xaml
index 025ae7c..315b465 100644
--- a/YouTubeViewers.WPF/App.xaml
+++ b/YouTubeViewers.WPF/App.xaml
@@ -8,8 +8,12 @@
-
+
+
+
+
+
+
+
+
+
+
+
-
-
+
-
-
-
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/YouTubeViewers.WPF/ViewModels/YouTubeViewerDetailsFormViewModel.cs b/YouTubeViewers.WPF/ViewModels/YouTubeViewerDetailsFormViewModel.cs
index 7665626..1b088e6 100644
--- a/YouTubeViewers.WPF/ViewModels/YouTubeViewerDetailsFormViewModel.cs
+++ b/YouTubeViewers.WPF/ViewModels/YouTubeViewerDetailsFormViewModel.cs
@@ -59,6 +59,25 @@ public class YouTubeViewerDetailsFormViewModel : ViewModelBase
#endregion IsSubmitting
+ #region ErrorMessage
+
+ private string _errorMessage;
+ public string ErrorMessage
+ {
+ get { return _errorMessage; }
+ set
+ {
+ _errorMessage = value;
+ OnPropertyChanged(nameof(ErrorMessage));
+ OnPropertyChanged(nameof(HasErrorMessage));
+ }
+ }
+
+ #endregion ErrorMessage
+
+ public bool HasErrorMessage => !string.IsNullOrEmpty(ErrorMessage);
+
+
public bool CanSubmit => !string.IsNullOrEmpty(UserName);
public ICommand SubmitCommand { get; }
public ICommand CancelCommand { get; }
diff --git a/YouTubeViewers.WPF/ViewModels/YouTubeViewersListingItemViewModel.cs b/YouTubeViewers.WPF/ViewModels/YouTubeViewersListingItemViewModel.cs
index e81168d..8a26ad3 100644
--- a/YouTubeViewers.WPF/ViewModels/YouTubeViewersListingItemViewModel.cs
+++ b/YouTubeViewers.WPF/ViewModels/YouTubeViewersListingItemViewModel.cs
@@ -20,6 +20,35 @@ namespace YouTubeViewers.WPF.ViewModels
public string UserName => YouTubeViewer.Username;
+
+ #region IsDeleting
+
+ private bool _isDeleting;
+ public bool IsDeleting
+ {
+ get { return _isDeleting; }
+ set { _isDeleting = value; OnPropertyChanged(); }
+ }
+
+ #endregion IsDeleting
+
+ #region ErrorMessage
+
+ private string _errorMessage;
+ public string ErrorMessage
+ {
+ get { return _errorMessage; }
+ set
+ {
+ _errorMessage = value;
+ OnPropertyChanged(nameof(ErrorMessage));
+ OnPropertyChanged(nameof(HasErrorMessage));
+ }
+ }
+
+ #endregion ErrorMessage
+
+ public bool HasErrorMessage => !string.IsNullOrEmpty(ErrorMessage);
public ICommand EditCommand { get; }
public ICommand DeleteCommand { get; }
diff --git a/YouTubeViewers.WPF/ViewModels/YouTubeViewersViewModel.cs b/YouTubeViewers.WPF/ViewModels/YouTubeViewersViewModel.cs
index f574071..d740bfe 100644
--- a/YouTubeViewers.WPF/ViewModels/YouTubeViewersViewModel.cs
+++ b/YouTubeViewers.WPF/ViewModels/YouTubeViewersViewModel.cs
@@ -29,6 +29,23 @@ namespace YouTubeViewers.WPF.ViewModels
}
}
+
+ #region ErrorMessage
+
+ private string _errorMessage;
+ public string ErrorMessage
+ {
+ get { return _errorMessage; }
+ set { _errorMessage = value;
+ OnPropertyChanged(nameof(ErrorMessage));
+ OnPropertyChanged(nameof(HasErrorMessage));
+ }
+ }
+
+ #endregion ErrorMessage
+
+ public bool HasErrorMessage => !string.IsNullOrEmpty(ErrorMessage);
+
public ICommand LoadYouTubeViewersCommand { get; }
public ICommand AddYouTubeViewersCommand { get; }
public YouTubeViewersViewModel(YouTubeViewersStore youTubeViewersStore, SelectedYouTubeViewerStore _selectedYouTubeViewerStore, ModalNavigationStore modalNavigationStore)
diff --git a/YouTubeViewers.WPF/Views/AddYouTubeViewerView.xaml b/YouTubeViewers.WPF/Views/AddYouTubeViewerView.xaml
index bb39867..de3a2ed 100644
--- a/YouTubeViewers.WPF/Views/AddYouTubeViewerView.xaml
+++ b/YouTubeViewers.WPF/Views/AddYouTubeViewerView.xaml
@@ -6,7 +6,9 @@
xmlns:local="clr-namespace:YouTubeViewers.WPF.Views"
xmlns:components="clr-namespace:YouTubeViewers.WPF.Components"
mc:Ignorable="d"
- d:DesignHeight="450" d:DesignWidth="800">
+ d:DesignHeight="450" d:DesignWidth="800"
+ Width="400"
+ >
diff --git a/YouTubeViewers.WPF/Views/YouTubeViewersView.xaml b/YouTubeViewers.WPF/Views/YouTubeViewersView.xaml
index 9a586d7..e2973b4 100644
--- a/YouTubeViewers.WPF/Views/YouTubeViewersView.xaml
+++ b/YouTubeViewers.WPF/Views/YouTubeViewersView.xaml
@@ -34,25 +34,50 @@
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+