Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

feat: cn util with clsx #31

Merged
merged 5 commits into from
Dec 31, 2023
Merged

feat: cn util with clsx #31

merged 5 commits into from
Dec 31, 2023

Conversation

Willem-Jaap
Copy link
Contributor

Fixes #29

@vercel Vercel
Copy link

vercel bot commented Dec 30, 2023

@Willem-Jaap is attempting to deploy a commit to the Tom Team on Vercel.

A member of the Team first needs to authorize it.

@Willem-Jaap
Copy link
Contributor Author

I don't know whats going on with the formatting, I ran prettier --write \"**/*.{ts,tsx}\" but that results in a change in almost every file

QuiiBz
QuiiBz requested changes Dec 31, 2023
View reviewed changes
Copy link
Owner

@QuiiBz QuiiBz left a comment

Choose a reason for hiding this comment

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

Thanks a lot! Two small suggestions:

apps/dashboard/package.json Outdated Show resolved Hide resolved
apps/dashboard/src/components/Element.tsx Outdated Show resolved Hide resolved
@Willem-Jaap Willem-Jaap requested a review from QuiiBz December 31, 2023 11:34
@QuiiBz QuiiBz changed the title feat: cn util with clsx & tailwind-merge feat: cn util with clsx Dec 31, 2023
@vercel Vercel
Copy link

vercel bot commented Dec 31, 2023 •
edited
Loading

The latest updates on your projects. Learn more about Vercel for Git ↗︎

Name Status Preview Comments Updated (UTC)
ogstudio ✅ Ready (Inspect) Visit Preview 💬 Add feedback Dec 31, 2023 0:56am

QuiiBz
QuiiBz approved these changes Dec 31, 2023
View reviewed changes
Copy link
Owner

@QuiiBz QuiiBz left a comment

Choose a reason for hiding this comment

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

Thanks! Let's keep it without tailwind-merge for now, and if we found out that it could be useful we can still add it later.

@QuiiBz QuiiBz merged commit 5fdbc69 into QuiiBz:main Dec 31, 2023
6 checks passed
@Willem-Jaap Willem-Jaap deleted the cn-util branch December 31, 2023 14:15
@QuiiBz QuiiBz mentioned this pull request Jan 1, 2024
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@QuiiBz QuiiBz QuiiBz approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Use clsx to handle optional classes
2 participants
@Willem-Jaap @QuiiBz