From ae835ced800088b3fde3cd8a214a026279027c9a Mon Sep 17 00:00:00 2001 From: OhmygoodR <109280933+OhmygoodR@users.noreply.github.com> Date: Fri, 25 Oct 2024 22:19:05 +0800 Subject: [PATCH 1/9] Update HomeController.php --- app/Http/Controllers/HomeController.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/Http/Controllers/HomeController.php b/app/Http/Controllers/HomeController.php index 3ec9546d..6f3702f3 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 From 87678cac86ae68dc9a51a11759bbdad2c05423f0 Mon Sep 17 00:00:00 2001 From: OhmygoodR <109280933+OhmygoodR@users.noreply.github.com> Date: Fri, 25 Oct 2024 22:19:49 +0800 Subject: [PATCH 2/9] Update alert.blade.php --- resources/views/alert.blade.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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.
From 20f8717d87e7679955a63f182617a824120359d5 Mon Sep 17 00:00:00 2001 From: OhmygoodR <109280933+OhmygoodR@users.noreply.github.com> Date: Fri, 25 Oct 2024 22:20:47 +0800 Subject: [PATCH 3/9] Update table.blade.php --- resources/views/table.blade.php | 3 +++ 1 file changed, 3 insertions(+) diff --git a/resources/views/table.blade.php b/resources/views/table.blade.php index 399bf5c0..1da4dea5 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" --}} + @forelse($users as $user) {{ $user->name }} {{ $user->email }} {{ $user->created_at }} + @empty No content. + @endforelse
From 11f280bcfc8ad94ccbc03552e107f03647689a06 Mon Sep 17 00:00:00 2001 From: OhmygoodR <109280933+OhmygoodR@users.noreply.github.com> Date: Fri, 25 Oct 2024 22:22:30 +0800 Subject: [PATCH 4/9] Update rows.blade.php --- resources/views/rows.blade.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/resources/views/rows.blade.php b/resources/views/rows.blade.php index 4762a090..0adbb794 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->even]) > + {{$loop->iteration}}{{-- Task: add row number here: 1, 2, etc. --}} {{ $user->name }} {{-- Task: only the FIRST row should have email with "font-bold" --}} - {{ $user->email }} + $loop->first]) >{{ $user->email }} {{ $user->created_at }} @endforeach From d2180b4640a0bdf41551870aaa01e5b77861e3ed Mon Sep 17 00:00:00 2001 From: OhmygoodR <109280933+OhmygoodR@users.noreply.github.com> Date: Fri, 25 Oct 2024 22:23:14 +0800 Subject: [PATCH 5/9] Update authenticated.blade.php --- resources/views/authenticated.blade.php | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/resources/views/authenticated.blade.php b/resources/views/authenticated.blade.php index e200ae1e..a24a0952 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
From 9976dfa7fc0dfd17db27c8c669b0ccecf6ef568b Mon Sep 17 00:00:00 2001 From: OhmygoodR <109280933+OhmygoodR@users.noreply.github.com> Date: Fri, 25 Oct 2024 22:24:00 +0800 Subject: [PATCH 6/9] Update include.blade.php --- resources/views/include.blade.php | 1 + 1 file changed, 1 insertion(+) diff --git a/resources/views/include.blade.php b/resources/views/include.blade.php index 95d9bd6c..827cef5e 100644 --- a/resources/views/include.blade.php +++ b/resources/views/include.blade.php @@ -19,6 +19,7 @@ @foreach ($users as $user) + @include('includes.row',['user'=>$user]) {{-- Task: include file resources/views/includes/row.blade.php --}} {{-- passing the $user variable to it --}} From 4830b26b48e1d7b50b2685f7f8fb241b4f228461 Mon Sep 17 00:00:00 2001 From: OhmygoodR <109280933+OhmygoodR@users.noreply.github.com> Date: Fri, 25 Oct 2024 22:25:01 +0800 Subject: [PATCH 7/9] Update AppServiceProvider.php --- app/Providers/AppServiceProvider.php | 1 + 1 file changed, 1 insertion(+) diff --git a/app/Providers/AppServiceProvider.php b/app/Providers/AppServiceProvider.php index 38c135bd..bd809582 100644 --- a/app/Providers/AppServiceProvider.php +++ b/app/Providers/AppServiceProvider.php @@ -25,5 +25,6 @@ public function register() public function boot() { // + View::share('metaTitle',"Blade Test"); } } From 5ce72860a0f9a9db04958b89f41de6be826ed826 Mon Sep 17 00:00:00 2001 From: OhmygoodR <109280933+OhmygoodR@users.noreply.github.com> Date: Fri, 25 Oct 2024 22:25:55 +0800 Subject: [PATCH 8/9] Update layout.blade.php --- resources/views/layout.blade.php | 22 +++++++++++++++++++--- 1 file changed, 19 insertions(+), 3 deletions(-) diff --git a/resources/views/layout.blade.php b/resources/views/layout.blade.php index f8ffc5b6..2cc52f24 100644 --- a/resources/views/layout.blade.php +++ b/resources/views/layout.blade.php @@ -1,5 +1,21 @@ - -
+// +//
+//
+//
+//
+// {{-- Task: change the layout from layouts/app.blade.php --}} +// {{-- to layouts/main.blade.php --}} +// Please change layout. +//
+//
+//
+//
+// + +@extends('layouts.main') + +@section('content') +
@@ -10,4 +26,4 @@
- +@endsection From 3ca072d1e8c0c7aad56d83fc17448473ad8b922e Mon Sep 17 00:00:00 2001 From: OhmygoodR <109280933+OhmygoodR@users.noreply.github.com> Date: Fri, 25 Oct 2024 22:26:05 +0800 Subject: [PATCH 9/9] Update layout.blade.php --- resources/views/layout.blade.php | 14 +------------- 1 file changed, 1 insertion(+), 13 deletions(-) diff --git a/resources/views/layout.blade.php b/resources/views/layout.blade.php index 2cc52f24..19280d13 100644 --- a/resources/views/layout.blade.php +++ b/resources/views/layout.blade.php @@ -1,16 +1,4 @@ -// -//
-//
-//
-//
-// {{-- Task: change the layout from layouts/app.blade.php --}} -// {{-- to layouts/main.blade.php --}} -// Please change layout. -//
-//
-//
-//
-// + @extends('layouts.main')