From 87ef4776f60bee2d8e2c98fd6decb8b4e92285ce Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Samuel=20=C5=A0tancl?= <samuel.stancl@gmail.com>
Date: Wed, 18 Sep 2019 09:07:34 +0200
Subject: [PATCH] wip

---
 config.php                 |  2 +-
 config.production.php      |  2 +-
 navigation.php             | 89 ++++++++++++++++++++------------------
 source/1.x/index.html      |  2 +-
 source/2.x/index.html      |  2 +-
 source/_nav/menu.blade.php |  2 +-
 source/index.blade.php     |  2 +-
 7 files changed, 53 insertions(+), 48 deletions(-)

diff --git a/config.php b/config.php
index 08dfe4d..a842c68 100644
--- a/config.php
+++ b/config.php
@@ -14,7 +14,7 @@ return [
     },
 
     'link' => function ($page, $path) {
-        return $page->baseUrl . '/' . $page->version() . '/' . $path . ($page->prettyUrls ? '' : '.html');
+        return $page->baseUrl . $page->version() . '/' . $path . ($page->prettyUrls ? '' : '.html');
     },
 
     // Algolia DocSearch credentials
diff --git a/config.production.php b/config.production.php
index 894bbc4..ed868c8 100644
--- a/config.production.php
+++ b/config.production.php
@@ -1,7 +1,7 @@
 <?php
 
 return [
-    'baseUrl'    => env('JIGSAW_BASE_URL') ?? 'https://tenancy.samuelstancl.me/docs',
+    'baseUrl'    => env('JIGSAW_BASE_URL') ?? 'https://tenancy.samuelstancl.me/docs/', // must end with /
     'production' => true,
 
     'docsearchApiKey' => '53c5eaf88e819535d98f4a179c1802e1',
diff --git a/navigation.php b/navigation.php
index 380c674..65157c8 100644
--- a/navigation.php
+++ b/navigation.php
@@ -1,52 +1,57 @@
 <?php
 
 return [
-    'Getting Started' => [
-        'url'      => 'getting-started',
-        'children' => [
-            'Installation'             => 'installation',
-            'Storage Drivers'          => 'storage-drivers',
-            'This Package vs Others'   => 'difference-between-this-package-and-others',
-            'Configuration'            => 'configuration',
+    '1.x' => [
+        'Getting Started' => [
+            'url'      => 'getting-started',
+            'children' => [
+                'Installation'             => 'installation',
+                'Storage Drivers'          => 'storage-drivers',
+                'This Package vs Others'   => 'difference-between-this-package-and-others',
+                'Configuration'            => 'configuration',
+            ],
         ],
-    ],
-    'Usage' => [
-        'url'      => 'usage',
-        'children' => [
-            'Creating Tenants' => 'creating-tenants',
-            'Tenant Routes'    => 'tenant-routes',
-            'Tenant Storage'   => 'tenant-storage',
-            'Tenant Manager'   => 'tenant-manager',
-            'Console Commands' => 'console-commands',
+        'Usage' => [
+            'url'      => 'usage',
+            'children' => [
+                'Creating Tenants' => 'creating-tenants',
+                'Tenant Routes'    => 'tenant-routes',
+                'Tenant Storage'   => 'tenant-storage',
+                'Tenant Manager'   => 'tenant-manager',
+                'Console Commands' => 'console-commands',
+            ],
         ],
-    ],
-    'Digging Deeper' => [
-        'url'      => 'digging-deeper',
-        'children' => [
-            'Middleware Configuration'   => 'middleware-configuration',
-            'Custom Database Names'      => 'custom-database-names',
-            'Filesystem Tenancy'         => 'filesystem-tenancy',
-            'Jobs & Queues'              => 'jobs-queues',
-            'Event System'               => 'event-system',
-            'Tenancy Initialization'     => 'tenancy-initialization',
-            'Application Testing'        => 'application-testing',
-            'Writing Storage Drivers'    => 'writing-storage-drivers',
-            'Development'                => 'development',
+        'Digging Deeper' => [
+            'url'      => 'digging-deeper',
+            'children' => [
+                'Middleware Configuration'   => 'middleware-configuration',
+                'Custom Database Names'      => 'custom-database-names',
+                'Filesystem Tenancy'         => 'filesystem-tenancy',
+                'Jobs & Queues'              => 'jobs-queues',
+                'Event System'               => 'event-system',
+                'Tenancy Initialization'     => 'tenancy-initialization',
+                'Application Testing'        => 'application-testing',
+                'Writing Storage Drivers'    => 'writing-storage-drivers',
+                'Development'                => 'development',
+            ],
         ],
-    ],
-    'Integrations' => [
-        'url'      => 'integrations',
-        'children' => [
-            'Telescope' => 'telescope',
-            'Horizon'   => 'horizon',
+        'Integrations' => [
+            'url'      => 'integrations',
+            'children' => [
+                'Telescope' => 'telescope',
+                'Horizon'   => 'horizon',
+            ],
         ],
-    ],
-    'Tips' => [
-        'children' => [
-            'HTTPS Certificates' => 'https-certificates',
-            'Misc'               => 'misc-tips',
+        'Tips' => [
+            'children' => [
+                'HTTPS Certificates' => 'https-certificates',
+                'Misc'               => 'misc-tips',
+            ],
         ],
+        'Stay Updated' => 'stay-updated',
+        'GitHub'       => 'https://github.com/stancl/tenancy',
+    ],
+    '2.x' => [
+
     ],
-    'Stay Updated' => 'stay-updated',
-    'GitHub'       => 'https://github.com/stancl/tenancy',
 ];
diff --git a/source/1.x/index.html b/source/1.x/index.html
index 9aeb75e..6a49dfc 100644
--- a/source/1.x/index.html
+++ b/source/1.x/index.html
@@ -2,7 +2,7 @@
 <html lang="en-US">
 <head>
     <meta charset="UTF-8">
-    <meta http-equiv="refresh" content="0; url=getting-started/index.html">
+    <meta http-equiv="refresh" content="0; url=getting-started">
     <title>stancl/tenancy</title>
 </head>
 </html>
\ No newline at end of file
diff --git a/source/2.x/index.html b/source/2.x/index.html
index 9aeb75e..6a49dfc 100644
--- a/source/2.x/index.html
+++ b/source/2.x/index.html
@@ -2,7 +2,7 @@
 <html lang="en-US">
 <head>
     <meta charset="UTF-8">
-    <meta http-equiv="refresh" content="0; url=getting-started/index.html">
+    <meta http-equiv="refresh" content="0; url=getting-started">
     <title>stancl/tenancy</title>
 </head>
 </html>
\ No newline at end of file
diff --git a/source/_nav/menu.blade.php b/source/_nav/menu.blade.php
index 68de7b4..9867758 100644
--- a/source/_nav/menu.blade.php
+++ b/source/_nav/menu.blade.php
@@ -1,7 +1,7 @@
 @php $level = $level ?? 0 @endphp
 
 <ul class="list-reset my-0">
-    @foreach ($items as $label => $item)
+    @foreach ($items[$page->version()] as $label => $item)
         @include('_nav.menu-item')
     @endforeach
 </ul>
diff --git a/source/index.blade.php b/source/index.blade.php
index 5517014..2facec7 100644
--- a/source/index.blade.php
+++ b/source/index.blade.php
@@ -2,7 +2,7 @@
 <html lang="en-US">
 <head>
     <meta charset="UTF-8">
-    <meta http-equiv="refresh" content="0; url={{ $page->baseUrl . $page->defaultVersion }}/index.html">
+    <meta http-equiv="refresh" content="0; url={{ $page->baseUrl . $page->defaultVersion }}">
     <title>stancl/tenancy</title>
 </head>
 </html>
\ No newline at end of file