From 4fa58cec5a184107df10206ad218289800590462 Mon Sep 17 00:00:00 2001
From: Nabeel S <nabeelio@users.noreply.github.com>
Date: Thu, 13 Aug 2020 17:53:30 -0400
Subject: [PATCH] Fix clear cache errors with duplicate route names #759 (#787)

---
 app/Providers/RouteServiceProvider.php                          | 2 +-
 modules/Installer/Providers/InstallerServiceProvider.php        | 2 +-
 modules/Installer/Resources/views/install/index-start.blade.php | 2 +-
 modules/Updater/Providers/UpdateServiceProvider.php             | 2 +-
 modules/Updater/Resources/views/index-start.blade.php           | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/app/Providers/RouteServiceProvider.php b/app/Providers/RouteServiceProvider.php
index 40bdbaa1..0954b7c8 100755
--- a/app/Providers/RouteServiceProvider.php
+++ b/app/Providers/RouteServiceProvider.php
@@ -103,8 +103,8 @@ class RouteServiceProvider extends ServiceProvider
                 Route::get('livemap', 'LiveMapController@index')->name('livemap.index');
             });
 
+            Route::get('/logout', 'Auth\LoginController@logout')->name('auth.logout');
             Auth::routes(['verify' => true]);
-            Route::get('/logout', 'Auth\LoginController@logout')->name('logout');
         });
     }
 
diff --git a/modules/Installer/Providers/InstallerServiceProvider.php b/modules/Installer/Providers/InstallerServiceProvider.php
index 06adb3f1..63ba0b2c 100644
--- a/modules/Installer/Providers/InstallerServiceProvider.php
+++ b/modules/Installer/Providers/InstallerServiceProvider.php
@@ -33,7 +33,7 @@ class InstallerServiceProvider extends ServiceProvider
             Route::post('/dbtest', 'InstallerController@dbtest')->name('dbtest');
 
             Route::get('/step1', 'InstallerController@step1')->name('step1');
-            Route::post('/step1', 'InstallerController@step1')->name('step1');
+            Route::post('/step1', 'InstallerController@step1')->name('step1post');
 
             Route::get('/step2', 'InstallerController@step2')->name('step2');
             Route::post('/envsetup', 'InstallerController@envsetup')->name('envsetup');
diff --git a/modules/Installer/Resources/views/install/index-start.blade.php b/modules/Installer/Resources/views/install/index-start.blade.php
index 62d69839..504376a5 100644
--- a/modules/Installer/Resources/views/install/index-start.blade.php
+++ b/modules/Installer/Resources/views/install/index-start.blade.php
@@ -3,7 +3,7 @@
 
 @section('content')
   <p>Press continue to start</p>
-  {{ Form::open(['route' => 'installer.step1', 'method' => 'post']) }}
+  {{ Form::open(['route' => 'installer.step1post', 'method' => 'post']) }}
   <p style="text-align: right">
     {{ Form::submit('Start >>', ['class' => 'btn btn-success']) }}
   </p>
diff --git a/modules/Updater/Providers/UpdateServiceProvider.php b/modules/Updater/Providers/UpdateServiceProvider.php
index 7739ce39..38516de4 100644
--- a/modules/Updater/Providers/UpdateServiceProvider.php
+++ b/modules/Updater/Providers/UpdateServiceProvider.php
@@ -29,7 +29,7 @@ class UpdateServiceProvider extends ServiceProvider
             Route::get('/', 'UpdateController@index')->name('index');
 
             Route::get('/step1', 'UpdateController@step1')->name('step1');
-            Route::post('/step1', 'UpdateController@step1')->name('step1');
+            Route::post('/step1', 'UpdateController@step1')->name('step1post');
 
             Route::post('/run-migrations', 'UpdateController@run_migrations')->name('run_migrations');
             Route::get('/complete', 'UpdateController@complete')->name('complete');
diff --git a/modules/Updater/Resources/views/index-start.blade.php b/modules/Updater/Resources/views/index-start.blade.php
index ddbde149..f550feeb 100644
--- a/modules/Updater/Resources/views/index-start.blade.php
+++ b/modules/Updater/Resources/views/index-start.blade.php
@@ -4,7 +4,7 @@
 @section('content')
   <h2>phpvms updater</h2>
   <p>Press continue to check if there are any updates available.</p>
-  {{ Form::open(['route' => 'update.step1', 'method' => 'post']) }}
+  {{ Form::open(['route' => 'update.step1post', 'method' => 'post']) }}
   <p style="text-align: right">
     {{ Form::submit('Start >>', ['class' => 'btn btn-success']) }}
   </p>