From 06f320c1beb8618ce53941e01f3ff717fdbb4da3 Mon Sep 17 00:00:00 2001 From: Rick Reilly Date: Thu, 13 Feb 2020 13:06:51 -0500 Subject: [PATCH] wip: fix env stuff --- .env | 2 +- .env.development | 2 +- .env.test | 1 + src/index.jsx | 5 +++-- 4 files changed, 6 insertions(+), 4 deletions(-) diff --git a/.env b/.env index 36113cd..5c4ec8e 100644 --- a/.env +++ b/.env @@ -15,4 +15,4 @@ SEGMENT_KEY=null SITE_NAME=null SUPPORT_URL=null USER_INFO_COOKIE_NAME=null -ENABLE_LOGIN_AND_REGISTRATION=null \ No newline at end of file +ENABLE_LOGIN_AND_REGISTRATION=false \ No newline at end of file diff --git a/.env.development b/.env.development index 8dc1b87..7c85c03 100644 --- a/.env.development +++ b/.env.development @@ -5,7 +5,7 @@ CSRF_TOKEN_API_PATH='/csrf/api/v1/token' ECOMMERCE_BASE_URL='http://localhost:18130' LANGUAGE_PREFERENCE_COOKIE_NAME='openedx-language-preference' LMS_BASE_URL='http://localhost:18000' -LOGIN_URL='http://localhost:18000/login' +LOGIN_URL='http://localhost:1997/login' LOGOUT_URL='http://localhost:18000/login' MARKETING_SITE_BASE_URL='http://localhost:18000' NODE_ENV='development' diff --git a/.env.test b/.env.test index b76b0c3..b372f82 100644 --- a/.env.test +++ b/.env.test @@ -15,3 +15,4 @@ SEGMENT_KEY=null SITE_NAME='edX' SUPPORT_URL='http://localhost:18000/support' USER_INFO_COOKIE_NAME='edx-user-info' +ENABLE_LOGIN_AND_REGISTRATION=false #hackathon 23 todo diff --git a/src/index.jsx b/src/index.jsx index 658fd11..1b8e204 100755 --- a/src/index.jsx +++ b/src/index.jsx @@ -1,7 +1,7 @@ import 'babel-polyfill'; import 'formdata-polyfill'; import { AppProvider, ErrorPage, AuthenticatedPageRoute } from '@edx/frontend-platform/react'; -import { subscribe, initialize, APP_INIT_ERROR, APP_READY, mergeConfig } from '@edx/frontend-platform'; +import { subscribe, initialize, APP_INIT_ERROR, APP_READY, mergeConfig, getConfig } from '@edx/frontend-platform'; import React from 'react'; import ReactDOM from 'react-dom'; import { Route, Switch } from 'react-router-dom'; @@ -27,7 +27,8 @@ subscribe(APP_READY, () => { { - getConfig().ENABLE_LOGIN_AND_REGISTRATION && <> + getConfig().ENABLE_LOGIN_AND_REGISTRATION && + <>