From 378d9e7758e6272e0c7845c6985fbb30f39b2b88 Mon Sep 17 00:00:00 2001
From: Liyas Thomas <liyascthomas@gmail.com>
Date: Tue, 3 Mar 2020 17:27:53 +0530
Subject: [PATCH] :truck: Moving or renaming files

---
 components/collections/addCollection.vue        |  2 +-
 components/collections/addFolder.vue            |  2 +-
 components/collections/editCollection.vue       |  2 +-
 components/collections/editFolder.vue           |  2 +-
 components/collections/editRequest.vue          |  2 +-
 .../collections/importExportCollections.vue     |  2 +-
 components/collections/index.vue                |  2 +-
 components/collections/saveRequestAs.vue        |  2 +-
 components/environments/addEnvironment.vue      |  2 +-
 components/environments/editEnvironment.vue     |  2 +-
 .../environments/importExportEnvironment.vue    |  2 +-
 components/environments/index.vue               |  2 +-
 components/{ => layout}/history.vue             |  6 +++---
 components/{ => layout}/logo.vue                |  0
 components/{ => layout}/section.vue             |  0
 components/{ => ui}/ace-editor.vue              |  4 ++--
 components/{ => ui}/autocomplete.vue            |  0
 components/{ => ui}/modal.vue                   |  0
 components/{ => ui}/toggle.vue                  |  0
 layouts/default.vue                             |  4 ++--
 pages/doc.vue                                   |  4 ++--
 pages/graphql.vue                               |  6 +++---
 pages/index.vue                                 | 12 ++++++------
 pages/index.vue.orig                            | 10 +++++-----
 pages/realtime.vue                              |  2 +-
 pages/settings.vue                              | 17 ++++++++++-------
 26 files changed, 46 insertions(+), 43 deletions(-)
 rename components/{ => layout}/history.vue (99%)
 rename components/{ => layout}/logo.vue (100%)
 rename components/{ => layout}/section.vue (100%)
 rename components/{ => ui}/ace-editor.vue (96%)
 rename components/{ => ui}/autocomplete.vue (100%)
 rename components/{ => ui}/modal.vue (100%)
 rename components/{ => ui}/toggle.vue (100%)

