diff --git a/support/client/lib/index.html b/support/client/lib/index.html index 24e9edfcc..7e582e443 100644 --- a/support/client/lib/index.html +++ b/support/client/lib/index.html @@ -25,7 +25,7 @@ Virtual World Framework - + diff --git a/support/lobby/index.html b/support/lobby/index.html index 788a024e2..1b9b73e7e 100644 --- a/support/lobby/index.html +++ b/support/lobby/index.html @@ -4,7 +4,7 @@ - + Virtual World Framework lobby diff --git a/support/lobby/lib/Layout.js b/support/lobby/lib/Layout.js index f7811455f..cc7b5524b 100644 --- a/support/lobby/lib/Layout.js +++ b/support/lobby/lib/Layout.js @@ -37,9 +37,12 @@ export default class Layout extends React.Component { @@ -55,14 +58,16 @@ export default class Layout extends React.Component { { this.state.user.instructor && - } + + } { true && } { this.state.user.instructor && - } + + } ; @@ -70,6 +75,7 @@ export default class Layout extends React.Component { return null; } } + componentDidMount() { this.handleVersion(); diff --git a/support/lobby/lib/Login.js b/support/lobby/lib/Login.js index 92f5288e9..6dde0bf64 100644 --- a/support/lobby/lib/Login.js +++ b/support/lobby/lib/Login.js @@ -162,19 +162,7 @@ setStudent(isStudent){ - - - - { - this.props.flash.map( - ( message, index ) => - - { message.message } - - ) - } - - + @@ -220,23 +208,10 @@ setStudent(isStudent){ then( version => this.setState( { version: version || {} } ) ). catch( error => - console.log( error.message ) ); /* eslint no-console: "off" */ + console.log( "Not working" ) ); /* eslint no-console: "off" */ } } /// Convert an Express flash `type` to a Bootstrap alert style. -function bsstyle( flashType ) { - switch ( flashType ) { - case "success": - return "success"; - // case "warning": - // case "warn": - // return "warning"; - case "error": - return "danger"; - default: - return "info"; - } -} diff --git a/support/lobby/lib/Scenarios.js b/support/lobby/lib/Scenarios.js index 685d70f99..b624611c5 100644 --- a/support/lobby/lib/Scenarios.js +++ b/support/lobby/lib/Scenarios.js @@ -19,9 +19,10 @@ export default function Scenarios( props ) { ( { fields: @@ -48,6 +49,7 @@ export default function Scenarios( props ) { ; } + Scenarios.propTypes = { records: PropTypes.arrayOf( PropTypes.object ).isRequired, @@ -86,13 +88,13 @@ class Application extends React.Component { render() { return + {/*Click on button to make create info pop up*/} - - - {/*will not appear until create button is clicked*/} - - + - -   - + +