Skip to content

T
Tia-dev
Commit 4f9bb316 authored by Deni Rinaldi's avatar Deni Rinaldi
Browse files
Options

Merge branch 'deni-dev(pc)' into 'master' 

menu ke inggris || dasborCAT

See merge request !82
parents 9e420c4f 523732c1
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 152 additions and 135 deletions
src/container/Home.js
View file @ 4f9bb316
......@@ -193,9 +193,9 @@ export default function MiniDrawer() {
}}
>
<div className={classes.toolbarDrawer} style={{
backgroundColor: '#51c6ea',
backgroundColor: '#51c5ea',
height: open ? null : 68,
paddingBottom: open ? 25 : null
paddingBottom: open ? 55 : null
}}>
<div style={{ display: 'flex', justifyContent: 'space-between', flex: 1, padding: 10 }}>
<img src={Images.triputra} alt="React Logo" style={{ height: 31, width: 151, alignSelf: 'center' }} />
......@@ -212,8 +212,8 @@ export default function MiniDrawer() {
</div>
<Divider />
{open &&
<div style={{ width: '100%', textAlign: '-webkit-center', marginTop: -15 }}>
<div style={{ width: 86, height: 86, backgroundColor: '#0d2846', borderRadius: 50, display: 'flex', justifyContent: 'center' }}>
<div style={{ width: '100%', textAlign: '-webkit-center', marginTop: -40 }}>
<div style={{ width: 90, height: 90, backgroundColor: '#0d2846', borderRadius: 50, display: 'flex', justifyContent: 'center' }}>
<div style={{ width: 72, height: 72, backgroundColor: 'white', borderRadius: 50, alignSelf: 'center' }}>
</div>
......@@ -222,33 +222,33 @@ export default function MiniDrawer() {
}
{open &&
<div style={{ marginLeft: 20, marginTop: 20 }}>
<Typography style={{ color: 'white', fontSize: 14, fontFamily: 'nunito' }}>APLIKASI</Typography>
<Typography style={{ color: 'white', fontSize: 14, fontFamily: 'nunito' }}>Application</Typography>
</div>
}
<List>
{ArraySide.map((item, index) => (
<div style={{ marginTop: index === 0 ? null : 10}}>
<div style={{ marginTop: index === 0 ? null : 10 }}>
{item.subItem != null ?
<div style={{ justifyContent: 'space-between', flexDirection: 'row', display: 'flex', paddingLeft: 10, paddingRight: 10 }} onClick={() => selectedIndex == 0 ? setSelectedIndex(index) : setSelectedIndex(0)}>
<ListItem button key={item.label}>
<ListItemIcon><img src={item.img} /></ListItemIcon>
<ListItemIcon style={{ minWidth: open ? 40 : 56 }}><img src={item.img} /></ListItemIcon>
<Typography style={{ fontFamily: 'nunito', color: 'white', fontSize: 14 }}>{item.label}</Typography>
</ListItem>
{item.subItem != null ? (index === selectedIndex ? <ExpandLess style={{ color: "white", marginLeft: 50, alignSelf: 'center' }} /> : <ExpandMore style={{ color: "white", marginLeft: 50, alignSelf: 'center' }} />) : null}
</div>
:
item.label === 'PENGATURAN' ?
item.label === 'Settings' ?
open ?
<Link to={`${url}/${item.path}`}>
<ListItem button key={item.label} onClick={() => null}>
<Typography style={{ fontFamily: 'nunito', color: 'white', fontSize: 14 }}>{item.label}</Typography>
<Typography style={{ color: 'white', fontSize: 14, fontFamily: 'nunito' }}>{item.label}</Typography>
</ListItem>
</Link> : null
:
</Link> : null
:
<Link to={`${url}/${item.path}`}>
<div style={{paddingLeft: 10}}>
<div style={{ paddingLeft: 10 }}>
<ListItem button key={item.label} onClick={() => setSelectedIndex(index)}>
<ListItemIcon><img src={item.img} /></ListItemIcon>
<ListItemIcon style={{ minWidth: open ? 40 : 56 }}><img src={item.img} /></ListItemIcon>
<Typography style={{ fontFamily: 'nunito', color: 'white', fontSize: 14 }}>{item.label}</Typography>
</ListItem>
</div>
......@@ -261,8 +261,8 @@ export default function MiniDrawer() {
{item.subItem.map((sub, index) => {
return (
<Link to={`${url}/${sub.path}`}>
<div style={{paddingLeft: 10}}>
<ListItem style={{ paddingLeft: 72 }}>
<div style={{ paddingLeft: 10 }}>
<ListItem style={{ paddingLeft: 57 }}>
<Typography style={{ fontFamily: 'nunito', color: 'white', fontSize: 14 }}>{sub.label}</Typography>
</ListItem>
</div>
......
src/container/Laporan/DashboardCAT.js
View file @ 4f9bb316
......@@ -32,7 +32,7 @@ export default class DashboardCAT extends Component {
{ value: '2016', label: '2016' },
]
return (
<div style={{ height: this.props.height }}>
<div style={{}}>
<div style={{ backgroundColor: '#354960', padding: 28 }}>
<Typography style={{ fontSize: '16px', color: 'white' }}>ON CHANGE CAT</Typography>
</div>
......@@ -70,21 +70,21 @@ export default class DashboardCAT extends Component {
</TextField>
</div>
<Paper style={{ marginTop: 20}}>
<AppBar position="static">
<Tabs indicatorColor="primary" value={this.state.tab} onChange={this.selectTab} aria-label="simple tabs example" style={{ backgroundColor: '#354960', borderColor: 'transparent' }}>
<Paper style={{ marginTop: 20, }}>
<AppBar position="static" style={{ borderTopRightRadius: 10, borderTopLeftRadius: 10 }}>
<Tabs indicatorColor="primary" value={this.state.tab} onChange={this.selectTab} aria-label="simple tabs example" style={{ backgroundColor: '#354960', borderColor: 'transparent',borderTopRightRadius: 10, borderTopLeftRadius: 10 }}>
<Tab label="Executive Scoreboard" style={{ color: '#fff', fontSize: 11 }} />
<Tab label="Strategy Map" style={{ color: '#fff', fontSize: 11 }} />
<Tab label="KPIs" style={{ color: '#fff', fontSize: 11 }} />
</Tabs>
</AppBar>
{this.state.tab == 0 ?
<ExceutiveScoreboard />
<ExceutiveScoreboard height={this.props.height} />
:
this.state.tab == 1 ?
<span>Testt</span>
:
<span>Test2</span>
<span>Testt</span>
:
<span>Test2</span>
}
</Paper>
</div>
......
src/container/Laporan/ExceutiveScoreboard.js
View file @ 4f9bb316
......@@ -77,7 +77,8 @@ export default class ExceutiveScoreboard extends Component {
</div>
)
})}
<div style={{ width: 566, height: 233, boxShadow: '0 1px 4px 0 rgba(0, 0, 0, 0.25)', padding: 20, justifyContent: 'space-between', display: 'grid', margin: 10 }}>
</div>
<div style={{ width: 566, height: 233, boxShadow: '0 1px 4px 0 rgba(0, 0, 0, 0.25)', padding: 20, justifyContent: 'space-between', display: 'grid', margin: 10 }}>
<div>
<span style={{ fontSize: 17 }}>YTD Revenue</span>
<Typography style={{ fontSize: 24, fontWeight: 'bold' }}>1,016,489.78</Typography>
......@@ -95,7 +96,6 @@ export default class ExceutiveScoreboard extends Component {
hideYLabel={true}
/>
</div>
</div>
</div>
)
}
......
src/container/MasterData/UnitBisnis.js
View file @ 4f9bb316
This diff is collapsed.
src/library/Array.js
View file @ 4f9bb316
......@@ -3,53 +3,71 @@ import Images from "../assets/Images";
const arraySide = [
{
img: Images.Home,
label: 'Beranda',
label: 'Home',
path: 'beranda',
subItem: null
},
{
img: Images.budgetTahunan,
label: 'Budget Tahunan',
label: 'Master Budget & CAT',
path: 'budget-tahunan',
subItem: null
},
{
img: Images.laporanBulanan,
label: 'Laporan Bulanan',
label: 'Monthly Report',
path: 'beranda',
subItem: null
},
{
img: Images.manajemenDokumen,
label: 'Manajemen Dokumen',
label: 'Rolling Outlook & CAT Revision',
path: 'beranda',
subItem: null
},
{
img: Images.manajemenDokumen,
label: 'Outlook Performance Appraisal',
path: 'beranda',
subItem: null
},
{
img: Images.manajemenDokumen,
label: 'Operating Indicator',
path: 'beranda',
subItem: null
},
{
img: Images.manajemenDokumen,
label: 'Document Management',
path: 'beranda',
subItem: null
},
{
img: Images.laporan,
label: 'Laporan',
label: 'Reports',
path: '',
subItem: [
{
img: 'beranda',
label: 'Dashboard CAT',
label: 'CAT Dashboard',
path: 'dashboard-cat',
},
{
img: 'beranda',
label: 'Report Summary Triputra Group',
label: 'Summary of Triputra Group',
path: 'beranda',
},
{
img: '',
label: 'Report Sub Holding',
label: 'Sub Holding',
path: 'beranda',
}
]
},
{
img: '',
label: 'PENGATURAN',
label: 'Settings',
path: 'beranda',
subItem: null
},
......@@ -60,34 +78,29 @@ const arraySide = [
subItem: [
{
img: '',
label: 'Unit Bisnis',
label: 'Business Unit',
path: 'unit-bisnis',
},
{
img: '',
label: 'Perusahaan',
label: 'Company',
path: 'perusahaan',
},
{
img: '',
label: 'Item Laporan',
label: 'Report Items',
path: 'report-items',
},
{
img: '',
label: 'Manajemen Laporan',
path: 'beranda',
},
{
img: '',
label: 'Parameter Lainnya',
label: 'Parameters',
path: 'parameter',
},
]
},
{
img: Images.otorisasi,
label: 'Otorisasi',
label: 'Authorization',
path: '',
subItem: [
{
......
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