Fixed highlighting color, chnged QueryPage fields

falcon-client · Aug 30, 2017 · 31bbc84 · 31bbc84
1 parent fd74891
commit 31bbc84
Show file tree

Hide file tree

Showing 5 changed files with 25 additions and 19 deletions.
diff --git a/app/components/Header.js b/app/components/Header.js
@@ -8,7 +8,7 @@ export default function Header() {
 
   return (
     <div className="Header col-sm-12">
-      <div className="Header--container" style={{ marginLeft: isFullScreen ? '10px' : '100px' }}>
+      <div className="Header--container" style={{ marginLeft: isFullScreen ? '10px' : '80px' }}>
         {/* @TODO: Create a separate breadcrumbs component  */}
         <div className="Header--breadcrumb">
           <ListSymbol type="connection" /> Falcon Test Database

diff --git a/app/containers/QueryPage.js b/app/containers/QueryPage.js
@@ -19,12 +19,21 @@ export default class QueryPage extends Component {
 
   item = null;
 
+  didMount: boolean = false;
+
+  componentWillUnmount() {
+    this.didMount = false;
+  }
+
   componentDidMount() {
+    this.didMount = true;
     this.item = document.querySelector('.QueryPage').parentElement;
     window.onresizeFunctions['query-page-resize'] = () => {
-      this.setState({
-        queryResultsHeight: this.item.offsetHeight - this.state.queryHeight,
-      });
+      if (this.didMount) {
+        this.setState({
+          queryResultsHeight: this.item.offsetHeight - this.state.queryHeight,
+        });
+      }
     };
   }
 

diff --git a/app/containers/StructurePage.js b/app/containers/StructurePage.js
@@ -62,24 +62,12 @@ export default class StructurePage extends Component {
           />
         </span>
       )
-    }, {
-      accessor: 'autoIncrement',
-      Header: 'Auto Increment',
-    }, {
-      accessor: 'primaryKey',
-      Header: 'Primary Key',
-    }, {
-      accessor: 'notNull',
-      Header: 'Not Null',
-    }, {
-      accessor: 'unique',
-      Header: 'Unique',
     }, {
       accessor: 'default',
-      Header: 'default',
+      Header: 'Default',
     }, {
-      accessor: 'checkConstraints',
-      Header: 'Check Constraints',
+      accessor: 'notNull',
+      Header: 'Constraints',
     }];
 
     return (

diff --git a/app/styles/Footer.scss b/app/styles/Footer.scss
@@ -25,6 +25,10 @@
     cursor: pointer;
   }
 
+  .FooterButton:not(:last-child) {
+    border-right: 2px solid lightgray;
+  }
+
   .FooterButton--active {
     background: gray;
 

diff --git a/app/styles/app.global.scss b/app/styles/app.global.scss
@@ -67,6 +67,11 @@ body {
   margin: 0;
 }
 
+::selection {
+  color: white;
+  background: gray;
+}
+
 .ace_layer.ace_gutter-layer.ace_folding-enabled {
   background: white;
 }