Skip to content
Merged
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
2 changes: 1 addition & 1 deletion .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ jobs:
- name: Setup Node
uses: actions/setup-node@820762786026740c76f36085b0efc47a31fe5020 # v6
with:
node-version: '22'
node-version: '24'

- name: Install Node Dependencies
run: npm i
Expand Down
10 changes: 5 additions & 5 deletions app/Actions/SetLocaleAction.php
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,11 @@

use App\Models\User;
use Illuminate\Http\Request;
use Lattice\Lattice\Actions\ActionDefinition;
use Lattice\Lattice\Actions\ActionResult;
use Lattice\Lattice\Actions\Components\Action;
use Lattice\Lattice\Attributes\AsAction;
use Lattice\Lattice\Ui\Enums\Emphasis;
use Lattice\Actions\ActionDefinition;
use Lattice\Actions\ActionResult;
use Lattice\Actions\Components\Action;
use Lattice\Core\Attributes\AsAction;
use Lattice\Ui\Enums\Emphasis;

#[AsAction('app.locale.set')]
class SetLocaleAction extends ActionDefinition
Expand Down
10 changes: 5 additions & 5 deletions app/Actions/Settings/DeletePasskey.php
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,11 @@

use App\Concerns\ResolvesCurrentUser;
use Illuminate\Http\Request;
use Lattice\Lattice\Actions\ActionDefinition;
use Lattice\Lattice\Actions\ActionResult;
use Lattice\Lattice\Actions\Components\Action;
use Lattice\Lattice\Attributes\AsAction;
use Lattice\Lattice\Ui\Enums\Variant;
use Lattice\Actions\ActionDefinition;
use Lattice\Actions\ActionResult;
use Lattice\Actions\Components\Action;
use Lattice\Core\Attributes\AsAction;
use Lattice\Ui\Enums\Variant;

#[AsAction('settings.passkeys.delete')]
class DeletePasskey extends ActionDefinition
Expand Down
12 changes: 6 additions & 6 deletions app/Actions/Settings/DisableTwoFactorAuthenticationAction.php
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,12 @@
use Illuminate\Http\Request;
use Laravel\Fortify\Actions\DisableTwoFactorAuthentication;
use Laravel\Fortify\Features;
use Lattice\Lattice\Actions\ActionDefinition;
use Lattice\Lattice\Actions\ActionResult;
use Lattice\Lattice\Actions\Components\Action as ActionComponent;
use Lattice\Lattice\Attributes\AsAction;
use Lattice\Lattice\Ui\Enums\HttpMethod;
use Lattice\Lattice\Ui\Enums\Variant;
use Lattice\Actions\ActionDefinition;
use Lattice\Actions\ActionResult;
use Lattice\Actions\Components\Action as ActionComponent;
use Lattice\Core\Attributes\AsAction;
use Lattice\Ui\Enums\HttpMethod;
use Lattice\Ui\Enums\Variant;

#[AsAction('settings.two-factor.disable')]
class DisableTwoFactorAuthenticationAction extends ActionDefinition
Expand Down
24 changes: 17 additions & 7 deletions app/Actions/Settings/EnableTwoFactorAuthenticationAction.php
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,18 @@
namespace App\Actions\Settings;

use App\Concerns\ResolvesCurrentUser;
use App\Fragments\Settings\TwoFactorSetupFragment;
use Illuminate\Http\Request;
use Laravel\Fortify\Actions\EnableTwoFactorAuthentication;
use Laravel\Fortify\Features;
use Lattice\Lattice\Actions\ActionDefinition;
use Lattice\Lattice\Actions\ActionResult;
use Lattice\Lattice\Actions\Components\Action as ActionComponent;
use Lattice\Lattice\Attributes\AsAction;
use Lattice\Lattice\Ui\Enums\HttpMethod;
use Lattice\Lattice\Ui\Enums\Variant;
use Lattice\Actions\ActionDefinition;
use Lattice\Actions\ActionResult;
use Lattice\Actions\Components\Action as ActionComponent;
use Lattice\Core\Attributes\AsAction;
use Lattice\Fragments\Components\Fragment;
use Lattice\Ui\Components\Modal;
use Lattice\Ui\Enums\HttpMethod;
use Lattice\Ui\Enums\Variant;

#[AsAction('settings.two-factor.enable')]
class EnableTwoFactorAuthenticationAction extends ActionDefinition
Expand All @@ -38,6 +41,13 @@ public function handle(Request $request): ActionResult

