Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions .storybook/main.js
Original file line number Diff line number Diff line change
Expand Up @@ -17,4 +17,11 @@ module.exports = {
},
},
framework: '@storybook/react',
webpackFinal: async (config) => {
config.resolve.alias = {
...config.resolve.alias,
'~': path.resolve(__dirname, '../app'),
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nit pick:
There is a general practise of using @ instead of ~ for path alias.

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@samyakshah3008 Has this been considered as well?

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If we use @ then we need to change it everywhere in our codebase where we have used ~
Shall I do it in this PR? @harshith-venkatesh @iRohitGaur ? Your thoughts?

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It will be a one-time Change I feel should not be a problem.

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please consider it as it is application level change

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Great in that case, please go ahead and create a ticket linking this PR as well and mention the expectations of that ticket.
We can assign the ticket to the beginner as well :)

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

*issue

Copy link
Copy Markdown
Contributor

@yesyash yesyash Apr 14, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

True, but that also means all the files of story book in the application might be affected right. Might there be a chance, due to this condition, few components might not work right in story book?

Disagree here, if the paths are set right there will not be any problem as I have done this before.

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I guess I got confused with the intent of the ticket and its impact which had led to this discussion.
Thanks for providing more clarity @yesyash @samyakshah3008

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sounds great, I have raised a ticket #143 @harshith-venkatesh @yesyash 😄
Thanks @yesyash for bringing out this discussion!

};
return config;
},
};
1 change: 0 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@

- [Remix Docs](https://remix.run/docs)


The staging site is deployed at
https://staging-calendar.realdevsquad.com/

Expand Down
10 changes: 5 additions & 5 deletions app/stories/eventCard.stories.tsx
Original file line number Diff line number Diff line change
@@ -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<Event> = (args: Event) => <EventCard {...args} />;
const Template: Story<CalEvent> = (args: CalEvent) => <EventCard {...args} />;

export const Primary = Template.bind({});
Primary.args = {
name: 'Example Event',
title: 'Example Event',
attendees: [],
};
124 changes: 52 additions & 72 deletions app/styles/tailwind.css
Original file line number Diff line number Diff line change
Expand Up @@ -574,6 +574,10 @@ video {
left: 0px;
}

.top-4 {
top: 1rem;
}

.top-0 {
top: 0px;
}
Expand All @@ -582,10 +586,6 @@ video {
left: 0px;
}

.top-4 {
top: 1rem;
}

.bottom-0 {
bottom: 0px;
}
Expand Down Expand Up @@ -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;
Expand Down Expand Up @@ -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;
}
Expand Down Expand Up @@ -731,10 +731,6 @@ video {
margin-left: 0.5rem;
}

.mb-4 {
margin-bottom: 1rem;
}

.ml-0 {
margin-left: 0px;
}
Expand All @@ -743,6 +739,10 @@ video {
margin-left: -8px;
}

.mb-4 {
margin-bottom: 1rem;
}

.mt-2 {
margin-top: 0.5rem;
}
Expand Down Expand Up @@ -819,10 +819,6 @@ video {
height: 8rem;
}

.h-\[95vh\] {
height: 95vh;
}

.h-72 {
height: 18rem;
}
Expand All @@ -831,6 +827,10 @@ video {
height: 3rem;
}

.h-\[95vh\] {
height: 95vh;
}

.h-16 {
height: 4rem;
}
Expand Down Expand Up @@ -872,10 +872,6 @@ video {
width: 20rem;
}

.w-4 {
width: 1rem;
}

.w-64 {
width: 16rem;
}
Expand All @@ -884,6 +880,10 @@ video {
width: 2.5rem;
}

.w-4 {
width: 1rem;
}

.w-16 {
width: 4rem;
}
Expand Down Expand Up @@ -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;
}
Expand All @@ -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;
}
Expand Down Expand Up @@ -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));
Expand All @@ -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));
Expand Down Expand Up @@ -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));
Expand All @@ -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));
Expand Down Expand Up @@ -1415,6 +1405,11 @@ video {
line-height: 1rem;
}

.text-base {
font-size: 1rem;
line-height: 1.5rem;
}

.text-\[32px\] {
font-size: 32px;
}
Expand All @@ -1423,11 +1418,6 @@ video {
font-size: 14px;
}

.text-base {
font-size: 1rem;
line-height: 1.5rem;
}

.text-\[12px\] {
font-size: 12px;
}
Expand Down Expand Up @@ -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));
Expand All @@ -1517,21 +1502,16 @@ 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 {
--tw-text-opacity: 1;
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));
Expand All @@ -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;
}
Expand Down