Shane

client/DemoData.json

@@ -0,0 +1,47 @@
+{
+
+  "entries": [
+    {
+      "name": "Movement of the Sun: Activity 1",
+      "description": "Students will create program that will read the value of a photoresistor on specific user input.",
+      "author": "Content Creator",
+      "privacy": "classroom"
+    },
+    {
+      "name": "Movement of the Sun: Activity 2",
+      "description": "Students will utilize a while loop in their program.",
+      "author": "Content Creator",
+      "privacy": "classroom"
+    },
+    {
+      "name": "Movement of the Sun: Activity 3",
+      "description": "Students will learn how to nest loops.",
+      "author": "Content Creator",
+      "privacy": "classroom"
+    },
+    {
+      "name": "Force, Motion, and Energy: Activity 1",
+      "description": "Students will use a ballista to learn about force, motion, and energy.",
+      "author": "Content Creator",
+      "privacy": "public"
+    },
+    {
+      "name": "Force, Motion, and Energy: Activity 2",
+      "description": "Students will use a ballista to learn about force, motion, and energy.",
+      "author": "Content Creator",
+      "privacy": "public"
+    },
+    {
+      "name": "Force, Motion, and Energy: Activity 3",
+      "description": "Students will use a ballista to learn about force, motion, and energy.",
+      "author": "Content Creator",
+      "privacy": "public"
+    },
+    {
+      "name": "Circuits: Activity 1",
+      "description": "Students will use if-else statements to predict energy flow in circuits.",
+      "author": "Content Creator",
+      "privacy": "public"
+    }
+  ]
+}

client/src/App.jsx

@@ -2,6 +2,7 @@ import React from 'react';
 import { Route, Routes } from 'react-router-dom';
 import PrivateRoute from './Utils/PrivateRoute';
 import About from './views/About/About';
+import Gallery from './views/Gallery/Gallery';
 import BlocklyPage from './views/BlocklyPage/BlocklyPage';
 import BugReport from './views/BugReport/BugReport';
 import ContentCreator from './views/ContentCreator/ContentCreator';
