From 1362468d640bdfb3deb863eee481588b06300439 Mon Sep 17 00:00:00 2001 From: Anselm Marie Date: Thu, 3 Oct 2024 15:24:43 +0900 Subject: [PATCH] =?UTF-8?q?Button=20component=20updates=20=E2=80=A2=20Poke?= =?UTF-8?q?mon=20Ui=20component=20changes?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pokemon.card/pokemon.card.module.css | 8 ++++++++ .../pokemon/pokemon.card/pokemon.card.view.tsx | 8 +++++++- .../pokemon/pokemon.list/assets/bulbasaur.gif | Bin 0 -> 28505 bytes .../pokemon/pokemon.list/pokemon.list.view.tsx | 10 +++------- .../lib-base/ui/button/button.element.view.tsx | 9 ++++++++- .../src/lib-base/ui/button/button.interface.ts | 2 ++ .../src/lib-base/ui/button/button.module.css | 17 ++++++++++++++--- libs/ui/src/lib-base/ui/button/button.view.tsx | 4 +++- 8 files changed, 45 insertions(+), 13 deletions(-) create mode 100644 libs/features/src/lib/pokemon/pokemon.list/assets/bulbasaur.gif diff --git a/libs/features/src/lib/pokemon/pokemon.card/pokemon.card.module.css b/libs/features/src/lib/pokemon/pokemon.card/pokemon.card.module.css index b704718..2023005 100644 --- a/libs/features/src/lib/pokemon/pokemon.card/pokemon.card.module.css +++ b/libs/features/src/lib/pokemon/pokemon.card/pokemon.card.module.css @@ -8,6 +8,14 @@ position: relative; } +.cardWrapperShadowLight { + box-shadow: 0 3px 12px rgb(0 0 0 / 20%); +} + +.cardWrapperShadowDark { + box-shadow: 0 3px 12px rgb(0 0 0 / 10%); +} + .imgCardWrapper { max-width: 115px; border-radius: var(--theme-radius-8); diff --git a/libs/features/src/lib/pokemon/pokemon.card/pokemon.card.view.tsx b/libs/features/src/lib/pokemon/pokemon.card/pokemon.card.view.tsx index 6e0b38d..6c59f5b 100644 --- a/libs/features/src/lib/pokemon/pokemon.card/pokemon.card.view.tsx +++ b/libs/features/src/lib/pokemon/pokemon.card/pokemon.card.view.tsx @@ -1,5 +1,6 @@ import { memo, ReactElement, useMemo } from 'react'; +import { ThemeTypeEnum, useThemeStore } from '@pokemon-pet-shop/store'; import { PokemonDetailAbilityObj } from '@pokemon-pet-shop/typing'; import { UiElementLayout, @@ -21,6 +22,7 @@ import usePokemonCardLogic from './use.pokemon.card.logic'; const PokemonCard = ({ data, isLoading }: CardProps): ReactElement => { const { getThemeClass, onHandleOpenDetailModalClick } = usePokemonCardLogic(data); + const { theme } = useThemeStore(); const capitalizeName = useMemo((): string => { return capitalizeNameUtil(data?.name); @@ -28,7 +30,11 @@ const PokemonCard = ({ data, isLoading }: CardProps): ReactElement => { return ( diff --git a/libs/features/src/lib/pokemon/pokemon.list/assets/bulbasaur.gif b/libs/features/src/lib/pokemon/pokemon.list/assets/bulbasaur.gif new file mode 100644 index 0000000000000000000000000000000000000000..b973a5d3bab30cd886db3aba14525f1a9967b6b4 GIT binary patch literal 28505 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 CA{0vi literal 0 HcmV?d00001 diff --git a/libs/features/src/lib/pokemon/pokemon.list/pokemon.list.view.tsx b/libs/features/src/lib/pokemon/pokemon.list/pokemon.list.view.tsx index 90b7e8a..a2c5d0c 100644 --- a/libs/features/src/lib/pokemon/pokemon.list/pokemon.list.view.tsx +++ b/libs/features/src/lib/pokemon/pokemon.list/pokemon.list.view.tsx @@ -6,6 +6,7 @@ import { skeletonLoadDataUtil } from '@pokemon-pet-shop/utils'; import { UiPokemonCard } from '../pokemon.card'; +import image from './assets/bulbasaur.gif'; import { styles } from './pokemon.list.module'; import usePokemonList from './use.pokemon.list.logic'; @@ -51,13 +52,8 @@ const PokemonList = (): ReactElement => { { onFetchNextPage((old: number) => old + 1); }} diff --git a/libs/ui/src/lib-base/ui/button/button.element.view.tsx b/libs/ui/src/lib-base/ui/button/button.element.view.tsx index 1ceb11d..c628212 100644 --- a/libs/ui/src/lib-base/ui/button/button.element.view.tsx +++ b/libs/ui/src/lib-base/ui/button/button.element.view.tsx @@ -2,21 +2,28 @@ import { ReactElement } from 'react'; import { UiElementLayout } from '../element.layout'; import { UiIcon } from '../icon'; +import { UiImage } from '../image'; +import { TypographyTypeEnum, UiTypography } from '../typography'; import { ButtonProps } from './button.interface'; import { styles } from './button.module'; const ButtonElement = ({ className = '', + classNameText = '', text = null, appendIcon = '', + appendImage = '', isDisabled, onClick, }: ButtonProps): ReactElement => { return ( diff --git a/libs/ui/src/lib-base/ui/button/button.interface.ts b/libs/ui/src/lib-base/ui/button/button.interface.ts index e9e1792..3a699b6 100644 --- a/libs/ui/src/lib-base/ui/button/button.interface.ts +++ b/libs/ui/src/lib-base/ui/button/button.interface.ts @@ -5,9 +5,11 @@ import { ButtonSizeEnum, ButtonTypeEnum } from './button.enum'; export interface ButtonProps { type?: ButtonTypeEnum; text?: string | null; + classNameText: string; className?: any; size?: ButtonSizeEnum; appendIcon?: string; + appendImage?: string; timerText?: string; timerStyle?: string; isDisabled?: boolean; diff --git a/libs/ui/src/lib-base/ui/button/button.module.css b/libs/ui/src/lib-base/ui/button/button.module.css index 4fd2240..552db8f 100644 --- a/libs/ui/src/lib-base/ui/button/button.module.css +++ b/libs/ui/src/lib-base/ui/button/button.module.css @@ -3,6 +3,7 @@ cursor: pointer; border: 0; text-align: center; + padding: var(--theme-spacing-5); } .buttonPrimary { @@ -22,20 +23,30 @@ } .standard { - padding: var(--theme-spacing-10) var(--theme-spacing-15); + padding: var(--theme-spacing-5) var(--theme-spacing-15); font-size: var(--theme-font-13); + align-items: center; + justify-content: center; + display: flex; } .large { min-width: 230px; height: 66px; - padding: var(--theme-spacing-15) var(--theme-spacing-30); + padding: var(--theme-spacing-10) var(--theme-spacing-30); font-size: var(--theme-font-24); + align-items: center; + justify-content: center; + display: flex; +} + +.appendImage { + width: 22px; + margin-right: var(--theme-spacing-5); } .buttonInnerWrapper { display: flex; align-items: center; justify-content: center; - gap: var(--theme-spacing-10); } diff --git a/libs/ui/src/lib-base/ui/button/button.view.tsx b/libs/ui/src/lib-base/ui/button/button.view.tsx index a182b47..80442dc 100644 --- a/libs/ui/src/lib-base/ui/button/button.view.tsx +++ b/libs/ui/src/lib-base/ui/button/button.view.tsx @@ -16,6 +16,7 @@ const Button = ({ text = null, size = ButtonSizeEnum.STANDARD, appendIcon = '', + appendImage = '', timerText = '', timerStyle = styles.buttonSuccess, isDisabled = false, @@ -69,10 +70,11 @@ const Button = ({ className, newStyles.button, getTypeStyles, - getSizeStyles, getDisabledStyles, displaySuccessStyle ? timerStyle : '' )} + classNameText={getSizeStyles} + appendImage={appendImage} appendIcon={appendIcon} isDisabled={isDisabled || displaySuccessStyle} onClick={onClick}