From c1065e816f932d87bb8900fb144d99bc9aa6a5ef Mon Sep 17 00:00:00 2001 From: rray524 Date: Thu, 19 Sep 2024 13:07:15 +0530 Subject: [PATCH 1/3] add-custom-navigation-button --- src/App.jsx | 6 +- src/components/button/ArrowButton.jsx | 13 + src/components/button/BlackButton.jsx | 17 + .../button/DefaultNavigationButton .jsx | 19 + .../button/OutlineNavigationButton.jsx | 19 + src/components/button/icons/arrow-icon.jsx | 10 + src/components/button/icons/user-icon.jsx | 16 + src/stories/Button.jsx | 50 --- src/stories/Button.stories.js | 48 --- src/stories/Configure.mdx | 364 ------------------ src/stories/Header.jsx | 59 --- src/stories/Header.stories.js | 28 -- src/stories/button.css | 30 -- src/stories/header.css | 32 -- 14 files changed, 97 insertions(+), 614 deletions(-) create mode 100644 src/components/button/ArrowButton.jsx create mode 100644 src/components/button/BlackButton.jsx create mode 100644 src/components/button/DefaultNavigationButton .jsx create mode 100644 src/components/button/OutlineNavigationButton.jsx create mode 100644 src/components/button/icons/arrow-icon.jsx create mode 100644 src/components/button/icons/user-icon.jsx delete mode 100644 src/stories/Button.jsx delete mode 100644 src/stories/Button.stories.js delete mode 100644 src/stories/Configure.mdx delete mode 100644 src/stories/Header.jsx delete mode 100644 src/stories/Header.stories.js delete mode 100644 src/stories/button.css delete mode 100644 src/stories/header.css diff --git a/src/App.jsx b/src/App.jsx index 144ecd6..34ef7b3 100644 --- a/src/App.jsx +++ b/src/App.jsx @@ -1,8 +1,8 @@ const App = () => { return ( -

- Hello World! -

+ <> +

Hello World!

+ ); }; diff --git a/src/components/button/ArrowButton.jsx b/src/components/button/ArrowButton.jsx new file mode 100644 index 0000000..6e8b86b --- /dev/null +++ b/src/components/button/ArrowButton.jsx @@ -0,0 +1,13 @@ +import PropTypes from "prop-types"; + +const CircularButton = ({ icon: Icon }) => ( + +); + +CircularButton.propTypes = { + icon: PropTypes.elementType, +}; + +export default CircularButton; diff --git a/src/components/button/BlackButton.jsx b/src/components/button/BlackButton.jsx new file mode 100644 index 0000000..397c7f4 --- /dev/null +++ b/src/components/button/BlackButton.jsx @@ -0,0 +1,17 @@ +import PropTypes from "prop-types"; +import { Link } from "react-router-dom"; + +const BlackButton = ({ text }) => ( + + {text} + +); + +BlackButton.propTypes = { + text: PropTypes.string.isRequired, +}; + +export default BlackButton; diff --git a/src/components/button/DefaultNavigationButton .jsx b/src/components/button/DefaultNavigationButton .jsx new file mode 100644 index 0000000..9279403 --- /dev/null +++ b/src/components/button/DefaultNavigationButton .jsx @@ -0,0 +1,19 @@ +import PropTypes from "prop-types"; +import { Link } from "react-router-dom"; + +const DefaultButton = ({ text, icon: Icon }) => ( + + {text} + {Icon && } + +); + +DefaultButton.propTypes = { + text: PropTypes.string.isRequired, + icon: PropTypes.elementType, +}; + +export default DefaultButton; diff --git a/src/components/button/OutlineNavigationButton.jsx b/src/components/button/OutlineNavigationButton.jsx new file mode 100644 index 0000000..2bd3585 --- /dev/null +++ b/src/components/button/OutlineNavigationButton.jsx @@ -0,0 +1,19 @@ +import PropTypes from "prop-types"; +import { Link } from "react-router-dom"; + +const OutlineButton = ({ text, icon: Icon }) => ( + + {Icon && } + {text} + +); + +OutlineButton.propTypes = { + text: PropTypes.string.isRequired, + icon: PropTypes.elementType, +}; + +export default OutlineButton; diff --git a/src/components/button/icons/arrow-icon.jsx b/src/components/button/icons/arrow-icon.jsx new file mode 100644 index 0000000..719a52d --- /dev/null +++ b/src/components/button/icons/arrow-icon.jsx @@ -0,0 +1,10 @@ +const ArrowIcon = () => ( + + + +); + +export default ArrowIcon; diff --git a/src/components/button/icons/user-icon.jsx b/src/components/button/icons/user-icon.jsx new file mode 100644 index 0000000..f4c3fa3 --- /dev/null +++ b/src/components/button/icons/user-icon.jsx @@ -0,0 +1,16 @@ +const UserIcon = () => ( + + + +); + +export default UserIcon; diff --git a/src/stories/Button.jsx b/src/stories/Button.jsx deleted file mode 100644 index 15dde39..0000000 --- a/src/stories/Button.jsx +++ /dev/null @@ -1,50 +0,0 @@ -import React from 'react'; -import PropTypes from 'prop-types'; -import './button.css'; - -/** - * Primary UI component for user interaction - */ -export const Button = ({ primary, backgroundColor, size, label, ...props }) => { - const mode = primary ? 'storybook-button--primary' : 'storybook-button--secondary'; - return ( - - ); -}; - -Button.propTypes = { - /** - * Is this the principal call to action on the page? - */ - primary: PropTypes.bool, - /** - * What background color to use - */ - backgroundColor: PropTypes.string, - /** - * How large should the button be? - */ - size: PropTypes.oneOf(['small', 'medium', 'large']), - /** - * Button contents - */ - label: PropTypes.string.isRequired, - /** - * Optional click handler - */ - onClick: PropTypes.func, -}; - -Button.defaultProps = { - backgroundColor: null, - primary: false, - size: 'medium', - onClick: undefined, -}; diff --git a/src/stories/Button.stories.js b/src/stories/Button.stories.js deleted file mode 100644 index 97b9ec0..0000000 --- a/src/stories/Button.stories.js +++ /dev/null @@ -1,48 +0,0 @@ -import { fn } from '@storybook/test'; -import { Button } from './Button'; - -// More on how to set up stories at: https://storybook.js.org/docs/writing-stories#default-export -export default { - title: 'Example/Button', - component: Button, - parameters: { - // Optional parameter to center the component in the Canvas. More info: https://storybook.js.org/docs/configure/story-layout - layout: 'centered', - }, - // This component will have an automatically generated Autodocs entry: https://storybook.js.org/docs/writing-docs/autodocs - tags: ['autodocs'], - // More on argTypes: https://storybook.js.org/docs/api/argtypes - argTypes: { - backgroundColor: { control: 'color' }, - }, - // Use `fn` to spy on the onClick arg, which will appear in the actions panel once invoked: https://storybook.js.org/docs/essentials/actions#action-args - args: { onClick: fn() }, -}; - -// More on writing stories with args: https://storybook.js.org/docs/writing-stories/args -export const Primary = { - args: { - primary: true, - label: 'Button', - }, -}; - -export const Secondary = { - args: { - label: 'Button', - }, -}; - -export const Large = { - args: { - size: 'large', - label: 'Button', - }, -}; - -export const Small = { - args: { - size: 'small', - label: 'Button', - }, -}; diff --git a/src/stories/Configure.mdx b/src/stories/Configure.mdx deleted file mode 100644 index 6a53730..0000000 --- a/src/stories/Configure.mdx +++ /dev/null @@ -1,364 +0,0 @@ -import { Meta } from "@storybook/blocks"; - -import Github from "./assets/github.svg"; -import Discord from "./assets/discord.svg"; -import Youtube from "./assets/youtube.svg"; -import Tutorials from "./assets/tutorials.svg"; -import Styling from "./assets/styling.png"; -import Context from "./assets/context.png"; -import Assets from "./assets/assets.png"; -import Docs from "./assets/docs.png"; -import Share from "./assets/share.png"; -import FigmaPlugin from "./assets/figma-plugin.png"; -import Testing from "./assets/testing.png"; -import Accessibility from "./assets/accessibility.png"; -import Theming from "./assets/theming.png"; -import AddonLibrary from "./assets/addon-library.png"; - -export const RightArrow = () => - - - - - -
-
- # Configure your project - - Because Storybook works separately from your app, you'll need to configure it for your specific stack and setup. Below, explore guides for configuring Storybook with popular frameworks and tools. If you get stuck, learn how you can ask for help from our community. -
-
-
- A wall of logos representing different styling technologies -

