Skip to content

Commit

Permalink
commit mui#6: more layout, menu and sub-menu coming...
Browse files Browse the repository at this point in the history
  • Loading branch information
DavidNgv committed Dec 8, 2016
1 parent c47af99 commit 568d42b
Show file tree
Hide file tree
Showing 8 changed files with 327 additions and 311 deletions.
4 changes: 4 additions & 0 deletions david-docs/src/app/AppRoutes.js
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,7 @@ import StepperPage from './components/pages/components/Stepper/Page';


import UserPage from './components/pages/users/Page'
import ListStockIn from './components/pages/stock-in/List'

/**
* Routes: https://github.com/reactjs/react-router/blob/master/docs/API.md#route
Expand Down Expand Up @@ -149,6 +150,9 @@ const AppRoutes = (
<Route path="settings">
<Route path="user" component={UserPage} />
</Route>
<Route path="stock-in">
<Route path="list" component={ListStockIn} />
</Route>
</Route>
);

Expand Down
32 changes: 21 additions & 11 deletions david-docs/src/app/components/AppNavDrawer.js
Original file line number Diff line number Diff line change
Expand Up @@ -121,8 +121,9 @@ class AppNavDrawer extends Component {
containerStyle={{zIndex: zIndex.drawer - 100}}
>
<div style={styles.logo} onTouchTap={this.handleTouchTapHeader}>
Store Man
EzyStoreMan
</div>

{/*
<span style={styles.version}>Version:</span>
<DropDownMenu
Expand All @@ -139,12 +140,10 @@ class AppNavDrawer extends Component {
/>
))}
</DropDownMenu>
*/}
<SelectableList
value={location.pathname}
onChange={onChangeList}
>
{/*
<ListItem
primaryText="Get Started"
primaryTogglesNestedList={true}
Expand All @@ -156,8 +155,6 @@ class AppNavDrawer extends Component {
<ListItem primaryText="Examples" value="/get-started/examples" />,
]}
/>
*/}
{/*
<ListItem
primaryText="Customization"
primaryTogglesNestedList={true}
Expand All @@ -167,7 +164,6 @@ class AppNavDrawer extends Component {
<ListItem primaryText="Colors" value="/customization/colors" />,
]}
/>
*/}
<ListItem
primaryText="Components"
primaryTogglesNestedList={true}
Expand Down Expand Up @@ -404,7 +400,6 @@ class AppNavDrawer extends Component {
/>,
]}
/>
{/*
<ListItem
primaryText="Discover More"
primaryTogglesNestedList={true}
Expand All @@ -415,9 +410,7 @@ class AppNavDrawer extends Component {
<ListItem primaryText="Related projects" value="/discover-more/related-projects" />,
]}
/>
*/}
</SelectableList>
{/*
<Divider />
<SelectableList
value=""
Expand All @@ -431,13 +424,13 @@ class AppNavDrawer extends Component {
value="https://www.google.com/design/spec/material-design/introduction.html"
/>
</SelectableList>
*/}
<Divider />
*/}

