Skip to content

Commit

Permalink
Updated styling of the submissions details page for students, added a…
Browse files Browse the repository at this point in the history
… submission summary and card that presents the feedback and content of the submission
  • Loading branch information
ashwaqaljanahi2021 committed Oct 22, 2024
1 parent 0f95425 commit 9c29319
Show file tree
Hide file tree
Showing 6 changed files with 255 additions and 50 deletions.
3 changes: 1 addition & 2 deletions devU-client/src/components/misc/globalToolbar.scss
Original file line number Diff line number Diff line change
Expand Up @@ -50,9 +50,8 @@ $font-size: 16px;
height: 80px;
background-color: $purple;
//height: $bar-height;

font-size: 40px;
border-radius: 30px;
//border-radius: 30px removed so the edges are not round
color: #D9D9D9;
font-weight: 550;

Expand Down
5 changes: 4 additions & 1 deletion devU-client/src/components/misc/navbar.scss
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,17 @@
.breadcrumbContainer {
display: flex;
align-items: center;
margin-left: 3.5rem;
margin-top:10px;

}

.link {
text-decoration: none;
color: $text-color; /* Breadcrumb link color */

}


.link:hover {
text-decoration: underline;
}
Expand Down
22 changes: 11 additions & 11 deletions devU-client/src/components/pages/homePage/homePage.scss
Original file line number Diff line number Diff line change
@@ -1,31 +1,31 @@
@import 'variables';


.h2 {
.courses_title {
text-align: left;
margin-left: 20px;
font-size: 30px;
font-weight: 550;
margin-bottom: 30px;
}

h3 {
.courses_heading{
align-items:left;
margin-left: 20px;
font-size: 30px;
font-weight: 550;
margin-bottom: 30px;

}
h1 {
align-items:left;
margin-left: 20px;
font-size: 30px;
font-weight: 550;
margin-bottom: 30px;
}
// h1 {
// align-items:left;
// margin-left: 20px;
// font-size: 30px;
// font-weight: 550;
// margin-bottom: 30px;
// }

h4 {
.no_courses {
margin-left: 20px;
}

Expand Down Expand Up @@ -65,7 +65,7 @@ h4 {
align-items: center;
}

h3::after {
.courses_heading::after {
content: '';
display: block;
margin-top: 10px;
Expand Down
14 changes: 7 additions & 7 deletions devU-client/src/components/pages/homePage/homePage.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ const HomePage = () => {
<PageWrapper>
<div className={styles.header}>
<div className={styles.smallLine}></div>
<h2 className={styles.h2}>Courses</h2>
<h2 className={styles.courses_title}>Courses</h2>
<button className = {styles.create_course} onClick={() => {
history.push(`/addCoursesForm`)
}}>Create Course
Expand All @@ -84,7 +84,7 @@ const HomePage = () => {
</div>
<div className={styles.header}>
<div className={styles.smallLine}></div>
<h3>Current</h3>
<h3 className = {styles.courses_heading}>Current</h3>
<div className={styles.largeLine}></div>
</div>
<div className={styles.coursesContainer}>
Expand All @@ -101,12 +101,12 @@ const HomePage = () => {
<UserCourseListItem course={course} assignments={assignments.get(course)} key={course.id}/>
</div>
))}
{enrollCourses.length === 0 && <h4>You do not have current enrollment yet</h4>}
{enrollCourses.length === 0 && <h4 className={styles.no_courses}>You do not have current enrollment yet</h4>}
</div>

<div className={styles.header}>
<div className={styles.smallLine}></div>
<h3>Completed</h3>
<h3 className = {styles.courses_heading}>Completed</h3>
<div className={styles.largeLine}></div>
</div>

Expand All @@ -122,12 +122,12 @@ const HomePage = () => {
/>
</div>
))}
{pastCourses.length === 0 && <h4>No completed courses</h4>}
{pastCourses.length === 0 && <h4 className={styles.no_courses}>No completed courses</h4>}
</div>

<div className={styles.header}>
<div className={styles.smallLine}></div>
<h3>Upcoming</h3>
<h3 className = {styles.courses_heading}>Upcoming</h3>
<div className={styles.largeLine}></div>
</div>

Expand All @@ -137,7 +137,7 @@ const HomePage = () => {
<UserCourseListItem course={course} assignments={assignments.get(course)} key={course.id}/>
</div>
))}
{upcomingCourses.length === 0 && <h4>No upcoming Courses</h4>}
{upcomingCourses.length === 0 && <h4 className={styles.no_courses}>No upcoming Courses</h4>}
</div>


Expand Down
124 changes: 124 additions & 0 deletions devU-client/src/components/pages/submissions/submissionDetailPage.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,124 @@
@import 'variables';

.scores {
padding: 20px;
}

.submissionsLayout {
display: flex;
gap: 20px;
}

.submissionsContainer {
flex: 1;
max-width: 250px;
border-right: 1px solid lightgray;
padding-right: 10px;
overflow-y: auto;
}

.submissionCard {
margin-bottom: 15px;
cursor: pointer;
}

.submissionContent {
flex: 2;
max-height: 800px;
overflow-y: auto;
padding: 0 20px;
background-color: $background;
border: 1px solid #ddd;
color: $text-color;
border-radius: 30px;
padding:30px;
}

pre {
color: $text-color;
white-space: pre-wrap;
word-wrap: break-word;
font-size: 12px;
}

.feedbackContainer{
background-color: $background;

}

.scoreDisplay {

color:$text-color;

}

.content_title{
display: inline-block;
padding: 5px 10px;
background-color: $secondary;
color: $text-color;
border-radius: 5px;
font-size: 1rem;
font-weight: bold;
text-align: left;
margin-bottom: 10px;
margin-top:30px;
}

.scrollableContent {
max-height: 350px;
overflow-y: auto;
border: 1px solid $background;
padding: 10px;
background-color: $background;
border-radius: 5px;
border: 2px solid $text-color;
padding:0px;
}
p{
text-align: left;
margin-left: 10px;
}

.scrollableContent::-webkit-scrollbar {
width: 12px; /* Width of the scrollbar */
}

.scrollableContent::-webkit-scrollbar-thumb {
background-color: $purple;
border-radius: 10px;
}

.scrollableContent::-webkit-scrollbar-track {
background-color: #f0f0f0;
}

.problemAnswerContainer {
margin-top: 10px;
max-height: 400px;
overflow-y: auto;
padding: 10px;
background-color: $background;
border-radius: 5px;
}

.assignmentTable {
width: 100%;
border-collapse: collapse;
}

.assignmentTable th, .assignmentTable td {

padding: 8px;
text-align: center;
}

.assignmentTable th {
background-color: $background;
font-weight: bold;
}

.assignmentTable tr:nth-child(even) {
background-color: $background;
}

Loading

0 comments on commit 9c29319

Please sign in to comment.