From e9ee11eec0c2139baae5247012b11ad4c792cf64 Mon Sep 17 00:00:00 2001 From: alex-chevski Date: Mon, 18 Dec 2023 16:35:41 +0300 Subject: [PATCH 01/12] fix comment reset --- app/Livewire/Plan/Comment/Create.php | 2 +- resources/views/livewire/plan/comment/create.blade.php | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/app/Livewire/Plan/Comment/Create.php b/app/Livewire/Plan/Comment/Create.php index fc505c8..ee77936 100644 --- a/app/Livewire/Plan/Comment/Create.php +++ b/app/Livewire/Plan/Comment/Create.php @@ -38,7 +38,7 @@ class Create extends Component $comment->plan_id = $this->plan->id; $comment->user_id = $this->user->id; $comment->save(); - $this->reset(['body']); + $this->reset(); $this->toggle(); diff --git a/resources/views/livewire/plan/comment/create.blade.php b/resources/views/livewire/plan/comment/create.blade.php index 92a27a0..507b5b0 100644 --- a/resources/views/livewire/plan/comment/create.blade.php +++ b/resources/views/livewire/plan/comment/create.blade.php @@ -18,8 +18,9 @@ $isChecked]) wire:model="isChecked" wire:click="$set('grade',1)" type="radio" name="rate" id="rate-1" value="1" hidden> + - + From 45c5922c547a1a0d020ea20f33aa46f816ef13e0 Mon Sep 17 00:00:00 2001 From: alex-chevski Date: Mon, 18 Dec 2023 22:30:03 +0300 Subject: [PATCH 02/12] added icon type show --- app/Livewire/Plan/Create.php | 14 +++++++----- resources/views/plan/show.blade.php | 35 ++++++++++++++++++++++++++--- 2 files changed, 40 insertions(+), 9 deletions(-) diff --git a/app/Livewire/Plan/Create.php b/app/Livewire/Plan/Create.php index 9d776d1..6203ba7 100644 --- a/app/Livewire/Plan/Create.php +++ b/app/Livewire/Plan/Create.php @@ -11,12 +11,11 @@ use App\Models\Plan; class Create extends Component { use WithFileUploads; - public $name = ""; public $image = null; public $duration = "7"; public $state = "draft"; - public $type = []; + public $type = ['fit' => false, 'slim' => false, 'behavior' => false, 'wellness' => false]; public $details = ""; public $packets_count = 1; public $packet1_options = []; @@ -120,11 +119,14 @@ class Create extends Component $plan->state = $this->state; $plan->details = $this->details; $plan->packets_count = $this->packets_count; - $plan->type = json_encode($this->type); - $plan->packet1_options = json_encode($this->packet1_options); - $plan->packet2_options = json_encode($this->packet2_options); - $plan->packet3_options = json_encode($this->packet3_options); + $plan->type = $this->type; + $plan->packet1_options = $this->packet1_options; + $plan->packet2_options = $this->packet2_options; + $plan->packet3_options = $this->packet3_options; + $plan->saveOrFail(); + + $user = Auth::user(); $user->author_of_plans()->attach($plan->id); diff --git a/resources/views/plan/show.blade.php b/resources/views/plan/show.blade.php index f256633..f5f2538 100644 --- a/resources/views/plan/show.blade.php +++ b/resources/views/plan/show.blade.php @@ -86,6 +86,35 @@ {{ $plan->details }}

+ +
+ + + @if ($plan->type['slim'] === true) + + + + @endif + + @if ($plan->type['fit'] === true) + + + + @endif + + @if ($plan->type['wellness'] === true) + + + + @endif + + @if ($plan->type['behavior'] === true) + + + + @endif +
+
@@ -117,7 +146,7 @@ @endsection {{-- @push('jq_scripts') --}} - {{-- --}} - {{-- --}} - {{-- --}} +{{-- --}} +{{-- --}} +{{-- --}} {{-- @endpush --}} From 04a6c26982bb4c81edfac1a8cf3b7743eb9a605f Mon Sep 17 00:00:00 2001 From: alex-chevski Date: Mon, 18 Dec 2023 23:29:33 +0300 Subject: [PATCH 03/12] delete method unserialize --- app/Livewire/Plan/Accordion.php | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) diff --git a/app/Livewire/Plan/Accordion.php b/app/Livewire/Plan/Accordion.php index 16cb986..9ecb4cd 100644 --- a/app/Livewire/Plan/Accordion.php +++ b/app/Livewire/Plan/Accordion.php @@ -17,17 +17,9 @@ class Accordion extends Component { $this->plan = $plan; // dd($this->unserializeOptions($plan->packet3_options)); - $this->options1 = $this->unserializeOptions($plan->packet1_options); - $this->options2 = $this->unserializeOptions($plan->packet2_options); - $this->options3 = $this->unserializeOptions($plan->packet3_options); - } - - private function unserializeOptions($str) - { - if (preg_match('/^".*"$/', $str)) { - return json_decode(mb_substr($str, 1, -1), true); - } - return json_decode($str, true); + $this->options1 = $plan->packet1_options; + $this->options2 = $plan->packet2_options; + $this->options3 = $plan->packet3_options; } public function render() From 5698aa1b43bf33d0a9382ec7529a3c5095cb74b6 Mon Sep 17 00:00:00 2001 From: alex-chevski Date: Mon, 18 Dec 2023 23:32:35 +0300 Subject: [PATCH 04/12] added plans and users seeders to database seeder --- database/seeders/DatabaseSeeder.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/database/seeders/DatabaseSeeder.php b/database/seeders/DatabaseSeeder.php index b112279..0b03b25 100644 --- a/database/seeders/DatabaseSeeder.php +++ b/database/seeders/DatabaseSeeder.php @@ -16,6 +16,8 @@ class DatabaseSeeder extends Seeder { $this->call(PlanSeeder::class); $this->call(UserSeeder::class); + $this->call(PlanAuthor::class); + $this->call(PlanCommentSeeder::class); // $this->call(RecipeSeeder::class); // \App\Models\User::factory(10)->create(); } From 9cf91dded538daf03f84f0424e82df496f3f9d74 Mon Sep 17 00:00:00 2001 From: alex-chevski Date: Tue, 19 Dec 2023 12:34:59 +0300 Subject: [PATCH 05/12] updated show and create test plan --- tests/Feature/Plan/CreateTest.php | 39 ++++++++++++++++++++++++------- tests/Feature/Plan/ShowTest.php | 10 ++++---- 2 files changed, 34 insertions(+), 15 deletions(-) diff --git a/tests/Feature/Plan/CreateTest.php b/tests/Feature/Plan/CreateTest.php index 11c7092..42ab833 100644 --- a/tests/Feature/Plan/CreateTest.php +++ b/tests/Feature/Plan/CreateTest.php @@ -32,16 +32,17 @@ class CreateTest extends TestCase $this->user = User::factory()->create(['is_consultant' => true]); $this->plan = Plan::factory()->make(); + + $this->refreshApplicationWithLocale('en'); } public function test_show_form_create_plan() { $response = $this ->actingAs($this->user) - ->get('/plan/create'); + ->get(route('plan.create')); - $response - ->assertStatus(302); + $response->assertSuccessful(); // ->assertRedirect(route('home')); } @@ -50,6 +51,7 @@ class CreateTest extends TestCase $this->actingAs($this->user); // $this->assertEquals($this->plan->count(), $count = Plan::count()); + $planCountAtStart = Plan::count(); Livewire::test(Create::class) ->set('name', $this->plan->name) @@ -72,11 +74,18 @@ class CreateTest extends TestCase ->set('packet3_options', $this->plan->packet3_options) ->assertSet('packet3_options', $this->plan->packet3_options) ->call('publish') - ->assertStatus(200) - ->assertHasNoErrors(['name', 'image', 'duration', 'details']); + ->assertSuccessful() + ->assertHasNoErrors(['name', 'image', 'duration', 'details', 'packets_count', 'packet1_options', 'packet2_options', 'packet3_options']); Storage::disk('public')->assertExists($this->plan->image); + $this->assertEquals($planCountAtStart + 1, Plan::count()); + + $response = $this->actingAs($this->user)->get(route('plan.index')); + + $response->assertSuccessful(); + + // $this->assertEquals($count + 1, Plan::count()); } @@ -85,7 +94,10 @@ class CreateTest extends TestCase { $this->actingAs($this->user); - $id = $this->plan->count(); + $planCountAtStart = Plan::count(); + + // $planLastId = $this->plan->latest()->first()->id; + // $expectedRedirectRoute = route('plan.show', ['plan' => $planLastId + 1]); Livewire::test(Create::class) ->set('name', $this->plan->name) @@ -108,11 +120,12 @@ class CreateTest extends TestCase ->set('packet3_options', $this->plan->packet3_options) ->assertSet('packet3_options', $this->plan->packet3_options) ->call('addToDrafts') - ->assertStatus(200) - ->assertRedirect('plan/' . $id + 1) + ->assertRedirect() ->assertHasNoErrors(['name', 'image', 'duration', 'details']); Storage::disk('public')->assertExists($this->plan->image); + + $this->assertEquals($planCountAtStart + 1, Plan::count()); } @@ -120,6 +133,8 @@ class CreateTest extends TestCase { $this->actingAs($this->user); + $planCountAtStart = Plan::count(); + Livewire::test(Create::class) ->set('name', $this->plan->name) ->assertSet('name', $this->plan->name) @@ -141,16 +156,20 @@ class CreateTest extends TestCase ->set('packet3_options', $this->plan->packet3_options) ->assertSet('packet3_options', $this->plan->packet3_options) ->call('showPreview') - ->assertStatus(200) + ->assertSuccessful() ->assertHasNoErrors(['name', 'image', 'duration', 'details']); Storage::disk('public')->assertExists($this->plan->image); + + $this->assertEquals($planCountAtStart + 1, Plan::count()); } public function test_set_empty_data(): void { $this->actingAs($this->user); + $planCountAtStart = Plan::count(); + Livewire::test(Create::class) ->set('name', null) ->set('image', null) @@ -164,5 +183,7 @@ class CreateTest extends TestCase ->set('packet3_options', null) ->call('publish') ->assertHasErrors(['name', 'image', 'duration', 'details']); + + $this->assertEquals($planCountAtStart, Plan::count()); } } diff --git a/tests/Feature/Plan/ShowTest.php b/tests/Feature/Plan/ShowTest.php index 375435a..9eb5ac6 100644 --- a/tests/Feature/Plan/ShowTest.php +++ b/tests/Feature/Plan/ShowTest.php @@ -31,19 +31,17 @@ class ShowTest extends TestCase $this->image = UploadedFile::fake()->image('plan.png'); $this->user = User::factory()->create(['is_consultant' => true]); - $this->plan = Plan::factory()->create(); - + $this->plan = Plan::inRandomOrder()->first(); + $this->refreshApplicationWithLocale('en'); } public function test_show_form_success() { $response = $this->actingAs($this->user) - ->get('/plan/'. $this->plan->id); + ->get(route('plan.show', ['plan' => $this->plan->id])); $response - ->assertStatus(302); - // ->assertRedirect(route('home')); - // ->assertRedirect('https://dev2.eatvio.com/ru'); + ->assertOk(); } // When appear role for user From 06409455fd97a90128a9eb159a3e07cbbd082677 Mon Sep 17 00:00:00 2001 From: alex-chevski Date: Tue, 19 Dec 2023 12:35:46 +0300 Subject: [PATCH 06/12] changed fields key types --- app/Livewire/Plan/Create.php | 2 +- database/factories/PlanFactory.php | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/app/Livewire/Plan/Create.php b/app/Livewire/Plan/Create.php index 6203ba7..e0b41c9 100644 --- a/app/Livewire/Plan/Create.php +++ b/app/Livewire/Plan/Create.php @@ -39,7 +39,7 @@ class Create extends Component 'name' => 'required|min:3', 'image' => 'required|image|max:2048', 'duration' => 'required|numeric|min:7', - 'state' => 'required|in:draft,active,inactive', + 'state' => 'required|in:draft,active,unactive', 'type' => ['required', 'array:slim,fit,wellness,behavior', 'min:1'], 'details' => 'required|min:3', 'packets_count' => 'required|in:1,3', diff --git a/database/factories/PlanFactory.php b/database/factories/PlanFactory.php index a87d4b4..10169e1 100755 --- a/database/factories/PlanFactory.php +++ b/database/factories/PlanFactory.php @@ -30,6 +30,8 @@ class PlanFactory extends Factory 'wellness' => $this->faker->boolean(), ]; + $wrongTypeBody = json_encode($typeBody); + $packetsOptions = [ 'items' => [$this->faker->fruitName(), $this->faker->meatName(), $this->faker->sauceName()], 'price' => $this->faker->randomNumber(), @@ -46,7 +48,8 @@ class PlanFactory extends Factory // 'image' => UploadedFile::fake()->image('plans/Photo_C.png'), 'image' => $fileLocalPath, 'duration' => $this->faker->randomElement([7, 14,21]), - 'state' => $this->faker->randomElement(['active', 'draft', 'archived']), + 'state' => $this->faker->randomElement(['active', 'draft', 'unactive']), + //'type' => $this->faker->randomElement([$typeBody, $wrongTypeBody]), 'type' => $typeBody, 'details' => $this->faker->text(), 'packets_count' => $this->faker->randomElement([1, 3]), From dd171b6f5cb2ab0274189b066f5ac178a6b40ab7 Mon Sep 17 00:00:00 2001 From: alex-chevski Date: Tue, 19 Dec 2023 22:38:17 +0300 Subject: [PATCH 07/12] added edit plan --- app/Http/Controllers/PlanController.php | 12 + app/Livewire/Plan/Edit.php | 190 +++++++ resources/views/livewire/plan/edit.blade.php | 493 +++++++++++++++++++ resources/views/plan/edit_form.blade.php | 8 +- 4 files changed, 701 insertions(+), 2 deletions(-) create mode 100644 app/Livewire/Plan/Edit.php create mode 100644 resources/views/livewire/plan/edit.blade.php diff --git a/app/Http/Controllers/PlanController.php b/app/Http/Controllers/PlanController.php index 6484d94..0f76e56 100644 --- a/app/Http/Controllers/PlanController.php +++ b/app/Http/Controllers/PlanController.php @@ -24,9 +24,21 @@ class PlanController extends Controller } else { $plans = Plan::all(); } + + try{ + $this->checkArgumentsJson($plans); + }catch(\InvalidArgumentException $error){ + return back()->with('error', $error->getMessage()); + } + + return view('plan/index', ['plans' => $plans]); } + private function checkArgumentsJson($plans){ + + } + /** * Show the form for creating a new resource. * diff --git a/app/Livewire/Plan/Edit.php b/app/Livewire/Plan/Edit.php new file mode 100644 index 0000000..ff322e1 --- /dev/null +++ b/app/Livewire/Plan/Edit.php @@ -0,0 +1,190 @@ + false, 'slim' => false, 'behavior' => false, 'wellness' => false]; + public $details = ''; + public $packets_count = 1; + public $packet1_options = []; + public $packet2_options = []; + public $packet3_options = []; + public $packet1_options_input = []; + public $packet2_options_input = []; + public $packet3_options_input = []; + public $input_items_1 = ''; + public $input_items_2 = ''; + public $input_items_3 = ''; + public $isVisibleDuration = false; + public $isVisibleState = false; + + public function mount(Plan $plan) + { + $this->plan = $plan; + + $this->name = $plan->name; + $this->image = $plan->image; + $this->duration = $plan->duration; + $this->state = $plan->state; + $this->type = $plan->type; + $this->details = $plan->details; + $this->packets_count = $plan->packets_count; + + $this->packet1_options_input['short'] = $plan->packet1_options['short']; + $this->packet1_options_input['price'] = $plan->packet1_options['price']; + $this->packet1_options_input['description'] = $plan->packet1_options['description']; + // $this->input_items_1 = $plan->packet1_options['items']; + + $this->packet1_options['short'] = $plan->packet1_options['short']; + $this->packet1_options['price'] = $plan->packet1_options['price']; + $this->packet1_options['description'] = $plan->packet1_options['description']; + $this->packet1_options['items'] = $plan->packet1_options['items']; + + if ($plan->packets_count === 3) { + + $this->packet2_options_input['short'] = $plan->packet2_options['short']; + $this->packet2_options_input['price'] = $plan->packet2_options['price']; + $this->packet2_options_input['description'] = $plan->packet2_options['description']; + // $this->input_items_2 = $plan->packet1_options['items']; + + $this->packet2_options['short'] = $plan->packet2_options['short']; + $this->packet2_options['price'] = $plan->packet2_options['price']; + $this->packet2_options['description'] = $plan->packet2_options['description']; + $this->packet2_options['items'] = $plan->packet2_options['items']; + + $this->packet3_options_input['short'] = $plan->packet2_options['short']; + $this->packet3_options_input['price'] = $plan->packet2_options['price']; + $this->packet3_options_input['description'] = $plan->packet2_options['description']; + // $this->input_items_3 = $plan->packet1_options['items']; + + $this->packet3_options['short'] = $plan->packet2_options['short']; + $this->packet3_options['price'] = $plan->packet2_options['price']; + $this->packet3_options['description'] = $plan->packet2_options['description']; + $this->packet3_options['items'] = $plan->packet3_options['items']; + } + + // likes_count + // commentsCount + } + + protected function rules() + { + $rules = [ + 'name' => 'required|min:3', + // 'image' => 'image|max:2048', + 'duration' => 'required|numeric|min:7', + 'state' => 'required|in:draft,active,unactive', + 'type' => ['required', 'array:slim,fit,wellness,behavior', 'min:1'], + 'details' => 'required|min:3', + 'packets_count' => 'required|in:1,3', + 'packet1_options.short' => 'required|string|min:3', + 'packet1_options.price' => 'required|numeric|min:1', + 'packet1_options.description' => 'required|string|min:3', + 'packet1_options.items' => 'required|array|min:1', + ]; + + if ($this->packets_count === 3) { + $rules['packet2_options.short'] = 'required|string|min:3'; + $rules['packet2_options.price'] = 'required|numeric|min:1'; + $rules['packet2_options.description'] = 'required|string|min:3'; + $rules['packet2_options.items'] = 'required|array|min:1'; + $rules['packet3_options.short'] = 'required|string|min:3'; + $rules['packet3_options.price'] = 'required|numeric|min:1'; + $rules['packet3_options.description'] = 'required|string|min:3'; + $rules['packet3_options.items'] = 'required|array|min:1'; + } + + return $rules; + } + + public function showListDuration() + { + $this->isVisibleDuration = !$this->isVisibleDuration; + } + + public function showListState() + { + $this->isVisibleState = !$this->isVisibleState; + } + + public function toggleDuration($duration) + { + $this->duration = $duration; + $this->isVisibleDuration = false; + } + + public function toggleState($state) + { + $this->state = $state; + $this->isVisibleState = false; + } + + public function addPacketOption($options_type, $options_type_input) + { + $this->$options_type['short'] = $this->$options_type_input['short']; + $this->$options_type['price'] = $this->$options_type_input['price']; + $this->$options_type['description'] = $this->$options_type_input['description']; + + $this->$options_type['items'][] = $this->input_items_1; + $this->$options_type['items'][] = $this->input_items_2; + $this->$options_type['items'][] = $this->input_items_3; + + // delete empty value in items + $this->$options_type['items'] = array_filter($this->$options_type['items'], fn($item) => !empty($item)); + $this->reset('input_items_1'); + $this->reset('input_items_2'); + $this->reset('input_items_3'); + } + + public function publish() + { + $this->validate(); + + $this->plan->name = $this->name; + $this->plan->image = !is_string($this->image) ? $this->image->store('plans', 'public') : $this->image; + $this->plan->duration = $this->duration; + $this->plan->state = $this->state; + $this->plan->details = $this->details; + $this->plan->packets_count = $this->packets_count; + $this->plan->type = $this->type; + $this->plan->packet1_options = $this->packet1_options; + $this->plan->packet2_options = $this->packet2_options; + $this->plan->packet3_options = $this->packet3_options; + + $this->plan->update(); + + // $user = Auth::user(); + // $user->author_of_plans()->attach($plan->id); + + return redirect()->route('plan.show', $this->plan->id); + } + + public function addToDrafts() + { + $this->state = 'draft'; + $this->publish(); + } + + public function showPreview() + { + $this->state = 'unactive'; + $this->publish(); + } + + public function render() + { + return view('livewire.plan.edit'); + } +} diff --git a/resources/views/livewire/plan/edit.blade.php b/resources/views/livewire/plan/edit.blade.php new file mode 100644 index 0000000..5e49c6e --- /dev/null +++ b/resources/views/livewire/plan/edit.blade.php @@ -0,0 +1,493 @@ +
+
+
+ +

+ Мои планы +

+
+ +
+
+
+ Название +
+ +
+ +
+
+
+
+ Изображение +
+ +
+ +
+
+
+ Длительность плана питания +
+
+ + +
    $isVisibleDuration])> +
  • $duration === '7']) data-value="7">7 + дней
    • +
  • $duration === '8']) data-value="8">8 + дней
    • +
  • $duration === '100']) + data-value="100 ">100 дней
    • +
