Skip to content

Commit

Permalink
feat: use openedx footer by default (#282)
Browse files Browse the repository at this point in the history
* feat: use openedx footer by default

* fix: delete footer directory and update package-lock
  • Loading branch information
Adam Butterworth authored and davidjoy committed Sep 30, 2019
1 parent 51b4d9b commit cd2fdae
Show file tree
Hide file tree
Showing 6 changed files with 61 additions and 109 deletions.
99 changes: 0 additions & 99 deletions footer/Footer.jsx

This file was deleted.

Binary file removed footer/edx-footer.png
Binary file not shown.
57 changes: 51 additions & 6 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@
"@edx/frontend-analytics": "3.0.0",
"@edx/frontend-auth": "7.0.1",
"@edx/frontend-base": "2.2.0",
"@edx/frontend-component-footer": "6.0.2",
"@edx/frontend-component-footer": "8.0.0",
"@edx/frontend-component-header": "1.1.2",
"@edx/frontend-i18n": "3.0.2",
"@edx/frontend-logging": "3.0.1",
Expand Down
10 changes: 8 additions & 2 deletions src/index.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import ReactDOM from 'react-dom';
import { Route, Switch } from 'react-router-dom';

import Header, { messages as headerMessages } from '@edx/frontend-component-header';
import Footer from '../footer/Footer';
import Footer, { messages as footerMessages } from '@edx/frontend-component-footer';

import appMessages from './i18n';
import './index.scss';
Expand Down Expand Up @@ -34,4 +34,10 @@ App.subscribe(APP_ERROR, (error) => {
ReactDOM.render(<ErrorPage message={error.message} />, document.getElementById('root'));
});

App.initialize({ messages: [appMessages, headerMessages] });
App.initialize({
messages: [
appMessages,
headerMessages,
footerMessages,
],
});
2 changes: 1 addition & 1 deletion src/index.scss
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,4 @@
@import './profile/index.scss';

@import "~@edx/frontend-component-header/src/index";
@import "~@edx/frontend-component-footer/src/lib/scss/site-footer";
@import "~@edx/frontend-component-footer/src/footer";

0 comments on commit cd2fdae

Please sign in to comment.