mirror of
https://github.com/MBombeck/HealthLog.git
synced 2026-11-16 07:13:29 +00:00
Merge remote-tracking branch 'origin/release/v1.42.0' into v142/qol-1
# Conflicts: # src/app/insights/mood/page.tsx # src/components/charts/mood-heatmap.tsx # src/components/documents/document-bulk-bar.tsx
This commit is contained in:
commit
17b8b35397
67 files changed
+3990
-1675
No files matched your search
@@ -203,6 +203,7 @@ export default function InsightsMoodPageClient() {
|
||||
chartKey="mood"
|
||||
compareBaseline={compareBaseline}
|
||||
onDataReady={markChartSettled}
|
||||
dayLinks
|
||||
/>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
@@ -1693,6 +1693,7 @@ export default function DashboardPageClient({
|
||||
compareBaseline={compareBaseline}
|
||||
userTimezone={user?.timezone}
|
||||
valueScale={unitDisplay.transformFor("WEIGHT").factor}
|
||||
dayLinks
|
||||
/>
|
||||
),
|
||||
});
|
||||
@@ -1746,6 +1747,7 @@ export default function DashboardPageClient({
|
||||
},
|
||||
]}
|
||||
compareBaseline={compareBaseline}
|
||||
dayLinks
|
||||
/>
|
||||
),
|
||||
});
|
||||
@@ -1772,6 +1774,7 @@ export default function DashboardPageClient({
|
||||
targetZones={bpTargetZones}
|
||||
compareBaseline={compareBaseline}
|
||||
userTimezone={user?.timezone}
|
||||
dayLinks
|
||||
/>
|
||||
),
|
||||
});
|
||||
@@ -1800,6 +1803,7 @@ export default function DashboardPageClient({
|
||||
valueBands={hasRestingHr ? pulseBands : undefined}
|
||||
compareBaseline={compareBaseline}
|
||||
userTimezone={user?.timezone}
|
||||
dayLinks
|
||||
/>
|
||||
),
|
||||
});
|
||||
@@ -1824,6 +1828,7 @@ export default function DashboardPageClient({
|
||||
valueBands={bodyFatBands}
|
||||
compareBaseline={compareBaseline}
|
||||
userTimezone={user?.timezone}
|
||||
dayLinks
|
||||
/>
|
||||
),
|
||||
});
|
||||
@@ -1840,6 +1845,7 @@ export default function DashboardPageClient({
|
||||
onDataReady={() => markChartReady("mood-chart")}
|
||||
compareBaseline={compareBaseline}
|
||||
chartKey="mood"
|
||||
dayLinks
|
||||
/>
|
||||
),
|
||||
});
|
||||
@@ -1861,6 +1867,7 @@ export default function DashboardPageClient({
|
||||
unit="h"
|
||||
compareBaseline={compareBaseline}
|
||||
userTimezone={user?.timezone}
|
||||
dayLinks
|
||||
/>
|
||||
),
|
||||
});
|
||||
@@ -1883,6 +1890,7 @@ export default function DashboardPageClient({
|
||||
colors={["var(--success)"]}
|
||||
compareBaseline={compareBaseline}
|
||||
userTimezone={user?.timezone}
|
||||
dayLinks
|
||||
/>
|
||||
),
|
||||
});
|
||||
@@ -1903,6 +1911,7 @@ export default function DashboardPageClient({
|
||||
onDataReady={() => markChartReady("medications")}
|
||||
compareBaseline={compareBaseline}
|
||||
userTimezone={user?.timezone}
|
||||
dayLinks
|
||||
/>
|
||||
),
|
||||
});
|
||||
|
||||
Reference in new issue
Block a user