+ +
+
+
+
+ + +
+
+
+ +
+
+
+ Статус +
+
+ +
    $isVisibleState])> +
  • $state === 'active'])> + Активна
    • +
  • $state === 'unactive'])>Неактивна +
    • +
+ +
+
+ +
+
+ + +
+
+
+ + +
+
+ +
+
+ Описание +
+ +
+
+ + +
+
+
+
+ + +
+
+
+ ОКАЗАНИЕ УСЛУГ +
+
+ + +
+
+ + @if ($packets_count === 1) +
+
+
+
+
+
+ Краткое описание +
+ +
+
+
+ Цена + + + 1 вариант + +
+ +
+
+
+
+
+ Описание услуги: +
+ +
+
+ +
+
+
+ Содержание услуги +
+ @isset($packet1_options['items']) +
    + @foreach ($packet1_options['items'] as $item) +
  • + {{ $item }} +
    • + @endforeach +
+ @endisset + +
+ +
+ + + + +
+
+
+
+
+ @endif + + @if ($packets_count === 3) +
+
+
+
+
+
+ Краткое описание +
+ +
+
+
+ Цена + + + 1 вариант + +
+ +
+
+
+
+
+ Описание услуги: +
+ +
+
+ +
+
+
+ Содержание услуги +
+ @isset($packet1_options['items']) +
    + @foreach ($packet1_options['items'] as $item) +
  • + {{ $item }} +
    • + @endforeach +
