Merge pull request #11 from EnesEfeTokta/Develop

Develop

Author: EnesEfeTokta

FinTrack/Assets/Images/Icons/calendar.png

@@ -1,17 +1,22 @@
-using System.IO;
+using Microsoft.Extensions.Logging;
+using System.IO;
 using System.Security.Cryptography;
 using System.Text;
 
 namespace FinTrack.Core
 {
     public class SecureTokenStorage : ISecureTokenStorage
     {
+        private readonly ILogger<SecureTokenStorage> _logger;
+
         private readonly string _filePath;
 
         private static readonly byte[] s_entropy = Encoding.UTF8.GetBytes("E5A3B8B8_4A8C_4F1D_9F0B_2B3A7F9C1D0E"); // [TEST]
 
-        public SecureTokenStorage()
+        public SecureTokenStorage(ILogger<SecureTokenStorage> logger)
         {
+            _logger = logger;
+
             var appDataPath = Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData);
             var appFolder = Path.Combine(appDataPath, "FinTrack");
             Directory.CreateDirectory(appFolder);
@@ -27,10 +32,11 @@ public void SaveToken(string token)
             {
                 var encryptedToken = ProtectedData.Protect(Encoding.UTF8.GetBytes(token), s_entropy, DataProtectionScope.CurrentUser);
                 File.WriteAllBytes(_filePath, encryptedToken);
+                _logger.LogInformation("Token başarıyla kaydedildi.");
             }
             catch (Exception ex)
             {
-                Console.WriteLine($"Error saving token: {ex.Message}");
+                _logger.LogError(ex, "Token 'ı kaydederken hata oluştu.");
                 throw;
             }
         }
@@ -48,7 +54,7 @@ public void SaveToken(string token)
             }
             catch (Exception ex)
             {
-                Console.WriteLine($"Error retrieving token: {ex.Message}");
+                _logger.LogError(ex, "Token 'ı alırken hata oluştu.");
                 ClearToken();
                 return null;
             }
@@ -61,10 +67,11 @@ public void ClearToken()
                 try
                 {
                     File.Delete(_filePath);
+                    _logger.LogInformation("Token başarıyla temizlendi.");
                 }
                 catch (Exception ex)
                 {
-                    Console.WriteLine($"Error clearing token: {ex.Message}");
+                    _logger.LogError(ex, "Token 'ı temizlerken hata oluştu.");
                 }
             }
         }

FinTrack/Assets/Images/Icons/credit-card.png

@@ -13,13 +13,16 @@
     <None Remove="Assets\Images\Icons\add.png" />
     <None Remove="Assets\Images\Icons\bank.png" />
     <None Remove="Assets\Images\Icons\bell.png" />
+    <None Remove="Assets\Images\Icons\calendar.png" />
     <None Remove="Assets\Images\Icons\conversation.png" />
+    <None Remove="Assets\Images\Icons\credit-card.png" />
     <None Remove="Assets\Images\Icons\delete.png" />
     <None Remove="Assets\Images\Icons\done.png" />
     <None Remove="Assets\Images\Icons\edit.png" />
     <None Remove="Assets\Images\Icons\email.png" />
     <None Remove="Assets\Images\Icons\eyeclose.png" />
     <None Remove="Assets\Images\Icons\eyeopen.png" />
+    <None Remove="Assets\Images\Icons\investment.png" />
     <None Remove="Assets\Images\Icons\login.png" />
     <None Remove="Assets\Images\Icons\message.png" />
     <None Remove="Assets\Images\Icons\money.png" />
@@ -73,8 +76,11 @@
     <Resource Include="Assets\Images\Icons\add.png" />
     <Resource Include="Assets\Images\Icons\bank.png" />
     <Resource Include="Assets\Images\Icons\bell.png" />
+    <Resource Include="Assets\Images\Icons\calendar.png" />
+    <Resource Include="Assets\Images\Icons\credit-card.png" />
     <Resource Include="Assets\Images\Icons\delete.png" />
     <Resource Include="Assets\Images\Icons\edit.png" />
+    <Resource Include="Assets\Images\Icons\investment.png" />
     <Resource Include="Assets\Images\Icons\money.png" />
     <Resource Include="Assets\Images\Icons\report.png" />
     <Resource Include="Assets\Images\Icons\send-message.png" />

