diff --git a/.storybook/main.js b/.storybook/main.js index 1a9c714..e8295d5 100644 --- a/.storybook/main.js +++ b/.storybook/main.js @@ -17,4 +17,11 @@ module.exports = { }, }, framework: '@storybook/react', + webpackFinal: async (config) => { + config.resolve.alias = { + ...config.resolve.alias, + '~': path.resolve(__dirname, '../app'), + }; + return config; + }, }; diff --git a/README.md b/README.md index 8139428..5301759 100644 --- a/README.md +++ b/README.md @@ -2,7 +2,6 @@ - [Remix Docs](https://remix.run/docs) - The staging site is deployed at https://staging-calendar.realdevsquad.com/ diff --git a/app/stories/eventCard.stories.tsx b/app/stories/eventCard.stories.tsx index 67d1264..e1fd775 100644 --- a/app/stories/eventCard.stories.tsx +++ b/app/stories/eventCard.stories.tsx @@ -1,19 +1,19 @@ import { Story, Meta } from '@storybook/react'; -import { Event } from '~/utils/interfaces'; -import EventCard from '../components/common/eventCard/index'; +import { CalEvent } from '~/utils/interfaces'; +import EventCard from '~/components/common/eventCard/index'; export default { title: 'Components/EventCard', component: EventCard, argTypes: { - name: { control: 'text' }, + title: { control: 'text' }, }, } as Meta; -const Template: Story = (args: Event) => ; +const Template: Story = (args: CalEvent) => ; export const Primary = Template.bind({}); Primary.args = { - name: 'Example Event', + title: 'Example Event', attendees: [], }; diff --git a/app/styles/tailwind.css b/app/styles/tailwind.css index c3205af..5b1226d 100644 --- a/app/styles/tailwind.css +++ b/app/styles/tailwind.css @@ -574,6 +574,10 @@ video { left: 0px; } +.top-4 { + top: 1rem; +} + .top-0 { top: 0px; } @@ -582,10 +586,6 @@ video { left: 0px; } -.top-4 { - top: 1rem; -} - .bottom-0 { bottom: 0px; } @@ -638,14 +638,14 @@ video { margin: 1rem; } -.m-0 { - margin: 0px; -} - .m-auto { margin: auto; } +.m-0 { + margin: 0px; +} + .my-2 { margin-top: 0.5rem; margin-bottom: 0.5rem; @@ -681,16 +681,16 @@ video { margin-right: 0.5rem; } -.my-6 { - margin-top: 1.5rem; - margin-bottom: 1.5rem; -} - .mx-1 { margin-left: 0.25rem; margin-right: 0.25rem; } +.my-6 { + margin-top: 1.5rem; + margin-bottom: 1.5rem; +} + .mt-8 { margin-top: 2rem; } @@ -731,10 +731,6 @@ video { margin-left: 0.5rem; } -.mb-4 { - margin-bottom: 1rem; -} - .ml-0 { margin-left: 0px; } @@ -743,6 +739,10 @@ video { margin-left: -8px; } +.mb-4 { + margin-bottom: 1rem; +} + .mt-2 { margin-top: 0.5rem; } @@ -819,10 +819,6 @@ video { height: 8rem; } -.h-\[95vh\] { - height: 95vh; -} - .h-72 { height: 18rem; } @@ -831,6 +827,10 @@ video { height: 3rem; } +.h-\[95vh\] { + height: 95vh; +} + .h-16 { height: 4rem; } @@ -872,10 +872,6 @@ video { width: 20rem; } -.w-4 { - width: 1rem; -} - .w-64 { width: 16rem; } @@ -884,6 +880,10 @@ video { width: 2.5rem; } +.w-4 { + width: 1rem; +} + .w-16 { width: 4rem; } @@ -1018,6 +1018,12 @@ video { gap: 1rem; } +.divide-y > :not([hidden]) ~ :not([hidden]) { + --tw-divide-y-reverse: 0; + border-top-width: calc(1px * calc(1 - var(--tw-divide-y-reverse))); + border-bottom-width: calc(1px * var(--tw-divide-y-reverse)); +} + .self-center { align-self: center; } @@ -1026,12 +1032,6 @@ video { overflow: auto; } -.divide-y > :not([hidden]) ~ :not([hidden]) { - --tw-divide-y-reverse: 0; - border-top-width: calc(1px * calc(1 - var(--tw-divide-y-reverse))); - border-bottom-width: calc(1px * var(--tw-divide-y-reverse)); -} - .overflow-hidden { overflow: hidden; } @@ -1161,6 +1161,11 @@ video { border-color: rgb(168 162 158 / var(--tw-border-opacity)); } +.border-black { + --tw-border-opacity: 1; + border-color: rgb(0 0 0 / var(--tw-border-opacity)); +} + .border-stone-50 { --tw-border-opacity: 1; border-color: rgb(250 250 249 / var(--tw-border-opacity)); @@ -1171,11 +1176,6 @@ video { border-color: rgb(229 229 229 / var(--tw-border-opacity)); } -.border-black { - --tw-border-opacity: 1; - border-color: rgb(0 0 0 / var(--tw-border-opacity)); -} - .border-red-600 { --tw-border-opacity: 1; border-color: rgb(220 38 38 / var(--tw-border-opacity)); @@ -1226,6 +1226,11 @@ video { background-color: rgb(209 213 219 / var(--tw-bg-opacity)); } +.bg-gray-200 { + --tw-bg-opacity: 1; + background-color: rgb(229 231 235 / var(--tw-bg-opacity)); +} + .bg-black { --tw-bg-opacity: 1; background-color: rgb(0 0 0 / var(--tw-bg-opacity)); @@ -1246,21 +1251,6 @@ video { background-color: rgb(229 229 229 / var(--tw-bg-opacity)); } -.bg-gray-100 { - --tw-bg-opacity: 1; - background-color: rgb(243 244 246 / var(--tw-bg-opacity)); -} - -.bg-gray-200 { - --tw-bg-opacity: 1; - background-color: rgb(229 231 235 / var(--tw-bg-opacity)); -} - -.bg-gray-300 { - --tw-bg-opacity: 1; - background-color: rgb(209 213 219 / var(--tw-bg-opacity)); -} - .bg-\[\#D9D9D9\] { --tw-bg-opacity: 1; background-color: rgb(217 217 217 / var(--tw-bg-opacity)); @@ -1415,6 +1405,11 @@ video { line-height: 1rem; } +.text-base { + font-size: 1rem; + line-height: 1.5rem; +} + .text-\[32px\] { font-size: 32px; } @@ -1423,11 +1418,6 @@ video { font-size: 14px; } -.text-base { - font-size: 1rem; - line-height: 1.5rem; -} - .text-\[12px\] { font-size: 12px; } @@ -1492,11 +1482,6 @@ video { color: rgb(30 58 138 / var(--tw-text-opacity)); } -.text-slate-900 { - --tw-text-opacity: 1; - color: rgb(15 23 42 / var(--tw-text-opacity)); -} - .text-gray-500 { --tw-text-opacity: 1; color: rgb(107 114 128 / var(--tw-text-opacity)); @@ -1517,9 +1502,9 @@ video { color: rgb(0 0 0 / var(--tw-text-opacity)); } -.text-\[\#737373\] { +.text-red-600 { --tw-text-opacity: 1; - color: rgb(115 115 115 / var(--tw-text-opacity)); + color: rgb(220 38 38 / var(--tw-text-opacity)); } .text-neutral-500 { @@ -1527,11 +1512,6 @@ video { color: rgb(115 115 115 / var(--tw-text-opacity)); } -.text-red-600 { - --tw-text-opacity: 1; - color: rgb(220 38 38 / var(--tw-text-opacity)); -} - .text-\[\#737373\] { --tw-text-opacity: 1; color: rgb(115 115 115 / var(--tw-text-opacity)); @@ -1541,14 +1521,14 @@ video { text-decoration-line: underline; } -.underline-offset-4 { - text-underline-offset: 4px; -} - .underline-offset-2 { text-underline-offset: 2px; } +.underline-offset-4 { + text-underline-offset: 4px; +} + .opacity-100 { opacity: 1; }