+ @endisset + +
+ +
+ + + + +
+
+
+
+
+ + + +
+
+
+
+
+
+ Краткое описание +
+ +
+
+
+ Цена + + + 2 вариант + +
+ +
+
+
+
+
+ Описание услуги: +
+ +
+
+ + +
+
+
+ Содержание услуги +
+ @isset($packet2_options['items']) +
    + @foreach ($packet2_options['items'] as $item) +
  • + {{ $item }} +
    • + @endforeach +
+ @endisset + +
+ +
+ + + + +
+
+ +
+
+
+ + + +
+
+
+
+
+
+ Краткое описание +
+ +
+
+
+ Цена + + + 3 вариант + +
+ +
+
+
+
+
+ Описание услуги: +
+ +
+
+ + +
+
+
+ Содержание услуги +
+ @isset($packet3_options['items']) +
    + @foreach ($packet3_options['items'] as $item) +
  • + {{ $item }} +
    • + @endforeach +
+ @endisset + +
+ +
+ + + + +
+
+
+ +
+ +
+ @endif + + + @if ($errors) +
+
    + @foreach ($errors->all() as $message) +
  • {{ $message }}
    • + @endforeach +
+
+ @endif + + +
+ + + +
+ +
+ +
+
diff --git a/resources/views/plan/edit_form.blade.php b/resources/views/plan/edit_form.blade.php index 7b95ef3..5cfe942 100644 --- a/resources/views/plan/edit_form.blade.php +++ b/resources/views/plan/edit_form.blade.php @@ -1,9 +1,13 @@ @extends('layouts/eatvio') - @section('main_section') - @livewire('plan.create') + @isset($plan) + @livewire('plan.edit', ['plan' => $plan]); + @else + @livewire('plan.create') + @endisset @endsection @push('css_head') {{-- --}} @endpush + From 05db495902b9896efb532bf85a738ab3d1cdd386 Mon Sep 17 00:00:00 2001 From: alex-chevski Date: Tue, 19 Dec 2023 22:43:29 +0300 Subject: [PATCH 08/12] added package composer slug --- composer.json | 1 + composer.lock | 61 ++++++++++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 61 insertions(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 69c81d6..c06085a 100644 --- a/composer.json +++ b/composer.json @@ -25,6 +25,7 @@ "pusher/pusher-php-server": "^7.2", "sentry/sentry-laravel": "^3.7", "spatie/laravel-query-builder": "^5.0", + "spatie/laravel-sluggable": "^3.5", "wire-elements/modal": "^2.0@beta" }, "require-dev": { diff --git a/composer.lock b/composer.lock index 301c7ef..a17f08c 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "2e254ae7b37d7841970bf3a2a4f56d80", + "content-hash": "25208739069f14268f84916edfb8c963", "packages": [ { "name": "asantibanez/livewire-charts", @@ -6054,6 +6054,65 @@ ], "time": "2023-08-21T10:51:49+00:00" }, + { + "name": "spatie/laravel-sluggable", + "version": "3.5.0", + "source": { + "type": "git", + "url": "https://github.com/spatie/laravel-sluggable.git", + "reference": "041af2533fe2206715e9a4a9cad2cab6cb796655" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/spatie/laravel-sluggable/zipball/041af2533fe2206715e9a4a9cad2cab6cb796655", + "reference": "041af2533fe2206715e9a4a9cad2cab6cb796655", + "shasum": "" + }, + "require": { + "illuminate/database": "^8.0|^9.0|^10.0", + "illuminate/support": "^8.0|^9.0|^10.0", + "php": "^8.0" + }, + "require-dev": { + "orchestra/testbench": "^6.23|^7.0|^8.0", + "pestphp/pest": "^1.20", + "spatie/laravel-translatable": "^5.0|^6.0" + }, + "type": "library", + "autoload": { + "psr-4": { + "Spatie\\Sluggable\\": "src" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Freek Van der Herten", + "email": "freek@spatie.be", + "homepage": "https://spatie.be", + "role": "Developer" + } + ], + "description": "Generate slugs when saving Eloquent models", + "homepage": "https://github.com/spatie/laravel-sluggable", + "keywords": [ + "laravel-sluggable", + "spatie" + ], + "support": { + "source": "https://github.com/spatie/laravel-sluggable/tree/3.5.0" + }, + "funding": [ + { + "url": "https://github.com/spatie", + "type": "github" + } + ], + "time": "2023-05-29T09:42:35+00:00" + }, { "name": "symfony/cache", "version": "v6.3.4", From 3c379684e57171c537f3230d4801b8295d9a8ad8 Mon Sep 17 00:00:00 2001 From: alex-chevski Date: Tue, 19 Dec 2023 23:24:41 +0300 Subject: [PATCH 09/12] changed id into slug url plan --- app/Livewire/Plan/Comment/Create.php | 1 + app/Livewire/Plan/Create.php | 2 +- app/Livewire/Plan/Edit.php | 2 +- app/Models/Plan.php | 24 +++++++++++++++++++ .../2022_06_29_135450_create_plans_table.php | 1 + .../livewire/plan/comment/show.blade.php | 2 +- routes/web.php | 2 +- 7 files changed, 30 insertions(+), 4 deletions(-) diff --git a/app/Livewire/Plan/Comment/Create.php b/app/Livewire/Plan/Comment/Create.php index ee77936..3ea82ca 100644 --- a/app/Livewire/Plan/Comment/Create.php +++ b/app/Livewire/Plan/Comment/Create.php @@ -35,6 +35,7 @@ class Create extends Component $comment = new PlanComment(); $comment->grade = $this->grade; $comment->body = $this->body; + $comment->plan_id = $this->plan->id; $comment->user_id = $this->user->id; $comment->save(); diff --git a/app/Livewire/Plan/Create.php b/app/Livewire/Plan/Create.php index e0b41c9..a9ea467 100644 --- a/app/Livewire/Plan/Create.php +++ b/app/Livewire/Plan/Create.php @@ -130,7 +130,7 @@ class Create extends Component $user = Auth::user(); $user->author_of_plans()->attach($plan->id); - return redirect()->route('plan.show', $plan->id); + return redirect()->route('plan.show', $plan->slug); } public function addToDrafts() diff --git a/app/Livewire/Plan/Edit.php b/app/Livewire/Plan/Edit.php index ff322e1..7bd15f3 100644 --- a/app/Livewire/Plan/Edit.php +++ b/app/Livewire/Plan/Edit.php @@ -168,7 +168,7 @@ class Edit extends Component // $user = Auth::user(); // $user->author_of_plans()->attach($plan->id); - return redirect()->route('plan.show', $this->plan->id); + return redirect()->route('plan.show', $this->plan->slug); } public function addToDrafts() diff --git a/app/Models/Plan.php b/app/Models/Plan.php index 7e168c9..48c498e 100644 --- a/app/Models/Plan.php +++ b/app/Models/Plan.php @@ -12,13 +12,37 @@ use Illuminate\Database\Eloquent\Relations\HasMany; use Illuminate\Database\Eloquent\Builder; use Illuminate\Database\Eloquent\Model; use Laracasts\Presenter\PresentableTrait; +use Spatie\Sluggable\HasSlug; +use Spatie\Sluggable\SlugOptions; class Plan extends Model implements Viewable { use HasFactory; + use HasSlug; use InteractsWithViews; use PresentableTrait; + public function getSlugOptions(): SlugOptions + { + return SlugOptions::create() + ->generateSlugsFrom(['name'] ) + ->saveSlugsTo('slug') + // ->slugsShouldBeNoLongerThan(20) + ->usingSeparator('_'); + // ->usingLanguage('ru') + // ->doNotGenerateSlugsOnUpdate(); + } + + /** + * Get the route key for the model. + * + * @return string + */ + public function getRouteKeyName() + { + return 'slug'; + } + protected $withCount = [ 'likes', 'comments' diff --git a/database/migrations/2022_06_29_135450_create_plans_table.php b/database/migrations/2022_06_29_135450_create_plans_table.php index f447088..3be4efc 100644 --- a/database/migrations/2022_06_29_135450_create_plans_table.php +++ b/database/migrations/2022_06_29_135450_create_plans_table.php @@ -25,6 +25,7 @@ return new class extends Migration $table->json('packet1_options'); $table->json('packet2_options'); $table->json('packet3_options'); + $table->string('slug'); $table->timestamps(); }); } diff --git a/resources/views/livewire/plan/comment/show.blade.php b/resources/views/livewire/plan/comment/show.blade.php index e874223..5282a0a 100644 --- a/resources/views/livewire/plan/comment/show.blade.php +++ b/resources/views/livewire/plan/comment/show.blade.php @@ -1,4 +1,4 @@ -
+
@php $positivComments = $plan->byPositive(); diff --git a/routes/web.php b/routes/web.php index 2fc85cb..f27ca4a 100644 --- a/routes/web.php +++ b/routes/web.php @@ -88,7 +88,7 @@ Route::group( Route::resource('user_detailz', UserDetailzController::class); Route::resource('user', UserController::class)->only('show'); Route::resource('finance', FinanceController::class)->only(['index','show']); - Route::resource('plan', PlanController::class)->only(['create', 'show', 'index']); + Route::resource('plan', PlanController::class)->only(['create', 'show', 'index', 'edit']); Route::resource('diet', DietController::class)->only(['create', 'show', 'index', 'edit']); Route::resource('consultants', ConsultantController::class)->only([ 'index']); Route::resource('recipe', RecipeController::class)->only(['create', 'show', 'index', 'edit']); From 46c3fcc12a93a2fc379dcb5e9734e3047c4d9055 Mon Sep 17 00:00:00 2001 From: alex-chevski Date: Tue, 19 Dec 2023 23:39:56 +0300 Subject: [PATCH 10/12] reset body grade create comment fix --- app/Livewire/Plan/Comment/Create.php | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/app/Livewire/Plan/Comment/Create.php b/app/Livewire/Plan/Comment/Create.php index 3ea82ca..ea395ec 100644 --- a/app/Livewire/Plan/Comment/Create.php +++ b/app/Livewire/Plan/Comment/Create.php @@ -21,7 +21,8 @@ class Create extends Component return view('livewire.plan.comment.create'); } - public function toggle() { + public function toggle() + { $this->isChecked = !$this->isChecked; } @@ -39,7 +40,8 @@ class Create extends Component $comment->plan_id = $this->plan->id; $comment->user_id = $this->user->id; $comment->save(); - $this->reset(); + + $this->reset(['grade', 'body']); $this->toggle(); From 04e0bf66ee93871482e6f3ec0e3bb2cfd2168d4d Mon Sep 17 00:00:00 2001 From: alex-chevski Date: Wed, 20 Dec 2023 10:35:18 +0300 Subject: [PATCH 11/12] deleted unuses functional plan --- app/Http/Controllers/PlanController.php | 20 -------------------- 1 file changed, 20 deletions(-) diff --git a/app/Http/Controllers/PlanController.php b/app/Http/Controllers/PlanController.php index 0f76e56..85a98f1 100644 --- a/app/Http/Controllers/PlanController.php +++ b/app/Http/Controllers/PlanController.php @@ -16,7 +16,6 @@ class PlanController extends Controller */ public function index(Request $request) { - /* dd($request->get('author')); */ if ($request->has('author')) { $author = $request->get('author'); $user = User::find($author); @@ -25,20 +24,9 @@ class PlanController extends Controller $plans = Plan::all(); } - try{ - $this->checkArgumentsJson($plans); - }catch(\InvalidArgumentException $error){ - return back()->with('error', $error->getMessage()); - } - - return view('plan/index', ['plans' => $plans]); } - private function checkArgumentsJson($plans){ - - } - /** * Show the form for creating a new resource. * @@ -92,14 +80,6 @@ class PlanController extends Controller ); } - private function unserializeOptions($str) - { - if (preg_match('/^".*"$/', $str)) { - return json_decode(stripslashes(mb_substr($str, 1, -1)), true); - } - return json_decode(stripslashes($str), true); - } - /** * Show the form for editing the specified resource. * From be84fd983cb93e364db4bddb4bfe6d2f8ac3128d Mon Sep 17 00:00:00 2001 From: alex-chevski Date: Wed, 20 Dec 2023 10:56:10 +0300 Subject: [PATCH 12/12] added migration slug plan --- .../2022_06_29_135450_create_plans_table.php | 1 - .../2023_12_20_105039_add_slug_to_plan.php | 28 +++++++++++++++++++ 2 files changed, 28 insertions(+), 1 deletion(-) create mode 100644 database/migrations/2023_12_20_105039_add_slug_to_plan.php diff --git a/database/migrations/2022_06_29_135450_create_plans_table.php b/database/migrations/2022_06_29_135450_create_plans_table.php index 3be4efc..f447088 100644 --- a/database/migrations/2022_06_29_135450_create_plans_table.php +++ b/database/migrations/2022_06_29_135450_create_plans_table.php @@ -25,7 +25,6 @@ return new class extends Migration $table->json('packet1_options'); $table->json('packet2_options'); $table->json('packet3_options'); - $table->string('slug'); $table->timestamps(); }); } diff --git a/database/migrations/2023_12_20_105039_add_slug_to_plan.php b/database/migrations/2023_12_20_105039_add_slug_to_plan.php new file mode 100644 index 0000000..5c48db4 --- /dev/null +++ b/database/migrations/2023_12_20_105039_add_slug_to_plan.php @@ -0,0 +1,28 @@ +string('slug'); + }); + } + + /** + * Reverse the migrations. + */ + public function down(): void + { + Schema::table('plans', function (Blueprint $table) { + $table->dropColumn('slug'); + }); + } +};