From 054f152249d51ad66d1c2366d6f9b1326e5bd4e7 Mon Sep 17 00:00:00 2001
From: Erik Lindegren <erik@epineer.se>
Date: Mon, 24 Sep 2018 10:25:18 +0200
Subject: [PATCH 1/3] Place widgets in aside with header

---
 src/PersonalRecentVisitsWidget.php       | 4 ++--
 src/TeamRecentVisitsWidget.php           | 4 ++--
 tests/Feature/UserlandControllerTest.php | 6 ++++++
 3 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/src/PersonalRecentVisitsWidget.php b/src/PersonalRecentVisitsWidget.php
index 2724dca..6f604d2 100644
--- a/src/PersonalRecentVisitsWidget.php
+++ b/src/PersonalRecentVisitsWidget.php
@@ -17,9 +17,9 @@ public function __construct(RecentVisitsRepository $repository)
 
     public function toHtml()
     {
-        return '<ul>' . $this->getVisits()->map(function ($visit) {
+        return '<aside data-kontour-widget-name="PersonalRecentVisitsWidget"><header>Recent</header><ul>' . $this->getVisits()->map(function ($visit) {
             return '<li data-kontour-visit-type="' . $visit->getType() . '">' . $visit->getLink()->toHtml() . '</li>';
-        })->implode("\n") . '</ul>';
+        })->implode("\n") . '</ul></aside>';
     }
 
     public function isAuthorized(Authorizable $user = null): bool
diff --git a/src/TeamRecentVisitsWidget.php b/src/TeamRecentVisitsWidget.php
index 89258a4..ce57b35 100644
--- a/src/TeamRecentVisitsWidget.php
+++ b/src/TeamRecentVisitsWidget.php
@@ -17,9 +17,9 @@ public function __construct(RecentVisitsRepository $repository)
 
     public function toHtml()
     {
-        return '<ul>' . $this->getVisits()->map(function ($visit) {
+        return '<aside data-kontour-widget-name="TeamRecentVisitsWidget"><header>Team Recent</header><ul>' . $this->getVisits()->map(function ($visit) {
             return '<li data-kontour-visit-type="' . $visit->getType() . '" data-kontour-username="' . $visit->getUser()->getDisplayName() . '">' . $visit->getLink()->toHtml() . '</li>';
-        })->implode("\n") . '</ul>';
+        })->implode("\n") . '</ul></aside>';
     }
 
     public function isAuthorized(Authorizable $user = null): bool
diff --git a/tests/Feature/UserlandControllerTest.php b/tests/Feature/UserlandControllerTest.php
index 0ad4951..b18ee7b 100644
--- a/tests/Feature/UserlandControllerTest.php
+++ b/tests/Feature/UserlandControllerTest.php
@@ -63,6 +63,9 @@ public function test_recent_visits_widgets()
         $response->assertOk();
 
         // Check personal links
+        $response->assertSee('<aside data-kontour-widget-name="PersonalRecentVisitsWidget">');
+        $response->assertSee('<header>Recent</header>');
+
         $numberOfMatches = substr_count($response->content(), '<li data-kontour-visit-type="show"><a href="' . route('userland.index') . '">Recent Userland Tool</a>');
         $this->assertEquals(1, $numberOfMatches);
 
@@ -70,6 +73,9 @@ public function test_recent_visits_widgets()
         $this->assertEquals(1, $numberOfMatches);
 
         // Check team links
+        $response->assertSee('<aside data-kontour-widget-name="TeamRecentVisitsWidget">');
+        $response->assertSee('<header>Team Recent</header>');
+
         $numberOfMatches = substr_count($response->content(), '<li data-kontour-visit-type="edit" data-kontour-username="' . $otherUser->getDisplayName() . '"><a href="' . route('userland.edit') . '">Other Recent Userland Tool</a>');
         $this->assertEquals(1, $numberOfMatches);
 

From d8f73de15b020ffb4493f80aa01f0b2c7061bb90 Mon Sep 17 00:00:00 2001
From: Erik Lindegren <erik@epineer.se>
Date: Mon, 24 Sep 2018 10:36:12 +0200
Subject: [PATCH 2/3] Add section names in layout view

---
 resources/views/layouts/master.blade.php | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/resources/views/layouts/master.blade.php b/resources/views/layouts/master.blade.php
index eee63b4..6f782a6 100644
--- a/resources/views/layouts/master.blade.php
+++ b/resources/views/layouts/master.blade.php
@@ -11,23 +11,21 @@
       <button type="submit">Logout</button>
     </form>
   </header>
