Skip to content
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

메인페이지 리팩토링 #323

Merged
merged 3 commits into from
Aug 3, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
97 changes: 30 additions & 67 deletions src/app/page.tsx
Original file line number Diff line number Diff line change
@@ -1,84 +1,47 @@
'use client'

import { CategoryList, Dropdown, LinkItem, Spinner } from '@/components'
import { CategoryList, Dropdown, Spinner } from '@/components'
import FloatingButton from '@/components/FloatingButton/FloatingButton'
import { ChipColors } from '@/components/common/Chip/Chip'
import PopularLinkSkeleton from '@/components/PopularLinkList/PopularLinkSkeleton'
import DeferredComponent from '@/components/common/DeferedComponent/DeferedComponent'
import MainSpaceList from '@/components/common/MainSpaceList/MainSpaceList'
import MainSpaceSkeleton from '@/components/common/MainSpaceList/MainSpaceSkeleton'
import { useCategoryParam, useSortParam } from '@/hooks'
import useGetPopularLinks from '@/hooks/useGetPopularLinks'
import { fetchGetSpaces } from '@/services/space/spaces'
import { PopularLinkResBody } from '@/types'
import 'swiper/css'
import 'swiper/css/free-mode'
import 'swiper/css/pagination'
import { FreeMode } from 'swiper/modules'
import { Swiper, SwiperSlide } from 'swiper/react'
import dynamic from 'next/dynamic'

const DynamicPopularLinkList = dynamic(
() => import('@/components/PopularLinkList/PopularLinkList'),
{
loading: () => (
<DeferredComponent>
<PopularLinkSkeleton />
</DeferredComponent>
),
},
)
const DynamicMainSpaceList = dynamic(
() => import('@/components/common/MainSpaceList/MainSpaceList'),
{
loading: () => (
<DeferredComponent>
<MainSpaceSkeleton />
</DeferredComponent>
),
},
)

