Created the Admin page to do work on

README.md

@@ -1,4 +1,20 @@
 # CaSMM
+## Deployment
+There are many branches on our GitHub Repository, but the Develop branch is the main branch where all our working features are currently located. The steps to launch our project is:
+1. clone the repository
+2. download Docker
+3. install Node and Yarn
+4. Run yarn from /client
+5. Run yarn start from /client
+6. Run npm install react-bootstrap bootstrap from /client
+7. Run docker compose up from /
+8. Open up the STRAPI admin page and login using these credentials:
+  superadmin@mail.com
+  TN9q6RZhDaw6
+9. create the role “ Admin”
+10. Create a temporary Admin user
+11. Open local website. click the three lines at the top right in the navigation bar. click user login and use the same credentials as the temporary Admin user. 
+Hooray! You have now logged in as an Administrator and can see the Admin pages. 
 
 > Computation and Science Modeling through Making
 
@@ -86,9 +102,18 @@ The production environment is a Heroku app. It is composed of a web dyno, compil
   * The compile dyno runs `compile`
 
 #### Running
-
-`casmm` is automatically built from the latest commits to `master`. Heroku runs the container orchestration from there.
-
+Access STRAPI Admin Page:
+
+Open the STRAPI admin page and log in using these credentials:
+Email: superadmin@mail.com
+Password: TN9q6RZhDaw6
+Create the role "Admin".
+Create a temporary Admin user.
+Log in as Admin:
+
+Open the local website.
+Click the three lines at the top right in the navigation bar.
+Click user login and use the same credentials as the temporary Admin user.
 <br/>
 
 ## Maintenance

bin/yarn--1699064612949-0.9986850656299113/node.cmd

@@ -0,0 +1 @@
+@"C:\Program Files\nodejs\node.exe"   %*

bin/yarn--1699064612949-0.9986850656299113/yarn.cmd

@@ -0,0 +1 @@
+@"C:\Program Files\nodejs\node.exe"  "C:\Program Files (x86)\Yarn\bin\yarn.js"  %*

client/README.md