@@ -21,102 +22,103 @@ import ResetPassword from './views/TeacherLogin/ResetPassword';
 import TeacherLogin from './views/TeacherLogin/TeacherLogin';
 
 const App = () => {
-  return (
-    <div>
-      <Routes>
-        <Route path='/' element={<Home />} />
-        <Route path='/about' element={<About />} />
-        <Route path='/teacherlogin' element={<TeacherLogin />} />
-        <Route path='/forgot-password' element={<ForgetPassword />} />
-        <Route path='/reset-password' element={<ResetPassword />} />
-        <Route path='/login' element={<StudentLogin />} />
-        <Route path='/replay/:saveID' element={<Replay />} />
-        <Route path='/sandbox' element={<BlocklyPage isSandbox={true} />} />
-        <Route
-          path='/report'
-          element={
-            <PrivateRoute>
-              <Report />
-            </PrivateRoute>
-          }
-        />
-        <Route
-          path='/activityLevel'
-          element={
-            <PrivateRoute>
-              <ActivityLevelReport />
-            </PrivateRoute>
-          }
-        />
-        <Route
-          path='/activityLevel/:id'
-          element={
-            <PrivateRoute>
-              <ActivityLevelReportView />
-            </PrivateRoute>
-          }
-        />
-        <Route
-          path='/group-report'
-          element={
-            <PrivateRoute>
-              <GroupReport />
-            </PrivateRoute>
-          }
-        />
-        <Route
-          path='/dashboard'
-          element={
-            <PrivateRoute>
-              <Dashboard />
-            </PrivateRoute>
-          }
-        />
-        <Route
-          path='/student'
-          element={
-            <PrivateRoute>
-              <Student />
-            </PrivateRoute>
-          }
-        />
-        <Route
-          path='/classroom/:id'
-          element={
-            <PrivateRoute>
-              <Classroom />
-            </PrivateRoute>
-          }
-        />
-        <Route
-          path='/workspace'
-          element={
-            <PrivateRoute>
-              <BlocklyPage isSandbox={false} />
-            </PrivateRoute>
-          }
-        />
-        <Route
-          path='/activity'
-          element={
-            <PrivateRoute>
-              <BlocklyPage isSandbox={false} />
-            </PrivateRoute>
-          }
-        />
-        <Route
-          path='/ccdashboard'
-          element={
-            <PrivateRoute>
-              <ContentCreator />
-            </PrivateRoute>
-          }
-        />
-        <Route path='/bugreport' element={<BugReport />} />
-        <Route path='*' element={<NotFound/>} />
-      </Routes>
-    </div>
-  );
+    return (
+        <div>
+            <Routes>
+                <Route path='/' element={<Home />} />
+                <Route path='/about' element={<About />} />
+                <Route path='/teacherlogin' element={<TeacherLogin />} />
+                <Route path='/forgot-password' element={<ForgetPassword />} />
+                <Route path='/reset-password' element={<ResetPassword />} />
+                <Route path='/login' element={<StudentLogin />} />
+                <Route path='/replay/:saveID' element={<Replay />} />
+                <Route path='/sandbox' element={<BlocklyPage isSandbox={true} />} />
+                <Route path='/gallery' element={<Gallery />} />
+                <Route
+                    path='/report'
+                    element={
+                        <PrivateRoute>
+                            <Report />
+                        </PrivateRoute>
+                    }
+                />
+                <Route
+                    path='/activityLevel'
+                    element={
+                        <PrivateRoute>
+                            <ActivityLevelReport />
+                        </PrivateRoute>
+                    }
+                />
+                <Route
+                    path='/activityLevel/:id'
+                    element={
+                        <PrivateRoute>
+                            <ActivityLevelReportView />
+                        </PrivateRoute>
+                    }
+                />
+                <Route
+                    path='/group-report'
+                    element={
+                        <PrivateRoute>
+                            <GroupReport />
+                        </PrivateRoute>
+                    }
+                />
+                <Route
+                    path='/dashboard'
+                    element={
+                        <PrivateRoute>
+                            <Dashboard />
+                        </PrivateRoute>
+                    }
+                />
+                <Route
+                    path='/student'
+                    element={
+                        <PrivateRoute>
+                            <Student />
+                        </PrivateRoute>
+                    }
+                />
+                <Route
+                    path='/classroom/:id'
+                    element={
+                        <PrivateRoute>
+                            <Classroom />
+                        </PrivateRoute>
+                    }
+                />
+                <Route
+                    path='/workspace'
+                    element={
+                        <PrivateRoute>
+                            <BlocklyPage isSandbox={false} />
+                        </PrivateRoute>
+                    }
+                />
+                <Route
+                    path='/activity'
+                    element={
+                        <PrivateRoute>
+                            <BlocklyPage isSandbox={false} />
+                        </PrivateRoute>
+                    }
+                />
+                <Route
+                    path='/ccdashboard'
+                    element={
+                        <PrivateRoute>
+                            <ContentCreator />
+                        </PrivateRoute>
+                    }
+                />
+                <Route path='/bugreport' element={<BugReport />} />
+                <Route path='*' element={<NotFound/>} />
+            </Routes>
+        </div>
+    );
 };
 
 export default App;

client/src/Utils/requests.js

@@ -13,10 +13,10 @@ const makeRequest = async ({ method, path, data, auth = false, error }) => {
   let err = null;
   const config = auth
     ? {
-        headers: {
-          Authorization: `Bearer ${getToken()}`,
-        },
-      }
+      headers: {
+        Authorization: `Bearer ${getToken()}`,
+      },
+    }
     : null;
 
   try {
@@ -504,7 +504,7 @@ export const getLessonModuleActivities = async (lsId) =>
     error: 'Activity cannot be retrived',
   });
 
-  export const getActivityLevels = async (lsId) =>
+export const getActivityLevels = async (lsId) =>
   makeRequest({
     method: GET,
     path: `${server}/authorized-workspaces?activities.id=${lsId}`,
@@ -520,6 +520,27 @@ export const getActivity = async (id) =>
     error: 'Activity cannot be retrived',
   });
 