return ActionResult::success()
->toast(__('settings.two-factor.setup-started'), Variant::Info)
->openModal('settings.two-factor-setup');
->openModal(
Modal::make('settings.two-factor-setup')
->title(__('settings.two-factor.setup-title'))
->description(__('settings.two-factor.setup-description'))
->schema([
Fragment::lazy(TwoFactorSetupFragment::class),
]),
);
}
}
12 changes: 6 additions & 6 deletions app/Actions/Settings/RegenerateRecoveryCodesAction.php
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,12 @@
use Illuminate\Http\Request;
use Laravel\Fortify\Actions\GenerateNewRecoveryCodes;
use Laravel\Fortify\Features;
use Lattice\Lattice\Actions\ActionDefinition;
use Lattice\Lattice\Actions\ActionResult;
use Lattice\Lattice\Actions\Components\Action as ActionComponent;
use Lattice\Lattice\Attributes\AsAction;
use Lattice\Lattice\Ui\Enums\HttpMethod;
use Lattice\Lattice\Ui\Enums\Variant;
use Lattice\Actions\ActionDefinition;
use Lattice\Actions\ActionResult;
use Lattice\Actions\Components\Action as ActionComponent;
use Lattice\Core\Attributes\AsAction;
use Lattice\Ui\Enums\HttpMethod;
use Lattice\Ui\Enums\Variant;

#[AsAction('settings.two-factor.regenerate-recovery-codes')]
class RegenerateRecoveryCodesAction extends ActionDefinition
Expand Down
14 changes: 7 additions & 7 deletions app/Actions/Settings/SendVerificationEmailAction.php
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,13 @@

use App\Concerns\ResolvesCurrentUser;
use Illuminate\Http\Request;
use Lattice\Lattice\Actions\ActionDefinition;
use Lattice\Lattice\Actions\ActionResult;
use Lattice\Lattice\Actions\Components\Action as ActionComponent;
use Lattice\Lattice\Attributes\AsAction;
use Lattice\Lattice\Ui\Enums\Emphasis;
use Lattice\Lattice\Ui\Enums\HttpMethod;
use Lattice\Lattice\Ui\Enums\Variant;
use Lattice\Actions\ActionDefinition;
use Lattice\Actions\ActionResult;
use Lattice\Actions\Components\Action as ActionComponent;
use Lattice\Core\Attributes\AsAction;
use Lattice\Ui\Enums\Emphasis;
use Lattice\Ui\Enums\HttpMethod;
use Lattice\Ui\Enums\Variant;

#[AsAction('settings.send-verification-email')]
class SendVerificationEmailAction extends ActionDefinition
Expand Down
12 changes: 6 additions & 6 deletions app/Actions/Teams/CancelInvitation.php
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,12 @@
use App\Concerns\ResolvesCurrentUser;
use App\Concerns\ResolvesTeamFromContext;
use Illuminate\Http\Request;
use Lattice\Lattice\Actions\ActionDefinition;
use Lattice\Lattice\Actions\ActionResult;
use Lattice\Lattice\Actions\Components\Action;
use Lattice\Lattice\Attributes\AsAction;
use Lattice\Lattice\Ui\Enums\HttpMethod;
use Lattice\Lattice\Ui\Enums\Variant;
use Lattice\Actions\ActionDefinition;
use Lattice\Actions\ActionResult;
use Lattice\Actions\Components\Action;
use Lattice\Core\Attributes\AsAction;
use Lattice\Ui\Enums\HttpMethod;
use Lattice\Ui\Enums\Variant;

#[AsAction('teams.invitations.cancel')]
class CancelInvitation extends ActionDefinition
Expand Down
12 changes: 6 additions & 6 deletions app/Actions/Teams/RemoveMember.php
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,12 @@
use App\Models\Team;
use App\Models\User;
use Illuminate\Http\Request;
use Lattice\Lattice\Actions\ActionDefinition;
use Lattice\Lattice\Actions\ActionResult;
use Lattice\Lattice\Actions\Components\Action;
use Lattice\Lattice\Attributes\AsAction;
use Lattice\Lattice\Ui\Enums\HttpMethod;
use Lattice\Lattice\Ui\Enums\Variant;
use Lattice\Actions\ActionDefinition;
use Lattice\Actions\ActionResult;
use Lattice\Actions\Components\Action;
use Lattice\Core\Attributes\AsAction;
use Lattice\Ui\Enums\HttpMethod;
use Lattice\Ui\Enums\Variant;

#[AsAction('teams.members.remove')]
class RemoveMember extends ActionDefinition
Expand Down
8 changes: 4 additions & 4 deletions app/Actions/Teams/SwitchTeam.php
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,10 @@
use App\Concerns\ResolvesCurrentUser;
use App\Concerns\ResolvesTeamFromContext;
use Illuminate\Http\Request;
use Lattice\Lattice\Actions\ActionDefinition;
use Lattice\Lattice\Actions\ActionResult;
use Lattice\Lattice\Actions\Components\Action;
use Lattice\Lattice\Attributes\AsAction;
use Lattice\Actions\ActionDefinition;
use Lattice\Actions\ActionResult;
use Lattice\Actions\Components\Action;
use Lattice\Core\Attributes\AsAction;

