diff --git a/index.html b/index.html index 861518b..4dc4de4 100644 --- a/index.html +++ b/index.html @@ -2,7 +2,7 @@ - + diff --git a/public/Rectangle 47.png b/public/Rectangle 47.png new file mode 100644 index 0000000..f272259 Binary files /dev/null and b/public/Rectangle 47.png differ diff --git a/public/arrow.svg b/public/arrow.svg new file mode 100644 index 0000000..dbfcf76 --- /dev/null +++ b/public/arrow.svg @@ -0,0 +1,3 @@ + + + diff --git a/public/community_img.png b/public/community_img.png new file mode 100644 index 0000000..da2fe2a Binary files /dev/null and b/public/community_img.png differ diff --git a/public/default_profile.svg b/public/default_profile.svg new file mode 100644 index 0000000..9b4052f --- /dev/null +++ b/public/default_profile.svg @@ -0,0 +1,3 @@ + + + diff --git a/public/favicon.png b/public/favicon.png new file mode 100644 index 0000000..538b46f Binary files /dev/null and b/public/favicon.png differ diff --git "a/public/icons/\352\260\225\354\262\240_off.svg" "b/public/icons/\352\260\225\354\262\240_off.svg" new file mode 100644 index 0000000..a7a4d71 --- /dev/null +++ "b/public/icons/\352\260\225\354\262\240_off.svg" @@ -0,0 +1,12 @@ + + + + + + + + + + + + diff --git "a/public/icons/\352\260\225\354\262\240_on.svg" "b/public/icons/\352\260\225\354\262\240_on.svg" new file mode 100644 index 0000000..7af054e --- /dev/null +++ "b/public/icons/\352\260\225\354\262\240_on.svg" @@ -0,0 +1,12 @@ + + + + + + + + + + + + diff --git "a/public/icons/\352\262\251\355\210\254_off.svg" "b/public/icons/\352\262\251\355\210\254_off.svg" new file mode 100644 index 0000000..7f4ec18 --- /dev/null +++ "b/public/icons/\352\262\251\355\210\254_off.svg" @@ -0,0 +1,11 @@ + + + + + + + + + + + diff --git "a/public/icons/\352\262\251\355\210\254_on.svg" "b/public/icons/\352\262\251\355\210\254_on.svg" new file mode 100644 index 0000000..6c02797 --- /dev/null +++ "b/public/icons/\352\262\251\355\210\254_on.svg" @@ -0,0 +1,11 @@ + + + + + + + + + + + diff --git "a/public/icons/\352\263\240\354\212\244\355\212\270_off.svg" "b/public/icons/\352\263\240\354\212\244\355\212\270_off.svg" new file mode 100644 index 0000000..a0bde84 --- /dev/null +++ "b/public/icons/\352\263\240\354\212\244\355\212\270_off.svg" @@ -0,0 +1,11 @@ + + + + + + + + + + + diff --git "a/public/icons/\352\263\240\354\212\244\355\212\270_on.svg" "b/public/icons/\352\263\240\354\212\244\355\212\270_on.svg" new file mode 100644 index 0000000..3ffb163 --- /dev/null +++ "b/public/icons/\352\263\240\354\212\244\355\212\270_on.svg" @@ -0,0 +1,11 @@ + + + + + + + + + + + diff --git "a/public/icons/\353\205\270\353\247\220_off.svg" "b/public/icons/\353\205\270\353\247\220_off.svg" new file mode 100644 index 0000000..8b04f39 --- /dev/null +++ "b/public/icons/\353\205\270\353\247\220_off.svg" @@ -0,0 +1,11 @@ + + + + + + + + + + + diff --git "a/public/icons/\353\205\270\353\247\220_on.svg" "b/public/icons/\353\205\270\353\247\220_on.svg" new file mode 100644 index 0000000..0b924f6 --- /dev/null +++ "b/public/icons/\353\205\270\353\247\220_on.svg" @@ -0,0 +1,11 @@ + + + + + + + + + + + diff --git "a/public/icons/\353\217\205_off.svg" "b/public/icons/\353\217\205_off.svg" new file mode 100644 index 0000000..5511404 --- /dev/null +++ "b/public/icons/\353\217\205_off.svg" @@ -0,0 +1,13 @@ + + + + + + + + + + + + + diff --git "a/public/icons/\353\217\205_on.svg" "b/public/icons/\353\217\205_on.svg" new file mode 100644 index 0000000..a02790c --- /dev/null +++ "b/public/icons/\353\217\205_on.svg" @@ -0,0 +1,13 @@ + + + + + + + + + + + + + diff --git "a/public/icons/\353\223\234\353\236\230\352\263\244_off.svg" "b/public/icons/\353\223\234\353\236\230\352\263\244_off.svg" new file mode 100644 index 0000000..c7b2857 --- /dev/null +++ "b/public/icons/\353\223\234\353\236\230\352\263\244_off.svg" @@ -0,0 +1,11 @@ + + + + + + + + + + + diff --git "a/public/icons/\353\223\234\353\236\230\352\263\244_on.svg" "b/public/icons/\353\223\234\353\236\230\352\263\244_on.svg" new file mode 100644 index 0000000..97c5a78 --- /dev/null +++ "b/public/icons/\353\223\234\353\236\230\352\263\244_on.svg" @@ -0,0 +1,11 @@ + + + + + + + + + + + diff --git "a/public/icons/\353\225\205_off.svg" "b/public/icons/\353\225\205_off.svg" new file mode 100644 index 0000000..5f51cd2 --- /dev/null +++ "b/public/icons/\353\225\205_off.svg" @@ -0,0 +1,12 @@ + + + + + + + + + + + + diff --git "a/public/icons/\353\225\205_on.svg" "b/public/icons/\353\225\205_on.svg" new file mode 100644 index 0000000..ca59b11 --- /dev/null +++ "b/public/icons/\353\225\205_on.svg" @@ -0,0 +1,12 @@ + + + + + + + + + + + + diff --git "a/public/icons/\353\254\274_off.svg" "b/public/icons/\353\254\274_off.svg" new file mode 100644 index 0000000..01da897 --- /dev/null +++ "b/public/icons/\353\254\274_off.svg" @@ -0,0 +1,11 @@ + + + + + + + + + + + diff --git "a/public/icons/\353\254\274_on.svg" "b/public/icons/\353\254\274_on.svg" new file mode 100644 index 0000000..a1d6840 --- /dev/null +++ "b/public/icons/\353\254\274_on.svg" @@ -0,0 +1,11 @@ + + + + + + + + + + + diff --git "a/public/icons/\353\260\224\354\234\204_off.svg" "b/public/icons/\353\260\224\354\234\204_off.svg" new file mode 100644 index 0000000..752c9ce --- /dev/null +++ "b/public/icons/\353\260\224\354\234\204_off.svg" @@ -0,0 +1,11 @@ + + + + + + + + + + + diff --git "a/public/icons/\353\260\224\354\234\204_on.svg" "b/public/icons/\353\260\224\354\234\204_on.svg" new file mode 100644 index 0000000..49f9710 --- /dev/null +++ "b/public/icons/\353\260\224\354\234\204_on.svg" @@ -0,0 +1,11 @@ + + + + + + + + + + + diff --git "a/public/icons/\353\262\214\353\240\210_off.svg" "b/public/icons/\353\262\214\353\240\210_off.svg" new file mode 100644 index 0000000..2d6bf5f --- /dev/null +++ "b/public/icons/\353\262\214\353\240\210_off.svg" @@ -0,0 +1,11 @@ + + + + + + + + + + + diff --git "a/public/icons/\353\262\214\353\240\210_on.svg" "b/public/icons/\353\262\214\353\240\210_on.svg" new file mode 100644 index 0000000..ab870fa --- /dev/null +++ "b/public/icons/\353\262\214\353\240\210_on.svg" @@ -0,0 +1,11 @@ + + + + + + + + + + + diff --git "a/public/icons/\353\266\210\352\275\203_off.svg" "b/public/icons/\353\266\210\352\275\203_off.svg" new file mode 100644 index 0000000..5a7ab0e --- /dev/null +++ "b/public/icons/\353\266\210\352\275\203_off.svg" @@ -0,0 +1,11 @@ + + + + + + + + + + + diff --git "a/public/icons/\353\266\210\352\275\203_on.svg" "b/public/icons/\353\266\210\352\275\203_on.svg" new file mode 100644 index 0000000..44f72ca --- /dev/null +++ "b/public/icons/\353\266\210\352\275\203_on.svg" @@ -0,0 +1,11 @@ + + + + + + + + + + + diff --git "a/public/icons/\353\271\204\355\226\211_off.svg" "b/public/icons/\353\271\204\355\226\211_off.svg" new file mode 100644 index 0000000..da113e1 --- /dev/null +++ "b/public/icons/\353\271\204\355\226\211_off.svg" @@ -0,0 +1,11 @@ + + + + + + + + + + + diff --git "a/public/icons/\353\271\204\355\226\211_on.svg" "b/public/icons/\353\271\204\355\226\211_on.svg" new file mode 100644 index 0000000..8610707 --- /dev/null +++ "b/public/icons/\353\271\204\355\226\211_on.svg" @@ -0,0 +1,11 @@ + + + + + + + + + + + diff --git "a/public/icons/\354\225\205_off.svg" "b/public/icons/\354\225\205_off.svg" new file mode 100644 index 0000000..ade1eeb --- /dev/null +++ "b/public/icons/\354\225\205_off.svg" @@ -0,0 +1,12 @@ + + + + + + + + + + + + diff --git "a/public/icons/\354\225\205_on.svg" "b/public/icons/\354\225\205_on.svg" new file mode 100644 index 0000000..ffa74f0 --- /dev/null +++ "b/public/icons/\354\225\205_on.svg" @@ -0,0 +1,12 @@ + + + + + + + + + + + + diff --git "a/public/icons/\354\226\274\354\235\214_off.svg" "b/public/icons/\354\226\274\354\235\214_off.svg" new file mode 100644 index 0000000..cd7a96e --- /dev/null +++ "b/public/icons/\354\226\274\354\235\214_off.svg" @@ -0,0 +1,11 @@ + + + + + + + + + + + diff --git "a/public/icons/\354\226\274\354\235\214_on.svg" "b/public/icons/\354\226\274\354\235\214_on.svg" new file mode 100644 index 0000000..6ede752 --- /dev/null +++ "b/public/icons/\354\226\274\354\235\214_on.svg" @@ -0,0 +1,11 @@ + + + + + + + + + + + diff --git "a/public/icons/\354\227\220\354\212\244\355\215\274_off.svg" "b/public/icons/\354\227\220\354\212\244\355\215\274_off.svg" new file mode 100644 index 0000000..40fc7c8 --- /dev/null +++ "b/public/icons/\354\227\220\354\212\244\355\215\274_off.svg" @@ -0,0 +1,11 @@ + + + + + + + + + + + diff --git "a/public/icons/\354\227\220\354\212\244\355\215\274_on.svg" "b/public/icons/\354\227\220\354\212\244\355\215\274_on.svg" new file mode 100644 index 0000000..53b0252 --- /dev/null +++ "b/public/icons/\354\227\220\354\212\244\355\215\274_on.svg" @@ -0,0 +1,11 @@ + + + + + + + + + + + diff --git "a/public/icons/\354\240\204\352\270\260_off.svg" "b/public/icons/\354\240\204\352\270\260_off.svg" new file mode 100644 index 0000000..1cf6443 --- /dev/null +++ "b/public/icons/\354\240\204\352\270\260_off.svg" @@ -0,0 +1,11 @@ + + + + + + + + + + + diff --git "a/public/icons/\354\240\204\352\270\260_on.svg" "b/public/icons/\354\240\204\352\270\260_on.svg" new file mode 100644 index 0000000..4b3b963 --- /dev/null +++ "b/public/icons/\354\240\204\352\270\260_on.svg" @@ -0,0 +1,11 @@ + + + + + + + + + + + diff --git "a/public/icons/\355\216\230\354\226\264\353\246\254_off.svg" "b/public/icons/\355\216\230\354\226\264\353\246\254_off.svg" new file mode 100644 index 0000000..0549799 --- /dev/null +++ "b/public/icons/\355\216\230\354\226\264\353\246\254_off.svg" @@ -0,0 +1,11 @@ + + + + + + + + + + + diff --git "a/public/icons/\355\216\230\354\226\264\353\246\254_on.svg" "b/public/icons/\355\216\230\354\226\264\353\246\254_on.svg" new file mode 100644 index 0000000..dd0ca6b --- /dev/null +++ "b/public/icons/\355\216\230\354\226\264\353\246\254_on.svg" @@ -0,0 +1,11 @@ + + + + + + + + + + + diff --git "a/public/icons/\355\222\200_off.svg" "b/public/icons/\355\222\200_off.svg" new file mode 100644 index 0000000..e2d9124 --- /dev/null +++ "b/public/icons/\355\222\200_off.svg" @@ -0,0 +1,11 @@ + + + + + + + + + + + diff --git "a/public/icons/\355\222\200_on.svg" "b/public/icons/\355\222\200_on.svg" new file mode 100644 index 0000000..0596b4e --- /dev/null +++ "b/public/icons/\355\222\200_on.svg" @@ -0,0 +1,11 @@ + + + + + + + + + + + diff --git a/public/logo-pokehub.png b/public/logo-pokehub.png new file mode 100644 index 0000000..b213143 Binary files /dev/null and b/public/logo-pokehub.png differ diff --git "a/public/pokemonImg/\352\267\270\354\232\260\353\246\260\354\260\250.png" "b/public/pokemonImg/\352\267\270\354\232\260\353\246\260\354\260\250.png" new file mode 100644 index 0000000..b6f046c Binary files /dev/null and "b/public/pokemonImg/\352\267\270\354\232\260\353\246\260\354\260\250.png" differ diff --git "a/public/pokemonImg/\354\230\244\352\261\260\355\217\260-\354\232\260\353\254\274\354\235\230\352\260\200\353\251\264.png" "b/public/pokemonImg/\354\230\244\352\261\260\355\217\260-\354\232\260\353\254\274\354\235\230\352\260\200\353\251\264.png" new file mode 100644 index 0000000..c0b0c38 Binary files /dev/null and "b/public/pokemonImg/\354\230\244\352\261\260\355\217\260-\354\232\260\353\254\274\354\235\230\352\260\200\353\251\264.png" differ diff --git "a/public/pokemonImg/\354\230\244\352\261\260\355\217\260-\354\243\274\354\266\247\353\217\214\354\235\230\352\260\200\353\251\264.png" "b/public/pokemonImg/\354\230\244\352\261\260\355\217\260-\354\243\274\354\266\247\353\217\214\354\235\230\352\260\200\353\251\264.png" new file mode 100644 index 0000000..eabb5a8 Binary files /dev/null and "b/public/pokemonImg/\354\230\244\352\261\260\355\217\260-\354\243\274\354\266\247\353\217\214\354\235\230\352\260\200\353\251\264.png" differ diff --git "a/public/pokemonImg/\354\230\244\352\261\260\355\217\260-\355\231\224\353\215\225\354\235\230\352\260\200\353\251\264.png" "b/public/pokemonImg/\354\230\244\352\261\260\355\217\260-\355\231\224\353\215\225\354\235\230\352\260\200\353\251\264.png" new file mode 100644 index 0000000..2b6c4f9 Binary files /dev/null and "b/public/pokemonImg/\354\230\244\352\261\260\355\217\260-\355\231\224\353\215\225\354\235\230\352\260\200\353\251\264.png" differ diff --git a/public/pokemon_name_box.svg b/public/pokemon_name_box.svg new file mode 100644 index 0000000..d1497e8 --- /dev/null +++ b/public/pokemon_name_box.svg @@ -0,0 +1,3 @@ + + + diff --git a/public/search_icon.png b/public/search_icon.png new file mode 100644 index 0000000..b711688 Binary files /dev/null and b/public/search_icon.png differ diff --git a/public/setup.svg b/public/setup.svg new file mode 100644 index 0000000..9157ab3 --- /dev/null +++ b/public/setup.svg @@ -0,0 +1,6 @@ + + + + + + diff --git a/public/socialLoginIcons/github_icon.svg b/public/socialLoginIcons/github_icon.svg new file mode 100644 index 0000000..3e4827d --- /dev/null +++ b/public/socialLoginIcons/github_icon.svg @@ -0,0 +1,6 @@ + + + diff --git a/public/socialLoginIcons/google_icon.svg b/public/socialLoginIcons/google_icon.svg new file mode 100644 index 0000000..dad0413 --- /dev/null +++ b/public/socialLoginIcons/google_icon.svg @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/src/components/card/PokemonCard.tsx b/src/components/card/PokemonCard.tsx index 647a11c..c41acc6 100644 --- a/src/components/card/PokemonCard.tsx +++ b/src/components/card/PokemonCard.tsx @@ -150,7 +150,7 @@ const PokemonCard = ({
PoketHub
diff --git a/src/components/community/CommunityCardItem.tsx b/src/components/community/CommunityCardItem.tsx index 194a136..80544bb 100644 --- a/src/components/community/CommunityCardItem.tsx +++ b/src/components/community/CommunityCardItem.tsx @@ -12,13 +12,17 @@ import { MdRemoveRedEye } from '@react-icons/all-files/md/MdRemoveRedEye'; export const fetchProfileImages = async (userId: any) => { const fileRef = ref(storage, `${userId}`); const result = await listAll(fileRef); - const valData = await Promise.all(result.items.map(async (item) => await getDownloadURL(item))); + const valData = await Promise.all( + result.items.map(async (item) => await getDownloadURL(item)), + ); return valData; }; const CommunityCardItem = ({ data }: any) => { const navigate = useNavigate(); - const { data: imageUrl }: any = useQuery(['profileImages', data.userId], () => fetchProfileImages(data.userId)); + const { data: imageUrl }: any = useQuery(['profileImages', data.userId], () => + fetchProfileImages(data.userId), + ); const likeCount = data.likes ? data.likes.length : 0; @@ -29,7 +33,7 @@ const CommunityCardItem = ({ data }: any) => { return (
- +
{data.title}
diff --git a/src/components/detail/EvolutionChain.tsx b/src/components/detail/EvolutionChain.tsx index 2dd19e8..d42c43a 100644 --- a/src/components/detail/EvolutionChain.tsx +++ b/src/components/detail/EvolutionChain.tsx @@ -126,7 +126,7 @@ const EvolutionChain = ({
우측 화살표 {index < evovlutionPokemonData.length - 1 && ( 우측 화살표 { if (!name) { return; } - return `/src/assets/pokemonImg/${name}.png`; + return `/pokemonImg/${name}.png`; }; const getKoreanName = (englishName: string | undefined) => { @@ -65,7 +65,7 @@ const PokemonImg = ({ pokemonState, isLoading }: PokemonInfoExtendsProps) => { <>
- name_box + name_box {koreanName}
@@ -101,7 +101,7 @@ const PokemonImg = ({ pokemonState, isLoading }: PokemonInfoExtendsProps) => { className={`${styles.detail__plate} ${styles[koreanPokemonName]}`} > {`${koreanPokemonName}타입
{koreanPokemonName}
diff --git a/src/components/detail/PokemonInfo.tsx b/src/components/detail/PokemonInfo.tsx index 31f5f66..a19c7f7 100644 --- a/src/components/detail/PokemonInfo.tsx +++ b/src/components/detail/PokemonInfo.tsx @@ -72,12 +72,7 @@ const PokemonInfo = ({
정보
- +
ID
diff --git a/src/components/detail/Status.tsx b/src/components/detail/Status.tsx index e3bd106..04d3522 100644 --- a/src/components/detail/Status.tsx +++ b/src/components/detail/Status.tsx @@ -18,12 +18,7 @@ const Status = ({ pokemonState, isLoading }: PokemonInfoExtendsProps) => {
스탯
- +
체력 diff --git a/src/components/header/Header.tsx b/src/components/header/Header.tsx index 87910b7..153a80e 100644 --- a/src/components/header/Header.tsx +++ b/src/components/header/Header.tsx @@ -36,12 +36,7 @@ const Header = () => {
- logo + logo
diff --git a/src/components/plate/FilterPlates.tsx b/src/components/plate/FilterPlates.tsx index d0fe48c..8822e3f 100644 --- a/src/components/plate/FilterPlates.tsx +++ b/src/components/plate/FilterPlates.tsx @@ -28,9 +28,7 @@ const FilterPlates = () => { > {`${koreanType}타입 {koreanType} diff --git a/src/components/plate/Plate.tsx b/src/components/plate/Plate.tsx index 6c69036..2dc373f 100644 --- a/src/components/plate/Plate.tsx +++ b/src/components/plate/Plate.tsx @@ -22,7 +22,7 @@ const Plate = ({ pokemonTypeProp }: PlateProp) => { {`${koreanType}타입 {koreanType} diff --git a/src/components/search/Search.tsx b/src/components/search/Search.tsx index c24d5a3..410eeae 100644 --- a/src/components/search/Search.tsx +++ b/src/components/search/Search.tsx @@ -59,7 +59,7 @@ const SearchInput = () => { className={styles.main__search__bar} /> diff --git a/src/components/users/SocialLogin.tsx b/src/components/users/SocialLogin.tsx index a546f9a..6a59ba6 100644 --- a/src/components/users/SocialLogin.tsx +++ b/src/components/users/SocialLogin.tsx @@ -111,7 +111,7 @@ const SocialLogin = ({ isOpen, setIsOpen }: SocialLoginProps) => { > 구글 로그인 구글 로그인 @@ -124,7 +124,7 @@ const SocialLogin = ({ isOpen, setIsOpen }: SocialLoginProps) => { > 깃허브 로그인 깃허브 로그인 diff --git a/src/lib/constants.ts b/src/lib/constants.ts index 7b386dc..af448a6 100644 --- a/src/lib/constants.ts +++ b/src/lib/constants.ts @@ -117,7 +117,7 @@ export const POKEMON_NICKNAME2 = [ '무책임한', ]; -export const PROFILE_DEFAULT_IMG = '/src/assets/default_profile.svg'; +export const PROFILE_DEFAULT_IMG = '/default_profile.svg'; export const STORAGE_DOWNLOAD_URL = 'https://firebasestorage.googleapis.com'; diff --git a/vercel.json b/vercel.json index a99224c..ad4a499 100644 --- a/vercel.json +++ b/vercel.json @@ -1 +1,3 @@ -{ "src": "/[^.]+", "dest": "/", "status": 200 } +{ + "rewrites": [{ "source": "/(.*)", "destination": "/" }] +} diff --git a/vite.config.ts b/vite.config.ts index 89fc7d8..634be23 100644 --- a/vite.config.ts +++ b/vite.config.ts @@ -1,18 +1,10 @@ import { defineConfig } from 'vite'; import react from '@vitejs/plugin-react'; import path from 'path'; -import ViteCompression from 'vite-plugin-compression'; // https://vitejs.dev/config/ export default defineConfig({ - plugins: [ - react(), - ViteCompression({ - algorithm: 'gzip', - ext: '.gz', - threshold: 1024, - }), - ], + plugins: [react()], resolve: { alias: { '@': path.resolve(__dirname, './src'),