fix: migrate atoms to normal functions

fix: remove service worker
2026-03-08 03:29:49 +01:00 · 2026-03-06 23:16:19 +01:00 · 2026-03-06 22:47:32 +01:00 · 2026-02-24 23:19:40 +01:00
13 changed files with 85 additions and 207 deletions
--- a/app/layout.tsx
+++ b/app/layout.tsx
@@ -48,23 +48,6 @@ export default async function RootLayout({
    // set suppressHydrationWarning to true to prevent hydration errors when using ThemeProvider (https://ui.shadcn.com/docs/dark-mode/next)
    <html lang={locale} suppressHydrationWarning>
      <body className={activeFont.className}>
-        <script
-          dangerouslySetInnerHTML={{
-            __html: `
-              if ('serviceWorker' in navigator) {
-                window.addEventListener('load', () => {
-                  navigator.serviceWorker.register('/sw.js')
-                    .then(registration => {
-                      console.log('ServiceWorker registration successful');
-                    })
-                    .catch(err => {
-                      console.log('ServiceWorker registration failed: ', err);
-                    });
-                });
-              }
-            `,
-          }}
-        />
        <JotaiProvider>
          <Suspense fallback={<LoadingSpinner />}>
            <JotaiHydrate
--- a/components/CoinsManager.tsx
+++ b/components/CoinsManager.tsx
@@ -10,7 +10,7 @@ import { useCoins } from '@/hooks/useCoins'
 import { currentUserAtom, settingsAtom, usersAtom } from '@/lib/atoms'
 import { MAX_COIN_LIMIT } from '@/lib/constants'
 import { TransactionType } from '@/lib/types'
-import { d2s, t2d } from '@/lib/utils'
+import { calculateTransactionsToday, d2s, t2d } from '@/lib/utils'
 import { useAtom } from 'jotai'
 import { History } from 'lucide-react'
 import { useTranslations } from 'next-intl'
@@ -33,8 +33,7 @@ export default function CoinsManager() {
    coinsEarnedToday,
    totalEarned,
    totalSpent,
-    coinsSpentToday,
-    transactionsToday
+    coinsSpentToday
  } = useCoins({ selectedUser })
  const [settings] = useAtom(settingsAtom)
  const [usersData] = useAtom(usersAtom)
@@ -252,7 +251,7 @@ export default function CoinsManager() {
              <div className="p-4 rounded-lg bg-orange-100 dark:bg-orange-900">
                <div className="text-sm text-orange-800 dark:text-orange-100 mb-1">{t('todaysTransactionsLabel')}</div>
                <div className="text-2xl font-bold text-orange-900 dark:text-orange-50">
-                  {transactionsToday} 📊
+                  {calculateTransactionsToday(transactions, settings.system.timezone)} 📊
                </div>
              </div>
            </div>
--- a/components/DailyOverview.tsx
+++ b/components/DailyOverview.tsx
@@ -13,22 +13,22 @@ import {
  TooltipTrigger,
 } from "@/components/ui/tooltip"
 import { useHabits } from '@/hooks/useHabits'
-import { browserSettingsAtom, completedHabitsMapAtom, hasTasksAtom, pomodoroAtom, settingsAtom } from '@/lib/atoms'
+import { browserSettingsAtom, completedHabitsMapAtom, settingsAtom } from '@/lib/atoms'
 import { DESKTOP_DISPLAY_ITEM_COUNT } from '@/lib/constants'
 import { Habit, WishlistItemType } from '@/lib/types'
 import { cn, d2t, getNow, getTodayInTimezone, isHabitDue, isSameDate, isTaskOverdue, t2d } from '@/lib/utils'
 import { useAtom } from 'jotai'
-import { AlertTriangle, ArrowRight, ChevronDown, ChevronUp, Circle, CircleCheck, Coins, Pin, Plus } from 'lucide-react'; // Removed unused icons
+import { AlertTriangle, ArrowRight, ChevronDown, ChevronUp, Circle, CircleCheck, Coins, Pin, Plus } from 'lucide-react';
 import { useTranslations } from 'next-intl'
 import Link from 'next/link'
 import { useState } from 'react'
 import AddEditHabitModal from './AddEditHabitModal'
 import CompletionCountBadge from './CompletionCountBadge'
 import ConfirmDialog from './ConfirmDialog'
+import DrawingDisplay from './DrawingDisplay'
 import { HabitContextMenuItems } from './HabitContextMenuItems'
 import Linkify from './linkify'
 import { Button } from './ui/button'
-import DrawingDisplay from './DrawingDisplay'

 interface UpcomingItemsProps {
  habits: Habit[]
@@ -54,8 +54,7 @@ const ItemSection = ({
  addNewItem,
 }: ItemSectionProps) => {
  const t = useTranslations('DailyOverview');
-  const { completeHabit, undoComplete, saveHabit, deleteHabit, archiveHabit, habitFreqMap } = useHabits();
-  const [_, setPomo] = useAtom(pomodoroAtom);
+  const { completeHabit, undoComplete, saveHabit, deleteHabit, habitFreqMap } = useHabits();
  const [browserSettings, setBrowserSettings] = useAtom(browserSettingsAtom);
  const [settings] = useAtom(settingsAtom);
  const [completedHabitsMap] = useAtom(completedHabitsMapAtom);
@@ -397,8 +396,6 @@ export default function DailyOverview({
      return a.coinCost - b.coinCost
    })

-  const [hasTasks] = useAtom(hasTasksAtom)
-  const [, setPomo] = useAtom(pomodoroAtom)
  const [modalConfig, setModalConfig] = useState<{
    isOpen: boolean,
    isTask: boolean
@@ -416,7 +413,7 @@ export default function DailyOverview({
        <CardContent>
          <div className="space-y-6">
            {/* Tasks Section */}
-            {hasTasks && (
+            {habits.some(habit => habit.isTask === true) && (
              <ItemSection
                title={t('dailyTasksTitle')}
                items={dailyTasks}
--- a/components/HabitCalendar.tsx
+++ b/components/HabitCalendar.tsx
@@ -4,7 +4,7 @@ import CompletionCountBadge from '@/components/CompletionCountBadge'
 import { Calendar } from '@/components/ui/calendar'
 import { Card, CardContent, CardHeader, CardTitle } from '@/components/ui/card'
 import { useHabits } from '@/hooks/useHabits'
-import { completedHabitsMapAtom, habitsAtom, hasTasksAtom, settingsAtom } from '@/lib/atoms'
+import { completedHabitsMapAtom, habitsAtom, settingsAtom } from '@/lib/atoms'
 import { Habit } from '@/lib/types'
 import { d2s, getCompletionsForDate, getISODate, getNow, isHabitDue } from '@/lib/utils'
 import { useAtom } from 'jotai'
@@ -29,7 +29,6 @@ export default function HabitCalendar() {
  const [selectedDateTime, setSelectedDateTime] = useState<DateTime>(getNow({ timezone: settings.system.timezone }))
  const selectedDate = selectedDateTime.toFormat("yyyy-MM-dd")
  const [habitsData] = useAtom(habitsAtom)
-  const [hasTasks] = useAtom(hasTasksAtom)
  const habits = habitsData.habits

  const [completedHabitsMap] = useAtom(completedHabitsMapAtom)
@@ -83,7 +82,7 @@ export default function HabitCalendar() {
          <CardContent>
            {selectedDateTime && (
              <div className="space-y-8">
-                {hasTasks && (
+                {habits.some(habit => habit.isTask === true) && (
                  <div className="pt-2 border-t">
                    <div className="flex items-center justify-between mb-3">
                      <h3 className="font-medium text-sm text-muted-foreground uppercase tracking-wide">{t('tasksSectionTitle')}</h3>
--- a/components/HabitStreak.tsx
+++ b/components/HabitStreak.tsx
@@ -1,22 +1,16 @@
 'use client'

 import { Card, CardContent, CardHeader, CardTitle } from "@/components/ui/card";
-import { completedHabitsMapAtom, hasTasksAtom, settingsAtom } from '@/lib/atoms'; // Added completedHabitsMapAtom
+import { completedHabitsMapAtom, settingsAtom } from '@/lib/atoms';
 import { Habit } from '@/lib/types';
-import { d2s, getNow } from '@/lib/utils'; // Removed getCompletedHabitsForDate
+import { d2s, getNow } from '@/lib/utils';
 import { useAtom } from 'jotai';
 import { useTranslations } from 'next-intl';
 import { CartesianGrid, Line, LineChart, ResponsiveContainer, Tooltip, XAxis, YAxis } from 'recharts';

-
-interface HabitStreakProps {
-  habits: Habit[]
-}
-
-export default function HabitStreak({ habits }: HabitStreakProps) {
+export default function HabitStreak({ habits }: { habits: Habit[] }) {
  const t = useTranslations('HabitStreak');
  const [settings] = useAtom(settingsAtom)
-  const [hasTasks] = useAtom(hasTasksAtom)
  const [completedHabitsMap] = useAtom(completedHabitsMapAtom) // Use the atom

  // Get the last 7 days of data
@@ -72,7 +66,7 @@ export default function HabitStreak({ habits }: HabitStreakProps) {
                strokeWidth={2}
                dot={false}
              />
-              {hasTasks && (
+              {habits.some(habit => habit.isTask === true) && (
                <Line
                  type="monotone"
                  name={t('tooltipTasksLabel')}
--- a/components/PomodoroTimer.tsx
+++ b/components/PomodoroTimer.tsx
@@ -3,8 +3,8 @@
 import { Button } from '@/components/ui/button'
 import { Progress } from '@/components/ui/progress'
 import { useHabits } from '@/hooks/useHabits'
-import { habitsAtom, pomodoroAtom, pomodoroTodayCompletionsAtom } from '@/lib/atoms'
-import { cn } from '@/lib/utils'
+import { habitsAtom, pomodoroAtom, settingsAtom } from '@/lib/atoms'
+import { cn, getTodayCompletions } from '@/lib/utils'
 import { useAtom } from 'jotai'
 import { Clock, Minus, Pause, Play, RotateCw, SkipForward, X } from 'lucide-react'
 import { useTranslations } from 'next-intl'
@@ -41,12 +41,13 @@ export default function PomodoroTimer() {
  const [pomo, setPomo] = useAtom(pomodoroAtom)
  const { show, selectedHabitId, autoStart, minimized } = pomo
  const [habitsData] = useAtom(habitsAtom)
+  const [settingsData] = useAtom(settingsAtom)
  const { completeHabit } = useHabits()
  const selectedHabit = selectedHabitId ? habitsData.habits.find(habit => habit.id === selectedHabitId) : null
  const [timeLeft, setTimeLeft] = useState(PomoConfigs.focus.duration)
  const [state, setState] = useState<'started' | 'stopped' | 'paused'>(autoStart ? 'started' : 'stopped')
  const wakeLock = useRef<WakeLockSentinel | null>(null)
-  const [todayCompletions] = useAtom(pomodoroTodayCompletionsAtom)
+  const todayCompletions = getTodayCompletions(pomo, habitsData, settingsData);
  const currentTimerRef = useRef<PomoConfig>(PomoConfigs.focus)
  const [currentLabel, setCurrentLabel] = useState(() => {
    const labels = currentTimerRef.current.getLabels();
--- a/hooks/useCoins.tsx
+++ b/hooks/useCoins.tsx
@@ -2,15 +2,14 @@ import { addCoins, removeCoins, saveCoinsData } from '@/app/actions/data';
 import { toast } from '@/hooks/use-toast';
 import {
  coinsAtom,
-  coinsBalanceAtom,
  coinsEarnedTodayAtom,
  coinsSpentTodayAtom,
  currentUserAtom,
+  currentUserIdAtom,
  settingsAtom,
  totalEarnedAtom,
  totalSpentAtom,
-  transactionsTodayAtom,
-  usersAtom,
+  usersAtom
 } from '@/lib/atoms';
 import { MAX_COIN_LIMIT } from '@/lib/constants';
 import { CoinsData } from '@/lib/types';
@@ -24,27 +23,26 @@ export function useCoins(options?: { selectedUser?: string }) {
  const tCommon = useTranslations('Common');
  const [coins, setCoins] = useAtom(coinsAtom)
  const [settings] = useAtom(settingsAtom)
-  const [users] = useAtom(usersAtom)
+  const [{users}] = useAtom(usersAtom)
  const [currentUser] = useAtom(currentUserAtom)
-  const [allCoinsData] = useAtom(coinsAtom) // All coin transactions
-  const [loggedInUserBalance] = useAtom(coinsBalanceAtom) // Balance of the *currently logged-in* user
+  const [coinsData] = useAtom(coinsAtom) // All coin transactions
+  const [loggedInUserId] = useAtom(currentUserIdAtom);
+  const loggedInUserBalance = loggedInUserId ? coins.transactions.filter(transaction => transaction.userId === loggedInUserId).reduce((sum, transaction) => sum + transaction.amount, 0) : 0;
  const [atomCoinsEarnedToday] = useAtom(coinsEarnedTodayAtom);
  const [atomTotalEarned] = useAtom(totalEarnedAtom)
  const [atomTotalSpent] = useAtom(totalSpentAtom)
  const [atomCoinsSpentToday] = useAtom(coinsSpentTodayAtom);
-  const [atomTransactionsToday] = useAtom(transactionsTodayAtom);
-  const targetUser = options?.selectedUser ? users.users.find(u => u.id === options.selectedUser) : currentUser
+  const targetUser = options?.selectedUser ? users.find(u => u.id === options.selectedUser) : currentUser
  
  const transactions = useMemo(() => {
-    return allCoinsData.transactions.filter(t => t.userId === targetUser?.id);
-  }, [allCoinsData, targetUser?.id]);
+    return coinsData.transactions.filter(t => t.userId === targetUser?.id);
+  }, [coinsData, targetUser?.id]);

  const timezone = settings.system.timezone;
  const [coinsEarnedToday, setCoinsEarnedToday] = useState(0);
  const [totalEarned, setTotalEarned] = useState(0);
  const [totalSpent, setTotalSpent] = useState(0);
  const [coinsSpentToday, setCoinsSpentToday] = useState(0);
-  const [transactionsToday, setTransactionsToday] = useState<number>(0);
  const [balance, setBalance] = useState(0);

  useEffect(() => {
@@ -55,7 +53,6 @@ export function useCoins(options?: { selectedUser?: string }) {
      setTotalEarned(atomTotalEarned);
      setTotalSpent(atomTotalSpent);
      setCoinsSpentToday(atomCoinsSpentToday);
-      setTransactionsToday(atomTransactionsToday);
      setBalance(loggedInUserBalance);
    } else if (targetUser?.id) {
      // If an admin is viewing another user, calculate their metrics manually
@@ -71,8 +68,6 @@ export function useCoins(options?: { selectedUser?: string }) {
      const spentToday = calculateCoinsSpentToday(transactions, timezone);
      setCoinsSpentToday(roundToInteger(spentToday));

-      setTransactionsToday(calculateTransactionsToday(transactions, timezone)); // This is a count
-
      const calculatedBalance = transactions.reduce((acc, t) => acc + t.amount, 0);
      setBalance(roundToInteger(calculatedBalance));
    }
@@ -85,8 +80,7 @@ export function useCoins(options?: { selectedUser?: string }) {
    atomCoinsEarnedToday,
    atomTotalEarned,
    atomTotalSpent,
-    atomCoinsSpentToday,
-    atomTransactionsToday,
+    atomCoinsSpentToday
  ]);

  const add = async (amount: number, description: string, note?: string) => {
@@ -187,7 +181,6 @@ export function useCoins(options?: { selectedUser?: string }) {
    coinsEarnedToday,
    totalEarned,
    totalSpent,
-    coinsSpentToday,
-    transactionsToday
+    coinsSpentToday
  }
 }
--- a/hooks/useHabits.tsx
+++ b/hooks/useHabits.tsx
@@ -1,12 +1,13 @@
 import { addCoins, removeCoins, saveHabitsData } from '@/app/actions/data'
 import { ToastAction } from '@/components/ui/toast'
 import { toast } from '@/hooks/use-toast'
-import { coinsAtom, currentUserAtom, habitFreqMapAtom, habitsAtom, settingsAtom, usersAtom } from '@/lib/atoms'
-import { Habit } from '@/lib/types'
+import { coinsAtom, currentUserAtom, habitsAtom, settingsAtom } from '@/lib/atoms'
+import { Freq, Habit } from '@/lib/types'
 import {
  d2s,
  d2t,
  getCompletionsForDate,
+  getHabitFreq,
  getISODate,
  getNow,
  getTodayInTimezone,
@@ -23,12 +24,15 @@ import { useTranslations } from 'next-intl'
 export function useHabits() {
  const t = useTranslations('useHabits');
  const tCommon = useTranslations('Common');
-  const [usersData] = useAtom(usersAtom)
  const [currentUser] = useAtom(currentUserAtom)
  const [habitsData, setHabitsData] = useAtom(habitsAtom)
  const [coins, setCoins] = useAtom(coinsAtom)
  const [settings] = useAtom(settingsAtom)
-  const [habitFreqMap] = useAtom(habitFreqMapAtom)
+  // const [habitFreqMap] = useAtom(habitFreqMapAtom)
+  const habitFreqMap = new Map<string, Freq>();
+  habitsData.habits.forEach(habit => {
+    habitFreqMap.set(habit.id, getHabitFreq(habit));
+  })

  const completeHabit = async (habit: Habit) => {
    if (!handlePermissionCheck(currentUser, 'habit', 'interact', tCommon)) return
--- a/lib/atoms.ts
+++ b/lib/atoms.ts
@@ -3,10 +3,7 @@ import {
  calculateCoinsSpentToday,
  calculateTotalEarned,
  calculateTotalSpent,
-  calculateTransactionsToday,
  generateCryptoHash,
-  getCompletionsForToday,
-  getHabitFreq,
  isHabitDue,
  prepareDataForHashing,
  roundToInteger,
@@ -16,9 +13,9 @@ import { atom } from "jotai";
 import { atomFamily, atomWithStorage } from "jotai/utils";
 import { DateTime } from "luxon";
 import {
+  BrowserSettings,
  CoinsData,
  CompletionCache,
-  Freq,
  getDefaultCoinsData,
  getDefaultHabitsData,
  getDefaultServerSettings,
@@ -27,6 +24,7 @@ import {
  getDefaultWishlistData,
  Habit,
  HabitsData,
+  PomodoroAtom,
  ServerSettings,
  Settings,
  UserData,
@@ -34,12 +32,6 @@ import {
  WishlistData
 } from "./types";

-export interface BrowserSettings {
-  expandedHabits: boolean
-  expandedTasks: boolean
-  expandedWishlist: boolean
-}
-
 export const browserSettingsAtom = atomWithStorage('browserSettings', {
  expandedHabits: false,
  expandedTasks: false,
@@ -47,11 +39,21 @@ export const browserSettingsAtom = atomWithStorage('browserSettings', {
 } as BrowserSettings)

 export const usersAtom = atom(getDefaultUsersData<UserData>())
+export const currentUserIdAtom = atom<UserId | undefined>(undefined);
 export const settingsAtom = atom(getDefaultSettings<Settings>());
 export const habitsAtom = atom(getDefaultHabitsData<HabitsData>());
 export const coinsAtom = atom(getDefaultCoinsData<CoinsData>());
 export const wishlistAtom = atom(getDefaultWishlistData<WishlistData>());
 export const serverSettingsAtom = atom(getDefaultServerSettings<ServerSettings>());
+export const userSelectAtom = atom<boolean>(false)
+export const aboutOpenAtom = atom<boolean>(false)
+
+export const pomodoroAtom = atom<PomodoroAtom>({
+  show: false,
+  selectedHabitId: null,
+  autoStart: true,
+  minimized: false,
+})

 // Derived atom for coins earned today
 export const coinsEarnedTodayAtom = atom((get) => {
@@ -83,54 +85,12 @@ export const coinsSpentTodayAtom = atom((get) => {
  return roundToInteger(value);
 });

-// Derived atom for transactions today
-export const transactionsTodayAtom = atom((get) => {
-  const coins = get(coinsAtom);
-  const settings = get(settingsAtom);
-  return calculateTransactionsToday(coins.transactions, settings.system.timezone);
-});
-
-// Atom to store the current logged-in user's ID.
-// This should be set by your application when the user session is available.
-export const currentUserIdAtom = atom<UserId | undefined>(undefined);
-
 export const currentUserAtom = atom((get) => {
  const currentUserId = get(currentUserIdAtom);
  const users = get(usersAtom);
  return users.users.find(user => user.id === currentUserId);
 })

-// Derived atom for current balance for the logged-in user
-export const coinsBalanceAtom = atom((get) => {
-  const loggedInUserId = get(currentUserIdAtom);
-  if (!loggedInUserId) {
-    return 0; // No user logged in or ID not set, so balance is 0
-  }
-  const coins = get(coinsAtom);
-  const balance = coins.transactions
-    .filter(transaction => transaction.userId === loggedInUserId)
-    .reduce((sum, transaction) => sum + transaction.amount, 0);
-  return roundToInteger(balance);
-});
-
-/* transient atoms */
-interface PomodoroAtom {
-  show: boolean
-  selectedHabitId: string | null
-  autoStart: boolean
-  minimized: boolean
-}
-
-export const pomodoroAtom = atom<PomodoroAtom>({
-  show: false,
-  selectedHabitId: null,
-  autoStart: true,
-  minimized: false,
-})
-
-export const userSelectAtom = atom<boolean>(false)
-export const aboutOpenAtom = atom<boolean>(false)
-
 /**
 * Asynchronous atom that calculates a freshness token (hash) based on the current client-side data.
 * This token can be compared with a server-generated token to detect data discrepancies.
@@ -147,34 +107,26 @@ export const clientFreshnessTokenAtom = atom(async (get) => {
  return hash;
 });

-// Derived atom for completion cache
-export const completionCacheAtom = atom((get) => {
+// Derived atom for completed habits by date, using the cache
+export const completedHabitsMapAtom = atom((get) => {
  const habits = get(habitsAtom).habits;
+  const completionCache: CompletionCache = {};
+  const map = new Map<string, Habit[]>();
  const timezone = get(settingsAtom).system.timezone;
-  const cache: CompletionCache = {};

  habits.forEach(habit => {
    habit.completions.forEach(utcTimestamp => {
      const localDate = t2d({ timestamp: utcTimestamp, timezone })
        .toFormat('yyyy-MM-dd');

-      if (!cache[localDate]) {
-        cache[localDate] = {};
+      if (!completionCache[localDate]) {
+        completionCache[localDate] = {};
      }

-      cache[localDate][habit.id] = (cache[localDate][habit.id] || 0) + 1;
+      completionCache[localDate][habit.id] = (completionCache[localDate][habit.id] || 0) + 1;
    });
  });

-  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<string, Habit[]>();
-
  // For each date in the cache
  Object.entries(completionCache).forEach(([dateKey, habitCompletions]) => {
    const completedHabits = habits.filter(habit => {
@@ -191,38 +143,6 @@ export const completedHabitsMapAtom = atom((get) => {
  return map;
 });

-// Derived atom for habit frequency map
-export const habitFreqMapAtom = atom((get) => {
-  const habits = get(habitsAtom).habits;
-  const map = new Map<string, Freq>();
-  habits.forEach(habit => {
-    map.set(habit.id, getHabitFreq(habit));
-  });
-  return map;
-});
-
-export const pomodoroTodayCompletionsAtom = atom((get) => {
-  const pomo = get(pomodoroAtom)
-  const habits = get(habitsAtom)
-  const settings = get(settingsAtom)
-
-  if (!pomo.selectedHabitId) return 0
-
-  const selectedHabit = habits.habits.find(h => h.id === pomo.selectedHabitId!)
-  if (!selectedHabit) return 0
-
-  return getCompletionsForToday({
-    habit: selectedHabit,
-    timezone: settings.system.timezone
-  })
-})
-
-// Derived atom to check if any habits are tasks
-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) => {
--- a/lib/types.ts
+++ b/lib/types.ts
@@ -210,3 +210,16 @@ export interface ParsedFrequencyResult {
  message: string | null
  result: ParsedResultType
 }
+
+export interface PomodoroAtom {
+  show: boolean
+  selectedHabitId: string | null
+  autoStart: boolean
+  minimized: boolean
+}
+
+export interface BrowserSettings {
+  expandedHabits: boolean
+  expandedTasks: boolean
+  expandedWishlist: boolean
+}
--- a/lib/utils.ts
+++ b/lib/utils.ts
@@ -1,5 +1,5 @@
 import { toast } from "@/hooks/use-toast"
-import { CoinsData, CoinTransaction, Freq, Habit, HabitsData, ParsedFrequencyResult, ParsedResultType, SafeUser, Settings, User, UserData, WishlistData } from '@/lib/types'
+import { CoinsData, CoinTransaction, Freq, Habit, HabitsData, ParsedFrequencyResult, ParsedResultType, PomodoroAtom, SafeUser, Settings, User, UserData, WishlistData } from '@/lib/types'
 import * as chrono from 'chrono-node'
 import { clsx, type ClassValue } from "clsx"
 import { DateTime, DateTimeFormatOptions } from "luxon"
@@ -84,6 +84,20 @@ export function getCompletionsForToday({
  return getCompletionsForDate({ habit, date: getTodayInTimezone(timezone), timezone })
 }

+export function getTodayCompletions({ selectedHabitId }: PomodoroAtom, { habits }: HabitsData, { system: { timezone } }: Settings): number {
+  if (!selectedHabitId)
+    return 0;
+
+  const selectedHabit = habits.find(h => h.id === selectedHabitId!);
+  if (!selectedHabit)
+    return 0;
+
+  return getCompletionsForToday({
+    habit: selectedHabit,
+    timezone: timezone
+  });
+}
+
 export function getCompletedHabitsForDate({
  habits,
  date,
--- a/next.config.ts
+++ b/next.config.ts
@@ -30,24 +30,7 @@ const nextConfig: NextConfig = {
            value: 'strict-origin-when-cross-origin',
          },
        ],
-      },
-      {
-        source: '/sw.js',
-        headers: [
-          {
-            key: 'Content-Type',
-            value: 'application/javascript; charset=utf-8',
-          },
-          {
-            key: 'Cache-Control',
-            value: 'no-cache, no-store, must-revalidate',
-          },
-          {
-            key: 'Content-Security-Policy',
-            value: "default-src 'self'; script-src 'self'",
-          },
-        ],
-      },
+      }
    ]
  },
 };
--- a/public/sw.js
+++ b/public/sw.js
@@ -1,22 +0,0 @@
-self.addEventListener('push', function (event) {
-  if (event.data) {
-    const data = event.data.json()
-    const options = {
-      body: data.body,
-      icon: data.icon || '/icon.png',
-      badge: '/badge.png',
-      vibrate: [100, 50, 100],
-      data: {
-        dateOfArrival: Date.now(),
-        primaryKey: '2',
-      },
-    }
-    event.waitUntil(self.registration.showNotification(data.title, options))
-  }
-})
-
-self.addEventListener('notificationclick', function (event) {
-  console.log('Notification click received.')
-  event.notification.close()
-  event.waitUntil(clients.openWindow('/'))
-})
Author	SHA1	Message	Date
ManInDark	630363af1f	fix: migrate atoms to normal functions	2026-03-06 23:16:19 +01:00
ManInDark	f7034116a3	fix: migrate atoms to normal functions	2026-03-06 22:47:32 +01:00
ManInDark	c418bddd9e	fix: remove service worker	2026-02-24 23:19:40 +01:00