Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Submit my solution #649

Open
wants to merge 10 commits into
base: main
Choose a base branch
from
2 changes: 1 addition & 1 deletion app/Http/Controllers/HomeController.php
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion app/Providers/AppServiceProvider.php
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,6 @@ public function register()
*/
public function boot()
{
//
view()->share('metaTitle', 'Blade Test');
}
}
2 changes: 1 addition & 1 deletion resources/views/alert.blade.php
Original file line number Diff line number Diff line change
Expand Up @@ -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 !!}
{!! htmlentities($text) !!}
Your task is to change the code of alert.blade.php, to avoid that JavaScript alert.
</div>
</div>
Expand Down
7 changes: 5 additions & 2 deletions resources/views/authenticated.blade.php
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
1 change: 1 addition & 0 deletions resources/views/include.blade.php
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
6 changes: 4 additions & 2 deletions resources/views/layout.blade.php
Original file line number Diff line number Diff line change
@@ -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">
Expand All @@ -10,4 +12,4 @@
</div>
</div>
</div>
</x-app-layout>
@endsection
7 changes: 4 additions & 3 deletions resources/views/rows.blade.php
Original file line number Diff line number Diff line change
Expand Up @@ -21,11 +21,12 @@
<tbody>
@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="{{ $loop->even ? 'bg-red-100' : '' }}">
{{-- Task: add row number here: 1, 2, etc. --}}
<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
Expand Down
21 changes: 13 additions & 8 deletions resources/views/table.blade.php
Original file line number Diff line number Diff line change
Expand Up @@ -19,14 +19,19 @@
</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>
@if(!$users->isEmpty())
@foreach ($users as $user)
<tr>
<td>{{ $user->name }}</td>
<td>{{ $user->email }}</td>
<td>{{ $user->created_at }}</td>
</tr>
@endforeach
@else
<tr>
<td colspan="3">No content.</td>
</tr>
@endif
</tbody>
</table>
</div>
Expand Down
Loading