diff --git a/devU-client/src/components/misc/navbar.scss b/devU-client/src/components/misc/navbar.scss index f490536..0c8cf19 100644 --- a/devU-client/src/components/misc/navbar.scss +++ b/devU-client/src/components/misc/navbar.scss @@ -1,6 +1,21 @@ @import 'variables'; +.breadcrumbContainer { + display: flex; + align-items: center; +} + .link { text-decoration: none; - color: #52468A; + color: $text-color; /* Breadcrumb link color */ + +} + +.link:hover { + text-decoration: underline; +} + +.separator { + color: #888; /* Separator color */ + margin: 0 5px; /* Add spacing between breadcrumbs */ } \ No newline at end of file diff --git a/devU-client/src/components/misc/navbar.tsx b/devU-client/src/components/misc/navbar.tsx index cbc2407..bb766f3 100644 --- a/devU-client/src/components/misc/navbar.tsx +++ b/devU-client/src/components/misc/navbar.tsx @@ -81,16 +81,16 @@ const Navbar = ({breadcrumbs}: any) => { ] return ( -
+
{breadcrumbs.map(({breadcrumb, match}: any, index: number) => { let url = match.url - if (excludedPaths.includes(match.params.path)) return
+ if (excludedPaths.includes(match.params.path)) return null if (match.params.home) url = '/' return ( {breadcrumb} - {index < (breadcrumbs.length - 1) ? ' > ' : ''} + {index < (breadcrumbs.length - 1) && ( > )} ) })} diff --git a/devU-client/src/components/pages/assignments/assignmentDetailPage.scss b/devU-client/src/components/pages/assignments/assignmentDetailPage.scss index 7f46726..e5e580c 100644 --- a/devU-client/src/components/pages/assignments/assignmentDetailPage.scss +++ b/devU-client/src/components/pages/assignments/assignmentDetailPage.scss @@ -1,60 +1,121 @@ @import 'variables'; +.wrap { + display:flex; + align-items: baseline; + gap:20px; + padding:20px; + justify-content:center; +} + + .header { display: flex; - align-items: center; + flex-direction: column; + align-items: flex-start; + color: $text-color; } -.smallLine { - width: 50px; /* adjust this value to set the length of the small line */ - border-top: 3px solid $text-color; /* adjust this value to set the color and thickness of the line */ - margin-right: 10px; /* adjust this value to set the space between the line and the text */ + +.line { + border: none; + height: 2px; + background-color: #ccc; + width: 100%; + margin-top: 10px; } -.largeLine { - flex-grow: 1; - border-top: 3px solid $text-color; /* adjust this value to set the color and thickness of the line */ - margin-left: 10px; /* adjust this value to set the space between the line and the text */ - margin-right: 10px; /* add this line to create some space between the line and the button */ +.card { + background-color: #f9f9f9; + border-radius: 8px; + padding: 20px; + width: 300px; + box-shadow: 0 4px 8px rgba(0, 0, 0, 0.1); + margin: 20px; } -.buttons { - margin : 0 10px; + +.card_heading { + font-size: 20px; + font-weight: 550; + margin-bottom: 15px; + color: #52468a; + text-align: center; } -.card { - width: 60%; - height: 50%; - display: flex; - flex-direction: column; - justify-content: center; + +.options_buttons { + display: flex; + flex-direction: column; align-items: center; - padding-top: 20px; + justify-content: center; + gap: 10px; + } -.accordion { - width: 90%; +.submit_container{ display: flex; - flex-direction: column; - margin-top: 10px; - margin-left: 10px; - margin-right: 10px; - background-color: $list-item-background; - color:$list-item-background + justify-content: flex-end; + align-items: flex-end; + width: 100%; + margin-top: auto; + } -.accordionDetails { - display: flex; - flex-direction: column; - align-items: center; - justify-content: center; - background-color: $list-item-background; - color:$text-color; + +.buttons { + color: #52468a; + background-color: #f9f9f9; + padding: 10px 20px; + border-radius:15px; + cursor: pointer; + font-size: 15px; + border: none; + width: fit-content; + text-align: center; + margin-left: 20px; +} + + +.buttons:hover { + background-color: #888; + +} + +.assignment_card { + background-color: #f9f9f9; + border-radius: 8px; + padding: 20px; + width: 100%; + box-shadow: 0 4px 8px rgba(0, 0, 0, 0.1); + width:800px; +} + +.accordion { + background-color: #f9f9f9; + box-shadow: none; + border: 1px solid #ddd; + margin-bottom: 10px; } +.accordionDetails { + background-color: #f9f9f9; + padding: 10px; + border-top: 1px solid #ddd; +} +.typography { + font-size: 16px; + color: #333; +} +.gridContainer { + display: flex; + justify-content: center; + align-items: center; + margin-top: 20px; +} .textField { - align-items: center; - justify-content: center; + margin-top: 10px; + margin-bottom: 20px; } .submissionCard { @@ -62,6 +123,60 @@ } .fileInput { - margin-top: 10px; - margin-bottom: 10px; + margin-top: 20px; +} + +.due_date { + font-size: 14px; + color: #888; + margin-top: 5px; + margin-bottom: 15px; +} + + +.submissionsContainer { + display: flex; + flex-direction: column; + width: 100%; + margin-top: 20px; +} + + +.submissionCard { + display: flex; + justify-content: space-between; + align-items: flex-start; + background-color: #f9f9f9; + border-radius: 8px; + box-shadow: 0 4px 8px rgba(0, 0, 0, 0.1); + transition: transform 0.2s ease; +} + +.submissionCard:hover { + transform: scale(1.02); } + +.submissionHeading { + font-size: 16px; + font-weight: bold; + color: #52468a; +} + + +.submissionTime { + font-size: 14px; + color: #888; + margin-top: 5px; +} + +@media (max-width: 768px) { + .header { + flex-direction: column; + align-items: center; + } + + .buttons { + width: 100%; + max-width: none; + } +} \ No newline at end of file diff --git a/devU-client/src/components/pages/assignments/assignmentDetailPage.tsx b/devU-client/src/components/pages/assignments/assignmentDetailPage.tsx index f242055..2eb53ad 100644 --- a/devU-client/src/components/pages/assignments/assignmentDetailPage.tsx +++ b/devU-client/src/components/pages/assignments/assignmentDetailPage.tsx @@ -11,8 +11,7 @@ import {SET_ALERT} from 'redux/types/active.types' import Card from '@mui/material/Card' import CardContent from '@mui/material/CardContent' import {Accordion, AccordionDetails, AccordionSummary, CardActionArea, TextField, Typography} from '@mui/material' -import Stack from '@mui/material/Stack' -import Button from '@mui/material/Button' + import Grid from '@mui/material/Unstable_Grid2' import styles from './assignmentDetailPage.scss' @@ -143,28 +142,50 @@ const AssignmentDetailPage = () => { return(
-
-

{assignment?.name}

-
- - {role.isInstructor() &&
+
+ + {role.isInstructor() && ( + <> +
+

Options

+
+
+ {role.isInstructor() && } - {role.isInstructor() && } +
+ {role.isInstructor() && } - {role.isInstructor() && } +
+ {role.isInstructor() && } - {role.isInstructor() && } +
+ {role.isInstructor() && } - -
+ }}>Edit Assignment} +
+
+ + )} + + + + + - - + + {assignment?.description} +
+ + {assignment?.dueDate && ( + {`Due Date: ${new Date(assignment.dueDate).toLocaleDateString()}`} + )} {nonContainerAutograders && nonContainerAutograders.length > 0 ? ( nonContainerAutograders.map((nonContainer, index) => ( @@ -182,37 +203,41 @@ const AssignmentDetailPage = () => { No Problems Exist )} - + {!(assignment?.disableHandins) && ()} - + {assignmentProblems && assignmentProblems.length > 0 ? ( - +
+ +
) : null}
- +
-

{`Submissions`}

-
+
{/**Submissions List */}
+
{submissions.map((submission, index) => ( { history.push(`/course/${courseId}/assignment/${assignmentId}/submission/${submission.id}`) }}> - - {`Submission ${submissions.length - index}`} - {`Submitted at: ${submission.createdAt && prettyPrintDateTime(submission.createdAt)}`} - + + {`Submission ${submissions.length - index}`} + {`Submitted at: ${submission.createdAt && prettyPrintDateTime(submission.createdAt)}`} + ))}
+
+ ) } diff --git a/devU-client/src/components/pages/homePage/homePage.scss b/devU-client/src/components/pages/homePage/homePage.scss index e84eab9..932d059 100644 --- a/devU-client/src/components/pages/homePage/homePage.scss +++ b/devU-client/src/components/pages/homePage/homePage.scss @@ -1,8 +1,8 @@ @import 'variables'; -h2 { - align-items:left; +.h2 { + text-align: left; margin-left: 20px; font-size: 30px; font-weight: 550; @@ -17,6 +17,13 @@ h3 { margin-bottom: 30px; } +h1 { + align-items:left; + margin-left: 20px; + font-size: 30px; + font-weight: 550; + margin-bottom: 30px; +} h4 { margin-left: 20px; diff --git a/devU-client/src/components/pages/homePage/homePage.tsx b/devU-client/src/components/pages/homePage/homePage.tsx index 3f27e2f..4bb0a1d 100644 --- a/devU-client/src/components/pages/homePage/homePage.tsx +++ b/devU-client/src/components/pages/homePage/homePage.tsx @@ -75,7 +75,7 @@ const HomePage = () => {
-

Courses

+

Courses