+  export const getGalleryActivity = async (id) => {
+    if (!id) {
+      throw new Error('Invalid gallery ID');
+    }
+
+    try {
+      return await makeRequest({
+        method: GET,
+        path: `${server}/galleries/${id}`,
+        auth: true,
+        error: 'Failed to retrieve gallery activity',
+      });
+    } catch (error) {
+      console.error('Error fetching gallery data:', error.message);
+      throw error; // Rethrow the error to handle it in the component
+    }
+  };
+
+
+
+
 export const forgetPassword = async (email) =>
   makeRequest({
     method: POST,

client/src/components/ActivityPanels/BlocklyCanvasPanel/modals/ConsoleModal.jsx

@@ -23,19 +23,25 @@ export default function ConsoleModal({
   const [deviceDisconnect, setDeviceDisconnect] = useState(false);
 
   useEffect(() => {
-    navigator.serial.addEventListener('disconnect', (e) => {
-      console.log('device disconnected');
-      window.port = undefined;
-      setConnectionOpen(false);
-      document.getElementById('connect-button').innerHTML = 'Connect';
-      setDeviceDisconnect(true);
-      message.error('Device Disconnected');
-    });
-    navigator.serial.addEventListener('connect', (e) => {
-      setDeviceDisconnect(false);
-      message.success('Device Connected');
-    });
+    if ('serial' in navigator) {
+      navigator.serial.addEventListener('disconnect', (e) => {
+        console.log('device disconnected');
+        window.port = undefined;
+        setConnectionOpen(false);
+        document.getElementById('connect-button').innerHTML = 'Connect';
+        setDeviceDisconnect(true);
+        message.error('Device Disconnected');
+      });
+      navigator.serial.addEventListener('connect', (e) => {
+        setDeviceDisconnect(false);
+        message.success('Device Connected');
+      });
+    } else {
+      console.error('Serial not supported in this environment.');
+    }
   }, [deviceDisconnect, setConnectionOpen]);
+
+
 
   const handleKeyPress = async (e) => {
     if (e.key === 'Enter') {

client/src/components/ActivityPanels/BlocklyCanvasPanel/modals/PlotterModal.jsx

@@ -34,19 +34,24 @@ export default function PlotterModal({
   const [forceUpdate] = useReducer((x) => x + 1, 0);
 
   useEffect(() => {
-    navigator.serial.addEventListener('disconnect', (e) => {
-      console.log('device disconnected');
-      window.port = undefined;
-      setConnectionOpen(false);
-      document.getElementById('connect-button').innerHTML = 'Connect';
-      setDeviceDisconnect(true);
-      message.error('Device Disconnected');
-    });
-    navigator.serial.addEventListener('connect', (e) => {
-      setDeviceDisconnect(false);
-      message.success('Device Connected');
-    });
+    if ('serial' in navigator) {
+      navigator.serial.addEventListener('disconnect', (e) => {
+        console.log('device disconnected');
+        window.port = undefined;
+        setConnectionOpen(false);
+        document.getElementById('connect-button').innerHTML = 'Connect';
+        setDeviceDisconnect(true);
+        message.error('Device Disconnected');
+      });
+      navigator.serial.addEventListener('connect', (e) => {
+        setDeviceDisconnect(false);
+        message.success('Device Connected');
+      });
+    } else {
+      console.error('Serial not supported in this environment.');
+    }
   }, [deviceDisconnect, setConnectionOpen]);
+
 
   const handleConnect = async () => {
     if (!connectionOpen) {
@@ -62,10 +67,11 @@ export default function PlotterModal({
       setDeviceDisconnect(false);
     } else {
       await handleCloseConnection();
-      plotId = 1;
+      setPlotId(1); // Assuming you have a state variable for plotId
       setConnectionOpen(false);
     }
   };
+
 
   const handleChange = (value) => {
     setBaudRate(value);