Merge branch 'laravel-12' into 'LivewireViews'

# Conflicts:
#   resources/views/components/footer.blade.php
#   resources/views/components/layouts/app.blade.php
#   routes/web.php
This commit is contained in:
Iridium34
2025-03-15 21:54:38 +00:00
7 changed files with 143 additions and 55 deletions
+3 -1
View File
@@ -9,6 +9,7 @@ use App\Http\Controllers\ManufacturerController;
use App\Livewire\Types\Index;
use App\Livewire\Dashboard;
use App\Livewire\Color\Index;
Route::get('/', function () {
return view('welcome');
@@ -31,5 +32,6 @@ Route::middleware([
// Manufacturers
Route::resource('manufacturers', ManufacturerController::class);
Route::get('refresh', [ManufacturerController::class, 'refresh'])->name('refresh');
Route::get('colors', Index::class)->name('colors.index');
});