export default function Home() {
const { links, isPopularLinksLoading } = useGetPopularLinks()
const { sort, sortIndex, handleSortChange } = useSortParam('space')
const { category, categoryIndex, handleCategoryChange } =
useCategoryParam('all')

return isPopularLinksLoading ? (
<DeferredComponent>
<Spinner />
</DeferredComponent>
) : (
return (
<>
<section className="px-4 pb-8">
<h2 className="py-4 font-bold text-gray9">인기있는 링크</h2>
{links && (
<Swiper
slidesPerView={2.2}
breakpoints={{
640: {
slidesPerView: 2.2,
},
743: {
slidesPerView: 3.2,
},
1099: {
slidesPerView: 4.2,
},
1455: {
slidesPerView: 5.2,
},
1811: {
slidesPerView: 6.2,
},
2152: {
slidesPerView: 7.2,
},

2324: {
slidesPerView: 8.2,
},
}}
spaceBetween={16}
freeMode={true}
pagination={{
clickable: true,
}}
modules={[FreeMode]}
className="mySwiper">
{links.map((link: PopularLinkResBody) => (
<SwiperSlide key={link.linkId}>
<LinkItem
linkId={link.linkId}
title={link.title}
url={link.url}
tagName={link.tagName}
tagColor={link.tagColor as ChipColors}
isInitLiked={link.isLiked}
likeInitCount={link.likeCount}
type="card"
/>
</SwiperSlide>
))}
</Swiper>
)}
<div className="min-h-[101.5px]">
<DynamicPopularLinkList />
</div>
</section>
<section>
<div className="sticky top-[53px] z-40 bg-bgColor">
Expand All @@ -97,7 +60,7 @@ export default function Home() {
onChange={handleCategoryChange}
/>
</div>
<MainSpaceList
<DynamicMainSpaceList
queryKey="main"
sort={sort ?? ''}
category={category ?? ''}
Expand Down
66 changes: 66 additions & 0 deletions src/components/PopularLink/PopularLinkList/PopularLinkList.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,66 @@
'use client'

import useGetPopularLinks from '@/components/PopularLinkList/hooks/useGetPopularLinks'
import { ChipColors } from '@/components/common/Chip/Chip'
import LinkItem from '@/components/common/LinkItem/LinkItem'
import { PopularLinkResBody } from '@/types'
import 'swiper/css'
import 'swiper/css/free-mode'
import 'swiper/css/pagination'
import { FreeMode } from 'swiper/modules'
import { Swiper, SwiperSlide } from 'swiper/react'

const PopularLinkList = () => {
const { data } = useGetPopularLinks()
return (
<Swiper
slidesPerView={2.2}
breakpoints={{
640: {
slidesPerView: 2.2,
},
743: {
slidesPerView: 3.2,
},
1099: {
slidesPerView: 4.2,
},
1455: {
slidesPerView: 5.2,
},
1811: {
slidesPerView: 6.2,
},
2152: {
slidesPerView: 7.2,
},
2324: {
slidesPerView: 8.2,
},
}}
spaceBetween={16}
freeMode={true}
pagination={{
clickable: true,
}}
modules={[FreeMode]}
className="mySwiper">
{data?.responses.map((link: PopularLinkResBody) => (
<SwiperSlide key={link.linkId}>
<LinkItem
linkId={link.linkId}
title={link.title}
url={link.url}
tagName={link.tagName}
tagColor={link.tagColor as ChipColors}
isInitLiked={link.isLiked}
likeInitCount={link.likeCount}
type="card"
/>
</SwiperSlide>
))}
</Swiper>
)
}

export default PopularLinkList
64 changes: 64 additions & 0 deletions src/components/PopularLinkList/PopularLinkList.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,64 @@
import { PopularLinkResBody } from '@/types'
import 'swiper/css'
import 'swiper/css/free-mode'
import 'swiper/css/pagination'
import { FreeMode } from 'swiper/modules'
import { Swiper, SwiperSlide } from 'swiper/react'
import { ChipColors } from '../common/Chip/Chip'
import LinkItem from '../common/LinkItem/LinkItem'
import useGetPopularLinks from './hooks/useGetPopularLinks'

const PopularLinkList = () => {
const { data } = useGetPopularLinks()
return (
<Swiper
slidesPerView={2.2}
breakpoints={{
640: {
slidesPerView: 2.2,
},
743: {
slidesPerView: 3.2,
},
1099: {
slidesPerView: 4.2,
},
1455: {
slidesPerView: 5.2,
},
1811: {
slidesPerView: 6.2,
},
2152: {
slidesPerView: 7.2,
},
2324: {
slidesPerView: 8.2,
},
}}
spaceBetween={16}
freeMode={true}
pagination={{
clickable: true,
}}
modules={[FreeMode]}
className="mySwiper">
{data?.responses.map((link: PopularLinkResBody) => (
<SwiperSlide key={link.linkId}>
<LinkItem
linkId={link.linkId}
title={link.title}
url={link.url}
tagName={link.tagName}
tagColor={link.tagColor as ChipColors}
isInitLiked={link.isLiked}
likeInitCount={link.likeCount}
type="card"
/>
</SwiperSlide>
))}
</Swiper>
)
}

export default PopularLinkList
36 changes: 36 additions & 0 deletions src/components/PopularLinkList/PopularLinkSkeleton.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
const LinkSkeleton = () => {
return (
<div className="mr-4 min-w-[164px]">
<div className="flex min-h-[101.5px] flex-col justify-between gap-1 rounded-md border border-slate3 px-3 py-2.5">
<div className="button-round h-[20px] w-3/4 bg-slate-100 text-sm font-medium text-gray9 dark:bg-slate-800" />
<div>
<div className="button-round inline-flex h-[24px] w-[40.74px] rounded-xl bg-slate-100 px-2.5 py-1 text-center text-xs font-medium dark:bg-slate-800" />
</div>
<div className="flex items-center justify-end">
<div className="button-round h-[26px] w-[41.28px] bg-slate-100 dark:bg-slate-800" />
</div>
</div>
</div>
)
}

const PopularLinkSkeleton = () => {
return (
<div className="overflow-hidden">
<div className="flex">
<LinkSkeleton />
<LinkSkeleton />
<LinkSkeleton />
<LinkSkeleton />
<LinkSkeleton />
<LinkSkeleton />
<LinkSkeleton />
<LinkSkeleton />
<LinkSkeleton />
<LinkSkeleton />
</div>
</div>
)
}

export default PopularLinkSkeleton
11 changes: 11 additions & 0 deletions src/components/PopularLinkList/hooks/useGetPopularLinks.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
import { fetchGetPopularLinks } from '@/services/link/link'
import { useSuspenseQuery } from '@tanstack/react-query'

const useGetPopularLinks = () => {
return useSuspenseQuery({
queryKey: ['popularLinks'],
queryFn: () => fetchGetPopularLinks(),
})
}

export default useGetPopularLinks
2 changes: 0 additions & 2 deletions src/components/Space/SpaceForm.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -120,8 +120,6 @@ const SpaceForm = ({ spaceType, space }: SpaceFormProps) => {
width={5000}
height={188}
alt="spaceImage"
placeholder="blur"
blurDataURL="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAQAAAC1HAwCAAAAC0lEQVR42mO8UA8AAiUBUcc3qzwAAAAASUVORK5CYII="
/>
) : (
<div className="flex h-[188px] items-center justify-center border-4 border-dashed border-slate5">
Expand Down
Loading
Loading