Compare commits

...

4 Commits

Author SHA1 Message Date
Kyle McCormick
6f0e6b4c82 Update .env.development for devstack 2020-04-06 08:19:52 -04:00
Kyle McCormick
48c7204e04 npm install 2020-04-05 17:35:01 -04:00
Kyle McCormick
2b93e5fab0 Use kdmccormick's frontend-build; add dev-build command 2020-04-05 17:35:01 -04:00
Kyle McCormick
13c5b12500 Make React routes relative 2020-04-05 17:23:42 -04:00
4 changed files with 6296 additions and 2850 deletions

View File

@@ -1,5 +1,5 @@
ACCESS_TOKEN_COOKIE_NAME='edx-jwt-cookie-header-payload' ACCESS_TOKEN_COOKIE_NAME='edx-jwt-cookie-header-payload'
BASE_URL='localhost:1997' BASE_URL='localhost:19000/account/'
CREDENTIALS_BASE_URL='http://localhost:18150' CREDENTIALS_BASE_URL='http://localhost:18150'
CSRF_TOKEN_API_PATH='/csrf/api/v1/token' CSRF_TOKEN_API_PATH='/csrf/api/v1/token'
ECOMMERCE_BASE_URL='http://localhost:18130' ECOMMERCE_BASE_URL='http://localhost:18130'
@@ -9,8 +9,8 @@ LOGIN_URL='http://localhost:18000/login'
LOGOUT_URL='http://localhost:18000/login' LOGOUT_URL='http://localhost:18000/login'
MARKETING_SITE_BASE_URL='http://localhost:18000' MARKETING_SITE_BASE_URL='http://localhost:18000'
NODE_ENV='development' NODE_ENV='development'
ORDER_HISTORY_URL='localhost:1996/orders' ORDER_HISTORY_URL='localhost:19000/orders/'
PORT=1997 PORT=1997 # For standalone dev server only.
REFRESH_ACCESS_TOKEN_ENDPOINT='http://localhost:18000/login_refresh' REFRESH_ACCESS_TOKEN_ENDPOINT='http://localhost:18000/login_refresh'
SEGMENT_KEY=null SEGMENT_KEY=null
SITE_NAME='edX' SITE_NAME='edX'

9131
package-lock.json generated

File diff suppressed because it is too large Load Diff

View File

@@ -10,6 +10,7 @@
}, },
"scripts": { "scripts": {
"build": "fedx-scripts webpack", "build": "fedx-scripts webpack",
"dev-build": "fedx-scripts webpack-dev",
"i18n_extract": "BABEL_ENV=i18n fedx-scripts babel src --quiet > /dev/null", "i18n_extract": "BABEL_ENV=i18n fedx-scripts babel src --quiet > /dev/null",
"is-es5": "es-check es5 ./dist/*.js", "is-es5": "es-check es5 ./dist/*.js",
"lint": "fedx-scripts eslint", "lint": "fedx-scripts eslint",
@@ -73,7 +74,7 @@
"universal-cookie": "4.0.3" "universal-cookie": "4.0.3"
}, },
"devDependencies": { "devDependencies": {
"@edx/frontend-build": "2.0.6", "@edx/frontend-build": "github:kdmccormick/frontend-build#kdmccormick/devstack",
"codecov": "3.6.5", "codecov": "3.6.5",
"enzyme": "3.10.0", "enzyme": "3.10.0",
"enzyme-adapter-react-16": "1.15.2", "enzyme-adapter-react-16": "1.15.2",

View File

@@ -31,10 +31,10 @@ subscribe(APP_READY, () => {
ReactDOM.render( ReactDOM.render(
<AppProvider store={configureStore()}> <AppProvider store={configureStore()}>
<Switch> <Switch>
<Route path="/coaching_consent" component={CoachingConsent} /> <Route path="coaching_consent" component={CoachingConsent} />
<HeaderFooterLayout> <HeaderFooterLayout>
<Route exact path="/" component={AccountSettingsPage} /> <Route exact path="" component={AccountSettingsPage} />
<Route path="/notfound" component={NotFoundPage} /> <Route path="notfound" component={NotFoundPage} />
<Route path="*" component={NotFoundPage} /> <Route path="*" component={NotFoundPage} />
</HeaderFooterLayout> </HeaderFooterLayout>
</Switch> </Switch>