From 7e54db4fd410f4b0e3466a4b162215ac1817b1a4 Mon Sep 17 00:00:00 2001
From: PHP-Mods <info@php-mods.eu>
Date: Thu, 22 Jun 2017 00:24:19 +0300
Subject: [PATCH 1/3] updated logout to url

---
 app/Http/Controllers/Frontend/DashboardController.php | 4 ++++
 resources/views/home.blade.php                        | 4 ++++
 2 files changed, 8 insertions(+)

diff --git a/app/Http/Controllers/Frontend/DashboardController.php b/app/Http/Controllers/Frontend/DashboardController.php
index c75827b9..efa0381e 100644
--- a/app/Http/Controllers/Frontend/DashboardController.php
+++ b/app/Http/Controllers/Frontend/DashboardController.php
@@ -13,4 +13,8 @@ class DashboardController extends BaseController
     {
         return view('frontend.dashboard');
     }
+	public function test()
+    {
+        return view('frontend.dashboard');
+    }
 }
diff --git a/resources/views/home.blade.php b/resources/views/home.blade.php
index 6737b17d..bd7abb63 100644
--- a/resources/views/home.blade.php
+++ b/resources/views/home.blade.php
@@ -81,6 +81,7 @@
                 <a href="{{ url('/admin') }}">Admin</a>
             @endif
             <a href="{{ url('/user/dashboard') }}">Dashboard</a>
+<<<<<<< HEAD
             <a href="{!! url('/logout') !!}" class="btn btn-default btn-flat"
                                             onclick="event.preventDefault(); document.getElementById('logout-form').submit();">
                                             Sign out
@@ -88,6 +89,9 @@
                                         <form id="logout-form" action="{{ url('/logout') }}" method="POST" style="display: none;">
                                             {{ csrf_field() }}
                                         </form>
+=======
+            <a href="{{ url('/logout') }}">Logout</a>
+>>>>>>> #26.1 test
         @endif
     </div>
     @endif

From 88d163cc13004920b02562505bfa0c03717483ca Mon Sep 17 00:00:00 2001
From: PHP-Mods <info@php-mods.eu>
Date: Thu, 22 Jun 2017 00:42:08 +0300
Subject: [PATCH 2/3] remove some faulty data

---
 resources/views/home.blade.php | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/resources/views/home.blade.php b/resources/views/home.blade.php
index bd7abb63..d4202564 100644
--- a/resources/views/home.blade.php
+++ b/resources/views/home.blade.php
@@ -81,7 +81,6 @@
                 <a href="{{ url('/admin') }}">Admin</a>
             @endif
             <a href="{{ url('/user/dashboard') }}">Dashboard</a>
-<<<<<<< HEAD
             <a href="{!! url('/logout') !!}" class="btn btn-default btn-flat"
                                             onclick="event.preventDefault(); document.getElementById('logout-form').submit();">
                                             Sign out
@@ -89,9 +88,7 @@
                                         <form id="logout-form" action="{{ url('/logout') }}" method="POST" style="display: none;">
                                             {{ csrf_field() }}
                                         </form>
-=======
             <a href="{{ url('/logout') }}">Logout</a>
->>>>>>> #26.1 test
         @endif
     </div>
     @endif

From bee4044d63d25ef076a3bf9cecaf26b7ad234684 Mon Sep 17 00:00:00 2001
From: PHP-Mods <info@php-mods.eu>
Date: Thu, 22 Jun 2017 01:45:37 +0300
Subject: [PATCH 3/3] Updated Logout from form to get link

---
 resources/views/admin/app.blade.php | 10 ++--------
 resources/views/home.blade.php      |  7 -------
 routes/web.php                      |  1 +
 3 files changed, 3 insertions(+), 15 deletions(-)

diff --git a/resources/views/admin/app.blade.php b/resources/views/admin/app.blade.php
index d1da6ec3..f2048764 100644
--- a/resources/views/admin/app.blade.php
+++ b/resources/views/admin/app.blade.php
@@ -106,13 +106,7 @@
                                         <a href="#" class="btn btn-default btn-flat">Profile</a>
                                     </div>
                                     <div class="pull-right">
-                                        <a href="{!! url('/logout') !!}" class="btn btn-default btn-flat"
-                                            onclick="event.preventDefault(); document.getElementById('logout-form').submit();">
-                                            Sign out
-                                        </a>
-                                        <form id="logout-form" action="{{ url('/logout') }}" method="POST" style="display: none;">
-                                            {{ csrf_field() }}
-                                        </form>
+                                        <a href="{!! url('/logout') !!}" class="btn btn-default btn-flat">Sign out</a>
                                     </div>
                                 </li>
                             </ul>
@@ -193,7 +187,7 @@
 
     <!-- AdminLTE App -->
     <script src="https://cdnjs.cloudflare.com/ajax/libs/admin-lte/2.3.3/js/app.min.js"></script>
-    
+
     <script src="https://unpkg.com/leaflet@1.0.3/dist/leaflet.js"
         integrity="sha512-A7vV8IFfih/D732iSSKi20u/ooOfj/AGehOKq0f4vLT1Zr2Y+RX7C+w8A1gaSasGtRUZpF/NZgzSAu4/Gc41Lg=="
         crossorigin=""></script>
diff --git a/resources/views/home.blade.php b/resources/views/home.blade.php
index d4202564..8dc341db 100644
--- a/resources/views/home.blade.php
+++ b/resources/views/home.blade.php
@@ -81,13 +81,6 @@
                 <a href="{{ url('/admin') }}">Admin</a>
             @endif
             <a href="{{ url('/user/dashboard') }}">Dashboard</a>
-            <a href="{!! url('/logout') !!}" class="btn btn-default btn-flat"
-                                            onclick="event.preventDefault(); document.getElementById('logout-form').submit();">
-                                            Sign out
-                                        </a>
-                                        <form id="logout-form" action="{{ url('/logout') }}" method="POST" style="display: none;">
-                                            {{ csrf_field() }}
-                                        </form>
             <a href="{{ url('/logout') }}">Logout</a>
         @endif
     </div>
diff --git a/routes/web.php b/routes/web.php
index 8781ba7e..2c05d70f 100755
--- a/routes/web.php
+++ b/routes/web.php
@@ -15,5 +15,6 @@ Route::group([
 });
 
 Auth::routes();
+Route::get('/logout', 'Auth\LoginController@logout');
 
 require base_path('routes/admin.php');