updates

ipfs · Mar 22, 2018 · b878921 · b878921
1 parent a882647
commit b878921
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 20 deletions.
diff --git a/src/panes/Files.js b/src/panes/Files.js
@@ -132,6 +132,11 @@ class Files extends Component {
     return connectDropTarget(
       <div>
         <Pane className='files'>
+          <div>
+            <IconButton active={this.state.sticky} onClick={this.toggleStickWindow} icon='eye' />
+            <IconButton onClick={this.selectFileDialog} icon='plus' />
+            <IconButton onClick={this.selectDirectoryDialog} icon='folder' />
+          </div>
           <Header title={this.makeBreadcrumbs()} loading={this.props.adding} />
 
           <div className='main'>
@@ -141,15 +146,6 @@ class Files extends Component {
           <div className='dropper' style={dropper}>
             Drop to upload to IPFS
           </div>
-
-          <Footer>
-            <IconButton active={this.state.sticky} onClick={this.toggleStickWindow} icon='eye' />
-
-            <div className='right'>
-              <IconButton onClick={this.selectFileDialog} icon='plus' />
-              <IconButton onClick={this.selectDirectoryDialog} icon='folder' />
-            </div>
-          </Footer>
         </Pane>
       </div>
     )

diff --git a/src/screens/menubar.js b/src/screens/menubar.js
@@ -8,11 +8,11 @@ import PaneContainer from '../components/PaneContainer'
 import MenuOption from '../components/MenuOption'
 import Menu from '../components/Menu'
 
-import Peers from '../panes/Peers'
+/* import Peers from '../panes/Peers'
+import Pinned from '../panes/Pinned' */
 import Loader from '../panes/Loader'
 import Start from '../panes/Start'
 import Files from '../panes/Files'
-import Pinned from '../panes/Pinned'
 import Info from '../panes/Info'
 import Settings from '../panes/Settings'
 
@@ -25,7 +25,7 @@ const RUNNING = 'running'
 const panes = [
   {
     id: 'info',
-    title: 'Info',
+    title: 'Home',
     icon: 'ipfs'
   },
   {
@@ -37,12 +37,12 @@ const panes = [
     id: 'pinned',
     title: 'Pin',
     icon: 'pin'
-  }, */
+  },
   {
     id: 'peers',
     title: 'Peers',
     icon: 'pulse'
-  },
+  }, */
   {
     id: 'settings',
     title: 'Settings',
@@ -171,26 +171,26 @@ class Menubar extends Component {
           root={this.state.files.root} />
       case 'settings':
         return <Settings settings={this.state.settings} />
-      case 'peers':
+      /* case 'peers':
         var location = 'Unknown'
         if (this.state.stats.node) {
           location = this.state.stats.node.location
         }
 
-        return <Peers peers={this.state.stats.peers} location={location} />
+        return <Peers peers={this.state.stats.peers} location={location} /> */
       case 'info':
         return (
           <Info
             node={this.state.stats.id}
             bw={this.state.stats.bw}
             repo={this.state.stats.repo} />
         )
-      case 'pinned':
+      /* case 'pinned':
         return (
           <Pinned
             files={this.state.pinned}
             pinning={this.state.pinning} />
-        )
+        ) */
       default:
         return (
           <Pane className='left-pane'>
@@ -224,8 +224,8 @@ class Menubar extends Component {
   render () {
     return (
       <PaneContainer>
-        {this._getRouteScreen()}
         {this._getMenu()}
+        {this._getRouteScreen()}
       </PaneContainer>
     )
   }

diff --git a/src/styles/components/MenuOption.less b/src/styles/components/MenuOption.less
@@ -8,7 +8,7 @@
   color: rgba(255, 255, 255, 0.4);
   cursor: pointer;
   transition: .2s ease all;
-  width: 25%;
+  width: 33%;
   height: 4em;
 }