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..7e3fdbd 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: apoloz/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: apoloz/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 diff --git a/database/seeders/DatabaseSeeder.php b/database/seeders/DatabaseSeeder.php index a8222ee..b112279 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/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/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/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 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 + 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'); - } -}