From 0299453d971418cf27c94b16948edcbd47113627 Mon Sep 17 00:00:00 2001 From: Evgeni Georgiev Date: Sun, 27 Oct 2024 12:33:35 +0200 Subject: [PATCH] main - solution to Test-Laravel-Blade-Basics --- app/Http/Controllers/HomeController.php | 2 +- resources/views/authenticated.blade.php | 7 +++++-- resources/views/include.blade.php | 1 + resources/views/layout.blade.php | 5 +++-- resources/views/layouts/app.blade.php | 2 +- resources/views/rows.blade.php | 6 +++--- resources/views/table.blade.php | 15 ++++++++++----- 7 files changed, 24 insertions(+), 14 deletions(-) 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/authenticated.blade.php b/resources/views/authenticated.blade.php index e200ae1e..b94b627d 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]. - No, I am not logged in. + @if(auth()->check()) + Yes, I am logged in as {{ auth()->user()->email }}. + @else + No, I am not logged in. + @endif
diff --git a/resources/views/include.blade.php b/resources/views/include.blade.php index 95d9bd6c..74fcb45d 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('row', ['user' => $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..282cefd2 100644 --- a/resources/views/layouts/app.blade.php +++ b/resources/views/layouts/app.blade.php @@ -6,7 +6,7 @@ {{-- Task: edit one file to pass $metaTitle as "Blade Test" to all views --}} - {{ $metaTitle ?? 'Laravel' }} + {{ $metaTitle ?? 'Blade Test' }} diff --git a/resources/views/rows.blade.php b/resources/views/rows.blade.php index 4762a090..c6b9fbb7 100644 --- a/resources/views/rows.blade.php +++ b/resources/views/rows.blade.php @@ -21,11 +21,11 @@ @foreach ($users as $user) {{-- Task: only every second row should have "bg-red-100" --}} - - {{-- Task: add row number here: 1, 2, etc. --}} + + {{ $loop->iteration }} {{ $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..296f467d 100644 --- a/resources/views/table.blade.php +++ b/resources/views/table.blade.php @@ -19,14 +19,19 @@ {{-- Task: add the loop here to show users, or the row "No content" --}} - - {{ $user->name }} - {{ $user->email }} - {{ $user->created_at }} - + @if(count($users)) + @foreach($users as $user) + + {{ $user->name }} + {{ $user->email }} + {{ $user->created_at }} + + @endforeach + @else No content. + @endif