diff --git a/app/Http/Controllers/RecipeController.php b/app/Http/Controllers/RecipeController.php index 88ea1fe..99dc368 100644 --- a/app/Http/Controllers/RecipeController.php +++ b/app/Http/Controllers/RecipeController.php @@ -12,18 +12,28 @@ class RecipeController extends Controller { public function index() { - $recipes = Recipe::with('user')->with('categories')->get(); + $recipes = Recipe::with('user')->get(); $categories=array_values(RecipeCategory::get()->sortby('name')->pluck('name')->unique()->toArray()); return view('recipes.index')->with('recipes', $recipes)->with('categories',$categories); } + public function show($id) { - $recipe=Recipe::with('user')->with('ingredients')->findOrFail($id); + $recipe=Recipe::with('user')->findOrFail($id); return view('recipes.show')->with('recipe', $recipe); } + public function edit($id){ - $recipe=Recipe::with('user')->with('ingredients')->findOrFail($id); - $ingredients=RecipeIngredient::get()->sortby('name')->pluck('name')->unique(); - return $ingredients; + $recipe=Recipe::with('user')->findOrFail($id); + $lists['ingredients']=array_values(RecipeIngredient::get()->sortby('name')->pluck('name')->unique()->toArray()); + $lists['measurements']=array_values(RecipeIngredient::get()->sortby('measurement')->pluck('measurement')->unique()->toArray()); + $lists['categories']=array_values(RecipeCategory::get()->sortby('name')->pluck('name')->unique()->toArray()); + $lists['authors']=array_values(Recipe::get()->sortby('author')->pluck('author')->unique()->toArray()); + $lists['owners']=array_values(User::get()->sortby('name')->pluck('name')->unique()->toArray()); + return view('recipes.edit')->with('recipe', $recipe)->with('lists',$lists); + } + + public function update(Request $request, $id) + { } } diff --git a/app/Recipe.php b/app/Recipe.php index f3bc920..f95ac71 100644 --- a/app/Recipe.php +++ b/app/Recipe.php @@ -8,7 +8,7 @@ use Carbon\Carbon; class Recipe extends Model { - protected $fillable = ['name','maintainer','author','servings','date_entered','date_modified','instructions']; + protected $fillable = ['name','maintainer','author','servings','date_entered','date_modified','description','instructions']; protected $dates = ['date_entered','date_modified']; public function setDateEnteredAttribute($value){ diff --git a/database/migrations/2022_02_08_001417_create_recipes_table.php b/database/migrations/2022_02_08_001417_create_recipes_table.php index 3fc5d35..2b8c0b1 100644 --- a/database/migrations/2022_02_08_001417_create_recipes_table.php +++ b/database/migrations/2022_02_08_001417_create_recipes_table.php @@ -22,6 +22,7 @@ class CreateRecipesTable extends Migration $table->string('serving_size'); $table->datetime('date_entered'); $table->datetime('date_modified'); + $table->longtext('description'); $table->longtext('instructions'); $table->timestamps(); diff --git a/database/seeders/RecipeSeeder.php b/database/seeders/RecipeSeeder.php index 459f2a0..c5fff10 100644 --- a/database/seeders/RecipeSeeder.php +++ b/database/seeders/RecipeSeeder.php @@ -19,7 +19,7 @@ class RecipeSeeder extends Seeder { $first_user = User::orderBy('id')->first(); - $recipe=Recipe::updateOrCreate(['name'=>'Test','user_id'=>$first_user['id'],'author'=>'Jayne','servings'=>1,'serving_size'=>'1 cup','date_entered'=>now(),'date_modified'=>now(),'instructions'=>'These are instructions']); + $recipe=Recipe::updateOrCreate(['name'=>'Test','user_id'=>$first_user['id'],'author'=>'Jayne','servings'=>1,'serving_size'=>'1 cup','date_entered'=>now(),'date_modified'=>now(),'description'=>'Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Varius quam quisque id diam vel.','instructions'=>'

Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Sit amet volutpat consequat mauris. Diam phasellus vestibulum lorem sed risus ultricies tristique nulla. Dignissim diam quis enim lobortis scelerisque fermentum dui faucibus. Rutrum quisque non tellus orci ac auctor augue mauris. Id venenatis a condimentum vitae sapien. A iaculis at erat pellentesque adipiscing commodo elit at imperdiet. Sed libero enim sed faucibus turpis. Commodo viverra maecenas accumsan lacus vel facilisis volutpat est velit. Quam elementum pulvinar etiam non quam lacus suspendisse faucibus interdum. Volutpat odio facilisis mauris sit amet massa vitae tortor. Morbi enim nunc faucibus a pellentesque. Hendrerit gravida rutrum quisque non tellus orci ac auctor. Amet est placerat in egestas erat imperdiet. Eget nunc scelerisque viverra mauris in aliquam sem fringilla. Massa enim nec dui nunc mattis enim ut.

Ultricies tristique nulla aliquet enim tortor at auctor urna. A arcu cursus vitae congue mauris rhoncus aenean vel. Vel facilisis volutpat est velit egestas. Sed viverra ipsum nunc aliquet bibendum enim facilisis gravida. Dolor sit amet consectetur adipiscing elit duis. Non pulvinar neque laoreet suspendisse interdum consectetur libero id. Aenean et tortor at risus viverra adipiscing at. Morbi leo urna molestie at elementum eu facilisis sed odio. Non enim praesent elementum facilisis leo vel fringilla est. Ultrices dui sapien eget mi proin sed libero enim. Fames ac turpis egestas sed tempus urna. Id cursus metus aliquam eleifend.

']); RecipeIngredient::updateOrCreate(['recipe_id'=>$recipe['id'],'order'=>0,'alternative'=>false,'name'=>'hamburger','quantity'=>1.0,'measurement'=>'lb','special_notes'=>'']); RecipeIngredient::updateOrCreate(['recipe_id'=>$recipe['id'],'order'=>0,'alternative'=>true,'name'=>'sausage','quantity'=>1.0,'measurement'=>'lb','special_notes'=>'']); RecipeIngredient::updateOrCreate(['recipe_id'=>$recipe['id'],'order'=>0,'alternative'=>false,'name'=>'carrot','quantity'=>1.0,'measurement'=>'lb','special_notes'=>'']); @@ -28,7 +28,7 @@ class RecipeSeeder extends Seeder - $recipe=Recipe::updateOrCreate(['name'=>'Test2','user_id'=>$first_user['id'],'author'=>'Karen','servings'=>1,'serving_size'=>'1 cup','date_entered'=>now(),'date_modified'=>now(),'instructions'=>'These are instructions']); + $recipe=Recipe::updateOrCreate(['name'=>'Test2','user_id'=>$first_user['id'],'author'=>'Karen','servings'=>1,'serving_size'=>'1 cup','date_entered'=>now(),'date_modified'=>now(),'description'=>'Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Varius quam quisque id diam vel.','instructions'=>'

Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Sit amet volutpat consequat mauris. Diam phasellus vestibulum lorem sed risus ultricies tristique nulla. Dignissim diam quis enim lobortis scelerisque fermentum dui faucibus. Rutrum quisque non tellus orci ac auctor augue mauris. Id venenatis a condimentum vitae sapien. A iaculis at erat pellentesque adipiscing commodo elit at imperdiet. Sed libero enim sed faucibus turpis. Commodo viverra maecenas accumsan lacus vel facilisis volutpat est velit. Quam elementum pulvinar etiam non quam lacus suspendisse faucibus interdum. Volutpat odio facilisis mauris sit amet massa vitae tortor. Morbi enim nunc faucibus a pellentesque. Hendrerit gravida rutrum quisque non tellus orci ac auctor. Amet est placerat in egestas erat imperdiet. Eget nunc scelerisque viverra mauris in aliquam sem fringilla. Massa enim nec dui nunc mattis enim ut.

Ultricies tristique nulla aliquet enim tortor at auctor urna. A arcu cursus vitae congue mauris rhoncus aenean vel. Vel facilisis volutpat est velit egestas. Sed viverra ipsum nunc aliquet bibendum enim facilisis gravida. Dolor sit amet consectetur adipiscing elit duis. Non pulvinar neque laoreet suspendisse interdum consectetur libero id. Aenean et tortor at risus viverra adipiscing at. Morbi leo urna molestie at elementum eu facilisis sed odio. Non enim praesent elementum facilisis leo vel fringilla est. Ultrices dui sapien eget mi proin sed libero enim. Fames ac turpis egestas sed tempus urna. Id cursus metus aliquam eleifend.

']); RecipeIngredient::updateOrCreate(['recipe_id'=>$recipe['id'],'order'=>0,'alternative'=>false,'name'=>'chicken','quantity'=>1.0,'measurement'=>'lb','special_notes'=>'']); RecipeIngredient::updateOrCreate(['recipe_id'=>$recipe['id'],'order'=>0,'alternative'=>false,'name'=>'carrot','quantity'=>1.0,'measurement'=>'lb','special_notes'=>'']); @@ -39,7 +39,7 @@ class RecipeSeeder extends Seeder RecipeCategory::updateOrCreate(['recipe_id'=>$recipe['id'],'name'=>'mexican']); - $recipe=Recipe::updateOrCreate(['name'=>'Test3','user_id'=>$jayne['id'],'author'=>'Jayne','servings'=>1,'serving_size'=>'1 cup','date_entered'=>now(),'date_modified'=>now(),'instructions'=>'These are instructions']); + $recipe=Recipe::updateOrCreate(['name'=>'Test3','user_id'=>$jayne['id'],'author'=>'Jayne','servings'=>1,'serving_size'=>'1 cup','date_entered'=>now(),'date_modified'=>now(),'description'=>'Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Varius quam quisque id diam vel.','instructions'=>'

Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Sit amet volutpat consequat mauris. Diam phasellus vestibulum lorem sed risus ultricies tristique nulla. Dignissim diam quis enim lobortis scelerisque fermentum dui faucibus. Rutrum quisque non tellus orci ac auctor augue mauris. Id venenatis a condimentum vitae sapien. A iaculis at erat pellentesque adipiscing commodo elit at imperdiet. Sed libero enim sed faucibus turpis. Commodo viverra maecenas accumsan lacus vel facilisis volutpat est velit. Quam elementum pulvinar etiam non quam lacus suspendisse faucibus interdum. Volutpat odio facilisis mauris sit amet massa vitae tortor. Morbi enim nunc faucibus a pellentesque. Hendrerit gravida rutrum quisque non tellus orci ac auctor. Amet est placerat in egestas erat imperdiet. Eget nunc scelerisque viverra mauris in aliquam sem fringilla. Massa enim nec dui nunc mattis enim ut.

Ultricies tristique nulla aliquet enim tortor at auctor urna. A arcu cursus vitae congue mauris rhoncus aenean vel. Vel facilisis volutpat est velit egestas. Sed viverra ipsum nunc aliquet bibendum enim facilisis gravida. Dolor sit amet consectetur adipiscing elit duis. Non pulvinar neque laoreet suspendisse interdum consectetur libero id. Aenean et tortor at risus viverra adipiscing at. Morbi leo urna molestie at elementum eu facilisis sed odio. Non enim praesent elementum facilisis leo vel fringilla est. Ultrices dui sapien eget mi proin sed libero enim. Fames ac turpis egestas sed tempus urna. Id cursus metus aliquam eleifend.

']); RecipeIngredient::updateOrCreate(['recipe_id'=>$recipe['id'],'order'=>0,'alternative'=>false,'name'=>'chicken','quantity'=>1.0,'measurement'=>'lb','special_notes'=>'']); RecipeIngredient::updateOrCreate(['recipe_id'=>$recipe['id'],'order'=>0,'alternative'=>false,'name'=>'carrot','quantity'=>1.0,'measurement'=>'lb','special_notes'=>'']); diff --git a/resources/views/recipes/edit.blade.php b/resources/views/recipes/edit.blade.php new file mode 100644 index 0000000..cca22e8 --- /dev/null +++ b/resources/views/recipes/edit.blade.php @@ -0,0 +1,180 @@ +@extends('layouts.default') +@extends('content_wrappers.md-10') + +@section('title', ' | Edit '.$recipe->name) +@section('heading', 'Edit '.$recipe->name) + +@section('content') +
+ {{ Form::model($recipe, array('route' => array('recipes.update', $recipe->id), 'method' => 'PUT')) }} +
+
+ {{ Form::label('author', 'Created By:') }} + {{ Form::text('author', null, array('class' => 'form-control', 'id' => 'authorFilter')) }} +
+
+ {{ Form::label('user', 'Maintained By:') }} + {{ Form::select($recipe->user->name, $lists['owners'], array('class' => 'form-control')) }} +
+ +
Entered On: {{$recipe->date_entered->format('Y/m/d') }}
+
Last Changed: {{$recipe->date_modified->format('Y/m/d') }}
+
+
+
+ {{ Form::label('servings', 'Servings:') }} + {{ Form::text('servings', null, array('class' => 'form-control')) }} +
+
Serving Size: {{$recipe->serving_size}}
+
+
+

Categories

+
+ @foreach ($recipe->categories as $index => $category) + {{ Form::button(ucwords($category->name), array('class' => 'btn form-control category','style'=>'width:100px;margin-left:10px;margin-bottom:10px;'))}} + @endforeach +
+
+
+
{{ Form::button("Add", array('id'=>'addCategory','class'=>'form-control'))}}
+
+
+

Description

+ {{ Form::textarea('description', null, array('class' => 'form-control', 'id' => 'descriptionEditor','name'=>'descriptionEditor')) }} +
+

Ingredients

+
+ + + + + + + + + + + @foreach ($recipe->ingredients as $index => $ingredient) + + + + + + + + @endforeach + + + + + + + + +
Alternative?QuantityMeasurementName          
+ @if($index != 0) + {{Form::checkbox($ingredient->alternative,null,$ingredient->alternative,array('class' => 'form-control ingredientAlternative'))}} + @endif + {{Form::text($ingredient->quantity,$ingredient->quantity,array('class' => 'form-control ingredientQuantity'))}}{{Form::text($ingredient->measurement,$ingredient->measurement,array('class' => 'form-control ingredientMeasurement'))}}{{Form::text($ingredient->name,$ingredient->name,array('class' => 'form-control ingredientName'))}}{{Form::button("Remove",array('class' => 'form-control ingredientRemove'))}}
{{Form::checkbox($ingredient->alternative,null,false,array('class' => 'form-control ingredientAlternative','id'=>'addIngredientAlternative'))}}{{Form::text($ingredient->quantity,null,array('class' => 'form-control ingredientQuantity'))}}{{Form::text($ingredient->measurement,null,array('class' => 'form-control ingredientMeasurement'))}}{{Form::text($ingredient->name,null,array('class' => 'form-control ingredientName'))}}{{Form::button("Add",array('class' => 'form-control','id' => 'addIngredient'))}}
+
+ @if(count($recipe->ingredients) > 0) +
+ @endif + +

+

Instructions

+ {{ Form::textarea('instructions', null, array('class' => 'form-control', 'id' => 'instructionsEditor','name'=>'instructionsEditor')) }} + + +{{ Form::submit('Save', array('class' => 'btn btn-primary')) }} + +{{ Form::close() }} +@endsection + +@section('scripts') + + + +@endsection + +@section('styles') + +@endsection diff --git a/resources/views/recipes/show.blade.php b/resources/views/recipes/show.blade.php index 5c4c4a9..c863006 100644 --- a/resources/views/recipes/show.blade.php +++ b/resources/views/recipes/show.blade.php @@ -18,6 +18,12 @@
Serving Size: {{$recipe->serving_size}}

+

Categories

+
@foreach ($recipe->categories as $index => $category){{($index != 0 ? ", " : "").ucwords($category->name)}}@endforeach
+
+

Description

+
{!!$recipe->description!!}
+

Ingredients

@foreach ($recipe->ingredients as $index => $ingredient) @@ -34,6 +40,6 @@

Instructions

-
{{$recipe->instructions}}
+
{!!$recipe->instructions!!}
@endsection