From fc6edb24442d53e2270a52c5653f653746bcbf44 Mon Sep 17 00:00:00 2001
From: guillaume91 <guillaume@sobit.nl>
Date: Thu, 23 May 2024 12:03:01 +0200
Subject: [PATCH] changed urls for projects manager

---
 laravel_app/app/Http/Controllers/ProjectController.php |  4 ++--
 laravel_app/app/Livewire/Projects/ProjectManager.php   | 10 ----------
 laravel_app/routes/web.php                             |  2 +-
 3 files changed, 3 insertions(+), 13 deletions(-)

diff --git a/laravel_app/app/Http/Controllers/ProjectController.php b/laravel_app/app/Http/Controllers/ProjectController.php
index 04c77f7..8ff8289 100644
--- a/laravel_app/app/Http/Controllers/ProjectController.php
+++ b/laravel_app/app/Http/Controllers/ProjectController.php
@@ -12,9 +12,9 @@ public function index()
         return view('projects.index');
     }
 
-    public function show(Project $project)
+    public function show(Project $project,?string $currentTab = null)
     {
-        return view('projects.show', compact('project'));
+        return $currentTab ? view('projects.show', compact(['project', 'currentTab'])) : redirect(route('project.show', [$project->id, 'download']));
     }
 
 }
diff --git a/laravel_app/app/Livewire/Projects/ProjectManager.php b/laravel_app/app/Livewire/Projects/ProjectManager.php
index e5179e8..d748c10 100644
--- a/laravel_app/app/Livewire/Projects/ProjectManager.php
+++ b/laravel_app/app/Livewire/Projects/ProjectManager.php
@@ -25,9 +25,6 @@ class ProjectManager extends Component
     public $showMailSettingsModal = false;
 
     public $projectIdBeingDeleted;
-//    public $span_json_path;
-//    public $pivot_json_path;
-//    public $harvest_json_path;
 
     public array $pivotFiles;
     public array $spanFiles;
@@ -59,13 +56,6 @@ public function editMailSettings(Project $project)
     private function loadFormData(Project $project)
     {
         $this->formData = $project->toArray();
-//        $this->pivot_json_path = $this->formData['pivot_json_path'];
-//        $this->span_json_path = $this->formData['span_json_path'];
-//        $this->harvest_json_path = $this->formData['harvest_json_path'];
-//        $this->formData['pivot_json_path'] = null;
-//        $this->formData['span_json_path'] = null;
-//        $this->formData['harvest_json_path'] = null;
-//        $this->formData['boundingBoxes'] = $project->boundingBoxes->toArray();
         $this->formData['mail_recipients'] = $project->emailRecipients->toArray() ?: [
             [
                 'name' => '',
diff --git a/laravel_app/routes/web.php b/laravel_app/routes/web.php
index 8f659c5..99ac0d9 100644
--- a/laravel_app/routes/web.php
+++ b/laravel_app/routes/web.php
@@ -29,7 +29,7 @@
     Route::get('/dashboard', function () {
         return view('dashboard');
     })->name('dashboard');
-    Route::get('/projects/{project}', [\App\Http\Controllers\ProjectController::class, 'show'])->name('project.show');
+    Route::get('/projects/{project}/{currentTab?}', [\App\Http\Controllers\ProjectController::class, 'show'])->name('project.show');
     Route::get('/projects/{projectReport}/download', [\App\Http\Controllers\ProjectReportController::class, 'download'])->name('project.report.download');
     Route::get('/projects', [\App\Http\Controllers\ProjectController::class, 'index'])->name('project');
 });