From 41ae9df2a09c6c13172513fdc8cadb45e96c93bf Mon Sep 17 00:00:00 2001
From: Doh <mydohsimpson@gmail.com>
Date: Thu, 16 Jan 2025 20:40:51 -0500
Subject: [PATCH] fix pomo (#42)

---
 CHANGELOG.md                   |  11 ++++
 components/ChangelogModal.tsx  |   2 +-
 components/HabitItem.tsx       | 100 ++++++++++++++++++++++++---------
 components/HabitList.tsx       |   2 +-
 components/PomodoroTimer.tsx   |  21 +++----
 components/WishlistItem.tsx    | 100 ++++++++++++++++++++++++---------
 components/WishlistManager.tsx |   2 +-
 components/ui/button.tsx       |   3 +-
 package-lock.json              |   4 +-
 package.json                   |   2 +-
 10 files changed, 176 insertions(+), 71 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index ced7bd2..7fa0f04 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,16 @@
 # Changelog
 
+## Version 0.1.20
+
+### Changed
+
+- improved UI for habits and wishlist on mobile
+
+### Fixed
+
+- fix pomodoro break timer from triggering completions
+- don't show progress on pomodoro for single completion habit
+
 ## Version 0.1.19
 
 ### Added
diff --git a/components/ChangelogModal.tsx b/components/ChangelogModal.tsx
index 2ef3523..1988f3f 100644
--- a/components/ChangelogModal.tsx
+++ b/components/ChangelogModal.tsx
@@ -27,7 +27,7 @@ export default function ChangelogModal({ isOpen, onClose }: ChangelogModalProps)
     <Dialog open={isOpen} onOpenChange={onClose}>
       <DialogContent className="max-w-2xl max-h-[80vh] overflow-y-auto">
         <DialogHeader>
-          <DialogTitle>Changelog</DialogTitle>
+          <DialogTitle></DialogTitle>
         </DialogHeader>
         <div className="prose dark:prose-invert prose-sm max-w-none">
           <ReactMarkdown>{changelog}</ReactMarkdown>
diff --git a/components/HabitItem.tsx b/components/HabitItem.tsx
index 1ffa141..1edd8df 100644
--- a/components/HabitItem.tsx
+++ b/components/HabitItem.tsx
@@ -3,8 +3,16 @@ import { useAtom } from 'jotai'
 import { settingsAtom } from '@/lib/atoms'
 import { getTodayInTimezone, isSameDate, t2d, d2t, getNow, parseNaturalLanguageRRule, parseRRule } from '@/lib/utils'
 import { Card, CardContent, CardDescription, CardFooter, CardHeader, CardTitle } from '@/components/ui/card'
+import ReactMarkdown from 'react-markdown'
 import { Button } from '@/components/ui/button'
-import { Coins, Edit, Trash2, Check, Undo2 } from 'lucide-react'
+import { Coins, Edit, Trash2, Check, Undo2, MoreVertical } from 'lucide-react'
+import {
+  DropdownMenu,
+  DropdownMenuContent,
+  DropdownMenuItem,
+  DropdownMenuSeparator,
+  DropdownMenuTrigger,
+} from '@/components/ui/dropdown-menu'
 import { useEffect, useState } from 'react'
 import { useHabits } from '@/hooks/useHabits'
 import { RRule } from 'rrule'
@@ -49,30 +57,24 @@ export default function HabitItem({ habit, onEdit, onDelete }: HabitItemProps) {
   return (
     <Card
       id={`habit-${habit.id}`}
-      className={`transition-all duration-500 ${isHighlighted ? 'bg-yellow-100 dark:bg-yellow-900' : ''}`}
+      className={`h-full flex flex-col transition-all duration-500 ${isHighlighted ? 'bg-yellow-100 dark:bg-yellow-900' : ''}`}
     >
-      <CardHeader>
-        <CardTitle>{habit.name}</CardTitle>
-        <CardDescription>{habit.description}</CardDescription>
+      <CardHeader className="flex-none">
+        <CardTitle className="line-clamp-1">{habit.name}</CardTitle>
+        {habit.description && (
+          <CardDescription className="whitespace-pre-line">
+            {habit.description}
+          </CardDescription>
+        )}
       </CardHeader>
-      <CardContent>
+      <CardContent className="flex-1">
         <p className="text-sm text-gray-500">Frequency: {parseRRule(habit.frequency || INITIAL_RECURRENCE_RULE).toText()}</p>
         <div className="flex items-center mt-2">
           <Coins className="h-4 w-4 text-yellow-400 mr-1" />
           <span className="text-sm font-medium">{habit.coinReward} coins per completion</span>
         </div>
       </CardContent>
-      <CardFooter className="flex justify-between">
-        <div>
-          <Button variant="outline" size="sm" onClick={onEdit} className="mr-2">
-            <Edit className="h-4 w-4 mr-2" />
-            Edit
-          </Button>
-          <Button variant="destructive" size="sm" onClick={onDelete}>
-            <Trash2 className="h-4 w-4 mr-2" />
-            Delete
-          </Button>
-        </div>
+      <CardFooter className="flex justify-between gap-2">
         <div className="flex gap-2">
           <div className="relative">
             <Button
@@ -80,14 +82,28 @@ export default function HabitItem({ habit, onEdit, onDelete }: HabitItemProps) {
               size="sm"
               onClick={async () => await completeHabit(habit)}
               disabled={isCompletedToday && completionsToday >= target}
-              className="overflow-hidden"
+              className="overflow-hidden w-24 sm:w-auto"
             >
-              <Check className="h-4 w-4 mr-2" />
-              {isCompletedToday ? (
-                target > 1 ? `Completed (${completionsToday}/${target})` : 'Completed'
-              ) : (
-                target > 1 ? `Complete (${completionsToday}/${target})` : 'Complete'
-              )}
+              <Check className="h-4 w-4 sm:mr-2" />
+              <span>
+                {isCompletedToday ? (
+                  target > 1 ? (
+                    <>
+                      <span className="sm:hidden">{completionsToday}/{target}</span>
+                      <span className="hidden sm:inline">Completed ({completionsToday}/{target})</span>
+                    </>
+                  ) : (
+                    'Completed'
+                  )
+                ) : (
+                  target > 1 ? (
+                    <>
+                      <span className="sm:hidden">{completionsToday}/{target}</span>
+                      <span className="hidden sm:inline">Complete ({completionsToday}/{target})</span>
+                    </>
+                  ) : 'Complete'
+                )}
+              </span>
               {habit.targetCompletions && habit.targetCompletions > 1 && (
                 <div
                   className="absolute bottom-0 left-0 h-1 bg-white/50"
@@ -103,11 +119,45 @@ export default function HabitItem({ habit, onEdit, onDelete }: HabitItemProps) {
               variant="outline"
               size="sm"
               onClick={async () => await undoComplete(habit)}
+              className="w-10 sm:w-auto"
             >
-              <Undo2 />
+              <Undo2 className="h-4 w-4" />
+              <span className="hidden sm:inline ml-2">Undo</span>
             </Button>
           )}
         </div>
+        <div className="flex gap-2">
+          <Button
+            variant="edit"
+            size="sm"
+            onClick={onEdit}
+            className="hidden sm:flex"
+          >
+            <Edit className="h-4 w-4" />
+            <span className="ml-2">Edit</span>
+          </Button>
+          <DropdownMenu>
+            <DropdownMenuTrigger asChild>
+              <Button variant="ghost" size="sm" className="h-8 w-8 p-0">
+                <MoreVertical className="h-4 w-4" />
+              </Button>
+            </DropdownMenuTrigger>
+            <DropdownMenuContent align="end">
+              <DropdownMenuItem onClick={onEdit} className="sm:hidden">
+                <Edit className="mr-2 h-4 w-4" />
+                Edit
+              </DropdownMenuItem>
+              <DropdownMenuSeparator className="sm:hidden" />
+              <DropdownMenuItem
+                className="text-red-600 focus:text-red-600 dark:text-red-400 dark:focus:text-red-400 cursor-pointer"
+                onClick={onDelete}
+              >
+                <Trash2 className="mr-2 h-4 w-4" />
+                Delete
+              </DropdownMenuItem>
+            </DropdownMenuContent>
+          </DropdownMenu>
+        </div>
       </CardFooter>
     </Card>
   )
diff --git a/components/HabitList.tsx b/components/HabitList.tsx
index abb583f..9bbfb4c 100644
--- a/components/HabitList.tsx
+++ b/components/HabitList.tsx
@@ -33,7 +33,7 @@ export default function HabitList() {
           <Plus className="mr-2 h-4 w-4" /> Add Habit
         </Button>
       </div>
-      <div className="grid grid-cols-1 md:grid-cols-2 gap-4">
+      <div className="grid grid-cols-1 md:grid-cols-2 gap-4 items-stretch">
         {habits.length === 0 ? (
           <div className="col-span-2">
             <EmptyState
diff --git a/components/PomodoroTimer.tsx b/components/PomodoroTimer.tsx
index 7bffdc3..aa4bceb 100644
--- a/components/PomodoroTimer.tsx
+++ b/components/PomodoroTimer.tsx
@@ -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
diff --git a/components/WishlistItem.tsx b/components/WishlistItem.tsx
index e68e2c4..46bf06c 100644
--- a/components/WishlistItem.tsx
+++ b/components/WishlistItem.tsx
@@ -1,7 +1,15 @@
 import { WishlistItemType } from '@/lib/types'
 import { Card, CardContent, CardDescription, CardFooter, CardHeader, CardTitle } from '@/components/ui/card'
+import ReactMarkdown from 'react-markdown'
 import { Button } from '@/components/ui/button'
-import { Coins, Edit, Trash2, Gift } from 'lucide-react'
+import { Coins, Edit, Trash2, Gift, MoreVertical } from 'lucide-react'
+import {
+  DropdownMenu,
+  DropdownMenuContent,
+  DropdownMenuItem,
+  DropdownMenuSeparator,
+  DropdownMenuTrigger,
+} from '@/components/ui/dropdown-menu'
 
 interface WishlistItemProps {
   item: WishlistItemType
@@ -25,43 +33,81 @@ export default function WishlistItem({
   return (
     <Card
       id={`wishlist-${item.id}`}
-      className={`transition-all duration-500 ${isHighlighted ? 'bg-yellow-100 dark:bg-yellow-900' : ''
+      className={`h-full flex flex-col transition-all duration-500 ${isHighlighted ? 'bg-yellow-100 dark:bg-yellow-900' : ''
         } ${isRecentlyRedeemed ? 'animate-[celebrate_1s_ease-in-out] shadow-lg ring-2 ring-primary' : ''
         }`}
     >
-      <CardHeader>
-        <CardTitle>{item.name}</CardTitle>
-        <CardDescription>{item.description}</CardDescription>
+      <CardHeader className="flex-none">
+        <CardTitle className="line-clamp-1">{item.name}</CardTitle>
+        {item.description && (
+          <CardDescription className="whitespace-pre-line">
+            {item.description}
+          </CardDescription>
+        )}
       </CardHeader>
-      <CardContent>
+      <CardContent className="flex-1">
         <div className="flex items-center">
           <Coins className="h-4 w-4 text-yellow-400 mr-1" />
           <span className="text-sm font-medium">{item.coinCost} coins</span>
         </div>
       </CardContent>
-      <CardFooter className="flex justify-between">
-        <div>
-          <Button variant="outline" size="sm" onClick={onEdit} className="mr-2">
-            <Edit className="h-4 w-4 mr-2" />
-            Edit
-          </Button>
-          <Button variant="destructive" size="sm" onClick={onDelete}>
-            <Trash2 className="h-4 w-4 mr-2" />
-            Delete
+      <CardFooter className="flex justify-between gap-2">
+        <div className="flex gap-2">
+          <Button
+            variant={canRedeem ? "default" : "secondary"}
+            size="sm"
+            onClick={onRedeem}
+            disabled={!canRedeem}
+            className={`transition-all duration-300 w-24 sm:w-auto ${isRecentlyRedeemed ? 'bg-green-500 hover:bg-green-600' : ''}`}
+          >
+            <Gift className={`h-4 w-4 sm:mr-2 ${isRecentlyRedeemed ? 'animate-spin' : ''}`} />
+            <span>
+              {isRecentlyRedeemed ? (
+                <>
+                  <span className="sm:hidden">Done</span>
+                  <span className="hidden sm:inline">Redeemed!</span>
+                </>
+              ) : (
+                <>
+                  <span className="sm:hidden">Redeem</span>
+                  <span className="hidden sm:inline">Redeem</span>
+                </>
+              )}
+            </span>
           </Button>
         </div>
-        <Button
-          variant={canRedeem ? "default" : "secondary"}
-          size="sm"
-          onClick={onRedeem}
-          disabled={!canRedeem}
-          className={`transition-all duration-300 ${isRecentlyRedeemed ? 'bg-green-500 hover:bg-green-600' : ''
-            }`}
-        >
-          <Gift className={`h-4 w-4 mr-2 ${isRecentlyRedeemed ? 'animate-spin' : ''
-            }`} />
-          {isRecentlyRedeemed ? 'Redeemed!' : 'Redeem'}
-        </Button>
+        <div className="flex gap-2">
+          <Button
+            variant="edit"
+            size="sm"
+            onClick={onEdit}
+            className="hidden sm:flex"
+          >
+            <Edit className="h-4 w-4" />
+            <span className="ml-2">Edit</span>
+          </Button>
+          <DropdownMenu>
+            <DropdownMenuTrigger asChild>
+              <Button variant="ghost" size="sm" className="h-8 w-8 p-0">
+                <MoreVertical className="h-4 w-4" />
+              </Button>
+            </DropdownMenuTrigger>
+            <DropdownMenuContent align="end">
+              <DropdownMenuItem onClick={onEdit} className="sm:hidden">
+                <Edit className="mr-2 h-4 w-4" />
+                Edit
+              </DropdownMenuItem>
+              <DropdownMenuSeparator className="sm:hidden" />
+              <DropdownMenuItem
+                className="text-red-600 focus:text-red-600 dark:text-red-400 dark:focus:text-red-400 cursor-pointer"
+                onClick={onDelete}
+              >
+                <Trash2 className="mr-2 h-4 w-4" />
+                Delete
+              </DropdownMenuItem>
+            </DropdownMenuContent>
+          </DropdownMenu>
+        </div>
       </CardFooter>
     </Card>
   )
diff --git a/components/WishlistManager.tsx b/components/WishlistManager.tsx
index 9f8d56f..924be67 100644
--- a/components/WishlistManager.tsx
+++ b/components/WishlistManager.tsx
@@ -68,7 +68,7 @@ export default function WishlistManager() {
           <Plus className="mr-2 h-4 w-4" /> Add Reward
         </Button>
       </div>
-      <div className="grid grid-cols-1 md:grid-cols-2 gap-4">
+      <div className="grid grid-cols-1 md:grid-cols-2 gap-4 items-stretch">
         {wishlistItems.length === 0 ? (
           <div className="col-span-2">
             <EmptyState
diff --git a/components/ui/button.tsx b/components/ui/button.tsx
index 65d4fcd..feb466b 100644
--- a/components/ui/button.tsx
+++ b/components/ui/button.tsx
@@ -19,6 +19,7 @@ const buttonVariants = cva(
           "bg-secondary text-secondary-foreground shadow-sm hover:bg-secondary/80",
         ghost: "hover:bg-accent hover:text-accent-foreground",
         link: "text-primary underline-offset-4 hover:underline",
+        edit: "bg-white text-blue-600 hover:bg-gray-50 dark:bg-gray-800 dark:text-blue-400 dark:hover:bg-gray-700 border border-slate-200 dark:border-blue-800",
       },
       size: {
         default: "h-9 px-4 py-2",
@@ -36,7 +37,7 @@ const buttonVariants = cva(
 
 export interface ButtonProps
   extends React.ButtonHTMLAttributes<HTMLButtonElement>,
-    VariantProps<typeof buttonVariants> {
+  VariantProps<typeof buttonVariants> {
   asChild?: boolean
 }
 
diff --git a/package-lock.json b/package-lock.json
index 330ccf9..e68e694 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "habittrove",
-  "version": "0.1.18",
+  "version": "0.1.19",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "habittrove",
-      "version": "0.1.18",
+      "version": "0.1.19",
       "dependencies": {
         "@emoji-mart/data": "^1.2.1",
         "@emoji-mart/react": "^1.1.1",
diff --git a/package.json b/package.json
index 446391d..c17ccc4 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "habittrove",
-  "version": "0.1.19",
+  "version": "0.1.20",
   "private": true,
   "scripts": {
     "dev": "next dev --turbopack",