Merge branch 'develop'

STEM-C · Feb 16, 2024 · ed80cb0 · ed80cb0
2 parents 652522b + 5e748cc
commit ed80cb0
Show file tree

Hide file tree

Showing 19 changed files with 236 additions and 395 deletions.
diff --git a/client/package.json b/client/package.json
@@ -15,9 +15,9 @@
     "react-hooks-global-state": "^2.1.0",
     "react-papaparse": "^3.17.1",
     "react-router-dom": "^6.9.0",
-    "vite": "^4.2.0",
     "recharts": "^2.5.0",
-    "yarn": "^1.22.10"
+    "vite": "^4.2.0",
+    "yarn": "^1.22.21"
   },
   "scripts": {
     "start": "vite",

diff --git a/client/src/App.jsx b/client/src/App.jsx
@@ -20,6 +20,7 @@ import ForgetPassword from './views/TeacherLogin/ForgetPassword';
 import ResetPassword from './views/TeacherLogin/ResetPassword';
 import TeacherLogin from './views/TeacherLogin/TeacherLogin';
 
+
 const App = () => {
   return (
     <div>

diff --git a/client/src/Utils/requests.js b/client/src/Utils/requests.js
@@ -483,8 +483,8 @@ export const updateDayDetails = async (
     path: `${server}/days/${id}`,
     data: {
       description,
-      // template,
-      // activity_template,
+      //template,
+      //activity_template,
       TekS,
       images,
       link,

diff --git a/client/src/serviceWorker.js b/client/src/serviceWorker.js
@@ -10,6 +10,7 @@
 // To learn more about the benefits of this model and instructions on how to
 // opt-in, read https://bit.ly/CRA-PWA
 
+
 const isLocalhost = Boolean(
     window.location.hostname === 'localhost' ||
     // [::1] is the IPv6 localhost address.

diff --git a/client/src/views/ContentCreator/DayEditor/components/DayDetailModal.jsx b/client/src/views/ContentCreator/DayEditor/components/DayDetailModal.jsx
@@ -169,7 +169,7 @@ const DayDetailModal = ({
           <Input.TextArea
             onChange={e => setDescription(e.target.value)}
             value={description}
-            required
+            //required
             placeholder="Enter description"
           ></Input.TextArea>
         </Form.Item>
@@ -186,7 +186,7 @@ const DayDetailModal = ({
             onChange={e => setTekS(e.target.value)}
             value={TekS}
             className="input"
-            required
+            //required
             placeholder="Enter tekS"
           ></Input>
         </Form.Item>

diff --git a/client/src/views/ContentCreator/LearningStandardCreator/LearningStandardCreator.jsx b/client/src/views/ContentCreator/LearningStandardCreator/LearningStandardCreator.jsx
@@ -174,7 +174,7 @@ export default function LearningStandardCreator({
           <Form.Item label="Description">
             <Input.TextArea
               rows={3}
-              required
+
               onChange={e => {
                 setDescription(e.target.value)
               }}
@@ -187,7 +187,7 @@ export default function LearningStandardCreator({
               onChange={e => {
                 setTeks(e.target.value)
               }}
-              required
+
               value={teks}
               placeholder="Enter lesson Teks"
             />

diff --git a/client/src/views/ContentCreator/LessonEditor/LessonEditor.jsx b/client/src/views/ContentCreator/LessonEditor/LessonEditor.jsx
@@ -115,15 +115,15 @@ export default function LessonEditor({
               onChange={e => setDescription(e.target.value)}
               value={description}
               rows={3}
-              required
+              //required
               placeholder="Enter lesson description"
             />
           </Form.Item>
           <Form.Item id="form-label" label="Teks">
             <Input
               onChange={e => setTeks(e.target.value)}
               value={teks}
-              required
+              //required
               placeholder="Enter lesson teks"
             />
           </Form.Item>

diff --git a/client/src/views/ContentCreator/UnitCreator/UnitCreator.jsx b/client/src/views/ContentCreator/UnitCreator/UnitCreator.jsx
@@ -89,9 +89,10 @@ export default function UnitCreator({ gradeList }) {
               type="number"
               value={number}
               placeholder="Enter unit number"
+              required
               min={1}
               max={15}
-              required
+
             />
           </Form.Item>
           <Form.Item id="form-label" label="Description">
@@ -100,15 +101,15 @@ export default function UnitCreator({ gradeList }) {
               onChange={e => setDescription(e.target.value)}
               value={description}
               placeholder="Enter unit description"
-              required
+
             />
           </Form.Item>
           <Form.Item id="form-label" label="TekS">
             <Input
               onChange={e => setTek(e.target.value)}
               value={tek}
               placeholder="Enter unit Teks"
-              required
+
             />
           </Form.Item>
           <Form.Item

diff --git a/client/src/views/Mentor/Classroom/Home/MentorDayDetailModal.jsx b/client/src/views/Mentor/Classroom/Home/MentorDayDetailModal.jsx
@@ -185,7 +185,7 @@ const MentorDayDetailModal = ({
           <Input.TextArea
             onChange={e => setDescription(e.target.value)}
             value={description}
-            required
+
             placeholder="Enter description"
           ></Input.TextArea>
         </Form.Item>
@@ -195,7 +195,7 @@ const MentorDayDetailModal = ({
             onChange={e => setTekS(e.target.value)}
             value={TekS}
             className="input"
-            required
+
             placeholder="Enter tekS"
           ></Input>
         </Form.Item>

diff --git a/client/vite.config.js b/client/vite.config.js
@@ -2,6 +2,7 @@ import react from "@vitejs/plugin-react-swc"
 import { defineConfig } from "vite"
 
 const base = process.env.PUBLIC_URL ?? "/"
+console.log(base);
 
 export default defineConfig({
   css: {