-
Notifications
You must be signed in to change notification settings - Fork 2
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Browse files
Browse the repository at this point in the history
Fix/#154/code
- Loading branch information
Showing
19 changed files
with
211 additions
and
256 deletions.
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
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,24 @@ | ||
| import React from 'react'; | ||
| import PropTypes from 'prop-types'; | ||
| import { animationVariants } from '@/styles/FramerMotion'; | ||
| import { motion } from 'framer-motion'; | ||
|
|
||
| function SlideUpMotion({ children, delay = 0 }) { | ||
| return ( | ||
| <motion.div | ||
| initial="hidden" | ||
| animate="visible" | ||
| variants={animationVariants} | ||
| transition={{ duration: 0.6, ease: 'easeOut', delay }} | ||
| > | ||
| {children} | ||
| </motion.div> | ||
| ); | ||
| } | ||
|
|
||
| SlideUpMotion.propTypes = { | ||
| children: PropTypes.node.isRequired, | ||
| delay: PropTypes.number, | ||
| }; | ||
|
|
||
| export default SlideUpMotion; |
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,32 @@ | ||
| import React from 'react'; | ||
| import PropTypes from 'prop-types'; | ||
|
|
||
| function BaseButton({ | ||
| value, | ||
| onClickFunc, | ||
| styles = '', | ||
| disabled = false, | ||
| bgColor, | ||
| textColor, | ||
| }) { | ||
| return ( | ||
| <button | ||
| onClick={onClickFunc} | ||
| className={`${styles} ${disabled ? 'opacity-30' : 'opacity-100 hover-scale-ani'} set-center rounded-full ${bgColor} ${textColor}`} | ||
| disabled={disabled} | ||
| > | ||
| {value} | ||
| </button> | ||
| ); | ||
| } | ||
|
|
||
| BaseButton.propTypes = { | ||
| value: PropTypes.string.isRequired, | ||
| onClickFunc: PropTypes.func.isRequired, | ||
| styles: PropTypes.string, | ||
| disabled: PropTypes.bool, | ||
| bgColor: PropTypes.string.isRequired, | ||
| textColor: PropTypes.string.isRequired, | ||
| }; | ||
|
|
||
| export default React.memo(BaseButton); |
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 |
|---|---|---|
| @@ -1,23 +1,14 @@ | ||
| import React from 'react'; | ||
| import PropTypes from 'prop-types'; | ||
| import BaseButton from '@/components/buttons/BaseButton'; | ||
|
|
||
| function BlueButton({ value, styles, onClickFunc, disabled = false }) { | ||
| function BlueButton(props) { | ||
| return ( | ||
| <button | ||
| onClick={onClickFunc} | ||
| className={`${styles} ${disabled ? 'opacity-30' : 'opacity-100 hover-scale-ani'} set-center rounded-full bg-primary-blue text-neutral-white`} | ||
| > | ||
| {value} | ||
| </button> | ||
| <BaseButton | ||
| {...props} | ||
| bgColor="bg-primary-blue" | ||
| textColor="text-neutral-white" | ||
| /> | ||
| ); | ||
| } | ||
|
|
||
| BlueButton.propTypes = { | ||
| value: PropTypes.string.isRequired, | ||
| onClickFunc: PropTypes.func.isRequired, | ||
| styles: PropTypes.string.isRequired, | ||
| disabled: PropTypes.bool, | ||
| }; | ||
|
|
||
| //memo를 이용하여 rerender 방지 | ||
| export default React.memo(BlueButton); |
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 |
|---|---|---|
| @@ -1,23 +1,14 @@ | ||
| import React from 'react'; | ||
| import PropTypes from 'prop-types'; | ||
| import BaseButton from '@/components/buttons/BaseButton'; | ||
|
|
||
| function BluePurpleButton({ value, onClickFunc, styles, disabled = false }) { | ||
| function BluePurpleButton(props) { | ||
| return ( | ||
| <button | ||
| onClick={onClickFunc} | ||
| className={`${styles} ${disabled ? 'opacity-30' : 'opacity-100 hover-scale-ani'} set-center rounded-full bg-gradient-blue-purple text-neutral-white`} | ||
| disabled={disabled} | ||
| > | ||
| {value} | ||
| </button> | ||
| <BaseButton | ||
| {...props} | ||
| bgColor="bg-gradient-blue-purple" | ||
| textColor="text-neutral-white" | ||
| /> | ||
| ); | ||
| } | ||
|
|
||
| BluePurpleButton.propTypes = { | ||
| value: PropTypes.string.isRequired, | ||
| onClickFunc: PropTypes.func.isRequired, | ||
| styles: PropTypes.string.isRequired, | ||
| disabled: PropTypes.bool, | ||
| }; | ||
|
|
||
| export default React.memo(BluePurpleButton); |
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 |
|---|---|---|
| @@ -1,23 +1,14 @@ | ||
| import React from 'react'; | ||
| import PropTypes from 'prop-types'; | ||
| import BaseButton from '@/components/buttons/BaseButton'; | ||
|
|
||
| function WhiteButton({ value, onClickFunc, styles, disabled = false }) { | ||
| function WhiteButton(props) { | ||
| return ( | ||
| <button | ||
| onClick={onClickFunc} | ||
| className={`${styles} ${disabled ? 'opacity-30' : 'opacity-100 hover-scale-ani'} set-center rounded-full bg-neutral-white text-neutral-black`} | ||
| disabled={disabled} | ||
| > | ||
| {value} | ||
| </button> | ||
| <BaseButton | ||
| {...props} | ||
| bgColor="bg-neutral-white" | ||
| textColor="text-neutral-black" | ||
| /> | ||
| ); | ||
| } | ||
|
|
||
| WhiteButton.propTypes = { | ||
| value: PropTypes.string.isRequired, | ||
| onClickFunc: PropTypes.func.isRequired, | ||
| styles: PropTypes.string.isRequired, | ||
| disabled: PropTypes.bool, | ||
| }; | ||
|
|
||
| export default React.memo(WhiteButton); |
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
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
Oops, something went wrong.