From 87a8fe30932e205c750bcfe569f2b4a47d674916 Mon Sep 17 00:00:00 2001 From: Sidney Alcantara Date: Fri, 27 Aug 2021 13:35:05 +1000 Subject: [PATCH] update icons --- www/src/assets/icons/AddColumn.tsx | 5 +- www/src/assets/icons/AddColumnCircle.tsx | 9 - www/src/assets/icons/AddRow.tsx | 4 +- www/src/assets/icons/AddRowCircle.tsx | 9 - www/src/assets/icons/Backburger.tsx | 2 +- www/src/assets/icons/CellResize.tsx | 7 +- www/src/assets/icons/CloudLogs.tsx | 2 +- www/src/assets/icons/ColumnPlusAfter.tsx | 10 +- www/src/assets/icons/ColumnPlusBefore.tsx | 10 +- www/src/assets/icons/ColumnRemove.tsx | 10 +- www/src/assets/icons/ConnectTable.tsx | 7 +- www/src/assets/icons/CornerResize.tsx | 10 - www/src/assets/icons/DarkTheme.tsx | 10 - www/src/assets/icons/Derivative.tsx | 2 +- www/src/assets/icons/Extension.tsx | 2 +- www/src/assets/icons/FileUpload.tsx | 2 +- www/src/assets/icons/Id.tsx | 5 +- www/src/assets/icons/Json.tsx | 5 +- www/src/assets/icons/MultiSelect.tsx | 5 +- www/src/assets/icons/Number.tsx | 2 +- www/src/assets/icons/SingleSelect.tsx | 9 + www/src/assets/icons/Slider.tsx | 2 +- www/src/assets/icons/Status.tsx | 2 +- www/src/assets/icons/SubTable.tsx | 7 +- www/src/assets/icons/Upload.tsx | 3 +- .../components/HomeNavigation/NavDrawer.tsx | 52 +---- www/src/components/Loading.tsx | 2 +- www/src/components/Navigation/NavDrawer.tsx | 32 +-- .../components/Navigation/NavDrawerItem.tsx | 23 +- www/src/components/Navigation/UserMenu.tsx | 2 + .../Table/ColumnMenu/FieldsDropdown.tsx | 19 +- .../fields/ConnectService/index.tsx | 2 +- .../components/fields/SingleSelect/index.tsx | 2 +- www/src/components/fields/index.tsx | 2 +- www/src/pages/Test.tsx | 214 +++++++++++++++--- www/src/theme/components.tsx | 11 +- 36 files changed, 276 insertions(+), 226 deletions(-) delete mode 100644 www/src/assets/icons/AddColumnCircle.tsx delete mode 100644 www/src/assets/icons/AddRowCircle.tsx delete mode 100644 www/src/assets/icons/CornerResize.tsx delete mode 100644 www/src/assets/icons/DarkTheme.tsx create mode 100644 www/src/assets/icons/SingleSelect.tsx diff --git a/www/src/assets/icons/AddColumn.tsx b/www/src/assets/icons/AddColumn.tsx index 40d3f24b..92148511 100644 --- a/www/src/assets/icons/AddColumn.tsx +++ b/www/src/assets/icons/AddColumn.tsx @@ -1,9 +1,10 @@ import SvgIcon, { SvgIconProps } from "@material-ui/core/SvgIcon"; +import { mdiTableColumnPlusAfter } from "@mdi/js"; export default function AddColumn(props: SvgIconProps) { return ( - - + + ); } diff --git a/www/src/assets/icons/AddColumnCircle.tsx b/www/src/assets/icons/AddColumnCircle.tsx deleted file mode 100644 index 0a51850b..00000000 --- a/www/src/assets/icons/AddColumnCircle.tsx +++ /dev/null @@ -1,9 +0,0 @@ -import SvgIcon, { SvgIconProps } from "@material-ui/core/SvgIcon"; - -export default function AddColumnCircle(props: SvgIconProps) { - return ( - - - - ); -} diff --git a/www/src/assets/icons/AddRow.tsx b/www/src/assets/icons/AddRow.tsx index 106b4f39..35c65e89 100644 --- a/www/src/assets/icons/AddRow.tsx +++ b/www/src/assets/icons/AddRow.tsx @@ -2,8 +2,8 @@ import SvgIcon, { SvgIconProps } from "@material-ui/core/SvgIcon"; export default function AddRow(props: SvgIconProps) { return ( - - + + ); } diff --git a/www/src/assets/icons/AddRowCircle.tsx b/www/src/assets/icons/AddRowCircle.tsx deleted file mode 100644 index 7387e6a3..00000000 --- a/www/src/assets/icons/AddRowCircle.tsx +++ /dev/null @@ -1,9 +0,0 @@ -import SvgIcon, { SvgIconProps } from "@material-ui/core/SvgIcon"; - -export default function AddRowCircle(props: SvgIconProps) { - return ( - - - - ); -} diff --git a/www/src/assets/icons/Backburger.tsx b/www/src/assets/icons/Backburger.tsx index bbe0013e..7d71de1d 100644 --- a/www/src/assets/icons/Backburger.tsx +++ b/www/src/assets/icons/Backburger.tsx @@ -3,7 +3,7 @@ import { mdiBackburger } from "@mdi/js"; export default function Backburger(props: SvgIconProps) { return ( - + ); diff --git a/www/src/assets/icons/CellResize.tsx b/www/src/assets/icons/CellResize.tsx index 73beb456..f061c186 100644 --- a/www/src/assets/icons/CellResize.tsx +++ b/www/src/assets/icons/CellResize.tsx @@ -1,9 +1,10 @@ import SvgIcon, { SvgIconProps } from "@material-ui/core/SvgIcon"; +import { mdiArrowSplitVertical } from "@mdi/js"; -export default function FileDownload(props: SvgIconProps) { +export default function CellResize(props: SvgIconProps) { return ( - - + + ); } diff --git a/www/src/assets/icons/CloudLogs.tsx b/www/src/assets/icons/CloudLogs.tsx index 51101dd4..75a843ef 100644 --- a/www/src/assets/icons/CloudLogs.tsx +++ b/www/src/assets/icons/CloudLogs.tsx @@ -1,7 +1,7 @@ import SvgIcon, { SvgIconProps } from "@material-ui/core/SvgIcon"; import { mdiFileTree } from "@mdi/js"; -export default function CloudLog(props: SvgIconProps) { +export default function CloudLogs(props: SvgIconProps) { return ( diff --git a/www/src/assets/icons/ColumnPlusAfter.tsx b/www/src/assets/icons/ColumnPlusAfter.tsx index b90d21da..6a4a22b5 100644 --- a/www/src/assets/icons/ColumnPlusAfter.tsx +++ b/www/src/assets/icons/ColumnPlusAfter.tsx @@ -1,12 +1,10 @@ import SvgIcon, { SvgIconProps } from "@material-ui/core/SvgIcon"; +import { mdiTableColumnPlusAfter } from "@mdi/js"; -export default function FileDownload(props: SvgIconProps) { +export default function ColumnPlusAfter(props: SvgIconProps) { return ( - - + + ); } diff --git a/www/src/assets/icons/ColumnPlusBefore.tsx b/www/src/assets/icons/ColumnPlusBefore.tsx index cc5be963..eeea588f 100644 --- a/www/src/assets/icons/ColumnPlusBefore.tsx +++ b/www/src/assets/icons/ColumnPlusBefore.tsx @@ -1,12 +1,10 @@ import SvgIcon, { SvgIconProps } from "@material-ui/core/SvgIcon"; +import { mdiTableColumnPlusBefore } from "@mdi/js"; -export default function FileDownload(props: SvgIconProps) { +export default function ColumnPlusBefore(props: SvgIconProps) { return ( - - + + ); } diff --git a/www/src/assets/icons/ColumnRemove.tsx b/www/src/assets/icons/ColumnRemove.tsx index 617207e6..8e854e46 100644 --- a/www/src/assets/icons/ColumnRemove.tsx +++ b/www/src/assets/icons/ColumnRemove.tsx @@ -1,12 +1,10 @@ import SvgIcon, { SvgIconProps } from "@material-ui/core/SvgIcon"; +import { mdiTableColumnRemove } from "@mdi/js"; -export default function FileDownload(props: SvgIconProps) { +export default function ColumnRemove(props: SvgIconProps) { return ( - - + + ); } diff --git a/www/src/assets/icons/ConnectTable.tsx b/www/src/assets/icons/ConnectTable.tsx index fa1bb315..14889b6c 100644 --- a/www/src/assets/icons/ConnectTable.tsx +++ b/www/src/assets/icons/ConnectTable.tsx @@ -2,11 +2,8 @@ import SvgIcon, { SvgIconProps } from "@material-ui/core/SvgIcon"; export default function ConnectTable(props: SvgIconProps) { return ( - - + + ); } diff --git a/www/src/assets/icons/CornerResize.tsx b/www/src/assets/icons/CornerResize.tsx deleted file mode 100644 index 241bd9b8..00000000 --- a/www/src/assets/icons/CornerResize.tsx +++ /dev/null @@ -1,10 +0,0 @@ -import SvgIcon, { SvgIconProps } from "@material-ui/core/SvgIcon"; -import { mdiResizeBottomRight } from "@mdi/js"; - -export default function Derivative(props: SvgIconProps) { - return ( - - - - ); -} diff --git a/www/src/assets/icons/DarkTheme.tsx b/www/src/assets/icons/DarkTheme.tsx deleted file mode 100644 index 35020eb4..00000000 --- a/www/src/assets/icons/DarkTheme.tsx +++ /dev/null @@ -1,10 +0,0 @@ -import SvgIcon, { SvgIconProps } from "@material-ui/core/SvgIcon"; -import { mdiCircleHalfFull } from "@mdi/js"; - -export default function DarkTheme(props: SvgIconProps) { - return ( - - - - ); -} diff --git a/www/src/assets/icons/Derivative.tsx b/www/src/assets/icons/Derivative.tsx index 1a8ab1ff..f771a40d 100644 --- a/www/src/assets/icons/Derivative.tsx +++ b/www/src/assets/icons/Derivative.tsx @@ -3,7 +3,7 @@ import { mdiFunctionVariant } from "@mdi/js"; export default function Derivative(props: SvgIconProps) { return ( - + ); diff --git a/www/src/assets/icons/Extension.tsx b/www/src/assets/icons/Extension.tsx index 2376cb2e..6468fe71 100644 --- a/www/src/assets/icons/Extension.tsx +++ b/www/src/assets/icons/Extension.tsx @@ -3,7 +3,7 @@ import { mdiPuzzleOutline } from "@mdi/js"; export default function Extension(props: SvgIconProps) { return ( - + ); diff --git a/www/src/assets/icons/FileUpload.tsx b/www/src/assets/icons/FileUpload.tsx index f0d7ff75..7a2e21d0 100644 --- a/www/src/assets/icons/FileUpload.tsx +++ b/www/src/assets/icons/FileUpload.tsx @@ -3,7 +3,7 @@ import { mdiUpload } from "@mdi/js"; export default function FileUpload(props: SvgIconProps) { return ( - + ); diff --git a/www/src/assets/icons/Id.tsx b/www/src/assets/icons/Id.tsx index 0ed01c7b..2a7be4ef 100644 --- a/www/src/assets/icons/Id.tsx +++ b/www/src/assets/icons/Id.tsx @@ -1,9 +1,10 @@ import SvgIcon, { SvgIconProps } from "@material-ui/core/SvgIcon"; +import { mdiIdentifier } from "@mdi/js"; export default function Id(props: SvgIconProps) { return ( - - + + ); } diff --git a/www/src/assets/icons/Json.tsx b/www/src/assets/icons/Json.tsx index a01c7fa6..a3bde93e 100644 --- a/www/src/assets/icons/Json.tsx +++ b/www/src/assets/icons/Json.tsx @@ -1,9 +1,10 @@ import SvgIcon, { SvgIconProps } from "@material-ui/core/SvgIcon"; +import { mdiCodeJson } from "@mdi/js"; export default function Json(props: SvgIconProps) { return ( - - + + ); } diff --git a/www/src/assets/icons/MultiSelect.tsx b/www/src/assets/icons/MultiSelect.tsx index 7b01ca30..1564e3d9 100644 --- a/www/src/assets/icons/MultiSelect.tsx +++ b/www/src/assets/icons/MultiSelect.tsx @@ -1,9 +1,10 @@ import SvgIcon, { SvgIconProps } from "@material-ui/core/SvgIcon"; +import { mdiFormatListBulletedSquare } from "@mdi/js"; export default function MultiSelect(props: SvgIconProps) { return ( - - + + ); } diff --git a/www/src/assets/icons/Number.tsx b/www/src/assets/icons/Number.tsx index a75bc99f..cd4e0d67 100644 --- a/www/src/assets/icons/Number.tsx +++ b/www/src/assets/icons/Number.tsx @@ -3,7 +3,7 @@ import { mdiNumeric } from "@mdi/js"; export default function Number(props: SvgIconProps) { return ( - + ); diff --git a/www/src/assets/icons/SingleSelect.tsx b/www/src/assets/icons/SingleSelect.tsx new file mode 100644 index 00000000..0af1d051 --- /dev/null +++ b/www/src/assets/icons/SingleSelect.tsx @@ -0,0 +1,9 @@ +import SvgIcon, { SvgIconProps } from "@material-ui/core/SvgIcon"; + +export default function SingleSelect(props: SvgIconProps) { + return ( + + + + ); +} diff --git a/www/src/assets/icons/Slider.tsx b/www/src/assets/icons/Slider.tsx index 162e6080..87bf8510 100644 --- a/www/src/assets/icons/Slider.tsx +++ b/www/src/assets/icons/Slider.tsx @@ -3,7 +3,7 @@ import SvgIcon, { SvgIconProps } from "@material-ui/core/SvgIcon"; export default function Slider(props: SvgIconProps) { return ( - + ); } diff --git a/www/src/assets/icons/Status.tsx b/www/src/assets/icons/Status.tsx index 1a1a9abb..1e74485b 100644 --- a/www/src/assets/icons/Status.tsx +++ b/www/src/assets/icons/Status.tsx @@ -3,7 +3,7 @@ import { mdiPulse } from "@mdi/js"; export default function Status(props: SvgIconProps) { return ( - + ); diff --git a/www/src/assets/icons/SubTable.tsx b/www/src/assets/icons/SubTable.tsx index 0af4acf4..14b6c3e7 100644 --- a/www/src/assets/icons/SubTable.tsx +++ b/www/src/assets/icons/SubTable.tsx @@ -2,11 +2,8 @@ import SvgIcon, { SvgIconProps } from "@material-ui/core/SvgIcon"; export default function SubTable(props: SvgIconProps) { return ( - - + + ); } diff --git a/www/src/assets/icons/Upload.tsx b/www/src/assets/icons/Upload.tsx index 59945325..d1f348a1 100644 --- a/www/src/assets/icons/Upload.tsx +++ b/www/src/assets/icons/Upload.tsx @@ -1,10 +1,9 @@ -import * as React from "react"; import SvgIcon, { SvgIconProps } from "@material-ui/core/SvgIcon"; import { mdiUpload } from "@mdi/js"; export default function Upload(props: SvgIconProps) { return ( - + ); diff --git a/www/src/components/HomeNavigation/NavDrawer.tsx b/www/src/components/HomeNavigation/NavDrawer.tsx index b8383c11..5507e297 100644 --- a/www/src/components/HomeNavigation/NavDrawer.tsx +++ b/www/src/components/HomeNavigation/NavDrawer.tsx @@ -7,11 +7,10 @@ import { Grid, IconButton, List, - ListItem, + MenuItem, ListItemIcon, ListItemText, } from "@material-ui/core"; -import { alpha } from "@material-ui/core/styles"; import CloseIcon from "assets/icons/Backburger"; import AddIcon from "@material-ui/icons/Add"; @@ -49,28 +48,6 @@ const useStyles = makeStyles((theme) => height: "100%", }, - listItem: { - color: theme.palette.text.secondary, - // minHeight: 48, - transition: theme.transitions.create(["background-color", "color"]), - "& $listItemIcon": { transition: theme.transitions.create("color") }, - }, - listItemSelected: { - "&&, &&:hover": { - color: theme.palette.primary.main, - backgroundColor: alpha( - theme.palette.primary.main, - theme.palette.action.selectedOpacity - ), - }, - }, - listItemIcon: {}, - listItemText: { - // ...theme.typography.button, - display: "block", - color: "inherit", - }, - createTable: { marginTop: "auto" }, }) ); @@ -126,41 +103,26 @@ export default function NavDrawer({ {sections && Object.keys(sections).map((section) => (
  • - - - + +
    • ))}
  • - + - - + +
    • diff --git a/www/src/components/Loading.tsx b/www/src/components/Loading.tsx index a13aac11..9209b03f 100644 --- a/www/src/components/Loading.tsx +++ b/www/src/components/Loading.tsx @@ -10,7 +10,7 @@ const useStyles = makeStyles((theme) => width: "100%", textAlign: "center", }, - progress: { color: theme.palette.text.secondary }, + progress: { color: theme.palette.action.active }, content: { maxWidth: "25em" }, message: { marginTop: theme.spacing(1) }, }) diff --git a/www/src/components/Navigation/NavDrawer.tsx b/www/src/components/Navigation/NavDrawer.tsx index 9d967d84..38624f07 100644 --- a/www/src/components/Navigation/NavDrawer.tsx +++ b/www/src/components/Navigation/NavDrawer.tsx @@ -7,7 +7,7 @@ import { Grid, IconButton, List, - ListItem, + MenuItem, ListItemIcon, ListItemText, Divider, @@ -40,20 +40,6 @@ const useStyles = makeStyles((theme) => }, logo: { marginLeft: theme.spacing(1.5) }, - listItem: { - color: theme.palette.text.secondary, - // minHeight: 48, - transition: theme.transitions.create(["background-color", "color"]), - "& $listItemIcon": { transition: theme.transitions.create("color") }, - }, - listItemIcon: {}, - listItemText: { - ...theme.typography.body2, - fontWeight: theme.typography.fontWeightMedium, - display: "block", - color: "inherit", - }, - divider: { marginTop: theme.spacing(1), marginBottom: theme.spacing(1), @@ -103,20 +89,12 @@ export default function NavDrawer({