{[...navItems(isTasksView).filter(item => item.position === 'main'), ...navItems(isTasksView).filter(item => item.position === 'bottom')].map((item) => (
{item.label}
diff --git a/components/ViewToggle.tsx b/components/ViewToggle.tsx
index 730daa0..ba659e1 100644
--- a/components/ViewToggle.tsx
+++ b/components/ViewToggle.tsx
@@ -32,7 +32,7 @@ export function ViewToggle({
// Calculate due tasks count
const dueTasksCount = habits.habits.filter(habit =>
- habit.isTask && !habit.archived && isHabitDueToday({ habit, timezone: settings.system.timezone })
+ habit.isTask && isHabitDueToday({ habit, timezone: settings.system.timezone })
).length
return (
diff --git a/lib/atoms.ts b/lib/atoms.ts
index fe53097..6a65802 100644
--- a/lib/atoms.ts
+++ b/lib/atoms.ts
@@ -7,6 +7,7 @@ import {
Habit,
ViewType,
getDefaultUsersData,
+ CompletionCache,
} from "./types";
import {
getTodayInTimezone,
@@ -18,16 +19,26 @@ import {
calculateCoinsSpentToday,
calculateTransactionsToday,
getCompletionsForToday,
- getISODate
+ getISODate,
+ isHabitDueToday,
+ getNow,
+ isHabitDue
} from "@/lib/utils";
-import { atomWithStorage } from "jotai/utils";
+import { atomFamily, atomWithStorage } from "jotai/utils";
+import { DateTime } from "luxon";
export interface BrowserSettings {
viewType: ViewType
+ expandedHabits: boolean
+ expandedTasks: boolean
+ expandedWishlist: boolean
}
export const browserSettingsAtom = atomWithStorage('browserSettings', {
- viewType: 'habits'
+ viewType: 'habits',
+ expandedHabits: false,
+ expandedTasks: false,
+ expandedWishlist: false
} as BrowserSettings)
export const usersAtom = atom(getDefaultUsersData())
@@ -92,36 +103,49 @@ export const pomodoroAtom = atom
({
export const userSelectAtom = atom(false)
-// Derived atom for *fully* completed habits by date, respecting target completions
-export const completedHabitsMapAtom = atom((get) => {
- const habits = get(habitsAtom).habits
- const timezone = get(settingsAtom).system.timezone
-
- const map = new Map()
-
+// Derived atom for completion cache
+export const completionCacheAtom = atom((get) => {
+ const habits = get(habitsAtom).habits;
+ const timezone = get(settingsAtom).system.timezone;
+ const cache: CompletionCache = {};
+
habits.forEach(habit => {
- // Group completions by date
- const completionsByDate = new Map()
-
- habit.completions.forEach(completion => {
- const dateKey = getISODate({ dateTime: t2d({ timestamp: completion, timezone }), timezone })
- completionsByDate.set(dateKey, (completionsByDate.get(dateKey) || 0) + 1)
- })
-
- // Check if habit meets target completions for each date
- completionsByDate.forEach((count, dateKey) => {
- const target = habit.targetCompletions || 1
- if (count >= target) {
- if (!map.has(dateKey)) {
- map.set(dateKey, [])
- }
- map.get(dateKey)!.push(habit)
+ habit.completions.forEach(utcTimestamp => {
+ const localDate = t2d({ timestamp: utcTimestamp, timezone })
+ .toFormat('yyyy-MM-dd');
+
+ if (!cache[localDate]) {
+ cache[localDate] = {};
}
- })
- })
+
+ cache[localDate][habit.id] = (cache[localDate][habit.id] || 0) + 1;
+ });
+ });
- return map
-})
+ return cache;
+});
+
+// Derived atom for completed habits by date, using the cache
+export const completedHabitsMapAtom = atom((get) => {
+ const habits = get(habitsAtom).habits;
+ const completionCache = get(completionCacheAtom);
+ const map = new Map();
+
+ // For each date in the cache
+ Object.entries(completionCache).forEach(([dateKey, habitCompletions]) => {
+ const completedHabits = habits.filter(habit => {
+ const completionsNeeded = habit.targetCompletions || 1;
+ const completionsAchieved = habitCompletions[habit.id] || 0;
+ return completionsAchieved >= completionsNeeded;
+ });
+
+ if (completedHabits.length > 0) {
+ map.set(dateKey, completedHabits);
+ }
+ });
+
+ return map;
+});
export const pomodoroTodayCompletionsAtom = atom((get) => {
@@ -145,3 +169,22 @@ export const hasTasksAtom = atom((get) => {
const habits = get(habitsAtom)
return habits.habits.some(habit => habit.isTask === true)
})
+
+// Atom family for habits by specific date
+export const habitsByDateFamily = atomFamily((dateString: string) =>
+ atom((get) => {
+ const habits = get(habitsAtom).habits;
+ const settings = get(settingsAtom);
+ const timezone = settings.system.timezone;
+
+ const date = DateTime.fromISO(dateString).setZone(timezone);
+ return habits.filter(habit => isHabitDue({ habit, timezone, date }));
+ })
+);
+
+// Derived atom for daily habits
+export const dailyHabitsAtom = atom((get) => {
+ const settings = get(settingsAtom);
+ const today = getTodayInTimezone(settings.system.timezone);
+ return get(habitsByDateFamily(today));
+});
diff --git a/lib/types.ts b/lib/types.ts
index 86beff2..82f7ead 100644
--- a/lib/types.ts
+++ b/lib/types.ts
@@ -164,6 +164,12 @@ export interface Settings {
profile: ProfileSettings;
}
+export type CompletionCache = {
+ [dateKey: string]: { // dateKey format: "YYYY-MM-DD"
+ [habitId: string]: number // number of completions on that date
+ }
+}
+
export type ViewType = 'habits' | 'tasks'
export interface JotaiHydrateInitialValues {
diff --git a/lib/utils.ts b/lib/utils.ts
index bbcb799..bf05680 100644
--- a/lib/utils.ts
+++ b/lib/utils.ts
@@ -231,11 +231,18 @@ export function isHabitDue({
timezone: string
date: DateTime
}): boolean {
+ // handle task
if (habit.isTask) {
// For tasks, frequency is stored as a UTC ISO timestamp
const taskDueDate = t2d({ timestamp: habit.frequency, timezone })
return isSameDate(taskDueDate, date);
}
+
+ // handle habit
+ if (habit.archived) {
+ return false
+ }
+
const startOfDay = date.setZone(timezone).startOf('day')
const endOfDay = date.setZone(timezone).endOf('day')
diff --git a/package.json b/package.json
index d264404..e230586 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
{
"name": "habittrove",
- "version": "0.2.1",
+ "version": "0.2.2",
"private": true,
"scripts": {
"dev": "next dev --turbopack",