-
Notifications
You must be signed in to change notification settings - Fork 0
merge dev into stage #111
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
Merged
Merged
merge dev into stage #111
Changes from all commits
Commits
Show all changes
12 commits
Select commit
Hold shift + click to select a range
4363506
seed lower body exercises
aditya-arcot b907732
client - add displayed rows text to table
aditya-arcot 0d1e3bb
client - capitalize exercise names
aditya-arcot 483e105
remove trailing periods from muscle group descriptions
aditya-arcot a1ad50b
client - improve data table layout
aditya-arcot 1a7ad3a
client - update app layout
aditya-arcot 1961eca
client - improve card styling
aditya-arcot cbb4332
client - fix toolbar spacing
aditya-arcot acfdc66
client - hide docs page temporarily
aditya-arcot a083f8e
client - update dashboard layout
aditya-arcot 758de53
server - fix exercise query tests
aditya-arcot 36148bd
client - fix pagination text
aditya-arcot File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,95 @@ | ||
| import * as React from 'react' | ||
|
|
||
| import { | ||
| Card as UICard, | ||
| CardAction as UICardAction, | ||
| CardContent as UICardContent, | ||
| CardDescription as UICardDescription, | ||
| CardFooter as UICardFooter, | ||
| CardHeader as UICardHeader, | ||
| CardTitle as UICardTitle, | ||
| } from '@/components/ui/card' | ||
| import { cn } from '@/lib/utils' | ||
|
|
||
| type CardProps = React.ComponentProps<typeof UICard> | ||
| type CardHeaderProps = React.ComponentProps<typeof UICardHeader> | ||
| type CardTitleProps = React.ComponentProps<typeof UICardTitle> | ||
| type CardDescriptionProps = React.ComponentProps<typeof UICardDescription> | ||
| type CardActionProps = React.ComponentProps<typeof UICardAction> | ||
| type CardContentProps = React.ComponentProps<typeof UICardContent> | ||
| type CardFooterProps = React.ComponentProps<typeof UICardFooter> | ||
|
|
||
| function Card({ className, ...props }: CardProps) { | ||
| return ( | ||
| <UICard | ||
| className={cn( | ||
| 'gap-0 py-1 max-md:mb-0 max-md:rounded-none', | ||
| className | ||
| )} | ||
| {...props} | ||
| /> | ||
| ) | ||
| } | ||
|
|
||
| function CardHeader({ className, ...props }: CardHeaderProps) { | ||
| return ( | ||
| <UICardHeader | ||
| className={cn('-mb-1 pt-1 text-center md:pt-3', className)} | ||
| {...props} | ||
| /> | ||
| ) | ||
| } | ||
|
|
||
| function CardTitle({ className, ...props }: CardTitleProps) { | ||
| return ( | ||
| <UICardTitle | ||
| className={cn('text-xl font-bold', className)} | ||
| {...props} | ||
| /> | ||
| ) | ||
| } | ||
|
|
||
| function CardDescription({ className, ...props }: CardDescriptionProps) { | ||
| return <UICardDescription className={cn('', className)} {...props} /> | ||
| } | ||
|
|
||
| function CardAction({ className, ...props }: CardActionProps) { | ||
| return <UICardAction className={cn('', className)} {...props} /> | ||
| } | ||
|
|
||
| function CardContent({ className, ...props }: CardContentProps) { | ||
| return ( | ||
| <UICardContent | ||
| className={cn('px-2 pb-1 md:px-4 md:pb-3', className)} | ||
| {...props} | ||
| /> | ||
| ) | ||
| } | ||
|
|
||
| function CardFooter({ className, ...props }: CardFooterProps) { | ||
| return ( | ||
| <UICardFooter | ||
| className={cn('px-2 pb-1 md:px-4 md:pb-3', className)} | ||
| {...props} | ||
| /> | ||
| ) | ||
| } | ||
|
|
||
| export { | ||
| Card, | ||
| CardAction, | ||
| CardContent, | ||
| CardDescription, | ||
| CardFooter, | ||
| CardHeader, | ||
| CardTitle, | ||
| } | ||
| export type { | ||
| CardActionProps, | ||
| CardContentProps, | ||
| CardDescriptionProps, | ||
| CardFooterProps, | ||
| CardHeaderProps, | ||
| CardProps, | ||
| CardTitleProps, | ||
| } |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.