Merge pull request #37 from cazetto/homolog

seijiakiyama · web-flow · commit 722d4bc9ee05 · 2017-12-06T16:56:31.000-02:00
Trying to fix merge problems
diff --git a/Parse-Dashboard/app.js b/Parse-Dashboard/app.js
@@ -180,6 +180,7 @@ module.exports = function(config, options) {
       res.send(`<!DOCTYPE html>
         <head>
           <link rel="shortcut icon" type="image/x-icon" href="${mountPath}favicon.ico" />
+          <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/4.0.0-alpha.6/css/bootstrap.min.css" integrity="sha384-rwoIResjU2yc3z8GV/NPeZWAv56rSmLldC3R/AZzGRnGxQQKnKkoFVhFQhNUwEyJ" crossorigin="anonymous">
           <base href="${mountPath}"/>
           <script>
             PARSE_DASHBOARD_PATH = "${mountPath}";
@@ -205,6 +206,7 @@ module.exports = function(config, options) {
       res.send(`<!DOCTYPE html>
         <head>
           <link rel="shortcut icon" type="image/x-icon" href="${mountPath}favicon.ico" />
+          <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/4.0.0-alpha.6/css/bootstrap.min.css" integrity="sha384-rwoIResjU2yc3z8GV/NPeZWAv56rSmLldC3R/AZzGRnGxQQKnKkoFVhFQhNUwEyJ" crossorigin="anonymous">
           <base href="${mountPath}"/>
           <script>
             PARSE_DASHBOARD_PATH = "${mountPath}";
diff --git a/src/components/back4App/Header/Header.react.js b/src/components/back4App/Header/Header.react.js
@@ -41,7 +41,7 @@ let Header = props => (
 
       <Media query="(min-width: 1100px)">
         <div className="ml-auto">
-          <Dropdown items={navData.dropdownItems}>Hello, TBrayner!<i className="dropdown-icon zmdi zmdi-caret-down"></i></Dropdown>
+          <Dropdown items={navData.dropdownItems}>Hello, User!<i className="dropdown-icon zmdi zmdi-caret-down"></i></Dropdown>
           <Button color="green" weight="700" url="https://dashboard.back4app.com/apps/#!/apps/new">NEW APP</Button>
         </div>
       </Media>
diff --git a/src/dashboard/Dashboard.js b/src/dashboard/Dashboard.js
@@ -196,19 +196,17 @@ class Dashboard extends React.Component {
         }
       });
       return Parse.Promise.when(appInfoPromises);
-    }).then(function(resolvedApps) {
-      if(resolvedApps && resolvedApps.length) {
-        resolvedApps.forEach(app => {
-          AppsManager.addApp(app);
-        });
-      }
+    }).then(function() {
+      Array.prototype.slice.call(arguments).forEach(app => {
+        AppsManager.addApp(app);
+      });
       this.setState({ configLoadingState: AsyncStatus.SUCCESS });
     }.bind(this)).fail(({ error }) => {
       this.setState({
         configLoadingError: error,
         configLoadingState: AsyncStatus.FAILED
       });
-    });
+    })
   }
 
   render() {
diff --git a/src/dashboard/Data/Browser/BrowserTable.react.js b/src/dashboard/Data/Browser/BrowserTable.react.js
@@ -292,9 +292,6 @@ export default class BrowserTable extends React.Component {
             {rows}
             <div style={{ height: Math.max(0, (this.props.data.length - this.state.offset - MAX_ROWS) * ROW_HEIGHT) }} />
             {addRow}
-            <div className={styles.rowsHolder} style={{ top: Math.max(0, this.state.offset * ROW_HEIGHT) }}>
-              {rows}
-            </div>
             {editor}
           </div>
         );
