From b2775bbd4b1b1b5029a3e3eb261604d0ec2a5af5 Mon Sep 17 00:00:00 2001 From: Joseph Young Date: Mon, 19 Feb 2024 19:14:14 -0600 Subject: [PATCH] Folder restructure --- src/{util => Context}/classOptions.js | 0 src/{ => components}/Accordion/Accordion.jsx | 4 ++-- .../Accordion/Accordion.stories.jsx | 0 src/components/Avatar/Avatar.jsx | 18 ++++++++++++++++++ src/{ => components}/Button/Button.jsx | 4 ++-- src/{ => components}/Button/Button.stories.jsx | 0 src/{ => components}/Button/LeadingButton.jsx | 4 ++-- src/{ => components}/Button/PillButton.jsx | 4 ++-- src/{ => components}/Button/ShapeButton.jsx | 4 ++-- src/{ => components}/Card/Card.jsx | 4 ++-- src/{ => components}/Card/Card.stories.jsx | 2 +- src/{ => components}/Icon/Icon.jsx | 3 +-- src/{ => components}/Textual/Follower.jsx | 0 src/{util => resources}/styles.css | 0 14 files changed, 32 insertions(+), 15 deletions(-) rename src/{util => Context}/classOptions.js (100%) rename src/{ => components}/Accordion/Accordion.jsx (97%) rename src/{ => components}/Accordion/Accordion.stories.jsx (100%) create mode 100644 src/components/Avatar/Avatar.jsx rename src/{ => components}/Button/Button.jsx (91%) rename src/{ => components}/Button/Button.stories.jsx (100%) rename src/{ => components}/Button/LeadingButton.jsx (88%) rename src/{ => components}/Button/PillButton.jsx (90%) rename src/{ => components}/Button/ShapeButton.jsx (81%) rename src/{ => components}/Card/Card.jsx (94%) rename src/{ => components}/Card/Card.stories.jsx (99%) rename src/{ => components}/Icon/Icon.jsx (87%) rename src/{ => components}/Textual/Follower.jsx (100%) rename src/{util => resources}/styles.css (100%) diff --git a/src/util/classOptions.js b/src/Context/classOptions.js similarity index 100% rename from src/util/classOptions.js rename to src/Context/classOptions.js diff --git a/src/Accordion/Accordion.jsx b/src/components/Accordion/Accordion.jsx similarity index 97% rename from src/Accordion/Accordion.jsx rename to src/components/Accordion/Accordion.jsx index a55f47e..69e474f 100644 --- a/src/Accordion/Accordion.jsx +++ b/src/components/Accordion/Accordion.jsx @@ -1,6 +1,6 @@ import { useState, Children, isValidElement, cloneElement } from "react"; -import { radiusOptions, surfaceColorOptions, childSurfaceColorOptions, textOptions } from "../util/classOptions.js"; -import { useTheme } from "../Context/ThemeContext.jsx"; +import { radiusOptions, surfaceColorOptions, childSurfaceColorOptions, textOptions } from "../../context/classOptions"; +import { useTheme } from "../../context/ThemeContext.jsx"; import { twMerge, twJoin } from "tailwind-merge"; export default function Accordion({ themeClass = useTheme(), radiusClass = 'round', className, children, onChange = null, initialExpanded = [], accordion = true, flush = false }) { diff --git a/src/Accordion/Accordion.stories.jsx b/src/components/Accordion/Accordion.stories.jsx similarity index 100% rename from src/Accordion/Accordion.stories.jsx rename to src/components/Accordion/Accordion.stories.jsx diff --git a/src/components/Avatar/Avatar.jsx b/src/components/Avatar/Avatar.jsx new file mode 100644 index 0000000..0809c98 --- /dev/null +++ b/src/components/Avatar/Avatar.jsx @@ -0,0 +1,18 @@ + + +const Avatar = (props) => { + return ( +
+ +
+
{props.name}
+
{props.company}
+
+
+ +
+
+ ) +}; + +export default Avatar; \ No newline at end of file diff --git a/src/Button/Button.jsx b/src/components/Button/Button.jsx similarity index 91% rename from src/Button/Button.jsx rename to src/components/Button/Button.jsx index c9806ab..e99d1d5 100644 --- a/src/Button/Button.jsx +++ b/src/components/Button/Button.jsx @@ -1,6 +1,6 @@ -import { buttonColorOptions, radiusOptions, sizeOptions } from "../util/classOptions"; +import { buttonColorOptions, radiusOptions, sizeOptions } from "../../context/classOptions"; import { LoadingIcon } from "../Icon/Icon.jsx"; -import { useTheme } from "../Context/ThemeContext.jsx"; +import { useTheme } from "../../context/ThemeContext.jsx"; export const Button = (props) => { const themeColor = useTheme(); diff --git a/src/Button/Button.stories.jsx b/src/components/Button/Button.stories.jsx similarity index 100% rename from src/Button/Button.stories.jsx rename to src/components/Button/Button.stories.jsx diff --git a/src/Button/LeadingButton.jsx b/src/components/Button/LeadingButton.jsx similarity index 88% rename from src/Button/LeadingButton.jsx rename to src/components/Button/LeadingButton.jsx index 5926a80..a461203 100644 --- a/src/Button/LeadingButton.jsx +++ b/src/components/Button/LeadingButton.jsx @@ -1,5 +1,5 @@ -import { buttonColorOptions, radiusOptions, sizeOptions } from "../util/classOptions.js"; -import { useTheme } from "../Context/ThemeContext.jsx"; +import { buttonColorOptions, radiusOptions, sizeOptions } from "../../context/classOptions.js"; +import { useTheme } from "../../context/ThemeContext.jsx"; export const LeadingButton = (props) => { const themeColor = useTheme(); diff --git a/src/Button/PillButton.jsx b/src/components/Button/PillButton.jsx similarity index 90% rename from src/Button/PillButton.jsx rename to src/components/Button/PillButton.jsx index b6dd1c9..ea2bd7a 100644 --- a/src/Button/PillButton.jsx +++ b/src/components/Button/PillButton.jsx @@ -1,6 +1,6 @@ -import { buttonColorOptions, radiusOptions, sizeOptions } from "../util/classOptions"; +import { buttonColorOptions, radiusOptions, sizeOptions } from "../../context/classOptions"; +import { useTheme } from "../../context/ThemeContext.jsx"; import { LoadingIcon } from "../Icon/Icon.jsx"; -import { useTheme } from "../Context/ThemeContext.jsx"; export const PillButton = (props) => { const themeColor = useTheme(); diff --git a/src/Button/ShapeButton.jsx b/src/components/Button/ShapeButton.jsx similarity index 81% rename from src/Button/ShapeButton.jsx rename to src/components/Button/ShapeButton.jsx index 74ddbcf..4703b58 100644 --- a/src/Button/ShapeButton.jsx +++ b/src/components/Button/ShapeButton.jsx @@ -1,5 +1,5 @@ -import { buttonColorOptions, radiusOptions } from "../util/classOptions.js"; -import { useTheme } from "../Context/ThemeContext.jsx"; +import { buttonColorOptions, radiusOptions } from "../../context/classOptions.js"; +import { useTheme } from "../../context/ThemeContext.jsx"; export const ShapeButton = (props) => { const themeColor = useTheme(); diff --git a/src/Card/Card.jsx b/src/components/Card/Card.jsx similarity index 94% rename from src/Card/Card.jsx rename to src/components/Card/Card.jsx index 09c2665..5a3982e 100644 --- a/src/Card/Card.jsx +++ b/src/components/Card/Card.jsx @@ -1,5 +1,5 @@ -import { surfaceColorOptions, textOptions, radiusOptions } from "../util/classOptions.js"; -import { useTheme } from "../Context/ThemeContext.jsx"; +import { surfaceColorOptions, textOptions, radiusOptions } from "../../context/classOptions.js"; +import { useTheme } from "../../context/ThemeContext.jsx"; import { twMerge } from "tailwind-merge"; export default function Card({ ref, themeClass = useTheme(), radiusClass = 'round', className, children }) { diff --git a/src/Card/Card.stories.jsx b/src/components/Card/Card.stories.jsx similarity index 99% rename from src/Card/Card.stories.jsx rename to src/components/Card/Card.stories.jsx index 3bba845..ff7aec6 100644 --- a/src/Card/Card.stories.jsx +++ b/src/components/Card/Card.stories.jsx @@ -7,7 +7,7 @@ import { LeadingButton } from "../Button/LeadingButton"; import { Icon } from "../Icon/Icon"; import { Follower } from "../Textual/Follower"; import { ChevronDoubleRightIcon } from "@heroicons/react/24/outline"; -import "../util/styles.css"; +import "../../resources/styles.css"; export default { args: { diff --git a/src/Icon/Icon.jsx b/src/components/Icon/Icon.jsx similarity index 87% rename from src/Icon/Icon.jsx rename to src/components/Icon/Icon.jsx index 1a234ed..f01d991 100644 --- a/src/Icon/Icon.jsx +++ b/src/components/Icon/Icon.jsx @@ -1,5 +1,4 @@ -import { cloneElement } from "react"; -import { loadingOptions } from "../util/classOptions"; +import { loadingOptions } from "../../context/classOptions"; export const Icon = ({ icons, loading, loadingClass }) => { return ( diff --git a/src/Textual/Follower.jsx b/src/components/Textual/Follower.jsx similarity index 100% rename from src/Textual/Follower.jsx rename to src/components/Textual/Follower.jsx diff --git a/src/util/styles.css b/src/resources/styles.css similarity index 100% rename from src/util/styles.css rename to src/resources/styles.css