#[AsAction('teams.switch')]
class SwitchTeam extends ActionDefinition
Expand Down
14 changes: 7 additions & 7 deletions app/Actions/Teams/UpdateMemberRole.php
Original file line number Diff line number Diff line change
Expand Up @@ -9,13 +9,13 @@
use App\Models\User;
use Illuminate\Http\Request;
use Illuminate\Validation\Rule;
use Lattice\Lattice\Actions\ActionDefinition;
use Lattice\Lattice\Actions\ActionResult;
use Lattice\Lattice\Actions\Components\Action;
use Lattice\Lattice\Attributes\AsAction;
use Lattice\Lattice\Forms\Components\Choice;
use Lattice\Lattice\Ui\Enums\HttpMethod;
use Lattice\Lattice\Ui\Enums\Variant;
use Lattice\Actions\ActionDefinition;
use Lattice\Actions\ActionResult;
use Lattice\Actions\Components\Action;
use Lattice\Core\Attributes\AsAction;
use Lattice\Form\Components\Choice;
use Lattice\Ui\Enums\HttpMethod;
use Lattice\Ui\Enums\Variant;

#[AsAction('teams.members.update')]
class UpdateMemberRole extends ActionDefinition
Expand Down
4 changes: 2 additions & 2 deletions app/Components/Auth/PasskeyVerify.php
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@

namespace App\Components\Auth;

use Lattice\Lattice\Attributes\AsComponent;
use Lattice\Lattice\Ui\Components\Component;
use Lattice\Core\Attributes\AsComponent;
use Lattice\Ui\Components\Component;

#[AsComponent('auth.passkey-verify')]
class PasskeyVerify extends Component
Expand Down
4 changes: 2 additions & 2 deletions app/Components/Settings/PasskeyRegistration.php
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@

namespace App\Components\Settings;

use Lattice\Lattice\Attributes\AsComponent;
use Lattice\Lattice\Ui\Components\Component;
use Lattice\Core\Attributes\AsComponent;
use Lattice\Ui\Components\Component;

#[AsComponent('settings.passkey-registration')]
class PasskeyRegistration extends Component
Expand Down
2 changes: 1 addition & 1 deletion app/Concerns/ResolvesTeamFromContext.php
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
namespace App\Concerns;

use App\Models\Team;
use Lattice\Lattice\Core\Concerns\ResolvesContextModels;
use Lattice\Core\Concerns\ResolvesContextModels;

trait ResolvesTeamFromContext
{
Expand Down
2 changes: 1 addition & 1 deletion app/Enums/TeamRole.php
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

namespace App\Enums;

use Lattice\Lattice\Core\Contracts\HasLabel;
use Lattice\Core\Contracts\HasLabel;

enum TeamRole: string implements HasLabel
{
Expand Down
13 changes: 7 additions & 6 deletions app/Forms/Settings/ConfirmTwoFactorForm.php
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,12 @@
use Illuminate\Http\Request;
use Laravel\Fortify\Actions\ConfirmTwoFactorAuthentication;
use Laravel\Fortify\Features;
use Lattice\Lattice\Attributes\AsForm;
use Lattice\Lattice\Forms\Components\Form;
use Lattice\Lattice\Forms\Components\OtpInput;
use Lattice\Lattice\Forms\FormDefinition;
use Lattice\Lattice\Http\LatticeResponse;
use Lattice\Facades\Effects;
use Lattice\Form\Attributes\AsForm;
use Lattice\Form\Components\Form;
use Lattice\Form\Components\OtpInput;
use Lattice\Form\FormDefinition;
use Lattice\Http\LatticeResponse;

#[AsForm('settings.two-factor.confirm')]
class ConfirmTwoFactorForm extends FormDefinition
Expand Down Expand Up @@ -40,6 +41,6 @@ public function handle(Request $request): LatticeResponse

($this->confirm)($user, (string) $request->input('code'));

return $this->toast(__('settings.two-factor.enabled-toast'))->back();
return Effects::respond()->toast(__('settings.two-factor.enabled-toast'))->back();
}
}
22 changes: 11 additions & 11 deletions app/Forms/Settings/DeleteAccountForm.php
Original file line number Diff line number Diff line change
Expand Up @@ -7,17 +7,17 @@
use Illuminate\Http\RedirectResponse;
use Illuminate\Http\Request;
use Illuminate\Support\Facades\Auth;
use Lattice\Lattice\Attributes\AsForm;
use Lattice\Lattice\Forms\Components\Form;
use Lattice\Lattice\Forms\Components\PasswordInput;
use Lattice\Lattice\Forms\FormDefinition;
use Lattice\Lattice\Ui\Components\Button;
use Lattice\Lattice\Ui\Components\Heading;
use Lattice\Lattice\Ui\Components\Stack;
use Lattice\Lattice\Ui\Components\Text;
use Lattice\Lattice\Ui\Enums\HttpMethod;
use Lattice\Lattice\Ui\Enums\StackDirection;
use Lattice\Lattice\Ui\Enums\Variant;
use Lattice\Form\Attributes\AsForm;
use Lattice\Form\Components\Form;
use Lattice\Form\Components\PasswordInput;
use Lattice\Form\FormDefinition;
use Lattice\Ui\Components\Button;
use Lattice\Ui\Components\Heading;
use Lattice\Ui\Components\Stack;
use Lattice\Ui\Components\Text;
use Lattice\Ui\Enums\HttpMethod;
use Lattice\Ui\Enums\StackDirection;
use Lattice\Ui\Enums\Variant;

