Skip to content
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

Design: 프로젝트 페이지 개발자 디자인 #61

Merged
merged 3 commits into from
Nov 6, 2023
Merged

Design: 프로젝트 페이지 개발자 디자인 #61

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a7ffe14
Feat: 홈페이지 이동
imddoy Nov 6, 2023
6500ba3
Merge branch 'main' of https://github.com/2023WISCOM/WISCOM-FE into f…
imddoy Nov 6, 2023
d823f0d
Design: 개발자 디자인 갈아엎기
imddoy Nov 6, 2023
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
4 changes: 2 additions & 2 deletions WISCOM/src/components/Main/Folder.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ export default function Folder() {
<F.FolderName>PROJECT</F.FolderName>
</F.FolderGroup>

<F.FolderGroup href="/">
<F.FolderGroup href="https://www.duksung.ac.kr/" target="_blank">
<motion.div
whileHover={{
scale: 1.2,
Expand All @@ -37,7 +37,7 @@ export default function Folder() {
</motion.div>
<F.FolderName>GUESTBOOK</F.FolderName>
</F.FolderGroup>
<F.FolderGroup href="/">
<F.FolderGroup href="https://www.duksung.ac.kr/computer/main.do" target="_blank">
<motion.div
whileHover={{
scale: 1.2,
Expand Down
6 changes: 4 additions & 2 deletions WISCOM/src/components/Project/Developer.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,12 +11,14 @@ const Developer = ({ data }) => {
const developerLength = data && data.developer.length;
const upBoxData = data && data.developer.slice(2, developerLength);
const downBoxData = data && data.developer.slice(0, Math.min(2, developerLength));
const isThreeItems = upBoxData?.length === 3;

return (
<D.DeveloperContainer>
{data && (
<>
<D.DeTitle>DEVELOPER</D.DeTitle>
<D.UpBox>
<D.UpBox isThreeItems={isThreeItems}>
{upBoxData.map((developer, index) => (
<DeveloperProfile
key={index}
Expand All @@ -28,7 +30,7 @@ const Developer = ({ data }) => {
))}
</D.UpBox>

<D.DownBox>
<D.DownBox isThreeItems={isThreeItems}>
{downBoxData.map((developer, index) => (
<DeveloperProfile
key={index}
Expand Down
5 changes: 4 additions & 1 deletion WISCOM/src/components/Project/DeveloperProfile.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,10 @@ const DeveloperProfile = (props) => {
<DP.DeveloperProfileContainer>
{props && (
<>
<DP.DeveloperImg src={`http://13.124.248.135/${props.image}`} bg={props.bg} alt="개발자 이미지" />
<DP.DeveloperImg>
<DP.BackgroundImg src={props.bg} />
<DP.PersonalImg src={`http://13.124.248.135/${props.image}`} bg={props.bg} alt="개발자 이미지" />
</DP.DeveloperImg>
<DP.Name>{props.name}</DP.Name>
<DP.Impression>{props.impression}</DP.Impression>
</>
Expand Down
245 changes: 38 additions & 207 deletions WISCOM/src/components/Project/ProjectStyle.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -295,252 +295,83 @@ export const PrjURL = styled.div`
export const DeveloperContainer = styled.div`
display: flex;
flex-direction: column;
padding-left: 15rem;
padding-right: 15rem;

@media screen and (min-width: 1100px) and (max-width: 1300px) {
padding-left: 7rem;
padding-right: 2rem;
}

@media screen and (min-width: 950px) and (max-width: 1100px) {
padding-left: 5rem;
padding-right: 0rem;
}

@media screen and (min-width: 900px) and (max-width: 950px) {
padding-left: 0.05rem;
padding-right: 0.05rem;
}

@media screen and (min-width: 768px) and (max-width: 900px) {
padding-left: 0.025rem;
padding-right: 0.025rem;
}

@media screen and (min-width: 700px) and (max-width: 768px) {
padding-left: 0.02rem;
padding-right: 2rem;
}

@media screen and (min-width: 630px) and (max-width: 700px) {
padding-left: 0.015rem;
padding-right: 0.015rem;
}

@media screen and (min-width: 319px) and (max-width: 630px) {
padding: 0;
}
gap: 2.5vw;
padding: 0 8vw;
margin: 0.5vw;
`;

export const DeTitle = styled.div`
color: #20217d;
font-size: 60px;
font-size: 3vw;
font-weight: 700;
line-height: normal;
margin-bottom: 90px;

@media screen and (min-width: 768px) and (max-width: 1100px) {
font-size: 50px;
margin-left: -2rem;
}

@media screen and (min-width: 426px) and (max-width: 768px) {
font-size: 40px;
margin-bottom: 50px;
}

@media screen and (min-width: 426px) and (max-width: 760px) {
font-size: 20px;
margin-bottom: 40px;
}
@media screen and (min-width: 376px) and (max-width: 426px) {
font-size: 20px;
margin-bottom: 30px;
}

@media screen and (min-width: 319px) and (max-width: 376px) {
font-size: 15px;
margin-bottom: 20px;
margin-left: -2rem;
}
`;

export const UpBox = styled.div`
display: flex;
margin-bottom: 150px;

@media screen and (min-width: 470px) and (max-width: 660px) {
margin-bottom: 70px;
}
@media screen and (min-width: 319px) and (max-width: 470px) {
margin-bottom: 50px;
}
justify-content: center;
gap: 12vw;
margin-right: ${(props) => (props.isThreeItems ? '0' : '12vw')};
`;
export const DownBox = styled.div`
display: flex;
flex-direction: row-reverse;
justify-content: center;
gap: 12vw;
margin-left: ${(props) => (props.isThreeItems ? '0' : '12vw')};
`;

/*DeveloperProfile 부분*/
export const DeveloperProfileContainer = styled.div`
display: flex;
position: relative;
align-items: center;
flex-direction: column;
justify-content: center; //center or this
width: 250px;
height: 20vw;
margin-right: 15rem;

@media screen and (min-width: 1100px) and (max-width: 1200px) {
margin-right: 13rem;
}

@media screen and (min-width: 900px) and (max-width: 1100px) {
margin-right: 10rem;
}

@media screen and (min-width: 768px) and (max-width: 900px) {
margin-right: 5rem;
margin-left: 0.1rem;
width: 230px;
}

@media screen and (min-width: 700px) and (max-width: 768px) {
margin-right: 4rem;
margin-left: 0.1rem;
width: 230px;
}

@media screen and (min-width: 630px) and (max-width: 700px) {
margin-right: 2rem;
margin-left: 0.1rem;
width: 230px;
}
@media screen and (min-width: 550px) and (max-width: 630px) {
margin-right: 1.5rem;
margin-left: 0;
width: 200px;
}
@media screen and (min-width: 500px) and (max-width: 550px) {
margin-right: 3rem;
margin-left: 0;
width: 150px;
}

@media screen and (min-width: 450px) and (max-width: 500px) {
margin-right: 6rem;
margin-left: 0;
width: 100px;
}
@media screen and (min-width: 400px) and (max-width: 450px) {
margin-right: 6rem;
margin-left: 0;
width: 70px;
}
@media screen and (min-width: 319px) and (max-width: 400px) {
margin-right: 4rem;
margin-left: 0.02rem;
width: 90px;
justify-content: space-between;
width: 15vw;
height: 22vw;
@media screen and (max-width: 400px) {
height: 25vw;
}
`;

export const DeveloperImg = styled.img`
width: 250px;
background-repeat: no-repeat;
background-size: contain;
background-position: center;
background-image: url(${(props) => props.bg});

margin-bottom: 2.5rem;

@media screen and (min-width: 1100px) and (max-width: 1250px) {
width: 180px;
}

@media screen and (min-width: 900px) and (max-width: 1100px) {
width: 150px;
}

@media screen and (min-width: 768px) and (max-width: 900px) {
width: 110px;
}

@media screen and (min-width: 700px) and (max-width: 768px) {
width: 100px;
}
@media screen and (min-width: 550px) and (max-width: 700px) {
width: 90px;
margin-bottom: 1rem;
}
@media screen and (min-width: 350px) and (max-width: 550px) {
width: 70px;
margin-bottom: 0.5rem;
}
@media screen and (min-width: 319px) and (max-width: 350px) {
width: 50px;
margin-bottom: 0.5rem;
}
export const DeveloperImg = styled.div`
display: flex;
justify-content: center;
position: relative;
`;
export const BackgroundImg = styled.img`
height: 12vw;
`;
export const PersonalImg = styled.img`
height: 12vw;
position: absolute;
bottom: 0;
`;

export const Name = styled.div`
font-size: 3rem;
font-size: 2vw;
font-weight: bold;
color: #20217d;
position: absolute;
top: 18vw;

@media screen and (min-width: 700px) and (max-width: 900px) {
font-size: 2.3rem;
}
margin-top: 0.5vw;

@media screen and (min-width: 550px) and (max-width: 700px) {
font-size: 2rem;
}
@media screen and (min-width: 350px) and (max-width: 550px) {
bottom: -15px;
font-size: 1.5rem;
}
@media screen and (min-width: 319px) and (max-width: 350px) {
bottom: -10px;
font-size: 1.3rem;
@media screen and (max-width: 400px) {
font-size: 3vw;
}
`;

export const Impression = styled.div`
width: 20vw;
height: 8vw;
font-size: 2rem;
width: 15vw;
height: 4.7vw;
font-size: 1.2vw;
font-weight: bold;
color: #20217d;
position: absolute;
top: 23vw;
overflow-y: scroll;
margin: 1vw 0;
&::-webkit-scrollbar {
display: none;
width: 0;
}

@media screen and (min-width: 700px) and (max-width: 900px) {
font-size: 2rem;
}

@media screen and (max-width: 768px) {
bottom: -40px;
}

@media screen and (min-width: 550px) and (max-width: 700px) {
font-size: 1.5rem;
bottom: -35px;
}
@media screen and (min-width: 350px) and (max-width: 550px) {
font-size: 1rem;
bottom: -25px;
}

@media screen and (min-width: 319px) and (max-width: 350px) {
font-size: 1rem;
bottom: -20px;
@media screen and (max-width: 400px) {
font-size: 1.8vw;
height: 8vw;
}
`;