ManInDark/HabitTrove
1
0
Fork 0
mirror of https://github.com/ManInDark/HabitTrove.git synced 2026-03-09 12:09:48 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix pomo (#42)

Browse Source
This commit is contained in:
Doh
2025-01-16 20:40:51 -05:00
committed by GitHub
parent 71b9d1b408
commit 41ae9df2a0
10 changed files with 176 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
components/PomodoroTimer.tsx
View File

@@ -158,7 +158,8 @@ export default function PomodoroTimer() {
const handleTimerEnd = async () => {
setState("stopped")
currentTimer.current = currentTimer.current.type === 'focus' ? PomoConfigs.break : PomoConfigs.focus
const currentTimerType = currentTimer.current.type
currentTimer.current = currentTimerType === 'focus' ? PomoConfigs.break : PomoConfigs.focus
setTimeLeft(currentTimer.current.duration)
setCurrentLabel(
currentTimer.current.labels[Math.floor(Math.random() * currentTimer.current.labels.length)]
@@ -167,13 +168,10 @@ export default function PomodoroTimer() {
// Play sound
playSound()
// update habits
if (selectedHabit) {
const ret = await completeHabit(selectedHabit)
if (ret) {
const updatedHabit = ret.updatedHabits.find(h => h.id === selectedHabit.id)
// The atom will automatically update with the new completions
}
// update habits only after focus sessions
if (selectedHabit && currentTimerType === 'focus') {
await completeHabit(selectedHabit)
// The atom will automatically update with the new completions
}
}
@@ -258,14 +256,13 @@ export default function PomodoroTimer() {
</div>
)}
<span>{currentTimer.current.type.charAt(0).toUpperCase() + currentTimer.current.type.slice(1)}: {currentLabel}</span>
{selectedHabit && (
{selectedHabit && selectedHabit.targetCompletions && selectedHabit.targetCompletions > 1 && (
<div className="flex justify-center gap-1 mt-2">
{(() => {
const total = selectedHabit.targetCompletions || 1
// Show up to 7 items, but no more than the target completions
const maxItems = Math.min(7, total)
const maxItems = Math.min(7, selectedHabit.targetCompletions)
// Calculate start position to center current completion
const start = Math.max(0, Math.min(todayCompletions - Math.floor(maxItems / 2), total - maxItems))
const start = Math.max(0, Math.min(todayCompletions - Math.floor(maxItems / 2), selectedHabit.targetCompletions - maxItems))
return Array.from({ length: maxItems }).map((_, i) => {
const cycle = start + i