Skip to content

Commit

Permalink
Adding a handful of likely necessary compontents
Browse files Browse the repository at this point in the history
Clicking the button adds a card component but renders on
top of the rest of it all -- this should be fixed.
  • Loading branch information
bencarothers committed Jan 5, 2016
1 parent c3afd7b commit 46db3f9
Show file tree
Hide file tree
Showing 4 changed files with 32 additions and 7 deletions.
24 changes: 24 additions & 0 deletions server/static/jsx/components/add_video.jsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
import React from 'react';
import FloatingActionButton from 'material-ui/lib/floating-action-button';
import Camera from 'material-ui/lib/svg-icons/image/camera';
import Lift from './lift_card'

const Add = React.createClass({
clickHandle() {
React.render(<Lift />, document.getElementById('app'));
},

render() {
var buttonStyle= {
marginLeft: '290px',
marginTop: '30px',
paddng: '50px'
}
return(
<FloatingActionButton style={buttonStyle} onClick={this.clickHandle}>
<Camera />
</FloatingActionButton>);
}
});

export default Add;
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,8 @@ const Lift = React.createClass({
height: '300px',
paddng: '50px'

}
};

return(
<Card style={cardStyle}>
<CardMedia overlay={<CardTitle title="I suck at squatting" subtitle="Ripp save me"/>}>
Expand Down
12 changes: 6 additions & 6 deletions server/static/jsx/components/main.jsx
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
import React from 'react';
import ThemeManager from 'material-ui/lib/styles/theme-manager';
import LightRawTheme from 'material-ui/lib/styles/raw-themes/light-raw-theme';
import DarkRawTheme from 'material-ui/lib/styles/raw-themes/dark-raw-theme';
import Colors from 'material-ui/lib/styles/colors';
import MenuItem from 'material-ui/lib/menus/menu-item';
import Nav from './nav'
import Lift from './liftcard'
import Nav from './left_nav'
import Add from './add_video'
import Lift from './lift_card'

const Main = React.createClass({

Expand All @@ -14,7 +15,7 @@ const Main = React.createClass({

getInitialState() {
return {
muiTheme: ThemeManager.getMuiTheme(LightRawTheme),
muiTheme: ThemeManager.getMuiTheme(DarkRawTheme),
};
},

Expand All @@ -36,8 +37,7 @@ const Main = React.createClass({
return (
<div>
<Nav/>
<Lift/>
<Lift/>
<Add/>
</div>
);
},
Expand Down

0 comments on commit 46db3f9

Please sign in to comment.