From d81ecb31996290aad7f5975ae360b035150f0227 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20N=C3=A9grier?= Date: Tue, 30 Nov 2021 14:58:37 +0100 Subject: [PATCH] Making the ADMIN_URL parameter optionnal in front This parameter is only used in the SAAS version (and ideally, should disappear completely). The warning message that uses the ADMIN_URL should originate from the admin itself. --- docker-compose.single-domain.yaml | 2 +- docker-compose.yaml | 2 +- front/webpack.config.ts | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/docker-compose.single-domain.yaml b/docker-compose.single-domain.yaml index 52875ce8..59752cb9 100644 --- a/docker-compose.single-domain.yaml +++ b/docker-compose.single-domain.yaml @@ -28,7 +28,7 @@ services: NODE_ENV: development PUSHER_URL: /pusher UPLOADER_URL: /uploader - ADMIN_URL: /admin + #ADMIN_URL: /admin MAPS_URL: /maps ICON_URL: /icon STARTUP_COMMAND_1: ./templater.sh diff --git a/docker-compose.yaml b/docker-compose.yaml index ed5389c0..b8fa15ab 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -34,7 +34,7 @@ services: NODE_ENV: development PUSHER_URL: //pusher.workadventure.localhost UPLOADER_URL: //uploader.workadventure.localhost - ADMIN_URL: //workadventure.localhost + #ADMIN_URL: //workadventure.localhost ICON_URL: //icon.workadventure.localhost STARTUP_COMMAND_1: ./templater.sh STARTUP_COMMAND_2: yarn install diff --git a/front/webpack.config.ts b/front/webpack.config.ts index 9d18d51f..7a189911 100644 --- a/front/webpack.config.ts +++ b/front/webpack.config.ts @@ -189,7 +189,7 @@ module.exports = { DISABLE_NOTIFICATIONS: false, PUSHER_URL: undefined, UPLOADER_URL: null, - ADMIN_URL: undefined, + ADMIN_URL: null, CONTACT_URL: null, PROFILE_URL: null, ICON_URL: null,