Skip to content

너비에 따라 한줄 두줄로 나오게함 #45

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
bhy13579 merged 2 commits into from
Mar 19, 2025
Merged

너비에 따라 한줄 두줄로 나오게함 #45

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0772f50
너비에 따라 한줄 두줄로 나오게함
bhy13579 Mar 19, 2025
e56222f
Merge branch 'main' into SCRUM-89-방호영
bhy13579 Mar 19, 2025
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
39 changes: 34 additions & 5 deletions src/pages/RollingPaper/RollingPaperPage.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,15 @@ import InformationBar from "../../components/common/InformationBar/InformationBa
import CardWrite from "../../components/domain/rollingpaper/Card/CardWrite";
import Card from "../../components/domain/rollingpaper/Card/Card";
import styled from "styled-components";
import recipientsService from "../../api/services/recipientsService";
import axios from "axios";

import recipientsService from "../../api/services/recipientsService"; // get 요청

const CardContainer = styled.div`
margin: auto;
display: flex;
align-items: center;
justify-content: center;

padding: 100px 24px;
width: 100%;
box-sizing: border-box;
Expand All @@ -24,6 +25,11 @@ const DivWrap = styled.div`
display: grid;
grid-template-columns: repeat(3, 1fr);
gap: 28px;

@media (max-width: 1248px) {
grid-template-columns: repeat(2, 1fr);
}

opacity: ${({ isLoaded }) => (isLoaded ? 1 : 0)};
transition: opacity 0.5s ease-in-out;
`;
Expand All @@ -39,22 +45,38 @@ const BackgroundWrap = styled.div`
background-repeat: no-repeat;
background-position: center top;
background-attachment: fixed;

@media (max-width: 768px) {
background-attachment: scroll;
grid-template-columns: 1fr;
}
`;


const BackgroundWrap = styled.div.withConfig({
shouldForwardProp: (prop) =>
!["bgColor", "backgroundImageURL"].includes(prop),
})`
background-image: ${({ backgroundImageURL }) =>
backgroundImageURL ? `url(${backgroundImageURL})` : "none"};
background-color: ${({ bgColor }) => bgColor || "#FFE2AD"};
min-height: calc(100vh - 65px);
background-size: cover;
background-position: center;
`;

const colorMap = {
beige: "#FFE2AD",
purple: "#ECD9FF",
blue: "#B1E4FF",
green: "#D0F5C3",
};


function RollingPaperDetailPage() {
const { id } = useParams();
const [loading, setLoading] = useState(true);
const [recipientData, setRecipientData] = useState({});

const [messages, setMessages] = useState([]);
const [nextUrl, setNextUrl] = useState(null);
const [isLoaded, setIsLoaded] = useState(false);
Expand All @@ -80,7 +102,10 @@ function RollingPaperDetailPage() {
if (id) fetchInitialData();
}, [id]);

const loadMoreMessages = async () => {


// 메시지 로드 함수
const loadMoreMessages = async () => {
if (!nextUrl || isFetchingRef.current) return;
isFetchingRef.current = true;
try {
Expand All @@ -104,6 +129,7 @@ function RollingPaperDetailPage() {
return () => observer.disconnect();
}, [messages]);


useEffect(() => {
setTimeout(() => setIsLoaded(true), 100);
}, []);
Expand All @@ -116,7 +142,9 @@ function RollingPaperDetailPage() {
<InformationBar
name={recipientData?.name ?? ""}
count={recipientData?.messageCount ?? 0}
profileImages={recipientData?.recentMessages?.map(({ profileImageURL }) => profileImageURL) || []}
profileImages={(recipientData?.recentMessages ?? []).map(
({ profileImageURL }) => profileImageURL
)}
topReactions={recipientData?.topReactions ?? []}
setRecipientData={setRecipientData}
/>
Expand All @@ -128,6 +156,7 @@ function RollingPaperDetailPage() {
<CardWrite message={message} fontFamily={message.font} />
</div>
))}
{messages?.length > 0 && <div id="last-card"></div>}
</DivWrap>
</CardContainer>
</BackgroundWrap>
Expand Down
Loading