diff --git a/src/components/Card/Card.js b/src/components/Card/Card.js new file mode 100644 index 0000000..1b64e93 --- /dev/null +++ b/src/components/Card/Card.js @@ -0,0 +1,20 @@ +import React from "react"; +import PropTypes from "prop-types"; +import ExpandableCard from "./ExpandableCard"; + +const Card = (props) => { + const { Content, ...input } = props; + return ; +}; + +Card.propTypes = { + Icon: PropTypes.node.isRequired, + iconVariant: PropTypes.oneOf(["circular", "rounded", "square"]), + title: PropTypes.string.isRequired, + subtitle: PropTypes.string, + smallHeader: PropTypes.bool, + Content: PropTypes.node, + Actions: PropTypes.node +}; + +export default Card; diff --git a/src/components/Card/ExpandableCard.js b/src/components/Card/ExpandableCard.js index 408a14b..070be0a 100644 --- a/src/components/Card/ExpandableCard.js +++ b/src/components/Card/ExpandableCard.js @@ -42,7 +42,7 @@ const ExpandableCard = ({ {Icon} @@ -84,7 +84,7 @@ ExpandableCard.defaultProps = { ExpandableCard.propTypes = { Icon: PropTypes.node.isRequired, - iconVariant: PropTypes.oneOf(["circle", "circular", "rounded", "square"]), + iconVariant: PropTypes.oneOf(["circular", "rounded", "square"]), title: PropTypes.string.isRequired, subtitle: PropTypes.string, smallHeader: PropTypes.bool, diff --git a/src/components/Card/index.js b/src/components/Card/index.js new file mode 100644 index 0000000..8284e8a --- /dev/null +++ b/src/components/Card/index.js @@ -0,0 +1,4 @@ +import Card from "./Card"; +import ExpandableCard from "./ExpandableCard"; + +export { Card, ExpandableCard }; diff --git a/src/pages/settings/appearance/components/AppearancePage.js b/src/pages/settings/appearance/components/AppearancePage.js index 0a464aa..fcf905b 100644 --- a/src/pages/settings/appearance/components/AppearancePage.js +++ b/src/pages/settings/appearance/components/AppearancePage.js @@ -1,6 +1,6 @@ import React from "react"; import { useTranslation } from "react-i18next"; -import { Card, CardContent, CardActions, Button } from "@material-ui/core"; +import { Button } from "@material-ui/core"; import { makeStyles } from "@material-ui/core/styles"; import PageTitle from "../../../../components/PageTitle"; import LanguageContainer from "./LanguageContainer"; @@ -10,7 +10,7 @@ import { Save as SaveIcon, Vibration as VibrationIcon } from "@material-ui/icons"; -import ExpandableCard from "../../../../components/Card/ExpandableCard"; +import { Card } from "../../../../components/Card"; const useStyles = makeStyles((theme) => ({ formControl: { @@ -34,12 +34,11 @@ const AppearancePage = () => { <> - } title={t("Forward.Options.KeyOverwrite.Label")} subtitle={t("Forward.Options.KeyOverwrite.Tooltip")} - expandable={false} - Summary={ + Content={ <>