RecentRunner/HaBit
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch staging into mason

Browse Source 
Resolve habit-tracker conflict by keeping the daily tasks countdown header and adopting check-in terminology from staging.

Co-authored-by: Cursor <cursoragent@cursor.com>
This commit is contained in:
masongga
2026-05-24 10:24:27 -06:00
parent 003ee3851e 93af01dec1
commit f94fd49894
22 changed files with 732 additions and 110 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
components/habits/habit-tracker.tsx
View File

@@ -81,7 +81,7 @@ function DailyTaskList({
if (tasks.length === 0) {
return (
<p className="text-sm text-muted-foreground">
No daily tasks yet. Complete your daily quiz or update your profile so
No daily tasks yet. Complete your daily check-in or update your profile so
AI can suggest habits for you.
</p>
);
@@ -450,7 +450,7 @@ export function HabitTracker({ mode = "daily" }: HabitTrackerProps) {
<Card>
<DailyTasksCardHeader
description={`Personalized from your focus topics${
quizCompletedToday ? ", today's quiz," : ""
quizCompletedToday ? ", today's check-in," : ""
} and custom habits.`}
onDayChange={refresh}
/>
@@ -508,17 +508,17 @@ export function HabitTracker({ mode = "daily" }: HabitTrackerProps) {
<CardTitle className="text-base">How daily tasks are picked</CardTitle>
<CardDescription>
Your tasks combine focus preferences, custom habits, and today&apos;s
quiz.
check-in.
</CardDescription>
</CardHeader>
<CardContent className="space-y-3 text-sm text-muted-foreground">
<p>Focus topics: {focusTopic ?? "None selected"}</p>
<p>
Daily quiz today:{" "}
Daily check-in today:{" "}
{quizCompletedToday ? "Completed" : "Not completed yet"}
</p>
<p>
Suggested habits can appear when your quiz shows low energy, high
Suggested habits can appear when your check-in shows low energy, high
stress, or poor sleep.
</p>
</CardContent>
@@ -571,7 +571,7 @@ export function HabitTracker({ mode = "daily" }: HabitTrackerProps) {
<CardTitle className="text-base">How daily tasks are picked</CardTitle>
<CardDescription>
Your tasks combine custom habits and AI suggestions based on your
profile, onboarding, daily quiz, and journal.
profile, onboarding, daily check-in, and journal.
</CardDescription>
</CardHeader>
<CardContent className="space-y-3 text-sm text-muted-foreground">
@@ -580,7 +580,7 @@ export function HabitTracker({ mode = "daily" }: HabitTrackerProps) {
{focusTopic ?? "None selected"}
</p>
<p>
Daily quiz today:{" "}
Daily check-in today:{" "}
{quizCompletedToday ? "Completed" : "Not completed yet"}
</p>
<p>
@@ -596,7 +596,7 @@ export function HabitTracker({ mode = "daily" }: HabitTrackerProps) {
return (
<Card>
<DailyTasksCardHeader
description="Personalized from your profile, daily quiz, journal, and custom habits."
description="Personalized from your profile, daily check-in, journal, and custom habits."
onDayChange={refresh}
/>
<CardContent className="space-y-4">