Skip to content

T
Tia-dev
Commit 980ef048 authored by EKSAD's avatar EKSAD
Browse files
Options

Merge branch 'master' of http://103.44.149.204/d.arizona/tia-dev into riri

parents 5494a3a8 b4a4a132
Expand all Show whitespace changes
Inline Side-by-side
Showing with 382 additions and 40 deletions
package.json
View file @ 980ef048
...@@ -12,6 +12,7 @@ ...@@ -12,6 +12,7 @@
"font-awesome": "^4.7.0", "font-awesome": "^4.7.0",
"mui-datatables": "^3.3.1", "mui-datatables": "^3.3.1",
"react": "^16.13.1", "react": "^16.13.1",
"react-d3-donut": "^1.1.2",
"react-dom": "^16.13.1", "react-dom": "^16.13.1",
"react-router-dom": "^5.2.0", "react-router-dom": "^5.2.0",
"react-scripts": "3.4.1" "react-scripts": "3.4.1"
......
src/assets/Images.js
View file @ 980ef048
...@@ -17,6 +17,8 @@ const Images = { ...@@ -17,6 +17,8 @@ const Images = {
imageLogin: require('./image.svg'), imageLogin: require('./image.svg'),
email: require('./email.svg'), email: require('./email.svg'),
key: require('./key.svg'), key: require('./key.svg'),
green: require('./green.svg'),
red: require('./red.svg'),
//Image //Image
triputra: require('./triputra.png'), triputra: require('./triputra.png'),
......
src/assets/green.svg 0 → 100644
View file @ 980ef048
<svg xmlns="http://www.w3.org/2000/svg" width="10" height="10" viewBox="0 0 10 10">
<g fill="none" fill-rule="evenodd">
<path d="M0 0H16V16H0z" transform="matrix(1 0 0 -1 -3 13)"/>
<g stroke="#4CAF50" stroke-linecap="round">
<path stroke-linejoin="round" d="M8 7.243L2 7.243 2 1.243" transform="matrix(1 0 0 -1 -3 13) translate(3 3.757) rotate(-45 5 4.243)"/>
<path d="M5 8.485L5 0" transform="matrix(1 0 0 -1 -3 13) translate(3 3.757)"/>
</g>
</g>
</svg>
src/assets/red.svg 0 → 100644
View file @ 980ef048
<svg xmlns="http://www.w3.org/2000/svg" width="10" height="10" viewBox="0 0 10 10">
<g fill="none" fill-rule="evenodd">
<path d="M0 0H16V16H0z" transform="translate(-3 -3)"/>
<g stroke="#F65A4C" stroke-linecap="round">
<path stroke-linejoin="round" d="M8 7.243L2 7.243 2 1.243" transform="translate(-3 -3) translate(3 3.757) rotate(-45 5 4.243)"/>
<path d="M5 8.485L5 0" transform="translate(-3 -3) translate(3 3.757)"/>
</g>
</g>
</svg>
src/container/Home.js
View file @ 980ef048
...@@ -10,6 +10,8 @@ import Typography from '@material-ui/core/Typography'; ...@@ -10,6 +10,8 @@ import Typography from '@material-ui/core/Typography';
import Divider from '@material-ui/core/Divider'; import Divider from '@material-ui/core/Divider';
import IconButton from '@material-ui/core/IconButton'; import IconButton from '@material-ui/core/IconButton';
import MenuIcon from '@material-ui/icons/Menu'; import MenuIcon from '@material-ui/icons/Menu';
import ExpandMore from '@material-ui/icons/ExpandMore'
import ExpandLess from '@material-ui/icons/ExpandLess'
import ChevronLeftIcon from '@material-ui/icons/ChevronLeft'; import ChevronLeftIcon from '@material-ui/icons/ChevronLeft';
import ChevronRightIcon from '@material-ui/icons/ChevronRight'; import ChevronRightIcon from '@material-ui/icons/ChevronRight';
import ListItem from '@material-ui/core/ListItem'; import ListItem from '@material-ui/core/ListItem';
...@@ -17,6 +19,7 @@ import ListItemIcon from '@material-ui/core/ListItemIcon'; ...@@ -17,6 +19,7 @@ import ListItemIcon from '@material-ui/core/ListItemIcon';
import ListItemText from '@material-ui/core/ListItemText'; import ListItemText from '@material-ui/core/ListItemText';
import InboxIcon from '@material-ui/icons/MoveToInbox'; import InboxIcon from '@material-ui/icons/MoveToInbox';
import MailIcon from '@material-ui/icons/Mail'; import MailIcon from '@material-ui/icons/Mail';
import Collapse from '@material-ui/core/Collapse';
import { import {
BrowserRouter as Router, BrowserRouter as Router,
...@@ -31,6 +34,7 @@ import { FadeMenu, Footer } from '../Utils/Index'; ...@@ -31,6 +34,7 @@ import { FadeMenu, Footer } from '../Utils/Index';
import Beranda from './Beranda'; import Beranda from './Beranda';
import { Avatar } from '@material-ui/core'; import { Avatar } from '@material-ui/core';
import HomeRoutes from '../router/homeRoutes' import HomeRoutes from '../router/homeRoutes'
import ArraySide from '../library/Array'
const drawerWidth = 307; const drawerWidth = 307;
...@@ -114,7 +118,11 @@ export default function MiniDrawer() { ...@@ -114,7 +118,11 @@ export default function MiniDrawer() {
const classes = useStyles(); const classes = useStyles();
const theme = useTheme(); const theme = useTheme();
const [open, setOpen] = React.useState(false); const [open, setOpen] = React.useState(false);
const [selectedIndex, setSelectedIndex] = React.useState([]);
React.useEffect(() => {
// alert(ArraySide)
})
const handleDrawerOpen = () => { const handleDrawerOpen = () => {
setOpen(true); setOpen(true);
}; };
...@@ -203,25 +211,52 @@ export default function MiniDrawer() { ...@@ -203,25 +211,52 @@ export default function MiniDrawer() {
</div> </div>
</div> </div>
} }
{open &&
<div style={{marginLeft: 25, marginTop: 20, marginBottom: 20}}>
<Typography style={{color: 'white', fontSize: 12}}>APLIKASI</Typography>
</div>
}
<List> <List>
{['Inbox', 'Starred', 'Send email', 'Drafts'].map((text, index) => ( {ArraySide.map((item, index) => (
<ListItem button key={text}> <div>
<ListItemIcon>{index % 2 === 0 ? <InboxIcon /> : <MailIcon />}</ListItemIcon> {item.subItem != null?
<ListItemText primary={text} /> <div style={{justifyContent:'space-between', flexDirection: 'row', display: 'flex', paddingRight: 10}} onClick={() => selectedIndex == 0? setSelectedIndex(index) : setSelectedIndex(0)}>
<ListItem button key={item.label}>
<ListItemIcon>{index % 2 === 0 ? <InboxIcon style={{color:"white"}}/> : <MailIcon style={{color:"white"}}/>}</ListItemIcon>
<Typography style={{color: 'white', fontSize: 12}}>{item.label}</Typography>
</ListItem> </ListItem>
))} {item.subItem != null? (index === selectedIndex? <ExpandMore style={{color:"white", marginLeft: 50, alignSelf:'center'}}/> : <ExpandLess style={{color:"white", marginLeft: 50, alignSelf:'center'}}/>) : null}
</List> </div>
<Divider /> :
<List> <Link to={`${url}/${item.path}`}>
{['All mail', 'Trash', 'Spam'].map((text, index) => ( <ListItem button key={item.label} onClick={() => setSelectedIndex(index)}>
<ListItem button key={text}> <ListItemIcon>{index % 2 === 0 ? <InboxIcon style={{color:"white"}}/> : <MailIcon style={{color:"white"}}/>}</ListItemIcon>
<ListItemIcon>{index % 2 === 0 ? <Link to={`${url}/beranda`}><InboxIcon /></Link> : <Link to={`${url}/screen404`}><MailIcon /></Link>}</ListItemIcon> <Typography style={{color: 'white', fontSize: 12}}>{item.label}</Typography>
<ListItemText primary={text} /> </ListItem>
</Link>
}
{item.subItem != null &&
<div>
<Collapse in={index === selectedIndex} timeout="auto" unmountOnExit>
<List component="div" disablePadding>
{item.subItem.map((sub, index) => {
return (
<Link to={`${url}/${sub.path}`}>
<ListItem style={{paddingLeft: 70}}>
<Typography style={{color: 'white', fontSize: 12}}>{sub.label}</Typography>
</ListItem> </ListItem>
</Link>
)
})}
</List>
</Collapse>
</div>
}
</div>
))} ))}
</List> </List>
</Drawer> </Drawer>
<div className={classes.content} style={{ height: '100vh', justifyContent: 'space-between', padding: 0, backgroundColor: '#f8f8f8' }}> <div className={classes.content} style={{ justifyContent: 'space-between', padding: 0, backgroundColor: '#f8f8f8' }}>
<div> <div>
<div className={classes.toolbar} /> <div className={classes.toolbar} />
<Switch> <Switch>
...@@ -250,19 +285,3 @@ export default function MiniDrawer() { ...@@ -250,19 +285,3 @@ export default function MiniDrawer() {
</div> </div>
); );
} }
\ No newline at end of file
function Topic() {
// The <Route> that rendered this component has a
// path of `/topics/:topicId`. The `:topicId` portion
// of the URL indicates a placeholder that we can
// get from `useParams()`.
let { topicId } = useParams();
React.useEffect(() => {
alert(topicId)
})
return (
<div>
<h3>{topicId}</h3>
</div>
);
}
\ No newline at end of file
src/container/HomePage.js
View file @ 980ef048
This diff is collapsed.
src/container/UserRole.js 0 → 100644
View file @ 980ef048
import React, { Component } from 'react';
export default class componentName extends Component {
render() {
return (
<div style={{height: '100vh', width: '100%', flex: 1}}> textInComponent </div>
);
}
}
src/index.js
View file @ 980ef048
import React from 'react'; import React from 'react';
import ReactDOM from 'react-dom'; import ReactDOM from 'react-dom';
import './index.css'; import './index.css';
import '../node_modules/font-awesome/css/font-awesome.min.css';
import App from './App'; import App from './App';
import * as serviceWorker from './serviceWorker'; import * as serviceWorker from './serviceWorker';
......
src/library/Array.js 0 → 100644
View file @ 980ef048
const arraySide = [
{
img: '',
label: 'Beranda',
path: 'beranda',
subItem: null
},
{
img: '',
label: 'Budget Tahunan',
path: 'beranda',
subItem: null
},
{
img: '',
label: 'Laporan Bulanan',
path: 'beranda',
subItem: null
},
{
img: '',
label: 'Manajemen Dokumen',
path: 'beranda',
subItem: null
},
{
img: '',
label: 'Laporan',
path: '',
subItem: [
{
img: 'beranda',
label: 'Dashboard CAT',
path: 'beranda',
},
{
img: 'beranda',
label: 'Report Summary Triputra Group',
path: 'beranda',
},
{
img: '',
label: 'Report Sub Holding',
path: 'beranda',
}
]
},
{
img: '',
label: 'PENGATURAN',
path: 'beranda',
subItem: null
},
{
img: '',
label: 'Master Data',
path: '',
subItem: [
{
img: '',
label: 'Unit Bisnis',
path: 'beranda',
},
{
img: '',
label: 'Perusahaan',
path: 'beranda',
},
{
img: '',
label: 'Item Laporan',
path: 'beranda',
},
{
img: '',
label: 'Manajemen Laporan',
path: 'beranda',
},
{
img: '',
label: 'Parameter Lainnya',
path: 'beranda',
},
]
},
{
img: '',
label: 'Otorisasi',
path: '',
subItem: [
{
img: '',
label: 'User Role',
path: 'userrole',
},
{
img: '',
label: 'User',
path: 'beranda',
}
]
},
{
img: '',
label: 'Approvalz Matrix',
path: 'beranda',
subItem: null
}
]
export default arraySide;
\ No newline at end of file
src/router/homeRoutes.js
View file @ 980ef048
import screen404 from '../container/Screen404' import screen404 from '../container/Screen404'
import Beranda from '../container/Beranda' import Beranda from '../container/Beranda'
import UserRole from '../container/UserRole'
const routes = [ const routes = [
{ {
path: "/home/beranda", path: "/home/beranda",
main: Beranda main: HomePage
}, },
{ {
path: "/home/screen404", path: "/home/userrole",
main: screen404 main: UserRole
}, },
]; ];
export default routes; export default routes;
\ No newline at end of file
src/router/index.js
View file @ 980ef048
...@@ -36,7 +36,7 @@ export default function BasicExample() { ...@@ -36,7 +36,7 @@ export default function BasicExample() {
<Route path="/login" component={Login} /> <Route path="/login" component={Login} />
<Route path="/reset" component={ResetPassword} /> <Route path="/reset" component={ResetPassword} />
<Route path="/register" component={Register}/> <Route path="/register" component={Register}/>
<Route path="/home" component={Home} /> <PrivateRoute path="/home" component={Home} />
<Route path="*"> <Route path="*">
<Screen404 /> <Screen404 />
</Route> </Route>
...@@ -44,3 +44,23 @@ export default function BasicExample() { ...@@ -44,3 +44,23 @@ export default function BasicExample() {
</Router> </Router>
); );
} }
function PrivateRoute({ children, ...rest }) {
return (
<Route
{...rest}
render={({ location }) =>
// fakeAuth.isAuthenticated ? (
// children
// ) : (
<Redirect
to={{
pathname: "/login",
// state: { from: location }
}}
/>
// )
}
/>
);
}
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment