Skip to content

Commit

Permalink
added layout tab in mobile interface. still under construction
Browse files Browse the repository at this point in the history
  • Loading branch information
bquader committed Jul 17, 2018
1 parent 5358577 commit 58f3b35
Show file tree
Hide file tree
Showing 3 changed files with 52 additions and 11 deletions.
3 changes: 2 additions & 1 deletion support/client/lib/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -143,6 +143,7 @@

<body>


<!-- Generic clients may have nearly empty pages, but pages for custom clients may be laid -->
<!-- out in any manner desired. Any view and models that render to the page should be -->
<!-- instructed where to attach their content. -->
Expand All @@ -158,7 +159,7 @@
</div>
</div>
<div id="vwf-root"></div>

<tbody></tbody>
</body>

</html>
24 changes: 16 additions & 8 deletions support/lobby/lib/PreviousSessions.js
Original file line number Diff line number Diff line change
Expand Up @@ -24,37 +24,43 @@ const columns = [ {
accessor:
"state.scenarioTitle",
Cell:
function Cell( props ) { return <TextCell { ...props }/> },
function Cell( props ) { return <TextCell { ...props }/>
},
Filter:
function Filter( props ) { return <ScenarioFilter { ...props }/> },
function Filter( props ) { return <ScenarioFilter { ...props }/>
},
}, {
Header:
"Company",
accessor:
"state.classroom.company",
Cell:
function Cell( props ) { return <TextCell { ...props }/> },
function Cell( props ) { return <TextCell { ...props }/>
},
}, {
Header:
"Platoon",
accessor:
"state.classroom.platoon",
Cell:
function Cell( props ) { return <TextCell { ...props }/> },
function Cell( props ) { return <TextCell { ...props }/>
},
}, {
Header:
"Unit",
accessor:
"state.classroom.unit",
Cell:
function Cell( props ) { return <TextCell { ...props }/> },
function Cell( props ) { return <TextCell { ...props }/>
},
}, {
Header:
"Date",
accessor:
"document.timestamp",
Cell:
function Cell( props ) { return <DateCell { ...props }/> },
function Cell( props ) { return <DateCell { ...props }/>
},
filterable:
false,
width:
Expand All @@ -67,7 +73,8 @@ const columns = [ {
accessor:
session => session,
Cell:
function Cell( props ) { return <ReviewCell { ...props }/> },
function Cell( props ) { return <ReviewCell { ...props }/>
},
sortable:
false,
filterable:
Expand All @@ -80,7 +87,8 @@ const columns = [ {
accessor:
session => session,
Cell:
function Cell( props ) { return <ResumeCell { ...props }/> },
function Cell( props ) { return <ResumeCell { ...props }/>
},
sortable:
false,
filterable:
Expand Down
36 changes: 34 additions & 2 deletions support/lobby/lib/Scenarios.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import React from "react";
import PropTypes from "prop-types";
import { Table, FormControl, Button, ControlLabel } from "react-bootstrap";
import { Table, FormControl, Button, ControlLabel, Checkbox } from "react-bootstrap";
import ReactTable from "react-table";

import { post } from "./utils";
Expand Down Expand Up @@ -134,6 +134,7 @@ class Application extends React.Component {

//closes create info upon clicking 'create' button and leads to new page
handleSubmit = event => {

this.setState({isClicked: false});
this.setState({buttonOn: true});
let properties = {
Expand Down Expand Up @@ -162,6 +163,7 @@ class Application extends React.Component {
this.setState({isClicked: false});
this.setState({buttonOn: true});
this.setState({title: ""});

}
}

Expand Down Expand Up @@ -262,7 +264,7 @@ const columns = [
false,
filterable:
false,
}, {
},{
Header:
"",
id:
Expand Down Expand Up @@ -345,6 +347,7 @@ class ActionCell extends LobbyCell {
<Button type="submit" disabled={ !this.context.readers.filled() }
bsSize="small" className={ !this.context.readers.filled() && "hidden" }
onClick={ this.handleSubmit }> Start </Button>

</React.Fragment>;
}

Expand All @@ -367,6 +370,35 @@ class ActionCell extends LobbyCell {

}

//class DeleteCell extends React.Component{
//
// static propTypes = {
// value:
// PropTypes.object.isRequired,
// };
// state = {
// check: false,
// }
//
// render() {
// return <React.Fragment>
// <Checkbox href={this.props.value.instance || this.props.value.document.uri}
// onChange={ this.handleChange } checked = {this.state.check}> </Checkbox>
//
// </React.Fragment>;
// }
//
// handleChange = event => {
// this.setState({check: event.target.checked});
// }
//
//
//}





class HiddenCell extends React.Component {

static propTypes = {
Expand Down

0 comments on commit 58f3b35

Please sign in to comment.