testing my blade skills

LaravelDaily · Sep 7, 2023 · ccd7e65 · ccd7e65
1 parent 4b534fd
commit ccd7e65
Show file tree

Hide file tree

Showing 7 changed files with 22 additions and 9 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/resources/views/alert.blade.php b/resources/views/alert.blade.php
@@ -1,18 +1,19 @@
 <x-app-layout>
     <x-slot name="header">
         <h2 class="font-semibold text-xl text-gray-800 leading-tight">
-            {{ __('Security alert') }}
+            {{ __('Security alert')  }}
         </h2>
     </x-slot>
 
     <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">
                 <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>
         </div>
     </div>
 </x-app-layout>
+
diff --git a/resources/views/authenticated.blade.php b/resources/views/authenticated.blade.php
@@ -11,8 +11,12 @@
                 <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].
+                    @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
@@ -20,6 +20,7 @@
                             @foreach ($users as $user)
                                 <tr class="bg-red-100">
                                     {{-- Task: include file resources/views/includes/row.blade.php --}}
+                                    @include('includes.row',['user' =>$user])
                                     {{-- passing the $user variable to it --}}
                                 </tr>
                             @endforeach

diff --git a/resources/views/layout.blade.php b/resources/views/layout.blade.php
@@ -1,4 +1,4 @@
-<x-app-layout>
+@include('layouts.main')
     <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 +10,4 @@
             </div>
         </div>
     </div>
-</x-app-layout>
+
diff --git a/resources/views/rows.blade.php b/resources/views/rows.blade.php
@@ -19,15 +19,17 @@
                             </tr>
                         </thead>
                         <tbody>
+                            @php($counter=1)
                             @foreach ($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(["bg-red-100" => ($counter%2==0) ])>
+                                    <td> {{ $counter }}</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(["font-bold" => ($counter==1) ])>{{ $user->email }}</td>
                                     <td>{{ $user->created_at }}</td>
                                 </tr>
+                                @php($counter+=1)
                             @endforeach
                         </tbody>
                     </table>

diff --git a/resources/views/table.blade.php b/resources/views/table.blade.php
@@ -19,14 +19,19 @@
                         </thead>
                         {{-- Task: add the loop here to show users, or the row "No content" --}}
                         <tbody>
+                            @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>