Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add Bar, Line Chart and Tabs #36

Merged
merged 12 commits into from
Sep 3, 2020
Merged

Add Bar, Line Chart and Tabs #36

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
eacb810
Revert "add scrollbar heights"
muhammadtrad Sep 1, 2020
8ada00e
fix schema state bug
muhammadtrad Sep 3, 2020
33e4380
add working tabs
muhammadtrad Sep 3, 2020
6883597
remove side effects, fix unique key errors
catherinechiu Sep 3, 2020
f46a10b
remove side effects and fix key error for React
catherinechiu Sep 3, 2020
d851044
fix Dropdown.Item by taking out id and adding key
catherinechiu Sep 3, 2020
ae0b59d
fix styling by adding id in first div in Tabs and setting it to 'main…
catherinechiu Sep 3, 2020
5acffe8
Merge pull request #38 from oslabs-beta/staging
catherinechiu Sep 3, 2020
32390fe
remove extra webpacks
muhammadtrad Sep 3, 2020
218439e
merge with launch
muhammadtrad Sep 3, 2020
b2b8ff8
merge launch with tabs
muhammadtrad Sep 3, 2020
5d9f048
fix splash bug
muhammadtrad Sep 3, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
243 changes: 0 additions & 243 deletions adasd
View file
Open in desktop

This file was deleted.

7 changes: 7 additions & 0 deletions backend/main.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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-------------------
Expand All @@ -203,6 +209,7 @@ ipcMain.on('execute-query', (event, data: QueryType) => {
lists: {},
};


// Run select * from actors;
db.query(queryString)
.then((queryData) => {
Expand Down
12 changes: 10 additions & 2 deletions frontend/assets/stylesheets/css/components.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -99,7 +99,7 @@ input *:focus {
}

#data-table {
overflow-y: auto;
overflow: auto;
height: 300px;
}

Expand All @@ -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;
Expand Down
14 changes: 8 additions & 6 deletions frontend/assets/stylesheets/css/layout.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand All @@ -33,7 +29,7 @@
-webkit-box-direction: normal;
-ms-flex-direction: column;
flex-direction: column;
margin-top: 300px;
margin-top: 30px;
text-align: center;
}

Expand Down Expand Up @@ -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;
Expand Down Expand Up @@ -181,7 +183,7 @@
-webkit-box-direction: normal;
-ms-flex-direction: column;
flex-direction: column;
height: 500px;
height: 50%;
z-index: 1000;
}

Expand Down
Loading