Skip to content

Commit ef1e480

Browse files
committed
minor fixes
1 parent 6109c06 commit ef1e480

File tree

3 files changed

+14
-17
lines changed

3 files changed

+14
-17
lines changed

src/lib/components/Habit/HabitSummaryComponent.svelte

Lines changed: 10 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -7,24 +7,22 @@
77
const thirtyDaysAgo = dayjs().subtract(30, 'days');
88
</script>
99

10-
{#snippet summaryDateLabel(date: dayjs.Dayjs, spanDays: number)}
11-
<div class="col-span-{spanDays}">
12-
<div>{date.format('DD')}</div>
13-
<div>{date.format(' MMM')}</div>
14-
</div>
10+
{#snippet summaryDateLabel(date: dayjs.Dayjs)}
11+
<div>{date.format('DD')}</div>
12+
<div>{date.format(' MMM')}</div>
1513
{/snippet}
1614

1715
<div class="flex flex-shrink">
1816
<div class="overflow-hidden rounded-lg bg-base-200 p-4">
1917
<div class="relative grid items-center gap-1 overflow-x-scroll pb-4 text-[0.5rem]">
2018
<div class="col-span-1"></div>
21-
{@render summaryDateLabel(thirtyDaysAgo.add(1, 'day'), 5)}
22-
{@render summaryDateLabel(thirtyDaysAgo.add(6, 'day'), 5)}
23-
{@render summaryDateLabel(thirtyDaysAgo.add(11, 'day'), 5)}
24-
{@render summaryDateLabel(thirtyDaysAgo.add(16, 'day'), 5)}
25-
{@render summaryDateLabel(thirtyDaysAgo.add(21, 'day'), 5)}
26-
{@render summaryDateLabel(thirtyDaysAgo.add(26, 'day'), 4)}
27-
{@render summaryDateLabel(thirtyDaysAgo.add(30, 'day'), 1)}
19+
<div class="col-span-5">{@render summaryDateLabel(thirtyDaysAgo.add(1, 'day'))}</div>
20+
<div class="col-span-5">{@render summaryDateLabel(thirtyDaysAgo.add(6, 'day'))}</div>
21+
<div class="col-span-5">{@render summaryDateLabel(thirtyDaysAgo.add(11, 'day'))}</div>
22+
<div class="col-span-5">{@render summaryDateLabel(thirtyDaysAgo.add(16, 'day'))}</div>
23+
<div class="col-span-5">{@render summaryDateLabel(thirtyDaysAgo.add(21, 'day'))}</div>
24+
<div class="col-span-4">{@render summaryDateLabel(thirtyDaysAgo.add(26, 'day'))}</div>
25+
<div class="col-span-1">{@render summaryDateLabel(thirtyDaysAgo.add(30, 'day'))}</div>
2826

2927
{#each summary as summaryItem}
3028
<a class="link-hover link link-primary sticky left-0 mr-2 text-sm" href="/{summaryItem.id}"

src/routes/(app)/+layout.svelte

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,12 @@
1010
<div class="container mx-auto px-3 py-8">
1111
<div class="mb-7 flex flex-row items-center justify-between">
1212
<span class="text-4xl font-bold text-primary">Habit<span class="text-accent">Kit</span></span>
13-
<div class="flex flex-col">
13+
<div class="text-right">
1414
<span class="text-xs">
15-
Logged in as <span class="text-accent">{data.user?.username ?? 'UNDEFINED'}</span>
15+
Logged in as <span class="text-primary">{data.user?.username ?? 'UNDEFINED'}</span>
1616
</span>
1717
<form method="post" action="?/logout" use:enhance>
18-
<button class="text-md btn btn-link btn-accent btn-xs px-0">Sign out</button>
18+
<button class="text-md btn btn-link link-accent btn-xs px-0">Sign out</button>
1919
</form>
2020
</div>
2121
</div>

src/routes/(app)/+page.svelte

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,11 @@
1313
</div>
1414

1515
<div class="my-6">
16-
<h3 class="mb-3 text-xl">Last 30 Days</h3>
16+
<h3 class="mb-2 text-xl">Last 30 Days</h3>
1717
<LastXDays summary={data.summary} />
1818
</div>
1919

2020
<div class="my-6">
21-
<h3 class="mb-3 text-xl">Overview</h3>
2221
<div class="flex flex-row flex-wrap justify-start gap-6">
2322
{#each data.habits as habit}
2423
<HabitOverviewItem {habit} />

0 commit comments

Comments
 (0)