Add styling and CSS

-

Like with web applications, there are many ways to include CSS within Storybook. Learn more about setting up styling within Storybook.

- Learn more -
-
- An abstraction representing the composition of data for a component -

Provide context and mocking

-

Often when a story doesn't render, it's because your component is expecting a specific environment or context (like a theme provider) to be available.

- Learn more -
-
- A representation of typography and image assets -
-

Load assets and resources

-

To link static files (like fonts) to your projects and stories, use the - `staticDirs` configuration option to specify folders to load when - starting Storybook.

- Learn more -
-
-
-
-
-
- # Do more with Storybook - - Now that you know the basics, let's explore other parts of Storybook that will improve your experience. This list is just to get you started. You can customise Storybook in many ways to fit your needs. -
- -
-
-
- A screenshot showing the autodocs tag being set, pointing a docs page being generated -

Autodocs

-

Auto-generate living, - interactive reference documentation from your components and stories.

- Learn more -
-
- A browser window showing a Storybook being published to a chromatic.com URL -

Publish to Chromatic

-

Publish your Storybook to review and collaborate with your entire team.

- Learn more -
-
- Windows showing the Storybook plugin in Figma -

Figma Plugin

-

Embed your stories into Figma to cross-reference the design and live - implementation in one place.

- Learn more -
-
- Screenshot of tests passing and failing -

Testing

-

Use stories to test a component in all its variations, no matter how - complex.

- Learn more -
-
- Screenshot of accessibility tests passing and failing -

Accessibility

-

Automatically test your components for a11y issues as you develop.

- Learn more -
-
- Screenshot of Storybook in light and dark mode -

Theming

-

Theme Storybook's UI to personalize it to your project.

- Learn more -
-
-
-
-
-
-

Addons

-

Integrate your tools with Storybook to connect workflows.

- Discover all addons -
-
- Integrate your tools with Storybook to connect workflows. -
-
- -
-
- Github logo - Join our contributors building the future of UI development. - - Star on GitHub -
-
- Discord logo -
- Get support and chat with frontend developers. - - Join Discord server -
-
-
- Youtube logo -
- Watch tutorials, feature previews and interviews. - - Watch on YouTube -
-
-
- A book -

Follow guided walkthroughs on for key workflows.

