Skip to content

Commit

Permalink
πŸ”€ Add Responsive Page Design
Browse files Browse the repository at this point in the history
#285 νŽ˜μ΄μ§€ λ””μžμΈ λ°˜μ‘ν˜• μΆ”κ°€ 및 μ½”λ“œ μ‚­μ œ
  • Loading branch information
chaeyoungwon authored Oct 2, 2024
2 parents ed1116a + fc3a688 commit a89c807
Show file tree
Hide file tree
Showing 17 changed files with 107 additions and 68 deletions.
1 change: 0 additions & 1 deletion gongjakso/src/components/Auth/KakaoRedirectPage.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ const KakaoRedirectPage = () => {
useEffect(() => {
getToken(code, REDIRECT_URI)
.then(result => {
console.log(result);
localStorage.setItem('accessToken', result?.accessToken);
window.location.replace('/');
})
Expand Down
4 changes: 2 additions & 2 deletions gongjakso/src/components/Footer/Footer.Styled.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ export const Footer = styled.div`
display: flex;
margin: auto;
width: 100%;
max-width: 1200px;
max-width: 75rem;
height: 92px;
align-items: center;
justify-content: center;
Expand All @@ -19,7 +19,7 @@ export const Footer = styled.div`
export const FooterContainer = styled.ul`
display: flex;
width: 100%;
max-width: 1100px;
max-width: 68.75rem;
justify-content: space-between;
position: static;
`;
Expand Down
2 changes: 1 addition & 1 deletion gongjakso/src/components/Header/Header.Styled.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ export const Header = styled.div`
width: 100%;
justify-content: center;
padding: 15px;
padding-left: 80px;
align-items: center;
position: absolute;
top: 0;
`;
Expand Down
1 change: 0 additions & 1 deletion gongjakso/src/components/common/Calendar/SelectOne.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,6 @@ const SelectOne = ({ value, onApply, placeholder, width }) => {
};

const handleApply = () => {
console.log('Selected Date:', selectedDate);
if (selectedDate) {
onApply(selectedDate); // λΆ€λͺ¨ μ»΄ν¬λ„ŒνŠΈλ‘œ μ„ νƒλœ λ‚ μ§œ 전달
}
Expand Down
1 change: 0 additions & 1 deletion gongjakso/src/features/modal/ClickRecruitApplicant.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@ const ClickmyApply = props => {
// νŠΉμ • μ§€μ›μž μ§€μ›μ„œ μ—΄λžŒν•˜κΈ°
useEffect(() => {
getMyApplication(props.applyId).then(res => {
console.log('μ§€μ›μ„œ 데이터:', res?.data); // API 응닡 확인
setmyApp(res?.data);
});
}, [props.applyId]);
Expand Down
3 changes: 0 additions & 3 deletions gongjakso/src/features/modal/ClickmyApply.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@ const ClickmyApply = props => {
// νŠΉμ • μ§€μ›μž μ§€μ›μ„œ μ—΄λžŒν•˜κΈ°
useEffect(() => {
getMyApplication(props.applyId).then(res => {
// console.log(res?.data);
setmyApp(res?.data);
});

Expand All @@ -35,8 +34,6 @@ const ClickmyApply = props => {
});
}, [props.applyId]);

// console.log(portfolioData);

return (
<div>
<S.Background>
Expand Down
1 change: 0 additions & 1 deletion gongjakso/src/features/modal/DeleteModal.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ import Close from '../../assets/images/Close.svg';

const DeleteModal = ({ showModal, closeModal, confirmDelete, title, type }) => {
if (!showModal) return null;
console.log('Type received in modal:', type);

const getDeleteMessage = () => {
switch (type) {
Expand Down
10 changes: 1 addition & 9 deletions gongjakso/src/pages/DetailPage/DetailPageProject.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,7 @@ import arrow from '../../assets/images/Arrow.svg';
import googleform from '../../assets/images/GoogleFormLink.svg';
import ApplyModal from '../../features/modal/ApplyModal';
import Completed from '../../features/modal/Completed';
import {
getPostDetail,
getScrap,
postScrap,
getCheckStatus,
} from '../../service/post_service';
import { getPostDetail, getScrap, postScrap } from '../../service/post_service';
import ClickmyApply from '../../features/modal/ClickmyApply';
import { getMyApplication } from '../../service/apply_service';
import ApplyCancel from '../../features/modal/ApplyCancel';
Expand Down Expand Up @@ -73,9 +68,6 @@ const DetailPageProject = () => {
setapplyTitle(res?.data.title);
});

getCheckStatus(id).then(res => {
setcheckStatus(res?.data.role);
});
getScrap(id).then(res => {
setscrapStatus(res?.data.scrapStatus);
});
Expand Down
79 changes: 75 additions & 4 deletions gongjakso/src/pages/HomePage/HomePage.Styled.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -93,8 +93,10 @@ export const PageImg = styled.div`
height: 59.7rem;
position: absolute;
margin-top: 5rem;
transform: scale(0.9);
background-repeat: no-repeat;
@media (max-width: 1270px) {
transform: scale(0.85);
}
`;

export const ContestImg = styled.div`
Expand All @@ -105,6 +107,10 @@ export const ContestImg = styled.div`
margin-top: 1rem;
right: 0;
background-repeat: no-repeat;
@media (max-width: 1270px) {
transform: scale(0.85);
margin-top: 0;
}
`;

export const Section = styled.div`
Expand All @@ -121,11 +127,16 @@ export const Section = styled.div`
export const Section1 = styled.div`
display: flex;
justify-content: space-between;
width: 77rem;
width: 100%;
max-width: 77rem;
height: 45rem;
padding: 4rem 0;
flex-direction: row;
position: relative;
@media (max-width: 1270px) {
max-width: 64rem;
}
`;

export const Bubble = styled.div`
Expand All @@ -140,6 +151,9 @@ export const Bubble = styled.div`
background-repeat: no-repeat;
background: url(${leftBubble});
font-weight: 600;
@media (max-width: 1270px) {
transform: scale(0.8);
}
`;

export const Text = styled.div`
Expand All @@ -153,6 +167,11 @@ export const Text = styled.div`
width: 18rem;
position: absolute;
font-size: ${({ theme }) => theme.fontSize.lg};
@media (max-width: 1270px) {
left: 12rem;
top: 8rem;
font-size: ${({ theme }) => theme.fontSize.md};
}
`;

export const TextContainer = styled.div`
Expand All @@ -172,31 +191,54 @@ export const TeamImg = styled.div`
width: 18rem;
background-size: cover;
height: 16rem;
@media (max-width: 1270px) {
left: 16rem;
top: 12rem;
transform: scale(0.9);
}
`;

export const RightBubble = styled(Bubble)`
background: url(${rightBubble});
right: 0;
background-repeat: no-repeat;
@media (max-width: 1270px) {
transform: scale(0.8);
margin-top: 1rem;
}
`;

export const RightBubble1 = styled(RightBubble)`
position: absolute;
left: 7.5rem;
top: 6.5rem;
@media (max-width: 1270px) {
transform: scale(0.8);
left: 1.5rem;
top: 5.5rem;
margin-top: 0;
}
`;

export const Section2 = styled(Section1)`
width: 80rem;
max-width: 80rem;
width: 100%;
height: 45rem;
position: relative;
@media (max-width: 1270px) {
max-width: 64rem;
}
`;

export const Section3 = styled(Section1)`
width: 80rem;
max-width: 80rem;
width: 100%;
height: 40rem;
margin-bottom: 30rem;
position: relative;
@media (max-width: 1270px) {
max-width: 64rem;
}
`;

export const ContestDetail = styled(ContestImg)`
Expand All @@ -205,6 +247,9 @@ export const ContestDetail = styled(ContestImg)`
left: 0;
height: 30rem;
background-repeat: no-repeat;
@media (max-width: 1270px) {
transform: scale(0.85);
}
`;

export const TextContainer1 = styled(TextContainer)`
Expand All @@ -219,6 +264,9 @@ export const Bubble1 = styled(Bubble)`
position: absolute;
right: 8.5rem;
top: 6.5rem;
@media (max-width: 1270px) {
right: 0.8rem;
}
`;

export const Bubble2 = styled(Bubble)`
Expand All @@ -233,21 +281,35 @@ export const Text1 = styled(Text)`
top: 20rem;
left: -110px;
width: 30rem;
@media (max-width: 1270px) {
left: 40px;
top: 18rem;
}
`;

export const Text2 = styled(Text)`
text-align: right;
top: 29.5rem;
left: 8.5rem;
width: 32rem;
@media (max-width: 1270px) {
left: 2rem;
top: 24rem;
}
`;

export const TeamImg2 = styled(TeamImg)`
background: url(${teambuilding2});
width: 19rem;
height: 17rem;
background-size: cover;
left: 17.5rem;
top: 14.5rem;
@media (max-width: 1270px) {
left: 19.5rem;
top: 15rem;
transform: scale(0.7);
}
`;

export const PortfolioImg = styled(TeamImg)`
Expand All @@ -257,6 +319,11 @@ export const PortfolioImg = styled(TeamImg)`
background-size: cover;
left: 26rem;
top: 13rem;
@media (max-width: 1270px) {
left: 17rem;
transform: scale(0.8);
top: 10rem;
}
`;

export const PortfolioDetail = styled(ContestImg)`
Expand All @@ -266,4 +333,8 @@ export const PortfolioDetail = styled(ContestImg)`
top: 9.5rem;
width: 37.7rem;
height: 28rem;
@media (max-width: 1270px) {
top: 7.2rem;
transform: scale(0.8);
}
`;
13 changes: 10 additions & 3 deletions gongjakso/src/pages/Portfolio/Portfolio.Styled.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@ export const TopBox = styled.div`
export const BoxDetail = styled.div`
display: flex;
gap: 0.5rem;
width: 70rem;
margin-bottom: 1rem;
`;
export const PortfolioInfo = styled.div`
Expand All @@ -42,12 +41,17 @@ export const Description = styled.span`
`;

export const GlobalBox = styled.div`
width: 64rem;
margin: 5rem auto 0 auto; // κ°€μš΄λ° μ •λ ¬
width: 100%;
max-width: 1000px;
display: flex;
flex-direction: column;
align-items: center;
margin: auto; // κ°€μš΄λ° μ •λ ¬
`;

export const SubTitle = styled.p`
width: 100%;
max-width: 1000px;
font-size: ${({ theme }) => theme.fontSize.lg};
font-weight: 700;
margin-bottom: 25px;
Expand All @@ -60,12 +64,15 @@ export const SubTitle = styled.p`

export const UploadInfo = styled.p`
width: 100%;
max-width: 1000px;
font-size: ${({ theme }) => theme.fontSize.m};
font-weight: 500;
color: #565656;
margin: 0.625rem 0;
line-height: 1.343rem;
margin-bottom: 1.5rem;
display: flex;
align-items: center;
`;

export const LinkIcon = styled.div`
Expand Down
32 changes: 17 additions & 15 deletions gongjakso/src/pages/Portfolio/UsePortfolio.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -42,8 +42,8 @@ const UsePortfolio = () => {
}
if (notionData && notionData.notionUri) {
setSnsLink(notionData.notionUri || '');
} else {
console.log('No Notion URI found');
// } else {
// console.log('No Notion URI found');
}
} catch (error) {
console.error(
Expand Down Expand Up @@ -135,14 +135,16 @@ const UsePortfolio = () => {
</S.PortfolioInfo>
</S.TopBox>
<S.GlobalBox>
<S.SubTitle>
포트폴리였 파일 {isEdit ? 'μˆ˜μ •' : 'μ—…λ‘œλ“œ'}ν•˜κΈ°
</S.SubTitle>
<S.UploadInfo>
PDF ν˜•μ‹μœΌλ‘œ μ—…λ‘œλ“œ ν•΄μ£Όμ„Έμš”.
<br />
μ΅œλŒ€ 10MB κΉŒμ§€ μ—…λ‘œλ“œν•  수 μžˆμ–΄μš”.
</S.UploadInfo>
<S.TitleSection style={{ flexDirection: 'column' }}>
<S.SubTitle>
포트폴리였 파일 {isEdit ? 'μˆ˜μ •' : 'μ—…λ‘œλ“œ'}ν•˜κΈ°
</S.SubTitle>
<S.UploadInfo>
PDF ν˜•μ‹μœΌλ‘œ μ—…λ‘œλ“œ ν•΄μ£Όμ„Έμš”.
<br />
μ΅œλŒ€ 10MB κΉŒμ§€ μ—…λ‘œλ“œν•  수 μžˆμ–΄μš”.
</S.UploadInfo>
</S.TitleSection>

<S.FileUploadBox>
<S.pdfImg />
Expand Down Expand Up @@ -180,13 +182,13 @@ const UsePortfolio = () => {
)}

{error && <S.ErrorMessage>{error}</S.ErrorMessage>}
<S.TitleSection>
<S.TitleSection style={{ flexDirection: 'column' }}>
<S.SubTitle>λ…Έμ…˜ 포트폴리였 링크 μž…λ ₯ν•˜κΈ°</S.SubTitle>
<S.UploadInfo>
λ…Έμ…˜ κ³΅μœ μ—μ„œ β€˜μ›Ήμ— κ²Œμ‹œβ€™ μ—¬λΆ€λ₯Ό ν™•μΈν•΄μ£Όμ„Έμš”! κ²Œμ‹œκ°€
ν—ˆμš©λ˜μ§€ μ•Šμ•˜μ„ 경우 링크 확인이 λΆˆκ°€λŠ₯ν•΄μš”.
</S.UploadInfo>
</S.TitleSection>
<S.UploadInfo>
λ…Έμ…˜ κ³΅μœ μ—μ„œ β€˜μ›Ήμ— κ²Œμ‹œβ€™ μ—¬λΆ€λ₯Ό ν™•μΈν•΄μ£Όμ„Έμš”! κ²Œμ‹œκ°€
ν—ˆμš©λ˜μ§€ μ•Šμ•˜μ„ 경우 링크 확인이 λΆˆκ°€λŠ₯ν•΄μš”.
</S.UploadInfo>

{/* 단일 λ…Έμ…˜ 링크 μž…λ ₯ ν•„λ“œ */}
<S.BoxDetail>
Expand Down
Loading

0 comments on commit a89c807

Please sign in to comment.