diff --git a/.dockerignore b/.dockerignore
deleted file mode 100755
index 92f7e4b42..000000000
--- a/.dockerignore
+++ /dev/null
@@ -1,10 +0,0 @@
-node_modules
-npm-debug.log
-README.md
-LICENSE
-.babelrc
-.eslintignore
-.eslintrc.json
-.gitignore
-.npmignore
-commitlint.config.js
diff --git a/.eslintignore b/.eslintignore
deleted file mode 100755
index fcea47f62..000000000
--- a/.eslintignore
+++ /dev/null
@@ -1,5 +0,0 @@
-coverage/*
-dist/
-node_modules/
-src/postcss.config.js
-src/segment.js
diff --git a/.gitattributes b/.gitattributes
deleted file mode 100644
index 44f4f7bae..000000000
--- a/.gitattributes
+++ /dev/null
@@ -1 +0,0 @@
-*.snap linguist-generated=false
diff --git a/.gitignore b/.gitignore
index 8ff9a4924..a6ce6be5b 100755
--- a/.gitignore
+++ b/.gitignore
@@ -1,28 +1,15 @@
-.DS_Store
-.eslintcache
node_modules
npm-debug.log
coverage
-
+module.config.js
dist/
-public/samples/
+/*.tgz
-### pyenv ###
-.python-version
+### i18n ###
+src/i18n/transifex_input.json
-### Emacs ###
+### Editors ###
+.DS_Store
*~
-*.swo
-*.swp
-
-### Development environments ###
-.idea
-.vscode
-
-# Local package dependencies
-module.config.js
-
-### transifex ###
-src/i18n/transifex_input.json
-temp
-src/i18n/messages
+/temp
+/.vscode
diff --git a/.npmignore b/.npmignore
index 559d68006..bb212e05a 100755
--- a/.npmignore
+++ b/.npmignore
@@ -1,12 +1,6 @@
-.eslintignore
-.eslintrc.json
-.gitignore
-docker-compose.yml
-Dockerfile
-Makefile
-npm-debug.log
-
-config
-coverage
+__mocks__
node_modules
-public
+*.test.js
+*.test.jsx
+*.test.ts
+*.test.tsx
diff --git a/Makefile b/Makefile
index 8fe338f03..5935d00cd 100755
--- a/Makefile
+++ b/Makefile
@@ -45,11 +45,11 @@ pull_translations:
mkdir src/i18n/messages
cd src/i18n/messages \
&& atlas pull $(ATLAS_OPTIONS) \
- translations/frontend-platform/src/i18n/messages:frontend-platform \
+ translations/frontend-base/src/i18n/messages:frontend-base \
translations/paragon/src/i18n/messages:paragon \
translations/frontend-app-learner-dashboard/src/i18n/messages:frontend-app-learner-dashboard
- $(intl_imports) frontend-platform paragon frontend-app-learner-dashboard
+ $(intl_imports) frontend-base paragon frontend-app-learner-dashboard
# This target is used by CI.
validate-no-uncommitted-package-lock-changes:
diff --git a/package.json b/package.json
index 2552b710a..53a70284d 100644
--- a/package.json
+++ b/package.json
@@ -1,5 +1,5 @@
{
- "name": "@edx/frontend-app-learner-dashboard",
+ "name": "@openedx/frontend-app-learner-dashboard",
"version": "1.0.0",
"description": "",
"repository": {
@@ -7,6 +7,9 @@
"url": "git+https://github.com/edx/frontend-app-learner-dashboard.git"
},
"main": "src/index.ts",
+ "files": [
+ "/src"
+ ],
"browserslist": [
"extends @edx/browserslist-config"
],
@@ -22,7 +25,7 @@
"snapshot": "openedx test --updateSnapshot",
"test": "openedx test --coverage --passWithNoTests"
},
- "author": "edX",
+ "author": "Open edX",
"license": "AGPL-3.0",
"homepage": "https://github.com/openedx/frontend-app-learner-dashboard#readme",
"publishConfig": {
diff --git a/public/index.html b/public/index.html
index e1a12ed66..835275552 100755
--- a/public/index.html
+++ b/public/index.html
@@ -1,6 +1,7 @@
+ Learner Dashboard Development Site>
diff --git a/site.config.test.tsx b/site.config.test.tsx
index 417b54dfe..0483daa70 100644
--- a/site.config.test.tsx
+++ b/site.config.test.tsx
@@ -1,5 +1,7 @@
import { EnvironmentTypes, SiteConfig } from '@openedx/frontend-base';
+import { appId } from './src/constants';
+
const siteConfig: SiteConfig = {
siteId: 'learner-dashboard-test-site',
siteName: 'Learner Dashboard Test Site',
@@ -8,10 +10,10 @@ const siteConfig: SiteConfig = {
loginUrl: 'http://localhost:8000/login',
logoutUrl: 'http://localhost:8000/logout',
- environment: EnvironmentTypes.DEVELOPMENT,
+ environment: EnvironmentTypes.TEST,
basename: '/learner-dashboard',
apps: [{
- appId: 'org.openedx.frontend.app.learnerDashboard',
+ appId,
config: {
ECOMMERCE_BASE_URL: 'http://localhost:18130',
FAVICON_URL: 'https://edx-cdn.org/v3/default/favicon.ico',
diff --git a/src/data/services/lms/urls.test.js b/src/data/services/lms/urls.test.js
index c39c1d0a3..0c47b6998 100644
--- a/src/data/services/lms/urls.test.js
+++ b/src/data/services/lms/urls.test.js
@@ -1,4 +1,5 @@
import { getAppConfig, getSiteConfig } from '@openedx/frontend-base';
+import { appId } from '../../../constants';
import * as urls from './urls';
describe('urls', () => {
@@ -25,7 +26,7 @@ describe('urls', () => {
it('returns the url if it is relative', () => {
const url = '/edx.org';
expect(urls.learningMfeUrl(url)).toEqual(
- `${getAppConfig('org.openedx.frontend.app.learnerDashboard').LEARNING_BASE_URL}${url}`,
+ `${getAppConfig(appId).LEARNING_BASE_URL}${url}`,
);
});
it('return null if url is null', () => {
diff --git a/src/index.ts b/src/index.ts
index e58275f6b..8c9959416 100644
--- a/src/index.ts
+++ b/src/index.ts
@@ -1,3 +1,3 @@
export { default as learnerDashboardApp } from './app';
export { default as learnerDashboardRoutes } from './routes';
-export { default as learnerDashboardMessages } from './messages';
+export { default as learnerDashboardMessages } from './i18n';
diff --git a/src/routes.jsx b/src/routes.jsx
index e01e50d8f..d3770124e 100644
--- a/src/routes.jsx
+++ b/src/routes.jsx
@@ -4,6 +4,9 @@ const routes = [
{
id: 'org.openedx.frontend.route.learnerDashboard.main',
path: '/',
+ handle: {
+ role: 'org.openedx.frontend.role.dashboard'
+ },
Component: Main
}
];
diff --git a/src/setupTest.jsx b/src/setupTest.jsx
index 320eecc3c..a31c6ab9a 100755
--- a/src/setupTest.jsx
+++ b/src/setupTest.jsx
@@ -6,8 +6,6 @@ import { addAppConfigs, configureAnalytics, configureAuth, configureLogging, get
mergeSiteConfig(siteConfig);
addAppConfigs();
-export const testAppId = getSiteConfig().apps[0].appId;
-
export function initializeMockServices() {
const loggingService = configureLogging(MockLoggingService, {
config: getSiteConfig(),