From 6c0f042b44d445fd025bac316e053a7ea7bf3a4b Mon Sep 17 00:00:00 2001 From: Asad Manzoor Date: Mon, 30 Sep 2019 12:21:07 +0500 Subject: [PATCH 1/5] Edly Panel Frontend Integeration Devstack --- docker-compose-host.yml | 8 ++++++-- docker-compose-sync.yml | 5 +++++ docker-compose.yml | 11 ++++++++++- docker-sync.yml | 7 ++++++- repo.sh | 3 ++- 5 files changed, 29 insertions(+), 5 deletions(-) diff --git a/docker-compose-host.yml b/docker-compose-host.yml index 1ccd85b8dd..ac130eec2c 100644 --- a/docker-compose-host.yml +++ b/docker-compose-host.yml @@ -42,10 +42,14 @@ services: - ${DEVSTACK_WORKSPACE}/edly-wp-plugin:/var/www/html/wp-content/plugins/edly-wp-plugin:cached - ${DEVSTACK_WORKSPACE}/edly-wp-theme:/var/www/html/wp-content/themes/edly-wp-theme:cached - + panel_frontend: + volumes: + - ${DEVSTACK_WORKSPACE}/edly-panel-frontend:/var/www/html/edly-panel-frontend:cached + - panel_node_modules:/var/www/html/edly-panel-frontend/node_modules + volumes: credentials_node_modules: discovery_node_modules: ecommerce_node_modules: edxapp_node_modules: - gradebook_node_modules: + panel_node_modules: diff --git a/docker-compose-sync.yml b/docker-compose-sync.yml index 1cf7c80713..9a1c11b2c8 100644 --- a/docker-compose-sync.yml +++ b/docker-compose-sync.yml @@ -23,6 +23,9 @@ services: volumes: - wordpress-sync:/var/www/html/wp-content/plugins/edly-wp-plugin:nocopy - wordpress-sync:/var/www/html/wp-content/themes/edly-wp-theme:nocopy + panel_frontend: + volumes: + - panel_frontend-sync:/var/www/html/edly-panel-frontend:cached volumes: credentials-sync: @@ -37,3 +40,5 @@ volumes: external: true wordpress-sync: external: true + panel_frontend-sync: + external: true diff --git a/docker-compose.yml b/docker-compose.yml index 917c02fb04..6db151958a 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -254,7 +254,16 @@ services: - mysql ports: - "8888:80" - + + panel_frontend: + command: bash -c 'npm install && npm run start' + container_name: edx.devstack.panel_frontend + image: node:10 + environment: + - NODE_ENV=development + ports: + - "3000:80" + volumes: discovery_assets: edxapp_lms_assets: diff --git a/docker-sync.yml b/docker-sync.yml index 5148558b4c..82284dddb0 100644 --- a/docker-sync.yml +++ b/docker-sync.yml @@ -34,4 +34,9 @@ syncs: host_disk_mount_mode: 'cached' src: '../edly-wp-plugin/' src: '../edly-wp-theme/' - sync_excludes: [ '.git', '.idea', '.sass-cache', 'vendor'] \ No newline at end of file + sync_excludes: [ '.git', '.idea', '.sass-cache', 'vendor'] + + panel_frontend-sync: + host_disk_mount_mode: 'cached' + src: '../edly-panel-frontend/' + sync_excludes: [ '.git', '.idea'] diff --git a/repo.sh b/repo.sh index a48d7568c0..1ddbff03b2 100755 --- a/repo.sh +++ b/repo.sh @@ -40,6 +40,7 @@ edly_repos=( "https://github.com/edly-io/edly-wp-plugin.git" "https://github.com/edly-io/edly-wp-theme.git" "https://github.com/edly-io/edly-edx-themes.git" + "https://github.com/edly-io/edly-panel-frontend.git" ) @@ -111,7 +112,7 @@ _checkout_and_update_branch () git fetch origin ${OPENEDX_GIT_BRANCH}:${OPENEDX_GIT_BRANCH} git checkout ${OPENEDX_GIT_BRANCH} fi - find . -name '*.pyc' -not -path './.git/*' -delete + find . -name '*.pyc' -not -path './.git/*' -delete } clone () From e22b7a5374a11dc2847e293f4c3f139b23848cbc Mon Sep 17 00:00:00 2001 From: Asad Manzoor Date: Mon, 30 Sep 2019 12:24:12 +0500 Subject: [PATCH 2/5] Minor Typo Issue Fixed --- docker-compose-host.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/docker-compose-host.yml b/docker-compose-host.yml index ac130eec2c..92609c0a5d 100644 --- a/docker-compose-host.yml +++ b/docker-compose-host.yml @@ -41,7 +41,6 @@ services: volumes: - ${DEVSTACK_WORKSPACE}/edly-wp-plugin:/var/www/html/wp-content/plugins/edly-wp-plugin:cached - ${DEVSTACK_WORKSPACE}/edly-wp-theme:/var/www/html/wp-content/themes/edly-wp-theme:cached - panel_frontend: volumes: - ${DEVSTACK_WORKSPACE}/edly-panel-frontend:/var/www/html/edly-panel-frontend:cached From fe32218156ccb602d95c7f99d4590fa830355a6d Mon Sep 17 00:00:00 2001 From: Asad Manzoor Date: Mon, 30 Sep 2019 12:53:19 +0500 Subject: [PATCH 3/5] Edly panel gradebook issue fixed --- docker-compose-host.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/docker-compose-host.yml b/docker-compose-host.yml index 92609c0a5d..e79bd76c5c 100644 --- a/docker-compose-host.yml +++ b/docker-compose-host.yml @@ -51,4 +51,5 @@ volumes: discovery_node_modules: ecommerce_node_modules: edxapp_node_modules: + gradebook_node_modules: panel_node_modules: From fb95a6005f1a7d2bff5f6fad65b8312eb096aef6 Mon Sep 17 00:00:00 2001 From: Asad Manzoor Date: Mon, 30 Sep 2019 15:49:06 +0500 Subject: [PATCH 4/5] Port Setting Added --- docker-compose.yml | 5 ++--- docker-sync.yml | 2 +- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index 6db151958a..fa7de0f9ff 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -258,11 +258,10 @@ services: panel_frontend: command: bash -c 'npm install && npm run start' container_name: edx.devstack.panel_frontend + working_dir: '/var/www/html/edly-panel-frontend' image: node:10 - environment: - - NODE_ENV=development ports: - - "3000:80" + - "3030:3030" volumes: discovery_assets: diff --git a/docker-sync.yml b/docker-sync.yml index 82284dddb0..8f26176543 100644 --- a/docker-sync.yml +++ b/docker-sync.yml @@ -39,4 +39,4 @@ syncs: panel_frontend-sync: host_disk_mount_mode: 'cached' src: '../edly-panel-frontend/' - sync_excludes: [ '.git', '.idea'] + sync_excludes: ['.idea'] From 8291c73183eab2b60db3975ec54d188e39a03a1e Mon Sep 17 00:00:00 2001 From: Asad Manzoor Date: Mon, 30 Sep 2019 16:20:07 +0500 Subject: [PATCH 5/5] README Updated --- README.rst | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.rst b/README.rst index 97ff2c19a5..e225215708 100644 --- a/README.rst +++ b/README.rst @@ -502,6 +502,8 @@ meant to be user-facing, the "homepage" may be the API root. +---------------------+-------------------------------------+ | Service | URL | +=====================+=====================================+ +| Panel Frontend | http://localhost:3030/ | ++---------------------+-------------------------------------+ | Credentials | http://localhost:18150/api/v2/ | +---------------------+-------------------------------------+ | Catalog/Discovery | http://localhost:18381/api-docs/ |