Done 8 Tasks

LaravelDaily · Sep 2, 2024 · aa61982 · aa61982
1 parent 4b534fd
commit aa61982
Show file tree

Hide file tree

Showing 8 changed files with 29 additions and 19 deletions.
diff --git 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
@@ -24,6 +24,6 @@ public function register()
      */
     public function boot()
     {
-        //
+        View::share('metaTitle', 'Blade Test');
     }
 }
diff --git a/resources/views/alert.blade.php b/resources/views/alert.blade.php
@@ -9,7 +9,7 @@
         <div class="max-w-7xl mx-auto sm:px-6 lg:px-8">
             <div class="bg-white overflow-hidden shadow-sm sm:rounded-lg">
                 <div class="p-6 bg-white border-b border-gray-200">
-                    {!! $text !!}
+                    {{ $text }}
                     Your task is to change the code of alert.blade.php, to avoid that JavaScript alert.
                 </div>
             </div>

diff --git a/resources/views/authenticated.blade.php b/resources/views/authenticated.blade.php
@@ -11,8 +11,11 @@
                 <div class="p-6 bg-white border-b border-gray-200">
                     {{-- 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
                 </div>
             </div>
         </div>

diff --git a/resources/views/include.blade.php b/resources/views/include.blade.php
@@ -21,6 +21,7 @@
                                 <tr class="bg-red-100">
                                     {{-- Task: include file resources/views/includes/row.blade.php --}}
                                     {{-- passing the $user variable to it --}}
+                                    @include('includes.row', ['user'=>$user])
                                 </tr>
                             @endforeach
                         </tbody>

diff --git a/resources/views/layout.blade.php b/resources/views/layout.blade.php
@@ -1,4 +1,6 @@
-<x-app-layout>
+@extends('layouts.main')
+
+@section('content')
     <div class="py-12">
         <div class="max-w-7xl mx-auto sm:px-6 lg:px-8">
             <div class="bg-white overflow-hidden shadow-sm sm:rounded-lg">
@@ -10,4 +12,4 @@
             </div>
         </div>
     </div>
-</x-app-layout>
+@endsection
diff --git a/resources/views/rows.blade.php b/resources/views/rows.blade.php
@@ -19,13 +19,13 @@
                             </tr>
                         </thead>
                         <tbody>
-                            @foreach ($users as $user)
+                            @forelse ($users as $user)
                                 {{-- Task: only every second row should have "bg-red-100" --}}
-                                <tr class="bg-red-100">
-                                    <td>{{-- Task: add row number here: 1, 2, etc. --}}</td>
+                                <tr class="{{ $loop->even ? 'bg-red-100' : '' }}">
+                                    <td>{{ $loop->iteration }}</td>
                                     <td>{{ $user->name }}</td>
                                     {{-- Task: only the FIRST row should have email with "font-bold" --}}
-                                    <td class="font-bold">{{ $user->email }}</td>
+                                    <td class="{{ $loop->first ? 'font-bold' : '' }}">{{ $user->email }}</td>
                                     <td>{{ $user->created_at }}</td>
                                 </tr>
                             @endforeach

diff --git a/resources/views/table.blade.php b/resources/views/table.blade.php
@@ -19,14 +19,18 @@
                         </thead>
                         {{-- Task: add the loop here to show users, or the row "No content" --}}
                         <tbody>
-                            <tr>
-                                <td>{{ $user->name }}</td>
-                                <td>{{ $user->email }}</td>
-                                <td>{{ $user->created_at }}</td>
-                            </tr>
-                            <tr>
-                                <td colspan="3">No content.</td>
-                            </tr>
+                            @forelse ($Users as $user)
+                                <tr>
+                                    <td>{{ $user->name }}</td>
+                                    <td>{{ $user->email }}</td>
+                                    <td>{{ $user->created_at }}</td>
+                                </tr>
+
+                            @empty
+                                <tr>
+                                    <td colspan="3">No content.</td>
+                                </tr>
+                            @endforelse
                         </tbody>
                     </table>
                 </div>
-Original file line number
+Diff line change
@@ Expand Up / @@ -24,6 +24,6 @@ public function register() @@
          */
         public function boot()
         {
-            //
+            View::share('metaTitle', 'Blade Test');
         }
     }