From 1f90ad3a4fab98a8d6f0cca9ba48e4407cecea49 Mon Sep 17 00:00:00 2001
From: joeprogrammer88 <joeProgrammer88@users.noreply.github.com>
Date: Tue, 31 Mar 2026 07:54:49 -0700
Subject: [PATCH 01/11] Initial features implemented

---
 SarahsDailyApp.slnx                           |   7 +-
 SarahsDailyApp/App.xaml                       |  14 +
 SarahsDailyApp/AppShell.xaml                  |  37 +-
 SarahsDailyApp/AppShell.xaml.cs               |  13 +-
 .../BoolToStrikethroughConverter.cs           |  16 +
 .../Converters/InverseBoolConverter.cs        |  12 +
 SarahsDailyApp/Converters/ValueConverters.cs  | 103 ++
 SarahsDailyApp/MainPage.xaml                  |  36 -
 SarahsDailyApp/MainPage.xaml.cs               |  24 -
 SarahsDailyApp/MauiProgram.cs                 |  58 +-
 SarahsDailyApp/Models/AppSettings.cs          |  12 +
 SarahsDailyApp/Models/Category.cs             |  12 +
 SarahsDailyApp/Models/FinanceItem.cs          |  45 +
 SarahsDailyApp/Models/Habit.cs                |  40 +
 SarahsDailyApp/Models/HabitLog.cs             |  17 +
 SarahsDailyApp/Models/Note.cs                 |  18 +
 SarahsDailyApp/Models/Project.cs              |  18 +
 SarahsDailyApp/Models/ShoppingItem.cs         |  18 +
 SarahsDailyApp/Models/TaskItem.cs             |  57 ++
 SarahsDailyApp/Models/UserStats.cs            |  16 +
 SarahsDailyApp/Models/WishItem.cs             |  24 +
 SarahsDailyApp/Models/WishList.cs             |  16 +
 SarahsDailyApp/SarahsDailyApp.csproj          |   7 +-
 SarahsDailyApp/Services/CategoryService.cs    |  61 ++
 SarahsDailyApp/Services/DatabaseService.cs    |  68 ++
 .../Services/ExportImportService.cs           | 146 +++
 SarahsDailyApp/Services/FinanceService.cs     |  50 +
 SarahsDailyApp/Services/HabitService.cs       | 111 +++
 SarahsDailyApp/Services/NoteService.cs        |  42 +
 SarahsDailyApp/Services/ProjectService.cs     |  44 +
 SarahsDailyApp/Services/ShoppingService.cs    |  47 +
 SarahsDailyApp/Services/TaskService.cs        | 122 +++
 SarahsDailyApp/Services/UserStatsService.cs   |  61 ++
 SarahsDailyApp/Services/WishListService.cs    |  98 ++
 .../ViewModels/DashboardViewModel.cs          | 177 ++++
 .../ViewModels/FinanceDetailViewModel.cs      | 118 +++
 .../ViewModels/FinancesViewModel.cs           |  94 ++
 .../ViewModels/HabitDetailViewModel.cs        | 132 +++
 SarahsDailyApp/ViewModels/HabitsViewModel.cs  |  83 ++
 .../ViewModels/NoteDetailViewModel.cs         |  66 ++
 SarahsDailyApp/ViewModels/NotesViewModel.cs   |  32 +
 .../ViewModels/ProjectDetailViewModel.cs      |  75 ++
 .../ViewModels/ProjectsViewModel.cs           |  58 ++
 .../ViewModels/SettingsViewModel.cs           | 168 ++++
 .../ViewModels/ShoppingItemDetailViewModel.cs |  67 ++
 .../ViewModels/ShoppingListViewModel.cs       |  50 +
 .../ViewModels/TaskDetailViewModel.cs         | 172 ++++
 SarahsDailyApp/ViewModels/TasksViewModel.cs   | 145 +++
 .../ViewModels/WishItemDetailViewModel.cs     |  89 ++
 .../ViewModels/WishListViewModel.cs           | 123 +++
 SarahsDailyApp/Views/DashboardPage.xaml       | 132 +++
 SarahsDailyApp/Views/DashboardPage.xaml.cs    |  20 +
 SarahsDailyApp/Views/FinanceDetailPage.xaml   |  44 +
 .../Views/FinanceDetailPage.xaml.cs           |  20 +
 SarahsDailyApp/Views/FinancesPage.xaml        | 133 +++
 SarahsDailyApp/Views/FinancesPage.xaml.cs     |  20 +
 SarahsDailyApp/Views/HabitDetailPage.xaml     |  89 ++
 SarahsDailyApp/Views/HabitDetailPage.xaml.cs  |  28 +
 SarahsDailyApp/Views/HabitsPage.xaml          |  61 ++
 SarahsDailyApp/Views/HabitsPage.xaml.cs       |  20 +
 SarahsDailyApp/Views/NoteDetailPage.xaml      |  26 +
 SarahsDailyApp/Views/NoteDetailPage.xaml.cs   |  20 +
 SarahsDailyApp/Views/NotesPage.xaml           |  48 +
 SarahsDailyApp/Views/NotesPage.xaml.cs        |  20 +
 SarahsDailyApp/Views/ProjectDetailPage.xaml   |  34 +
 .../Views/ProjectDetailPage.xaml.cs           |  20 +
 SarahsDailyApp/Views/ProjectsPage.xaml        |  44 +
 SarahsDailyApp/Views/ProjectsPage.xaml.cs     |  20 +
 SarahsDailyApp/Views/SettingsPage.xaml        |  82 ++
 SarahsDailyApp/Views/SettingsPage.xaml.cs     |  20 +
 .../Views/ShoppingItemDetailPage.xaml         |  28 +
 .../Views/ShoppingItemDetailPage.xaml.cs      |  20 +
 SarahsDailyApp/Views/ShoppingListPage.xaml    |  59 ++
 SarahsDailyApp/Views/ShoppingListPage.xaml.cs |  20 +
 SarahsDailyApp/Views/TaskDetailPage.xaml      |  84 ++
 SarahsDailyApp/Views/TaskDetailPage.xaml.cs   |  20 +
 SarahsDailyApp/Views/TasksPage.xaml           | 102 ++
 SarahsDailyApp/Views/TasksPage.xaml.cs        |  20 +
 SarahsDailyApp/Views/WishItemDetailPage.xaml  |  37 +
 .../Views/WishItemDetailPage.xaml.cs          |  20 +
 SarahsDailyApp/Views/WishListPage.xaml        |  84 ++
 SarahsDailyApp/Views/WishListPage.xaml.cs     |  28 +
 Spec.md                                       | 886 ++++++++++++++++++
 83 files changed, 5357 insertions(+), 71 deletions(-)
 create mode 100644 SarahsDailyApp/Converters/BoolToStrikethroughConverter.cs
 create mode 100644 SarahsDailyApp/Converters/InverseBoolConverter.cs
 create mode 100644 SarahsDailyApp/Converters/ValueConverters.cs
 delete mode 100644 SarahsDailyApp/MainPage.xaml
 delete mode 100644 SarahsDailyApp/MainPage.xaml.cs
 create mode 100644 SarahsDailyApp/Models/AppSettings.cs
 create mode 100644 SarahsDailyApp/Models/Category.cs
 create mode 100644 SarahsDailyApp/Models/FinanceItem.cs
 create mode 100644 SarahsDailyApp/Models/Habit.cs
 create mode 100644 SarahsDailyApp/Models/HabitLog.cs
 create mode 100644 SarahsDailyApp/Models/Note.cs
 create mode 100644 SarahsDailyApp/Models/Project.cs
 create mode 100644 SarahsDailyApp/Models/ShoppingItem.cs
 create mode 100644 SarahsDailyApp/Models/TaskItem.cs
 create mode 100644 SarahsDailyApp/Models/UserStats.cs
 create mode 100644 SarahsDailyApp/Models/WishItem.cs
 create mode 100644 SarahsDailyApp/Models/WishList.cs
 create mode 100644 SarahsDailyApp/Services/CategoryService.cs
 create mode 100644 SarahsDailyApp/Services/DatabaseService.cs
 create mode 100644 SarahsDailyApp/Services/ExportImportService.cs
 create mode 100644 SarahsDailyApp/Services/FinanceService.cs
 create mode 100644 SarahsDailyApp/Services/HabitService.cs
 create mode 100644 SarahsDailyApp/Services/NoteService.cs
 create mode 100644 SarahsDailyApp/Services/ProjectService.cs
 create mode 100644 SarahsDailyApp/Services/ShoppingService.cs
 create mode 100644 SarahsDailyApp/Services/TaskService.cs
 create mode 100644 SarahsDailyApp/Services/UserStatsService.cs
 create mode 100644 SarahsDailyApp/Services/WishListService.cs
 create mode 100644 SarahsDailyApp/ViewModels/DashboardViewModel.cs
 create mode 100644 SarahsDailyApp/ViewModels/FinanceDetailViewModel.cs
 create mode 100644 SarahsDailyApp/ViewModels/FinancesViewModel.cs
 create mode 100644 SarahsDailyApp/ViewModels/HabitDetailViewModel.cs
 create mode 100644 SarahsDailyApp/ViewModels/HabitsViewModel.cs
 create mode 100644 SarahsDailyApp/ViewModels/NoteDetailViewModel.cs
 create mode 100644 SarahsDailyApp/ViewModels/NotesViewModel.cs
 create mode 100644 SarahsDailyApp/ViewModels/ProjectDetailViewModel.cs
 create mode 100644 SarahsDailyApp/ViewModels/ProjectsViewModel.cs
 create mode 100644 SarahsDailyApp/ViewModels/SettingsViewModel.cs
 create mode 100644 SarahsDailyApp/ViewModels/ShoppingItemDetailViewModel.cs
 create mode 100644 SarahsDailyApp/ViewModels/ShoppingListViewModel.cs
 create mode 100644 SarahsDailyApp/ViewModels/TaskDetailViewModel.cs
 create mode 100644 SarahsDailyApp/ViewModels/TasksViewModel.cs
 create mode 100644 SarahsDailyApp/ViewModels/WishItemDetailViewModel.cs
 create mode 100644 SarahsDailyApp/ViewModels/WishListViewModel.cs
 create mode 100644 SarahsDailyApp/Views/DashboardPage.xaml
 create mode 100644 SarahsDailyApp/Views/DashboardPage.xaml.cs
 create mode 100644 SarahsDailyApp/Views/FinanceDetailPage.xaml
 create mode 100644 SarahsDailyApp/Views/FinanceDetailPage.xaml.cs
 create mode 100644 SarahsDailyApp/Views/FinancesPage.xaml
 create mode 100644 SarahsDailyApp/Views/FinancesPage.xaml.cs
 create mode 100644 SarahsDailyApp/Views/HabitDetailPage.xaml
 create mode 100644 SarahsDailyApp/Views/HabitDetailPage.xaml.cs
 create mode 100644 SarahsDailyApp/Views/HabitsPage.xaml
 create mode 100644 SarahsDailyApp/Views/HabitsPage.xaml.cs
 create mode 100644 SarahsDailyApp/Views/NoteDetailPage.xaml
 create mode 100644 SarahsDailyApp/Views/NoteDetailPage.xaml.cs
 create mode 100644 SarahsDailyApp/Views/NotesPage.xaml
 create mode 100644 SarahsDailyApp/Views/NotesPage.xaml.cs
 create mode 100644 SarahsDailyApp/Views/ProjectDetailPage.xaml
 create mode 100644 SarahsDailyApp/Views/ProjectDetailPage.xaml.cs
 create mode 100644 SarahsDailyApp/Views/ProjectsPage.xaml
 create mode 100644 SarahsDailyApp/Views/ProjectsPage.xaml.cs
 create mode 100644 SarahsDailyApp/Views/SettingsPage.xaml
 create mode 100644 SarahsDailyApp/Views/SettingsPage.xaml.cs
 create mode 100644 SarahsDailyApp/Views/ShoppingItemDetailPage.xaml
 create mode 100644 SarahsDailyApp/Views/ShoppingItemDetailPage.xaml.cs
 create mode 100644 SarahsDailyApp/Views/ShoppingListPage.xaml
 create mode 100644 SarahsDailyApp/Views/ShoppingListPage.xaml.cs
 create mode 100644 SarahsDailyApp/Views/TaskDetailPage.xaml
 create mode 100644 SarahsDailyApp/Views/TaskDetailPage.xaml.cs
 create mode 100644 SarahsDailyApp/Views/TasksPage.xaml
 create mode 100644 SarahsDailyApp/Views/TasksPage.xaml.cs
 create mode 100644 SarahsDailyApp/Views/WishItemDetailPage.xaml
 create mode 100644 SarahsDailyApp/Views/WishItemDetailPage.xaml.cs
 create mode 100644 SarahsDailyApp/Views/WishListPage.xaml
 create mode 100644 SarahsDailyApp/Views/WishListPage.xaml.cs
 create mode 100644 Spec.md

diff --git a/SarahsDailyApp.slnx b/SarahsDailyApp.slnx
index 3080fe6..1facaf6 100644
--- a/SarahsDailyApp.slnx
+++ b/SarahsDailyApp.slnx
@@ -1,3 +1,8 @@
 <Solution>
-  <Project Path="SarahsDailyApp/SarahsDailyApp.csproj" />
+  <Folder Name="/Solution Items/">
+    <File Path="Spec.md" />
+  </Folder>
+  <Project Path="SarahsDailyApp/SarahsDailyApp.csproj">
+    <Deploy Solution="Debug|*" />
+  </Project>
 </Solution>
diff --git a/SarahsDailyApp/App.xaml b/SarahsDailyApp/App.xaml
index 329ef40..6b19106 100644
--- a/SarahsDailyApp/App.xaml
+++ b/SarahsDailyApp/App.xaml
@@ -2,6 +2,7 @@
 <Application xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
              xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
              xmlns:local="clr-namespace:SarahsDailyApp"
+             xmlns:converters="clr-namespace:SarahsDailyApp.Converters"
              x:Class="SarahsDailyApp.App">
     <Application.Resources>
         <ResourceDictionary>
@@ -9,6 +10,19 @@
                 <ResourceDictionary Source="Resources/Styles/Colors.xaml" />
                 <ResourceDictionary Source="Resources/Styles/Styles.xaml" />
             </ResourceDictionary.MergedDictionaries>
+
+            <!-- Global converters -->
+            <converters:PercentToProgressConverter x:Key="PercentToProgressConverter"/>
+            <converters:IsNotNullConverter x:Key="IsNotNullConverter"/>
+            <converters:IsNotZeroConverter x:Key="IsNotZeroConverter"/>
+            <converters:IsNotNoneConverter x:Key="IsNotNoneConverter"/>
+            <converters:StatusColorConverter x:Key="StatusColorConverter"/>
+            <converters:StatusTextConverter x:Key="StatusTextConverter"/>
+            <converters:CompletionColorConverter x:Key="CompletionColorConverter"/>
+            <converters:ActionButtonColorConverter x:Key="ActionButtonColorConverter"/>
+            <converters:EditTitleConverter x:Key="EditTitleConverter"/>
+            <converters:BoolToStrikethroughConverter x:Key="BoolToStrikethroughConverter"/>
+            <converters:InverseBoolConverter x:Key="InverseBoolConverter"/>
         </ResourceDictionary>
     </Application.Resources>
 </Application>
diff --git a/SarahsDailyApp/AppShell.xaml b/SarahsDailyApp/AppShell.xaml
index 8790d92..f1b9223 100644
--- a/SarahsDailyApp/AppShell.xaml
+++ b/SarahsDailyApp/AppShell.xaml
@@ -3,12 +3,37 @@
     x:Class="SarahsDailyApp.AppShell"
     xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
     xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
-    xmlns:local="clr-namespace:SarahsDailyApp"
-    Title="SarahsDailyApp">
+    xmlns:views="clr-namespace:SarahsDailyApp.Views"
+    Title="📋 Task Manager">
 
-    <ShellContent
-        Title="Home"
-        ContentTemplate="{DataTemplate local:MainPage}"
-        Route="MainPage" />
+    <TabBar>
+        <Tab Title="Dashboard" Icon="home.png">
+            <ShellContent ContentTemplate="{DataTemplate views:DashboardPage}" Route="DashboardPage"/>
+        </Tab>
+        <Tab Title="Tasks" Icon="check.png">
+            <ShellContent ContentTemplate="{DataTemplate views:TasksPage}" Route="TasksPage"/>
+        </Tab>
+        <Tab Title="Projects" Icon="folder.png">
+            <ShellContent ContentTemplate="{DataTemplate views:ProjectsPage}" Route="ProjectsPage"/>
+        </Tab>
+        <Tab Title="Habits" Icon="refresh.png">
+            <ShellContent ContentTemplate="{DataTemplate views:HabitsPage}" Route="HabitsPage"/>
+        </Tab>
+        <Tab Title="Wish List" Icon="gift.png">
+            <ShellContent ContentTemplate="{DataTemplate views:WishListPage}" Route="WishListPage"/>
+        </Tab>
+        <Tab Title="Shopping" Icon="cart.png">
+            <ShellContent ContentTemplate="{DataTemplate views:ShoppingListPage}" Route="ShoppingListPage"/>
+        </Tab>
+        <Tab Title="Notes" Icon="notes.png">
+            <ShellContent ContentTemplate="{DataTemplate views:NotesPage}" Route="NotesPage"/>
+        </Tab>
+        <Tab Title="Finances" Icon="money.png">
+            <ShellContent ContentTemplate="{DataTemplate views:FinancesPage}" Route="FinancesPage"/>
+        </Tab>
+        <Tab Title="Settings" Icon="settings.png">
+            <ShellContent ContentTemplate="{DataTemplate views:SettingsPage}" Route="SettingsPage"/>
+        </Tab>
+    </TabBar>
 
 </Shell>
diff --git a/SarahsDailyApp/AppShell.xaml.cs b/SarahsDailyApp/AppShell.xaml.cs
index 0616858..80b0549 100644
--- a/SarahsDailyApp/AppShell.xaml.cs
+++ b/SarahsDailyApp/AppShell.xaml.cs
@@ -1,10 +1,21 @@
-namespace SarahsDailyApp
+using SarahsDailyApp.Views;
+
+namespace SarahsDailyApp
 {
     public partial class AppShell : Shell
     {
         public AppShell()
         {
             InitializeComponent();
+
+            // Register detail page routes for navigation
+            Routing.RegisterRoute(nameof(TaskDetailPage), typeof(TaskDetailPage));
+            Routing.RegisterRoute(nameof(ProjectDetailPage), typeof(ProjectDetailPage));
+            Routing.RegisterRoute(nameof(HabitDetailPage), typeof(HabitDetailPage));
+            Routing.RegisterRoute(nameof(FinanceDetailPage), typeof(FinanceDetailPage));
+            Routing.RegisterRoute(nameof(WishItemDetailPage), typeof(WishItemDetailPage));
+            Routing.RegisterRoute(nameof(ShoppingItemDetailPage), typeof(ShoppingItemDetailPage));
+            Routing.RegisterRoute(nameof(NoteDetailPage), typeof(NoteDetailPage));
         }
     }
 }
diff --git a/SarahsDailyApp/Converters/BoolToStrikethroughConverter.cs b/SarahsDailyApp/Converters/BoolToStrikethroughConverter.cs
new file mode 100644
index 0000000..95360ec
--- /dev/null
+++ b/SarahsDailyApp/Converters/BoolToStrikethroughConverter.cs
@@ -0,0 +1,16 @@
+using System.Globalization;
+
+namespace SarahsDailyApp.Converters;
+
+public class BoolToStrikethroughConverter : IValueConverter
+{
+    public object? Convert(object? value, Type targetType, object? parameter, CultureInfo culture)
+    {
+        if (value is bool completed && completed)
+            return TextDecorations.Strikethrough;
+        return TextDecorations.None;
+    }
+
+    public object? ConvertBack(object? value, Type targetType, object? parameter, CultureInfo culture)
+        => throw new NotImplementedException();
+}
diff --git a/SarahsDailyApp/Converters/InverseBoolConverter.cs b/SarahsDailyApp/Converters/InverseBoolConverter.cs
new file mode 100644
index 0000000..3fb52a8
--- /dev/null
+++ b/SarahsDailyApp/Converters/InverseBoolConverter.cs
@@ -0,0 +1,12 @@
+using System.Globalization;
+
+namespace SarahsDailyApp.Converters;
+
+public class InverseBoolConverter : IValueConverter
+{
+    public object? Convert(object? value, Type targetType, object? parameter, CultureInfo culture)
+        => value is bool b ? !b : value;
+
+    public object? ConvertBack(object? value, Type targetType, object? parameter, CultureInfo culture)
+        => value is bool b ? !b : value;
+}
diff --git a/SarahsDailyApp/Converters/ValueConverters.cs b/SarahsDailyApp/Converters/ValueConverters.cs
new file mode 100644
index 0000000..8b3933b
--- /dev/null
+++ b/SarahsDailyApp/Converters/ValueConverters.cs
@@ -0,0 +1,103 @@
+using System.Globalization;
+using SarahsDailyApp.Models;
+
+namespace SarahsDailyApp.Converters;
+
+/// <summary>Converts a percentage (0–100) to a ProgressBar progress value (0.0–1.0).</summary>
+public class PercentToProgressConverter : IValueConverter
+{
+    public object? Convert(object? value, Type targetType, object? parameter, CultureInfo culture)
+        => value is double pct ? pct / 100.0 : 0.0;
+
+    public object? ConvertBack(object? value, Type targetType, object? parameter, CultureInfo culture)
+        => throw new NotImplementedException();
+}
+
+/// <summary>Returns true when the value is not null (and not empty string).</summary>
+public class IsNotNullConverter : IValueConverter
+{
+    public object Convert(object? value, Type targetType, object? parameter, CultureInfo culture)
+        => value is not null && (value is not string s || !string.IsNullOrEmpty(s));
+
+    public object ConvertBack(object? value, Type targetType, object? parameter, CultureInfo culture)
+        => throw new NotImplementedException();
+}
+
+/// <summary>Returns true when an int value is not zero.</summary>
+public class IsNotZeroConverter : IValueConverter
+{
+    public object Convert(object? value, Type targetType, object? parameter, CultureInfo culture)
+        => value is int i && i != 0;
+
+    public object ConvertBack(object? value, Type targetType, object? parameter, CultureInfo culture)
+        => throw new NotImplementedException();
+}
+
+/// <summary>Returns true when a RepeatType is not None.</summary>
+public class IsNotNoneConverter : IValueConverter
+{
+    public object Convert(object? value, Type targetType, object? parameter, CultureInfo culture)
+        => value is RepeatType rt && rt != RepeatType.None;
+
+    public object ConvertBack(object? value, Type targetType, object? parameter, CultureInfo culture)
+        => throw new NotImplementedException();
+}
+
+/// <summary>Maps a completed bool to a status color.</summary>
+public class StatusColorConverter : IValueConverter
+{
+    public object Convert(object? value, Type targetType, object? parameter, CultureInfo culture)
+        => value is bool completed && completed
+            ? Color.FromArgb("#4CAF50")
+            : Color.FromArgb("#FF9800");
+
+    public object ConvertBack(object? value, Type targetType, object? parameter, CultureInfo culture)
+        => throw new NotImplementedException();
+}
+
+/// <summary>Maps a completed bool to a status text.</summary>
+public class StatusTextConverter : IValueConverter
+{
+    public object Convert(object? value, Type targetType, object? parameter, CultureInfo culture)
+        => value is bool completed && completed ? "completed" : "pending";
+
+    public object ConvertBack(object? value, Type targetType, object? parameter, CultureInfo culture)
+        => throw new NotImplementedException();
+}
+
+/// <summary>Maps a bool (IsComplete) to a color for completion status text.</summary>
+public class CompletionColorConverter : IValueConverter
+{
+    public object Convert(object? value, Type targetType, object? parameter, CultureInfo culture)
+        => value is bool complete && complete
+            ? Color.FromArgb("#4CAF50")
+            : Color.FromArgb("#FF9800");
+
+    public object ConvertBack(object? value, Type targetType, object? parameter, CultureInfo culture)
+        => throw new NotImplementedException();
+}
+
+/// <summary>Maps a bool (CanComplete) to an action button color.</summary>
+public class ActionButtonColorConverter : IValueConverter
+{
+    public object Convert(object? value, Type targetType, object? parameter, CultureInfo culture)
+        => value is bool can && can
+            ? Color.FromArgb("#4CAF50")
+            : Color.FromArgb("#9E9E9E");
+
+    public object ConvertBack(object? value, Type targetType, object? parameter, CultureInfo culture)
+        => throw new NotImplementedException();
+}
+
+/// <summary>Converts IsEditing bool to "Edit {Parameter}" or "Add {Parameter}" title.</summary>
+public class EditTitleConverter : IValueConverter
+{
+    public object Convert(object? value, Type targetType, object? parameter, CultureInfo culture)
+    {
+        var entity = parameter as string ?? "Item";
+        return value is bool editing && editing ? $"Edit {entity}" : $"Add {entity}";
+    }
+
+    public object ConvertBack(object? value, Type targetType, object? parameter, CultureInfo culture)
+        => throw new NotImplementedException();
+}
diff --git a/SarahsDailyApp/MainPage.xaml b/SarahsDailyApp/MainPage.xaml
deleted file mode 100644
index e8fa7d6..0000000
--- a/SarahsDailyApp/MainPage.xaml
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<ContentPage xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
-             xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
-             x:Class="SarahsDailyApp.MainPage">
-
-    <ScrollView>
-        <VerticalStackLayout
-            Padding="30,0"
-            Spacing="25">
-            <Image
-                Source="dotnet_bot.png"
-                HeightRequest="185"
-                Aspect="AspectFit"
-                SemanticProperties.Description="dot net bot in a submarine number ten" />
-
-            <Label
-                Text="Hello, World!"
-                Style="{StaticResource Headline}"
-                SemanticProperties.HeadingLevel="Level1" />
-
-            <Label
-                Text="Welcome to &#10;.NET Multi-platform App UI"
-                Style="{StaticResource SubHeadline}"
-                SemanticProperties.HeadingLevel="Level2"
-                SemanticProperties.Description="Welcome to dot net Multi platform App U I" />
-
-            <Button
-                x:Name="CounterBtn"
-                Text="Click me" 
-                SemanticProperties.Hint="Counts the number of times you click"
-                Clicked="OnCounterClicked"
-                HorizontalOptions="Fill" />
-        </VerticalStackLayout>
-    </ScrollView>
-
-</ContentPage>
diff --git a/SarahsDailyApp/MainPage.xaml.cs b/SarahsDailyApp/MainPage.xaml.cs
deleted file mode 100644
index 839aaf0..0000000
--- a/SarahsDailyApp/MainPage.xaml.cs
+++ /dev/null
@@ -1,24 +0,0 @@
-namespace SarahsDailyApp
-{
-    public partial class MainPage : ContentPage
-    {
-        int count = 0;
-
-        public MainPage()
-        {
-            InitializeComponent();
-        }
-
-        private void OnCounterClicked(object? sender, EventArgs e)
-        {
-            count++;
-
-            if (count == 1)
-                CounterBtn.Text = $"Clicked {count} time";
-            else
-                CounterBtn.Text = $"Clicked {count} times";
-
-            SemanticScreenReader.Announce(CounterBtn.Text);
-        }
-    }
-}
diff --git a/SarahsDailyApp/MauiProgram.cs b/SarahsDailyApp/MauiProgram.cs
index 34a3fa8..0329783 100644
--- a/SarahsDailyApp/MauiProgram.cs
+++ b/SarahsDailyApp/MauiProgram.cs
@@ -1,4 +1,8 @@
-using Microsoft.Extensions.Logging;
+using CommunityToolkit.Maui;
+using Microsoft.Extensions.Logging;
+using SarahsDailyApp.Services;
+using SarahsDailyApp.ViewModels;
+using SarahsDailyApp.Views;
 
 namespace SarahsDailyApp
 {
@@ -9,14 +13,64 @@ public static MauiApp CreateMauiApp()
             var builder = MauiApp.CreateBuilder();
             builder
                 .UseMauiApp<App>()
+                .UseMauiCommunityToolkit()
                 .ConfigureFonts(fonts =>
                 {
                     fonts.AddFont("OpenSans-Regular.ttf", "OpenSansRegular");
                     fonts.AddFont("OpenSans-Semibold.ttf", "OpenSansSemibold");
                 });
 
+            // Services
+            builder.Services.AddSingleton<DatabaseService>();
+            builder.Services.AddSingleton<TaskService>();
+            builder.Services.AddSingleton<ProjectService>();
+            builder.Services.AddSingleton<HabitService>();
+            builder.Services.AddSingleton<FinanceService>();
+            builder.Services.AddSingleton<WishListService>();
+            builder.Services.AddSingleton<NoteService>();
+            builder.Services.AddSingleton<ShoppingService>();
+            builder.Services.AddSingleton<CategoryService>();
+            builder.Services.AddSingleton<UserStatsService>();
+            builder.Services.AddSingleton<ExportImportService>();
+
+            // ViewModels
+            builder.Services.AddTransient<DashboardViewModel>();
+            builder.Services.AddTransient<TasksViewModel>();
+            builder.Services.AddTransient<TaskDetailViewModel>();
+            builder.Services.AddTransient<ProjectsViewModel>();
+            builder.Services.AddTransient<ProjectDetailViewModel>();
+            builder.Services.AddTransient<HabitsViewModel>();
+            builder.Services.AddTransient<HabitDetailViewModel>();
+            builder.Services.AddTransient<FinancesViewModel>();
+            builder.Services.AddTransient<FinanceDetailViewModel>();
+            builder.Services.AddTransient<WishListViewModel>();
+            builder.Services.AddTransient<WishItemDetailViewModel>();
+            builder.Services.AddTransient<ShoppingListViewModel>();
+            builder.Services.AddTransient<ShoppingItemDetailViewModel>();
+            builder.Services.AddTransient<NotesViewModel>();
+            builder.Services.AddTransient<NoteDetailViewModel>();
+            builder.Services.AddTransient<SettingsViewModel>();
+
+            // Pages
+            builder.Services.AddTransient<DashboardPage>();
+            builder.Services.AddTransient<TasksPage>();
+            builder.Services.AddTransient<TaskDetailPage>();
+            builder.Services.AddTransient<ProjectsPage>();
+            builder.Services.AddTransient<ProjectDetailPage>();
+            builder.Services.AddTransient<HabitsPage>();
+            builder.Services.AddTransient<HabitDetailPage>();
+            builder.Services.AddTransient<FinancesPage>();
+            builder.Services.AddTransient<FinanceDetailPage>();
+            builder.Services.AddTransient<WishListPage>();
+            builder.Services.AddTransient<WishItemDetailPage>();
+            builder.Services.AddTransient<ShoppingListPage>();
+            builder.Services.AddTransient<ShoppingItemDetailPage>();
+            builder.Services.AddTransient<NotesPage>();
+            builder.Services.AddTransient<NoteDetailPage>();
+            builder.Services.AddTransient<SettingsPage>();
+
 #if DEBUG
-    		builder.Logging.AddDebug();
+            builder.Logging.AddDebug();
 #endif
 
             return builder.Build();
diff --git a/SarahsDailyApp/Models/AppSettings.cs b/SarahsDailyApp/Models/AppSettings.cs
new file mode 100644
index 0000000..801c9f1
--- /dev/null
+++ b/SarahsDailyApp/Models/AppSettings.cs
@@ -0,0 +1,12 @@
+using SQLite;
+
+namespace SarahsDailyApp.Models;
+
+[Table("Settings")]
+public class AppSettings
+{
+    [PrimaryKey]
+    public int Id { get; set; } = 1; // Singleton row
+
+    public int TasksPerLevel { get; set; } = 30;
+}
diff --git a/SarahsDailyApp/Models/Category.cs b/SarahsDailyApp/Models/Category.cs
new file mode 100644
index 0000000..fa7e9cb
--- /dev/null
+++ b/SarahsDailyApp/Models/Category.cs
@@ -0,0 +1,12 @@
+using SQLite;
+
+namespace SarahsDailyApp.Models;
+
+[Table("Categories")]
+public class Category
+{
+    [PrimaryKey, AutoIncrement]
+    public int Id { get; set; }
+
+    public string Name { get; set; } = string.Empty;
+}
diff --git a/SarahsDailyApp/Models/FinanceItem.cs b/SarahsDailyApp/Models/FinanceItem.cs
new file mode 100644
index 0000000..d3ac729
--- /dev/null
+++ b/SarahsDailyApp/Models/FinanceItem.cs
@@ -0,0 +1,45 @@
+using SQLite;
+
+namespace SarahsDailyApp.Models;
+
+public enum RecurringType
+{
+    Once,
+    Monthly,
+    Yearly
+}
+
+public enum FinanceType
+{
+    Expense,
+    Revenue,
+    Charge
+}
+
+[Table("FinanceItems")]
+public class FinanceItem
+{
+    [PrimaryKey]
+    public string Id { get; set; } = Guid.NewGuid().ToString();
+
+    public string Description { get; set; } = string.Empty;
+
+    public decimal Amount { get; set; }
+
+    public DateTime? Date { get; set; }
+
+    public string? Category { get; set; }
+
+    public RecurringType Recurring { get; set; } = RecurringType.Once;
+
+    public FinanceType Type { get; set; }
+
+    public DateTime CreatedDate { get; set; } = DateTime.UtcNow;
+
+    [Ignore]
+    public decimal MonthlyAmount => Recurring switch
+    {
+        RecurringType.Yearly => Amount / 12m,
+        _ => Amount
+    };
+}
diff --git a/SarahsDailyApp/Models/Habit.cs b/SarahsDailyApp/Models/Habit.cs
new file mode 100644
index 0000000..5560b4a
--- /dev/null
+++ b/SarahsDailyApp/Models/Habit.cs
@@ -0,0 +1,40 @@
+using SQLite;
+
+namespace SarahsDailyApp.Models;
+
+[Table("Habits")]
+public class Habit
+{
+    [PrimaryKey]
+    public string Id { get; set; } = Guid.NewGuid().ToString();
+
+    public string Name { get; set; } = string.Empty;
+
+    public string? Description { get; set; }
+
+    public string Icon { get; set; } = "⭐";
+
+    public string? Category { get; set; }
+
+    public int TargetGoal { get; set; } = 1;
+
+    /// <summary>
+    /// Comma-separated day-of-week values (0=Sun..6=Sat).
+    /// </summary>
+    public string DaysOfWeek { get; set; } = "0,1,2,3,4,5,6";
+
+    public int Streak { get; set; }
+
+    public DateTime? LastCompletedDate { get; set; }
+
+    public DateTime CreatedDate { get; set; } = DateTime.UtcNow;
+
+    [Ignore]
+    public int[] DaysOfWeekArray
+    {
+        get => string.IsNullOrEmpty(DaysOfWeek)
+            ? [0, 1, 2, 3, 4, 5, 6]
+            : DaysOfWeek.Split(',').Select(int.Parse).ToArray();
+        set => DaysOfWeek = string.Join(",", value);
+    }
+}
diff --git a/SarahsDailyApp/Models/HabitLog.cs b/SarahsDailyApp/Models/HabitLog.cs
new file mode 100644
index 0000000..9c9394a
--- /dev/null
+++ b/SarahsDailyApp/Models/HabitLog.cs
@@ -0,0 +1,17 @@
+using SQLite;
+
+namespace SarahsDailyApp.Models;
+
+[Table("HabitLogs")]
+public class HabitLog
+{
+    [PrimaryKey]
+    public string Id { get; set; } = Guid.NewGuid().ToString();
+
+    [Indexed]
+    public string HabitId { get; set; } = string.Empty;
+
+    public DateTime Date { get; set; }
+
+    public DateTime Timestamp { get; set; } = DateTime.UtcNow;
+}
diff --git a/SarahsDailyApp/Models/Note.cs b/SarahsDailyApp/Models/Note.cs
new file mode 100644
index 0000000..321f63a
--- /dev/null
+++ b/SarahsDailyApp/Models/Note.cs
@@ -0,0 +1,18 @@
+using SQLite;
+
+namespace SarahsDailyApp.Models;
+
+[Table("Notes")]
+public class Note
+{
+    [PrimaryKey]
+    public string Id { get; set; } = Guid.NewGuid().ToString();
+
+    public string Title { get; set; } = string.Empty;
+
+    public string Content { get; set; } = string.Empty;
+
+    public DateTime CreatedDate { get; set; } = DateTime.UtcNow;
+
+    public DateTime? UpdatedDate { get; set; }
+}
diff --git a/SarahsDailyApp/Models/Project.cs b/SarahsDailyApp/Models/Project.cs
new file mode 100644
index 0000000..dce36d8
--- /dev/null
+++ b/SarahsDailyApp/Models/Project.cs
@@ -0,0 +1,18 @@
+using SQLite;
+
+namespace SarahsDailyApp.Models;
+
+[Table("Projects")]
+public class Project
+{
+    [PrimaryKey]
+    public string Id { get; set; } = Guid.NewGuid().ToString();
+
+    public string Name { get; set; } = string.Empty;
+
+    public string? Description { get; set; }
+
+    public string Color { get; set; } = "#3b82f6";
+
+    public DateTime CreatedDate { get; set; } = DateTime.UtcNow;
+}
diff --git a/SarahsDailyApp/Models/ShoppingItem.cs b/SarahsDailyApp/Models/ShoppingItem.cs
new file mode 100644
index 0000000..ec0e1b5
--- /dev/null
+++ b/SarahsDailyApp/Models/ShoppingItem.cs
@@ -0,0 +1,18 @@
+using SQLite;
+
+namespace SarahsDailyApp.Models;
+
+[Table("ShoppingItems")]
+public class ShoppingItem
+{
+    [PrimaryKey]
+    public string Id { get; set; } = Guid.NewGuid().ToString();
+
+    public string Name { get; set; } = string.Empty;
+
+    public string? Quantity { get; set; }
+
+    public bool Completed { get; set; }
+
+    public DateTime CreatedDate { get; set; } = DateTime.UtcNow;
+}
diff --git a/SarahsDailyApp/Models/TaskItem.cs b/SarahsDailyApp/Models/TaskItem.cs
new file mode 100644
index 0000000..2b6bdf1
--- /dev/null
+++ b/SarahsDailyApp/Models/TaskItem.cs
@@ -0,0 +1,57 @@
+using SQLite;
+
+namespace SarahsDailyApp.Models;
+
+public enum RepeatType
+{
+    None,
+    Daily,
+    Weekly,
+    Monthly,
+    Yearly,
+    Custom,
+    Movable
+}
+
+[Table("Tasks")]
+public class TaskItem
+{
+    [PrimaryKey]
+    public string Id { get; set; } = Guid.NewGuid().ToString();
+
+    public string Title { get; set; } = string.Empty;
+
+    public string? Description { get; set; }
+
+    public DateTime? DueDate { get; set; }
+
+    public RepeatType RepeatType { get; set; } = RepeatType.None;
+
+    public int RepeatUnit { get; set; } = 1;
+
+    public int? CustomRepeatDays { get; set; }
+
+    public int? MovableRepeatDays { get; set; }
+
+    /// <summary>
+    /// Comma-separated day-of-week values (0=Sun..6=Sat).
+    /// </summary>
+    public string? DaysOfWeek { get; set; }
+
+    public string? ProjectId { get; set; }
+
+    public bool Completed { get; set; }
+
+    public DateTime? CompletedDate { get; set; }
+
+    public DateTime CreatedDate { get; set; } = DateTime.UtcNow;
+
+    [Ignore]
+    public int[]? DaysOfWeekArray
+    {
+        get => string.IsNullOrEmpty(DaysOfWeek)
+            ? null
+            : DaysOfWeek.Split(',').Select(int.Parse).ToArray();
+        set => DaysOfWeek = value is null ? null : string.Join(",", value);
+    }
+}
diff --git a/SarahsDailyApp/Models/UserStats.cs b/SarahsDailyApp/Models/UserStats.cs
new file mode 100644
index 0000000..5f72e7f
--- /dev/null
+++ b/SarahsDailyApp/Models/UserStats.cs
@@ -0,0 +1,16 @@
+using SQLite;
+
+namespace SarahsDailyApp.Models;
+
+[Table("UserStats")]
+public class UserStats
+{
+    [PrimaryKey]
+    public int Id { get; set; } = 1; // Singleton row
+
+    public int Level { get; set; } = 1;
+
+    public int DailyStreak { get; set; }
+
+    public DateTime? LastActivityDate { get; set; }
+}
diff --git a/SarahsDailyApp/Models/WishItem.cs b/SarahsDailyApp/Models/WishItem.cs
new file mode 100644
index 0000000..b7a6544
--- /dev/null
+++ b/SarahsDailyApp/Models/WishItem.cs
@@ -0,0 +1,24 @@
+using SQLite;
+
+namespace SarahsDailyApp.Models;
+
+[Table("WishItems")]
+public class WishItem
+{
+    [PrimaryKey]
+    public string Id { get; set; } = Guid.NewGuid().ToString();
+
+    public string Title { get; set; } = string.Empty;
+
+    public string? Url { get; set; }
+
+    public decimal? Price { get; set; }
+
+    public int Order { get; set; }
+
+    public bool Completed { get; set; }
+
+    public string? ListId { get; set; }
+
+    public DateTime CreatedDate { get; set; } = DateTime.UtcNow;
+}
diff --git a/SarahsDailyApp/Models/WishList.cs b/SarahsDailyApp/Models/WishList.cs
new file mode 100644
index 0000000..dd60a68
--- /dev/null
+++ b/SarahsDailyApp/Models/WishList.cs
@@ -0,0 +1,16 @@
+using SQLite;
+
+namespace SarahsDailyApp.Models;
+
+[Table("WishLists")]
+public class WishList
+{
+    [PrimaryKey]
+    public string Id { get; set; } = Guid.NewGuid().ToString();
+
+    public string Name { get; set; } = string.Empty;
+
+    public int Order { get; set; }
+
+    public DateTime CreatedDate { get; set; } = DateTime.UtcNow;
+}
diff --git a/SarahsDailyApp/SarahsDailyApp.csproj b/SarahsDailyApp/SarahsDailyApp.csproj
index 8efa80c..ca6637b 100644
--- a/SarahsDailyApp/SarahsDailyApp.csproj
+++ b/SarahsDailyApp/SarahsDailyApp.csproj
@@ -66,8 +66,13 @@
 	</ItemGroup>
 
 	<ItemGroup>
-		<PackageReference Include="Microsoft.Maui.Controls" Version="$(MauiVersion)" />
+		<PackageReference Include="Microsoft.Maui.Controls" Version="10.0.51" />
+		<PackageReference Include="Microsoft.Maui.Controls.Compatibility" Version="10.0.51" />
 		<PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="10.0.0" />
+		<PackageReference Include="sqlite-net-pcl" Version="1.9.172" />
+		<PackageReference Include="SQLitePCLRaw.bundle_green" Version="2.1.11" />
+		<PackageReference Include="CommunityToolkit.Mvvm" Version="8.4.0" />
+		<PackageReference Include="CommunityToolkit.Maui" Version="14.0.1" />
 	</ItemGroup>
 
 </Project>
diff --git a/SarahsDailyApp/Services/CategoryService.cs b/SarahsDailyApp/Services/CategoryService.cs
new file mode 100644
index 0000000..5e79268
--- /dev/null
+++ b/SarahsDailyApp/Services/CategoryService.cs
@@ -0,0 +1,61 @@
+using SarahsDailyApp.Models;
+
+namespace SarahsDailyApp.Services;
+
+public class CategoryService(DatabaseService db)
+{
+    public async Task<List<Category>> GetAllAsync()
+    {
+        var conn = await db.GetDatabaseAsync();
+        return await conn.Table<Category>().OrderBy(c => c.Name).ToListAsync();
+    }
+
+    public async System.Threading.Tasks.Task AddAsync(string name)
+    {
+        var conn = await db.GetDatabaseAsync();
+        await conn.InsertAsync(new Category { Name = name });
+    }
+
+    public async System.Threading.Tasks.Task RenameAsync(int id, string newName)
+    {
+        var conn = await db.GetDatabaseAsync();
+        var category = await conn.FindAsync<Category>(id);
+        if (category is null) return;
+
+        string oldName = category.Name;
+        category.Name = newName;
+        await conn.UpdateAsync(category);
+
+        await PropagateRenameAsync(conn, oldName, newName);
+    }
+
+    public async System.Threading.Tasks.Task DeleteAsync(int id)
+    {
+        var conn = await db.GetDatabaseAsync();
+        var category = await conn.FindAsync<Category>(id);
+        if (category is null) return;
+
+        await ClearCategoryReferencesAsync(conn, category.Name);
+        await conn.DeleteAsync(category);
+    }
+
+    private static async System.Threading.Tasks.Task PropagateRenameAsync(
+        SQLite.SQLiteAsyncConnection conn, string oldName, string newName)
+    {
+        var habits = await conn.Table<Habit>().Where(h => h.Category == oldName).ToListAsync();
+        foreach (var h in habits) { h.Category = newName; await conn.UpdateAsync(h); }
+
+        var finances = await conn.Table<FinanceItem>().Where(f => f.Category == oldName).ToListAsync();
+        foreach (var f in finances) { f.Category = newName; await conn.UpdateAsync(f); }
+    }
+
+    private static async System.Threading.Tasks.Task ClearCategoryReferencesAsync(
+        SQLite.SQLiteAsyncConnection conn, string name)
+    {
+        var habits = await conn.Table<Habit>().Where(h => h.Category == name).ToListAsync();
+        foreach (var h in habits) { h.Category = null; await conn.UpdateAsync(h); }
+
+        var finances = await conn.Table<FinanceItem>().Where(f => f.Category == name).ToListAsync();
+        foreach (var f in finances) { f.Category = null; await conn.UpdateAsync(f); }
+    }
+}
diff --git a/SarahsDailyApp/Services/DatabaseService.cs b/SarahsDailyApp/Services/DatabaseService.cs
new file mode 100644
index 0000000..ba76177
--- /dev/null
+++ b/SarahsDailyApp/Services/DatabaseService.cs
@@ -0,0 +1,68 @@
+using SQLite;
+using SarahsDailyApp.Models;
+
+namespace SarahsDailyApp.Services;
+
+public class DatabaseService
+{
+    private SQLiteAsyncConnection? _database;
+    private bool _initialized;
+
+    private static readonly string[] DefaultCategories =
+    [
+        "Work", "Personal", "Home", "Shopping", "Health", "Fitness",
+        "Learning", "Productivity", "Food", "Transportation",
+        "Entertainment", "Utilities", "Income"
+    ];
+
+    public async Task<SQLiteAsyncConnection> GetDatabaseAsync()
+    {
+        if (_initialized && _database is not null)
+            return _database;
+
+        var dbPath = Path.Combine(FileSystem.AppDataDirectory, "sarahsdailyapp.db3");
+        _database = new SQLiteAsyncConnection(dbPath);
+
+        await _database.CreateTableAsync<TaskItem>();
+        await _database.CreateTableAsync<Project>();
+        await _database.CreateTableAsync<Habit>();
+        await _database.CreateTableAsync<HabitLog>();
+        await _database.CreateTableAsync<FinanceItem>();
+        await _database.CreateTableAsync<WishItem>();
+        await _database.CreateTableAsync<WishList>();
+        await _database.CreateTableAsync<Note>();
+        await _database.CreateTableAsync<ShoppingItem>();
+        await _database.CreateTableAsync<UserStats>();
+        await _database.CreateTableAsync<AppSettings>();
+        await _database.CreateTableAsync<Category>();
+
+        await SeedDefaultsAsync(_database);
+
+        _initialized = true;
+        return _database;
+    }
+
+    private static async System.Threading.Tasks.Task SeedDefaultsAsync(SQLiteAsyncConnection db)
+    {
+        var statsCount = await db.Table<UserStats>().CountAsync();
+        if (statsCount == 0)
+        {
+            await db.InsertAsync(new UserStats());
+        }
+
+        var settingsCount = await db.Table<AppSettings>().CountAsync();
+        if (settingsCount == 0)
+        {
+            await db.InsertAsync(new AppSettings());
+        }
+
+        var categoryCount = await db.Table<Category>().CountAsync();
+        if (categoryCount == 0)
+        {
+            foreach (var name in DefaultCategories)
+            {
+                await db.InsertAsync(new Category { Name = name });
+            }
+        }
+    }
+}
diff --git a/SarahsDailyApp/Services/ExportImportService.cs b/SarahsDailyApp/Services/ExportImportService.cs
new file mode 100644
index 0000000..f4dce10
--- /dev/null
+++ b/SarahsDailyApp/Services/ExportImportService.cs
@@ -0,0 +1,146 @@
+using System.Text.Json;
+using System.Text.Json.Serialization;
+using SarahsDailyApp.Models;
+
+namespace SarahsDailyApp.Services;
+
+public class ExportImportService(DatabaseService db)
+{
+    private static readonly JsonSerializerOptions JsonOptions = new()
+    {
+        WriteIndented = true,
+        PropertyNamingPolicy = JsonNamingPolicy.CamelCase,
+        DefaultIgnoreCondition = JsonIgnoreCondition.WhenWritingNull
+    };
+
+    public async Task<string> ExportToJsonAsync()
+    {
+        var conn = await db.GetDatabaseAsync();
+
+        var data = new ExportData
+        {
+            Version = "1.0.0",
+            SchemaVersion = 3,
+            LastUpdated = DateTime.UtcNow.ToString("o"),
+            Tasks = await conn.Table<TaskItem>().ToListAsync(),
+            Projects = await conn.Table<Project>().ToListAsync(),
+            Habits = await conn.Table<Habit>().ToListAsync(),
+            DailyHabitLogs = await conn.Table<HabitLog>().ToListAsync(),
+            Expenses = await conn.Table<FinanceItem>().Where(f => f.Type == FinanceType.Expense).ToListAsync(),
+            Revenue = await conn.Table<FinanceItem>().Where(f => f.Type == FinanceType.Revenue).ToListAsync(),
+            Charges = await conn.Table<FinanceItem>().Where(f => f.Type == FinanceType.Charge).ToListAsync(),
+            Categories = (await conn.Table<Category>().ToListAsync()).Select(c => c.Name).ToList(),
+            UserStats = await conn.FindAsync<UserStats>(1) ?? new UserStats(),
+            Settings = await conn.FindAsync<AppSettings>(1) ?? new AppSettings(),
+            WishList = await conn.Table<WishItem>().ToListAsync(),
+            WishLists = await conn.Table<WishList>().ToListAsync(),
+            Notes = await conn.Table<Note>().ToListAsync(),
+            ShoppingList = await conn.Table<ShoppingItem>().ToListAsync()
+        };
+
+        return JsonSerializer.Serialize(data, JsonOptions);
+    }
+
+    public async Task<bool> ImportFromJsonAsync(string json)
+    {
+        try
+        {
+            var data = JsonSerializer.Deserialize<ExportData>(json, JsonOptions);
+            if (data is null)
+                return false;
+
+            var conn = await db.GetDatabaseAsync();
+
+            // Clear existing data
+            await conn.DeleteAllAsync<TaskItem>();
+            await conn.DeleteAllAsync<Project>();
+            await conn.DeleteAllAsync<Habit>();
+            await conn.DeleteAllAsync<HabitLog>();
+            await conn.DeleteAllAsync<FinanceItem>();
+            await conn.DeleteAllAsync<WishItem>();
+            await conn.DeleteAllAsync<WishList>();
+            await conn.DeleteAllAsync<Note>();
+            await conn.DeleteAllAsync<ShoppingItem>();
+            await conn.DeleteAllAsync<Category>();
+
+            // Import data
+            if (data.Tasks is not null)
+                await conn.InsertAllAsync(data.Tasks);
+            if (data.Projects is not null)
+                await conn.InsertAllAsync(data.Projects);
+            if (data.Habits is not null)
+                await conn.InsertAllAsync(data.Habits);
+            if (data.DailyHabitLogs is not null)
+                await conn.InsertAllAsync(data.DailyHabitLogs);
+
+            if (data.Expenses is not null)
+            {
+                foreach (var e in data.Expenses) e.Type = FinanceType.Expense;
+                await conn.InsertAllAsync(data.Expenses);
+            }
+            if (data.Revenue is not null)
+            {
+                foreach (var r in data.Revenue) r.Type = FinanceType.Revenue;
+                await conn.InsertAllAsync(data.Revenue);
+            }
+            if (data.Charges is not null)
+            {
+                foreach (var c in data.Charges) c.Type = FinanceType.Charge;
+                await conn.InsertAllAsync(data.Charges);
+            }
+
+            if (data.Categories is not null)
+            {
+                foreach (var name in data.Categories)
+                    await conn.InsertAsync(new Category { Name = name });
+            }
+
+            if (data.WishList is not null)
+                await conn.InsertAllAsync(data.WishList);
+            if (data.WishLists is not null)
+                await conn.InsertAllAsync(data.WishLists);
+            if (data.Notes is not null)
+                await conn.InsertAllAsync(data.Notes);
+            if (data.ShoppingList is not null)
+                await conn.InsertAllAsync(data.ShoppingList);
+
+            if (data.UserStats is not null)
+            {
+                data.UserStats.Id = 1;
+                await conn.InsertOrReplaceAsync(data.UserStats);
+            }
+            if (data.Settings is not null)
+            {
+                data.Settings.Id = 1;
+                await conn.InsertOrReplaceAsync(data.Settings);
+            }
+
+            return true;
+        }
+        catch
+        {
+            return false;
+        }
+    }
+}
+
+public class ExportData
+{
+    public string Version { get; set; } = "1.0.0";
+    public int SchemaVersion { get; set; } = 3;
+    public string? LastUpdated { get; set; }
+    public List<TaskItem>? Tasks { get; set; }
+    public List<Project>? Projects { get; set; }
+    public List<Habit>? Habits { get; set; }
+    public List<HabitLog>? DailyHabitLogs { get; set; }
+    public List<FinanceItem>? Expenses { get; set; }
+    public List<FinanceItem>? Revenue { get; set; }
+    public List<FinanceItem>? Charges { get; set; }
+    public List<string>? Categories { get; set; }
+    public UserStats? UserStats { get; set; }
+    public AppSettings? Settings { get; set; }
+    public List<WishItem>? WishList { get; set; }
+    public List<WishList>? WishLists { get; set; }
+    public List<Note>? Notes { get; set; }
+    public List<ShoppingItem>? ShoppingList { get; set; }
+}
diff --git a/SarahsDailyApp/Services/FinanceService.cs b/SarahsDailyApp/Services/FinanceService.cs
new file mode 100644
index 0000000..d0b7116
--- /dev/null
+++ b/SarahsDailyApp/Services/FinanceService.cs
@@ -0,0 +1,50 @@
+using SarahsDailyApp.Models;
+
+namespace SarahsDailyApp.Services;
+
+public class FinanceService(DatabaseService db)
+{
+    public async Task<List<FinanceItem>> GetByTypeAsync(FinanceType type)
+    {
+        var conn = await db.GetDatabaseAsync();
+        return await conn.Table<FinanceItem>()
+            .Where(f => f.Type == type)
+            .ToListAsync();
+    }
+
+    public async Task<List<FinanceItem>> GetFilteredAsync(FinanceType type, DateTime startDate, DateTime endDate)
+    {
+        var all = await GetByTypeAsync(type);
+        return all.Where(f =>
+        {
+            if (f.Date is null)
+                return false;
+            if (f.Recurring == RecurringType.Once)
+                return f.Date >= startDate.Date && f.Date <= endDate.Date;
+            // Monthly/Yearly recurring: included if created before endDate
+            return f.Date <= endDate.Date;
+        }).ToList();
+    }
+
+    public async Task<FinanceItem?> GetByIdAsync(string id)
+    {
+        var conn = await db.GetDatabaseAsync();
+        return await conn.FindAsync<FinanceItem>(id);
+    }
+
+    public async System.Threading.Tasks.Task SaveAsync(FinanceItem item)
+    {
+        var conn = await db.GetDatabaseAsync();
+        var existing = await conn.FindAsync<FinanceItem>(item.Id);
+        if (existing is null)
+            await conn.InsertAsync(item);
+        else
+            await conn.UpdateAsync(item);
+    }
+
+    public async System.Threading.Tasks.Task DeleteAsync(string id)
+    {
+        var conn = await db.GetDatabaseAsync();
+        await conn.DeleteAsync<FinanceItem>(id);
+    }
+}
diff --git a/SarahsDailyApp/Services/HabitService.cs b/SarahsDailyApp/Services/HabitService.cs
new file mode 100644
index 0000000..a767bcf
--- /dev/null
+++ b/SarahsDailyApp/Services/HabitService.cs
@@ -0,0 +1,111 @@
+using SarahsDailyApp.Models;
+
+namespace SarahsDailyApp.Services;
+
+public class HabitService(DatabaseService db)
+{
+    public async Task<List<Habit>> GetAllAsync()
+    {
+        var conn = await db.GetDatabaseAsync();
+        return await conn.Table<Habit>().ToListAsync();
+    }
+
+    public async Task<Habit?> GetByIdAsync(string id)
+    {
+        var conn = await db.GetDatabaseAsync();
+        return await conn.FindAsync<Habit>(id);
+    }
+
+    public async System.Threading.Tasks.Task SaveAsync(Habit habit)
+    {
+        var conn = await db.GetDatabaseAsync();
+        var existing = await conn.FindAsync<Habit>(habit.Id);
+        if (existing is null)
+            await conn.InsertAsync(habit);
+        else
+            await conn.UpdateAsync(habit);
+    }
+
+    public async System.Threading.Tasks.Task DeleteAsync(string id)
+    {
+        var conn = await db.GetDatabaseAsync();
+        await conn.DeleteAsync<Habit>(id);
+        // Delete associated logs
+        var logs = await conn.Table<HabitLog>()
+            .Where(l => l.HabitId == id)
+            .ToListAsync();
+        foreach (var log in logs)
+            await conn.DeleteAsync(log);
+    }
+
+    public async Task<List<HabitLog>> GetLogsForHabitAsync(string habitId)
+    {
+        var conn = await db.GetDatabaseAsync();
+        return await conn.Table<HabitLog>()
+            .Where(l => l.HabitId == habitId)
+            .ToListAsync();
+    }
+
+    public async Task<List<HabitLog>> GetLogsForDateAsync(DateTime date)
+    {
+        var start = date.Date;
+        var end = start.AddDays(1);
+        var conn = await db.GetDatabaseAsync();
+        return await conn.Table<HabitLog>()
+            .Where(l => l.Date >= start && l.Date < end)
+            .ToListAsync();
+    }
+
+    public async System.Threading.Tasks.Task CompleteHabitAsync(Habit habit, DateTime selectedDate)
+    {
+        var conn = await db.GetDatabaseAsync();
+
+        var log = new HabitLog
+        {
+            HabitId = habit.Id,
+            Date = selectedDate.Date,
+            Timestamp = DateTime.UtcNow
+        };
+        await conn.InsertAsync(log);
+
+        habit.Streak = await CalculateStreakAsync(habit);
+        habit.LastCompletedDate = selectedDate.Date;
+        await conn.UpdateAsync(habit);
+    }
+
+    public async Task<int> GetCompletionsForDateAsync(string habitId, DateTime date)
+    {
+        var start = date.Date;
+        var end = start.AddDays(1);
+        var conn = await db.GetDatabaseAsync();
+        return await conn.Table<HabitLog>()
+            .Where(l => l.HabitId == habitId && l.Date >= start && l.Date < end)
+            .CountAsync();
+    }
+
+    public async Task<int> CalculateStreakAsync(Habit habit)
+    {
+        var allLogs = await GetLogsForHabitAsync(habit.Id);
+
+        var completedDates = allLogs
+            .GroupBy(l => l.Date.Date)
+            .Where(g => g.Count() >= habit.TargetGoal)
+            .Select(g => g.Key)
+            .OrderByDescending(d => d)
+            .ToList();
+
+        if (completedDates.Count == 0)
+            return 0;
+
+        int streak = 1;
+        for (int i = 1; i < completedDates.Count; i++)
+        {
+            if ((completedDates[i - 1] - completedDates[i]).Days == 1)
+                streak++;
+            else
+                break;
+        }
+
+        return streak;
+    }
+}
diff --git a/SarahsDailyApp/Services/NoteService.cs b/SarahsDailyApp/Services/NoteService.cs
new file mode 100644
index 0000000..50bb492
--- /dev/null
+++ b/SarahsDailyApp/Services/NoteService.cs
@@ -0,0 +1,42 @@
+using SarahsDailyApp.Models;
+
+namespace SarahsDailyApp.Services;
+
+public class NoteService(DatabaseService db)
+{
+    public async Task<List<Note>> GetAllAsync()
+    {
+        var conn = await db.GetDatabaseAsync();
+        var notes = await conn.Table<Note>().ToListAsync();
+        return notes
+            .OrderByDescending(n => n.UpdatedDate ?? n.CreatedDate)
+            .ToList();
+    }
+
+    public async Task<Note?> GetByIdAsync(string id)
+    {
+        var conn = await db.GetDatabaseAsync();
+        return await conn.FindAsync<Note>(id);
+    }
+
+    public async System.Threading.Tasks.Task SaveAsync(Note note)
+    {
+        var conn = await db.GetDatabaseAsync();
+        var existing = await conn.FindAsync<Note>(note.Id);
+        if (existing is null)
+        {
+            await conn.InsertAsync(note);
+        }
+        else
+        {
+            note.UpdatedDate = DateTime.UtcNow;
+            await conn.UpdateAsync(note);
+        }
+    }
+
+    public async System.Threading.Tasks.Task DeleteAsync(string id)
+    {
+        var conn = await db.GetDatabaseAsync();
+        await conn.DeleteAsync<Note>(id);
+    }
+}
diff --git a/SarahsDailyApp/Services/ProjectService.cs b/SarahsDailyApp/Services/ProjectService.cs
new file mode 100644
index 0000000..defb2d7
--- /dev/null
+++ b/SarahsDailyApp/Services/ProjectService.cs
@@ -0,0 +1,44 @@
+using SarahsDailyApp.Models;
+
+namespace SarahsDailyApp.Services;
+
+public class ProjectService(DatabaseService db)
+{
+    public async Task<List<Project>> GetAllAsync()
+    {
+        var conn = await db.GetDatabaseAsync();
+        return await conn.Table<Project>().ToListAsync();
+    }
+
+    public async Task<Project?> GetByIdAsync(string id)
+    {
+        var conn = await db.GetDatabaseAsync();
+        return await conn.FindAsync<Project>(id);
+    }
+
+    public async System.Threading.Tasks.Task SaveAsync(Project project)
+    {
+        var conn = await db.GetDatabaseAsync();
+        var existing = await conn.FindAsync<Project>(project.Id);
+        if (existing is null)
+            await conn.InsertAsync(project);
+        else
+            await conn.UpdateAsync(project);
+    }
+
+    public async System.Threading.Tasks.Task DeleteAsync(string id)
+    {
+        var conn = await db.GetDatabaseAsync();
+        await conn.DeleteAsync<Project>(id);
+
+        // Unlink tasks from this project
+        var tasks = await conn.Table<TaskItem>()
+            .Where(t => t.ProjectId == id)
+            .ToListAsync();
+        foreach (var task in tasks)
+        {
+            task.ProjectId = null;
+            await conn.UpdateAsync(task);
+        }
+    }
+}
diff --git a/SarahsDailyApp/Services/ShoppingService.cs b/SarahsDailyApp/Services/ShoppingService.cs
new file mode 100644
index 0000000..7d2d553
--- /dev/null
+++ b/SarahsDailyApp/Services/ShoppingService.cs
@@ -0,0 +1,47 @@
+using SarahsDailyApp.Models;
+
+namespace SarahsDailyApp.Services;
+
+public class ShoppingService(DatabaseService db)
+{
+    public async Task<List<ShoppingItem>> GetAllAsync()
+    {
+        var conn = await db.GetDatabaseAsync();
+        return await conn.Table<ShoppingItem>()
+            .OrderBy(s => s.CreatedDate)
+            .ToListAsync();
+    }
+
+    public async System.Threading.Tasks.Task SaveAsync(ShoppingItem item)
+    {
+        var conn = await db.GetDatabaseAsync();
+        var existing = await conn.FindAsync<ShoppingItem>(item.Id);
+        if (existing is null)
+            await conn.InsertAsync(item);
+        else
+            await conn.UpdateAsync(item);
+    }
+
+    public async System.Threading.Tasks.Task DeleteAsync(string id)
+    {
+        var conn = await db.GetDatabaseAsync();
+        await conn.DeleteAsync<ShoppingItem>(id);
+    }
+
+    public async System.Threading.Tasks.Task ToggleCompletionAsync(ShoppingItem item)
+    {
+        item.Completed = !item.Completed;
+        var conn = await db.GetDatabaseAsync();
+        await conn.UpdateAsync(item);
+    }
+
+    public async System.Threading.Tasks.Task ClearCheckedAsync()
+    {
+        var conn = await db.GetDatabaseAsync();
+        var checked_items = await conn.Table<ShoppingItem>()
+            .Where(s => s.Completed)
+            .ToListAsync();
+        foreach (var item in checked_items)
+            await conn.DeleteAsync(item);
+    }
+}
diff --git a/SarahsDailyApp/Services/TaskService.cs b/SarahsDailyApp/Services/TaskService.cs
new file mode 100644
index 0000000..37016a3
--- /dev/null
+++ b/SarahsDailyApp/Services/TaskService.cs
@@ -0,0 +1,122 @@
+using SarahsDailyApp.Models;
+
+namespace SarahsDailyApp.Services;
+
+public class TaskService(DatabaseService db)
+{
+    public async Task<List<TaskItem>> GetAllAsync()
+    {
+        var conn = await db.GetDatabaseAsync();
+        return await conn.Table<TaskItem>().ToListAsync();
+    }
+
+    public async Task<TaskItem?> GetByIdAsync(string id)
+    {
+        var conn = await db.GetDatabaseAsync();
+        return await conn.FindAsync<TaskItem>(id);
+    }
+
+    public async Task<List<TaskItem>> GetByProjectIdAsync(string projectId)
+    {
+        var conn = await db.GetDatabaseAsync();
+        return await conn.Table<TaskItem>()
+            .Where(t => t.ProjectId == projectId)
+            .ToListAsync();
+    }
+
+    public async System.Threading.Tasks.Task SaveAsync(TaskItem task)
+    {
+        var conn = await db.GetDatabaseAsync();
+        var existing = await conn.FindAsync<TaskItem>(task.Id);
+        if (existing is null)
+            await conn.InsertAsync(task);
+        else
+            await conn.UpdateAsync(task);
+    }
+
+    public async System.Threading.Tasks.Task DeleteAsync(string id)
+    {
+        var conn = await db.GetDatabaseAsync();
+        await conn.DeleteAsync<TaskItem>(id);
+    }
+
+    public async Task<int> GetCompletedCountAsync()
+    {
+        var conn = await db.GetDatabaseAsync();
+        return await conn.Table<TaskItem>().Where(t => t.Completed).CountAsync();
+    }
+
+    public async System.Threading.Tasks.Task ToggleCompletionAsync(TaskItem task, DateTime selectedDate)
+    {
+        task.Completed = !task.Completed;
+        task.CompletedDate = task.Completed ? selectedDate.Date : null;
+        await SaveAsync(task);
+
+        if (task.Completed && task.RepeatType != RepeatType.None)
+        {
+            var nextTask = CreateNextRecurringTask(task, selectedDate);
+            await SaveAsync(nextTask);
+        }
+    }
+
+    public static TaskItem CreateNextRecurringTask(TaskItem original, DateTime completionDate)
+    {
+        var nextDue = CalculateNextDueDate(original, completionDate);
+
+        return new TaskItem
+        {
+            Id = Guid.NewGuid().ToString(),
+            Title = original.Title,
+            Description = original.Description,
+            DueDate = nextDue,
+            RepeatType = original.RepeatType,
+            RepeatUnit = original.RepeatUnit,
+            CustomRepeatDays = original.CustomRepeatDays,
+            MovableRepeatDays = original.MovableRepeatDays,
+            DaysOfWeek = original.DaysOfWeek,
+            ProjectId = original.ProjectId,
+            Completed = false,
+            CompletedDate = null,
+            CreatedDate = DateTime.UtcNow
+        };
+    }
+
+    private static DateTime CalculateNextDueDate(TaskItem task, DateTime completionDate)
+    {
+        var daysOfWeek = task.DaysOfWeekArray;
+        int unit = Math.Max(1, task.RepeatUnit);
+
+        return task.RepeatType switch
+        {
+            RepeatType.Daily => daysOfWeek is { Length: > 0 }
+                ? NextOccurrenceOfDays(completionDate, daysOfWeek)
+                : completionDate.AddDays(unit),
+
+            RepeatType.Weekly => daysOfWeek is { Length: > 0 }
+                ? NextOccurrenceOfDays(completionDate, daysOfWeek).AddDays((unit - 1) * 7)
+                : completionDate.AddDays(unit * 7),
+
+            RepeatType.Monthly => completionDate.AddMonths(unit),
+
+            RepeatType.Yearly => completionDate.AddYears(unit),
+
+            RepeatType.Custom => completionDate.AddDays(task.CustomRepeatDays ?? 1),
+
+            RepeatType.Movable => completionDate.AddDays(task.MovableRepeatDays ?? 1),
+
+            _ => completionDate.AddDays(1)
+        };
+    }
+
+    private static DateTime NextOccurrenceOfDays(DateTime from, int[] targetDays)
+    {
+        for (int i = 1; i <= 7; i++)
+        {
+            var candidate = from.AddDays(i);
+            int dow = (int)candidate.DayOfWeek;
+            if (targetDays.Contains(dow))
+                return candidate;
+        }
+        return from.AddDays(1);
+    }
+}
diff --git a/SarahsDailyApp/Services/UserStatsService.cs b/SarahsDailyApp/Services/UserStatsService.cs
new file mode 100644
index 0000000..6973175
--- /dev/null
+++ b/SarahsDailyApp/Services/UserStatsService.cs
@@ -0,0 +1,61 @@
+using SarahsDailyApp.Models;
+
+namespace SarahsDailyApp.Services;
+
+public class UserStatsService(DatabaseService db, TaskService taskService)
+{
+    public async Task<UserStats> GetAsync()
+    {
+        var conn = await db.GetDatabaseAsync();
+        return await conn.FindAsync<UserStats>(1) ?? new UserStats();
+    }
+
+    public async Task<AppSettings> GetSettingsAsync()
+    {
+        var conn = await db.GetDatabaseAsync();
+        return await conn.FindAsync<AppSettings>(1) ?? new AppSettings();
+    }
+
+    public async System.Threading.Tasks.Task SaveSettingsAsync(AppSettings settings)
+    {
+        var conn = await db.GetDatabaseAsync();
+        await conn.UpdateAsync(settings);
+        await RecalculateLevelAsync();
+    }
+
+    public async System.Threading.Tasks.Task RecalculateLevelAsync()
+    {
+        var conn = await db.GetDatabaseAsync();
+        var completedCount = await taskService.GetCompletedCountAsync();
+        var settings = await GetSettingsAsync();
+        var stats = await GetAsync();
+
+        stats.Level = (completedCount / settings.TasksPerLevel) + 1;
+        await conn.UpdateAsync(stats);
+    }
+
+    public async System.Threading.Tasks.Task UpdateDailyStreakAsync()
+    {
+        var conn = await db.GetDatabaseAsync();
+        var stats = await GetAsync();
+        var today = DateTime.Today;
+
+        if (stats.LastActivityDate?.Date == today)
+            return; // Already updated today
+
+        if (stats.LastActivityDate?.Date == today.AddDays(-1))
+            stats.DailyStreak++;
+        else
+            stats.DailyStreak = 1;
+
+        stats.LastActivityDate = today;
+        await conn.UpdateAsync(stats);
+    }
+
+    public async Task<int> GetProgressToNextLevelAsync()
+    {
+        var completedCount = await taskService.GetCompletedCountAsync();
+        var settings = await GetSettingsAsync();
+        return completedCount % settings.TasksPerLevel;
+    }
+}
diff --git a/SarahsDailyApp/Services/WishListService.cs b/SarahsDailyApp/Services/WishListService.cs
new file mode 100644
index 0000000..ab192fe
--- /dev/null
+++ b/SarahsDailyApp/Services/WishListService.cs
@@ -0,0 +1,98 @@
+using SarahsDailyApp.Models;
+
+namespace SarahsDailyApp.Services;
+
+public class WishListService(DatabaseService db)
+{
+    // --- WishList CRUD ---
+
+    public async Task<List<WishList>> GetAllListsAsync()
+    {
+        var conn = await db.GetDatabaseAsync();
+        return await conn.Table<WishList>().OrderBy(w => w.Order).ToListAsync();
+    }
+
+    public async System.Threading.Tasks.Task SaveListAsync(WishList list)
+    {
+        var conn = await db.GetDatabaseAsync();
+        var existing = await conn.FindAsync<WishList>(list.Id);
+        if (existing is null)
+        {
+            var count = await conn.Table<WishList>().CountAsync();
+            list.Order = count;
+            await conn.InsertAsync(list);
+        }
+        else
+        {
+            await conn.UpdateAsync(list);
+        }
+    }
+
+    public async System.Threading.Tasks.Task DeleteListAsync(string id)
+    {
+        var conn = await db.GetDatabaseAsync();
+        await conn.DeleteAsync<WishList>(id);
+
+        // Unlink items
+        var items = await conn.Table<WishItem>()
+            .Where(i => i.ListId == id)
+            .ToListAsync();
+        foreach (var item in items)
+        {
+            item.ListId = null;
+            await conn.UpdateAsync(item);
+        }
+    }
+
+    // --- WishItem CRUD ---
+
+    public async Task<List<WishItem>> GetAllItemsAsync()
+    {
+        var conn = await db.GetDatabaseAsync();
+        return await conn.Table<WishItem>().OrderBy(i => i.Order).ToListAsync();
+    }
+
+    public async Task<List<WishItem>> GetItemsByListIdAsync(string? listId)
+    {
+        var conn = await db.GetDatabaseAsync();
+        if (listId is null)
+            return await conn.Table<WishItem>()
+                .Where(i => i.ListId == null)
+                .OrderBy(i => i.Order)
+                .ToListAsync();
+
+        return await conn.Table<WishItem>()
+            .Where(i => i.ListId == listId)
+            .OrderBy(i => i.Order)
+            .ToListAsync();
+    }
+
+    public async System.Threading.Tasks.Task SaveItemAsync(WishItem item)
+    {
+        var conn = await db.GetDatabaseAsync();
+        var existing = await conn.FindAsync<WishItem>(item.Id);
+        if (existing is null)
+        {
+            var count = await conn.Table<WishItem>().CountAsync();
+            item.Order = count;
+            await conn.InsertAsync(item);
+        }
+        else
+        {
+            await conn.UpdateAsync(item);
+        }
+    }
+
+    public async System.Threading.Tasks.Task DeleteItemAsync(string id)
+    {
+        var conn = await db.GetDatabaseAsync();
+        await conn.DeleteAsync<WishItem>(id);
+    }
+
+    public async System.Threading.Tasks.Task ToggleItemCompletionAsync(WishItem item)
+    {
+        item.Completed = !item.Completed;
+        var conn = await db.GetDatabaseAsync();
+        await conn.UpdateAsync(item);
+    }
+}
diff --git a/SarahsDailyApp/ViewModels/DashboardViewModel.cs b/SarahsDailyApp/ViewModels/DashboardViewModel.cs
new file mode 100644
index 0000000..2580e8e
--- /dev/null
+++ b/SarahsDailyApp/ViewModels/DashboardViewModel.cs
@@ -0,0 +1,177 @@
+using CommunityToolkit.Mvvm.ComponentModel;
+using CommunityToolkit.Mvvm.Input;
+using SarahsDailyApp.Models;
+using SarahsDailyApp.Services;
+
+namespace SarahsDailyApp.ViewModels;
+
+public partial class DashboardViewModel(
+    TaskService taskService,
+    HabitService habitService,
+    ProjectService projectService,
+    UserStatsService userStatsService) : ObservableObject
+{
+    [ObservableProperty]
+    private int _tasksDueToday;
+
+    [ObservableProperty]
+    private int _overdueTasks;
+
+    [ObservableProperty]
+    private int _completedToday;
+
+    [ObservableProperty]
+    private int _incompleteHabits;
+
+    [ObservableProperty]
+    private int _level;
+
+    [ObservableProperty]
+    private int _streak;
+
+    [ObservableProperty]
+    private string _levelProgress = string.Empty;
+
+    [ObservableProperty]
+    private List<HabitProgress> _incompleteHabitList = [];
+
+    [ObservableProperty]
+    private List<ProjectProgress> _projectList = [];
+
+    [ObservableProperty]
+    private List<ActivityItem> _recentActivity = [];
+
+    [RelayCommand]
+    public async Task LoadDataAsync()
+    {
+        var today = DateTime.Today;
+        var tasks = await taskService.GetAllAsync();
+        var habits = await habitService.GetAllAsync();
+        var projects = await projectService.GetAllAsync();
+        var stats = await userStatsService.GetAsync();
+        var settings = await userStatsService.GetSettingsAsync();
+
+        // Task stats
+        TasksDueToday = tasks.Count(t => !t.Completed && t.DueDate?.Date == today);
+        OverdueTasks = tasks.Count(t => !t.Completed && t.DueDate?.Date < today);
+        CompletedToday = tasks.Count(t => t.CompletedDate?.Date == today);
+
+        // Habit stats
+        var habitProgressList = new List<HabitProgress>();
+        int incomplete = 0;
+        foreach (var habit in habits)
+        {
+            int dow = (int)today.DayOfWeek;
+            if (!habit.DaysOfWeekArray.Contains(dow))
+                continue;
+
+            int completions = await habitService.GetCompletionsForDateAsync(habit.Id, today);
+            if (completions < habit.TargetGoal)
+            {
+                incomplete++;
+                double pct = habit.TargetGoal > 0 ? (double)completions / habit.TargetGoal * 100 : 0;
+                habitProgressList.Add(new HabitProgress
+                {
+                    HabitId = habit.Id,
+                    Icon = habit.Icon,
+                    Name = habit.Name,
+                    Completions = completions,
+                    Target = habit.TargetGoal,
+                    Percentage = pct
+                });
+            }
+        }
+        IncompleteHabits = incomplete;
+        IncompleteHabitList = habitProgressList;
+
+        // Level & streak
+        Level = stats.Level;
+        Streak = stats.DailyStreak;
+        var progress = await userStatsService.GetProgressToNextLevelAsync();
+        LevelProgress = $"{progress}/{settings.TasksPerLevel} tasks";
+
+        // Projects
+        var projectProgressList = new List<ProjectProgress>();
+        foreach (var project in projects)
+        {
+            var projectTasks = tasks.Where(t => t.ProjectId == project.Id).ToList();
+            int total = projectTasks.Count;
+            int completed = projectTasks.Count(t => t.Completed);
+            double pct = total > 0 ? (double)completed / total * 100 : 0;
+            projectProgressList.Add(new ProjectProgress
+            {
+                ProjectId = project.Id,
+                Name = project.Name,
+                TotalTasks = total,
+                CompletedTasks = completed,
+                Percentage = pct
+            });
+        }
+        ProjectList = projectProgressList;
+
+        // Recent activity
+        var activities = new List<ActivityItem>();
+        var completedTasks = tasks
+            .Where(t => t.Completed && t.CompletedDate.HasValue)
+            .OrderByDescending(t => t.CompletedDate)
+            .Take(5);
+        foreach (var t in completedTasks)
+        {
+            activities.Add(new ActivityItem
+            {
+                Icon = "✓",
+                Message = $"Completed: {t.Title}",
+                Date = t.CompletedDate!.Value
+            });
+        }
+
+        var allLogs = new List<HabitLog>();
+        foreach (var habit in habits)
+        {
+            var logs = await habitService.GetLogsForHabitAsync(habit.Id);
+            foreach (var log in logs)
+            {
+                activities.Add(new ActivityItem
+                {
+                    Icon = "⭐",
+                    Message = $"Habit: {habit.Name}",
+                    Date = log.Timestamp
+                });
+            }
+        }
+
+        RecentActivity = activities
+            .OrderByDescending(a => a.Date)
+            .Take(5)
+            .ToList();
+    }
+}
+
+public class HabitProgress
+{
+    public string HabitId { get; set; } = string.Empty;
+    public string Icon { get; set; } = string.Empty;
+    public string Name { get; set; } = string.Empty;
+    public int Completions { get; set; }
+    public int Target { get; set; }
+    public double Percentage { get; set; }
+    public string ProgressText => $"{Completions}/{Target} ({Percentage:F0}%)";
+}
+
+public class ProjectProgress
+{
+    public string ProjectId { get; set; } = string.Empty;
+    public string Name { get; set; } = string.Empty;
+    public int TotalTasks { get; set; }
+    public int CompletedTasks { get; set; }
+    public double Percentage { get; set; }
+    public string ProgressText => $"{CompletedTasks}/{TotalTasks} tasks ({Percentage:F0}%)";
+}
+
+public class ActivityItem
+{
+    public string Icon { get; set; } = string.Empty;
+    public string Message { get; set; } = string.Empty;
+    public DateTime Date { get; set; }
+    public string DateText => Date.ToString("MMM dd, yyyy");
+}
diff --git a/SarahsDailyApp/ViewModels/FinanceDetailViewModel.cs b/SarahsDailyApp/ViewModels/FinanceDetailViewModel.cs
new file mode 100644
index 0000000..1f09d32
--- /dev/null
+++ b/SarahsDailyApp/ViewModels/FinanceDetailViewModel.cs
@@ -0,0 +1,118 @@
+using CommunityToolkit.Mvvm.ComponentModel;
+using CommunityToolkit.Mvvm.Input;
+using SarahsDailyApp.Models;
+using SarahsDailyApp.Services;
+
+namespace SarahsDailyApp.ViewModels;
+
+[QueryProperty(nameof(Item), "Item")]
+[QueryProperty(nameof(FinanceType), "FinanceType")]
+public partial class FinanceDetailViewModel(
+    FinanceService financeService,
+    CategoryService categoryService) : ObservableObject
+{
+    [ObservableProperty]
+    private FinanceItem _item = new();
+
+    [ObservableProperty]
+    private FinanceType _financeType;
+
+    [ObservableProperty]
+    private bool _isEditing;
+
+    [ObservableProperty]
+    private string _description = string.Empty;
+
+    [ObservableProperty]
+    private decimal _amount;
+
+    [ObservableProperty]
+    private DateTime _date = DateTime.Today;
+
+    [ObservableProperty]
+    private RecurringType _recurring = RecurringType.Once;
+
+    [ObservableProperty]
+    private string? _selectedCategory;
+
+    [ObservableProperty]
+    private List<string> _categories = [];
+
+    [ObservableProperty]
+    private string _newCategoryName = string.Empty;
+
+    [ObservableProperty]
+    private string _pageTitle = "Add Item";
+
+    public string[] RecurringOptions { get; } = ["One-time", "Monthly", "Yearly"];
+
+    [RelayCommand]
+    public async Task LoadDataAsync()
+    {
+        var cats = await categoryService.GetAllAsync();
+        Categories = cats.Select(c => c.Name).ToList();
+
+        if (Item is not null && !string.IsNullOrEmpty(Item.Description))
+        {
+            IsEditing = true;
+            Description = Item.Description;
+            Amount = Item.Amount;
+            Date = Item.Date ?? DateTime.Today;
+            Recurring = Item.Recurring;
+            SelectedCategory = Item.Category;
+            FinanceType = Item.Type;
+        }
+
+        PageTitle = IsEditing
+            ? $"Edit {FinanceType}"
+            : $"Add {FinanceType}";
+    }
+
+    [RelayCommand]
+    private async Task AddCategoryAsync()
+    {
+        if (string.IsNullOrWhiteSpace(NewCategoryName)) return;
+        await categoryService.AddAsync(NewCategoryName.Trim());
+        var cats = await categoryService.GetAllAsync();
+        Categories = cats.Select(c => c.Name).ToList();
+        SelectedCategory = NewCategoryName.Trim();
+        NewCategoryName = string.Empty;
+    }
+
+    [RelayCommand]
+    private async Task SaveAsync()
+    {
+        if (string.IsNullOrWhiteSpace(Description))
+        {
+            await Shell.Current.DisplayAlert("Validation", "Description is required.", "OK");
+            return;
+        }
+
+        Item.Description = Description.Trim();
+        Item.Amount = Amount;
+        Item.Date = Date;
+        Item.Recurring = Recurring;
+        Item.Category = SelectedCategory;
+        Item.Type = FinanceType;
+
+        await financeService.SaveAsync(Item);
+        await Shell.Current.GoToAsync("..");
+    }
+
+    [RelayCommand]
+    private async Task DeleteAsync()
+    {
+        bool confirm = await Shell.Current.DisplayAlert(
+            "Delete", "Are you sure you want to delete this item?", "Delete", "Cancel");
+        if (!confirm) return;
+
+        await financeService.DeleteAsync(Item.Id);
+        await Shell.Current.GoToAsync("..");
+    }
+
+    [RelayCommand]
+    private async Task CancelAsync()
+    {
+        await Shell.Current.GoToAsync("..");
+    }
+}
diff --git a/SarahsDailyApp/ViewModels/FinancesViewModel.cs b/SarahsDailyApp/ViewModels/FinancesViewModel.cs
new file mode 100644
index 0000000..39ebae8
--- /dev/null
+++ b/SarahsDailyApp/ViewModels/FinancesViewModel.cs
@@ -0,0 +1,94 @@
+using CommunityToolkit.Mvvm.ComponentModel;
+using CommunityToolkit.Mvvm.Input;
+using SarahsDailyApp.Models;
+using SarahsDailyApp.Services;
+using SarahsDailyApp.Views;
+
+namespace SarahsDailyApp.ViewModels;
+
+public partial class FinancesViewModel(FinanceService financeService) : ObservableObject
+{
+    [ObservableProperty]
+    private List<FinanceItem> _expenses = [];
+
+    [ObservableProperty]
+    private List<FinanceItem> _revenue = [];
+
+    [ObservableProperty]
+    private decimal _totalIncome;
+
+    [ObservableProperty]
+    private decimal _totalExpenses;
+
+    [ObservableProperty]
+    private decimal _netBalance;
+
+    [ObservableProperty]
+    private DateTime _startDate = new(DateTime.Today.Year, DateTime.Today.Month, 1);
+
+    [ObservableProperty]
+    private DateTime _endDate = new DateTime(DateTime.Today.Year, DateTime.Today.Month, 1)
+        .AddMonths(1).AddDays(-1);
+
+    [ObservableProperty]
+    private int _selectedTab; // 0=Expenses, 1=Revenue
+
+    [RelayCommand]
+    public async Task LoadDataAsync()
+    {
+        var expenses = await financeService.GetFilteredAsync(FinanceType.Expense, StartDate, EndDate);
+        var revenue = await financeService.GetFilteredAsync(FinanceType.Revenue, StartDate, EndDate);
+
+        Expenses = expenses;
+        Revenue = revenue;
+
+        TotalExpenses = expenses.Sum(e => e.MonthlyAmount);
+        TotalIncome = revenue.Sum(r => r.MonthlyAmount);
+        NetBalance = TotalIncome - TotalExpenses;
+    }
+
+    [RelayCommand]
+    private void PreviousMonth()
+    {
+        StartDate = StartDate.AddMonths(-1);
+        EndDate = StartDate.AddMonths(1).AddDays(-1);
+        LoadDataCommand.Execute(null);
+    }
+
+    [RelayCommand]
+    private void NextMonth()
+    {
+        StartDate = StartDate.AddMonths(1);
+        EndDate = StartDate.AddMonths(1).AddDays(-1);
+        LoadDataCommand.Execute(null);
+    }
+
+    [RelayCommand]
+    private void ThisMonth()
+    {
+        StartDate = new DateTime(DateTime.Today.Year, DateTime.Today.Month, 1);
+        EndDate = StartDate.AddMonths(1).AddDays(-1);
+        LoadDataCommand.Execute(null);
+    }
+
+    [RelayCommand]
+    private async Task AddExpenseAsync()
+    {
+        await Shell.Current.GoToAsync(nameof(FinanceDetailPage),
+            new Dictionary<string, object> { ["FinanceType"] = FinanceType.Expense });
+    }
+
+    [RelayCommand]
+    private async Task AddRevenueAsync()
+    {
+        await Shell.Current.GoToAsync(nameof(FinanceDetailPage),
+            new Dictionary<string, object> { ["FinanceType"] = FinanceType.Revenue });
+    }
+
+    [RelayCommand]
+    private async Task EditItemAsync(FinanceItem item)
+    {
+        await Shell.Current.GoToAsync(nameof(FinanceDetailPage),
+            new Dictionary<string, object> { ["Item"] = item, ["FinanceType"] = item.Type });
+    }
+}
diff --git a/SarahsDailyApp/ViewModels/HabitDetailViewModel.cs b/SarahsDailyApp/ViewModels/HabitDetailViewModel.cs
new file mode 100644
index 0000000..75033ce
--- /dev/null
+++ b/SarahsDailyApp/ViewModels/HabitDetailViewModel.cs
@@ -0,0 +1,132 @@
+using CommunityToolkit.Mvvm.ComponentModel;
+using CommunityToolkit.Mvvm.Input;
+using SarahsDailyApp.Models;
+using SarahsDailyApp.Services;
+
+namespace SarahsDailyApp.ViewModels;
+
+[QueryProperty(nameof(Habit), "Habit")]
+public partial class HabitDetailViewModel(
+    HabitService habitService,
+    CategoryService categoryService) : ObservableObject
+{
+    [ObservableProperty]
+    private Habit _habit = new();
+
+    [ObservableProperty]
+    private bool _isEditing;
+
+    [ObservableProperty]
+    private string _name = string.Empty;
+
+    [ObservableProperty]
+    private string? _description;
+
+    [ObservableProperty]
+    private string _icon = "⭐";
+
+    [ObservableProperty]
+    private string? _selectedCategory;
+
+    [ObservableProperty]
+    private int _targetGoal = 1;
+
+    [ObservableProperty]
+    private bool _sunday = true, _monday = true, _tuesday = true,
+        _wednesday = true, _thursday = true, _friday = true, _saturday = true;
+
+    [ObservableProperty]
+    private List<string> _categories = [];
+
+    [ObservableProperty]
+    private string _newCategoryName = string.Empty;
+
+    public static string[] CommonEmojis { get; } =
+    [
+        "⭐", "🏃", "📚", "💧", "🧘", "💪", "🎵", "✍️", "🧹", "💤",
+        "🍎", "🥗", "🏋️", "🚶", "🧠", "🎯", "⏰", "🌅", "🌿", "❤️"
+    ];
+
+    [RelayCommand]
+    public async Task LoadDataAsync()
+    {
+        var cats = await categoryService.GetAllAsync();
+        Categories = cats.Select(c => c.Name).ToList();
+
+        if (Habit is not null && !string.IsNullOrEmpty(Habit.Name))
+        {
+            IsEditing = true;
+            Name = Habit.Name;
+            Description = Habit.Description;
+            Icon = Habit.Icon;
+            SelectedCategory = Habit.Category;
+            TargetGoal = Habit.TargetGoal;
+
+            var days = Habit.DaysOfWeekArray;
+            Sunday = days.Contains(0);
+            Monday = days.Contains(1);
+            Tuesday = days.Contains(2);
+            Wednesday = days.Contains(3);
+            Thursday = days.Contains(4);
+            Friday = days.Contains(5);
+            Saturday = days.Contains(6);
+        }
+    }
+
+    [RelayCommand]
+    private async Task AddCategoryAsync()
+    {
+        if (string.IsNullOrWhiteSpace(NewCategoryName)) return;
+        await categoryService.AddAsync(NewCategoryName.Trim());
+        var cats = await categoryService.GetAllAsync();
+        Categories = cats.Select(c => c.Name).ToList();
+        SelectedCategory = NewCategoryName.Trim();
+        NewCategoryName = string.Empty;
+    }
+
+    [RelayCommand]
+    private async Task SaveAsync()
+    {
+        if (string.IsNullOrWhiteSpace(Name))
+        {
+            await Shell.Current.DisplayAlert("Validation", "Habit name is required.", "OK");
+            return;
+        }
+
+        Habit.Name = Name.Trim();
+        Habit.Description = Description?.Trim();
+        Habit.Icon = Icon;
+        Habit.Category = SelectedCategory;
+        Habit.TargetGoal = Math.Max(1, TargetGoal);
+
+        var days = new List<int>();
+        if (Sunday) days.Add(0);
+        if (Monday) days.Add(1);
+        if (Tuesday) days.Add(2);
+        if (Wednesday) days.Add(3);
+        if (Thursday) days.Add(4);
+        if (Friday) days.Add(5);
+        if (Saturday) days.Add(6);
+        Habit.DaysOfWeekArray = days.Count > 0 ? days.ToArray() : [0, 1, 2, 3, 4, 5, 6];
+
+        await habitService.SaveAsync(Habit);
+        await Shell.Current.GoToAsync("..");
+    }
+
+    [RelayCommand]
+    private async Task DeleteAsync()
+    {
+        bool confirm = await Shell.Current.DisplayAlert(
+            "Delete Habit", "Are you sure you want to delete this habit?", "Delete", "Cancel");
+        if (!confirm) return;
+
+        await habitService.DeleteAsync(Habit.Id);
+        await Shell.Current.GoToAsync("..");
+    }
+
+    [RelayCommand]
+    private async Task CancelAsync()
+    {
+        await Shell.Current.GoToAsync("..");
+    }
+}
diff --git a/SarahsDailyApp/ViewModels/HabitsViewModel.cs b/SarahsDailyApp/ViewModels/HabitsViewModel.cs
new file mode 100644
index 0000000..81f44e5
--- /dev/null
+++ b/SarahsDailyApp/ViewModels/HabitsViewModel.cs
@@ -0,0 +1,83 @@
+using CommunityToolkit.Mvvm.ComponentModel;
+using CommunityToolkit.Mvvm.Input;
+using SarahsDailyApp.Models;
+using SarahsDailyApp.Services;
+using SarahsDailyApp.Views;
+
+namespace SarahsDailyApp.ViewModels;
+
+public partial class HabitsViewModel(
+    HabitService habitService,
+    UserStatsService userStatsService) : ObservableObject
+{
+    [ObservableProperty]
+    private List<HabitCardViewModel> _habits = [];
+
+    [RelayCommand]
+    public async Task LoadDataAsync()
+    {
+        var today = DateTime.Today;
+        int todayDow = (int)today.DayOfWeek;
+        var allHabits = await habitService.GetAllAsync();
+
+        var cards = new List<HabitCardViewModel>();
+        foreach (var habit in allHabits)
+        {
+            int completions = await habitService.GetCompletionsForDateAsync(habit.Id, today);
+            bool scheduled = habit.DaysOfWeekArray.Contains(todayDow);
+            bool complete = completions >= habit.TargetGoal;
+            double pct = habit.TargetGoal > 0 ? (double)completions / habit.TargetGoal * 100 : 0;
+
+            string buttonLabel;
+            bool canComplete;
+            if (!scheduled) { buttonLabel = "✗ Not Scheduled"; canComplete = false; }
+            else if (complete) { buttonLabel = "✓ Done for Today"; canComplete = false; }
+            else { buttonLabel = "+ Complete"; canComplete = true; }
+
+            cards.Add(new HabitCardViewModel
+            {
+                Habit = habit,
+                Completions = completions,
+                IsComplete = complete,
+                Percentage = pct,
+                ButtonLabel = buttonLabel,
+                CanComplete = canComplete
+            });
+        }
+
+        Habits = cards;
+    }
+
+    [RelayCommand]
+    private async Task CompleteHabitAsync(HabitCardViewModel card)
+    {
+        await habitService.CompleteHabitAsync(card.Habit, DateTime.Today);
+        await userStatsService.UpdateDailyStreakAsync();
+        await LoadDataAsync();
+    }
+
+    [RelayCommand]
+    private async Task AddHabitAsync()
+    {
+        await Shell.Current.GoToAsync(nameof(HabitDetailPage));
+    }
+
+    [RelayCommand]
+    private async Task EditHabitAsync(HabitCardViewModel card)
+    {
+        await Shell.Current.GoToAsync(nameof(HabitDetailPage),
+            new Dictionary<string, object> { ["Habit"] = card.Habit });
+    }
+}
+
+public class HabitCardViewModel
+{
+    public Habit Habit { get; set; } = new();
+    public int Completions { get; set; }
+    public bool IsComplete { get; set; }
+    public double Percentage { get; set; }
+    public string ButtonLabel { get; set; } = string.Empty;
+    public bool CanComplete { get; set; }
+    public string ProgressText => $"{Completions}/{Habit.TargetGoal} ({Percentage:F0}%)";
+    public string StatusText => IsComplete ? "✓ Complete!" : $"{Percentage:F0}% Complete";
+}
diff --git a/SarahsDailyApp/ViewModels/NoteDetailViewModel.cs b/SarahsDailyApp/ViewModels/NoteDetailViewModel.cs
new file mode 100644
index 0000000..ec1b22e
--- /dev/null
+++ b/SarahsDailyApp/ViewModels/NoteDetailViewModel.cs
@@ -0,0 +1,66 @@
+using CommunityToolkit.Mvvm.ComponentModel;
+using CommunityToolkit.Mvvm.Input;
+using SarahsDailyApp.Models;
+using SarahsDailyApp.Services;
+
+namespace SarahsDailyApp.ViewModels;
+
+[QueryProperty(nameof(Note), "Note")]
+public partial class NoteDetailViewModel(NoteService noteService) : ObservableObject
+{
+    [ObservableProperty]
+    private Note _note = new();
+
+    [ObservableProperty]
+    private bool _isEditing;
+
+    [ObservableProperty]
+    private string _title = string.Empty;
+
+    [ObservableProperty]
+    private string _content = string.Empty;
+
+    [RelayCommand]
+    public async Task LoadDataAsync()
+    {
+        await System.Threading.Tasks.Task.CompletedTask;
+        if (Note is not null && !string.IsNullOrEmpty(Note.Id) && (Note.Title != string.Empty || Note.Content != string.Empty))
+        {
+            // Check if it's actually a saved note (has content or was explicitly passed)
+            var existing = await noteService.GetByIdAsync(Note.Id);
+            if (existing is not null)
+            {
+                IsEditing = true;
+                Title = Note.Title;
+                Content = Note.Content;
+            }
+        }
+    }
+
+    [RelayCommand]
+    private async Task SaveAsync()
+    {
+        Note.Title = string.IsNullOrWhiteSpace(Title) ? string.Empty : Title.Trim();
+        Note.Content = Content?.Trim() ?? string.Empty;
+
+        await noteService.SaveAsync(Note);
+        await Shell.Current.GoToAsync("..");
+    }
+
+    [RelayCommand]
+    private async Task DeleteAsync()
+    {
+        bool confirm = await Shell.Current.DisplayAlert(
+            "Delete Note", "Are you sure?", "Delete", "Cancel");
+        if (!confirm) return;
+
+        await noteService.DeleteAsync(Note.Id);
+        await Shell.Current.GoToAsync("..");
+    }
+
+    [RelayCommand]
+    private async Task CancelAsync()
+    {
+        await Shell.Current.GoToAsync("..");
+    }
+}
diff --git a/SarahsDailyApp/ViewModels/NotesViewModel.cs b/SarahsDailyApp/ViewModels/NotesViewModel.cs
new file mode 100644
index 0000000..21a2c74
--- /dev/null
+++ b/SarahsDailyApp/ViewModels/NotesViewModel.cs
@@ -0,0 +1,32 @@
+using CommunityToolkit.Mvvm.ComponentModel;
+using CommunityToolkit.Mvvm.Input;
+using SarahsDailyApp.Models;
+using SarahsDailyApp.Services;
+using SarahsDailyApp.Views;
+
+namespace SarahsDailyApp.ViewModels;
+
+public partial class NotesViewModel(NoteService noteService) : ObservableObject
+{
+    [ObservableProperty]
+    private List<Note> _notes = [];
+
+    [RelayCommand]
+    public async Task LoadDataAsync()
+    {
+        Notes = await noteService.GetAllAsync();
+    }
+
+    [RelayCommand]
+    private async Task AddNoteAsync()
+    {
+        await Shell.Current.GoToAsync(nameof(NoteDetailPage));
+    }
+
+    [RelayCommand]
+    private async Task EditNoteAsync(Note note)
+    {
+        await Shell.Current.GoToAsync(nameof(NoteDetailPage),
+            new Dictionary<string, object> { ["Note"] = note });
+    }
+}
diff --git a/SarahsDailyApp/ViewModels/ProjectDetailViewModel.cs b/SarahsDailyApp/ViewModels/ProjectDetailViewModel.cs
new file mode 100644
index 0000000..73bab96
--- /dev/null
+++ b/SarahsDailyApp/ViewModels/ProjectDetailViewModel.cs
@@ -0,0 +1,75 @@
+using CommunityToolkit.Mvvm.ComponentModel;
+using CommunityToolkit.Mvvm.Input;
+using SarahsDailyApp.Models;
+using SarahsDailyApp.Services;
+
+namespace SarahsDailyApp.ViewModels;
+
+[QueryProperty(nameof(Project), "Project")]
+public partial class ProjectDetailViewModel(
+    ProjectService projectService) : ObservableObject
+{
+    [ObservableProperty]
+    private Project _project = new();
+
+    [ObservableProperty]
+    private bool _isEditing;
+
+    [ObservableProperty]
+    private string _name = string.Empty;
+
+    [ObservableProperty]
+    private string? _description;
+
+    [ObservableProperty]
+    private string _color = "#3b82f6";
+
+    [RelayCommand]
+    public async Task LoadDataAsync()
+    {
+        await System.Threading.Tasks.Task.CompletedTask;
+        if (Project is not null && !string.IsNullOrEmpty(Project.Name))
+        {
+            IsEditing = true;
+            Name = Project.Name;
+            Description = Project.Description;
+            Color = Project.Color;
+        }
+    }
+
+    [RelayCommand]
+    private async Task SaveAsync()
+    {
+        if (string.IsNullOrWhiteSpace(Name))
+        {
+            await Shell.Current.DisplayAlert("Validation", "Project name is required.", "OK");
+            return;
+        }
+
+        Project.Name = Name.Trim();
+        Project.Description = Description?.Trim();
+        Project.Color = Color;
+
+        await projectService.SaveAsync(Project);
+        await Shell.Current.GoToAsync("..");
+    }
+
+    [RelayCommand]
+    private async Task DeleteAsync()
+    {
+        bool confirm = await Shell.Current.DisplayAlert(
+            "Delete Project",
+            "Are you sure? This will not delete the tasks in it.",
+            "Delete", "Cancel");
+        if (!confirm) return;
+
+        await projectService.DeleteAsync(Project.Id);
+        await Shell.Current.GoToAsync("..");
+    }
+
+    [RelayCommand]
+    private async Task CancelAsync()
+    {
+        await Shell.Current.GoToAsync("..");
+    }
+}
diff --git a/SarahsDailyApp/ViewModels/ProjectsViewModel.cs b/SarahsDailyApp/ViewModels/ProjectsViewModel.cs
new file mode 100644
index 0000000..c400653
--- /dev/null
+++ b/SarahsDailyApp/ViewModels/ProjectsViewModel.cs
@@ -0,0 +1,58 @@
+using CommunityToolkit.Mvvm.ComponentModel;
+using CommunityToolkit.Mvvm.Input;
+using SarahsDailyApp.Models;
+using SarahsDailyApp.Services;
+using SarahsDailyApp.Views;
+
+namespace SarahsDailyApp.ViewModels;
+
+public partial class ProjectsViewModel(
+    ProjectService projectService,
+    TaskService taskService) : ObservableObject
+{
+    [ObservableProperty]
+    private List<ProjectViewModel> _projects = [];
+
+    [RelayCommand]
+    public async Task LoadDataAsync()
+    {
+        var projects = await projectService.GetAllAsync();
+        var allTasks = await taskService.GetAllAsync();
+
+        Projects = projects.Select(p =>
+        {
+            var tasks = allTasks.Where(t => t.ProjectId == p.Id).ToList();
+            int completed = tasks.Count(t => t.Completed);
+            double pct = tasks.Count > 0 ? (double)completed / tasks.Count * 100 : 0;
+            return new ProjectViewModel
+            {
+                Project = p,
+                TotalTasks = tasks.Count,
+                CompletedTasks = completed,
+                Percentage = pct
+            };
+        }).ToList();
+    }
+
+    [RelayCommand]
+    private async Task AddProjectAsync()
+    {
+        await Shell.Current.GoToAsync(nameof(ProjectDetailPage));
+    }
+
+    [RelayCommand]
+    private async Task EditProjectAsync(ProjectViewModel pvm)
+    {
+        await Shell.Current.GoToAsync(nameof(ProjectDetailPage),
+            new Dictionary<string, object> { ["Project"] = pvm.Project });
+    }
+}
+
+public class ProjectViewModel
+{
+    public Project Project { get; set; } = new();
+    public int TotalTasks { get; set; }
+    public int CompletedTasks { get; set; }
+    public double Percentage { get; set; }
+    public string ProgressText => $"{CompletedTasks}/{TotalTasks} tasks ({Percentage:F0}%)";
+}
diff --git a/SarahsDailyApp/ViewModels/SettingsViewModel.cs b/SarahsDailyApp/ViewModels/SettingsViewModel.cs
new file mode 100644
index 0000000..767f591
--- /dev/null
+++ b/SarahsDailyApp/ViewModels/SettingsViewModel.cs
@@ -0,0 +1,168 @@
+using CommunityToolkit.Mvvm.ComponentModel;
+using CommunityToolkit.Mvvm.Input;
+using SarahsDailyApp.Models;
+using SarahsDailyApp.Services;
+
+namespace SarahsDailyApp.ViewModels;
+
+public partial class SettingsViewModel(
+    UserStatsService userStatsService,
+    CategoryService categoryService,
+    ExportImportService exportImportService,
+    TaskService taskService) : ObservableObject
+{
+    [ObservableProperty]
+    private int _tasksPerLevel = 30;
+
+    [ObservableProperty]
+    private int _currentLevel;
+
+    [ObservableProperty]
+    private int _totalCompleted;
+
+    [ObservableProperty]
+    private int _tasksToNextLevel;
+
+    [ObservableProperty]
+    private List<Category> _categories = [];
+
+    [ObservableProperty]
+    private string _newCategoryName = string.Empty;
+
+    [RelayCommand]
+    public async Task LoadDataAsync()
+    {
+        var settings = await userStatsService.GetSettingsAsync();
+        var stats = await userStatsService.GetAsync();
+
+        TasksPerLevel = settings.TasksPerLevel;
+        CurrentLevel = stats.Level;
+        TotalCompleted = await taskService.GetCompletedCountAsync();
+        TasksToNextLevel = TasksPerLevel - (TotalCompleted % TasksPerLevel);
+
+        Categories = await categoryService.GetAllAsync();
+    }
+
+    [RelayCommand]
+    private async Task SaveLevelSettingsAsync()
+    {
+        var settings = await userStatsService.GetSettingsAsync();
+        settings.TasksPerLevel = Math.Clamp(TasksPerLevel, 1, 100);
+        await userStatsService.SaveSettingsAsync(settings);
+        await LoadDataAsync();
+        await Shell.Current.DisplayAlert("Saved", $"Level settings saved. You are Level {CurrentLevel}.", "OK");
+    }
+
+    [RelayCommand]
+    private async Task AddCategoryAsync()
+    {
+        if (string.IsNullOrWhiteSpace(NewCategoryName)) return;
+        await categoryService.AddAsync(NewCategoryName.Trim());
+        NewCategoryName = string.Empty;
+        Categories = await categoryService.GetAllAsync();
+    }
+
+    [RelayCommand]
+    private async Task RenameCategoryAsync(Category category)
+    {
+        string? newName = await Shell.Current.DisplayPromptAsync(
+            "Rename Category", "New name:", initialValue: category.Name);
+        if (string.IsNullOrWhiteSpace(newName)) return;
+
+        await categoryService.RenameAsync(category.Id, newName.Trim());
+        Categories = await categoryService.GetAllAsync();
+    }
+
+    [RelayCommand]
+    private async Task DeleteCategoryAsync(Category category)
+    {
+        bool confirm = await Shell.Current.DisplayAlert(
+            "Delete Category",
+            $"Delete \"{category.Name}\"? Items using this category will be cleared.",
+            "Delete", "Cancel");
+        if (!confirm) return;
+
+        await categoryService.DeleteAsync(category.Id);
+        Categories = await categoryService.GetAllAsync();
+    }
+
+    [RelayCommand]
+    private async Task ExportDataAsync()
+    {
+        try
+        {
+            var json = await exportImportService.ExportToJsonAsync();
+            var fileName = $"task-manager-backup-{DateTime.Today:yyyy-MM-dd}.json";
+            var filePath = Path.Combine(FileSystem.CacheDirectory, fileName);
+            await File.WriteAllTextAsync(filePath, json);
+
+            await Share.RequestAsync(new ShareFileRequest
+            {
+                Title = "Export Data",
+                File = new ShareFile(filePath)
+            });
+        }
+        catch (Exception ex)
+        {
+            await Shell.Current.DisplayAlert("Error", $"Export failed: {ex.Message}", "OK");
+        }
+    }
+
+    [RelayCommand]
+    private async Task ImportDataAsync()
+    {
+        try
+        {
+            var result = await FilePicker.PickAsync(new PickOptions
+            {
+                PickerTitle = "Select backup JSON file",
+                FileTypes = new FilePickerFileType(new Dictionary<DevicePlatform, IEnumerable<string>>
+                {
+                    { DevicePlatform.WinUI, [".json"] },
+                    { DevicePlatform.Android, ["application/json"] },
+                    { DevicePlatform.iOS, ["public.json"] },
+                    { DevicePlatform.macOS, ["public.json"] }
+                })
+            });
+
+            if (result is null) return;
+
+            var json = await File.ReadAllTextAsync(result.FullPath);
+            bool confirm = await Shell.Current.DisplayAlert(
+                "Import Data",
+                "This will replace all existing data. Continue?",
+                "Import", "Cancel");
+            if (!confirm) return;
+
+            var success = await exportImportService.ImportFromJsonAsync(json);
+            if (success)
+            {
+                await Shell.Current.DisplayAlert("Success", "Data imported successfully.", "OK");
+                await LoadDataAsync();
+            }
+            else
+            {
+                await Shell.Current.DisplayAlert("Error", "Invalid backup file format.", "OK");
+            }
+        }
+        catch (Exception ex)
+        {
+            await Shell.Current.DisplayAlert("Error", $"Import failed: {ex.Message}", "OK");
+        }
+    }
+
+    [RelayCommand]
+    private async Task ClearAllDataAsync()
+    {
+        bool confirm = await Shell.Current.DisplayAlert(
+            "Clear All Data",
+            "This will permanently delete all your data. Are you sure?",
+            "Clear Everything", "Cancel");
+        if (!confirm) return;
+
+        var json = "{}";
+        await exportImportService.ImportFromJsonAsync(json);
+        await Shell.Current.DisplayAlert("Cleared", "All data has been cleared.", "OK");
+        await LoadDataAsync();
+    }
+}
diff --git a/SarahsDailyApp/ViewModels/ShoppingItemDetailViewModel.cs b/SarahsDailyApp/ViewModels/ShoppingItemDetailViewModel.cs
new file mode 100644
index 0000000..388a3ef
--- /dev/null
+++ b/SarahsDailyApp/ViewModels/ShoppingItemDetailViewModel.cs
@@ -0,0 +1,67 @@
+using CommunityToolkit.Mvvm.ComponentModel;
+using CommunityToolkit.Mvvm.Input;
+using SarahsDailyApp.Models;
+using SarahsDailyApp.Services;
+
+namespace SarahsDailyApp.ViewModels;
+
+[QueryProperty(nameof(Item), "Item")]
+public partial class ShoppingItemDetailViewModel(ShoppingService shoppingService) : ObservableObject
+{
+    [ObservableProperty]
+    private ShoppingItem _item = new();
+
+    [ObservableProperty]
+    private bool _isEditing;
+
+    [ObservableProperty]
+    private string _name = string.Empty;
+
+    [ObservableProperty]
+    private string? _quantity;
+
+    [RelayCommand]
+    public async Task LoadDataAsync()
+    {
+        await System.Threading.Tasks.Task.CompletedTask;
+        if (Item is not null && !string.IsNullOrEmpty(Item.Name))
+        {
+            IsEditing = true;
+            Name = Item.Name;
+            Quantity = Item.Quantity;
+        }
+    }
+
+    [RelayCommand]
+    private async Task SaveAsync()
+    {
+        if (string.IsNullOrWhiteSpace(Name))
+        {
+            await Shell.Current.DisplayAlert("Validation", "Item name is required.", "OK");
+            return;
+        }
+
+        Item.Name = Name.Trim();
+        Item.Quantity = string.IsNullOrWhiteSpace(Quantity) ? null : Quantity.Trim();
+
+        await shoppingService.SaveAsync(Item);
+        await Shell.Current.GoToAsync("..");
+    }
+
+    [RelayCommand]
+    private async Task DeleteAsync()
+    {
+        bool confirm = await Shell.Current.DisplayAlert(
+            "Delete", "Are you sure?", "Delete", "Cancel");
+        if (!confirm) return;
+
+        await shoppingService.DeleteAsync(Item.Id);
+        await Shell.Current.GoToAsync("..");
+    }
+
+    [RelayCommand]
+    private async Task CancelAsync()
+    {
+        await Shell.Current.GoToAsync("..");
+    }
+}
diff --git a/SarahsDailyApp/ViewModels/ShoppingListViewModel.cs b/SarahsDailyApp/ViewModels/ShoppingListViewModel.cs
new file mode 100644
index 0000000..6c9860f
--- /dev/null
+++ b/SarahsDailyApp/ViewModels/ShoppingListViewModel.cs
@@ -0,0 +1,50 @@
+using CommunityToolkit.Mvvm.ComponentModel;
+using CommunityToolkit.Mvvm.Input;
+using SarahsDailyApp.Models;
+using SarahsDailyApp.Services;
+using SarahsDailyApp.Views;
+
+namespace SarahsDailyApp.ViewModels;
+
+public partial class ShoppingListViewModel(ShoppingService shoppingService) : ObservableObject
+{
+    [ObservableProperty]
+    private List<ShoppingItem> _items = [];
+
+    [RelayCommand]
+    public async Task LoadDataAsync()
+    {
+        Items = await shoppingService.GetAllAsync();
+    }
+
+    [RelayCommand]
+    private async Task ToggleItemAsync(ShoppingItem item)
+    {
+        await shoppingService.ToggleCompletionAsync(item);
+        await LoadDataAsync();
+    }
+
+    [RelayCommand]
+    private async Task AddItemAsync()
+    {
+        await Shell.Current.GoToAsync(nameof(ShoppingItemDetailPage));
+    }
+
+    [RelayCommand]
+    private async Task EditItemAsync(ShoppingItem item)
+    {
+        await Shell.Current.GoToAsync(nameof(ShoppingItemDetailPage),
+            new Dictionary<string, object> { ["Item"] = item });
+    }
+
+    [RelayCommand]
+    private async Task ClearCheckedAsync()
+    {
+        bool confirm = await Shell.Current.DisplayAlert(
+            "Clear Checked", "Remove all checked items?", "Clear", "Cancel");
+        if (!confirm) return;
+
+        await shoppingService.ClearCheckedAsync();
+        await LoadDataAsync();
+    }
+}
diff --git a/SarahsDailyApp/ViewModels/TaskDetailViewModel.cs b/SarahsDailyApp/ViewModels/TaskDetailViewModel.cs
new file mode 100644
index 0000000..7c7c68c
--- /dev/null
+++ b/SarahsDailyApp/ViewModels/TaskDetailViewModel.cs
@@ -0,0 +1,172 @@
+using CommunityToolkit.Mvvm.ComponentModel;
+using CommunityToolkit.Mvvm.Input;
+using SarahsDailyApp.Models;
+using SarahsDailyApp.Services;
+
+namespace SarahsDailyApp.ViewModels;
+
+[QueryProperty(nameof(Task), "Task")]
+public partial class TaskDetailViewModel(
+    TaskService taskService,
+    ProjectService projectService) : ObservableObject
+{
+    [ObservableProperty]
+    private TaskItem _task = new();
+
+    [ObservableProperty]
+    private bool _isEditing;
+
+    [ObservableProperty]
+    private string _title = string.Empty;
+
+    [ObservableProperty]
+    private string? _description;
+
+    [ObservableProperty]
+    private DateTime? _dueDate;
+
+    [ObservableProperty]
+    private RepeatType _repeatType = RepeatType.None;
+
+    [ObservableProperty]
+    private int _repeatUnit = 1;
+
+    [ObservableProperty]
+    private int _customRepeatDays = 1;
+
+    [ObservableProperty]
+    private int _movableRepeatDays = 1;
+
+    [ObservableProperty]
+    private string? _selectedProjectId;
+
+    [ObservableProperty]
+    private List<Project> _projects = [];
+
+    [ObservableProperty]
+    private bool _sunday, _monday, _tuesday, _wednesday, _thursday, _friday, _saturday;
+
+    [ObservableProperty]
+    private bool _showRepeatUnit;
+
+    [ObservableProperty]
+    private bool _showDaysOfWeek;
+
+    [ObservableProperty]
+    private bool _showCustomDays;
+
+    [ObservableProperty]
+    private bool _showMovableDays;
+
+    [ObservableProperty]
+    private string _repeatUnitLabel = "day(s)";
+
+    public string[] RepeatTypeOptions { get; } =
+        ["None", "Daily", "Weekly", "Monthly", "Yearly", "Custom", "Movable"];
+
+    [RelayCommand]
+    public async Task LoadDataAsync()
+    {
+        Projects = await projectService.GetAllAsync();
+
+        if (Task is not null && !string.IsNullOrEmpty(Task.Title))
+        {
+            IsEditing = true;
+            Title = Task.Title;
+            Description = Task.Description;
+            DueDate = Task.DueDate;
+            RepeatType = Task.RepeatType;
+            RepeatUnit = Task.RepeatUnit;
+            CustomRepeatDays = Task.CustomRepeatDays ?? 1;
+            MovableRepeatDays = Task.MovableRepeatDays ?? 1;
+            SelectedProjectId = Task.ProjectId;
+
+            var days = Task.DaysOfWeekArray ?? [];
+            Sunday = days.Contains(0);
+            Monday = days.Contains(1);
+            Tuesday = days.Contains(2);
+            Wednesday = days.Contains(3);
+            Thursday = days.Contains(4);
+            Friday = days.Contains(5);
+            Saturday = days.Contains(6);
+        }
+
+        UpdateRepeatVisibility();
+    }
+
+    partial void OnRepeatTypeChanged(RepeatType value) => UpdateRepeatVisibility();
+
+    private void UpdateRepeatVisibility()
+    {
+        ShowRepeatUnit = RepeatType is RepeatType.Daily or RepeatType.Weekly
+            or RepeatType.Monthly or RepeatType.Yearly;
+        ShowDaysOfWeek = RepeatType is RepeatType.Daily or RepeatType.Weekly;
+        ShowCustomDays = RepeatType == RepeatType.Custom;
+        ShowMovableDays = RepeatType == RepeatType.Movable;
+
+        RepeatUnitLabel = RepeatType switch
+        {
+            RepeatType.Daily => "day(s)",
+            RepeatType.Weekly => "week(s)",
+            RepeatType.Monthly => "month(s)",
+            RepeatType.Yearly => "year(s)",
+            _ => "day(s)"
+        };
+    }
+
+    [RelayCommand]
+    private async Task SaveAsync()
+    {
+        if (string.IsNullOrWhiteSpace(Title))
+        {
+            await Shell.Current.DisplayAlert("Validation", "Title is required.", "OK");
+            return;
+        }
+
+        Task.Title = Title.Trim();
+        Task.Description = Description?.Trim();
+        Task.DueDate = DueDate;
+        Task.RepeatType = RepeatType;
+        Task.RepeatUnit = RepeatUnit;
+        Task.CustomRepeatDays = RepeatType == RepeatType.Custom ? CustomRepeatDays : null;
+        Task.MovableRepeatDays = RepeatType == RepeatType.Movable ? MovableRepeatDays : null;
+        Task.ProjectId = SelectedProjectId;
+
+        if (ShowDaysOfWeek)
+        {
+            var days = new List<int>();
+            if (Sunday) days.Add(0);
+            if (Monday) days.Add(1);
+            if (Tuesday) days.Add(2);
+            if (Wednesday) days.Add(3);
+            if (Thursday) days.Add(4);
+            if (Friday) days.Add(5);
+            if (Saturday) days.Add(6);
+            Task.DaysOfWeekArray = days.Count > 0 ? days.ToArray() : null;
+        }
+        else
+        {
+            Task.DaysOfWeekArray = null;
+        }
+
+        await taskService.SaveAsync(Task);
+        await Shell.Current.GoToAsync("..");
+    }
+
+    [RelayCommand]
+    private async Task DeleteAsync()
+    {
+        bool confirm = await Shell.Current.DisplayAlert(
+            "Delete Task", "Are you sure you want to delete this task?", "Delete", "Cancel");
+        if (!confirm) return;
+
+        await taskService.DeleteAsync(Task.Id);
+        await Shell.Current.GoToAsync("..");
+    }
+
+    [RelayCommand]
+    private async Task CancelAsync()
+    {
+        await Shell.Current.GoToAsync("..");
+    }
+}
diff --git a/SarahsDailyApp/ViewModels/TasksViewModel.cs b/SarahsDailyApp/ViewModels/TasksViewModel.cs
new file mode 100644
index 0000000..712ab2b
--- /dev/null
+++ b/SarahsDailyApp/ViewModels/TasksViewModel.cs
@@ -0,0 +1,145 @@
+using CommunityToolkit.Mvvm.ComponentModel;
+using CommunityToolkit.Mvvm.Input;
+using SarahsDailyApp.Models;
+using SarahsDailyApp.Services;
+using SarahsDailyApp.Views;
+
+namespace SarahsDailyApp.ViewModels;
+
+public partial class TasksViewModel(
+    TaskService taskService,
+    UserStatsService userStatsService) : ObservableObject
+{
+    [ObservableProperty]
+    private List<TaskGroup> _taskGroups = [];
+
+    [ObservableProperty]
+    private string _searchText = string.Empty;
+
+    [ObservableProperty]
+    private string _selectedStatusFilter = "All";
+
+    [ObservableProperty]
+    private bool _hideCompleted;
+
+    public string[] StatusFilterOptions { get; } = ["All", "Pending", "Completed", "Overdue"];
+
+    [RelayCommand]
+    public async Task LoadDataAsync()
+    {
+        var today = DateTime.Today;
+        var allTasks = await taskService.GetAllAsync();
+
+        // Apply filters
+        var filtered = ApplyFilters(allTasks, today);
+
+        bool hasActiveFilters = SelectedStatusFilter != "All"
+            || !string.IsNullOrWhiteSpace(SearchText)
+            || HideCompleted;
+
+        if (hasActiveFilters)
+        {
+            TaskGroups = [new TaskGroup("Results", filtered)];
+        }
+        else
+        {
+            var groups = new List<TaskGroup>();
+
+            var overdue = filtered
+                .Where(t => !t.Completed && t.DueDate?.Date < today)
+                .OrderBy(t => t.DueDate).ThenBy(t => t.Title).ToList();
+            if (overdue.Count > 0) groups.Add(new TaskGroup("Overdue", overdue));
+
+            var dueToday = filtered
+                .Where(t => t.DueDate?.Date == today)
+                .OrderBy(t => t.Title).ToList();
+            if (dueToday.Count > 0) groups.Add(new TaskGroup("Due Today", dueToday));
+
+            var upcoming = filtered
+                .Where(t => !t.Completed && t.DueDate?.Date > today && t.RepeatType != RepeatType.Daily)
+                .OrderBy(t => t.DueDate).ThenBy(t => t.Title).ToList();
+            if (upcoming.Count > 0) groups.Add(new TaskGroup("Upcoming", upcoming));
+
+            var noDueDate = filtered
+                .Where(t => t.DueDate is null)
+                .OrderBy(t => t.Title).ToList();
+            if (noDueDate.Count > 0) groups.Add(new TaskGroup("No Due Date", noDueDate));
+
+            TaskGroups = groups;
+        }
+    }
+
+    private List<TaskItem> ApplyFilters(List<TaskItem> tasks, DateTime today)
+    {
+        var result = tasks.AsEnumerable();
+
+        if (HideCompleted)
+            result = result.Where(t => !t.Completed);
+
+        result = SelectedStatusFilter switch
+        {
+            "Pending" => result.Where(t => !t.Completed),
+            "Completed" => result.Where(t => t.Completed),
+            "Overdue" => result.Where(t => !t.Completed && t.DueDate?.Date < today),
+            _ => result
+        };
+
+        if (!string.IsNullOrWhiteSpace(SearchText))
+        {
+            var search = SearchText.Trim();
+            result = result.Where(t =>
+                t.Title.Contains(search, StringComparison.OrdinalIgnoreCase) ||
+                (t.Description?.Contains(search, StringComparison.OrdinalIgnoreCase) ?? false));
+        }
+
+        return result.ToList();
+    }
+
+    [RelayCommand]
+    private async Task ToggleTaskCompletionAsync(TaskItem task)
+    {
+        await taskService.ToggleCompletionAsync(task, DateTime.Today);
+        if (task.Completed)
+        {
+            await userStatsService.UpdateDailyStreakAsync();
+            await userStatsService.RecalculateLevelAsync();
+        }
+        else
+        {
+            await userStatsService.RecalculateLevelAsync();
+        }
+        await LoadDataAsync();
+    }
+
+    [RelayCommand]
+    private async Task AddTaskAsync()
+    {
+        await Shell.Current.GoToAsync(nameof(TaskDetailPage));
+    }
+
+    [RelayCommand]
+    private async Task EditTaskAsync(TaskItem task)
+    {
+        await Shell.Current.GoToAsync(nameof(TaskDetailPage),
+            new Dictionary<string, object> { ["Task"] = task });
+    }
+
+    [RelayCommand]
+    private async Task ResetFiltersAsync()
+    {
+        SearchText = string.Empty;
+        SelectedStatusFilter = "All";
+        HideCompleted = false;
+        await LoadDataAsync();
+    }
+
+    partial void OnSearchTextChanged(string value) => LoadDataCommand.Execute(null);
+    partial void OnSelectedStatusFilterChanged(string value) => LoadDataCommand.Execute(null);
+    partial void OnHideCompletedChanged(bool value) => LoadDataCommand.Execute(null);
+}
+
+public class TaskGroup(string name, List<TaskItem> tasks)
+{
+    public string Name { get; } = name;
+    public List<TaskItem> Tasks { get; } = tasks;
+}
diff --git a/SarahsDailyApp/ViewModels/WishItemDetailViewModel.cs b/SarahsDailyApp/ViewModels/WishItemDetailViewModel.cs
new file mode 100644
index 0000000..2afc7aa
--- /dev/null
+++ b/SarahsDailyApp/ViewModels/WishItemDetailViewModel.cs
@@ -0,0 +1,89 @@
+using CommunityToolkit.Mvvm.ComponentModel;
+using CommunityToolkit.Mvvm.Input;
+using SarahsDailyApp.Models;
+using SarahsDailyApp.Services;
+
+namespace SarahsDailyApp.ViewModels;
+
+[QueryProperty(nameof(Item), "Item")]
+[QueryProperty(nameof(ListId), "ListId")]
+public partial class WishItemDetailViewModel(WishListService wishListService) : ObservableObject
+{
+    [ObservableProperty]
+    private WishItem _item = new();
+
+    [ObservableProperty]
+    private string? _listId;
+
+    [ObservableProperty]
+    private bool _isEditing;
+
+    [ObservableProperty]
+    private string _title = string.Empty;
+
+    [ObservableProperty]
+    private string? _url;
+
+    [ObservableProperty]
+    private decimal? _price;
+
+    [ObservableProperty]
+    private string? _selectedListId;
+
+    [ObservableProperty]
+    private List<WishList> _lists = [];
+
+    [RelayCommand]
+    public async Task LoadDataAsync()
+    {
+        Lists = await wishListService.GetAllListsAsync();
+
+        if (Item is not null && !string.IsNullOrEmpty(Item.Title))
+        {
+            IsEditing = true;
+            Title = Item.Title;
+            Url = Item.Url;
+            Price = Item.Price;
+            SelectedListId = Item.ListId;
+        }
+        else if (!string.IsNullOrEmpty(ListId))
+        {
+            SelectedListId = ListId;
+        }
+    }
+
+    [RelayCommand]
+    private async Task SaveAsync()
+    {
+        if (string.IsNullOrWhiteSpace(Title))
+        {
+            await Shell.Current.DisplayAlert("Validation", "Title is required.", "OK");
+            return;
+        }
+
+        Item.Title = Title.Trim();
+        Item.Url = string.IsNullOrWhiteSpace(Url) ? null : Url.Trim();
+        Item.Price = Price;
+        Item.ListId = SelectedListId;
+
+        await wishListService.SaveItemAsync(Item);
+        await Shell.Current.GoToAsync("..");
+    }
+
+    [RelayCommand]
+    private async Task DeleteAsync()
+    {
+        bool confirm = await Shell.Current.DisplayAlert(
+            "Delete", "Are you sure?", "Delete", "Cancel");
+        if (!confirm) return;
+
+        await wishListService.DeleteItemAsync(Item.Id);
+        await Shell.Current.GoToAsync("..");
+    }
+
+    [RelayCommand]
+    private async Task CancelAsync()
+    {
+        await Shell.Current.GoToAsync("..");
+    }
+}
diff --git a/SarahsDailyApp/ViewModels/WishListViewModel.cs b/SarahsDailyApp/ViewModels/WishListViewModel.cs
new file mode 100644
index 0000000..be85376
--- /dev/null
+++ b/SarahsDailyApp/ViewModels/WishListViewModel.cs
@@ -0,0 +1,123 @@
+using CommunityToolkit.Mvvm.ComponentModel;
+using CommunityToolkit.Mvvm.Input;
+using SarahsDailyApp.Models;
+using SarahsDailyApp.Services;
+using SarahsDailyApp.Views;
+
+namespace SarahsDailyApp.ViewModels;
+
+public partial class WishListViewModel(WishListService wishListService) : ObservableObject
+{
+    [ObservableProperty]
+    private List<WishListGroupViewModel> _groups = [];
+
+    [RelayCommand]
+    public async Task LoadDataAsync()
+    {
+        var lists = await wishListService.GetAllListsAsync();
+        var allItems = await wishListService.GetAllItemsAsync();
+
+        var groups = new List<WishListGroupViewModel>();
+
+        foreach (var list in lists)
+        {
+            var items = allItems.Where(i => i.ListId == list.Id).OrderBy(i => i.Order).ToList();
+            int remaining = items.Count(i => !i.Completed);
+            groups.Add(new WishListGroupViewModel
+            {
+                List = list,
+                Name = list.Name,
+                Items = items,
+                Remaining = remaining,
+                IsExpanded = true
+            });
+        }
+
+        var uncategorized = allItems.Where(i => i.ListId is null).OrderBy(i => i.Order).ToList();
+        if (uncategorized.Count > 0 || lists.Count == 0)
+        {
+            groups.Add(new WishListGroupViewModel
+            {
+                Name = "Uncategorized",
+                Items = uncategorized,
+                Remaining = uncategorized.Count(i => !i.Completed),
+                IsExpanded = true
+            });
+        }
+
+        Groups = groups;
+    }
+
+    [RelayCommand]
+    private async Task AddListAsync()
+    {
+        string? name = await Shell.Current.DisplayPromptAsync("New List", "List name:");
+        if (string.IsNullOrWhiteSpace(name)) return;
+
+        await wishListService.SaveListAsync(new WishList { Name = name.Trim() });
+        await LoadDataAsync();
+    }
+
+    [RelayCommand]
+    private async Task AddItemAsync(WishListGroupViewModel group)
+    {
+        var parameters = new Dictionary<string, object>();
+        if (group.List is not null)
+            parameters["ListId"] = group.List.Id;
+        await Shell.Current.GoToAsync(nameof(WishItemDetailPage), parameters);
+    }
+
+    [RelayCommand]
+    private async Task EditItemAsync(WishItem item)
+    {
+        await Shell.Current.GoToAsync(nameof(WishItemDetailPage),
+            new Dictionary<string, object> { ["Item"] = item });
+    }
+
+    [RelayCommand]
+    private async Task ToggleItemAsync(WishItem item)
+    {
+        await wishListService.ToggleItemCompletionAsync(item);
+        await LoadDataAsync();
+    }
+
+    [RelayCommand]
+    private async Task EditListAsync(WishListGroupViewModel group)
+    {
+        if (group.List is null) return;
+        string? name = await Shell.Current.DisplayPromptAsync(
+            "Edit List", "List name:", initialValue: group.List.Name);
+        if (string.IsNullOrWhiteSpace(name)) return;
+
+        group.List.Name = name.Trim();
+        await wishListService.SaveListAsync(group.List);
+        await LoadDataAsync();
+    }
+
+    [RelayCommand]
+    private async Task DeleteListAsync(WishListGroupViewModel group)
+    {
+        if (group.List is null) return;
+        bool confirm = await Shell.Current.DisplayAlert(
+            "Delete List",
+            "Items in this list will become uncategorized.",
+            "Delete", "Cancel");
+        if (!confirm) return;
+
+        await wishListService.DeleteListAsync(group.List.Id);
+        await LoadDataAsync();
+    }
+}
+
+public partial class WishListGroupViewModel : ObservableObject
+{
+    public WishList? List { get; set; }
+    public string Name { get; set; } = string.Empty;
+    public List<WishItem> Items { get; set; } = [];
+    public int Remaining { get; set; }
+
+    [ObservableProperty]
+    private bool _isExpanded = true;
+
+    public string RemainingText => $"{Remaining} remaining";
+}
diff --git a/SarahsDailyApp/Views/DashboardPage.xaml b/SarahsDailyApp/Views/DashboardPage.xaml
new file mode 100644
index 0000000..4e19321
--- /dev/null
+++ b/SarahsDailyApp/Views/DashboardPage.xaml
@@ -0,0 +1,132 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<ContentPage xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
+             xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
+             xmlns:vm="clr-namespace:SarahsDailyApp.ViewModels"
+             x:Class="SarahsDailyApp.Views.DashboardPage"
+             x:DataType="vm:DashboardViewModel"
+             Title="📋 Dashboard">
+
+    <ScrollView>
+        <VerticalStackLayout Spacing="16" Padding="16">
+
+            <!-- Level & Streak -->
+            <Grid ColumnDefinitions="*,*" ColumnSpacing="12">
+                <Frame BackgroundColor="{AppThemeBinding Light=#e8f5e9, Dark=#1b5e20}"
+                       Padding="16" CornerRadius="12" BorderColor="Transparent">
+                    <VerticalStackLayout Spacing="4">
+                        <Label Text="{Binding Level, StringFormat='Level {0}'}"
+                               FontSize="24" FontAttributes="Bold" HorizontalTextAlignment="Center"/>
+                        <Label Text="{Binding LevelProgress}"
+                               FontSize="12" HorizontalTextAlignment="Center" Opacity="0.7"/>
+                    </VerticalStackLayout>
+                </Frame>
+                <Frame Grid.Column="1"
+                       BackgroundColor="{AppThemeBinding Light=#fff3e0, Dark=#e65100}"
+                       Padding="16" CornerRadius="12" BorderColor="Transparent">
+                    <VerticalStackLayout Spacing="4">
+                        <Label Text="{Binding Streak, StringFormat='🔥 {0}'}"
+                               FontSize="24" FontAttributes="Bold" HorizontalTextAlignment="Center"/>
+                        <Label Text="Day Streak"
+                               FontSize="12" HorizontalTextAlignment="Center" Opacity="0.7"/>
+                    </VerticalStackLayout>
+                </Frame>
+            </Grid>
+
+            <!-- Today's Overview -->
+            <Label Text="Today's Overview" FontSize="18" FontAttributes="Bold"/>
+            <Grid ColumnDefinitions="*,*" RowDefinitions="Auto,Auto" ColumnSpacing="12" RowSpacing="12">
+                <Frame Padding="12" CornerRadius="8" BorderColor="Transparent"
+                       BackgroundColor="{AppThemeBinding Light=#e3f2fd, Dark=#0d47a1}">
+                    <VerticalStackLayout HorizontalOptions="Center">
+                        <Label Text="{Binding TasksDueToday}" FontSize="28" FontAttributes="Bold"
+                               HorizontalTextAlignment="Center"/>
+                        <Label Text="Tasks Due" FontSize="12" HorizontalTextAlignment="Center"/>
+                    </VerticalStackLayout>
+                </Frame>
+                <Frame Grid.Column="1" Padding="12" CornerRadius="8" BorderColor="Transparent"
+                       BackgroundColor="{AppThemeBinding Light=#fce4ec, Dark=#880e4f}">
+                    <VerticalStackLayout HorizontalOptions="Center">
+                        <Label Text="{Binding OverdueTasks}" FontSize="28" FontAttributes="Bold"
+                               HorizontalTextAlignment="Center"/>
+                        <Label Text="Overdue" FontSize="12" HorizontalTextAlignment="Center"/>
+                    </VerticalStackLayout>
+                </Frame>
+                <Frame Grid.Row="1" Padding="12" CornerRadius="8" BorderColor="Transparent"
+                       BackgroundColor="{AppThemeBinding Light=#e8f5e9, Dark=#1b5e20}">
+                    <VerticalStackLayout HorizontalOptions="Center">
+                        <Label Text="{Binding CompletedToday}" FontSize="28" FontAttributes="Bold"
+                               HorizontalTextAlignment="Center"/>
+                        <Label Text="Completed" FontSize="12" HorizontalTextAlignment="Center"/>
+                    </VerticalStackLayout>
+                </Frame>
+                <Frame Grid.Row="1" Grid.Column="1" Padding="12" CornerRadius="8" BorderColor="Transparent"
+                       BackgroundColor="{AppThemeBinding Light=#f3e5f5, Dark=#4a148c}">
+                    <VerticalStackLayout HorizontalOptions="Center">
+                        <Label Text="{Binding IncompleteHabits}" FontSize="28" FontAttributes="Bold"
+                               HorizontalTextAlignment="Center"/>
+                        <Label Text="Habits Left" FontSize="12" HorizontalTextAlignment="Center"/>
+                    </VerticalStackLayout>
+                </Frame>
+            </Grid>
+
+            <!-- Incomplete Habits -->
+            <Label Text="Incomplete Habits" FontSize="18" FontAttributes="Bold"
+                   IsVisible="{Binding IncompleteHabitList.Count, Converter={StaticResource IsNotZeroConverter}}"/>
+            <CollectionView ItemsSource="{Binding IncompleteHabitList}"
+                            IsVisible="{Binding IncompleteHabitList.Count, Converter={StaticResource IsNotZeroConverter}}">
+                <CollectionView.ItemTemplate>
+                    <DataTemplate x:DataType="vm:HabitProgress">
+                        <Frame Padding="12" Margin="0,4" CornerRadius="8" BorderColor="Transparent"
+                               BackgroundColor="{AppThemeBinding Light=#f5f5f5, Dark=#2c2c2c}">
+                            <Grid ColumnDefinitions="Auto,*,Auto">
+                                <Label Text="{Binding Icon}" FontSize="24" VerticalTextAlignment="Center"/>
+                                <Label Grid.Column="1" Text="{Binding Name}" FontSize="16"
+                                       VerticalTextAlignment="Center" Margin="8,0"/>
+                                <Label Grid.Column="2" Text="{Binding ProgressText}" FontSize="14"
+                                       VerticalTextAlignment="Center" Opacity="0.7"/>
+                            </Grid>
+                        </Frame>
+                    </DataTemplate>
+                </CollectionView.ItemTemplate>
+            </CollectionView>
+
+            <!-- Active Projects -->
+            <Label Text="Active Projects" FontSize="18" FontAttributes="Bold" Margin="0,8,0,0"/>
+            <CollectionView ItemsSource="{Binding ProjectList}">
+                <CollectionView.ItemTemplate>
+                    <DataTemplate x:DataType="vm:ProjectProgress">
+                        <Frame Padding="12" Margin="0,4" CornerRadius="8" BorderColor="Transparent"
+                               BackgroundColor="{AppThemeBinding Light=#f5f5f5, Dark=#2c2c2c}">
+                            <VerticalStackLayout Spacing="6">
+                                <Label Text="{Binding Name}" FontSize="16" FontAttributes="Bold"/>
+                                <Label Text="{Binding ProgressText}" FontSize="13" Opacity="0.7"/>
+                                <ProgressBar Progress="{Binding Percentage, Converter={StaticResource PercentToProgressConverter}}"
+                                             ProgressColor="#4CAF50" HeightRequest="6"/>
+                            </VerticalStackLayout>
+                        </Frame>
+                    </DataTemplate>
+                </CollectionView.ItemTemplate>
+            </CollectionView>
+
+            <!-- Recent Activity -->
+            <Label Text="Recent Activity" FontSize="18" FontAttributes="Bold" Margin="0,8,0,0"/>
+            <CollectionView ItemsSource="{Binding RecentActivity}">
+                <CollectionView.EmptyView>
+                    <Label Text="No recent activity" Opacity="0.5" HorizontalTextAlignment="Center" Margin="0,16"/>
+                </CollectionView.EmptyView>
+                <CollectionView.ItemTemplate>
+                    <DataTemplate x:DataType="vm:ActivityItem">
+                        <Grid ColumnDefinitions="Auto,*,Auto" Padding="4,8">
+                            <Label Text="{Binding Icon}" FontSize="18" VerticalTextAlignment="Center"/>
+                            <Label Grid.Column="1" Text="{Binding Message}" FontSize="14"
+                                   VerticalTextAlignment="Center" Margin="8,0"/>
+                            <Label Grid.Column="2" Text="{Binding DateText}" FontSize="12"
+                                   VerticalTextAlignment="Center" Opacity="0.5"/>
+                        </Grid>
+                    </DataTemplate>
+                </CollectionView.ItemTemplate>
+            </CollectionView>
+
+        </VerticalStackLayout>
+    </ScrollView>
+</ContentPage>
diff --git a/SarahsDailyApp/Views/DashboardPage.xaml.cs b/SarahsDailyApp/Views/DashboardPage.xaml.cs
new file mode 100644
index 0000000..0d47787
--- /dev/null
+++ b/SarahsDailyApp/Views/DashboardPage.xaml.cs
@@ -0,0 +1,20 @@
+using SarahsDailyApp.ViewModels;
+
+namespace SarahsDailyApp.Views;
+
+public partial class DashboardPage : ContentPage
+{
+    private readonly DashboardViewModel _viewModel;
+
+    public DashboardPage(DashboardViewModel viewModel)
+    {
+        InitializeComponent();
+        BindingContext = _viewModel = viewModel;
+    }
+
+    protected override async void OnAppearing()
+    {
+        base.OnAppearing();
+        await _viewModel.LoadDataCommand.ExecuteAsync(null);
+    }
+}
diff --git a/SarahsDailyApp/Views/FinanceDetailPage.xaml b/SarahsDailyApp/Views/FinanceDetailPage.xaml
new file mode 100644
index 0000000..a488524
--- /dev/null
+++ b/SarahsDailyApp/Views/FinanceDetailPage.xaml
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<ContentPage xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
+             xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
+             xmlns:vm="clr-namespace:SarahsDailyApp.ViewModels"
+             x:Class="SarahsDailyApp.Views.FinanceDetailPage"
+             x:DataType="vm:FinanceDetailViewModel"
+             Title="{Binding PageTitle}">
+
+    <ScrollView>
+        <VerticalStackLayout Spacing="16" Padding="16">
+            <Label Text="Description" FontAttributes="Bold"/>
+            <Entry Text="{Binding Description}" Placeholder="Item description"/>
+
+            <Label Text="Amount" FontAttributes="Bold"/>
+            <Entry Text="{Binding Amount}" Keyboard="Numeric" Placeholder="0.00"/>
+
+            <Label Text="Date" FontAttributes="Bold"/>
+            <DatePicker Date="{Binding Date}"/>
+
+            <Label Text="Recurring" FontAttributes="Bold"/>
+            <Picker ItemsSource="{Binding RecurringOptions}"
+                    SelectedIndex="{Binding Recurring}"/>
+
+            <Label Text="Category" FontAttributes="Bold"/>
+            <Picker ItemsSource="{Binding Categories}"
+                    SelectedItem="{Binding SelectedCategory}" Title="Select category"/>
+            <Grid ColumnDefinitions="*,Auto" ColumnSpacing="8">
+                <Entry Text="{Binding NewCategoryName}" Placeholder="New category"/>
+                <Button Grid.Column="1" Text="Add" Command="{Binding AddCategoryCommand}"
+                        BackgroundColor="#2196F3" TextColor="White" CornerRadius="8" Padding="12,8"/>
+            </Grid>
+
+            <Grid ColumnDefinitions="*,*,*" ColumnSpacing="8" Margin="0,16,0,0">
+                <Button Text="Save" Command="{Binding SaveCommand}"
+                        BackgroundColor="#4CAF50" TextColor="White" CornerRadius="8"/>
+                <Button Grid.Column="1" Text="Cancel" Command="{Binding CancelCommand}"
+                        BackgroundColor="{AppThemeBinding Light=#e0e0e0, Dark=#424242}" CornerRadius="8"/>
+                <Button Grid.Column="2" Text="Delete" Command="{Binding DeleteCommand}"
+                        IsVisible="{Binding IsEditing}"
+                        BackgroundColor="#f44336" TextColor="White" CornerRadius="8"/>
+            </Grid>
+        </VerticalStackLayout>
+    </ScrollView>
+</ContentPage>
diff --git a/SarahsDailyApp/Views/FinanceDetailPage.xaml.cs b/SarahsDailyApp/Views/FinanceDetailPage.xaml.cs
new file mode 100644
index 0000000..5bfbbac
--- /dev/null
+++ b/SarahsDailyApp/Views/FinanceDetailPage.xaml.cs
@@ -0,0 +1,20 @@
+using SarahsDailyApp.ViewModels;
+
+namespace SarahsDailyApp.Views;
+
+public partial class FinanceDetailPage : ContentPage
+{
+    private readonly FinanceDetailViewModel _viewModel;
+
+    public FinanceDetailPage(FinanceDetailViewModel viewModel)
+    {
+        InitializeComponent();
+        BindingContext = _viewModel = viewModel;
+    }
+
+    protected override async void OnAppearing()
+    {
+        base.OnAppearing();
+        await _viewModel.LoadDataCommand.ExecuteAsync(null);
+    }
+}
diff --git a/SarahsDailyApp/Views/FinancesPage.xaml b/SarahsDailyApp/Views/FinancesPage.xaml
new file mode 100644
index 0000000..f6eebab
--- /dev/null
+++ b/SarahsDailyApp/Views/FinancesPage.xaml
@@ -0,0 +1,133 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<ContentPage xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
+             xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
+             xmlns:vm="clr-namespace:SarahsDailyApp.ViewModels"
+             xmlns:models="clr-namespace:SarahsDailyApp.Models"
+             x:Class="SarahsDailyApp.Views.FinancesPage"
+             x:DataType="vm:FinancesViewModel"
+             Title="💰 Finances">
+
+    <Grid RowDefinitions="Auto,Auto,Auto,*">
+        <!-- Summary Cards -->
+        <Grid ColumnDefinitions="*,*,*" ColumnSpacing="8" Padding="16,12">
+            <Frame Padding="12" CornerRadius="8" BorderColor="Transparent"
+                   BackgroundColor="{AppThemeBinding Light=#e8f5e9, Dark=#1b5e20}">
+                <VerticalStackLayout HorizontalOptions="Center">
+                    <Label Text="{Binding TotalIncome, StringFormat='${0:F2}'}"
+                           FontSize="18" FontAttributes="Bold" HorizontalTextAlignment="Center"/>
+                    <Label Text="Income" FontSize="11" HorizontalTextAlignment="Center"/>
+                </VerticalStackLayout>
+            </Frame>
+            <Frame Grid.Column="1" Padding="12" CornerRadius="8" BorderColor="Transparent"
+                   BackgroundColor="{AppThemeBinding Light=#fce4ec, Dark=#880e4f}">
+                <VerticalStackLayout HorizontalOptions="Center">
+                    <Label Text="{Binding TotalExpenses, StringFormat='${0:F2}'}"
+                           FontSize="18" FontAttributes="Bold" HorizontalTextAlignment="Center"/>
+                    <Label Text="Expenses" FontSize="11" HorizontalTextAlignment="Center"/>
+                </VerticalStackLayout>
+            </Frame>
+            <Frame Grid.Column="2" Padding="12" CornerRadius="8" BorderColor="Transparent"
+                   BackgroundColor="{AppThemeBinding Light=#e3f2fd, Dark=#0d47a1}">
+                <VerticalStackLayout HorizontalOptions="Center">
+                    <Label Text="{Binding NetBalance, StringFormat='${0:F2}'}"
+                           FontSize="18" FontAttributes="Bold" HorizontalTextAlignment="Center"/>
+                    <Label Text="Net" FontSize="11" HorizontalTextAlignment="Center"/>
+                </VerticalStackLayout>
+            </Frame>
+        </Grid>
+
+        <!-- Date Range Filter -->
+        <Grid Grid.Row="1" ColumnDefinitions="Auto,*,Auto,*,Auto" ColumnSpacing="8" Padding="16,0">
+            <Button Text="◀" Command="{Binding PreviousMonthCommand}" Padding="8" CornerRadius="8"
+                    BackgroundColor="{AppThemeBinding Light=#e0e0e0, Dark=#424242}"/>
+            <DatePicker Grid.Column="1" Date="{Binding StartDate}" Format="MMM dd"/>
+            <Label Grid.Column="2" Text="to" VerticalTextAlignment="Center"/>
+            <DatePicker Grid.Column="3" Date="{Binding EndDate}" Format="MMM dd"/>
+            <Button Grid.Column="4" Text="▶" Command="{Binding NextMonthCommand}" Padding="8" CornerRadius="8"
+                    BackgroundColor="{AppThemeBinding Light=#e0e0e0, Dark=#424242}"/>
+        </Grid>
+        <Grid Grid.Row="2" ColumnDefinitions="*,*,*" ColumnSpacing="8" Padding="16,8">
+            <Button Text="Apply" Command="{Binding LoadDataCommand}"
+                    BackgroundColor="#2196F3" TextColor="White" CornerRadius="8"/>
+            <Button Grid.Column="1" Text="This Month" Command="{Binding ThisMonthCommand}"
+                    BackgroundColor="{AppThemeBinding Light=#e0e0e0, Dark=#424242}" CornerRadius="8"/>
+            <Grid Grid.Column="2" ColumnDefinitions="*,*" ColumnSpacing="4">
+                <Button Text="+ Expense" Command="{Binding AddExpenseCommand}"
+                        BackgroundColor="#f44336" TextColor="White" CornerRadius="8" FontSize="11" Padding="4"/>
+                <Button Grid.Column="1" Text="+ Revenue" Command="{Binding AddRevenueCommand}"
+                        BackgroundColor="#4CAF50" TextColor="White" CornerRadius="8" FontSize="11" Padding="4"/>
+            </Grid>
+        </Grid>
+
+        <!-- Items List -->
+        <ScrollView Grid.Row="3">
+            <VerticalStackLayout Spacing="8" Padding="16,0,16,16">
+                <Label Text="Expenses" FontSize="16" FontAttributes="Bold" Margin="0,8,0,0"/>
+                <CollectionView ItemsSource="{Binding Expenses}">
+                    <CollectionView.EmptyView>
+                        <Label Text="No expenses" Opacity="0.5" Margin="0,8"/>
+                    </CollectionView.EmptyView>
+                    <CollectionView.ItemTemplate>
+                        <DataTemplate x:DataType="models:FinanceItem">
+                            <Frame Padding="12" Margin="0,2" CornerRadius="8" BorderColor="Transparent"
+                                   BackgroundColor="{AppThemeBinding Light=#f5f5f5, Dark=#2c2c2c}">
+                                <Frame.GestureRecognizers>
+                                    <TapGestureRecognizer
+                                        Command="{Binding Source={RelativeSource AncestorType={x:Type vm:FinancesViewModel}}, Path=EditItemCommand}"
+                                        CommandParameter="{Binding .}"/>
+                                </Frame.GestureRecognizers>
+                                <Grid ColumnDefinitions="*,Auto">
+                                    <VerticalStackLayout Spacing="2">
+                                        <Label Text="{Binding Description}" FontSize="15"/>
+                                        <HorizontalStackLayout Spacing="8">
+                                            <Label Text="{Binding Category, StringFormat='📂 {0}'}" FontSize="12" Opacity="0.6"
+                                                   IsVisible="{Binding Category, Converter={StaticResource IsNotNullConverter}}"/>
+                                            <Label Text="{Binding Date, StringFormat='📅 {0:MMM dd}'}" FontSize="12" Opacity="0.6"
+                                                   IsVisible="{Binding Date, Converter={StaticResource IsNotNullConverter}}"/>
+                                        </HorizontalStackLayout>
+                                    </VerticalStackLayout>
+                                    <Label Grid.Column="1" Text="{Binding MonthlyAmount, StringFormat='-${0:F2}'}"
+                                           FontSize="16" FontAttributes="Bold" TextColor="#f44336"
+                                           VerticalTextAlignment="Center"/>
+                                </Grid>
+                            </Frame>
+                        </DataTemplate>
+                    </CollectionView.ItemTemplate>
+                </CollectionView>
+
+                <Label Text="Revenue" FontSize="16" FontAttributes="Bold" Margin="0,12,0,0"/>
+                <CollectionView ItemsSource="{Binding Revenue}">
+                    <CollectionView.EmptyView>
+                        <Label Text="No revenue" Opacity="0.5" Margin="0,8"/>
+                    </CollectionView.EmptyView>
+                    <CollectionView.ItemTemplate>
+                        <DataTemplate x:DataType="models:FinanceItem">
+                            <Frame Padding="12" Margin="0,2" CornerRadius="8" BorderColor="Transparent"
+                                   BackgroundColor="{AppThemeBinding Light=#f5f5f5, Dark=#2c2c2c}">
+                                <Frame.GestureRecognizers>
+                                    <TapGestureRecognizer
+                                        Command="{Binding Source={RelativeSource AncestorType={x:Type vm:FinancesViewModel}}, Path=EditItemCommand}"
+                                        CommandParameter="{Binding .}"/>
+                                </Frame.GestureRecognizers>
+                                <Grid ColumnDefinitions="*,Auto">
+                                    <VerticalStackLayout Spacing="2">
+                                        <Label Text="{Binding Description}" FontSize="15"/>
+                                        <HorizontalStackLayout Spacing="8">
+                                            <Label Text="{Binding Category, StringFormat='📂 {0}'}" FontSize="12" Opacity="0.6"
+                                                   IsVisible="{Binding Category, Converter={StaticResource IsNotNullConverter}}"/>
+                                            <Label Text="{Binding Date, StringFormat='📅 {0:MMM dd}'}" FontSize="12" Opacity="0.6"
+                                                   IsVisible="{Binding Date, Converter={StaticResource IsNotNullConverter}}"/>
+                                        </HorizontalStackLayout>
+                                    </VerticalStackLayout>
+                                    <Label Grid.Column="1" Text="{Binding MonthlyAmount, StringFormat='+${0:F2}'}"
+                                           FontSize="16" FontAttributes="Bold" TextColor="#4CAF50"
+                                           VerticalTextAlignment="Center"/>
+                                </Grid>
+                            </Frame>
+                        </DataTemplate>
+                    </CollectionView.ItemTemplate>
+                </CollectionView>
+            </VerticalStackLayout>
+        </ScrollView>
+    </Grid>
+</ContentPage>
diff --git a/SarahsDailyApp/Views/FinancesPage.xaml.cs b/SarahsDailyApp/Views/FinancesPage.xaml.cs
new file mode 100644
index 0000000..7e6fd93
--- /dev/null
+++ b/SarahsDailyApp/Views/FinancesPage.xaml.cs
@@ -0,0 +1,20 @@
+using SarahsDailyApp.ViewModels;
+
+namespace SarahsDailyApp.Views;
+
+public partial class FinancesPage : ContentPage
+{
+    private readonly FinancesViewModel _viewModel;
+
+    public FinancesPage(FinancesViewModel viewModel)
+    {
+        InitializeComponent();
+        BindingContext = _viewModel = viewModel;
+    }
+
+    protected override async void OnAppearing()
+    {
+        base.OnAppearing();
+        await _viewModel.LoadDataCommand.ExecuteAsync(null);
+    }
+}
diff --git a/SarahsDailyApp/Views/HabitDetailPage.xaml b/SarahsDailyApp/Views/HabitDetailPage.xaml
new file mode 100644
index 0000000..51fd9d7
--- /dev/null
+++ b/SarahsDailyApp/Views/HabitDetailPage.xaml
@@ -0,0 +1,89 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<ContentPage xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
+             xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
+             xmlns:vm="clr-namespace:SarahsDailyApp.ViewModels"
+             x:Class="SarahsDailyApp.Views.HabitDetailPage"
+             x:DataType="vm:HabitDetailViewModel"
+             Title="{Binding IsEditing, Converter={StaticResource EditTitleConverter}, ConverterParameter='Habit'}">
+
+    <ScrollView>
+        <VerticalStackLayout Spacing="16" Padding="16">
+            <Label Text="Habit Name" FontAttributes="Bold"/>
+            <Entry Text="{Binding Name}" Placeholder="Habit name"/>
+
+            <Label Text="Description" FontAttributes="Bold"/>
+            <Editor Text="{Binding Description}" Placeholder="Optional description"
+                    HeightRequest="80" AutoSize="TextChanges"/>
+
+            <Label Text="Icon / Emoji" FontAttributes="Bold"/>
+            <HorizontalStackLayout Spacing="8">
+                <Label Text="{Binding Icon}" FontSize="32" VerticalTextAlignment="Center"/>
+                <CollectionView ItemsSource="{x:Static vm:HabitDetailViewModel.CommonEmojis}"
+                                SelectionMode="Single"
+                                HeightRequest="50">
+                    <CollectionView.ItemsLayout>
+                        <LinearItemsLayout Orientation="Horizontal" ItemSpacing="4"/>
+                    </CollectionView.ItemsLayout>
+                    <CollectionView.ItemTemplate>
+                        <DataTemplate x:DataType="x:String">
+                            <Frame Padding="6" CornerRadius="8" BorderColor="Transparent"
+                                   BackgroundColor="{AppThemeBinding Light=#f0f0f0, Dark=#3c3c3c}">
+                                <Frame.GestureRecognizers>
+                                    <TapGestureRecognizer Tapped="OnEmojiTapped" CommandParameter="{Binding .}"/>
+                                </Frame.GestureRecognizers>
+                                <Label Text="{Binding .}" FontSize="20" HorizontalTextAlignment="Center"/>
+                            </Frame>
+                        </DataTemplate>
+                    </CollectionView.ItemTemplate>
+                </CollectionView>
+            </HorizontalStackLayout>
+
+            <Label Text="Category" FontAttributes="Bold"/>
+            <Picker ItemsSource="{Binding Categories}"
+                    SelectedItem="{Binding SelectedCategory}" Title="Select category"/>
+            <Grid ColumnDefinitions="*,Auto" ColumnSpacing="8">
+                <Entry Text="{Binding NewCategoryName}" Placeholder="New category name"/>
+                <Button Grid.Column="1" Text="Add" Command="{Binding AddCategoryCommand}"
+                        BackgroundColor="#2196F3" TextColor="White" CornerRadius="8" Padding="12,8"/>
+            </Grid>
+
+            <Label Text="Daily Target Goal" FontAttributes="Bold"/>
+            <Entry Text="{Binding TargetGoal}" Keyboard="Numeric"/>
+
+            <Label Text="Days of Week" FontAttributes="Bold"/>
+            <FlexLayout Wrap="Wrap" JustifyContent="Start">
+                <HorizontalStackLayout Spacing="4" Margin="0,0,12,0">
+                    <CheckBox IsChecked="{Binding Sunday}"/><Label Text="Sun" VerticalTextAlignment="Center"/>
+                </HorizontalStackLayout>
+                <HorizontalStackLayout Spacing="4" Margin="0,0,12,0">
+                    <CheckBox IsChecked="{Binding Monday}"/><Label Text="Mon" VerticalTextAlignment="Center"/>
+                </HorizontalStackLayout>
+                <HorizontalStackLayout Spacing="4" Margin="0,0,12,0">
+                    <CheckBox IsChecked="{Binding Tuesday}"/><Label Text="Tue" VerticalTextAlignment="Center"/>
+                </HorizontalStackLayout>
+                <HorizontalStackLayout Spacing="4" Margin="0,0,12,0">
+                    <CheckBox IsChecked="{Binding Wednesday}"/><Label Text="Wed" VerticalTextAlignment="Center"/>
+                </HorizontalStackLayout>
+                <HorizontalStackLayout Spacing="4" Margin="0,0,12,0">
+                    <CheckBox IsChecked="{Binding Thursday}"/><Label Text="Thu" VerticalTextAlignment="Center"/>
+                </HorizontalStackLayout>
+                <HorizontalStackLayout Spacing="4" Margin="0,0,12,0">
+                    <CheckBox IsChecked="{Binding Friday}"/><Label Text="Fri" VerticalTextAlignment="Center"/>
+                </HorizontalStackLayout>
+                <HorizontalStackLayout Spacing="4">
+                    <CheckBox IsChecked="{Binding Saturday}"/><Label Text="Sat" VerticalTextAlignment="Center"/>
+                </HorizontalStackLayout>
+            </FlexLayout>
+
+            <Grid ColumnDefinitions="*,*,*" ColumnSpacing="8" Margin="0,16,0,0">
+                <Button Text="Save" Command="{Binding SaveCommand}"
+                        BackgroundColor="#4CAF50" TextColor="White" CornerRadius="8"/>
+                <Button Grid.Column="1" Text="Cancel" Command="{Binding CancelCommand}"
+                        BackgroundColor="{AppThemeBinding Light=#e0e0e0, Dark=#424242}" CornerRadius="8"/>
+                <Button Grid.Column="2" Text="Delete" Command="{Binding DeleteCommand}"
+                        IsVisible="{Binding IsEditing}"
+                        BackgroundColor="#f44336" TextColor="White" CornerRadius="8"/>
+            </Grid>
+        </VerticalStackLayout>
+    </ScrollView>
+</ContentPage>
diff --git a/SarahsDailyApp/Views/HabitDetailPage.xaml.cs b/SarahsDailyApp/Views/HabitDetailPage.xaml.cs
new file mode 100644
index 0000000..75f170a
--- /dev/null
+++ b/SarahsDailyApp/Views/HabitDetailPage.xaml.cs
@@ -0,0 +1,28 @@
+using SarahsDailyApp.ViewModels;
+
+namespace SarahsDailyApp.Views;
+
+public partial class HabitDetailPage : ContentPage
+{
+    private readonly HabitDetailViewModel _viewModel;
+
+    public HabitDetailPage(HabitDetailViewModel viewModel)
+    {
+        InitializeComponent();
+        BindingContext = _viewModel = viewModel;
+    }
+
+    protected override async void OnAppearing()
+    {
+        base.OnAppearing();
+        await _viewModel.LoadDataCommand.ExecuteAsync(null);
+    }
+
+    private void OnEmojiTapped(object? sender, TappedEventArgs e)
+    {
+        if (e.Parameter is string emoji)
+        {
+            _viewModel.Icon = emoji;
+        }
+    }
+}
diff --git a/SarahsDailyApp/Views/HabitsPage.xaml b/SarahsDailyApp/Views/HabitsPage.xaml
new file mode 100644
index 0000000..86e0e27
--- /dev/null
+++ b/SarahsDailyApp/Views/HabitsPage.xaml
@@ -0,0 +1,61 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<ContentPage xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
+             xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
+             xmlns:vm="clr-namespace:SarahsDailyApp.ViewModels"
+             x:Class="SarahsDailyApp.Views.HabitsPage"
+             x:DataType="vm:HabitsViewModel"
+             Title="🔄 Habits">
+
+    <Grid RowDefinitions="Auto,*">
+        <Button Text="+ New Habit" Command="{Binding AddHabitCommand}"
+                Margin="16,12" HorizontalOptions="End"
+                BackgroundColor="#4CAF50" TextColor="White" CornerRadius="8"/>
+
+        <CollectionView Grid.Row="1" ItemsSource="{Binding Habits}" Margin="16,0">
+            <CollectionView.EmptyView>
+                <Label Text="No habits yet. Start building good habits!" 
+                       HorizontalTextAlignment="Center" Opacity="0.5" Margin="0,40"/>
+            </CollectionView.EmptyView>
+            <CollectionView.ItemTemplate>
+                <DataTemplate x:DataType="vm:HabitCardViewModel">
+                    <Frame Padding="16" Margin="0,4" CornerRadius="12" BorderColor="Transparent"
+                           BackgroundColor="{AppThemeBinding Light=#f5f5f5, Dark=#2c2c2c}">
+                        <Frame.GestureRecognizers>
+                            <TapGestureRecognizer
+                                Command="{Binding Source={RelativeSource AncestorType={x:Type vm:HabitsViewModel}}, Path=EditHabitCommand}"
+                                CommandParameter="{Binding .}"/>
+                        </Frame.GestureRecognizers>
+                        <VerticalStackLayout Spacing="8">
+                            <Grid ColumnDefinitions="Auto,*,Auto">
+                                <Label Text="{Binding Habit.Icon}" FontSize="32" VerticalTextAlignment="Center"/>
+                                <VerticalStackLayout Grid.Column="1" Margin="12,0" VerticalOptions="Center">
+                                    <Label Text="{Binding Habit.Name}" FontSize="18" FontAttributes="Bold"/>
+                                    <Label Text="{Binding Habit.Description}" FontSize="13" Opacity="0.7"
+                                           IsVisible="{Binding Habit.Description, Converter={StaticResource IsNotNullConverter}}"
+                                           MaxLines="1" LineBreakMode="TailTruncation"/>
+                                </VerticalStackLayout>
+                                <VerticalStackLayout Grid.Column="2" VerticalOptions="Center">
+                                    <Label Text="{Binding Habit.Streak, StringFormat='🔥 {0}'}"
+                                           FontSize="14" HorizontalTextAlignment="End"/>
+                                </VerticalStackLayout>
+                            </Grid>
+
+                            <Label Text="{Binding ProgressText}" FontSize="13" Opacity="0.7"/>
+                            <ProgressBar Progress="{Binding Percentage, Converter={StaticResource PercentToProgressConverter}}"
+                                         ProgressColor="#4CAF50" HeightRequest="6"/>
+                            <Label Text="{Binding StatusText}" FontSize="13"
+                                   TextColor="{Binding IsComplete, Converter={StaticResource CompletionColorConverter}}"/>
+
+                            <Button Text="{Binding ButtonLabel}"
+                                    IsEnabled="{Binding CanComplete}"
+                                    Command="{Binding Source={RelativeSource AncestorType={x:Type vm:HabitsViewModel}}, Path=CompleteHabitCommand}"
+                                    CommandParameter="{Binding .}"
+                                    BackgroundColor="{Binding CanComplete, Converter={StaticResource ActionButtonColorConverter}}"
+                                    TextColor="White" CornerRadius="8"/>
+                        </VerticalStackLayout>
+                    </Frame>
+                </DataTemplate>
+            </CollectionView.ItemTemplate>
+        </CollectionView>
+    </Grid>
+</ContentPage>
diff --git a/SarahsDailyApp/Views/HabitsPage.xaml.cs b/SarahsDailyApp/Views/HabitsPage.xaml.cs
new file mode 100644
index 0000000..c108a4a
--- /dev/null
+++ b/SarahsDailyApp/Views/HabitsPage.xaml.cs
@@ -0,0 +1,20 @@
+using SarahsDailyApp.ViewModels;
+
+namespace SarahsDailyApp.Views;
+
+public partial class HabitsPage : ContentPage
+{
+    private readonly HabitsViewModel _viewModel;
+
+    public HabitsPage(HabitsViewModel viewModel)
+    {
+        InitializeComponent();
+        BindingContext = _viewModel = viewModel;
+    }
+
+    protected override async void OnAppearing()
+    {
+        base.OnAppearing();
+        await _viewModel.LoadDataCommand.ExecuteAsync(null);
+    }
+}
diff --git a/SarahsDailyApp/Views/NoteDetailPage.xaml b/SarahsDailyApp/Views/NoteDetailPage.xaml
new file mode 100644
index 0000000..5e546fd
--- /dev/null
+++ b/SarahsDailyApp/Views/NoteDetailPage.xaml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<ContentPage xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
+             xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
+             xmlns:vm="clr-namespace:SarahsDailyApp.ViewModels"
+             x:Class="SarahsDailyApp.Views.NoteDetailPage"
+             x:DataType="vm:NoteDetailViewModel"
+             Title="{Binding IsEditing, Converter={StaticResource EditTitleConverter}, ConverterParameter='Note'}">
+
+    <Grid RowDefinitions="Auto,*,Auto" Padding="16">
+        <Label Text="Title" FontAttributes="Bold"/>
+        <Entry Text="{Binding Title}" Placeholder="Note title" Margin="0,0,0,8"/>
+
+        <Editor Grid.Row="1" Text="{Binding Content}" Placeholder="Write your note here..."
+                AutoSize="TextChanges"/>
+
+        <Grid Grid.Row="2" ColumnDefinitions="*,*,*" ColumnSpacing="8" Margin="0,16,0,0">
+            <Button Text="Save" Command="{Binding SaveCommand}"
+                    BackgroundColor="#4CAF50" TextColor="White" CornerRadius="8"/>
+            <Button Grid.Column="1" Text="Cancel" Command="{Binding CancelCommand}"
+                    BackgroundColor="{AppThemeBinding Light=#e0e0e0, Dark=#424242}" CornerRadius="8"/>
+            <Button Grid.Column="2" Text="Delete" Command="{Binding DeleteCommand}"
+                    IsVisible="{Binding IsEditing}"
+                    BackgroundColor="#f44336" TextColor="White" CornerRadius="8"/>
+        </Grid>
+    </Grid>
+</ContentPage>
diff --git a/SarahsDailyApp/Views/NoteDetailPage.xaml.cs b/SarahsDailyApp/Views/NoteDetailPage.xaml.cs
new file mode 100644
index 0000000..397bd9e
--- /dev/null
+++ b/SarahsDailyApp/Views/NoteDetailPage.xaml.cs
@@ -0,0 +1,20 @@
+using SarahsDailyApp.ViewModels;
+
+namespace SarahsDailyApp.Views;
+
+public partial class NoteDetailPage : ContentPage
+{
+    private readonly NoteDetailViewModel _viewModel;
+
+    public NoteDetailPage(NoteDetailViewModel viewModel)
+    {
+        InitializeComponent();
+        BindingContext = _viewModel = viewModel;
+    }
+
+    protected override async void OnAppearing()
+    {
+        base.OnAppearing();
+        await _viewModel.LoadDataCommand.ExecuteAsync(null);
+    }
+}
diff --git a/SarahsDailyApp/Views/NotesPage.xaml b/SarahsDailyApp/Views/NotesPage.xaml
new file mode 100644
index 0000000..78ac731
--- /dev/null
+++ b/SarahsDailyApp/Views/NotesPage.xaml
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<ContentPage xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
+             xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
+             xmlns:vm="clr-namespace:SarahsDailyApp.ViewModels"
+             xmlns:models="clr-namespace:SarahsDailyApp.Models"
+             x:Class="SarahsDailyApp.Views.NotesPage"
+             x:DataType="vm:NotesViewModel"
+             Title="📝 Notes">
+
+    <Grid RowDefinitions="Auto,*">
+        <Button Text="+ New Note" Command="{Binding AddNoteCommand}"
+                Margin="16,12" HorizontalOptions="End"
+                BackgroundColor="#4CAF50" TextColor="White" CornerRadius="8"/>
+
+        <CollectionView Grid.Row="1" ItemsSource="{Binding Notes}" Margin="16,0">
+            <CollectionView.EmptyView>
+                <Label Text="No notes yet" HorizontalTextAlignment="Center"
+                       Opacity="0.5" Margin="0,40"/>
+            </CollectionView.EmptyView>
+            <CollectionView.ItemsLayout>
+                <GridItemsLayout Orientation="Vertical" Span="2" HorizontalItemSpacing="8" VerticalItemSpacing="8"/>
+            </CollectionView.ItemsLayout>
+            <CollectionView.ItemTemplate>
+                <DataTemplate x:DataType="models:Note">
+                    <Frame Padding="12" CornerRadius="12" BorderColor="Transparent"
+                           BackgroundColor="{AppThemeBinding Light=#f5f5f5, Dark=#2c2c2c}"
+                           HeightRequest="140">
+                        <Frame.GestureRecognizers>
+                            <TapGestureRecognizer
+                                Command="{Binding Source={RelativeSource AncestorType={x:Type vm:NotesViewModel}}, Path=EditNoteCommand}"
+                                CommandParameter="{Binding .}"/>
+                        </Frame.GestureRecognizers>
+                        <VerticalStackLayout Spacing="6">
+                            <Label Text="{Binding Title, TargetNullValue='Untitled'}"
+                                   FontSize="16" FontAttributes="Bold"
+                                   LineBreakMode="TailTruncation" MaxLines="1"/>
+                            <Label Text="{Binding Content}" FontSize="13" Opacity="0.7"
+                                   LineBreakMode="TailTruncation" MaxLines="4"/>
+                            <Label Text="{Binding UpdatedDate, StringFormat='{0:MMM dd, yyyy}', TargetNullValue=''}"
+                                   FontSize="11" Opacity="0.4"
+                                   VerticalOptions="EndAndExpand"/>
+                        </VerticalStackLayout>
+                    </Frame>
+                </DataTemplate>
+            </CollectionView.ItemTemplate>
+        </CollectionView>
+    </Grid>
+</ContentPage>
diff --git a/SarahsDailyApp/Views/NotesPage.xaml.cs b/SarahsDailyApp/Views/NotesPage.xaml.cs
new file mode 100644
index 0000000..d397f68
--- /dev/null
+++ b/SarahsDailyApp/Views/NotesPage.xaml.cs
@@ -0,0 +1,20 @@
+using SarahsDailyApp.ViewModels;
+
+namespace SarahsDailyApp.Views;
+
+public partial class NotesPage : ContentPage
+{
+    private readonly NotesViewModel _viewModel;
+
+    public NotesPage(NotesViewModel viewModel)
+    {
+        InitializeComponent();
+        BindingContext = _viewModel = viewModel;
+    }
+
+    protected override async void OnAppearing()
+    {
+        base.OnAppearing();
+        await _viewModel.LoadDataCommand.ExecuteAsync(null);
+    }
+}
diff --git a/SarahsDailyApp/Views/ProjectDetailPage.xaml b/SarahsDailyApp/Views/ProjectDetailPage.xaml
new file mode 100644
index 0000000..0be13f1
--- /dev/null
+++ b/SarahsDailyApp/Views/ProjectDetailPage.xaml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<ContentPage xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
+             xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
+             xmlns:vm="clr-namespace:SarahsDailyApp.ViewModels"
+             x:Class="SarahsDailyApp.Views.ProjectDetailPage"
+             x:DataType="vm:ProjectDetailViewModel"
+             Title="{Binding IsEditing, Converter={StaticResource EditTitleConverter}, ConverterParameter='Project'}">
+
+    <ScrollView>
+        <VerticalStackLayout Spacing="16" Padding="16">
+            <Label Text="Project Name" FontAttributes="Bold"/>
+            <Entry Text="{Binding Name}" Placeholder="Project name"/>
+
+            <Label Text="Description" FontAttributes="Bold"/>
+            <Editor Text="{Binding Description}" Placeholder="Optional description"
+                    HeightRequest="80" AutoSize="TextChanges"/>
+
+            <Label Text="Color Tag" FontAttributes="Bold"/>
+            <Entry Text="{Binding Color}" Placeholder="#3b82f6"/>
+            <BoxView HeightRequest="30" CornerRadius="4"
+                     Color="{Binding Color}" HorizontalOptions="Start" WidthRequest="60"/>
+
+            <Grid ColumnDefinitions="*,*,*" ColumnSpacing="8" Margin="0,16,0,0">
+                <Button Text="Save" Command="{Binding SaveCommand}"
+                        BackgroundColor="#4CAF50" TextColor="White" CornerRadius="8"/>
+                <Button Grid.Column="1" Text="Cancel" Command="{Binding CancelCommand}"
+                        BackgroundColor="{AppThemeBinding Light=#e0e0e0, Dark=#424242}" CornerRadius="8"/>
+                <Button Grid.Column="2" Text="Delete" Command="{Binding DeleteCommand}"
+                        IsVisible="{Binding IsEditing}"
+                        BackgroundColor="#f44336" TextColor="White" CornerRadius="8"/>
+            </Grid>
+        </VerticalStackLayout>
+    </ScrollView>
+</ContentPage>
diff --git a/SarahsDailyApp/Views/ProjectDetailPage.xaml.cs b/SarahsDailyApp/Views/ProjectDetailPage.xaml.cs
new file mode 100644
index 0000000..1a97a60
--- /dev/null
+++ b/SarahsDailyApp/Views/ProjectDetailPage.xaml.cs
@@ -0,0 +1,20 @@
+using SarahsDailyApp.ViewModels;
+
+namespace SarahsDailyApp.Views;
+
+public partial class ProjectDetailPage : ContentPage
+{
+    private readonly ProjectDetailViewModel _viewModel;
+
+    public ProjectDetailPage(ProjectDetailViewModel viewModel)
+    {
+        InitializeComponent();
+        BindingContext = _viewModel = viewModel;
+    }
+
+    protected override async void OnAppearing()
+    {
+        base.OnAppearing();
+        await _viewModel.LoadDataCommand.ExecuteAsync(null);
+    }
+}
diff --git a/SarahsDailyApp/Views/ProjectsPage.xaml b/SarahsDailyApp/Views/ProjectsPage.xaml
new file mode 100644
index 0000000..f8e608a
--- /dev/null
+++ b/SarahsDailyApp/Views/ProjectsPage.xaml
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<ContentPage xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
+             xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
+             xmlns:vm="clr-namespace:SarahsDailyApp.ViewModels"
+             x:Class="SarahsDailyApp.Views.ProjectsPage"
+             x:DataType="vm:ProjectsViewModel"
+             Title="📁 Projects">
+
+    <Grid RowDefinitions="Auto,*">
+        <Button Text="+ New Project" Command="{Binding AddProjectCommand}"
+                Margin="16,12" HorizontalOptions="End"
+                BackgroundColor="#4CAF50" TextColor="White" CornerRadius="8"/>
+
+        <CollectionView Grid.Row="1" ItemsSource="{Binding Projects}" Margin="16,0">
+            <CollectionView.EmptyView>
+                <Label Text="No projects yet" HorizontalTextAlignment="Center"
+                       VerticalTextAlignment="Center" Opacity="0.5" Margin="0,40"/>
+            </CollectionView.EmptyView>
+            <CollectionView.ItemTemplate>
+                <DataTemplate x:DataType="vm:ProjectViewModel">
+                    <Frame Padding="16" Margin="0,4" CornerRadius="12" BorderColor="Transparent"
+                           BackgroundColor="{AppThemeBinding Light=#f5f5f5, Dark=#2c2c2c}">
+                        <Frame.GestureRecognizers>
+                            <TapGestureRecognizer
+                                Command="{Binding Source={RelativeSource AncestorType={x:Type vm:ProjectsViewModel}}, Path=EditProjectCommand}"
+                                CommandParameter="{Binding .}"/>
+                        </Frame.GestureRecognizers>
+                        <VerticalStackLayout Spacing="8">
+                            <BoxView HeightRequest="4" CornerRadius="2"
+                                     Color="{Binding Project.Color}"/>
+                            <Label Text="{Binding Project.Name}" FontSize="18" FontAttributes="Bold"/>
+                            <Label Text="{Binding Project.Description}" FontSize="13" Opacity="0.7"
+                                   IsVisible="{Binding Project.Description, Converter={StaticResource IsNotNullConverter}}"
+                                   LineBreakMode="TailTruncation" MaxLines="2"/>
+                            <Label Text="{Binding ProgressText}" FontSize="13" Opacity="0.7"/>
+                            <ProgressBar Progress="{Binding Percentage, Converter={StaticResource PercentToProgressConverter}}"
+                                         ProgressColor="#4CAF50" HeightRequest="6"/>
+                        </VerticalStackLayout>
+                    </Frame>
+                </DataTemplate>
+            </CollectionView.ItemTemplate>
+        </CollectionView>
+    </Grid>
+</ContentPage>
diff --git a/SarahsDailyApp/Views/ProjectsPage.xaml.cs b/SarahsDailyApp/Views/ProjectsPage.xaml.cs
new file mode 100644
index 0000000..b328fc8
--- /dev/null
+++ b/SarahsDailyApp/Views/ProjectsPage.xaml.cs
@@ -0,0 +1,20 @@
+using SarahsDailyApp.ViewModels;
+
+namespace SarahsDailyApp.Views;
+
+public partial class ProjectsPage : ContentPage
+{
+    private readonly ProjectsViewModel _viewModel;
+
+    public ProjectsPage(ProjectsViewModel viewModel)
+    {
+        InitializeComponent();
+        BindingContext = _viewModel = viewModel;
+    }
+
+    protected override async void OnAppearing()
+    {
+        base.OnAppearing();
+        await _viewModel.LoadDataCommand.ExecuteAsync(null);
+    }
+}
diff --git a/SarahsDailyApp/Views/SettingsPage.xaml b/SarahsDailyApp/Views/SettingsPage.xaml
new file mode 100644
index 0000000..58870bc
--- /dev/null
+++ b/SarahsDailyApp/Views/SettingsPage.xaml
@@ -0,0 +1,82 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<ContentPage xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
+             xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
+             xmlns:vm="clr-namespace:SarahsDailyApp.ViewModels"
+             xmlns:models="clr-namespace:SarahsDailyApp.Models"
+             x:Class="SarahsDailyApp.Views.SettingsPage"
+             x:DataType="vm:SettingsViewModel"
+             Title="⚙️ Settings">
+
+    <ScrollView>
+        <VerticalStackLayout Spacing="16" Padding="16">
+
+            <!-- Leveling System -->
+            <Label Text="Leveling System" FontSize="20" FontAttributes="Bold"/>
+            <Frame Padding="16" CornerRadius="12" BorderColor="Transparent"
+                   BackgroundColor="{AppThemeBinding Light=#f5f5f5, Dark=#2c2c2c}">
+                <VerticalStackLayout Spacing="12">
+                    <Grid ColumnDefinitions="*,Auto" ColumnSpacing="8">
+                        <VerticalStackLayout>
+                            <Label Text="Tasks per Level" FontAttributes="Bold"/>
+                            <Entry Text="{Binding TasksPerLevel}" Keyboard="Numeric"/>
+                        </VerticalStackLayout>
+                        <Button Grid.Column="1" Text="Save" Command="{Binding SaveLevelSettingsCommand}"
+                                VerticalOptions="End"
+                                BackgroundColor="#4CAF50" TextColor="White" CornerRadius="8"/>
+                    </Grid>
+                    <Label Text="{Binding CurrentLevel, StringFormat='Current Level: {0}'}" FontSize="14"/>
+                    <Label Text="{Binding TotalCompleted, StringFormat='Total Completed Tasks: {0}'}" FontSize="14"/>
+                    <Label Text="{Binding TasksToNextLevel, StringFormat='Tasks to Next Level: {0}'}" FontSize="14"/>
+                </VerticalStackLayout>
+            </Frame>
+
+            <!-- Category Management -->
+            <Label Text="Categories" FontSize="20" FontAttributes="Bold" Margin="0,8,0,0"/>
+            <Grid ColumnDefinitions="*,Auto" ColumnSpacing="8">
+                <Entry Text="{Binding NewCategoryName}" Placeholder="New category name"/>
+                <Button Grid.Column="1" Text="Add" Command="{Binding AddCategoryCommand}"
+                        BackgroundColor="#2196F3" TextColor="White" CornerRadius="8" Padding="12,8"/>
+            </Grid>
+            <CollectionView ItemsSource="{Binding Categories}">
+                <CollectionView.ItemTemplate>
+                    <DataTemplate x:DataType="models:Category">
+                        <Frame Padding="12" Margin="0,2" CornerRadius="8" BorderColor="Transparent"
+                               BackgroundColor="{AppThemeBinding Light=#f5f5f5, Dark=#2c2c2c}">
+                            <Grid ColumnDefinitions="*,Auto,Auto" ColumnSpacing="8">
+                                <Label Text="{Binding Name}" FontSize="15" VerticalTextAlignment="Center"/>
+                                <Button Grid.Column="1" Text="Rename"
+                                        Command="{Binding Source={RelativeSource AncestorType={x:Type vm:SettingsViewModel}}, Path=RenameCategoryCommand}"
+                                        CommandParameter="{Binding .}"
+                                        BackgroundColor="{AppThemeBinding Light=#e0e0e0, Dark=#424242}"
+                                        CornerRadius="8" Padding="8,4" FontSize="12"/>
+                                <Button Grid.Column="2" Text="Delete"
+                                        Command="{Binding Source={RelativeSource AncestorType={x:Type vm:SettingsViewModel}}, Path=DeleteCategoryCommand}"
+                                        CommandParameter="{Binding .}"
+                                        BackgroundColor="#f44336" TextColor="White"
+                                        CornerRadius="8" Padding="8,4" FontSize="12"/>
+                            </Grid>
+                        </Frame>
+                    </DataTemplate>
+                </CollectionView.ItemTemplate>
+            </CollectionView>
+
+            <!-- Data Management -->
+            <Label Text="Data Management" FontSize="20" FontAttributes="Bold" Margin="0,8,0,0"/>
+            <Frame Padding="16" CornerRadius="12" BorderColor="Transparent"
+                   BackgroundColor="{AppThemeBinding Light=#f5f5f5, Dark=#2c2c2c}">
+                <VerticalStackLayout Spacing="12">
+                    <Button Text="📤 Export Data" Command="{Binding ExportDataCommand}"
+                            BackgroundColor="#2196F3" TextColor="White" CornerRadius="8"/>
+                    <Button Text="📥 Import Data" Command="{Binding ImportDataCommand}"
+                            BackgroundColor="#FF9800" TextColor="White" CornerRadius="8"/>
+                    <Button Text="🗑️ Clear All Data" Command="{Binding ClearAllDataCommand}"
+                            BackgroundColor="#f44336" TextColor="White" CornerRadius="8"/>
+                </VerticalStackLayout>
+            </Frame>
+
+            <Label Text="Data Version: 1.0.0" FontSize="12" Opacity="0.5"
+                   HorizontalTextAlignment="Center" Margin="0,16,0,0"/>
+
+        </VerticalStackLayout>
+    </ScrollView>
+</ContentPage>
diff --git a/SarahsDailyApp/Views/SettingsPage.xaml.cs b/SarahsDailyApp/Views/SettingsPage.xaml.cs
new file mode 100644
index 0000000..5d76aac
--- /dev/null
+++ b/SarahsDailyApp/Views/SettingsPage.xaml.cs
@@ -0,0 +1,20 @@
+using SarahsDailyApp.ViewModels;
+
+namespace SarahsDailyApp.Views;
+
+public partial class SettingsPage : ContentPage
+{
+    private readonly SettingsViewModel _viewModel;
+
+    public SettingsPage(SettingsViewModel viewModel)
+    {
+        InitializeComponent();
+        BindingContext = _viewModel = viewModel;
+    }
+
+    protected override async void OnAppearing()
+    {
+        base.OnAppearing();
+        await _viewModel.LoadDataCommand.ExecuteAsync(null);
+    }
+}
diff --git a/SarahsDailyApp/Views/ShoppingItemDetailPage.xaml b/SarahsDailyApp/Views/ShoppingItemDetailPage.xaml
new file mode 100644
index 0000000..eed2629
--- /dev/null
+++ b/SarahsDailyApp/Views/ShoppingItemDetailPage.xaml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<ContentPage xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
+             xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
+             xmlns:vm="clr-namespace:SarahsDailyApp.ViewModels"
+             x:Class="SarahsDailyApp.Views.ShoppingItemDetailPage"
+             x:DataType="vm:ShoppingItemDetailViewModel"
+             Title="{Binding IsEditing, Converter={StaticResource EditTitleConverter}, ConverterParameter='Shopping Item'}">
+
+    <ScrollView>
+        <VerticalStackLayout Spacing="16" Padding="16">
+            <Label Text="Item Name" FontAttributes="Bold"/>
+            <Entry Text="{Binding Name}" Placeholder="e.g. Milk"/>
+
+            <Label Text="Quantity" FontAttributes="Bold"/>
+            <Entry Text="{Binding Quantity}" Placeholder="e.g. 2 litres"/>
+
+            <Grid ColumnDefinitions="*,*,*" ColumnSpacing="8" Margin="0,16,0,0">
+                <Button Text="Save" Command="{Binding SaveCommand}"
+                        BackgroundColor="#4CAF50" TextColor="White" CornerRadius="8"/>
+                <Button Grid.Column="1" Text="Cancel" Command="{Binding CancelCommand}"
+                        BackgroundColor="{AppThemeBinding Light=#e0e0e0, Dark=#424242}" CornerRadius="8"/>
+                <Button Grid.Column="2" Text="Delete" Command="{Binding DeleteCommand}"
+                        IsVisible="{Binding IsEditing}"
+                        BackgroundColor="#f44336" TextColor="White" CornerRadius="8"/>
+            </Grid>
+        </VerticalStackLayout>
+    </ScrollView>
+</ContentPage>
diff --git a/SarahsDailyApp/Views/ShoppingItemDetailPage.xaml.cs b/SarahsDailyApp/Views/ShoppingItemDetailPage.xaml.cs
new file mode 100644
index 0000000..0368b46
--- /dev/null
+++ b/SarahsDailyApp/Views/ShoppingItemDetailPage.xaml.cs
@@ -0,0 +1,20 @@
+using SarahsDailyApp.ViewModels;
+
+namespace SarahsDailyApp.Views;
+
+public partial class ShoppingItemDetailPage : ContentPage
+{
+    private readonly ShoppingItemDetailViewModel _viewModel;
+
+    public ShoppingItemDetailPage(ShoppingItemDetailViewModel viewModel)
+    {
+        InitializeComponent();
+        BindingContext = _viewModel = viewModel;
+    }
+
+    protected override async void OnAppearing()
+    {
+        base.OnAppearing();
+        await _viewModel.LoadDataCommand.ExecuteAsync(null);
+    }
+}
diff --git a/SarahsDailyApp/Views/ShoppingListPage.xaml b/SarahsDailyApp/Views/ShoppingListPage.xaml
new file mode 100644
index 0000000..263757d
--- /dev/null
+++ b/SarahsDailyApp/Views/ShoppingListPage.xaml
@@ -0,0 +1,59 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<ContentPage xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
+             xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
+             xmlns:vm="clr-namespace:SarahsDailyApp.ViewModels"
+             xmlns:models="clr-namespace:SarahsDailyApp.Models"
+             xmlns:converters="clr-namespace:SarahsDailyApp.Converters"
+             xmlns:toolkit="http://schemas.microsoft.com/dotnet/2022/maui/toolkit"
+             x:Class="SarahsDailyApp.Views.ShoppingListPage"
+             x:DataType="vm:ShoppingListViewModel"
+             Title="🛒 Shopping">
+
+    <ContentPage.Resources>
+        <converters:BoolToStrikethroughConverter x:Key="StrikethroughConverter"/>
+    </ContentPage.Resources>
+
+    <Grid RowDefinitions="Auto,*">
+        <Grid ColumnDefinitions="*,Auto" Padding="16,12" ColumnSpacing="8">
+            <Button Text="Clear Checked" Command="{Binding ClearCheckedCommand}"
+                    BackgroundColor="{AppThemeBinding Light=#e0e0e0, Dark=#424242}" CornerRadius="8"/>
+            <Button Grid.Column="1" Text="+ Add" Command="{Binding AddItemCommand}"
+                    BackgroundColor="#4CAF50" TextColor="White" CornerRadius="8"/>
+        </Grid>
+
+        <CollectionView Grid.Row="1" ItemsSource="{Binding Items}" Margin="16,0">
+            <CollectionView.EmptyView>
+                <Label Text="Shopping list is empty" HorizontalTextAlignment="Center"
+                       Opacity="0.5" Margin="0,40"/>
+            </CollectionView.EmptyView>
+            <CollectionView.ItemTemplate>
+                <DataTemplate x:DataType="models:ShoppingItem">
+                    <Frame Padding="12" Margin="0,2" CornerRadius="8" BorderColor="Transparent"
+                           BackgroundColor="{AppThemeBinding Light=#f5f5f5, Dark=#2c2c2c}">
+                        <Grid ColumnDefinitions="Auto,*,Auto" ColumnSpacing="8">
+                            <CheckBox IsChecked="{Binding Completed}" VerticalOptions="Center">
+                                <CheckBox.Behaviors>
+                                    <toolkit:EventToCommandBehavior
+                                        EventName="CheckedChanged"
+                                        Command="{Binding Source={RelativeSource AncestorType={x:Type vm:ShoppingListViewModel}}, Path=ToggleItemCommand}"
+                                        CommandParameter="{Binding .}"/>
+                                </CheckBox.Behaviors>
+                            </CheckBox>
+                            <VerticalStackLayout Grid.Column="1" VerticalOptions="Center" Spacing="2">
+                                <Label Text="{Binding Name}" FontSize="16"
+                                       TextDecorations="{Binding Completed, Converter={StaticResource StrikethroughConverter}}"/>
+                                <Label Text="{Binding Quantity}" FontSize="13" Opacity="0.6"
+                                       IsVisible="{Binding Quantity, Converter={StaticResource IsNotNullConverter}}"/>
+                            </VerticalStackLayout>
+                            <Button Grid.Column="2" Text="Edit"
+                                    Command="{Binding Source={RelativeSource AncestorType={x:Type vm:ShoppingListViewModel}}, Path=EditItemCommand}"
+                                    CommandParameter="{Binding .}"
+                                    BackgroundColor="{AppThemeBinding Light=#e0e0e0, Dark=#424242}"
+                                    CornerRadius="8" Padding="8,4" FontSize="12"/>
+                        </Grid>
+                    </Frame>
+                </DataTemplate>
+            </CollectionView.ItemTemplate>
+        </CollectionView>
+    </Grid>
+</ContentPage>
diff --git a/SarahsDailyApp/Views/ShoppingListPage.xaml.cs b/SarahsDailyApp/Views/ShoppingListPage.xaml.cs
new file mode 100644
index 0000000..e88141e
--- /dev/null
+++ b/SarahsDailyApp/Views/ShoppingListPage.xaml.cs
@@ -0,0 +1,20 @@
+using SarahsDailyApp.ViewModels;
+
+namespace SarahsDailyApp.Views;
+
+public partial class ShoppingListPage : ContentPage
+{
+    private readonly ShoppingListViewModel _viewModel;
+
+    public ShoppingListPage(ShoppingListViewModel viewModel)
+    {
+        InitializeComponent();
+        BindingContext = _viewModel = viewModel;
+    }
+
+    protected override async void OnAppearing()
+    {
+        base.OnAppearing();
+        await _viewModel.LoadDataCommand.ExecuteAsync(null);
+    }
+}
diff --git a/SarahsDailyApp/Views/TaskDetailPage.xaml b/SarahsDailyApp/Views/TaskDetailPage.xaml
new file mode 100644
index 0000000..33d1023
--- /dev/null
+++ b/SarahsDailyApp/Views/TaskDetailPage.xaml
@@ -0,0 +1,84 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<ContentPage xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
+             xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
+             xmlns:vm="clr-namespace:SarahsDailyApp.ViewModels"
+             xmlns:models="clr-namespace:SarahsDailyApp.Models"
+             x:Class="SarahsDailyApp.Views.TaskDetailPage"
+             x:DataType="vm:TaskDetailViewModel"
+             Title="{Binding IsEditing, Converter={StaticResource EditTitleConverter}, ConverterParameter='Task'}">
+
+    <ScrollView>
+        <VerticalStackLayout Spacing="16" Padding="16">
+            <Label Text="Title" FontAttributes="Bold"/>
+            <Entry Text="{Binding Title}" Placeholder="Task title"/>
+
+            <Label Text="Description" FontAttributes="Bold"/>
+            <Editor Text="{Binding Description}" Placeholder="Optional description"
+                    HeightRequest="100" AutoSize="TextChanges"/>
+
+            <Label Text="Due Date" FontAttributes="Bold"/>
+            <DatePicker Date="{Binding DueDate}" MinimumDate="01/01/2020"/>
+
+            <Label Text="Repeat Type" FontAttributes="Bold"/>
+            <Picker ItemsSource="{Binding RepeatTypeOptions}"
+                    SelectedIndex="{Binding RepeatType}"/>
+
+            <VerticalStackLayout IsVisible="{Binding ShowRepeatUnit}" Spacing="4">
+                <Label Text="{Binding RepeatUnitLabel, StringFormat='Repeat Every ({0})'}" FontAttributes="Bold"/>
+                <Entry Text="{Binding RepeatUnit}" Keyboard="Numeric"/>
+            </VerticalStackLayout>
+
+            <VerticalStackLayout IsVisible="{Binding ShowDaysOfWeek}" Spacing="4">
+                <Label Text="Days of Week" FontAttributes="Bold"/>
+                <FlexLayout Wrap="Wrap" JustifyContent="Start">
+                    <HorizontalStackLayout Spacing="4" Margin="0,0,12,0">
+                        <CheckBox IsChecked="{Binding Sunday}"/><Label Text="Sun" VerticalTextAlignment="Center"/>
+                    </HorizontalStackLayout>
+                    <HorizontalStackLayout Spacing="4" Margin="0,0,12,0">
+                        <CheckBox IsChecked="{Binding Monday}"/><Label Text="Mon" VerticalTextAlignment="Center"/>
+                    </HorizontalStackLayout>
+                    <HorizontalStackLayout Spacing="4" Margin="0,0,12,0">
+                        <CheckBox IsChecked="{Binding Tuesday}"/><Label Text="Tue" VerticalTextAlignment="Center"/>
+                    </HorizontalStackLayout>
+                    <HorizontalStackLayout Spacing="4" Margin="0,0,12,0">
+                        <CheckBox IsChecked="{Binding Wednesday}"/><Label Text="Wed" VerticalTextAlignment="Center"/>
+                    </HorizontalStackLayout>
+                    <HorizontalStackLayout Spacing="4" Margin="0,0,12,0">
+                        <CheckBox IsChecked="{Binding Thursday}"/><Label Text="Thu" VerticalTextAlignment="Center"/>
+                    </HorizontalStackLayout>
+                    <HorizontalStackLayout Spacing="4" Margin="0,0,12,0">
+                        <CheckBox IsChecked="{Binding Friday}"/><Label Text="Fri" VerticalTextAlignment="Center"/>
+                    </HorizontalStackLayout>
+                    <HorizontalStackLayout Spacing="4">
+                        <CheckBox IsChecked="{Binding Saturday}"/><Label Text="Sat" VerticalTextAlignment="Center"/>
+                    </HorizontalStackLayout>
+                </FlexLayout>
+            </VerticalStackLayout>
+
+            <VerticalStackLayout IsVisible="{Binding ShowCustomDays}" Spacing="4">
+                <Label Text="Repeat Every (Days)" FontAttributes="Bold"/>
+                <Entry Text="{Binding CustomRepeatDays}" Keyboard="Numeric"/>
+            </VerticalStackLayout>
+
+            <VerticalStackLayout IsVisible="{Binding ShowMovableDays}" Spacing="4">
+                <Label Text="Days Until Due (From Completion)" FontAttributes="Bold"/>
+                <Entry Text="{Binding MovableRepeatDays}" Keyboard="Numeric"/>
+            </VerticalStackLayout>
+
+            <Label Text="Project" FontAttributes="Bold"/>
+            <Picker ItemsSource="{Binding Projects}"
+                    ItemDisplayBinding="{Binding Name}"
+                    SelectedItem="{Binding SelectedProjectId}"/>
+
+            <Grid ColumnDefinitions="*,*,*" ColumnSpacing="8" Margin="0,16,0,0">
+                <Button Text="Save" Command="{Binding SaveCommand}"
+                        BackgroundColor="#4CAF50" TextColor="White" CornerRadius="8"/>
+                <Button Grid.Column="1" Text="Cancel" Command="{Binding CancelCommand}"
+                        BackgroundColor="{AppThemeBinding Light=#e0e0e0, Dark=#424242}" CornerRadius="8"/>
+                <Button Grid.Column="2" Text="Delete" Command="{Binding DeleteCommand}"
+                        IsVisible="{Binding IsEditing}"
+                        BackgroundColor="#f44336" TextColor="White" CornerRadius="8"/>
+            </Grid>
+        </VerticalStackLayout>
+    </ScrollView>
+</ContentPage>
diff --git a/SarahsDailyApp/Views/TaskDetailPage.xaml.cs b/SarahsDailyApp/Views/TaskDetailPage.xaml.cs
new file mode 100644
index 0000000..05cb567
--- /dev/null
+++ b/SarahsDailyApp/Views/TaskDetailPage.xaml.cs
@@ -0,0 +1,20 @@
+using SarahsDailyApp.ViewModels;
+
+namespace SarahsDailyApp.Views;
+
+public partial class TaskDetailPage : ContentPage
+{
+    private readonly TaskDetailViewModel _viewModel;
+
+    public TaskDetailPage(TaskDetailViewModel viewModel)
+    {
+        InitializeComponent();
+        BindingContext = _viewModel = viewModel;
+    }
+
+    protected override async void OnAppearing()
+    {
+        base.OnAppearing();
+        await _viewModel.LoadDataCommand.ExecuteAsync(null);
+    }
+}
diff --git a/SarahsDailyApp/Views/TasksPage.xaml b/SarahsDailyApp/Views/TasksPage.xaml
new file mode 100644
index 0000000..fac5863
--- /dev/null
+++ b/SarahsDailyApp/Views/TasksPage.xaml
@@ -0,0 +1,102 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<ContentPage xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
+             xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
+             xmlns:vm="clr-namespace:SarahsDailyApp.ViewModels"
+             xmlns:models="clr-namespace:SarahsDailyApp.Models"
+             xmlns:converters="clr-namespace:SarahsDailyApp.Converters"
+             xmlns:toolkit="http://schemas.microsoft.com/dotnet/2022/maui/toolkit"
+             x:Class="SarahsDailyApp.Views.TasksPage"
+             x:DataType="vm:TasksViewModel"
+             Title="✅ Tasks">
+
+    <ContentPage.Resources>
+        <converters:BoolToStrikethroughConverter x:Key="StrikethroughConverter"/>
+    </ContentPage.Resources>
+
+    <Grid RowDefinitions="Auto,*">
+        <!-- Filters -->
+        <VerticalStackLayout Spacing="8" Padding="16,12">
+            <Grid ColumnDefinitions="*,Auto" ColumnSpacing="8">
+                <SearchBar Placeholder="Search tasks..." Text="{Binding SearchText}"/>
+                <Button Grid.Column="1" Text="+ Add" Command="{Binding AddTaskCommand}"
+                        BackgroundColor="#4CAF50" TextColor="White" CornerRadius="8"/>
+            </Grid>
+            <Grid ColumnDefinitions="*,Auto,Auto" ColumnSpacing="8">
+                <Picker ItemsSource="{Binding StatusFilterOptions}"
+                        SelectedItem="{Binding SelectedStatusFilter}"
+                        Title="Filter"/>
+                <Button Grid.Column="1"
+                        Text="{Binding HideCompleted, StringFormat='{0:Hide Done|Show Done}'}"
+                        Command="{Binding Source={RelativeSource AncestorType={x:Type vm:TasksViewModel}}, Path=ToggleHideCompletedCommand}"
+                        BackgroundColor="{AppThemeBinding Light=#e0e0e0, Dark=#424242}"
+                        CornerRadius="8" Padding="12,8"/>
+                <Button Grid.Column="2" Text="Reset" Command="{Binding ResetFiltersCommand}"
+                        BackgroundColor="{AppThemeBinding Light=#e0e0e0, Dark=#424242}"
+                        CornerRadius="8" Padding="12,8"/>
+            </Grid>
+        </VerticalStackLayout>
+
+        <!-- Task Groups -->
+        <CollectionView Grid.Row="1" ItemsSource="{Binding TaskGroups}" Margin="16,0">
+            <CollectionView.EmptyView>
+                <Label Text="No tasks found" HorizontalTextAlignment="Center"
+                       VerticalTextAlignment="Center" Opacity="0.5" Margin="0,40"/>
+            </CollectionView.EmptyView>
+            <CollectionView.ItemTemplate>
+                <DataTemplate x:DataType="vm:TaskGroup">
+                    <VerticalStackLayout Spacing="4" Margin="0,0,0,16">
+                        <Label Text="{Binding Name}" FontSize="16" FontAttributes="Bold"
+                               Margin="0,8,0,4"/>
+                        <CollectionView ItemsSource="{Binding Tasks}">
+                            <CollectionView.ItemTemplate>
+                                <DataTemplate x:DataType="models:TaskItem">
+                                    <SwipeView>
+                                        <SwipeView.RightItems>
+                                            <SwipeItems>
+                                                <SwipeItem Text="Edit" BackgroundColor="#2196F3"
+                                                           Command="{Binding Source={RelativeSource AncestorType={x:Type vm:TasksViewModel}}, Path=EditTaskCommand}"
+                                                           CommandParameter="{Binding .}"/>
+                                            </SwipeItems>
+                                        </SwipeView.RightItems>
+                                        <Frame Padding="12" Margin="0,2" CornerRadius="8"
+                                               BorderColor="Transparent"
+                                               BackgroundColor="{AppThemeBinding Light=#f5f5f5, Dark=#2c2c2c}">
+                                            <Grid ColumnDefinitions="Auto,*,Auto" ColumnSpacing="12">
+                                                <CheckBox IsChecked="{Binding Completed}" VerticalOptions="Center">
+                                                    <CheckBox.Behaviors>
+                                                        <toolkit:EventToCommandBehavior
+                                                                EventName="CheckedChanged"
+                                                                Command="{Binding Source={RelativeSource AncestorType={x:Type vm:TasksViewModel}}, Path=ToggleTaskCompletionCommand}"
+                                                                CommandParameter="{Binding .}"/>
+                                                    </CheckBox.Behaviors>
+                                                </CheckBox>
+                                                <VerticalStackLayout Grid.Column="1" VerticalOptions="Center" Spacing="2">
+                                                    <Label Text="{Binding Title}" FontSize="16"
+                                                           TextDecorations="{Binding Completed, Converter={StaticResource StrikethroughConverter}}"/>
+                                                    <HorizontalStackLayout Spacing="8">
+                                                        <Label Text="{Binding DueDate, StringFormat='📅 {0:MMM dd}'}"
+                                                               FontSize="12" Opacity="0.6"
+                                                               IsVisible="{Binding DueDate, Converter={StaticResource IsNotNullConverter}}"/>
+                                                        <Label Text="{Binding RepeatType, StringFormat='🔁 {0}'}"
+                                                               FontSize="12" Opacity="0.6"
+                                                               IsVisible="{Binding RepeatType, Converter={StaticResource IsNotNoneConverter}}"/>
+                                                    </HorizontalStackLayout>
+                                                </VerticalStackLayout>
+                                                <Frame Grid.Column="2" Padding="8,4" CornerRadius="12"
+                                                       BorderColor="Transparent" VerticalOptions="Center"
+                                                       BackgroundColor="{Binding Completed, Converter={StaticResource StatusColorConverter}}">
+                                                    <Label Text="{Binding Completed, Converter={StaticResource StatusTextConverter}}"
+                                                           FontSize="11" TextColor="White"/>
+                                                </Frame>
+                                            </Grid>
+                                        </Frame>
+                                    </SwipeView>
+                                </DataTemplate>
+                            </CollectionView.ItemTemplate>
+                        </CollectionView>
+                    </VerticalStackLayout>
+                </DataTemplate>
+            </CollectionView.ItemTemplate>
+        </CollectionView>
+    </Grid>
+</ContentPage>
diff --git a/SarahsDailyApp/Views/TasksPage.xaml.cs b/SarahsDailyApp/Views/TasksPage.xaml.cs
new file mode 100644
index 0000000..09127c5
--- /dev/null
+++ b/SarahsDailyApp/Views/TasksPage.xaml.cs
@@ -0,0 +1,20 @@
+using SarahsDailyApp.ViewModels;
+
+namespace SarahsDailyApp.Views;
+
+public partial class TasksPage : ContentPage
+{
+    private readonly TasksViewModel _viewModel;
+
+    public TasksPage(TasksViewModel viewModel)
+    {
+        InitializeComponent();
+        BindingContext = _viewModel = viewModel;
+    }
+
+    protected override async void OnAppearing()
+    {
+        base.OnAppearing();
+        await _viewModel.LoadDataCommand.ExecuteAsync(null);
+    }
+}
diff --git a/SarahsDailyApp/Views/WishItemDetailPage.xaml b/SarahsDailyApp/Views/WishItemDetailPage.xaml
new file mode 100644
index 0000000..00326f2
--- /dev/null
+++ b/SarahsDailyApp/Views/WishItemDetailPage.xaml
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<ContentPage xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
+             xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
+             xmlns:vm="clr-namespace:SarahsDailyApp.ViewModels"
+             x:Class="SarahsDailyApp.Views.WishItemDetailPage"
+             x:DataType="vm:WishItemDetailViewModel"
+             Title="{Binding IsEditing, Converter={StaticResource EditTitleConverter}, ConverterParameter='Wish Item'}">
+
+    <ScrollView>
+        <VerticalStackLayout Spacing="16" Padding="16">
+            <Label Text="Title" FontAttributes="Bold"/>
+            <Entry Text="{Binding Title}" Placeholder="Item title"/>
+
+            <Label Text="List" FontAttributes="Bold"/>
+            <Picker ItemsSource="{Binding Lists}"
+                    ItemDisplayBinding="{Binding Name}"
+                    SelectedItem="{Binding SelectedListId}"
+                    Title="Uncategorized"/>
+
+            <Label Text="URL" FontAttributes="Bold"/>
+            <Entry Text="{Binding Url}" Placeholder="https://..." Keyboard="Url"/>
+
+            <Label Text="Approximate Price" FontAttributes="Bold"/>
+            <Entry Text="{Binding Price}" Keyboard="Numeric" Placeholder="0.00"/>
+
+            <Grid ColumnDefinitions="*,*,*" ColumnSpacing="8" Margin="0,16,0,0">
+                <Button Text="Save" Command="{Binding SaveCommand}"
+                        BackgroundColor="#4CAF50" TextColor="White" CornerRadius="8"/>
+                <Button Grid.Column="1" Text="Cancel" Command="{Binding CancelCommand}"
+                        BackgroundColor="{AppThemeBinding Light=#e0e0e0, Dark=#424242}" CornerRadius="8"/>
+                <Button Grid.Column="2" Text="Delete" Command="{Binding DeleteCommand}"
+                        IsVisible="{Binding IsEditing}"
+                        BackgroundColor="#f44336" TextColor="White" CornerRadius="8"/>
+            </Grid>
+        </VerticalStackLayout>
+    </ScrollView>
+</ContentPage>
diff --git a/SarahsDailyApp/Views/WishItemDetailPage.xaml.cs b/SarahsDailyApp/Views/WishItemDetailPage.xaml.cs
new file mode 100644
index 0000000..f62b964
--- /dev/null
+++ b/SarahsDailyApp/Views/WishItemDetailPage.xaml.cs
@@ -0,0 +1,20 @@
+using SarahsDailyApp.ViewModels;
+
+namespace SarahsDailyApp.Views;
+
+public partial class WishItemDetailPage : ContentPage
+{
+    private readonly WishItemDetailViewModel _viewModel;
+
+    public WishItemDetailPage(WishItemDetailViewModel viewModel)
+    {
+        InitializeComponent();
+        BindingContext = _viewModel = viewModel;
+    }
+
+    protected override async void OnAppearing()
+    {
+        base.OnAppearing();
+        await _viewModel.LoadDataCommand.ExecuteAsync(null);
+    }
+}
diff --git a/SarahsDailyApp/Views/WishListPage.xaml b/SarahsDailyApp/Views/WishListPage.xaml
new file mode 100644
index 0000000..2ce7afa
--- /dev/null
+++ b/SarahsDailyApp/Views/WishListPage.xaml
@@ -0,0 +1,84 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<ContentPage xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
+             xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
+             xmlns:vm="clr-namespace:SarahsDailyApp.ViewModels"
+             xmlns:models="clr-namespace:SarahsDailyApp.Models"
+             xmlns:toolkit="http://schemas.microsoft.com/dotnet/2022/maui/toolkit"
+             x:Class="SarahsDailyApp.Views.WishListPage"
+             x:DataType="vm:WishListViewModel"
+             Title="🎁 Wish List">
+
+    <Grid RowDefinitions="Auto,*">
+        <Button Text="+ New List" Command="{Binding AddListCommand}"
+                Margin="16,12" HorizontalOptions="End"
+                BackgroundColor="#4CAF50" TextColor="White" CornerRadius="8"/>
+
+        <CollectionView Grid.Row="1" ItemsSource="{Binding Groups}" Margin="16,0">
+            <CollectionView.EmptyView>
+                <Label Text="No wish list items yet" HorizontalTextAlignment="Center"
+                       Opacity="0.5" Margin="0,40"/>
+            </CollectionView.EmptyView>
+            <CollectionView.ItemTemplate>
+                <DataTemplate x:DataType="vm:WishListGroupViewModel">
+                    <VerticalStackLayout Spacing="4" Margin="0,0,0,12">
+                        <Grid ColumnDefinitions="Auto,*,Auto,Auto,Auto" ColumnSpacing="8" Padding="0,4">
+                            <Label Text="{Binding Name}" FontSize="16" FontAttributes="Bold"
+                                   VerticalTextAlignment="Center"/>
+                            <Label Grid.Column="1" Text="{Binding RemainingText}" FontSize="12"
+                                   Opacity="0.6" VerticalTextAlignment="Center"/>
+                            <Button Grid.Column="2" Text="Edit"
+                                    Command="{Binding Source={RelativeSource AncestorType={x:Type vm:WishListViewModel}}, Path=EditListCommand}"
+                                    CommandParameter="{Binding .}"
+                                    IsVisible="{Binding List, Converter={StaticResource IsNotNullConverter}}"
+                                    BackgroundColor="{AppThemeBinding Light=#e0e0e0, Dark=#424242}"
+                                    CornerRadius="8" Padding="8,4" FontSize="12"/>
+                            <Button Grid.Column="3" Text="+ Add"
+                                    Command="{Binding Source={RelativeSource AncestorType={x:Type vm:WishListViewModel}}, Path=AddItemCommand}"
+                                    CommandParameter="{Binding .}"
+                                    BackgroundColor="#2196F3" TextColor="White"
+                                    CornerRadius="8" Padding="8,4" FontSize="12"/>
+                        </Grid>
+
+                        <CollectionView ItemsSource="{Binding Items}" IsVisible="{Binding IsExpanded}">
+                            <CollectionView.ItemTemplate>
+                                <DataTemplate x:DataType="models:WishItem">
+                                    <Frame Padding="12" Margin="0,2" CornerRadius="8" BorderColor="Transparent"
+                                           BackgroundColor="{AppThemeBinding Light=#f5f5f5, Dark=#2c2c2c}">
+                                        <Grid ColumnDefinitions="Auto,*,Auto,Auto" ColumnSpacing="8">
+                                            <CheckBox IsChecked="{Binding Completed}" VerticalOptions="Center">
+                                                <CheckBox.Behaviors>
+                                                    <toolkit:EventToCommandBehavior
+                                                        EventName="CheckedChanged"
+                                                        Command="{Binding Source={RelativeSource AncestorType={x:Type vm:WishListViewModel}}, Path=ToggleItemCommand}"
+                                                        CommandParameter="{Binding .}"/>
+                                                </CheckBox.Behaviors>
+                                            </CheckBox>
+                                            <VerticalStackLayout Grid.Column="1" VerticalOptions="Center" Spacing="2">
+                                                <Label Text="{Binding Title}" FontSize="15"/>
+                                                <Label Text="{Binding Price, StringFormat='${0:F2}'}"
+                                                       FontSize="12" Opacity="0.6"
+                                                       IsVisible="{Binding Price, Converter={StaticResource IsNotNullConverter}}"/>
+                                            </VerticalStackLayout>
+                                            <Label Grid.Column="2" Text="🔗" FontSize="16"
+                                                   IsVisible="{Binding Url, Converter={StaticResource IsNotNullConverter}}"
+                                                   VerticalTextAlignment="Center">
+                                                <Label.GestureRecognizers>
+                                                    <TapGestureRecognizer Tapped="OnUrlTapped" CommandParameter="{Binding Url}"/>
+                                                </Label.GestureRecognizers>
+                                            </Label>
+                                            <Button Grid.Column="3" Text="Edit"
+                                                    Command="{Binding Source={RelativeSource AncestorType={x:Type vm:WishListViewModel}}, Path=EditItemCommand}"
+                                                    CommandParameter="{Binding .}"
+                                                    BackgroundColor="{AppThemeBinding Light=#e0e0e0, Dark=#424242}"
+                                                    CornerRadius="8" Padding="8,4" FontSize="12"/>
+                                        </Grid>
+                                    </Frame>
+                                </DataTemplate>
+                            </CollectionView.ItemTemplate>
+                        </CollectionView>
+                    </VerticalStackLayout>
+                </DataTemplate>
+            </CollectionView.ItemTemplate>
+        </CollectionView>
+    </Grid>
+</ContentPage>
diff --git a/SarahsDailyApp/Views/WishListPage.xaml.cs b/SarahsDailyApp/Views/WishListPage.xaml.cs
new file mode 100644
index 0000000..621f14b
--- /dev/null
+++ b/SarahsDailyApp/Views/WishListPage.xaml.cs
@@ -0,0 +1,28 @@
+using SarahsDailyApp.ViewModels;
+
+namespace SarahsDailyApp.Views;
+
+public partial class WishListPage : ContentPage
+{
+    private readonly WishListViewModel _viewModel;
+
+    public WishListPage(WishListViewModel viewModel)
+    {
+        InitializeComponent();
+        BindingContext = _viewModel = viewModel;
+    }
+
+    protected override async void OnAppearing()
+    {
+        base.OnAppearing();
+        await _viewModel.LoadDataCommand.ExecuteAsync(null);
+    }
+
+    private async void OnUrlTapped(object? sender, TappedEventArgs e)
+    {
+        if (e.Parameter is string url && Uri.TryCreate(url, UriKind.Absolute, out var uri))
+        {
+            await Launcher.OpenAsync(uri);
+        }
+    }
+}
diff --git a/Spec.md b/Spec.md
new file mode 100644
index 0000000..8a9179b
--- /dev/null
+++ b/Spec.md
@@ -0,0 +1,886 @@
+# TaskManagerWeb — Application Specification & .NET MAUI Migration Guide
+
+## Table of Contents
+
+1. [Overview](#overview)
+2. [Technology Stack](#technology-stack)
+3. [Data Models](#data-models)
+4. [Data Storage & Persistence](#data-storage--persistence)
+5. [Application Architecture](#application-architecture)
+6. [Feature Specifications](#feature-specifications)
+   - [Navigation & Layout](#navigation--layout)
+   - [Date Navigator](#date-navigator)
+   - [Dashboard](#1-dashboard)
+   - [Tasks](#2-tasks)
+   - [Projects](#3-projects)
+   - [Habits](#4-habits)
+   - [Finances](#5-finances)
+   - [Wish List](#6-wish-list)
+   - [Shopping List](#7-shopping-list)
+   - [Notes](#8-notes)
+   - [Settings](#9-settings)
+7. [Gamification System](#gamification-system)
+8. [PWA Capabilities](#pwa-capabilities)
+9. [.NET MAUI Migration Guide](#net-maui-migration-guide)
+
+---
+
+## Overview
+
+**TaskManagerWeb** is a comprehensive personal productivity Progressive Web App (PWA) built with vanilla TypeScript. It combines task management, project tracking, habit tracking, finance management, wish lists, shopping lists, and notes — all in a single application with gamification elements (levels and streaks).
+
+All data is stored locally in the browser's `localStorage`. There is no server or database backend.
+
+---
+
+## Technology Stack
+
+| Layer         | Technology                              |
+|---------------|----------------------------------------|
+| Language      | TypeScript (compiled to JavaScript)     |
+| UI            | Vanilla HTML5 / CSS3 (no framework)     |
+| Storage       | Browser `localStorage` (JSON blob)      |
+| PWA           | Service Worker + Web App Manifest       |
+| Unit Tests    | Vitest                                  |
+| E2E Tests     | Playwright                              |
+| Build         | TypeScript compiler (`tsc`) → `js/`     |
+
+---
+
+## Data Models
+
+### Task
+
+| Field              | Type                                                                    | Required | Default    | Description |
+|--------------------|-------------------------------------------------------------------------|----------|------------|-------------|
+| `id`               | `string`                                                                | Yes      | Generated  | Unique ID (base-36 timestamp + random) |
+| `title`            | `string`                                                                | Yes      | `""`       | Task title |
+| `description`      | `string?`                                                               | No       | —          | Optional description |
+| `dueDate`          | `string?`                                                               | No       | —          | ISO date string `YYYY-MM-DD` |
+| `repeatType`       | `"none" \| "daily" \| "weekly" \| "monthly" \| "yearly" \| "custom" \| "movable"` | Yes | `"none"` | Recurrence type |
+| `repeatUnit`       | `number?`                                                               | No       | `1`        | Every N days/weeks/months/years (used for daily, weekly, monthly, yearly) |
+| `customRepeatDays` | `number?`                                                               | No       | —          | Interval in days for `custom` repeat type |
+| `movableRepeatDays`| `number?`                                                               | No       | —          | Days from completion for `movable` repeat type |
+| `daysOfWeek`       | `number[]?`                                                             | No       | —          | 0=Sun..6=Sat; for daily/weekly with specific days |
+| `projectId`        | `string \| null?`                                                       | No       | `null`     | FK to a Project |
+| `completed`        | `boolean`                                                               | Yes      | `false`    | Completion status |
+| `completedDate`    | `string \| null?`                                                       | No       | `null`     | Date completed (`YYYY-MM-DD`) |
+| `createdDate`      | `string`                                                                | Yes      | Auto       | ISO timestamp |
+
+### Project
+
+| Field         | Type      | Required | Default    | Description |
+|---------------|-----------|----------|------------|-------------|
+| `id`          | `string`  | Yes      | Generated  | Unique ID |
+| `name`        | `string`  | Yes      | `""`       | Project name |
+| `description` | `string?` | No       | —          | Optional description |
+| `color`       | `string?` | No       | `"#3b82f6"`| Hex color code for visual tag |
+| `createdDate` | `string`  | Yes      | Auto       | ISO timestamp |
+
+### Habit
+
+| Field               | Type              | Required | Default  | Description |
+|---------------------|-------------------|----------|----------|-------------|
+| `id`                | `string`          | Yes      | Generated| Unique ID |
+| `name`              | `string`          | Yes      | `""`     | Habit name |
+| `description`       | `string?`         | No       | —        | Optional description |
+| `icon`              | `string`          | Yes      | `"⭐"`   | Emoji icon displayed on the habit card |
+| `category`          | `string \| null?` | No       | `null`   | Category from shared categories list |
+| `targetGoal`        | `number`          | Yes      | `1`      | Completions per day needed to "finish" the habit |
+| `daysOfWeek`        | `number[]?`       | No       | All 7    | Days the habit is scheduled (0=Sun..6=Sat) |
+| `streak`            | `number`          | Yes      | `0`      | Consecutive fully-completed days |
+| `lastCompletedDate` | `string \| null?` | No       | `null`   | Last date fully completed (`YYYY-MM-DD`) |
+| `createdDate`       | `string`          | Yes      | Auto     | ISO timestamp |
+
+### HabitLog
+
+| Field       | Type     | Required | Description |
+|-------------|----------|----------|-------------|
+| `id`        | `string` | Yes      | Unique ID |
+| `habitId`   | `string` | Yes      | FK to Habit |
+| `date`      | `string` | Yes      | Date of completion (`YYYY-MM-DD`) |
+| `timestamp` | `string` | Yes      | Full ISO timestamp of when logged |
+
+### FinanceItem (used for Expenses, Revenue, and Charges)
+
+| Field         | Type                                     | Required | Default  | Description |
+|---------------|------------------------------------------|----------|----------|-------------|
+| `id`          | `string`                                 | Yes      | Generated| Unique ID |
+| `description` | `string`                                 | Yes      | `""`     | Item description |
+| `amount`      | `number`                                 | Yes      | `0`      | Dollar amount |
+| `date`        | `string?`                                | No       | —        | Date (`YYYY-MM-DD`) |
+| `category`    | `string \| null?`                        | No       | `null`   | Category from shared categories |
+| `recurring`   | `"once" \| "monthly" \| "yearly"?`       | No       | —        | Recurrence frequency |
+| `createdDate` | `string`                                 | Yes      | Auto     | ISO timestamp |
+
+### WishItem
+
+| Field        | Type              | Required | Default    | Description |
+|--------------|-------------------|----------|------------|-------------|
+| `id`         | `string`          | Yes      | Generated  | Unique ID |
+| `title`      | `string`          | Yes      | `""`       | Item title |
+| `url`        | `string?`         | No       | —          | Link to product listing |
+| `price`      | `number?`         | No       | —          | Approximate price |
+| `order`      | `number`          | Yes      | Auto       | Sort order within list (0-based) |
+| `createdDate`| `string`          | Yes      | Auto       | ISO timestamp |
+| `completed`  | `boolean?`        | No       | `false`    | Marked as received/purchased |
+| `listId`     | `string \| null?` | No       | `null`     | FK to WishList; `null` = uncategorized |
+
+### WishList
+
+| Field        | Type     | Required | Default   | Description |
+|--------------|----------|----------|-----------|-------------|
+| `id`         | `string` | Yes      | Generated | Unique ID |
+| `name`       | `string` | Yes      | `""`      | List name |
+| `order`      | `number` | Yes      | Auto      | Display order |
+| `createdDate`| `string` | Yes      | Auto      | ISO timestamp |
+
+### Note
+
+| Field        | Type      | Required | Default | Description |
+|--------------|-----------|----------|---------|-------------|
+| `id`         | `string`  | Yes      | Generated | Unique ID |
+| `title`      | `string`  | Yes      | `""`    | Note title |
+| `content`    | `string`  | Yes      | `""`    | Note body text |
+| `createdDate`| `string`  | Yes      | Auto    | ISO timestamp |
+| `updatedDate`| `string?` | No       | —       | Auto-set on edit |
+
+### ShoppingItem
+
+| Field        | Type      | Required | Default | Description |
+|--------------|-----------|----------|---------|-------------|
+| `id`         | `string`  | Yes      | Generated | Unique ID |
+| `name`       | `string`  | Yes      | `""`    | Item name |
+| `quantity`   | `string?` | No       | —       | Free-text quantity (e.g. "2 litres") |
+| `completed`  | `boolean` | Yes      | `false` | Checked off |
+| `createdDate`| `string`  | Yes      | Auto    | ISO timestamp |
+
+### UserStats
+
+| Field              | Type           | Default | Description |
+|--------------------|----------------|---------|-------------|
+| `level`            | `number`       | `1`     | Calculated from completed tasks |
+| `dailyStreak`      | `number`       | `0`     | Consecutive active days |
+| `lastActivityDate` | `string \| null` | `null` | `YYYY-MM-DD` of last task/habit completion |
+
+### Settings
+
+| Field           | Type     | Default | Description |
+|-----------------|----------|---------|-------------|
+| `tasksPerLevel` | `number` | `30`    | Completed tasks needed to advance one level |
+
+---
+
+## Data Storage & Persistence
+
+### Primary Storage
+
+- **Key**: `taskManagerData` in `localStorage`
+- **Format**: Single JSON blob containing all app data (`AppData` interface)
+- **Schema Version**: `3` (with migration support from older versions)
+- **Storage Version**: `"1.0.0"`
+
+### AppData Root Structure
+
+```
+{
+  version: "1.0.0",
+  schemaVersion: 3,
+  lastUpdated: "<ISO timestamp>",
+  tasks: Task[],
+  projects: Project[],
+  habits: Habit[],
+  dailyHabitLogs: HabitLog[],
+  expenses: FinanceItem[],
+  revenue: FinanceItem[],
+  charges: FinanceItem[],
+  categories: string[],
+  userStats: UserStats,
+  settings: Settings,
+  wishList: WishItem[],
+  wishLists: WishList[],
+  notes: Note[],
+  shoppingList: ShoppingItem[]
+}
+```
+
+### Secondary Storage
+
+- **Key**: `taskManagerFilterSettings` in `localStorage`
+- **Content**: `{ statusFilter: string, hideCompleted: boolean }`
+- **Purpose**: Persists the Tasks tab filter state across sessions
+
+### Default Categories (seeded on first run)
+
+`Work`, `Personal`, `Home`, `Shopping`, `Health`, `Fitness`, `Learning`, `Productivity`, `Food`, `Transportation`, `Entertainment`, `Utilities`, `Income`
+
+### ID Generation
+
+IDs are generated client-side: `Date.now().toString(36) + Math.random().toString(36).substr(2)`
+
+### Data Migration
+
+The `StorageManager` supports migration from older schema versions:
+- On initialization, if `schemaVersion < 3`, `migrateToLatest()` runs automatically
+- Handles legacy category structures (per-type object → flat array)
+- Handles legacy `UserStats` fields (`totalPoints`, `pointsBreakdown` → removed)
+- Missing collections default to empty arrays; missing settings get default values
+
+### Import/Export
+
+- **Export**: Downloads all data as timestamped JSON file (`task-manager-backup-YYYY-MM-DD.json`)
+- **Import**: Validates uploaded JSON; supports full import and partial data migration with user confirmation
+- **Validation**: Checks for `version`, `tasks`, and `projects` fields; warns about missing/invalid fields
+
+---
+
+## Application Architecture
+
+### File Structure
+
+```
+src/storage.ts    → StorageManager class (data layer, all CRUD operations)
+src/app.ts        → TaskManager class (UI logic, event handlers, rendering)
+index.html        → Single-page HTML shell with all tab sections
+css/styles.css    → All styling
+service-worker.js → PWA offline caching
+manifest.json     → PWA install manifest
+```
+
+### Class Structure
+
+**`StorageManager`** (in `storage.ts`):
+- Manages all data access and persistence
+- CRUD methods for every entity type
+- Streak & level calculation
+- Category management with propagation
+- Export/import/migration
+
+**`TaskManager`** (in `app.ts`):
+- All UI rendering (DOM manipulation via `innerHTML`)
+- Event listener setup and handling
+- Tab switching
+- Modal management (open/close/populate)
+- Recurring task generation on completion
+- Finance chart rendering (pie chart, Sankey diagram via inline SVG)
+- Drag & drop for wish list (desktop + touch)
+- Date navigation
+
+### Rendering Pattern
+
+All rendering is done via DOM manipulation:
+1. Read data from `StorageManager`
+2. Build HTML strings with template literals
+3. Set `innerHTML` on container elements
+4. Attach event listeners to newly created elements
+
+---
+
+## Feature Specifications
+
+### Navigation & Layout
+
+**Header**:
+- App title: "📋 Task Manager"
+- Two stats displayed: **Level** (with progress subtitle `X/N tasks`) and **Streak**
+
+**Navigation**:
+- 9 tabs: Dashboard, Tasks, Projects, Habits, Wish List, Shopping, Notes, Finances, Settings
+- Each tab has an emoji icon prefix
+- On mobile (≤768px): hamburger menu that toggles tab visibility
+- Clicking a tab hides all other content sections and shows the selected one
+- Tab click also triggers re-rendering of that tab's content
+
+**Modals**:
+- Used for all create/edit forms
+- Opened by adding CSS class `active` to `.modal` element
+- Closed by clicking the `×` button, clicking the backdrop, or pressing Cancel
+- Delete button appears only when editing (not creating)
+- All delete operations require `confirm()` dialog
+
+### Date Navigator
+
+- Displayed below the header, above tabs
+- Shows the selected date in format: `"Today — Wednesday, Mar 31"` or `"Wednesday, Mar 31"` for past days
+- Left/right arrows to navigate between days
+- Can navigate up to **6 days into the past** (no future navigation beyond today)
+- "Back to Today" button appears when viewing a past day
+- Changing the date re-renders the active tab
+- Affects: Dashboard overview counts, Habits (view/log past completions), Tasks (due date context)
+
+### 1. Dashboard
+
+**Today's Overview Card** (4 stats):
+| Stat | Description | Clickable? |
+|------|-------------|------------|
+| Tasks Due Today | Count of incomplete tasks with `dueDate === selectedDate` | Yes → navigates to Tasks tab |
+| Overdue Tasks | Count of incomplete tasks with `dueDate < selectedDate` | Yes → navigates to Tasks tab with `overdue` filter pre-set |
+| Completed Today | Count of tasks with `completedDate === selectedDate` | No |
+| Incomplete Habits | Count of habits scheduled for today that haven't reached their target goal | No |
+
+**Incomplete Habits List**:
+- Below the overview stats
+- Shows each incomplete habit with icon, name, and progress (`X/Y (Z%)`)
+- If all habits complete: shows "All habits completed for today! 🎉"
+- Clicking a habit navigates to the Habits tab
+
+**Recent Activity Feed**:
+- Shows the 5 most recent activities
+- Sources: completed tasks (icon: `✓`) and habit logs (icon: `⭐`)
+- Sorted by date descending
+- Each entry: `[icon] [message]` + date
+
+**Active Projects Summary**:
+- Lists all projects with progress bars
+- Per project: name, `X/Y tasks (Z%)`, visual progress bar
+
+### 2. Tasks
+
+**Task List Display** (no active filters):
+Tasks are organized into sections in this order:
+1. **Overdue** — incomplete tasks where `dueDate < today`
+2. **Due Today** — all tasks (completed or not) where `dueDate === today`
+3. **Upcoming Tasks** — incomplete tasks where `dueDate > today` (excludes daily repeat type), sorted by due date then title
+4. **No Due Date** — tasks with no `dueDate` set
+
+**Task List Display** (with filters active):
+- Flat list, no section headers
+
+**Task Item Rendering**:
+- Checkbox (toggle completion)
+- Title
+- Description (if expanded view or if present)
+- Meta info: 📅 due date, 🔁 repeat type
+- Status badge: `pending` / `completed` / `overdue`
+- "Days until due" badge: `Overdue`, `Today`, `1 day`, `N days`
+
+**Expand/Collapse View**:
+- Toggle button: `⊞ Expand Details` / `⊟ Collapse Details`
+- Adds `expanded` CSS class to task list container
+
+**Filters**:
+| Filter | Type | Options | Persisted? |
+|--------|------|---------|------------|
+| Status | Dropdown | All, Pending, Completed, Overdue | Yes (localStorage) |
+| Search | Text input | Searches `title` and `description` (case-insensitive) | No |
+| Hide Completed | Toggle button | Shows/hides completed tasks | Yes (localStorage) |
+| Reset Filters | Button | Clears all filters and removes persisted settings | — |
+
+**Task Create/Edit Modal** fields:
+| Field | Type | Required | Notes |
+|-------|------|----------|-------|
+| Title | Text input | Yes | — |
+| Description | Textarea (4 rows) | No | — |
+| Due Date | Date picker | No | — |
+| Repeat Type | Dropdown | No | `none`, `daily`, `weekly`, `monthly`, `yearly`, `custom`, `movable` |
+| Repeat Every | Number input | Conditional | Shown for daily/weekly/monthly/yearly; label changes (e.g. "week(s)") |
+| Days of Week | 7 checkboxes (Sun–Sat) | Conditional | Shown for daily and weekly repeat types |
+| Repeat Every (Days) | Number input | Conditional | Shown for `custom` repeat type |
+| Days Until Due (From Completion) | Number input | Conditional | Shown for `movable` repeat type |
+| Project | Dropdown | No | Populated from existing projects; option "None" |
+
+**Task Completion Behavior**:
+1. Toggle `completed` flag, set `completedDate` to selected date
+2. Call `updateDailyStreak(true)` — increments streak if first activity today
+3. If task has a repeat type other than `none`, create next recurring task instance
+4. Recalculate user level
+5. Re-render Tasks, Dashboard, and Projects
+
+**Recurring Task Generation** (`createNextRecurringTask`):
+When a recurring task is marked complete, a new task is created with a recalculated due date:
+
+| Repeat Type | Next Due Date Calculation |
+|-------------|--------------------------|
+| `daily` | If `daysOfWeek` specified: next matching day from completion date. Otherwise: completion date + `repeatUnit` days |
+| `weekly` | If `daysOfWeek` specified: next matching day + `(repeatUnit - 1) * 7` days. Otherwise: completion date + `repeatUnit * 7` days |
+| `monthly` | Completion date + `repeatUnit` months |
+| `yearly` | Completion date + `repeatUnit` years |
+| `custom` | Completion date + `customRepeatDays` days |
+| `movable` | Completion date + `movableRepeatDays` days |
+
+The new task inherits: title, description, projectId, repeatType, repeatUnit, customRepeatDays, movableRepeatDays, daysOfWeek. The original completed task stays in history.
+
+**Uncompleting a Task**:
+- Clears `completedDate` to `null`, sets `completed` to `false`
+- Recalculates level (does not decrement streak)
+- Note: does not delete the next recurring task if one was created
+
+### 3. Projects
+
+**Project List**:
+- Cards with colored top border (from `color` field)
+- Displays: name, description (if any), task count, completed count, percentage, progress bar
+- Clicking a card opens the Project Detail modal
+
+**Project Create/Edit Modal** fields:
+| Field | Type | Required | Default |
+|-------|------|----------|---------|
+| Name | Text input | Yes | — |
+| Description | Textarea (3 rows) | No | — |
+| Color Tag | Color picker (`<input type="color">`) | No | `#3b82f6` |
+
+**Project Detail Modal** (read-only overview):
+- Project name and description
+- Stats: Total Tasks, Completed, Progress %
+- List of all related tasks with checkboxes
+  - Checking/unchecking a task toggles completion and refreshes the modal
+  - Clicking a task navigates to Task edit modal
+- Buttons: "Edit Project" (opens edit modal), "Close"
+
+**Project Deletion**:
+- Confirms with dialog: "Are you sure? This will not delete the tasks in it."
+- All tasks with this `projectId` have it set to `null` (unlinked, not deleted)
+
+### 4. Habits
+
+**Habit Card** rendering:
+- Emoji icon (large display)
+- Habit name and optional description
+- Stats: Streak count, Progress (`X/Y` completions today)
+- Progress bar with percentage
+- Completion status text: `✓ Complete!` or `X% Complete`
+- Action button with contextual label:
+  | Condition | Button Label | Enabled? |
+  |-----------|-------------|----------|
+  | Not scheduled for today's day of week | `✗ Not Scheduled` | Disabled |
+  | Complete (≥ targetGoal today) & today | `✓ Done for Today` | Disabled |
+  | Complete (≥ targetGoal) & past day | `✓ Logged` | Disabled |
+  | Incomplete & today | `+ Complete` | Enabled |
+  | Incomplete & past day | `+ Log Past Day` | Enabled |
+
+**Habit Create/Edit Modal** fields:
+| Field | Type | Required | Default |
+|-------|------|----------|---------|
+| Habit Name | Text input | Yes | — |
+| Description | Textarea (3 rows) | No | — |
+| Icon/Emoji | Emoji picker (modal grid) | No | `⭐` |
+| Category | Dropdown (shared categories) + inline "Add New" | No | — |
+| Daily Target Goal | Number input (min 1) | No | `1` |
+| Days of Week | 7 checkboxes (Sun–Sat) | No | All checked by default |
+
+**Emoji Picker**:
+- Grid modal with 80 emojis organized by category
+- Categories: Activity, Food & Health, Work & Productivity, Learning & Mind, Nature & Outdoors, Sleep & Rest, Social & Fun, Sports & Games, Habits & Goals, Misc
+- Clicking an emoji selects it and closes the picker
+
+**Habit Completion** (`completeHabit`):
+1. Verify the habit is scheduled for the selected day of week
+2. Log a `HabitLog` entry for the habit and selected date
+3. Update streak: count consecutive fully-completed days going backward from the most recent
+4. Call `updateDailyStreak(true)`
+5. Re-render Habits and Dashboard
+
+**Streak Calculation Algorithm** (`calculateHabitStreak`):
+1. Get all logs for the habit, count completions per date
+2. Filter to dates where completions ≥ `targetGoal`
+3. Sort dates descending (most recent first)
+4. Starting from the most recent date, count consecutive days backward
+5. Break on the first gap
+
+### 5. Finances
+
+**Three financial types** sharing the same `FinanceItem` data model:
+- **Expenses** — stored in `data.expenses`
+- **Revenue** — stored in `data.revenue`
+- **Charges** — stored in `data.charges` (not currently exposed in UI for add; exists in data layer)
+
+**Summary Cards** (top of Finances tab):
+- **Total Income**: Sum of filtered revenue items' `monthlyAmount`
+- **Total Expenses**: Sum of filtered expense items' `monthlyAmount`
+- **Net Balance**: Total Income - Total Expenses
+
+**Monthly Amount Calculation** for recurring items:
+- `once`: `monthlyAmount = amount`
+- `monthly`: `monthlyAmount = amount`
+- `yearly`: `monthlyAmount = amount / 12`
+
+**Date Range Filter**:
+- From/To date inputs, defaulting to the first and last day of the current month
+- `← Prev` / `Next →` buttons for month navigation
+- `Apply` button to filter with current date range
+- `This Month` button to reset to current month
+- Filtering rules:
+  - One-time items: included if `date` falls within the range
+  - Monthly/yearly recurring items: included if `date <= endDate` (they persist after creation)
+  - Items with no date are excluded when a filter is active
+
+**Sub-tabs** within Finances:
+1. **Expenses** — list of expense items
+2. **Revenue** — list of revenue items
+3. **Charts** — Pie chart + Sankey diagram
+
+**Finance Item Rendering**:
+- Description, category (📂), date (📅), recurring status (🔁)
+- Amount: `-$X.XX` for expenses, `+$X.XX` for revenue
+- Yearly items show `/mo` suffix to indicate the displayed monthly equivalent
+- Clicking an item opens the edit modal
+
+**Finance Create/Edit Modal** fields:
+| Field | Type | Required | Notes |
+|-------|------|----------|-------|
+| Description | Text input | Yes | — |
+| Amount | Number input (step 0.01, min 0) | Yes | — |
+| Date | Date picker | No | Defaults to today |
+| Recurring | Dropdown | No | `One-time`, `Monthly`, `Yearly`; shown for expense/revenue |
+| Category | Dropdown (shared categories) + inline "Add New" | No | — |
+
+**Charts**:
+
+*Expense Pie Chart*:
+- SVG-based pie chart (no external library)
+- Groups expenses by category, shows proportional slices
+- Legend with: color dot, category name, `$amount (X.X%)`
+- 10-color palette cycling
+
+*Sankey Diagram*:
+- SVG-based flow diagram (no external library)
+- Left nodes: revenue sources (by category/description)
+- Right nodes: expense categories
+- Curved paths showing proportional flow from income to expenses
+- Color-coded by expense category
+
+### 6. Wish List
+
+**Two-level organization**:
+1. **Named Lists** (WishList): collapsible groups (e.g., "Electronics", "Books")
+2. **Uncategorized**: default group for items without a `listId`
+
+**Wish List Group** rendering:
+- Collapse/expand toggle button (`▼` / `▶`)
+- Group name
+- Counter: `X remaining` (unpurchased items)
+- `Edit` button (for named lists only) → opens WishList edit modal
+- `+ Add` button → opens WishItem modal pre-selecting this list
+- Items rendered inside the group
+
+**Wish Item** rendering:
+- Drag handle (`⠿`) for reordering
+- Checkbox ("Mark as received")
+- Title
+- Optional price (`$X.XX`)
+- Optional URL (`🔗 View Listing` — opens in new tab)
+- `Edit` button
+
+**Drag & Drop Reordering**:
+- Desktop: HTML5 Drag & Drop API; dragging only activates from the drag handle
+- Mobile: Touch events with drag threshold (10px); temporarily hides dragged element to find drop target via `elementFromPoint`
+- Reordering is scoped to the item's list group (within named list or within uncategorized)
+- On drop, `reorderWishItems()` updates order values in storage
+
+**Collapse State**:
+- Tracked in memory (`expandedWishLists: Set<string>`)
+- Named lists start collapsed; state is not persisted across page reloads
+
+**WishItem Create/Edit Modal** fields:
+| Field | Type | Required | Default |
+|-------|------|----------|---------|
+| Title | Text input | Yes | — |
+| List | Dropdown | No | Uncategorized; pre-selected if adding from a list group |
+| URL | URL input | No | — |
+| Approximate Price | Number input (step 0.01, min 0) | No | — |
+
+**WishList Create/Edit Modal** fields:
+| Field | Type | Required |
+|-------|------|----------|
+| List Name | Text input | Yes |
+
+**WishList Deletion**:
+- Confirms: "Items in this list will become uncategorized"
+- All items with this `listId` get `listId` set to `null`
+- List is removed and remaining lists re-indexed
+
+### 7. Shopping List
+
+**Simple checklist** interface:
+- Item name + optional quantity
+- Checkbox to mark as collected (completed items show with strikethrough styling)
+- `Edit` button per item
+- `Clear Checked` button removes all completed items from storage
+- Items sorted by creation date (oldest first)
+
+**ShoppingItem Create/Edit Modal** fields:
+| Field | Type | Required | Notes |
+|-------|------|----------|-------|
+| Item Name | Text input | Yes | Placeholder: "e.g. Milk" |
+| Quantity | Text input | No | Free text, placeholder: "e.g. 2 litres" |
+
+### 8. Notes
+
+**Note Card Grid**:
+- Each note shows: title (or "Untitled"), content preview (first 120 chars), date
+- Sorted by most recently updated (then by creation date)
+- Clicking a card opens the edit modal
+
+**Note Create/Edit Modal** fields:
+| Field | Type | Required |
+|-------|------|----------|
+| Title | Text input | No (displays as "Untitled" if empty) |
+| Content | Textarea (8 rows) | No |
+
+**Auto-updating**:
+- `updatedDate` is set automatically on every save/edit
+
+### 9. Settings
+
+**Leveling System**:
+- Configure `tasksPerLevel` (number input, min 1, max 100, default 30)
+- Save button recalculates level immediately and alerts the user
+- Status display: Current Level, Total Completed Tasks, Tasks to Next Level
+
+**Data Management**:
+| Action | Description |
+|--------|-------------|
+| Export Data | Downloads JSON backup with filename `task-manager-backup-YYYY-MM-DD.json` |
+| Import Data | File upload; validates structure; supports partial data migration with user prompt |
+| Migrate to Latest Version | Runs `migrateToLatest()` — safe to run anytime; then reloads |
+| Clear All Data | `confirm()` dialog → removes storage key → reinitializes defaults → reloads if confirmed |
+
+**Category Management**:
+- Shared categories list used across Tasks (not yet wired), Habits, and all Finance types
+- Add new category (text input + Add button)
+- Edit category in-place (converts label to text input; Save/Cancel buttons)
+- Delete category with confirmation: clears `category` field on all items using that category
+- Rename propagates to all Habits, Expenses, Revenue, and Charges
+
+**Data Version Display**:
+- Shows version string (`1.0.0`) and last updated timestamp
+
+---
+
+## Gamification System
+
+### Level Calculation
+
+```
+level = Math.floor(completedTasksCount / tasksPerLevel) + 1
+```
+
+- `completedTasksCount` = total tasks where `completed === true`
+- `tasksPerLevel` = configurable in Settings (default: 30)
+- Recalculated on: task completion, task uncompletion, settings change
+
+### Progress Display
+
+- Header shows: `Level X` with subtitle `Y/N tasks` where Y = `completedTasksCount % tasksPerLevel`
+
+### Daily Streak
+
+- Incremented when a task or habit is completed and `lastActivityDate !== today`
+- If `lastActivityDate` was yesterday, streak increments by 1
+- If `lastActivityDate` was earlier than yesterday, streak resets to 1
+- `lastActivityDate` is updated to today on any activity
+- Streak never decrements automatically (no background job)
+
+---
+
+## PWA Capabilities
+
+### Service Worker
+
+- **Cache-first strategy**: serves cached assets when offline, falls back to network
+- **Cached assets**: `/`, `/index.html`, `/css/styles.css`, `/js/storage.js`, `/js/app.js`
+- **Cache cleanup**: on activation, deletes any caches not matching current `CACHE_NAME`
+- Uses `skipWaiting()` and `clients.claim()` for immediate activation
+
+### Web App Manifest
+
+| Property | Value |
+|----------|-------|
+| Name | Task Manager |
+| Short Name | TaskManager |
+| Display | Standalone |
+| Orientation | Portrait-primary |
+| Theme Color | `#4CAF50` (green) |
+| Background Color | `#ffffff` |
+| Categories | Productivity, Lifestyle |
+| Icons | 192×192, 512×512 PNG (maskable) |
+
+---
+
+## .NET MAUI Migration Guide
+
+### Recommended Architecture
+
+| Web Layer | .NET MAUI Equivalent |
+|-----------|---------------------|
+| `localStorage` | SQLite via `sqlite-net-pcl` using EF Core; preferences via `Preferences` API |
+| `StorageManager` class | Repository or Service classes per entity |
+| `TaskManager` class (UI) | MVVM pattern: ViewModels + XAML Views |
+| HTML templates | XAML ContentPages + DataTemplates |
+| CSS classes | MAUI Styles and Resources |
+| Tab navigation | `Shell` with `TabBar` or `TabbedPage` |
+| Modals | `Navigation.PushModalAsync()` or `CommunityToolkit.Maui` popups |
+| Service Worker | Not needed (native app); consider `BackgroundService` for notifications |
+
+### Project Structure Suggestion
+
+```
+TaskManager.Maui/
+├── Models/
+│   ├── Task.cs
+│   ├── Project.cs
+│   ├── Habit.cs
+│   ├── HabitLog.cs
+│   ├── FinanceItem.cs
+│   ├── WishItem.cs
+│   ├── WishList.cs
+│   ├── Note.cs
+│   ├── ShoppingItem.cs
+│   ├── UserStats.cs
+│   └── Settings.cs
+├── Services/
+│   ├── IDataService.cs
+│   ├── DataService.cs          (SQLite implementation)
+│   ├── ITaskService.cs
+│   ├── TaskService.cs
+│   ├── IHabitService.cs
+│   ├── HabitService.cs
+│   ├── IFinanceService.cs
+│   ├── FinanceService.cs
+│   ├── IExportImportService.cs
+│   └── ExportImportService.cs
+├── ViewModels/
+│   ├── DashboardViewModel.cs
+│   ├── TasksViewModel.cs
+│   ├── TaskDetailViewModel.cs
+│   ├── ProjectsViewModel.cs
+│   ├── ProjectDetailViewModel.cs
+│   ├── HabitsViewModel.cs
+│   ├── HabitDetailViewModel.cs
+│   ├── FinancesViewModel.cs
+│   ├── WishListViewModel.cs
+│   ├── ShoppingListViewModel.cs
+│   ├── NotesViewModel.cs
+│   └── SettingsViewModel.cs
+├── Views/
+│   ├── DashboardPage.xaml
+│   ├── TasksPage.xaml
+│   ├── TaskDetailPage.xaml
+│   ├── ProjectsPage.xaml
+│   ├── ProjectDetailPage.xaml
+│   ├── HabitsPage.xaml
+│   ├── HabitDetailPage.xaml
+│   ├── FinancesPage.xaml
+│   ├── WishListPage.xaml
+│   ├── ShoppingListPage.xaml
+│   ├── NotesPage.xaml
+│   └── SettingsPage.xaml
+├── Converters/
+│   ├── BoolToStrikethroughConverter.cs
+│   ├── PercentToWidthConverter.cs
+│   └── DateFormatConverter.cs
+├── Resources/
+│   ├── Styles/
+│   └── Fonts/
+├── App.xaml
+├── AppShell.xaml
+└── MauiProgram.cs
+```
+
+### Key Migration Decisions
+
+#### 1. Data Storage: localStorage → SQLite
+
+The web app stores everything as a single JSON blob. For MAUI, use SQLite with one table per entity with EF Core for management:
+
+```
+Tables: Tasks, Projects, Habits, HabitLogs, Expenses, Revenue, Charges,
+        WishItems, WishLists, Notes, ShoppingItems, Categories, UserStats, Settings
+```
+
+Consider using `sqlite-net-pcl` with `[Table]` and `[PrimaryKey]` attributes on model classes. Keep the same date format (`YYYY-MM-DD` strings) for simplicity, or migrate to `DateTime` types.
+
+#### 2. Import/Export Compatibility
+
+To maintain data portability with the web version:
+- Export should produce the same JSON structure (`AppData`)
+- Import should accept the web app's JSON format
+- Add a `JsonImportExportService` that maps between SQLite models and the flat `AppData` JSON structure
+
+#### 3. Navigation: Tabs via Shell
+
+```xml
+<Shell>
+  <TabBar>
+    <Tab Title="Dashboard" Icon="home.png">
+      <ShellContent ContentTemplate="{DataTemplate views:DashboardPage}" />
+    </Tab>
+    <Tab Title="Tasks" Icon="check.png">
+      <ShellContent ContentTemplate="{DataTemplate views:TasksPage}" />
+    </Tab>
+    <!-- ... 7 more tabs ... -->
+  </TabBar>
+</Shell>
+```
+
+Note: 9 tabs is a lot for mobile. Consider grouping some tabs under a flyout menu or using a "More" tab that lists less-used features (Notes, Shopping, Wish List).
+
+#### 4. Recurring Task Logic
+
+Port the `createNextRecurringTask` method and `nextOccurrenceOfDays` helper directly. The date arithmetic is straightforward and maps 1:1 to C# `DateTime` operations:
+
+| TypeScript | C# Equivalent |
+|------------|---------------|
+| `date.setDate(date.getDate() + n)` | `date.AddDays(n)` |
+| `date.setMonth(date.getMonth() + n)` | `date.AddMonths(n)` |
+| `date.setFullYear(date.getFullYear() + n)` | `date.AddYears(n)` |
+| `date.getDay()` | `date.DayOfWeek` (enum, Sunday=0) |
+
+#### 5. Charts
+
+The web app renders SVG charts manually. For MAUI:
+- **Option A**: Use `Microcharts.Maui` or `LiveChartsCore` for pie charts
+- **Option B**: Use `SkiaSharp` with `Microsoft.Maui.Graphics` for custom drawing (Sankey diagram)
+
+#### 6. Drag & Drop (Wish List)
+
+MAUI supports drag & drop via `DragGestureRecognizer` and `DropGestureRecognizer`. The `CollectionView` with reorder support can work. Alternatively, use `CommunityToolkit.Maui` `ReorderableCollectionView`.
+
+#### 7. Emoji Picker (Habits)
+
+No native emoji picker in MAUI:
+- Use the system keyboard emoji picker as an alternative
+
+#### 8. Streak & Level Calculation
+
+Port `calculateHabitStreak` and level formula directly. These are pure logic with no platform dependencies.
+
+#### 9. Notifications (Enhancement Opportunity)
+
+The web app has no notifications. MAUI can add:
+- Local notifications for overdue tasks
+- Daily habit reminders
+- Use `Plugin.LocalNotification` NuGet package
+
+#### 10. Offline Support
+
+The web app uses a service worker for offline. In MAUI, this is native — SQLite data is always available offline.
+
+### NuGet Packages to Consider
+
+| Package | Purpose |
+|---------|---------|
+| `sqlite-net-pcl` | Local SQLite database |
+| `CommunityToolkit.Mvvm` | MVVM helpers (`ObservableObject`, `RelayCommand`, etc.) |
+| `CommunityToolkit.Maui` | UI helpers (popups, converters, behaviors) |
+| `Microcharts.Maui` or `LiveChartsCore` | Chart rendering |
+| `SkiaSharp.Views.Maui.Controls` | Custom drawing (Sankey diagram) |
+| `Plugin.LocalNotification` | Push/local notifications |
+| `Newtonsoft.Json` or `System.Text.Json` | JSON import/export |
+
+### Migration Priority Order
+
+Recommended order for incremental migration:
+
+1. **Models + EF Core + SQLite setup** — Define all entity classes and database schema
+2. **Settings page** — Simple CRUD, validates the data layer works
+3. **Tasks** — Core feature; includes CRUD, filtering, recurring logic
+4. **Projects** — Simple CRUD + relationship to Tasks
+5. **Habits** — CRUD + completion logging + streak calculation
+6. **Dashboard** — Aggregation view pulling from Tasks + Habits + Projects
+7. **Shopping List** — Simple checklist
+8. **Notes** — Simple CRUD
+9. **Wish List** — CRUD + drag-and-drop reordering + list grouping
+10. **Finances** — CRUD + date filtering + chart rendering
+11. **Export/Import** — JSON compatibility with web version
+12. **Gamification** — Level + Streak display in header/shell
\ No newline at end of file

From 2b3f9e2e12ca3a091639b9a4a522090559c2ae5f Mon Sep 17 00:00:00 2001
From: joeprogrammer88 <joeProgrammer88@users.noreply.github.com>
Date: Tue, 31 Mar 2026 08:23:58 -0700
Subject: [PATCH 02/11] Add test project

---
 .../Converters/ConverterTests.cs              | 208 +++++++++
 .../Helpers/TestDatabaseService.cs            |  56 +++
 .../Models/FinanceItemTests.cs                |  57 +++
 SarahsDailyApp.Tests/Models/HabitTests.cs     |  67 +++
 .../Models/OtherModelTests.cs                 | 101 +++++
 SarahsDailyApp.Tests/Models/TaskItemTests.cs  |  78 ++++
 .../SarahsDailyApp.Tests.csproj               |  31 ++
 .../Services/CategoryServiceTests.cs          | 197 ++++++++
 .../Services/ExportImportServiceTests.cs      | 254 +++++++++++
 .../Services/FinanceServiceTests.cs           | 235 ++++++++++
 .../Services/HabitServiceTests.cs             | 245 ++++++++++
 .../Services/NoteServiceTests.cs              | 126 ++++++
 .../Services/ProjectServiceTests.cs           | 116 +++++
 .../Services/ShoppingServiceTests.cs          | 133 ++++++
 .../Services/TaskServiceTests.cs              | 421 ++++++++++++++++++
 .../Services/UserStatsServiceTests.cs         | 248 +++++++++++
 .../Services/WishListServiceTests.cs          | 208 +++++++++
 SarahsDailyApp.slnx                           |   1 +
 SarahsDailyApp/AppShell.xaml                  |  19 +-
 SarahsDailyApp/Services/DatabaseService.cs    |   2 +-
 20 files changed, 2793 insertions(+), 10 deletions(-)
 create mode 100644 SarahsDailyApp.Tests/Converters/ConverterTests.cs
 create mode 100644 SarahsDailyApp.Tests/Helpers/TestDatabaseService.cs
 create mode 100644 SarahsDailyApp.Tests/Models/FinanceItemTests.cs
 create mode 100644 SarahsDailyApp.Tests/Models/HabitTests.cs
 create mode 100644 SarahsDailyApp.Tests/Models/OtherModelTests.cs
 create mode 100644 SarahsDailyApp.Tests/Models/TaskItemTests.cs
 create mode 100644 SarahsDailyApp.Tests/SarahsDailyApp.Tests.csproj
 create mode 100644 SarahsDailyApp.Tests/Services/CategoryServiceTests.cs
 create mode 100644 SarahsDailyApp.Tests/Services/ExportImportServiceTests.cs
 create mode 100644 SarahsDailyApp.Tests/Services/FinanceServiceTests.cs
 create mode 100644 SarahsDailyApp.Tests/Services/HabitServiceTests.cs
 create mode 100644 SarahsDailyApp.Tests/Services/NoteServiceTests.cs
 create mode 100644 SarahsDailyApp.Tests/Services/ProjectServiceTests.cs
 create mode 100644 SarahsDailyApp.Tests/Services/ShoppingServiceTests.cs
 create mode 100644 SarahsDailyApp.Tests/Services/TaskServiceTests.cs
 create mode 100644 SarahsDailyApp.Tests/Services/UserStatsServiceTests.cs
 create mode 100644 SarahsDailyApp.Tests/Services/WishListServiceTests.cs

diff --git a/SarahsDailyApp.Tests/Converters/ConverterTests.cs b/SarahsDailyApp.Tests/Converters/ConverterTests.cs
new file mode 100644
index 0000000..e977f8f
--- /dev/null
+++ b/SarahsDailyApp.Tests/Converters/ConverterTests.cs
@@ -0,0 +1,208 @@
+using System.Globalization;
+using SarahsDailyApp.Converters;
+using SarahsDailyApp.Models;
+
+namespace SarahsDailyApp.Tests.Converters;
+
+public class ConverterTests
+{
+    private static readonly CultureInfo Culture = CultureInfo.InvariantCulture;
+
+    // --- InverseBoolConverter ---
+
+    [Theory]
+    [InlineData(true, false)]
+    [InlineData(false, true)]
+    public void InverseBoolConverter_Convert_InvertsBool(bool input, bool expected)
+    {
+        var converter = new InverseBoolConverter();
+        var result = converter.Convert(input, typeof(bool), null, Culture);
+        Assert.Equal(expected, result);
+    }
+
+    [Theory]
+    [InlineData(true, false)]
+    [InlineData(false, true)]
+    public void InverseBoolConverter_ConvertBack_InvertsBool(bool input, bool expected)
+    {
+        var converter = new InverseBoolConverter();
+        var result = converter.ConvertBack(input, typeof(bool), null, Culture);
+        Assert.Equal(expected, result);
+    }
+
+    [Fact]
+    public void InverseBoolConverter_Convert_NonBool_ReturnsValue()
+    {
+        var converter = new InverseBoolConverter();
+        var result = converter.Convert("not a bool", typeof(bool), null, Culture);
+        Assert.Equal("not a bool", result);
+    }
+
+    // --- BoolToStrikethroughConverter ---
+
+    [Fact]
+    public void BoolToStrikethroughConverter_True_ReturnsStrikethrough()
+    {
+        var converter = new BoolToStrikethroughConverter();
+        var result = converter.Convert(true, typeof(TextDecorations), null, Culture);
+        Assert.Equal(TextDecorations.Strikethrough, result);
+    }
+
+    [Fact]
+    public void BoolToStrikethroughConverter_False_ReturnsNone()
+    {
+        var converter = new BoolToStrikethroughConverter();
+        var result = converter.Convert(false, typeof(TextDecorations), null, Culture);
+        Assert.Equal(TextDecorations.None, result);
+    }
+
+    [Fact]
+    public void BoolToStrikethroughConverter_NonBool_ReturnsNone()
+    {
+        var converter = new BoolToStrikethroughConverter();
+        var result = converter.Convert("not a bool", typeof(TextDecorations), null, Culture);
+        Assert.Equal(TextDecorations.None, result);
+    }
+
+    // --- PercentToProgressConverter ---
+
+    [Theory]
+    [InlineData(0.0, 0.0)]
+    [InlineData(50.0, 0.5)]
+    [InlineData(100.0, 1.0)]
+    [InlineData(75.0, 0.75)]
+    public void PercentToProgressConverter_ConvertsCorrectly(double input, double expected)
+    {
+        var converter = new PercentToProgressConverter();
+        var result = converter.Convert(input, typeof(double), null, Culture);
+        Assert.Equal(expected, result);
+    }
+
+    [Fact]
+    public void PercentToProgressConverter_NonDouble_ReturnsZero()
+    {
+        var converter = new PercentToProgressConverter();
+        var result = converter.Convert("not a double", typeof(double), null, Culture);
+        Assert.Equal(0.0, result);
+    }
+
+    // --- IsNotNullConverter ---
+
+    [Fact]
+    public void IsNotNullConverter_Null_ReturnsFalse()
+    {
+        var converter = new IsNotNullConverter();
+        var result = converter.Convert(null, typeof(bool), null, Culture);
+        Assert.Equal(false, result);
+    }
+
+    [Fact]
+    public void IsNotNullConverter_NonNull_ReturnsTrue()
+    {
+        var converter = new IsNotNullConverter();
+        var result = converter.Convert(42, typeof(bool), null, Culture);
+        Assert.Equal(true, result);
+    }
+
+    [Fact]
+    public void IsNotNullConverter_EmptyString_ReturnsFalse()
+    {
+        var converter = new IsNotNullConverter();
+        var result = converter.Convert("", typeof(bool), null, Culture);
+        Assert.Equal(false, result);
+    }
+
+    [Fact]
+    public void IsNotNullConverter_NonEmptyString_ReturnsTrue()
+    {
+        var converter = new IsNotNullConverter();
+        var result = converter.Convert("hello", typeof(bool), null, Culture);
+        Assert.Equal(true, result);
+    }
+
+    // --- IsNotZeroConverter ---
+
+    [Fact]
+    public void IsNotZeroConverter_Zero_ReturnsFalse()
+    {
+        var converter = new IsNotZeroConverter();
+        var result = converter.Convert(0, typeof(bool), null, Culture);
+        Assert.Equal(false, result);
+    }
+
+    [Fact]
+    public void IsNotZeroConverter_NonZero_ReturnsTrue()
+    {
+        var converter = new IsNotZeroConverter();
+        var result = converter.Convert(5, typeof(bool), null, Culture);
+        Assert.Equal(true, result);
+    }
+
+    [Fact]
+    public void IsNotZeroConverter_NegativeNumber_ReturnsTrue()
+    {
+        var converter = new IsNotZeroConverter();
+        var result = converter.Convert(-1, typeof(bool), null, Culture);
+        Assert.Equal(true, result);
+    }
+
+    // --- IsNotNoneConverter ---
+
+    [Fact]
+    public void IsNotNoneConverter_None_ReturnsFalse()
+    {
+        var converter = new IsNotNoneConverter();
+        var result = converter.Convert(RepeatType.None, typeof(bool), null, Culture);
+        Assert.Equal(false, result);
+    }
+
+    [Theory]
+    [InlineData(RepeatType.Daily)]
+    [InlineData(RepeatType.Weekly)]
+    [InlineData(RepeatType.Monthly)]
+    [InlineData(RepeatType.Yearly)]
+    [InlineData(RepeatType.Custom)]
+    [InlineData(RepeatType.Movable)]
+    public void IsNotNoneConverter_NonNone_ReturnsTrue(RepeatType repeatType)
+    {
+        var converter = new IsNotNoneConverter();
+        var result = converter.Convert(repeatType, typeof(bool), null, Culture);
+        Assert.Equal(true, result);
+    }
+
+    // --- StatusTextConverter ---
+
+    [Fact]
+    public void StatusTextConverter_True_ReturnsCompleted()
+    {
+        var converter = new StatusTextConverter();
+        var result = converter.Convert(true, typeof(string), null, Culture);
+        Assert.Equal("completed", result);
+    }
+
+    [Fact]
+    public void StatusTextConverter_False_ReturnsPending()
+    {
+        var converter = new StatusTextConverter();
+        var result = converter.Convert(false, typeof(string), null, Culture);
+        Assert.Equal("pending", result);
+    }
+
+    // --- StatusColorConverter ---
+
+    [Fact]
+    public void StatusColorConverter_True_ReturnsGreen()
+    {
+        var converter = new StatusColorConverter();
+        var result = converter.Convert(true, typeof(Color), null, Culture);
+        Assert.IsType<Color>(result);
+    }
+
+    [Fact]
+    public void StatusColorConverter_False_ReturnsOrange()
+    {
+        var converter = new StatusColorConverter();
+        var result = converter.Convert(false, typeof(Color), null, Culture);
+        Assert.IsType<Color>(result);
+    }
+}
diff --git a/SarahsDailyApp.Tests/Helpers/TestDatabaseService.cs b/SarahsDailyApp.Tests/Helpers/TestDatabaseService.cs
new file mode 100644
index 0000000..9a933e3
--- /dev/null
+++ b/SarahsDailyApp.Tests/Helpers/TestDatabaseService.cs
@@ -0,0 +1,56 @@
+using SQLite;
+using SarahsDailyApp.Models;
+using SarahsDailyApp.Services;
+
+namespace SarahsDailyApp.Tests.Helpers;
+
+/// <summary>
+/// A test-friendly DatabaseService that uses a unique temp file SQLite database
+/// instead of the MAUI FileSystem.AppDataDirectory path.
+/// </summary>
+public class TestDatabaseService : DatabaseService, IDisposable
+{
+    private SQLiteAsyncConnection? _database;
+    private bool _initialized;
+    private readonly string _dbPath;
+
+    public TestDatabaseService()
+    {
+        _dbPath = Path.Combine(Path.GetTempPath(), $"test_{Guid.NewGuid()}.db3");
+    }
+
+    public override async Task<SQLiteAsyncConnection> GetDatabaseAsync()
+    {
+        if (_initialized && _database is not null)
+            return _database;
+
+        _database = new SQLiteAsyncConnection(_dbPath);
+
+        await _database.CreateTableAsync<TaskItem>();
+        await _database.CreateTableAsync<Project>();
+        await _database.CreateTableAsync<Habit>();
+        await _database.CreateTableAsync<HabitLog>();
+        await _database.CreateTableAsync<FinanceItem>();
+        await _database.CreateTableAsync<WishItem>();
+        await _database.CreateTableAsync<WishList>();
+        await _database.CreateTableAsync<Note>();
+        await _database.CreateTableAsync<ShoppingItem>();
+        await _database.CreateTableAsync<UserStats>();
+        await _database.CreateTableAsync<AppSettings>();
+        await _database.CreateTableAsync<Category>();
+
+        // Seed defaults
+        await _database.InsertAsync(new UserStats());
+        await _database.InsertAsync(new AppSettings());
+
+        _initialized = true;
+        return _database;
+    }
+
+    public void Dispose()
+    {
+        _database?.CloseAsync().GetAwaiter().GetResult();
+        try { File.Delete(_dbPath); } catch { }
+        GC.SuppressFinalize(this);
+    }
+}
diff --git a/SarahsDailyApp.Tests/Models/FinanceItemTests.cs b/SarahsDailyApp.Tests/Models/FinanceItemTests.cs
new file mode 100644
index 0000000..bbe2da4
--- /dev/null
+++ b/SarahsDailyApp.Tests/Models/FinanceItemTests.cs
@@ -0,0 +1,57 @@
+using SarahsDailyApp.Models;
+
+namespace SarahsDailyApp.Tests.Models;
+
+public class FinanceItemTests
+{
+    [Fact]
+    public void NewFinanceItem_HasDefaultValues()
+    {
+        var item = new FinanceItem();
+
+        Assert.NotNull(item.Id);
+        Assert.NotEmpty(item.Id);
+        Assert.Equal(string.Empty, item.Description);
+        Assert.Equal(0m, item.Amount);
+        Assert.Null(item.Date);
+        Assert.Null(item.Category);
+        Assert.Equal(RecurringType.Once, item.Recurring);
+    }
+
+    [Fact]
+    public void MonthlyAmount_OnceRecurring_ReturnsAmount()
+    {
+        var item = new FinanceItem { Amount = 120m, Recurring = RecurringType.Once };
+        Assert.Equal(120m, item.MonthlyAmount);
+    }
+
+    [Fact]
+    public void MonthlyAmount_MonthlyRecurring_ReturnsAmount()
+    {
+        var item = new FinanceItem { Amount = 50m, Recurring = RecurringType.Monthly };
+        Assert.Equal(50m, item.MonthlyAmount);
+    }
+
+    [Fact]
+    public void MonthlyAmount_YearlyRecurring_ReturnsDividedByTwelve()
+    {
+        var item = new FinanceItem { Amount = 1200m, Recurring = RecurringType.Yearly };
+        Assert.Equal(100m, item.MonthlyAmount);
+    }
+
+    [Fact]
+    public void MonthlyAmount_YearlyRecurring_HandlesNonEvenDivision()
+    {
+        var item = new FinanceItem { Amount = 100m, Recurring = RecurringType.Yearly };
+        var expected = 100m / 12m;
+        Assert.Equal(expected, item.MonthlyAmount);
+    }
+
+    [Fact]
+    public void Id_IsUnique_AcrossInstances()
+    {
+        var item1 = new FinanceItem();
+        var item2 = new FinanceItem();
+        Assert.NotEqual(item1.Id, item2.Id);
+    }
+}
diff --git a/SarahsDailyApp.Tests/Models/HabitTests.cs b/SarahsDailyApp.Tests/Models/HabitTests.cs
new file mode 100644
index 0000000..d9cd938
--- /dev/null
+++ b/SarahsDailyApp.Tests/Models/HabitTests.cs
@@ -0,0 +1,67 @@
+using SarahsDailyApp.Models;
+
+namespace SarahsDailyApp.Tests.Models;
+
+public class HabitTests
+{
+    [Fact]
+    public void NewHabit_HasDefaultValues()
+    {
+        var habit = new Habit();
+
+        Assert.NotNull(habit.Id);
+        Assert.NotEmpty(habit.Id);
+        Assert.Equal(string.Empty, habit.Name);
+        Assert.Null(habit.Description);
+        Assert.Equal("⭐", habit.Icon);
+        Assert.Null(habit.Category);
+        Assert.Equal(1, habit.TargetGoal);
+        Assert.Equal("0,1,2,3,4,5,6", habit.DaysOfWeek);
+        Assert.Equal(0, habit.Streak);
+        Assert.Null(habit.LastCompletedDate);
+    }
+
+    [Fact]
+    public void DaysOfWeekArray_Get_ReturnsAllDays_WhenDefault()
+    {
+        var habit = new Habit();
+        Assert.Equal([0, 1, 2, 3, 4, 5, 6], habit.DaysOfWeekArray);
+    }
+
+    [Fact]
+    public void DaysOfWeekArray_Get_ReturnsAllDays_WhenEmpty()
+    {
+        var habit = new Habit { DaysOfWeek = "" };
+        Assert.Equal([0, 1, 2, 3, 4, 5, 6], habit.DaysOfWeekArray);
+    }
+
+    [Fact]
+    public void DaysOfWeekArray_Get_ReturnsAllDays_WhenNull()
+    {
+        var habit = new Habit { DaysOfWeek = null! };
+        Assert.Equal([0, 1, 2, 3, 4, 5, 6], habit.DaysOfWeekArray);
+    }
+
+    [Fact]
+    public void DaysOfWeekArray_Get_ParsesSpecificDays()
+    {
+        var habit = new Habit { DaysOfWeek = "1,3,5" };
+        Assert.Equal([1, 3, 5], habit.DaysOfWeekArray);
+    }
+
+    [Fact]
+    public void DaysOfWeekArray_Set_StoresCommaSeparatedString()
+    {
+        var habit = new Habit();
+        habit.DaysOfWeekArray = [0, 6];
+        Assert.Equal("0,6", habit.DaysOfWeek);
+    }
+
+    [Fact]
+    public void Id_IsUnique_AcrossInstances()
+    {
+        var habit1 = new Habit();
+        var habit2 = new Habit();
+        Assert.NotEqual(habit1.Id, habit2.Id);
+    }
+}
diff --git a/SarahsDailyApp.Tests/Models/OtherModelTests.cs b/SarahsDailyApp.Tests/Models/OtherModelTests.cs
new file mode 100644
index 0000000..e7fdb41
--- /dev/null
+++ b/SarahsDailyApp.Tests/Models/OtherModelTests.cs
@@ -0,0 +1,101 @@
+using SarahsDailyApp.Models;
+
+namespace SarahsDailyApp.Tests.Models;
+
+public class OtherModelTests
+{
+    [Fact]
+    public void Project_HasDefaultValues()
+    {
+        var project = new Project();
+
+        Assert.NotNull(project.Id);
+        Assert.Equal(string.Empty, project.Name);
+        Assert.Null(project.Description);
+        Assert.Equal("#3b82f6", project.Color);
+    }
+
+    [Fact]
+    public void HabitLog_HasDefaultValues()
+    {
+        var log = new HabitLog();
+
+        Assert.NotNull(log.Id);
+        Assert.Equal(string.Empty, log.HabitId);
+    }
+
+    [Fact]
+    public void WishItem_HasDefaultValues()
+    {
+        var item = new WishItem();
+
+        Assert.NotNull(item.Id);
+        Assert.Equal(string.Empty, item.Title);
+        Assert.Null(item.Url);
+        Assert.Null(item.Price);
+        Assert.Equal(0, item.Order);
+        Assert.False(item.Completed);
+        Assert.Null(item.ListId);
+    }
+
+    [Fact]
+    public void WishList_HasDefaultValues()
+    {
+        var list = new WishList();
+
+        Assert.NotNull(list.Id);
+        Assert.Equal(string.Empty, list.Name);
+        Assert.Equal(0, list.Order);
+    }
+
+    [Fact]
+    public void Note_HasDefaultValues()
+    {
+        var note = new Note();
+
+        Assert.NotNull(note.Id);
+        Assert.Equal(string.Empty, note.Title);
+        Assert.Equal(string.Empty, note.Content);
+        Assert.Null(note.UpdatedDate);
+    }
+
+    [Fact]
+    public void ShoppingItem_HasDefaultValues()
+    {
+        var item = new ShoppingItem();
+
+        Assert.NotNull(item.Id);
+        Assert.Equal(string.Empty, item.Name);
+        Assert.Null(item.Quantity);
+        Assert.False(item.Completed);
+    }
+
+    [Fact]
+    public void UserStats_HasDefaultValues()
+    {
+        var stats = new UserStats();
+
+        Assert.Equal(1, stats.Id);
+        Assert.Equal(1, stats.Level);
+        Assert.Equal(0, stats.DailyStreak);
+        Assert.Null(stats.LastActivityDate);
+    }
+
+    [Fact]
+    public void AppSettings_HasDefaultValues()
+    {
+        var settings = new AppSettings();
+
+        Assert.Equal(1, settings.Id);
+        Assert.Equal(30, settings.TasksPerLevel);
+    }
+
+    [Fact]
+    public void Category_HasDefaultValues()
+    {
+        var category = new Category();
+
+        Assert.Equal(0, category.Id);
+        Assert.Equal(string.Empty, category.Name);
+    }
+}
diff --git a/SarahsDailyApp.Tests/Models/TaskItemTests.cs b/SarahsDailyApp.Tests/Models/TaskItemTests.cs
new file mode 100644
index 0000000..22779a0
--- /dev/null
+++ b/SarahsDailyApp.Tests/Models/TaskItemTests.cs
@@ -0,0 +1,78 @@
+using SarahsDailyApp.Models;
+
+namespace SarahsDailyApp.Tests.Models;
+
+public class TaskItemTests
+{
+    [Fact]
+    public void NewTaskItem_HasDefaultValues()
+    {
+        var task = new TaskItem();
+
+        Assert.NotNull(task.Id);
+        Assert.NotEmpty(task.Id);
+        Assert.Equal(string.Empty, task.Title);
+        Assert.Null(task.Description);
+        Assert.Null(task.DueDate);
+        Assert.Equal(RepeatType.None, task.RepeatType);
+        Assert.Equal(1, task.RepeatUnit);
+        Assert.Null(task.CustomRepeatDays);
+        Assert.Null(task.MovableRepeatDays);
+        Assert.Null(task.DaysOfWeek);
+        Assert.Null(task.ProjectId);
+        Assert.False(task.Completed);
+        Assert.Null(task.CompletedDate);
+    }
+
+    [Fact]
+    public void DaysOfWeekArray_Get_ReturnsNull_WhenDaysOfWeekIsNull()
+    {
+        var task = new TaskItem { DaysOfWeek = null };
+        Assert.Null(task.DaysOfWeekArray);
+    }
+
+    [Fact]
+    public void DaysOfWeekArray_Get_ReturnsNull_WhenDaysOfWeekIsEmpty()
+    {
+        var task = new TaskItem { DaysOfWeek = "" };
+        Assert.Null(task.DaysOfWeekArray);
+    }
+
+    [Fact]
+    public void DaysOfWeekArray_Get_ParsesCommaSeparatedValues()
+    {
+        var task = new TaskItem { DaysOfWeek = "1,3,5" };
+        Assert.Equal([1, 3, 5], task.DaysOfWeekArray);
+    }
+
+    [Fact]
+    public void DaysOfWeekArray_Get_ParsesSingleValue()
+    {
+        var task = new TaskItem { DaysOfWeek = "0" };
+        Assert.Equal([0], task.DaysOfWeekArray);
+    }
+
+    [Fact]
+    public void DaysOfWeekArray_Set_StoresCommaSeparatedString()
+    {
+        var task = new TaskItem();
+        task.DaysOfWeekArray = [0, 2, 4, 6];
+        Assert.Equal("0,2,4,6", task.DaysOfWeek);
+    }
+
+    [Fact]
+    public void DaysOfWeekArray_Set_Null_ClearsDaysOfWeek()
+    {
+        var task = new TaskItem { DaysOfWeek = "1,2,3" };
+        task.DaysOfWeekArray = null;
+        Assert.Null(task.DaysOfWeek);
+    }
+
+    [Fact]
+    public void Id_IsUnique_AcrossInstances()
+    {
+        var task1 = new TaskItem();
+        var task2 = new TaskItem();
+        Assert.NotEqual(task1.Id, task2.Id);
+    }
+}
diff --git a/SarahsDailyApp.Tests/SarahsDailyApp.Tests.csproj b/SarahsDailyApp.Tests/SarahsDailyApp.Tests.csproj
new file mode 100644
index 0000000..9181878
--- /dev/null
+++ b/SarahsDailyApp.Tests/SarahsDailyApp.Tests.csproj
@@ -0,0 +1,31 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>net10.0-windows10.0.19041.0</TargetFramework>
+    <UseMaui>true</UseMaui>
+    <ImplicitUsings>enable</ImplicitUsings>
+    <Nullable>enable</Nullable>
+    <IsPackable>false</IsPackable>
+    <OutputType>Library</OutputType>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="coverlet.collector" Version="6.0.4" />
+    <PackageReference Include="Microsoft.Maui.Controls" Version="10.0.51" />
+    <PackageReference Include="Microsoft.Maui.Controls.Compatibility" Version="10.0.51" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.14.1" />
+    <PackageReference Include="sqlite-net-pcl" Version="1.9.172" />
+    <PackageReference Include="SQLitePCLRaw.bundle_green" Version="2.1.11" />
+    <PackageReference Include="xunit" Version="2.9.3" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="3.1.4" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\SarahsDailyApp\SarahsDailyApp.csproj" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <Using Include="Xunit" />
+  </ItemGroup>
+
+</Project>
\ No newline at end of file
diff --git a/SarahsDailyApp.Tests/Services/CategoryServiceTests.cs b/SarahsDailyApp.Tests/Services/CategoryServiceTests.cs
new file mode 100644
index 0000000..04e31a8
--- /dev/null
+++ b/SarahsDailyApp.Tests/Services/CategoryServiceTests.cs
@@ -0,0 +1,197 @@
+using SarahsDailyApp.Models;
+using SarahsDailyApp.Services;
+using SarahsDailyApp.Tests.Helpers;
+
+namespace SarahsDailyApp.Tests.Services;
+
+public class CategoryServiceTests
+{
+    private static (CategoryService service, TestDatabaseService db) CreateService()
+    {
+        var db = new TestDatabaseService();
+        var service = new CategoryService(db);
+        return (service, db);
+    }
+
+    [Fact]
+    public async Task GetAllAsync_ReturnsEmpty_WhenNoCategories()
+    {
+        var (service, _) = CreateService();
+        var categories = await service.GetAllAsync();
+        Assert.Empty(categories);
+    }
+
+    [Fact]
+    public async Task AddAsync_InsertsCategory()
+    {
+        var (service, _) = CreateService();
+
+        await service.AddAsync("Work");
+
+        var all = await service.GetAllAsync();
+        Assert.Single(all);
+        Assert.Equal("Work", all[0].Name);
+    }
+
+    [Fact]
+    public async Task AddAsync_MultipleCategories_ReturnedAlphabetically()
+    {
+        var (service, _) = CreateService();
+        await service.AddAsync("Zebra");
+        await service.AddAsync("Apple");
+        await service.AddAsync("Mango");
+
+        var all = await service.GetAllAsync();
+
+        Assert.Equal(3, all.Count);
+        Assert.Equal("Apple", all[0].Name);
+        Assert.Equal("Mango", all[1].Name);
+        Assert.Equal("Zebra", all[2].Name);
+    }
+
+    [Fact]
+    public async Task RenameAsync_UpdatesCategoryName()
+    {
+        var (service, _) = CreateService();
+        await service.AddAsync("OldName");
+
+        var all = await service.GetAllAsync();
+        var category = all[0];
+
+        await service.RenameAsync(category.Id, "NewName");
+
+        var updated = await service.GetAllAsync();
+        Assert.Single(updated);
+        Assert.Equal("NewName", updated[0].Name);
+    }
+
+    [Fact]
+    public async Task RenameAsync_PropagatesRenameToHabits()
+    {
+        var db = new TestDatabaseService();
+        var categoryService = new CategoryService(db);
+        var habitService = new HabitService(db);
+
+        await categoryService.AddAsync("Fitness");
+        var categories = await categoryService.GetAllAsync();
+        var category = categories[0];
+
+        var habit = new Habit { Name = "Run", Category = "Fitness" };
+        await habitService.SaveAsync(habit);
+
+        await categoryService.RenameAsync(category.Id, "Exercise");
+
+        var updatedHabit = await habitService.GetByIdAsync(habit.Id);
+        Assert.NotNull(updatedHabit);
+        Assert.Equal("Exercise", updatedHabit.Category);
+    }
+
+    [Fact]
+    public async Task RenameAsync_PropagatesRenameToFinanceItems()
+    {
+        var db = new TestDatabaseService();
+        var categoryService = new CategoryService(db);
+        var financeService = new FinanceService(db);
+
+        await categoryService.AddAsync("Food");
+        var categories = await categoryService.GetAllAsync();
+        var category = categories[0];
+
+        var item = new FinanceItem
+        {
+            Description = "Dinner",
+            Category = "Food",
+            Type = FinanceType.Expense
+        };
+        await financeService.SaveAsync(item);
+
+        await categoryService.RenameAsync(category.Id, "Dining");
+
+        var updatedItem = await financeService.GetByIdAsync(item.Id);
+        Assert.NotNull(updatedItem);
+        Assert.Equal("Dining", updatedItem.Category);
+    }
+
+    [Fact]
+    public async Task RenameAsync_DoesNothing_WhenIdNotFound()
+    {
+        var (service, _) = CreateService();
+        await service.AddAsync("Existing");
+
+        await service.RenameAsync(9999, "Something");
+
+        var all = await service.GetAllAsync();
+        Assert.Single(all);
+        Assert.Equal("Existing", all[0].Name);
+    }
+
+    [Fact]
+    public async Task DeleteAsync_RemovesCategory()
+    {
+        var (service, _) = CreateService();
+        await service.AddAsync("ToDelete");
+
+        var all = await service.GetAllAsync();
+        await service.DeleteAsync(all[0].Id);
+
+        var afterDelete = await service.GetAllAsync();
+        Assert.Empty(afterDelete);
+    }
+
+    [Fact]
+    public async Task DeleteAsync_ClearsCategoryOnHabits()
+    {
+        var db = new TestDatabaseService();
+        var categoryService = new CategoryService(db);
+        var habitService = new HabitService(db);
+
+        await categoryService.AddAsync("Health");
+        var categories = await categoryService.GetAllAsync();
+
+        var habit = new Habit { Name = "Meditate", Category = "Health" };
+        await habitService.SaveAsync(habit);
+
+        await categoryService.DeleteAsync(categories[0].Id);
+
+        var updatedHabit = await habitService.GetByIdAsync(habit.Id);
+        Assert.NotNull(updatedHabit);
+        Assert.Null(updatedHabit.Category);
+    }
+
+    [Fact]
+    public async Task DeleteAsync_ClearsCategoryOnFinanceItems()
+    {
+        var db = new TestDatabaseService();
+        var categoryService = new CategoryService(db);
+        var financeService = new FinanceService(db);
+
+        await categoryService.AddAsync("Utilities");
+        var categories = await categoryService.GetAllAsync();
+
+        var item = new FinanceItem
+        {
+            Description = "Electric Bill",
+            Category = "Utilities",
+            Type = FinanceType.Expense
+        };
+        await financeService.SaveAsync(item);
+
+        await categoryService.DeleteAsync(categories[0].Id);
+
+        var updatedItem = await financeService.GetByIdAsync(item.Id);
+        Assert.NotNull(updatedItem);
+        Assert.Null(updatedItem.Category);
+    }
+
+    [Fact]
+    public async Task DeleteAsync_DoesNothing_WhenIdNotFound()
+    {
+        var (service, _) = CreateService();
+        await service.AddAsync("Existing");
+
+        await service.DeleteAsync(9999);
+
+        var all = await service.GetAllAsync();
+        Assert.Single(all);
+    }
+}
diff --git a/SarahsDailyApp.Tests/Services/ExportImportServiceTests.cs b/SarahsDailyApp.Tests/Services/ExportImportServiceTests.cs
new file mode 100644
index 0000000..fc8ef7f
--- /dev/null
+++ b/SarahsDailyApp.Tests/Services/ExportImportServiceTests.cs
@@ -0,0 +1,254 @@
+using System.Text.Json;
+using SarahsDailyApp.Models;
+using SarahsDailyApp.Services;
+using SarahsDailyApp.Tests.Helpers;
+
+namespace SarahsDailyApp.Tests.Services;
+
+public class ExportImportServiceTests
+{
+    private static (ExportImportService service, TestDatabaseService db) CreateService()
+    {
+        var db = new TestDatabaseService();
+        var service = new ExportImportService(db);
+        return (service, db);
+    }
+
+    [Fact]
+    public async Task ExportToJsonAsync_ReturnsValidJson()
+    {
+        var (service, _) = CreateService();
+
+        var json = await service.ExportToJsonAsync();
+
+        Assert.NotNull(json);
+        Assert.NotEmpty(json);
+
+        var doc = JsonDocument.Parse(json);
+        Assert.Equal("1.0.0", doc.RootElement.GetProperty("version").GetString());
+        Assert.Equal(3, doc.RootElement.GetProperty("schemaVersion").GetInt32());
+    }
+
+    [Fact]
+    public async Task ExportToJsonAsync_IncludesAllData()
+    {
+        var db = new TestDatabaseService();
+        var taskService = new TaskService(db);
+        var exportService = new ExportImportService(db);
+
+        await taskService.SaveAsync(new TaskItem { Title = "Test Task" });
+
+        var json = await exportService.ExportToJsonAsync();
+        var doc = JsonDocument.Parse(json);
+
+        var tasks = doc.RootElement.GetProperty("tasks");
+        Assert.Equal(1, tasks.GetArrayLength());
+    }
+
+    [Fact]
+    public async Task ExportToJsonAsync_SeparatesFinancesByType()
+    {
+        var db = new TestDatabaseService();
+        var financeService = new FinanceService(db);
+        var exportService = new ExportImportService(db);
+
+        await financeService.SaveAsync(new FinanceItem { Description = "Exp", Type = FinanceType.Expense });
+        await financeService.SaveAsync(new FinanceItem { Description = "Rev", Type = FinanceType.Revenue });
+        await financeService.SaveAsync(new FinanceItem { Description = "Chg", Type = FinanceType.Charge });
+
+        var json = await exportService.ExportToJsonAsync();
+        var doc = JsonDocument.Parse(json);
+
+        Assert.Equal(1, doc.RootElement.GetProperty("expenses").GetArrayLength());
+        Assert.Equal(1, doc.RootElement.GetProperty("revenue").GetArrayLength());
+        Assert.Equal(1, doc.RootElement.GetProperty("charges").GetArrayLength());
+    }
+
+    [Fact]
+    public async Task ImportFromJsonAsync_ReturnsFalse_ForInvalidJson()
+    {
+        var (service, _) = CreateService();
+
+        var result = await service.ImportFromJsonAsync("not valid json");
+
+        Assert.False(result);
+    }
+
+    [Fact]
+    public async Task ImportFromJsonAsync_ReturnsFalse_ForNullDeserialization()
+    {
+        var (service, _) = CreateService();
+
+        var result = await service.ImportFromJsonAsync("null");
+
+        Assert.False(result);
+    }
+
+    [Fact]
+    public async Task ImportFromJsonAsync_ImportsTasks()
+    {
+        var db = new TestDatabaseService();
+        var taskService = new TaskService(db);
+        var exportService = new ExportImportService(db);
+
+        var json = """
+        {
+            "version": "1.0.0",
+            "schemaVersion": 3,
+            "tasks": [
+                {
+                    "id": "task-1",
+                    "title": "Imported Task",
+                    "completed": false,
+                    "repeatType": 0,
+                    "repeatUnit": 1
+                }
+            ]
+        }
+        """;
+
+        var result = await exportService.ImportFromJsonAsync(json);
+
+        Assert.True(result);
+
+        var tasks = await taskService.GetAllAsync();
+        Assert.Single(tasks);
+        Assert.Equal("Imported Task", tasks[0].Title);
+    }
+
+    [Fact]
+    public async Task ImportFromJsonAsync_ClearsExistingData()
+    {
+        var db = new TestDatabaseService();
+        var taskService = new TaskService(db);
+        var exportService = new ExportImportService(db);
+
+        // Insert existing data
+        await taskService.SaveAsync(new TaskItem { Title = "Existing Task" });
+
+        var json = """
+        {
+            "version": "1.0.0",
+            "schemaVersion": 3,
+            "tasks": [
+                {
+                    "id": "new-task-1",
+                    "title": "New Task",
+                    "completed": false,
+                    "repeatType": 0,
+                    "repeatUnit": 1
+                }
+            ]
+        }
+        """;
+
+        await exportService.ImportFromJsonAsync(json);
+
+        var tasks = await taskService.GetAllAsync();
+        Assert.Single(tasks);
+        Assert.Equal("New Task", tasks[0].Title);
+    }
+
+    [Fact]
+    public async Task ImportFromJsonAsync_ImportsCategories()
+    {
+        var db = new TestDatabaseService();
+        var categoryService = new CategoryService(db);
+        var exportService = new ExportImportService(db);
+
+        var json = """
+        {
+            "version": "1.0.0",
+            "schemaVersion": 3,
+            "categories": ["Work", "Personal", "Health"]
+        }
+        """;
+
+        await exportService.ImportFromJsonAsync(json);
+
+        var categories = await categoryService.GetAllAsync();
+        Assert.Equal(3, categories.Count);
+    }
+
+    [Fact]
+    public async Task RoundTrip_ExportThenImport_PreservesData()
+    {
+        var db = new TestDatabaseService();
+        var taskService = new TaskService(db);
+        var noteService = new NoteService(db);
+        var exportService = new ExportImportService(db);
+
+        // Create data
+        await taskService.SaveAsync(new TaskItem { Title = "Task A", Description = "Desc A" });
+        await taskService.SaveAsync(new TaskItem { Title = "Task B", Completed = true });
+        await noteService.SaveAsync(new Note { Title = "Note 1", Content = "Content 1" });
+
+        // Export
+        var json = await exportService.ExportToJsonAsync();
+
+        // Create a fresh database and import
+        var db2 = new TestDatabaseService();
+        var taskService2 = new TaskService(db2);
+        var noteService2 = new NoteService(db2);
+        var exportService2 = new ExportImportService(db2);
+
+        var result = await exportService2.ImportFromJsonAsync(json);
+        Assert.True(result);
+
+        // Verify
+        var tasks = await taskService2.GetAllAsync();
+        Assert.Equal(2, tasks.Count);
+
+        var notes = await noteService2.GetAllAsync();
+        Assert.Single(notes);
+        Assert.Equal("Note 1", notes[0].Title);
+    }
+
+    [Fact]
+    public async Task ImportFromJsonAsync_HandlesEmptyCollections()
+    {
+        var (service, _) = CreateService();
+
+        var json = """
+        {
+            "version": "1.0.0",
+            "schemaVersion": 3
+        }
+        """;
+
+        var result = await service.ImportFromJsonAsync(json);
+
+        Assert.True(result);
+    }
+
+    [Fact]
+    public async Task ImportFromJsonAsync_ImportsFinancesWithCorrectTypes()
+    {
+        var db = new TestDatabaseService();
+        var financeService = new FinanceService(db);
+        var exportService = new ExportImportService(db);
+
+        var json = """
+        {
+            "version": "1.0.0",
+            "schemaVersion": 3,
+            "expenses": [{"id": "e1", "description": "Lunch", "amount": 15.00}],
+            "revenue": [{"id": "r1", "description": "Salary", "amount": 5000.00}],
+            "charges": [{"id": "c1", "description": "Netflix", "amount": 15.99}]
+        }
+        """;
+
+        await exportService.ImportFromJsonAsync(json);
+
+        var expenses = await financeService.GetByTypeAsync(FinanceType.Expense);
+        var revenues = await financeService.GetByTypeAsync(FinanceType.Revenue);
+        var charges = await financeService.GetByTypeAsync(FinanceType.Charge);
+
+        Assert.Single(expenses);
+        Assert.Equal(FinanceType.Expense, expenses[0].Type);
+        Assert.Single(revenues);
+        Assert.Equal(FinanceType.Revenue, revenues[0].Type);
+        Assert.Single(charges);
+        Assert.Equal(FinanceType.Charge, charges[0].Type);
+    }
+}
diff --git a/SarahsDailyApp.Tests/Services/FinanceServiceTests.cs b/SarahsDailyApp.Tests/Services/FinanceServiceTests.cs
new file mode 100644
index 0000000..bc42f6b
--- /dev/null
+++ b/SarahsDailyApp.Tests/Services/FinanceServiceTests.cs
@@ -0,0 +1,235 @@
+using SarahsDailyApp.Models;
+using SarahsDailyApp.Services;
+using SarahsDailyApp.Tests.Helpers;
+
+namespace SarahsDailyApp.Tests.Services;
+
+public class FinanceServiceTests
+{
+    private static (FinanceService service, TestDatabaseService db) CreateService()
+    {
+        var db = new TestDatabaseService();
+        var service = new FinanceService(db);
+        return (service, db);
+    }
+
+    [Fact]
+    public async Task GetByTypeAsync_ReturnsEmpty_WhenNoItems()
+    {
+        var (service, _) = CreateService();
+        var items = await service.GetByTypeAsync(FinanceType.Expense);
+        Assert.Empty(items);
+    }
+
+    [Fact]
+    public async Task SaveAsync_InsertsNewItem()
+    {
+        var (service, _) = CreateService();
+        var item = new FinanceItem
+        {
+            Description = "Groceries",
+            Amount = 50m,
+            Type = FinanceType.Expense
+        };
+
+        await service.SaveAsync(item);
+
+        var all = await service.GetByTypeAsync(FinanceType.Expense);
+        Assert.Single(all);
+        Assert.Equal("Groceries", all[0].Description);
+    }
+
+    [Fact]
+    public async Task SaveAsync_UpdatesExistingItem()
+    {
+        var (service, _) = CreateService();
+        var item = new FinanceItem
+        {
+            Description = "Original",
+            Amount = 10m,
+            Type = FinanceType.Expense
+        };
+        await service.SaveAsync(item);
+
+        item.Description = "Updated";
+        item.Amount = 20m;
+        await service.SaveAsync(item);
+
+        var all = await service.GetByTypeAsync(FinanceType.Expense);
+        Assert.Single(all);
+        Assert.Equal("Updated", all[0].Description);
+        Assert.Equal(20m, all[0].Amount);
+    }
+
+    [Fact]
+    public async Task GetByTypeAsync_FiltersCorrectly()
+    {
+        var (service, _) = CreateService();
+        await service.SaveAsync(new FinanceItem { Description = "Exp1", Type = FinanceType.Expense });
+        await service.SaveAsync(new FinanceItem { Description = "Rev1", Type = FinanceType.Revenue });
+        await service.SaveAsync(new FinanceItem { Description = "Chg1", Type = FinanceType.Charge });
+        await service.SaveAsync(new FinanceItem { Description = "Exp2", Type = FinanceType.Expense });
+
+        var expenses = await service.GetByTypeAsync(FinanceType.Expense);
+        var revenues = await service.GetByTypeAsync(FinanceType.Revenue);
+        var charges = await service.GetByTypeAsync(FinanceType.Charge);
+
+        Assert.Equal(2, expenses.Count);
+        Assert.Single(revenues);
+        Assert.Single(charges);
+    }
+
+    [Fact]
+    public async Task GetByIdAsync_ReturnsItem_WhenExists()
+    {
+        var (service, _) = CreateService();
+        var item = new FinanceItem { Description = "Find Me", Type = FinanceType.Revenue };
+        await service.SaveAsync(item);
+
+        var found = await service.GetByIdAsync(item.Id);
+
+        Assert.NotNull(found);
+        Assert.Equal("Find Me", found.Description);
+    }
+
+    [Fact]
+    public async Task GetByIdAsync_ReturnsNull_WhenNotExists()
+    {
+        var (service, _) = CreateService();
+        var found = await service.GetByIdAsync("nonexistent");
+        Assert.Null(found);
+    }
+
+    [Fact]
+    public async Task DeleteAsync_RemovesItem()
+    {
+        var (service, _) = CreateService();
+        var item = new FinanceItem { Description = "Delete Me", Type = FinanceType.Expense };
+        await service.SaveAsync(item);
+
+        await service.DeleteAsync(item.Id);
+
+        var all = await service.GetByTypeAsync(FinanceType.Expense);
+        Assert.Empty(all);
+    }
+
+    [Fact]
+    public async Task GetFilteredAsync_OnceItem_InRange_IsIncluded()
+    {
+        var (service, _) = CreateService();
+        await service.SaveAsync(new FinanceItem
+        {
+            Description = "In Range",
+            Type = FinanceType.Expense,
+            Recurring = RecurringType.Once,
+            Date = new DateTime(2025, 3, 15)
+        });
+
+        var results = await service.GetFilteredAsync(
+            FinanceType.Expense,
+            new DateTime(2025, 3, 1),
+            new DateTime(2025, 3, 31));
+
+        Assert.Single(results);
+    }
+
+    [Fact]
+    public async Task GetFilteredAsync_OnceItem_OutOfRange_IsExcluded()
+    {
+        var (service, _) = CreateService();
+        await service.SaveAsync(new FinanceItem
+        {
+            Description = "Out of Range",
+            Type = FinanceType.Expense,
+            Recurring = RecurringType.Once,
+            Date = new DateTime(2025, 4, 15)
+        });
+
+        var results = await service.GetFilteredAsync(
+            FinanceType.Expense,
+            new DateTime(2025, 3, 1),
+            new DateTime(2025, 3, 31));
+
+        Assert.Empty(results);
+    }
+
+    [Fact]
+    public async Task GetFilteredAsync_MonthlyRecurring_IncludedIfDateBeforeEnd()
+    {
+        var (service, _) = CreateService();
+        await service.SaveAsync(new FinanceItem
+        {
+            Description = "Monthly Subscription",
+            Type = FinanceType.Expense,
+            Recurring = RecurringType.Monthly,
+            Date = new DateTime(2025, 1, 1)
+        });
+
+        var results = await service.GetFilteredAsync(
+            FinanceType.Expense,
+            new DateTime(2025, 6, 1),
+            new DateTime(2025, 6, 30));
+
+        Assert.Single(results);
+    }
+
+    [Fact]
+    public async Task GetFilteredAsync_YearlyRecurring_IncludedIfDateBeforeEnd()
+    {
+        var (service, _) = CreateService();
+        await service.SaveAsync(new FinanceItem
+        {
+            Description = "Annual Fee",
+            Type = FinanceType.Expense,
+            Recurring = RecurringType.Yearly,
+            Date = new DateTime(2024, 1, 1)
+        });
+
+        var results = await service.GetFilteredAsync(
+            FinanceType.Expense,
+            new DateTime(2025, 6, 1),
+            new DateTime(2025, 6, 30));
+
+        Assert.Single(results);
+    }
+
+    [Fact]
+    public async Task GetFilteredAsync_RecurringItem_ExcludedIfDateAfterEnd()
+    {
+        var (service, _) = CreateService();
+        await service.SaveAsync(new FinanceItem
+        {
+            Description = "Future Monthly",
+            Type = FinanceType.Expense,
+            Recurring = RecurringType.Monthly,
+            Date = new DateTime(2025, 7, 1)
+        });
+
+        var results = await service.GetFilteredAsync(
+            FinanceType.Expense,
+            new DateTime(2025, 3, 1),
+            new DateTime(2025, 3, 31));
+
+        Assert.Empty(results);
+    }
+
+    [Fact]
+    public async Task GetFilteredAsync_NullDate_IsExcluded()
+    {
+        var (service, _) = CreateService();
+        await service.SaveAsync(new FinanceItem
+        {
+            Description = "No Date",
+            Type = FinanceType.Expense,
+            Recurring = RecurringType.Once,
+            Date = null
+        });
+
+        var results = await service.GetFilteredAsync(
+            FinanceType.Expense,
+            new DateTime(2025, 1, 1),
+            new DateTime(2025, 12, 31));
+
+        Assert.Empty(results);
+    }
+}
diff --git a/SarahsDailyApp.Tests/Services/HabitServiceTests.cs b/SarahsDailyApp.Tests/Services/HabitServiceTests.cs
new file mode 100644
index 0000000..6e9c40f
--- /dev/null
+++ b/SarahsDailyApp.Tests/Services/HabitServiceTests.cs
@@ -0,0 +1,245 @@
+using SarahsDailyApp.Models;
+using SarahsDailyApp.Services;
+using SarahsDailyApp.Tests.Helpers;
+
+namespace SarahsDailyApp.Tests.Services;
+
+public class HabitServiceTests
+{
+    private static (HabitService service, TestDatabaseService db) CreateService()
+    {
+        var db = new TestDatabaseService();
+        var service = new HabitService(db);
+        return (service, db);
+    }
+
+    [Fact]
+    public async Task GetAllAsync_ReturnsEmpty_WhenNoHabits()
+    {
+        var (service, _) = CreateService();
+        var habits = await service.GetAllAsync();
+        Assert.Empty(habits);
+    }
+
+    [Fact]
+    public async Task SaveAsync_InsertsNewHabit()
+    {
+        var (service, _) = CreateService();
+        var habit = new Habit { Name = "Exercise" };
+
+        await service.SaveAsync(habit);
+
+        var all = await service.GetAllAsync();
+        Assert.Single(all);
+        Assert.Equal("Exercise", all[0].Name);
+    }
+
+    [Fact]
+    public async Task SaveAsync_UpdatesExistingHabit()
+    {
+        var (service, _) = CreateService();
+        var habit = new Habit { Name = "Original" };
+        await service.SaveAsync(habit);
+
+        habit.Name = "Updated";
+        await service.SaveAsync(habit);
+
+        var all = await service.GetAllAsync();
+        Assert.Single(all);
+        Assert.Equal("Updated", all[0].Name);
+    }
+
+    [Fact]
+    public async Task GetByIdAsync_ReturnsHabit_WhenExists()
+    {
+        var (service, _) = CreateService();
+        var habit = new Habit { Name = "Find Me" };
+        await service.SaveAsync(habit);
+
+        var found = await service.GetByIdAsync(habit.Id);
+
+        Assert.NotNull(found);
+        Assert.Equal("Find Me", found.Name);
+    }
+
+    [Fact]
+    public async Task GetByIdAsync_ReturnsNull_WhenNotExists()
+    {
+        var (service, _) = CreateService();
+        var found = await service.GetByIdAsync("nonexistent");
+        Assert.Null(found);
+    }
+
+    [Fact]
+    public async Task DeleteAsync_RemovesHabitAndLogs()
+    {
+        var (service, _) = CreateService();
+        var habit = new Habit { Name = "Delete Me" };
+        await service.SaveAsync(habit);
+
+        // Complete the habit to create a log
+        await service.CompleteHabitAsync(habit, DateTime.Today);
+
+        await service.DeleteAsync(habit.Id);
+
+        var all = await service.GetAllAsync();
+        Assert.Empty(all);
+
+        var logs = await service.GetLogsForHabitAsync(habit.Id);
+        Assert.Empty(logs);
+    }
+
+    [Fact]
+    public async Task CompleteHabitAsync_CreatesLog()
+    {
+        var (service, _) = CreateService();
+        var habit = new Habit { Name = "Complete Me" };
+        await service.SaveAsync(habit);
+
+        var selectedDate = new DateTime(2025, 3, 15);
+        await service.CompleteHabitAsync(habit, selectedDate);
+
+        var logs = await service.GetLogsForHabitAsync(habit.Id);
+        Assert.Single(logs);
+        Assert.Equal(selectedDate.Date, logs[0].Date);
+        Assert.Equal(habit.Id, logs[0].HabitId);
+    }
+
+    [Fact]
+    public async Task CompleteHabitAsync_UpdatesLastCompletedDate()
+    {
+        var (service, _) = CreateService();
+        var habit = new Habit { Name = "Track Date" };
+        await service.SaveAsync(habit);
+
+        var selectedDate = new DateTime(2025, 3, 15);
+        await service.CompleteHabitAsync(habit, selectedDate);
+
+        var updated = await service.GetByIdAsync(habit.Id);
+        Assert.NotNull(updated);
+        Assert.Equal(selectedDate.Date, updated.LastCompletedDate);
+    }
+
+    [Fact]
+    public async Task CompleteHabitAsync_CalculatesStreak()
+    {
+        var (service, _) = CreateService();
+        var habit = new Habit { Name = "Streak Habit", TargetGoal = 1 };
+        await service.SaveAsync(habit);
+
+        // Complete 3 consecutive days
+        await service.CompleteHabitAsync(habit, new DateTime(2025, 3, 13));
+        await service.CompleteHabitAsync(habit, new DateTime(2025, 3, 14));
+        await service.CompleteHabitAsync(habit, new DateTime(2025, 3, 15));
+
+        var updated = await service.GetByIdAsync(habit.Id);
+        Assert.NotNull(updated);
+        Assert.Equal(3, updated.Streak);
+    }
+
+    [Fact]
+    public async Task CalculateStreakAsync_ReturnsZero_WhenNoLogs()
+    {
+        var (service, _) = CreateService();
+        var habit = new Habit { Name = "No Logs" };
+        await service.SaveAsync(habit);
+
+        var streak = await service.CalculateStreakAsync(habit);
+
+        Assert.Equal(0, streak);
+    }
+
+    [Fact]
+    public async Task CalculateStreakAsync_ReturnsSingleDay_WhenOneCompletion()
+    {
+        var (service, _) = CreateService();
+        var habit = new Habit { Name = "One Day", TargetGoal = 1 };
+        await service.SaveAsync(habit);
+
+        await service.CompleteHabitAsync(habit, new DateTime(2025, 3, 15));
+
+        var streak = await service.CalculateStreakAsync(habit);
+
+        Assert.Equal(1, streak);
+    }
+
+    [Fact]
+    public async Task CalculateStreakAsync_BreaksOnGap()
+    {
+        var (service, _) = CreateService();
+        var habit = new Habit { Name = "Gap Habit", TargetGoal = 1 };
+        await service.SaveAsync(habit);
+
+        // Day 1, 2, skip 3, day 4, 5
+        await service.CompleteHabitAsync(habit, new DateTime(2025, 3, 11));
+        await service.CompleteHabitAsync(habit, new DateTime(2025, 3, 12));
+        // Skip March 13
+        await service.CompleteHabitAsync(habit, new DateTime(2025, 3, 14));
+        await service.CompleteHabitAsync(habit, new DateTime(2025, 3, 15));
+
+        var streak = await service.CalculateStreakAsync(habit);
+
+        // Only the last 2 consecutive days count
+        Assert.Equal(2, streak);
+    }
+
+    [Fact]
+    public async Task CalculateStreakAsync_RequiresTargetGoal()
+    {
+        var (service, _) = CreateService();
+        var habit = new Habit { Name = "Double Goal", TargetGoal = 2 };
+        await service.SaveAsync(habit);
+
+        // Day 1: complete twice (meets goal)
+        await service.CompleteHabitAsync(habit, new DateTime(2025, 3, 14));
+        await service.CompleteHabitAsync(habit, new DateTime(2025, 3, 14));
+
+        // Day 2: complete once (doesn't meet goal of 2)
+        await service.CompleteHabitAsync(habit, new DateTime(2025, 3, 15));
+
+        var streak = await service.CalculateStreakAsync(habit);
+
+        // Only day 1 met the goal; day 2 didn't
+        // But since day 2 is more recent and didn't meet goal, streak from most recent is 0
+        // Actually: groupBy date, filter by count>=targetGoal, then count consecutive from most recent
+        // Day 15 has 1 completion (< 2 goal), so filtered out
+        // Day 14 has 2 completions (>= 2 goal), streak = 1
+        Assert.Equal(1, streak);
+    }
+
+    [Fact]
+    public async Task GetCompletionsForDateAsync_ReturnsCount()
+    {
+        var (service, _) = CreateService();
+        var habit = new Habit { Name = "Count Completions" };
+        await service.SaveAsync(habit);
+
+        var date = new DateTime(2025, 3, 15);
+        await service.CompleteHabitAsync(habit, date);
+        await service.CompleteHabitAsync(habit, date);
+        await service.CompleteHabitAsync(habit, date.AddDays(1));
+
+        var count = await service.GetCompletionsForDateAsync(habit.Id, date);
+
+        Assert.Equal(2, count);
+    }
+
+    [Fact]
+    public async Task GetLogsForDateAsync_ReturnsLogsForSpecificDate()
+    {
+        var (service, _) = CreateService();
+        var habit1 = new Habit { Name = "Habit A" };
+        var habit2 = new Habit { Name = "Habit B" };
+        await service.SaveAsync(habit1);
+        await service.SaveAsync(habit2);
+
+        var date = new DateTime(2025, 3, 15);
+        await service.CompleteHabitAsync(habit1, date);
+        await service.CompleteHabitAsync(habit2, date);
+        await service.CompleteHabitAsync(habit1, date.AddDays(1));
+
+        var logs = await service.GetLogsForDateAsync(date);
+
+        Assert.Equal(2, logs.Count);
+    }
+}
diff --git a/SarahsDailyApp.Tests/Services/NoteServiceTests.cs b/SarahsDailyApp.Tests/Services/NoteServiceTests.cs
new file mode 100644
index 0000000..6b49e5a
--- /dev/null
+++ b/SarahsDailyApp.Tests/Services/NoteServiceTests.cs
@@ -0,0 +1,126 @@
+using SarahsDailyApp.Models;
+using SarahsDailyApp.Services;
+using SarahsDailyApp.Tests.Helpers;
+
+namespace SarahsDailyApp.Tests.Services;
+
+public class NoteServiceTests
+{
+    private static (NoteService service, TestDatabaseService db) CreateService()
+    {
+        var db = new TestDatabaseService();
+        var service = new NoteService(db);
+        return (service, db);
+    }
+
+    [Fact]
+    public async Task GetAllAsync_ReturnsEmpty_WhenNoNotes()
+    {
+        var (service, _) = CreateService();
+        var notes = await service.GetAllAsync();
+        Assert.Empty(notes);
+    }
+
+    [Fact]
+    public async Task SaveAsync_InsertsNewNote()
+    {
+        var (service, _) = CreateService();
+        var note = new Note { Title = "My Note", Content = "Hello World" };
+
+        await service.SaveAsync(note);
+
+        var all = await service.GetAllAsync();
+        Assert.Single(all);
+        Assert.Equal("My Note", all[0].Title);
+        Assert.Equal("Hello World", all[0].Content);
+    }
+
+    [Fact]
+    public async Task SaveAsync_UpdatesExistingNote_AndSetsUpdatedDate()
+    {
+        var (service, _) = CreateService();
+        var note = new Note { Title = "Original", Content = "Content" };
+        await service.SaveAsync(note);
+
+        Assert.Null(note.UpdatedDate);
+
+        note.Title = "Updated";
+        await service.SaveAsync(note);
+
+        var updated = await service.GetByIdAsync(note.Id);
+        Assert.NotNull(updated);
+        Assert.Equal("Updated", updated.Title);
+        Assert.NotNull(updated.UpdatedDate);
+    }
+
+    [Fact]
+    public async Task GetByIdAsync_ReturnsNote_WhenExists()
+    {
+        var (service, _) = CreateService();
+        var note = new Note { Title = "Find Me" };
+        await service.SaveAsync(note);
+
+        var found = await service.GetByIdAsync(note.Id);
+
+        Assert.NotNull(found);
+        Assert.Equal("Find Me", found.Title);
+    }
+
+    [Fact]
+    public async Task GetByIdAsync_ReturnsNull_WhenNotExists()
+    {
+        var (service, _) = CreateService();
+        var found = await service.GetByIdAsync("nonexistent");
+        Assert.Null(found);
+    }
+
+    [Fact]
+    public async Task DeleteAsync_RemovesNote()
+    {
+        var (service, _) = CreateService();
+        var note = new Note { Title = "Delete Me" };
+        await service.SaveAsync(note);
+
+        await service.DeleteAsync(note.Id);
+
+        var all = await service.GetAllAsync();
+        Assert.Empty(all);
+    }
+
+    [Fact]
+    public async Task GetAllAsync_ReturnsOrderedByUpdatedDateDescending()
+    {
+        var (service, _) = CreateService();
+
+        var note1 = new Note
+        {
+            Title = "First",
+            Content = "Content 1",
+            CreatedDate = new DateTime(2025, 1, 1)
+        };
+        var note2 = new Note
+        {
+            Title = "Second",
+            Content = "Content 2",
+            CreatedDate = new DateTime(2025, 1, 2)
+        };
+        var note3 = new Note
+        {
+            Title = "Third",
+            Content = "Content 3",
+            CreatedDate = new DateTime(2025, 1, 3),
+            UpdatedDate = new DateTime(2025, 1, 10)
+        };
+
+        await service.SaveAsync(note1);
+        await service.SaveAsync(note2);
+        await service.SaveAsync(note3);
+
+        var all = await service.GetAllAsync();
+
+        // note3 has UpdatedDate (Jan 10) > note2 CreatedDate (Jan 2) > note1 CreatedDate (Jan 1)
+        Assert.Equal("Third", all[0].Title);
+        Assert.Equal("Second", all[1].Title);
+        Assert.Equal("First", all[2].Title);
+    }
+}
diff --git a/SarahsDailyApp.Tests/Services/ProjectServiceTests.cs b/SarahsDailyApp.Tests/Services/ProjectServiceTests.cs
new file mode 100644
index 0000000..cfcbd8f
--- /dev/null
+++ b/SarahsDailyApp.Tests/Services/ProjectServiceTests.cs
@@ -0,0 +1,116 @@
+using SarahsDailyApp.Models;
+using SarahsDailyApp.Services;
+using SarahsDailyApp.Tests.Helpers;
+
+namespace SarahsDailyApp.Tests.Services;
+
+public class ProjectServiceTests
+{
+    private static (ProjectService service, TestDatabaseService db) CreateService()
+    {
+        var db = new TestDatabaseService();
+        var service = new ProjectService(db);
+        return (service, db);
+    }
+
+    [Fact]
+    public async Task GetAllAsync_ReturnsEmpty_WhenNoProjects()
+    {
+        var (service, _) = CreateService();
+        var projects = await service.GetAllAsync();
+        Assert.Empty(projects);
+    }
+
+    [Fact]
+    public async Task SaveAsync_InsertsNewProject()
+    {
+        var (service, _) = CreateService();
+        var project = new Project { Name = "My Project" };
+
+        await service.SaveAsync(project);
+
+        var all = await service.GetAllAsync();
+        Assert.Single(all);
+        Assert.Equal("My Project", all[0].Name);
+    }
+
+    [Fact]
+    public async Task SaveAsync_UpdatesExistingProject()
+    {
+        var (service, _) = CreateService();
+        var project = new Project { Name = "Original" };
+        await service.SaveAsync(project);
+
+        project.Name = "Updated";
+        await service.SaveAsync(project);
+
+        var all = await service.GetAllAsync();
+        Assert.Single(all);
+        Assert.Equal("Updated", all[0].Name);
+    }
+
+    [Fact]
+    public async Task GetByIdAsync_ReturnsProject_WhenExists()
+    {
+        var (service, _) = CreateService();
+        var project = new Project { Name = "Find Me" };
+        await service.SaveAsync(project);
+
+        var found = await service.GetByIdAsync(project.Id);
+
+        Assert.NotNull(found);
+        Assert.Equal("Find Me", found.Name);
+    }
+
+    [Fact]
+    public async Task GetByIdAsync_ReturnsNull_WhenNotExists()
+    {
+        var (service, _) = CreateService();
+        var found = await service.GetByIdAsync("nonexistent");
+        Assert.Null(found);
+    }
+
+    [Fact]
+    public async Task DeleteAsync_RemovesProject()
+    {
+        var (service, _) = CreateService();
+        var project = new Project { Name = "Delete Me" };
+        await service.SaveAsync(project);
+
+        await service.DeleteAsync(project.Id);
+
+        var all = await service.GetAllAsync();
+        Assert.Empty(all);
+    }
+
+    [Fact]
+    public async Task DeleteAsync_UnlinksTasksFromProject()
+    {
+        var db = new TestDatabaseService();
+        var projectService = new ProjectService(db);
+        var taskService = new TaskService(db);
+
+        var project = new Project { Name = "Project With Tasks" };
+        await projectService.SaveAsync(project);
+
+        var task1 = new TaskItem { Title = "Task 1", ProjectId = project.Id };
+        var task2 = new TaskItem { Title = "Task 2", ProjectId = project.Id };
+        var task3 = new TaskItem { Title = "Task 3", ProjectId = "other-project" };
+        await taskService.SaveAsync(task1);
+        await taskService.SaveAsync(task2);
+        await taskService.SaveAsync(task3);
+
+        await projectService.DeleteAsync(project.Id);
+
+        var updatedTask1 = await taskService.GetByIdAsync(task1.Id);
+        var updatedTask2 = await taskService.GetByIdAsync(task2.Id);
+        var updatedTask3 = await taskService.GetByIdAsync(task3.Id);
+
+        Assert.NotNull(updatedTask1);
+        Assert.Null(updatedTask1.ProjectId);
+        Assert.NotNull(updatedTask2);
+        Assert.Null(updatedTask2.ProjectId);
+        Assert.NotNull(updatedTask3);
+        Assert.Equal("other-project", updatedTask3.ProjectId);
+    }
+}
diff --git a/SarahsDailyApp.Tests/Services/ShoppingServiceTests.cs b/SarahsDailyApp.Tests/Services/ShoppingServiceTests.cs
new file mode 100644
index 0000000..eb4117a
--- /dev/null
+++ b/SarahsDailyApp.Tests/Services/ShoppingServiceTests.cs
@@ -0,0 +1,133 @@
+using SarahsDailyApp.Models;
+using SarahsDailyApp.Services;
+using SarahsDailyApp.Tests.Helpers;
+
+namespace SarahsDailyApp.Tests.Services;
+
+public class ShoppingServiceTests
+{
+    private static (ShoppingService service, TestDatabaseService db) CreateService()
+    {
+        var db = new TestDatabaseService();
+        var service = new ShoppingService(db);
+        return (service, db);
+    }
+
+    [Fact]
+    public async Task GetAllAsync_ReturnsEmpty_WhenNoItems()
+    {
+        var (service, _) = CreateService();
+        var items = await service.GetAllAsync();
+        Assert.Empty(items);
+    }
+
+    [Fact]
+    public async Task SaveAsync_InsertsNewItem()
+    {
+        var (service, _) = CreateService();
+        var item = new ShoppingItem { Name = "Milk", Quantity = "1 gallon" };
+
+        await service.SaveAsync(item);
+
+        var all = await service.GetAllAsync();
+        Assert.Single(all);
+        Assert.Equal("Milk", all[0].Name);
+        Assert.Equal("1 gallon", all[0].Quantity);
+    }
+
+    [Fact]
+    public async Task SaveAsync_UpdatesExistingItem()
+    {
+        var (service, _) = CreateService();
+        var item = new ShoppingItem { Name = "Original" };
+        await service.SaveAsync(item);
+
+        item.Name = "Updated";
+        await service.SaveAsync(item);
+
+        var all = await service.GetAllAsync();
+        Assert.Single(all);
+        Assert.Equal("Updated", all[0].Name);
+    }
+
+    [Fact]
+    public async Task DeleteAsync_RemovesItem()
+    {
+        var (service, _) = CreateService();
+        var item = new ShoppingItem { Name = "Delete Me" };
+        await service.SaveAsync(item);
+
+        await service.DeleteAsync(item.Id);
+
+        var all = await service.GetAllAsync();
+        Assert.Empty(all);
+    }
+
+    [Fact]
+    public async Task ToggleCompletionAsync_TogglesState()
+    {
+        var (service, _) = CreateService();
+        var item = new ShoppingItem { Name = "Toggle", Completed = false };
+        await service.SaveAsync(item);
+
+        await service.ToggleCompletionAsync(item);
+
+        var all = await service.GetAllAsync();
+        Assert.True(all[0].Completed);
+    }
+
+    [Fact]
+    public async Task ToggleCompletionAsync_TogglesBack()
+    {
+        var (service, _) = CreateService();
+        var item = new ShoppingItem { Name = "Toggle Back", Completed = false };
+        await service.SaveAsync(item);
+
+        await service.ToggleCompletionAsync(item);
+        await service.ToggleCompletionAsync(item);
+
+        var all = await service.GetAllAsync();
+        Assert.False(all[0].Completed);
+    }
+
+    [Fact]
+    public async Task ClearCheckedAsync_DeletesOnlyCompletedItems()
+    {
+        var (service, _) = CreateService();
+        await service.SaveAsync(new ShoppingItem { Name = "Checked 1", Completed = true });
+        await service.SaveAsync(new ShoppingItem { Name = "Checked 2", Completed = true });
+        await service.SaveAsync(new ShoppingItem { Name = "Unchecked", Completed = false });
+
+        await service.ClearCheckedAsync();
+
+        var all = await service.GetAllAsync();
+        Assert.Single(all);
+        Assert.Equal("Unchecked", all[0].Name);
+    }
+
+    [Fact]
+    public async Task ClearCheckedAsync_NoOp_WhenNoneChecked()
+    {
+        var (service, _) = CreateService();
+        await service.SaveAsync(new ShoppingItem { Name = "Item 1", Completed = false });
+        await service.SaveAsync(new ShoppingItem { Name = "Item 2", Completed = false });
+
+        await service.ClearCheckedAsync();
+
+        var all = await service.GetAllAsync();
+        Assert.Equal(2, all.Count);
+    }
+
+    [Fact]
+    public async Task ClearCheckedAsync_ClearsAll_WhenAllChecked()
+    {
+        var (service, _) = CreateService();
+        await service.SaveAsync(new ShoppingItem { Name = "Item 1", Completed = true });
+        await service.SaveAsync(new ShoppingItem { Name = "Item 2", Completed = true });
+
+        await service.ClearCheckedAsync();
+
+        var all = await service.GetAllAsync();
+        Assert.Empty(all);
+    }
+}
diff --git a/SarahsDailyApp.Tests/Services/TaskServiceTests.cs b/SarahsDailyApp.Tests/Services/TaskServiceTests.cs
new file mode 100644
index 0000000..5403cec
--- /dev/null
+++ b/SarahsDailyApp.Tests/Services/TaskServiceTests.cs
@@ -0,0 +1,421 @@
+using SarahsDailyApp.Models;
+using SarahsDailyApp.Services;
+using SarahsDailyApp.Tests.Helpers;
+
+namespace SarahsDailyApp.Tests.Services;
+
+public class TaskServiceTests
+{
+    private static (TaskService service, TestDatabaseService db) CreateService()
+    {
+        var db = new TestDatabaseService();
+        var service = new TaskService(db);
+        return (service, db);
+    }
+
+    [Fact]
+    public async Task GetAllAsync_ReturnsEmpty_WhenNoTasks()
+    {
+        var (service, _) = CreateService();
+        var tasks = await service.GetAllAsync();
+        Assert.Empty(tasks);
+    }
+
+    [Fact]
+    public async Task SaveAsync_InsertsNewTask()
+    {
+        var (service, _) = CreateService();
+        var task = new TaskItem { Title = "Test Task" };
+
+        await service.SaveAsync(task);
+
+        var all = await service.GetAllAsync();
+        Assert.Single(all);
+        Assert.Equal("Test Task", all[0].Title);
+    }
+
+    [Fact]
+    public async Task SaveAsync_UpdatesExistingTask()
+    {
+        var (service, _) = CreateService();
+        var task = new TaskItem { Title = "Original" };
+        await service.SaveAsync(task);
+
+        task.Title = "Updated";
+        await service.SaveAsync(task);
+
+        var all = await service.GetAllAsync();
+        Assert.Single(all);
+        Assert.Equal("Updated", all[0].Title);
+    }
+
+    [Fact]
+    public async Task GetByIdAsync_ReturnsTask_WhenExists()
+    {
+        var (service, _) = CreateService();
+        var task = new TaskItem { Title = "Find Me" };
+        await service.SaveAsync(task);
+
+        var found = await service.GetByIdAsync(task.Id);
+
+        Assert.NotNull(found);
+        Assert.Equal("Find Me", found.Title);
+    }
+
+    [Fact]
+    public async Task GetByIdAsync_ReturnsNull_WhenNotExists()
+    {
+        var (service, _) = CreateService();
+        var found = await service.GetByIdAsync("nonexistent");
+        Assert.Null(found);
+    }
+
+    [Fact]
+    public async Task GetByProjectIdAsync_ReturnsMatchingTasks()
+    {
+        var (service, _) = CreateService();
+        var projectId = "proj-1";
+        await service.SaveAsync(new TaskItem { Title = "Task A", ProjectId = projectId });
+        await service.SaveAsync(new TaskItem { Title = "Task B", ProjectId = projectId });
+        await service.SaveAsync(new TaskItem { Title = "Task C", ProjectId = "other" });
+
+        var tasks = await service.GetByProjectIdAsync(projectId);
+
+        Assert.Equal(2, tasks.Count);
+        Assert.All(tasks, t => Assert.Equal(projectId, t.ProjectId));
+    }
+
+    [Fact]
+    public async Task DeleteAsync_RemovesTask()
+    {
+        var (service, _) = CreateService();
+        var task = new TaskItem { Title = "To Delete" };
+        await service.SaveAsync(task);
+
+        await service.DeleteAsync(task.Id);
+
+        var all = await service.GetAllAsync();
+        Assert.Empty(all);
+    }
+
+    [Fact]
+    public async Task GetCompletedCountAsync_ReturnsCount()
+    {
+        var (service, _) = CreateService();
+        await service.SaveAsync(new TaskItem { Title = "Done 1", Completed = true });
+        await service.SaveAsync(new TaskItem { Title = "Done 2", Completed = true });
+        await service.SaveAsync(new TaskItem { Title = "Not Done", Completed = false });
+
+        var count = await service.GetCompletedCountAsync();
+
+        Assert.Equal(2, count);
+    }
+
+    [Fact]
+    public async Task ToggleCompletionAsync_CompletesTask()
+    {
+        var (service, _) = CreateService();
+        var task = new TaskItem { Title = "Toggle Me", Completed = false };
+        await service.SaveAsync(task);
+
+        await service.ToggleCompletionAsync(task, DateTime.Today);
+
+        var updated = await service.GetByIdAsync(task.Id);
+        Assert.NotNull(updated);
+        Assert.True(updated.Completed);
+        Assert.Equal(DateTime.Today.Date, updated.CompletedDate);
+    }
+
+    [Fact]
+    public async Task ToggleCompletionAsync_UncompletesTask()
+    {
+        var (service, _) = CreateService();
+        var task = new TaskItem { Title = "Toggle Me", Completed = true, CompletedDate = DateTime.Today };
+        await service.SaveAsync(task);
+
+        await service.ToggleCompletionAsync(task, DateTime.Today);
+
+        var updated = await service.GetByIdAsync(task.Id);
+        Assert.NotNull(updated);
+        Assert.False(updated.Completed);
+        Assert.Null(updated.CompletedDate);
+    }
+
+    [Fact]
+    public async Task ToggleCompletionAsync_CreatesRecurringTask_WhenCompleted()
+    {
+        var (service, _) = CreateService();
+        var task = new TaskItem
+        {
+            Title = "Daily Task",
+            RepeatType = RepeatType.Daily,
+            RepeatUnit = 1,
+            Completed = false
+        };
+        await service.SaveAsync(task);
+
+        await service.ToggleCompletionAsync(task, DateTime.Today);
+
+        var all = await service.GetAllAsync();
+        Assert.Equal(2, all.Count);
+        var newTask = all.First(t => t.Id != task.Id);
+        Assert.Equal("Daily Task", newTask.Title);
+        Assert.False(newTask.Completed);
+        Assert.Equal(RepeatType.Daily, newTask.RepeatType);
+    }
+
+    [Fact]
+    public async Task ToggleCompletionAsync_DoesNotCreateRecurring_WhenUncompleted()
+    {
+        var (service, _) = CreateService();
+        var task = new TaskItem
+        {
+            Title = "Daily Task",
+            RepeatType = RepeatType.Daily,
+            Completed = true,
+            CompletedDate = DateTime.Today
+        };
+        await service.SaveAsync(task);
+
+        await service.ToggleCompletionAsync(task, DateTime.Today);
+
+        var all = await service.GetAllAsync();
+        Assert.Single(all);
+    }
+
+    // --- CreateNextRecurringTask tests (static method) ---
+
+    [Fact]
+    public void CreateNextRecurringTask_Daily_AddsDays()
+    {
+        var original = new TaskItem
+        {
+            Title = "Daily",
+            RepeatType = RepeatType.Daily,
+            RepeatUnit = 1,
+            DueDate = new DateTime(2025, 1, 1)
+        };
+        var completionDate = new DateTime(2025, 1, 1);
+
+        var next = TaskService.CreateNextRecurringTask(original, completionDate);
+
+        Assert.Equal(new DateTime(2025, 1, 2), next.DueDate);
+        Assert.NotEqual(original.Id, next.Id);
+        Assert.Equal("Daily", next.Title);
+        Assert.False(next.Completed);
+        Assert.Null(next.CompletedDate);
+    }
+
+    [Fact]
+    public void CreateNextRecurringTask_Daily_WithUnit3_Adds3Days()
+    {
+        var original = new TaskItem
+        {
+            Title = "Every 3 Days",
+            RepeatType = RepeatType.Daily,
+            RepeatUnit = 3
+        };
+        var completionDate = new DateTime(2025, 1, 10);
+
+        var next = TaskService.CreateNextRecurringTask(original, completionDate);
+
+        Assert.Equal(new DateTime(2025, 1, 13), next.DueDate);
+    }
+
+    [Fact]
+    public void CreateNextRecurringTask_Weekly_Adds7Days()
+    {
+        var original = new TaskItem
+        {
+            Title = "Weekly",
+            RepeatType = RepeatType.Weekly,
+            RepeatUnit = 1
+        };
+        var completionDate = new DateTime(2025, 1, 6); // Monday
+
+        var next = TaskService.CreateNextRecurringTask(original, completionDate);
+
+        Assert.Equal(new DateTime(2025, 1, 13), next.DueDate);
+    }
+
+    [Fact]
+    public void CreateNextRecurringTask_Weekly_WithUnit2_Adds14Days()
+    {
+        var original = new TaskItem
+        {
+            Title = "Bi-Weekly",
+            RepeatType = RepeatType.Weekly,
+            RepeatUnit = 2
+        };
+        var completionDate = new DateTime(2025, 1, 6);
+
+        var next = TaskService.CreateNextRecurringTask(original, completionDate);
+
+        Assert.Equal(new DateTime(2025, 1, 20), next.DueDate);
+    }
+
+    [Fact]
+    public void CreateNextRecurringTask_Monthly_AddsMonth()
+    {
+        var original = new TaskItem
+        {
+            Title = "Monthly",
+            RepeatType = RepeatType.Monthly,
+            RepeatUnit = 1
+        };
+        var completionDate = new DateTime(2025, 1, 15);
+
+        var next = TaskService.CreateNextRecurringTask(original, completionDate);
+
+        Assert.Equal(new DateTime(2025, 2, 15), next.DueDate);
+    }
+
+    [Fact]
+    public void CreateNextRecurringTask_Monthly_WithUnit3_Adds3Months()
+    {
+        var original = new TaskItem
+        {
+            Title = "Quarterly",
+            RepeatType = RepeatType.Monthly,
+            RepeatUnit = 3
+        };
+        var completionDate = new DateTime(2025, 1, 15);
+
+        var next = TaskService.CreateNextRecurringTask(original, completionDate);
+
+        Assert.Equal(new DateTime(2025, 4, 15), next.DueDate);
+    }
+
+    [Fact]
+    public void CreateNextRecurringTask_Yearly_AddsYear()
+    {
+        var original = new TaskItem
+        {
+            Title = "Yearly",
+            RepeatType = RepeatType.Yearly,
+            RepeatUnit = 1
+        };
+        var completionDate = new DateTime(2025, 6, 15);
+
+        var next = TaskService.CreateNextRecurringTask(original, completionDate);
+
+        Assert.Equal(new DateTime(2026, 6, 15), next.DueDate);
+    }
+
+    [Fact]
+    public void CreateNextRecurringTask_Custom_AddsCustomDays()
+    {
+        var original = new TaskItem
+        {
+            Title = "Custom",
+            RepeatType = RepeatType.Custom,
+            CustomRepeatDays = 10
+        };
+        var completionDate = new DateTime(2025, 1, 1);
+
+        var next = TaskService.CreateNextRecurringTask(original, completionDate);
+
+        Assert.Equal(new DateTime(2025, 1, 11), next.DueDate);
+    }
+
+    [Fact]
+    public void CreateNextRecurringTask_Custom_DefaultsTo1Day_WhenNull()
+    {
+        var original = new TaskItem
+        {
+            Title = "Custom No Days",
+            RepeatType = RepeatType.Custom,
+            CustomRepeatDays = null
+        };
+        var completionDate = new DateTime(2025, 1, 1);
+
+        var next = TaskService.CreateNextRecurringTask(original, completionDate);
+
+        Assert.Equal(new DateTime(2025, 1, 2), next.DueDate);
+    }
+
+    [Fact]
+    public void CreateNextRecurringTask_Movable_AddsMovableDays()
+    {
+        var original = new TaskItem
+        {
+            Title = "Movable",
+            RepeatType = RepeatType.Movable,
+            MovableRepeatDays = 5
+        };
+        var completionDate = new DateTime(2025, 1, 1);
+
+        var next = TaskService.CreateNextRecurringTask(original, completionDate);
+
+        Assert.Equal(new DateTime(2025, 1, 6), next.DueDate);
+    }
+
+    [Fact]
+    public void CreateNextRecurringTask_Daily_WithDaysOfWeek_FindsNextMatchingDay()
+    {
+        // Jan 6, 2025 is Monday (DayOfWeek = 1)
+        // DaysOfWeek = "3,5" means Wed and Fri
+        var original = new TaskItem
+        {
+            Title = "Weekday Task",
+            RepeatType = RepeatType.Daily,
+            RepeatUnit = 1,
+            DaysOfWeek = "3,5" // Wed, Fri
+        };
+        var completionDate = new DateTime(2025, 1, 6); // Monday
+
+        var next = TaskService.CreateNextRecurringTask(original, completionDate);
+
+        // Next Wednesday after Monday is Jan 8
+        Assert.Equal(new DateTime(2025, 1, 8), next.DueDate);
+    }
+
+    [Fact]
+    public void CreateNextRecurringTask_Weekly_WithDaysOfWeek_FindsNextOccurrence()
+    {
+        // Jan 8, 2025 is Wednesday (DayOfWeek = 3)
+        // DaysOfWeek = "1" means Monday
+        var original = new TaskItem
+        {
+            Title = "Weekly Monday",
+            RepeatType = RepeatType.Weekly,
+            RepeatUnit = 1,
+            DaysOfWeek = "1" // Monday
+        };
+        var completionDate = new DateTime(2025, 1, 8); // Wednesday
+
+        var next = TaskService.CreateNextRecurringTask(original, completionDate);
+
+        // Next Monday after Wednesday is Jan 13
+        Assert.Equal(new DateTime(2025, 1, 13), next.DueDate);
+    }
+
+    [Fact]
+    public void CreateNextRecurringTask_PreservesAllProperties()
+    {
+        var original = new TaskItem
+        {
+            Title = "Full Task",
+            Description = "A description",
+            RepeatType = RepeatType.Daily,
+            RepeatUnit = 2,
+            CustomRepeatDays = 5,
+            MovableRepeatDays = 3,
+            DaysOfWeek = "1,3",
+            ProjectId = "project-123"
+        };
+        var completionDate = new DateTime(2025, 1, 1);
+
+        var next = TaskService.CreateNextRecurringTask(original, completionDate);
+
+        Assert.Equal(original.Title, next.Title);
+        Assert.Equal(original.Description, next.Description);
+        Assert.Equal(original.RepeatType, next.RepeatType);
+        Assert.Equal(original.RepeatUnit, next.RepeatUnit);
+        Assert.Equal(original.CustomRepeatDays, next.CustomRepeatDays);
+        Assert.Equal(original.MovableRepeatDays, next.MovableRepeatDays);
+        Assert.Equal(original.DaysOfWeek, next.DaysOfWeek);
+        Assert.Equal(original.ProjectId, next.ProjectId);
+        Assert.NotEqual(original.Id, next.Id);
+    }
+}
diff --git a/SarahsDailyApp.Tests/Services/UserStatsServiceTests.cs b/SarahsDailyApp.Tests/Services/UserStatsServiceTests.cs
new file mode 100644
index 0000000..e947c94
--- /dev/null
+++ b/SarahsDailyApp.Tests/Services/UserStatsServiceTests.cs
@@ -0,0 +1,248 @@
+using SarahsDailyApp.Models;
+using SarahsDailyApp.Services;
+using SarahsDailyApp.Tests.Helpers;
+
+namespace SarahsDailyApp.Tests.Services;
+
+public class UserStatsServiceTests
+{
+    private static (UserStatsService service, TaskService taskService, TestDatabaseService db) CreateService()
+    {
+        var db = new TestDatabaseService();
+        var taskService = new TaskService(db);
+        var service = new UserStatsService(db, taskService);
+        return (service, taskService, db);
+    }
+
+    [Fact]
+    public async Task GetAsync_ReturnsDefaultStats()
+    {
+        var (service, _, _) = CreateService();
+
+        var stats = await service.GetAsync();
+
+        Assert.NotNull(stats);
+        Assert.Equal(1, stats.Id);
+        Assert.Equal(1, stats.Level);
+        Assert.Equal(0, stats.DailyStreak);
+    }
+
+    [Fact]
+    public async Task GetSettingsAsync_ReturnsDefaultSettings()
+    {
+        var (service, _, _) = CreateService();
+
+        var settings = await service.GetSettingsAsync();
+
+        Assert.NotNull(settings);
+        Assert.Equal(1, settings.Id);
+        Assert.Equal(30, settings.TasksPerLevel);
+    }
+
+    [Fact]
+    public async Task SaveSettingsAsync_UpdatesAndRecalculates()
+    {
+        var (service, taskService, _) = CreateService();
+
+        // Complete 10 tasks
+        for (int i = 0; i < 10; i++)
+        {
+            await taskService.SaveAsync(new TaskItem
+            {
+                Title = $"Task {i}",
+                Completed = true
+            });
+        }
+
+        var settings = await service.GetSettingsAsync();
+        settings.TasksPerLevel = 5;
+        await service.SaveSettingsAsync(settings);
+
+        var stats = await service.GetAsync();
+        // 10 completed / 5 per level + 1 = 3
+        Assert.Equal(3, stats.Level);
+    }
+
+    [Fact]
+    public async Task RecalculateLevelAsync_CalculatesCorrectly()
+    {
+        var (service, taskService, _) = CreateService();
+
+        // Complete 31 tasks with default 30 per level
+        for (int i = 0; i < 31; i++)
+        {
+            await taskService.SaveAsync(new TaskItem
+            {
+                Title = $"Task {i}",
+                Completed = true
+            });
+        }
+
+        await service.RecalculateLevelAsync();
+
+        var stats = await service.GetAsync();
+        // 31 / 30 + 1 = 2
+        Assert.Equal(2, stats.Level);
+    }
+
+    [Fact]
+    public async Task RecalculateLevelAsync_Level1_WhenNoCompletedTasks()
+    {
+        var (service, _, _) = CreateService();
+
+        await service.RecalculateLevelAsync();
+
+        var stats = await service.GetAsync();
+        // 0 / 30 + 1 = 1
+        Assert.Equal(1, stats.Level);
+    }
+
+    [Fact]
+    public async Task RecalculateLevelAsync_Level1_WithLessThanThreshold()
+    {
+        var (service, taskService, _) = CreateService();
+
+        for (int i = 0; i < 29; i++)
+        {
+            await taskService.SaveAsync(new TaskItem
+            {
+                Title = $"Task {i}",
+                Completed = true
+            });
+        }
+
+        await service.RecalculateLevelAsync();
+
+        var stats = await service.GetAsync();
+        // 29 / 30 + 1 = 1
+        Assert.Equal(1, stats.Level);
+    }
+
+    [Fact]
+    public async Task RecalculateLevelAsync_Level2_AtExactThreshold()
+    {
+        var (service, taskService, _) = CreateService();
+
+        for (int i = 0; i < 30; i++)
+        {
+            await taskService.SaveAsync(new TaskItem
+            {
+                Title = $"Task {i}",
+                Completed = true
+            });
+        }
+
+        await service.RecalculateLevelAsync();
+
+        var stats = await service.GetAsync();
+        // 30 / 30 + 1 = 2
+        Assert.Equal(2, stats.Level);
+    }
+
+    [Fact]
+    public async Task UpdateDailyStreakAsync_StartsAt1_OnFirstActivity()
+    {
+        var (service, _, _) = CreateService();
+
+        await service.UpdateDailyStreakAsync();
+
+        var stats = await service.GetAsync();
+        Assert.Equal(1, stats.DailyStreak);
+        Assert.Equal(DateTime.Today, stats.LastActivityDate);
+    }
+
+    [Fact]
+    public async Task UpdateDailyStreakAsync_DoesNotIncrement_WhenCalledSameDay()
+    {
+        var (service, _, db) = CreateService();
+
+        // Simulate already updated today
+        var conn = await db.GetDatabaseAsync();
+        var stats = await conn.FindAsync<UserStats>(1);
+        stats!.DailyStreak = 5;
+        stats.LastActivityDate = DateTime.Today;
+        await conn.UpdateAsync(stats);
+
+        await service.UpdateDailyStreakAsync();
+
+        var updated = await service.GetAsync();
+        Assert.Equal(5, updated.DailyStreak);
+    }
+
+    [Fact]
+    public async Task UpdateDailyStreakAsync_Increments_WhenCalledNextDay()
+    {
+        var (service, _, db) = CreateService();
+
+        // Simulate last activity was yesterday
+        var conn = await db.GetDatabaseAsync();
+        var stats = await conn.FindAsync<UserStats>(1);
+        stats!.DailyStreak = 3;
+        stats.LastActivityDate = DateTime.Today.AddDays(-1);
+        await conn.UpdateAsync(stats);
+
+        await service.UpdateDailyStreakAsync();
+
+        var updated = await service.GetAsync();
+        Assert.Equal(4, updated.DailyStreak);
+    }
+
+    [Fact]
+    public async Task UpdateDailyStreakAsync_Resets_WhenGapInDays()
+    {
+        var (service, _, db) = CreateService();
+
+        // Simulate last activity was 3 days ago
+        var conn = await db.GetDatabaseAsync();
+        var stats = await conn.FindAsync<UserStats>(1);
+        stats!.DailyStreak = 10;
+        stats.LastActivityDate = DateTime.Today.AddDays(-3);
+        await conn.UpdateAsync(stats);
+
+        await service.UpdateDailyStreakAsync();
+
+        var updated = await service.GetAsync();
+        Assert.Equal(1, updated.DailyStreak);
+    }
+
+    [Fact]
+    public async Task GetProgressToNextLevelAsync_ReturnsRemainder()
+    {
+        var (service, taskService, _) = CreateService();
+
+        // Complete 35 tasks with default 30 per level
+        for (int i = 0; i < 35; i++)
+        {
+            await taskService.SaveAsync(new TaskItem
+            {
+                Title = $"Task {i}",
+                Completed = true
+            });
+        }
+
+        var progress = await service.GetProgressToNextLevelAsync();
+
+        // 35 % 30 = 5
+        Assert.Equal(5, progress);
+    }
+
+    [Fact]
+    public async Task GetProgressToNextLevelAsync_ReturnsZero_AtExactLevel()
+    {
+        var (service, taskService, _) = CreateService();
+
+        for (int i = 0; i < 60; i++)
+        {
+            await taskService.SaveAsync(new TaskItem
+            {
+                Title = $"Task {i}",
+                Completed = true
+            });
+        }
+
+        var progress = await service.GetProgressToNextLevelAsync();
+
+        // 60 % 30 = 0
+        Assert.Equal(0, progress);
+    }
+}
diff --git a/SarahsDailyApp.Tests/Services/WishListServiceTests.cs b/SarahsDailyApp.Tests/Services/WishListServiceTests.cs
new file mode 100644
index 0000000..2e6593f
--- /dev/null
+++ b/SarahsDailyApp.Tests/Services/WishListServiceTests.cs
@@ -0,0 +1,208 @@
+using SarahsDailyApp.Models;
+using SarahsDailyApp.Services;
+using SarahsDailyApp.Tests.Helpers;
+
+namespace SarahsDailyApp.Tests.Services;
+
+public class WishListServiceTests
+{
+    private static (WishListService service, TestDatabaseService db) CreateService()
+    {
+        var db = new TestDatabaseService();
+        var service = new WishListService(db);
+        return (service, db);
+    }
+
+    // --- WishList tests ---
+
+    [Fact]
+    public async Task GetAllListsAsync_ReturnsEmpty_WhenNoLists()
+    {
+        var (service, _) = CreateService();
+        var lists = await service.GetAllListsAsync();
+        Assert.Empty(lists);
+    }
+
+    [Fact]
+    public async Task SaveListAsync_InsertsNewList_WithAutoOrder()
+    {
+        var (service, _) = CreateService();
+        var list = new WishList { Name = "Birthday" };
+
+        await service.SaveListAsync(list);
+
+        var all = await service.GetAllListsAsync();
+        Assert.Single(all);
+        Assert.Equal("Birthday", all[0].Name);
+        Assert.Equal(0, all[0].Order);
+    }
+
+    [Fact]
+    public async Task SaveListAsync_IncrementalOrder_ForMultipleLists()
+    {
+        var (service, _) = CreateService();
+        await service.SaveListAsync(new WishList { Name = "List 1" });
+        await service.SaveListAsync(new WishList { Name = "List 2" });
+        await service.SaveListAsync(new WishList { Name = "List 3" });
+
+        var all = await service.GetAllListsAsync();
+        Assert.Equal(3, all.Count);
+        Assert.Equal(0, all[0].Order);
+        Assert.Equal(1, all[1].Order);
+        Assert.Equal(2, all[2].Order);
+    }
+
+    [Fact]
+    public async Task SaveListAsync_UpdatesExistingList()
+    {
+        var (service, _) = CreateService();
+        var list = new WishList { Name = "Original" };
+        await service.SaveListAsync(list);
+
+        list.Name = "Updated";
+        await service.SaveListAsync(list);
+
+        var all = await service.GetAllListsAsync();
+        Assert.Single(all);
+        Assert.Equal("Updated", all[0].Name);
+    }
+
+    [Fact]
+    public async Task DeleteListAsync_RemovesList()
+    {
+        var (service, _) = CreateService();
+        var list = new WishList { Name = "Delete Me" };
+        await service.SaveListAsync(list);
+
+        await service.DeleteListAsync(list.Id);
+
+        var all = await service.GetAllListsAsync();
+        Assert.Empty(all);
+    }
+
+    [Fact]
+    public async Task DeleteListAsync_UnlinksItems()
+    {
+        var (service, _) = CreateService();
+        var list = new WishList { Name = "My List" };
+        await service.SaveListAsync(list);
+
+        var item = new WishItem { Title = "Linked Item", ListId = list.Id };
+        await service.SaveItemAsync(item);
+
+        await service.DeleteListAsync(list.Id);
+
+        var items = await service.GetAllItemsAsync();
+        Assert.Single(items);
+        Assert.Null(items[0].ListId);
+    }
+
+    // --- WishItem tests ---
+
+    [Fact]
+    public async Task GetAllItemsAsync_ReturnsEmpty_WhenNoItems()
+    {
+        var (service, _) = CreateService();
+        var items = await service.GetAllItemsAsync();
+        Assert.Empty(items);
+    }
+
+    [Fact]
+    public async Task SaveItemAsync_InsertsNewItem_WithAutoOrder()
+    {
+        var (service, _) = CreateService();
+        var item = new WishItem { Title = "Gadget" };
+
+        await service.SaveItemAsync(item);
+
+        var all = await service.GetAllItemsAsync();
+        Assert.Single(all);
+        Assert.Equal("Gadget", all[0].Title);
+        Assert.Equal(0, all[0].Order);
+    }
+
+    [Fact]
+    public async Task SaveItemAsync_UpdatesExistingItem()
+    {
+        var (service, _) = CreateService();
+        var item = new WishItem { Title = "Original" };
+        await service.SaveItemAsync(item);
+
+        item.Title = "Updated";
+        await service.SaveItemAsync(item);
+
+        var all = await service.GetAllItemsAsync();
+        Assert.Single(all);
+        Assert.Equal("Updated", all[0].Title);
+    }
+
+    [Fact]
+    public async Task DeleteItemAsync_RemovesItem()
+    {
+        var (service, _) = CreateService();
+        var item = new WishItem { Title = "Delete Me" };
+        await service.SaveItemAsync(item);
+
+        await service.DeleteItemAsync(item.Id);
+
+        var all = await service.GetAllItemsAsync();
+        Assert.Empty(all);
+    }
+
+    [Fact]
+    public async Task GetItemsByListIdAsync_ReturnsMatchingItems()
+    {
+        var (service, _) = CreateService();
+        var list = new WishList { Name = "My List" };
+        await service.SaveListAsync(list);
+
+        await service.SaveItemAsync(new WishItem { Title = "Item A", ListId = list.Id });
+        await service.SaveItemAsync(new WishItem { Title = "Item B", ListId = list.Id });
+        await service.SaveItemAsync(new WishItem { Title = "Item C", ListId = "other" });
+
+        var items = await service.GetItemsByListIdAsync(list.Id);
+
+        Assert.Equal(2, items.Count);
+        Assert.All(items, i => Assert.Equal(list.Id, i.ListId));
+    }
+
+    [Fact]
+    public async Task GetItemsByListIdAsync_Null_ReturnsUnlinkedItems()
+    {
+        var (service, _) = CreateService();
+        await service.SaveItemAsync(new WishItem { Title = "Unlinked", ListId = null });
+        await service.SaveItemAsync(new WishItem { Title = "Linked", ListId = "some-list" });
+
+        var items = await service.GetItemsByListIdAsync(null);
+
+        Assert.Single(items);
+        Assert.Equal("Unlinked", items[0].Title);
+    }
+
+    [Fact]
+    public async Task ToggleItemCompletionAsync_TogglesState()
+    {
+        var (service, _) = CreateService();
+        var item = new WishItem { Title = "Toggle", Completed = false };
+        await service.SaveItemAsync(item);
+
+        await service.ToggleItemCompletionAsync(item);
+
+        var all = await service.GetAllItemsAsync();
+        Assert.True(all[0].Completed);
+    }
+
+    [Fact]
+    public async Task ToggleItemCompletionAsync_TogglesBack()
+    {
+        var (service, _) = CreateService();
+        var item = new WishItem { Title = "Toggle Back", Completed = false };
+        await service.SaveItemAsync(item);
+
+        await service.ToggleItemCompletionAsync(item);
+        await service.ToggleItemCompletionAsync(item);
+
+        var all = await service.GetAllItemsAsync();
+        Assert.False(all[0].Completed);
+    }
+}
diff --git a/SarahsDailyApp.slnx b/SarahsDailyApp.slnx
index 1facaf6..be4bd2b 100644
--- a/SarahsDailyApp.slnx
+++ b/SarahsDailyApp.slnx
@@ -2,6 +2,7 @@
   <Folder Name="/Solution Items/">
     <File Path="Spec.md" />
   </Folder>
+  <Project Path="SarahsDailyApp.Tests/SarahsDailyApp.Tests.csproj" />
   <Project Path="SarahsDailyApp/SarahsDailyApp.csproj">
     <Deploy Solution="Debug|*" />
   </Project>
diff --git a/SarahsDailyApp/AppShell.xaml b/SarahsDailyApp/AppShell.xaml
index f1b9223..4651971 100644
--- a/SarahsDailyApp/AppShell.xaml
+++ b/SarahsDailyApp/AppShell.xaml
@@ -4,34 +4,35 @@
     xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
     xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
     xmlns:views="clr-namespace:SarahsDailyApp.Views"
+    FlyoutBehavior="Disabled"
     Title="📋 Task Manager">
 
     <TabBar>
-        <Tab Title="Dashboard" Icon="home.png">
+        <Tab Title="🏠 Dashboard">
             <ShellContent ContentTemplate="{DataTemplate views:DashboardPage}" Route="DashboardPage"/>
         </Tab>
-        <Tab Title="Tasks" Icon="check.png">
+        <Tab Title="✅ Tasks">
             <ShellContent ContentTemplate="{DataTemplate views:TasksPage}" Route="TasksPage"/>
         </Tab>
-        <Tab Title="Projects" Icon="folder.png">
+        <Tab Title="📁 Projects">
             <ShellContent ContentTemplate="{DataTemplate views:ProjectsPage}" Route="ProjectsPage"/>
         </Tab>
-        <Tab Title="Habits" Icon="refresh.png">
+        <Tab Title="🔄 Habits">
             <ShellContent ContentTemplate="{DataTemplate views:HabitsPage}" Route="HabitsPage"/>
         </Tab>
-        <Tab Title="Wish List" Icon="gift.png">
+        <Tab Title="🎁 Wish List">
             <ShellContent ContentTemplate="{DataTemplate views:WishListPage}" Route="WishListPage"/>
         </Tab>
-        <Tab Title="Shopping" Icon="cart.png">
+        <Tab Title="🛒 Shopping">
             <ShellContent ContentTemplate="{DataTemplate views:ShoppingListPage}" Route="ShoppingListPage"/>
         </Tab>
-        <Tab Title="Notes" Icon="notes.png">
+        <Tab Title="📝 Notes">
             <ShellContent ContentTemplate="{DataTemplate views:NotesPage}" Route="NotesPage"/>
         </Tab>
-        <Tab Title="Finances" Icon="money.png">
+        <Tab Title="💰 Finances">
             <ShellContent ContentTemplate="{DataTemplate views:FinancesPage}" Route="FinancesPage"/>
         </Tab>
-        <Tab Title="Settings" Icon="settings.png">
+        <Tab Title="⚙️ Settings">
             <ShellContent ContentTemplate="{DataTemplate views:SettingsPage}" Route="SettingsPage"/>
         </Tab>
     </TabBar>
diff --git a/SarahsDailyApp/Services/DatabaseService.cs b/SarahsDailyApp/Services/DatabaseService.cs
index ba76177..8747613 100644
--- a/SarahsDailyApp/Services/DatabaseService.cs
+++ b/SarahsDailyApp/Services/DatabaseService.cs
@@ -15,7 +15,7 @@ public class DatabaseService
         "Entertainment", "Utilities", "Income"
     ];
 
-    public async Task<SQLiteAsyncConnection> GetDatabaseAsync()
+    public virtual async Task<SQLiteAsyncConnection> GetDatabaseAsync()
     {
         if (_initialized && _database is not null)
             return _database;

From 2b60f7d0c3ca89f2a94882845228865bf96c70b2 Mon Sep 17 00:00:00 2001
From: joeprogrammer88 <joeProgrammer88@users.noreply.github.com>
Date: Tue, 31 Mar 2026 08:24:33 -0700
Subject: [PATCH 03/11] Remove migrate specs

---
 SarahsDailyApp.slnx |   4 +-
 Spec.md             | 886 --------------------------------------------
 2 files changed, 1 insertion(+), 889 deletions(-)
 delete mode 100644 Spec.md

diff --git a/SarahsDailyApp.slnx b/SarahsDailyApp.slnx
index be4bd2b..6d28b2a 100644
--- a/SarahsDailyApp.slnx
+++ b/SarahsDailyApp.slnx
@@ -1,7 +1,5 @@
 <Solution>
-  <Folder Name="/Solution Items/">
-    <File Path="Spec.md" />
-  </Folder>
+  <Folder Name="/Solution Items/" />
   <Project Path="SarahsDailyApp.Tests/SarahsDailyApp.Tests.csproj" />
   <Project Path="SarahsDailyApp/SarahsDailyApp.csproj">
     <Deploy Solution="Debug|*" />
diff --git a/Spec.md b/Spec.md
deleted file mode 100644
index 8a9179b..0000000
--- a/Spec.md
+++ /dev/null
@@ -1,886 +0,0 @@
-# TaskManagerWeb — Application Specification & .NET MAUI Migration Guide
-
-## Table of Contents
-
-1. [Overview](#overview)
-2. [Technology Stack](#technology-stack)
-3. [Data Models](#data-models)
-4. [Data Storage & Persistence](#data-storage--persistence)
-5. [Application Architecture](#application-architecture)
-6. [Feature Specifications](#feature-specifications)
-   - [Navigation & Layout](#navigation--layout)
-   - [Date Navigator](#date-navigator)
-   - [Dashboard](#1-dashboard)
-   - [Tasks](#2-tasks)
-   - [Projects](#3-projects)
-   - [Habits](#4-habits)
-   - [Finances](#5-finances)
-   - [Wish List](#6-wish-list)
-   - [Shopping List](#7-shopping-list)
-   - [Notes](#8-notes)
-   - [Settings](#9-settings)
-7. [Gamification System](#gamification-system)
-8. [PWA Capabilities](#pwa-capabilities)
-9. [.NET MAUI Migration Guide](#net-maui-migration-guide)
-
----
-
-## Overview
-
-**TaskManagerWeb** is a comprehensive personal productivity Progressive Web App (PWA) built with vanilla TypeScript. It combines task management, project tracking, habit tracking, finance management, wish lists, shopping lists, and notes — all in a single application with gamification elements (levels and streaks).
-
-All data is stored locally in the browser's `localStorage`. There is no server or database backend.
-
----
-
-## Technology Stack
-
-| Layer         | Technology                              |
-|---------------|----------------------------------------|
-| Language      | TypeScript (compiled to JavaScript)     |
-| UI            | Vanilla HTML5 / CSS3 (no framework)     |
-| Storage       | Browser `localStorage` (JSON blob)      |
-| PWA           | Service Worker + Web App Manifest       |
-| Unit Tests    | Vitest                                  |
-| E2E Tests     | Playwright                              |
-| Build         | TypeScript compiler (`tsc`) → `js/`     |
-
----
-
-## Data Models
-
-### Task
-
-| Field              | Type                                                                    | Required | Default    | Description |
-|--------------------|-------------------------------------------------------------------------|----------|------------|-------------|
-| `id`               | `string`                                                                | Yes      | Generated  | Unique ID (base-36 timestamp + random) |
-| `title`            | `string`                                                                | Yes      | `""`       | Task title |
-| `description`      | `string?`                                                               | No       | —          | Optional description |
-| `dueDate`          | `string?`                                                               | No       | —          | ISO date string `YYYY-MM-DD` |
-| `repeatType`       | `"none" \| "daily" \| "weekly" \| "monthly" \| "yearly" \| "custom" \| "movable"` | Yes | `"none"` | Recurrence type |
-| `repeatUnit`       | `number?`                                                               | No       | `1`        | Every N days/weeks/months/years (used for daily, weekly, monthly, yearly) |
-| `customRepeatDays` | `number?`                                                               | No       | —          | Interval in days for `custom` repeat type |
-| `movableRepeatDays`| `number?`                                                               | No       | —          | Days from completion for `movable` repeat type |
-| `daysOfWeek`       | `number[]?`                                                             | No       | —          | 0=Sun..6=Sat; for daily/weekly with specific days |
-| `projectId`        | `string \| null?`                                                       | No       | `null`     | FK to a Project |
-| `completed`        | `boolean`                                                               | Yes      | `false`    | Completion status |
-| `completedDate`    | `string \| null?`                                                       | No       | `null`     | Date completed (`YYYY-MM-DD`) |
-| `createdDate`      | `string`                                                                | Yes      | Auto       | ISO timestamp |
-
-### Project
-
-| Field         | Type      | Required | Default    | Description |
-|---------------|-----------|----------|------------|-------------|
-| `id`          | `string`  | Yes      | Generated  | Unique ID |
-| `name`        | `string`  | Yes      | `""`       | Project name |
-| `description` | `string?` | No       | —          | Optional description |
-| `color`       | `string?` | No       | `"#3b82f6"`| Hex color code for visual tag |
-| `createdDate` | `string`  | Yes      | Auto       | ISO timestamp |
-
-### Habit
-
-| Field               | Type              | Required | Default  | Description |
-|---------------------|-------------------|----------|----------|-------------|
-| `id`                | `string`          | Yes      | Generated| Unique ID |
-| `name`              | `string`          | Yes      | `""`     | Habit name |
-| `description`       | `string?`         | No       | —        | Optional description |
-| `icon`              | `string`          | Yes      | `"⭐"`   | Emoji icon displayed on the habit card |
-| `category`          | `string \| null?` | No       | `null`   | Category from shared categories list |
-| `targetGoal`        | `number`          | Yes      | `1`      | Completions per day needed to "finish" the habit |
-| `daysOfWeek`        | `number[]?`       | No       | All 7    | Days the habit is scheduled (0=Sun..6=Sat) |
-| `streak`            | `number`          | Yes      | `0`      | Consecutive fully-completed days |
-| `lastCompletedDate` | `string \| null?` | No       | `null`   | Last date fully completed (`YYYY-MM-DD`) |
-| `createdDate`       | `string`          | Yes      | Auto     | ISO timestamp |
-
-### HabitLog
-
-| Field       | Type     | Required | Description |
-|-------------|----------|----------|-------------|
-| `id`        | `string` | Yes      | Unique ID |
-| `habitId`   | `string` | Yes      | FK to Habit |
-| `date`      | `string` | Yes      | Date of completion (`YYYY-MM-DD`) |
-| `timestamp` | `string` | Yes      | Full ISO timestamp of when logged |
-
-### FinanceItem (used for Expenses, Revenue, and Charges)
-
-| Field         | Type                                     | Required | Default  | Description |
-|---------------|------------------------------------------|----------|----------|-------------|
-| `id`          | `string`                                 | Yes      | Generated| Unique ID |
-| `description` | `string`                                 | Yes      | `""`     | Item description |
-| `amount`      | `number`                                 | Yes      | `0`      | Dollar amount |
-| `date`        | `string?`                                | No       | —        | Date (`YYYY-MM-DD`) |
-| `category`    | `string \| null?`                        | No       | `null`   | Category from shared categories |
-| `recurring`   | `"once" \| "monthly" \| "yearly"?`       | No       | —        | Recurrence frequency |
-| `createdDate` | `string`                                 | Yes      | Auto     | ISO timestamp |
-
-### WishItem
-
-| Field        | Type              | Required | Default    | Description |
-|--------------|-------------------|----------|------------|-------------|
-| `id`         | `string`          | Yes      | Generated  | Unique ID |
-| `title`      | `string`          | Yes      | `""`       | Item title |
-| `url`        | `string?`         | No       | —          | Link to product listing |
-| `price`      | `number?`         | No       | —          | Approximate price |
-| `order`      | `number`          | Yes      | Auto       | Sort order within list (0-based) |
-| `createdDate`| `string`          | Yes      | Auto       | ISO timestamp |
-| `completed`  | `boolean?`        | No       | `false`    | Marked as received/purchased |
-| `listId`     | `string \| null?` | No       | `null`     | FK to WishList; `null` = uncategorized |
-
-### WishList
-
-| Field        | Type     | Required | Default   | Description |
-|--------------|----------|----------|-----------|-------------|
-| `id`         | `string` | Yes      | Generated | Unique ID |
-| `name`       | `string` | Yes      | `""`      | List name |
-| `order`      | `number` | Yes      | Auto      | Display order |
-| `createdDate`| `string` | Yes      | Auto      | ISO timestamp |
-
-### Note
-
-| Field        | Type      | Required | Default | Description |
-|--------------|-----------|----------|---------|-------------|
-| `id`         | `string`  | Yes      | Generated | Unique ID |
-| `title`      | `string`  | Yes      | `""`    | Note title |
-| `content`    | `string`  | Yes      | `""`    | Note body text |
-| `createdDate`| `string`  | Yes      | Auto    | ISO timestamp |
-| `updatedDate`| `string?` | No       | —       | Auto-set on edit |
-
-### ShoppingItem
-
-| Field        | Type      | Required | Default | Description |
-|--------------|-----------|----------|---------|-------------|
-| `id`         | `string`  | Yes      | Generated | Unique ID |
-| `name`       | `string`  | Yes      | `""`    | Item name |
-| `quantity`   | `string?` | No       | —       | Free-text quantity (e.g. "2 litres") |
-| `completed`  | `boolean` | Yes      | `false` | Checked off |
-| `createdDate`| `string`  | Yes      | Auto    | ISO timestamp |
-
-### UserStats
-
-| Field              | Type           | Default | Description |
-|--------------------|----------------|---------|-------------|
-| `level`            | `number`       | `1`     | Calculated from completed tasks |
-| `dailyStreak`      | `number`       | `0`     | Consecutive active days |
-| `lastActivityDate` | `string \| null` | `null` | `YYYY-MM-DD` of last task/habit completion |
-
-### Settings
-
-| Field           | Type     | Default | Description |
-|-----------------|----------|---------|-------------|
-| `tasksPerLevel` | `number` | `30`    | Completed tasks needed to advance one level |
-
----
-
-## Data Storage & Persistence
-
-### Primary Storage
-
-- **Key**: `taskManagerData` in `localStorage`
-- **Format**: Single JSON blob containing all app data (`AppData` interface)
-- **Schema Version**: `3` (with migration support from older versions)
-- **Storage Version**: `"1.0.0"`
-
-### AppData Root Structure
-
-```
-{
-  version: "1.0.0",
-  schemaVersion: 3,
-  lastUpdated: "<ISO timestamp>",
-  tasks: Task[],
-  projects: Project[],
-  habits: Habit[],
-  dailyHabitLogs: HabitLog[],
-  expenses: FinanceItem[],
-  revenue: FinanceItem[],
-  charges: FinanceItem[],
-  categories: string[],
-  userStats: UserStats,
-  settings: Settings,
-  wishList: WishItem[],
-  wishLists: WishList[],
-  notes: Note[],
-  shoppingList: ShoppingItem[]
-}
-```
-
-### Secondary Storage
-
-- **Key**: `taskManagerFilterSettings` in `localStorage`
-- **Content**: `{ statusFilter: string, hideCompleted: boolean }`
-- **Purpose**: Persists the Tasks tab filter state across sessions
-
-### Default Categories (seeded on first run)
-
-`Work`, `Personal`, `Home`, `Shopping`, `Health`, `Fitness`, `Learning`, `Productivity`, `Food`, `Transportation`, `Entertainment`, `Utilities`, `Income`
-
-### ID Generation
-
-IDs are generated client-side: `Date.now().toString(36) + Math.random().toString(36).substr(2)`
-
-### Data Migration
-
-The `StorageManager` supports migration from older schema versions:
-- On initialization, if `schemaVersion < 3`, `migrateToLatest()` runs automatically
-- Handles legacy category structures (per-type object → flat array)
-- Handles legacy `UserStats` fields (`totalPoints`, `pointsBreakdown` → removed)
-- Missing collections default to empty arrays; missing settings get default values
-
-### Import/Export
-
-- **Export**: Downloads all data as timestamped JSON file (`task-manager-backup-YYYY-MM-DD.json`)
-- **Import**: Validates uploaded JSON; supports full import and partial data migration with user confirmation
-- **Validation**: Checks for `version`, `tasks`, and `projects` fields; warns about missing/invalid fields
-
----
-
-## Application Architecture
-
-### File Structure
-
-```
-src/storage.ts    → StorageManager class (data layer, all CRUD operations)
-src/app.ts        → TaskManager class (UI logic, event handlers, rendering)
-index.html        → Single-page HTML shell with all tab sections
-css/styles.css    → All styling
-service-worker.js → PWA offline caching
-manifest.json     → PWA install manifest
-```
-
-### Class Structure
-
-**`StorageManager`** (in `storage.ts`):
-- Manages all data access and persistence
-- CRUD methods for every entity type
-- Streak & level calculation
-- Category management with propagation
-- Export/import/migration
-
-**`TaskManager`** (in `app.ts`):
-- All UI rendering (DOM manipulation via `innerHTML`)
-- Event listener setup and handling
-- Tab switching
-- Modal management (open/close/populate)
-- Recurring task generation on completion
-- Finance chart rendering (pie chart, Sankey diagram via inline SVG)
-- Drag & drop for wish list (desktop + touch)
-- Date navigation
-
-### Rendering Pattern
-
-All rendering is done via DOM manipulation:
-1. Read data from `StorageManager`
-2. Build HTML strings with template literals
-3. Set `innerHTML` on container elements
-4. Attach event listeners to newly created elements
-
----
-
-## Feature Specifications
-
-### Navigation & Layout
-
-**Header**:
-- App title: "📋 Task Manager"
-- Two stats displayed: **Level** (with progress subtitle `X/N tasks`) and **Streak**
-
-**Navigation**:
-- 9 tabs: Dashboard, Tasks, Projects, Habits, Wish List, Shopping, Notes, Finances, Settings
-- Each tab has an emoji icon prefix
-- On mobile (≤768px): hamburger menu that toggles tab visibility
-- Clicking a tab hides all other content sections and shows the selected one
-- Tab click also triggers re-rendering of that tab's content
-
-**Modals**:
-- Used for all create/edit forms
-- Opened by adding CSS class `active` to `.modal` element
-- Closed by clicking the `×` button, clicking the backdrop, or pressing Cancel
-- Delete button appears only when editing (not creating)
-- All delete operations require `confirm()` dialog
-
-### Date Navigator
-
-- Displayed below the header, above tabs
-- Shows the selected date in format: `"Today — Wednesday, Mar 31"` or `"Wednesday, Mar 31"` for past days
-- Left/right arrows to navigate between days
-- Can navigate up to **6 days into the past** (no future navigation beyond today)
-- "Back to Today" button appears when viewing a past day
-- Changing the date re-renders the active tab
-- Affects: Dashboard overview counts, Habits (view/log past completions), Tasks (due date context)
-
-### 1. Dashboard
-
-**Today's Overview Card** (4 stats):
-| Stat | Description | Clickable? |
-|------|-------------|------------|
-| Tasks Due Today | Count of incomplete tasks with `dueDate === selectedDate` | Yes → navigates to Tasks tab |
-| Overdue Tasks | Count of incomplete tasks with `dueDate < selectedDate` | Yes → navigates to Tasks tab with `overdue` filter pre-set |
-| Completed Today | Count of tasks with `completedDate === selectedDate` | No |
-| Incomplete Habits | Count of habits scheduled for today that haven't reached their target goal | No |
-
-**Incomplete Habits List**:
-- Below the overview stats
-- Shows each incomplete habit with icon, name, and progress (`X/Y (Z%)`)
-- If all habits complete: shows "All habits completed for today! 🎉"
-- Clicking a habit navigates to the Habits tab
-
-**Recent Activity Feed**:
-- Shows the 5 most recent activities
-- Sources: completed tasks (icon: `✓`) and habit logs (icon: `⭐`)
-- Sorted by date descending
-- Each entry: `[icon] [message]` + date
-
-**Active Projects Summary**:
-- Lists all projects with progress bars
-- Per project: name, `X/Y tasks (Z%)`, visual progress bar
-
-### 2. Tasks
-
-**Task List Display** (no active filters):
-Tasks are organized into sections in this order:
-1. **Overdue** — incomplete tasks where `dueDate < today`
-2. **Due Today** — all tasks (completed or not) where `dueDate === today`
-3. **Upcoming Tasks** — incomplete tasks where `dueDate > today` (excludes daily repeat type), sorted by due date then title
-4. **No Due Date** — tasks with no `dueDate` set
-
-**Task List Display** (with filters active):
-- Flat list, no section headers
-
-**Task Item Rendering**:
-- Checkbox (toggle completion)
-- Title
-- Description (if expanded view or if present)
-- Meta info: 📅 due date, 🔁 repeat type
-- Status badge: `pending` / `completed` / `overdue`
-- "Days until due" badge: `Overdue`, `Today`, `1 day`, `N days`
-
-**Expand/Collapse View**:
-- Toggle button: `⊞ Expand Details` / `⊟ Collapse Details`
-- Adds `expanded` CSS class to task list container
-
-**Filters**:
-| Filter | Type | Options | Persisted? |
-|--------|------|---------|------------|
-| Status | Dropdown | All, Pending, Completed, Overdue | Yes (localStorage) |
-| Search | Text input | Searches `title` and `description` (case-insensitive) | No |
-| Hide Completed | Toggle button | Shows/hides completed tasks | Yes (localStorage) |
-| Reset Filters | Button | Clears all filters and removes persisted settings | — |
-
-**Task Create/Edit Modal** fields:
-| Field | Type | Required | Notes |
-|-------|------|----------|-------|
-| Title | Text input | Yes | — |
-| Description | Textarea (4 rows) | No | — |
-| Due Date | Date picker | No | — |
-| Repeat Type | Dropdown | No | `none`, `daily`, `weekly`, `monthly`, `yearly`, `custom`, `movable` |
-| Repeat Every | Number input | Conditional | Shown for daily/weekly/monthly/yearly; label changes (e.g. "week(s)") |
-| Days of Week | 7 checkboxes (Sun–Sat) | Conditional | Shown for daily and weekly repeat types |
-| Repeat Every (Days) | Number input | Conditional | Shown for `custom` repeat type |
-| Days Until Due (From Completion) | Number input | Conditional | Shown for `movable` repeat type |
-| Project | Dropdown | No | Populated from existing projects; option "None" |
-
-**Task Completion Behavior**:
-1. Toggle `completed` flag, set `completedDate` to selected date
-2. Call `updateDailyStreak(true)` — increments streak if first activity today
-3. If task has a repeat type other than `none`, create next recurring task instance
-4. Recalculate user level
-5. Re-render Tasks, Dashboard, and Projects
-
-**Recurring Task Generation** (`createNextRecurringTask`):
-When a recurring task is marked complete, a new task is created with a recalculated due date:
-
-| Repeat Type | Next Due Date Calculation |
-|-------------|--------------------------|
-| `daily` | If `daysOfWeek` specified: next matching day from completion date. Otherwise: completion date + `repeatUnit` days |
-| `weekly` | If `daysOfWeek` specified: next matching day + `(repeatUnit - 1) * 7` days. Otherwise: completion date + `repeatUnit * 7` days |
-| `monthly` | Completion date + `repeatUnit` months |
-| `yearly` | Completion date + `repeatUnit` years |
-| `custom` | Completion date + `customRepeatDays` days |
-| `movable` | Completion date + `movableRepeatDays` days |
-
-The new task inherits: title, description, projectId, repeatType, repeatUnit, customRepeatDays, movableRepeatDays, daysOfWeek. The original completed task stays in history.
-
-**Uncompleting a Task**:
-- Clears `completedDate` to `null`, sets `completed` to `false`
-- Recalculates level (does not decrement streak)
-- Note: does not delete the next recurring task if one was created
-
-### 3. Projects
-
-**Project List**:
-- Cards with colored top border (from `color` field)
-- Displays: name, description (if any), task count, completed count, percentage, progress bar
-- Clicking a card opens the Project Detail modal
-
-**Project Create/Edit Modal** fields:
-| Field | Type | Required | Default |
-|-------|------|----------|---------|
-| Name | Text input | Yes | — |
-| Description | Textarea (3 rows) | No | — |
-| Color Tag | Color picker (`<input type="color">`) | No | `#3b82f6` |
-
-**Project Detail Modal** (read-only overview):
-- Project name and description
-- Stats: Total Tasks, Completed, Progress %
-- List of all related tasks with checkboxes
-  - Checking/unchecking a task toggles completion and refreshes the modal
-  - Clicking a task navigates to Task edit modal
-- Buttons: "Edit Project" (opens edit modal), "Close"
-
-**Project Deletion**:
-- Confirms with dialog: "Are you sure? This will not delete the tasks in it."
-- All tasks with this `projectId` have it set to `null` (unlinked, not deleted)
-
-### 4. Habits
-
-**Habit Card** rendering:
-- Emoji icon (large display)
-- Habit name and optional description
-- Stats: Streak count, Progress (`X/Y` completions today)
-- Progress bar with percentage
-- Completion status text: `✓ Complete!` or `X% Complete`
-- Action button with contextual label:
-  | Condition | Button Label | Enabled? |
-  |-----------|-------------|----------|
-  | Not scheduled for today's day of week | `✗ Not Scheduled` | Disabled |
-  | Complete (≥ targetGoal today) & today | `✓ Done for Today` | Disabled |
-  | Complete (≥ targetGoal) & past day | `✓ Logged` | Disabled |
-  | Incomplete & today | `+ Complete` | Enabled |
-  | Incomplete & past day | `+ Log Past Day` | Enabled |
-
-**Habit Create/Edit Modal** fields:
-| Field | Type | Required | Default |
-|-------|------|----------|---------|
-| Habit Name | Text input | Yes | — |
-| Description | Textarea (3 rows) | No | — |
-| Icon/Emoji | Emoji picker (modal grid) | No | `⭐` |
-| Category | Dropdown (shared categories) + inline "Add New" | No | — |
-| Daily Target Goal | Number input (min 1) | No | `1` |
-| Days of Week | 7 checkboxes (Sun–Sat) | No | All checked by default |
-
-**Emoji Picker**:
-- Grid modal with 80 emojis organized by category
-- Categories: Activity, Food & Health, Work & Productivity, Learning & Mind, Nature & Outdoors, Sleep & Rest, Social & Fun, Sports & Games, Habits & Goals, Misc
-- Clicking an emoji selects it and closes the picker
-
-**Habit Completion** (`completeHabit`):
-1. Verify the habit is scheduled for the selected day of week
-2. Log a `HabitLog` entry for the habit and selected date
-3. Update streak: count consecutive fully-completed days going backward from the most recent
-4. Call `updateDailyStreak(true)`
-5. Re-render Habits and Dashboard
-
-**Streak Calculation Algorithm** (`calculateHabitStreak`):
-1. Get all logs for the habit, count completions per date
-2. Filter to dates where completions ≥ `targetGoal`
-3. Sort dates descending (most recent first)
-4. Starting from the most recent date, count consecutive days backward
-5. Break on the first gap
-
-### 5. Finances
-
-**Three financial types** sharing the same `FinanceItem` data model:
-- **Expenses** — stored in `data.expenses`
-- **Revenue** — stored in `data.revenue`
-- **Charges** — stored in `data.charges` (not currently exposed in UI for add; exists in data layer)
-
-**Summary Cards** (top of Finances tab):
-- **Total Income**: Sum of filtered revenue items' `monthlyAmount`
-- **Total Expenses**: Sum of filtered expense items' `monthlyAmount`
-- **Net Balance**: Total Income - Total Expenses
-
-**Monthly Amount Calculation** for recurring items:
-- `once`: `monthlyAmount = amount`
-- `monthly`: `monthlyAmount = amount`
-- `yearly`: `monthlyAmount = amount / 12`
-
-**Date Range Filter**:
-- From/To date inputs, defaulting to the first and last day of the current month
-- `← Prev` / `Next →` buttons for month navigation
-- `Apply` button to filter with current date range
-- `This Month` button to reset to current month
-- Filtering rules:
-  - One-time items: included if `date` falls within the range
-  - Monthly/yearly recurring items: included if `date <= endDate` (they persist after creation)
-  - Items with no date are excluded when a filter is active
-
-**Sub-tabs** within Finances:
-1. **Expenses** — list of expense items
-2. **Revenue** — list of revenue items
-3. **Charts** — Pie chart + Sankey diagram
-
-**Finance Item Rendering**:
-- Description, category (📂), date (📅), recurring status (🔁)
-- Amount: `-$X.XX` for expenses, `+$X.XX` for revenue
-- Yearly items show `/mo` suffix to indicate the displayed monthly equivalent
-- Clicking an item opens the edit modal
-
-**Finance Create/Edit Modal** fields:
-| Field | Type | Required | Notes |
-|-------|------|----------|-------|
-| Description | Text input | Yes | — |
-| Amount | Number input (step 0.01, min 0) | Yes | — |
-| Date | Date picker | No | Defaults to today |
-| Recurring | Dropdown | No | `One-time`, `Monthly`, `Yearly`; shown for expense/revenue |
-| Category | Dropdown (shared categories) + inline "Add New" | No | — |
-
-**Charts**:
-
-*Expense Pie Chart*:
-- SVG-based pie chart (no external library)
-- Groups expenses by category, shows proportional slices
-- Legend with: color dot, category name, `$amount (X.X%)`
-- 10-color palette cycling
-
-*Sankey Diagram*:
-- SVG-based flow diagram (no external library)
-- Left nodes: revenue sources (by category/description)
-- Right nodes: expense categories
-- Curved paths showing proportional flow from income to expenses
-- Color-coded by expense category
-
-### 6. Wish List
-
-**Two-level organization**:
-1. **Named Lists** (WishList): collapsible groups (e.g., "Electronics", "Books")
-2. **Uncategorized**: default group for items without a `listId`
-
-**Wish List Group** rendering:
-- Collapse/expand toggle button (`▼` / `▶`)
-- Group name
-- Counter: `X remaining` (unpurchased items)
-- `Edit` button (for named lists only) → opens WishList edit modal
-- `+ Add` button → opens WishItem modal pre-selecting this list
-- Items rendered inside the group
-
-**Wish Item** rendering:
-- Drag handle (`⠿`) for reordering
-- Checkbox ("Mark as received")
-- Title
-- Optional price (`$X.XX`)
-- Optional URL (`🔗 View Listing` — opens in new tab)
-- `Edit` button
-
-**Drag & Drop Reordering**:
-- Desktop: HTML5 Drag & Drop API; dragging only activates from the drag handle
-- Mobile: Touch events with drag threshold (10px); temporarily hides dragged element to find drop target via `elementFromPoint`
-- Reordering is scoped to the item's list group (within named list or within uncategorized)
-- On drop, `reorderWishItems()` updates order values in storage
-
-**Collapse State**:
-- Tracked in memory (`expandedWishLists: Set<string>`)
-- Named lists start collapsed; state is not persisted across page reloads
-
-**WishItem Create/Edit Modal** fields:
-| Field | Type | Required | Default |
-|-------|------|----------|---------|
-| Title | Text input | Yes | — |
-| List | Dropdown | No | Uncategorized; pre-selected if adding from a list group |
-| URL | URL input | No | — |
-| Approximate Price | Number input (step 0.01, min 0) | No | — |
-
-**WishList Create/Edit Modal** fields:
-| Field | Type | Required |
-|-------|------|----------|
-| List Name | Text input | Yes |
-
-**WishList Deletion**:
-- Confirms: "Items in this list will become uncategorized"
-- All items with this `listId` get `listId` set to `null`
-- List is removed and remaining lists re-indexed
-
-### 7. Shopping List
-
-**Simple checklist** interface:
-- Item name + optional quantity
-- Checkbox to mark as collected (completed items show with strikethrough styling)
-- `Edit` button per item
-- `Clear Checked` button removes all completed items from storage
-- Items sorted by creation date (oldest first)
-
-**ShoppingItem Create/Edit Modal** fields:
-| Field | Type | Required | Notes |
-|-------|------|----------|-------|
-| Item Name | Text input | Yes | Placeholder: "e.g. Milk" |
-| Quantity | Text input | No | Free text, placeholder: "e.g. 2 litres" |
-
-### 8. Notes
-
-**Note Card Grid**:
-- Each note shows: title (or "Untitled"), content preview (first 120 chars), date
-- Sorted by most recently updated (then by creation date)
-- Clicking a card opens the edit modal
-
-**Note Create/Edit Modal** fields:
-| Field | Type | Required |
-|-------|------|----------|
-| Title | Text input | No (displays as "Untitled" if empty) |
-| Content | Textarea (8 rows) | No |
-
-**Auto-updating**:
-- `updatedDate` is set automatically on every save/edit
-
-### 9. Settings
-
-**Leveling System**:
-- Configure `tasksPerLevel` (number input, min 1, max 100, default 30)
-- Save button recalculates level immediately and alerts the user
-- Status display: Current Level, Total Completed Tasks, Tasks to Next Level
-
-**Data Management**:
-| Action | Description |
-|--------|-------------|
-| Export Data | Downloads JSON backup with filename `task-manager-backup-YYYY-MM-DD.json` |
-| Import Data | File upload; validates structure; supports partial data migration with user prompt |
-| Migrate to Latest Version | Runs `migrateToLatest()` — safe to run anytime; then reloads |
-| Clear All Data | `confirm()` dialog → removes storage key → reinitializes defaults → reloads if confirmed |
-
-**Category Management**:
-- Shared categories list used across Tasks (not yet wired), Habits, and all Finance types
-- Add new category (text input + Add button)
-- Edit category in-place (converts label to text input; Save/Cancel buttons)
-- Delete category with confirmation: clears `category` field on all items using that category
-- Rename propagates to all Habits, Expenses, Revenue, and Charges
-
-**Data Version Display**:
-- Shows version string (`1.0.0`) and last updated timestamp
-
----
-
-## Gamification System
-
-### Level Calculation
-
-```
-level = Math.floor(completedTasksCount / tasksPerLevel) + 1
-```
-
-- `completedTasksCount` = total tasks where `completed === true`
-- `tasksPerLevel` = configurable in Settings (default: 30)
-- Recalculated on: task completion, task uncompletion, settings change
-
-### Progress Display
-
-- Header shows: `Level X` with subtitle `Y/N tasks` where Y = `completedTasksCount % tasksPerLevel`
-
-### Daily Streak
-
-- Incremented when a task or habit is completed and `lastActivityDate !== today`
-- If `lastActivityDate` was yesterday, streak increments by 1
-- If `lastActivityDate` was earlier than yesterday, streak resets to 1
-- `lastActivityDate` is updated to today on any activity
-- Streak never decrements automatically (no background job)
-
----
-
-## PWA Capabilities
-
-### Service Worker
-
-- **Cache-first strategy**: serves cached assets when offline, falls back to network
-- **Cached assets**: `/`, `/index.html`, `/css/styles.css`, `/js/storage.js`, `/js/app.js`
-- **Cache cleanup**: on activation, deletes any caches not matching current `CACHE_NAME`
-- Uses `skipWaiting()` and `clients.claim()` for immediate activation
-
-### Web App Manifest
-
-| Property | Value |
-|----------|-------|
-| Name | Task Manager |
-| Short Name | TaskManager |
-| Display | Standalone |
-| Orientation | Portrait-primary |
-| Theme Color | `#4CAF50` (green) |
-| Background Color | `#ffffff` |
-| Categories | Productivity, Lifestyle |
-| Icons | 192×192, 512×512 PNG (maskable) |
-
----
-
-## .NET MAUI Migration Guide
-
-### Recommended Architecture
-
-| Web Layer | .NET MAUI Equivalent |
-|-----------|---------------------|
-| `localStorage` | SQLite via `sqlite-net-pcl` using EF Core; preferences via `Preferences` API |
-| `StorageManager` class | Repository or Service classes per entity |
-| `TaskManager` class (UI) | MVVM pattern: ViewModels + XAML Views |
-| HTML templates | XAML ContentPages + DataTemplates |
-| CSS classes | MAUI Styles and Resources |
-| Tab navigation | `Shell` with `TabBar` or `TabbedPage` |
-| Modals | `Navigation.PushModalAsync()` or `CommunityToolkit.Maui` popups |
-| Service Worker | Not needed (native app); consider `BackgroundService` for notifications |
-
-### Project Structure Suggestion
-
-```
-TaskManager.Maui/
-├── Models/
-│   ├── Task.cs
-│   ├── Project.cs
-│   ├── Habit.cs
-│   ├── HabitLog.cs
-│   ├── FinanceItem.cs
-│   ├── WishItem.cs
-│   ├── WishList.cs
-│   ├── Note.cs
-│   ├── ShoppingItem.cs
-│   ├── UserStats.cs
-│   └── Settings.cs
-├── Services/
-│   ├── IDataService.cs
-│   ├── DataService.cs          (SQLite implementation)
-│   ├── ITaskService.cs
-│   ├── TaskService.cs
-│   ├── IHabitService.cs
-│   ├── HabitService.cs
-│   ├── IFinanceService.cs
-│   ├── FinanceService.cs
-│   ├── IExportImportService.cs
-│   └── ExportImportService.cs
-├── ViewModels/
-│   ├── DashboardViewModel.cs
-│   ├── TasksViewModel.cs
-│   ├── TaskDetailViewModel.cs
-│   ├── ProjectsViewModel.cs
-│   ├── ProjectDetailViewModel.cs
-│   ├── HabitsViewModel.cs
-│   ├── HabitDetailViewModel.cs
-│   ├── FinancesViewModel.cs
-│   ├── WishListViewModel.cs
-│   ├── ShoppingListViewModel.cs
-│   ├── NotesViewModel.cs
-│   └── SettingsViewModel.cs
-├── Views/
-│   ├── DashboardPage.xaml
-│   ├── TasksPage.xaml
-│   ├── TaskDetailPage.xaml
-│   ├── ProjectsPage.xaml
-│   ├── ProjectDetailPage.xaml
-│   ├── HabitsPage.xaml
-│   ├── HabitDetailPage.xaml
-│   ├── FinancesPage.xaml
-│   ├── WishListPage.xaml
-│   ├── ShoppingListPage.xaml
-│   ├── NotesPage.xaml
-│   └── SettingsPage.xaml
-├── Converters/
-│   ├── BoolToStrikethroughConverter.cs
-│   ├── PercentToWidthConverter.cs
-│   └── DateFormatConverter.cs
-├── Resources/
-│   ├── Styles/
-│   └── Fonts/
-├── App.xaml
-├── AppShell.xaml
-└── MauiProgram.cs
-```
-
-### Key Migration Decisions
-
-#### 1. Data Storage: localStorage → SQLite
-
-The web app stores everything as a single JSON blob. For MAUI, use SQLite with one table per entity with EF Core for management:
-
-```
-Tables: Tasks, Projects, Habits, HabitLogs, Expenses, Revenue, Charges,
-        WishItems, WishLists, Notes, ShoppingItems, Categories, UserStats, Settings
-```
-
-Consider using `sqlite-net-pcl` with `[Table]` and `[PrimaryKey]` attributes on model classes. Keep the same date format (`YYYY-MM-DD` strings) for simplicity, or migrate to `DateTime` types.
-
-#### 2. Import/Export Compatibility
-
-To maintain data portability with the web version:
-- Export should produce the same JSON structure (`AppData`)
-- Import should accept the web app's JSON format
-- Add a `JsonImportExportService` that maps between SQLite models and the flat `AppData` JSON structure
-
-#### 3. Navigation: Tabs via Shell
-
-```xml
-<Shell>
-  <TabBar>
-    <Tab Title="Dashboard" Icon="home.png">
-      <ShellContent ContentTemplate="{DataTemplate views:DashboardPage}" />
-    </Tab>
-    <Tab Title="Tasks" Icon="check.png">
-      <ShellContent ContentTemplate="{DataTemplate views:TasksPage}" />
-    </Tab>
-    <!-- ... 7 more tabs ... -->
-  </TabBar>
-</Shell>
-```
-
-Note: 9 tabs is a lot for mobile. Consider grouping some tabs under a flyout menu or using a "More" tab that lists less-used features (Notes, Shopping, Wish List).
-
-#### 4. Recurring Task Logic
-
-Port the `createNextRecurringTask` method and `nextOccurrenceOfDays` helper directly. The date arithmetic is straightforward and maps 1:1 to C# `DateTime` operations:
-
-| TypeScript | C# Equivalent |
-|------------|---------------|
-| `date.setDate(date.getDate() + n)` | `date.AddDays(n)` |
-| `date.setMonth(date.getMonth() + n)` | `date.AddMonths(n)` |
-| `date.setFullYear(date.getFullYear() + n)` | `date.AddYears(n)` |
-| `date.getDay()` | `date.DayOfWeek` (enum, Sunday=0) |
-
-#### 5. Charts
-
-The web app renders SVG charts manually. For MAUI:
-- **Option A**: Use `Microcharts.Maui` or `LiveChartsCore` for pie charts
-- **Option B**: Use `SkiaSharp` with `Microsoft.Maui.Graphics` for custom drawing (Sankey diagram)
-
-#### 6. Drag & Drop (Wish List)
-
-MAUI supports drag & drop via `DragGestureRecognizer` and `DropGestureRecognizer`. The `CollectionView` with reorder support can work. Alternatively, use `CommunityToolkit.Maui` `ReorderableCollectionView`.
-
-#### 7. Emoji Picker (Habits)
-
-No native emoji picker in MAUI:
-- Use the system keyboard emoji picker as an alternative
-
-#### 8. Streak & Level Calculation
-
-Port `calculateHabitStreak` and level formula directly. These are pure logic with no platform dependencies.
-
-#### 9. Notifications (Enhancement Opportunity)
-
-The web app has no notifications. MAUI can add:
-- Local notifications for overdue tasks
-- Daily habit reminders
-- Use `Plugin.LocalNotification` NuGet package
-
-#### 10. Offline Support
-
-The web app uses a service worker for offline. In MAUI, this is native — SQLite data is always available offline.
-
-### NuGet Packages to Consider
-
-| Package | Purpose |
-|---------|---------|
-| `sqlite-net-pcl` | Local SQLite database |
-| `CommunityToolkit.Mvvm` | MVVM helpers (`ObservableObject`, `RelayCommand`, etc.) |
-| `CommunityToolkit.Maui` | UI helpers (popups, converters, behaviors) |
-| `Microcharts.Maui` or `LiveChartsCore` | Chart rendering |
-| `SkiaSharp.Views.Maui.Controls` | Custom drawing (Sankey diagram) |
-| `Plugin.LocalNotification` | Push/local notifications |
-| `Newtonsoft.Json` or `System.Text.Json` | JSON import/export |
-
-### Migration Priority Order
-
-Recommended order for incremental migration:
-
-1. **Models + EF Core + SQLite setup** — Define all entity classes and database schema
-2. **Settings page** — Simple CRUD, validates the data layer works
-3. **Tasks** — Core feature; includes CRUD, filtering, recurring logic
-4. **Projects** — Simple CRUD + relationship to Tasks
-5. **Habits** — CRUD + completion logging + streak calculation
-6. **Dashboard** — Aggregation view pulling from Tasks + Habits + Projects
-7. **Shopping List** — Simple checklist
-8. **Notes** — Simple CRUD
-9. **Wish List** — CRUD + drag-and-drop reordering + list grouping
-10. **Finances** — CRUD + date filtering + chart rendering
-11. **Export/Import** — JSON compatibility with web version
-12. **Gamification** — Level + Streak display in header/shell
\ No newline at end of file

From 97d4b243dd2645d514395174d7b03046019147f4 Mon Sep 17 00:00:00 2001
From: joeprogrammer88 <joeProgrammer88@users.noreply.github.com>
Date: Tue, 31 Mar 2026 08:42:54 -0700
Subject: [PATCH 04/11] Add GitHub Action for build and test

---
 .github/workflows/build-and-test.yml | 37 ++++++++++++++++++++++++++++
 1 file changed, 37 insertions(+)
 create mode 100644 .github/workflows/build-and-test.yml

diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml
new file mode 100644
index 0000000..6c6decf
--- /dev/null
+++ b/.github/workflows/build-and-test.yml
@@ -0,0 +1,37 @@
+name: Build and Test
+
+on:
+  pull_request:
+    branches: [ main ]
+
+jobs:
+  build-and-test:
+    runs-on: windows-latest
+
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+
+      - name: Setup .NET 10
+        uses: actions/setup-dotnet@v4
+        with:
+          dotnet-version: '10.x'
+
+      - name: Install MAUI workload
+        run: dotnet workload install maui-windows
+
+      - name: Restore dependencies
+        run: dotnet restore SarahsDailyApp.slnx
+
+      - name: Build solution
+        run: dotnet build SarahsDailyApp.slnx --no-restore --configuration Release
+
+      - name: Run tests
+        run: dotnet test SarahsDailyApp.Tests/SarahsDailyApp.Tests.csproj --no-build --configuration Release --logger "trx;LogFileName=test-results.trx" --results-directory ./test-results
+
+      - name: Upload test results
+        uses: actions/upload-artifact@v4
+        if: always()
+        with:
+          name: test-results
+          path: ./test-results/*.trx

From 1665f56639284d16dc282e5dfe6aba7246c1579e Mon Sep 17 00:00:00 2001
From: joeprogrammer88 <joeProgrammer88@users.noreply.github.com>
Date: Tue, 31 Mar 2026 09:04:52 -0700
Subject: [PATCH 05/11] Update workflow to restore all required workloads

Replaced MAUI-specific workload install step with a general workload restore using dotnet workload restore SarahsDailyApp.sln. This ensures all workloads specified in the solution are restored, improving compatibility and maintainability.
---
 .github/workflows/build-and-test.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml
index 6c6decf..d84d714 100644
--- a/.github/workflows/build-and-test.yml
+++ b/.github/workflows/build-and-test.yml
@@ -17,8 +17,8 @@ jobs:
         with:
           dotnet-version: '10.x'
 
-      - name: Install MAUI workload
-        run: dotnet workload install maui-windows
+      - name: Install required workloads
+        run: dotnet workload restore SarahsDailyApp.slnx
 
       - name: Restore dependencies
         run: dotnet restore SarahsDailyApp.slnx

From 63bb4d8548c3e37e734e395b14229a676ee4ebeb Mon Sep 17 00:00:00 2001
From: joeprogrammer88 <joeProgrammer88@users.noreply.github.com>
Date: Tue, 31 Mar 2026 09:29:46 -0700
Subject: [PATCH 06/11] Update CI to restore/build MAUI project directly to
 compile on Windows

Switched workflow steps to target SarahsDailyApp.csproj for restore and build, specifying MAUI target frameworks and runtime identifiers. Adjusted test step to ensure tests run after building the project by removing the --no-build flag.
---
 .github/workflows/build-and-test.yml | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml
index d84d714..f206a5f 100644
--- a/.github/workflows/build-and-test.yml
+++ b/.github/workflows/build-and-test.yml
@@ -20,14 +20,14 @@ jobs:
       - name: Install required workloads
         run: dotnet workload restore SarahsDailyApp.slnx
 
-      - name: Restore dependencies
-        run: dotnet restore SarahsDailyApp.slnx
+      - name: Restore MAUI project
+        run: dotnet restore SarahsDailyApp/SarahsDailyApp.csproj -p:TargetFrameworks="net10.0-android;net10.0-windows10.0.19041.0" -p:RuntimeIdentifiers="win-x64"
 
-      - name: Build solution
-        run: dotnet build SarahsDailyApp.slnx --no-restore --configuration Release
+      - name: Build MAUI project
+        run: dotnet build SarahsDailyApp/SarahsDailyApp.csproj --no-restore --configuration Release -p:TargetFrameworks="net10.0-android;net10.0-windows10.0.19041.0"
 
       - name: Run tests
-        run: dotnet test SarahsDailyApp.Tests/SarahsDailyApp.Tests.csproj --no-build --configuration Release --logger "trx;LogFileName=test-results.trx" --results-directory ./test-results
+        run: dotnet test SarahsDailyApp.Tests/SarahsDailyApp.Tests.csproj --configuration Release --logger "trx;LogFileName=test-results.trx" --results-directory ./test-results
 
       - name: Upload test results
         uses: actions/upload-artifact@v4

From 158a6cbe4ee51ad4b8704e27c54739518bc0786a Mon Sep 17 00:00:00 2001
From: joeprogrammer88 <joeProgrammer88@users.noreply.github.com>
Date: Tue, 31 Mar 2026 09:46:36 -0700
Subject: [PATCH 07/11] Update TargetFrameworks arg handling in GitHub Actions

TargetFrameworks is now passed with URL-encoded semicolons (%3B)
and quoted in dotnet restore/build commands to prevent issues
with YAML or shell parsing of semicolons.
---
 .github/workflows/build-and-test.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml
index f206a5f..7a7acc9 100644
--- a/.github/workflows/build-and-test.yml
+++ b/.github/workflows/build-and-test.yml
@@ -21,10 +21,10 @@ jobs:
         run: dotnet workload restore SarahsDailyApp.slnx
 
       - name: Restore MAUI project
-        run: dotnet restore SarahsDailyApp/SarahsDailyApp.csproj -p:TargetFrameworks="net10.0-android;net10.0-windows10.0.19041.0" -p:RuntimeIdentifiers="win-x64"
+        run: dotnet restore SarahsDailyApp/SarahsDailyApp.csproj "-p:TargetFrameworks=net10.0-android%3Bnet10.0-windows10.0.19041.0" -p:RuntimeIdentifiers=win-x64
 
       - name: Build MAUI project
-        run: dotnet build SarahsDailyApp/SarahsDailyApp.csproj --no-restore --configuration Release -p:TargetFrameworks="net10.0-android;net10.0-windows10.0.19041.0"
+        run: dotnet build SarahsDailyApp/SarahsDailyApp.csproj --no-restore --configuration Release "-p:TargetFrameworks=net10.0-android%3Bnet10.0-windows10.0.19041.0"
 
       - name: Run tests
         run: dotnet test SarahsDailyApp.Tests/SarahsDailyApp.Tests.csproj --configuration Release --logger "trx;LogFileName=test-results.trx" --results-directory ./test-results

From 58f2f95e1dcef6d3d674a25be84db53681e95358 Mon Sep 17 00:00:00 2001
From: joeprogrammer88 <joeProgrammer88@users.noreply.github.com>
Date: Tue, 31 Mar 2026 10:53:10 -0700
Subject: [PATCH 08/11] Separate Android and Windows build steps in CI workflow

Refactored build-and-test.yml to restore and build Android and Windows targets individually for the .NET MAUI project. Added explicit steps for each platform with correct target frameworks and runtime parameters to improve clarity and reliability of the CI process.
---
 .github/workflows/build-and-test.yml | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml
index 7a7acc9..d4afd5a 100644
--- a/.github/workflows/build-and-test.yml
+++ b/.github/workflows/build-and-test.yml
@@ -20,11 +20,17 @@ jobs:
       - name: Install required workloads
         run: dotnet workload restore SarahsDailyApp.slnx
 
-      - name: Restore MAUI project
-        run: dotnet restore SarahsDailyApp/SarahsDailyApp.csproj "-p:TargetFrameworks=net10.0-android%3Bnet10.0-windows10.0.19041.0" -p:RuntimeIdentifiers=win-x64
+      - name: Restore Android
+        run: dotnet restore SarahsDailyApp/SarahsDailyApp.csproj -p:TargetFrameworks=net10.0-android
 
-      - name: Build MAUI project
-        run: dotnet build SarahsDailyApp/SarahsDailyApp.csproj --no-restore --configuration Release "-p:TargetFrameworks=net10.0-android%3Bnet10.0-windows10.0.19041.0"
+      - name: Build Android
+        run: dotnet build SarahsDailyApp/SarahsDailyApp.csproj --no-restore --configuration Release -p:TargetFrameworks=net10.0-android
+
+      - name: Restore Windows
+        run: dotnet restore SarahsDailyApp/SarahsDailyApp.csproj -p:TargetFrameworks=net10.0-windows10.0.19041.0 -r win-x64
+
+      - name: Build Windows
+        run: dotnet build SarahsDailyApp/SarahsDailyApp.csproj --no-restore --configuration Release -p:TargetFrameworks=net10.0-windows10.0.19041.0 -r win-x64 -p:WindowsPackageType=None
 
       - name: Run tests
         run: dotnet test SarahsDailyApp.Tests/SarahsDailyApp.Tests.csproj --configuration Release --logger "trx;LogFileName=test-results.trx" --results-directory ./test-results

From f805de1526e72cb02106e6dacc2b9827b2d2eeaa Mon Sep 17 00:00:00 2001
From: joeprogrammer88 <joeProgrammer88@users.noreply.github.com>
Date: Tue, 31 Mar 2026 12:01:08 -0700
Subject: [PATCH 09/11] Remove UseMaui property from test project config

The <UseMaui>true</UseMaui> property was deleted from SarahsDailyApp.Tests.csproj, so the test project is no longer explicitly configured as a .NET MAUI project. This may affect how the tests are built and run, especially if MAUI-specific features were previously required.
---
 SarahsDailyApp.Tests/SarahsDailyApp.Tests.csproj | 1 -
 1 file changed, 1 deletion(-)

diff --git a/SarahsDailyApp.Tests/SarahsDailyApp.Tests.csproj b/SarahsDailyApp.Tests/SarahsDailyApp.Tests.csproj
index 9181878..33d5469 100644
--- a/SarahsDailyApp.Tests/SarahsDailyApp.Tests.csproj
+++ b/SarahsDailyApp.Tests/SarahsDailyApp.Tests.csproj
@@ -2,7 +2,6 @@
 
   <PropertyGroup>
     <TargetFramework>net10.0-windows10.0.19041.0</TargetFramework>
-    <UseMaui>true</UseMaui>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
     <IsPackable>false</IsPackable>

From 0c69a06293bc7525198b408cb09221f0979e3890 Mon Sep 17 00:00:00 2001
From: joeprogrammer88 <joeProgrammer88@users.noreply.github.com>
Date: Tue, 31 Mar 2026 12:38:40 -0700
Subject: [PATCH 10/11] Remove MAUI Controls dependencies from test project

Removed Microsoft.Maui.Controls and Microsoft.Maui.Controls.Compatibility package references from SarahsDailyApp.Tests.csproj to clean up unnecessary dependencies. All other package references remain unchanged.
---
 SarahsDailyApp.Tests/SarahsDailyApp.Tests.csproj | 2 --
 1 file changed, 2 deletions(-)

diff --git a/SarahsDailyApp.Tests/SarahsDailyApp.Tests.csproj b/SarahsDailyApp.Tests/SarahsDailyApp.Tests.csproj
index 33d5469..939b4d7 100644
--- a/SarahsDailyApp.Tests/SarahsDailyApp.Tests.csproj
+++ b/SarahsDailyApp.Tests/SarahsDailyApp.Tests.csproj
@@ -10,8 +10,6 @@
 
   <ItemGroup>
     <PackageReference Include="coverlet.collector" Version="6.0.4" />
-    <PackageReference Include="Microsoft.Maui.Controls" Version="10.0.51" />
-    <PackageReference Include="Microsoft.Maui.Controls.Compatibility" Version="10.0.51" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.14.1" />
     <PackageReference Include="sqlite-net-pcl" Version="1.9.172" />
     <PackageReference Include="SQLitePCLRaw.bundle_green" Version="2.1.11" />

From bf056de0565473223b8ad8441d27ef6168d2d875 Mon Sep 17 00:00:00 2001
From: joeprogrammer88 <joeProgrammer88@users.noreply.github.com>
Date: Tue, 31 Mar 2026 12:55:11 -0700
Subject: [PATCH 11/11] Add Microsoft.Maui.Resizetizer to test project deps

Added Microsoft.Maui.Resizetizer (v10.0.51) to SarahsDailyApp.Tests.csproj with build and buildTransitive assets excluded to avoid unnecessary build-time dependencies.
---
 SarahsDailyApp.Tests/SarahsDailyApp.Tests.csproj | 1 +
 1 file changed, 1 insertion(+)

diff --git a/SarahsDailyApp.Tests/SarahsDailyApp.Tests.csproj b/SarahsDailyApp.Tests/SarahsDailyApp.Tests.csproj
index 939b4d7..96d0060 100644
--- a/SarahsDailyApp.Tests/SarahsDailyApp.Tests.csproj
+++ b/SarahsDailyApp.Tests/SarahsDailyApp.Tests.csproj
@@ -10,6 +10,7 @@
 
   <ItemGroup>
     <PackageReference Include="coverlet.collector" Version="6.0.4" />
+    <PackageReference Include="Microsoft.Maui.Resizetizer" Version="10.0.51" ExcludeAssets="build;buildTransitive" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.14.1" />
     <PackageReference Include="sqlite-net-pcl" Version="1.9.172" />
     <PackageReference Include="SQLitePCLRaw.bundle_green" Version="2.1.11" />