Merge pull request #16 from EnesEfeTokta/Develop

Develop

Author: EnesEfeTokta

FinTrack/App.xaml

@@ -1,7 +1,8 @@
 <Application x:Class="FinTrackForWindows.App"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             xmlns:local="clr-namespace:FinTrackForWindows">
+             xmlns:local="clr-namespace:FinTrackForWindows"
+             ShutdownMode="OnExplicitShutdown">
     <Application.Resources>
         <ResourceDictionary>
             <ResourceDictionary.MergedDictionaries>

FinTrack/App.xaml.cs

@@ -3,12 +3,15 @@
 using FinTrackForWindows.Services;
 using FinTrackForWindows.Services.Accounts;
 using FinTrackForWindows.Services.Api;
+using FinTrackForWindows.Services.AppInNotifications;
 using FinTrackForWindows.Services.Budgets;
 using FinTrackForWindows.Services.Camera;
 using FinTrackForWindows.Services.Currencies;
 using FinTrackForWindows.Services.Debts;
 using FinTrackForWindows.Services.Memberships;
+using FinTrackForWindows.Services.Reports;
 using FinTrackForWindows.Services.Transactions;
+using FinTrackForWindows.Services.Users;
 using FinTrackForWindows.ViewModels;
 using FinTrackForWindows.Views;
 using Microsoft.Extensions.DependencyInjection;
@@ -88,8 +91,12 @@ private void ConfigureServices(IServiceCollection services)
             services.AddSingleton<ICurrenciesStore, CurrenciesStore>();
             services.AddSingleton<IMembershipStore, MembershipStore>();
             services.AddSingleton<IDebtStore, DebtStore>();
+            services.AddSingleton<IReportStore, ReportStore>();
+            services.AddSingleton<IUserStore, UserStore>();
 
             services.AddTransient<ICameraService, CameraService>();
+
+            services.AddSingleton<IAppInNotificationService, AppInNotificationService>();
         }
 
         protected override async void OnStartup(StartupEventArgs e)
@@ -126,11 +133,17 @@ private void SetupGlobalExceptionHandling()
 
         protected override async void OnExit(ExitEventArgs e)
         {
+            var notificationService = _host.Services.GetService<IAppInNotificationService>();
+            notificationService?.Dispose();
+
             using (_host)
             {
                 await _host.StopAsync(TimeSpan.FromSeconds(5));
+                _host.Dispose();
             }
+
             base.OnExit(e);
         }
+
     }
 }

FinTrack/Dtos/BudgetDtos/BudgetCreateDto.cs

@@ -8,6 +8,7 @@ public class BudgetCreateDto
         public string? Description { get; set; }
         public string Category { get; set; } = null!;
         public decimal AllocatedAmount { get; set; }
+        public decimal? ReachedAmount { get; set; }
         public BaseCurrencyType Currency { get; set; }
         public DateTime StartDate { get; set; }
         public DateTime EndDate { get; set; }

FinTrack/Dtos/BudgetDtos/BudgetDto.cs

@@ -9,6 +9,7 @@ public class BudgetDto
         public string? Description { get; set; }
         public string Category { get; set; } = null!;
         public decimal AllocatedAmount { get; set; }
+        public decimal? ReachedAmount { get; set; }
         public BaseCurrencyType Currency { get; set; }
         public DateTime StartDate { get; set; }
         public DateTime EndDate { get; set; }

FinTrack/Dtos/BudgetDtos/BudgetUpdateDto.cs

@@ -8,6 +8,7 @@ public class BudgetUpdateDto
         public string? Description { get; set; }
         public string Category { get; set; } = null!;
         public decimal AllocatedAmount { get; set; }
+        public decimal? ReachedAmount { get; set; }
         public BaseCurrencyType Currency { get; set; }
         public DateTime StartDate { get; set; }
         public DateTime EndDate { get; set; }

FinTrack/Dtos/BudgetDtos/BudgetUpdateReachedAmountDto.cs

@@ -0,0 +1,8 @@
+namespace FinTrackForWindows.Dtos.BudgetDtos
+{
+    public class BudgetUpdateReachedAmountDto
+    {
+        public int BudgetId { get; set; }
+        public decimal? ReachedAmount { get; set; }
+    }
+}

FinTrack/Dtos/UserProfileDto.cs

