diff --git a/resources/views/foods/delete.blade.php b/resources/views/foods/delete.blade.php index 9d7c26a..fde158a 100644 --- a/resources/views/foods/delete.blade.php +++ b/resources/views/foods/delete.blade.php @@ -1,9 +1,9 @@ Delete {{ $food->name }} -

+

Delete {{ $food->name }}? -

+
@method('delete') diff --git a/resources/views/foods/edit.blade.php b/resources/views/foods/edit.blade.php index 888f002..0062b67 100644 --- a/resources/views/foods/edit.blade.php +++ b/resources/views/foods/edit.blade.php @@ -2,7 +2,7 @@ {{ $title = ($food->exists ? "Edit {$food->name}" : 'Add Food') }} {{ $title }} -

{{ $title }}

+

{{ $title }}

@if ($food->exists)@method('put')@endif diff --git a/resources/views/foods/index.blade.php b/resources/views/foods/index.blade.php index 5da3d76..5963563 100644 --- a/resources/views/foods/index.blade.php +++ b/resources/views/foods/index.blade.php @@ -2,7 +2,7 @@ Foods
-

Foods

+

Foods

@@ -14,55 +14,55 @@
- -
-
-
Serving size
-
+ +

+
+

Serving size

+

-

-
-
Amount per serving
-
-
Calories
+

+ +

Amount per serving

+
+

Calories

-
+

-
-
Total Fat
+
+

Total Fat

-
+
-
-
Cholesterol
+
+

Cholesterol

-
+
-
-
Sodium
+
+

Sodium

-
+
-
-
Total Carbohydrate
+
+

Total Carbohydrate

-
+
-
-
Protein
+
+

Protein

-
+
-
+ diff --git a/resources/views/foods/show.blade.php b/resources/views/foods/show.blade.php index 6598735..9901a32 100644 --- a/resources/views/foods/show.blade.php +++ b/resources/views/foods/show.blade.php @@ -1,7 +1,7 @@ {{ $food->name }} -

+

{{ $food->name }}@if($food->detail), {{ $food->detail }}@endif @if($food->brand) @@ -21,55 +21,55 @@ -

+
-
-
-
Nutrition Facts
-
-
Serving size
+
+
+

Nutrition Facts

+
+

Serving size

{{ $food->servingSizeFormatted }} {{ $food->servingUnitFormatted ?? $food->name }} ({{ $food->serving_weight }}g)
-
-
Amount per serving
-
-
Calories
+ +

Amount per serving

+
+

Calories

{{ $food->calories }}
-
+

-
-
Total Fat
+
+

Total Fat

{{ $food->fat }}g
-
+
-
-
Cholesterol
+
+

Cholesterol

{{ $food->cholesterol }}mg
-
+
-
-
Sodium
+
+

Sodium

{{ $food->sodium }}mg
-
+
-
-
Total Carbohydrate
+
+

Total Carbohydrate

{{ $food->carbohydrates }}g
-
+
-
-
Protein
+
+

Protein

{{ $food->protein }}g
-
+
-
-
+ +
@if(!$food->tags->isEmpty()) -

Tags

+

Tags

@foreach ($food->tags as $tag) {{ $tag->name }} @@ -77,11 +77,11 @@
@endif @if($food->description) -

Description

-
{{ $food->description }}
+

Description

+

{{ $food->description }}

@endif @if(!$food->ingredientAmountRelationships->isEmpty()) -

Recipes

+

Recipes

-
+ +
diff --git a/resources/views/goals/delete.blade.php b/resources/views/goals/delete.blade.php index 1647d08..07bb70b 100644 --- a/resources/views/goals/delete.blade.php +++ b/resources/views/goals/delete.blade.php @@ -1,9 +1,9 @@ Delete Goal -

+

Delete {{ $goal->goal }} goal? -

+
@method('delete') diff --git a/resources/views/goals/edit.blade.php b/resources/views/goals/edit.blade.php index 8fc8018..0415e6b 100644 --- a/resources/views/goals/edit.blade.php +++ b/resources/views/goals/edit.blade.php @@ -2,7 +2,7 @@ {{ $title = ($goal->exists ? 'Edit' : 'Add') . ' Goal' }} {{ $title }} -

{{ $title }}

+

{{ $title }}

@if ($goal->exists)@method('put')@endif diff --git a/resources/views/goals/index.blade.php b/resources/views/goals/index.blade.php index 90537a2..f2e15f1 100644 --- a/resources/views/goals/index.blade.php +++ b/resources/views/goals/index.blade.php @@ -2,7 +2,7 @@ My Goals - {{ $date->format('D, j M Y') }}
-

+

My Goals
@@ -23,7 +23,7 @@
-