diff --git a/components/collections/addCollection.vue b/components/collections/addCollection.vue
index 69ee934b5..878c9d788 100644
--- a/components/collections/addCollection.vue
+++ b/components/collections/addCollection.vue
@@ -50,7 +50,7 @@ export default {
     show: Boolean,
   },
   components: {
-    modal: () => import("../../components/modal"),
+    modal: () => import("../../components/ui/modal"),
   },
   data() {
     return {
diff --git a/components/collections/addFolder.vue b/components/collections/addFolder.vue
index cc8761f51..2f442b580 100644
--- a/components/collections/addFolder.vue
+++ b/components/collections/addFolder.vue
@@ -50,7 +50,7 @@ export default {
     collectionIndex: Number,
   },
   components: {
-    modal: () => import("../../components/modal"),
+    modal: () => import("../../components/ui/modal"),
   },
   data() {
     return {
diff --git a/components/collections/editCollection.vue b/components/collections/editCollection.vue
index a3f12195e..8cfd3f27c 100644
--- a/components/collections/editCollection.vue
+++ b/components/collections/editCollection.vue
@@ -50,7 +50,7 @@ export default {
     editingCollectionIndex: Number,
   },
   components: {
-    modal: () => import("../../components/modal"),
+    modal: () => import("../../components/ui/modal"),
   },
   data() {
     return {
diff --git a/components/collections/editFolder.vue b/components/collections/editFolder.vue
index 9179b205f..611938de2 100644
--- a/components/collections/editFolder.vue
+++ b/components/collections/editFolder.vue
@@ -47,7 +47,7 @@ export default {
     folderIndex: Number,
   },
   components: {
-    modal: () => import("../../components/modal"),
+    modal: () => import("../../components/ui/modal"),
   },
   data() {
     return {
diff --git a/components/collections/editRequest.vue b/components/collections/editRequest.vue
index 480232784..175a79ca5 100644
--- a/components/collections/editRequest.vue
+++ b/components/collections/editRequest.vue
@@ -78,7 +78,7 @@ export default {
     requestIndex: Number,
   },
   components: {
-    modal: () => import("../../components/modal"),
+    modal: () => import("../../components/ui/modal"),
   },
   data() {
     return {
diff --git a/components/collections/importExportCollections.vue b/components/collections/importExportCollections.vue
index 8286cca11..68afd7312 100644
--- a/components/collections/importExportCollections.vue
+++ b/components/collections/importExportCollections.vue
@@ -88,7 +88,7 @@ export default {
     show: Boolean,
   },
   components: {
-    modal: () => import("../../components/modal"),
+    modal: () => import("../../components/ui/modal"),
   },
   computed: {
     collectionJson() {
diff --git a/components/collections/index.vue b/components/collections/index.vue
index a2f336c1f..fae7242b5 100644
--- a/components/collections/index.vue
+++ b/components/collections/index.vue
@@ -113,7 +113,7 @@ import { fb } from "../../functions/fb"
 export default {
   components: {
     collection,
-    "pw-section": () => import("../section"),
+    "pw-section": () => import("../layout/section"),
     addCollection: () => import("./addCollection"),
     addFolder: () => import("./addFolder"),
     editCollection: () => import("./editCollection"),
diff --git a/components/collections/saveRequestAs.vue b/components/collections/saveRequestAs.vue
index aab5bcb0b..9785a6a16 100644
--- a/components/collections/saveRequestAs.vue
+++ b/components/collections/saveRequestAs.vue
@@ -86,7 +86,7 @@ export default {
     editingRequest: Object,
   },
   components: {
-    modal: () => import("../../components/modal"),
+    modal: () => import("../../components/ui/modal"),
   },
   data() {
     return {
diff --git a/components/environments/addEnvironment.vue b/components/environments/addEnvironment.vue
index fe5e225ce..6d15499e6 100644
--- a/components/environments/addEnvironment.vue
+++ b/components/environments/addEnvironment.vue
@@ -50,7 +50,7 @@ export default {
     show: Boolean,
   },
   components: {
-    modal: () => import("../../components/modal"),
+    modal: () => import("../../components/ui/modal"),
   },
   data() {
     return {
diff --git a/components/environments/editEnvironment.vue b/components/environments/editEnvironment.vue
index b47320de6..c540ac311 100644
--- a/components/environments/editEnvironment.vue
+++ b/components/environments/editEnvironment.vue
@@ -126,7 +126,7 @@ export default {
     editingEnvironmentIndex: Number,
   },
   components: {
-    modal: () => import("../../components/modal"),
+    modal: () => import("../../components/ui/modal"),
   },
   data() {
     return {
diff --git a/components/environments/importExportEnvironment.vue b/components/environments/importExportEnvironment.vue
index 5c49c4503..2b4b4777f 100644
--- a/components/environments/importExportEnvironment.vue
+++ b/components/environments/importExportEnvironment.vue
@@ -88,7 +88,7 @@ export default {
     show: Boolean,
   },
   components: {
-    modal: () => import("../../components/modal"),
+    modal: () => import("../../components/ui/modal"),
   },
   computed: {
     environmentJson() {
diff --git a/components/environments/index.vue b/components/environments/index.vue
index a3db91df5..25034afc5 100644
--- a/components/environments/index.vue
+++ b/components/environments/index.vue
@@ -71,7 +71,7 @@ const updateOnLocalStorage = (propertyName, property) =>
 export default {
   components: {
     environment,
-    "pw-section": () => import("../section"),
+    "pw-section": () => import("../layout/section"),
     addEnvironment: () => import("./addEnvironment"),
     editEnvironment: () => import("./editEnvironment"),
     importExportEnvironment: () => import("./importExportEnvironment"),
diff --git a/components/history.vue b/components/layout/history.vue
similarity index 99%
rename from components/history.vue
rename to components/layout/history.vue
index bbe2799a8..e3dac98f5 100644
--- a/components/history.vue
+++ b/components/layout/history.vue
@@ -320,15 +320,15 @@ ol {
 </style>
 
 <script>
-import { findStatusGroup } from "../pages/index"
-import { fb } from "../functions/fb"
+import { findStatusGroup } from "../../pages/index"
+import { fb } from "../../functions/fb"
 
 const updateOnLocalStorage = (propertyName, property) =>
   window.localStorage.setItem(propertyName, JSON.stringify(property))
 
 export default {
   components: {
-    "pw-section": () => import("./section"),
+    "pw-section": () => import("../layout/section"),
     VirtualList: () => import("vue-virtual-scroll-list"),
   },
   data() {
diff --git a/components/logo.vue b/components/layout/logo.vue
similarity index 100%
rename from components/logo.vue
rename to components/layout/logo.vue
diff --git a/components/section.vue b/components/layout/section.vue
similarity index 100%
rename from components/section.vue
rename to components/layout/section.vue
diff --git a/components/ace-editor.vue b/components/ui/ace-editor.vue
similarity index 96%
rename from components/ace-editor.vue
rename to components/ui/ace-editor.vue
index 0ac6b2369..2b5140ddc 100644
--- a/components/ace-editor.vue
+++ b/components/ui/ace-editor.vue
@@ -23,8 +23,8 @@ const DEFAULT_THEME = "twilight"
 
 import ace from "ace-builds"
 import "ace-builds/webpack-resolver"
-import jsonParse from "../functions/jsonParse"
-import debounce from "../functions/utils/debounce"
+import jsonParse from "../../functions/jsonParse"
+import debounce from "../../functions/utils/debounce"
 
 export default {
   props: {
diff --git a/components/autocomplete.vue b/components/ui/autocomplete.vue
similarity index 100%
rename from components/autocomplete.vue
rename to components/ui/autocomplete.vue
diff --git a/components/modal.vue b/components/ui/modal.vue
similarity index 100%
rename from components/modal.vue
rename to components/ui/modal.vue
diff --git a/components/toggle.vue b/components/ui/toggle.vue
similarity index 100%
rename from components/toggle.vue
rename to components/ui/toggle.vue
diff --git a/layouts/default.vue b/layouts/default.vue
index f72bc6304..d6596866d 100644
--- a/layouts/default.vue
+++ b/layouts/default.vue
@@ -720,8 +720,8 @@ import { fb } from "../functions/fb"
 
 export default {
   components: {
-    logo: () => import("../components/logo"),
-    modal: () => import("../components/modal"),
+    logo: () => import("../components/layout/logo"),
+    modal: () => import("../components/ui/modal"),
     login: () => import("../components/firebase/login"),
   },
 
diff --git a/pages/doc.vue b/pages/doc.vue
index ac6f0d499..6a7f6ae1e 100644
--- a/pages/doc.vue
+++ b/pages/doc.vue
@@ -302,11 +302,11 @@
 </style>
 
 <script>
-import AceEditor from "../components/ace-editor"
+import AceEditor from "../components/ui/ace-editor"
 
 export default {
   components: {
-    "pw-section": () => import("../components/section"),
+    "pw-section": () => import("../components/layout/section"),
     Editor: AceEditor,
   },
 
diff --git a/pages/graphql.vue b/pages/graphql.vue
index ba443b0d4..cce5689ae 100644
--- a/pages/graphql.vue
+++ b/pages/graphql.vue
@@ -351,7 +351,7 @@ import axios from "axios"
 import * as gql from "graphql"
 import textareaAutoHeight from "../directives/textareaAutoHeight"
 import { commonHeaders } from "../functions/headers"
-import AceEditor from "../components/ace-editor"
+import AceEditor from "../components/ui/ace-editor"
 import QueryEditor from "../components/graphql/queryeditor"
 import { getPlatformSpecialKey } from "~/functions/platformutils"
 import { sendNetworkRequest } from "../functions/network"
@@ -361,10 +361,10 @@ export default {
     textareaAutoHeight,
   },
   components: {
-    "pw-section": () => import("../components/section"),
+    "pw-section": () => import("../components/layout/section"),
     "gql-field": () => import("../components/graphql/field"),
     "gql-type": () => import("../components/graphql/type"),
-    autocomplete: () => import("../components/autocomplete"),
+    autocomplete: () => import("../components/ui/autocomplete"),
     Editor: AceEditor,
     QueryEditor: QueryEditor,
   },
diff --git a/pages/index.vue b/pages/index.vue
index 1051600c7..1915a9388 100644
--- a/pages/index.vue
+++ b/pages/index.vue
@@ -1301,7 +1301,7 @@
 </template>
 
 <script>
-import section from "../components/section"
+import section from "../components/layout/section"
 import url from "url"
 import querystring from "querystring"
 import { commonHeaders } from "../functions/headers"
@@ -1310,7 +1310,7 @@ import parseCurlCommand from "../assets/js/curlparser.js"
 import getEnvironmentVariablesFromScript from "../functions/preRequest"
 import runTestScriptWithVariables from "../functions/postwomanTesting"
 import parseTemplateString from "../functions/templating"
-import AceEditor from "../components/ace-editor"
+import AceEditor from "../components/ui/ace-editor"
 import { tokenRequest, oauthRedirect } from "../assets/js/oauth"
 import { sendNetworkRequest } from "../functions/network"
 import { fb } from "../functions/fb"
@@ -1370,10 +1370,10 @@ export default {
   },
   components: {
     "pw-section": section,
-    "pw-toggle": () => import("../components/toggle"),
-    "pw-modal": () => import("../components/modal"),
-    history: () => import("../components/history"),
-    autocomplete: () => import("../components/autocomplete"),
+    "pw-toggle": () => import("../components/ui/toggle"),
+    "pw-modal": () => import("../components/ui/modal"),
+    history: () => import("../components/layout/history"),
+    autocomplete: () => import("../components/ui/autocomplete"),
     collections: () => import("../components/collections"),
     saveRequestAs: () => import("../components/collections/saveRequestAs"),
     Editor: AceEditor,
diff --git a/pages/index.vue.orig b/pages/index.vue.orig
index 0325c80e4..10990a3d4 100644
--- a/pages/index.vue.orig
+++ b/pages/index.vue.orig
@@ -1451,7 +1451,7 @@
 </template>
 
 <script>
-import section from "../components/section"
+import section from "../components/layout/section"
 import url from "url"
 import querystring from "querystring"
 import { commonHeaders } from "../functions/headers"
@@ -1460,7 +1460,7 @@ import parseCurlCommand from "../assets/js/curlparser.js"
 import getEnvironmentVariablesFromScript from "../functions/preRequest"
 import runTestScriptWithVariables from "../functions/postwomanTesting"
 import parseTemplateString from "../functions/templating"
-import AceEditor from "../components/ace-editor"
+import AceEditor from "../components/ui/ace-editor"
 import { tokenRequest, oauthRedirect } from "../assets/js/oauth"
 import { sendNetworkRequest } from "../functions/network"
 import { fb } from "../functions/fb"
@@ -1524,9 +1524,9 @@ export default {
   components: {
     "pw-section": section,
     "pw-toggle": () => import("../components/toggle"),
-    "pw-modal": () => import("../components/modal"),
-    history: () => import("../components/history"),
-    autocomplete: () => import("../components/autocomplete"),
+    "pw-modal": () => import("../components/ui/modal"),
+    history: () => import("../components/layout/history"),
+    autocomplete: () => import("../components/ui/autocomplete"),
     collections: () => import("../components/collections"),
     saveRequestAs: () => import("../components/collections/saveRequestAs"),
     Editor: AceEditor,
diff --git a/pages/realtime.vue b/pages/realtime.vue
index 473feaad3..a27227cdf 100644
--- a/pages/realtime.vue
+++ b/pages/realtime.vue
@@ -168,7 +168,7 @@ div.log {
 <script>
 export default {
   components: {
-    "pw-section": () => import("../components/section"),
+    "pw-section": () => import("../components/layout/section"),
   },
   data() {
     return {
diff --git a/pages/settings.vue b/pages/settings.vue
index 47de979e8..c41fe3bed 100644
--- a/pages/settings.vue
+++ b/pages/settings.vue
@@ -211,8 +211,10 @@
               class="link"
               href="https://apollosoftware.xyz/legal/postwoman"
               target="_blank"
-              rel="noopener">
-              {{ $t("apollosw_privacy_policy") }} </a>.
+              rel="noopener"
+            >
+              {{ $t("apollosw_privacy_policy") }} </a
+            >.
           </p>
         </li>
       </ul>
@@ -243,8 +245,8 @@ import { fb } from "../functions/fb"
 
 export default {
   components: {
-    "pw-section": () => import("../components/section"),
-    "pw-toggle": () => import("../components/toggle"),
+    "pw-section": () => import("../components/layout/section"),
+    "pw-toggle": () => import("../components/ui/toggle"),
     swatch: () => import("../components/settings/swatch"),
   },
 
@@ -341,7 +343,8 @@ export default {
 
         FRAME_COLORS_ENABLED: this.$store.state.postwoman.settings.FRAME_COLORS_ENABLED || false,
         PROXY_ENABLED: this.$store.state.postwoman.settings.PROXY_ENABLED || false,
-        PROXY_URL: this.$store.state.postwoman.settings.PROXY_URL || "https://postwoman.apollosoftware.xyz/",
+        PROXY_URL:
+          this.$store.state.postwoman.settings.PROXY_URL || "https://postwoman.apollosoftware.xyz/",
         PROXY_KEY: this.$store.state.postwoman.settings.PROXY_KEY || "",
 
         EXTENSIONS_ENABLED:
@@ -641,8 +644,8 @@ export default {
       fb.writeSettings("syncEnvironments", true)
     },
     resetProxy({ target }) {
-      this.settings.PROXY_URL = `https://postwoman.apollosoftware.xyz/`;
-      target.innerHTML = this.doneButton;
+      this.settings.PROXY_URL = `https://postwoman.apollosoftware.xyz/`
+      target.innerHTML = this.doneButton
       this.$toast.info(this.$t("cleared"), {
         icon: "clear_all",
       })