Skip to content

Commit d3502e2

Browse files
dohsimpsondohsimpson
committed
added support for tasks
1 parent 3b33719 commit d3502e2

19 files changed

+223
-105
lines changed

‎CHANGELOG.md

+6
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,11 @@
11
# Changelog
22

3+
## Version 0.1.25
4+
5+
### Added
6+
7+
- added support for tasks (#41)
8+
39
## Version 0.1.24
410

511
### Fixed

‎app/actions/data.ts

+24-12
Original file line numberDiff line numberDiff line change
@@ -101,13 +101,19 @@ export async function saveCoinsData(data: CoinsData): Promise<void> {
101101
return saveData('coins', data)
102102
}
103103

104-
export async function addCoins(
105-
amount: number,
106-
description: string,
107-
type: TransactionType = 'MANUAL_ADJUSTMENT',
108-
relatedItemId?: string,
104+
export async function addCoins({
105+
amount,
106+
description,
107+
type = 'MANUAL_ADJUSTMENT',
108+
relatedItemId,
109+
note,
110+
}: {
111+
amount: number
112+
description: string
113+
type?: TransactionType
114+
relatedItemId?: string
109115
note?: string
110-
): Promise<CoinsData> {
116+
}): Promise<CoinsData> {
111117
const data = await loadCoinsData()
112118
const newTransaction: CoinTransaction = {
113119
id: crypto.randomUUID(),
@@ -143,13 +149,19 @@ export async function saveSettings(settings: Settings): Promise<void> {
143149
return saveData('settings', settings)
144150
}
145151

146-
export async function removeCoins(
147-
amount: number,
148-
description: string,
149-
type: TransactionType = 'MANUAL_ADJUSTMENT',
150-
relatedItemId?: string,
152+
export async function removeCoins({
153+
amount,
154+
description,
155+
type = 'MANUAL_ADJUSTMENT',
156+
relatedItemId,
157+
note,
158+
}: {
159+
amount: number
160+
description: string
161+
type?: TransactionType
162+
relatedItemId?: string
151163
note?: string
152-
): Promise<CoinsData> {
164+
}): Promise<CoinsData> {
153165
const data = await loadCoinsData()
154166
const newTransaction: CoinTransaction = {
155167
id: crypto.randomUUID(),

‎components/AddEditHabitModal.tsx

+20-15
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
import { useState, useEffect } from 'react'
44
import { RRule, RRuleSet, rrulestr } from 'rrule'
55
import { useAtom } from 'jotai'
6-
import { settingsAtom } from '@/lib/atoms'
6+
import { settingsAtom, browserSettingsAtom } from '@/lib/atoms'
77
import { Dialog, DialogContent, DialogHeader, DialogTitle, DialogFooter } from '@/components/ui/dialog'
88
import { Button } from '@/components/ui/button'
99
import { Input } from '@/components/ui/input'
@@ -16,8 +16,10 @@ import { Popover, PopoverContent, PopoverTrigger } from '@/components/ui/popover
1616
import data from '@emoji-mart/data'
1717
import Picker from '@emoji-mart/react'
1818
import { Habit } from '@/lib/types'
19-
import { parseNaturalLanguageRRule, parseRRule, serializeRRule } from '@/lib/utils'
20-
import { INITIAL_RECURRENCE_RULE } from '@/lib/constants'
19+
import { d2s, d2t, getISODate, getNow, parseNaturalLanguageDate, parseNaturalLanguageRRule, parseRRule, serializeRRule } from '@/lib/utils'
20+
import { INITIAL_DUE, INITIAL_RECURRENCE_RULE } from '@/lib/constants'
21+
import * as chrono from 'chrono-node';
22+
import { DateTime } from 'luxon'
2123

2224
interface AddEditHabitModalProps {
2325
onClose: () => void
@@ -27,12 +29,16 @@ interface AddEditHabitModalProps {
2729

2830
export default function AddEditHabitModal({ onClose, onSave, habit }: AddEditHabitModalProps) {
2931
const [settings] = useAtom(settingsAtom)
32+
const [browserSettings] = useAtom(browserSettingsAtom)
33+
const isTasksView = browserSettings.viewType === 'tasks'
3034
const [name, setName] = useState(habit?.name || '')
3135
const [description, setDescription] = useState(habit?.description || '')
3236
const [coinReward, setCoinReward] = useState(habit?.coinReward || 1)
3337
const [targetCompletions, setTargetCompletions] = useState(habit?.targetCompletions || 1)
34-
const origRuleText = parseRRule(habit?.frequency || INITIAL_RECURRENCE_RULE).toText()
38+
const isRecurRule = !isTasksView
39+
const origRuleText = isRecurRule ? parseRRule(habit?.frequency || INITIAL_RECURRENCE_RULE).toText() : habit?.frequency || INITIAL_DUE
3540
const [ruleText, setRuleText] = useState<string>(origRuleText)
41+
const now = getNow({ timezone: settings.system.timezone })
3642

3743
const handleSubmit = async (e: React.FormEvent) => {
3844
e.preventDefault()
@@ -42,17 +48,16 @@ export default function AddEditHabitModal({ onClose, onSave, habit }: AddEditHab
4248
coinReward,
4349
targetCompletions: targetCompletions > 1 ? targetCompletions : undefined,
4450
completions: habit?.completions || [],
45-
frequency: habit ? (
46-
origRuleText === ruleText ? habit.frequency : serializeRRule(parseNaturalLanguageRRule(ruleText))
47-
) : serializeRRule(parseNaturalLanguageRRule(ruleText)),
51+
frequency: isRecurRule ? serializeRRule(parseNaturalLanguageRRule(ruleText)) : d2t({ dateTime: parseNaturalLanguageDate({ text: ruleText, timezone: settings.system.timezone }) }),
52+
isTask: isTasksView ? true : undefined
4853
})
4954
}
5055

5156
return (
5257
<Dialog open={true} onOpenChange={onClose}>
5358
<DialogContent>
5459
<DialogHeader>
55-
<DialogTitle>{habit ? 'Edit Habit' : 'Add New Habit'}</DialogTitle>
60+
<DialogTitle>{habit ? `Edit ${isTasksView ? 'Task' : 'Habit'}` : `Add New ${isTasksView ? 'Task' : 'Habit'}`}</DialogTitle>
5661
</DialogHeader>
5762
<form onSubmit={handleSubmit}>
5863
<div className="grid gap-4 py-4">
@@ -109,7 +114,7 @@ export default function AddEditHabitModal({ onClose, onSave, habit }: AddEditHab
109114
</div>
110115
<div className="grid grid-cols-4 items-center gap-4">
111116
<Label htmlFor="recurrence" className="text-right">
112-
Frequency
117+
When
113118
</Label>
114119
<div className="col-span-3 space-y-2">
115120
<Input
@@ -123,7 +128,7 @@ export default function AddEditHabitModal({ onClose, onSave, habit }: AddEditHab
123128
<span>
124129
{(() => {
125130
try {
126-
return parseNaturalLanguageRRule(ruleText).toText()
131+
return isRecurRule ? parseNaturalLanguageRRule(ruleText).toText() : d2s({ dateTime: parseNaturalLanguageDate({ text: ruleText, timezone: settings.system.timezone }), timezone: settings.system.timezone, format: DateTime.DATE_MED_WITH_WEEKDAY })
127132
} catch (e: unknown) {
128133
return `Invalid rule: ${e instanceof Error ? e.message : 'Invalid recurrence rule'}`
129134
}
@@ -134,7 +139,7 @@ export default function AddEditHabitModal({ onClose, onSave, habit }: AddEditHab
134139
<div className="grid grid-cols-4 items-center gap-4">
135140
<div className="flex items-center gap-2 justify-end">
136141
<Label htmlFor="targetCompletions">
137-
Repetitions
142+
Complete
138143
</Label>
139144
</div>
140145
<div className="col-span-3">
@@ -168,15 +173,15 @@ export default function AddEditHabitModal({ onClose, onSave, habit }: AddEditHab
168173
</button>
169174
</div>
170175
<span className="text-sm text-muted-foreground">
171-
times per occurrence
176+
times
172177
</span>
173178
</div>
174179
</div>
175180
</div>
176181
<div className="grid grid-cols-4 items-center gap-4">
177182
<div className="flex items-center gap-2 justify-end">
178183
<Label htmlFor="coinReward">
179-
Coin Reward
184+
Reward
180185
</Label>
181186
</div>
182187
<div className="col-span-3">
@@ -207,14 +212,14 @@ export default function AddEditHabitModal({ onClose, onSave, habit }: AddEditHab
207212
</button>
208213
</div>
209214
<span className="text-sm text-muted-foreground">
210-
coins per completion
215+
coins
211216
</span>
212217
</div>
213218
</div>
214219
</div>
215220
</div>
216221
<DialogFooter>
217-
<Button type="submit">{habit ? 'Save Changes' : 'Add Habit'}</Button>
222+
<Button type="submit">{habit ? 'Save Changes' : `Add ${isTasksView ? 'Task' : 'Habit'}`}</Button>
218223
</DialogFooter>
219224
</form>
220225
</DialogContent>

‎components/DailyOverview.tsx

+9-4
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import { cn, isHabitDueToday, getHabitFreq } from '@/lib/utils'
99
import Link from 'next/link'
1010
import { useState, useEffect } from 'react'
1111
import { useAtom } from 'jotai'
12-
import { pomodoroAtom, settingsAtom, completedHabitsMapAtom, transientSettingsAtom } from '@/lib/atoms'
12+
import { pomodoroAtom, settingsAtom, completedHabitsMapAtom, browserSettingsAtom } from '@/lib/atoms'
1313
import { getTodayInTimezone, isSameDate, t2d, d2t, getNow } from '@/lib/utils'
1414
import { Card, CardContent, CardHeader, CardTitle } from '@/components/ui/card'
1515
import { Badge } from '@/components/ui/badge'
@@ -32,16 +32,21 @@ export default function DailyOverview({
3232
}: UpcomingItemsProps) {
3333
const { completeHabit, undoComplete } = useHabits()
3434
const [settings] = useAtom(settingsAtom)
35+
const [browserSettings] = useAtom(browserSettingsAtom)
3536
const [dailyHabits, setDailyHabits] = useState<Habit[]>([])
3637
const [completedHabitsMap] = useAtom(completedHabitsMapAtom)
3738
const today = getTodayInTimezone(settings.system.timezone)
3839
const todayCompletions = completedHabitsMap.get(today) || []
40+
const isTasksView = browserSettings.viewType === 'tasks'
3941

4042
useEffect(() => {
4143
// Filter habits that are due today based on their recurrence rule
42-
const filteredHabits = habits.filter(habit => isHabitDueToday({ habit, timezone: settings.system.timezone }))
44+
const filteredHabits = habits.filter(habit =>
45+
(isTasksView ? habit.isTask : !habit.isTask) &&
46+
isHabitDueToday({ habit, timezone: settings.system.timezone })
47+
)
4348
setDailyHabits(filteredHabits)
44-
}, [habits])
49+
}, [habits, isTasksView])
4550

4651
// Get all wishlist items sorted by redeemable status (non-redeemable first) then by coin cost
4752
const sortedWishlistItems = wishlistItems
@@ -72,7 +77,7 @@ export default function DailyOverview({
7277
<div className="space-y-4">
7378
<div>
7479
<div className="flex items-center justify-between mb-2">
75-
<h3 className="font-semibold">Daily Habits</h3>
80+
<h3 className="font-semibold">{isTasksView ? 'Daily Tasks' : 'Daily Habits'}</h3>
7681
<Badge variant="secondary">
7782
{`${dailyHabits.filter(habit => {
7883
const completions = (completedHabitsMap.get(today) || [])

‎components/Dashboard.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ export default function Dashboard() {
2121
<div className="container mx-auto px-4 py-8">
2222
<div className="flex justify-between items-center mb-6">
2323
<h1 className="text-3xl font-bold">Dashboard</h1>
24-
{/* <ViewToggle /> */}
24+
<ViewToggle />
2525
</div>
2626
<div className="grid grid-cols-1 md:grid-cols-2 lg:grid-cols-3 gap-6">
2727
<CoinBalance coinBalance={coinBalance} />

‎components/HabitItem.tsx

+7-3
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import { Habit } from '@/lib/types'
22
import { useAtom } from 'jotai'
3-
import { settingsAtom, pomodoroAtom } from '@/lib/atoms'
4-
import { getTodayInTimezone, isSameDate, t2d, d2t, getNow, parseNaturalLanguageRRule, parseRRule } from '@/lib/utils'
3+
import { settingsAtom, pomodoroAtom, browserSettingsAtom } from '@/lib/atoms'
4+
import { getTodayInTimezone, isSameDate, t2d, d2t, getNow, parseNaturalLanguageRRule, parseRRule, d2s } from '@/lib/utils'
55
import { Card, CardContent, CardDescription, CardFooter, CardHeader, CardTitle } from '@/components/ui/card'
66
import { Button } from '@/components/ui/button'
77
import { Coins, Edit, Trash2, Check, Undo2, MoreVertical, Timer } from 'lucide-react'
@@ -15,6 +15,7 @@ import {
1515
import { useEffect, useState } from 'react'
1616
import { useHabits } from '@/hooks/useHabits'
1717
import { INITIAL_RECURRENCE_RULE } from '@/lib/constants'
18+
import { DateTime } from 'luxon'
1819

1920
interface HabitItemProps {
2021
habit: Habit
@@ -32,6 +33,9 @@ export default function HabitItem({ habit, onEdit, onDelete }: HabitItemProps) {
3233
const target = habit.targetCompletions || 1
3334
const isCompletedToday = completionsToday >= target
3435
const [isHighlighted, setIsHighlighted] = useState(false)
36+
const [browserSettings] = useAtom(browserSettingsAtom)
37+
const isTasksView = browserSettings.viewType === 'tasks'
38+
const isRecurRule = !isTasksView
3539

3640
useEffect(() => {
3741
const params = new URLSearchParams(window.location.search)
@@ -66,7 +70,7 @@ export default function HabitItem({ habit, onEdit, onDelete }: HabitItemProps) {
6670
)}
6771
</CardHeader>
6872
<CardContent className="flex-1">
69-
<p className="text-sm text-gray-500">Frequency: {parseRRule(habit.frequency || INITIAL_RECURRENCE_RULE).toText()}</p>
73+
<p className="text-sm text-gray-500">When: {isRecurRule ? parseRRule(habit.frequency || INITIAL_RECURRENCE_RULE).toText() : d2s({ dateTime: t2d({ timestamp: habit.frequency, timezone: settings.system.timezone }), timezone: settings.system.timezone, format: DateTime.DATE_MED_WITH_WEEKDAY })}</p>
7074
<div className="flex items-center mt-2">
7175
<Coins className="h-4 w-4 text-yellow-400 mr-1" />
7276
<span className="text-sm font-medium">{habit.coinReward} coins per completion</span>

‎components/HabitList.tsx

+16-9
Original file line numberDiff line numberDiff line change
@@ -3,19 +3,24 @@
33
import { useState } from 'react'
44
import { Plus, ListTodo } from 'lucide-react'
55
import { useAtom } from 'jotai'
6-
import { habitsAtom, settingsAtom } from '@/lib/atoms'
6+
import { habitsAtom, settingsAtom, browserSettingsAtom } from '@/lib/atoms'
77
import EmptyState from './EmptyState'
88
import { Button } from '@/components/ui/button'
99
import HabitItem from './HabitItem'
1010
import AddEditHabitModal from './AddEditHabitModal'
1111
import ConfirmDialog from './ConfirmDialog'
1212
import { Habit } from '@/lib/types'
1313
import { useHabits } from '@/hooks/useHabits'
14+
import { HabitIcon, TaskIcon } from '@/lib/constants'
1415

1516
export default function HabitList() {
1617
const { saveHabit, deleteHabit } = useHabits()
1718
const [habitsData, setHabitsData] = useAtom(habitsAtom)
18-
const habits = habitsData.habits
19+
const [browserSettings] = useAtom(browserSettingsAtom)
20+
const isTasksView = browserSettings.viewType === 'tasks'
21+
const habits = habitsData.habits.filter(habit =>
22+
isTasksView ? habit.isTask : !habit.isTask
23+
)
1924
const [settings] = useAtom(settingsAtom)
2025
const [isModalOpen, setIsModalOpen] = useState(false)
2126
const [editingHabit, setEditingHabit] = useState<Habit | null>(null)
@@ -28,18 +33,20 @@ export default function HabitList() {
2833
return (
2934
<div className="container mx-auto px-4 py-8">
3035
<div className="flex justify-between items-center mb-6">
31-
<h1 className="text-3xl font-bold">My Habits</h1>
36+
<h1 className="text-3xl font-bold">
37+
{isTasksView ? 'My Tasks' : 'My Habits'}
38+
</h1>
3239
<Button onClick={() => setIsModalOpen(true)}>
33-
<Plus className="mr-2 h-4 w-4" /> Add Habit
40+
<Plus className="mr-2 h-4 w-4" /> {isTasksView ? 'Add Task' : 'Add Habit'}
3441
</Button>
3542
</div>
3643
<div className="grid grid-cols-1 md:grid-cols-2 gap-4 items-stretch">
3744
{habits.length === 0 ? (
3845
<div className="col-span-2">
3946
<EmptyState
40-
icon={ListTodo}
41-
title="No habits yet"
42-
description="Create your first habit to start tracking your progress"
47+
icon={isTasksView ? TaskIcon : HabitIcon}
48+
title={isTasksView ? "No tasks yet" : "No habits yet"}
49+
description={isTasksView ? "Create your first task to start tracking your progress" : "Create your first habit to start tracking your progress"}
4350
/>
4451
</div>
4552
) : (
@@ -79,8 +86,8 @@ export default function HabitList() {
7986
}
8087
setDeleteConfirmation({ isOpen: false, habitId: null })
8188
}}
82-
title="Delete Habit"
83-
message="Are you sure you want to delete this habit? This action cannot be undone."
89+
title={isTasksView ? "Delete Task" : "Delete Habit"}
90+
message={isTasksView ? "Are you sure you want to delete this task? This action cannot be undone." : "Are you sure you want to delete this habit? This action cannot be undone."}
8491
confirmText="Delete"
8592
/>
8693
</div>

‎components/Header.tsx

+3-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
import { useState } from 'react'
44
import { useAtom } from 'jotai'
5-
import { coinsAtom, settingsAtom } from '@/lib/atoms'
5+
import { coinsAtom, settingsAtom, browserSettingsAtom } from '@/lib/atoms'
66
import { useCoins } from '@/hooks/useCoins'
77
import { FormattedNumber } from '@/components/FormattedNumber'
88
import { Bell, Menu, Settings, User, Info, Coins } from 'lucide-react'
@@ -29,6 +29,8 @@ export default function Header({ className }: HeaderProps) {
2929
const [showAbout, setShowAbout] = useState(false)
3030
const [settings] = useAtom(settingsAtom)
3131
const [coins] = useAtom(coinsAtom)
32+
const [browserSettings] = useAtom(browserSettingsAtom)
33+
const isTasksView = browserSettings.viewType === 'tasks'
3234
return (
3335
<>
3436
<header className={`border-b bg-white dark:bg-gray-800 shadow-sm ${className || ''}`}>

0 commit comments

Comments
 (0)