Merge branch 'main' of https://homehud.duckdns.org/javier/Nexora

2025-05-07 00:21:14 +02:00
parent 655ea60d6b f97a7a8498
commit 19fa52ca65
11 changed files with 378 additions and 0 deletions
--- a/routes/web.php
+++ b/routes/web.php
@@ -49,9 +49,16 @@ Route::middleware(['auth', 'verified'])->group(function () {
    
    // Proyectos
    Route::resource('projects', ProjectController::class);
+<<<<<<< HEAD
    //Route::get('/projects/{project}', ProjectController::class)->name('projects.show');
    //Route::get('/projects/{project}', ProjectController::class)->name('projects.show')->middleware('can:view,project'); // Opcional: política de acceso
    Route::get('/projects/{project}', ProjectShow::class)->name('projects.show')->middleware('auth');
+=======
+    Route::get('/projects/{project}', ProjectController::class)->name('projects.show');
+    //Route::get('/projects/{project}', ProjectController::class)->name('projects.show')->middleware('can:view,project'); // Opcional: política de acceso
+    //Route::get('/projects/{project}', ProjectShow::class)->name('projects.show');
+    
+>>>>>>> f97a7a84985ea300216ba3ea2ab4c31306e1659a
    
    // Documentos
    Route::resource('documents', DocumentController::class);