Merge 413bb06d83 into 23d23c3c04

backend/config/settings/base.py

@@ -30,6 +30,10 @@ SECRET_KEY = env("SECRET_KEY", "v8sk33sy82!uw3ty=!jjv5vp7=s2phrzw(m(hrn^f7e_#1h2
 # SECURITY WARNING: don't run with debug turned on in production!
 DEBUG = env.bool("DEBUG", True)
 
+BASE_URL = env("BASE_URL", "/")
+
+USE_X_FORWARDED_HOST = env.bool("USE_X_FORWARDED_HOST", False)
+
 # Application definition
 INSTALLED_APPS = [
     "whitenoise.runserver_nostatic",
@@ -109,7 +113,7 @@ TEMPLATES = [
 
 # Static files (CSS, JavaScript, Images)
 # https://docs.djangoproject.com/en/2.0/howto/static-files/
-STATIC_URL = "/static/"
+STATIC_URL = BASE_URL + "static/"
 STATIC_ROOT = path.join(BASE_DIR, "staticfiles")
 STATICFILES_DIRS = [
     path.join(BASE_DIR, "client/dist/static"),
@@ -185,9 +189,9 @@ USE_TZ = True
 TEST_RUNNER = "xmlrunner.extra.djangotestrunner.XMLTestRunner"
 TEST_OUTPUT_DIR = path.join(BASE_DIR, "junitxml")
 
-LOGIN_URL = "/login/"
-LOGIN_REDIRECT_URL = "/projects/"
-LOGOUT_REDIRECT_URL = "/"
+LOGIN_URL = BASE_URL + "login/"
+LOGIN_REDIRECT_URL = BASE_URL + "projects/"
+LOGOUT_REDIRECT_URL = BASE_URL
 
 # Database
 # https://docs.djangoproject.com/en/2.0/ref/settings/#databases
@@ -252,7 +256,7 @@ if not EMAIL_HOST:
 
 # User media files
 MEDIA_ROOT = env("MEDIA_ROOT", path.join(BASE_DIR, "media"))
-MEDIA_URL = "/media/"
+MEDIA_URL = BASE_URL + "/media/"
 
 # Filepond settings
 DJANGO_DRF_FILEPOND_UPLOAD_TMP = path.join(BASE_DIR, "filepond-temp-uploads")

backend/config/urls.py

@@ -69,3 +69,6 @@ urlpatterns += [
     path("swagger/", schema_view.with_ui("swagger", cache_timeout=0), name="schema-swagger-ui"),
     re_path("", TemplateView.as_view(template_name="index.html")),
 ]
+
+if settings.BASE_URL:
+    urlpatterns = [path(f'{settings.BASE_URL.strip("/")}/', include(urlpatterns))]

frontend/components/configAutoLabeling/form/FileField.vue

@@ -35,7 +35,7 @@ export default {
     return {
       myFiles: [],
       server: {
-        url: '/v1/fp',
+        url: `${process.env.baseUrl}/fp`,
         headers: {
           'X-CSRFToken': Cookies.get('csrftoken')
         },

frontend/nuxt.config.js

@@ -1,7 +1,12 @@
 import colors from 'vuetify/es5/util/colors'
 import i18n from './i18n'
 
+const BASE_URL = process.env.BASE_URL || '/'
+
 export default {
+  router: {
+    base: BASE_URL
+  },
   ssr: false,
   /*
    ** Headers of the page
@@ -26,7 +31,7 @@ export default {
   },
 
   env: {
-    baseUrl: '/v1'
+    baseUrl: `${BASE_URL}v1`
   },
 
   /*

frontend/pages/projects/_id/dataset/import.vue

@@ -127,7 +127,7 @@ export default {
       ],
       requiredRules: [(v) => !!v || 'Field value is required'],
       server: {
-        url: '/v1/fp',
+        url: `${process.env.baseUrl}/fp`,
         headers: {
           'X-CSRFToken': Cookies.get('csrftoken')
         },