FinTrack/Assets/Images/Icons/investment.png

@@ -10,7 +10,7 @@ public partial class AccountModel : ObservableObject
         private Guid id = Guid.NewGuid();
 
         [ObservableProperty]
-        private string name;
+        private string name = string.Empty;
 
         [ObservableProperty]
         private AccountType type;
@@ -30,9 +30,9 @@ public partial class AccountModel : ObservableObject
         public string IconPath => Type switch
         {
             AccountType.Checking => "/Assets/Images/Icons/bank.png",
-            AccountType.CreditCard => "/Assets/Images/Icons/credit_card.png",
+            AccountType.CreditCard => "/Assets/Images/Icons/credit-card.png",
             AccountType.Loan => "/Assets/Images/Icons/investment.png",
-            _ => string.Empty
+            _ => "/Assets/Images/Icons/money.png"
         };
 
         public Brush IconBackground => Type switch

FinTrack/Core/SecureTokenStorage.cs

@@ -25,6 +25,18 @@ public partial class CurrencyModel : ObservableObject
         [NotifyPropertyChangedFor(nameof(ToCurrencyChangeForeground))]
         private CurrencyConversionType type = CurrencyConversionType.Increase;
 
+        [ObservableProperty]
+        private string dailyLow = string.Empty;
+
+        [ObservableProperty]
+        private string dailyHigh = string.Empty;
+
+        [ObservableProperty]
+        private string weeklyChange = string.Empty;
+
+        [ObservableProperty]
+        private string monthlyChange = string.Empty;
+
         private static readonly Brush IncreaseBrush = new SolidColorBrush(Colors.Green);
         private static readonly Brush DecreaseBrush = new SolidColorBrush(Colors.Red);
         private static readonly Brush DefaultBrush = new SolidColorBrush(Colors.Gray);

FinTrack/FinTrack.csproj

@@ -1,4 +1,6 @@
-namespace FinTrack.Models.Dashboard
+using System.Windows.Media;
+
+namespace FinTrack.Models.Dashboard
 {
     public class DebtDashboard
     {
@@ -7,7 +9,7 @@ public class DebtDashboard
         public string BorrowerName { get; set; } = string.Empty;
         public string BorrowerIconPath { get; set; } = string.Empty;
         public string Status { get; set; } = string.Empty;
-        public string StatusBrush { get; set; } = string.Empty;
+        public Brush StatusBrush { get; set; } = Brushes.Transparent;
         public string Amount { get; set; } = string.Empty;
         public string CreationDate { get; set; } = string.Empty;
         public string DueDate { get; set; } = string.Empty;

FinTrack/Models/Account/AccountModel.cs

@@ -0,0 +1,39 @@
+using CommunityToolkit.Mvvm.ComponentModel;
+using CommunityToolkit.Mvvm.Input;
+using FinTrack.Enums;
+using Microsoft.Extensions.Logging;
+using System.Collections.ObjectModel;
+using System.Windows;
+
+namespace FinTrack.Models.Dashboard
+{
+    public partial class ReportDashboardModel : ObservableObject
+    {
+        [ObservableProperty]
+        private string name = string.Empty;
+
+        public ObservableCollection<ExportFormat> Formats { get; set; }
+
+        private readonly ILogger<ReportDashboardModel> _logger;
+
+        public ReportDashboardModel(ILogger<ReportDashboardModel> logger)
+        {
+            _logger = logger;
+
+            Formats = new ObservableCollection<ExportFormat>();
+
+            foreach (ExportFormat exportFormat in Enum.GetValues(typeof(ExportFormat)))
+            {
+                Formats.Add(exportFormat);
+            }
+        }
+
+        [RelayCommand]
+        private void Generate(ExportFormat format)
+        {
+
+            _logger.LogInformation("Rapor oluşturuluyor -> Rapor Adı: {ReportName}, Format: {Format}", this.Name, format);
+            MessageBox.Show($"Rapor oluşturuldu:\nAd: {this.Name}\nFormat: {format}", "Rapor Oluşturma", MessageBoxButton.OK, MessageBoxImage.Information);
+        }
+    }
+}