diff --git a/src/lib/components/DayEditor/Bucket.svelte b/src/lib/components/DayEditor/Bucket.svelte index 9ce5d7e..8135a0c 100644 --- a/src/lib/components/DayEditor/Bucket.svelte +++ b/src/lib/components/DayEditor/Bucket.svelte @@ -5,6 +5,7 @@ import ItemDrawer from '$lib/views/ItemDrawer/ItemDrawer.svelte' import { createEventDispatcher } from 'svelte' import Expandable from '../Expandable.svelte' + import { calculateProteinFromItems } from '$lib/protein' const dispatch = createEventDispatcher() export let label: string @@ -35,13 +36,14 @@ {label}
{#if items.length} - - {items.length} Item{items.length !== 1 ? 's' : ''} - {kcalDisplay(calculateKcalFromItems(items))} kcal + + {kcalDisplay(calculateProteinFromItems(items))} + protein + {:else}
- {kcalLabel} kcal + {kcalDisplay(calculateKcal(item))} kcal + + + {kcalDisplay(calculateProtein(item))} protein
diff --git a/src/lib/components/KcalLimitBar.svelte b/src/lib/components/KcalLimitBar.svelte index 20af86c..9590bcc 100644 --- a/src/lib/components/KcalLimitBar.svelte +++ b/src/lib/components/KcalLimitBar.svelte @@ -1,24 +1,17 @@ -
diff --git a/src/lib/components/WeekSwitcher.svelte b/src/lib/components/WeekSwitcher.svelte index 7f2e4bf..4c4cb48 100644 --- a/src/lib/components/WeekSwitcher.svelte +++ b/src/lib/components/WeekSwitcher.svelte @@ -1,9 +1,8 @@ { editItem = null - showQuickSnacks = false }} triggerProps={{ 'class': `margin-left-auto ${selector ? 'btn text' : ''}`, diff --git a/src/lib/views/UnifiedView.svelte b/src/lib/views/UnifiedView.svelte index 2909971..519440c 100644 --- a/src/lib/views/UnifiedView.svelte +++ b/src/lib/views/UnifiedView.svelte @@ -59,7 +59,7 @@ {kcalDisplay(kcalInDay)} kcal
- +
{:else} diff --git a/src/routes/+error.svelte b/src/routes/+error.svelte index 720ffdf..fe0bc91 100644 --- a/src/routes/+error.svelte +++ b/src/routes/+error.svelte @@ -16,14 +16,14 @@

Maybe try reloading or logging in.

{:else}

Maybe try reloading or going home.

diff --git a/src/routes/+layout.svelte b/src/routes/+layout.svelte index e73cf94..296ac69 100644 --- a/src/routes/+layout.svelte +++ b/src/routes/+layout.svelte @@ -59,7 +59,7 @@ {/if} {#if $user} - + {#if $user.photoURL && !imgError}

Made possible thanks to:


{#await userSettings.load()} - Kcal Day Limit / Warning + Kcal Goal + Protein Goal {:then} - Kcal Day Limit / Warning + Kcal Goal + + + Protein Goal {/await} - Kalo­ri­en­be­darfs­rechner von TK + Kalorienbedarfsrechner von TK