From b1f604ada75a4f46562aadcd382c748999097d08 Mon Sep 17 00:00:00 2001
From: Wing-Kam Wong <wingkwong.code@gmail.com>
Date: Thu, 17 Jun 2021 01:26:04 +0800
Subject: [PATCH 1/7] fix: hardcoded baseurl - ref to #264

Signed-off-by: Wing-Kam Wong <wingkwong.code@gmail.com>
---
 packages/nc-gui/components/changeEnv.vue      |  4 +--
 .../nc-gui/components/createOrEditProject.vue |  2 +-
 .../components/project/settings/env.vue       |  4 +--
 packages/nc-gui/components/project/xcInfo.vue |  3 +-
 packages/nc-gui/nuxt.config.js                | 29 ++-----------------
 packages/nc-gui/pages/nc/_project_id.vue      |  3 +-
 packages/nc-gui/pages/project/id.vue          |  4 +--
 .../pages/user/authentication/signin.vue      | 12 ++------
 .../user/authentication/signup/_token.vue     |  5 ++--
 .../user/authentication/signup/index.vue      |  3 +-
 packages/nc-gui/plugins/projectLoader.js      | 27 ++---------------
 packages/nc-gui/store/graphqlClient.js        |  5 ++--
 packages/nc-gui/store/project.js              |  5 ++--
 packages/nc-gui/store/sqlMgr.js               | 10 +++----
 packages/nc-gui/store/users.js                |  5 ++--
 15 files changed, 36 insertions(+), 85 deletions(-)

