Skip to content

Revert "Merge pull request #284 from THIP-TextHip/feat/influencer" #293

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
heeeeyong merged 1 commit into from
Nov 11, 2025
Merged

Revert "Merge pull request #284 from THIP-TextHip/feat/influencer" #293

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
2 changes: 0 additions & 2 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,6 @@
"@emotion/styled": "^11.14.0",
"@types/react-datepicker": "^7.0.0",
"axios": "^1.11.0",
"embla-carousel": "^8.6.0",
"embla-carousel-react": "^8.6.0",
"react": "^19.1.0",
"react-cookie": "^8.0.1",
"react-datepicker": "^8.4.0",
Expand Down
31 changes: 0 additions & 31 deletions pnpm-lock.yaml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

11 changes: 0 additions & 11 deletions src/assets/feed/lookmore-influencer.svg
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion src/components/feed/FeedPost.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ const Container = styled.div`
`;

const BorderBottom = styled.div`
width: 100%;
width: 94.8%;
/* min-width: 280px;
max-width: 500px; */
margin: 0 auto;
Expand Down
65 changes: 0 additions & 65 deletions src/components/feed/RecommendedFeedCard.tsx
View file
Open in desktop

This file was deleted.

106 changes: 0 additions & 106 deletions src/components/feed/RecommendedFeedSection.tsx
View file
Open in desktop

This file was deleted.

24 changes: 10 additions & 14 deletions src/components/feed/TotalFeed.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,29 +1,25 @@
import styled from '@emotion/styled';
import { Fragment } from 'react';
import FollowList from './FollowList';
import FeedPost from './FeedPost';
import RecommendedFeedSection from './RecommendedFeedSection';
import type { FeedListProps } from '../../types/post';
import { colors, typography } from '@/styles/global/global';

const TotalFeed = ({ showHeader, posts = [], isTotalFeed }: FeedListProps) => {
const TotalFeed = ({ showHeader, posts = [], isTotalFeed, isLast = false }: FeedListProps) => {
const hasPosts = posts.length > 0;

return (
<Container>
<FollowList />
{hasPosts ? (
<>
{posts.map((post, index) => (
<Fragment key={`${post.feedId}-${index}`}>
<FeedPost showHeader={showHeader} isMyFeed={isTotalFeed} isLast={false} {...post} />
{/* 10개마다 추천 섹션 반복 표시 */}
{(index + 1) % 10 === 0 && (
<RecommendedFeedSection sectionIndex={Math.floor((index + 1) / 10) - 1} />
)}
</Fragment>
))}
</>
posts.map((post, index) => (
<FeedPost
key={`${post.feedId}-${index}`}
showHeader={showHeader}
isMyFeed={isTotalFeed}
isLast={isLast && index === posts.length - 1}
{...post}
/>
))
) : (
<EmptyState>
<div>피드에 작성된 글이 없어요</div>
Expand Down
Loading