Skip to content

SCRUM-80-김수연 list 페이지 화면 구조 재수정과 버튼 스크롤 + 한 줄 스크롤 완료 #52

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

SCRUM-80-김수연 list 페이지 화면 구조 재수정과 버튼 스크롤 + 한 줄 스크롤 완료 #52

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
8bb74ce
list 페이지 화면 구조 재수정과 버튼 스크롤 + 한 줄 스크롤 완료
ramong26 Mar 19, 2025
6259f83
버튼 적용(리스트페이지완료)
ramong26 Mar 19, 2025
8906b79
반응형 모달 수정과 input and profileInput 반응형 수정
ramong26 Mar 19, 2025
af81d1e
Merge branch 'main' into SCRUM-80-김수연
ramong26 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
9 changes: 4 additions & 5 deletions src/components/common/Input/Input/Input.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,7 @@ export const Bone = styled.div`
width: 100%;
max-width: 720px;

@media (max-width: 768px) {
padding: 0;
}

@media (max-width: 360px) {
@media (max-width: 767px) {
padding: 0;
}
`;
Expand All @@ -32,6 +28,9 @@ const Picker = styled.div`
const ButtonWrapper = styled.div`
display: flex;
justify-content: center;
@media (max-width: 767px) {
margin-top: auto;
}
`

// To 전체적인 컴포넌
Expand Down
8 changes: 5 additions & 3 deletions src/components/common/Input/Picker/ColorPicker.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,10 @@ const Bone = styled.div`
gap: 12px;
flex-wrap: wrap;
margin: 45px 0;
@media (max-width: 768px) {
justify-content: flex-start;
@media (max-width: 767px) {
display: grid;
grid-template: 1fr 1fr / 1fr 1fr;
width: fit-content;
}
`;

Expand All @@ -24,7 +26,7 @@ const Color = styled.div`
justify-content: center;
position: relative;
background-color: ${(props) => props.color};
@media (max-width: 768px) {
@media (max-width: 767px) {
width: 154px;
height: 154px;
}
Expand Down
6 changes: 4 additions & 2 deletions src/components/common/Input/Picker/ImgPicker.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,10 @@ const Bone = styled.div`
gap: 12px;
flex-wrap: wrap;
margin: 45px 0;
@media (max-width: 768px) {
justify-content: flex-start;
@media (max-width: 767px) {
display: grid;
grid-template: 1fr 1fr / 1fr 1fr;
width: fit-content;
}
`;

Expand Down
14 changes: 9 additions & 5 deletions src/components/common/Input/ProfileInput/ProfileInputChoiceImage.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ const Bone = styled.div`
margin: 3.125rem auto 3.125rem auto;
width: 44.813rem;
height: auto;
@media (max-width: 768px) {
@media (max-width: 1199px) {
width: auto;
}
`;
Expand All @@ -34,10 +34,10 @@ const ProfileImg = styled.img`
height: 5rem;
margin-right: 2rem;
border-radius: 50%;
@media (max-width: 768px) {
@media (max-width: 1199px) {
margin-right: 1.76rem;
}
@media (max-width: 360px) {
@media (max-width: 767px) {
margin-right: 1.5rem;
}
`;
Expand All @@ -53,7 +53,7 @@ const ProfileImgChoice = styled.div`
width: 37.813rem;
height: 3.5rem;
margin: 0.75rem 0 0 0;
@media (max-width: 768px) {
@media (max-width: 1199px) {
display: flex;
align-items: center;
margin: 0.75rem 0 0 0;
Expand All @@ -63,6 +63,10 @@ const ProfileImgChoice = styled.div`
width: auto;
height: auto;
}
@media (max-width: 767px) {
display: grid;
grid-template: 1fr 1fr / 1fr 1fr 1fr 1fr 1fr;
}
`;

const Image = styled.div.withConfig({
Expand All @@ -83,7 +87,7 @@ const Image = styled.div.withConfig({
props.selected
? "0 0 5px rgba(0, 162, 254, 0.5)"
: "none"}; /* 선택 시 box-shadow 추가 */
@media (max-width: 360px) {
@media (max-width: 767px) {
width: 40px;
height: 40px;
}
Expand Down
27 changes: 25 additions & 2 deletions src/components/domain/rollingpaper/Card/CardWrite.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import React, { useState } from "react";
import React, { useState, useEffect } from "react";
import styled from "styled-components";
import IconButton from "../../../common/Button/IconButton";
import { textStyle } from "../../../../styles/textStyle";
Expand Down Expand Up @@ -85,6 +85,16 @@ const CardContainer = styled.div`
transform: scale(0.97);
box-shadow: 0px 1px 8px rgba(0, 0, 0, 0.1);
}
@media (max-width: 767px) {
&:hover {
transform: none;
box-shadow: none;
}
&:active {
transform: none;
box-shadow: none;
}
}
`;

const Header = styled.div`
Expand Down Expand Up @@ -146,9 +156,22 @@ const ProfileWrap = styled.div`

const CardWrite = ({ message, onDelete }) => {
const [isModalOpen, setIsModalOpen] = useState(false);
const [isMobile, setIsMobile] = useState(window.innerWidth <= 767);

useEffect(() => {
const handleResize = () => {
setIsMobile(window.innerWidth <= 768);
};

window.addEventListener("resize", handleResize);
return () => window.removeEventListener("resize", handleResize);
}, []);

const handleCardClick = () => {
if (!isMobile) { // 모바일이 아닐 때만 모달 실행
setIsModalOpen(true);
};
}
};

const handleCloseModal = () => {
setIsModalOpen(false);
Expand Down
Loading
Loading