Skip to content
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
10 changes: 0 additions & 10 deletions .dockerignore

This file was deleted.

5 changes: 0 additions & 5 deletions .eslintignore

This file was deleted.

1 change: 0 additions & 1 deletion .gitattributes

This file was deleted.

29 changes: 8 additions & 21 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -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
16 changes: 5 additions & 11 deletions .npmignore
Original file line number Diff line number Diff line change
@@ -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
4 changes: 2 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
7 changes: 5 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,12 +1,15 @@
{
"name": "@edx/frontend-app-learner-dashboard",
"name": "@openedx/frontend-app-learner-dashboard",
"version": "1.0.0",
"description": "",
"repository": {
"type": "git",
"url": "git+https://github.com/edx/frontend-app-learner-dashboard.git"
},
"main": "src/index.ts",
"files": [
"/src"
],
"browserslist": [
"extends @edx/browserslist-config"
],
Expand All @@ -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": {
Expand Down
1 change: 1 addition & 0 deletions public/index.html
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
<!doctype html>
<html lang="en-us" dir="ltr">
<head>
<title>Learner Dashboard Development Site></title>
<meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
</head>
Expand Down
6 changes: 4 additions & 2 deletions site.config.test.tsx
Original file line number Diff line number Diff line change
@@ -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',
Expand All @@ -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',
Expand Down
3 changes: 2 additions & 1 deletion src/data/services/lms/urls.test.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import { getAppConfig, getSiteConfig } from '@openedx/frontend-base';
import { appId } from '../../../constants';
import * as urls from './urls';

describe('urls', () => {
Expand All @@ -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', () => {
Expand Down
2 changes: 1 addition & 1 deletion src/index.ts
Original file line number Diff line number Diff line change
@@ -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';
3 changes: 3 additions & 0 deletions src/routes.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,9 @@ const routes = [
{
id: 'org.openedx.frontend.route.learnerDashboard.main',
path: '/',
handle: {
role: 'org.openedx.frontend.role.dashboard'
},
Component: Main
}
];
Expand Down
2 changes: 0 additions & 2 deletions src/setupTest.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -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(),
Expand Down
Loading