Christoph

.gitignore

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

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,25 @@ 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',
+  });
+
+  export const removeLesson = async (id, itemToRemove) =>
+  makeRequest({
+    method: PUT,
+    path: `${server}/mentors/remove/${id}`,
+    auth: true,
+    data: {
+      itemToRemove
+    },
+    error: 'Unable to remove 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/ContentCreator/LessonViewer/LessonViewer.jsx

@@ -0,0 +1,102 @@
+import { Button, Form, Input, message, Modal } from "antd";
+import React, { useEffect, useState } from "react";
+import { useSearchParams } from "react-router-dom";
+import {
+  getLessonModule,
+  updateLessonModule,
+} from "../../../Utils/requests";
+import ActivityEditor from "../ActivityEditor/ActivityEditor";
+
+export default function LessonEditor({
+  learningStandard,
+  viewing,
+  setViewing,
+  tab,
+  page,
+}) {
+  const [visible, setVisible] = useState(false);
+  const [name, setName] = useState(learningStandard.name);
+  const [description, setDescription] = useState("");
+  const [standards, setStandards] = useState("");
+  const [link, setLink] = useState("");
+  const [linkError, setLinkError] = useState(false);
+  const [displayName, setDisplayName] = useState(learningStandard.name);
+  // eslint-disable-next-line
+  const [_, setSearchParams] = useSearchParams();
+  const [newLesson, setNewLesson] = useState({
+    title: "",
+    content: "",
+    objectives: "",
+  });
+
+  const showModal = async () => {
+    setVisible(true);
+    const res = await getLessonModule(learningStandard.id);
+    setName(res.data.name);
+    setDescription(res.data.expectations);
+    setStandards(res.data.standards);
+    setLink(res.data.link);
+    setLinkError(false);
+  };
+
+  useEffect(() => {
+    setDisplayName(learningStandard.name);
+  }, [learningStandard.name]);
+
+
+  const addNewLesson = async () => {
+    console.log("Adding new lesson:", newLesson);
+    setNewLesson({ title: "", content: "", objectives: "" });
+    message.success("New lesson added successfully");
+  };
+
+  return (
+    <div>
+      <Button id="link-btn" onClick={showModal}>
+        {displayName}
+      </Button>
+      <Modal
+        title="Add New Lesson"
+        visible={visible}
+        onOk={addNewLesson}
+        onCancel={() => setVisible(false)}
+      >
+        <Form layout="vertical">
+          <Form.Item label="Lesson Title">
+            <Input
+              value={newLesson.title}
+              onChange={(e) =>
+                setNewLesson({ ...newLesson, title: e.target.value })
+              }
+            />
+          </Form.Item>
+          <Form.Item label="Content">
+            <Input.TextArea
+              value={newLesson.content}
+              onChange={(e) =>
+                setNewLesson({ ...newLesson, content: e.target.value })
+              }
+            />
+          </Form.Item>
+          <Form.Item label="Objectives">
+            <Input
+              value={newLesson.objectives}
+              onChange={(e) =>
+                setNewLesson({ ...newLesson, objectives: e.target.value })
+              }
+            />
+          </Form.Item>
+        </Form>
+      </Modal>
+      {!visible && (
+        <ActivityEditor
+          learningStandard={learningStandard}
+          viewing={viewing}
+          setViewing={setViewing}
+          page={page}
+          tab={tab}
+        />
+      )}
+    </div>
+  );
+}

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='Unit Handling' key='unit'>
+          <Unit classroomId={id}/>
+        </TabPane>
       </Tabs>
     </div>
   );