From 34e3a52b4c8c8c90b432a59146f7974af05acc18 Mon Sep 17 00:00:00 2001 From: BearHumanS Date: Sun, 10 Mar 2024 01:34:58 +0900 Subject: [PATCH 1/6] =?UTF-8?q?Feat:=20=EB=A9=94=ED=83=80=ED=83=9C?= =?UTF-8?q?=EA=B7=B8=20keyword=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/Meta.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Meta.tsx b/src/Meta.tsx index 8245847..77c8363 100644 --- a/src/Meta.tsx +++ b/src/Meta.tsx @@ -70,7 +70,7 @@ Meta.defaultProps = { subject: '포케허브: 포켓몬 커뮤니티, 도감, 카드제작 및 토론', copyright: 'PokeHub_Team', keywords: - '포켓몬, 포켓몬 도감, 포켓몬 카드, 포켓몬 게임, 포켓몬 커뮤니티, 포켓몬 공략, 포켓몬 이벤트, 포켓몬 최신 뉴스, 포켓몬 교환, 포켓몬 카드 제작', + '포케허브, pokehub, 포켓몬, 포켓몬 도감, 포켓몬 카드, 포켓몬 게임, 포켓몬 커뮤니티, 포켓몬 공략, 포켓몬 이벤트, 포켓몬 최신 뉴스, 포켓몬 교환, 포켓몬 카드 제작', url: window.location.href, image: 'https://github.com/side-project-pokehub/my-pokemon/assets/115094069/20de534c-814b-441d-8b74-6cfc9347c66c', From c5b911b134da80cadeb91222b3887b3706a40274 Mon Sep 17 00:00:00 2001 From: BearHumanS Date: Sun, 10 Mar 2024 01:35:37 +0900 Subject: [PATCH 2/6] =?UTF-8?q?Feat:=20=ED=8F=AC=EC=BC=93=EB=AA=AC=20?= =?UTF-8?q?=EB=94=94=ED=85=8C=EC=9D=BC=20=ED=8E=98=EC=9D=B4=EC=A7=80?= =?UTF-8?q?=EC=97=90=EC=84=9C=20=ED=8F=AC=EC=BC=93=EB=AA=AC=EC=9D=98=20url?= =?UTF-8?q?=EC=97=90=20=EB=94=B0=EB=9D=BC=20=EC=A7=84=ED=99=94=EC=B2=B4?= =?UTF-8?q?=EC=9D=B8=20=EA=B0=95=EC=A1=B0=EB=A1=9C=EC=A7=81=20=EC=B6=94?= =?UTF-8?q?=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/dex/PokemonDex.module.scss | 4 ++++ .../dex/PokemonDexElementLayout.tsx | 22 ++++++++++++++----- 2 files changed, 21 insertions(+), 5 deletions(-) diff --git a/src/components/dex/PokemonDex.module.scss b/src/components/dex/PokemonDex.module.scss index 3bb1554..f650d77 100644 --- a/src/components/dex/PokemonDex.module.scss +++ b/src/components/dex/PokemonDex.module.scss @@ -65,3 +65,7 @@ } } } + +.highlighted { + border: 2px solid rgb(250, 19, 2); +} diff --git a/src/components/dex/PokemonDexElementLayout.tsx b/src/components/dex/PokemonDexElementLayout.tsx index bbf253a..568f90c 100644 --- a/src/components/dex/PokemonDexElementLayout.tsx +++ b/src/components/dex/PokemonDexElementLayout.tsx @@ -2,6 +2,7 @@ import { ReactNode } from 'react'; import styles from './PokemonDex.module.scss'; import { PokemonType } from '@/lib/type'; import { motion } from 'framer-motion'; +import { useParams } from 'react-router-dom'; interface PokemonDexElementLayoutProp { children: ReactNode; @@ -16,15 +17,24 @@ const PokemonDexElementLayout = ({ onClick, className, }: PokemonDexElementLayoutProp) => { + const { id } = useParams(); + const number = () => { if (data.id < 10) { - return '00' + data.id + return '00' + data.id; } else if (data.id < 100) { - return '0' + data.id + return '0' + data.id; } else { - return data.id + return data.id; } - } + }; + + const getHighlightClass = () => { + return data.id.toString() === id ? styles.highlighted : ''; + }; + + console.log(data.id.toString() === id); + return (
From 85fe25308d091581dc3718afbd07489d785d406d Mon Sep 17 00:00:00 2001 From: BearHumanS Date: Sun, 10 Mar 2024 01:36:11 +0900 Subject: [PATCH 3/6] =?UTF-8?q?Design:=20=ED=8F=AC=EC=BC=93=EB=AA=AC=20?= =?UTF-8?q?=EB=94=94=ED=85=8C=EC=9D=BC=20=ED=8E=98=EC=9D=B4=EC=A7=80=20?= =?UTF-8?q?=EC=A0=95=EB=B3=B4=20=EB=B6=80=EB=B6=84=20=EA=B0=81=EB=8F=84=20?= =?UTF-8?q?=EC=8A=A4=ED=83=80=EC=9D=BC=20=EC=A1=B0=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/detail/Detail.module.scss | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/components/detail/Detail.module.scss b/src/components/detail/Detail.module.scss index 3f5297e..fd9efe5 100644 --- a/src/components/detail/Detail.module.scss +++ b/src/components/detail/Detail.module.scss @@ -96,7 +96,7 @@ flex-direction: column; justify-content: space-around; transition: 0.3s; - transform: rotateY(30deg); + transform: rotateY(15deg); border-radius: 0px 4px 4px 0px; border: 3px solid #000; background: #fff; @@ -225,7 +225,7 @@ background: #fff; padding: 20px; transition: 0.3s; - transform: rotateY(-30deg); + transform: rotateY(-15deg); display: flex; flex-direction: column; justify-content: space-around; @@ -595,7 +595,6 @@ height: 226px; flex-shrink: 0; border-radius: 15px; - border: 2px solid #000; background: #fff; display: flex; justify-content: center; From 136008f0816ad42da174648a211beb8abdbdaaa8 Mon Sep 17 00:00:00 2001 From: BearHumanS Date: Sun, 10 Mar 2024 01:49:43 +0900 Subject: [PATCH 4/6] =?UTF-8?q?Feat:=20=EB=B9=84=EB=A1=9C=EA=B7=B8?= =?UTF-8?q?=EC=9D=B8=20=EC=83=81=ED=83=9C=EC=97=90=EC=84=9C=20=EC=B0=9C?= =?UTF-8?q?=ED=95=98=EA=B8=B0=20=EB=B2=84=ED=8A=BC=20=EB=88=8C=EB=A0=80?= =?UTF-8?q?=EC=9D=84=20=EC=8B=9C=EC=97=90=20alert?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/detail/Detail.module.scss | 14 ++++++-------- src/components/detail/LikePokemon.tsx | 12 ++++++++---- 2 files changed, 14 insertions(+), 12 deletions(-) diff --git a/src/components/detail/Detail.module.scss b/src/components/detail/Detail.module.scss index fd9efe5..4914865 100644 --- a/src/components/detail/Detail.module.scss +++ b/src/components/detail/Detail.module.scss @@ -182,24 +182,22 @@ span { color: #ff5050; - font-size: 14px; font-style: normal; font-weight: 600; line-height: normal; } - &:disabled { - border: 2px solid #999; - } - - &:disabled, - &:disabled span { + .disabledText { color: #999; - cursor: not-allowed; } } +.stats__like, +.disabledButton { + border: 2px solid #999; +} + .stats__like__animate.animateHeart { animation: moveUpAndRotate 1s ease-in-out; } diff --git a/src/components/detail/LikePokemon.tsx b/src/components/detail/LikePokemon.tsx index 365ca7c..c976ace 100644 --- a/src/components/detail/LikePokemon.tsx +++ b/src/components/detail/LikePokemon.tsx @@ -34,7 +34,9 @@ const LikePokemon = ({ pokemonId, isLoading }: LikePokemonProps) => { }; const onToggleLike = async () => { - if (!user?.uid) return; + if (!user?.uid) { + return alert('로그인이 필요합니다.'); + } setAnimate(true); try { const docSnap = await getDocument(`/likes/${user.uid}`); @@ -76,9 +78,11 @@ const LikePokemon = ({ pokemonId, isLoading }: LikePokemonProps) => { }`} >
); From 3a1a7219e84a9544487d8920d4d2c8c667adaf74 Mon Sep 17 00:00:00 2001 From: BearHumanS Date: Sun, 10 Mar 2024 01:55:41 +0900 Subject: [PATCH 5/6] =?UTF-8?q?Design:=20=EB=B9=84=EB=A1=9C=EA=B7=B8?= =?UTF-8?q?=EC=9D=B8=20=EC=8B=9C=EC=97=90=20=EC=B0=9C=ED=95=98=EA=B8=B0=20?= =?UTF-8?q?=EB=B2=84=ED=8A=BC=20border=EC=83=89=EC=83=81=20=EC=88=98?= =?UTF-8?q?=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/detail/Detail.module.scss | 1 - 1 file changed, 1 deletion(-) diff --git a/src/components/detail/Detail.module.scss b/src/components/detail/Detail.module.scss index 4914865..353ea29 100644 --- a/src/components/detail/Detail.module.scss +++ b/src/components/detail/Detail.module.scss @@ -193,7 +193,6 @@ } } -.stats__like, .disabledButton { border: 2px solid #999; } From 9f43f0a4e65df7cd30a7c840e506e4b25838aa02 Mon Sep 17 00:00:00 2001 From: BearHumanS Date: Sun, 10 Mar 2024 01:57:59 +0900 Subject: [PATCH 6/6] =?UTF-8?q?Remove:=20=EB=A1=9C=EA=B7=B8=EC=95=84?= =?UTF-8?q?=EC=9B=83=EC=9D=B4=20=EB=A9=94=EC=9D=B8=EC=9C=BC=EB=A1=9C=20?= =?UTF-8?q?=EB=A6=AC=EB=94=94=EB=A0=89=EC=85=98=20=ED=95=98=EB=8A=94=20?= =?UTF-8?q?=EB=A1=9C=EC=A7=81=20=EC=82=AD=EC=A0=9C=20(Require=20Auth?= =?UTF-8?q?=EB=A1=9C=EC=A7=81=EC=9D=B4=EB=9E=91=20=EC=A4=91=EB=B3=B5)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/users/SocialLogin.tsx | 1 - 1 file changed, 1 deletion(-) diff --git a/src/components/users/SocialLogin.tsx b/src/components/users/SocialLogin.tsx index 974c26a..2319fc4 100644 --- a/src/components/users/SocialLogin.tsx +++ b/src/components/users/SocialLogin.tsx @@ -81,7 +81,6 @@ const SocialLogin = ({ isOpen, setIsOpen }: SocialLoginProps) => { await signOut(auth); setUser(null); console.log('로그아웃'); - navigate('/'); } catch (error) { console.error('로그아웃 중 오류 발생:', error); }