-  <nav>
+  <nav data-kontour-section="{{ $view_manager->navSection() }}">
     @foreach($widget_manager->getWidgetsForSection($view_manager->navSection()) as $widget)
       {{ $widget }}
     @endforeach
   </nav>
-  <main>
-  <!-- Section {{ $view_manager->mainSection() }} -->
+  <main data-kontour-section="{{ $view_manager->mainSection() }}">
   @yield($view_manager->mainSection())
-  <!-- End section {{ $view_manager->mainSection() }} -->
   </main>
-  <aside>
+  <section data-kontour-section="{{ $view_manager->widgetSection() }}">
   @section($view_manager->widgetSection())
     @foreach($widget_manager->getWidgetsForSection($view_manager->widgetSection()) as $widget)
       {{ $widget }}
     @endforeach
   @show
-  </aside>
+  </section>
 @endsection
 
 @push('styles')

From 3daacc9a8f90d3b9d9e9b8022c892c22ece49ddc Mon Sep 17 00:00:00 2001
From: Erik Lindegren <erik@epineer.se>
Date: Mon, 24 Sep 2018 10:44:24 +0200
Subject: [PATCH 3/3] Rename data widget attribute

---
 src/PersonalRecentVisitsWidget.php       | 2 +-
 src/TeamRecentVisitsWidget.php           | 2 +-
 tests/Feature/UserlandControllerTest.php | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/PersonalRecentVisitsWidget.php b/src/PersonalRecentVisitsWidget.php
index 6f604d2..37ea0a1 100644
--- a/src/PersonalRecentVisitsWidget.php
+++ b/src/PersonalRecentVisitsWidget.php
@@ -17,7 +17,7 @@ public function __construct(RecentVisitsRepository $repository)
 
     public function toHtml()
     {
-        return '<aside data-kontour-widget-name="PersonalRecentVisitsWidget"><header>Recent</header><ul>' . $this->getVisits()->map(function ($visit) {
+        return '<aside data-kontour-widget="PersonalRecentVisitsWidget"><header>Recent</header><ul>' . $this->getVisits()->map(function ($visit) {
             return '<li data-kontour-visit-type="' . $visit->getType() . '">' . $visit->getLink()->toHtml() . '</li>';
         })->implode("\n") . '</ul></aside>';
     }
diff --git a/src/TeamRecentVisitsWidget.php b/src/TeamRecentVisitsWidget.php
index ce57b35..da4f657 100644
--- a/src/TeamRecentVisitsWidget.php
+++ b/src/TeamRecentVisitsWidget.php
@@ -17,7 +17,7 @@ public function __construct(RecentVisitsRepository $repository)
 
     public function toHtml()
     {
-        return '<aside data-kontour-widget-name="TeamRecentVisitsWidget"><header>Team Recent</header><ul>' . $this->getVisits()->map(function ($visit) {
+        return '<aside data-kontour-widget="TeamRecentVisitsWidget"><header>Team Recent</header><ul>' . $this->getVisits()->map(function ($visit) {
             return '<li data-kontour-visit-type="' . $visit->getType() . '" data-kontour-username="' . $visit->getUser()->getDisplayName() . '">' . $visit->getLink()->toHtml() . '</li>';
         })->implode("\n") . '</ul></aside>';
     }
diff --git a/tests/Feature/UserlandControllerTest.php b/tests/Feature/UserlandControllerTest.php
index b18ee7b..5b6d49b 100644
--- a/tests/Feature/UserlandControllerTest.php
+++ b/tests/Feature/UserlandControllerTest.php
@@ -63,7 +63,7 @@ public function test_recent_visits_widgets()
         $response->assertOk();
 
         // Check personal links
-        $response->assertSee('<aside data-kontour-widget-name="PersonalRecentVisitsWidget">');
+        $response->assertSee('<aside data-kontour-widget="PersonalRecentVisitsWidget">');
         $response->assertSee('<header>Recent</header>');
 
         $numberOfMatches = substr_count($response->content(), '<li data-kontour-visit-type="show"><a href="' . route('userland.index') . '">Recent Userland Tool</a>');
@@ -73,7 +73,7 @@ public function test_recent_visits_widgets()
         $this->assertEquals(1, $numberOfMatches);
 
         // Check team links
-        $response->assertSee('<aside data-kontour-widget-name="TeamRecentVisitsWidget">');
+        $response->assertSee('<aside data-kontour-widget="TeamRecentVisitsWidget">');
         $response->assertSee('<header>Team Recent</header>');
 
         $numberOfMatches = substr_count($response->content(), '<li data-kontour-visit-type="edit" data-kontour-username="' . $otherUser->getDisplayName() . '"><a href="' . route('userland.edit') . '">Other Recent Userland Tool</a>');