diff --git a/app/Http/Controllers/HomeController.php b/app/Http/Controllers/HomeController.php index 3ec9546d..1ea08e52 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', compact('usersCount')); } // Task 2. Change the View code so alert would not show on the screen 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..1707ad30 100644 --- a/resources/views/authenticated.blade.php +++ b/resources/views/authenticated.blade.php @@ -11,8 +11,12 @@
{{-- 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 }}.. + @endauth + @guest No, I am not logged in. + @endguest
diff --git a/resources/views/include.blade.php b/resources/views/include.blade.php index 95d9bd6c..ed78635c 100644 --- a/resources/views/include.blade.php +++ b/resources/views/include.blade.php @@ -21,6 +21,7 @@ {{-- Task: include file resources/views/includes/row.blade.php --}} {{-- passing the $user variable to it --}} + @include('includes.row', $user) @endforeach diff --git a/resources/views/layout.blade.php b/resources/views/layout.blade.php index f8ffc5b6..1c10ac50 100644 --- a/resources/views/layout.blade.php +++ b/resources/views/layout.blade.php @@ -1,4 +1,5 @@ - +@extends('layouts.main') +@section('content')
@@ -10,4 +11,4 @@
- +@endsection diff --git a/resources/views/layouts/app.blade.php b/resources/views/layouts/app.blade.php index 9da21478..4ad59c68 100644 --- a/resources/views/layouts/app.blade.php +++ b/resources/views/layouts/app.blade.php @@ -1,3 +1,4 @@ +@props(['metaTitle' => 'Blade Test']) diff --git a/resources/views/rows.blade.php b/resources/views/rows.blade.php index 4762a090..2a47e4a6 100644 --- a/resources/views/rows.blade.php +++ b/resources/views/rows.blade.php @@ -21,12 +21,22 @@ @foreach ($users as $user) {{-- Task: only every second row should have "bg-red-100" --}} - - {{-- Task: add row number here: 1, 2, etc. --}} - {{ $user->name }} - {{-- Task: only the FIRST row should have email with "font-bold" --}} + @if ($loop->even) + + @else + + @endif + {{-- Task: add row number here: 1, 2, etc. --}} + {{ $loop->iteration }} + {{ $user->name }} + {{-- Task: only the FIRST row should have email with "font-bold" --}} + @if ($loop->first) {{ $user->email }} - {{ $user->created_at }} + @else + {{ $user->email }} + @endif + + {{ $user->created_at }} @endforeach diff --git a/resources/views/table.blade.php b/resources/views/table.blade.php index 399bf5c0..8cdbcdb6 100644 --- a/resources/views/table.blade.php +++ b/resources/views/table.blade.php @@ -19,14 +19,17 @@ {{-- 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