From 5d94ac361e8e2a324e6eca845bee311b6536016b Mon Sep 17 00:00:00 2001
From: Liyas Thomas <liyascthomas@gmail.com>
Date: Sun, 21 Jun 2020 09:24:45 +0530
Subject: [PATCH] Isolate Netlify, Firebase and Helper functions + Import from
 absolute paths

---
 components/collections/addCollection.vue      |  4 +-
 components/collections/addFolder.vue          |  4 +-
 components/collections/collection.vue         |  2 +-
 components/collections/editCollection.vue     |  4 +-
 components/collections/editFolder.vue         |  4 +-
 components/collections/editRequest.vue        |  4 +-
 components/collections/folder.vue             |  2 +-
 .../collections/importExportCollections.vue   |  4 +-
 components/collections/index.vue              |  2 +-
 components/collections/request.vue            |  2 +-
 components/collections/saveRequestAs.vue      |  4 +-
 components/environments/addEnvironment.vue    |  4 +-
 components/environments/editEnvironment.vue   |  6 +-
 components/environments/environment.vue       |  2 +-
 .../environments/importExportEnvironment.vue  |  4 +-
 components/environments/index.vue             |  2 +-
 components/firebase/feeds.vue                 |  2 +-
 components/firebase/inputform.vue             |  2 +-
 components/firebase/login.vue                 |  2 +-
 components/firebase/logout.vue                |  2 +-
 components/graphql/queryeditor.vue            |  4 +-
 components/layout/header.vue                  |  8 +--
 components/layout/history.vue                 |  4 +-
 components/realtime/log.vue                   |  2 +-
 components/realtime/mqtt.vue                  |  4 +-
 components/realtime/socketio.vue              |  4 +-
 components/realtime/sse.vue                   |  2 +-
 components/realtime/websocket.vue             |  2 +-
 components/ui/ace-editor.vue                  |  4 +-
 {functions => helpers}/editorutils.js         |  0
 {functions => helpers}/fb.js                  |  0
 {functions => helpers}/headers.js             |  0
 {functions => helpers}/jsonParse.js           |  0
 {functions => helpers}/network.js             |  0
 {functions => helpers}/platformutils.js       |  0
 {functions => helpers}/postwomanTesting.js    |  0
 {functions => helpers}/preRequest.js          |  0
 {functions => helpers}/requestParams.js       |  0
 .../strategies/AxiosStrategy.js               |  0
 .../strategies/ExtensionStrategy.js           |  0
 .../syntax/gqlQueryLangMode.js                |  0
 {functions => helpers}/templating.js          |  0
 {functions => helpers}/utils/contenttypes.js  |  0
 {functions => helpers}/utils/debounce.js      |  0
 {functions => helpers}/utils/string.js        |  0
 {functions => helpers}/utils/uri.js           |  0
 {functions => helpers}/utils/valid.js         |  0
 layouts/default.vue                           |  6 +-
 netlify.toml                                  |  2 +-
 {functions => netlify}/api.js                 |  0
 pages/doc.vue                                 |  4 +-
 pages/graphql.vue                             | 24 ++++----
 pages/index.vue                               | 60 +++++++++----------
 pages/realtime.vue                            | 14 ++---
 pages/settings.vue                            | 12 ++--
 tests/e2e/integration/proxy.spec.js           |  2 +-
 56 files changed, 108 insertions(+), 112 deletions(-)
 rename {functions => helpers}/editorutils.js (100%)
 rename {functions => helpers}/fb.js (100%)
 rename {functions => helpers}/headers.js (100%)
 rename {functions => helpers}/jsonParse.js (100%)
 rename {functions => helpers}/network.js (100%)
 rename {functions => helpers}/platformutils.js (100%)
 rename {functions => helpers}/postwomanTesting.js (100%)
 rename {functions => helpers}/preRequest.js (100%)
 rename {functions => helpers}/requestParams.js (100%)
 rename {functions => helpers}/strategies/AxiosStrategy.js (100%)
 rename {functions => helpers}/strategies/ExtensionStrategy.js (100%)
 rename {functions => helpers}/syntax/gqlQueryLangMode.js (100%)
 rename {functions => helpers}/templating.js (100%)
 rename {functions => helpers}/utils/contenttypes.js (100%)
 rename {functions => helpers}/utils/debounce.js (100%)
 rename {functions => helpers}/utils/string.js (100%)
 rename {functions => helpers}/utils/uri.js (100%)
 rename {functions => helpers}/utils/valid.js (100%)
 rename {functions => netlify}/api.js (100%)

