Make ShapeOption a child of ShapeBar

dali-lab · Mar 1, 2017 · 48332b8 · 48332b8
1 parent dad4a5b
commit 48332b8
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 4 deletions.
diff --git a/app/components/ShapeBar.js b/app/components/ShapeBar.js
@@ -3,13 +3,19 @@ import React, { Component } from 'react';
 var ReactDOM = require('react-dom');
 var electron = require('electron');
 
-// const {Raphael,Paper,Set,Circle,Ellipse,Image,Rect,Text,Path,Line} = require('react-raphael');
+import ShapeOption from './ShapeOption';
 
-export default class Canvas extends Component {
+export default class ShapeBar extends Component {
+
   render() {
     return (
       <div style={{position: 'absolute', backgroundColor: 'red', width: '100%', height: '10%', margin: 0, padding: 0}}>
-        <div></div>
+        <ShapeOption />
+        <ShapeOption />
+        <ShapeOption />
+        <ShapeOption />
+        <ShapeOption />
+        <ShapeOption />
       </div>);
   }
 }
diff --git a/app/components/ShapeOption.js b/app/components/ShapeOption.js
@@ -0,0 +1,15 @@
+// @flow
+import React, { Component } from 'react';
+var ReactDOM = require('react-dom');
+var electron = require('electron');
+
+const {Raphael,Paper,Set,Circle,Ellipse,Image,Rect,Text,Path,Line} = require('react-raphael');
+
+export default class Canvas extends Component {
+  render() {
+    return (
+      <div style={{position: 'relative', float: 'left', backgroundColor: 'grey', width: '10%', height: '90%', marginLeft: '5%', marginTop: '0.5%'}}>
+        <div></div>
+      </div>);
+  }
+}
diff --git a/app/containers/App.js b/app/containers/App.js
@@ -17,7 +17,6 @@ export default class App extends Component {
     super(props);
   };
 
-
   render() {
     return (
       <div style={{position: 'absolute', backgroundColor: 'green', width: '100%', height: '100%', margin: 0, padding: 0}}>