+
+
+ {/* Start Time */}
+
+
+
+ {
+ const newSettings = { ...reminderSettings, hourlyStart: newTime };
+ setReminderSettings(newSettings);
+ await saveReminderSettings(newSettings);
+ }}
+ />
+
+
+
+ {/* End Time */}
+
+
+
+ {
+ const newSettings = { ...reminderSettings, hourlyEnd: newTime };
+ setReminderSettings(newSettings);
+ await saveReminderSettings(newSettings);
+ }}
+ />
+
+
+
- You'll receive reminders every hour during active hours (9 AM - 9 PM).
+ You'll receive reminders every hour between these times.
)}
diff --git a/src/hooks/useNotifications.ts b/src/hooks/useNotifications.ts
index 58b3e9d..8e61e46 100644
--- a/src/hooks/useNotifications.ts
+++ b/src/hooks/useNotifications.ts
@@ -88,29 +88,74 @@ export function useNotifications(reminderSettings: ReminderSettings) {
}
}, []);
- // Check and send daily reminder
+ // Track previous settings to detect changes
+ const [prevSettings, setPrevSettings] = useState(reminderSettings);
+
+ // If settings change, we might need to reset notification history to allow "update and resend"
+ useEffect(() => {
+ if (JSON.stringify(prevSettings) !== JSON.stringify(reminderSettings)) {
+ // Only reset if time changed significantly or if toggled.
+ // For simplicity, if the user updates settings, we clear the daily lock *if* the time is in the future relative to previous check?
+ // Actually, the user wants "sent out again" if edited.
+ // We can simply clear the 'last notified' date if the reminderTime changed.
+ if (prevSettings.reminderTime !== reminderSettings.reminderTime && reminderSettings.frequency === 'daily') {
+ localStorage.removeItem(LAST_NOTIFICATION_KEY);
+ }
+ setPrevSettings(reminderSettings);
+ }
+ }, [reminderSettings, prevSettings]);
+
+ // Check and send reminder
const checkAndSendReminder = useCallback(() => {
if (!reminderSettings.enabled || permission !== 'granted') return;
- const today = new Date().toISOString().split('T')[0];
- const lastNotified = localStorage.getItem(LAST_NOTIFICATION_KEY);
-
- if (lastNotified === today) return; // Already notified today
-
const now = new Date();
- const [hours, minutes] = reminderSettings.reminderTime.split(':').map(Number);
- const reminderTime = new Date();
- reminderTime.setHours(hours, minutes, 0, 0);
+ const today = now.toISOString().split('T')[0];
- // If current time is past the reminder time, send it
- if (now >= reminderTime) {
- playNotificationSound();
- sendNotification('QuitTraq Reminder', {
- body: "Time to log your daily usage! Every day counts on your journey.",
- tag: 'daily-reminder', // Tag ensures we don't stack multiple notifications
- requireInteraction: true, // Keep it visible until user interacts
- });
- localStorage.setItem(LAST_NOTIFICATION_KEY, today);
+ if (reminderSettings.frequency === 'hourly') {
+ const LAST_HOURLY_KEY = 'quittraq_last_hourly_notification';
+ const lastNotifiedHour = localStorage.getItem(LAST_HOURLY_KEY);
+ const currentHourKey = `${today}-${now.getHours()}`;
+
+ if (lastNotifiedHour === currentHourKey) return; // Already notified this hour
+
+ // Check active hours
+ const startParts = (reminderSettings.hourlyStart || '09:00').split(':').map(Number);
+ const endParts = (reminderSettings.hourlyEnd || '21:00').split(':').map(Number);
+
+ const startMinutes = startParts[0] * 60 + startParts[1];
+ const endMinutes = endParts[0] * 60 + endParts[1];
+ const currentMinutes = now.getHours() * 60 + now.getMinutes();
+
+ if (currentMinutes >= startMinutes && currentMinutes <= endMinutes) {
+ playNotificationSound();
+ sendNotification('QuitTraq Hourly Check-in', {
+ body: "How are you doing? Log your status to stay on track!",
+ tag: 'hourly-reminder',
+ requireInteraction: true,
+ });
+ localStorage.setItem(LAST_HOURLY_KEY, currentHourKey);
+ }
+
+ } else {
+ // Daily logic
+ const lastNotified = localStorage.getItem(LAST_NOTIFICATION_KEY);
+ if (lastNotified === today) return; // Already notified today
+
+ const [hours, minutes] = reminderSettings.reminderTime.split(':').map(Number);
+ const reminderTime = new Date();
+ reminderTime.setHours(hours, minutes, 0, 0);
+
+ // If current time is past the reminder time, send it
+ if (now >= reminderTime) {
+ playNotificationSound();
+ sendNotification('QuitTraq Reminder', {
+ body: "Time to log your daily usage! Every day counts on your journey.",
+ tag: 'daily-reminder', // Tag ensures we don't stack multiple notifications
+ requireInteraction: true, // Keep it visible until user interacts
+ });
+ localStorage.setItem(LAST_NOTIFICATION_KEY, today);
+ }
}
}, [reminderSettings, permission, sendNotification, playNotificationSound]);
diff --git a/src/lib/d1.ts b/src/lib/d1.ts
index c744ef1..1fdcca7 100644
--- a/src/lib/d1.ts
+++ b/src/lib/d1.ts
@@ -235,6 +235,8 @@ export interface ReminderSettingsRow {
enabled: number; // SQLite boolean
reminderTime: string;
frequency: string;
+ hourlyStart: string | null;
+ hourlyEnd: string | null;
lastNotifiedDate: string | null;
createdAt: string;
updatedAt: string;
@@ -251,7 +253,14 @@ export async function getReminderSettingsD1(userId: string): Promise
{
+export async function upsertReminderSettingsD1(
+ userId: string,
+ enabled: boolean,
+ reminderTime: string,
+ frequency: string = 'daily',
+ hourlyStart: string = '09:00',
+ hourlyEnd: string = '21:00'
+): Promise {
const db = getD1();
if (!db) return null;
@@ -261,13 +270,13 @@ export async function upsertReminderSettingsD1(userId: string, enabled: boolean,
if (existing) {
await db.prepare(
- 'UPDATE ReminderSettings SET enabled = ?, reminderTime = ?, frequency = ?, updatedAt = ? WHERE userId = ?'
- ).bind(enabled ? 1 : 0, reminderTime, frequency, now, userId).run();
+ 'UPDATE ReminderSettings SET enabled = ?, reminderTime = ?, frequency = ?, hourlyStart = ?, hourlyEnd = ?, updatedAt = ? WHERE userId = ?'
+ ).bind(enabled ? 1 : 0, reminderTime, frequency, hourlyStart, hourlyEnd, now, userId).run();
} else {
await db.prepare(
- `INSERT INTO ReminderSettings (id, userId, enabled, reminderTime, frequency, createdAt, updatedAt)
- VALUES (?, ?, ?, ?, ?, ?, ?)`
- ).bind(id, userId, enabled ? 1 : 0, reminderTime, frequency, now, now).run();
+ `INSERT INTO ReminderSettings (id, userId, enabled, reminderTime, frequency, hourlyStart, hourlyEnd, createdAt, updatedAt)
+ VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?)`
+ ).bind(id, userId, enabled ? 1 : 0, reminderTime, frequency, hourlyStart, hourlyEnd, now, now).run();
}
return getReminderSettingsD1(userId);
diff --git a/src/lib/storage.ts b/src/lib/storage.ts
index 0d604ee..156011c 100644
--- a/src/lib/storage.ts
+++ b/src/lib/storage.ts
@@ -39,6 +39,8 @@ export interface ReminderSettings {
enabled: boolean;
reminderTime: string; // HH:MM format
frequency: 'daily' | 'hourly';
+ hourlyStart?: string; // HH:MM
+ hourlyEnd?: string; // HH:MM
}
export interface SavingsConfig {