Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions .env
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,6 @@ MFE_CONFIG_API_URL=''

DISABLE_DESKTOP_HEADER=false
DISABLE_HEADER_LOGO=false
ENABLE_DASHBOARD_RETURN_LINK=false
ACCESS_DENIED_PAGE_INSTRUCTIONS_LINK=''
ACCESS_DENIED_PAGE_STUDENT_PORTAL_LINK=''
ACCESS_DENIED_PAGE_STUDENT_PORTAL_LINK_TEXT=''
ACCESS_DENIED_PAGE_STUDENT_PORTAL_LINK_TEXT=''
24 changes: 12 additions & 12 deletions .env.development
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ NODE_ENV='development'

ACCESS_TOKEN_COOKIE_NAME='edx-jwt-cookie-header-payload'
ADA_URL=''
BASE_URL='http://apps.local.overhang.io/wgulearning'
CONTACT_URL='http://local.overhang.io/contact'
BASE_URL='http://apps.local.edly.io/wgulearning'
CONTACT_URL='http://local.edly.io/contact'
COPYRIGHT_STRING='2023 OpenEdx Compatible Learning Microfrontend. All rights reserved.'
CREDENTIALS_BASE_URL=''
CREDIT_HELP_LINK_URL='https://edx.readthedocs.io/projects/edx-guide-for-students/en/latest/SFD_credit_courses.html#keep-track-of-credit-requirements'
Expand All @@ -22,46 +22,46 @@ ENTERPRISE_LEARNER_PORTAL_HOSTNAME=''
FAVICON_URL=https://edx-cdn.org/v3/default/favicon.ico
IGNORED_ERROR_REGEX=''
LANGUAGE_PREFERENCE_COOKIE_NAME='openedx-language-preference'
LMS_BASE_URL='http://local.overhang.io'
LOGIN_URL='http://local.overhang.io/login'
LOGOUT_URL='http://local.overhang.io/logout'
LMS_BASE_URL='http://local.edly.io'
LOGIN_URL='http://local.edly.io/login'
LOGOUT_URL='http://local.edly.io/logout'
LOGO_URL=https://edx-cdn.org/v3/default/logo.svg
LOGO_TRADEMARK_URL=https://edx-cdn.org/v3/default/logo-trademark.svg
LOGO_WHITE_URL=https://edx-cdn.org/v3/default/logo-white.svg
LEGACY_THEME_NAME=''
MARKETING_SITE_BASE_URL='http://local.overhang.io'
MARKETING_SITE_BASE_URL='http://local.edly.io'
ORDER_HISTORY_URL=''
PORT=2000
PENDO_SNIPPET=''
PENDO_VISITOR_KEY=''
PENDO_VISITOR_IIFE=''
PENDO_VISITOR_TYPE=''
PRIVACY_POLICY_URL=''
REFRESH_ACCESS_TOKEN_ENDPOINT='http://local.overhang.io/login_refresh'
SEARCH_CATALOG_URL='http://local.overhang.io/courses'
REFRESH_ACCESS_TOKEN_ENDPOINT='http://local.edly.io/login_refresh'
SEARCH_CATALOG_URL='http://local.edly.io/courses'
SEGMENT_KEY=''
SITE_NAME='edX'
SITE_OPERATOR=''
SOCIAL_UTM_MILESTONE_CAMPAIGN='edxmilestone'
STUDIO_BASE_URL='http://studio.local.overhang.io'
STUDIO_BASE_URL='http://studio.local.edly.io'
SUPPORT_URL='https://support.edx.org'
SUPPORT_URL_CALCULATOR_MATH='https://support.edx.org/hc/en-us/articles/360000038428-Entering-math-expressions-in-assignments-or-the-calculator'
SUPPORT_URL_ID_VERIFICATION='https://support.edx.org/hc/en-us/articles/206503858-How-do-I-verify-my-identity'
SUPPORT_URL_VERIFIED_CERTIFICATE='https://support.edx.org/hc/en-us/articles/206502008-What-is-a-verified-certificate'
TERMS_OF_SERVICE_URL='https://www.edx.org/edx-terms-service'
HONOR_CODE_URL=''
USER_INFO_COOKIE_NAME='edx-user-info'
SESSION_COOKIE_DOMAIN='.local.overhang.io'
SESSION_COOKIE_DOMAIN='.local.edly.io'

PUBLIC_PATH='/wgulearning/'

APP_ID='wgulearning'
MFE_CONFIG_API_URL='http://apps.local.overhang.io/api/mfe_config/v1'
MFE_CONFIG_API_URL='http://apps.local.edly.io/api/mfe_config/v1'

