From 352f3af737779b90329cd394ebc2f578b4af61b6 Mon Sep 17 00:00:00 2001
From: Liyas Thomas <liyascthomas@gmail.com>
Date: Mon, 22 Mar 2021 11:53:36 +0000
Subject: [PATCH] refactor: show sub-folders before requests inside folders

---
 components/collections/graphql/Folder.vue | 34 +++++++++++------------
 1 file changed, 17 insertions(+), 17 deletions(-)

diff --git a/components/collections/graphql/Folder.vue b/components/collections/graphql/Folder.vue
index 02be2982e..b20d152d2 100644
--- a/components/collections/graphql/Folder.vue
+++ b/components/collections/graphql/Folder.vue
@@ -52,23 +52,6 @@
       </v-popover>
     </div>
     <div v-show="showChildren || isFiltered">
-      <ul class="flex-col">
-        <li
-          v-for="(request, index) in folder.requests"
-          :key="index"
-          class="flex ml-8 border-l border-brdColor"
-        >
-          <CollectionsGraphqlRequest
-            :request="request"
-            :collection-index="collectionIndex"
-            :folder-index="folderIndex"
-            :folder-name="folder.name"
-            :request-index="index"
-            :doc="doc"
-            @edit-request="$emit('edit-request', $event)"
-          />
-        </li>
-      </ul>
       <ul v-if="folder.folders && folder.folders.length" class="flex-col">
         <li
           v-for="(subFolder, subFolderIndex) in folder.folders"
@@ -87,6 +70,23 @@
           />
         </li>
       </ul>
+      <ul class="flex-col">
+        <li
+          v-for="(request, index) in folder.requests"
+          :key="index"
+          class="flex ml-8 border-l border-brdColor"
+        >
+          <CollectionsGraphqlRequest
+            :request="request"
+            :collection-index="collectionIndex"
+            :folder-index="folderIndex"
+            :folder-name="folder.name"
+            :request-index="index"
+            :doc="doc"
+            @edit-request="$emit('edit-request', $event)"
+          />
+        </li>
+      </ul>
       <ul
         v-if="
           folder.folders &&