Skip to content
Open
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
4 changes: 4 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,10 @@ npm run build //builds to /lib which is used when library is npm installed elsew
*If you are using nvm, simply run `nvm use` to use node & npm version intended for this project*

*Following commands will need to be run in two terminals to hot reload changes in both /example and /react-admin-panel*
<<<<<<< HEAD

=======
>>>>>>> fix leftmenu with dropdown
```
npm install
npm run build:example // Terminal 1. Build react-admin-panel, and place it inside example's node_module directory
Expand Down
Binary file added example/client/asset/image/dropdownTriangle@2x.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added example/client/asset/image/logo.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
6 changes: 5 additions & 1 deletion example/client/components/App/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,10 @@ import 'react-admin-panel/lib/bundle.css'; // TODO this should be automated bett

const App = (props) => {
return (
<LeftMenu>
<LeftMenu
headerLogoSrc={require('../../../client/asset/image/logo.png')}
location={props.location}
>
hey!
{props.children}
</LeftMenu>
Expand All @@ -21,6 +24,7 @@ App.propTypes = {
PropTypes.arrayOf(PropTypes.node),
PropTypes.node,
]),
location: PropTypes.object,
};

export default App;
93 changes: 0 additions & 93 deletions example/client/components/LeftMenu/index.js

This file was deleted.

29 changes: 26 additions & 3 deletions lib/bundle.css

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

2 changes: 1 addition & 1 deletion lib/bundle.css.map

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

Loading