diff --git a/packages/nc-gui/components/changeEnv.vue b/packages/nc-gui/components/changeEnv.vue
index 94bd2c0653..a28e158bc6 100644
--- a/packages/nc-gui/components/changeEnv.vue
+++ b/packages/nc-gui/components/changeEnv.vue
@@ -72,8 +72,7 @@
         await new Promise(resolve => {
           const interv = setInterval(() => {
             axios.create({
-              baseURL: process.env.NODE_ENV === 'production' ? './' : 'http://localhost:8080/dashboard',
-              // baseURL:  'http://localhost:8080/dashboard',
+              baseURL: `${$axios.defaults.baseURL}/dashboard`,
             }).get('').then(() => {
               this.projectReloading = false;
               clearInterval(interv);
@@ -105,6 +104,7 @@
  *
  * @author Naveen MR <oof1lab@gmail.com>
  * @author Pranav C Balan <pranavxc@gmail.com>
+ * @author Wing-Kam Wong <wingkwong.code@gmail.com>
  *
  * @license GNU AGPL version 3 or any later version
  *
diff --git a/packages/nc-gui/components/createOrEditProject.vue b/packages/nc-gui/components/createOrEditProject.vue
index ef26be9ae3..f5395c4841 100644
--- a/packages/nc-gui/components/createOrEditProject.vue
+++ b/packages/nc-gui/components/createOrEditProject.vue
@@ -1388,7 +1388,7 @@ export default {
       this.allSchemas = true;
       await this.$axios({
         url: 'demo',
-        baseURL: process.env.NODE_ENV === 'production' ? './' : 'http://localhost:8080/dashboard',
+        baseURL: `${this.$axios.defaults.baseURL}/dashboard`,
       });
     },
 
diff --git a/packages/nc-gui/components/project/settings/env.vue b/packages/nc-gui/components/project/settings/env.vue
index 46b23012e7..1ea1eb7c46 100644
--- a/packages/nc-gui/components/project/settings/env.vue
+++ b/packages/nc-gui/components/project/settings/env.vue
@@ -62,8 +62,7 @@ export default {
       await new Promise(resolve => {
         const interv = setInterval(() => {
           axios.create({
-            baseURL: process.env.NODE_ENV === 'production' ? './' : 'http://localhost:8080/dashboard',
-            // baseURL:  'http://localhost:8080/dashboard',
+            baseURL: `${$axios.defaults.baseURL}/dashboard`
           }).get('').then(() => {
             this.projectReloading = false;
             clearInterval(interv);
@@ -94,6 +93,7 @@ export default {
  *
  * @author Naveen MR <oof1lab@gmail.com>
  * @author Pranav C Balan <pranavxc@gmail.com>
+ * @author Wing-Kam Wong <wingkwong.code@gmail.com>
  *
  * @license GNU AGPL version 3 or any later version
  *
diff --git a/packages/nc-gui/components/project/xcInfo.vue b/packages/nc-gui/components/project/xcInfo.vue
index d3535c435f..5ba70af562 100644
--- a/packages/nc-gui/components/project/xcInfo.vue
+++ b/packages/nc-gui/components/project/xcInfo.vue
@@ -241,7 +241,7 @@ export default {
   async created() {
     await this.loadProjectApiInfo();
     try {
-      this.iframeUrl = this._isDev ? 'http://localhost:8080/dashboard/status' : './status';
+      this.iframeUrl = `${this.$axios.defaults.baseURL}/dashboard/status`;
       const res = await this.$axios.get(this.iframeUrl);
       this.showinfoIFrame = true;
     } catch (e) {
@@ -322,6 +322,7 @@ iframe {
  *
  * @author Naveen MR <oof1lab@gmail.com>
  * @author Pranav C Balan <pranavxc@gmail.com>
+ * @author Wing-Kam Wong <wingkwong.code@gmail.com>
  *
  * @license GNU AGPL version 3 or any later version
  *
diff --git a/packages/nc-gui/nuxt.config.js b/packages/nc-gui/nuxt.config.js
index 3d66319d86..62daee9c1c 100644
--- a/packages/nc-gui/nuxt.config.js
+++ b/packages/nc-gui/nuxt.config.js
@@ -90,9 +90,7 @@ export default {
   ** See https://axios.nuxtjs.org/options
   */
   axios: {
-    baseURL: process.env.NODE_ENV === 'production' ? '../' : 'http://localhost:8080/',
-    // baseURL: 'http://localhost:8080/',
-    // baseURL: 'http://localhost:8080/',
+    baseURL: process.env.NC_BACKEND_URL || 'http://localhost:8080',
   },
   /*
   ** vuetify module configuration
@@ -217,6 +215,7 @@ export default {
  *
  * @author Naveen MR <oof1lab@gmail.com>
  * @author Pranav C Balan <pranavxc@gmail.com>
+ * @author Wing-Kam Wong <wingkwong.code@gmail.com>
  *
  * @license GNU AGPL version 3 or any later version
  *
@@ -233,26 +232,4 @@ export default {
  * You should have received a copy of the GNU Affero General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  *
- */
-/**
- * @copyright Copyright (c) 2021, Xgene Cloud Ltd
- *
- * @author Naveen MR <oof1lab@gmail.com>
- * @author Pranav C Balan <pranavxc@gmail.com>
- *
- * @license GNU AGPL version 3 or any later version
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- *
- */
+ */
\ No newline at end of file
diff --git a/packages/nc-gui/pages/nc/_project_id.vue b/packages/nc-gui/pages/nc/_project_id.vue
index 4d2d7adc95..a333ff97d1 100644
--- a/packages/nc-gui/pages/nc/_project_id.vue
+++ b/packages/nc-gui/pages/nc/_project_id.vue
@@ -47,7 +47,7 @@ export default {
       this.$router.replace({query: {}})
     }
     try {
-      hj('stateChange', 'http://localhost:8080/dashboard/#/nc/');
+      hj('stateChange', `${this.$axios.defaults.baseURL}/dashboard/#/nc/`);
     } catch (e) {
     }
   },
@@ -112,6 +112,7 @@ export default {
  *
  * @author Naveen MR <oof1lab@gmail.com>
  * @author Pranav C Balan <pranavxc@gmail.com>
+ * @author Wing-Kam Wong <wingkwong.code@gmail.com>
  *
  * @license GNU AGPL version 3 or any later version
  *
diff --git a/packages/nc-gui/pages/project/id.vue b/packages/nc-gui/pages/project/id.vue
index b4c2cd55d8..5d802decc2 100644
--- a/packages/nc-gui/pages/project/id.vue
+++ b/packages/nc-gui/pages/project/id.vue
@@ -1113,8 +1113,7 @@ export default {
           }
 
           axios.create({
-            baseURL: process.env.NODE_ENV === 'production' ? './' : 'http://localhost:8080/dashboard',
-            // baseURL: 'http://localhost:8080/dashboard',
+            baseURL: `${$axios.defaults.baseURL}/dashboard`,
           }).get('').then(() => {
             toast.goAway(100);
             this.projectReloading = false;
@@ -1692,6 +1691,7 @@ export default {
  *
  * @author Naveen MR <oof1lab@gmail.com>
  * @author Pranav C Balan <pranavxc@gmail.com>
+ * @author Wing-Kam Wong <wingkwong.code@gmail.com>
  *
  * @license GNU AGPL version 3 or any later version
  *
diff --git a/packages/nc-gui/pages/user/authentication/signin.vue b/packages/nc-gui/pages/user/authentication/signin.vue
index 9a8d8e3dd1..46adc3bd13 100644
--- a/packages/nc-gui/pages/user/authentication/signin.vue
+++ b/packages/nc-gui/pages/user/authentication/signin.vue
@@ -105,11 +105,7 @@
                 <div>
                   <v-btn
                     v-if="googleAuthEnabled"
-                    :href="
-                      _isDev
-                        ? 'http://localhost:8080/auth/google'
-                        : '../auth/google'
-                    "
+                    :href="`${this.$axios.defaults.baseURL}/auth/google`"
                     outlined
                     large
                     elevation-10
@@ -126,11 +122,7 @@
                   </v-btn>
                   <v-btn
                     v-if="githubAuthEnabled"
-                    :href="
-                      _isDev
-                        ? 'http://localhost:8080/auth/github'
-                        : '../auth/github'
-                    "
+                    :href="`${this.$axios.defaults.baseURL}/auth/google`"
                     outlined
                     large
                     elevation-10
diff --git a/packages/nc-gui/pages/user/authentication/signup/_token.vue b/packages/nc-gui/pages/user/authentication/signup/_token.vue
index 0501ec9d63..fe4aa00cc5 100644
--- a/packages/nc-gui/pages/user/authentication/signup/_token.vue
+++ b/packages/nc-gui/pages/user/authentication/signup/_token.vue
@@ -98,7 +98,7 @@
                 <v-btn
 
                   v-if="googleAuthEnabled"
-                  :href="(_isDev ?'http://localhost:8080/auth/google':'../auth/google') + `?state=${token}`" outlined
+                  :href="`${this.$axios.defaults.baseURL}/auth/google?state=${token}`" outlined
                   large elevation-10
                   block
                   color="blue">
@@ -154,7 +154,7 @@
 <!--                <v-btn
 
                   v-if="googleAuthEnabled"
-                  :href="(_isDev ?'http://localhost:8080/auth/google':'../auth/google') + `?state=${token}`" outlined
+                  :href="`${this.$axios.defaults.baseURL}/auth/google?state=${token}`" outlined
                   large elevation-10
                   block
                   color="blue">
@@ -500,6 +500,7 @@ export default {
  *
  * @author Naveen MR <oof1lab@gmail.com>
  * @author Pranav C Balan <pranavxc@gmail.com>
+ * @author Wing-Kam Wong <wingkwong.code@gmail.com>
  *
  * @license GNU AGPL version 3 or any later version
  *
diff --git a/packages/nc-gui/pages/user/authentication/signup/index.vue b/packages/nc-gui/pages/user/authentication/signup/index.vue
index 66ca8e609f..5a480f330b 100644
--- a/packages/nc-gui/pages/user/authentication/signup/index.vue
+++ b/packages/nc-gui/pages/user/authentication/signup/index.vue
@@ -131,7 +131,7 @@
                 <v-btn
 
                   v-if="googleAuthEnabled"
-                  :href="_isDev ?'http://localhost:8080/auth/google':'../auth/google'" outlined large elevation-10
+                  :href="`${this.$axios.defaults.baseURL}/auth/google`" outlined large elevation-10
                   block
                   color="blue">
                   <img :src="require('~/assets/img/gmail.png')"
@@ -482,6 +482,7 @@ export default {
  *
  * @author Naveen MR <oof1lab@gmail.com>
  * @author Pranav C Balan <pranavxc@gmail.com>
+ * @author Wing-Kam Wong <wingkwong.code@gmail.com>
  *
  * @license GNU AGPL version 3 or any later version
  *
diff --git a/packages/nc-gui/plugins/projectLoader.js b/packages/nc-gui/plugins/projectLoader.js
index e9a623ad4e..af5ede6c03 100644
--- a/packages/nc-gui/plugins/projectLoader.js
+++ b/packages/nc-gui/plugins/projectLoader.js
@@ -5,7 +5,7 @@ export default async ({store, redirect, $axios, $toast}) => {
     && /\bcode=/.test(window.location.search)) {
     try {
       const tokenData = await $axios.create({
-        baseURL: process.env.NODE_ENV === 'production' ? '../' : 'http://localhost:8080/',
+        baseURL: $axios.defaults.baseURL,
       }).post(`/auth/${window.location.search.indexOf('state=github') > -1 ? 'github' : 'google'}/genTokenByCode${window.location.search}`);
 
       store.commit('users/MutSetToken', tokenData.data.token);
@@ -68,6 +68,7 @@ export default async ({store, redirect, $axios, $toast}) => {
  *
  * @author Naveen MR <oof1lab@gmail.com>
  * @author Pranav C Balan <pranavxc@gmail.com>
+ * @author Wing-Kam Wong <wingkwong.code@gmail.com>
  *
  * @license GNU AGPL version 3 or any later version
  *
@@ -84,26 +85,4 @@ export default async ({store, redirect, $axios, $toast}) => {
  * You should have received a copy of the GNU Affero General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  *
- */
-/**
- * @copyright Copyright (c) 2021, Xgene Cloud Ltd
- *
- * @author Naveen MR <oof1lab@gmail.com>
- * @author Pranav C Balan <pranavxc@gmail.com>
- *
- * @license GNU AGPL version 3 or any later version
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- *
- */
+ */
\ No newline at end of file
diff --git a/packages/nc-gui/store/graphqlClient.js b/packages/nc-gui/store/graphqlClient.js
index b7ca61c170..20c8beef5a 100644
--- a/packages/nc-gui/store/graphqlClient.js
+++ b/packages/nc-gui/store/graphqlClient.js
@@ -11,7 +11,7 @@ export const state = () => ({
    *
    */
   list: [{
-    url: 'http://localhost:8080/graphql'
+    url: `${process.env.NC_BACKEND_URL || 'http://localhost:8080'}/graphql`
   }]
 
 });
@@ -33,13 +33,12 @@ export const actions = {
 
 };
 
-
-
 /**
  * @copyright Copyright (c) 2021, Xgene Cloud Ltd
  *
  * @author Naveen MR <oof1lab@gmail.com>
  * @author Pranav C Balan <pranavxc@gmail.com>
+ * @author Wing-Kam Wong <wingkwong.code@gmail.com>
  *
  * @license GNU AGPL version 3 or any later version
  *
diff --git a/packages/nc-gui/store/project.js b/packages/nc-gui/store/project.js
index b2ebb7d1ce..000d7282eb 100644
--- a/packages/nc-gui/store/project.js
+++ b/packages/nc-gui/store/project.js
@@ -583,19 +583,20 @@ export const actions = {
   async ActLoadProjectInfo({commit}) {
     const projectInfo = (await this.$axios({
       url: '/auth/type',
-      baseURL: process.env.NODE_ENV === 'production' ? './' : 'http://localhost:8080/dashboard',
-      // baseURL:  'http://localhost:8080/dashboard',
+      baseURL: `${this.$axios.defaults.baseURL}/dashboard`,
       method: 'get'
     })).data;
 
     commit('MutProjectInfo', projectInfo)
   }
 };
+
 /**
  * @copyright Copyright (c) 2021, Xgene Cloud Ltd
  *
  * @author Naveen MR <oof1lab@gmail.com>
  * @author Pranav C Balan <pranavxc@gmail.com>
+ * @author Wing-Kam Wong <wingkwong.code@gmail.com>
  *
  * @license GNU AGPL version 3 or any later version
  *
diff --git a/packages/nc-gui/store/sqlMgr.js b/packages/nc-gui/store/sqlMgr.js
index e687ea3f7e..009326d77e 100644
--- a/packages/nc-gui/store/sqlMgr.js
+++ b/packages/nc-gui/store/sqlMgr.js
@@ -339,8 +339,7 @@ export const actions = {
         // result = await state.sqlMgr.sqlOpPlus(args, op, opArgs);
         result = (await this.$axios({
             url: '?q=sqlOpPlus_' + op,
-            baseURL: process.env.NODE_ENV === 'production' ? './' : 'http://localhost:8080/dashboard',
-            // baseURL: 'http://localhost:8080/dashboard',
+            baseURL: `${this.$axios.defaults.baseURL}/dashboard`,
             data: {api: op, ...args, ...params, args: opArgs, sqlOpPlus: true},
             headers,
             method: 'post'
@@ -377,8 +376,7 @@ export const actions = {
       }
       return (await this.$axios({
         url: '?q=sqlOp_' + op,
-        baseURL: process.env.NODE_ENV === 'production' ? './' : 'http://localhost:8080/dashboard',
-        // baseURL: 'http://localhost:8080/dashboard',
+        baseURL: `${this.$axios.defaults.baseURL}/dashboard`,
         data: {api: op, ...args, ...params, args: opArgs},
         headers,
         method: 'post',
@@ -423,8 +421,7 @@ export const actions = {
 
       return (await this.$axios({
         url: '?q=sqlOp_' + op,
-        baseURL: process.env.NODE_ENV === 'production' ? './' : 'http://localhost:8080/dashboard',
-        // baseURL:  'http://localhost:8080/dashboard',
+        baseURL: `${$this.axios.defaults.baseURL}/dashboard`,
         data: formData, //{api: op, ...args, args: opArgs},
         headers,
         method: 'post',
@@ -445,6 +442,7 @@ export const actions = {
  *
  * @author Naveen MR <oof1lab@gmail.com>
  * @author Pranav C Balan <pranavxc@gmail.com>
+ * @author Wing-Kam Wong <wingkwong.code@gmail.com>
  *
  * @license GNU AGPL version 3 or any later version
  *
diff --git a/packages/nc-gui/store/users.js b/packages/nc-gui/store/users.js
index adaf69eb77..84a504f660 100644
--- a/packages/nc-gui/store/users.js
+++ b/packages/nc-gui/store/users.js
@@ -497,8 +497,7 @@ export const actions = {
 
     return (await this.$axios({
       url: '/auth/admin/verify',
-      baseURL: process.env.NODE_ENV === 'production' ? './' : 'http://localhost:8080/dashboard',
-      // baseURL:  'http://localhost:8080/dashboard',
+      baseURL: `${this.$axios.defaults.baseURL}/dashboard`,
       method: 'post',
       data: {secret}
     })).data;
@@ -531,11 +530,13 @@ export const actions = {
 //   actions,
 //   mutations
 // }
+
 /**
  * @copyright Copyright (c) 2021, Xgene Cloud Ltd
  *
  * @author Naveen MR <oof1lab@gmail.com>
  * @author Pranav C Balan <pranavxc@gmail.com>
+ * @author Wing-Kam Wong <wingkwong.code@gmail.com>
  *
  * @license GNU AGPL version 3 or any later version
  *

From fe756f5c9b581317c01bb3c53691ec3fcd542fe8 Mon Sep 17 00:00:00 2001
From: Wing-Kam Wong <wingkwong.code@gmail.com>
Date: Thu, 17 Jun 2021 21:10:24 +0800
Subject: [PATCH 2/7] doc: include NC_BACKEND_URL to README.md - ref to #264

Signed-off-by: Wing-Kam Wong <wingkwong.code@gmail.com>
---
 README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/README.md b/README.md
index 0d6a5b44cf..4fb9a0c52b 100644
--- a/README.md
+++ b/README.md
@@ -170,6 +170,7 @@ docker-compose up
 | NC_SENTRY_DSN           | No        | For Sentry monitoring                                                     |   |
 | NC_CONNECT_TO_EXTERNAL_DB_DISABLED | No | Disable Project creation with external database                              |   |
 | NC_DISABLE_TELE | No | Disable telemetry                              |   |
+| NC_BACKEND_URL | No | Custom Backend URL                              | ``http://localhost:8080`` will be used  |
 
 # Running locally 
 ```

From 96a2d904393b94c6940d79ff3071f861ef2bca01 Mon Sep 17 00:00:00 2001
From: Wing-Kam Wong <wingkwong.code@gmail.com>
Date: Thu, 17 Jun 2021 23:30:55 +0800
Subject: [PATCH 3/7] fix: hardcoded baseurl - ref to #264

Signed-off-by: Wing-Kam Wong <wingkwong.code@gmail.com>
---
 packages/nc-gui/components/project/graphqlClient.vue          | 2 +-
 packages/nc-gui/components/project/spreadsheet/apis/gqlApi.js | 2 +-
 packages/nc-gui/components/project/swaggerClient.vue          | 2 +-
 packages/nc-gui/components/project/xcInfo.vue                 | 2 +-
 packages/nc-gui/layouts/default.vue                           | 4 ++--
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/packages/nc-gui/components/project/graphqlClient.vue b/packages/nc-gui/components/project/graphqlClient.vue
index eb18f09109..4838845398 100644
--- a/packages/nc-gui/components/project/graphqlClient.vue
+++ b/packages/nc-gui/components/project/graphqlClient.vue
@@ -55,7 +55,7 @@ export default {
     if (this.$store.state.graphqlClient.list && this.$store.state.graphqlClient.list[0])
       this.webViewUrl = this.url = this.$store.state.graphqlClient.list[0].url;
     try {
-      const {info} = (await this.$axios.get(`/nc/${this.$route.params.project_id}/projectApiInfo`, {
+      const {info} = (await this.$axios.get(`${this.$axios.defaults.baseURL}/nc/${this.$route.params.project_id}/projectApiInfo`, {
         headers: {
           'xc-auth': this.$store.state.users.token
         }
diff --git a/packages/nc-gui/components/project/spreadsheet/apis/gqlApi.js b/packages/nc-gui/components/project/spreadsheet/apis/gqlApi.js
index 926c99c1b3..2b3ae838c8 100644
--- a/packages/nc-gui/components/project/spreadsheet/apis/gqlApi.js
+++ b/packages/nc-gui/components/project/spreadsheet/apis/gqlApi.js
@@ -29,7 +29,7 @@ export default class GqlApi {
 
   post(url, params) {
     return this.$axios({
-      url,
+      url: `${this.$axios.defaults.baseURL}/${url}`,
       method: 'post',
       data: params,
     })
diff --git a/packages/nc-gui/components/project/swaggerClient.vue b/packages/nc-gui/components/project/swaggerClient.vue
index d59d3bddc0..883908a800 100644
--- a/packages/nc-gui/components/project/swaggerClient.vue
+++ b/packages/nc-gui/components/project/swaggerClient.vue
@@ -55,7 +55,7 @@ export default {
     // if (this.$store.state.graphqlClient.list && this.$store.state.graphqlClient.list[0])
     //   this.webViewUrl = this.url = this.$store.state.graphqlClient.list[0].url;
     try {
-      const {info} = (await this.$axios.get(`/nc/${this.$route.params.project_id}/projectApiInfo`, {
+      const {info} = (await this.$axios.get(`${this.$axios.defaults.baseURL}/nc/${this.$route.params.project_id}/projectApiInfo`, {
         headers: {
           'xc-auth': this.$store.state.users.token
         }
diff --git a/packages/nc-gui/components/project/xcInfo.vue b/packages/nc-gui/components/project/xcInfo.vue
index 5ba70af562..13f21bfd1c 100644
--- a/packages/nc-gui/components/project/xcInfo.vue
+++ b/packages/nc-gui/components/project/xcInfo.vue
@@ -252,7 +252,7 @@ export default {
   }, methods: {
     async loadProjectApiInfo() {
       try {
-        const {info, aggregatedInfo} = (await this.$axios.get(`/nc/${this.$route.params.project_id}/projectApiInfo`, {
+        const {info, aggregatedInfo} = (await this.$axios.get(`${this.$axios.defaults.baseURL}/nc/${this.$route.params.project_id}/projectApiInfo`, {
           headers: {
             'xc-auth': this.$store.state.users.token
           }
diff --git a/packages/nc-gui/layouts/default.vue b/packages/nc-gui/layouts/default.vue
index 1b76d27f5a..5907f95af1 100644
--- a/packages/nc-gui/layouts/default.vue
+++ b/packages/nc-gui/layouts/default.vue
@@ -624,7 +624,7 @@
 
                               </v-list-item-title>
                             </v-list-item>-->
-              <v-list-item v-if="swaggerOrGraphiqlUrl" dense @click.stop="openUrl(swaggerOrGraphiqlUrl)">
+              <v-list-item v-if="swaggerOrGraphiqlUrl" dense @click.stop="openUrl(`${$axios.defaults.baseURL}${swaggerOrGraphiqlUrl}`)">
                 <v-list-item-title>
 
                   <v-icon small key="terminal-dash">
@@ -977,7 +977,7 @@ export default {
     async loadProjectInfo() {
       if (this.$route.params.project_id)
         try {
-          const {info} = (await this.$axios.get(`/nc/${this.$route.params.project_id}/projectApiInfo`, {
+          const {info} = (await this.$axios.get(`${this.$axios.defaults.baseURL}/nc/${this.$route.params.project_id}/projectApiInfo`, {
             headers: {
               'xc-auth': this.$store.state.users.token
             }

From 7856e2bc3d0955e07ed3d1b64778f04ea5e067fb Mon Sep 17 00:00:00 2001
From: Wing-Kam Wong <wingkwong.code@gmail.com>
Date: Sat, 19 Jun 2021 00:18:17 +0800
Subject: [PATCH 4/7] chore: revise based on comments

Signed-off-by: Wing-Kam Wong <wingkwong.code@gmail.com>
---
 packages/nc-gui/components/changeEnv.vue                    | 2 +-
 packages/nc-gui/components/project/settings/env.vue         | 2 +-
 packages/nc-gui/pages/project/id.vue                        | 2 +-
 packages/nc-gui/pages/user/authentication/signin.vue        | 4 ++--
 packages/nc-gui/pages/user/authentication/signup/_token.vue | 4 ++--
 5 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/packages/nc-gui/components/changeEnv.vue b/packages/nc-gui/components/changeEnv.vue
index a28e158bc6..344faa9280 100644
--- a/packages/nc-gui/components/changeEnv.vue
+++ b/packages/nc-gui/components/changeEnv.vue
@@ -72,7 +72,7 @@
         await new Promise(resolve => {
           const interv = setInterval(() => {
             axios.create({
-              baseURL: `${$axios.defaults.baseURL}/dashboard`,
+              baseURL: `${this.$axios.defaults.baseURL}/dashboard`,
             }).get('').then(() => {
               this.projectReloading = false;
               clearInterval(interv);
diff --git a/packages/nc-gui/components/project/settings/env.vue b/packages/nc-gui/components/project/settings/env.vue
index 1ea1eb7c46..bc581bc3be 100644
--- a/packages/nc-gui/components/project/settings/env.vue
+++ b/packages/nc-gui/components/project/settings/env.vue
@@ -62,7 +62,7 @@ export default {
       await new Promise(resolve => {
         const interv = setInterval(() => {
           axios.create({
-            baseURL: `${$axios.defaults.baseURL}/dashboard`
+            baseURL: `${this.$axios.defaults.baseURL}/dashboard`
           }).get('').then(() => {
             this.projectReloading = false;
             clearInterval(interv);
diff --git a/packages/nc-gui/pages/project/id.vue b/packages/nc-gui/pages/project/id.vue
index 5d802decc2..c584e06a33 100644
--- a/packages/nc-gui/pages/project/id.vue
+++ b/packages/nc-gui/pages/project/id.vue
@@ -1113,7 +1113,7 @@ export default {
           }
 
           axios.create({
-            baseURL: `${$axios.defaults.baseURL}/dashboard`,
+            baseURL: `${this.$axios.defaults.baseURL}/dashboard`,
           }).get('').then(() => {
             toast.goAway(100);
             this.projectReloading = false;
diff --git a/packages/nc-gui/pages/user/authentication/signin.vue b/packages/nc-gui/pages/user/authentication/signin.vue
index 46adc3bd13..4da53273a8 100644
--- a/packages/nc-gui/pages/user/authentication/signin.vue
+++ b/packages/nc-gui/pages/user/authentication/signin.vue
@@ -105,7 +105,7 @@
                 <div>
                   <v-btn
                     v-if="googleAuthEnabled"
-                    :href="`${this.$axios.defaults.baseURL}/auth/google`"
+                    :href="`${$axios.defaults.baseURL}/auth/google`"
                     outlined
                     large
                     elevation-10
@@ -122,7 +122,7 @@
                   </v-btn>
                   <v-btn
                     v-if="githubAuthEnabled"
-                    :href="`${this.$axios.defaults.baseURL}/auth/google`"
+                    :href="`${$axios.defaults.baseURL}/auth/google`"
                     outlined
                     large
                     elevation-10
diff --git a/packages/nc-gui/pages/user/authentication/signup/_token.vue b/packages/nc-gui/pages/user/authentication/signup/_token.vue
index fe4aa00cc5..3ef095a010 100644
--- a/packages/nc-gui/pages/user/authentication/signup/_token.vue
+++ b/packages/nc-gui/pages/user/authentication/signup/_token.vue
@@ -98,7 +98,7 @@
                 <v-btn
 
                   v-if="googleAuthEnabled"
-                  :href="`${this.$axios.defaults.baseURL}/auth/google?state=${token}`" outlined
+                  :href="`${$axios.defaults.baseURL}/auth/google?state=${token}`" outlined
                   large elevation-10
                   block
                   color="blue">
@@ -154,7 +154,7 @@
 <!--                <v-btn
 
                   v-if="googleAuthEnabled"
-                  :href="`${this.$axios.defaults.baseURL}/auth/google?state=${token}`" outlined
+                  :href="`${$axios.defaults.baseURL}/auth/google?state=${token}`" outlined
                   large elevation-10
                   block
                   color="blue">

From 0ad0e00b16adf8a84b2ffad072ac0c53fec364e2 Mon Sep 17 00:00:00 2001
From: Wing-Kam Wong <wingkwong.code@gmail.com>
Date: Sat, 19 Jun 2021 17:36:15 +0800
Subject: [PATCH 5/7] chore: revise based on comments

Signed-off-by: Wing-Kam Wong <wingkwong.code@gmail.com>
---
 packages/nc-gui/nuxt.config.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/nc-gui/nuxt.config.js b/packages/nc-gui/nuxt.config.js
index 62daee9c1c..9211c4f2f2 100644
--- a/packages/nc-gui/nuxt.config.js
+++ b/packages/nc-gui/nuxt.config.js
@@ -90,7 +90,7 @@ export default {
   ** See https://axios.nuxtjs.org/options
   */
   axios: {
-    baseURL: process.env.NC_BACKEND_URL || 'http://localhost:8080',
+    baseURL: baseURL: process.env.NC_BACKEND_URL || (process.env.NODE_ENV === 'production' ? '../' : 'http://localhost:8080/'),
   },
   /*
   ** vuetify module configuration

From c33984fddd5401715b0678730a8fe5d2f645db94 Mon Sep 17 00:00:00 2001
From: Wing-Kam Wong <wingkwong.code@gmail.com>
Date: Sat, 19 Jun 2021 17:37:43 +0800
Subject: [PATCH 6/7] chore: revise based on comments

Signed-off-by: Wing-Kam Wong <wingkwong.code@gmail.com>
---
 packages/nc-gui/nuxt.config.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/nc-gui/nuxt.config.js b/packages/nc-gui/nuxt.config.js
index 9211c4f2f2..e36bdbfb1c 100644
--- a/packages/nc-gui/nuxt.config.js
+++ b/packages/nc-gui/nuxt.config.js
@@ -90,7 +90,7 @@ export default {
   ** See https://axios.nuxtjs.org/options
   */
   axios: {
-    baseURL: baseURL: process.env.NC_BACKEND_URL || (process.env.NODE_ENV === 'production' ? '../' : 'http://localhost:8080/'),
+    baseURL: process.env.NC_BACKEND_URL || (process.env.NODE_ENV === 'production' ? '../' : 'http://localhost:8080/'),
   },
   /*
   ** vuetify module configuration

From e5dd8c014b4cfc5d7124cbe8b2a2ed6be5e56f08 Mon Sep 17 00:00:00 2001
From: o1lab <oof1lab@gmail.com>
Date: Thu, 24 Jun 2021 18:34:37 +0530
Subject: [PATCH 7/7] Update README.md

---
 README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/README.md b/README.md
index 4fb9a0c52b..c9ede2955e 100644
--- a/README.md
+++ b/README.md
@@ -154,6 +154,7 @@ docker run -d -p 8080:8080 \
 
 ## Docker Compose
 ```
+git clone https://github.com/nocodb/nocodb
 cd docker-compose
 cd mysql or pg or mssql
 docker-compose up