DISABLE_APP_FOOTER=false
DISABLE_DESKTOP_HEADER=false
DISABLE_HEADER_LOGO=false
ENABLE_DASHBOARD_RETURN_LINK=false
ACCESS_DENIED_PAGE_INSTRUCTIONS_LINK='http://example.com'
ACCESS_DENIED_PAGE_STUDENT_PORTAL_LINK='http://local.overhang.io/dashboard'
ACCESS_DENIED_PAGE_STUDENT_PORTAL_LINK='http://local.edly.io/dashboard'
ACCESS_DENIED_PAGE_STUDENT_PORTAL_LINK_TEXT='Student Portal'
2 changes: 1 addition & 1 deletion Pipfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ verify_ssl = true
name = "pypi"

[packages]
tutor = {version = "==15.3.9", extras = ["full"]}
tutor = {version = "==17.0.6", extras = ["full"]}

[dev-packages]

Expand Down
775 changes: 424 additions & 351 deletions Pipfile.lock

Large diffs are not rendered by default.

8 changes: 4 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -53,11 +53,11 @@ npm start

### Logging in

Go to http://apps.local.overhang.io/authn/login?next=%2F
Go to http://apps.local.edly.io/authn/login?next=%2F

### Accessing the MFE

Go to http://apps.local.overhang.io/wgulearning
Go to http://apps.local.edly.io/wgulearning

### Running tutor commands

Expand All @@ -73,10 +73,10 @@ After doing that, you can run tutor commands inside that shell as normal.
## FAQ

Q: Which version of tutor/OpenEDX are we targeting?
A: 15.3.8 (Olive), it is defined in `Pipfile`
A: 17.0.6 (Quince), it is defined in `Pipfile`

## Known Issues

When viewing an LMS course page on the MFE in the local environment, the console will output the warning: Failed prop type: The prop `id` is marked as required in `ForwardRef(DropdownToggle)`, but its value is `undefined`.

This warning is caused by the Paragon library's `DropdownToggle` component requiring an "id" prop. this component is used in `frontend-app-learning` within the `SequenceNavigationDropdown` component. This issue cannot be currently addressed without creating all of the related components within this repo and updating the code all the way to the `DropdownToggle` component.
This warning is caused by the Paragon library's `DropdownToggle` component requiring an "id" prop. this component is used in `frontend-app-learning` within the `SequenceNavigationDropdown` component. This issue cannot be currently addressed without creating all of the related components within this repo and updating the code all the way to the `DropdownToggle` component.
2 changes: 1 addition & 1 deletion docs/how_tos/adding-a-feature-flag.md
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ export default Example;

For setting the variable dinamically for a specific OpenEDX site, follow these steps:

1. Go to `http://local.overhang.io/admin/site_configuration/siteconfiguration/` (adjust the base url to the desired environment) and select the specific site you want to configure
1. Go to `http://local.edly.io/admin/site_configuration/siteconfiguration/` (adjust the base url to the desired environment) and select the specific site you want to configure
2. Inside the "Site values" JSON, add a "MFE_CONFIG" key with an empty object as a value, if it doesn't exist already.
3. Inside that "MFE_CONFIG" object, add your variables in valid JSON syntax.

Expand Down
14 changes: 7 additions & 7 deletions docs/how_tos/releasing-changes-to-frontend-app-learning-lib.md
Original file line number Diff line number Diff line change
@@ -1,26 +1,26 @@
# Releasing changes to frontend-app-learing as a library

After doing changes to https://github.com/wgu-opensource/frontend-app-learning olive branch, you need to build a dist in order to make it usable via npm.
After doing changes to https://github.com/wgu-opensource/frontend-app-learning quince branch, you need to build a dist in order to make it usable via npm.

To do that, follow the following process:

1. Change to branch olive-dist
2. Pull changes from olive
1. Change to branch quince-dist
2. Pull changes from quince
3. Run a build
4. Force-add the dist folder and commit
5. Push changes to olive-dist
5. Push changes to quince-dist
6. Create release/tag in GitHub
7. Update the tag in package.json of this repo.

## Step by step commands

```
# On https://github.com/wgu-opensource/frontend-app-learning
git checkout olive-dist
git pull origin olive
git checkout quince-dist
git pull origin quince
make build
git add -f dist
git commit -m "Release <your release>"
git push origin olive-dist
git push origin quince-dist
# Go to github and do a release
```
Loading