Jayden

.gitignore

@@ -32,4 +32,7 @@ yarn-error.log*
 node_modules/
 build/
 server/public/client/*
-!server/public/client/.gitkeep
+!server/public/client/.gitkeep
+
+client/package-lock.json
+.github/worflows/

client/package.json

@@ -2,6 +2,7 @@
   "name": "client",
   "version": "0.1.0",
   "private": true,
+  "start": "WATCHPACK_POLLING=true vite",
   "dependencies": {
     "@loadable/component": "^5.15.2",
     "antd": "^4.24.8",

client/src/App.jsx

@@ -7,6 +7,7 @@ import BugReport from './views/BugReport/BugReport';
 import ContentCreator from './views/ContentCreator/ContentCreator';
 import Home from './views/Home/Home';
 import Classroom from './views/Mentor/Classroom/Classroom';
+import Inbox from './views/Mentor/Inbox/inbox';
 import Dashboard from './views/Mentor/Dashboard/Dashboard';
 import NotFound from './views/NotFound';
 import Replay from './views/Replay/Replay';
@@ -87,6 +88,14 @@ const App = () => {
               <Classroom />
             </PrivateRoute>
           }
+        />
+          <Route
+          path='/inbox'
+          element={
+            <PrivateRoute>
+              <Inbox />
+            </PrivateRoute>
+          }
         />
         <Route
           path='/workspace'

client/src/Utils/requests.js

@@ -672,3 +672,14 @@ export const getClassroomWorkspace = async (id) =>
     auth: true,
     error: 'Unable to retrive classroom workspaces',
   });
+
+  export const shareLesson = async (id, add) =>
+  makeRequest({
+    method: PUT,
+    path: `${server}/mentors/${id}`,
+    auth: true,
+    data: {
+      add
+    },
+    error: 'Unable to send lesson',
+  });

client/src/components/MentorSubHeader/MentorSubHeader.jsx

@@ -24,6 +24,7 @@ export default function MentorSubHeader(props) {
           <button id='link'>
             <i className='fa fa-plus-square' />
           </button>
+
         ) : null}
         {addUserActive ? (
           <AddStudentsModal

client/src/views/Dashboard/Dashboard.jsx

@@ -36,7 +36,8 @@ export default function Dashboard() {
   return (
     <div className='container nav-padding'>
       <NavBar isMentor={true} />
-      <div id='main-header'>Welcome {user.username}</div>
+      <div id='main-header'>Welcome {user.username} hello</div>
+      <h1>hello</h1>
       <MentorSubHeader title={'Your Classrooms'}></MentorSubHeader>
       <div id='classrooms-container'>
         <div id='dashboard-card-container'>
@@ -64,4 +65,4 @@ export default function Dashboard() {
       </div>
     </div>
   );
-}
+}

client/src/views/Home/HomeJoin.jsx

@@ -30,12 +30,14 @@ export default function HomeJoin(props) {
         if (e.key === 'Enter') handleLogin();
       }}
     >
+
       <input
         type='text'
         value={joinCode}
         placeholder='Join Code'
         onChange={(e) => setJoinCode(e.target.value)}
       />
+
       <input
         type='button'
         value={loading ? 'Loading...' : 'Join'}

client/src/views/Mentor/Classroom/Classroom.jsx

@@ -5,6 +5,8 @@ import './Classroom.less';
 import NavBar from '../../../components/NavBar/NavBar';
 import Roster from './Roster/Roster';
 import Home from './Home/Home';
+import Lesson from './lesson/lesson';
+import Unit from './Unit/unitCreation';
 import SavedWorkSpaceTab from '../../../components/Tabs/SavedWorkspaceTab';
 import { useSearchParams, useParams } from 'react-router-dom';
 
@@ -51,6 +53,12 @@ export default function Classroom({
             classroomId={id}
           />
         </TabPane>
+        <TabPane tab='Create lesson' key='lesson'>
+          <Lesson classroomId={id}/>
+        </TabPane>
+        <TabPane tab='Create Unit' key='unit'>
+          <Unit classroomId={id}/>
+        </TabPane>
       </Tabs>
     </div>
   );

client/src/views/Mentor/Classroom/Home/Home.jsx

@@ -6,6 +6,7 @@ import {
   getLessonModuleActivities,
 } from '../../../../Utils/requests';
 import MentorSubHeader from '../../../../components/MentorSubHeader/MentorSubHeader';
+import '../../Dashboard/Dashboard.less'
 import DisplayCodeModal from './DisplayCodeModal';
 import MentorActivityDetailModal from './MentorActivityDetailModal';
 import LessonModuleModal from './LessonModuleSelect/LessonModuleModal';
@@ -17,7 +18,6 @@ export default function Home({ classroomId, viewing }) {
   const [activities, setActivities] = useState([]);
   const [gradeId, setGradeId] = useState(null);
   const [activeLessonModule, setActiveLessonModule] = useState(null);
-  const [activityDetailsVisible, setActivityDetailsVisible] = useState(false)
   const navigate = useNavigate();
 
   const SCIENCE = 1;
@@ -32,7 +32,7 @@ export default function Home({ classroomId, viewing }) {
         setClassroom(classroom);
         setGradeId(classroom.grade.id);
         classroom.selections.forEach(async (selection) => {
-          if (selection.current) {
+          if (selection.current ) {
             const lsRes = await getLessonModule(
               selection.lesson_module
             );
@@ -53,6 +53,7 @@ export default function Home({ classroomId, viewing }) {
     };
     fetchData();
   }, [classroomId]);
+
 
   const handleViewActivity = (activity, name) => {
     activity.lesson_module_name = name;
@@ -102,6 +103,7 @@ export default function Home({ classroomId, viewing }) {
                 <h3>{`Learning Standard - ${activeLessonModule.name}`}</h3>
                 <LessonModuleModal
                   setActiveLessonModule={setActiveLessonModule}
+                  activeLessonModule={activeLessonModule}
                   classroomId={classroomId}
                   gradeId={gradeId}
                   viewing={viewing}