Skip to content
This repository has been archived by the owner on Aug 1, 2024. It is now read-only.

feat: adding two MFEs to devstack #1278

Merged
merged 1 commit into from
Feb 22, 2024
Merged
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: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -88,6 +88,9 @@ ENV/
# OS X
.DS_Store

# VSCode
.vscode/

# PyCharm
.idea/

Expand Down
12 changes: 12 additions & 0 deletions docker-compose-host.yml
Original file line number Diff line number Diff line change
Expand Up @@ -93,6 +93,16 @@ services:
- ${DEVSTACK_WORKSPACE}/frontend-app-ora-grading:/edx/app/frontend-app-ora-grading
- frontend_app_ora_grading_node_modules:/edx/app/frontend-app-ora-grading/node_modules
- ${DEVSTACK_WORKSPACE}/src:/edx/app/src
frontend-app-learner-dashboard:
volumes:
- ${DEVSTACK_WORKSPACE}/frontend-app-learner-dashboard:/edx/app/frontend-app-learner-dashboard
- frontend_app_learner_dashboard_node_modules:/edx/app/frontend-app-learner-dashboard/node_modules
- ${DEVSTACK_WORKSPACE}/src:/edx/app/src
frontend-app-learner-record:
volumes:
- ${DEVSTACK_WORKSPACE}/frontend-app-learner-record:/edx/app/frontend-app-learner-record
- frontend_app_learner_record_node_modules:/edx/app/frontend-app-learner-record/node_modules
- ${DEVSTACK_WORKSPACE}/src:/edx/app/src
frontend-app-learning:
volumes:
- ${DEVSTACK_WORKSPACE}/frontend-app-learning:/edx/app/frontend-app-learning
Expand Down Expand Up @@ -133,6 +143,8 @@ volumes:
frontend_app_course_authoring_node_modules:
frontend_app_gradebook_node_modules:
frontend_app_ora_grading_node_modules:
frontend_app_learner_dashboard_node_modules:
frontend_app_learner_record_node_modules:
frontend_app_learning_node_modules:
frontend_app_library_authoring_node_modules:
frontend_app_payment_node_modules:
Expand Down
30 changes: 30 additions & 0 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -759,6 +759,36 @@ services:
depends_on:
- lms

frontend-app-learner-dashboard:
extends:
file: microfrontend.yml
service: microfrontend
working_dir: '/edx/app/frontend-app-learner-dashboard'
container_name: "edx.${COMPOSE_PROJECT_NAME:-devstack}.frontend-app-learner-dashboard"
networks:
default:
aliases:
- edx.devstack.frontend-app-learner-dashboard
ports:
- "1996:1996"
depends_on:
- lms

frontend-app-learner-record:
extends:
file: microfrontend.yml
service: microfrontend
working_dir: '/edx/app/frontend-app-learner-record'
container_name: "edx.${COMPOSE_PROJECT_NAME:-devstack}.frontend-app-learner-record"
networks:
default:
aliases:
- edx.devstack.frontend-app-learner-record
ports:
- "1990:1990"
depends_on:
- lms

frontend-app-learning:
extends:
file: microfrontend.yml
Expand Down
6 changes: 6 additions & 0 deletions docs/service_list.rst
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,10 @@ Instead of a service name or list, you can also run commands like ``make dev.pro
+------------------------------------+-------------------------------------+----------------+--------------+
| `edx_notes_api`_ | http://localhost:18120/api/v1/ | Python/Django | Default |
+------------------------------------+-------------------------------------+----------------+--------------+
| `frontend-app-learner-dashboard`_ | http://localhost:1996/ | MFE (React.js) | Default |
+------------------------------------+-------------------------------------+----------------+--------------+
| `frontend-app-learner-record`_ | http://localhost:1990/ | MFE (React.js) | Default |
+------------------------------------+-------------------------------------+----------------+--------------+
| `frontend-app-learning`_ | http://localhost:2000/ | MFE (React.js) | Default |
+------------------------------------+-------------------------------------+----------------+--------------+
| `frontend-app-payment`_ | http://localhost:1998/ | MFE (React.js) | Default |
Expand Down Expand Up @@ -78,6 +82,8 @@ Some common service combinations include:
.. _frontend-app-program-console: https://github.com/openedx/frontend-app-program-console
.. _registrar: https://github.com/openedx/registrar
.. _cms: https://github.com/openedx/edx-platform
.. _frontend-app-learner-dashboard: https://github.com/openedx/frontend-app-learner-dashboard
.. _frontend-app-learner-record: https://github.com/openedx/frontend-app-learner-record
.. _frontend-app-learning: https://github.com/openedx/frontend-app-learning
.. _frontend-app-library-authoring: https://github.com/openedx/frontend-app-library-authoring
.. _frontend-app-course-authoring: https://github.com/openedx/frontend-app-course-authoring
Expand Down
2 changes: 1 addition & 1 deletion options.mk
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ credentials+discovery+ecommerce+edx_notes_api+forum+frontend-app-authn+frontend-
# Separated by plus signs.
# Separated by plus signs. Listed in alphabetical order for clarity.
EDX_SERVICES ?= \
analyticsapi+credentials+discovery+ecommerce+edx_notes_api+forum+frontend-app-account+frontend-app-profile+frontend-app-authn+frontend-app-course-authoring+frontend-app-gradebook+frontend-app-ora-grading+frontend-app-learning+frontend-app-library-authoring+frontend-app-payment+frontend-app-program-console+frontend-app-publisher+insights+lms+lms_watcher+registrar+registrar-worker+cms+cms_watcher+xqueue+xqueue_consumer
analyticsapi+credentials+discovery+ecommerce+edx_notes_api+forum+frontend-app-account+frontend-app-learner-dashboard+frontend-app-learner-record+frontend-app-profile+frontend-app-authn+frontend-app-course-authoring+frontend-app-gradebook+frontend-app-ora-grading+frontend-app-learning+frontend-app-library-authoring+frontend-app-payment+frontend-app-program-console+frontend-app-publisher+insights+lms+lms_watcher+registrar+registrar-worker+cms+cms_watcher+xqueue+xqueue_consumer

# Services with database migrations.
# Should be a subset of $(EDX_SERVICES).
Expand Down
4 changes: 4 additions & 0 deletions repo.sh
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,8 @@ repos=(
"https://github.com/openedx/xqueue.git"
"https://github.com/openedx/edx-analytics-dashboard.git"
"https://github.com/openedx/frontend-app-gradebook.git"
"https://github.com/openedx/frontend-app-learner-dashboard"
"https://github.com/openedx/frontend-app-learner-record"
"https://github.com/openedx/frontend-app-payment.git"
"https://github.com/openedx/frontend-app-publisher.git"
"https://github.com/openedx/edx-analytics-dashboard.git"
Expand Down Expand Up @@ -58,6 +60,8 @@ ssh_repos=(
"[email protected]:openedx/xqueue.git"
"[email protected]:openedx/edx-analytics-dashboard.git"
"[email protected]:openedx/frontend-app-gradebook.git"
"[email protected]:openedx/frontend-app-learner-dashboard.git"
"[email protected]:openedx/frontend-app-learner-record.git"
"[email protected]:openedx/frontend-app-payment.git"
"[email protected]:openedx/frontend-app-publisher.git"
"[email protected]:openedx/edx-analytics-dashboard.git"
Expand Down