From a413b49a973a21d514d231526f2dfbe357b75344 Mon Sep 17 00:00:00 2001
From: Jonathan Shook <jshook@gmail.com>
Date: Wed, 16 Sep 2020 17:04:21 -0500
Subject: [PATCH] restore category linking

---
 .../main/node/docsys/components/DocsMenu.vue  | 11 +++---
 docsys/src/main/node/docsys/js/docpaths.js    | 16 +++++----
 docsys/src/main/node/docsys/pages/index.vue   | 36 ++++++++++---------
 3 files changed, 35 insertions(+), 28 deletions(-)

diff --git a/docsys/src/main/node/docsys/components/DocsMenu.vue b/docsys/src/main/node/docsys/components/DocsMenu.vue
index 227cd1a55..57a038204 100644
--- a/docsys/src/main/node/docsys/components/DocsMenu.vue
+++ b/docsys/src/main/node/docsys/components/DocsMenu.vue
@@ -3,11 +3,11 @@
                        v-model="isDrawerOpen"
                        :permanent="isMenuLocked"
                        @transitionend="toggleDrawerOpened"
-  :title="drawerTitle">
+                       :title="drawerTitle">
 
     <div class="menu">
 
-<!--      active_category: {{ active_category.name }} active_topic: {{ active_topic.name }}-->
+      <!--      active_category: {{ active_category.name }} active_topic: {{ active_topic.name }}-->
       <!-- Use active_category and active_topic to select inactive -->
 
       <v-list nav dense>
@@ -21,12 +21,13 @@
           </v-list-item-action>
         </v-list-item>
 
+        <!--              link :to="category.path">{{ category.title }}-->
         <!-- by category -->
         <v-list-group v-for="(category,c) in categories" :key="c"
                       :value="active_category.title === category.title" active-class="isactive">
           <template v-slot:activator>
-            <v-list-item-content>
-              <v-list-item-title link :to="category.path">{{ category.title }}</v-list-item-title>
+            <v-list-item-content @click="$nuxt.$router.push({path: category.path})">
+              <v-list-item-title>{{ category.title }}</v-list-item-title>
             </v-list-item-content>
           </template>
 
@@ -59,7 +60,7 @@ export default {
     drawerTitle: {
       get() {
         return "category=" + this.active_category.name
-        +"\ntopic=" + this.active_topic.name
+            + "\ntopic=" + this.active_topic.name
       }
     },
     isMenuLocked: {
diff --git a/docsys/src/main/node/docsys/js/docpaths.js b/docsys/src/main/node/docsys/js/docpaths.js
index 2669fe0c3..7b74bfc87 100644
--- a/docsys/src/main/node/docsys/js/docpaths.js
+++ b/docsys/src/main/node/docsys/js/docpaths.js
@@ -37,13 +37,15 @@ export default {
     getTopic(route, categories, active_category) {
         let active_topic = active_category.summary_topic;
 
-        if (!route.path) {
-            active_topic = active_category.topics[0]
-        } else {
-            let found_topic = active_category.topics.find(x => {return x.path === route.path})
-            if (found_topic) {
-                active_topic = found_topic;
-            }
+        if (route.path) {
+            let found_topic = active_category.topics.find(x => {
+                return x.path === route.path
+            })
+            let found_index = active_category.topics.find(x => {
+                return x.path.match(/\/index(.md)?/)
+            });
+            active_topic = found_topic ? found_topic : found_index ? found_index : active_topic;
+            console.log("active_topic=" + active_topic.path);
         }
         return active_topic;
 
diff --git a/docsys/src/main/node/docsys/pages/index.vue b/docsys/src/main/node/docsys/pages/index.vue
index d84bd51b0..80b8107d8 100644
--- a/docsys/src/main/node/docsys/pages/index.vue
+++ b/docsys/src/main/node/docsys/pages/index.vue
@@ -1,26 +1,30 @@
 <template>
-  <!-- https://github.com/Microsoft/vscode-recipes/tree/master/vuejs-cli -->
-    <div class="container" style="justify-content: center; align-content: center; display: flex; width: 100%; margin-left: unset">
-<!--        <recursive-menu/>-->
-        <div style="justify-content: center" align="middle">
-            <logo align="middle" style="justify-content: center; align-content: center"></logo>
-            <h1 class="title">nosqlbench</h1>
-            <h2 class="subtitle">open source, pluggable, nosql benchmarking suite</h2>
-            <div class="links">
-                <nuxt-link to="/docs/" class="button--purple">Documentation</nuxt-link>
-                <a href="https://github.com/nosqlbench/nosqlbench" class="button--purple">Project Site</a>
-            </div>
-        </div>
-    </div>
+ <div></div>
+<!--  &lt;!&ndash; https://github.com/Microsoft/vscode-recipes/tree/master/vuejs-cli &ndash;&gt;-->
+<!--    <div class="container" style="justify-content: center; align-content: center; display: flex; width: 100%; margin-left: unset">-->
+<!--&lt;!&ndash;        <recursive-menu/>&ndash;&gt;-->
+<!--        <div style="justify-content: center" align="middle">-->
+<!--            <logo align="middle" style="justify-content: center; align-content: center"></logo>-->
+<!--            <h1 class="title">nosqlbench</h1>-->
+<!--            <h2 class="subtitle">open source, pluggable, nosql benchmarking suite</h2>-->
+<!--            <div class="links">-->
+<!--                <nuxt-link to="/docs/" class="button&#45;&#45;purple">Documentation</nuxt-link>-->
+<!--                <a href="https://github.com/nosqlbench/nosqlbench" class="button&#45;&#45;purple">Project Site</a>-->
+<!--            </div>-->
+<!--        </div>-->
+<!--    </div>-->
 </template>
 
 <script>
-    import Logo from '~/components/Logo.vue'
+    // import Logo from '~/components/Logo.vue'
 
     export default {
-        components: {
-            Logo
+        middleware({ redirect }) {
+          return redirect('/docs/')
         }
+        // components: {
+        //     Logo
+        // }
     }
 </script>