diff --git a/js/gui.js b/js/gui.js index 0750dbe00..d731ed897 100644 --- a/js/gui.js +++ b/js/gui.js @@ -17,7 +17,7 @@ var Link = React.createClass({ className = (this.props.button ? 'button-block button-' + this.props.button : 'button-text') + (this.props.fadeIn ? ' fade-in-link' : ''); return ( - + {this.props.icon ? icon : '' } {this.props.label} @@ -104,7 +104,6 @@ var Header = React.createClass({ render: function() { return ( - @@ -113,7 +112,6 @@ var Header = React.createClass({ } }); - var topBarStyle = { 'float': 'right' }; @@ -138,7 +136,7 @@ var TopBar = React.createClass({ - + ); } @@ -152,12 +150,15 @@ var menuStyle = { marginLeft: '3px' }; +var chooseSettingsPage = function() { + this.props.onPageChosen('settings'); +}; var Menu = React.createClass({ render: function() { return ( - + ) } @@ -349,20 +350,68 @@ var Discover = React.createClass({ } }); -//component/home.js +var HomePage = React.createClass({ + render: function() { + return ( + + + + + ); + } +}); -var homeStyles = { +var settingsPageStyles = { + paddingTop: '80px' +}, settingsPageHeaderStyles = { + textAlign: 'center' +}, settingsBottomButtonsStyles = { + textAlign: 'center' +}; + +var SettingsPage = React.createClass({ + render: function() { + return ( + + Settings + Lots of settings and stuff + ... {/* Placeholder */} + + + + + + ); + } +}); + + +var appStyles = { width: '800px', marginLeft: 'auto', marginRight: 'auto', }; - -var Home = React.createClass({ +var App = React.createClass({ + getInitialState: function() { + return { + viewingPage: 'home' + } + }, + handlePageChosen: function(page) { + this.setState({ + viewingPage: page + }); + }, render: function() { + if (this.state.viewingPage == 'home') { + var content = ; + } else if (this.state.viewingPage == 'settings') { + var content = ; + } return ( - - - + + + {content} ); } @@ -378,7 +427,7 @@ var init = function() { ); lbry.connect(function() { - ReactDOM.render(, canvas); + ReactDOM.render(, canvas); }) };
Lots of settings and stuff
...