Merge pull request #157 from makeopensource/task-86-update_for_studen…

…t's_submissions_page

Task 86 update for student's submissions page

devU-client/src/components/misc/globalToolbar.scss

@@ -46,10 +46,15 @@ $font-size: 16px;
 }
 
 .bar {
-  height: 60px;
+
+  height: 80px;
   background-color: $primary;
   font-size: 40px;
-  color: #FFF;
+  color: #D9D9D9;
+  font-weight: 550;
+
+
+
   @extend .flex;
   justify-content: space-between;
 }

devU-client/src/components/misc/navbar.scss

@@ -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;
 }

devU-client/src/components/pages/homePage/homePage.scss

@@ -1,6 +1,37 @@
 @import 'variables';
 
 
+
+.courses_title {
+    text-align: left;
+    margin-left: 20px;
+    font-size: 30px;
+    font-weight: 550;
+    margin-bottom: 30px;
+}
+
+.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;
+// }
+
+.no_courses {
+    margin-left: 20px;
+}
+
+
+
 .coursesContainer {
     display: flex;
     flex-direction: row;
@@ -36,6 +67,18 @@
     align-items: center;  
 }
 
+
+.courses_heading::after {
+    content: '';
+    display: block;
+    margin-top: 10px; 
+    width: 100%;
+    height: 1px; 
+    font-weight: 600;
+    background-color: $text-color; 
+  }
+
+
 @media (max-width: 768px) {
     .coursesContainer {
         flex-direction: column; 

devU-client/src/components/pages/homePage/homePage.tsx

@@ -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
@@ -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}>
@@ -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>
 
@@ -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>
 
@@ -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>
 
 

devU-client/src/components/pages/submissions/submissionDetailPage.scss

@@ -0,0 +1,141 @@
+@import 'variables';
+
+.heading {
+  text-align: center;
+  margin-left:250px;
+
+}
+.scores {
+    padding: 20px;
+  }
+
+  .submissionsLayout {
+    display: flex;
+    gap: 50px;
+  }
+
+  .submissionsContainer {
+    flex: 1;
+    max-width: 250px;
+    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: left; 
+  }
+
+  .assignmentTable th {
+    background-color: $background; 
+    font-weight: bold; 
+  }
+
+  .assignmentTable tr:nth-child(even) {
+    background-color: $background; 
+  }
+
+  .sub_list{
+    text-align: center;
+
+  }
+  @media (max-width: 768px) {
+    .submissionsContainer {
+      display:none;
+    }
+   .heading {
+    margin:10px;
+   }
+
+}