- - Discover tutorials -
-
- - diff --git a/src/stories/Header.jsx b/src/stories/Header.jsx deleted file mode 100644 index 39e5226..0000000 --- a/src/stories/Header.jsx +++ /dev/null @@ -1,59 +0,0 @@ -import React from 'react'; -import PropTypes from 'prop-types'; - -import { Button } from './Button'; -import './header.css'; - -export const Header = ({ user, onLogin, onLogout, onCreateAccount }) => ( -
-
-
- - - - - - - -

Acme

-
-
- {user ? ( - <> - - Welcome, {user.name}! - -
-
-
-); - -Header.propTypes = { - user: PropTypes.shape({ - name: PropTypes.string.isRequired, - }), - onLogin: PropTypes.func.isRequired, - onLogout: PropTypes.func.isRequired, - onCreateAccount: PropTypes.func.isRequired, -}; - -Header.defaultProps = { - user: null, -}; diff --git a/src/stories/Header.stories.js b/src/stories/Header.stories.js deleted file mode 100644 index 17323e6..0000000 --- a/src/stories/Header.stories.js +++ /dev/null @@ -1,28 +0,0 @@ -import { Header } from './Header'; -import { fn } from '@storybook/test'; - -export default { - title: 'Example/Header', - component: Header, - // This component will have an automatically generated Autodocs entry: https://storybook.js.org/docs/writing-docs/autodocs - tags: ['autodocs'], - parameters: { - // More on how to position stories at: https://storybook.js.org/docs/configure/story-layout - layout: 'fullscreen', - }, - args: { - onLogin: fn(), - onLogout: fn(), - onCreateAccount: fn(), - }, -}; - -export const LoggedIn = { - args: { - user: { - name: 'Jane Doe', - }, - }, -}; - -export const LoggedOut = {}; diff --git a/src/stories/button.css b/src/stories/button.css deleted file mode 100644 index dc91dc7..0000000 --- a/src/stories/button.css +++ /dev/null @@ -1,30 +0,0 @@ -.storybook-button { - font-family: 'Nunito Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif; - font-weight: 700; - border: 0; - border-radius: 3em; - cursor: pointer; - display: inline-block; - line-height: 1; -} -.storybook-button--primary { - color: white; - background-color: #1ea7fd; -} -.storybook-button--secondary { - color: #333; - background-color: transparent; - box-shadow: rgba(0, 0, 0, 0.15) 0px 0px 0px 1px inset; -} -.storybook-button--small { - font-size: 12px; - padding: 10px 16px; -} -.storybook-button--medium { - font-size: 14px; - padding: 11px 20px; -} -.storybook-button--large { - font-size: 16px; - padding: 12px 24px; -} diff --git a/src/stories/header.css b/src/stories/header.css deleted file mode 100644 index d9a7052..0000000 --- a/src/stories/header.css +++ /dev/null @@ -1,32 +0,0 @@ -.storybook-header { - font-family: 'Nunito Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif; - border-bottom: 1px solid rgba(0, 0, 0, 0.1); - padding: 15px 20px; - display: flex; - align-items: center; - justify-content: space-between; -} - -.storybook-header svg { - display: inline-block; - vertical-align: top; -} - -.storybook-header h1 { - font-weight: 700; - font-size: 20px; - line-height: 1; - margin: 6px 0 6px 10px; - display: inline-block; - vertical-align: top; -} - -.storybook-header button + button { - margin-left: 10px; -} - -.storybook-header .welcome { - color: #333; - font-size: 14px; - margin-right: 10px; -} From adc5322656d7b0fdf35816ebd62371f412ab0744 Mon Sep 17 00:00:00 2001 From: rray524 Date: Thu, 26 Sep 2024 21:50:36 +0530 Subject: [PATCH 2/3] add-custom-navigation-button-1.1 --- .storybook/preview.js | 2 + package-lock.json | 384 +++++++++++++++++- package.json | 4 +- src/components/Button.jsx | 54 +++ src/components/button/ArrowButton.jsx | 13 - src/components/button/BlackButton.jsx | 17 - .../button/DefaultNavigationButton .jsx | 19 - .../button/OutlineNavigationButton.jsx | 19 - src/components/button/icons/arrow-icon.jsx | 10 - src/stories/Button.stories.jsx | 131 ++++++ src/stories/Page.jsx | 69 ---- src/stories/Page.stories.js | 28 -- src/stories/assets/accessibility.png | Bin 42336 -> 0 bytes src/stories/assets/accessibility.svg | 1 - src/stories/assets/addon-library.png | Bin 467366 -> 0 bytes src/stories/assets/arrow.svg | 6 + src/stories/assets/assets.png | Bin 3899 -> 0 bytes src/stories/assets/avif-test-image.avif | Bin 829 -> 0 bytes src/stories/assets/context.png | Bin 6119 -> 0 bytes src/stories/assets/discord.svg | 1 - src/stories/assets/docs.png | Bin 27875 -> 0 bytes src/stories/assets/figma-plugin.png | Bin 44246 -> 0 bytes src/stories/assets/github.svg | 1 - src/stories/assets/share.png | Bin 40767 -> 0 bytes src/stories/assets/styling.png | Bin 7237 -> 0 bytes src/stories/assets/testing.png | Bin 49313 -> 0 bytes src/stories/assets/theming.png | Bin 44374 -> 0 bytes src/stories/assets/tutorials.svg | 1 - .../user-icon.jsx => stories/assets/user.svg} | 9 +- src/stories/assets/youtube.svg | 1 - src/stories/page.css | 69 ---- tailwind.config.js | 3 +- vite.config.js | 9 +- 33 files changed, 574 insertions(+), 277 deletions(-) create mode 100644 src/components/Button.jsx delete mode 100644 src/components/button/ArrowButton.jsx delete mode 100644 src/components/button/BlackButton.jsx delete mode 100644 src/components/button/DefaultNavigationButton .jsx delete mode 100644 src/components/button/OutlineNavigationButton.jsx delete mode 100644 src/components/button/icons/arrow-icon.jsx create mode 100644 src/stories/Button.stories.jsx delete mode 100644 src/stories/Page.jsx delete mode 100644 src/stories/Page.stories.js delete mode 100644 src/stories/assets/accessibility.png delete mode 100644 src/stories/assets/accessibility.svg delete mode 100644 src/stories/assets/addon-library.png create mode 100644 src/stories/assets/arrow.svg delete mode 100644 src/stories/assets/assets.png delete mode 100644 src/stories/assets/avif-test-image.avif delete mode 100644 src/stories/assets/context.png delete mode 100644 src/stories/assets/discord.svg delete mode 100644 src/stories/assets/docs.png delete mode 100644 src/stories/assets/figma-plugin.png delete mode 100644 src/stories/assets/github.svg delete mode 100644 src/stories/assets/share.png delete mode 100644 src/stories/assets/styling.png delete mode 100644 src/stories/assets/testing.png delete mode 100644 src/stories/assets/theming.png delete mode 100644 src/stories/assets/tutorials.svg rename src/{components/button/icons/user-icon.jsx => stories/assets/user.svg} (91%) delete mode 100644 src/stories/assets/youtube.svg delete mode 100644 src/stories/page.css diff --git a/.storybook/preview.js b/.storybook/preview.js index 6731af8..dbb65c8 100644 --- a/.storybook/preview.js +++ b/.storybook/preview.js @@ -1,4 +1,6 @@ +import "../src/index.css"; /** @type { import('@storybook/react').Preview } */ + const preview = { parameters: { controls: { diff --git a/package-lock.json b/package-lock.json index a036ed9..222e76e 100644 --- a/package-lock.json +++ b/package-lock.json @@ -8,6 +8,7 @@ "name": "frontend-kc", "version": "0.0.0", "dependencies": { + "classnames": "^2.5.1", "react": "^18.3.1", "react-dom": "^18.3.1", "react-router-dom": "^6.26.0" @@ -35,7 +36,8 @@ "prop-types": "^15.8.1", "storybook": "^8.2.8", "tailwindcss": "^3.4.10", - "vite": "^5.3.1" + "vite": "^5.3.1", + "vite-plugin-svgr": "^4.2.0" } }, "node_modules/@adobe/css-tools": { @@ -3741,6 +3743,219 @@ "storybook": "^8.2.8" } }, + "node_modules/@svgr/babel-plugin-add-jsx-attribute": { + "version": "8.0.0", + "resolved": "https://registry.npmjs.org/@svgr/babel-plugin-add-jsx-attribute/-/babel-plugin-add-jsx-attribute-8.0.0.tgz", + "integrity": "sha512-b9MIk7yhdS1pMCZM8VeNfUlSKVRhsHZNMl5O9SfaX0l0t5wjdgu4IDzGB8bpnGBBOjGST3rRFVsaaEtI4W6f7g==", + "dev": true, + "engines": { + "node": ">=14" + }, + "funding": { + "type": "github", + "url": "https://github.com/sponsors/gregberge" + }, + "peerDependencies": { + "@babel/core": "^7.0.0-0" + } + }, + "node_modules/@svgr/babel-plugin-remove-jsx-attribute": { + "version": "8.0.0", + "resolved": "https://registry.npmjs.org/@svgr/babel-plugin-remove-jsx-attribute/-/babel-plugin-remove-jsx-attribute-8.0.0.tgz", + "integrity": "sha512-BcCkm/STipKvbCl6b7QFrMh/vx00vIP63k2eM66MfHJzPr6O2U0jYEViXkHJWqXqQYjdeA9cuCl5KWmlwjDvbA==", + "dev": true, + "engines": { + "node": ">=14" + }, + "funding": { + "type": "github", + "url": "https://github.com/sponsors/gregberge" + }, + "peerDependencies": { + "@babel/core": "^7.0.0-0" + } + }, + "node_modules/@svgr/babel-plugin-remove-jsx-empty-expression": { + "version": "8.0.0", + "resolved": "https://registry.npmjs.org/@svgr/babel-plugin-remove-jsx-empty-expression/-/babel-plugin-remove-jsx-empty-expression-8.0.0.tgz", + "integrity": "sha512-5BcGCBfBxB5+XSDSWnhTThfI9jcO5f0Ai2V24gZpG+wXF14BzwxxdDb4g6trdOux0rhibGs385BeFMSmxtS3uA==", + "dev": true, + "engines": { + "node": ">=14" + }, + "funding": { + "type": "github", + "url": "https://github.com/sponsors/gregberge" + }, + "peerDependencies": { + "@babel/core": "^7.0.0-0" + } + }, + "node_modules/@svgr/babel-plugin-replace-jsx-attribute-value": { + "version": "8.0.0", + "resolved": "https://registry.npmjs.org/@svgr/babel-plugin-replace-jsx-attribute-value/-/babel-plugin-replace-jsx-attribute-value-8.0.0.tgz", + "integrity": "sha512-KVQ+PtIjb1BuYT3ht8M5KbzWBhdAjjUPdlMtpuw/VjT8coTrItWX6Qafl9+ji831JaJcu6PJNKCV0bp01lBNzQ==", + "dev": true, + "engines": { + "node": ">=14" + }, + "funding": { + "type": "github", + "url": "https://github.com/sponsors/gregberge" + }, + "peerDependencies": { + "@babel/core": "^7.0.0-0" + } + }, + "node_modules/@svgr/babel-plugin-svg-dynamic-title": { + "version": "8.0.0", + "resolved": "https://registry.npmjs.org/@svgr/babel-plugin-svg-dynamic-title/-/babel-plugin-svg-dynamic-title-8.0.0.tgz", + "integrity": "sha512-omNiKqwjNmOQJ2v6ge4SErBbkooV2aAWwaPFs2vUY7p7GhVkzRkJ00kILXQvRhA6miHnNpXv7MRnnSjdRjK8og==", + "dev": true, + "engines": { + "node": ">=14" + }, + "funding": { + "type": "github", + "url": "https://github.com/sponsors/gregberge" + }, + "peerDependencies": { + "@babel/core": "^7.0.0-0" + } + }, + "node_modules/@svgr/babel-plugin-svg-em-dimensions": { + "version": "8.0.0", + "resolved": "https://registry.npmjs.org/@svgr/babel-plugin-svg-em-dimensions/-/babel-plugin-svg-em-dimensions-8.0.0.tgz", + "integrity": "sha512-mURHYnu6Iw3UBTbhGwE/vsngtCIbHE43xCRK7kCw4t01xyGqb2Pd+WXekRRoFOBIY29ZoOhUCTEweDMdrjfi9g==", + "dev": true, + "engines": { + "node": ">=14" + }, + "funding": { + "type": "github", + "url": "https://github.com/sponsors/gregberge" + }, + "peerDependencies": { + "@babel/core": "^7.0.0-0" + } + }, + "node_modules/@svgr/babel-plugin-transform-react-native-svg": { + "version": "8.1.0", + "resolved": "https://registry.npmjs.org/@svgr/babel-plugin-transform-react-native-svg/-/babel-plugin-transform-react-native-svg-8.1.0.tgz", + "integrity": "sha512-Tx8T58CHo+7nwJ+EhUwx3LfdNSG9R2OKfaIXXs5soiy5HtgoAEkDay9LIimLOcG8dJQH1wPZp/cnAv6S9CrR1Q==", + "dev": true, + "engines": { + "node": ">=14" + }, + "funding": { + "type": "github", + "url": "https://github.com/sponsors/gregberge" + }, + "peerDependencies": { + "@babel/core": "^7.0.0-0" + } + }, + "node_modules/@svgr/babel-plugin-transform-svg-component": { + "version": "8.0.0", + "resolved": "https://registry.npmjs.org/@svgr/babel-plugin-transform-svg-component/-/babel-plugin-transform-svg-component-8.0.0.tgz", + "integrity": "sha512-DFx8xa3cZXTdb/k3kfPeaixecQLgKh5NVBMwD0AQxOzcZawK4oo1Jh9LbrcACUivsCA7TLG8eeWgrDXjTMhRmw==", + "dev": true, + "engines": { + "node": ">=12" + }, + "funding": { + "type": "github", + "url": "https://github.com/sponsors/gregberge" + }, + "peerDependencies": { + "@babel/core": "^7.0.0-0" + } + }, + "node_modules/@svgr/babel-preset": { + "version": "8.1.0", + "resolved": "https://registry.npmjs.org/@svgr/babel-preset/-/babel-preset-8.1.0.tgz", + "integrity": "sha512-7EYDbHE7MxHpv4sxvnVPngw5fuR6pw79SkcrILHJ/iMpuKySNCl5W1qcwPEpU+LgyRXOaAFgH0KhwD18wwg6ug==", + "dev": true, + "dependencies": { + "@svgr/babel-plugin-add-jsx-attribute": "8.0.0", + "@svgr/babel-plugin-remove-jsx-attribute": "8.0.0", + "@svgr/babel-plugin-remove-jsx-empty-expression": "8.0.0", + "@svgr/babel-plugin-replace-jsx-attribute-value": "8.0.0", + "@svgr/babel-plugin-svg-dynamic-title": "8.0.0", + "@svgr/babel-plugin-svg-em-dimensions": "8.0.0", + "@svgr/babel-plugin-transform-react-native-svg": "8.1.0", + "@svgr/babel-plugin-transform-svg-component": "8.0.0" + }, + "engines": { + "node": ">=14" + }, + "funding": { + "type": "github", + "url": "https://github.com/sponsors/gregberge" + }, + "peerDependencies": { + "@babel/core": "^7.0.0-0" + } + }, + "node_modules/@svgr/core": { + "version": "8.1.0", + "resolved": "https://registry.npmjs.org/@svgr/core/-/core-8.1.0.tgz", + "integrity": "sha512-8QqtOQT5ACVlmsvKOJNEaWmRPmcojMOzCz4Hs2BGG/toAp/K38LcsMRyLp349glq5AzJbCEeimEoxaX6v/fLrA==", + "dev": true, + "dependencies": { + "@babel/core": "^7.21.3", + "@svgr/babel-preset": "8.1.0", + "camelcase": "^6.2.0", + "cosmiconfig": "^8.1.3", + "snake-case": "^3.0.4" + }, + "engines": { + "node": ">=14" + }, + "funding": { + "type": "github", + "url": "https://github.com/sponsors/gregberge" + } + }, + "node_modules/@svgr/hast-util-to-babel-ast": { + "version": "8.0.0", + "resolved": "https://registry.npmjs.org/@svgr/hast-util-to-babel-ast/-/hast-util-to-babel-ast-8.0.0.tgz", + "integrity": "sha512-EbDKwO9GpfWP4jN9sGdYwPBU0kdomaPIL2Eu4YwmgP+sJeXT+L7bMwJUBnhzfH8Q2qMBqZ4fJwpCyYsAN3mt2Q==", + "dev": true, + "dependencies": { + "@babel/types": "^7.21.3", + "entities": "^4.4.0" + }, + "engines": { + "node": ">=14" + }, + "funding": { + "type": "github", + "url": "https://github.com/sponsors/gregberge" + } + }, + "node_modules/@svgr/plugin-jsx": { + "version": "8.1.0", + "resolved": "https://registry.npmjs.org/@svgr/plugin-jsx/-/plugin-jsx-8.1.0.tgz", + "integrity": "sha512-0xiIyBsLlr8quN+WyuxooNW9RJ0Dpr8uOnH/xrCVO8GLUcwHISwj1AG0k+LFzteTkAA0GbX0kj9q6Dk70PTiPA==", + "dev": true, + "dependencies": { + "@babel/core": "^7.21.3", + "@svgr/babel-preset": "8.1.0", + "@svgr/hast-util-to-babel-ast": "8.0.0", + "svg-parser": "^2.0.4" + }, + "engines": { + "node": ">=14" + }, + "funding": { + "type": "github", + "url": "https://github.com/sponsors/gregberge" + }, + "peerDependencies": { + "@svgr/core": "*" + } + }, "node_modules/@testing-library/dom": { "version": "10.1.0", "resolved": "https://registry.npmjs.org/@testing-library/dom/-/dom-10.1.0.tgz", @@ -5128,6 +5343,18 @@ "node": ">=6" } }, + "node_modules/camelcase": { + "version": "6.3.0", + "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-6.3.0.tgz", + "integrity": "sha512-Gmy6FhYlCY7uOElZUSbxo2UCDH8owEk996gkbrpsgGtrJLM3J7jGxl9Ic7Qwwj4ivOE5AWZWRMecDdF7hqGjFA==", + "dev": true, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, "node_modules/camelcase-css": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/camelcase-css/-/camelcase-css-2.0.1.tgz", @@ -5278,6 +5505,11 @@ "consola": "^3.2.3" } }, + "node_modules/classnames": { + "version": "2.5.1", + "resolved": "https://registry.npmjs.org/classnames/-/classnames-2.5.1.tgz", + "integrity": "sha512-saHYOzhIQs6wy2sVxTM6bUDsQO4F50V9RQ22qBpEdCW+I+/Wmke2HOl6lS6dTpdxVhb88/I6+Hs+438c3lfUow==" + }, "node_modules/cli-cursor": { "version": "3.1.0", "resolved": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-3.1.0.tgz", @@ -5443,6 +5675,32 @@ "url": "https://opencollective.com/core-js" } }, + "node_modules/cosmiconfig": { + "version": "8.3.6", + "resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-8.3.6.tgz", + "integrity": "sha512-kcZ6+W5QzcJ3P1Mt+83OUv/oHFqZHIx8DuxG6eZ5RGMERoLqp4BuGjhHLYGK+Kf5XVkQvqBSmAy/nGWN3qDgEA==", + "dev": true, + "dependencies": { + "import-fresh": "^3.3.0", + "js-yaml": "^4.1.0", + "parse-json": "^5.2.0", + "path-type": "^4.0.0" + }, + "engines": { + "node": ">=14" + }, + "funding": { + "url": "https://github.com/sponsors/d-fischer" + }, + "peerDependencies": { + "typescript": ">=4.9.5" + }, + "peerDependenciesMeta": { + "typescript": { + "optional": true + } + } + }, "node_modules/cross-spawn": { "version": "7.0.3", "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz", @@ -5734,6 +5992,16 @@ "integrity": "sha512-X7BJ2yElsnOJ30pZF4uIIDfBEVgF4XEBxL9Bxhy6dnrm5hkzqmsWHGTiHqRiITNhMyFLyAiWndIJP7Z1NTteDg==", "dev": true }, + "node_modules/dot-case": { + "version": "3.0.4", + "resolved": "https://registry.npmjs.org/dot-case/-/dot-case-3.0.4.tgz", + "integrity": "sha512-Kv5nKlh6yRrdrGvxeJ2e5y2eRUpkUosIW4A2AS38zwSz27zu7ufDwQPi5Jhs3XAlGNetl3bmnGhQsMtkKJnj3w==", + "dev": true, + "dependencies": { + "no-case": "^3.0.4", + "tslib": "^2.0.3" + } + }, "node_modules/eastasianwidth": { "version": "0.2.0", "resolved": "https://registry.npmjs.org/eastasianwidth/-/eastasianwidth-0.2.0.tgz", @@ -5767,6 +6035,18 @@ "node": ">= 0.8" } }, + "node_modules/entities": { + "version": "4.5.0", + "resolved": "https://registry.npmjs.org/entities/-/entities-4.5.0.tgz", + "integrity": "sha512-V0hjH4dGPh9Ao5p0MoRY6BVqtwCjhz6vI5LT8AJ55H+4g9/4vbHx1I54fS0XuclLhDHArPQCiMjDxjaL8fPxhw==", + "dev": true, + "engines": { + "node": ">=0.12" + }, + "funding": { + "url": "https://github.com/fb55/entities?sponsor=1" + } + }, "node_modules/envinfo": { "version": "7.13.0", "resolved": "https://registry.npmjs.org/envinfo/-/envinfo-7.13.0.tgz", @@ -5779,6 +6059,15 @@ "node": ">=4" } }, + "node_modules/error-ex": { + "version": "1.3.2", + "resolved": "https://registry.npmjs.org/error-ex/-/error-ex-1.3.2.tgz", + "integrity": "sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==", + "dev": true, + "dependencies": { + "is-arrayish": "^0.2.1" + } + }, "node_modules/es-abstract": { "version": "1.23.3", "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.23.3.tgz", @@ -7359,6 +7648,12 @@ "url": "https://github.com/sponsors/ljharb" } }, + "node_modules/is-arrayish": { + "version": "0.2.1", + "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz", + "integrity": "sha512-zz06S8t0ozoDXMG+ube26zeCTNXcKIPJZJi8hBrF4idCLms4CG9QtK7qBl1boi5ODzFpjswb5JPmHCbMpjaYzg==", + "dev": true + }, "node_modules/is-async-function": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/is-async-function/-/is-async-function-2.0.0.tgz", @@ -7957,6 +8252,12 @@ "integrity": "sha512-4bV5BfR2mqfQTJm+V5tPPdf+ZpuhiIvTuAB5g8kcrXOZpTT/QwwVRWBywX1ozr6lEuPdbHxwaJlm9G6mI2sfSQ==", "dev": true }, + "node_modules/json-parse-even-better-errors": { + "version": "2.3.1", + "resolved": "https://registry.npmjs.org/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz", + "integrity": "sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w==", + "dev": true + }, "node_modules/json-schema-traverse": { "version": "0.4.1", "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz", @@ -8211,6 +8512,15 @@ "get-func-name": "^2.0.1" } }, + "node_modules/lower-case": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/lower-case/-/lower-case-2.0.2.tgz", + "integrity": "sha512-7fm3l3NAF9WfN6W3JOmf5drwpVqX78JtoGJ3A6W0a6ZnldM41w2fV5D490psKFTpMds8TJse/eHLFFsNHHjHgg==", + "dev": true, + "dependencies": { + "tslib": "^2.0.3" + } + }, "node_modules/lru-cache": { "version": "5.1.1", "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-5.1.1.tgz", @@ -8524,6 +8834,16 @@ "integrity": "sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==", "dev": true }, + "node_modules/no-case": { + "version": "3.0.4", + "resolved": "https://registry.npmjs.org/no-case/-/no-case-3.0.4.tgz", + "integrity": "sha512-fgAN3jGAh+RoxUGZHTSOLJIqUc2wmoBwGR4tbpNAKmmovFoWq0OdRkb0VkldReO2a2iBT/OEulG9XSUc10r3zg==", + "dev": true, + "dependencies": { + "lower-case": "^2.0.2", + "tslib": "^2.0.3" + } + }, "node_modules/node-dir": { "version": "0.1.17", "resolved": "https://registry.npmjs.org/node-dir/-/node-dir-0.1.17.tgz", @@ -9035,6 +9355,24 @@ "node": ">=6" } }, + "node_modules/parse-json": { + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-5.2.0.tgz", + "integrity": "sha512-ayCKvm/phCGxOkYRSCM82iDwct8/EonSEgCSxWxD7ve6jHggsFl4fZVQBPRNgQoKiuV/odhFrGzQXZwbifC8Rg==", + "dev": true, + "dependencies": { + "@babel/code-frame": "^7.0.0", + "error-ex": "^1.3.1", + "json-parse-even-better-errors": "^2.3.0", + "lines-and-columns": "^1.1.6" + }, + "engines": { + "node": ">=8" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, "node_modules/parseurl": { "version": "1.3.3", "resolved": "https://registry.npmjs.org/parseurl/-/parseurl-1.3.3.tgz", @@ -10377,6 +10715,16 @@ "node": ">=8" } }, + "node_modules/snake-case": { + "version": "3.0.4", + "resolved": "https://registry.npmjs.org/snake-case/-/snake-case-3.0.4.tgz", + "integrity": "sha512-LAOh4z89bGQvl9pFfNF8V146i7o7/CqFPbqzYgP+yYzDIDeS9HaNFtXABamRW+AQzEVODcvE79ljJ+8a9YSdMg==", + "dev": true, + "dependencies": { + "dot-case": "^3.0.4", + "tslib": "^2.0.3" + } + }, "node_modules/source-map": { "version": "0.6.1", "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", @@ -10923,6 +11271,12 @@ "url": "https://github.com/sponsors/ljharb" } }, + "node_modules/svg-parser": { + "version": "2.0.4", + "resolved": "https://registry.npmjs.org/svg-parser/-/svg-parser-2.0.4.tgz", + "integrity": "sha512-e4hG1hRwoOdRb37cIMSgzNsxyzKfayW6VOflrwvR+/bzrkyxY/31WkbgnQpgtrNp1SdpJvpUAGTa/ZoiPNDuRQ==", + "dev": true + }, "node_modules/tailwindcss": { "version": "3.4.10", "resolved": "https://registry.npmjs.org/tailwindcss/-/tailwindcss-3.4.10.tgz", @@ -11347,20 +11701,6 @@ "url": "https://github.com/sponsors/ljharb" } }, - "node_modules/typescript": { - "version": "5.5.4", - "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.5.4.tgz", - "integrity": "sha512-Mtq29sKDAEYP7aljRgtPOpTvOfbwRWlS6dPRzwjdE+C0R4brX/GUyhHSecbHMFLNBLcJIPt9nl9yG5TZ1weH+Q==", - "dev": true, - "peer": true, - "bin": { - "tsc": "bin/tsc", - "tsserver": "bin/tsserver" - }, - "engines": { - "node": ">=14.17" - } - }, "node_modules/ufo": { "version": "1.5.4", "resolved": "https://registry.npmjs.org/ufo/-/ufo-1.5.4.tgz", @@ -11674,6 +12014,20 @@ } } }, + "node_modules/vite-plugin-svgr": { + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/vite-plugin-svgr/-/vite-plugin-svgr-4.2.0.tgz", + "integrity": "sha512-SC7+FfVtNQk7So0XMjrrtLAbEC8qjFPifyD7+fs/E6aaNdVde6umlVVh0QuwDLdOMu7vp5RiGFsB70nj5yo0XA==", + "dev": true, + "dependencies": { + "@rollup/pluginutils": "^5.0.5", + "@svgr/core": "^8.1.0", + "@svgr/plugin-jsx": "^8.1.0" + }, + "peerDependencies": { + "vite": "^2.6.0 || 3 || 4 || 5" + } + }, "node_modules/walk-up-path": { "version": "3.0.1", "resolved": "https://registry.npmjs.org/walk-up-path/-/walk-up-path-3.0.1.tgz", diff --git a/package.json b/package.json index 492d43c..bcadfc3 100644 --- a/package.json +++ b/package.json @@ -12,6 +12,7 @@ "build-storybook": "storybook build" }, "dependencies": { + "classnames": "^2.5.1", "react": "^18.3.1", "react-dom": "^18.3.1", "react-router-dom": "^6.26.0" @@ -39,6 +40,7 @@ "prop-types": "^15.8.1", "storybook": "^8.2.8", "tailwindcss": "^3.4.10", - "vite": "^5.3.1" + "vite": "^5.3.1", + "vite-plugin-svgr": "^4.2.0" } } diff --git a/src/components/Button.jsx b/src/components/Button.jsx new file mode 100644 index 0000000..829c75c --- /dev/null +++ b/src/components/Button.jsx @@ -0,0 +1,54 @@ +import PropTypes from "prop-types"; +import { Link } from "react-router-dom"; +import classNames from "classnames"; + +const Button = ({ text, variant, size, to, fullWidth, children, ...props }) => { + const buttonClass = classNames( + "inline-flex gap-2 items-center justify-center font-semibold transition-colors duration-300 rounded-lg", + { + "bg-orange-500 text-white hover:bg-red-500 justify-between": + variant === "default", + "bg-black text-white hover:bg-orange-500": variant === "black", + "border-2 border-orange-500 !text-xl text-orange-500 hover:bg-black hover:border-black hover:text-white group": + variant === "outline", + "bg-black text-white hover:bg-orange-500 !rounded-full !gap-0 !p-4 w-[60px] h-[60px]": + variant === "circular", + "w-full !justify-center": fullWidth, + "py-4 px-10 text-xl": size === "large", + "py-2 px-6 text-lg": size === "medium", + "py-1 px-4 text-sm": size === "small", + } + ); + + const ButtonComponent = to ? Link : "button"; + + return ( + + {children ? ( + <> + {text} + {children} + + ) : ( + text + )} + + ); +}; + +Button.propTypes = { + text: PropTypes.string.isRequired, + variant: PropTypes.oneOf(["default", "black", "outline", "circular"]), + size: PropTypes.oneOf(["small", "medium", "large"]), + to: PropTypes.string, + fullWidth: PropTypes.bool, + children: PropTypes.node, +}; + +Button.defaultProps = { + variant: "default", + size: "medium", + fullWidth: false, +}; + +export default Button; diff --git a/src/components/button/ArrowButton.jsx b/src/components/button/ArrowButton.jsx deleted file mode 100644 index 6e8b86b..0000000 --- a/src/components/button/ArrowButton.jsx +++ /dev/null @@ -1,13 +0,0 @@ -import PropTypes from "prop-types"; - -const CircularButton = ({ icon: Icon }) => ( - -); - -CircularButton.propTypes = { - icon: PropTypes.elementType, -}; - -export default CircularButton; diff --git a/src/components/button/BlackButton.jsx b/src/components/button/BlackButton.jsx deleted file mode 100644 index 397c7f4..0000000 --- a/src/components/button/BlackButton.jsx +++ /dev/null @@ -1,17 +0,0 @@ -import PropTypes from "prop-types"; -import { Link } from "react-router-dom"; - -const BlackButton = ({ text }) => ( - - {text} - -); - -BlackButton.propTypes = { - text: PropTypes.string.isRequired, -}; - -export default BlackButton; diff --git a/src/components/button/DefaultNavigationButton .jsx b/src/components/button/DefaultNavigationButton .jsx deleted file mode 100644 index 9279403..0000000 --- a/src/components/button/DefaultNavigationButton .jsx +++ /dev/null @@ -1,19 +0,0 @@ -import PropTypes from "prop-types"; -import { Link } from "react-router-dom"; - -const DefaultButton = ({ text, icon: Icon }) => ( - - {text} - {Icon && } - -); - -DefaultButton.propTypes = { - text: PropTypes.string.isRequired, - icon: PropTypes.elementType, -}; - -export default DefaultButton; diff --git a/src/components/button/OutlineNavigationButton.jsx b/src/components/button/OutlineNavigationButton.jsx deleted file mode 100644 index 2bd3585..0000000 --- a/src/components/button/OutlineNavigationButton.jsx +++ /dev/null @@ -1,19 +0,0 @@ -import PropTypes from "prop-types"; -import { Link } from "react-router-dom"; - -const OutlineButton = ({ text, icon: Icon }) => ( - - {Icon && } - {text} - -); - -OutlineButton.propTypes = { - text: PropTypes.string.isRequired, - icon: PropTypes.elementType, -}; - -export default OutlineButton; diff --git a/src/components/button/icons/arrow-icon.jsx b/src/components/button/icons/arrow-icon.jsx deleted file mode 100644 index 719a52d..0000000 --- a/src/components/button/icons/arrow-icon.jsx +++ /dev/null @@ -1,10 +0,0 @@ -const ArrowIcon = () => ( - - - -); - -export default ArrowIcon; diff --git a/src/stories/Button.stories.jsx b/src/stories/Button.stories.jsx new file mode 100644 index 0000000..e6db99b --- /dev/null +++ b/src/stories/Button.stories.jsx @@ -0,0 +1,131 @@ +import Button from "../components/Button"; + +// Default export that defines the title of the component in Storybook and its component +export default { + title: "Components/Button", + component: Button, + tags: ["autodocs"], + argTypes: { + text: { control: "text" }, + variant: { + control: "select", + options: ["default", "black", "outline", "circular"], + }, + size: { control: "select", options: ["small", "medium", "large"] }, + fullWidth: { control: "boolean" }, + to: { control: false }, + }, +}; + +// Template to create different stories using args +const Template = (args) => ); }; @@ -43,6 +61,7 @@ Button.propTypes = { to: PropTypes.string, fullWidth: PropTypes.bool, children: PropTypes.node, + onClick: PropTypes.func, }; Button.defaultProps = { diff --git a/src/stories/Button.stories.jsx b/src/stories/Button.stories.jsx index e6db99b..bbb6f8d 100644 --- a/src/stories/Button.stories.jsx +++ b/src/stories/Button.stories.jsx @@ -39,6 +39,10 @@ Default.argTypes = { children: { table: { disable: true }, }, + variant: { + control: "select", + options: ["default", "black", "outline"], + }, }; // Black Button @@ -52,6 +56,10 @@ Black.argTypes = { children: { table: { disable: true }, }, + variant: { + control: "select", + options: ["default", "black", "outline"], + }, }; // Outline Button export const Outline = Template.bind({}); @@ -77,6 +85,10 @@ Outline.argTypes = { children: { table: { disable: true }, }, + variant: { + control: "select", + options: ["default", "black", "outline"], + }, }; // Circular Button