Added edit page, doesn't store changes yet

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);
+    $recipe=Recipe::with('user')->findOrFail($id);
-    $ingredients=RecipeIngredient::get()->sortby('name')->pluck('name')->unique();
+    $lists['ingredients']=array_values(RecipeIngredient::get()->sortby('name')->pluck('name')->unique()->toArray());
-    return $ingredients;
+    $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)
+  {
   }
 }

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){

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();
 

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'=>'<p>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.</p><p>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.</p>']);
         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'=>'<p>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.</p><p>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.</p>']);
 
         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'=>'<p>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.</p><p>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.</p>']);
 
         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'=>'']);

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')
+<div class="panel-body">
+  {{ Form::model($recipe, array('route' => array('recipes.update', $recipe->id), 'method' => 'PUT')) }}
+    <div class="row">
+      <div class="form-group col-md-3 text-center">
+        {{ Form::label('author', 'Created By:') }}
+        {{ Form::text('author', null, array('class' => 'form-control', 'id' => 'authorFilter')) }}
+      </div>
+      <div class="col-md-3 text-center">
+        {{ Form::label('user', 'Maintained By:') }}
+        {{ Form::select($recipe->user->name, $lists['owners'], array('class' => 'form-control')) }}
+      </div>
+
+      <div class="col-md-3 text-center">Entered On: {{$recipe->date_entered->format('Y/m/d') }}</div>
+      <div class="col-md-3 text-center">Last Changed: {{$recipe->date_modified->format('Y/m/d') }}</div>
+    </div>
+    <div class="row">
+      <div class="col-sm-offset-3 col-sm-3 text-center">
+        {{ Form::label('servings', 'Servings:') }}
+        {{ Form::text('servings', null, array('class' => 'form-control')) }}
+      </div>
+      <div class="col-sm-3 text-center">Serving Size: {{$recipe->serving_size}}</div>
+    </div>
+    <br />
+    <div class="row"><div class="panel-heading"><h1>Categories</h1></div></div>
+    <div id="categories" class="row text-center">
+      @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
+    </div>
+    <div class='row text-center'>
+      <div class='col-sm-offset-4 col-sm-2'><input id="categoryFilter" class="filter form-control" type="text" placeholder="Search.."></div>
+      <div class='col-sm-2'>{{ Form::button("Add", array('id'=>'addCategory','class'=>'form-control'))}}</div>
+    </div>
+    <br />
+    <div class="row"><div class="panel-heading"><h1>Description</h1></div></div>
+    {{ Form::textarea('description', null, array('class' => 'form-control', 'id' => 'descriptionEditor','name'=>'descriptionEditor')) }}
+    <br />
+    <div class="row"><div class="panel-heading"><h1>Ingredients</h1></div></div>
+    <div class="table-responsive">
+      <table class="table table-bordered table-striped">
+        <thead>
+          <tr>
+            <th class='col-sm-2'>Alternative?</th>
+            <th class='col-sm-1'>Quantity</th>
+            <th class='col-sm-2'>Measurement</th>
+            <th class='col-sm-5'>Name&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp</th>
+            <th class='col-sm-2'></th>
+          </tr>
+        </thead>
+        @foreach ($recipe->ingredients as $index => $ingredient)
+          <tr>
+            <td>
+              @if($index != 0)
+                {{Form::checkbox($ingredient->alternative,null,$ingredient->alternative,array('class' => 'form-control ingredientAlternative'))}}
+              @endif
+            </td>
+            <td>{{Form::text($ingredient->quantity,$ingredient->quantity,array('class' => 'form-control ingredientQuantity'))}}</td>
+            <td>{{Form::text($ingredient->measurement,$ingredient->measurement,array('class' => 'form-control ingredientMeasurement'))}}</td>
+            <td>{{Form::text($ingredient->name,$ingredient->name,array('class' => 'form-control ingredientName'))}}</td>
+            <td>{{Form::button("Remove",array('class' => 'form-control ingredientRemove'))}}</td>
+          </tr>
+        @endforeach
+          <tr id="blankRow"><td colspan='5'></td></tr>
+          <tr id="addRow">
+            <td>{{Form::checkbox($ingredient->alternative,null,false,array('class' => 'form-control ingredientAlternative','id'=>'addIngredientAlternative'))}}</td>
+            <td>{{Form::text($ingredient->quantity,null,array('class' => 'form-control ingredientQuantity'))}}</td>
+            <td>{{Form::text($ingredient->measurement,null,array('class' => 'form-control ingredientMeasurement'))}}</td>
+            <td>{{Form::text($ingredient->name,null,array('class' => 'form-control ingredientName'))}}</td>
+            <td>{{Form::button("Add",array('class' => 'form-control','id' => 'addIngredient'))}}</td>
+          </tr>
+      </table>
+    </div>
+    @if(count($recipe->ingredients) > 0)
+        </div>
+    @endif
+
+    <br /><br />
+    <div class="row"><div class="panel-heading"><h1>Instructions</h1></div></div>
+    {{ Form::textarea('instructions', null, array('class' => 'form-control', 'id' => 'instructionsEditor','name'=>'instructionsEditor')) }}
+</div>
+
+{{ Form::submit('Save', array('class' => 'btn btn-primary')) }}
+
+{{ Form::close() }}
+@endsection
+
+@section('scripts')
+  <script src="https://cdn.ckeditor.com/4.17.2/standard-all/ckeditor.js"></script>
+  <script type="text/javascript" src="https://code.jquery.com/ui/1.12.1/jquery-ui.js"></script>
+  <script>
+    CKEDITOR.replace('instructionsEditor');
+    CKEDITOR.replace('descriptionEditor');
+
+    var authors = @json($lists['authors']);
+    $("#authorFilter").autocomplete({
+      source: authors
+    });
+    var categories = @json($lists['categories']);
+    $("#categoryFilter").autocomplete({
+      source: categories
+    });
+
+    var ingredients = @json($lists['ingredients']);
+    $(".ingredientName").autocomplete({
+      source: ingredients
+    });
+
+    var measurements = @json($lists['measurements']);
+    $(".ingredientMeasurement").autocomplete({
+      source: measurements
+    });
+
+    $(".category").on("click",function(){
+      $(this).remove();
+    });
+
+    $("#addCategory").on("click", function(){
+      var newCategory = upperWords($('#categoryFilter').val().toLowerCase());
+      var currentCategories = [];
+      $(".category").each(function(){
+        currentCategories.push($(this).text());
+      });
+      if(newCategory!="" && currentCategories.indexOf(newCategory) == -1){
+        $("#categories").append('<button type="button" class="btn form-control category" style="width: 100px; margin-left: 10px;margin-bottom: 10px;">'+newCategory+'</button>');
+      }
+    });
+
+    function upperWords(str){
+      words=str.split(" ");
+      words.forEach(function(word,i){
+        words[i]=word[0].toUpperCase() + word.slice(1,word.length);
+      });
+      return words.join(" ");
+    }
+
+    $(".ingredientRemove").on("click",function(){
+      $(this).parent().parent().remove();
+    });
+
+    $("#addIngredient").on("click", function(){
+      var ingredientAlternative=$('#addIngredientAlternative').prop("checked");
+      var ingredientQuantity=$('#addRow .ingredientQuantity').val();
+      var ingredientMeasurement=$('#addRow .ingredientMeasurement').val();
+      var ingredientName=$('#addRow .ingredientName').val();
+      if(isFraction(ingredientQuantity) && ingredientMeasurement != "" && ingredientName != ""){
+        var newRow='<tr>';
+        newRow+='<td><input name="0" type="checkbox" '+ (ingredientAlternative ? 'checked="checked"' : "") +'class="form-control ingredientAlternative"></td>';
+        newRow+='<td><input name="1" type="text" value="'+ingredientQuantity+'" class="form-control ingredientQuantity"></td>';
+        newRow+='<td><input name="lb" type="text" value="'+ingredientMeasurement+'" class="form-control ingredientMeasurement ui-autocomplete-input" autocomplete="off"></td>';
+        newRow+='<td><input name="carrot" type="text" value="'+ingredientName+'" class="form-control ingredientName ui-autocomplete-input" autocomplete="off"></td>';
+        newRow+='<td><button type="button" class="form-control ingredientRemove">Remove</button></td>';
+        newRow+='</tr>';
+        $("#blankRow").before(newRow);
+      }else{
+        if(ingredientMeasurement == ""){alert("Ingredient measurement required")};
+        if(ingredientName == ""){alert("Ingredient name required")};
+      }
+    });
+
+    function isFraction(value){
+      var pattern = new RegExp(/(^\d+\/\d+$)|(^\d*\.\d+$)|(^\d+ \d\/\d$)|(^\d+$)/);
+      if(value.match(pattern)){return true}
+      else{
+        alert("Ingredient quantity must be a decimal or fraction");
+        return false
+      }
+    }
+  </script>
+@endsection
+
+@section('styles')
+  <link rel="stylesheet" href="https://code.jquery.com/ui/1.12.1/themes/base/jquery-ui.css">
+@endsection

resources/views/recipes/show.blade.php

@@ -18,6 +18,12 @@
         <div class="col-sm-3 text-center">Serving Size: {{$recipe->serving_size}}</div>
     </div>
     <br />
+    <div class="row"><div class="panel-heading"><h1>Categories</h1></div></div>
+    <div class="row text-center">@foreach ($recipe->categories as $index => $category){{($index != 0 ? ", " : "").ucwords($category->name)}}@endforeach</div>
+    <br />
+    <div class="row"><div class="panel-heading"><h1>Description</h1></div></div>
+    <div class="row"><div class="col-sm-offset-2 col-lg-8">{!!$recipe->description!!}</div></div class="row">
+    <br />
     <div class="row"><div class="panel-heading"><h1>Ingredients</h1></div></div>
 
     @foreach ($recipe->ingredients as $index => $ingredient)
@@ -34,6 +40,6 @@
 
     <br /><br />
     <div class="row"><div class="panel-heading"><h1>Instructions</h1></div></div>
-    <div class="row"><div class="col-lg-12">{{$recipe->instructions}}</div>
+    <div class="row"><div class="col-sm-offset-1 col-lg-10">{!!$recipe->instructions!!}</div>
 </div>
 @endsection