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

Feature/#214 마이페이지 마일스톤 수정 #215

Merged
merged 2 commits into from
Sep 20, 2024
Merged

Feature/#214 마이페이지 마일스톤 수정 #215

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
898fd7f
feat: 마이페이지의 마일스톤 관리 수정
llddang Sep 20, 2024
0eff1e5
feat: 마일스톤 페이지에 마일스톤 등록하러가기 버튼 추가
llddang Sep 20, 2024
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
10 changes: 10 additions & 0 deletions frontend/src/app/(client)/(withSidebar)/milestone/page.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import Image from 'next/image';

import * as S from './styled';
import Link from 'next/link';

const Page = () => (
<S.Content>
Expand All @@ -14,6 +15,15 @@ const Page = () => (
학생들은 교내외 여러 활동들을 통하여 실전적 SW역량, 글로벌 역량, 커뮤니케이션 역량을 균형있게 함양하고
SW중심대학사업단에서는 학생들의 적립된 마일스톤 점수에 따라 매년 장학생을 선발하고 있습니다.
</S.Description>
<div className="mb-10 mt-6 flex flex-col items-center">
<Link
href="/my-page/milestone/register"
className="mt-2 block w-fit rounded-sm bg-primary-main p-3 text-lg font-semibold tracking-wide text-white"
type="button"
>
마일스톤 등록하러 가기
</Link>
</div>
<S.ImageWrapper maxWidth="429px" maxHeight="208px" backgroundImage="/images/milestone/milestone_img02_bg.png">
<Image src="/images/milestone/milestone_img02.png" priority={false} alt="" fill />
</S.ImageWrapper>
Expand Down
1 change: 0 additions & 1 deletion frontend/src/app/(client)/(withSidebar)/milestone/styled.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@ export const Title = styled.div`

export const Description = styled.div`
text-align: center;
margin-bottom: 50px;
`;

export const InformationList = styled.ul`
Expand Down
2 changes: 1 addition & 1 deletion frontend/src/app/(client)/(withSidebar)/my-page/components/MilestoneHistorySection/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ const MilestoneHistorySection = async () => {

return (
<div className="relative w-full min-w-[260px] flex-1 rounded-sm bg-white p-5 lg:max-w-[280px]">
<SubTitle title="실적 등록" urlText="등록하기" url="/my-page/milestone/register" />
<SubTitle title="실적 관리" urlText="전체보기" url="/my-page/milestone/register" />
<div className="mt-4">
{milestoneHistoriesOfStudent ? (
milestoneHistoriesOfStudent.content.map((milestoneHistory) => (
Expand Down