#[AsForm('settings.delete-account')]
class DeleteAccountForm extends FormDefinition
Expand Down
19 changes: 10 additions & 9 deletions app/Forms/Settings/PasswordSettingsForm.php
Original file line number Diff line number Diff line change
Expand Up @@ -6,14 +6,15 @@
use App\Concerns\ResolvesCurrentUser;
use Illuminate\Http\Request;
use Illuminate\Validation\Rules\Password;
use Lattice\Lattice\Attributes\AsForm;
use Lattice\Lattice\Forms\Components\Form;
use Lattice\Lattice\Forms\Components\PasswordInput;
use Lattice\Lattice\Forms\FormDefinition;
use Lattice\Lattice\Http\LatticeResponse;
use Lattice\Lattice\Ui\Components\Button;
use Lattice\Lattice\Ui\Components\Grid;
use Lattice\Lattice\Ui\Enums\HttpMethod;
use Lattice\Facades\Effects;
use Lattice\Form\Attributes\AsForm;
use Lattice\Form\Components\Form;
use Lattice\Form\Components\PasswordInput;
use Lattice\Form\FormDefinition;
use Lattice\Http\LatticeResponse;
use Lattice\Ui\Components\Button;
use Lattice\Ui\Components\Grid;
use Lattice\Ui\Enums\HttpMethod;

#[AsForm('settings.password')]
class PasswordSettingsForm extends FormDefinition
Expand Down Expand Up @@ -57,6 +58,6 @@ public function handle(Request $request): LatticeResponse
'password' => $validated['password'],
]);

return $this->toast(__('settings.password.updated'))->back();
return Effects::respond()->toast(__('settings.password.updated'))->back();
}
}
31 changes: 16 additions & 15 deletions app/Forms/Settings/ProfileSettingsForm.php
Original file line number Diff line number Diff line change
Expand Up @@ -8,20 +8,21 @@
use App\Models\User;
use Illuminate\Http\Request;
use Illuminate\Validation\Rule;
use Lattice\Lattice\Actions\Components\Action;
use Lattice\Lattice\Attributes\AsForm;
use Lattice\Lattice\Forms\Components\Form;
use Lattice\Lattice\Forms\Components\TextInput;
use Lattice\Lattice\Forms\FormDefinition;
use Lattice\Lattice\Http\LatticeResponse;
use Lattice\Lattice\Ui\Components\Button;
use Lattice\Lattice\Ui\Components\Component;
use Lattice\Lattice\Ui\Components\Grid;
use Lattice\Lattice\Ui\Components\Stack;
use Lattice\Lattice\Ui\Components\Text;
use Lattice\Lattice\Ui\Enums\Gap;
use Lattice\Lattice\Ui\Enums\HttpMethod;
use Lattice\Lattice\Ui\Enums\StackDirection;
use Lattice\Actions\Components\Action;
use Lattice\Facades\Effects;
use Lattice\Form\Attributes\AsForm;
use Lattice\Form\Components\Form;
use Lattice\Form\Components\TextInput;
use Lattice\Form\FormDefinition;
use Lattice\Http\LatticeResponse;
use Lattice\Ui\Components\Button;
use Lattice\Ui\Components\Component;
use Lattice\Ui\Components\Grid;
use Lattice\Ui\Components\Stack;
use Lattice\Ui\Components\Text;
use Lattice\Ui\Enums\Gap;
use Lattice\Ui\Enums\HttpMethod;
use Lattice\Ui\Enums\StackDirection;

#[AsForm('settings.profile')]
class ProfileSettingsForm extends FormDefinition
Expand Down Expand Up @@ -70,7 +71,7 @@ public function handle(Request $request): LatticeResponse

$user->save();

return $this->toast(__('settings.profile.updated'))->toRoute('settings.edit');
return Effects::respond()->toast(__('settings.profile.updated'))->toRoute('settings.edit');
}

/**
Expand Down
Loading