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.

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

feat: add collections table voted state #532

Merged

Conversation

shahin-hq
Copy link
Contributor

@shahin-hq shahin-hq commented Dec 4, 2023

Summary

Closes: https://app.clickup.com/t/86dqnpfvg

Design: https://www.figma.com/file/2Rr7zzoeGGiHYsROvfHaGe/Dashboard?node-id=23916%3A101569&mode=dev

Checklist

  • I checked my UI changes against the design and there are no notable differences
  • I checked my UI changes for any responsiveness issues
  • I checked my (code) changes for obvious issues, debug statements and commented code
  • I opened a corresponding card on Clickup for any remaining TODOs in my code
  • I added a short description on how to test this PR (if necessary)
  • I added a storybook entry for the component that was added (if necessary)
  • Documentation (if necessary)
  • Tests (if necessary)
  • Ready to be merged

shahin-hq and others added 23 commits November 30, 2023 22:17
…able

# Conflicts:
#	resources/js/Pages/Collections/Components/CollectionOfTheMonth/CollectionOfTheMonth.tsx
#	resources/js/Pages/Collections/Index.tsx
…o feat/collections-vote-table

# Conflicts:
#	resources/js/Pages/Collections/Components/CollectionVoting/VoteCollections.tsx
…able

# Conflicts:
#	resources/js/I18n/Locales/en.json
#	resources/js/Pages/Collections/Components/CollectionOfTheMonth/CollectionOfTheMonth.tsx
#	resources/js/Pages/Collections/Components/CollectionOfTheMonth/VoteCollection.tsx
#	resources/js/Pages/Collections/Index.tsx
@shahin-hq shahin-hq changed the title feat: add collection table voted state feat: add collections table voted state Dec 4, 2023
Base automatically changed from feat/collections-vote-table to feat/collections-overview December 5, 2023 09:04
…e-voted-state

# Conflicts:
#	resources/js/Pages/Collections/Components/CollectionVoting/VoteCollections.tsx
…voted-state

# Conflicts:
#	resources/css/app.css
#	resources/js/Pages/Collections/Components/CollectionVoting/VoteCollections.tsx
#	resources/js/Pages/Collections/Index.tsx
#	resources/js/icons.tsx
@shahin-hq shahin-hq marked this pull request as ready for review December 5, 2023 10:27
@@ -145,6 +147,7 @@ const CollectionsIndex = ({
</div>
<div className="mt-12 flex w-full flex-col gap-4 xl:flex-row">
<VoteCollections
votedCollectionId={1}
Copy link
Contributor Author

Choose a reason for hiding this comment

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

set this to undefined to see non-voted states

@ItsANameToo ItsANameToo added this to the 0.13.0 milestone Dec 5, 2023
…voted-state

# Conflicts:
#	resources/js/I18n/Locales/en.json
@crnkovic crnkovic self-assigned this Dec 6, 2023
@ItsANameToo ItsANameToo merged commit 34ae421 into feat/collections-overview Dec 6, 2023
16 checks passed
@ItsANameToo ItsANameToo deleted the feat/collections-table-voted-state branch December 6, 2023 09:55
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants