Merge pull request #39 from oslabs-beta/staging

Add Bar, Line Chart and Tabs
open-source-labs · Sep 3, 2020 · b888dbd · b888dbd
2 parents 5acffe8 + 1ccfc92
commit b888dbd
Show file tree

Hide file tree

Showing 19 changed files with 303 additions and 664 deletions.
diff --git a/adasd b/adasd
diff --git a/backend/main.ts b/backend/main.ts
@@ -186,6 +186,12 @@ interface QueryType {
   queryStatistics: string;
 }
 
+//Listens for database changes sent from the renderer
+  ipcMain.on('change-db', (event, db_name) => {
+    db.changeDB(db_name);
+    event.sender.send('return-change-db', db_name);
+  });
+
 // Listen for queries being sent from renderer
 ipcMain.on('execute-query', (event, data: QueryType) => {
   // ---------Refactor-------------------
@@ -203,6 +209,7 @@ ipcMain.on('execute-query', (event, data: QueryType) => {
     lists: {},
   };
 
+
   // Run select * from actors;
   db.query(queryString)
     .then((queryData) => {

diff --git a/frontend/assets/stylesheets/css/components.css b/frontend/assets/stylesheets/css/components.css
@@ -68,7 +68,7 @@ textarea {
 table.scroll-box {
   border: 0.5px solid #444c50;
   background: none;
-  overflow: scroll;
+  overflow-y: scroll;
   padding: 5px;
   font-size: 1em;
   line-height: 1.5em;
@@ -99,7 +99,7 @@ input *:focus {
 }
 
 #data-table {
-  overflow-y: auto;
+  overflow: auto;
   height: 300px;
 }
 
@@ -111,6 +111,14 @@ input *:focus {
   padding: 15px 0;
 }
 
+#data-table::-webkit-scrollbar-track {
+  background: #c6d2d5;
+}
+
+#data-table::-webkit-scrollbar-thumb {
+  background-color: #444c50;
+}
+
 .input-schema-button {
   padding: 10px;
   width: 50px;

diff --git a/frontend/assets/stylesheets/css/layout.css b/frontend/assets/stylesheets/css/layout.css
@@ -19,10 +19,6 @@
           align-items: center;
   height: 100vh;
   color: #c6d2d5;
-  background-image: url("../../images/logo_color.png");
-  background-repeat: no-repeat;
-  background-position-y: 25vh;
-  background-position-x: center;
 }
 
 #splash-page .splash-prompt {
@@ -33,7 +29,7 @@
   -webkit-box-direction: normal;
       -ms-flex-direction: column;
           flex-direction: column;
-  margin-top: 300px;
+  margin-top: 30px;
   text-align: center;
 }
 
@@ -71,6 +67,12 @@
   margin-bottom: 30px;
 }
 
+#splash-page .logo {
+  background-image: url("../../images/logo_color.png");
+  width: 360px;
+  height: 362px;
+}
+
 #main-panel {
   display: -webkit-box;
   display: -ms-flexbox;
@@ -181,7 +183,7 @@
   -webkit-box-direction: normal;
       -ms-flex-direction: column;
           flex-direction: column;
-  height: 500px;
+  height: 50%;
   z-index: 1000;
 }