From 3e9065e963fbf31941b6bbfb37e3546f99f795fb Mon Sep 17 00:00:00 2001 From: David Joy Date: Thu, 12 Dec 2019 16:04:41 -0500 Subject: [PATCH] Absorbing work from douglashall/learning_sequence --- .env.development | 4 +- src/example/ExamplePage.jsx | 12 -- src/example/ExamplePage.test.jsx | 5 - src/example/data/.gitkeep | 0 src/example/data/README.rst | 4 - src/example/index.scss | 0 src/index.jsx | 7 +- src/index.scss | 2 +- .../LearningSequencePage.jsx | 119 ++++++++++++++++++ src/learning-sequence/PageLoading.jsx | 37 ++++++ src/learning-sequence/index.scss | 4 + src/learning-sequence/messages.js | 16 +++ 12 files changed, 184 insertions(+), 26 deletions(-) delete mode 100644 src/example/ExamplePage.jsx delete mode 100644 src/example/ExamplePage.test.jsx delete mode 100644 src/example/data/.gitkeep delete mode 100644 src/example/data/README.rst delete mode 100644 src/example/index.scss create mode 100644 src/learning-sequence/LearningSequencePage.jsx create mode 100644 src/learning-sequence/PageLoading.jsx create mode 100644 src/learning-sequence/index.scss create mode 100644 src/learning-sequence/messages.js diff --git a/.env.development b/.env.development index df083d4f..db5888fb 100644 --- a/.env.development +++ b/.env.development @@ -1,7 +1,7 @@ NODE_ENV='development' -PORT=8080 +PORT=2000 ACCESS_TOKEN_COOKIE_NAME='edx-jwt-cookie-header-payload' -BASE_URL='localhost:8080' +BASE_URL='localhost:2000' CREDENTIALS_BASE_URL='http://localhost:18150' CSRF_TOKEN_API_PATH='/csrf/api/v1/token' ECOMMERCE_BASE_URL='http://localhost:18130' diff --git a/src/example/ExamplePage.jsx b/src/example/ExamplePage.jsx deleted file mode 100644 index ec21e1b0..00000000 --- a/src/example/ExamplePage.jsx +++ /dev/null @@ -1,12 +0,0 @@ -import React from 'react'; - -export default function ExamplePage() { - return ( -
-
-

Example Page

-

Hello world!

-
-
- ); -} diff --git a/src/example/ExamplePage.test.jsx b/src/example/ExamplePage.test.jsx deleted file mode 100644 index 3bad6f31..00000000 --- a/src/example/ExamplePage.test.jsx +++ /dev/null @@ -1,5 +0,0 @@ -describe('example', () => { - it('will pass because it is an example', () => { - - }); -}); diff --git a/src/example/data/.gitkeep b/src/example/data/.gitkeep deleted file mode 100644 index e69de29b..00000000 diff --git a/src/example/data/README.rst b/src/example/data/README.rst deleted file mode 100644 index c4db0b68..00000000 --- a/src/example/data/README.rst +++ /dev/null @@ -1,4 +0,0 @@ -data folder -=========== - -This folder is the home for non-component files, such as redux reducers, actions, selectors, API client services, etc. See `Feature-based Application Organization `_. for more detail. \ No newline at end of file diff --git a/src/example/index.scss b/src/example/index.scss deleted file mode 100644 index e69de29b..00000000 diff --git a/src/index.jsx b/src/index.jsx index e3ade7ce..18b05f22 100755 --- a/src/index.jsx +++ b/src/index.jsx @@ -4,12 +4,13 @@ import { APP_INIT_ERROR, APP_READY, subscribe, initialize } from '@edx/frontend- import { AppProvider, ErrorPage } from '@edx/frontend-platform/react'; import React from 'react'; import ReactDOM from 'react-dom'; +import { Route, Switch } from 'react-router-dom'; import Header, { messages as headerMessages } from '@edx/frontend-component-header'; import Footer, { messages as footerMessages } from '@edx/frontend-component-footer'; import appMessages from './i18n'; -import ExamplePage from './example/ExamplePage'; +import LearningSequencePage from './learning-sequence/LearningSequencePage'; import './index.scss'; import './assets/favicon.ico'; @@ -18,7 +19,9 @@ subscribe(APP_READY, () => { ReactDOM.render(
- + + +