+ diff --git a/resources/views/goals/show.blade.php b/resources/views/goals/show.blade.php index 3605ff9..0e593e5 100644 --- a/resources/views/goals/show.blade.php +++ b/resources/views/goals/show.blade.php @@ -1,7 +1,7 @@ Goal -

+

{{ $goal->summary }} @@ -16,7 +16,7 @@ -

+
From
diff --git a/resources/views/journal-entries/create-from-nutrients.blade.php b/resources/views/journal-entries/create-from-nutrients.blade.php index 82d95b1..f32af89 100644 --- a/resources/views/journal-entries/create-from-nutrients.blade.php +++ b/resources/views/journal-entries/create-from-nutrients.blade.php @@ -2,7 +2,7 @@ Add Entry
-

Add Entry

+

Add Entry

Add by Recipes/Food diff --git a/resources/views/journal-entries/create.blade.php b/resources/views/journal-entries/create.blade.php index af31486..01c3b7a 100644 --- a/resources/views/journal-entries/create.blade.php +++ b/resources/views/journal-entries/create.blade.php @@ -2,7 +2,7 @@ Add Entries
-

Add Entries

+

Add Entries

Add by Nutrients diff --git a/resources/views/journal-entries/delete.blade.php b/resources/views/journal-entries/delete.blade.php index 3ef7108..aec7590 100644 --- a/resources/views/journal-entries/delete.blade.php +++ b/resources/views/journal-entries/delete.blade.php @@ -1,9 +1,9 @@ Delete Entry -

+

Delete {{ $entry->summary }}? -

+
@method('delete') diff --git a/resources/views/journal-entries/index.blade.php b/resources/views/journal-entries/index.blade.php index e5b5954..540913f 100644 --- a/resources/views/journal-entries/index.blade.php +++ b/resources/views/journal-entries/index.blade.php @@ -2,7 +2,7 @@ My Journal - {{ $date->format('D, j M Y') }}
-

+

My Journal
@@ -23,7 +23,7 @@
-

+ diff --git a/resources/views/recipes/delete.blade.php b/resources/views/recipes/delete.blade.php index de20ea7..4cb6d3d 100644 --- a/resources/views/recipes/delete.blade.php +++ b/resources/views/recipes/delete.blade.php @@ -1,9 +1,9 @@ Delete {{ $recipe->name }} -

+

Delete {{ $recipe->name }}? -

+ @method('delete') diff --git a/resources/views/recipes/edit.blade.php b/resources/views/recipes/edit.blade.php index 8607a48..f330ee8 100644 --- a/resources/views/recipes/edit.blade.php +++ b/resources/views/recipes/edit.blade.php @@ -2,7 +2,7 @@ {{ $title = ($recipe->exists ? "Edit {$recipe->name}" : 'Add Recipe') }} {{ $title }} -

{{ $title }}

+

{{ $title }}

@if ($recipe->exists)@method('put')@endif diff --git a/resources/views/recipes/index.blade.php b/resources/views/recipes/index.blade.php index cbf3f57..eb17b43 100644 --- a/resources/views/recipes/index.blade.php +++ b/resources/views/recipes/index.blade.php @@ -2,7 +2,7 @@ Recipes
-

Recipes

+

Recipes

@@ -14,51 +14,49 @@
- -
-
-
-
-
Serving weight
+ +

+
+

Serving weight

-
-
Amount per serving
-
-
Calories
+ +

Amount per serving

+
+

Calories

-
+

-
-
Total Fat
+
+

Total Fat

-
+
-
-
Cholesterol
+
+

Cholesterol

-
+
-
-
Sodium
+
+

Sodium

-
+
-
-
Total Carbohydrate
+
+

Total Carbohydrate

-
+
-
-
Protein
+
+

Protein

-
+
-
+ diff --git a/resources/views/recipes/show.blade.php b/resources/views/recipes/show.blade.php index e8e2995..b7f23e8 100644 --- a/resources/views/recipes/show.blade.php +++ b/resources/views/recipes/show.blade.php @@ -1,7 +1,7 @@ {{ $recipe->name }} -

+

{{ $recipe->name }} @@ -16,28 +16,28 @@ -

+
@if(!$recipe->tags->isEmpty())
-

Tags:

+

Tags:

{{ implode(', ', $recipe->tags->pluck('name')->all()) }}
@endif @if($recipe->description)
-

Description

+

Description

{{ $recipe->description }}

@endif
-

+

Ingredients [toggle nutrients] -

+
    @foreach($recipe->ingredientAmounts as $ia)
  • @@ -104,7 +104,7 @@
-

Steps

+

Steps

@foreach($recipe->steps as $step)

{{ $step->number }}

@@ -114,7 +114,7 @@
@if($recipe->source)