Merge pull request #12 from kontenta/sections

Sections
kontenta · Sep 24, 2018 · 1513873 · 1513873
2 parents b738871 + 3daacc9
commit 1513873
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 10 deletions.
diff --git 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')

diff --git 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="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
@@ -17,9 +17,9 @@ public function __construct(RecentVisitsRepository $repository)
 
     public function toHtml()
     {
-        return '<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>';
+        })->implode("\n") . '</ul></aside>';
     }
 
     public function isAuthorized(Authorizable $user = null): bool

diff --git a/tests/Feature/UserlandControllerTest.php b/tests/Feature/UserlandControllerTest.php
@@ -63,13 +63,19 @@ public function test_recent_visits_widgets()
         $response->assertOk();
 
         // Check personal links
+        $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>');
         $this->assertEquals(1, $numberOfMatches);
 
         $numberOfMatches = substr_count($response->content(), '<li data-kontour-visit-type="edit"><a href="' . route('userland.edit') . '">Recent Userland Tool</a>');
         $this->assertEquals(1, $numberOfMatches);
 
         // Check team links
+        $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>');
         $this->assertEquals(1, $numberOfMatches);