Skip to content

feat: feedPage에 SearchBar 추가& ui 개선 #216

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

Merged
TrossYou merged 1 commit into from
Oct 31, 2025
Merged

feat: feedPage에 SearchBar 추가& ui 개선 #216

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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: 14 additions & 3 deletions app/features/feed/pages/feedPage.module.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,22 @@
@use 'styles/layout' as *;

.searchBarContainer {
position: sticky;
top: 0;
z-index: 20;
padding: 0 24px;

@include mobile {
padding: 0;
}
}
.feed {
display: flex;
flex-direction: column;
justify-content: center;
padding: 24px;
padding: 0 24px;
@include mobile {
padding: 16px;
padding: 0 16px;
}
}

Expand All @@ -15,14 +26,14 @@
display: grid;
gap: 20px;
padding: 0;
margin: 0;
}

.card {
background: #fff;
border: 1px solid #eee;
border-radius: 16px;
overflow: hidden;
box-shadow: 0 6px 20px rgba(0, 0, 0, 0.04);
}

.cover-link {
Expand Down
69 changes: 38 additions & 31 deletions app/features/feed/pages/feedPage.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
import { Link, useLoaderData } from '@remix-run/react';

import { SearchBar } from 'app/components/SearchBar';

import styles from './feedPage.module.scss';
import { feedLoader } from '../loader';

Expand All @@ -10,40 +12,45 @@ export default function feedPage() {
const { feedList } = useLoaderData<typeof feedLoader>();

return (
<div className={styles.feed}>
<ul className={styles.list}>
{feedList.map((item) => (
<li key={item.id} className={styles.card}>
<Link to={`/music/${item.memo.songId}/user/${item.memo.userId}`} className={styles['cover-link']}>
<div className={styles['cover-box']}>
<img
className={styles.cover}
src={item.memo.song.thumbnailUrl || DEFAULT_COVER}
alt={`${item.memo.song.title} 앨범 커버`}
/>
</div>
</Link>
<div className={styles.body}>
<p className={styles.memo}>
<Link to={`/music/${item.memo.songId}/user/${item.memo.userId}`} className={styles.memoLink}>
{trimFirstLine(item.memo.content)}
</Link>
</p>
<div className={styles.meta}>
<Link to={`/profile/${item.memo.userId}/show`} className={styles.chip}>
<>
<div className={styles.searchBarContainer}>
<SearchBar />
</div>
<div className={styles.feed}>
<ul className={styles.list}>
{feedList.map((item) => (
<li key={item.id} className={styles.card}>
<Link to={`/music/${item.memo.songId}/user/${item.memo.userId}`} className={styles['cover-link']}>
<div className={styles['cover-box']}>
<img
className={styles.avatar}
src={(item.memo.user.avatarUrl ?? '').trim() || DEFAULT_AVATAR}
alt=""
className={styles.cover}
src={item.memo.song.thumbnailUrl || DEFAULT_COVER}
alt={`${item.memo.song.title} 앨범 커버`}
/>
<span className={styles.handle}>@{item.memo.user.handle}</span>
</Link>
</div>
</Link>
<div className={styles.body}>
<p className={styles.memo}>
<Link to={`/music/${item.memo.songId}/user/${item.memo.userId}`} className={styles.memoLink}>
{trimFirstLine(item.memo.content)}
</Link>
</p>
<div className={styles.meta}>
<Link to={`/profile/${item.memo.userId}/show`} className={styles.chip}>
<img
className={styles.avatar}
src={(item.memo.user.avatarUrl ?? '').trim() || DEFAULT_AVATAR}
alt=""
/>
<span className={styles.handle}>@{item.memo.user.handle}</span>
</Link>
</div>
</div>
</div>
</li>
))}
</ul>
</div>
</li>
))}
</ul>
</div>
</>
);
}

Expand Down
6 changes: 5 additions & 1 deletion app/features/profile/pages/show.module.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,11 @@
@use 'styles/layout' as *;

.root {
padding: 24px;
padding: 0 24px 24px;

@include mobile {
padding: 0 0 16px;
}
}
.profile-box {
display: flex;
Expand Down