Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
47 changes: 34 additions & 13 deletions app/Http/Controllers/Auth/RegisteredUserController.php
Original file line number Diff line number Diff line change
Expand Up @@ -33,23 +33,44 @@ public function create()
*/
public function store(Request $request)
{
// Task: change validation rule to include at least one letter
$request->validate([
'name' => ['required', 'string', 'max:255'],
'email' => ['required', 'string', 'email', 'max:255', 'unique:users'],
'password' => ['required', 'confirmed', Rules\Password::defaults()],
]);

$user = User::create([
'name' => $request->name,
'email' => $request->email,
'password' => Hash::make($request->password),
]);

$validated = $this->validateRegistration($request);

$user = $this->createUser($validated);

event(new Registered($user));

Auth::login($user);

return redirect(RouteServiceProvider::HOME);
}

/**
* Validate the registration request.
*
* @param Request $request
* @return array
*/
private function validateRegistration(Request $request): array
{
return $request->validate([
'name' => ['required', 'string', 'max:255'],
'email' => ['required', 'string', 'email', 'max:255', 'unique:users'],
'password' => ['required', 'confirmed', Rules\Password::defaults()->letters()],
]);
}

/**
* Create a new user instance.
*
* @param array $data
* @return User
*/
private function createUser(array $data): User
{
return User::create([
'name' => $data['name'],
'email' => $data['email'],
'password' => Hash::make($data['password']),
]);
}
}
15 changes: 14 additions & 1 deletion app/Http/Controllers/ProfileController.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,19 +2,32 @@

namespace App\Http\Controllers;

use Illuminate\Support\Facades\Auth;
use Illuminate\Support\Facades\Hash;
use App\Http\Requests\ProfileUpdateRequest;

class ProfileController extends Controller
{
public function show()
{
return view('auth.profile');
return view('auth.profile', [
'user' => Auth::user()
]);
}

public function update(ProfileUpdateRequest $request)
{
// Task: fill in the code here to update name and email
// Also, update the password if it is set
$user = Auth::user();
$user->name = $request->name;
$user->email = $request->email;

if ($request->filled('password')) {
$user->password = Hash::make($request->password);
}

$user->save();

return redirect()->route('profile.show')->with('success', 'Profile updated.');
}
Expand Down
2 changes: 1 addition & 1 deletion app/Models/User.php
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
use Illuminate\Notifications\Notifiable;
use Laravel\Sanctum\HasApiTokens;

class User extends Authenticatable
class User extends Authenticatable implements MustVerifyEmail
{
use HasApiTokens, HasFactory, Notifiable;

Expand Down
9 changes: 8 additions & 1 deletion resources/views/auth/login.blade.php
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,13 @@
</label>
</div>

<div class="flex items-center justify-end mt-4">
<div class="flex items-center justify-end mt-4 space-x-4">
@if (Route::has('register'))
<a class="underline text-sm text-gray-600 hover:text-gray-900 mr-auto" href="{{ route('register') }}">
{{ __('Register') }}
</a>
@endif

@if (Route::has('password.request'))
<a class="underline text-sm text-gray-600 hover:text-gray-900" href="{{ route('password.request') }}">
{{ __('Forgot your password?') }}
Expand All @@ -50,6 +56,7 @@
<x-button class="ml-3">
{{ __('Log in') }}
</x-button>

</div>
</form>
</x-auth-card>
Expand Down
8 changes: 2 additions & 6 deletions resources/views/auth/profile.blade.php
Original file line number Diff line number Diff line change
Expand Up @@ -19,17 +19,13 @@
@method('PUT')

<div>
<em><b>Task:</b> replace ??? for name/email with logged in user's name/email</em>
<br /><br />

<x-label for="name" :value="__('Name')"/>

{{-- Task: replace ??? for name/email with logged in user's name/email --}}
<x-input id="name"
class="block mt-1 w-full"
type="text"
name="name"
value="???"
:value="old('name', $user->name)"
required />
</div>

Expand All @@ -40,7 +36,7 @@ class="block mt-1 w-full"
class="block mt-1 w-full"
type="email"
name="email"
value="???"
:value="old('email', $user->email)"
required />
</div>

Expand Down
2 changes: 2 additions & 0 deletions resources/views/layouts/navigation.blade.php
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,11 @@
{{ __('Users') }}
</x-nav-link>
{{-- Task: this "Profile" link should be visible only to logged-in users --}}
@auth
<x-nav-link href="/profile" :active="request()->routeIs('profile.show')">
{{ __('Profile') }}
</x-nav-link>
@endauth
</div>
</div>

Expand Down
17 changes: 12 additions & 5 deletions routes/web.php
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
<?php

use Illuminate\Support\Facades\Route;
use App\Http\Controllers\UserController;
use App\Http\Controllers\ProfileController;

/*
|--------------------------------------------------------------------------
Expand All @@ -17,20 +19,25 @@
return view('home');
})->name('home');

Route::get('users', [\App\Http\Controllers\UserController::class, 'index'])->name('users.index');
Route::get('users', [UserController::class, 'index'])->name('users.index');

// Task: profile functionality should be available only for logged-in users
Route::get('profile', [\App\Http\Controllers\ProfileController::class, 'show'])->name('profile.show');
Route::put('profile', [\App\Http\Controllers\ProfileController::class, 'update'])->name('profile.update');
Route::middleware('auth')->group(function () {
Route::get('profile', [ProfileController::class, 'show'])->name('profile.show');
Route::put('profile', [ProfileController::class, 'update'])->name('profile.update');
});

// Task: this "/secretpage" URL should be visible only for those who VERIFIED their email
// Add some middleware here, and change some code in app/Models/User.php to enable this
Route::view('/secretpage', 'secretpage')
->name('secretpage');
Route::middleware(['auth', 'verified'])->group(function () {
Route::view('/secretpage', 'secretpage')
->name('secretpage');
});

// Task: this "/verysecretpage" URL should ask user for verifying their password once again
// You need to add some middleware here
Route::view('/verysecretpage', 'verysecretpage')
->middleware(['auth', 'password.confirm'])
->name('verysecretpage');

require __DIR__.'/auth.php';