Merge pull request #53 from back4app/remove-brown-bar

Remove brown bar

Author: rsouzas

src/components/Sidebar/FooterMenu.react.js

@@ -10,6 +10,7 @@ import Popover  from 'components/Popover/Popover.react';
 import Position from 'lib/Position';
 import React    from 'react';
 import styles   from 'components/Sidebar/Sidebar.scss';
+import SidebarHeader  from 'components/Sidebar/SidebarHeader.react';
 
 let host = location.host.split('.');
 let urlRoot = location.protocol + '//' + host.slice(host.length - 2).join('.');
@@ -43,6 +44,7 @@ export default class FooterMenu extends React.Component {
           position={this.state.position}
           onExternalClick={() => this.setState({ show: false })}>
           <div className={styles.popup}>
+            <SidebarHeader />
             <a href={`${mountPath}logout`}>Log Out <span className={styles.emoji}>👋</span></a>
             <a target='_blank' href='http://docs.parseplatform.org/parse-server/guide/'>Server Guide <span className={styles.emoji}>📚</span></a>
             <a target='_blank' href='http://stackoverflow.com/questions/tagged/parse.com'>Code-level Questions <span className={styles.emoji}>❓</span></a>

src/components/Sidebar/Sidebar.react.js

@@ -9,7 +9,7 @@ import AppsManager    from 'lib/AppsManager';
 import AppsSelector   from 'components/Sidebar/AppsSelector.react';
 import FooterMenu     from 'components/Sidebar/FooterMenu.react';
 import React          from 'react';
-import SidebarHeader  from 'components/Sidebar/SidebarHeader.react';
+// import SidebarHeader  from 'components/Sidebar/SidebarHeader.react';
 import SidebarSection from 'components/Sidebar/SidebarSection.react';
 import SidebarSubItem from 'components/Sidebar/SidebarSubItem.react';
 import styles         from 'components/Sidebar/Sidebar.scss';
@@ -23,6 +23,7 @@ const Sidebar = ({
   sections,
   section,
   appSelector,
+  contentStyle
 }) => {
   const _subMenu = subsections => {
     if (!subsections) {
@@ -51,10 +52,10 @@ const Sidebar = ({
   const apps = [].concat(AppsManager.apps()).sort((a, b) => (a.name < b.name ? -1 : (a.name > b.name ? 1 : 0)));
 
   return <div className={styles.sidebar}>
-    <SidebarHeader />
+    {/*<SidebarHeader />*/}
     {appSelector ? <AppsSelector apps={apps} /> : null}
 
-    <div className={styles.content}>
+    <div className={styles.content} style={contentStyle}>
       {sections.map(({
         name,
         icon,

src/components/Sidebar/Sidebar.scss

@@ -62,7 +62,7 @@
 }
 
 .apps + .content {
-  top: 96px;
+  //top: 96px;
 }
 
 .footer {

src/components/Sidebar/SidebarHeader.react.js

@@ -5,23 +5,23 @@
  * This source code is licensed under the license found in the LICENSE file in
  * the root directory of this source tree.
  */
-import Icon           from 'components/Icon/Icon.react';
-import { Link }       from 'react-router';
+// import Icon           from 'components/Icon/Icon.react';
+// import { Link }       from 'react-router';
 import React          from 'react';
 import styles         from 'components/Sidebar/Sidebar.scss';
 // get the package.json environment variable
 const version = process.env.version;
 
 let SidebarHeader = () =>
 <div className={styles.header}>
-  <Link className={styles.logo} to={{ pathname: '/apps' }}>
-    <Icon width={28} height={28} name='infinity' fill={'#ffffff'} />
-  </Link>
-  <Link to='/apps'>
+  {/*<Link className={styles.logo} to={{ pathname: '/apps' }}>*/}
+    {/*<Icon width={28} height={28} name='infinity' fill={'#ffffff'} />*/}
+  {/*</Link>*/}
+  {/*<Link to='/apps'>*/}
     <div className={styles.version}>
       <div>Parse Dashboard {version}</div>
     </div>
-  </Link>
+  {/*</Link>*/}
 </div>
 
 export default SidebarHeader

src/components/Toolbar/Toolbar.scss

@@ -14,7 +14,7 @@
   right: 0;
   left: 300px;
   background: #353446;
-  height: 96px;
+  height: 48px;
   color: white;
   transition: left 0.5s ease-in;
   margin-top: $header-height;
@@ -29,7 +29,7 @@
 .title {
   position: absolute;
   left: 14px;
-  bottom: 10px;
+  bottom: 3px;
 }
 
 .nav {

src/components/back4App/Header/headerNavData.js

@@ -1,7 +1,7 @@
 const headerNavData = {
   items: [
     {label: 'My Apps', url: 'https://dashboard.back4app.com/apps/#!/admin'},
-    {label: 'Dashboard', url: 'https://parse-dashboard.back4app.com/'},
+    {label: 'Dashboard', url: '/apps'},
     {label: 'Docs', url: 'http://docs.back4app.com/'},
     {label: 'Community', url: 'https://groups.google.com/forum/#!forum/back4app'},
     {label: 'Blog', url: 'http://blog.back4app.com/'}

src/dashboard/Dashboard.js

@@ -94,7 +94,7 @@ class App extends React.Component {
         />
         {this.props.children}
       </div>
-    );      
+    );
   }
 }
 
@@ -237,7 +237,7 @@ class Dashboard extends React.Component {
 
 
     const AppsIndexPage = () => (
-      <AccountView section='Your Apps'>
+      <AccountView section='Your Apps' style={{top: '0px'}}>
         <AppsIndex newFeaturesInLatestVersion={this.state.newFeaturesInLatestVersion}/>
       </AccountView>
     );

src/dashboard/Data/Browser/Browser.scss

@@ -10,7 +10,7 @@
 
 .browser {
   position: fixed;
-  top: 96px;
+  top: 48px;
   left: 300px;
   right: 0;
   bottom: 0;

src/dashboard/SidebarBuilder.js

@@ -12,7 +12,7 @@ let accountSidebarSections = [
   {
     name: 'Your Apps',
     icon: 'blank-app-outline',
-    link: '/apps'
+    link: '/apps',
   }, /*{
     name: 'Account Settings',
     icon: 'users-solid',
@@ -30,6 +30,8 @@ export function buildAccountSidebar(options) {
       sections={accountSidebarSections}
       section={section}
       subsection={subsection}
-      prefix={''} />
+      prefix={''}
+      contentStyle={{top: '0px'}}
+    />
   );
 }