-
Notifications
You must be signed in to change notification settings - Fork 5
Feature/wineid #49
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
Feature/wineid #49
Changes from 18 commits
Commits
Show all changes
29 commits
Select commit
Hold shift + click to select a range
31c6320
feat: [wineid]ui๊ตฌํ+๋ฆฌ๋ทฐ์นด๋ ์์น์กฐ์
626-ju 61a4e6e
fix: gnb z์ธ๋ฑ์ค ์์น ์์
626-ju d36663d
feat: shadcn progress์ถ๊ฐ
626-ju 97cfb38
feat:ํ๋ก๊ทธ๋ ์ค ui์ถ๊ฐ
626-ju 2e45e7d
refactor: WineRating.tsx ๋ฐฐ์น ๊ฐ์
626-ju 6996733
Merge branch 'dev' into feature/wineid
626-ju c904f73
feat:ํ๊ท ๋ณ์ ์ปดํฌ๋ํธ ์ถ๊ฐ + ๋ณ์ ๋ฑ์ง ๋ด๋ถ๊ฐ๊ฒฉ ์ํญ ์กฐ์
626-ju 275c726
Merge branch 'dev' into feature/wineid
626-ju 6a07a20
feat: FlavorSliderList ์ถ๊ฐ+์ผ๋ฐฅ+์ข์์๋ฒํผ ์ถ๊ฐ
626-ju b6d0cd7
feat: ReviewCard์ปดํฌ๋ํธ์ useClickToggle ํ
์ถ๊ฐํ๊ธฐ
626-ju e769a1b
feat: ์นด๋ ์ด๊ณ ๋ซ๊ณ ์ ๋๋ฉ์ด์
์ถ๊ฐ
626-ju f8b1e8d
style: ํฌ๋งทํ
626-ju e9fe01b
refactor: ํ
์คํธ์ฉ ๋๋ฏธ ํ์ผ ๋ถ๋ฆฌ
626-ju 813f3e5
refactor: 1์ฐจ qa ํผ๋๋ฐฑ ๋ฐ์
626-ju 4c0cbe9
build: svgํ์ผ๋ค ํด๋ ๋ณ๊ฒฝ์ ๋ฐ๋ฅธ ์ํฌํธ ๊ฒฝ๋ก ์์
626-ju dca39e1
Merge branch 'dev' into feature/wineid
626-ju 91064d0
chore: ๋ถํ์ํ ์ฃผ์ ์ ๊ฑฐ
626-ju fc5f8c1
feat: ์ผ๋ฐฅ์ ์ถ๊ฐ ๋๋๋ค์ด ์ถ๊ฐ+์ถํ ์ ์ง๋ ๊ป๋ก ๊ต์ฒด
626-ju e4007fc
feat: og ์ด๋ฏธ์ง ์ถ๊ฐ
626-ju 49419ad
fix: env๋ค์ด๊ฐ ๊ฑฐ ๋นผ๊ธฐ
626-ju 16d5e45
fix:og์ด๋ฏธ์ง ๋๋ฝ ์์
626-ju 60ab8e4
refactor(mentor): hidden->sr-only
626-ju a04e9a4
refactor(mentor): ๋ฆฌ๋ทฐ์นด๋ -> ์ฃผ์คํ๋๊ธฐ๋ฐ ํฉ์ฑ์ปดํฌ๋ํธ
626-ju d62a492
fix: ํ
์คํธ์ ์ ์ฉ๋๋ ํธ๋์ง์
์ ๊ฑฐ
626-ju 4b8c7bd
chore: ์ค๋ช
์ฃผ์ ์ถ๊ฐ
626-ju 2e26ed2
chore: ์ฌ์ฉํ์ง ์๋ useClickToggle.tsx์ญ์ (hooksํด๋๋ ๊ฐ์ด)
626-ju 8f8152a
chore:์คํ
์ด์ง ๋๋ฝ๋ ํ์ผ ์ถ๊ฐ
626-ju ee8b03d
Merge branch 'dev' into feature/wineid
626-ju 26d2e5c
refactor:wineid ์ด๋ฏธ์ง ์นด๋ ๊ทธ๋ผ๋ฐ์ด์
์ถ๊ฐ+์ฒ์ ๋ฆฌ๋ทฐ๋ ์ด๋ฆฌ๊ฒ
626-ju 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
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
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
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
File renamed without changes
File renamed without changes
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
File renamed without changes
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,24 @@ | ||
| import * as React from 'react'; | ||
|
|
||
| import * as ProgressPrimitive from '@radix-ui/react-progress'; | ||
|
|
||
| import { cn } from '@/lib/utils'; | ||
|
|
||
| const Progress = React.forwardRef< | ||
| React.ElementRef<typeof ProgressPrimitive.Root>, | ||
| React.ComponentPropsWithoutRef<typeof ProgressPrimitive.Root> | ||
| >(({ className, value, ...props }, ref) => ( | ||
| <ProgressPrimitive.Root | ||
| ref={ref} | ||
| className={cn('relative h-2 w-full overflow-hidden rounded-full bg-primary/20', className)} | ||
| {...props} | ||
| > | ||
| <ProgressPrimitive.Indicator | ||
| className='h-full w-full flex-1 bg-primary transition-all' | ||
| style={{ transform: `translateX(-${100 - (value || 0)}%)` }} | ||
| /> | ||
| </ProgressPrimitive.Root> | ||
| )); | ||
| Progress.displayName = ProgressPrimitive.Root.displayName; | ||
|
|
||
| export { Progress }; |
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,34 @@ | ||
| import React from 'react'; | ||
|
|
||
| import clsx from 'clsx'; | ||
|
|
||
| import Star from '@/assets/icons/star.svg'; | ||
|
|
||
| interface Props { | ||
| rating: number; | ||
| } | ||
|
|
||
| const STARS = ['1st', '2nd', '3rd', '4th', '5th']; | ||
|
|
||
| function AverageStar({ rating }: Props) { | ||
| const activateStar = Math.floor(rating); | ||
|
|
||
| return ( | ||
| <div className='h-4 md:h-auto w-28'> | ||
| {STARS.map((_, i) => ( | ||
| <li | ||
| key={`star${i}`} | ||
| className={clsx({ | ||
| 'size-4 inline-block mr-1': true, | ||
| 'text-primary': i < activateStar, | ||
| 'text-gray-300': i >= activateStar, | ||
| })} | ||
| > | ||
| <Star /> | ||
| </li> | ||
| ))} | ||
| </div> | ||
| ); | ||
| } | ||
|
|
||
| export default AverageStar; |
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,54 @@ | ||
| import FlavorSlider from '@/components/common/slider/FlavorSlider'; | ||
|
|
||
| interface Props { | ||
| lightBold: number; | ||
| smoothTannic: number; | ||
| drySweet: number; | ||
| softAcidic: number; | ||
| } | ||
|
|
||
| function FlavorSliderList({ | ||
| lightBold = 0, | ||
| smoothTannic = 0, | ||
| drySweet = 0, | ||
| softAcidic = 0, | ||
| }: Props) { | ||
| return ( | ||
| <div className='flex gap-[18px] flex-col mb-4 md:mb-6 xl:mb-[6.5px]'> | ||
| <FlavorSlider | ||
| value={lightBold} | ||
| onChange={() => {}} //onChange๊ฐ ํ์ ํ๋กญ์ด๋ผ | ||
| labelLeft={'๊ฐ๋ฒผ์์'} | ||
| labelRight={'์งํด์'} | ||
| badgeLabel={'๋ฐ๋๊ฐ'} | ||
| disabled | ||
| /> | ||
| <FlavorSlider | ||
| value={smoothTannic} | ||
| onChange={() => {}} | ||
| labelLeft={'๋ถ๋๋ฌ์์'} | ||
| labelRight={'๋ซ์ด์'} | ||
| badgeLabel={'ํ๋'} | ||
| disabled | ||
| /> | ||
| <FlavorSlider | ||
| value={drySweet} | ||
| onChange={() => {}} | ||
| labelLeft={'๋๋ผ์ดํด์'} | ||
| labelRight={'๋ฌ์์'} | ||
| badgeLabel={'๋น๋'} | ||
| disabled | ||
| /> | ||
| <FlavorSlider | ||
| value={softAcidic} | ||
| onChange={() => {}} | ||
| labelLeft={'์์ ์'} | ||
| labelRight={'๋ง์ด์ ์'} | ||
| badgeLabel={'์ฐ๋ฏธ'} | ||
| disabled | ||
| /> | ||
| </div> | ||
| ); | ||
| } | ||
|
|
||
| export default FlavorSliderList; |
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,33 @@ | ||
| import KebabIcon from '@/assets/icons/kebab.svg'; | ||
| import { Button } from '@/components/ui/button'; | ||
|
|
||
| import MenuDropdown from '../common/dropdown/MenuDropdown'; | ||
|
|
||
| function Kebab() { | ||
| //์ ์ง๋์ด ๋ง๋ ๊ฑฐ๋ ๊ฒน์น๋ ๊ฑฐ ๊ฐ์๋ฐ ๋์ค์ ํฉ์ณ์ง๋ฉด ๊ทธ๊ฑธ๋ก ์์ ํด๋๊ฒ ์ต๋๋ค. | ||
| function onSelect(value: string) { | ||
| //-> ์๊ฑฐ ํน์ ์ ๋ฒ์ ๋ฉํ ๋๊ป์ ์ ๋ค๋ฆญ ๊ด๋ จ ํผ๋๋ฐฑ ํด์ฃผ์ ๊ฑฐ ๋ฐ์๋์ด ์์๊น์??? | ||
| if (value === 'update') alert('์์ ํ๊ธฐ ๋ชจ๋ฌ ํธ์ถ'); | ||
| if (value === 'delete') alert('์ ๋ง ์ญ์ ํ๊ฒ ์ต๋๋ค alert ํธ์ถ'); | ||
| } | ||
|
|
||
| return ( | ||
| <MenuDropdown | ||
| options={[ | ||
| { label: '์์ ํ๊ธฐ', value: 'update' }, | ||
| { label: '์ญ์ ํ๊ธฐ', value: 'delete' }, | ||
| ]} | ||
| onSelect={onSelect} | ||
| trigger={ | ||
| <Button | ||
| variant='onlyCancel' | ||
| className='border-0 w-8 h-8 md:w-9.5 md:h-9.5 [&_svg]:w-8 [&_svg]:h-8 hover:text-primary' | ||
| > | ||
| <KebabIcon /> | ||
| </Button> | ||
| } | ||
| ></MenuDropdown> | ||
| ); | ||
| } | ||
|
|
||
| export default Kebab; | ||
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
์์ง์ ๋๋ค! 1์ฐจ QA ํผ๋๋ฐฑ ๋ฐ์ ํ ๋ฐ๋ก ์์ ํ๊ฒ ์ต๋๋ค.