<SelectableList
value={location.pathname}
onChange={onChangeList}
>
<Subheader>Store Management System</Subheader>
<ListItem
primaryText="Settings"
primaryTogglesNestedList={true}
Expand All @@ -450,6 +443,23 @@ class AppNavDrawer extends Component {
]}
/>
</SelectableList>
<Divider />
<SelectableList
value={location.pathname}
onChange={onChangeList}
>
<ListItem
primaryText="Stock In"
primaryTogglesNestedList={true}
nestedItems={[
<ListItem
primaryText="List"
value="/stock-in/list"
href="#/stock-in/list"
/>,
]}
/>
</SelectableList>
</Drawer>
);
}
Expand Down
5 changes: 4 additions & 1 deletion david-docs/src/app/components/Master.js
Original file line number Diff line number Diff line change
Expand Up @@ -148,9 +148,12 @@ class Master extends Component {
router.isActive('/get-started') ? 'Get Started' :
router.isActive('/customization') ? 'Customization' :
router.isActive('/components') ? 'Components' :
router.isActive('/settings') ? 'Settings' :
router.isActive('/settings') ? router.isActive('/settings/user') ? 'User Settings' : 'Settings' :
router.isActive('/stock-in') ? router.isActive('/stock-in/list') ? 'Stock In List' : 'Stock In' :
router.isActive('/discover-more') ? 'Discover More' : '';

// console.log(router.isActive('/settings/user'));

let docked = false;
let showMenuIconButton = true;

Expand Down
164 changes: 164 additions & 0 deletions david-docs/src/app/components/pages/stock-in/List.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,164 @@
/**
* Created by davidngv on 12/8/16.
*/

import React from 'react';
import Title from 'react-title-component';

import {Table, TableBody, TableFooter, TableHeader, TableHeaderColumn, TableRow, TableRowColumn}
from 'material-ui/Table';

const styles = {
propContainer: {
width: 200,
overflow: 'hidden',
margin: '20px auto 0',
},
propToggleHeader: {
margin: '20px auto 10px',
},
};

const tableData = [
{
name: 'John Smith',
status: 'Employed',
date: '20-11-2015',
selected: true,
comment: '',
},
{
name: 'Randal White',
status: 'Unemployed',
date: '20-11-2015',
comment: '',
},
{
name: 'Stephanie Sanders',
status: 'Employed',
selected: true,
date: '20-11-2015',
comment: '',
},
{
name: 'Steve Brown',
status: 'Employed',
date: '20-11-2015',
comment: '',
},
{
name: 'Joyce Whitten',
status: 'Employed',
date: '20-11-2015',
comment: '',
},
{
name: 'Samuel Roberts',
status: 'Employed',
date: '20-11-2015',
comment: '',
},
{
name: 'Adam Moore',
status: 'Employed',
date: '20-11-2015',
comment: '',
},
];

class ListStockIn extends React.Component {
constructor(props) {
super(props);

this.state = {
fixedHeader: true,
fixedFooter: true,
stripedRows: false,
showRowHover: false,
selectable: true,
multiSelectable: false,
enableSelectAll: false,
deselectOnClickaway: true,
showCheckboxes: true,
height: '400px',
};
}

handleToggle = (event, toggled) => {
this.setState({
[event.target.name]: toggled,
});
};

handleChange = (event) => {
this.setState({height: event.target.value});
};

render() {
return (
<div>
<Title render={(previousTitle) => `Stock In List - ${previousTitle}`} />

<Table
height={this.state.height}
fixedHeader={this.state.fixedHeader}
fixedFooter={this.state.fixedFooter}
selectable={this.state.selectable}
multiSelectable={this.state.multiSelectable}
>
<TableHeader
displaySelectAll={this.state.showCheckboxes}
adjustForCheckbox={this.state.showCheckboxes}
enableSelectAll={this.state.enableSelectAll}
>
{/*
<TableRow>
<TableHeaderColumn colSpan="3" tooltip="Super Header" style={{textAlign: 'center'}}>
Super Header
</TableHeaderColumn>
</TableRow>
*/}
<TableRow>
{/*<TableHeaderColumn tooltip="The ID">ID</TableHeaderColumn>*/}
<TableHeaderColumn tooltip="The Name">Date</TableHeaderColumn>
<TableHeaderColumn tooltip="The Status">Comment</TableHeaderColumn>
</TableRow>
</TableHeader>
<TableBody
displayRowCheckbox={this.state.showCheckboxes}
deselectOnClickaway={this.state.deselectOnClickaway}
showRowHover={this.state.showRowHover}
stripedRows={this.state.stripedRows}
>
{tableData.map( (row, index) => (
<TableRow key={index} selected={row.selected}>
{/*<TableRowColumn>{index}</TableRowColumn>*/}
<TableRowColumn>{row.date}</TableRowColumn>
<TableRowColumn>{row.comment}</TableRowColumn>
</TableRow>
))}
</TableBody>
{/*
<TableFooter
adjustForCheckbox={this.state.showCheckboxes}
>
<TableRow>
<TableRowColumn>ID</TableRowColumn>
<TableRowColumn>Name</TableRowColumn>
<TableRowColumn>Status</TableRowColumn>
</TableRow>
<TableRow>
<TableRowColumn colSpan="3" style={{textAlign: 'center'}}>
Super Footer
</TableRowColumn>
</TableRow>
</TableFooter>
*/}
</Table>

</div>
);
}
}

export default ListStockIn;
Loading

0 comments on commit 568d42b

Please sign in to comment.