-
Notifications
You must be signed in to change notification settings - Fork 3
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/#23] Tab & TextBox & BottomSheet & FilterBottomSheet #34
Merged
Merged
Changes from all commits
Commits
Show all changes
22 commits
Select commit
Hold shift + click to select a range
762c6ba
feat: Tab ์ปดํฌ๋ํธ ๊ตฌํ
ocahs9 475c340
feat: BottomSheet ํ ๊ตฌํ
ocahs9 0f76449
feat: BottomSheet ๋ซ๊ธฐ ๋ฒํผ ๊ธฐ๋ฅ ๊ตฌํ
ocahs9 1b55906
feat: FilterBottom 1์ฐจ ๊ตฌํ
ocahs9 ff009d2
feat: CheckBoxText ์ปดํฌ๋ํธ ๊ตฌํ
ocahs9 70ff22b
design: CheckBoxText ํผ๋ธ๋ฆฌ์ฑ
ocahs9 a7ba48d
feat: DropDownText ์ปดํฌ๋ํธ ๊ตฌํ
ocahs9 ca726bf
Merge branch 'develop' into feat/#23/TabAndBottomSheet
ocahs9 e395566
feat: ํํฐ๋ฐํ
์ํธ 1์ฐจ ์์ฑ
ocahs9 0025bb7
feat: ํํฐ๋ฐํ
์ํธ ๊ตฌํ(๋ฒํผ ๊ธฐ๋ฅ ๊ตฌํ)
ocahs9 fb0d30a
Merge branch 'develop' of https://github.com/SOPT-all/35-APPJAM-WEB-Cโฆ
ocahs9 aa315e9
design: ์นฉ ์ถ๊ฐ
ocahs9 fa67218
Merge branch 'develop' into feat/#23/TabAndBottomSheet
ocahs9 02c5413
feat: filter ๋ฐ์ดํฐ, ํจ์ ์ ์ญํ
ocahs9 c14d83c
refactor: ํํฐ ๋ฐํ
์ํธ zustand๋ก ๋ฆฌํฉํ ๋ง
ocahs9 1ef698d
bug: depth ๊น์ symptoms, disease๊ฐ ํ๋ฉด์ ๋ ๋๋ง ๋์ง ์๋ ๋ฌธ์ ํด๊ฒฐ
ocahs9 f5a8f61
fix: ์ธ๋ฐ์๋ ์ ์ญ ์ํ ์ ๊ฑฐ
ocahs9 fffa1d0
bug: ์ข
๋ฅ์์ ์นฉ ๋๋ ์ ๋ ์์ด ํด์ ๋์ง ์๋ ๋ฒ๊ทธ ํด๊ฒฐ
ocahs9 8504171
bug: ์ธ๋ถ์ ์ํด์ ๋ณํ ์ ์๋ ๋ฒ๊ทธ ์์
ocahs9 203aa34
bug: ์๋ฌด ์นฉ ์์ ๋ ๊ณต๊ฐ ์ฐจ์งํ๋ ๋ฒ๊ทธ ์์ & ๋ฐ์ดํฐ ์ธํ
ํ
์คํธ
ocahs9 63a320a
Merge branch 'develop' into feat/#23/TabAndBottomSheet
ocahs9 840000a
fix: ์ฌ์ฉํ์ง ์๋ ์ฝ๋ ์ ๊ฑฐ
ocahs9 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 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.
This file contains 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,20 @@ | ||
|
||
import type { SVGProps } from "react"; | ||
const SvgCheck = (props: SVGProps<SVGSVGElement>) => ( | ||
<svg | ||
xmlns="http://www.w3.org/2000/svg" | ||
width={24} | ||
height={24} | ||
fill="none" | ||
{...props} | ||
> | ||
<path | ||
stroke="#14B5F0" | ||
strokeLinecap="round" | ||
strokeLinejoin="round" | ||
strokeWidth={2} | ||
d="M20 6 9 17l-5-5" | ||
/> | ||
</svg> | ||
); | ||
export default SvgCheck; |
This file contains 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,20 @@ | ||
import * as React from "react"; | ||
import type { SVGProps } from "react"; | ||
const SvgIcUp = (props: SVGProps<SVGSVGElement>) => ( | ||
<svg | ||
xmlns="http://www.w3.org/2000/svg" | ||
width={21} | ||
height={20} | ||
fill="none" | ||
{...props} | ||
> | ||
<path | ||
stroke="#717171" | ||
strokeLinecap="round" | ||
strokeLinejoin="round" | ||
strokeWidth={1.5} | ||
d="m15.023 12.5-5-5-5 5" | ||
/> | ||
</svg> | ||
); | ||
export default SvgIcUp; |
This file contains 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 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,42 @@ | ||
import { semanticColor } from "@style/styles.css"; | ||
import { style } from "@vanilla-extract/css"; | ||
|
||
export const overlay = style({ | ||
position: "absolute", | ||
top: 0, | ||
left: 0, | ||
zIndex: "99", | ||
|
||
width: "100%", | ||
height: "100vh", | ||
backgroundColor: "rgba(34, 34, 34, 0.2)", | ||
}); | ||
|
||
export const bottomSheet = style({ | ||
position: "absolute", | ||
bottom: "0", | ||
|
||
display: "flex", | ||
flexDirection: "column", | ||
zIndex: "99", | ||
|
||
width: "100%", | ||
height: "90vh", | ||
borderRadius: "20px 20px 0px 0px", | ||
backgroundColor: "white", | ||
}); | ||
|
||
export const bottomTabBar = style({ | ||
width: "100%", | ||
height: "24px", | ||
padding: "12px", | ||
display: "flex", | ||
justifyContent: "center", | ||
alignItems: "center", | ||
}); | ||
|
||
export const bar = style({ | ||
width: "8rem", | ||
height: "4px", | ||
backgroundColor: semanticColor.line.heavy, | ||
}); |
This file contains 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,35 @@ | ||
import {} from "react"; | ||
import * as styles from "./BottomSheet.css"; | ||
|
||
interface BottomSheetPropTypes { | ||
isOpen: boolean; | ||
handleOpen: (isOpen: boolean) => void; | ||
children: JSX.Element; //ReactNode๋ ๋ฒ์๊ฐ ๋๋ฌด ๋์ | ||
} | ||
|
||
//ํ๋ฉด ์ ์ฒด๋ฅผ ์ฐจ์งํ๋ ๋ฐํ ์ํธ ํ (children ํ์) | ||
const BottomSheet = ({ isOpen, children, handleOpen }: BottomSheetPropTypes) => { | ||
if (!isOpen) return; | ||
|
||
const handleClose = () => { | ||
handleOpen(false); | ||
}; | ||
|
||
const handleBottomSheetClick = (event: React.MouseEvent<HTMLDivElement>) => { | ||
event.stopPropagation(); // ์ด๋ฒคํธ ์ ํ ์ฐจ๋จ | ||
}; | ||
|
||
return ( | ||
<div className={styles.overlay} onClick={handleClose} onKeyDown={handleClose}> | ||
<div className={styles.bottomSheet} onClick={handleBottomSheetClick}> | ||
<div className={styles.bottomTabBar}> | ||
<div className={styles.bar} onClick={handleClose} onKeyDown={handleClose} /> | ||
</div> | ||
|
||
{children} | ||
</div> | ||
</div> | ||
); | ||
}; | ||
|
||
export default BottomSheet; |
This file contains 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 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 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,31 @@ | ||
import { font, semanticColor } from "@style/styles.css"; | ||
import { recipe } from "@vanilla-extract/recipes"; | ||
|
||
export const checkboxText = recipe({ | ||
base: [ | ||
font.body01, | ||
{ | ||
display: "flex", | ||
width: "100%", | ||
height: "44px", | ||
padding: "12px 8px", | ||
alignItems: "flex-start", | ||
gap: "16px", | ||
borderRadius: "9px", | ||
color: semanticColor.text.normal, | ||
}, | ||
], | ||
|
||
variants: { | ||
isSelected: { | ||
true: { | ||
border: `1px solid ${semanticColor.primary.normal}`, | ||
color: semanticColor.text.heavy, | ||
backgroundColor: "rgba(67, 214, 255, 0.16)", | ||
}, | ||
false: { | ||
border: "1px solid white", | ||
}, | ||
}, | ||
}, | ||
}); |
This file contains 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,27 @@ | ||
import { checkboxText } from "./CheckBoxText.css"; | ||
import { Check } from "@asset/svg"; | ||
|
||
interface CheckBoxTextPropTypes { | ||
children: string; | ||
isSelected: boolean; | ||
onClick: () => void; | ||
} | ||
const CheckBoxText = ({ children, isSelected, onClick }: CheckBoxTextPropTypes) => { | ||
const handleClickTextBox = () => { | ||
onClick(); | ||
}; | ||
|
||
return ( | ||
<div | ||
className={checkboxText({ | ||
isSelected: isSelected, | ||
})} | ||
onClick={handleClickTextBox} | ||
> | ||
<span style={{ width: "100%" }}>{children}</span> | ||
{isSelected && <Check width={24} height={24} style={{ position: "relative", bottom: "3" }} />} | ||
</div> | ||
); | ||
}; | ||
|
||
export default CheckBoxText; |
This file contains 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 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 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,52 @@ | ||
import { color, font, semanticColor } from "@style/styles.css"; | ||
import { style } from "@vanilla-extract/css"; | ||
import { recipe } from "@vanilla-extract/recipes"; | ||
|
||
export const dropdownTextWrapper = style({ | ||
display: "flex", | ||
width: "100%", | ||
flexDirection: "column", | ||
}); | ||
|
||
export const dropdownText = style([ | ||
font.body01, | ||
{ | ||
display: "flex", | ||
width: "100%", | ||
height: "44px", | ||
padding: "12px 8px", | ||
alignItems: "flex-start", | ||
gap: "16px", | ||
color: semanticColor.text.normal, | ||
borderBottom: `1px solid ${color.gray.gray100}`, | ||
}, | ||
]); | ||
|
||
export const dropdownContent = style({ | ||
display: "flex", | ||
padding: "0.8rem", | ||
width: "100%", | ||
flexDirection: "row", | ||
justifyContent: "flex-start", | ||
gap: "1rem", | ||
alignSelf: "stretch", | ||
backgroundColor: semanticColor.neutral.strong, | ||
|
||
flexWrap: "wrap", | ||
}); | ||
|
||
export const rotateIcon = recipe({ | ||
base: { | ||
//transition: "transform 0.3s ease", | ||
}, | ||
variants: { | ||
isOpen: { | ||
true: { | ||
transform: "rotate(0deg)", | ||
}, | ||
false: { | ||
transform: "rotate(180deg)", | ||
}, | ||
}, | ||
}, | ||
}); |
Oops, something went wrong.
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.
p2) ์ฌ๊ธฐ ํ์ธํด์ฃผ์ธ์!
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.
๋ฐ๋ก ๋ฐ์ํ์ต๋๋ค !