diff --git a/docker-compose.yaml b/docker-compose.yaml index b2cc191ad6123f4d03f0589f22f17b5ca7733392..260230503c7fd0f22331cc5690528b812dc72427 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -11,8 +11,8 @@ services: - external labels: - "traefik.enable=true" - #- "traefik.http.routers.frontend.rule=Host(`languagelab.be`)" - - "traefik.http.routers.frontend.rule=Host(`languagelab.sipr.ucl.ac.be`)" + - "traefik.http.routers.frontend.rule=Host(`languagelab.be`)" + #- "traefik.http.routers.frontend.rule=Host(`languagelab.sipr.ucl.ac.be`)" - "traefik.http.routers.frontend.tls=true" - "traefik.http.services.frontend.loadbalancer.server.port=8080" @@ -37,8 +37,8 @@ services: - "traefik.enable=true" - "traefik.http.routers.backend.tls=true" - "traefik.http.services.backend.loadbalancer.server.port=8000" - #- "traefik.http.routers.backend.rule=Host(`languagelab.be`) && (PathPrefix(`/tmp-api`) || PathPrefix(`/docs`) || PathPrefix(`/openapi.json`))" - - "traefik.http.routers.backend.rule=Host(`languagelab.sipr.ucl.ac.be`) && (PathPrefix(`/tmp-api`) || PathPrefix(`/docs`) || PathPrefix(`/openapi.json`))" + - "traefik.http.routers.backend.rule=Host(`languagelab.be`) && (PathPrefix(`/tmp-api`) || PathPrefix(`/docs`) || PathPrefix(`/openapi.json`))" + #- "traefik.http.routers.backend.rule=Host(`languagelab.sipr.ucl.ac.be`) && (PathPrefix(`/tmp-api`) || PathPrefix(`/docs`) || PathPrefix(`/openapi.json`))" traefik: container_name: traefik diff --git a/frontend/src/lib/config.ts b/frontend/src/lib/config.ts index 9e42973b0172395b77e8683ab8fc9aa2976f0e85..84a563901c4d30a1ce19c7083299010bfd4109bf 100644 --- a/frontend/src/lib/config.ts +++ b/frontend/src/lib/config.ts @@ -1,16 +1,8 @@ export default { - API_URL: import.meta.env.VITE_API_URL || 'https://languagelab.sipr.ucl.ac.be/tmp-api', - API_PROXY: import.meta.env.VITE_API_PROXY || 'https://languagelab.sipr.ucl.ac.be/tmp-api', + API_URL: import.meta.env.VITE_API_URL || 'https://languagelab.be/tmp-api', + API_PROXY: import.meta.env.VITE_API_PROXY || 'https://languagelab.be/tmp-api', APP_URL: import.meta.env.VITE_APP_URL || 'https://languagelab.be', - WS_URL: import.meta.env.VITE_WS_URL || 'wss://languagelab.sipr.ucl.ac.be/tmp-api/v1/ws', - //API_URL: import.meta.env.VITE_API_URL || 'https://languagelab.be/tmp-api', - //API_PROXY: import.meta.env.VITE_API_PROXY || 'https://languagelab.be/tmp-api', - //WS_URL: import.meta.env.VITE_WS_URL || 'wss://languagelab.be/tmp-api/v1/ws', - // - //API_URL: import.meta.env.VITE_API_URL || 'https://api.languagelab.be/api', - //API_PROXY: import.meta.env.VITE_API_PROXY || 'https://api.languagelab.be', - //WS_URL: import.meta.env.VITE_WS_URL || 'wss://api.languagelab.be/api/v1/ws', - // + WS_URL: import.meta.env.VITE_WS_URL || 'wss://languagelab.be/tmp-api/v1/ws', // 1 week - 2 hours WEEKLY_SURVEY_INTERVAL: (7 * 24 - 2) * 60 * 60 * 1000, LEARNING_LANGUAGES: {