Skip to content

Commit

Permalink
Switch mounting method to openemp-mf-core (#4)
Browse files Browse the repository at this point in the history
* add .env file

* Switch mounting method to **openemp-mf-core**

* Add RTL support
  • Loading branch information
honohunter authored Jul 4, 2020
1 parent 0a33b91 commit c8ff1ff
Show file tree
Hide file tree
Showing 9 changed files with 17 additions and 26 deletions.
4 changes: 4 additions & 0 deletions .env
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
ORG_NAME = openemp-mf
PROJECT_NAME = drawer
HOST = localhost
PORT = 9003
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ typings/
.yarn-integrity

# dotenv environment variables file
.env


# next.js build output
.next
Expand Down
10 changes: 4 additions & 6 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
{
"name": "@openemp-mf/drawer",
"repository": "[email protected]:openemp/openemp-ui-template.git",
"repository": "[email protected]:openemp/openemp-ui-drawer.git",
"author": "OpenEMP",
"license": "MIT",
"version": "1.0.0",
"description": "OpenEMP UI Dasboard MF",
"version": "0.0.1-latest",
"description": "OpenEMP UI Drawer MF",
"scripts": {
"lint": "eslint src",
"start": "webpack-dev-server",
Expand All @@ -16,9 +16,7 @@
"coverage": "jest --coverage"
},
"dependencies": {
"@material-ui/core": "^4.10.0",
"@material-ui/icons": "^4.9.1",
"@openemp-mf/styleguide": "github:honohunter/openemp-ui-styleguide#alpha",
"@openemp-mf/styleguide": "file:../openemp-ui-styleguide",
"@reach/router": "1.3.3",
"clsx": "^1.1.0",
"nanoevents": "^5.1.7",
Expand Down
1 change: 1 addition & 0 deletions src/components/drawerFrame.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ const useStyles = makeStyles((theme) => ({
easing: theme.transitions.easing.sharp,
duration: theme.transitions.duration.enteringScreen,
}),
overflowX: 'hidden',
},
drawerClose: {
transition: theme.transitions.create('width', {
Expand Down
3 changes: 2 additions & 1 deletion src/features/collapseItem.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ import {

const useStyles = makeStyles((theme) => ({
nested: (props) => ({
paddingLeft: theme.spacing(props.level ? 4 + props.level : 3),
[theme.direction === 'rtl' ? 'paddingRight' : 'paddingLeft']: theme.spacing(props.level ? 4 + props.level : 3),
}),
}));

Expand All @@ -26,6 +26,7 @@ export default function CollapseItem(props) {
// const navigate = useNavigate();

const handleNavigation = () => {
// check token b4 send navigation cmd
navigate(href);
};

Expand Down
12 changes: 0 additions & 12 deletions src/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,25 +6,13 @@ import Root from './root.component';

// eslint-disable-next-line no-undef

function domElementGetter() {
let el = document.getElementById('root-drawer');
if (!el) {
el = document.createElement('div');
el.id = 'root-drawer';
el.className = process.env.PROJECT_NAME;
document.body.appendChild(el);
}
return el;
}

const lifecycles = singleSpaReact({
React,
ReactDOM,
rootComponent: Root,
errorBoundary() {
return React.createElement('div', null, 'error');
},
domElementGetter,
});

export const { bootstrap, mount, unmount } = lifecycles;
Expand Down
7 changes: 4 additions & 3 deletions src/root.component.jsx
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
import React from 'react';

import React, { useEffect } from 'react';
import { DrawerFrame, NestedList } from 'components';

import { links } from './root.helper';

const Root = () => {
useEffect(() => {
window.appMountSuccess('success');
}, []);
return (
<DrawerFrame>
<NestedList linksList={links} />
Expand Down
2 changes: 0 additions & 2 deletions src/root.helper.js
Original file line number Diff line number Diff line change
Expand Up @@ -42,5 +42,3 @@ export const links = [
],
},
];

// console.log('-------', System.import('@openemp-mf/template'));
2 changes: 1 addition & 1 deletion webpack.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ module.exports = (webpackConfigEnv = {}) => {
assets: path.resolve(__dirname, 'src/assets'),
components: path.resolve(__dirname, 'src/components'),
features: path.resolve(__dirname, 'src/features'),
helpers: path.resolve(__dirname, 'src/features'),
helpers: path.resolve(__dirname, 'src/helpers'),
reducer: path.resolve(__dirname, 'src/reducer'),
},
},
Expand Down

0 comments on commit c8ff1ff

Please sign in to comment.