Merge

Author: JuiceBawks

backend/main.ts

@@ -71,7 +71,6 @@ if (dev) {
  installExtension(REACT_DEVELOPER_TOOLS);
  });
 }
-
 // Invoke createWindow to create browser windows after Electron has been initialized.
 app.on('ready', createWindow);
 

frontend/components/sidebar/QueryDbname.tsx

@@ -0,0 +1,59 @@
+import React from 'react';
+import styled from 'styled-components';
+import {
+ IconButton,
+ ListItemSecondaryAction,
+ Checkbox,
+ Tooltip,
+} from '@material-ui/core';
+import CloseIcon from '@material-ui/icons/Close';
+import {
+ SidebarListItem,
+ StyledListItemText,
+ textColor,
+} from '../../style-variables';
+import { QueryData } from '../../types';
+
+const QueryText = styled(StyledListItemText)`
+ & .MuiListItemText-secondary {
+ color: ${textColor};
+ }
+`;
+
+const CompareCheck = styled(Checkbox)`
+ color: ${textColor};
+`;
+
+interface QueryDbnameProps {
+ query: QueryData;
+ isSelected: boolean;
+ select: () => void;
+ setComparison: (evt: React.ChangeEvent<HTMLInputElement>) => void;
+ isCompared: boolean;
+ deleteThisQuery: () => void;
+ }
+
+ const QueryDbname = ({
+ query,
+ select,
+ isSelected,
+ setComparison,
+ isCompared,
+ deleteThisQuery,
+ }: QueryDbnameProps) => (
+ <SidebarListItem button $customSelected={isSelected} onClick={select}>
+ <QueryText primary={query.db} />
+ <ListItemSecondaryAction>
+ <Tooltip title="View in Comparison">
+ <CompareCheck onChange={setComparison} checked={isCompared} />
+ </Tooltip>
+ <Tooltip title="Forget Query">
+ <IconButton edge="end" onClick={deleteThisQuery}>
+ <CloseIcon />
+ </IconButton>
+ </Tooltip>
+ </ListItemSecondaryAction>
+ </SidebarListItem>
+ );
+
+ export default QueryDbname;

frontend/components/sidebar/QueryEntry.tsx

@@ -15,14 +15,25 @@ import {
  StyledListItemText,
  textColor,
 } from '../../style-variables';
+<<<<<<< HEAD
 import { QueryData, AppState } from '../../types';
+=======
+import { QueryData } from '../../types';
+import QueryDbname from './QueryDbname';
+import { deleteQuery, setCompare, key as queryKey } from '../../lib/queries';
+/******************* ACCORDION ***********************/
+import Accordion from '@mui/material/Accordion';
+import AccordionSummary from '@mui/material/AccordionSummary';
+import AccordionDetails from '@mui/material/AccordionDetails';
+import Typography from '@mui/material/Typography';
+import ExpandMoreIcon from '@mui/icons-material/ExpandMore';
+>>>>>>> 80350dfe29619646ea4267ae79a66dd51b08a9e5
 
 const QueryText = styled(StyledListItemText)`
  & .MuiListItemText-secondary {
  color: ${textColor};
  }
 `;
-
 const CompareCheck = styled(Checkbox)`
  color: ${textColor};
 `;
@@ -47,10 +58,38 @@ const QueryEntry = ({
  saveThisQuery,
 }: QueryEntryProps) => (
  <SidebarListItem button $customSelected={isSelected} onClick={select}>
- <QueryText primary={query.label} secondary={query.db} />
+ {/* <QueryText primary={query.label} /> */}
+
  <ListItemSecondaryAction>
- <Tooltip title="View in Comparison">
- <CompareCheck onChange={setComparison} checked={isCompared} />
+ <Tooltip title="drop down">
+ {/* <CompareCheck onChange={setComparison} checked={isCompared} /> */}
+ <div>
+ <Accordion>
+ <AccordionSummary
+ expandIcon={<ExpandMoreIcon />}
+ aria-controls="panel1a-content"
+ id="panel1a-header"
+ >
+ <Typography>
+ <QueryText primary={query.label} />
+ </Typography>
+ </AccordionSummary>
+ <AccordionDetails>
+ <Typography>
+ {/* //if statement here */}
+ <QueryDbname
+ query={query}
+ isSelected={isSelected}
+ select={select}
+ setComparison={setComparison}
+ isCompared={isCompared}
+ deleteThisQuery={deleteThisQuery}
+ />
+ test
+ </Typography>
+ </AccordionDetails>
+ </Accordion>
+ </div>
  </Tooltip>
  <Tooltip title="Save Query">
  <IconButton onClick={saveThisQuery}>

nut

@@ -0,0 +1,14 @@
+syntax_version: "7"
+docker_image: calbertts/node-gtk
+enable_gui: true
+container_working_directory: /app
+work_in_project_folder_as: /app
+volumes:
+main:
+ host_path: .
+ container_path: /app
+macros:
+ run:
+ actions:
+ - npm install
+ - npm start

nut.yml

@@ -35,6 +35,7 @@
  "@material-ui/icons": "^4.11.2",
  "@material-ui/lab": "^4.0.0-alpha.57",
  "@mui/icons-material": "^5.4.2",
+ "@mui/material": "^5.4.3",
  "@mui/styled-engine": "^5.4.2",
  "@skidding/react-codemirror": "^1.0.2",
  "@types/react-router-dom": "^5.1.5",
@@ -55,6 +56,7 @@
  "pg": "^8.3.2",
  "react": "^17.0.1",
  "react-bootstrap": "^1.3.0",
+ "react-bootstrap-accordion": "^1.0.0",
  "react-chartjs-2": "^2.11.1",
  "react-codemirror": "^1.0.0",
  "react-dom": "^17.0.1",