Skip to content

Commit

Permalink
feat/#492 : 전체적 반영
Browse files Browse the repository at this point in the history
  • Loading branch information
moondda committed Dec 17, 2024
1 parent f0a0776 commit bc0e446
Showing 1 changed file with 41 additions and 13 deletions.
54 changes: 41 additions & 13 deletions src/pages/groupFeed/GroupFeed.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,9 @@ import {
useGroupInfo,
useTopicList,
} from './hooks/queries';
import { MOBILE_MEDIA_QUERY } from '../../styles/mediaQuery';
import Responsive from '../../components/commons/Responsive/Responsive';
import GroupMobileInfo from './components/GroupMobileInfo';

const GroupFeed = () => {
const { groupId } = useParams();
Expand Down Expand Up @@ -86,18 +89,33 @@ const GroupFeed = () => {
<GroupFeedThumnail imageUrl={infoResponse?.imageUrl} />
<Spacing marginBottom="6" />
<GroupInfoWrapper>
{infoResponse && (
<GroupSideHeader
groupInfoData={infoResponse}
isMember={isMember}
isOwner={isOwner}
setShowEditProfileModal={setShowEditProfileModal}
writerName={writerName}
/>
)}
<Responsive only="desktop">
{infoResponse && (
<GroupSideHeader
groupInfoData={infoResponse}
isMember={isMember}
isOwner={isOwner}
setShowEditProfileModal={setShowEditProfileModal}
writerName={writerName}
/>
)}
</Responsive>
<GroupInfo>
<GroupTodayWriteStyle todayInfo={todayInfo} isMember={isMember} groupId={groupId} />
<Responsive only="mobile">
{infoResponse && (
<GroupMobileInfo
groupInfoData={infoResponse}
isMember={isMember}
isOwner={isOwner}
setShowEditProfileModal={setShowEditProfileModal}
writerName={writerName}
/>
)}
<Spacing marginBottom="8" />
</Responsive>
<Spacing marginBottom="6.4" />

<GroupCuriousTitle
mainText="우리 모임에서 궁금한 글쓴이에요"
subText="매주 월요일마다 업데이트 됩니다"
Expand Down Expand Up @@ -136,7 +154,6 @@ export default GroupFeed;

const GroupFeedWrapper = styled.div`
width: 100%;
height: 100vh;
background-color: ${({ theme }) => theme.colors.backGroundGray};
`;
Expand All @@ -146,19 +163,30 @@ const GroupFeedThumnail = styled.div<{ imageUrl: string | undefined }>`
background-image: ${({ imageUrl }) => `url(${imageUrl || GroupThumbnailImgIc})`};
background-size: cover;
@media ${MOBILE_MEDIA_QUERY} {
height: 18rem;
}
`;
const GroupInfoWrapper = styled.div`
display: flex;
gap: 3.9rem;
justify-content: center;
padding-right: 16.5rem;
padding-left: 16.5rem;
padding: 0 16.5rem;
@media ${MOBILE_MEDIA_QUERY} {
padding: 0 2rem;
}
`;

const GroupInfo = styled.div`
display: flex;
flex-direction: column;
width: 72rem;
justify-content: center;
@media ${MOBILE_MEDIA_QUERY} {
width: 100%;
}
`;

const GroupFloatingBtnIcon = styled(GroupFloatingBtnIc)`
Expand Down

0 comments on commit bc0e446

Please sign in to comment.