{{ __('A new verification link has been sent to the email address you provided during registration.') }}
diff --git a/resources/views/livewire/device-dashboard.blade.php b/resources/views/livewire/device-dashboard.blade.php
new file mode 100644
index 0000000..2b999c9
--- /dev/null
+++ b/resources/views/livewire/device-dashboard.blade.php
@@ -0,0 +1,52 @@
+
diff --git a/resources/views/livewire/device-manager.blade.php b/resources/views/livewire/device-manager.blade.php
index 04cfb36..3668c94 100644
--- a/resources/views/livewire/device-manager.blade.php
+++ b/resources/views/livewire/device-manager.blade.php
@@ -1,94 +1,124 @@
+ {{--@dump($devices)--}}
-
-
-
Devices
- {{ $showDeviceForm ? 'Cancel' : 'New Device' }}
-
-
- @if (session()->has('message'))
-
- {{ session('message') }}
-
- @endif
-
- @if ($showDeviceForm)
-
- @endif
-
-
-
-
-
- | Name |
- Friendly ID |
- Mac Address |
- Refresh |
- Actions |
-
-
-
- @foreach ($devices as $device)
-
- | {{ $device->name }} |
- {{ $device->friendly_id }} |
- {{ $device->mac_address }} |
- {{ $device->default_refresh_interval }} |
-
-
- View
-
- |
-
- @endforeach
-
-
-
- {{ $devices->links() }}
-
-
+
+
Devices
+
+ Add Device
+
+ @if (session()->has('message'))
+
+ {{ session('message') }}
+
+ @endif
+
+
+
+
+
+
+
+
+ |
+ Name
+ |
+
+ Friendly ID
+ |
+
+ Mac Address
+ |
+
+ Refresh
+ |
+
+ Actions
+ |
+
+
+
+
+ @foreach ($devices as $device)
+
+ |
+ {{ $device->name }}
+ |
+
+ {{ $device->friendly_id }}
+ |
+
+
+ {{ $device->mac_address }}
+
+ |
+
+ {{ $device->default_refresh_interval }}
+ |
+
+
+
+ |
+
+ @endforeach
+
+
+
+
diff --git a/resources/views/livewire/layout/navigation.blade.php b/resources/views/livewire/layout/navigation.blade.php
deleted file mode 100644
index 42046e1..0000000
--- a/resources/views/livewire/layout/navigation.blade.php
+++ /dev/null
@@ -1,116 +0,0 @@
-redirect('/', navigate: true);
- }
-}; ?>
-
-
diff --git a/resources/views/livewire/pages/auth/confirm-password.blade.php b/resources/views/livewire/pages/auth/confirm-password.blade.php
deleted file mode 100644
index 1c1e310..0000000
--- a/resources/views/livewire/pages/auth/confirm-password.blade.php
+++ /dev/null
@@ -1,62 +0,0 @@
-validate([
- 'password' => ['required', 'string'],
- ]);
-
- if (! Auth::guard('web')->validate([
- 'email' => Auth::user()->email,
- 'password' => $this->password,
- ])) {
- throw ValidationException::withMessages([
- 'password' => __('auth.password'),
- ]);
- }
-
- session(['auth.password_confirmed_at' => time()]);
-
- $this->redirectIntended(default: route('dashboard', absolute: false), navigate: true);
- }
-}; ?>
-
-
-
- {{ __('This is a secure area of the application. Please confirm your password before continuing.') }}
-
-
-
-
diff --git a/resources/views/livewire/pages/auth/forgot-password.blade.php b/resources/views/livewire/pages/auth/forgot-password.blade.php
deleted file mode 100644
index b804012..0000000
--- a/resources/views/livewire/pages/auth/forgot-password.blade.php
+++ /dev/null
@@ -1,61 +0,0 @@
-validate([
- 'email' => ['required', 'string', 'email'],
- ]);
-
- // We will send the password reset link to this user. Once we have attempted
- // to send the link, we will examine the response then see the message we
- // need to show to the user. Finally, we'll send out a proper response.
- $status = Password::sendResetLink(
- $this->only('email')
- );
-
- if ($status != Password::RESET_LINK_SENT) {
- $this->addError('email', __($status));
-
- return;
- }
-
- $this->reset('email');
-
- session()->flash('status', __($status));
- }
-}; ?>
-
-
-
- {{ __('Forgot your password? No problem. Just let us know your email address and we will email you a password reset link that will allow you to choose a new one.') }}
-
-
-
-
-
-
-
diff --git a/resources/views/livewire/pages/auth/login.blade.php b/resources/views/livewire/pages/auth/login.blade.php
deleted file mode 100644
index 8aa3f98..0000000
--- a/resources/views/livewire/pages/auth/login.blade.php
+++ /dev/null
@@ -1,71 +0,0 @@
-validate();
-
- $this->form->authenticate();
-
- Session::regenerate();
-
- $this->redirectIntended(default: route('dashboard', absolute: false), navigate: true);
- }
-}; ?>
-
-
diff --git a/resources/views/livewire/pages/auth/register.blade.php b/resources/views/livewire/pages/auth/register.blade.php
deleted file mode 100644
index 59ba2be..0000000
--- a/resources/views/livewire/pages/auth/register.blade.php
+++ /dev/null
@@ -1,88 +0,0 @@
-validate([
- 'name' => ['required', 'string', 'max:255'],
- 'email' => ['required', 'string', 'lowercase', 'email', 'max:255', 'unique:'.User::class],
- 'password' => ['required', 'string', 'confirmed', Rules\Password::defaults()],
- ]);
-
- $validated['password'] = Hash::make($validated['password']);
-
- event(new Registered($user = User::create($validated)));
-
- Auth::login($user);
-
- $this->redirect(route('dashboard', absolute: false), navigate: true);
- }
-}; ?>
-
-
diff --git a/resources/views/livewire/profile/delete-user-form.blade.php b/resources/views/livewire/profile/delete-user-form.blade.php
deleted file mode 100644
index 92c9579..0000000
--- a/resources/views/livewire/profile/delete-user-form.blade.php
+++ /dev/null
@@ -1,79 +0,0 @@
-validate([
- 'password' => ['required', 'string', 'current_password'],
- ]);
-
- tap(Auth::user(), $logout(...))->delete();
-
- $this->redirect('/', navigate: true);
- }
-}; ?>
-
-
-
-
- {{ __('Delete Account') }}
-
-
-
- {{ __('Once your account is deleted, all of its resources and data will be permanently deleted. Before deleting your account, please download any data or information that you wish to retain.') }}
-
-
-
- {{ __('Delete Account') }}
-
-
-
-
-
diff --git a/resources/views/livewire/profile/update-password-form.blade.php b/resources/views/livewire/profile/update-password-form.blade.php
deleted file mode 100644
index 568cf2f..0000000
--- a/resources/views/livewire/profile/update-password-form.blade.php
+++ /dev/null
@@ -1,79 +0,0 @@
-validate([
- 'current_password' => ['required', 'string', 'current_password'],
- 'password' => ['required', 'string', Password::defaults(), 'confirmed'],
- ]);
- } catch (ValidationException $e) {
- $this->reset('current_password', 'password', 'password_confirmation');
-
- throw $e;
- }
-
- Auth::user()->update([
- 'password' => Hash::make($validated['password']),
- ]);
-
- $this->reset('current_password', 'password', 'password_confirmation');
-
- $this->dispatch('password-updated');
- }
-}; ?>
-
-
diff --git a/resources/views/livewire/profile/update-profile-information-form.blade.php b/resources/views/livewire/profile/update-profile-information-form.blade.php
deleted file mode 100644
index 4ff4d86..0000000
--- a/resources/views/livewire/profile/update-profile-information-form.blade.php
+++ /dev/null
@@ -1,115 +0,0 @@
-name = Auth::user()->name;
- $this->email = Auth::user()->email;
- }
-
- /**
- * Update the profile information for the currently authenticated user.
- */
- public function updateProfileInformation(): void
- {
- $user = Auth::user();
-
- $validated = $this->validate([
- 'name' => ['required', 'string', 'max:255'],
- 'email' => ['required', 'string', 'lowercase', 'email', 'max:255', Rule::unique(User::class)->ignore($user->id)],
- ]);
-
- $user->fill($validated);
-
- if ($user->isDirty('email')) {
- $user->email_verified_at = null;
- }
-
- $user->save();
-
- $this->dispatch('profile-updated', name: $user->name);
- }
-
- /**
- * Send an email verification notification to the current user.
- */
- public function sendVerification(): void
- {
- $user = Auth::user();
-
- if ($user->hasVerifiedEmail()) {
- $this->redirectIntended(default: route('dashboard', absolute: false));
-
- return;
- }
-
- $user->sendEmailVerificationNotification();
-
- Session::flash('status', 'verification-link-sent');
- }
-}; ?>
-
-
diff --git a/resources/views/livewire/settings/appearance.blade.php b/resources/views/livewire/settings/appearance.blade.php
new file mode 100644
index 0000000..d485f7d
--- /dev/null
+++ b/resources/views/livewire/settings/appearance.blade.php
@@ -0,0 +1,19 @@
+
+
+
+ @include('partials.settings-heading')
+
+
+
+ Light
+ Dark
+ System
+
+
+
diff --git a/resources/views/livewire/settings/delete-user-form.blade.php b/resources/views/livewire/settings/delete-user-form.blade.php
new file mode 100644
index 0000000..5857be6
--- /dev/null
+++ b/resources/views/livewire/settings/delete-user-form.blade.php
@@ -0,0 +1,60 @@
+validate([
+ 'password' => ['required', 'string', 'current_password'],
+ ]);
+
+ tap(Auth::user(), $logout(...))->delete();
+
+ $this->redirect('/', navigate: true);
+ }
+}; ?>
+
+
+
+ {{ __('Delete Account') }}
+ {{ __('Delete your account and all of its resources') }}
+
+
+
+
+ {{ __('Delete Account') }}
+
+
+
+
+
+
+
diff --git a/resources/views/livewire/settings/password.blade.php b/resources/views/livewire/settings/password.blade.php
new file mode 100644
index 0000000..7dbd17e
--- /dev/null
+++ b/resources/views/livewire/settings/password.blade.php
@@ -0,0 +1,84 @@
+validate([
+ 'current_password' => ['required', 'string', 'current_password'],
+ 'password' => ['required', 'string', Password::defaults(), 'confirmed'],
+ ]);
+ } catch (ValidationException $e) {
+ $this->reset('current_password', 'password', 'password_confirmation');
+
+ throw $e;
+ }
+
+ Auth::user()->update([
+ 'password' => Hash::make($validated['password']),
+ ]);
+
+ $this->reset('current_password', 'password', 'password_confirmation');
+
+ $this->dispatch('password-updated');
+ }
+}; ?>
+
+
+ @include('partials.settings-heading')
+
+
+
+
+
diff --git a/resources/views/livewire/settings/profile.blade.php b/resources/views/livewire/settings/profile.blade.php
new file mode 100644
index 0000000..f1b07c3
--- /dev/null
+++ b/resources/views/livewire/settings/profile.blade.php
@@ -0,0 +1,117 @@
+name = Auth::user()->name;
+ $this->email = Auth::user()->email;
+ }
+
+ /**
+ * Update the profile information for the currently authenticated user.
+ */
+ public function updateProfileInformation(): void
+ {
+ $user = Auth::user();
+
+ $validated = $this->validate([
+ 'name' => ['required', 'string', 'max:255'],
+
+ 'email' => [
+ 'required',
+ 'string',
+ 'lowercase',
+ 'email',
+ 'max:255',
+ Rule::unique(User::class)->ignore($user->id)
+ ],
+ ]);
+
+ $user->fill($validated);
+
+ if ($user->isDirty('email')) {
+ $user->email_verified_at = null;
+ }
+
+ $user->save();
+
+ $this->dispatch('profile-updated', name: $user->name);
+ }
+
+ /**
+ * Send an email verification notification to the current user.
+ */
+ public function resendVerificationNotification(): void
+ {
+ $user = Auth::user();
+
+ if ($user->hasVerifiedEmail()) {
+ $this->redirectIntended(default: route('dashboard', absolute: false));
+
+ return;
+ }
+
+ $user->sendEmailVerificationNotification();
+
+ Session::flash('status', 'verification-link-sent');
+ }
+}; ?>
+
+
+ @include('partials.settings-heading')
+
+
+
+
+
+
+
diff --git a/resources/views/livewire/welcome/navigation.blade.php b/resources/views/livewire/welcome/navigation.blade.php
deleted file mode 100644
index 7d079de..0000000
--- a/resources/views/livewire/welcome/navigation.blade.php
+++ /dev/null
@@ -1,26 +0,0 @@
-
diff --git a/resources/views/partials/head.blade.php b/resources/views/partials/head.blade.php
new file mode 100644
index 0000000..848e1b5
--- /dev/null
+++ b/resources/views/partials/head.blade.php
@@ -0,0 +1,10 @@
+
+
+
+
{{ $title ?? 'Laravel TRMNL Server' }}
+
+
+
+
+@vite(['resources/css/app.css', 'resources/js/app.js'])
+@fluxAppearance
diff --git a/resources/views/partials/settings-heading.blade.php b/resources/views/partials/settings-heading.blade.php
new file mode 100644
index 0000000..cd175c3
--- /dev/null
+++ b/resources/views/partials/settings-heading.blade.php
@@ -0,0 +1,5 @@
+
+ Settings
+ Manage your profile and account settings
+
+
diff --git a/resources/views/profile.blade.php b/resources/views/profile.blade.php
deleted file mode 100644
index b14bcc1..0000000
--- a/resources/views/profile.blade.php
+++ /dev/null
@@ -1,29 +0,0 @@
-
-
-
- {{ __('Profile') }}
-
-
-
-
-
diff --git a/resources/views/welcome.blade.php b/resources/views/welcome.blade.php
index 3ac4e40..25454cd 100644
--- a/resources/views/welcome.blade.php
+++ b/resources/views/welcome.blade.php
@@ -1,69 +1,34 @@
-
-
-
-
-
-
-
Laravel
-
-
-
-
-
-
- @vite(['resources/css/app.css', 'resources/js/app.js'])
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
-
-
-
+
+ @if (Route::has('login'))
+
+ @endif
+
+
diff --git a/routes/auth.php b/routes/auth.php
index 71ace87..62e6352 100644
--- a/routes/auth.php
+++ b/routes/auth.php
@@ -5,27 +5,31 @@ use Illuminate\Support\Facades\Route;
use Livewire\Volt\Volt;
Route::middleware('guest')->group(function () {
- // Volt::route('register', 'pages.auth.register')
- // ->name('register');
-
- Volt::route('login', 'pages.auth.login')
+ Volt::route('login', 'auth.login')
->name('login');
- Volt::route('forgot-password', 'pages.auth.forgot-password')
+ Volt::route('register', 'auth.register')
+ ->name('register');
+
+ Volt::route('forgot-password', 'auth.forgot-password')
->name('password.request');
- Volt::route('reset-password/{token}', 'pages.auth.reset-password')
+ Volt::route('reset-password/{token}', 'auth.reset-password')
->name('password.reset');
+
});
Route::middleware('auth')->group(function () {
- Volt::route('verify-email', 'pages.auth.verify-email')
+ Volt::route('verify-email', 'auth.verify-email')
->name('verification.notice');
Route::get('verify-email/{id}/{hash}', VerifyEmailController::class)
->middleware(['signed', 'throttle:6,1'])
->name('verification.verify');
- Volt::route('confirm-password', 'pages.auth.confirm-password')
+ Volt::route('confirm-password', 'auth.confirm-password')
->name('password.confirm');
});
+
+Route::post('logout', App\Livewire\Actions\Logout::class)
+ ->name('logout');
diff --git a/routes/console.php b/routes/console.php
index 3c9adf1..aaf16f7 100644
--- a/routes/console.php
+++ b/routes/console.php
@@ -3,6 +3,6 @@
use Illuminate\Foundation\Inspiring;
use Illuminate\Support\Facades\Artisan;
-Artisan::command('inspire', function () {
- $this->comment(Inspiring::quote());
-})->purpose('Display an inspiring quote');
+//Artisan::command('inspire', function () {
+// $this->comment(Inspiring::quote());
+//})->purpose('Display an inspiring quote')->hourly();
diff --git a/routes/web.php b/routes/web.php
index 17a284b..e81cf05 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -1,30 +1,36 @@
name('home');
Route::view('dashboard', 'dashboard')
->middleware(['auth', 'verified'])
->name('dashboard');
-Route::view('profile', 'profile')
- ->middleware(['auth'])
- ->name('profile');
+Route::middleware(['auth'])->group(function () {
+ Route::redirect('settings', 'settings/profile');
+
+ Volt::route('settings/profile', 'settings.profile')->name('settings.profile');
+ Volt::route('settings/password', 'settings.password')->name('settings.password');
+ Volt::route('settings/appearance', 'settings.appearance')->name('settings.appearance');
-Route::middleware(['auth:sanctum', 'verified'])->group(function () {
Route::get('/devices', function () {
return view('devices');
})->name('devices');
Route::get('/devices/{device}/configure', function (App\Models\Device $device) {
$current_image_uuid = auth()->user()->devices()->find($device->id)->current_screen_image;
- $current_image_path = 'images/generated/'.$current_image_uuid.'.png';
+ $current_image_path = 'images/generated/' . $current_image_uuid . '.png';
return view('devices.configure', compact('device'), [
'image' => ($current_image_uuid) ? url($current_image_path) : null,
]);
})->name('devices.configure');
+
});
-require __DIR__.'/auth.php';
+require __DIR__ . '/auth.php';
diff --git a/tailwind.config.js b/tailwind.config.js
deleted file mode 100644
index c29eb1a..0000000
--- a/tailwind.config.js
+++ /dev/null
@@ -1,21 +0,0 @@
-import defaultTheme from 'tailwindcss/defaultTheme';
-import forms from '@tailwindcss/forms';
-
-/** @type {import('tailwindcss').Config} */
-export default {
- content: [
- './vendor/laravel/framework/src/Illuminate/Pagination/resources/views/*.blade.php',
- './storage/framework/views/*.php',
- './resources/views/**/*.blade.php',
- ],
-
- theme: {
- extend: {
- fontFamily: {
- sans: ['Figtree', ...defaultTheme.fontFamily.sans],
- },
- },
- },
-
- plugins: [forms],
-};
diff --git a/tests/Feature/Auth/AuthenticationTest.php b/tests/Feature/Auth/AuthenticationTest.php
index ec9910f..10df8e5 100644
--- a/tests/Feature/Auth/AuthenticationTest.php
+++ b/tests/Feature/Auth/AuthenticationTest.php
@@ -1,26 +1,25 @@
get('/login');
- $response
- ->assertOk()
- ->assertSeeVolt('pages.auth.login');
+ $response->assertStatus(200);
});
test('users can authenticate using the login screen', function () {
$user = User::factory()->create();
- $component = Volt::test('pages.auth.login')
- ->set('form.email', $user->email)
- ->set('form.password', 'password');
+ $response = LivewireVolt::test('auth.login')
+ ->set('email', $user->email)
+ ->set('password', 'password')
+ ->call('login');
- $component->call('login');
-
- $component
+ $response
->assertHasNoErrors()
->assertRedirect(route('dashboard', absolute: false));
@@ -30,43 +29,19 @@ test('users can authenticate using the login screen', function () {
test('users can not authenticate with invalid password', function () {
$user = User::factory()->create();
- $component = Volt::test('pages.auth.login')
- ->set('form.email', $user->email)
- ->set('form.password', 'wrong-password');
-
- $component->call('login');
-
- $component
- ->assertHasErrors()
- ->assertNoRedirect();
+ $this->post('/login', [
+ 'email' => $user->email,
+ 'password' => 'wrong-password',
+ ]);
$this->assertGuest();
});
-test('navigation menu can be rendered', function () {
- $user = User::factory()->create();
-
- $this->actingAs($user);
-
- $response = $this->get('/dashboard');
-
- $response
- ->assertOk()
- ->assertSeeVolt('layout.navigation');
-});
-
test('users can logout', function () {
$user = User::factory()->create();
- $this->actingAs($user);
-
- $component = Volt::test('layout.navigation');
-
- $component->call('logout');
-
- $component
- ->assertHasNoErrors()
- ->assertRedirect('/');
+ $response = $this->actingAs($user)->post('/logout');
$this->assertGuest();
-});
+ $response->assertRedirect('/');
+});
\ No newline at end of file
diff --git a/tests/Feature/Auth/EmailVerificationTest.php b/tests/Feature/Auth/EmailVerificationTest.php
index f282dff..2880c6b 100644
--- a/tests/Feature/Auth/EmailVerificationTest.php
+++ b/tests/Feature/Auth/EmailVerificationTest.php
@@ -5,6 +5,8 @@ use Illuminate\Auth\Events\Verified;
use Illuminate\Support\Facades\Event;
use Illuminate\Support\Facades\URL;
+uses(\Illuminate\Foundation\Testing\RefreshDatabase::class);
+
test('email verification screen can be rendered', function () {
$user = User::factory()->unverified()->create();
@@ -27,6 +29,7 @@ test('email can be verified', function () {
$response = $this->actingAs($user)->get($verificationUrl);
Event::assertDispatched(Verified::class);
+
expect($user->fresh()->hasVerifiedEmail())->toBeTrue();
$response->assertRedirect(route('dashboard', absolute: false).'?verified=1');
});
@@ -43,4 +46,4 @@ test('email is not verified with invalid hash', function () {
$this->actingAs($user)->get($verificationUrl);
expect($user->fresh()->hasVerifiedEmail())->toBeFalse();
-});
+});
\ No newline at end of file
diff --git a/tests/Feature/Auth/PasswordConfirmationTest.php b/tests/Feature/Auth/PasswordConfirmationTest.php
index 21c28c3..ba015f6 100644
--- a/tests/Feature/Auth/PasswordConfirmationTest.php
+++ b/tests/Feature/Auth/PasswordConfirmationTest.php
@@ -1,18 +1,16 @@
create();
$response = $this->actingAs($user)->get('/confirm-password');
- $response
- ->assertSeeVolt('pages.auth.confirm-password')
- ->assertStatus(200);
+ $response->assertStatus(200);
});
test('password can be confirmed', function () {
@@ -20,14 +18,13 @@ test('password can be confirmed', function () {
$this->actingAs($user);
- $component = Volt::test('pages.auth.confirm-password')
- ->set('password', 'password');
+ $response = Volt::test('auth.confirm-password')
+ ->set('password', 'password')
+ ->call('confirmPassword');
- $component->call('confirmPassword');
-
- $component
- ->assertRedirect('/dashboard')
- ->assertHasNoErrors();
+ $response
+ ->assertHasNoErrors()
+ ->assertRedirect(route('dashboard', absolute: false));
});
test('password is not confirmed with invalid password', function () {
@@ -35,12 +32,9 @@ test('password is not confirmed with invalid password', function () {
$this->actingAs($user);
- $component = Volt::test('pages.auth.confirm-password')
- ->set('password', 'wrong-password');
+ $response = Volt::test('auth.confirm-password')
+ ->set('password', 'wrong-password')
+ ->call('confirmPassword');
- $component->call('confirmPassword');
-
- $component
- ->assertNoRedirect()
- ->assertHasErrors('password');
-});
+ $response->assertHasErrors(['password']);
+});
\ No newline at end of file
diff --git a/tests/Feature/Auth/PasswordResetTest.php b/tests/Feature/Auth/PasswordResetTest.php
index c478bce..859312d 100644
--- a/tests/Feature/Auth/PasswordResetTest.php
+++ b/tests/Feature/Auth/PasswordResetTest.php
@@ -1,18 +1,16 @@
get('/forgot-password');
- $response
- ->assertSeeVolt('pages.auth.forgot-password')
- ->assertStatus(200);
+ $response->assertStatus(200);
});
test('reset password link can be requested', function () {
@@ -20,7 +18,7 @@ test('reset password link can be requested', function () {
$user = User::factory()->create();
- Volt::test('pages.auth.forgot-password')
+ Volt::test('auth.forgot-password')
->set('email', $user->email)
->call('sendPasswordResetLink');
@@ -32,16 +30,14 @@ test('reset password screen can be rendered', function () {
$user = User::factory()->create();
- Volt::test('pages.auth.forgot-password')
+ Volt::test('auth.forgot-password')
->set('email', $user->email)
->call('sendPasswordResetLink');
Notification::assertSentTo($user, ResetPassword::class, function ($notification) {
$response = $this->get('/reset-password/'.$notification->token);
- $response
- ->assertSeeVolt('pages.auth.reset-password')
- ->assertStatus(200);
+ $response->assertStatus(200);
return true;
});
@@ -52,22 +48,21 @@ test('password can be reset with valid token', function () {
$user = User::factory()->create();
- Volt::test('pages.auth.forgot-password')
+ Volt::test('auth.forgot-password')
->set('email', $user->email)
->call('sendPasswordResetLink');
Notification::assertSentTo($user, ResetPassword::class, function ($notification) use ($user) {
- $component = Volt::test('pages.auth.reset-password', ['token' => $notification->token])
+ $response = Volt::test('auth.reset-password', ['token' => $notification->token])
->set('email', $user->email)
->set('password', 'password')
- ->set('password_confirmation', 'password');
+ ->set('password_confirmation', 'password')
+ ->call('resetPassword');
- $component->call('resetPassword');
-
- $component
- ->assertRedirect('/login')
- ->assertHasNoErrors();
+ $response
+ ->assertHasNoErrors()
+ ->assertRedirect(route('login', absolute: false));
return true;
});
-});
+});
\ No newline at end of file
diff --git a/tests/Feature/Auth/RegistrationTest.php b/tests/Feature/Auth/RegistrationTest.php
index 3b05ed7..399e6a6 100644
--- a/tests/Feature/Auth/RegistrationTest.php
+++ b/tests/Feature/Auth/RegistrationTest.php
@@ -1,27 +1,26 @@
get('/register');
-//
-// $response
-// ->assertOk()
-// ->assertSeeVolt('pages.auth.register');
-// });
+uses(\Illuminate\Foundation\Testing\RefreshDatabase::class);
+
+test('registration screen can be rendered', function () {
+ $response = $this->get('/register');
+
+ $response->assertStatus(200);
+});
test('new users can register', function () {
- $component = Volt::test('pages.auth.register')
+ $response = Volt::test('auth.register')
->set('name', 'Test User')
->set('email', 'test@example.com')
->set('password', 'password')
- ->set('password_confirmation', 'password');
+ ->set('password_confirmation', 'password')
+ ->call('register');
- $component->call('register');
-
- $component->assertRedirect(route('dashboard', absolute: false));
+ $response
+ ->assertHasNoErrors()
+ ->assertRedirect(route('dashboard', absolute: false));
$this->assertAuthenticated();
-});
+});
\ No newline at end of file
diff --git a/tests/Feature/DashboardTest.php b/tests/Feature/DashboardTest.php
new file mode 100644
index 0000000..26d1d03
--- /dev/null
+++ b/tests/Feature/DashboardTest.php
@@ -0,0 +1,18 @@
+get('/dashboard');
+ $response->assertRedirect('/login');
+});
+
+test('authenticated users can visit the dashboard', function () {
+ $user = User::factory()->create();
+ $this->actingAs($user);
+
+ $response = $this->get('/dashboard');
+ $response->assertStatus(200);
+});
\ No newline at end of file
diff --git a/tests/Feature/ProfileTest.php b/tests/Feature/ProfileTest.php
deleted file mode 100644
index 984f050..0000000
--- a/tests/Feature/ProfileTest.php
+++ /dev/null
@@ -1,89 +0,0 @@
-create();
-
- $this->actingAs($user);
-
- $response = $this->get('/profile');
-
- $response
- ->assertOk()
- ->assertSeeVolt('profile.update-profile-information-form')
- ->assertSeeVolt('profile.update-password-form')
- ->assertSeeVolt('profile.delete-user-form');
-});
-
-test('profile information can be updated', function () {
- $user = User::factory()->create();
-
- $this->actingAs($user);
-
- $component = Volt::test('profile.update-profile-information-form')
- ->set('name', 'Test User')
- ->set('email', 'test@example.com')
- ->call('updateProfileInformation');
-
- $component
- ->assertHasNoErrors()
- ->assertNoRedirect();
-
- $user->refresh();
-
- $this->assertSame('Test User', $user->name);
- $this->assertSame('test@example.com', $user->email);
- $this->assertNull($user->email_verified_at);
-});
-
-test('email verification status is unchanged when the email address is unchanged', function () {
- $user = User::factory()->create();
-
- $this->actingAs($user);
-
- $component = Volt::test('profile.update-profile-information-form')
- ->set('name', 'Test User')
- ->set('email', $user->email)
- ->call('updateProfileInformation');
-
- $component
- ->assertHasNoErrors()
- ->assertNoRedirect();
-
- $this->assertNotNull($user->refresh()->email_verified_at);
-});
-
-test('user can delete their account', function () {
- $user = User::factory()->create();
-
- $this->actingAs($user);
-
- $component = Volt::test('profile.delete-user-form')
- ->set('password', 'password')
- ->call('deleteUser');
-
- $component
- ->assertHasNoErrors()
- ->assertRedirect('/');
-
- $this->assertGuest();
- $this->assertNull($user->fresh());
-});
-
-test('correct password must be provided to delete account', function () {
- $user = User::factory()->create();
-
- $this->actingAs($user);
-
- $component = Volt::test('profile.delete-user-form')
- ->set('password', 'wrong-password')
- ->call('deleteUser');
-
- $component
- ->assertHasErrors('password')
- ->assertNoRedirect();
-
- $this->assertNotNull($user->fresh());
-});
diff --git a/tests/Feature/Auth/PasswordUpdateTest.php b/tests/Feature/Settings/PasswordUpdateTest.php
similarity index 55%
rename from tests/Feature/Auth/PasswordUpdateTest.php
rename to tests/Feature/Settings/PasswordUpdateTest.php
index 33b1d4b..5cc1209 100644
--- a/tests/Feature/Auth/PasswordUpdateTest.php
+++ b/tests/Feature/Settings/PasswordUpdateTest.php
@@ -1,41 +1,41 @@
create();
+ $user = User::factory()->create([
+ 'password' => Hash::make('password'),
+ ]);
$this->actingAs($user);
- $component = Volt::test('profile.update-password-form')
+ $response = Volt::test('settings.password')
->set('current_password', 'password')
->set('password', 'new-password')
->set('password_confirmation', 'new-password')
->call('updatePassword');
- $component
- ->assertHasNoErrors()
- ->assertNoRedirect();
+ $response->assertHasNoErrors();
- $this->assertTrue(Hash::check('new-password', $user->refresh()->password));
+ expect(Hash::check('new-password', $user->refresh()->password))->toBeTrue();
});
test('correct password must be provided to update password', function () {
- $user = User::factory()->create();
+ $user = User::factory()->create([
+ 'password' => Hash::make('password'),
+ ]);
$this->actingAs($user);
- $component = Volt::test('profile.update-password-form')
+ $response = Volt::test('settings.password')
->set('current_password', 'wrong-password')
->set('password', 'new-password')
->set('password_confirmation', 'new-password')
->call('updatePassword');
- $component
- ->assertHasErrors(['current_password'])
- ->assertNoRedirect();
-});
+ $response->assertHasErrors(['current_password']);
+});
\ No newline at end of file
diff --git a/tests/Feature/Settings/ProfileUpdateTest.php b/tests/Feature/Settings/ProfileUpdateTest.php
new file mode 100644
index 0000000..d876e5d
--- /dev/null
+++ b/tests/Feature/Settings/ProfileUpdateTest.php
@@ -0,0 +1,77 @@
+actingAs($user = User::factory()->create());
+
+ $this->get('/settings/profile')->assertOk();
+});
+
+test('profile information can be updated', function () {
+ $user = User::factory()->create();
+
+ $this->actingAs($user);
+
+ $response = Volt::test('settings.profile')
+ ->set('name', 'Test User')
+ ->set('email', 'test@example.com')
+ ->call('updateProfileInformation');
+
+ $response->assertHasNoErrors();
+
+ $user->refresh();
+
+ expect($user->name)->toEqual('Test User');
+ expect($user->email)->toEqual('test@example.com');
+ expect($user->email_verified_at)->toBeNull();
+});
+
+test('email verification status is unchanged when email address is unchanged', function () {
+ $user = User::factory()->create();
+
+ $this->actingAs($user);
+
+ $response = Volt::test('settings.profile')
+ ->set('name', 'Test User')
+ ->set('email', $user->email)
+ ->call('updateProfileInformation');
+
+ $response->assertHasNoErrors();
+
+ expect($user->refresh()->email_verified_at)->not->toBeNull();
+});
+
+test('user can delete their account', function () {
+ $user = User::factory()->create();
+
+ $this->actingAs($user);
+
+ $response = Volt::test('settings.delete-user-form')
+ ->set('password', 'password')
+ ->call('deleteUser');
+
+ $response
+ ->assertHasNoErrors()
+ ->assertRedirect('/');
+
+ expect($user->fresh())->toBeNull();
+ expect(auth()->check())->toBeFalse();
+});
+
+test('correct password must be provided to delete account', function () {
+ $user = User::factory()->create();
+
+ $this->actingAs($user);
+
+ $response = Volt::test('settings.delete-user-form')
+ ->set('password', 'wrong-password')
+ ->call('deleteUser');
+
+ $response->assertHasErrors(['password']);
+
+ expect($user->fresh())->not->toBeNull();
+});
\ No newline at end of file
diff --git a/vite.config.js b/vite.config.js
index 421b569..937aae1 100644
--- a/vite.config.js
+++ b/vite.config.js
@@ -1,11 +1,18 @@
-import { defineConfig } from 'vite';
+import {
+ defineConfig
+} from 'vite';
import laravel from 'laravel-vite-plugin';
+import tailwindcss from "@tailwindcss/vite";
export default defineConfig({
plugins: [
laravel({
input: ['resources/css/app.css', 'resources/js/app.js'],
- refresh: true,
+ refresh: [`resources/views/**/*`],
}),
+ tailwindcss(),
],
-});
+ server: {
+ cors: true,
+ },
+});
\ No newline at end of file