@@ -5,8 +5,7 @@ public class UserProfileDto
         public int Id { get; set; }
         public string UserName { get; set; } = string.Empty;
         public string Email { get; set; } = string.Empty;
-        public string ProfilePicture { get; set; } = string.Empty;
-        public string Role { get; set; } = string.Empty;
+        public string? ProfilePicture { get; set; }
         public string MembershipType { get; set; } = string.Empty;
     }
 }

FinTrack/Enums/ExportFormat.cs FinTrack/Enums/DocumentFormat.csFinTrack/Enums/ExportFormat.cs renamed to FinTrack/Enums/DocumentFormat.cs

@@ -8,6 +8,17 @@
     <UseWPF>true</UseWPF>
   </PropertyGroup>
 
+  <ItemGroup>
+    <Compile Remove="Services\EmailService\**" />
+    <Compile Remove="Services\NotificationTemplates\**" />
+    <EmbeddedResource Remove="Services\EmailService\**" />
+    <EmbeddedResource Remove="Services\NotificationTemplates\**" />
+    <None Remove="Services\EmailService\**" />
+    <None Remove="Services\NotificationTemplates\**" />
+    <Page Remove="Services\EmailService\**" />
+    <Page Remove="Services\NotificationTemplates\**" />
+  </ItemGroup>
+
   <ItemGroup>
     <None Remove="Assets\Images\chatbot.png" />
     <None Remove="Assets\Images\Icons\add.png" />
@@ -57,6 +68,7 @@
     <PackageReference Include="Microsoft.Extensions.Hosting" Version="10.0.0-preview.6.25358.103" />
     <PackageReference Include="Microsoft.Xaml.Behaviors.Wpf" Version="1.1.135" />
     <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
+    <PackageReference Include="Notifications.Wpf" Version="0.1.1" />
     <PackageReference Include="Npgsql" Version="9.0.3" />
     <PackageReference Include="ReactiveUI.WPF" Version="20.4.1" />
     <PackageReference Include="Serilog.Extensions.Hosting" Version="9.0.1-dev-02307" />

FinTrack/FinTrackForWindows.csproj

@@ -0,0 +1,82 @@
+using System.Collections.Specialized;
+using System.Windows;
+using System.Windows.Controls;
+
+namespace FinTrackForWindows.Helpers
+{
+    public static class AutoScrollBehavior
+    {
+        public static readonly DependencyProperty AutoScrollProperty =
+            DependencyProperty.RegisterAttached(
+                "AutoScroll",
+                typeof(bool),
+                typeof(AutoScrollBehavior),
+                new PropertyMetadata(false, OnAutoScrollPropertyChanged));
+
+        public static void SetAutoScroll(DependencyObject obj, bool value)
+        {
+            obj.SetValue(AutoScrollProperty, value);
+        }
+
+        public static bool GetAutoScroll(DependencyObject obj)
+        {
+            return (bool)obj.GetValue(AutoScrollProperty);
+        }
+
+        private static void OnAutoScrollPropertyChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
+        {
+            if (d is not ScrollViewer scrollViewer)
+            {
+                return;
+            }
+
+            if ((bool)e.NewValue)
+            {
+                scrollViewer.ScrollToBottom();
+
+                if (FindItemsControl(scrollViewer) is { } itemsControl &&
+                    itemsControl.ItemsSource is INotifyCollectionChanged collection)
+                {
+                    collection.CollectionChanged += (s, args) =>
+                    {
+                        if (args.Action == NotifyCollectionChangedAction.Add)
+                        {
+                            scrollViewer.ScrollToBottom();
+                        }
+                    };
+                }
+            }
+        }
+
+        private static ItemsControl? FindItemsControl(DependencyObject parent)
+        {
+            if (parent == null) return null;
+
+            if (parent is ItemsControl itemsControl)
+            {
+                return itemsControl;
+            }
+
+            if (parent is ContentPresenter contentPresenter)
+            {
+                if (contentPresenter.Content is ItemsControl ic)
+                {
+                    return ic;
+                }
+            }
+
+            if (parent is Panel panel)
+            {
+                foreach (var child in panel.Children)
+                {
+                    if (child is ItemsControl ic)
+                    {
+                        return ic;
+                    }
+                }
+            }
+
+            return null;
+        }
+    }
+}