diff --git a/_ide_helper_models.php b/_ide_helper_models.php index f05b3e0..47fb949 100644 --- a/_ide_helper_models.php +++ b/_ide_helper_models.php @@ -31,6 +31,8 @@ namespace App\Models{ * @property float $protein * @property \Illuminate\Support\Carbon|null $created_at * @property \Illuminate\Support\Carbon|null $updated_at + * @property-read \Illuminate\Database\Eloquent\Collection|\App\Models\FoodAmount[] $foodAmounts + * @property-read int|null $food_amounts_count * @property-read \Illuminate\Database\Eloquent\Collection|\App\Models\JournalEntry[] $journalEntries * @property-read int|null $journal_entries_count * @method static \Illuminate\Database\Eloquent\Builder|Food findSimilarSlugs(string $attribute, array $config, string $slug) @@ -54,7 +56,7 @@ namespace App\Models{ * @method static \Illuminate\Database\Eloquent\Builder|Food whereSodium($value) * @method static \Illuminate\Database\Eloquent\Builder|Food whereUpdatedAt($value) */ - class IdeHelperFood extends \Eloquent {} + class Food extends \Eloquent {} } namespace App\Models{ @@ -70,6 +72,7 @@ namespace App\Models{ * @property int $weight * @property \Illuminate\Support\Carbon|null $created_at * @property \Illuminate\Support\Carbon|null $updated_at + * @property string|null $detail * @property-read \App\Models\Food $food * @property-read \App\Models\Recipe $recipe * @method static \Illuminate\Database\Eloquent\Builder|FoodAmount newModelQuery() @@ -77,6 +80,7 @@ namespace App\Models{ * @method static \Illuminate\Database\Eloquent\Builder|FoodAmount query() * @method static \Illuminate\Database\Eloquent\Builder|FoodAmount whereAmount($value) * @method static \Illuminate\Database\Eloquent\Builder|FoodAmount whereCreatedAt($value) + * @method static \Illuminate\Database\Eloquent\Builder|FoodAmount whereDetail($value) * @method static \Illuminate\Database\Eloquent\Builder|FoodAmount whereFoodId($value) * @method static \Illuminate\Database\Eloquent\Builder|FoodAmount whereId($value) * @method static \Illuminate\Database\Eloquent\Builder|FoodAmount whereRecipeId($value) @@ -84,7 +88,7 @@ namespace App\Models{ * @method static \Illuminate\Database\Eloquent\Builder|FoodAmount whereUpdatedAt($value) * @method static \Illuminate\Database\Eloquent\Builder|FoodAmount whereWeight($value) */ - class IdeHelperFoodAmount extends \Eloquent {} + class FoodAmount extends \Eloquent {} } namespace App\Models{ @@ -127,7 +131,7 @@ namespace App\Models{ * @method static \Illuminate\Database\Eloquent\Builder|JournalEntry whereUpdatedAt($value) * @method static \Illuminate\Database\Eloquent\Builder|JournalEntry whereUserId($value) */ - class IdeHelperJournalEntry extends \Eloquent {} + class JournalEntry extends \Eloquent {} } namespace App\Models{ @@ -138,10 +142,10 @@ namespace App\Models{ * @property int $id * @property string $name * @property string $slug - * @property string $description * @property int $servings * @property \Illuminate\Support\Carbon|null $created_at * @property \Illuminate\Support\Carbon|null $updated_at + * @property string|null $description * @property-read \Illuminate\Database\Eloquent\Collection|\App\Models\FoodAmount[] $foodAmounts * @property-read int|null $food_amounts_count * @property-read \Illuminate\Database\Eloquent\Collection|\App\Models\JournalEntry[] $journalEntries @@ -160,7 +164,7 @@ namespace App\Models{ * @method static \Illuminate\Database\Eloquent\Builder|Recipe whereSlug($value) * @method static \Illuminate\Database\Eloquent\Builder|Recipe whereUpdatedAt($value) */ - class IdeHelperRecipe extends \Eloquent {} + class Recipe extends \Eloquent {} } namespace App\Models{ @@ -185,7 +189,7 @@ namespace App\Models{ * @method static \Illuminate\Database\Eloquent\Builder|RecipeStep whereStep($value) * @method static \Illuminate\Database\Eloquent\Builder|RecipeStep whereUpdatedAt($value) */ - class IdeHelperRecipeStep extends \Eloquent {} + class RecipeStep extends \Eloquent {} } namespace App\Models{ @@ -215,6 +219,6 @@ namespace App\Models{ * @method static \Illuminate\Database\Eloquent\Builder|User whereRememberToken($value) * @method static \Illuminate\Database\Eloquent\Builder|User whereUpdatedAt($value) */ - class IdeHelperUser extends \Eloquent {} + class User extends \Eloquent {} } diff --git a/app/Http/Controllers/FoodAmountController.php b/app/Http/Controllers/FoodAmountController.php deleted file mode 100644 index 961986c..0000000 --- a/app/Http/Controllers/FoodAmountController.php +++ /dev/null @@ -1,85 +0,0 @@ - ['required_with:foods.*', 'nullable', new StringIsDecimalOrFraction], 'foods_unit' => ['required', 'array'], 'foods_unit.*' => 'nullable|string', + 'foods_detail' => ['required', 'array'], + 'foods_detail.*' => 'nullable|string', 'foods' => ['required', 'array', new ArrayNotEmpty], 'foods.*' => 'required_with:foods_amount.*|nullable|exists:App\Models\Food,id', 'steps' => ['required', 'array', new ArrayNotEmpty], @@ -136,6 +138,7 @@ class RecipeController extends Controller $food_amounts[$key]->fill([ 'amount' => Number::floatFromString($amount), 'unit' => $input['foods_unit'][$key], + 'detail' => $input['foods_detail'][$key], 'weight' => $weight++, ]); $food_amounts[$key]->food()->associate($input['foods'][$key]); diff --git a/app/Http/Controllers/RecipeStepController.php b/app/Http/Controllers/RecipeStepController.php deleted file mode 100644 index 717b5de..0000000 --- a/app/Http/Controllers/RecipeStepController.php +++ /dev/null @@ -1,85 +0,0 @@ -foreignIdFor(Food::class)->index(); $table->unsignedFloat('amount'); $table->enum('unit', ['tsp', 'tbsp', 'cup', 'oz'])->nullable(); + $table->string('detail')->nullable(); $table->foreignIdFor(Recipe::class)->index(); $table->unsignedInteger('weight'); $table->timestamps(); diff --git a/database/migrations/2021_01_18_084734_add_food_amount_detail_column.php b/database/migrations/2021_01_18_084734_add_food_amount_detail_column.php new file mode 100644 index 0000000..5aabd4c --- /dev/null +++ b/database/migrations/2021_01_18_084734_add_food_amount_detail_column.php @@ -0,0 +1,32 @@ +string('detail')->nullable()->after('unit'); + }); + } + + /** + * Reverse the migrations. + * + * @return void + */ + public function down() + { + Schema::table('food_amounts', function (Blueprint $table) { + $table->dropColumn('detail'); + }); + } +} diff --git a/resources/views/recipes/edit.blade.php b/resources/views/recipes/edit.blade.php index d73eacd..eb2bbe6 100644 --- a/resources/views/recipes/edit.blade.php +++ b/resources/views/recipes/edit.blade.php @@ -75,9 +75,10 @@ $amount = \App\Support\Number::fractionStringFromFloat($foodAmount->amount); $unit = $foodAmount->unit; $food_id = $foodAmount->food->id; + $detail = $foodAmount->detail; } else { $foodAmount = new \App\Models\FoodAmount(); - $amount = $food_id = $unit = null; + $amount = $food_id = $unit = $detail = null; } @endphp
@@ -95,6 +96,10 @@ :selectedValue="old('foods.' . $i, $food_id)"> +
@endfor diff --git a/resources/views/recipes/show.blade.php b/resources/views/recipes/show.blade.php index c193bba..5360c71 100644 --- a/resources/views/recipes/show.blade.php +++ b/resources/views/recipes/show.blade.php @@ -16,6 +16,7 @@
{{ \App\Support\Number::fractionStringFromFloat($ia->amount) }}
@if($ia->unit)
{{ $ia->unit }}
@endif
{{ $ia->food->name }}
+ @if($ia->detail)
{{ $ia->detail }}
@endif @endforeach

Steps