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.

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

Dev #63

Merged
merged 2 commits into from
Jan 21, 2024
Merged

Dev #63

Show file tree
Hide file tree
Changes from all commits
Commits
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
Binary file added public/image/μ˜€λ¦¬μ±—.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/image/μœ„ν‚€.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/image/탕후루.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/image/휠패슀.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion src/components/home/project/ProjectSection.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ const ProjectSection = () => {
<FadeInComponent variants={fadeInAnimation}>
<Wrapper>
<TitleWrapper>
<Title>각 νŠΈλž™μ΄ λͺ¨μ—¬ ν•¨κ»˜ λ§Œλ“  ν”„λ‘œμ νŠΈ</Title>
<Title>ν”„λ‘œμ νŠΈ μ†Œκ°œ</Title>
<Text>λ©‹μŸμ΄ μ‚¬μžμ²˜λŸΌμ—μ„œ νƒ„μƒν•œ μ„œλΉ„μŠ€λ“€μ„ μ†Œκ°œν•©λ‹ˆλ‹€. </Text>
</TitleWrapper>
<ProjectSlider />
Expand Down
20 changes: 17 additions & 3 deletions src/components/home/project/component/Project.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ const Project = ({
<ProjectTitle>{ProjectData.name}</ProjectTitle>
<ProjectText>{ProjectData.introduce}</ProjectText>
<TeamInfo>
<TeamName>{ProjectData.teamName}</TeamName>
<TeamName>TEAM {ProjectData.teamName}</TeamName>
<ProjectType>{ProjectData.projectType}</ProjectType>
</TeamInfo>
</TextWrapper>
Expand All @@ -52,14 +52,18 @@ const ProjectWrapper = styled(motion.div)`
border-radius: 30px;
display: flex;
height: 300px;
margin-top: 1rem;
margin-left: 4%;
margin-right: 4%;
top: 0;
left: 0;
bottom: 0;
right: 0;
@media (max-width: 900px) {
height: 150px;
height: 250px;
}
@media (max-width: 600px) {
height: 130px;
}
`;

Expand Down Expand Up @@ -110,11 +114,21 @@ const TeamName = styled.div`
font-weight: 500;
font-size: 14px;
margin-right: 15px;
width: 50%;
@media (max-width: 900px) {
font-size: 10px;
}
@media (max-width: 600px) {
width: 30%;
font-size: 7px;
}
`;
const ProjectType = styled(TeamName)`
width: 70%;
@media (max-width: 600px) {
font-size: 7px;
}
`;
const ProjectType = styled(TeamName)``;
const TeamInfo = styled.div`
display: flex;
`;
48 changes: 30 additions & 18 deletions src/components/home/project/component/ProjectSlider.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,10 @@ import styled from 'styled-components';
import { StaticImageData } from 'next/image';

import { TfiAngleLeft, TfiAngleRight } from 'react-icons/tfi';
import projectPic2 from '@image/projectPic2.png';
import mayI from '@image/메이아이.png';
import chunghaha from '@image/logoThumbnail.png';
import allItChat from '@image/μ˜€λ¦¬μ±—.png';
import wiki from '@image/μœ„ν‚€.png';
import huru from '@image/탕후루.png';
import pass from '@image/휠패슀.png';

import Project from './Project';
import useSlider from 'src/hooks/useSlider';
Expand All @@ -16,27 +17,35 @@ export interface IProjectInner {
projectType: string;
img: StaticImageData;
}

const ProjectData: IProjectInner[] = [
{
name: 'MAY I',
introduce: '기닀리지 λ§ˆμ„Έμš”, λ©”μ΄μ•„μ΄ν•˜μ„Έμš”. μ „λ¬Έκ°€-리포터 인터뷰 μ€‘κ°œ μ„œλΉ„μŠ€',
teamName: '메이아이',
projectType: '2022 해컀톀',
img: mayI,
name: 'μ˜€λ¦¬μ±—(All-It-Chat)',
introduce: 'λŒ€ν•™μ˜ 경계λ₯Ό λ„˜λŠ” κ΅ν™˜ν•™μƒ λ©˜ν† λ©˜ν‹° 맀칭 μ„œλΉ„μŠ€',
teamName: 'μ˜€μž‰',
projectType: '2023 해컀톀',
img: allItChat,
},
{
name: 'CAU LIKELION WIKI',
introduce: 'μ€‘μ•™λŒ€ λ©‹μŸμ΄μ‚¬μžμ²˜λŸΌ μœ„ν‚€',
teamName: 'ν‚€μœ„',
projectType: '2023 μ‚¬μ΄λ“œν”„λ‘œμ νŠΈ',
img: wiki,
},
{
name: 'μΉ΄λͺ¨λ§ˆμΌ',
introduce: '카페, λͺ¨λ‘μ˜ λ§ˆμŒλŒ€λ‘œ 맀일',
teamName: '21, 23, 25',
projectType: '2022 아이디어톀',
img: projectPic2,
name: '학ꡐ μ•ž 탕후루',
introduce: 'λ– λ‚˜μž, 본격 2000λ…„λŒ€ ν…ŒμŠ€νŠΈ λͺ¨μŒμ§‘',
teamName: '후루후루',
projectType: '2023 쀑컀톀',
img: huru,
},
{
name: 'CAU LIKELION',
introduce: 'μš°λ¦¬λ„ μ‚¬μ΄νŠΈ μžˆλ‹€ 마, 함 봐바라',
teamName: 'μ€‘ν•˜ν•˜',
projectType: 'μš΄μ˜μ§„ μ‚¬μ΄λ“œ ν”„λ‘œμ νŠΈ',
img: chunghaha,
name: '휠패슀',
introduce: 'νœ μ²΄μ–΄ μ΄μš©μžλ“€μ˜ μ•ˆμ „κ³Ό 편리λ₯Ό μœ„ν•œ, λ¬Έν™” μ‹œμ„€ 경둜 제곡 μ„œλΉ„μŠ€',
teamName: 'BFGGyu',
projectType: '2023 해컀톀',
img: pass,
},
];

Expand Down Expand Up @@ -71,6 +80,9 @@ const RelativeWrapper = styled.div`
width: 100%;
height: 300px;
@media (max-width: 900px) {
height: 250px;
}
@media (max-width: 600px) {
height: 150px;
}
`;
Expand Down
Loading