From a04be37acb5e7fa271d0c54dc0d867b87614aed2 Mon Sep 17 00:00:00 2001 From: "Christopher C. Wells" Date: Wed, 30 Dec 2020 08:30:14 -0800 Subject: [PATCH] Start Recipe controller (WIP) --- app/Http/Controllers/RecipeController.php | 7 +- .../views/components/form/textarea.blade.php | 4 + resources/views/ingredients/index.blade.php | 2 +- resources/views/layouts/app.blade.php | 4 + resources/views/layouts/navigation.blade.php | 32 ++++++- resources/views/recipes/create.blade.php | 84 +++++++++++++++++++ routes/web.php | 2 + 7 files changed, 127 insertions(+), 8 deletions(-) create mode 100644 resources/views/components/form/textarea.blade.php create mode 100644 resources/views/recipes/create.blade.php diff --git a/app/Http/Controllers/RecipeController.php b/app/Http/Controllers/RecipeController.php index 1e90ea2..592385f 100644 --- a/app/Http/Controllers/RecipeController.php +++ b/app/Http/Controllers/RecipeController.php @@ -3,6 +3,7 @@ namespace App\Http\Controllers; use App\Models\Recipe; +use Illuminate\Contracts\View\View; use Illuminate\Http\Request; class RecipeController extends Controller @@ -20,11 +21,11 @@ class RecipeController extends Controller /** * Show the form for creating a new resource. * - * @return \Illuminate\Http\Response + * @return \Illuminate\Contracts\View\View */ - public function create() + public function create(): View { - // + return view('recipes.create'); } /** diff --git a/resources/views/components/form/textarea.blade.php b/resources/views/components/form/textarea.blade.php new file mode 100644 index 0000000..c6f61d3 --- /dev/null +++ b/resources/views/components/form/textarea.blade.php @@ -0,0 +1,4 @@ +@props(['disabled' => false]) + + diff --git a/resources/views/ingredients/index.blade.php b/resources/views/ingredients/index.blade.php index 5d2edc3..03d8d0b 100644 --- a/resources/views/ingredients/index.blade.php +++ b/resources/views/ingredients/index.blade.php @@ -42,7 +42,7 @@
Carbohydrates
{{ $ingedient->carbohydrates < 1 ? $ingedient->carbohydrates * 1000 . "m" : $ingedient->carbohydrates }}g
Protein
-
{{$ingedient->protein}}g
+
{{ $ingedient->protein < 1 ? $ingedient->protein * 1000 . "m" : $ingedient->protein }}g
@endforeach diff --git a/resources/views/layouts/app.blade.php b/resources/views/layouts/app.blade.php index e7f54bc..30096c9 100644 --- a/resources/views/layouts/app.blade.php +++ b/resources/views/layouts/app.blade.php @@ -15,6 +15,8 @@ + + @isset($styles) {{ $styles }} @endisset
@@ -32,5 +34,7 @@ {{ $slot }}
+ + @isset($scripts) {{ $scripts }} @endisset diff --git a/resources/views/layouts/navigation.blade.php b/resources/views/layouts/navigation.blade.php index a19db08..23b9b33 100644 --- a/resources/views/layouts/navigation.blade.php +++ b/resources/views/layouts/navigation.blade.php @@ -17,6 +17,32 @@ + + +