From 1e6c208f3615269c5be40b63e28f3069df3b72f6 Mon Sep 17 00:00:00 2001 From: Justin Campbell Date: Tue, 13 Oct 2020 20:25:39 -0400 Subject: [PATCH] Replace direct theme imports with MUI useTheme hook --- src/components/DirectoryInformation/DirectoryInformation.js | 5 ++--- src/components/EmailHeader/EmailHeader.js | 5 ++--- src/components/ItemMetadataView/ItemMetadataView.js | 5 ++--- src/components/ItemTableAppBar/ItemTableAppBar.md | 4 ++-- src/components/ItemViewAppBar/ItemViewAppBar.md | 4 ++-- src/components/TeamMemberCard/TeamMemberCard.js | 6 +++--- 6 files changed, 13 insertions(+), 16 deletions(-) diff --git a/src/components/DirectoryInformation/DirectoryInformation.js b/src/components/DirectoryInformation/DirectoryInformation.js index 3f0fefd..6991e5e 100644 --- a/src/components/DirectoryInformation/DirectoryInformation.js +++ b/src/components/DirectoryInformation/DirectoryInformation.js @@ -1,11 +1,10 @@ import React from "react"; import PropTypes from "prop-types"; -import { TableContainer, Table, TableRow, TableCell, Paper, makeStyles } from "@material-ui/core"; -import webqueue2Theme from "../../theme"; +import { TableContainer, Table, TableRow, TableCell, Paper, makeStyles, useTheme } from "@material-ui/core"; export default function DirectoryInformation({ section }) { - const theme = webqueue2Theme(false); + const theme = useTheme(); const useStyles = makeStyles((theme) => ({ headerCell: { borderBottom: "none", diff --git a/src/components/EmailHeader/EmailHeader.js b/src/components/EmailHeader/EmailHeader.js index 3af9c0c..b48d59f 100644 --- a/src/components/EmailHeader/EmailHeader.js +++ b/src/components/EmailHeader/EmailHeader.js @@ -1,12 +1,11 @@ import React from "react"; import PropTypes from "prop-types"; -import { Card, CardHeader, makeStyles } from "@material-ui/core"; +import { Card, CardHeader, makeStyles, useTheme } from "@material-ui/core"; import UserAvatar from "../UserAvatar/"; -import webqueue2Theme from "../../theme"; export default function EmailHeader({name, date, email}){ - const theme = webqueue2Theme(false); + const theme = useTheme(); const useStyles = makeStyles({ "verticalPadding": { paddingTop: theme.spacing(1), diff --git a/src/components/ItemMetadataView/ItemMetadataView.js b/src/components/ItemMetadataView/ItemMetadataView.js index e0f27bc..62b7fe6 100644 --- a/src/components/ItemMetadataView/ItemMetadataView.js +++ b/src/components/ItemMetadataView/ItemMetadataView.js @@ -1,14 +1,13 @@ import React from 'react'; import PropTypes from 'prop-types'; -import { makeStyles, Typography } from '@material-ui/core'; +import { makeStyles, Typography, useTheme } from '@material-ui/core'; import { Alert } from '@material-ui/lab'; -import webqueue2Theme from "../../theme"; import EmailHeader from '../EmailHeader/EmailHeader'; export default function ItemMetadataView({item}){ - const theme = webqueue2Theme(false); + const theme = useTheme(); const useStyles = makeStyles({ "verticalSpacing": { marginTop: theme.spacing(1), diff --git a/src/components/ItemTableAppBar/ItemTableAppBar.md b/src/components/ItemTableAppBar/ItemTableAppBar.md index e870d28..4f43207 100644 --- a/src/components/ItemTableAppBar/ItemTableAppBar.md +++ b/src/components/ItemTableAppBar/ItemTableAppBar.md @@ -2,11 +2,11 @@ The ItemTableAppBar is the primary toolbar for the [ItemTable](/#/Components/Ite ```jsx import React, { useState } from "react"; -import webqueue2Theme from "../../theme.js"; +import { useTheme } from '@material-ui/core'; const [darkMode, setDarkMode] = useState(false); -const theme = webqueue2Theme(darkMode); +const theme = useTheme(); ``` diff --git a/src/components/ItemViewAppBar/ItemViewAppBar.md b/src/components/ItemViewAppBar/ItemViewAppBar.md index acf98df..0ffa96a 100644 --- a/src/components/ItemViewAppBar/ItemViewAppBar.md +++ b/src/components/ItemViewAppBar/ItemViewAppBar.md @@ -3,9 +3,9 @@ The ItemViewAppBar is the primary toolbar for the [ItemView](/#/Components/ItemV ```jsx import React, { useState } from "react"; import ItemViewAppBar from "./ItemViewAppBar"; -import webqueue2Theme from "../../theme.js"; +import { useTheme } from '@material-ui/core'; -const theme = webqueue2Theme(false); +const theme = useTheme(); const [sidebarOpen, setSidebarOpen] = useState(false); diff --git a/src/components/TeamMemberCard/TeamMemberCard.js b/src/components/TeamMemberCard/TeamMemberCard.js index febfa5e..7a7b4b5 100644 --- a/src/components/TeamMemberCard/TeamMemberCard.js +++ b/src/components/TeamMemberCard/TeamMemberCard.js @@ -1,13 +1,13 @@ import React from 'react'; import PropTypes from 'prop-types' import { Card, CardHeader, Avatar, IconButton, CardContent, - CardActions, Link, makeStyles } from '@material-ui/core'; + CardActions, Link, makeStyles, useTheme } from '@material-ui/core'; import WebsiteIcon from '@material-ui/icons/Language'; -import webqueue2Theme from "../../theme"; + export default function TeamMemberCard({firstName, lastName, imageUrl, websiteUrl, children}){ - const theme = webqueue2Theme(); + const theme = useTheme(); const useStyles = () => makeStyles({ "avatarImageLarge": {