diff --git a/components/collections/addCollection.vue b/components/collections/addCollection.vue
index e00dec3c3..7a8df1b77 100644
--- a/components/collections/addCollection.vue
+++ b/components/collections/addCollection.vue
@@ -43,14 +43,14 @@
 </template>
 
 <script>
-import { fb } from "../../functions/fb"
+import { fb } from "~/helpers/fb"
 
 export default {
   props: {
     show: Boolean,
   },
   components: {
-    modal: () => import("../../components/ui/modal"),
+    modal: () => import("~/components/ui/modal"),
   },
   data() {
     return {
diff --git a/components/collections/addFolder.vue b/components/collections/addFolder.vue
index 2a72c2daf..08bb8822b 100644
--- a/components/collections/addFolder.vue
+++ b/components/collections/addFolder.vue
@@ -43,7 +43,7 @@
 </template>
 
 <script>
-import { fb } from "../../functions/fb"
+import { fb } from "~/helpers/fb"
 
 export default {
   props: {
@@ -52,7 +52,7 @@ export default {
     collectionIndex: Number,
   },
   components: {
-    modal: () => import("../../components/ui/modal"),
+    modal: () => import("~/components/ui/modal"),
   },
   data() {
     return {
diff --git a/components/collections/collection.vue b/components/collections/collection.vue
index a490f7a09..c30427778 100644
--- a/components/collections/collection.vue
+++ b/components/collections/collection.vue
@@ -87,7 +87,7 @@ ul li {
 </style>
 
 <script>
-import { fb } from "../../functions/fb"
+import { fb } from "~/helpers/fb"
 
 export default {
   components: {
diff --git a/components/collections/editCollection.vue b/components/collections/editCollection.vue
index a25b4d99f..00bfc6ac1 100644
--- a/components/collections/editCollection.vue
+++ b/components/collections/editCollection.vue
@@ -43,7 +43,7 @@
 </template>
 
 <script>
-import { fb } from "../../functions/fb"
+import { fb } from "~/helpers/fb"
 
 export default {
   props: {
@@ -52,7 +52,7 @@ export default {
     editingCollectionIndex: Number,
   },
   components: {
-    modal: () => import("../../components/ui/modal"),
+    modal: () => import("~/components/ui/modal"),
   },
   data() {
     return {
diff --git a/components/collections/editFolder.vue b/components/collections/editFolder.vue
index 38506700b..7814a6fe6 100644
--- a/components/collections/editFolder.vue
+++ b/components/collections/editFolder.vue
@@ -38,7 +38,7 @@
 </template>
 
 <script>
-import { fb } from "../../functions/fb"
+import { fb } from "~/helpers/fb"
 
 export default {
   props: {
@@ -49,7 +49,7 @@ export default {
     folderIndex: Number,
   },
   components: {
-    modal: () => import("../../components/ui/modal"),
+    modal: () => import("~/components/ui/modal"),
   },
   data() {
     return {
diff --git a/components/collections/editRequest.vue b/components/collections/editRequest.vue
index 289c57005..39453d123 100644
--- a/components/collections/editRequest.vue
+++ b/components/collections/editRequest.vue
@@ -69,7 +69,7 @@
 </template>
 
 <script>
-import { fb } from "../../functions/fb"
+import { fb } from "~/helpers/fb"
 
 export default {
   props: {
@@ -80,7 +80,7 @@ export default {
     requestIndex: Number,
   },
   components: {
-    modal: () => import("../../components/ui/modal"),
+    modal: () => import("~/components/ui/modal"),
   },
   data() {
     return {
diff --git a/components/collections/folder.vue b/components/collections/folder.vue
index 8c652e9bb..97c8de5ea 100644
--- a/components/collections/folder.vue
+++ b/components/collections/folder.vue
@@ -70,7 +70,7 @@ ul li {
 </style>
 
 <script>
-import { fb } from "../../functions/fb"
+import { fb } from "~/helpers/fb"
 
 export default {
   props: {
diff --git a/components/collections/importExportCollections.vue b/components/collections/importExportCollections.vue
index 2c90803db..a4fc549b9 100644
--- a/components/collections/importExportCollections.vue
+++ b/components/collections/importExportCollections.vue
@@ -76,7 +76,7 @@
 </template>
 
 <script>
-import { fb } from "../../functions/fb"
+import { fb } from "~/helpers/fb"
 
 export default {
   data() {
@@ -88,7 +88,7 @@ export default {
     show: Boolean,
   },
   components: {
-    modal: () => import("../../components/ui/modal"),
+    modal: () => import("~/components/ui/modal"),
   },
   computed: {
     collectionJson() {
diff --git a/components/collections/index.vue b/components/collections/index.vue
index ce0b1dcf8..2aac7dad7 100644
--- a/components/collections/index.vue
+++ b/components/collections/index.vue
@@ -103,7 +103,7 @@ ul {
 
 <script>
 import collection from "./collection"
-import { fb } from "../../functions/fb"
+import { fb } from "~/helpers/fb"
 
 export default {
   components: {
diff --git a/components/collections/request.vue b/components/collections/request.vue
index 43eede7d0..cbd6e0c56 100644
--- a/components/collections/request.vue
+++ b/components/collections/request.vue
@@ -42,7 +42,7 @@ ul li {
 </style>
 
 <script>
-import { fb } from "../../functions/fb"
+import { fb } from "~/helpers/fb"
 
 export default {
   props: {
diff --git a/components/collections/saveRequestAs.vue b/components/collections/saveRequestAs.vue
index a1e668e6d..5eecdb2a7 100644
--- a/components/collections/saveRequestAs.vue
+++ b/components/collections/saveRequestAs.vue
@@ -78,7 +78,7 @@
 </template>
 
 <script>
-import { fb } from "../../functions/fb"
+import { fb } from "~/helpers/fb"
 
 export default {
   props: {
@@ -86,7 +86,7 @@ export default {
     editingRequest: Object,
   },
   components: {
-    modal: () => import("../../components/ui/modal"),
+    modal: () => import("~/components/ui/modal"),
   },
   data() {
     return {
diff --git a/components/environments/addEnvironment.vue b/components/environments/addEnvironment.vue
index 8d3e53951..b554fbd99 100644
--- a/components/environments/addEnvironment.vue
+++ b/components/environments/addEnvironment.vue
@@ -43,14 +43,14 @@
 </template>
 
 <script>
-import { fb } from "../../functions/fb"
+import { fb } from "~/helpers/fb"
 
 export default {
   props: {
     show: Boolean,
   },
   components: {
-    modal: () => import("../../components/ui/modal"),
+    modal: () => import("~/components/ui/modal"),
   },
   data() {
     return {
diff --git a/components/environments/editEnvironment.vue b/components/environments/editEnvironment.vue
index 03aee2a75..f269ccd04 100644
--- a/components/environments/editEnvironment.vue
+++ b/components/environments/editEnvironment.vue
@@ -114,8 +114,8 @@
 </template>
 
 <script>
-import textareaAutoHeight from "../../directives/textareaAutoHeight"
-import { fb } from "../../functions/fb"
+import textareaAutoHeight from "~/directives/textareaAutoHeight"
+import { fb } from "~/helpers/fb"
 
 export default {
   directives: {
@@ -127,7 +127,7 @@ export default {
     editingEnvironmentIndex: Number,
   },
   components: {
-    modal: () => import("../../components/ui/modal"),
+    modal: () => import("~/components/ui/modal"),
   },
   data() {
     return {
diff --git a/components/environments/environment.vue b/components/environments/environment.vue
index e7afb2bb3..ebf5329fa 100644
--- a/components/environments/environment.vue
+++ b/components/environments/environment.vue
@@ -42,7 +42,7 @@ ul li {
 </style>
 
 <script>
-import { fb } from "../../functions/fb"
+import { fb } from "~/helpers/fb"
 
 export default {
   props: {
diff --git a/components/environments/importExportEnvironment.vue b/components/environments/importExportEnvironment.vue
index 72642b496..cd6ef6d5b 100644
--- a/components/environments/importExportEnvironment.vue
+++ b/components/environments/importExportEnvironment.vue
@@ -76,7 +76,7 @@
 </template>
 
 <script>
-import { fb } from "../../functions/fb"
+import { fb } from "~/helpers/fb"
 
 export default {
   data() {
@@ -88,7 +88,7 @@ export default {
     show: Boolean,
   },
   components: {
-    modal: () => import("../../components/ui/modal"),
+    modal: () => import("~/components/ui/modal"),
   },
   computed: {
     environmentJson() {
diff --git a/components/environments/index.vue b/components/environments/index.vue
index e386377ce..6d6f76085 100644
--- a/components/environments/index.vue
+++ b/components/environments/index.vue
@@ -58,7 +58,7 @@ ul {
 
 <script>
 import environment from "./environment"
-import { fb } from "../../functions/fb"
+import { fb } from "~/helpers/fb"
 
 export default {
   components: {
diff --git a/components/firebase/feeds.vue b/components/firebase/feeds.vue
index 8bc7922a0..ad14fdf89 100644
--- a/components/firebase/feeds.vue
+++ b/components/firebase/feeds.vue
@@ -49,7 +49,7 @@ ol {
 </style>
 
 <script>
-import { fb } from "../../functions/fb"
+import { fb } from "~/helpers/fb"
 
 export default {
   data() {
diff --git a/components/firebase/inputform.vue b/components/firebase/inputform.vue
index c22d3f816..17e8430f0 100644
--- a/components/firebase/inputform.vue
+++ b/components/firebase/inputform.vue
@@ -46,7 +46,7 @@ ol {
 </style>
 
 <script>
-import { fb } from "../../functions/fb"
+import { fb } from "~/helpers/fb"
 
 export default {
   data() {
diff --git a/components/firebase/login.vue b/components/firebase/login.vue
index 015062ec3..23eca6f81 100644
--- a/components/firebase/login.vue
+++ b/components/firebase/login.vue
@@ -37,7 +37,7 @@
 
 <script>
 import firebase from "firebase/app"
-import { fb } from "../../functions/fb"
+import { fb } from "~/helpers/fb"
 
 export default {
   data() {
diff --git a/components/firebase/logout.vue b/components/firebase/logout.vue
index 2d7507330..060774f05 100644
--- a/components/firebase/logout.vue
+++ b/components/firebase/logout.vue
@@ -9,7 +9,7 @@
 
 <script>
 import firebase from "firebase/app"
-import { fb } from "../../functions/fb"
+import { fb } from "~/helpers/fb"
 
 export default {
   data() {
diff --git a/components/graphql/queryeditor.vue b/components/graphql/queryeditor.vue
index 5f3594cf1..534ffcc72 100644
--- a/components/graphql/queryeditor.vue
+++ b/components/graphql/queryeditor.vue
@@ -25,11 +25,11 @@ import ace from "ace-builds"
 import "ace-builds/webpack-resolver"
 import "ace-builds/src-noconflict/ext-language_tools"
 import "ace-builds/src-noconflict/mode-graphqlschema"
-import { defineGQLLanguageMode } from "~/functions/syntax/gqlQueryLangMode"
+import { defineGQLLanguageMode } from "~/helpers/syntax/gqlQueryLangMode"
 
 import * as gql from "graphql"
 import { getAutocompleteSuggestions } from "graphql-language-service-interface"
-import debounce from "../../functions/utils/debounce"
+import debounce from "~/helpers/utils/debounce"
 
 export default {
   props: {
diff --git a/components/layout/header.vue b/components/layout/header.vue
index 78dcca86c..e50f98226 100644
--- a/components/layout/header.vue
+++ b/components/layout/header.vue
@@ -282,15 +282,15 @@
 </style>
 
 <script>
-import intializePwa from "../../assets/js/pwa"
+import intializePwa from "~/assets/js/pwa"
 import {
   hasExtensionInstalled,
   hasChromeExtensionInstalled,
   hasFirefoxExtensionInstalled,
-} from "../../functions/strategies/ExtensionStrategy"
-import { getPlatformSpecialKey } from "../../functions/platformutils"
+} from "~/helpers/strategies/ExtensionStrategy"
+import { getPlatformSpecialKey } from "~/helpers/platformutils"
 import firebase from "firebase/app"
-import { fb } from "../../functions/fb"
+import { fb } from "~/helpers/fb"
 
 export default {
   components: {
diff --git a/components/layout/history.vue b/components/layout/history.vue
index a190a3231..fe2bd9c89 100644
--- a/components/layout/history.vue
+++ b/components/layout/history.vue
@@ -306,8 +306,8 @@ ol {
 </style>
 
 <script>
-import { findStatusGroup } from "../../pages/index"
-import { fb } from "../../functions/fb"
+import { findStatusGroup } from "~/pages/index"
+import { fb } from "~/helpers/fb"
 
 const updateOnLocalStorage = (propertyName, property) =>
   window.localStorage.setItem(propertyName, JSON.stringify(property))
diff --git a/components/realtime/log.vue b/components/realtime/log.vue
index acd1ce287..37fe6d0b4 100644
--- a/components/realtime/log.vue
+++ b/components/realtime/log.vue
@@ -40,7 +40,7 @@ div.realtime-log {
 </style>
 
 <script>
-import { getSourcePrefix } from "~/functions/utils/string"
+import { getSourcePrefix } from "~/helpers/utils/string"
 
 export default {
   props: ["log", "title"],
diff --git a/components/realtime/mqtt.vue b/components/realtime/mqtt.vue
index 889405981..92fcaa3fd 100644
--- a/components/realtime/mqtt.vue
+++ b/components/realtime/mqtt.vue
@@ -70,11 +70,11 @@
 
 <script>
 import Paho from "paho-mqtt"
-import { wsValid } from "~/functions/utils/valid"
+import { wsValid } from "~/helpers/utils/valid"
 
 export default {
   components: {
-    "pw-section": () => import("../../components/layout/section"),
+    "pw-section": () => import("~/components/layout/section"),
     realtimeLog: () => import("./log"),
   },
   data: function () {
diff --git a/components/realtime/socketio.vue b/components/realtime/socketio.vue
index 1f57cdb1c..9a67c5fd5 100644
--- a/components/realtime/socketio.vue
+++ b/components/realtime/socketio.vue
@@ -76,13 +76,13 @@
 </template>
 
 <script>
-import { socketioValid } from "~/functions/utils/valid"
+import { socketioValid } from "~/helpers/utils/valid"
 import io from "socket.io-client"
 import wildcard from "socketio-wildcard"
 
 export default {
   components: {
-    "pw-section": () => import("../../components/layout/section"),
+    "pw-section": () => import("~/components/layout/section"),
     realtimeLog: () => import("./log"),
   },
   data() {
diff --git a/components/realtime/sse.vue b/components/realtime/sse.vue
index a7294d84b..e4db04fb9 100644
--- a/components/realtime/sse.vue
+++ b/components/realtime/sse.vue
@@ -40,7 +40,7 @@
 </template>
 
 <script>
-import { httpValid } from "~/functions/utils/valid"
+import { httpValid } from "~/helpers/utils/valid"
 
 export default {
   components: {
diff --git a/components/realtime/websocket.vue b/components/realtime/websocket.vue
index c53dd1aaa..1f0a8195e 100644
--- a/components/realtime/websocket.vue
+++ b/components/realtime/websocket.vue
@@ -66,7 +66,7 @@
 </template>
 
 <script>
-import { wsValid } from "~/functions/utils/valid"
+import { wsValid } from "~/helpers/utils/valid"
 
 export default {
   components: {
diff --git a/components/ui/ace-editor.vue b/components/ui/ace-editor.vue
index ce4303e04..ca77e09bc 100644
--- a/components/ui/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 "~/helpers/jsonParse"
+import debounce from "~/helpers/utils/debounce"
 
 export default {
   props: {
diff --git a/functions/editorutils.js b/helpers/editorutils.js
similarity index 100%
rename from functions/editorutils.js
rename to helpers/editorutils.js
diff --git a/functions/fb.js b/helpers/fb.js
similarity index 100%
rename from functions/fb.js
rename to helpers/fb.js
diff --git a/functions/headers.js b/helpers/headers.js
similarity index 100%
rename from functions/headers.js
rename to helpers/headers.js
diff --git a/functions/jsonParse.js b/helpers/jsonParse.js
similarity index 100%
rename from functions/jsonParse.js
rename to helpers/jsonParse.js
diff --git a/functions/network.js b/helpers/network.js
similarity index 100%
rename from functions/network.js
rename to helpers/network.js
diff --git a/functions/platformutils.js b/helpers/platformutils.js
similarity index 100%
rename from functions/platformutils.js
rename to helpers/platformutils.js
diff --git a/functions/postwomanTesting.js b/helpers/postwomanTesting.js
similarity index 100%
rename from functions/postwomanTesting.js
rename to helpers/postwomanTesting.js
diff --git a/functions/preRequest.js b/helpers/preRequest.js
similarity index 100%
rename from functions/preRequest.js
rename to helpers/preRequest.js
diff --git a/functions/requestParams.js b/helpers/requestParams.js
similarity index 100%
rename from functions/requestParams.js
rename to helpers/requestParams.js
diff --git a/functions/strategies/AxiosStrategy.js b/helpers/strategies/AxiosStrategy.js
similarity index 100%
rename from functions/strategies/AxiosStrategy.js
rename to helpers/strategies/AxiosStrategy.js
diff --git a/functions/strategies/ExtensionStrategy.js b/helpers/strategies/ExtensionStrategy.js
similarity index 100%
rename from functions/strategies/ExtensionStrategy.js
rename to helpers/strategies/ExtensionStrategy.js
diff --git a/functions/syntax/gqlQueryLangMode.js b/helpers/syntax/gqlQueryLangMode.js
similarity index 100%
rename from functions/syntax/gqlQueryLangMode.js
rename to helpers/syntax/gqlQueryLangMode.js
diff --git a/functions/templating.js b/helpers/templating.js
similarity index 100%
rename from functions/templating.js
rename to helpers/templating.js
diff --git a/functions/utils/contenttypes.js b/helpers/utils/contenttypes.js
similarity index 100%
rename from functions/utils/contenttypes.js
rename to helpers/utils/contenttypes.js
diff --git a/functions/utils/debounce.js b/helpers/utils/debounce.js
similarity index 100%
rename from functions/utils/debounce.js
rename to helpers/utils/debounce.js
diff --git a/functions/utils/string.js b/helpers/utils/string.js
similarity index 100%
rename from functions/utils/string.js
rename to helpers/utils/string.js
diff --git a/functions/utils/uri.js b/helpers/utils/uri.js
similarity index 100%
rename from functions/utils/uri.js
rename to helpers/utils/uri.js
diff --git a/functions/utils/valid.js b/helpers/utils/valid.js
similarity index 100%
rename from functions/utils/valid.js
rename to helpers/utils/valid.js
diff --git a/layouts/default.vue b/layouts/default.vue
index 151645249..fb88e7430 100644
--- a/layouts/default.vue
+++ b/layouts/default.vue
@@ -16,9 +16,9 @@
 <script>
 export default {
   components: {
-    sidenav: () => import("../components/layout/sidenav"),
-    "pw-header": () => import("../components/layout/header"),
-    "pw-footer": () => import("../components/layout/footer"),
+    sidenav: () => import("~/components/layout/sidenav"),
+    "pw-header": () => import("~/components/layout/header"),
+    "pw-footer": () => import("~/components/layout/footer"),
   },
 
   beforeMount() {
diff --git a/netlify.toml b/netlify.toml
index ea43d468c..aa2472a4b 100644
--- a/netlify.toml
+++ b/netlify.toml
@@ -1,3 +1,3 @@
 [build]
   command = "npm run generate"
-  functions = "functions/"
+  functions = "netlify/"
diff --git a/functions/api.js b/netlify/api.js
similarity index 100%
rename from functions/api.js
rename to netlify/api.js
diff --git a/pages/doc.vue b/pages/doc.vue
index a9346ea6a..0549b57bd 100644
--- a/pages/doc.vue
+++ b/pages/doc.vue
@@ -303,11 +303,11 @@
 </style>
 
 <script>
-import AceEditor from "../components/ui/ace-editor"
+import AceEditor from "~/components/ui/ace-editor"
 
 export default {
   components: {
-    "pw-section": () => import("../components/layout/section"),
+    "pw-section": () => import("~/components/layout/section"),
     Editor: AceEditor,
   },
 
diff --git a/pages/graphql.vue b/pages/graphql.vue
index cdffd938b..5443b45f5 100644
--- a/pages/graphql.vue
+++ b/pages/graphql.vue
@@ -339,26 +339,26 @@
 <script>
 import axios from "axios"
 import * as gql from "graphql"
-import textareaAutoHeight from "../directives/textareaAutoHeight"
-import { commonHeaders } from "../functions/headers"
-import AceEditor from "../components/ui/ace-editor"
-import QueryEditor from "../components/graphql/queryeditor"
-import { getPlatformSpecialKey } from "~/functions/platformutils"
-import { sendNetworkRequest } from "../functions/network"
+import textareaAutoHeight from "~/directives/textareaAutoHeight"
+import { commonHeaders } from "~/helpers/headers"
+import AceEditor from "~/components/ui/ace-editor"
+import QueryEditor from "~/components/graphql/queryeditor"
+import { getPlatformSpecialKey } from "~/helpers/platformutils"
+import { sendNetworkRequest } from "~/helpers/network"
 
 export default {
   directives: {
     textareaAutoHeight,
   },
   components: {
-    "pw-section": () => import("../components/layout/section"),
-    "gql-field": () => import("../components/graphql/field"),
-    "gql-type": () => import("../components/graphql/type"),
-    autocomplete: () => import("../components/ui/autocomplete"),
+    "pw-section": () => import("~/components/layout/section"),
+    "gql-field": () => import("~/components/graphql/field"),
+    "gql-type": () => import("~/components/graphql/type"),
+    autocomplete: () => import("~/components/ui/autocomplete"),
     Editor: AceEditor,
     QueryEditor: QueryEditor,
-    tabs: () => import("../components/ui/tabs"),
-    tab: () => import("../components/ui/tab"),
+    tabs: () => import("~/components/ui/tabs"),
+    tab: () => import("~/components/ui/tab"),
   },
   data() {
     return {
diff --git a/pages/index.vue b/pages/index.vue
index d38f8fd7a..b2bc2fb6d 100644
--- a/pages/index.vue
+++ b/pages/index.vue
@@ -1339,28 +1339,24 @@
 </template>
 
 <script>
-import section from "../components/layout/section"
+import section from "~/components/layout/section"
 import url from "url"
 import querystring from "querystring"
-import { commonHeaders } from "../functions/headers"
-import textareaAutoHeight from "../directives/textareaAutoHeight"
-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/ui/ace-editor"
-import { tokenRequest, oauthRedirect } from "../assets/js/oauth"
-import { cancelRunningRequest, sendNetworkRequest } from "../functions/network"
-import { fb } from "../functions/fb"
-import { getEditorLangForMimeType } from "~/functions/editorutils"
-import {
-  hasPathParams,
-  addPathParamsToVariables,
-  getQueryParams,
-} from "../functions/requestParams.js"
-import { parseUrlAndPath } from "../functions/utils/uri.js"
-import { httpValid } from "../functions/utils/valid"
-import { knownContentTypes, isJSONContentType } from "../functions/utils/contenttypes"
+import { commonHeaders } from "~/helpers/headers"
+import textareaAutoHeight from "~/directives/textareaAutoHeight"
+import parseCurlCommand from "~/assets/js/curlparser.js"
+import getEnvironmentVariablesFromScript from "~/helpers/preRequest"
+import runTestScriptWithVariables from "~/helpers/postwomanTesting"
+import parseTemplateString from "~/helpers/templating"
+import AceEditor from "~/components/ui/ace-editor"
+import { tokenRequest, oauthRedirect } from "~/assets/js/oauth"
+import { cancelRunningRequest, sendNetworkRequest } from "~/helpers/network"
+import { fb } from "~/helpers/fb"
+import { getEditorLangForMimeType } from "~/helpers/editorutils"
+import { hasPathParams, addPathParamsToVariables, getQueryParams } from "~/helpers/requestParams.js"
+import { parseUrlAndPath } from "~/helpers/utils/uri.js"
+import { httpValid } from "~/helpers/utils/valid"
+import { knownContentTypes, isJSONContentType } from "~/helpers/utils/contenttypes"
 
 const statusCategories = [
   {
@@ -1417,19 +1413,19 @@ export default {
   },
   components: {
     "pw-section": section,
-    "pw-toggle": () => import("../components/ui/toggle"),
-    "pw-modal": () => import("../components/ui/modal"),
-    autocomplete: () => import("../components/ui/autocomplete"),
-    history: () => import("../components/layout/history"),
-    collections: () => import("../components/collections"),
-    saveRequestAs: () => import("../components/collections/saveRequestAs"),
+    "pw-toggle": () => import("~/components/ui/toggle"),
+    "pw-modal": () => import("~/components/ui/modal"),
+    autocomplete: () => import("~/components/ui/autocomplete"),
+    history: () => import("~/components/layout/history"),
+    collections: () => import("~/components/collections"),
+    saveRequestAs: () => import("~/components/collections/saveRequestAs"),
     Editor: AceEditor,
-    environments: () => import("../components/environments"),
-    inputform: () => import("../components/firebase/inputform"),
-    notes: () => import("../components/firebase/feeds"),
-    login: () => import("../components/firebase/login"),
-    tabs: () => import("../components/ui/tabs"),
-    tab: () => import("../components/ui/tab"),
+    environments: () => import("~/components/environments"),
+    inputform: () => import("~/components/firebase/inputform"),
+    notes: () => import("~/components/firebase/feeds"),
+    login: () => import("~/components/firebase/login"),
+    tabs: () => import("~/components/ui/tabs"),
+    tab: () => import("~/components/ui/tab"),
   },
   data() {
     return {
diff --git a/pages/realtime.vue b/pages/realtime.vue
index ac400985d..4c87e0723 100644
--- a/pages/realtime.vue
+++ b/pages/realtime.vue
@@ -25,13 +25,13 @@
 <script>
 export default {
   components: {
-    "pw-section": () => import("../components/layout/section"),
-    tabs: () => import("../components/ui/tabs"),
-    tab: () => import("../components/ui/tab"),
-    websocket: () => import("../components/realtime/websocket"),
-    sse: () => import("../components/realtime/sse"),
-    socketio: () => import("../components/realtime/socketio"),
-    mqtt: () => import("../components/realtime/mqtt"),
+    "pw-section": () => import("~/components/layout/section"),
+    tabs: () => import("~/components/ui/tabs"),
+    tab: () => import("~/components/ui/tab"),
+    websocket: () => import("~/components/realtime/websocket"),
+    sse: () => import("~/components/realtime/sse"),
+    socketio: () => import("~/components/realtime/socketio"),
+    mqtt: () => import("~/components/realtime/mqtt"),
   },
 }
 </script>
diff --git a/pages/settings.vue b/pages/settings.vue
index 023072472..2909ccf2a 100644
--- a/pages/settings.vue
+++ b/pages/settings.vue
@@ -209,15 +209,15 @@
 
 <script>
 import firebase from "firebase/app"
-import { fb } from "../functions/fb"
+import { fb } from "~/helpers/fb"
 
 export default {
   components: {
-    "pw-section": () => import("../components/layout/section"),
-    "pw-toggle": () => import("../components/ui/toggle"),
-    swatch: () => import("../components/settings/swatch"),
-    login: () => import("../components/firebase/login"),
-    logout: () => import("../components/firebase/logout"),
+    "pw-section": () => import("~/components/layout/section"),
+    "pw-toggle": () => import("~/components/ui/toggle"),
+    swatch: () => import("~/components/settings/swatch"),
+    login: () => import("~/components/firebase/login"),
+    logout: () => import("~/components/firebase/logout"),
   },
 
   data() {
diff --git a/tests/e2e/integration/proxy.spec.js b/tests/e2e/integration/proxy.spec.js
index 71d816255..19031cf75 100644
--- a/tests/e2e/integration/proxy.spec.js
+++ b/tests/e2e/integration/proxy.spec.js
@@ -13,7 +13,7 @@
 
 describe("Proxy enabled - external request", () => {
   it("Enable proxy and make a GET request to Postwoman API", () => {
-    cy.enableProxy("/?url=https://postwoman.io&path=/.netlify/functions/api")
+    cy.enableProxy("/?url=https://postwoman.io&path=/.netlify/netlify/api")
       .get("#send")
       .click()
       .get("#response-details-wrapper", { timeout: 24000 })