From ebe351ff0fc285eee3fbf28732f19fa80901e0f3 Mon Sep 17 00:00:00 2001
From: Liyas Thomas <liyascthomas@gmail.com>
Date: Sat, 18 Jul 2020 17:46:29 +0530
Subject: [PATCH] Import Collections directly from Docs page

---
 components/collections/collection.vue | 4 +++-
 components/collections/folder.vue     | 2 ++
 components/collections/index.vue      | 8 +-------
 components/collections/request.vue    | 7 ++++++-
 components/layout/section.vue         | 2 --
 components/layout/sidenav.vue         | 2 +-
 pages/doc.vue                         | 6 ++----
 7 files changed, 15 insertions(+), 16 deletions(-)

diff --git a/components/collections/collection.vue b/components/collections/collection.vue
index aff002c2d..1c0e8c4c2 100644
--- a/components/collections/collection.vue
+++ b/components/collections/collection.vue
@@ -14,7 +14,7 @@
           @click="$emit('select-collection')"
           v-tooltip.left="$t('import')"
         >
-          <i class="material-icons">keyboard_backspace</i>
+          <i class="material-icons">topic</i>
         </button>
         <v-popover>
           <button class="tooltip-target icon" v-tooltip.left="$t('more')">
@@ -51,6 +51,7 @@
             :folder="folder"
             :folderIndex="index"
             :collection-index="collectionIndex"
+            :doc="doc"
             @edit-folder="editFolder(collectionIndex, folder, index)"
             @edit-request="$emit('edit-request', $event)"
           />
@@ -66,6 +67,7 @@
             :collection-index="collectionIndex"
             :folder-index="-1"
             :request-index="index"
+            :doc="doc"
             @edit-request="
               $emit('edit-request', {
                 request,
diff --git a/components/collections/folder.vue b/components/collections/folder.vue
index 387cb50bf..332a0d5fe 100644
--- a/components/collections/folder.vue
+++ b/components/collections/folder.vue
@@ -38,6 +38,7 @@
             :collection-index="collectionIndex"
             :folder-index="folderIndex"
             :request-index="index"
+            :doc="doc"
             @edit-request="
               $emit('edit-request', {
                 request,
@@ -77,6 +78,7 @@ export default {
     folder: Object,
     collectionIndex: Number,
     folderIndex: Number,
+    doc: Boolean,
   },
   components: {
     request: () => import("./request"),
diff --git a/components/collections/index.vue b/components/collections/index.vue
index b090ebb4b..8cc794838 100644
--- a/components/collections/index.vue
+++ b/components/collections/index.vue
@@ -80,18 +80,12 @@ TODO:
         </li>
       </ul>
     </div>
-    <!-- <nuxt-link :to="localePath('doc')" :aria-label="$t('documentation')">
-      <button class="icon">
-        <i class="material-icons">topic</i>
-        <span>{{ $t("generate_docs") }}</span>
-      </button>
-    </nuxt-link> -->
   </pw-section>
 </template>
 
 <style scoped lang="scss">
 .virtual-list {
-  max-height: calc(100vh - 290px);
+  max-height: calc(100vh - 245px);
 }
 
 ul {
diff --git a/components/collections/request.vue b/components/collections/request.vue
index cbd6e0c56..83e8acb6d 100644
--- a/components/collections/request.vue
+++ b/components/collections/request.vue
@@ -1,7 +1,11 @@
 <template>
   <div class="flex-wrap">
     <div>
-      <button class="icon" @click="selectRequest()" v-tooltip="$t('use_request')">
+      <button
+        class="icon"
+        @click="!doc ? selectRequest() : {}"
+        v-tooltip="!doc ? $t('use_request') : ''"
+      >
         <i class="material-icons">insert_drive_file</i>
         <span>{{ request.name }}</span>
       </button>
@@ -50,6 +54,7 @@ export default {
     collectionIndex: Number,
     folderIndex: Number,
     requestIndex: Number,
+    doc: Boolean,
   },
   methods: {
     syncCollections() {
diff --git a/components/layout/section.vue b/components/layout/section.vue
index bc7db67b3..181937fb7 100644
--- a/components/layout/section.vue
+++ b/components/layout/section.vue
@@ -14,8 +14,6 @@
 
 <style scoped lang="scss">
 fieldset {
-  display: flex;
-  flex: 1;
   margin: 16px 0;
   border-radius: 8px;
   background-color: var(--bg-dark-color);
diff --git a/components/layout/sidenav.vue b/components/layout/sidenav.vue
index d0c346bcf..f541a1c8d 100644
--- a/components/layout/sidenav.vue
+++ b/components/layout/sidenav.vue
@@ -126,7 +126,7 @@
       <nav class="secondary-nav">
         <ul>
           <li>
-            <a href="#collections" v-tooltip.right="$t('collections')">
+            <a href="#import" v-tooltip.right="$t('import')">
               <i class="material-icons">folder</i>
             </a>
           </li>
diff --git a/pages/doc.vue b/pages/doc.vue
index 9aff4487b..6cd1f8b1a 100644
--- a/pages/doc.vue
+++ b/pages/doc.vue
@@ -2,7 +2,7 @@
   <div class="page">
     <div class="content">
       <div class="page-columns inner-left">
-        <pw-section class="blue" :label="$t('import')" ref="collections">
+        <pw-section class="blue" :label="$t('import')" ref="import">
           <ul>
             <li>
               <p class="info">
@@ -277,9 +277,7 @@
       </div>
 
       <aside class="sticky-inner inner-right">
-        <section>
-          <collections @use-collection="useSelectedCollection($event)" :doc="true" />
-        </section>
+        <collections @use-collection="useSelectedCollection($event)" :doc="true" />
       </aside>
     </div>
   </div>