From 10784b4d8357a186dd1158e98ac6313ddd35b26f Mon Sep 17 00:00:00 2001 From: Donald <154738239+DonaldFon@users.noreply.github.com> Date: Fri, 27 Dec 2024 01:41:34 +0800 Subject: [PATCH 01/10] 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 759c45589246ee87137b0dc1c2a0798f270f726a Mon Sep 17 00:00:00 2001 From: Donald <154738239+DonaldFon@users.noreply.github.com> Date: Fri, 27 Dec 2024 01:42:32 +0800 Subject: [PATCH 02/10] 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 8c8d51b780f153e50cc9b5679e2b35fd1a7aa7da Mon Sep 17 00:00:00 2001 From: Donald <154738239+DonaldFon@users.noreply.github.com> Date: Fri, 27 Dec 2024 01:45:13 +0800 Subject: [PATCH 03/10] 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 47723d0aa1222e4e36ae57c3ecb7291e3c5d3dcb Mon Sep 17 00:00:00 2001 From: Donald <154738239+DonaldFon@users.noreply.github.com> Date: Fri, 27 Dec 2024 01:47:29 +0800 Subject: [PATCH 04/10] 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..940ead3c 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 9e2f5b1d97a932308e9389f52e27c3a5fab0131e Mon Sep 17 00:00:00 2001 From: Donald <154738239+DonaldFon@users.noreply.github.com> Date: Fri, 27 Dec 2024 01:48:36 +0800 Subject: [PATCH 05/10] 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 95cb8641c512ba4bbe3712226b9a67b09080f047 Mon Sep 17 00:00:00 2001 From: Donald <154738239+DonaldFon@users.noreply.github.com> Date: Fri, 27 Dec 2024 01:49:18 +0800 Subject: [PATCH 06/10] 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 fb981e25705e5854ebe9dcf8babe185477157705 Mon Sep 17 00:00:00 2001 From: Donald <154738239+DonaldFon@users.noreply.github.com> Date: Fri, 27 Dec 2024 01:50:20 +0800 Subject: [PATCH 07/10] Update app.blade.php --- resources/views/layouts/app.blade.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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' }} From bce45d9f8ac353631146887bfc35023fdb7020f2 Mon Sep 17 00:00:00 2001 From: Donald <154738239+DonaldFon@users.noreply.github.com> Date: Fri, 27 Dec 2024 01:52:05 +0800 Subject: [PATCH 08/10] Update layout.blade.php --- resources/views/layout.blade.php | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/resources/views/layout.blade.php b/resources/views/layout.blade.php index f8ffc5b6..d9750c1d 100644 --- a/resources/views/layout.blade.php +++ b/resources/views/layout.blade.php @@ -1,4 +1,7 @@ - + +@extends('layouts.main') + +@section('content')
@@ -10,4 +13,4 @@
- +@endsection From cc48851d438cc228899dac055acfcd4e431d5354 Mon Sep 17 00:00:00 2001 From: Donald <154738239+DonaldFon@users.noreply.github.com> Date: Fri, 27 Dec 2024 01:55:08 +0800 Subject: [PATCH 09/10] 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..16c44ff2 100644 --- a/app/Providers/AppServiceProvider.php +++ b/app/Providers/AppServiceProvider.php @@ -25,5 +25,6 @@ public function register() public function boot() { // + View::share('metaTitle','abc'); } } From 4b4a1c03e69f71afe07fabb21815f23f4f1c8575 Mon Sep 17 00:00:00 2001 From: Donald <154738239+DonaldFon@users.noreply.github.com> Date: Fri, 27 Dec 2024 01:56:29 +0800 Subject: [PATCH 10/10] Update AppServiceProvider.php --- app/Providers/AppServiceProvider.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/Providers/AppServiceProvider.php b/app/Providers/AppServiceProvider.php index 16c44ff2..effa4820 100644 --- a/app/Providers/AppServiceProvider.php +++ b/app/Providers/AppServiceProvider.php @@ -25,6 +25,6 @@ public function register() public function boot() { // - View::share('metaTitle','abc'); + View::share('metaTitle','Blade Test'); } }