From 90d360e917ea01d7f71dd482bbac6545dd265008 Mon Sep 17 00:00:00 2001 From: annni11 Date: Tue, 22 Aug 2023 20:36:21 -0400 Subject: [PATCH 1/3] updated 3d icon --- frontend/components/sidebar/TopButtons.tsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/frontend/components/sidebar/TopButtons.tsx b/frontend/components/sidebar/TopButtons.tsx index 88ea0349..587bbad2 100644 --- a/frontend/components/sidebar/TopButtons.tsx +++ b/frontend/components/sidebar/TopButtons.tsx @@ -1,7 +1,7 @@ import React from 'react'; import { IconButton, Tooltip } from '@mui/material'; import styled from 'styled-components'; -import { Equalizer, Settings, Coronavirus } from '@mui/icons-material'; +import { Equalizer, Settings, ThreeDRotation } from '@mui/icons-material'; import HomeIcon from '@mui/icons-material/Home'; import { textColor, hoverColor, selectedColor } from '../../style-variables'; @@ -97,7 +97,7 @@ function TopButtons() { }) } > - + From a9fc8c3c5d171bdc133949c8a87f2032fba5d161 Mon Sep 17 00:00:00 2001 From: annni11 Date: Wed, 23 Aug 2023 11:10:51 -0400 Subject: [PATCH 2/3] updating ui --- frontend/components/sidebar/Sidebar.tsx | 10 +++++----- frontend/style-variables.tsx | 8 ++++---- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/frontend/components/sidebar/Sidebar.tsx b/frontend/components/sidebar/Sidebar.tsx index 5c144000..f113635a 100644 --- a/frontend/components/sidebar/Sidebar.tsx +++ b/frontend/components/sidebar/Sidebar.tsx @@ -44,11 +44,11 @@ const Logo = styled.img` bottom: 100px; left: calc(${sidebarWidth} / 2); transform: translateX(-50%); - opacity: 0.5; + opacity: 0.8; z-index: -1; - filter: grayscale(100%); - width: 100px; - height: 100px; + + width: 60px; + height: 60px; `; const ShowSidebarBtn = styled(IconButton)` @@ -84,7 +84,7 @@ const HideSidebarBtn = styled(IconButton)` const HideSidebarBtnContainer = styled.div` position: absolute; display: flex; - width: 25px; + width: 15px; height: 100vh; background: transparent; flex-direction: column; diff --git a/frontend/style-variables.tsx b/frontend/style-variables.tsx index b842c48e..9cca58b2 100644 --- a/frontend/style-variables.tsx +++ b/frontend/style-variables.tsx @@ -66,10 +66,10 @@ export const selectedColor = greenPrimary; export const hoverColor = greenPrimary; // Size -export const sidebarWidth = '375px'; -export const defaultMargin = '20px'; +export const sidebarWidth = '365px'; +export const defaultMargin = '15px'; export const tableWidth = `calc(100vw - (${defaultMargin} * 3) - ${sidebarWidth})`; -export const sidebarShowButtonSize = '50px'; +export const sidebarShowButtonSize = '40px'; // Execution Tree export const planNodeWidth = '200px'; @@ -125,7 +125,7 @@ export const MuiTheme = createTheme({ }); export const SidebarList = styled(List)` - padding: 0; + padding: 2%; width: 100%; `; From 26aef5c9d3faed3820e6df1286420cc467cd7ec6 Mon Sep 17 00:00:00 2001 From: annni11 Date: Wed, 23 Aug 2023 14:40:09 -0400 Subject: [PATCH 3/3] merging with dev-refactor --- .../components/views/ERTables/ERTabling.tsx | 2 +- frontend/components/views/QuickStartView.tsx | 42 ++++++++++--------- package-lock.json | 4 +- package.json | 4 +- 4 files changed, 28 insertions(+), 24 deletions(-) diff --git a/frontend/components/views/ERTables/ERTabling.tsx b/frontend/components/views/ERTables/ERTabling.tsx index e8077729..e98f37bc 100644 --- a/frontend/components/views/ERTables/ERTabling.tsx +++ b/frontend/components/views/ERTables/ERTabling.tsx @@ -250,7 +250,7 @@ function ERTabling({ tables, selectedDb, curDBType }: ERTablingProps) { }, [schemaState]); return ( -
+
  • To export a database, select the file download icon next to the - databse name + database name
    • @@ -138,20 +140,17 @@ function getStepContent(step: number) { Step 3:
  • Select which database you want to query with
    • -
  • - Go into the queries tab by selecting the "QUERIES" tab - in the sidebar -
    • +
  • Select the "QUERIES" tab in the sidebar
  • Give the query a label and a group
  • Optionally: You can change the database from the "Database" dropdown
  • - Use the "Auto-Format" button on the top-left to - automatically format the query + Use the brush icon on the top-right to automatically format the + query
    • -
  • Select the "RUN QUERY" button to execute
    • +
  • Select "RUN QUERY" button to execute
  • The planning time, execution time, and actual total time now show
    • @@ -168,11 +167,16 @@ function getStepContent(step: number) { Step 4: -
  • To save a query, click the folder icon in the queries tab
    • -
  • Designate a file location and click "Select Path"
  • - Click the save icon in the query drop down to save queries - individually + To save a query, click the folder icon in the "QUERIES" + tab +
    • +
  • + Designate a save file location and click "Select Path" +
    • +
  • + Click the save icon in the query group drop-down to save queries + automatically to designated file location
  • To import a query file, click the import icon, select the file you @@ -187,11 +191,11 @@ function getStepContent(step: number) { Step 5: +
  • Select the checkboxes in the query group drop-down
  • - Select the checkbox of the queries inside the groups you would - like to compare + Click the chart icon at the top of the sidebar to compare selected + queries
    • -
  • Click the chart icon at the top of the sidebar
    •      ); diff --git a/package-lock.json b/package-lock.json index b74ab948..03c60f50 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "seeqr", - "version": "11.0.0", + "version": "12.0.0", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "seeqr", - "version": "11.0.0", + "version": "12.0.0", "hasInstallScript": true, "license": "MIT", "dependencies": { diff --git a/package.json b/package.json index 314f01e3..aa3567d1 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "seeqr", "productName": "SeeQR App", - "version": "11.0.0", + "version": "12.0.0", "description": "SQL Toolbox - Model Implementer, Execution Plan Visualizer and Query Comparison Tool", "main": "./tsCompiled/backend/main.js", "babel": { @@ -42,7 +42,7 @@ "codemirror": "^6.0.1", "d3": "^7.8.5", "dagre": "^0.8.5", - "debounce": "^1.2.1", + "debounce": "^1.2.1", "electron": "^25.5.0", "fix-path": "^3.0.0", "fontsource-roboto": "^4.0.0",