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.

Sign up for GitHub

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

Jump to bottom

Merge Develop #89

Merged
merged 4 commits into from
Sep 13, 2024
Merged

Merge Develop #89

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
b071963
feat(search): 검색 구현 (#87)
qkrdmstlr3 Sep 13, 2024
ff97912
Merge remote-tracking branch 'origin/main' into develop
qkrdmstlr3 Sep 13, 2024
b64a9e6
feat(search): 라우팅 추가
qkrdmstlr3 Sep 13, 2024
8d0db30
Merge remote-tracking branch 'origin/main' into develop
qkrdmstlr3 Sep 13, 2024
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
7 changes: 6 additions & 1 deletion src/container/SearchDialog/SearchDialog.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ import { EasterEgg } from './EasterEgg';
import { useState } from 'react';
import { AsyncBoundaryWithQuery } from '@/lib';
import { If } from '@/system/utils/If';
import { useRouter } from 'next/navigation';

interface SearchDialogProps {
open: boolean;
Expand All @@ -19,6 +20,7 @@ interface SearchDialogProps {
function Content({ onClose }: SearchDialogProps) {
const { data, mutate } = useGetSearchCards();
const [showEaster, setShowEaster] = useState(false);
const router = useRouter();

return (
<div className="z-[10000] fixed w-[calc(100vw-160px)] h-[calc(100vh-160px)] top-[50%] left-[50%] translate-x-[-50%] translate-y-[-50%] rounded-[20px] bg-white p-[40px] pb-0">
Expand All @@ -36,10 +38,13 @@ function Content({ onClose }: SearchDialogProps) {
/>
<If condition={!showEaster}>
<div className="overflow-scroll grid flex-wrap" style={{ gap: 20, gridTemplateColumns: '1fr 1fr 1fr' }}>
{data?.data.map((info) => <SearchedCard key={info.id} {...info} />)}
{data?.data.map((info) => (
<SearchedCard key={info.id} {...info} onCardClick={() => router.push(`/write/${info.id}`)} />
))}
</div>
</If>
{showEaster && <EasterEgg />}
<div className="font-[NanumDaheng] text-transparent">ho</div>
</div>
);
}
Expand Down
Loading