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

refactor: search 페이지 #153

Merged
merged 3 commits into from
Apr 16, 2024
Merged

refactor: search 페이지 #153

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6b1b244
fix(document): column 정렬 되는거 수정
Ubinquitous Apr 15, 2024
990e6e1
refactor(search): 모듈 분리 후 주석 추가
Ubinquitous Apr 15, 2024
6459293
refactor(document): 유저 UX를위해 애니메이션 속도 늦춤
Ubinquitous Apr 15, 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
17 changes: 17 additions & 0 deletions app/search/[keyword]/SearchNotFound.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
import Container from "@/components/Container";
import Link from "next/link";
import { FC } from "react";
import * as styles from "./style.css";

const SearchNotFound: FC<{ keyword: string }> = ({ keyword }) => {
return (
<Container title={`검색결과#${decodeURI(keyword)}`} docsType="검색 결과">
<h1 className={styles.searchTitle}>검색 결과가 없습니다.</h1>
<Link href="/create" className={styles.searchCreateLink}>
직접 문서를 생성해보세요
</Link>
</Container>
);
};

export default SearchNotFound;
26 changes: 9 additions & 17 deletions app/search/[keyword]/SearchResult.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,42 +12,33 @@ import { theme } from "@/styles";
import { useDate } from "@/hooks";
import { MoonLoader } from "react-spinners";
import * as styles from "./style.css";
import SearchNotFound from "./SearchNotFound";

const SearchResult: FC<{ keyword: string }> = ({ keyword }) => {
const { data: result } = useQuery(docsQuery.keyword(keyword));
const router = useRouter();
const { formatDate } = useDate();

if (!result) {
return (
<Container title={`검색결과#${decodeURI(keyword)}`} docsType="user">
<div className={styles.searchNotFoundBox}>
<h1 className={styles.searchTitle}>검색 결과가 없습니다.</h1>
<Link href="/create" className={styles.searchCreateLink}>
직접 문서를 생성해보세요
</Link>
</div>
</Container>
);
}
if (!result) return <SearchNotFound keyword={keyword} />;

/** 결과값이 한 개면 바로 리다이렉트 */
if (result.length === 1) {
router.push(`/docs/${result[0].title}`);
} else {
return (
<Container title={`검색결과#${decodeURI(keyword)}`} docsType="user">
{result.map((docs) => (
<Link href={`/docs/${docs.title}`} key={docs.id} className={styles.container}>
<div className={styles.docs}>
<article className={styles.docs}>
<hgroup className={styles.titleBox}>
<h1 className={styles.title}>{docs.title}</h1>
<span className={styles.lastModifiedAt}>
<time className={styles.lastModifiedAt}>
최근 수정일 ·&nbsp;
{formatDate(docs.lastModifiedAt)}
</span>
</time>
</hgroup>
<p className={styles.simpleContents}>{tagRemover(docs.simpleContents)}</p>
</div>
</article>
{docs.thumbnail && (
<Image
width={170}
Expand All @@ -63,8 +54,9 @@ const SearchResult: FC<{ keyword: string }> = ({ keyword }) => {
);
}

/** 로딩 중일 경우 */
return (
<div className={styles.loader}>
<div className={styles.loaderBox}>
<MoonLoader size={40} color={theme.primary} />
</div>
);
Expand Down
7 changes: 1 addition & 6 deletions app/search/[keyword]/style.css.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,11 +67,6 @@ export const thumbnail = style({
},
});

export const searchNotFoundBox = style({
gap: "8px",
...flex.COLUMN_FLEX,
});

export const searchTitle = style({
...font.p2,
});
Expand All @@ -86,7 +81,7 @@ export const searchCreateLink = style({
},
});

export const loader = style({
export const loaderBox = style({
width: "100%",
height: "100vh",
...flex.CENTER,
Expand Down
9 changes: 4 additions & 5 deletions styles/document.css.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@ export const summary = style({
...font.H2,
...flex.FLEX,

// "::-webkit-details-marker": {},
selectors: {
[`${details} > &::-webkit-details-marker`]: {
display: "none",
Expand Down Expand Up @@ -48,6 +47,7 @@ export const summary = style({

export const link = style({
color: theme.link,
display: "inline",
":hover": {
textDecoration: "underline",
},
Expand All @@ -60,7 +60,6 @@ export const block = style({
backgroundColor: `${theme.hover}`,
padding: "16px 20px",
margin: "10px 0",
...flex.COLUMN_FLEX,
...font.H5,
});

Expand All @@ -70,7 +69,6 @@ export const quote = style({
border: `1px solid ${theme.gray}`,
padding: "10px 20px",
...font.H6,
...flex.COLUMN_FLEX,
});

const shakeAnimation = keyframes({
Expand All @@ -92,7 +90,7 @@ const shakeAnimation = keyframes({
});

export const shake = style({
animation: `${shakeAnimation} 0.5s linear infinite`,
animation: `${shakeAnimation} 1s linear infinite`,
});

const spinAnimation = keyframes({
Expand All @@ -105,7 +103,8 @@ const spinAnimation = keyframes({
});

export const spin = style({
animation: `${spinAnimation} 0.5s linear infinite`,
width: "fit-content",
animation: `${spinAnimation} 1s linear infinite`,
});

export const rainbow = style({
Expand Down