Skip to content

[fix]Assignment page #21

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
merged 1 commit into from
May 7, 2025
Merged

[fix]Assignment page #21

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
19 changes: 9 additions & 10 deletions frontend/src/Assignment.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@ import React from "react";
import WeeklyListBlock from "./components/WeeklyListBlock";
import Header from "./components/Header";
import AssignmentInfoBlock from "./components/AssignmentInfoBlock";
import styles from "./Assignment.module.css";

const Assignment = () => {
const weeks = [
{
Expand Down Expand Up @@ -37,22 +39,19 @@ const Assignment = () => {
},
];

//Assignment-Info-Block(형광 초록색카드 더미데이터)
//Assignment-Info-Block(형광 초록색카드 더미데이터)
const cardData = {
weekLabel: "3주차",
day: "화",
tasks: [
{ label: "Django girls 과제" },
{ label: "Django girls 과제" },
],
tasks: [{ label: "Django girls 과제" }, { label: "Django girls 과제" }],
};

return (

<div className="assignment-page" style={{ backgroundColor: "black", minHeight: "100vh", color: "white" }}>

<Header/>
<AssignmentInfoBlock {...cardData} />
<div className={styles.assignment_page}>
<Header />
<div className={styles.info}>
<AssignmentInfoBlock {...cardData} />
</div>

<WeeklyListBlock weeks={weeks} />
</div>
Expand Down
13 changes: 13 additions & 0 deletions frontend/src/Assignment.module.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
.info {
margin-top: 28px;
margin-bottom: 54px;
}

.assignment_page {
background-color: "black";
min-height: "100vh";
color: "white";
display: flex;
flex-direction: column;
align-items: center;
}
4 changes: 2 additions & 2 deletions frontend/src/components/componentsCss/AssignmentInfoBlock.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
padding: 16px;
margin: 12px auto;
border-radius: 10px;
max-width: 350px;
width: 309px;

box-shadow: 0 4px 10px rgba(0, 0, 0, 0.3);
color: black;
Expand All @@ -26,4 +26,4 @@
.task-list li {
margin-bottom: 6px;
font-size: 16px;
}
}
24 changes: 11 additions & 13 deletions frontend/src/components/componentsCss/WeeklyListBlock.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,18 +3,18 @@
flex-direction: column;
gap: 12px;
font-family: "Inter", sans-serif;
width: 350px;
width: 309px;
}

.weekly-item{
background-color: #045E07;
.weekly-item {
background-color: #045e07;
border-radius: 8px;
}

.weekly-button {
background-color: #575757;
color: white;
border: 1px solid rgba(217, 217, 217, 0.4);
border: 1px solid rgba(217, 217, 217, 0.4);
border-radius: 8px;
padding: 12px 20px;
font-size: 15px;
Expand All @@ -26,12 +26,12 @@
cursor: pointer;
}

.weekly-button:hover{
border: 1px solid var(--card-toggle-green)
.weekly-button:hover {
border: 1px solid var(--card-toggle-green);
}

.weekly-button.active{
background-color: #045E07;
.weekly-button.active {
background-color: #045e07;
border: none;
}

Expand All @@ -51,14 +51,12 @@
border-radius: 0 0 12px 12px;
color: white;
font-size: 16px;

}


.detail-item {
margin-top: 6px;
}

.daily-open-block-wrapper{
background-color:#045E07;
}
.daily-open-block-wrapper {
background-color: #045e07;
}
Loading