From 4122e3e135d214ea6eb1110c73712cf6b93a05c8 Mon Sep 17 00:00:00 2001 From: maxxkim Date: Thu, 14 Dec 2023 15:19:47 +0300 Subject: [PATCH 01/14] Added seeder for Recipe and registered in DatabaseSeeder --- database/seeders/DatabaseSeeder.php | 1 + database/seeders/RecipeSeeder.php | 49 +++++++++++++++++++++++++++++ 2 files changed, 50 insertions(+) create mode 100644 database/seeders/RecipeSeeder.php diff --git a/database/seeders/DatabaseSeeder.php b/database/seeders/DatabaseSeeder.php index a8222ee..a346b78 100644 --- a/database/seeders/DatabaseSeeder.php +++ b/database/seeders/DatabaseSeeder.php @@ -16,6 +16,7 @@ class DatabaseSeeder extends Seeder { $this->call(PlanSeeder::class); $this->call(UserSeeder::class); + $this->call(RecipeSeeder::class); // \App\Models\User::factory(10)->create(); } } diff --git a/database/seeders/RecipeSeeder.php b/database/seeders/RecipeSeeder.php new file mode 100644 index 0000000..23724b1 --- /dev/null +++ b/database/seeders/RecipeSeeder.php @@ -0,0 +1,49 @@ +image = $faker->imageUrl(640, 480, 'food'); + $recipe->state = 'active'; + $recipe->type = $faker->randomElement(['first_meals', 'second_meals', 'salads', 'snacks', 'drinks', 'other']); + $recipe->title = $faker->sentence(5); + $recipe->video_url = $faker->url; + $recipe->cooking_time = $faker->randomElement([10,20,30,60,120,14400]); + $recipe->description = $faker->text(200); + $recipe->steps = [ + ['image' => $faker->imageUrl(640, 480, 'food'), 'description' => $faker->text(100)], + ['image' => $faker->imageUrl(640, 480, 'food'), 'description' => $faker->text(100)], + ['image' => $faker->imageUrl(640, 480, 'food'), 'description' => $faker->text(100)] + ]; + $recipe->ingredients = [ + ['name' => $faker->word, 'portion' => $faker->numberBetween(1, 20), 'unit' => $faker->randomElement(['teespoon', 'tablespoon', 'ml', 'pcs', 'clove', 'to_taste'])], + ['name' => $faker->word, 'portion' => $faker->numberBetween(1, 20), 'unit' => $faker->randomElement(['teespoon', 'tablespoon', 'ml', 'pcs', 'clove', 'to_taste'])], + ['name' => $faker->word, 'portion' => $faker->numberBetween(1, 20), 'unit' => $faker->randomElement(['teespoon', 'tablespoon', 'ml', 'pcs', 'clove', 'to_taste'])], + ]; + $recipe->save(); + DB::table('recipe_author')->insert([ + 'recipe_id' => $recipe->id, + 'user_id' => 3 + ]); + } + + } +} From 1aaa7964ca54304cb9deb59b1a2b453ef1a01d2d Mon Sep 17 00:00:00 2001 From: maxxkim Date: Thu, 14 Dec 2023 15:23:37 +0300 Subject: [PATCH 02/14] Author is now random --- database/seeders/RecipeSeeder.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/database/seeders/RecipeSeeder.php b/database/seeders/RecipeSeeder.php index 23724b1..9a81c00 100644 --- a/database/seeders/RecipeSeeder.php +++ b/database/seeders/RecipeSeeder.php @@ -6,6 +6,7 @@ use Illuminate\Database\Console\Seeds\WithoutModelEvents; use Illuminate\Database\Seeder; use App\Models\Recipe; use App\Models\RecipeAuthor; +use App\Models\User; use Faker\Factory as FakerFaktory; use DB; @@ -41,7 +42,7 @@ class RecipeSeeder extends Seeder $recipe->save(); DB::table('recipe_author')->insert([ 'recipe_id' => $recipe->id, - 'user_id' => 3 + 'user_id' => User::inRandomOrder()->first()->id ]); } From ee3a6e21423144155661bcba095778425b685e31 Mon Sep 17 00:00:00 2001 From: maxxkim Date: Thu, 14 Dec 2023 16:07:55 +0300 Subject: [PATCH 03/14] Removed direct database query, used attach() method on User instead --- database/seeders/RecipeSeeder.php | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/database/seeders/RecipeSeeder.php b/database/seeders/RecipeSeeder.php index 9a81c00..b92f020 100644 --- a/database/seeders/RecipeSeeder.php +++ b/database/seeders/RecipeSeeder.php @@ -40,11 +40,7 @@ class RecipeSeeder extends Seeder ['name' => $faker->word, 'portion' => $faker->numberBetween(1, 20), 'unit' => $faker->randomElement(['teespoon', 'tablespoon', 'ml', 'pcs', 'clove', 'to_taste'])], ]; $recipe->save(); - DB::table('recipe_author')->insert([ - 'recipe_id' => $recipe->id, - 'user_id' => User::inRandomOrder()->first()->id - ]); + User::inRandomOrder()->first()->author_of_recipe()->attach($recipe->id); } - } } From b782272d9832e129f07f14febb53171b62f08376 Mon Sep 17 00:00:00 2001 From: maxxkim Date: Fri, 15 Dec 2023 10:47:19 +0300 Subject: [PATCH 04/14] Seeder images --- database/seeders/RecipeSeeder.php | 25 ++++++++++++++----- .../views/livewire/recipe/list-view.blade.php | 2 +- 2 files changed, 20 insertions(+), 7 deletions(-) diff --git a/database/seeders/RecipeSeeder.php b/database/seeders/RecipeSeeder.php index b92f020..c4fb37f 100644 --- a/database/seeders/RecipeSeeder.php +++ b/database/seeders/RecipeSeeder.php @@ -7,7 +7,7 @@ use Illuminate\Database\Seeder; use App\Models\Recipe; use App\Models\RecipeAuthor; use App\Models\User; -use Faker\Factory as FakerFaktory; +use Faker\Factory as FakerFactory; use DB; class RecipeSeeder extends Seeder @@ -19,10 +19,11 @@ class RecipeSeeder extends Seeder */ public function run() { - $faker = FakerFaktory::create(); + $faker = FakerFactory::create(); + $images = []; for ($i = 0; $i < 10; $i++) { $recipe = new Recipe(); - $recipe->image = $faker->imageUrl(640, 480, 'food'); + $recipe->image = $this->downloadRandomImage(); $recipe->state = 'active'; $recipe->type = $faker->randomElement(['first_meals', 'second_meals', 'salads', 'snacks', 'drinks', 'other']); $recipe->title = $faker->sentence(5); @@ -30,9 +31,9 @@ class RecipeSeeder extends Seeder $recipe->cooking_time = $faker->randomElement([10,20,30,60,120,14400]); $recipe->description = $faker->text(200); $recipe->steps = [ - ['image' => $faker->imageUrl(640, 480, 'food'), 'description' => $faker->text(100)], - ['image' => $faker->imageUrl(640, 480, 'food'), 'description' => $faker->text(100)], - ['image' => $faker->imageUrl(640, 480, 'food'), 'description' => $faker->text(100)] + ['image' => $this->downloadRandomImage(), 'description' => $faker->text(100)], + ['image' => $this->downloadRandomImage(), 'description' => $faker->text(100)], + ['image' => $this->downloadRandomImage(), 'description' => $faker->text(100)] ]; $recipe->ingredients = [ ['name' => $faker->word, 'portion' => $faker->numberBetween(1, 20), 'unit' => $faker->randomElement(['teespoon', 'tablespoon', 'ml', 'pcs', 'clove', 'to_taste'])], @@ -42,5 +43,17 @@ class RecipeSeeder extends Seeder $recipe->save(); User::inRandomOrder()->first()->author_of_recipe()->attach($recipe->id); } + + + } + public function downloadRandomImage(): string + { + $faker = FakerFactory::create(); + $url = $faker->imageUrl(640, 480, 'food', true); + $contents = file_get_contents($url); + $path = 'recipe/' . uniqid() . '.jpg'; + file_put_contents(storage_path('app/public/' . $path), $contents); + + return $path; } } diff --git a/resources/views/livewire/recipe/list-view.blade.php b/resources/views/livewire/recipe/list-view.blade.php index e6e5a37..9deff42 100644 --- a/resources/views/livewire/recipe/list-view.blade.php +++ b/resources/views/livewire/recipe/list-view.blade.php @@ -27,7 +27,7 @@ @if(is_null($image)) formats @else - recipe + recipe @endif From 8b417a9ff5b0b6108bb0b82d4f8b954f3e912657 Mon Sep 17 00:00:00 2001 From: maxxkim Date: Fri, 15 Dec 2023 10:48:36 +0300 Subject: [PATCH 05/14] Seeder minor fix --- resources/views/livewire/recipe/list-view.blade.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/views/livewire/recipe/list-view.blade.php b/resources/views/livewire/recipe/list-view.blade.php index 9deff42..e6e5a37 100644 --- a/resources/views/livewire/recipe/list-view.blade.php +++ b/resources/views/livewire/recipe/list-view.blade.php @@ -27,7 +27,7 @@ @if(is_null($image)) formats @else - recipe + recipe @endif From 14e0f36e7646f5b115a861a41b1034031d71cf2b Mon Sep 17 00:00:00 2001 From: maxxkim Date: Fri, 15 Dec 2023 11:56:03 +0300 Subject: [PATCH 06/14] Path exists validation --- database/seeders/RecipeSeeder.php | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/database/seeders/RecipeSeeder.php b/database/seeders/RecipeSeeder.php index c4fb37f..939c789 100644 --- a/database/seeders/RecipeSeeder.php +++ b/database/seeders/RecipeSeeder.php @@ -51,7 +51,11 @@ class RecipeSeeder extends Seeder $faker = FakerFactory::create(); $url = $faker->imageUrl(640, 480, 'food', true); $contents = file_get_contents($url); + $dir_path = storage_path('app/public/recipe'); $path = 'recipe/' . uniqid() . '.jpg'; + if (!file_exists( $dir_path)) { + mkdir( $dir_path, 0777, true); + } file_put_contents(storage_path('app/public/' . $path), $contents); return $path; From e887e5eae132fabbb21b33244dc8a8b58f5fa121 Mon Sep 17 00:00:00 2001 From: maxxkim Date: Fri, 15 Dec 2023 14:04:01 +0300 Subject: [PATCH 07/14] Added comments to RecipeSeeder --- database/seeders/RecipeSeeder.php | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/database/seeders/RecipeSeeder.php b/database/seeders/RecipeSeeder.php index 939c789..5120977 100644 --- a/database/seeders/RecipeSeeder.php +++ b/database/seeders/RecipeSeeder.php @@ -5,6 +5,7 @@ use Illuminate\Support\Facades\Storage; use Illuminate\Database\Console\Seeds\WithoutModelEvents; use Illuminate\Database\Seeder; use App\Models\Recipe; +use App\Models\RecipeComment; use App\Models\RecipeAuthor; use App\Models\User; use Faker\Factory as FakerFactory; @@ -41,6 +42,14 @@ class RecipeSeeder extends Seeder ['name' => $faker->word, 'portion' => $faker->numberBetween(1, 20), 'unit' => $faker->randomElement(['teespoon', 'tablespoon', 'ml', 'pcs', 'clove', 'to_taste'])], ]; $recipe->save(); + for ($j = 0; $j < 10; $j++) { + $comment = new RecipeComment(); + $comment->user_id = User::inRandomOrder()->first()->id; + $comment->recipe_id = $recipe->id; + $comment->grade = $faker->randomElement([1,2,3,4,5]); + $comment->body = $faker->text(100); + $comment->save(); + } User::inRandomOrder()->first()->author_of_recipe()->attach($recipe->id); } From d0384287b9d1b041a38baf8b66718d173aaffbaf Mon Sep 17 00:00:00 2001 From: apoloz Date: Fri, 15 Dec 2023 13:46:06 +0000 Subject: [PATCH 08/14] fix stock auth layouts --- resources/views/auth/confirm-password.blade.php | 3 +++ resources/views/auth/forgot-password.blade.php | 3 +++ resources/views/auth/login.blade.php | 4 ++++ resources/views/auth/register.blade.php | 3 +++ resources/views/auth/reset-password.blade.php | 3 +++ resources/views/auth/two-factor-challenge.blade.php | 3 +++ resources/views/auth/verify-email.blade.php | 3 +++ resources/views/layouts/guest.blade.php | 1 + 8 files changed, 23 insertions(+) diff --git a/resources/views/auth/confirm-password.blade.php b/resources/views/auth/confirm-password.blade.php index ccc4b28..33905ff 100644 --- a/resources/views/auth/confirm-password.blade.php +++ b/resources/views/auth/confirm-password.blade.php @@ -1,4 +1,7 @@ + @push('css_head') + + @endpush diff --git a/resources/views/auth/forgot-password.blade.php b/resources/views/auth/forgot-password.blade.php index 0097654..aba7922 100644 --- a/resources/views/auth/forgot-password.blade.php +++ b/resources/views/auth/forgot-password.blade.php @@ -1,4 +1,7 @@ + @push('css_head') + + @endpush diff --git a/resources/views/auth/login.blade.php b/resources/views/auth/login.blade.php index 0c5902d..991b1ef 100644 --- a/resources/views/auth/login.blade.php +++ b/resources/views/auth/login.blade.php @@ -1,4 +1,8 @@ + + @push('css_head') + + @endpush diff --git a/resources/views/auth/register.blade.php b/resources/views/auth/register.blade.php index 8a5f240..6681119 100644 --- a/resources/views/auth/register.blade.php +++ b/resources/views/auth/register.blade.php @@ -1,4 +1,7 @@ + @push('css_head') + + @endpush diff --git a/resources/views/auth/reset-password.blade.php b/resources/views/auth/reset-password.blade.php index 5991e3e..daeee33 100644 --- a/resources/views/auth/reset-password.blade.php +++ b/resources/views/auth/reset-password.blade.php @@ -1,4 +1,7 @@ + @push('css_head') + + @endpush diff --git a/resources/views/auth/two-factor-challenge.blade.php b/resources/views/auth/two-factor-challenge.blade.php index eec9264..da87857 100644 --- a/resources/views/auth/two-factor-challenge.blade.php +++ b/resources/views/auth/two-factor-challenge.blade.php @@ -1,4 +1,7 @@ + @push('css_head') + + @endpush diff --git a/resources/views/auth/verify-email.blade.php b/resources/views/auth/verify-email.blade.php index 59669c6..0ec4cbc 100644 --- a/resources/views/auth/verify-email.blade.php +++ b/resources/views/auth/verify-email.blade.php @@ -1,4 +1,7 @@ + @push('css_head') + + @endpush diff --git a/resources/views/layouts/guest.blade.php b/resources/views/layouts/guest.blade.php index fa10db7..1f7f378 100644 --- a/resources/views/layouts/guest.blade.php +++ b/resources/views/layouts/guest.blade.php @@ -16,6 +16,7 @@ + @stack('css_head') @livewireStyles From 6c48c062a4f2768364166b8c73a7c50d55aaa8b8 Mon Sep 17 00:00:00 2001 From: apoloz Date: Fri, 15 Dec 2023 14:53:43 +0000 Subject: [PATCH 09/14] fix app layout --- resources/views/blog_post/index.blade.php | 6 ++++++ resources/views/chat/index.blade.php | 6 ++++++ resources/views/consultant/index.blade.php | 2 ++ resources/views/consultant/list.blade.php | 5 +++++ resources/views/diet/index.blade.php | 6 ++++++ resources/views/plan/index.blade.php | 5 +++++ resources/views/profile/index.blade.php | 5 +++++ resources/views/recipe/index.blade.php | 9 ++++++--- 8 files changed, 41 insertions(+), 3 deletions(-) diff --git a/resources/views/blog_post/index.blade.php b/resources/views/blog_post/index.blade.php index a676513..6fc52c6 100644 --- a/resources/views/blog_post/index.blade.php +++ b/resources/views/blog_post/index.blade.php @@ -8,3 +8,9 @@ @endpush +@push('css_head') + + + +@endpush + diff --git a/resources/views/chat/index.blade.php b/resources/views/chat/index.blade.php index f7a1289..d4e3f9b 100644 --- a/resources/views/chat/index.blade.php +++ b/resources/views/chat/index.blade.php @@ -1,5 +1,11 @@ @extends('layouts/eatvio') @section('page_title', 'Chat') +@push('css_head') + + + +@endpush + @section('main_section')
diff --git a/resources/views/consultant/index.blade.php b/resources/views/consultant/index.blade.php index 42d1a5f..5c1a6dd 100644 --- a/resources/views/consultant/index.blade.php +++ b/resources/views/consultant/index.blade.php @@ -1,4 +1,6 @@ @extends('layouts/eatvio') + + @section('main_section')
diff --git a/resources/views/consultant/list.blade.php b/resources/views/consultant/list.blade.php index 42d1a5f..855ffac 100644 --- a/resources/views/consultant/list.blade.php +++ b/resources/views/consultant/list.blade.php @@ -1,4 +1,9 @@ @extends('layouts/eatvio') +@push('css_head') + + + +@endpush @section('main_section')
diff --git a/resources/views/diet/index.blade.php b/resources/views/diet/index.blade.php index 9e1dd9c..8c87b10 100644 --- a/resources/views/diet/index.blade.php +++ b/resources/views/diet/index.blade.php @@ -9,6 +9,12 @@ $mealNames = ['breakfast', 'dinner', 'supper', 'lunch', 'snacks']; @endphp +@push('css_head') + + + +@endpush + @section('main_section')
diff --git a/resources/views/plan/index.blade.php b/resources/views/plan/index.blade.php index c0790fe..7be4fc3 100644 --- a/resources/views/plan/index.blade.php +++ b/resources/views/plan/index.blade.php @@ -2,6 +2,11 @@ @php $typeToSvgId = ['slim' => '#SlimBig', 'fit' => '#FitBig', 'wellness' => '#WellnessBig', 'behavior' => '#BehaviorBig']; @endphp +@push('css_head') + + + +@endpush @section('main_section')
diff --git a/resources/views/profile/index.blade.php b/resources/views/profile/index.blade.php index 28209c4..223fa66 100644 --- a/resources/views/profile/index.blade.php +++ b/resources/views/profile/index.blade.php @@ -1,5 +1,10 @@ @extends('layouts/eatvio') @section('page_title', $user->name ." Profile") +@push('css_head') + + + +@endpush @section('main_section')
diff --git a/resources/views/recipe/index.blade.php b/resources/views/recipe/index.blade.php index 148c746..d08699d 100644 --- a/resources/views/recipe/index.blade.php +++ b/resources/views/recipe/index.blade.php @@ -3,7 +3,10 @@ @endsection @section('page_title', 'Recipes list') -@push('jq_scripts') - - + +@push('css_head') + + + @endpush + From aec022399082f182ecfd8a5d5db34268b5a590e3 Mon Sep 17 00:00:00 2001 From: Anatoliy Poloz Date: Mon, 18 Dec 2023 10:35:54 +0300 Subject: [PATCH 10/14] git action update --- .gitea/workflows/demo.yaml | 19 ------------ .gitea/workflows/test.yaml | 61 +++++++++++++++++++++++++++++++++++--- 2 files changed, 57 insertions(+), 23 deletions(-) delete mode 100644 .gitea/workflows/demo.yaml diff --git a/.gitea/workflows/demo.yaml b/.gitea/workflows/demo.yaml deleted file mode 100644 index 7edbde4..0000000 --- a/.gitea/workflows/demo.yaml +++ /dev/null @@ -1,19 +0,0 @@ -name: Gitea Actions Demo -run-name: ${{ gitea.actor }} is testing out Gitea Actions -on: [push] - -jobs: - Explore-Gitea-Actions: - runs-on: ubuntu-latest - steps: - - run: echo "🎉 The job was automatically triggered by a ${{ gitea.event_name }} event." - - run: echo "🐧 This job is now running on a ${{ runner.os }} server hosted by Gitea!" - - run: echo "🔎 The name of your branch is ${{ gitea.ref }} and your repository is ${{ gitea.repository }}." - - name: Check out repository code - uses: actions/checkout@v3 - - run: echo "💡 The ${{ gitea.repository }} repository has been cloned to the runner." - - run: echo "The workflow is now ready to test your code on the runner." - - name: List files in the repository - run: | - ls ${{ gitea.workspace }} - - run: echo "🍏 This job's status is ${{ job.status }}." diff --git a/.gitea/workflows/test.yaml b/.gitea/workflows/test.yaml index f9068b8..8dfdb40 100644 --- a/.gitea/workflows/test.yaml +++ b/.gitea/workflows/test.yaml @@ -1,13 +1,66 @@ -name: 'Test new actor runner 1.0' +name: 'Test new actor runner 1.1' on: [push] jobs: test: runs-on: ubuntu-latest name: Test + env: + extensions: gd, sqlite3 + php-version: '8.2' + key: cache-v1 # can be any string, change to clear the extension cache. steps: - uses: actions/checkout@v3 - - uses: apoloz/laravel-test-runner@v1.1.13 + + - name: Setup cache environment + id: extcache + uses: shivammathur/cache-extensions@v1 with: - php-version: 8.2 - setup: 'true' \ No newline at end of file + php-version: ${{ php-version }} + extensions: ${{ env.extensions }} + key: ${{ env.key }} + + - name: Cache extensions + uses: actions/cache@v3 + with: + path: ${{ steps.extcache.outputs.dir }} + key: ${{ steps.extcache.outputs.key }} + restore-keys: ${{ steps.extcache.outputs.key }} + + - name: Setup PHP + uses: shivammathur/setup-php@v2 + with: + php-version: ${{ php-version }} + extensions: ${{ env.extensions }} + coverage: none + + - name: Get composer cache directory + id: composer-cache + run: | + echo "dir=$(composer config cache-files-dir)" + echo "ls -la" + echo "composerhash=$(md5sum composer.lock|awk '{print $1}')" >> $GITHUB_OUTPUT + echo "dir=$(composer config cache-files-dir)" >> $GITHUB_OUTPUT + + - name: Cache composer dependencies + uses: actions/cache@v3 + with: + path: ${{ steps.composer-cache.outputs.dir }} + # Use composer.json for key, if composer.lock is not committed. + # key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.json') }} + key: ${{ runner.os }}-composer-${{ steps.composer-cache.outputs.composerhash }} + restore-keys: ${{ runner.os }}-composer- + + - name: Install composer dependencies + env: + COMPOSER_AUTH: '{"github-oauth": {"github.com": "${{ vars.GH_KEY }}"} }' + run: composer install + + - name: Run test + run: vendor/bin/phpunit + + # - name: Run Pint + # run: vendor/bin/pint + # + # - name: Run Static Analysis + # run: composer static-analysis From 9328dfa9426dbb2ac84a5c1fdf26bb64a41dca5a Mon Sep 17 00:00:00 2001 From: Anatoliy Poloz Date: Mon, 18 Dec 2023 10:39:10 +0300 Subject: [PATCH 11/14] git action update#2 --- .gitea/workflows/test.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitea/workflows/test.yaml b/.gitea/workflows/test.yaml index 8dfdb40..7e3fdbd 100644 --- a/.gitea/workflows/test.yaml +++ b/.gitea/workflows/test.yaml @@ -14,7 +14,7 @@ jobs: - name: Setup cache environment id: extcache - uses: shivammathur/cache-extensions@v1 + uses: apoloz/cache-extensions@v1 with: php-version: ${{ php-version }} extensions: ${{ env.extensions }} @@ -28,7 +28,7 @@ jobs: restore-keys: ${{ steps.extcache.outputs.key }} - name: Setup PHP - uses: shivammathur/setup-php@v2 + uses: apoloz/setup-php@v2 with: php-version: ${{ php-version }} extensions: ${{ env.extensions }} From f2c8d46601c52153f098eac9c36e4806c676ab1a Mon Sep 17 00:00:00 2001 From: Anatoliy Poloz Date: Mon, 18 Dec 2023 12:48:20 +0300 Subject: [PATCH 12/14] RecipeSeeder removed becose of breaking test speed, rewriteng needed --- database/seeders/RecipeSeeder.php | 72 ------------------------------- 1 file changed, 72 deletions(-) delete mode 100644 database/seeders/RecipeSeeder.php diff --git a/database/seeders/RecipeSeeder.php b/database/seeders/RecipeSeeder.php deleted file mode 100644 index 5120977..0000000 --- a/database/seeders/RecipeSeeder.php +++ /dev/null @@ -1,72 +0,0 @@ -image = $this->downloadRandomImage(); - $recipe->state = 'active'; - $recipe->type = $faker->randomElement(['first_meals', 'second_meals', 'salads', 'snacks', 'drinks', 'other']); - $recipe->title = $faker->sentence(5); - $recipe->video_url = $faker->url; - $recipe->cooking_time = $faker->randomElement([10,20,30,60,120,14400]); - $recipe->description = $faker->text(200); - $recipe->steps = [ - ['image' => $this->downloadRandomImage(), 'description' => $faker->text(100)], - ['image' => $this->downloadRandomImage(), 'description' => $faker->text(100)], - ['image' => $this->downloadRandomImage(), 'description' => $faker->text(100)] - ]; - $recipe->ingredients = [ - ['name' => $faker->word, 'portion' => $faker->numberBetween(1, 20), 'unit' => $faker->randomElement(['teespoon', 'tablespoon', 'ml', 'pcs', 'clove', 'to_taste'])], - ['name' => $faker->word, 'portion' => $faker->numberBetween(1, 20), 'unit' => $faker->randomElement(['teespoon', 'tablespoon', 'ml', 'pcs', 'clove', 'to_taste'])], - ['name' => $faker->word, 'portion' => $faker->numberBetween(1, 20), 'unit' => $faker->randomElement(['teespoon', 'tablespoon', 'ml', 'pcs', 'clove', 'to_taste'])], - ]; - $recipe->save(); - for ($j = 0; $j < 10; $j++) { - $comment = new RecipeComment(); - $comment->user_id = User::inRandomOrder()->first()->id; - $comment->recipe_id = $recipe->id; - $comment->grade = $faker->randomElement([1,2,3,4,5]); - $comment->body = $faker->text(100); - $comment->save(); - } - User::inRandomOrder()->first()->author_of_recipe()->attach($recipe->id); - } - - - } - public function downloadRandomImage(): string - { - $faker = FakerFactory::create(); - $url = $faker->imageUrl(640, 480, 'food', true); - $contents = file_get_contents($url); - $dir_path = storage_path('app/public/recipe'); - $path = 'recipe/' . uniqid() . '.jpg'; - if (!file_exists( $dir_path)) { - mkdir( $dir_path, 0777, true); - } - file_put_contents(storage_path('app/public/' . $path), $contents); - - return $path; - } -} From 48dc60127c7f2f885c72c8fe3cf1728b4205eb1f Mon Sep 17 00:00:00 2001 From: Anatoliy Poloz Date: Mon, 18 Dec 2023 12:54:53 +0300 Subject: [PATCH 13/14] RecipeSeeder removed from DatabaseSeeder. --- database/seeders/DatabaseSeeder.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/database/seeders/DatabaseSeeder.php b/database/seeders/DatabaseSeeder.php index a346b78..b112279 100644 --- a/database/seeders/DatabaseSeeder.php +++ b/database/seeders/DatabaseSeeder.php @@ -16,7 +16,7 @@ class DatabaseSeeder extends Seeder { $this->call(PlanSeeder::class); $this->call(UserSeeder::class); - $this->call(RecipeSeeder::class); + // $this->call(RecipeSeeder::class); // \App\Models\User::factory(10)->create(); } } From bbe27efb6d54b26dd33b977eb41bb004400f89f8 Mon Sep 17 00:00:00 2001 From: Anatoliy Poloz Date: Mon, 18 Dec 2023 12:56:49 +0300 Subject: [PATCH 14/14] Recipe/EditTest cos rewriting neede --- tests/Feature/Recipe/EditTest.php | 105 ------------------------------ 1 file changed, 105 deletions(-) delete mode 100644 tests/Feature/Recipe/EditTest.php diff --git a/tests/Feature/Recipe/EditTest.php b/tests/Feature/Recipe/EditTest.php deleted file mode 100644 index 8978f9c..0000000 --- a/tests/Feature/Recipe/EditTest.php +++ /dev/null @@ -1,105 +0,0 @@ -create(); - $recipe = Recipe::factory()->create([ - 'steps' => [], - 'ingredients' => [], - ]); - $tag1 = Tag::factory()->create(); - $tag2 = Tag::factory()->create(); - - $title = $faker->sentence(3); - $description = $faker->paragraph(2); - $cooking_time = $faker->numberBetween(10, 120); - $type = $faker->randomElement(['Main Dish', 'Dessert', 'Appetizer']); - $video_url = $faker->url; - $image = UploadedFile::fake()->image('new_image.jpg'); - $ingredients_names = [$faker->word, $faker->word, $faker->word]; - $ingredients_portions = [$faker->numberBetween(1, 500), $faker->numberBetween(1, 500), $faker->numberBetween(1, 500)]; - $ingredient_units = [$faker->randomElement(['gr', 'ml', 'pcs']), $faker->randomElement(['gr', 'ml', 'pcs']), $faker->randomElement(['gr', 'ml', 'pcs'])]; - - Livewire::actingAs($user) - ->test('recipe.edit', ['recipe' => $recipe]) - ->set('title', $title) - ->set('description', $description) - ->set('cooking_time', $cooking_time) - ->set('type', $type) - ->set('video_url', $video_url) - ->set('image', $image) - ->set('tags', [$tag1->id, $tag2->id]) - ->call('addIngredient') - ->set('ingredients_name.0', $ingredients_names[0]) - ->set('ingredients_portion.0', $ingredients_portions[0]) - ->set('ingredients_unit.0', $ingredient_units[0]) - ->call('addIngredient') - ->set('ingredients_name.1', $ingredients_names[1]) - ->set('ingredients_portion.1', $ingredients_portions[1]) - ->set('ingredients_unit.1', $ingredient_units[1]) - ->call('addIngredient') - ->set('ingredients_name.2', $ingredients_names[2]) - ->set('ingredients_portion.2', $ingredients_portions[2]) - ->set('ingredients_unit.2', $ingredient_units[2]) - ->call('addStep') - ->set('steps.0.description', $faker->paragraph) - ->set('steps.0.image', UploadedFile::fake()->image('new_step_image0.jpg')) - ->call('addStep') - ->set('steps.1.description', $faker->paragraph) - ->set('steps.1.image', UploadedFile::fake()->image('new_step_image1.jpg')) - ->call('addStep') - ->set('steps.2.description', $faker->paragraph) - ->set('steps.2.image', UploadedFile::fake()->image('new_step_image2.jpg')) - ->call('publish'); - - $this->assertDatabaseHas('recipes', [ - 'title' => $title, - 'description' => $description, - 'cooking_time' => $cooking_time, - 'type' => $type, - 'video_url' => $video_url, - 'image' => $image, - 'ingredients_name.0' => $ingredients_names[0], - 'ingredients_portion.0' => $ingredients_portions[0], - 'ingredients_unit.0' => $ingredient_units[0], - 'ingredients_name.1' => $ingredients_names[1], - 'ingredients_portion.1' => $ingredients_portions[1], - 'ingredients_unit.1' => $ingredient_units[1], - 'ingredients_name.2' => $ingredients_names[2], - 'ingredients_portion.2' => $ingredients_portions[2], - 'ingredients_unit.2' => $ingredient_units[2], - ]); - - $this->assertDatabaseHas('tags', [ - 'id' => $tag1->id, - ]); - $this->assertDatabaseHas('tags', [ - 'id' => $tag2->id, - ]); - - Storage::disk('public')->assertExists('recipes/new_image.jpg'); - Storage::disk('public')->assertExists('steps/new_step_image0.jpg'); - Storage::disk('public')->assertExists('steps/new_step_image1.jpg'); - Storage::disk('public')->assertExists('steps/new_step_image2.jpg'); - } -}