From 2e3c3e0dabc5a39f7bc69ef380350cc10eaae701 Mon Sep 17 00:00:00 2001 From: anne-maina Date: Thu, 14 Nov 2024 11:49:53 +0300 Subject: [PATCH] Completed blade tasks --- app/Http/Controllers/HomeController.php | 2 +- app/Providers/AppServiceProvider.php | 3 ++- resources/views/alert.blade.php | 2 +- resources/views/authenticated.blade.php | 5 ++++- resources/views/include.blade.php | 3 ++- resources/views/layout.blade.php | 4 ++-- resources/views/rows.blade.php | 10 ++++++---- resources/views/table.blade.php | 23 +++++++++++++---------- 8 files changed, 31 insertions(+), 21 deletions(-) diff --git a/app/Http/Controllers/HomeController.php b/app/Http/Controllers/HomeController.php index 3ec9546d..85e836b0 100644 --- a/app/Http/Controllers/HomeController.php +++ b/app/Http/Controllers/HomeController.php @@ -11,7 +11,7 @@ public function users() { $usersCount = User::count(); - return view('users'); + return view('users', ['usersCount' => $usersCount]); } // Task 2. Change the View code so alert would not show on the screen diff --git a/app/Providers/AppServiceProvider.php b/app/Providers/AppServiceProvider.php index 38c135bd..636cfb5f 100644 --- a/app/Providers/AppServiceProvider.php +++ b/app/Providers/AppServiceProvider.php @@ -24,6 +24,7 @@ public function register() */ public function boot() { - // + // Pass $metaTitle as "Blade Test" to all views + view()->share('metaTitle', 'Blade Test'); } } diff --git a/resources/views/alert.blade.php b/resources/views/alert.blade.php index 68bf0b9d..2980b456 100644 --- a/resources/views/alert.blade.php +++ b/resources/views/alert.blade.php @@ -9,7 +9,7 @@
- {!! $text !!} + {{ $text }} Your task is to change the code of alert.blade.php, to avoid that JavaScript alert.
diff --git a/resources/views/authenticated.blade.php b/resources/views/authenticated.blade.php index e200ae1e..1947859b 100644 --- a/resources/views/authenticated.blade.php +++ b/resources/views/authenticated.blade.php @@ -11,8 +11,11 @@
{{-- Task: add a condition to show correct text --}} {{-- If user is logged in, show their email --}} - Yes, I am logged in as [insert_user_email_here]. + @auth + Yes, I am logged in as {{ auth()->user()->email }}. + @else No, I am not logged in. + @endauth
diff --git a/resources/views/include.blade.php b/resources/views/include.blade.php index 95d9bd6c..d8d66cf7 100644 --- a/resources/views/include.blade.php +++ b/resources/views/include.blade.php @@ -21,8 +21,9 @@ {{-- Task: include file resources/views/includes/row.blade.php --}} {{-- passing the $user variable to it --}} + @include('includes.row', ['user' => $user]) - @endforeach + @endforeach diff --git a/resources/views/layout.blade.php b/resources/views/layout.blade.php index f8ffc5b6..9352a495 100644 --- a/resources/views/layout.blade.php +++ b/resources/views/layout.blade.php @@ -1,4 +1,4 @@ - +@extends('layouts.main')
@@ -10,4 +10,4 @@
-
+ diff --git a/resources/views/rows.blade.php b/resources/views/rows.blade.php index 4762a090..37acf111 100644 --- a/resources/views/rows.blade.php +++ b/resources/views/rows.blade.php @@ -19,13 +19,15 @@ - @foreach ($users as $user) + @foreach ($users as $index => $user) {{-- Task: only every second row should have "bg-red-100" --}} - - {{-- Task: add row number here: 1, 2, etc. --}} + + {{-- Task: add row number here: 1, 2, etc. --}} + {{ $index + 1 }} + {{ $user->name }} {{-- Task: only the FIRST row should have email with "font-bold" --}} - {{ $user->email }} + {{ $user->email }} {{ $user->created_at }} @endforeach diff --git a/resources/views/table.blade.php b/resources/views/table.blade.php index 399bf5c0..f571c0e4 100644 --- a/resources/views/table.blade.php +++ b/resources/views/table.blade.php @@ -18,16 +18,19 @@ {{-- Task: add the loop here to show users, or the row "No content" --}} - - - {{ $user->name }} - {{ $user->email }} - {{ $user->created_at }} - - - No content. - - + + @forelse($users as $user) + + {{ $user->name }} + {{ $user->email }} + {{ $user->created_at }} + + @empty + + No content. + + @endforelse +