@@ -48,7 +48,7 @@ Stars a basic http server (using [http-server](https://www.npmjs.com/package/htt
 Builds the app for production to the `build` folder.
 It correctly bundles React in production mode and optimizes the build for the best performance.
 
-<br />
+<br />+
 
 ## Styling
 

client/bin/yarn--1698517071991-0.7056936130386515/node.cmd

@@ -0,0 +1 @@
+@"C:\Program Files\nodejs\node.exe"   %*

client/bin/yarn--1698517071991-0.7056936130386515/yarn.cmd

@@ -0,0 +1 @@
+@"C:\Program Files\nodejs\node.exe"  "C:\Program Files (x86)\Yarn\bin\yarn.js"  %*

client/bin/yarn--1698519670578-0.5195432677065672/node.cmd

@@ -0,0 +1 @@
+@"C:\Program Files\nodejs\node.exe"   %*

client/bin/yarn--1698519670578-0.5195432677065672/yarn.cmd

@@ -0,0 +1 @@
+@"C:\Program Files\nodejs\node.exe"  "C:\Program Files (x86)\Yarn\bin\yarn.js"  %*

client/bin/yarn--1698519856924-0.4267300156529026/node.cmd

@@ -0,0 +1 @@
+@"C:\Program Files\nodejs\node.exe"   %*

client/bin/yarn--1698519856925-0.08908252650023996/node.cmd

@@ -0,0 +1 @@
+@"C:\Program Files\nodejs\node.exe"   %*

client/bin/yarn--1698519856925-0.08908252650023996/yarn.cmd

@@ -0,0 +1 @@
+@"C:\Program Files\nodejs\node.exe"  "C:\Program Files (x86)\Yarn\bin\yarn.js"  %*

client/bin/yarn--1698519856925-0.12126724769282426/node.cmd

@@ -0,0 +1 @@
+@"C:\Program Files\nodejs\node.exe"   %*

client/bin/yarn--1698519881420-0.5974132261069294/node.cmd

@@ -0,0 +1 @@
+@"C:\Program Files\nodejs\node.exe"   %*

client/bin/yarn--1698519881420-0.5974132261069294/yarn.cmd

@@ -0,0 +1 @@
+@"C:\Program Files\nodejs\node.exe"  "C:\Program Files (x86)\Yarn\bin\yarn.js"  %*

client/bin/yarn--1698521100792-0.05513688433697839/node.cmd

@@ -0,0 +1 @@
+@"C:\Program Files\nodejs\node.exe"   %*

client/bin/yarn--1698521100792-0.05513688433697839/yarn.cmd

@@ -0,0 +1 @@
+@"C:\Program Files\nodejs\node.exe"  "C:\Program Files (x86)\Yarn\bin\yarn.js"  %*

client/bin/yarn--1698764317129-0.8961084066099729/node.cmd

@@ -0,0 +1 @@
+@"C:\Program Files\nodejs\node.exe"   %*

client/bin/yarn--1698764317129-0.8961084066099729/yarn.cmd

@@ -0,0 +1 @@
+@"C:\Program Files\nodejs\node.exe"  "C:\Program Files (x86)\Yarn\bin\yarn.js"  %*

client/bin/yarn--1699033816913-0.3322156484620793/node.cmd

@@ -0,0 +1 @@
+@"C:\Program Files\nodejs\node.exe"   %*

client/bin/yarn--1699033816913-0.3322156484620793/yarn.cmd

@@ -0,0 +1 @@
+@"C:\Program Files\nodejs\node.exe"  "C:\Program Files (x86)\Yarn\bin\yarn.js"  %*

client/bin/yarn--1699288291421-0.452872308541749/node.cmd

@@ -0,0 +1 @@
+@"C:\Program Files\nodejs\node.exe"   %*

client/bin/yarn--1699288291421-0.452872308541749/yarn.cmd

@@ -0,0 +1 @@
+@"C:\Program Files\nodejs\node.exe"  "C:\Program Files (x86)\Yarn\bin\yarn.js"  %*

client/bin/yarn--1699481438574-0.4306832134488694/node.cmd

@@ -0,0 +1 @@
+@"C:\Program Files\nodejs\node.exe"   %*

client/bin/yarn--1699481438574-0.4306832134488694/yarn.cmd

@@ -0,0 +1 @@
+@"C:\Program Files\nodejs\node.exe"  "C:\Program Files (x86)\Yarn\bin\yarn.js"  %*

client/bin/yarn--1699899030945-0.27809597829712107/node.cmd

@@ -0,0 +1 @@
+@"C:\Program Files\nodejs\node.exe"   %*

client/bin/yarn--1699899030945-0.27809597829712107/yarn.cmd

@@ -0,0 +1 @@
+@"C:\Program Files\nodejs\node.exe"  "C:\Program Files (x86)\Yarn\bin\yarn.js"  %*

client/bin/yarn--1700152822182-0.7365502444867742/node.cmd

@@ -0,0 +1 @@
+@"C:\Program Files\nodejs\node.exe"   %*

client/bin/yarn--1700152822182-0.7365502444867742/yarn.cmd

@@ -0,0 +1 @@
+@"C:\Program Files\nodejs\node.exe"  "C:\Program Files (x86)\Yarn\bin\yarn.js"  %*

client/bin/yarn--1701123533856-0.3861208787184569/node.cmd

@@ -0,0 +1 @@
+@"C:\Program Files\nodejs\node.exe"   %*

client/bin/yarn--1701123533856-0.3861208787184569/yarn.cmd

@@ -0,0 +1 @@
+@"C:\Program Files\nodejs\node.exe"  "C:\Program Files (x86)\Yarn\bin\yarn.js"  %*

client/bin/yarn--1701712953949-0.1337658205693424/node.cmd

@@ -0,0 +1 @@
+@"C:\Program Files\nodejs\node.exe"   %*

client/bin/yarn--1701712953997-0.8152966625021165/node.cmd

@@ -0,0 +1 @@
+@"C:\Program Files\nodejs\node.exe"   %*

client/bin/yarn--1701712953997-0.8152966625021165/yarn.cmd

@@ -0,0 +1 @@
+@"C:\Program Files\nodejs\node.exe"  "C:\Program Files (x86)\Yarn\bin\yarn.js"  %*

client/bin/yarn--1701712953997-0.9080707031844724/node.cmd

@@ -0,0 +1 @@
+@"C:\Program Files\nodejs\node.exe"   %*

client/bin/yarn--1701712974379-0.5821689302080872/node.cmd

@@ -0,0 +1 @@
+@"C:\Program Files\nodejs\node.exe"   %*

client/bin/yarn--1701712974379-0.5821689302080872/yarn.cmd

@@ -0,0 +1 @@
+@"C:\Program Files\nodejs\node.exe"  "C:\Program Files (x86)\Yarn\bin\yarn.js"  %*

client/bin/yarn--1701713200894-0.3101917901501041/node.cmd

@@ -0,0 +1 @@
+@"C:\Program Files\nodejs\node.exe"   %*

client/bin/yarn--1701713200894-0.3101917901501041/yarn.cmd

@@ -0,0 +1 @@
+@"C:\Program Files\nodejs\node.exe"  "C:\Program Files (x86)\Yarn\bin\yarn.js"  %*

client/bin/yarn--1701728607717-0.9192737898566874/node.cmd

@@ -0,0 +1 @@
+@"C:\Program Files\nodejs\node.exe"   %*

client/bin/yarn--1701728607717-0.9192737898566874/yarn.cmd

@@ -0,0 +1 @@
+@"C:\Program Files\nodejs\node.exe"  "C:\Program Files (x86)\Yarn\bin\yarn.js"  %*

client/bin/yarn--1701879358031-0.7514135625290843/node.cmd

@@ -0,0 +1 @@
+@"C:\Program Files\nodejs\node.exe"   %*

client/bin/yarn--1701879358031-0.7514135625290843/yarn.cmd

@@ -0,0 +1 @@
+@"C:\Program Files\nodejs\node.exe"  "C:\Program Files (x86)\Yarn\bin\yarn.js"  %*

client/bin/yarn--1701888722336-0.41315628360594214/node.cmd

@@ -0,0 +1 @@
+@"C:\Program Files\nodejs\node.exe"   %*

client/bin/yarn--1701888722336-0.41315628360594214/yarn.cmd

@@ -0,0 +1 @@
+@"C:\Program Files\nodejs\node.exe"  "C:\Program Files (x86)\Yarn\bin\yarn.js"  %*

client/bin/yarn--1701893574113-0.8226167922204364/node.cmd

@@ -0,0 +1 @@
+@"C:\Program Files\nodejs\node.exe"   %*

client/bin/yarn--1701893574113-0.8226167922204364/yarn.cmd

@@ -0,0 +1 @@
+@"C:\Program Files\nodejs\node.exe"  "C:\Program Files (x86)\Yarn\bin\yarn.js"  %*

client/index.html

@@ -9,6 +9,7 @@
       name="description"
       content="Computation and Science Modeling through Making"
     />
+    <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/bootstrap@4.0.0/dist/css/bootstrap.min.css" integrity="sha384-Gn5384xqQ1aoWXA+058RXPxPg6fy4IWvTNh0E263XmFcJlSAwiGgFAW/dAiS6JXm" crossorigin="anonymous">
     <link rel="apple-touch-icon" href="/logo192.png" />
     <!--
       manifest.json provides metadata used when your web app is installed on a
@@ -36,6 +37,9 @@
     <script src="/lib/arduino_compressed.js"></script>
     <script src="/lib/javascript_compressed.js"></script>
     <script src="/lib/avrgirl-arduino.global.js"></script>
+    <script src="https://code.jquery.com/jquery-3.2.1.slim.min.js" integrity="sha384-KJ3o2DKtIkvYIK3UENzmM7KCkRr/rE9/Qpg6aAZGJwFDMVNA/GpGFF93hXpG5KkN" crossorigin="anonymous"></script>
+<script src="https://cdn.jsdelivr.net/npm/popper.js@1.12.9/dist/umd/popper.min.js" integrity="sha384-ApNbgh9B+Y1QKtv3Rn7W3mgPxhU9K/ScQsAP7hUibX39j7fakFPskvXusvfa0b4Q" crossorigin="anonymous"></script>
+<script src="https://cdn.jsdelivr.net/npm/bootstrap@4.0.0/dist/js/bootstrap.min.js" integrity="sha384-JZR6Spejh4U02d8jOt6vLEHfe/JQGiRRSQQxSfFWpi1MquVdAyjUar5+76PVCmYl" crossorigin="anonymous"></script>
     <script>
       const global = globalThis
     </script>

client/package.json

@@ -6,15 +6,17 @@
     "@loadable/component": "^5.15.2",
     "antd": "^4.24.8",
     "axios": "^1.4.0",
+    "bootstrap": "^5.3.2",
     "cross-env": "^7.0.3",
     "emoji-picker-react": "^3.6.1",
     "http-server": "^0.12.3",
     "less": "^4.1.3",
     "react": "^18.2.0",
+    "react-bootstrap": "^2.9.1",
     "react-dom": "^18.2.0",
     "react-hooks-global-state": "^2.1.0",
     "react-papaparse": "^3.17.1",
-    "react-router-dom": "^6.9.0",
+    "react-router-dom": "^6.18.0",
     "recharts": "^2.5.0",
     "vite": "^4.5.0",
     "yarn": "^1.22.10"

client/src/App.jsx

@@ -1,7 +1,14 @@
+//App.jsx
 import React from 'react';
 import { Route, Routes } from 'react-router-dom';
 import PrivateRoute from './Utils/PrivateRoute';
 import About from './views/About/About';
+import Admin from './views/Admin/Admin';
+import Teachers from './views/Admin/Teachers/TeacherList';
+import Classrooms from './views/Admin/Classrooms/executable/src/Classrooms';
+import Organizations from './views/Admin/Organizations/executable/src/Organizations';
+import Workspaces from './views/Admin/Workspaces/WorkspaceList';
+import ManageStudents from './views/Admin/ManageStudents/ManageStudents';
 import BlocklyPage from './views/BlocklyPage/BlocklyPage';
 import BugReport from './views/BugReport/BugReport';
 import ContentCreator from './views/ContentCreator/ContentCreator';
@@ -19,6 +26,7 @@ import StudentLogin from './views/StudentLogin/StudentLogin';
 import ForgetPassword from './views/TeacherLogin/ForgetPassword';
 import ResetPassword from './views/TeacherLogin/ResetPassword';
 import TeacherLogin from './views/TeacherLogin/TeacherLogin';
+import Lessons from './views/Admin/Lessons/lessons';
 
 const App = () => {
   return (
@@ -40,6 +48,22 @@ const App = () => {
             </PrivateRoute>
           }
         />
+        <Route
+          path='/admin'
+          element={
+            // <PrivateRoute>
+              <Admin />
+            // </PrivateRoute>
+          }
+        />
+        <Route path='/organizationlist' element={<Organizations />} />
+        <Route path='/classroomlist' element={<Classrooms />} />
+        <Route path='/workspacelist' element={<Workspaces />} />
+        <Route path='/lessonlist' element={<Lessons />} />
+        <Route path='/teacherlist' element={<Teachers />} />
+       <Route path='/managestudents' element={<ManageStudents />} />
+
+
         <Route
           path='/activityLevel'
           element={

client/src/Utils/requests.js

@@ -22,7 +22,9 @@ const makeRequest = async ({ method, path, data, auth = false, error }) => {
   try {
     switch (method) {
       case GET:
+        console.log("HERE");
         res = (await axios.get(path, config)).data;
+
         break;
       case POST:
         res = (await axios.post(path, data, config)).data;
@@ -52,13 +54,48 @@ export const getActivities = async () =>
     error: 'Activities could not be retrieved.',
   });
 
+  export const addTeacher = async (firstName,lastName, school, user) =>
+  makeRequest({
+    method: POST,
+    path: `${server}/mentors`,
+    data: {
+      firstName: firstName,
+      lastName: lastName,
+      school: school,
+      user: user,
+    },
+    auth: true,
+    error: 'Failed to add teacher.',
+  });
+  export const deleteTeacher = async (id) =>
+  makeRequest({
+    method: DELETE,
+    path: `${server}/mentors/${id}`,
+    auth: true,
+    error: 'Failed to delete teacher.',
+  });
 export const getTeachers = async () =>
   makeRequest({
     method: GET,
     path: `${server}/mentors`,
     auth: true,
     error: 'Teachers could not be retrieved.',
   });
+  export const getTeacher = async (id) =>
+  makeRequest({
+    method: GET,
+    path: `${server}/mentors/${id}`,
+    auth: true,
+    error: 'Failed to retrieve learning standard.',
+  });
+
+export const getAdmin = async () =>
+makeRequest({
+  method: GET,
+  path: `${server}/admin`,
+  auth: true,
+  error: 'Your admin information could not be retrieved.',
+});
 
 export const getAllClassrooms = async () =>
   makeRequest({
@@ -68,6 +105,14 @@ export const getAllClassrooms = async () =>
     error: 'Classrooms could not be retrieved.',
   });
 
+export const getSchools = async () =>
+  makeRequest({
+    method: GET,
+    path: `${server}/schools`,
+    auth: true,
+    error: 'Schools could not be retrieved.',
+});
+
 export const getAllStudents = async () =>
   makeRequest({
     method: GET,
@@ -330,6 +375,33 @@ export const deleteStudent = async (student) =>
     error: 'Failed to delete student.',
   });
 
+  // LESSON ADD/DELETE IMPLEMENTATION
+  export const addLesson = async (lessonData) =>
+  makeRequest({
+    method: POST,
+    path: `${server}/lesson-modules`,
+    data: lessonData,
+    auth: true,
+    error: 'Failed to add lesson module.',
+  });
+
+  export const addClassroomLesson = async (lesson, classroom) =>
+  makeRequest({
+    method: POST,
+    path: `${server}/lesson-modules`,
+    data: { lesson: lesson, classroom: classroom },
+    auth: true,
+    error: 'Failed to add lesson module to a classroom.',
+  });
+
+export const deleteLesson = async (key) =>
+  makeRequest({
+    method: DELETE,
+    path: `${server}/lesson-modules/${key}`,
+    auth: true,
+    error: 'Failed to delete lesson module.',
+  });
+
 export const updateActivityLevelTemplate = async (id, workspace, blocksList) =>
   makeRequest({
     method: PUT,

client/src/Utils/userState.js

@@ -17,6 +17,11 @@ export const getCurrUser = () => {
       role: 'ContentCreator',
       name: result.role.name,
     };
+  } else if (result.role.type === 'admin') {
+    return {
+      role: 'Admin',
+      name: result.role.name,
+    };
   } else if (result.role.type === 'researcher') {
     return {
       role: 'Researcher',
@@ -27,7 +32,7 @@ export const getCurrUser = () => {
       role: 'Mentor',
       name: result.role.name,
     };
-  }
+  } 
 };
 
 const { setGlobalState, useGlobalState } = createGlobalState({

client/src/components/AdminSubHeader/AdminSubHeader.jsx

@@ -0,0 +1,40 @@
+// taken from MentorSubHeader.jsx
+
+import React from 'react';
+import { Link } from 'react-router-dom';
+import AddLessonModal from '../../views/admin/Lessons/Roster/AddLesson/AddLessonModal';
+import './AdminSubHeader.less';
+
+export default function AdminSubHeader(props) {
+  const {
+    title,
+    listViewActive,
+    checkoutActive,
+    setListView,
+    addUserActive,
+    addLessonToTable,
+  } = props;
+
+  return (
+    <div id='page-header'>
+      <h1>{title}</h1>
+      <span id='header-nav'>
+        {listViewActive ? (
+          <button onClick={() => setListView(true)} id='link'>
+            <i className='fa fa-list-alt' />
+          </button>
+        ) : null}
+        {addUserActive ? (
+          <AddLessonModal
+            addLessonToTable={addLessonToTable}
+          />
+        ) : null}
+        {checkoutActive ? (
+          <Link id='link' to={'/dashboard'}>
+            <i className='fa fa-shopping-cart' />
+          </Link>
+        ) : null}
+      </span>
+    </div>
+  );
+}