Update from Maestro (#262)

Co-authored-by: WendellAdriel <11641518+WendellAdriel@users.noreply.github.com>

Author: joetannenbaum

.github/workflows/browser-tests.yml

@@ -5,10 +5,14 @@ on:
     branches:
       - develop
       - main
+      - master
+      - workos
   pull_request:
     branches:
       - develop
       - main
+      - master
+      - workos
 
 permissions:
   contents: write
@@ -17,7 +21,7 @@ jobs:
   quality:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
 
       - name: Setup PHP
         uses: shivammathur/setup-php@v2

.github/workflows/lint.yml

@@ -5,10 +5,14 @@ on:
     branches:
       - develop
       - main
+      - master
+      - workos
   pull_request:
     branches:
       - develop
       - main
+      - master
+      - workos
 
 jobs:
   ci:
@@ -39,14 +43,14 @@ jobs:
       - name: Install Dependencies
         run: composer install --no-interaction --prefer-dist --optimize-autoloader
 
-      - name: Build Assets
-        run: npm run build
-
       - name: Copy Environment File
         run: cp .env.example .env
 
       - name: Generate Application Key
         run: php artisan key:generate
 
+      - name: Build Assets
+        run: npm run build
+
       - name: Tests
         run: ./vendor/bin/phpunit

.github/workflows/tests.yml

@@ -4,11 +4,11 @@
 /public/build
 /public/hot
 /public/storage
+/storage/*.key
+/storage/pail
 /resources/js/actions
 /resources/js/routes
 /resources/js/wayfinder
-/storage/*.key
-/storage/pail
 /vendor
 .DS_Store
 .env

.gitignore

@@ -5,12 +5,12 @@
     "htmlWhitespaceSensitivity": "css",
     "printWidth": 80,
     "plugins": [
-        "prettier-plugin-organize-imports",
         "prettier-plugin-tailwindcss"
     ],
     "tailwindFunctions": [
         "clsx",
-        "cn"
+        "cn",
+        "cva"
     ],
     "tailwindStylesheet": "resources/css/app.css",
     "tabWidth": 4,

.prettierrc

@@ -26,7 +26,7 @@ public function edit(Request $request): Response
     }
 
     /**
-     * Update the user's profile settings.
+     * Update the user's profile information.
      */
     public function update(ProfileUpdateRequest $request): RedirectResponse
     {
@@ -42,7 +42,7 @@ public function update(ProfileUpdateRequest $request): RedirectResponse
     }
 
     /**
-     * Delete the user's account.
+     * Delete the user's profile.
      */
     public function destroy(ProfileDeleteRequest $request): RedirectResponse
     {

app/Http/Controllers/Settings/ProfileController.php

@@ -23,7 +23,6 @@
         "eslint-plugin-react": "^7.37.3",
         "eslint-plugin-react-hooks": "^7.0.0",
         "prettier": "^3.4.2",
-        "prettier-plugin-organize-imports": "^4.1.0",
         "prettier-plugin-tailwindcss": "^0.6.11",
         "typescript-eslint": "^8.23.0"
     },

…dd_two_factor_columns_to_users_table.php …dd_two_factor_columns_to_users_table.phpdatabase/migrations/2025_08_26_100418_add_two_factor_columns_to_users_table.php renamed to database/migrations/2025_08_14_170933_add_two_factor_columns_to_users_table.php database/migrations/2025_08_26_100418_add_two_factor_columns_to_users_table.php renamed to database/migrations/2025_08_14_170933_add_two_factor_columns_to_users_table.php

@@ -1,5 +1,5 @@
-import { Alert, AlertDescription, AlertTitle } from '@/components/ui/alert';
 import { AlertCircleIcon } from 'lucide-react';
+import { Alert, AlertDescription, AlertTitle } from '@/components/ui/alert';
 
 export default function AlertError({
     errors,