From c19850a38b837ead64d19a5e4be0d20e7f70ee40 Mon Sep 17 00:00:00 2001 From: DeepCodingStuff Date: Mon, 6 Nov 2023 10:56:39 -0500 Subject: [PATCH 01/16] Added a hide button --- client/src/views/BlocklyPage/BlocklyPage.jsx | 12 ++++++++---- .../documentation/1.0.0/full_documentation.json | 2 +- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/client/src/views/BlocklyPage/BlocklyPage.jsx b/client/src/views/BlocklyPage/BlocklyPage.jsx index 584766bd6..46dcb0f62 100644 --- a/client/src/views/BlocklyPage/BlocklyPage.jsx +++ b/client/src/views/BlocklyPage/BlocklyPage.jsx @@ -74,10 +74,14 @@ export default function BlocklyPage({ isSandbox }) { return (
- -
- -
+ +
+ + + + +
+
) } diff --git a/server/extensions/documentation/documentation/1.0.0/full_documentation.json b/server/extensions/documentation/documentation/1.0.0/full_documentation.json index 49963424f..3599cf989 100755 --- a/server/extensions/documentation/documentation/1.0.0/full_documentation.json +++ b/server/extensions/documentation/documentation/1.0.0/full_documentation.json @@ -14,7 +14,7 @@ "name": "Apache 2.0", "url": "https://www.apache.org/licenses/LICENSE-2.0.html" }, - "x-generation-date": "10/12/2023 1:28:43 PM" + "x-generation-date": "10/31/2023 8:58:11 PM" }, "x-strapi-config": { "path": "/documentation", From 9bee1e64a054bbac1d6d1328c8c85aa4a4cde5a5 Mon Sep 17 00:00:00 2001 From: tlteresalam Date: Tue, 7 Nov 2023 15:14:15 -0500 Subject: [PATCH 02/16] Created a file in modals to try to render lesson to studentcanvas --- .../canvas/StudentCanvas.jsx | 13 ++++++++++++ .../BlocklyCanvasPanel/modals/LessonModal.jsx | 20 +++++++++++++++++++ client/src/views/Workspace/Workspace.jsx | 1 + .../1.0.0/full_documentation.json | 2 +- 4 files changed, 35 insertions(+), 1 deletion(-) create mode 100644 client/src/components/ActivityPanels/BlocklyCanvasPanel/modals/LessonModal.jsx diff --git a/client/src/components/ActivityPanels/BlocklyCanvasPanel/canvas/StudentCanvas.jsx b/client/src/components/ActivityPanels/BlocklyCanvasPanel/canvas/StudentCanvas.jsx index e3f6a914b..b1d8f408e 100644 --- a/client/src/components/ActivityPanels/BlocklyCanvasPanel/canvas/StudentCanvas.jsx +++ b/client/src/components/ActivityPanels/BlocklyCanvasPanel/canvas/StudentCanvas.jsx @@ -16,6 +16,7 @@ import { import ArduinoLogo from '../Icons/ArduinoLogo'; import PlotterLogo from '../Icons/PlotterLogo'; import { useNavigate } from 'react-router-dom'; +import LessonModal from '../modals/LessonModal'; let plotId = 1; @@ -35,6 +36,8 @@ export default function StudentCanvas({ activity }) { const [saves, setSaves] = useState({}); const [lastSavedTime, setLastSavedTime] = useState(null); const [lastAutoSave, setLastAutoSave] = useState(null); + const [lessonVisible, setLessonVisible] = useState(false) + // const [lessonDes, setLeson] = useState(false); const [forceUpdate] = useReducer((x) => x + 1, 0); const navigate = useNavigate(); @@ -44,6 +47,16 @@ export default function StudentCanvas({ activity }) { const replayRef = useRef([]); const clicks = useRef(0); + const renderLesson = () => { + setLessonVisible(true); + } + + const closeLesson = () => { + setLessonVisible(false); + } + + + const setWorkspace = () => { workspaceRef.current = window.Blockly.inject('blockly-canvas', { toolbox: document.getElementById('toolbox'), diff --git a/client/src/components/ActivityPanels/BlocklyCanvasPanel/modals/LessonModal.jsx b/client/src/components/ActivityPanels/BlocklyCanvasPanel/modals/LessonModal.jsx new file mode 100644 index 000000000..541cbcf71 --- /dev/null +++ b/client/src/components/ActivityPanels/BlocklyCanvasPanel/modals/LessonModal.jsx @@ -0,0 +1,20 @@ +import Reaact from 'react'; +import { Modal } from 'antd'; + +const LessonModal = ({ isVisible, closeModal, description }) => { + return ( + + Close + + ]} + > + + ); + }; + + export default LessonModal; \ No newline at end of file diff --git a/client/src/views/Workspace/Workspace.jsx b/client/src/views/Workspace/Workspace.jsx index be7b7c06f..dc27454fc 100644 --- a/client/src/views/Workspace/Workspace.jsx +++ b/client/src/views/Workspace/Workspace.jsx @@ -42,6 +42,7 @@ export default function Workspace({ handleLogout }) { Date: Mon, 13 Nov 2023 15:50:38 -0500 Subject: [PATCH 03/16] Rendered in lesson as a pop up --- .../canvas/StudentCanvas.jsx | 25 ++++++++++++++----- .../BlocklyCanvasPanel/modals/LessonModal.jsx | 12 ++++++--- 2 files changed, 27 insertions(+), 10 deletions(-) diff --git a/client/src/components/ActivityPanels/BlocklyCanvasPanel/canvas/StudentCanvas.jsx b/client/src/components/ActivityPanels/BlocklyCanvasPanel/canvas/StudentCanvas.jsx index b1d8f408e..ee855e337 100644 --- a/client/src/components/ActivityPanels/BlocklyCanvasPanel/canvas/StudentCanvas.jsx +++ b/client/src/components/ActivityPanels/BlocklyCanvasPanel/canvas/StudentCanvas.jsx @@ -20,6 +20,14 @@ import LessonModal from '../modals/LessonModal'; let plotId = 1; +const LessonContent = ( +
+

Test Lesson

+

This is a sample lesson content.

+
+); + + export default function StudentCanvas({ activity }) { const [hoverSave, setHoverSave] = useState(false); const [hoverUndo, setHoverUndo] = useState(false); @@ -36,8 +44,7 @@ export default function StudentCanvas({ activity }) { const [saves, setSaves] = useState({}); const [lastSavedTime, setLastSavedTime] = useState(null); const [lastAutoSave, setLastAutoSave] = useState(null); - const [lessonVisible, setLessonVisible] = useState(false) - // const [lessonDes, setLeson] = useState(false); + const [lessonVisible, setLessonVisible] = useState(true); const [forceUpdate] = useReducer((x) => x + 1, 0); const navigate = useNavigate(); @@ -47,16 +54,15 @@ export default function StudentCanvas({ activity }) { const replayRef = useRef([]); const clicks = useRef(0); - const renderLesson = () => { - setLessonVisible(true); - } + // const renderLesson = () => { + // setLessonVisible(true); + // } const closeLesson = () => { setLessonVisible(false); } - const setWorkspace = () => { workspaceRef.current = window.Blockly.inject('blockly-canvas', { toolbox: document.getElementById('toolbox'), @@ -509,6 +515,13 @@ export default function StudentCanvas({ activity }) {
+ + +
diff --git a/client/src/components/ActivityPanels/BlocklyCanvasPanel/modals/LessonModal.jsx b/client/src/components/ActivityPanels/BlocklyCanvasPanel/modals/LessonModal.jsx index 541cbcf71..9eb99bdb6 100644 --- a/client/src/components/ActivityPanels/BlocklyCanvasPanel/modals/LessonModal.jsx +++ b/client/src/components/ActivityPanels/BlocklyCanvasPanel/modals/LessonModal.jsx @@ -1,11 +1,14 @@ -import Reaact from 'react'; -import { Modal } from 'antd'; +import React from 'react'; +import { Modal, Button } from 'antd'; -const LessonModal = ({ isVisible, closeModal, description }) => { + +const LessonModal = ({ isVisible, closeModal, lessonContent }) => { return ( + + // Functional components to display a lesson @@ -13,6 +16,7 @@ const LessonModal = ({ isVisible, closeModal, description }) => { ]} > + {lessonContent} ); }; From ad5dfd9c4211aa0de8bf81a19b2e950058fc88d5 Mon Sep 17 00:00:00 2001 From: tlteresalam Date: Tue, 14 Nov 2023 18:30:26 -0500 Subject: [PATCH 04/16] Modified the StudentCanvas.jsx file to render a test lesson --- .../canvas/StudentCanvas.jsx | 50 +++++++++++++------ .../BlocklyCanvasPanel/modals/LessonModal.jsx | 1 + 2 files changed, 35 insertions(+), 16 deletions(-) diff --git a/client/src/components/ActivityPanels/BlocklyCanvasPanel/canvas/StudentCanvas.jsx b/client/src/components/ActivityPanels/BlocklyCanvasPanel/canvas/StudentCanvas.jsx index ee855e337..c4c13cfdb 100644 --- a/client/src/components/ActivityPanels/BlocklyCanvasPanel/canvas/StudentCanvas.jsx +++ b/client/src/components/ActivityPanels/BlocklyCanvasPanel/canvas/StudentCanvas.jsx @@ -16,14 +16,18 @@ import { import ArduinoLogo from '../Icons/ArduinoLogo'; import PlotterLogo from '../Icons/PlotterLogo'; import { useNavigate } from 'react-router-dom'; -import LessonModal from '../modals/LessonModal'; - let plotId = 1; -const LessonContent = ( -
-

Test Lesson

-

This is a sample lesson content.

+ +const LessonContent = ({ onClose }) => ( +
+
+

Test Lesson

+

This is a sample lesson content.

+
+
); @@ -53,10 +57,15 @@ export default function StudentCanvas({ activity }) { const replayRef = useRef([]); const clicks = useRef(0); + const [openLesson, setOpenLesson] = useState(false); - // const renderLesson = () => { - // setLessonVisible(true); - // } + const openLessonHandler = () => { + setOpenLesson(true); + }; + + const toggleLessonVisibility = () => { + setLessonVisible(!lessonVisible); + }; const closeLesson = () => { setLessonVisible(false); @@ -482,6 +491,14 @@ export default function StudentCanvas({ activity }) { id='action-btn-container' className='flex space-around' > + +
- - -
+ {/* Right side LessonContent */} +
+ {lessonVisible && ( + + )} +
+ + { title="Lesson: " visible={isVisible} onClose={closeModal} + className="lesson-modal" footer={[ -
-); +let plotId = 1; export default function StudentCanvas({ activity }) { const [hoverSave, setHoverSave] = useState(false); @@ -48,7 +37,6 @@ export default function StudentCanvas({ activity }) { const [saves, setSaves] = useState({}); const [lastSavedTime, setLastSavedTime] = useState(null); const [lastAutoSave, setLastAutoSave] = useState(null); - const [lessonVisible, setLessonVisible] = useState(true); const [forceUpdate] = useReducer((x) => x + 1, 0); const navigate = useNavigate(); @@ -57,21 +45,11 @@ export default function StudentCanvas({ activity }) { const replayRef = useRef([]); const clicks = useRef(0); - const [openLesson, setOpenLesson] = useState(false); - - const openLessonHandler = () => { - setOpenLesson(true); - }; - const toggleLessonVisibility = () => { - setLessonVisible(!lessonVisible); + const handleResize = (e, { size }) => { + setLeftPanelWidth(size.width); }; - const closeLesson = () => { - setLessonVisible(false); - } - - const setWorkspace = () => { workspaceRef.current = window.Blockly.inject('blockly-canvas', { toolbox: document.getElementById('toolbox'), @@ -380,6 +358,14 @@ export default function StudentCanvas({ activity }) { return (
+ +
- -
- {/* Right side LessonContent */} -
- {lessonVisible && ( - - )} -
+ {/* THE RIGHT HAND SIDE OF THE WEBPAGE (WHERE LESSON SUPPOSE TO BE) */} + +
+ {/* Content for the right-hand side */} +

Test Lesson

+

Lesson content goes here...

+
+ - + /> + +
{/* This xml is for the blocks' menu we will provide. Here are examples on how to include categories and subcategories */} @@ -594,4 +575,4 @@ export default function StudentCanvas({ activity }) { )}
); -} +} \ No newline at end of file diff --git a/package-lock.json b/package-lock.json new file mode 100644 index 000000000..0cb71f48b --- /dev/null +++ b/package-lock.json @@ -0,0 +1,151 @@ +{ + "name": "Sapphire-20-9g", + "lockfileVersion": 3, + "requires": true, + "packages": { + "": { + "dependencies": { + "react-resizable": "^3.0.5", + "react-split-pane": "^0.1.92" + } + }, + "node_modules/clsx": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/clsx/-/clsx-1.2.1.tgz", + "integrity": "sha512-EcR6r5a8bj6pu3ycsa/E/cKVGuTgZJZdsyUYHOksG/UHIiKfjxzRxYJpyVBwYaQeOvghal9fcc4PidlgzugAQg==", + "engines": { + "node": ">=6" + } + }, + "node_modules/js-tokens": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz", + "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==" + }, + "node_modules/loose-envify": { + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/loose-envify/-/loose-envify-1.4.0.tgz", + "integrity": "sha512-lyuxPGr/Wfhrlem2CL/UcnUc1zcqKAImBDzukY7Y5F/yQiNdko6+fRLevlw1HgMySw7f611UIY408EtxRSoK3Q==", + "dependencies": { + "js-tokens": "^3.0.0 || ^4.0.0" + }, + "bin": { + "loose-envify": "cli.js" + } + }, + "node_modules/object-assign": { + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz", + "integrity": "sha512-rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg==", + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/prop-types": { + "version": "15.8.1", + "resolved": "https://registry.npmjs.org/prop-types/-/prop-types-15.8.1.tgz", + "integrity": "sha512-oj87CgZICdulUohogVAR7AjlC0327U4el4L6eAvOqCeudMDVU0NThNaV+b9Df4dXgSP1gXMTnPdhfe/2qDH5cg==", + "dependencies": { + "loose-envify": "^1.4.0", + "object-assign": "^4.1.1", + "react-is": "^16.13.1" + } + }, + "node_modules/react": { + "version": "16.14.0", + "resolved": "https://registry.npmjs.org/react/-/react-16.14.0.tgz", + "integrity": "sha512-0X2CImDkJGApiAlcf0ODKIneSwBPhqJawOa5wCtKbu7ZECrmS26NvtSILynQ66cgkT/RJ4LidJOc3bUESwmU8g==", + "peer": true, + "dependencies": { + "loose-envify": "^1.1.0", + "object-assign": "^4.1.1", + "prop-types": "^15.6.2" + }, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/react-dom": { + "version": "16.14.0", + "resolved": "https://registry.npmjs.org/react-dom/-/react-dom-16.14.0.tgz", + "integrity": "sha512-1gCeQXDLoIqMgqD3IO2Ah9bnf0w9kzhwN5q4FGnHZ67hBm9yePzB5JJAIQCc8x3pFnNlwFq4RidZggNAAkzWWw==", + "peer": true, + "dependencies": { + "loose-envify": "^1.1.0", + "object-assign": "^4.1.1", + "prop-types": "^15.6.2", + "scheduler": "^0.19.1" + }, + "peerDependencies": { + "react": "^16.14.0" + } + }, + "node_modules/react-is": { + "version": "16.13.1", + "resolved": "https://registry.npmjs.org/react-is/-/react-is-16.13.1.tgz", + "integrity": "sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ==" + }, + "node_modules/react-lifecycles-compat": { + "version": "3.0.4", + "resolved": "https://registry.npmjs.org/react-lifecycles-compat/-/react-lifecycles-compat-3.0.4.tgz", + "integrity": "sha512-fBASbA6LnOU9dOU2eW7aQ8xmYBSXUIWr+UmF9b1efZBazGNO+rcXT/icdKnYm2pTwcRylVUYwW7H1PHfLekVzA==" + }, + "node_modules/react-resizable": { + "version": "3.0.5", + "resolved": "https://registry.npmjs.org/react-resizable/-/react-resizable-3.0.5.tgz", + "integrity": "sha512-vKpeHhI5OZvYn82kXOs1bC8aOXktGU5AmKAgaZS4F5JPburCtbmDPqE7Pzp+1kN4+Wb81LlF33VpGwWwtXem+w==", + "dependencies": { + "prop-types": "15.x", + "react-draggable": "^4.0.3" + }, + "peerDependencies": { + "react": ">= 16.3" + } + }, + "node_modules/react-resizable/node_modules/react-draggable": { + "version": "4.4.6", + "resolved": "https://registry.npmjs.org/react-draggable/-/react-draggable-4.4.6.tgz", + "integrity": "sha512-LtY5Xw1zTPqHkVmtM3X8MUOxNDOUhv/khTgBgrUvwaS064bwVvxT+q5El0uUFNx5IEPKXuRejr7UqLwBIg5pdw==", + "dependencies": { + "clsx": "^1.1.1", + "prop-types": "^15.8.1" + }, + "peerDependencies": { + "react": ">= 16.3.0", + "react-dom": ">= 16.3.0" + } + }, + "node_modules/react-split-pane": { + "version": "0.1.92", + "resolved": "https://registry.npmjs.org/react-split-pane/-/react-split-pane-0.1.92.tgz", + "integrity": "sha512-GfXP1xSzLMcLJI5BM36Vh7GgZBpy+U/X0no+VM3fxayv+p1Jly5HpMofZJraeaMl73b3hvlr+N9zJKvLB/uz9w==", + "dependencies": { + "prop-types": "^15.7.2", + "react-lifecycles-compat": "^3.0.4", + "react-style-proptype": "^3.2.2" + }, + "peerDependencies": { + "react": "^16.0.0-0", + "react-dom": "^16.0.0-0" + } + }, + "node_modules/react-style-proptype": { + "version": "3.2.2", + "resolved": "https://registry.npmjs.org/react-style-proptype/-/react-style-proptype-3.2.2.tgz", + "integrity": "sha512-ywYLSjNkxKHiZOqNlso9PZByNEY+FTyh3C+7uuziK0xFXu9xzdyfHwg4S9iyiRRoPCR4k2LqaBBsWVmSBwCWYQ==", + "dependencies": { + "prop-types": "^15.5.4" + } + }, + "node_modules/scheduler": { + "version": "0.19.1", + "resolved": "https://registry.npmjs.org/scheduler/-/scheduler-0.19.1.tgz", + "integrity": "sha512-n/zwRWRYSUj0/3g/otKDRPMh6qv2SYMWNq85IEa8iZyAv8od9zDYpGSnpBEjNgcMNq6Scbu5KfIPxNF72R/2EA==", + "peer": true, + "dependencies": { + "loose-envify": "^1.1.0", + "object-assign": "^4.1.1" + } + } + } +} diff --git a/package.json b/package.json new file mode 100644 index 000000000..fda9cd1d7 --- /dev/null +++ b/package.json @@ -0,0 +1,6 @@ +{ + "dependencies": { + "react-resizable": "^3.0.5", + "react-split-pane": "^0.1.92" + } +} diff --git a/server/extensions/documentation/documentation/1.0.0/full_documentation.json b/server/extensions/documentation/documentation/1.0.0/full_documentation.json index 0a7a201e4..49963424f 100755 --- a/server/extensions/documentation/documentation/1.0.0/full_documentation.json +++ b/server/extensions/documentation/documentation/1.0.0/full_documentation.json @@ -14,11 +14,7 @@ "name": "Apache 2.0", "url": "https://www.apache.org/licenses/LICENSE-2.0.html" }, -<<<<<<< HEAD - "x-generation-date": "10/31/2023 8:58:11 PM" -======= - "x-generation-date": "10/24/2023 9:18:05 PM" ->>>>>>> develop + "x-generation-date": "10/12/2023 1:28:43 PM" }, "x-strapi-config": { "path": "/documentation", diff --git a/yarn.lock b/yarn.lock index fb57ccd13..84b0de49b 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2,3 +2,102 @@ # yarn lockfile v1 +clsx@^1.1.1: + version "1.2.1" + resolved "https://registry.npmjs.org/clsx/-/clsx-1.2.1.tgz" + integrity sha512-EcR6r5a8bj6pu3ycsa/E/cKVGuTgZJZdsyUYHOksG/UHIiKfjxzRxYJpyVBwYaQeOvghal9fcc4PidlgzugAQg== + +"js-tokens@^3.0.0 || ^4.0.0": + version "4.0.0" + resolved "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz" + integrity sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ== + +loose-envify@^1.1.0, loose-envify@^1.4.0: + version "1.4.0" + resolved "https://registry.npmjs.org/loose-envify/-/loose-envify-1.4.0.tgz" + integrity sha512-lyuxPGr/Wfhrlem2CL/UcnUc1zcqKAImBDzukY7Y5F/yQiNdko6+fRLevlw1HgMySw7f611UIY408EtxRSoK3Q== + dependencies: + js-tokens "^3.0.0 || ^4.0.0" + +object-assign@^4.1.1: + version "4.1.1" + resolved "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz" + integrity sha512-rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg== + +prop-types@^15.5.4, prop-types@^15.6.2, prop-types@^15.7.2, prop-types@^15.8.1, prop-types@15.x: + version "15.8.1" + resolved "https://registry.npmjs.org/prop-types/-/prop-types-15.8.1.tgz" + integrity sha512-oj87CgZICdulUohogVAR7AjlC0327U4el4L6eAvOqCeudMDVU0NThNaV+b9Df4dXgSP1gXMTnPdhfe/2qDH5cg== + dependencies: + loose-envify "^1.4.0" + object-assign "^4.1.1" + react-is "^16.13.1" + +react-dom@^16.0.0-0, "react-dom@>= 16.3.0": + version "16.14.0" + resolved "https://registry.npmjs.org/react-dom/-/react-dom-16.14.0.tgz" + integrity sha512-1gCeQXDLoIqMgqD3IO2Ah9bnf0w9kzhwN5q4FGnHZ67hBm9yePzB5JJAIQCc8x3pFnNlwFq4RidZggNAAkzWWw== + dependencies: + loose-envify "^1.1.0" + object-assign "^4.1.1" + prop-types "^15.6.2" + scheduler "^0.19.1" + +react-draggable@^4.0.3: + version "4.4.6" + resolved "https://registry.npmjs.org/react-draggable/-/react-draggable-4.4.6.tgz" + integrity sha512-LtY5Xw1zTPqHkVmtM3X8MUOxNDOUhv/khTgBgrUvwaS064bwVvxT+q5El0uUFNx5IEPKXuRejr7UqLwBIg5pdw== + dependencies: + clsx "^1.1.1" + prop-types "^15.8.1" + +react-is@^16.13.1: + version "16.13.1" + resolved "https://registry.npmjs.org/react-is/-/react-is-16.13.1.tgz" + integrity sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ== + +react-lifecycles-compat@^3.0.4: + version "3.0.4" + resolved "https://registry.npmjs.org/react-lifecycles-compat/-/react-lifecycles-compat-3.0.4.tgz" + integrity sha512-fBASbA6LnOU9dOU2eW7aQ8xmYBSXUIWr+UmF9b1efZBazGNO+rcXT/icdKnYm2pTwcRylVUYwW7H1PHfLekVzA== + +react-resizable@^3.0.5: + version "3.0.5" + resolved "https://registry.npmjs.org/react-resizable/-/react-resizable-3.0.5.tgz" + integrity sha512-vKpeHhI5OZvYn82kXOs1bC8aOXktGU5AmKAgaZS4F5JPburCtbmDPqE7Pzp+1kN4+Wb81LlF33VpGwWwtXem+w== + dependencies: + prop-types "15.x" + react-draggable "^4.0.3" + +react-split-pane@^0.1.92: + version "0.1.92" + resolved "https://registry.npmjs.org/react-split-pane/-/react-split-pane-0.1.92.tgz" + integrity sha512-GfXP1xSzLMcLJI5BM36Vh7GgZBpy+U/X0no+VM3fxayv+p1Jly5HpMofZJraeaMl73b3hvlr+N9zJKvLB/uz9w== + dependencies: + prop-types "^15.7.2" + react-lifecycles-compat "^3.0.4" + react-style-proptype "^3.2.2" + +react-style-proptype@^3.2.2: + version "3.2.2" + resolved "https://registry.npmjs.org/react-style-proptype/-/react-style-proptype-3.2.2.tgz" + integrity sha512-ywYLSjNkxKHiZOqNlso9PZByNEY+FTyh3C+7uuziK0xFXu9xzdyfHwg4S9iyiRRoPCR4k2LqaBBsWVmSBwCWYQ== + dependencies: + prop-types "^15.5.4" + +react@^16.0.0-0, react@^16.14.0, "react@>= 16.3", "react@>= 16.3.0": + version "16.14.0" + resolved "https://registry.npmjs.org/react/-/react-16.14.0.tgz" + integrity sha512-0X2CImDkJGApiAlcf0ODKIneSwBPhqJawOa5wCtKbu7ZECrmS26NvtSILynQ66cgkT/RJ4LidJOc3bUESwmU8g== + dependencies: + loose-envify "^1.1.0" + object-assign "^4.1.1" + prop-types "^15.6.2" + +scheduler@^0.19.1: + version "0.19.1" + resolved "https://registry.npmjs.org/scheduler/-/scheduler-0.19.1.tgz" + integrity sha512-n/zwRWRYSUj0/3g/otKDRPMh6qv2SYMWNq85IEa8iZyAv8od9zDYpGSnpBEjNgcMNq6Scbu5KfIPxNF72R/2EA== + dependencies: + loose-envify "^1.1.0" + object-assign "^4.1.1" From aebfcef6a5f7a6666afd3957c129e27307e69fcb Mon Sep 17 00:00:00 2001 From: DeepCodingStuff Date: Mon, 27 Nov 2023 21:49:58 -0500 Subject: [PATCH 06/16] Fixed hide button with split. --- .../canvas/StudentCanvas.jsx | 23 +++++++++++++++---- client/src/views/BlocklyPage/BlocklyPage.jsx | 4 ---- 2 files changed, 18 insertions(+), 9 deletions(-) diff --git a/client/src/components/ActivityPanels/BlocklyCanvasPanel/canvas/StudentCanvas.jsx b/client/src/components/ActivityPanels/BlocklyCanvasPanel/canvas/StudentCanvas.jsx index 18626e4c7..e1057b6cc 100644 --- a/client/src/components/ActivityPanels/BlocklyCanvasPanel/canvas/StudentCanvas.jsx +++ b/client/src/components/ActivityPanels/BlocklyCanvasPanel/canvas/StudentCanvas.jsx @@ -45,6 +45,13 @@ export default function StudentCanvas({ activity }) { const replayRef = useRef([]); const clicks = useRef(0); + const [lessonVisible, setLessonVisible] = useState(false); + + const lessonViewOnOff = () => { + console.log("Current state before toggle:", lessonVisible); + setLessonVisible(!lessonVisible); + console.log("State after toggle:", !lessonVisible); + }; const handleResize = (e, { size }) => { setLeftPanelWidth(size.width); @@ -380,6 +387,9 @@ export default function StudentCanvas({ activity }) { {activity.lesson_module_name} + @@ -515,11 +525,14 @@ export default function StudentCanvas({ activity }) { {/* THE RIGHT HAND SIDE OF THE WEBPAGE (WHERE LESSON SUPPOSE TO BE) */} -
- {/* Content for the right-hand side */} -

Test Lesson

-

Lesson content goes here...

-
+ {lessonVisible && ( +
+ <> +

Test Lesson

+

This is a sample lesson content.

+ +
+)}
- - - -
) From d8ab1ac8ef60c68963696274bd7e08a030083c4b Mon Sep 17 00:00:00 2001 From: julianbeloiu Date: Mon, 27 Nov 2023 21:51:37 -0500 Subject: [PATCH 07/16] updated styling of the lesson container --- .../ActivityPanels/BlocklyCanvasPanel/canvas/StudentCanvas.css | 2 ++ 1 file changed, 2 insertions(+) diff --git a/client/src/components/ActivityPanels/BlocklyCanvasPanel/canvas/StudentCanvas.css b/client/src/components/ActivityPanels/BlocklyCanvasPanel/canvas/StudentCanvas.css index fd2c5e850..018858fa4 100644 --- a/client/src/components/ActivityPanels/BlocklyCanvasPanel/canvas/StudentCanvas.css +++ b/client/src/components/ActivityPanels/BlocklyCanvasPanel/canvas/StudentCanvas.css @@ -65,6 +65,8 @@ overflow: hidden; border-left: 1px solid #ddd; padding-left: 20px; + height: 79%; + border-radius: 15px; } #blockly-canvas { From afc6aaa5bf1a549046f8a11bba3af3e57f7387af Mon Sep 17 00:00:00 2001 From: evanhadam Date: Mon, 27 Nov 2023 21:53:17 -0500 Subject: [PATCH 08/16] commit to get teresa's branch --- .../BlocklyCanvasPanel/canvas/StudentCanvas.jsx | 5 ++--- .../documentation/1.0.0/full_documentation.json | 6 +----- 2 files changed, 3 insertions(+), 8 deletions(-) diff --git a/client/src/components/ActivityPanels/BlocklyCanvasPanel/canvas/StudentCanvas.jsx b/client/src/components/ActivityPanels/BlocklyCanvasPanel/canvas/StudentCanvas.jsx index c4c13cfdb..dbfca6a77 100644 --- a/client/src/components/ActivityPanels/BlocklyCanvasPanel/canvas/StudentCanvas.jsx +++ b/client/src/components/ActivityPanels/BlocklyCanvasPanel/canvas/StudentCanvas.jsx @@ -20,11 +20,10 @@ let plotId = 1; const LessonContent = ({ onClose }) => ( -
-
+

Test Lesson

This is a sample lesson content.

-
+ diff --git a/server/extensions/documentation/documentation/1.0.0/full_documentation.json b/server/extensions/documentation/documentation/1.0.0/full_documentation.json index 0a7a201e4..49963424f 100755 --- a/server/extensions/documentation/documentation/1.0.0/full_documentation.json +++ b/server/extensions/documentation/documentation/1.0.0/full_documentation.json @@ -14,11 +14,7 @@ "name": "Apache 2.0", "url": "https://www.apache.org/licenses/LICENSE-2.0.html" }, -<<<<<<< HEAD - "x-generation-date": "10/31/2023 8:58:11 PM" -======= - "x-generation-date": "10/24/2023 9:18:05 PM" ->>>>>>> develop + "x-generation-date": "10/12/2023 1:28:43 PM" }, "x-strapi-config": { "path": "/documentation", From d285217d8eaaef9dc78aee1c7b560fd890dd70b8 Mon Sep 17 00:00:00 2001 From: evanhadam Date: Tue, 28 Nov 2023 04:09:27 -0500 Subject: [PATCH 09/16] UI and divider visuals --- .../BlocklyCanvasPanel/canvas/StudentCanvas.jsx | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/client/src/components/ActivityPanels/BlocklyCanvasPanel/canvas/StudentCanvas.jsx b/client/src/components/ActivityPanels/BlocklyCanvasPanel/canvas/StudentCanvas.jsx index e1057b6cc..ec13c24f7 100644 --- a/client/src/components/ActivityPanels/BlocklyCanvasPanel/canvas/StudentCanvas.jsx +++ b/client/src/components/ActivityPanels/BlocklyCanvasPanel/canvas/StudentCanvas.jsx @@ -367,10 +367,10 @@ export default function StudentCanvas({ activity }) {
+
<> -

Test Lesson

+

Test Lesson

This is a sample lesson content.

From 047c8000b0756585aef229c912d724fad5d22f58 Mon Sep 17 00:00:00 2001 From: tlteresalam Date: Tue, 28 Nov 2023 13:20:26 -0500 Subject: [PATCH 10/16] Change the UI --- .../BlocklyCanvasPanel/canvas/StudentCanvas.jsx | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/client/src/components/ActivityPanels/BlocklyCanvasPanel/canvas/StudentCanvas.jsx b/client/src/components/ActivityPanels/BlocklyCanvasPanel/canvas/StudentCanvas.jsx index e1057b6cc..c926c637e 100644 --- a/client/src/components/ActivityPanels/BlocklyCanvasPanel/canvas/StudentCanvas.jsx +++ b/client/src/components/ActivityPanels/BlocklyCanvasPanel/canvas/StudentCanvas.jsx @@ -367,12 +367,13 @@ export default function StudentCanvas({ activity }) {
+
- <> -

Test Lesson

-

This is a sample lesson content.

- -
-)} +
+ <> +

Test Lesson

+

This is a sample lesson content.

+ +
+ )} Date: Tue, 28 Nov 2023 13:27:40 -0500 Subject: [PATCH 11/16] pushing changes to develop --- .../BlocklyCanvasPanel/canvas/StudentCanvas.jsx | 4 +++- .../ActivityEditor/components/ActivityDetailModal.jsx | 1 + 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/client/src/components/ActivityPanels/BlocklyCanvasPanel/canvas/StudentCanvas.jsx b/client/src/components/ActivityPanels/BlocklyCanvasPanel/canvas/StudentCanvas.jsx index ec13c24f7..8f53ec066 100644 --- a/client/src/components/ActivityPanels/BlocklyCanvasPanel/canvas/StudentCanvas.jsx +++ b/client/src/components/ActivityPanels/BlocklyCanvasPanel/canvas/StudentCanvas.jsx @@ -18,6 +18,7 @@ import { import ArduinoLogo from '../Icons/ArduinoLogo'; import PlotterLogo from '../Icons/PlotterLogo'; import { useNavigate } from 'react-router-dom'; +import Replay from '../../../../views/Replay/Replay'; let plotId = 1; @@ -370,7 +371,7 @@ export default function StudentCanvas({ activity }) { minSize={300} defaultSize={ lessonVisible ? 1000 : 1500 } maxSize={ lessonVisible ? 1000 : 1500 } - resizerStyle={{ width: '10px', cursor: 'col-resize', marginRight: '23px', height: '600px', backgroundColor: 'black', borderRadius: '30px' }} + resizerStyle={{ display: lessonVisible ? 'block' : 'none', width: '10px', cursor: 'col-resize', marginRight: '23px', height: '600px', backgroundColor: 'black' , borderRadius: '30px' }} >

Test Lesson

This is a sample lesson content.

+
)} diff --git a/client/src/views/ContentCreator/ActivityEditor/components/ActivityDetailModal.jsx b/client/src/views/ContentCreator/ActivityEditor/components/ActivityDetailModal.jsx index ac4203595..9856dc3fe 100644 --- a/client/src/views/ContentCreator/ActivityEditor/components/ActivityDetailModal.jsx +++ b/client/src/views/ContentCreator/ActivityEditor/components/ActivityDetailModal.jsx @@ -27,6 +27,7 @@ const ActivityDetailModal = ({ const [StandardS, setStandardS] = useState("") const [images, setImages] = useState("") const [link, setLink] = useState("") + const [sideBySide, setSideBySide] = useState(false) const [scienceComponents, setScienceComponents] = useState([]) const [makingComponents, setMakingComponents] = useState([]) From d96bb6ac33eb5d4e69e1b096db8075920c5b8643 Mon Sep 17 00:00:00 2001 From: evanhadam Date: Tue, 28 Nov 2023 13:54:42 -0500 Subject: [PATCH 12/16] code replay editor button --- client/public/images/codeReplayRecord.png | Bin 0 -> 1768 bytes .../canvas/ContentCreatorCanvas.jsx | 3 +++ .../BlocklyCanvasPanel/canvas/MentorCanvas.jsx | 6 ++++++ .../BlocklyCanvasPanel/canvas/StudentCanvas.jsx | 2 +- 4 files changed, 10 insertions(+), 1 deletion(-) create mode 100644 client/public/images/codeReplayRecord.png diff --git a/client/public/images/codeReplayRecord.png b/client/public/images/codeReplayRecord.png new file mode 100644 index 0000000000000000000000000000000000000000..ba49fbc31b0ae8216ef0d6845ffdaeb31a4f1ea1 GIT binary patch literal 1768 zcmVP)zcXu5d9Q5?`?d|Oh2@7m&Z1C{#ARQl)l9FU(WC;WYva+(ey1E$` z7%eO;hlhtJCMKJkn-vlh)YR0$!NEjBLxF*T%*@QBq@+JSKIP@*H#Rm^RaH$)OeQ42 zp8x;`I!Q!9RCt{2oQZO?Di}Z&6~!eQT+l=l_5C06*N9dHjlEgmb~rPgX_JuQRCYel zG=)N;P$(1%h1@vCC%Avz!;UQT6S$H6Ws`Fa&?f-#`MV{Qj?+ukR#Hi0PV(tmYgQ%Tgdh3 z3G0nCGMW@M@;6O%43xaH7@^|XVxX1Ps=*!-A74>>SWy7RiPaI`4$=hQ+BVmS+vYFV{ zv2hohVcATy>`;~W5i@I)&ZN8?sVMBQOFk3(dc=gVQC!lQXl49d1;@-IkS%4ND+k%a)ubTD7rIKZ-D`5j|3xXu*yO1ngQ@kDMl2 zrEd*dh|YZ?(wb<|1@kHkCbw!M9#~cr&9Gv`>@%X++Ke`o) zT^4r=5cZRg*FobFhB{-aO#Y6EmK@!8|1IJ5yCPbC0dJ}4Ye2mf(&jTy9g%-f)(g? zEvB40&HC-0%VJN&~YaBOuC(fqnBCP9vHW66H zvO@oTOB}y3q5Fss;%R#nPM1ABH7Q*Xt~a~!<@*&1)4!RhFD;Afj-M zCJ@lPIWC}u?LIT{LD_H5P0+*z74bnDi)cG(sm7Qo$KmlOa|Z zl6gJRd8LagLtTQRrLiVeuqWPV z1;!7P^JpS?Fh4Sx%&>kgBiS*DMiX(FUoe^c+=2)%Ki8g4Ci6i(S(*sx(OE_lKTT5| z4WH9MAgf^e1;nQ%cdpuUla+8Cq6S z(*|j;kEh3NFfW!{0IQzSF=@`}L)kM4#^RMo(R!`>cv_FiWysy0$(;R(xug2=p}<&%Z3bopd7|U4;o#EVGtur1Rl%^yenLIHQph7>Oe$Ku+Tm?# zf=ze6@lJy(%9x%^gBaG2*>6-OZkq~eml+d}PM?OSz#DfF0xa4ami4%>;zNwWemw$p zZ;M#&;>}OctefDj66t6((To!&%!vr0Yb!GoTDh>7M^txoV#h6q{ja>iw<=@p}< zuk-_Z{%R_iZ@1qo_W}VxXc+Q$MT~QM$rrGLpMfVdegRT zW4hO%64Q8T_5k~eJ^y_P`z_wx=;y_TA!MCip-?Ck3WY-POa1}ySE3M*7cS8N0000< KMNUMnLSTaSK0!qQ literal 0 HcmV?d00001 diff --git a/client/src/components/ActivityPanels/BlocklyCanvasPanel/canvas/ContentCreatorCanvas.jsx b/client/src/components/ActivityPanels/BlocklyCanvasPanel/canvas/ContentCreatorCanvas.jsx index 760b7b5d9..a2750dec6 100644 --- a/client/src/components/ActivityPanels/BlocklyCanvasPanel/canvas/ContentCreatorCanvas.jsx +++ b/client/src/components/ActivityPanels/BlocklyCanvasPanel/canvas/ContentCreatorCanvas.jsx @@ -300,6 +300,9 @@ export default function ContentCreatorCanvas({ + +

Code Replay Editor

+
); diff --git a/client/src/components/ActivityPanels/BlocklyCanvasPanel/canvas/MentorCanvas.jsx b/client/src/components/ActivityPanels/BlocklyCanvasPanel/canvas/MentorCanvas.jsx index 7d99ef2be..eada97d4f 100644 --- a/client/src/components/ActivityPanels/BlocklyCanvasPanel/canvas/MentorCanvas.jsx +++ b/client/src/components/ActivityPanels/BlocklyCanvasPanel/canvas/MentorCanvas.jsx @@ -271,6 +271,12 @@ export default function MentorCanvas({ activity, isSandbox, setActivity, isMent + +
+ +

Code Replay Editor

+
+
); diff --git a/client/src/components/ActivityPanels/BlocklyCanvasPanel/canvas/StudentCanvas.jsx b/client/src/components/ActivityPanels/BlocklyCanvasPanel/canvas/StudentCanvas.jsx index 8f53ec066..57ba3e17a 100644 --- a/client/src/components/ActivityPanels/BlocklyCanvasPanel/canvas/StudentCanvas.jsx +++ b/client/src/components/ActivityPanels/BlocklyCanvasPanel/canvas/StudentCanvas.jsx @@ -371,7 +371,7 @@ export default function StudentCanvas({ activity }) { minSize={300} defaultSize={ lessonVisible ? 1000 : 1500 } maxSize={ lessonVisible ? 1000 : 1500 } - resizerStyle={{ display: lessonVisible ? 'block' : 'none', width: '10px', cursor: 'col-resize', marginRight: '23px', height: '600px', backgroundColor: 'black' , borderRadius: '30px' }} + resizerStyle={{ display: lessonVisible ? 'block' : 'none', width: '10px', cursor: 'col-resize', marginRight: '23px', height: '600px', backgroundColor: '#5dc0de' , borderRadius: '30px' }} >
Date: Tue, 28 Nov 2023 14:06:38 -0500 Subject: [PATCH 13/16] UI changes --- .../ActivityPanels/BlocklyCanvasPanel/canvas/StudentCanvas.jsx | 1 - 1 file changed, 1 deletion(-) diff --git a/client/src/components/ActivityPanels/BlocklyCanvasPanel/canvas/StudentCanvas.jsx b/client/src/components/ActivityPanels/BlocklyCanvasPanel/canvas/StudentCanvas.jsx index 57ba3e17a..712670ef8 100644 --- a/client/src/components/ActivityPanels/BlocklyCanvasPanel/canvas/StudentCanvas.jsx +++ b/client/src/components/ActivityPanels/BlocklyCanvasPanel/canvas/StudentCanvas.jsx @@ -531,7 +531,6 @@ export default function StudentCanvas({ activity }) { <>

Test Lesson

This is a sample lesson content.

-
)} From b7aa57cc94defdaaefb479f34972415fe7222992 Mon Sep 17 00:00:00 2001 From: julianbeloiu Date: Tue, 5 Dec 2023 08:10:57 -0500 Subject: [PATCH 14/16] updated ui stuff --- .../documentation/documentation/1.0.0/full_documentation.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server/extensions/documentation/documentation/1.0.0/full_documentation.json b/server/extensions/documentation/documentation/1.0.0/full_documentation.json index 49963424f..1903b11d5 100755 --- a/server/extensions/documentation/documentation/1.0.0/full_documentation.json +++ b/server/extensions/documentation/documentation/1.0.0/full_documentation.json @@ -14,7 +14,7 @@ "name": "Apache 2.0", "url": "https://www.apache.org/licenses/LICENSE-2.0.html" }, - "x-generation-date": "10/12/2023 1:28:43 PM" + "x-generation-date": "11/29/2023 6:19:14 PM" }, "x-strapi-config": { "path": "/documentation", From 69d1fa6e7681a34a44951f76cf5c74ef00d2824e Mon Sep 17 00:00:00 2001 From: julianbeloiu Date: Tue, 5 Dec 2023 08:31:32 -0500 Subject: [PATCH 15/16] updated ui stuff --- .../Mentor/Classroom/Home/MentorActivityDetailModal.jsx | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/client/src/views/Mentor/Classroom/Home/MentorActivityDetailModal.jsx b/client/src/views/Mentor/Classroom/Home/MentorActivityDetailModal.jsx index c2d7a159b..9f6abbc6e 100644 --- a/client/src/views/Mentor/Classroom/Home/MentorActivityDetailModal.jsx +++ b/client/src/views/Mentor/Classroom/Home/MentorActivityDetailModal.jsx @@ -1,4 +1,4 @@ -import { Button, Form, Input, message, Modal } from "antd" +import { Button, Form, Input, message, Modal, Switch } from "antd" import React, { useEffect, useState } from "react" import { useNavigate } from "react-router-dom" import { @@ -245,6 +245,10 @@ const MentorActivityDetailModal = ({ colorOffset={7} /> + + + +

Additional Information

Date: Fri, 8 Dec 2023 21:10:49 -0500 Subject: [PATCH 16/16] Updated backend and lesson view functionality --- client/src/Utils/requests.js | 2 ++ .../Home/MentorActivityDetailModal.jsx | 16 ++++++++++++-- server/api/activity/controllers/activity.js | 3 ++- .../documentation/1.0.0/activity.json | 8 +++++++ .../activity/models/activity.settings.json | 4 ++++ .../1.0.0/learning-components.json | 3 +++ .../documentation/1.0.0/lesson-module.json | 3 +++ server/api/save/documentation/1.0.0/save.json | 3 +++ .../documentation/1.0.0/submission.json | 3 +++ .../1.0.0/full_documentation.json | 22 ++++++++++++++++++- .../documentation/public/index.html | 2 +- 11 files changed, 64 insertions(+), 5 deletions(-) diff --git a/client/src/Utils/requests.js b/client/src/Utils/requests.js index 79fa17f63..a548d953d 100644 --- a/client/src/Utils/requests.js +++ b/client/src/Utils/requests.js @@ -474,6 +474,7 @@ export const updateActivityDetails = async ( StandardS, images, link, + lessonView, scienceComponents, makingComponents, computationComponents @@ -488,6 +489,7 @@ export const updateActivityDetails = async ( StandardS, images, link, + lessonView, scienceComponents, makingComponents, computationComponents, diff --git a/client/src/views/Mentor/Classroom/Home/MentorActivityDetailModal.jsx b/client/src/views/Mentor/Classroom/Home/MentorActivityDetailModal.jsx index 9f6abbc6e..dedb484da 100644 --- a/client/src/views/Mentor/Classroom/Home/MentorActivityDetailModal.jsx +++ b/client/src/views/Mentor/Classroom/Home/MentorActivityDetailModal.jsx @@ -32,6 +32,7 @@ const MentorActivityDetailModal = ({ const [makingComponents, setMakingComponents] = useState([]) const [computationComponents, setComputationComponents] = useState([]) const [activityDetailsVisible, setActivityDetailsVisible] = useState(false) + const [lessonView, setLessonView] = useState(false) const [linkError, setLinkError] = useState(false) const [submitButton, setSubmitButton] = useState(0) const navigate = useNavigate() @@ -48,6 +49,7 @@ const MentorActivityDetailModal = ({ setActivityTemplate(response.data.activity_template) setStandardS(response.data.StandardS) setImages(response.data.images) + setLessonView(response.data.lessonView) setLink(response.data.link) setLinkError(false) const science = response.data.learning_components @@ -113,6 +115,8 @@ const MentorActivityDetailModal = ({ } } setLinkError(false) + console.log("Lesson View before update:", lessonView); // Add this line + const res = await updateActivityDetails( selectActivity.id, description, @@ -120,10 +124,13 @@ const MentorActivityDetailModal = ({ StandardS, images, link, + lessonView, scienceComponents, makingComponents, computationComponents ) + console.log("Lesson View after update:", lessonView); // Add this line + if (res.err) { message.error(res.err) } else { @@ -148,6 +155,7 @@ const MentorActivityDetailModal = ({ setVisible(true) //setOpen(true) }; + return (