Merge branch 'master' into IT20005276

6366744b · janithgamage1.ed · 740491ac · 529c1ff1 · 6366744b · 6366744b
Commit 6366744b authored Aug 30, 2023 by janithgamage1.ed
17 changed files
--- a/Project/Backend/Server_Node/controllers/curriculum.controller.js
+++ b/Project/Backend/Server_Node/controllers/curriculum.controller.js
@@ -2,22 +2,25 @@ import Curriculum from '../models/curriculum.model.js';

 export const getAllCurriculums = async (req, res) => {
    try {
-        const curriculums = await Curriculum.find();
+        const curriculums = await Curriculum.find().populate("tutorials");
        res.status(200).json(curriculums);
    } catch (error) {
        res.status(500).json({ message: error.message });
    }
-}
+};

 export const getCurriculumById = async (req, res) => {
    const { id } = req.params;
    try {
-        const curriculum = await Curriculum.findById(id);
+        const curriculum = await Curriculum.findById(id).populate("tutorials");
+        if (!curriculum) {
+            return res.status(404).json({ message: 'Curriculum not found' });
+        }
        res.status(200).json(curriculum);
    } catch (error) {
-        res.status(404).json({ message: 'Curriculum not found' });
+        res.status(500).json({ message: error.message });
    }
-}
+};

 export const createCurriculum = async (req, res) => {
    const curriculumData = req.body;

--- a/Project/Backend/Server_Node/mocq_data/Curriculums.ts
+++ b/Project/Backend/Server_Node/mocq_data/Curriculums.ts
@@ -84,9 +84,9 @@ const curriculums = [
            },
            {
                "tutorialCode": "02",
-                "tutorialTitle": "Learn the Basics of Sign Language",
+                "tutorialTitle": "Everyday Vocabulary in Sign Language",
                "tutorialImage": "https://drive.google.com/uc?export=view&id=1YACBlu7X-O7-DKv5DoW3AM9kgfT7Yhdc",
-                "tutorialContent": "Introduce the concept of sign language and its importance.\nTeach basic greetings and expressions, such as hello, goodbye, thank you, and sorry.\nProvide visual demonstrations and practice exercises for learners to practice these basic signs."
+                "tutorialContent": "Teach signs for everyday objects and activities, such as eat, drink, sleep, book, pen, etc.\nIntroduce signs for common words used in daily life.\nProvide visual demonstrations and interactive exercises for learners to practice using these signs."
            }, 
            {
                "tutorialCode": "03",
@@ -96,12 +96,6 @@ const curriculums = [
            }, 
            {
                "tutorialCode": "04",
-                "tutorialTitle": "Everyday Vocabulary in Sign Language",
-                "tutorialImage": "https://drive.google.com/uc?export=view&id=1YACBlu7X-O7-DKv5DoW3AM9kgfT7Yhdc",
-                "tutorialContent": "Teach signs for everyday objects and activities, such as eat, drink, sleep, book, pen, etc.\nIntroduce signs for common words used in daily life.\nProvide visual demonstrations and interactive exercises for learners to practice using these signs."
-            },
-            {
-                "tutorialCode": "05",
                "tutorialTitle": "Basic Conversational Phrases in Sign Language",
                "tutorialImage": "https://drive.google.com/uc?export=view&id=1YACBlu7X-O7-DKv5DoW3AM9kgfT7Yhdc",
                "tutorialContent": "Teach simple conversational phrases, such as \"What is your name?\" or \"How are you?\"\nIntroduce signs for common question words and phrases.\nProvide visual demonstrations and practice exercises for learners to practice these conversational phrases."

--- a/Project/Backend/Server_Node/models/curriculum.model.js
+++ b/Project/Backend/Server_Node/models/curriculum.model.js
 import mongoose from "mongoose";

-const tutorialSchema = new mongoose.Schema({
-    tutorialCode: String,
-    tutorialTitle: String,
-    tutorialImage: String,
-    // Additional fields for tutorial content
-});
-
-const curriculumSchema = new mongoose.Schema({
-    curriculumCode: String,
-    curriculumLevel: String,
-    curriculumName: String,
-    curriculumImage: String,
-    tutorials: [tutorialSchema], // Embed tutorials as subdocuments
-    // Additional fields for curriculum details
-    status: {
-        type: Number,
-        default: 1, // Default status as active (1)
-    },
+const commonFields = {
    createdBy: String,
    updatedBy: String,
    createdAt: {
@@ -28,6 +11,27 @@ const curriculumSchema = new mongoose.Schema({
        type: Date,
        default: new Date(),
    },
+}; 
+ 
+const curriculumSchema = new mongoose.Schema({ 
+    curriculumCode: {
+        type: String,
+        unique: true, // Ensures unique values for curriculumCode
+    },
+    curriculumLevel: String,
+    curriculumTitle: String,
+    curriculumDescription: String,
+    curriculumImage: String,
+    tutorials: [{
+        type: mongoose.Schema.Types.ObjectId,
+        ref: "Tutorial",
+    }],
+    // Additional fields for curriculum details
+    status: {
+        type: Number,
+        default: 1, // Default status as active (1)
+    },
+    ...commonFields
 });

 const Curriculum = mongoose.model("Curriculum", curriculumSchema);

--- a/Project/Backend/Server_Node/models/tutorial.model.js
+++ b/Project/Backend/Server_Node/models/tutorial.model.js
 import mongoose from "mongoose";

+const commonFields = {
+    createdBy: String,
+    updatedBy: String,
+    createdAt: {
+        type: Date,
+        default: new Date(),
+    },
+    updatedAt: {
+        type: Date,
+        default: new Date(),
+    },
+};
+
 const taskItemSchema = new mongoose.Schema({
    title: String,
    description: String,
@@ -10,8 +23,12 @@ const taskItemSchema = new mongoose.Schema({
 });

 const tutorialSchema = new mongoose.Schema({
-    tutorialCode: String,
+    tutorialCode: {
+        type: String,
+        unique: true, // Ensures unique values for tutorialCode
+    },
    tutorialTitle: String,
+    tutorialDescription: String,
    tutorialImage: String,
    taskItems: [taskItemSchema], // Embed task items as subdocuments
    // Additional fields for tutorial details
@@ -19,16 +36,7 @@ const tutorialSchema = new mongoose.Schema({
        type: Number,
        default: 1, // Default status as active (1)
    },
-    createdBy: String,
-    updatedBy: String,
-    createdAt: {
-        type: Date,
-        default: new Date(),
-    },
-    updatedAt: {
-        type: Date,
-        default: new Date(),
-    },
+    ...commonFields
 });

 const Tutorial = mongoose.model("Tutorial", tutorialSchema);

--- a/Project/Backend/Server_Node/yarn.lock
+++ b/Project/Backend/Server_Node/yarn.lock
@@ -2,19 +2,26 @@
 # yarn lockfile v1


+"@mongodb-js/saslprep@^1.1.0":
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/@mongodb-js/saslprep/-/saslprep-1.1.0.tgz#022fa36620a7287d17acd05c4aae1e5f390d250d"
+  integrity sha512-Xfijy7HvfzzqiOAhAepF4SGN5e9leLkMvg/OPOF97XemjfVCYN/oWa75wnkc6mltMSTwY+XlbhWgUOJmkFspSw==
+  dependencies:
+    sparse-bitfield "^3.0.3"
+
 "@types/node@*":
-  version "20.1.2"
-  resolved "https://registry.npmjs.org/@types/node/-/node-20.1.2.tgz"
-  integrity sha512-CTO/wa8x+rZU626cL2BlbCDzydgnFNgc19h4YvizpTO88MFQxab8wqisxaofQJ/9bLGugRdWIuX/TbIs6VVF6g==
+  version "20.5.7"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-20.5.7.tgz#4b8ecac87fbefbc92f431d09c30e176fc0a7c377"
+  integrity sha512-dP7f3LdZIysZnmvP3ANJYTSwg+wLLl8p7RqniVlV7j+oXSXAbt9h0WIBFmJy5inWZoX9wZN6eXx+YXd9Rh3RBA==

 "@types/webidl-conversions@*":
  version "7.0.0"
-  resolved "https://registry.npmjs.org/@types/webidl-conversions/-/webidl-conversions-7.0.0.tgz"
+  resolved "https://registry.yarnpkg.com/@types/webidl-conversions/-/webidl-conversions-7.0.0.tgz#2b8e60e33906459219aa587e9d1a612ae994cfe7"
  integrity sha512-xTE1E+YF4aWPJJeUzaZI5DRntlkY3+BCVJi0axFptnjGmAoWxkyREIh/XMrfxVLejwQxMCfDXdICo0VLxThrog==

 "@types/whatwg-url@^8.2.1":
  version "8.2.2"
-  resolved "https://registry.npmjs.org/@types/whatwg-url/-/whatwg-url-8.2.2.tgz"
+  resolved "https://registry.yarnpkg.com/@types/whatwg-url/-/whatwg-url-8.2.2.tgz#749d5b3873e845897ada99be4448041d4cc39e63"
  integrity sha512-FtQu10RWgn3D9U4aazdwIE2yzphmTJREDqNdODHrbrZmmMqI0vMheC/6NE/J1Yveaj8H+ela+YwWTjq5PGmuhA==
  dependencies:
    "@types/node" "*"
@@ -22,20 +29,30 @@

 abbrev@1:
  version "1.1.1"
-  resolved "https://registry.npmjs.org/abbrev/-/abbrev-1.1.1.tgz"
+  resolved "https://registry.yarnpkg.com/abbrev/-/abbrev-1.1.1.tgz#f8f2c887ad10bf67f634f005b6987fed3179aac8"
  integrity sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==

 accepts@~1.3.8:
  version "1.3.8"
-  resolved "https://registry.npmjs.org/accepts/-/accepts-1.3.8.tgz"
+  resolved "https://registry.yarnpkg.com/accepts/-/accepts-1.3.8.tgz#0bf0be125b67014adcb0b0921e62db7bffe16b2e"
  integrity sha512-PYAthTa2m2VKxuvSD3DPC/Gy+U+sOA1LAuT8mkmRuvw+NACSaeXEQ+NHcVF7rONl6qcaxV3Uuemwawk+7+SJLw==
  dependencies:
    mime-types "~2.1.34"
    negotiator "0.6.3"

+ansi-regex@^2.0.0:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-2.1.1.tgz#c3b33ab5ee360d86e0e628f0468ae7ef27d654df"
+  integrity sha512-TIGnTpdo+E3+pCyAluZvtED5p5wCqLdezCyhPZzKPcxvFplEt4i+W7OONCKgeZFT3+y5NZZfOOS/Bdcanm1MYA==
+
+ansi-styles@^2.2.1:
+  version "2.2.1"
+  resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-2.2.1.tgz#b432dd3358b634cf75e1e4664368240533c1ddbe"
+  integrity sha512-kmCevFghRiWM7HB5zTPULl4r9bVFSWjz62MhqizDGUrq2NWuNMQyuv4tHHoKJHs69M/MF64lEcHdYIocrdWQYA==
+
 anymatch@~3.1.2:
  version "3.1.3"
-  resolved "https://registry.npmjs.org/anymatch/-/anymatch-3.1.3.tgz"
+  resolved "https://registry.yarnpkg.com/anymatch/-/anymatch-3.1.3.tgz#790c58b19ba1720a84205b57c618d5ad8524973e"
  integrity sha512-KMReFUr0B4t+D+OBkjR3KYqvocp2XaSzO55UcB6mgQMd3KbcE+mWTyvVV7D/zsdEbNnV6acZUutkiHQXvTr1Rw==
  dependencies:
    normalize-path "^3.0.0"
@@ -43,32 +60,32 @@ anymatch@~3.1.2:

 append-field@^1.0.0:
  version "1.0.0"
-  resolved "https://registry.npmjs.org/append-field/-/append-field-1.0.0.tgz"
+  resolved "https://registry.yarnpkg.com/append-field/-/append-field-1.0.0.tgz#1e3440e915f0b1203d23748e78edd7b9b5b43e56"
  integrity sha512-klpgFSWLW1ZEs8svjfb7g4qWY0YS5imI82dTg+QahUvJ8YqAY0P10Uk8tTyh9ZGuYEZEMaeJYCF5BFuX552hsw==

 array-flatten@1.1.1:
  version "1.1.1"
-  resolved "https://registry.npmjs.org/array-flatten/-/array-flatten-1.1.1.tgz"
+  resolved "https://registry.yarnpkg.com/array-flatten/-/array-flatten-1.1.1.tgz#9a5f699051b1e7073328f2a008968b64ea2955d2"
  integrity sha512-PCVAQswWemu6UdxsDFFX/+gVeYqKAod3D3UVm91jHwynguOwAvYPhx8nNlM++NqRcK6CxxpUafjmhIdKiHibqg==

 balanced-match@^1.0.0:
  version "1.0.2"
-  resolved "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz"
+  resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.2.tgz#e83e3a7e3f300b34cb9d87f615fa0cbf357690ee"
  integrity sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==

 bcryptjs@^2.4.3:
  version "2.4.3"
-  resolved "https://registry.npmjs.org/bcryptjs/-/bcryptjs-2.4.3.tgz"
+  resolved "https://registry.yarnpkg.com/bcryptjs/-/bcryptjs-2.4.3.tgz#9ab5627b93e60621ff7cdac5da9733027df1d0cb"
  integrity sha512-V/Hy/X9Vt7f3BbPJEi8BdVFMByHi+jNXrYkW3huaybV/kQ0KJg0Y6PkEMbn+zeT+i+SiKZ/HMqJGIIt4LZDqNQ==

 binary-extensions@^2.0.0:
  version "2.2.0"
-  resolved "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.2.0.tgz"
+  resolved "https://registry.yarnpkg.com/binary-extensions/-/binary-extensions-2.2.0.tgz#75f502eeaf9ffde42fc98829645be4ea76bd9e2d"
  integrity sha512-jDctJ/IVQbZoJykoeHbhXpOlNBqGNcwXJKJog42E5HDPUwQTSdjCHdihjj0DlnheQ7blbT6dHOafNAiS8ooQKA==

 body-parser@1.20.1:
  version "1.20.1"
-  resolved "https://registry.npmjs.org/body-parser/-/body-parser-1.20.1.tgz"
+  resolved "https://registry.yarnpkg.com/body-parser/-/body-parser-1.20.1.tgz#b1812a8912c195cd371a3ee5e66faa2338a5c668"
  integrity sha512-jWi7abTbYwajOytWCQc37VulmWiRae5RyTpaCyDcS5/lMdtwSz5lOpDE67srw/HYe35f1z3fDQw+3txg7gNtWw==
  dependencies:
    bytes "3.1.2"
@@ -86,7 +103,7 @@ body-parser@1.20.1:

 body-parser@^1.20.2:
  version "1.20.2"
-  resolved "https://registry.npmjs.org/body-parser/-/body-parser-1.20.2.tgz"
+  resolved "https://registry.yarnpkg.com/body-parser/-/body-parser-1.20.2.tgz#6feb0e21c4724d06de7ff38da36dad4f57a747fd"
  integrity sha512-ml9pReCu3M61kGlqoTm2umSXTlRTuGTx0bfYj+uIUKKYycG5NtSbeetV3faSU6R7ajOPw0g/J1PvK4qNy7s5bA==
  dependencies:
    bytes "3.1.2"
@@ -104,7 +121,7 @@ body-parser@^1.20.2:

 brace-expansion@^1.1.7:
  version "1.1.11"
-  resolved "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz"
+  resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.11.tgz#3c7fcbf529d87226f3d2f52b966ff5271eb441dd"
  integrity sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==
  dependencies:
    balanced-match "^1.0.0"
@@ -112,49 +129,60 @@ brace-expansion@^1.1.7:

 braces@~3.0.2:
  version "3.0.2"
-  resolved "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz"
+  resolved "https://registry.yarnpkg.com/braces/-/braces-3.0.2.tgz#3454e1a462ee8d599e236df336cd9ea4f8afe107"
  integrity sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==
  dependencies:
    fill-range "^7.0.1"

-bson@^5.2.0:
-  version "5.3.0"
-  resolved "https://registry.npmjs.org/bson/-/bson-5.3.0.tgz"
-  integrity sha512-ukmCZMneMlaC5ebPHXIkP8YJzNl5DC41N5MAIvKDqLggdao342t4McltoJBQfQya/nHBWAcSsYRqlXPoQkTJag==
+bson@^5.4.0:
+  version "5.4.0"
+  resolved "https://registry.yarnpkg.com/bson/-/bson-5.4.0.tgz#0eea77276d490953ad8616b483298dbff07384c6"
+  integrity sha512-WRZ5SQI5GfUuKnPTNmAYPiKIof3ORXAF4IRU5UcgmivNIon01rWQlw5RUH954dpu8yGL8T59YShVddIPaU/gFA==

 buffer-equal-constant-time@1.0.1:
  version "1.0.1"
-  resolved "https://registry.npmjs.org/buffer-equal-constant-time/-/buffer-equal-constant-time-1.0.1.tgz"
+  resolved "https://registry.yarnpkg.com/buffer-equal-constant-time/-/buffer-equal-constant-time-1.0.1.tgz#f8e71132f7ffe6e01a5c9697a4c6f3e48d5cc819"
  integrity sha512-zRpUiDwd/xk6ADqPMATG8vc9VPrkck7T07OIx0gnjmJAnHnTVXNQG3vfvWNuiZIkwu9KrKdA1iJKfsfTVxE6NA==

 buffer-from@^1.0.0:
  version "1.1.2"
-  resolved "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.2.tgz"
+  resolved "https://registry.yarnpkg.com/buffer-from/-/buffer-from-1.1.2.tgz#2b146a6fd72e80b4f55d255f35ed59a3a9a41bd5"
  integrity sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ==

 busboy@^1.0.0:
  version "1.6.0"
-  resolved "https://registry.npmjs.org/busboy/-/busboy-1.6.0.tgz"
+  resolved "https://registry.yarnpkg.com/busboy/-/busboy-1.6.0.tgz#966ea36a9502e43cdb9146962523b92f531f6893"
  integrity sha512-8SFQbg/0hQ9xy3UNTB0YEnsNBbWfhf7RtnzpL7TkBiTBRfrQ9Fxcnz7VJsleJpyp6rVLvXiuORqjlHi5q+PYuA==
  dependencies:
    streamsearch "^1.1.0"

 bytes@3.1.2:
  version "3.1.2"
-  resolved "https://registry.npmjs.org/bytes/-/bytes-3.1.2.tgz"
+  resolved "https://registry.yarnpkg.com/bytes/-/bytes-3.1.2.tgz#8b0beeb98605adf1b128fa4386403c009e0221a5"
  integrity sha512-/Nf7TyzTx6S3yRJObOAV7956r8cr2+Oj8AC5dt8wSP3BQAoeX58NoHyCU8P8zGkNXStjTSi6fzO6F0pBdcYbEg==

 call-bind@^1.0.0:
  version "1.0.2"
-  resolved "https://registry.npmjs.org/call-bind/-/call-bind-1.0.2.tgz"
+  resolved "https://registry.yarnpkg.com/call-bind/-/call-bind-1.0.2.tgz#b1d4e89e688119c3c9a903ad30abb2f6a919be3c"
  integrity sha512-7O+FbCihrB5WGbFYesctwmTKae6rOiIzmz1icreWJ+0aA7LJfuqhEso2T9ncpcFtzMQtzXf2QGGueWJGTYsqrA==
  dependencies:
    function-bind "^1.1.1"
    get-intrinsic "^1.0.2"

+chalk@^1.1.3:
+  version "1.1.3"
+  resolved "https://registry.yarnpkg.com/chalk/-/chalk-1.1.3.tgz#a8115c55e4a702fe4d150abd3872822a7e09fc98"
+  integrity sha512-U3lRVLMSlsCfjqYPbLyVv11M9CPW4I728d6TCKMAOJueEeB9/8o+eSsMnxPJD+Q+K909sdESg7C+tIkoH6on1A==
+  dependencies:
+    ansi-styles "^2.2.1"
+    escape-string-regexp "^1.0.2"
+    has-ansi "^2.0.0"
+    strip-ansi "^3.0.0"
+    supports-color "^2.0.0"
+
 chokidar@^3.5.2:
  version "3.5.3"
-  resolved "https://registry.npmjs.org/chokidar/-/chokidar-3.5.3.tgz"
+  resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-3.5.3.tgz#1cf37c8707b932bd1af1ae22c0432e2acd1903bd"
  integrity sha512-Dr3sfKRP6oTcjf2JmUmFJfeVMvXBdegxB0iVQ5eb2V10uFJUCAS8OByZdVAyVb8xXNz3GjjTgj9kLWsZTqE6kw==
  dependencies:
    anymatch "~3.1.2"
@@ -169,12 +197,12 @@ chokidar@^3.5.2:

 concat-map@0.0.1:
  version "0.0.1"
-  resolved "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz"
+  resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b"
  integrity sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==

 concat-stream@^1.5.2:
  version "1.6.2"
-  resolved "https://registry.npmjs.org/concat-stream/-/concat-stream-1.6.2.tgz"
+  resolved "https://registry.yarnpkg.com/concat-stream/-/concat-stream-1.6.2.tgz#904bdf194cd3122fc675c77fc4ac3d4ff0fd1a34"
  integrity sha512-27HBghJxjiZtIk3Ycvn/4kbJk/1uZuJFfuPEns6LaEvpvG1f0hTea8lilrouyo9mVc2GWdcEZ8OLoGmSADlrCw==
  dependencies:
    buffer-from "^1.0.0"
@@ -184,34 +212,34 @@ concat-stream@^1.5.2:

 content-disposition@0.5.4:
  version "0.5.4"
-  resolved "https://registry.npmjs.org/content-disposition/-/content-disposition-0.5.4.tgz"
+  resolved "https://registry.yarnpkg.com/content-disposition/-/content-disposition-0.5.4.tgz#8b82b4efac82512a02bb0b1dcec9d2c5e8eb5bfe"
  integrity sha512-FveZTNuGw04cxlAiWbzi6zTAL/lhehaWbTtgluJh4/E95DqMwTmha3KZN1aAWA8cFIhHzMZUvLevkw5Rqk+tSQ==
  dependencies:
    safe-buffer "5.2.1"

 content-type@~1.0.4, content-type@~1.0.5:
  version "1.0.5"
-  resolved "https://registry.npmjs.org/content-type/-/content-type-1.0.5.tgz"
+  resolved "https://registry.yarnpkg.com/content-type/-/content-type-1.0.5.tgz#8b773162656d1d1086784c8f23a54ce6d73d7918"
  integrity sha512-nTjqfcBFEipKdXCv4YDQWCfmcLZKm81ldF0pAopTvyrFGVbcR6P/VAAd5G7N+0tTr8QqiU0tFadD6FK4NtJwOA==

 cookie-signature@1.0.6:
  version "1.0.6"
-  resolved "https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.6.tgz"
+  resolved "https://registry.yarnpkg.com/cookie-signature/-/cookie-signature-1.0.6.tgz#e303a882b342cc3ee8ca513a79999734dab3ae2c"
  integrity sha512-QADzlaHc8icV8I7vbaJXJwod9HWYp8uCqf1xa4OfNu1T7JVxQIrUgOWtHdNDtPiywmFbiS12VjotIXLrKM3orQ==

 cookie@0.5.0:
  version "0.5.0"
-  resolved "https://registry.npmjs.org/cookie/-/cookie-0.5.0.tgz"
+  resolved "https://registry.yarnpkg.com/cookie/-/cookie-0.5.0.tgz#d1f5d71adec6558c58f389987c366aa47e994f8b"
  integrity sha512-YZ3GUyn/o8gfKJlnlX7g7xq4gyO6OSuhGPKaaGssGB2qgDUS0gPgtTvoyZLTt9Ab6dC4hfc9dV5arkvc/OCmrw==

 core-util-is@~1.0.0:
  version "1.0.3"
-  resolved "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.3.tgz"
+  resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.3.tgz#a6042d3634c2b27e9328f837b965fac83808db85"
  integrity sha512-ZQBvi1DcpJ4GDqanjucZ2Hj3wEO5pZDS89BWbkcrvdxksJorwUDDZamX9ldFkp9aw2lmBDLgkObEA4DWNJ9FYQ==

 cors@^2.8.5:
  version "2.8.5"
-  resolved "https://registry.npmjs.org/cors/-/cors-2.8.5.tgz"
+  resolved "https://registry.yarnpkg.com/cors/-/cors-2.8.5.tgz#eac11da51592dd86b9f06f6e7ac293b3df875d29"
  integrity sha512-KIHbLJqu73RGr/hnbrO9uBeixNGuvSQjul/jdFvS/KFSIH1hWVd1ng7zOHx+YrEfInLG7q4n6GHQ9cDtxv/P6g==
  dependencies:
    object-assign "^4"
@@ -219,70 +247,75 @@ cors@^2.8.5:

 debug@2.6.9:
  version "2.6.9"
-  resolved "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz"
+  resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.9.tgz#5d128515df134ff327e90a4c93f4e077a536341f"
  integrity sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==
  dependencies:
    ms "2.0.0"

 debug@4.x:
  version "4.3.4"
-  resolved "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz"
+  resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.4.tgz#1319f6579357f2338d3337d2cdd4914bb5dcc865"
  integrity sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==
  dependencies:
    ms "2.1.2"

 debug@^3.2.7:
  version "3.2.7"
-  resolved "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz"
+  resolved "https://registry.yarnpkg.com/debug/-/debug-3.2.7.tgz#72580b7e9145fb39b6676f9c5e5fb100b934179a"
  integrity sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==
  dependencies:
    ms "^2.1.1"

 depd@2.0.0:
  version "2.0.0"
-  resolved "https://registry.npmjs.org/depd/-/depd-2.0.0.tgz"
+  resolved "https://registry.yarnpkg.com/depd/-/depd-2.0.0.tgz#b696163cc757560d09cf22cc8fad1571b79e76df"
  integrity sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw==

 destroy@1.2.0:
  version "1.2.0"
-  resolved "https://registry.npmjs.org/destroy/-/destroy-1.2.0.tgz"
+  resolved "https://registry.yarnpkg.com/destroy/-/destroy-1.2.0.tgz#4803735509ad8be552934c67df614f94e66fa015"
  integrity sha512-2sJGJTaXIIaR1w4iJSNoN0hnMY7Gpc/n8D4qSCJw8QqFWXf7cuAgnEHxBpweaVcPevC2l3KpjYCx3NypQQgaJg==

 dotenv@^16.0.3:
-  version "16.0.3"
-  resolved "https://registry.npmjs.org/dotenv/-/dotenv-16.0.3.tgz"
-  integrity sha512-7GO6HghkA5fYG9TYnNxi14/7K9f5occMlp3zXAuSxn7CKCxt9xbNWG7yF8hTCSUchlfWSe3uLmlPfigevRItzQ==
+  version "16.3.1"
+  resolved "https://registry.yarnpkg.com/dotenv/-/dotenv-16.3.1.tgz#369034de7d7e5b120972693352a3bf112172cc3e"
+  integrity sha512-IPzF4w4/Rd94bA9imS68tZBaYyBWSCE47V1RGuMrB94iyTOIEwRmVL2x/4An+6mETpLrKJ5hQkB8W4kFAadeIQ==

 ecdsa-sig-formatter@1.0.11:
  version "1.0.11"
-  resolved "https://registry.npmjs.org/ecdsa-sig-formatter/-/ecdsa-sig-formatter-1.0.11.tgz"
+  resolved "https://registry.yarnpkg.com/ecdsa-sig-formatter/-/ecdsa-sig-formatter-1.0.11.tgz#ae0f0fa2d85045ef14a817daa3ce9acd0489e5bf"
  integrity sha512-nagl3RYrbNv6kQkeJIpt6NJZy8twLB/2vtz6yN9Z4vRKHN4/QZJIEbqohALSgwKdnksuY3k5Addp5lg8sVoVcQ==
  dependencies:
    safe-buffer "^5.0.1"

 ee-first@1.1.1:
  version "1.1.1"
-  resolved "https://registry.npmjs.org/ee-first/-/ee-first-1.1.1.tgz"
+  resolved "https://registry.yarnpkg.com/ee-first/-/ee-first-1.1.1.tgz#590c61156b0ae2f4f0255732a158b266bc56b21d"
  integrity sha512-WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow==

 encodeurl@~1.0.2:
  version "1.0.2"
-  resolved "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.2.tgz"
+  resolved "https://registry.yarnpkg.com/encodeurl/-/encodeurl-1.0.2.tgz#ad3ff4c86ec2d029322f5a02c3a9a606c95b3f59"
  integrity sha512-TPJXq8JqFaVYm2CWmPvnP2Iyo4ZSM7/QKcSmuMLDObfpH5fi7RUGmd/rTDf+rut/saiDiQEeVTNgAmJEdAOx0w==

 escape-html@~1.0.3:
  version "1.0.3"
-  resolved "https://registry.npmjs.org/escape-html/-/escape-html-1.0.3.tgz"
+  resolved "https://registry.yarnpkg.com/escape-html/-/escape-html-1.0.3.tgz#0258eae4d3d0c0974de1c169188ef0051d1d1988"
  integrity sha512-NiSupZ4OeuGwr68lGIeym/ksIZMJodUGOSCZ/FSnTxcrekbvqrgdUxlJOMpijaKZVjAJrWrGs/6Jy8OMuyj9ow==

+escape-string-regexp@^1.0.2:
+  version "1.0.5"
+  resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz#1b61c0562190a8dff6ae3bb2cf0200ca130b86d4"
+  integrity sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg==
+
 etag@~1.8.1:
  version "1.8.1"
-  resolved "https://registry.npmjs.org/etag/-/etag-1.8.1.tgz"
+  resolved "https://registry.yarnpkg.com/etag/-/etag-1.8.1.tgz#41ae2eeb65efa62268aebfea83ac7d79299b0887"
  integrity sha512-aIL5Fx7mawVa300al2BnEE4iNvo1qETxLrPI/o05L7z6go7fCw1J6EQmbK4FmJ2AS7kgVF/KEZWufBfdClMcPg==

 express@^4.18.2:
  version "4.18.2"
-  resolved "https://registry.npmjs.org/express/-/express-4.18.2.tgz"
+  resolved "https://registry.yarnpkg.com/express/-/express-4.18.2.tgz#3fabe08296e930c796c19e3c516979386ba9fd59"
  integrity sha512-5/PsL6iGPdfQ/lKM1UuielYgv3BUoJfz1aUwU9vHZ+J7gyvwdQXFEBIEIaxeGf0GIcreATNyBExtalisDbuMqQ==
  dependencies:
    accepts "~1.3.8"
@@ -319,14 +352,14 @@ express@^4.18.2:

 fill-range@^7.0.1:
  version "7.0.1"
-  resolved "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz"
+  resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-7.0.1.tgz#1919a6a7c75fe38b2c7c77e5198535da9acdda40"
  integrity sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==
  dependencies:
    to-regex-range "^5.0.1"

 finalhandler@1.2.0:
  version "1.2.0"
-  resolved "https://registry.npmjs.org/finalhandler/-/finalhandler-1.2.0.tgz"
+  resolved "https://registry.yarnpkg.com/finalhandler/-/finalhandler-1.2.0.tgz#7d23fe5731b207b4640e4fcd00aec1f9207a7b32"
  integrity sha512-5uXcUVftlQMFnWC9qu/svkWv3GTd2PfUhK/3PLkYNAe7FbqJMt3515HaxE6eRL74GdsriiwujiawdaB1BpEISg==
  dependencies:
    debug "2.6.9"
@@ -339,12 +372,12 @@ finalhandler@1.2.0:

 forwarded@0.2.0:
  version "0.2.0"
-  resolved "https://registry.npmjs.org/forwarded/-/forwarded-0.2.0.tgz"
+  resolved "https://registry.yarnpkg.com/forwarded/-/forwarded-0.2.0.tgz#2269936428aad4c15c7ebe9779a84bf0b2a81811"
  integrity sha512-buRG0fpBtRHSTCOASe6hD258tEubFoRLb4ZNA6NxMVHNw2gOcwHo9wyablzMzOA5z9xA9L1KNjk/Nt6MT9aYow==

 fresh@0.5.2:
  version "0.5.2"
-  resolved "https://registry.npmjs.org/fresh/-/fresh-0.5.2.tgz"
+  resolved "https://registry.yarnpkg.com/fresh/-/fresh-0.5.2.tgz#3d8cadd90d976569fa835ab1f8e4b23a105605a7"
  integrity sha512-zJ2mQYM18rEFOudeV4GShTGIQ7RbzA7ozbU9I/XBpm7kqgMywgmylMwXHxZJmkVoYkna9d2pVXVXPdYTP9ej8Q==

 fsevents@~2.3.2:
@@ -354,45 +387,58 @@ fsevents@~2.3.2:

 function-bind@^1.1.1:
  version "1.1.1"
-  resolved "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz"
+  resolved "https://registry.yarnpkg.com/function-bind/-/function-bind-1.1.1.tgz#a56899d3ea3c9bab874bb9773b7c5ede92f4895d"
  integrity sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==

 get-intrinsic@^1.0.2:
-  version "1.2.0"
-  resolved "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.2.0.tgz"
-  integrity sha512-L049y6nFOuom5wGyRc3/gdTLO94dySVKRACj1RmJZBQXlbTMhtNIgkWkUHq+jYmZvKf14EW1EoJnnjbmoHij0Q==
+  version "1.2.1"
+  resolved "https://registry.yarnpkg.com/get-intrinsic/-/get-intrinsic-1.2.1.tgz#d295644fed4505fc9cde952c37ee12b477a83d82"
+  integrity sha512-2DcsyfABl+gVHEfCOaTrWgyt+tb6MSEGmKq+kI5HwLbIYgjgmMcV8KQ41uaKz1xxUcn9tJtgFbQUEVcEbd0FYw==
  dependencies:
    function-bind "^1.1.1"
    has "^1.0.3"
+    has-proto "^1.0.1"
    has-symbols "^1.0.3"

 glob-parent@~5.1.2:
  version "5.1.2"
-  resolved "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz"
+  resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-5.1.2.tgz#869832c58034fe68a4093c17dc15e8340d8401c4"
  integrity sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==
  dependencies:
    is-glob "^4.0.1"

+has-ansi@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/has-ansi/-/has-ansi-2.0.0.tgz#34f5049ce1ecdf2b0649af3ef24e45ed35416d91"
+  integrity sha512-C8vBJ8DwUCx19vhm7urhTuUsr4/IyP6l4VzNQDv+ryHQObW3TTTp9yB68WpYgRe2bbaGuZ/se74IqFeVnMnLZg==
+  dependencies:
+    ansi-regex "^2.0.0"
+
 has-flag@^3.0.0:
  version "3.0.0"
-  resolved "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz"
+  resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-3.0.0.tgz#b5d454dc2199ae225699f3467e5a07f3b955bafd"
  integrity sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw==

+has-proto@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/has-proto/-/has-proto-1.0.1.tgz#1885c1305538958aff469fef37937c22795408e0"
+  integrity sha512-7qE+iP+O+bgF9clE5+UoBFzE65mlBiVj3tKCrlNQ0Ogwm0BjpT/gK4SlLYDMybDh5I3TCTKnPPa0oMG7JDYrhg==
+
 has-symbols@^1.0.3:
  version "1.0.3"
-  resolved "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.3.tgz"
+  resolved "https://registry.yarnpkg.com/has-symbols/-/has-symbols-1.0.3.tgz#bb7b2c4349251dce87b125f7bdf874aa7c8b39f8"
  integrity sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A==

 has@^1.0.3:
  version "1.0.3"
-  resolved "https://registry.npmjs.org/has/-/has-1.0.3.tgz"
+  resolved "https://registry.yarnpkg.com/has/-/has-1.0.3.tgz#722d7cbfc1f6aa8241f16dd814e011e1f41e8796"
  integrity sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==
  dependencies:
    function-bind "^1.1.1"

 http-errors@2.0.0:
  version "2.0.0"
-  resolved "https://registry.npmjs.org/http-errors/-/http-errors-2.0.0.tgz"
+  resolved "https://registry.yarnpkg.com/http-errors/-/http-errors-2.0.0.tgz#b7774a1486ef73cf7667ac9ae0858c012c57b9d3"
  integrity sha512-FtwrG/euBzaEjYeRqOgly7G0qviiXoJWnvEH2Z1plBdXgbyjv34pHTSb9zoeHMyDy33+DWy5Wt9Wo+TURtOYSQ==
  dependencies:
    depd "2.0.0"
@@ -403,69 +449,64 @@ http-errors@2.0.0:

 iconv-lite@0.4.24:
  version "0.4.24"
-  resolved "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz"
+  resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.24.tgz#2022b4b25fbddc21d2f524974a474aafe733908b"
  integrity sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==
  dependencies:
    safer-buffer ">= 2.1.2 < 3"

 ignore-by-default@^1.0.1:
  version "1.0.1"
-  resolved "https://registry.npmjs.org/ignore-by-default/-/ignore-by-default-1.0.1.tgz"
+  resolved "https://registry.yarnpkg.com/ignore-by-default/-/ignore-by-default-1.0.1.tgz#48ca6d72f6c6a3af00a9ad4ae6876be3889e2b09"
  integrity sha512-Ius2VYcGNk7T90CppJqcIkS5ooHUZyIQK+ClZfMfMNFEF9VSE73Fq+906u/CWu92x4gzZMWOwfFYckPObzdEbA==

 inherits@2.0.4, inherits@^2.0.3, inherits@~2.0.3:
  version "2.0.4"
-  resolved "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz"
+  resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.4.tgz#0fa2c64f932917c3433a0ded55363aae37416b7c"
  integrity sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==

 ip@^2.0.0:
  version "2.0.0"
-  resolved "https://registry.npmjs.org/ip/-/ip-2.0.0.tgz"
+  resolved "https://registry.yarnpkg.com/ip/-/ip-2.0.0.tgz#4cf4ab182fee2314c75ede1276f8c80b479936da"
  integrity sha512-WKa+XuLG1A1R0UWhl2+1XQSi+fZWMsYKffMZTTYsiZaUD8k2yDAj5atimTUD2TZkyCkNEeYE5NhFZmupOGtjYQ==

 ipaddr.js@1.9.1:
  version "1.9.1"
-  resolved "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.9.1.tgz"
+  resolved "https://registry.yarnpkg.com/ipaddr.js/-/ipaddr.js-1.9.1.tgz#bff38543eeb8984825079ff3a2a8e6cbd46781b3"
  integrity sha512-0KI/607xoxSToH7GjN1FfSbLoU0+btTicjsQSWQlh/hZykN8KpmMf7uYwPW3R+akZ6R/w18ZlXSHBYXiYUPO3g==

 is-binary-path@~2.1.0:
  version "2.1.0"
-  resolved "https://registry.npmjs.org/is-binary-path/-/is-binary-path-2.1.0.tgz"
+  resolved "https://registry.yarnpkg.com/is-binary-path/-/is-binary-path-2.1.0.tgz#ea1f7f3b80f064236e83470f86c09c254fb45b09"
  integrity sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==
  dependencies:
    binary-extensions "^2.0.0"

 is-extglob@^2.1.1:
  version "2.1.1"
-  resolved "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz"
+  resolved "https://registry.yarnpkg.com/is-extglob/-/is-extglob-2.1.1.tgz#a88c02535791f02ed37c76a1b9ea9773c833f8c2"
  integrity sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ==

 is-glob@^4.0.1, is-glob@~4.0.1:
  version "4.0.3"
-  resolved "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz"
+  resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-4.0.3.tgz#64f61e42cbbb2eec2071a9dac0b28ba1e65d5084"
  integrity sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==
  dependencies:
    is-extglob "^2.1.1"

 is-number@^7.0.0:
  version "7.0.0"
-  resolved "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz"
+  resolved "https://registry.yarnpkg.com/is-number/-/is-number-7.0.0.tgz#7535345b896734d5f80c4d06c50955527a14f12b"
  integrity sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==

 isarray@~1.0.0:
  version "1.0.0"
-  resolved "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz"
+  resolved "https://registry.yarnpkg.com/isarray/-/isarray-1.0.0.tgz#bb935d48582cba168c06834957a54a3e07124f11"
  integrity sha512-VLghIWNM6ELQzo7zwmcg0NmTVyWKYjvIeM83yjp0wRDTmUnrM678fQbcKBo6n2CJEF0szoG//ytg+TKla89ALQ==

-"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==
-
 jsonwebtoken@^9.0.0:
-  version "9.0.0"
-  resolved "https://registry.npmjs.org/jsonwebtoken/-/jsonwebtoken-9.0.0.tgz"
-  integrity sha512-tuGfYXxkQGDPnLJ7SibiQgVgeDgfbPq2k2ICcbgqW8WxWLBAxKQM/ZCu/IT8SOSwmaYl4dpTFCW5xZv7YbbWUw==
+  version "9.0.1"
+  resolved "https://registry.yarnpkg.com/jsonwebtoken/-/jsonwebtoken-9.0.1.tgz#81d8c901c112c24e497a55daf6b2be1225b40145"
+  integrity sha512-K8wx7eJ5TPvEjuiVSkv167EVboBDv9PZdDoF7BgeQnBLVvZWW9clr2PsQHVJDTKaEIH5JBIwHujGcHp7GgI2eg==
  dependencies:
    jws "^3.2.2"
    lodash "^4.17.21"
@@ -474,7 +515,7 @@ jsonwebtoken@^9.0.0:

 jwa@^1.4.1:
  version "1.4.1"
-  resolved "https://registry.npmjs.org/jwa/-/jwa-1.4.1.tgz"
+  resolved "https://registry.yarnpkg.com/jwa/-/jwa-1.4.1.tgz#743c32985cb9e98655530d53641b66c8645b039a"
  integrity sha512-qiLX/xhEEFKUAJ6FiBMbes3w9ATzyk5W7Hvzpa/SLYdxNtng+gcurvrI7TbACjIXlsJyr05/S1oUhZrc63evQA==
  dependencies:
    buffer-equal-constant-time "1.0.1"
@@ -483,7 +524,7 @@ jwa@^1.4.1:

 jws@^3.2.2:
  version "3.2.2"
-  resolved "https://registry.npmjs.org/jws/-/jws-3.2.2.tgz"
+  resolved "https://registry.yarnpkg.com/jws/-/jws-3.2.2.tgz#001099f3639468c9414000e99995fa52fb478304"
  integrity sha512-YHlZCB6lMTllWDtSPHz/ZXTsi8S00usEV6v1tjq8tOUZzw7DpSDWVXjXDre6ed1w/pd495ODpHZYSdkRTsa0HA==
  dependencies:
    jwa "^1.4.1"
@@ -491,111 +532,104 @@ jws@^3.2.2:

 kareem@2.5.1:
  version "2.5.1"
-  resolved "https://registry.npmjs.org/kareem/-/kareem-2.5.1.tgz"
+  resolved "https://registry.yarnpkg.com/kareem/-/kareem-2.5.1.tgz#7b8203e11819a8e77a34b3517d3ead206764d15d"
  integrity sha512-7jFxRVm+jD+rkq3kY0iZDJfsO2/t4BBPeEb2qKn2lR/9KhuksYk5hxzfRYWMPV8P/x2d0kHD306YyWLzjjH+uA==

 lodash@^4.17.21:
  version "4.17.21"
-  resolved "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz"
+  resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.21.tgz#679591c564c3bffaae8454cf0b3df370c3d6911c"
  integrity sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==

-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"
-
 lru-cache@^6.0.0:
  version "6.0.0"
-  resolved "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz"
+  resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-6.0.0.tgz#6d6fe6570ebd96aaf90fcad1dafa3b2566db3a94"
  integrity sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==
  dependencies:
    yallist "^4.0.0"

 media-typer@0.3.0:
  version "0.3.0"
-  resolved "https://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz"
+  resolved "https://registry.yarnpkg.com/media-typer/-/media-typer-0.3.0.tgz#8710d7af0aa626f8fffa1ce00168545263255748"
  integrity sha512-dq+qelQ9akHpcOl/gUVRTxVIOkAJ1wR3QAvb4RsVjS8oVoFjDGTc679wJYmUmknUF5HwMLOgb5O+a3KxfWapPQ==

 memory-pager@^1.0.2:
  version "1.5.0"
-  resolved "https://registry.npmjs.org/memory-pager/-/memory-pager-1.5.0.tgz"
+  resolved "https://registry.yarnpkg.com/memory-pager/-/memory-pager-1.5.0.tgz#d8751655d22d384682741c972f2c3d6dfa3e66b5"
  integrity sha512-ZS4Bp4r/Zoeq6+NLJpP+0Zzm0pR8whtGPf1XExKLJBAczGMnSi3It14OiNCStjQjM6NU1okjQGSxgEZN8eBYKg==

 merge-descriptors@1.0.1:
  version "1.0.1"
-  resolved "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-1.0.1.tgz"
+  resolved "https://registry.yarnpkg.com/merge-descriptors/-/merge-descriptors-1.0.1.tgz#b00aaa556dd8b44568150ec9d1b953f3f90cbb61"
  integrity sha512-cCi6g3/Zr1iqQi6ySbseM1Xvooa98N0w31jzUYrXPX2xqObmFGHJ0tQ5u74H3mVh7wLouTseZyYIq39g8cNp1w==

 methods@~1.1.2:
  version "1.1.2"
-  resolved "https://registry.npmjs.org/methods/-/methods-1.1.2.tgz"
+  resolved "https://registry.yarnpkg.com/methods/-/methods-1.1.2.tgz#5529a4d67654134edcc5266656835b0f851afcee"
  integrity sha512-iclAHeNqNm68zFtnZ0e+1L2yUIdvzNoauKU4WBA3VvH/vPFieF7qfRlwUZU+DA9P9bPXIS90ulxoUoCH23sV2w==

 mime-db@1.52.0:
  version "1.52.0"
-  resolved "https://registry.npmjs.org/mime-db/-/mime-db-1.52.0.tgz"
+  resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.52.0.tgz#bbabcdc02859f4987301c856e3387ce5ec43bf70"
  integrity sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==

 mime-types@~2.1.24, mime-types@~2.1.34:
  version "2.1.35"
-  resolved "https://registry.npmjs.org/mime-types/-/mime-types-2.1.35.tgz"
+  resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.35.tgz#381a871b62a734450660ae3deee44813f70d959a"
  integrity sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==
  dependencies:
    mime-db "1.52.0"

 mime@1.6.0:
  version "1.6.0"
-  resolved "https://registry.npmjs.org/mime/-/mime-1.6.0.tgz"
+  resolved "https://registry.yarnpkg.com/mime/-/mime-1.6.0.tgz#32cd9e5c64553bd58d19a568af452acff04981b1"
  integrity sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg==

 minimatch@^3.1.2:
  version "3.1.2"
-  resolved "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz"
+  resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.1.2.tgz#19cd194bfd3e428f049a70817c038d89ab4be35b"
  integrity sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==
  dependencies:
    brace-expansion "^1.1.7"

 minimist@^1.2.6:
  version "1.2.8"
-  resolved "https://registry.npmjs.org/minimist/-/minimist-1.2.8.tgz"
+  resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.8.tgz#c1a464e7693302e082a075cee0c057741ac4772c"
  integrity sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA==

 mkdirp@^0.5.4:
  version "0.5.6"
-  resolved "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.6.tgz"
+  resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.6.tgz#7def03d2432dcae4ba1d611445c48396062255f6"
  integrity sha512-FP+p8RB8OWpF3YZBCrP5gtADmtXApB5AMLn+vdyA+PyxCjrCs00mjyUozssO33cwDeT3wNGdLxJ5M//YqtHAJw==
  dependencies:
    minimist "^1.2.6"

 mongodb-connection-string-url@^2.6.0:
  version "2.6.0"
-  resolved "https://registry.npmjs.org/mongodb-connection-string-url/-/mongodb-connection-string-url-2.6.0.tgz"
+  resolved "https://registry.yarnpkg.com/mongodb-connection-string-url/-/mongodb-connection-string-url-2.6.0.tgz#57901bf352372abdde812c81be47b75c6b2ec5cf"
  integrity sha512-WvTZlI9ab0QYtTYnuMLgobULWhokRjtC7db9LtcVfJ+Hsnyr5eo6ZtNAt3Ly24XZScGMelOcGtm7lSn0332tPQ==
  dependencies:
    "@types/whatwg-url" "^8.2.1"
    whatwg-url "^11.0.0"

-mongodb@5.3.0:
-  version "5.3.0"
-  resolved "https://registry.npmjs.org/mongodb/-/mongodb-5.3.0.tgz"
-  integrity sha512-Wy/sbahguL8c3TXQWXmuBabiLD+iVmz+tOgQf+FwkCjhUIorqbAxRbbz00g4ZoN4sXIPwpAlTANMaGRjGGTikQ==
+mongodb@5.8.1:
+  version "5.8.1"
+  resolved "https://registry.yarnpkg.com/mongodb/-/mongodb-5.8.1.tgz#dc201adfbd6c6d73401cdcf12ebdb75f14771faf"
+  integrity sha512-wKyh4kZvm6NrCPH8AxyzXm3JBoEf4Xulo0aUWh3hCgwgYJxyQ1KLST86ZZaSWdj6/kxYUA3+YZuyADCE61CMSg==
  dependencies:
-    bson "^5.2.0"
+    bson "^5.4.0"
    mongodb-connection-string-url "^2.6.0"
    socks "^2.7.1"
  optionalDependencies:
-    saslprep "^1.0.3"
+    "@mongodb-js/saslprep" "^1.1.0"

 mongoose@^7.1.1:
-  version "7.1.1"
-  resolved "https://registry.npmjs.org/mongoose/-/mongoose-7.1.1.tgz"
-  integrity sha512-AIxaWwGY+td7QOMk4NgK6fbRuGovFyDzv65nU1uj1DsUh3lpjfP3iFYHSR+sUKrs7nbp19ksLlRXkmInBteSCA==
+  version "7.5.0"
+  resolved "https://registry.yarnpkg.com/mongoose/-/mongoose-7.5.0.tgz#d10003ffc1ff876d761c7cbca6844ddd2aadd42f"
+  integrity sha512-FpOWOb0AJuaVcplmEyIJ2eCbVGe4gOoniPD+pmft5BrGrNrsFcnYXlERdXtBApGHMHPwD7WbxTyhCbUNr72F3Q==
  dependencies:
-    bson "^5.2.0"
+    bson "^5.4.0"
    kareem "2.5.1"
-    mongodb "5.3.0"
+    mongodb "5.8.1"
    mpath "0.9.0"
    mquery "5.0.0"
    ms "2.1.3"
@@ -603,34 +637,34 @@ mongoose@^7.1.1:

 mpath@0.9.0:
  version "0.9.0"
-  resolved "https://registry.npmjs.org/mpath/-/mpath-0.9.0.tgz"
+  resolved "https://registry.yarnpkg.com/mpath/-/mpath-0.9.0.tgz#0c122fe107846e31fc58c75b09c35514b3871904"
  integrity sha512-ikJRQTk8hw5DEoFVxHG1Gn9T/xcjtdnOKIU1JTmGjZZlg9LST2mBLmcX3/ICIbgJydT2GOc15RnNy5mHmzfSew==

 mquery@5.0.0:
  version "5.0.0"
-  resolved "https://registry.npmjs.org/mquery/-/mquery-5.0.0.tgz"
+  resolved "https://registry.yarnpkg.com/mquery/-/mquery-5.0.0.tgz#a95be5dfc610b23862df34a47d3e5d60e110695d"
  integrity sha512-iQMncpmEK8R8ncT8HJGsGc9Dsp8xcgYMVSbs5jgnm1lFHTZqMJTUWTDx1LBO8+mK3tPNZWFLBghQEIOULSTHZg==
  dependencies:
    debug "4.x"

 ms@2.0.0:
  version "2.0.0"
-  resolved "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz"
+  resolved "https://registry.yarnpkg.com/ms/-/ms-2.0.0.tgz#5608aeadfc00be6c2901df5f9861788de0d597c8"
  integrity sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==

 ms@2.1.2:
  version "2.1.2"
-  resolved "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz"
+  resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.2.tgz#d09d1f357b443f493382a8eb3ccd183872ae6009"
  integrity sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==

 ms@2.1.3, ms@^2.1.1:
  version "2.1.3"
-  resolved "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz"
+  resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.3.tgz#574c8138ce1d2b5861f0b44579dbadd60c6615b2"
  integrity sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==

 multer@^1.4.5-lts.1:
  version "1.4.5-lts.1"
-  resolved "https://registry.npmjs.org/multer/-/multer-1.4.5-lts.1.tgz"
+  resolved "https://registry.yarnpkg.com/multer/-/multer-1.4.5-lts.1.tgz#803e24ad1984f58edffbc79f56e305aec5cfd1ac"
  integrity sha512-ywPWvcDMeH+z9gQq5qYHCCy+ethsk4goepZ45GLD63fOu0YcNecQxi64nDs3qluZB+murG3/D4dJ7+dGctcCQQ==
  dependencies:
    append-field "^1.0.0"
@@ -643,17 +677,17 @@ multer@^1.4.5-lts.1:

 negotiator@0.6.3:
  version "0.6.3"
-  resolved "https://registry.npmjs.org/negotiator/-/negotiator-0.6.3.tgz"
+  resolved "https://registry.yarnpkg.com/negotiator/-/negotiator-0.6.3.tgz#58e323a72fedc0d6f9cd4d31fe49f51479590ccd"
  integrity sha512-+EUsqGPLsM+j/zdChZjsnX51g4XrHFOIXwfnCVPGlQk/k5giakcKsuxCObBRu6DSm9opw/O6slWbJdghQM4bBg==

 nodemailer@^6.9.1:
-  version "6.9.1"
-  resolved "https://registry.npmjs.org/nodemailer/-/nodemailer-6.9.1.tgz"
-  integrity sha512-qHw7dOiU5UKNnQpXktdgQ1d3OFgRAekuvbJLcdG5dnEo/GtcTHRYM7+UfJARdOFU9WUQO8OiIamgWPmiSFHYAA==
+  version "6.9.4"
+  resolved "https://registry.yarnpkg.com/nodemailer/-/nodemailer-6.9.4.tgz#93bd4a60eb0be6fa088a0483340551ebabfd2abf"
+  integrity sha512-CXjQvrQZV4+6X5wP6ZIgdehJamI63MFoYFGGPtHudWym9qaEHDNdPzaj5bfMCvxG1vhAileSWW90q7nL0N36mA==

 nodemon@^2.0.22:
  version "2.0.22"
-  resolved "https://registry.npmjs.org/nodemon/-/nodemon-2.0.22.tgz"
+  resolved "https://registry.yarnpkg.com/nodemon/-/nodemon-2.0.22.tgz#182c45c3a78da486f673d6c1702e00728daf5258"
  integrity sha512-B8YqaKMmyuCO7BowF1Z1/mkPqLk6cs/l63Ojtd6otKjMx47Dq1utxfRxcavH1I7VSaL8n5BUaoutadnsX3AAVQ==
  dependencies:
    chokidar "^3.5.2"
@@ -669,65 +703,56 @@ nodemon@^2.0.22:

 nopt@~1.0.10:
  version "1.0.10"
-  resolved "https://registry.npmjs.org/nopt/-/nopt-1.0.10.tgz"
+  resolved "https://registry.yarnpkg.com/nopt/-/nopt-1.0.10.tgz#6ddd21bd2a31417b92727dd585f8a6f37608ebee"
  integrity sha512-NWmpvLSqUrgrAC9HCuxEvb+PSloHpqVu+FqcO4eeF2h5qYRhA7ev6KvelyQAKtegUbC6RypJnlEOhd8vloNKYg==
  dependencies:
    abbrev "1"

 normalize-path@^3.0.0, normalize-path@~3.0.0:
  version "3.0.0"
-  resolved "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz"
+  resolved "https://registry.yarnpkg.com/normalize-path/-/normalize-path-3.0.0.tgz#0dcd69ff23a1c9b11fd0978316644a0388216a65"
  integrity sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==

 object-assign@^4, object-assign@^4.1.1:
  version "4.1.1"
-  resolved "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz"
+  resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.1.tgz#2109adc7965887cfc05cbbd442cac8bfbb360863"
  integrity sha512-rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg==

 object-inspect@^1.9.0:
  version "1.12.3"
-  resolved "https://registry.npmjs.org/object-inspect/-/object-inspect-1.12.3.tgz"
+  resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.12.3.tgz#ba62dffd67ee256c8c086dfae69e016cd1f198b9"
  integrity sha512-geUvdk7c+eizMNUDkRpW1wJwgfOiOeHbxBR/hLXK1aT6zmVSO0jsQcs7fj6MGw89jC/cjGfLcNOrtMYtGqm81g==

 on-finished@2.4.1:
  version "2.4.1"
-  resolved "https://registry.npmjs.org/on-finished/-/on-finished-2.4.1.tgz"
+  resolved "https://registry.yarnpkg.com/on-finished/-/on-finished-2.4.1.tgz#58c8c44116e54845ad57f14ab10b03533184ac3f"
  integrity sha512-oVlzkg3ENAhCk2zdv7IJwd/QUD4z2RxRwpkcGY8psCVcCYZNq4wYnVWALHM+brtuJjePWiYF/ClmuDr8Ch5+kg==
  dependencies:
    ee-first "1.1.1"

 parseurl@~1.3.3:
  version "1.3.3"
-  resolved "https://registry.npmjs.org/parseurl/-/parseurl-1.3.3.tgz"
+  resolved "https://registry.yarnpkg.com/parseurl/-/parseurl-1.3.3.tgz#9da19e7bee8d12dff0513ed5b76957793bc2e8d4"
  integrity sha512-CiyeOxFT/JZyN5m0z9PfXw4SCBJ6Sygz1Dpl0wqjlhDEGGBP1GnsUVEL0p63hoG1fcj3fHynXi9NYO4nWOL+qQ==

 path-to-regexp@0.1.7:
  version "0.1.7"
-  resolved "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.7.tgz"
+  resolved "https://registry.yarnpkg.com/path-to-regexp/-/path-to-regexp-0.1.7.tgz#df604178005f522f15eb4490e7247a1bfaa67f8c"
  integrity sha512-5DFkuoqlv1uYQKxy8omFBeJPQcdoE07Kv2sferDCrAq1ohOU+MSDswDIbnx3YAM60qIOnYa53wBhXW0EbMonrQ==

 picomatch@^2.0.4, picomatch@^2.2.1:
  version "2.3.1"
-  resolved "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz"
+  resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-2.3.1.tgz#3ba3833733646d9d3e4995946c1365a67fb07a42"
  integrity sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==

 process-nextick-args@~2.0.0:
  version "2.0.1"
-  resolved "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.1.tgz"
+  resolved "https://registry.yarnpkg.com/process-nextick-args/-/process-nextick-args-2.0.1.tgz#7820d9b16120cc55ca9ae7792680ae7dba6d7fe2"
  integrity sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag==

-prop-types@^15.5.10:
-  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"
-
 proxy-addr@~2.0.7:
  version "2.0.7"
-  resolved "https://registry.npmjs.org/proxy-addr/-/proxy-addr-2.0.7.tgz"
+  resolved "https://registry.yarnpkg.com/proxy-addr/-/proxy-addr-2.0.7.tgz#f19fe69ceab311eeb94b42e70e8c2070f9ba1025"
  integrity sha512-llQsMLSUDUPT44jdrU/O37qlnifitDP+ZwrmmZcoSKyLKvtZxpyV0n2/bD/N4tBAAZ/gJEdZU7KMraoK1+XYAg==
  dependencies:
    forwarded "0.2.0"
@@ -735,29 +760,29 @@ proxy-addr@~2.0.7:

 pstree.remy@^1.1.8:
  version "1.1.8"
-  resolved "https://registry.npmjs.org/pstree.remy/-/pstree.remy-1.1.8.tgz"
+  resolved "https://registry.yarnpkg.com/pstree.remy/-/pstree.remy-1.1.8.tgz#c242224f4a67c21f686839bbdb4ac282b8373d3a"
  integrity sha512-77DZwxQmxKnu3aR542U+X8FypNzbfJ+C5XQDk3uWjWxn6151aIMGthWYRXTqT1E5oJvg+ljaa2OJi+VfvCOQ8w==

 punycode@^2.1.1:
  version "2.3.0"
-  resolved "https://registry.npmjs.org/punycode/-/punycode-2.3.0.tgz"
+  resolved "https://registry.yarnpkg.com/punycode/-/punycode-2.3.0.tgz#f67fa67c94da8f4d0cfff981aee4118064199b8f"
  integrity sha512-rRV+zQD8tVFys26lAGR9WUuS4iUAngJScM+ZRSKtvl5tKeZ2t5bvdNFdNHBW9FWR4guGHlgmsZ1G7BSm2wTbuA==

 qs@6.11.0:
  version "6.11.0"
-  resolved "https://registry.npmjs.org/qs/-/qs-6.11.0.tgz"
+  resolved "https://registry.yarnpkg.com/qs/-/qs-6.11.0.tgz#fd0d963446f7a65e1367e01abd85429453f0c37a"
  integrity sha512-MvjoMCJwEarSbUYk5O+nmoSzSutSsTwF85zcHPQ9OrlFoZOYIjaqBAJIqIXjptyD5vThxGq52Xu/MaJzRkIk4Q==
  dependencies:
    side-channel "^1.0.4"

 range-parser@~1.2.1:
  version "1.2.1"
-  resolved "https://registry.npmjs.org/range-parser/-/range-parser-1.2.1.tgz"
+  resolved "https://registry.yarnpkg.com/range-parser/-/range-parser-1.2.1.tgz#3cf37023d199e1c24d1a55b84800c2f3e6468031"
  integrity sha512-Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg==

 raw-body@2.5.1:
  version "2.5.1"
-  resolved "https://registry.npmjs.org/raw-body/-/raw-body-2.5.1.tgz"
+  resolved "https://registry.yarnpkg.com/raw-body/-/raw-body-2.5.1.tgz#fe1b1628b181b700215e5fd42389f98b71392857"
  integrity sha512-qqJBtEyVgS0ZmPGdCFPWJ3FreoqvG4MVQln/kCgF7Olq95IbOp0/BWyMwbdtn4VTvkM8Y7khCQ2Xgk/tcrCXig==
  dependencies:
    bytes "3.1.2"
@@ -767,7 +792,7 @@ raw-body@2.5.1:

 raw-body@2.5.2:
  version "2.5.2"
-  resolved "https://registry.npmjs.org/raw-body/-/raw-body-2.5.2.tgz"
+  resolved "https://registry.yarnpkg.com/raw-body/-/raw-body-2.5.2.tgz#99febd83b90e08975087e8f1f9419a149366b68a"
  integrity sha512-8zGqypfENjCIqGhgXToC8aB2r7YrBX+AQAfIPs/Mlk+BtPTztOvTS01NRW/3Eh60J+a48lt8qsCzirQ6loCVfA==
  dependencies:
    bytes "3.1.2"
@@ -775,27 +800,9 @@ raw-body@2.5.2:
    iconv-lite "0.4.24"
    unpipe "1.0.0"

-react-ga@^2.2.0:
-  version "2.7.0"
-  resolved "https://registry.npmjs.org/react-ga/-/react-ga-2.7.0.tgz"
-  integrity sha512-AjC7UOZMvygrWTc2hKxTDvlMXEtbmA0IgJjmkhgmQQ3RkXrWR11xEagLGFGaNyaPnmg24oaIiaNPnEoftUhfXA==
-
-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-mic@^12.4.6:
-  version "12.4.6"
-  resolved "https://registry.npmjs.org/react-mic/-/react-mic-12.4.6.tgz"
-  integrity sha512-2/DZoz7thR2nJyekF10zBvs/7a8HhUQ4L8MV6BpC+Q/T8G1MvpRHGSHjSlVtnbzaCMDJ3R1MdThoLu15WuVh/g==
-  dependencies:
-    prop-types "^15.5.10"
-    react-ga "^2.2.0"
-
 readable-stream@^2.2.2:
  version "2.3.8"
-  resolved "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.8.tgz"
+  resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.8.tgz#91125e8042bba1b9887f49345f6277027ce8be9b"
  integrity sha512-8p0AUk4XODgIewSi0l8Epjs+EVnWiK7NoDIEGU0HhE7+ZyY8D1IMY7odu5lRrFXGg71L15KG8QrPmum45RTtdA==
  dependencies:
    core-util-is "~1.0.0"
@@ -808,53 +815,46 @@ readable-stream@^2.2.2:

 readdirp@~3.6.0:
  version "3.6.0"
-  resolved "https://registry.npmjs.org/readdirp/-/readdirp-3.6.0.tgz"
+  resolved "https://registry.yarnpkg.com/readdirp/-/readdirp-3.6.0.tgz#74a370bd857116e245b29cc97340cd431a02a6c7"
  integrity sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA==
  dependencies:
    picomatch "^2.2.1"

 safe-buffer@5.2.1, safe-buffer@^5.0.1:
  version "5.2.1"
-  resolved "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz"
+  resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.2.1.tgz#1eaf9fa9bdb1fdd4ec75f58f9cdb4e6b7827eec6"
  integrity sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==

 safe-buffer@~5.1.0, safe-buffer@~5.1.1:
  version "5.1.2"
-  resolved "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz"
+  resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.2.tgz#991ec69d296e0313747d59bdfd2b745c35f8828d"
  integrity sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==

 "safer-buffer@>= 2.1.2 < 3":
  version "2.1.2"
-  resolved "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz"
+  resolved "https://registry.yarnpkg.com/safer-buffer/-/safer-buffer-2.1.2.tgz#44fa161b0187b9549dd84bb91802f9bd8385cd6a"
  integrity sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==

-saslprep@^1.0.3:
-  version "1.0.3"
-  resolved "https://registry.npmjs.org/saslprep/-/saslprep-1.0.3.tgz"
-  integrity sha512-/MY/PEMbk2SuY5sScONwhUDsV2p77Znkb/q3nSVstq/yQzYJOH/Azh29p9oJLsl3LnQwSvZDKagDGBsBwSooag==
-  dependencies:
-    sparse-bitfield "^3.0.3"
-
 semver@^5.7.1:
-  version "5.7.1"
-  resolved "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz"
-  integrity sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==
+  version "5.7.2"
+  resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.2.tgz#48d55db737c3287cd4835e17fa13feace1c41ef8"
+  integrity sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g==

 semver@^7.3.8:
-  version "7.5.0"
-  resolved "https://registry.npmjs.org/semver/-/semver-7.5.0.tgz"
-  integrity sha512-+XC0AD/R7Q2mPSRuy2Id0+CGTZ98+8f+KvwirxOKIEyid+XSx6HbC63p+O4IndTHuX5Z+JxQ0TghCkO5Cg/2HA==
+  version "7.5.4"
+  resolved "https://registry.yarnpkg.com/semver/-/semver-7.5.4.tgz#483986ec4ed38e1c6c48c34894a9182dbff68a6e"
+  integrity sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==
  dependencies:
    lru-cache "^6.0.0"

 semver@~7.0.0:
  version "7.0.0"
-  resolved "https://registry.npmjs.org/semver/-/semver-7.0.0.tgz"
+  resolved "https://registry.yarnpkg.com/semver/-/semver-7.0.0.tgz#5f3ca35761e47e05b206c6daff2cf814f0316b8e"
  integrity sha512-+GB6zVA9LWh6zovYQLALHwv5rb2PHGlJi3lfiqIHxR0uuwCgefcOJc59v9fv1w8GbStwxuuqqAjI9NMAOOgq1A==

 send@0.18.0:
  version "0.18.0"
-  resolved "https://registry.npmjs.org/send/-/send-0.18.0.tgz"
+  resolved "https://registry.yarnpkg.com/send/-/send-0.18.0.tgz#670167cc654b05f5aa4a767f9113bb371bc706be"
  integrity sha512-qqWzuOjSFOuqPjFe4NOsMLafToQQwBSOEpS+FwEt3A2V3vKubTquT3vmLTQpFgMXp8AlFWFuP1qKaJZOtPpVXg==
  dependencies:
    debug "2.6.9"
@@ -873,7 +873,7 @@ send@0.18.0:

 serve-static@1.15.0:
  version "1.15.0"
-  resolved "https://registry.npmjs.org/serve-static/-/serve-static-1.15.0.tgz"
+  resolved "https://registry.yarnpkg.com/serve-static/-/serve-static-1.15.0.tgz#faaef08cffe0a1a62f60cad0c4e513cff0ac9540"
  integrity sha512-XGuRDNjXUijsUL0vl6nSD7cwURuzEgglbOaFuZM9g3kwDXOWVTck0jLzjPzGD+TazWbboZYu52/9/XPdUgne9g==
  dependencies:
    encodeurl "~1.0.2"
@@ -883,12 +883,12 @@ serve-static@1.15.0:

 setprototypeof@1.2.0:
  version "1.2.0"
-  resolved "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.2.0.tgz"
+  resolved "https://registry.yarnpkg.com/setprototypeof/-/setprototypeof-1.2.0.tgz#66c9a24a73f9fc28cbe66b09fed3d33dcaf1b424"
  integrity sha512-E5LDX7Wrp85Kil5bhZv46j8jOeboKq5JMmYM3gVGdGH8xFpPWXUMsNrlODCrkoxMEeNi/XZIwuRvY4XNwYMJpw==

 side-channel@^1.0.4:
  version "1.0.4"
-  resolved "https://registry.npmjs.org/side-channel/-/side-channel-1.0.4.tgz"
+  resolved "https://registry.yarnpkg.com/side-channel/-/side-channel-1.0.4.tgz#efce5c8fdc104ee751b25c58d4290011fa5ea2cf"
  integrity sha512-q5XPytqFEIKHkGdiMIrY10mvLRvnQh42/+GoBlFW3b2LXLE2xxJpZFdm94we0BaoV3RwJyGqg5wS7epxTv0Zvw==
  dependencies:
    call-bind "^1.0.0"
@@ -897,24 +897,24 @@ side-channel@^1.0.4:

 sift@16.0.1:
  version "16.0.1"
-  resolved "https://registry.npmjs.org/sift/-/sift-16.0.1.tgz"
+  resolved "https://registry.yarnpkg.com/sift/-/sift-16.0.1.tgz#e9c2ccc72191585008cf3e36fc447b2d2633a053"
  integrity sha512-Wv6BjQ5zbhW7VFefWusVP33T/EM0vYikCaQ2qR8yULbsilAT8/wQaXvuQ3ptGLpoKx+lihJE3y2UTgKDyyNHZQ==

 simple-update-notifier@^1.0.7:
  version "1.1.0"
-  resolved "https://registry.npmjs.org/simple-update-notifier/-/simple-update-notifier-1.1.0.tgz"
+  resolved "https://registry.yarnpkg.com/simple-update-notifier/-/simple-update-notifier-1.1.0.tgz#67694c121de354af592b347cdba798463ed49c82"
  integrity sha512-VpsrsJSUcJEseSbMHkrsrAVSdvVS5I96Qo1QAQ4FxQ9wXFcB+pjj7FB7/us9+GcgfW4ziHtYMc1J0PLczb55mg==
  dependencies:
    semver "~7.0.0"

 smart-buffer@^4.2.0:
  version "4.2.0"
-  resolved "https://registry.npmjs.org/smart-buffer/-/smart-buffer-4.2.0.tgz"
+  resolved "https://registry.yarnpkg.com/smart-buffer/-/smart-buffer-4.2.0.tgz#6e1d71fa4f18c05f7d0ff216dd16a481d0e8d9ae"
  integrity sha512-94hK0Hh8rPqQl2xXc3HsaBoOXKV20MToPkcXvwbISWLEs+64sBq5kFgn2kJDHb1Pry9yrP0dxrCI9RRci7RXKg==

 socks@^2.7.1:
  version "2.7.1"
-  resolved "https://registry.npmjs.org/socks/-/socks-2.7.1.tgz"
+  resolved "https://registry.yarnpkg.com/socks/-/socks-2.7.1.tgz#d8e651247178fde79c0663043e07240196857d55"
  integrity sha512-7maUZy1N7uo6+WVEX6psASxtNlKaNVMlGQKkG/63nEDdLOWNbiUMoLK7X4uYoLhQstau72mLgfEWcXcwsaHbYQ==
  dependencies:
    ip "^2.0.0"
@@ -922,64 +922,83 @@ socks@^2.7.1:

 sparse-bitfield@^3.0.3:
  version "3.0.3"
-  resolved "https://registry.npmjs.org/sparse-bitfield/-/sparse-bitfield-3.0.3.tgz"
+  resolved "https://registry.yarnpkg.com/sparse-bitfield/-/sparse-bitfield-3.0.3.tgz#ff4ae6e68656056ba4b3e792ab3334d38273ca11"
  integrity sha512-kvzhi7vqKTfkh0PZU+2D2PIllw2ymqJKujUcyPMd9Y75Nv4nPbGJZXNhxsgdQab2BmlDct1YnfQCguEvHr7VsQ==
  dependencies:
    memory-pager "^1.0.2"

 statuses@2.0.1:
  version "2.0.1"
-  resolved "https://registry.npmjs.org/statuses/-/statuses-2.0.1.tgz"
+  resolved "https://registry.yarnpkg.com/statuses/-/statuses-2.0.1.tgz#55cb000ccf1d48728bd23c685a063998cf1a1b63"
  integrity sha512-RwNA9Z/7PrK06rYLIzFMlaF+l73iwpzsqRIFgbMLbTcLD6cOao82TaWefPXQvB2fOC4AjuYSEndS7N/mTCbkdQ==

 streamsearch@^1.1.0:
  version "1.1.0"
-  resolved "https://registry.npmjs.org/streamsearch/-/streamsearch-1.1.0.tgz"
+  resolved "https://registry.yarnpkg.com/streamsearch/-/streamsearch-1.1.0.tgz#404dd1e2247ca94af554e841a8ef0eaa238da764"
  integrity sha512-Mcc5wHehp9aXz1ax6bZUyY5afg9u2rv5cqQI3mRrYkGC8rW2hM02jWuwjtL++LS5qinSyhj2QfLyNsuc+VsExg==

 string_decoder@~1.1.1:
  version "1.1.1"
-  resolved "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz"
+  resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.1.1.tgz#9cf1611ba62685d7030ae9e4ba34149c3af03fc8"
  integrity sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==
  dependencies:
    safe-buffer "~5.1.0"

+strip-ansi@^3.0.0:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-3.0.1.tgz#6a385fb8853d952d5ff05d0e8aaf94278dc63dcf"
+  integrity sha512-VhumSSbBqDTP8p2ZLKj40UjBCV4+v8bUSEpUb4KjRgWk9pbqGF4REFj6KEagidb2f/M6AzC0EmFyDNGaw9OCzg==
+  dependencies:
+    ansi-regex "^2.0.0"
+
+supports-color@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-2.0.0.tgz#535d045ce6b6363fa40117084629995e9df324c7"
+  integrity sha512-KKNVtd6pCYgPIKU4cp2733HWYCpplQhddZLBUryaAHou723x+FRzQ5Df824Fj+IyyuiQTRoub4SnIFfIcrp70g==
+
 supports-color@^5.5.0:
  version "5.5.0"
-  resolved "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz"
+  resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-5.5.0.tgz#e2e69a44ac8772f78a1ec0b35b689df6530efc8f"
  integrity sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==
  dependencies:
    has-flag "^3.0.0"

 to-regex-range@^5.0.1:
  version "5.0.1"
-  resolved "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz"
+  resolved "https://registry.yarnpkg.com/to-regex-range/-/to-regex-range-5.0.1.tgz#1648c44aae7c8d988a326018ed72f5b4dd0392e4"
  integrity sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==
  dependencies:
    is-number "^7.0.0"

 toidentifier@1.0.1:
  version "1.0.1"
-  resolved "https://registry.npmjs.org/toidentifier/-/toidentifier-1.0.1.tgz"
+  resolved "https://registry.yarnpkg.com/toidentifier/-/toidentifier-1.0.1.tgz#3be34321a88a820ed1bd80dfaa33e479fbb8dd35"
  integrity sha512-o5sSPKEkg/DIQNmH43V0/uerLrpzVedkUh8tGNvaeXpfpuwjKenlSox/2O/BTlZUtEe+JG7s5YhEz608PlAHRA==

+torch@^0.2.7:
+  version "0.2.7"
+  resolved "https://registry.yarnpkg.com/torch/-/torch-0.2.7.tgz#ac4bc487e988ee582b383ece48fe0169e95443ad"
+  integrity sha512-yTv7qWKGg00hMDv0pyBgRjubbf4eygzzrjKPKRC9rbPCKBF0jd+cxnzIoN+pCHgGf2EQbd0jGyy1X7h5BIqjEA==
+  dependencies:
+    chalk "^1.1.3"
+
 touch@^3.1.0:
  version "3.1.0"
-  resolved "https://registry.npmjs.org/touch/-/touch-3.1.0.tgz"
+  resolved "https://registry.yarnpkg.com/touch/-/touch-3.1.0.tgz#fe365f5f75ec9ed4e56825e0bb76d24ab74af83b"
  integrity sha512-WBx8Uy5TLtOSRtIq+M03/sKDrXCLHxwDcquSP2c43Le03/9serjQBIztjRz6FkJez9D/hleyAXTBGLwwZUw9lA==
  dependencies:
    nopt "~1.0.10"

 tr46@^3.0.0:
  version "3.0.0"
-  resolved "https://registry.npmjs.org/tr46/-/tr46-3.0.0.tgz"
+  resolved "https://registry.yarnpkg.com/tr46/-/tr46-3.0.0.tgz#555c4e297a950617e8eeddef633c87d4d9d6cbf9"
  integrity sha512-l7FvfAHlcmulp8kr+flpQZmVwtu7nfRV7NZujtN0OqES8EL4O4e0qqzL0DC5gAvx/ZC/9lk6rhcUwYvkBnBnYA==
  dependencies:
    punycode "^2.1.1"

 type-is@^1.6.4, type-is@~1.6.18:
  version "1.6.18"
-  resolved "https://registry.npmjs.org/type-is/-/type-is-1.6.18.tgz"
+  resolved "https://registry.yarnpkg.com/type-is/-/type-is-1.6.18.tgz#4e552cd05df09467dcbc4ef739de89f2cf37c131"
  integrity sha512-TkRKr9sUTxEH8MdfuCSP7VizJyzRNMjj2J2do2Jr3Kym598JVdEksuzPQCnlFPW4ky9Q+iA+ma9BGm06XQBy8g==
  dependencies:
    media-typer "0.3.0"
@@ -987,47 +1006,47 @@ type-is@^1.6.4, type-is@~1.6.18:

 typedarray@^0.0.6:
  version "0.0.6"
-  resolved "https://registry.npmjs.org/typedarray/-/typedarray-0.0.6.tgz"
+  resolved "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777"
  integrity sha512-/aCDEGatGvZ2BIk+HmLf4ifCJFwvKFNb9/JeZPMulfgFracn9QFcAf5GO8B/mweUjSoblS5In0cWhqpfs/5PQA==

 undefsafe@^2.0.5:
  version "2.0.5"
-  resolved "https://registry.npmjs.org/undefsafe/-/undefsafe-2.0.5.tgz"
+  resolved "https://registry.yarnpkg.com/undefsafe/-/undefsafe-2.0.5.tgz#38733b9327bdcd226db889fb723a6efd162e6e2c"
  integrity sha512-WxONCrssBM8TSPRqN5EmsjVrsv4A8X12J4ArBiiayv3DyyG3ZlIg6yysuuSYdZsVz3TKcTg2fd//Ujd4CHV1iA==

 unpipe@1.0.0, unpipe@~1.0.0:
  version "1.0.0"
-  resolved "https://registry.npmjs.org/unpipe/-/unpipe-1.0.0.tgz"
+  resolved "https://registry.yarnpkg.com/unpipe/-/unpipe-1.0.0.tgz#b2bf4ee8514aae6165b4817829d21b2ef49904ec"
  integrity sha512-pjy2bYhSsufwWlKwPc+l3cN7+wuJlK6uz0YdJEOlQDbl6jo/YlPi4mb8agUkVC8BF7V8NuzeyPNqRksA3hztKQ==

 util-deprecate@~1.0.1:
  version "1.0.2"
-  resolved "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz"
+  resolved "https://registry.yarnpkg.com/util-deprecate/-/util-deprecate-1.0.2.tgz#450d4dc9fa70de732762fbd2d4a28981419a0ccf"
  integrity sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw==

 utils-merge@1.0.1:
  version "1.0.1"
-  resolved "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.1.tgz"
+  resolved "https://registry.yarnpkg.com/utils-merge/-/utils-merge-1.0.1.tgz#9f95710f50a267947b2ccc124741c1028427e713"
  integrity sha512-pMZTvIkT1d+TFGvDOqodOclx0QWkkgi6Tdoa8gC8ffGAAqz9pzPTZWAybbsHHoED/ztMtkv/VoYTYyShUn81hA==

 uuid@^9.0.0:
  version "9.0.0"
-  resolved "https://registry.npmjs.org/uuid/-/uuid-9.0.0.tgz"
+  resolved "https://registry.yarnpkg.com/uuid/-/uuid-9.0.0.tgz#592f550650024a38ceb0c562f2f6aa435761efb5"
  integrity sha512-MXcSTerfPa4uqyzStbRoTgt5XIe3x5+42+q1sDuy3R5MDk66URdLMOZe5aPX/SQd+kuYAh0FdP/pO28IkQyTeg==

 vary@^1, vary@~1.1.2:
  version "1.1.2"
-  resolved "https://registry.npmjs.org/vary/-/vary-1.1.2.tgz"
+  resolved "https://registry.yarnpkg.com/vary/-/vary-1.1.2.tgz#2299f02c6ded30d4a5961b0b9f74524a18f634fc"
  integrity sha512-BNGbWLfd0eUPabhkXUVm0j8uuvREyTh5ovRa/dyow/BqAbZJyC+5fU+IzQOzmAKzYqYRAISoRhdQr3eIZ/PXqg==

 webidl-conversions@^7.0.0:
  version "7.0.0"
-  resolved "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-7.0.0.tgz"
+  resolved "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-7.0.0.tgz#256b4e1882be7debbf01d05f0aa2039778ea080a"
  integrity sha512-VwddBukDzu71offAQR975unBIGqfKZpM+8ZX6ySk8nYhVoo5CYaZyzt3YBvYtRtO+aoGlqxPg/B87NGVZ/fu6g==

 whatwg-url@^11.0.0:
  version "11.0.0"
-  resolved "https://registry.npmjs.org/whatwg-url/-/whatwg-url-11.0.0.tgz"
+  resolved "https://registry.yarnpkg.com/whatwg-url/-/whatwg-url-11.0.0.tgz#0a849eebb5faf2119b901bb76fd795c2848d4018"
  integrity sha512-RKT8HExMpoYx4igMiVMY83lN6UeITKJlBQ+vR/8ZJ8OCdSiN3RwCq+9gH0+Xzj0+5IrM6i4j/6LuvzbZIQgEcQ==
  dependencies:
    tr46 "^3.0.0"
@@ -1035,10 +1054,10 @@ whatwg-url@^11.0.0:

 xtend@^4.0.0:
  version "4.0.2"
-  resolved "https://registry.npmjs.org/xtend/-/xtend-4.0.2.tgz"
+  resolved "https://registry.yarnpkg.com/xtend/-/xtend-4.0.2.tgz#bb72779f5fa465186b1f438f674fa347fdb5db54"
  integrity sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ==

 yallist@^4.0.0:
  version "4.0.0"
-  resolved "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz"
+  resolved "https://registry.yarnpkg.com/yallist/-/yallist-4.0.0.tgz#9bb92790d9c0effec63be73519e11a35019a3a72"
  integrity sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==
--- a/Project/Frontend/SignConnectPlus/src/data/curriculumLevels.ts
+++ b/Project/Frontend/SignConnectPlus/src/data/curriculumLevels.ts
+export interface CurriculumLevelsType {
+    id: number
+    code: string
+    description: string
+}
+
+// ==============================|| DATA - CURRICULUM LEVELS ||============================== //
+
+const curriculumLevels: readonly CurriculumLevelsType[] = [
+    { id: 1, code: "Level 1", description: "Preliminary" },
+    { id: 2, code: "Level 2", description: "Intermediate" },
+    { id: 3, code: "Level 3", description: "Advance" },
+];
+
+export default curriculumLevels;
--- a/Project/Frontend/SignConnectPlus/src/pages/learning-management/learning-curriculums/list/list.tsx
+++ b/Project/Frontend/SignConnectPlus/src/pages/learning-management/learning-curriculums/list/list.tsx
+import { useEffect, useState } from 'react';

 // material-ui
-
-// third-party
+import {
+    Box,
+    FormControl,
+    Grid,
+    MenuItem,
+    Pagination,
+    Select,
+    SelectChangeEvent,
+    Slide,
+    Stack,
+    Theme,
+    Typography,
+    useMediaQuery
+} from '@mui/material';

 // project import
-import MainCard from 'components/MainCard';
-import ScrollX from 'components/ScrollX';

+import usePagination from 'hooks/usePagination';
+import CurriculumCard from 'sections/learning-management/learning-curriculums/CurriculumCard';
+import EmptyCurriculumCard from 'sections/learning-management/learning-curriculums/skeleton/EmptyCurriculumCard';
+import { GlobalFilter } from 'utils/react-table';
+import { dataProps } from './types/types';

-// assets
+// types

-//types
+// assets

 // ==============================|| List ||============================== //

+const allColumns = [
+    {
+        id: 1,
+        header: 'Default'
+    },
+    {
+        id: 2,
+        header: 'Code'
+    },
+    {
+        id: 3,
+        header: 'Name'
+    },
+    {
+        id: 4,
+        header: 'Level'
+    },
+    {
+        id: 5,
+        header: 'Status'
+    }
+];
+
 const List = () => {
+    const data: dataProps[] = [
+        {
+            "_id": "1",
+            "curriculumCode": "01",
+            "curriculumLevel": 1,
+            "curriculumDescription": "This curriculum teaches basic sign language skills to help beginners communicate effectively using sign language.",
+            "curriculumName": "Learn Basic Sign Language Skills",
+            "curriculumImage": "https://drive.google.com/uc?export=view&id=1YACBlu7X-O7-DKv5DoW3AM9kgfT7Yhdc",
+            "tutorials": [],
+            "status": 1,
+            "createdAt": new Date("2023-08-30T12:00:00Z"),
+        },
+        {
+            "_id": "2",
+            "curriculumCode": "02",
+            "curriculumLevel": 2,
+            "curriculumName": "Learn Intermediate Sign Language Skills",
+            "curriculumDescription": "This curriculum focuses on building intermediate sign language skills, allowing learners to engage in more complex conversations and interactions using sign language.",
+            "curriculumImage": "https://drive.google.com/uc?export=view&id=1YACBlu7X-O7-DKv5DoW3AM9kgfT7Yhdc",
+            "tutorials": [],
+            "status": 1,
+            "createdAt": new Date("2023-08-30T12:00:00Z"),
+        },
+        {
+            "_id": "3",
+            "curriculumCode": "03",
+            "curriculumLevel": 3,
+            "curriculumName": "Learn Advance Sign Language Skills",
+            "curriculumDescription": "This curriculum is designed for those who already have a solid foundation in sign language. It covers advanced topics, nuances, and cultural aspects of sign language communication.",
+            "curriculumImage": "https://drive.google.com/uc?export=view&id=1YACBlu7X-O7-DKv5DoW3AM9kgfT7Yhdc",
+            "tutorials": [],
+            "status": 1,
+            "createdAt": new Date("2023-08-30T12:00:00Z"),
+        }
+    ]
+
+    const matchDownSM = useMediaQuery((theme: Theme) => theme.breakpoints.down('sm'));
+
+    const [sortBy, setSortBy] = useState('Default');
+    const [globalFilter, setGlobalFilter] = useState('');
+    const [curriculumCard, setCurriculumCard] = useState<dataProps[]>([]);
+    const [page, setPage] = useState(1);
+
+    const handleChange = (event: SelectChangeEvent) => {
+        setSortBy(event.target.value as string);
+    };
+
+    // search
+    useEffect(() => {
+        const newData = data.filter((value: any) => {
+            if (globalFilter) {
+                return value.curriculumName.toLowerCase().includes(globalFilter.toLowerCase());
+            } else {
+                return value;
+            }
+        });
+
+        console.log(newData.length);
+
+        setCurriculumCard(newData);
+    }, [globalFilter]);
+
+    const PER_PAGE = 6;
+
+    const count = Math.ceil(curriculumCard.length / PER_PAGE);
+    const _DATA = usePagination(curriculumCard, PER_PAGE);
+
+    const handleChangePage = (e: any, p: any) => {
+        setPage(p);
+        _DATA.jump(p);
+    };
+
+    return (
+        <>
+            <Box sx={{ position: 'relative', marginBottom: 3 }}>
+                <Stack direction="row" alignItems="center">
+                    <Stack
+                        direction={matchDownSM ? 'column' : 'row'}
+                        sx={{ width: '100%' }}
+                        spacing={1}
+                        justifyContent="space-between"
+                        alignItems="center"
+                    >
+                        {/* @ts-ignore */}
+                        <GlobalFilter preGlobalFilteredRows={data} globalFilter={globalFilter} setGlobalFilter={setGlobalFilter} />
+                        <Stack direction={matchDownSM ? 'column' : 'row'} alignItems="center" spacing={1}>
+                            <FormControl sx={{ m: 1, minWidth: 120 }}>
+                                <Select
+                                    value={sortBy}
+                                    onChange={handleChange}
+                                    displayEmpty
+                                    inputProps={{ 'aria-label': 'Without label' }}
+                                    renderValue={(selected) => {
+                                        if (!selected) {
+                                            return <Typography variant="subtitle1">Sort By</Typography>;
+                                        }
+
+                                        return <Typography variant="subtitle2">Sort by ({sortBy})</Typography>;
+                                    }}
+                                >
+                                    {allColumns.map((column) => {
                                        return (
-        <MainCard content={false}>
-            <ScrollX> 
-            </ScrollX>
-        </MainCard>
+                                            <MenuItem key={column.id} value={column.header}>
+                                                {column.header}
+                                            </MenuItem>
+                                        );
+                                    })}
+                                </Select>
+                            </FormControl>
+                        </Stack>
+                    </Stack>
+                </Stack>
+            </Box>
+            <Grid container spacing={3}>
+                {curriculumCard.length > 0 ? (
+                    _DATA
+                        .currentData()
+                        .sort(function (a: any, b: any) {
+                            if (sortBy === 'Customer Name') return a.fatherName.localeCompare(b.fatherName);
+                            if (sortBy === 'Email') return a.email.localeCompare(b.email);
+                            if (sortBy === 'Contact') return a.contact.localeCompare(b.contact);
+                            if (sortBy === 'Age') return b.age < a.age ? 1 : -1;
+                            if (sortBy === 'Country') return a.country.localeCompare(b.country);
+                            if (sortBy === 'Status') return a.status.localeCompare(b.status);
+                            return a;
+                        })
+                        .map((curriculum: dataProps, index: number) => (
+                            <Slide key={index} direction="up" in={true} timeout={50}>
+                                <Grid item xs={12} sm={6} lg={4}>
+                                    <CurriculumCard curriculum={curriculum} />
+                                </Grid>
+                            </Slide>
+                        ))
+                ) : (
+                    <EmptyCurriculumCard title={'System have no curriculums yet.'} />
+                )}
+            </Grid>
+            <Stack spacing={2} sx={{ p: 2.5 }} alignItems="flex-end">
+                <Pagination
+                    count={count}
+                    size="medium"
+                    page={page}
+                    showFirstButton
+                    showLastButton
+                    variant="combined"
+                    color="primary"
+                    onChange={handleChangePage}
+                />
+            </Stack>
+        </>
    )
 }


--- a/Project/Frontend/SignConnectPlus/src/pages/learning-management/learning-curriculums/list/types/types.tsx
+++ b/Project/Frontend/SignConnectPlus/src/pages/learning-management/learning-curriculums/list/types/types.tsx
+export interface dataProps {
+    _id: number | string | undefined;
+    curriculumCode: string;
+    curriculumLevel: number;
+    curriculumName: string;
+    curriculumDescription: string;
+    curriculumImage: string;
+    tutorials?: tutorialItemProps[];
+    status?: number;
+    createdBy?: string;
+    updatedBy?: string;
+    createdAt?: Date;
+    updatedAt?: Date;
+}
+
+export interface tutorialItemProps {
+    _id: number | string | undefined;
+    tutorialCode: string;
+    tutorialTitle: string;
+    tutorialDescription: string;
+    tutorialImage: string;
+    status?: number;
+    createdBy?: string;
+    updatedBy?: string;
+    createdAt?: Date;
+    updatedAt?: Date;
+    taskItems?: taskItemProps[]
+}
+
+export interface taskItemProps {
+    _id: number | string | undefined;
+    title: string;
+    description: string;
+    howToDo: string;
+    referenceImage: string;
+    referenceVideo: string;
+}
\ No newline at end of file
--- a/Project/Frontend/SignConnectPlus/src/pages/parameter/curriculum-management/list/list.tsx
+++ b/Project/Frontend/SignConnectPlus/src/pages/parameter/curriculum-management/list/list.tsx
@@ -157,7 +157,7 @@ const List = () => {
                }, 
                {
                    Header: 'Curriculum Name',
-                    accessor: 'curriculumName'
+                    accessor: 'curriculumTitle'
                }, 
                {
                    Header: 'Status',

--- a/Project/Frontend/SignConnectPlus/src/pages/parameter/curriculum-management/list/types/types.tsx
+++ b/Project/Frontend/SignConnectPlus/src/pages/parameter/curriculum-management/list/types/types.tsx
@@ -2,14 +2,15 @@ import { Column } from 'react-table';

 export interface dataProps {
    _id: number | string | undefined;
-    curriculumCode: String;
-    curriculumLevel: String;
-    curriculumName: String;
-    curriculumImage: String;
+    curriculumCode: string;
+    curriculumLevel: number;
+    curriculumName: string;
+    curriculumDescription: string;
+    curriculumImage: string;
    tutorials: tutorialItemProps[];
-    status: Number;
-    createdBy: String;
-    updatedBy: String;
+    status: number;
+    createdBy: string;
+    updatedBy: string;
    createdAt: Date;
    updatedAt: Date;
 }
@@ -22,26 +23,28 @@ export interface ReactTableProps {

 export interface curriculumProps {
    _id: number | string | undefined;
-    curriculumCode: String;
-    curriculumLevel: String;
-    curriculumName: String;
-    curriculumImage: String;
-    tutorials: tutorialItemProps[];
-    status: Number;
-    createdBy: String;
-    updatedBy: String;
+    curriculumCode: string;
+    curriculumLevel: number;
+    curriculumTitle: string;
+    curriculumDescription: string;
+    curriculumImage: string;
+    tutorials: string[];
+    status: number;
+    createdBy: string;
+    updatedBy: string;
    createdAt: Date;
    updatedAt: Date;
 }

 export interface tutorialItemProps {
    _id: number | string | undefined;
-    tutorialCode: String;
-    tutorialTitle: String;
-    tutorialImage: String;
-    status: Number;
-    createdBy: String;
-    updatedBy: String;
+    tutorialCode: string;
+    tutorialTitle: string;
+    tutorialDescription: string;
+    tutorialImage: string;
+    status: number;
+    createdBy: string;
+    updatedBy: string;
    createdAt: Date;
    updatedAt: Date;
    taskItems: taskItemProps[]
@@ -49,9 +52,9 @@ export interface tutorialItemProps {

 export interface taskItemProps {
    _id: number | string | undefined;
-    title: String;
-    description: String;
-    howToDo: String;
-    referenceImage: String;
-    referenceVideo: String;
+    title: string;
+    description: string;
+    howToDo: string;
+    referenceImage: string;
+    referenceVideo: string;
 }
\ No newline at end of file
--- a/Project/Frontend/SignConnectPlus/src/pages/parameter/tutorial-management/list/list.tsx
+++ b/Project/Frontend/SignConnectPlus/src/pages/parameter/tutorial-management/list/list.tsx
@@ -152,7 +152,7 @@ const List = () => {
                    accessor: 'tutorialCode'
                },
                {
-                    Header: 'Tutorial Title',
+                    Header: 'Tutorial Name',
                    accessor: 'tutorialTitle'
                },
                {

--- a/Project/Frontend/SignConnectPlus/src/pages/parameter/tutorial-management/list/types/types.tsx
+++ b/Project/Frontend/SignConnectPlus/src/pages/parameter/tutorial-management/list/types/types.tsx
@@ -2,12 +2,13 @@ import { Column } from 'react-table';

 export interface dataProps {
    _id: number | string | undefined;
-    tutorialCode: String;
-    tutorialTitle: String;
-    tutorialImage: String;
-    status: Number;
-    createdBy: String;
-    updatedBy: String;
+    tutorialCode: string;
+    tutorialTitle: string;
+    tutorialDescription: string;
+    tutorialImage: string;
+    status: number;
+    createdBy: string;
+    updatedBy: string;
    createdAt: Date;
    updatedAt: Date;
    taskItems: taskItemProps[]
@@ -21,12 +22,13 @@ export interface ReactTableProps {

 export interface tutorialProps {
    _id: number | string | undefined;
-    tutorialCode: String;
-    tutorialTitle: String;
-    tutorialImage: String;
-    status: Number;
-    createdBy: String;
-    updatedBy: String;
+    tutorialCode: string;
+    tutorialTitle: string;
+    tutorialDescription: string;
+    tutorialImage: string;
+    status: number;
+    createdBy: string;
+    updatedBy: string;
    createdAt: Date;
    updatedAt: Date;
    taskItems: taskItemProps[]
@@ -34,9 +36,9 @@ export interface tutorialProps {

 export interface taskItemProps {
    _id: number | string | undefined;
-    title: String;
-    description: String;
-    howToDo: String;
-    referenceImage: String;
-    referenceVideo: String;
+    title: string;
+    description: string;
+    howToDo: string;
+    referenceImage: string;
+    referenceVideo: string;
 }
\ No newline at end of file
--- a/Project/Frontend/SignConnectPlus/src/sections/learning-management/learning-curriculums/CurriculumCard.tsx
+++ b/Project/Frontend/SignConnectPlus/src/sections/learning-management/learning-curriculums/CurriculumCard.tsx
+import { useState } from 'react';
+
+// material-ui
+import {
+  Button,
+  Divider,
+  Fade,
+  Grid,
+  List,
+  ListItem,
+  ListItemAvatar,
+  ListItemText,
+  Menu,
+  MenuItem,
+  Stack,
+  Typography
+} from '@mui/material';
+
+// third-party
+import { PDFDownloadLink } from '@react-pdf/renderer';
+
+// project import
+import IconButton from 'components/@extended/IconButton';
+import MainCard from 'components/MainCard';
+
+// assets
+import { MoreOutlined } from '@ant-design/icons';
+import Avatar from 'components/@extended/Avatar';
+import curriculumLevels from 'data/curriculumLevels';
+
+// types
+export interface curriculumCardProps {
+  _id: number | string | undefined;
+  curriculumCode: string;
+  curriculumLevel: number;
+  curriculumName: string;
+  curriculumDescription: string;
+  curriculumImage: string;
+  tutorials?: tutorialItemProps[];
+  status?: number;
+  createdBy?: string;
+  updatedBy?: string;
+  createdAt?: Date;
+  updatedAt?: Date;
+}
+
+export interface tutorialItemProps {
+  _id: number | string | undefined;
+  tutorialCode: string;
+  tutorialTitle: string;
+  tutorialDescription: string;
+  tutorialImage: string;
+  status?: number;
+  createdBy?: string;
+  updatedBy?: string;
+  createdAt?: Date;
+  updatedAt?: Date;
+  taskItems?: taskItemProps[]
+}
+
+export interface taskItemProps {
+  _id: number | string | undefined;
+  title: string;
+  description: string;
+  howToDo: string;
+  referenceImage: string;
+  referenceVideo: string;
+}
+
+// ==============================|| CURRICULUM - CARD ||============================== //
+
+const CurriculumCard = ({ curriculum }: { curriculum: curriculumCardProps }) => {
+  // const [open, setOpen] = useState(false);
+
+  // const handleClickOpen = () => {
+  //   setOpen(true);
+  // };
+
+  // const handleClose = () => {
+  //   setOpen(false);
+  // };
+
+  const [anchorEl, setAnchorEl] = useState<null | HTMLElement>(null);
+  const openMenu = Boolean(anchorEl);
+  const handleMenuClick = (event: React.MouseEvent<HTMLElement>) => {
+    setAnchorEl(event.currentTarget);
+  };
+  const handleMenuClose = () => {
+    setAnchorEl(null);
+  };
+
+  return (
+    <>
+      <MainCard sx={{ height: 1, '& .MuiCardContent-root': { height: 1, display: 'flex', flexDirection: 'column' } }}>
+        <Grid id="print" container spacing={2.25}>
+          <Grid item xs={12}>
+            <List sx={{ width: 1, p: 0 }}>
+              <ListItem
+                disablePadding
+                secondaryAction={
+                  <IconButton edge="end" aria-label="comments" color="secondary" onClick={handleMenuClick}>
+                    <MoreOutlined style={{ fontSize: '1.15rem' }} />
+                  </IconButton>
+                }
+              >
+                <ListItemAvatar>
+                  <Avatar alt={curriculum.curriculumName!} src={curriculum.curriculumImage!} />
+                </ListItemAvatar>
+                <ListItemText
+                  primary={<Typography variant="subtitle1">{curriculum.curriculumName}</Typography>}
+                  secondary={
+                    <Typography variant="caption" color="secondary">
+                      {curriculumLevels.find(level => level.id === curriculum.curriculumLevel)?.description || ""}
+                    </Typography>
+                  }
+                />
+              </ListItem>
+            </List>
+            <Menu
+              id="fade-menu"
+              MenuListProps={{
+                'aria-labelledby': 'fade-button'
+              }}
+              anchorEl={anchorEl}
+              open={openMenu}
+              onClose={handleMenuClose}
+              TransitionComponent={Fade}
+              anchorOrigin={{
+                vertical: 'bottom',
+                horizontal: 'right'
+              }}
+              transformOrigin={{
+                vertical: 'top',
+                horizontal: 'right'
+              }}
+            >
+              <MenuItem sx={{ a: { textDecoration: 'none', color: 'inherit' } }}>
+                <PDFDownloadLink
+                  document={<></>} fileName={`${curriculum.curriculumCode}-${curriculum.curriculumName}.pdf`}
+                // document={<ListSmallCard customer={customer} />} fileName={`Customer-${customer.fatherName}.pdf`}
+                >
+                  Export PDF
+                </PDFDownloadLink>
+              </MenuItem>
+            </Menu>
+          </Grid>
+          <Grid item xs={12}>
+            <Divider />
+          </Grid>
+          <Grid item xs={12}>
+            <Typography>{curriculum.curriculumDescription}</Typography>
+          </Grid>
+          {/* <Grid item xs={12}>
+            <Grid container spacing={1}>
+              <Grid item xs={6}>
+                <List sx={{ p: 0, overflow: 'hidden', '& .MuiListItem-root': { px: 0, py: 0.5 } }}>
+                  <ListItem>
+                    <ListItemIcon>
+                      <MailOutlined />
+                    </ListItemIcon>
+                    <ListItemText primary={<Typography color="secondary">{customer.email}</Typography>} />
+                  </ListItem>
+                  <ListItem>
+                    <ListItemIcon>
+                      <PhoneOutlined />
+                    </ListItemIcon>
+                    <ListItemText
+                      primary={
+                        <Typography color="secondary">
+                          <PatternFormat displayType="text" format="+1 (###) ###-####" mask="_" defaultValue={customer.contact} />
+                        </Typography>
+                      }
+                    />
+                  </ListItem>
+                </List>
+              </Grid>
+              <Grid item xs={6}>
+                <List sx={{ p: 0, overflow: 'hidden', '& .MuiListItem-root': { px: 0, py: 0.5 } }}>
+                  <ListItem>
+                    <ListItemIcon>
+                      <EnvironmentOutlined />
+                    </ListItemIcon>
+                    <ListItemText primary={<Typography color="secondary">{customer.country}</Typography>} />
+                  </ListItem>
+                  <ListItem>
+                    <ListItemIcon>
+                      <LinkOutlined />
+                    </ListItemIcon>
+                    <ListItemText
+                      primary={
+                        <Link href="https://google.com" target="_blank" sx={{ textTransform: 'lowercase' }}>
+                          https://{customer.firstName}.en
+                        </Link>
+                      }
+                    />
+                  </ListItem>
+                </List>
+              </Grid>
+            </Grid>
+          </Grid>
+          <Grid item xs={12}>
+            <Box>
+              <Box
+                sx={{
+                  display: 'flex',
+                  flexWrap: 'wrap',
+                  listStyle: 'none',
+                  p: 0.5,
+                  m: 0
+                }}
+                component="ul"
+              >
+                {customer.skills.map((skill: string, index: number) => (
+                  <ListItem disablePadding key={index} sx={{ width: 'auto', pr: 0.75, pb: 0.75 }}>
+                    <Chip color="secondary" variant="outlined" size="small" label={skill} />
+                  </ListItem>
+                ))}
+              </Box>
+            </Box>
+          </Grid> */}
+        </Grid>
+        <Stack
+          direction="row"
+          className="hideforPDf"
+          alignItems="center"
+          spacing={1}
+          justifyContent="space-between"
+          sx={{ mt: 'auto', mb: 0, pt: 2.25 }}
+        >
+          <Typography variant="caption" color="secondary">
+            Updated in {curriculum.createdAt?.toLocaleTimeString()}
+          </Typography>
+          <Button variant="outlined" size="small" onClick={() => {
+            // handleClickOpen()
+          }}>
+            Preview
+          </Button>
+        </Stack>
+      </MainCard>
+
+      {/* edit customer dialog */}
+      {/* <CustomerPreview customer={customer} open={open} onClose={handleClose} />  */}
+    </>
+  );
+};
+
+export default CurriculumCard;
--- a/Project/Frontend/SignConnectPlus/src/sections/learning-management/learning-curriculums/skeleton/CurriculumCard.tsx
+++ b/Project/Frontend/SignConnectPlus/src/sections/learning-management/learning-curriculums/skeleton/CurriculumCard.tsx
+// material-ui
+import { CardContent, Grid, Skeleton, Stack, Avatar } from '@mui/material';
+
+// project import
+import MainCard from 'components/MainCard';
+
+// assets
+import { ContactsOutlined } from '@ant-design/icons';
+
+// ===========================|| SKELETON - USER EMPTY CARD ||=========================== //
+
+const UserCard = () => {
+  return (
+    <MainCard
+      border={false}
+      content={false}
+      boxShadow
+      sx={{ boxShadow: `rgba(50, 50, 93, 0.25) 0px 13px 27px -5px, rgba(0, 0, 0, 0.3) 0px 8px 16px -8px`, borderRadius: 2 }}
+    >
+      <CardContent sx={{ p: 2 }}>
+        <Grid container spacing={2}>
+          <Grid item xs={12}>
+            <Stack flexDirection="row" alignItems="center">
+              <Avatar>
+                <ContactsOutlined style={{ visibility: 'inherit' }} />
+              </Avatar>
+              <Stack sx={{ width: '100%', pl: 2.5 }}>
+                <Skeleton animation={false} height={20} width="80%" />
+                <Skeleton animation={false} height={20} width="40%" />
+              </Stack>
+            </Stack>
+          </Grid>
+          <Grid item xs={12}>
+            <Skeleton animation={false} height={20} width={45} />
+            <Skeleton animation={false} height={20} />
+            <Stack direction="row" alignItems="center" spacing={1}>
+              <Skeleton animation={false} height={20} width={90} />
+              <Skeleton animation={false} height={20} width={38} />
+            </Stack>
+          </Grid>
+          <Grid item xs={12}>
+            <Stack direction="row" justifyContent="space-between" alignItems="center">
+              <Grid container spacing={1}>
+                <Grid item>
+                  <Skeleton animation={false} height={20} width={40} />
+                </Grid>
+                <Grid item>
+                  <Skeleton animation={false} height={17} width={20} />
+                </Grid>
+              </Grid>
+              <Skeleton animation={false} height={32} width={47} />
+            </Stack>
+          </Grid>
+        </Grid>
+      </CardContent>
+    </MainCard>
+  );
+};
+
+export default UserCard;
--- a/Project/Frontend/SignConnectPlus/src/sections/learning-management/learning-curriculums/skeleton/EmptyCurriculumCard.tsx
+++ b/Project/Frontend/SignConnectPlus/src/sections/learning-management/learning-curriculums/skeleton/EmptyCurriculumCard.tsx
+// material-ui
+import { Box, Grid, Stack, Typography } from '@mui/material';
+
+// project import
+import CurriculumCard from './CurriculumCard';
+
+interface Props {
+  title: string;
+}
+
+// ==============================|| EMPTY STATE ||============================== //
+
+const EmptyCurriculumCard = ({ title }: Props) => {
+  return (
+    <Grid container spacing={3}>
+      <Grid item xs={12}>
+        <Box
+          sx={{
+            p: { xs: 2.5, sm: 6 },
+            height: `calc(100vh - 192px)`,
+            display: 'flex',
+            justifyContent: 'center',
+            alignItems: 'center',
+            bgcolor: 'transparent'
+          }}
+        >
+          <Grid container direction="column" justifyContent="center" alignItems="center">
+            <Grid item>
+              <Box sx={{ ml: -9, mb: { xs: -8, sm: -5 } }}>
+                <Box sx={{ position: 'relative' }}>
+                  <CurriculumCard />
+                </Box>
+                <Box sx={{ position: 'relative', top: -120, left: 72 }}>
+                  <CurriculumCard />
+                </Box>
+              </Box>
+            </Grid>
+            <Grid item>
+              <Stack spacing={1}>
+                <Typography align="center" variant="h4">
+                  {title}
+                </Typography>
+              </Stack>
+            </Grid>
+          </Grid>
+        </Box>
+      </Grid>
+    </Grid>
+  );
+};
+
+export default EmptyCurriculumCard;
--- a/Project/Frontend/SignConnectPlus/src/sections/parameters/curriculum-management/AddEditCurriculum.tsx
+++ b/Project/Frontend/SignConnectPlus/src/sections/parameters/curriculum-management/AddEditCurriculum.tsx
@@ -2,22 +2,27 @@ import { useState } from 'react';

 // material-ui
 import {
+    Autocomplete,
+    Box,
    Button,
    DialogActions,
    DialogContent,
    DialogTitle,
    Divider,
+    FormHelperText,
    Grid,
+    InputLabel,
    Stack,
+    TextField,
    Tooltip
 } from '@mui/material';
-// import { useTheme } from '@mui/material/styles';
+import { useTheme } from '@mui/material/styles';
 import { LocalizationProvider } from '@mui/x-date-pickers';

 import { AdapterDateFns } from '@mui/x-date-pickers/AdapterDateFns';

 // third-party
-import { Form, FormikProvider, FormikValues, useFormik } from 'formik';
+import { FieldArray, Form, FormikProvider, FormikValues, useFormik } from 'formik';
 import _ from 'lodash';
 import * as Yup from 'yup';

@@ -26,6 +31,8 @@ import IconButton from 'components/@extended/IconButton';

 // assets
 import { DeleteFilled } from '@ant-design/icons';
+import MainCard from 'components/MainCard';
+import curriculumLevels, { CurriculumLevelsType } from 'data/curriculumLevels';
 import AlertCurriculumDelete from './AlertCurriculumDelete';

 // types
@@ -35,6 +42,12 @@ const getInitialValues = (curriculum: FormikValues | null) => {

    const newCurriculum = {
        _id: undefined,
+        curriculumCode: "",
+        curriculumLevel: undefined,
+        curriculumTitle: "",
+        curriculumDescription: "",
+        curriculumImage: "",
+        tutorials: [''],
    }

    if (curriculum) {
@@ -49,44 +62,23 @@ const getInitialValues = (curriculum: FormikValues | null) => {
 export interface Props {
    curriculum?: {
        _id: number | string | undefined;
-        curriculumCode: String;
-        curriculumLevel: String;
-        curriculumName: String;
-        curriculumImage: String;
-        tutorials: tutorialItemProps[];
-        status: Number;
-        createdBy: String;
-        updatedBy: String;
+        curriculumCode: string;
+        curriculumLevel: number;
+        curriculumTitle: string;
+        curriculumDescription: string;
+        curriculumImage: string;
+        tutorials: string[];
+        status: number;
+        createdBy: string;
+        updatedBy: string;
        createdAt: Date;
        updatedAt: Date;
    };
    onCancel: () => void;
 }

-export interface tutorialItemProps {
-    _id: number | string | undefined;
-    tutorialCode: String;
-    tutorialTitle: String;
-    tutorialImage: String;
-    status: Number;
-    createdBy: String;
-    updatedBy: String;
-    createdAt: Date;
-    updatedAt: Date;
-    taskItems: taskItemProps[]
-}
-
-export interface taskItemProps {
-    _id: number | string | undefined;
-    title: String;
-    description: String;
-    howToDo: String;
-    referenceImage: String;
-    referenceVideo: String;
-}
-
 const AddEditCurriculum = ({ curriculum, onCancel }: Props) => {
-    // const theme = useTheme();
+    const theme = useTheme();

    const isCreating = !curriculum;

@@ -119,8 +111,8 @@ const AddEditCurriculum = ({ curriculum, onCancel }: Props) => {
        }
    });

-    // const { errors, touched, handleSubmit, isSubmitting, getFieldProps } = formik;
-    const { handleSubmit, isSubmitting } = formik;
+    const { errors, touched, handleSubmit, isSubmitting, getFieldProps, values } = formik;
+    // const { handleSubmit, isSubmitting } = formik;

    return (
        <>
@@ -133,6 +125,161 @@ const AddEditCurriculum = ({ curriculum, onCancel }: Props) => {
                            <Grid container spacing={3}>
                                <Grid item xs={12} md={12}>
                                    <Grid container spacing={3}>
+                                        <Grid item xs={4}>
+                                            <Stack spacing={1.25}>
+                                                <InputLabel htmlFor="curriculumCode">Curriculum Code</InputLabel>
+                                                <TextField
+                                                    fullWidth
+                                                    id="curriculumCode"
+                                                    placeholder="Enter Curriculum Code"
+                                                    {...getFieldProps('curriculumCode')}
+                                                    error={Boolean(touched.curriculumCode && errors.curriculumCode)}
+                                                    helperText={touched.curriculumCode && errors.curriculumCode}
+                                                />
+                                            </Stack>
+                                        </Grid>
+                                        <Grid item xs={4}>
+                                            <Stack spacing={1.25}>
+                                                <InputLabel htmlFor="curriculumLevel">Curriculum Level</InputLabel>
+                                                <Autocomplete
+                                                    fullWidth
+                                                    id="curriculumLevel"
+                                                    value={curriculumLevels.find((option) => option.id === formik.values.curriculumLevel) || null}
+                                                    onChange={(event: any, newValue: CurriculumLevelsType | null) => {
+                                                        formik.setFieldValue('curriculumLevel', newValue?.id);
+                                                    }}
+                                                    options={curriculumLevels}
+                                                    getOptionLabel={(item) => `${item.description}`}
+                                                    renderInput={(params) => {
+                                                        return (
+                                                            <TextField
+                                                                {...params}
+                                                                placeholder="Select Curriculum Level"
+                                                                sx={{ '& .MuiAutocomplete-input.Mui-disabled': { WebkitTextFillColor: theme.palette.text.primary } }}
+                                                            />
+                                                        )
+                                                    }}
+                                                />
+                                                {formik.touched.curriculumLevel && formik.errors.curriculumLevel && (
+                                                    <FormHelperText error id="helper-text-curriculumLevel">
+                                                        {formik.errors.curriculumLevel}
+                                                    </FormHelperText>
+                                                )}
+                                            </Stack>
+                                        </Grid>
+                                        <Grid item xs={4}>
+                                            <Stack spacing={1.25}>
+                                                <InputLabel htmlFor="curriculumTitle">Curriculum Title</InputLabel>
+                                                <TextField
+                                                    fullWidth
+                                                    id="curriculumTitle"
+                                                    placeholder="Enter Curriculum Title"
+                                                    {...getFieldProps('curriculumTitle')}
+                                                    error={Boolean(touched.curriculumTitle && errors.curriculumTitle)}
+                                                    helperText={touched.curriculumTitle && errors.curriculumTitle}
+                                                />
+                                            </Stack>
+                                        </Grid>
+                                        <Grid item xs={12}>
+                                            <Stack spacing={1.25}>
+                                                <InputLabel htmlFor="curriculumImage">Curriculum Image</InputLabel>
+                                                <TextField
+                                                    fullWidth
+                                                    id="curriculumImage"
+                                                    placeholder="Enter Curriculum Image"
+                                                    {...getFieldProps('curriculumImage')}
+                                                    error={Boolean(touched.curriculumImage && errors.curriculumImage)}
+                                                    helperText={touched.curriculumImage && errors.curriculumImage}
+                                                />
+                                            </Stack>
+                                        </Grid>
+                                        <Grid item xs={12}>
+                                            <Stack spacing={1.25}>
+                                                <InputLabel htmlFor="curriculumDescription">Curriculum Description</InputLabel>
+                                                <TextField
+                                                    multiline
+                                                    rows={2}
+                                                    fullWidth
+                                                    id="curriculumDescription"
+                                                    placeholder="Enter Curriculum Description"
+                                                    {...getFieldProps('curriculumDescription')}
+                                                    error={Boolean(touched.curriculumDescription && errors.curriculumDescription)}
+                                                    helperText={touched.curriculumDescription && errors.curriculumDescription}
+                                                />
+                                            </Stack>
+                                        </Grid>
+                                        <Grid item xs={12}>
+                                            <FieldArray name="tutorials">
+                                                {({ insert, remove, push, }) => {
+                                                    return (
+                                                        <>
+                                                            <MainCard content={false} title="Tutorials" sx={{ '& .MuiInputLabel-root': { fontSize: '0.875rem' } }}
+                                                                secondary={
+                                                                    <Button
+                                                                        style={{
+                                                                            float: "right"
+                                                                        }}
+                                                                        onClick={() => push("")}
+                                                                        variant="contained"
+                                                                    >
+                                                                        Add Tutorial
+                                                                    </Button>
+                                                                }
+                                                            >
+                                                                <Box sx={{ p: 2.5 }}>
+                                                                    <Grid container spacing={3}>
+                                                                        {values.tutorials.length > 0 &&
+                                                                            values.tutorials.map((item, index) => {
+                                                                                return (
+                                                                                    <>
+                                                                                        <Grid item xs={11}> 
+                                                                                            <Stack spacing={1.25}>
+                                                                                                <InputLabel htmlFor={`tutorials.${index}`}>Tutorial</InputLabel>
+                                                                                                <Autocomplete
+                                                                                                    fullWidth
+                                                                                                    id={`tutorials.${index}`}
+                                                                                                    // value={tutorials.find((option) => option.id === formik.values.curriculumLevel) || null}
+                                                                                                    // onChange={(event: any, newValue: CurriculumLevelsType | null) => {
+                                                                                                    //     formik.setFieldValue(`tutorials.${index}`, newValue?.id);
+                                                                                                    // }}
+                                                                                                    options={[]}
+                                                                                                    // getOptionLabel={(item) => `${item.description}`}
+                                                                                                    renderInput={(params) => {
+                                                                                                        return (
+                                                                                                            <TextField
+                                                                                                                {...params}
+                                                                                                                placeholder="Select Tutorial"
+                                                                                                                sx={{ '& .MuiAutocomplete-input.Mui-disabled': { WebkitTextFillColor: theme.palette.text.primary } }}
+                                                                                                            />
+                                                                                                        )
+                                                                                                    }}
+                                                                                                />
+                                                                                                {/* {formik.touched.curriculumLevel && formik.errors.curriculumLevel && (
+                                                                                                    <FormHelperText error id="helper-text-curriculumLevel">
+                                                                                                        {formik.errors.curriculumLevel}
+                                                                                                    </FormHelperText>
+                                                                                                )} */}
+                                                                                            </Stack>
+                                                                                        </Grid>
+                                                                                        <Grid item xs={1} style={{ marginTop: "4%" }}>
+                                                                                            <Tooltip title="Delete Nutrition" placement="right-start">
+                                                                                                <IconButton onClick={() => { remove(index) }} size="large" color="error">
+                                                                                                    <DeleteFilled />
+                                                                                                </IconButton>
+                                                                                            </Tooltip>
+                                                                                        </Grid>
+                                                                                    </>
+                                                                                )
+                                                                            })
+                                                                        }
+                                                                    </Grid >
+                                                                </Box>
+                                                            </MainCard>
+                                                        </>
+                                                    )
+                                                }}
+                                            </FieldArray>
+                                        </Grid>
                                    </Grid>
                                </Grid>
                            </Grid>

--- a/Project/Frontend/SignConnectPlus/src/sections/parameters/tutorial-management/AddEditTutorial.tsx
+++ b/Project/Frontend/SignConnectPlus/src/sections/parameters/tutorial-management/AddEditTutorial.tsx
@@ -2,6 +2,9 @@ import { useState } from 'react';

 // material-ui
 import {
+    Accordion,
+    AccordionDetails,
+    Box,
    Button,
    DialogActions,
    DialogContent,
@@ -9,15 +12,16 @@ import {
    Divider,
    Grid,
    Stack,
-    Tooltip
+    Tooltip,
+    Typography
 } from '@mui/material';
-// import { useTheme } from '@mui/material/styles';
+import { useTheme } from '@mui/material/styles';
 import { LocalizationProvider } from '@mui/x-date-pickers';

 import { AdapterDateFns } from '@mui/x-date-pickers/AdapterDateFns';

 // third-party
-import { Form, FormikProvider, FormikValues, useFormik } from 'formik';
+import { FieldArray, Form, FormikProvider, FormikValues, useFormik } from 'formik';
 import _ from 'lodash';
 import * as Yup from 'yup';

@@ -26,6 +30,8 @@ import IconButton from 'components/@extended/IconButton';

 // assets
 import { DeleteFilled } from '@ant-design/icons';
+import { AccordionSummary, InputLabel, TextField } from '@mui/material';
+import MainCard from 'components/MainCard';
 import AlertTutorialDelete from './AlertTutorialDelete';

 // types
@@ -35,6 +41,20 @@ const getInitialValues = (tutorial: FormikValues | null) => {

    const newTutorial = {
        _id: undefined,
+        tutorialCode: "",
+        tutorialTitle: "",
+        tutorialImage: "",
+        tutorialDescription: "",
+        taskItems: [
+            {
+                _id: undefined,
+                title: "",
+                description: "",
+                howToDo: "",
+                referenceImage: "",
+                referenceVideo: "",
+            }
+        ]
    }

    if (tutorial) {
@@ -49,12 +69,13 @@ const getInitialValues = (tutorial: FormikValues | null) => {
 export interface Props {
    tutorial?: {
        _id: number | string | undefined
-        tutorialCode: String;
-        tutorialTitle: String;
-        tutorialImage: String;
-        status: Number;
-        createdBy: String;
-        updatedBy: String;
+        tutorialCode: string;
+        tutorialTitle: string;
+        tutorialDescription: string;
+        tutorialImage: string;
+        status: number;
+        createdBy: string;
+        updatedBy: string;
        createdAt: Date;
        updatedAt: Date;
        taskItems: taskItemProps[]
@@ -64,15 +85,15 @@ export interface Props {

 export interface taskItemProps {
    _id: number | string | undefined;
-    title: String;
-    description: String;
-    howToDo: String;
-    referenceImage: String;
-    referenceVideo: String;
+    title: string;
+    description: string;
+    howToDo: string;
+    referenceImage: string;
+    referenceVideo: string;
 }

 const AddEditTutorial = ({ tutorial, onCancel }: Props) => {
-    // const theme = useTheme();
+    const theme = useTheme();

    const isCreating = !tutorial;

@@ -105,8 +126,15 @@ const AddEditTutorial = ({ tutorial, onCancel }: Props) => {
        }
    });

-    // const { errors, touched, handleSubmit, isSubmitting, getFieldProps } = formik;
-    const { handleSubmit, isSubmitting} = formik;
+    const { errors, touched, handleSubmit, isSubmitting, getFieldProps, values } = formik;
+    // const { handleSubmit, isSubmitting } = formik;
+
+    //accordion handlers
+    const [expanded, setExpanded] = useState<string | false>('panel-1');
+
+    const handleChange = (panel: string) => (event: React.SyntheticEvent, newExpanded: boolean) => {
+        setExpanded(newExpanded ? panel : false);
+    };

    return (
        <>
@@ -119,6 +147,207 @@ const AddEditTutorial = ({ tutorial, onCancel }: Props) => {
                            <Grid container spacing={3}>
                                <Grid item xs={12} md={12}>
                                    <Grid container spacing={3}>
+                                        <Grid item xs={6}>
+                                            <Stack spacing={1.25}>
+                                                <InputLabel htmlFor="tutorialCode">Tutorial Code</InputLabel>
+                                                <TextField
+                                                    fullWidth
+                                                    id="tutorialCode"
+                                                    placeholder="Enter Tutorial Code"
+                                                    {...getFieldProps('tutorialCode')}
+                                                    error={Boolean(touched.tutorialCode && errors.tutorialCode)}
+                                                    helperText={touched.tutorialCode && errors.tutorialCode}
+                                                />
+                                            </Stack>
+                                        </Grid>
+                                        <Grid item xs={6}>
+                                            <Stack spacing={1.25}>
+                                                <InputLabel htmlFor="tutorialTitle">Tutorial Title</InputLabel>
+                                                <TextField
+                                                    fullWidth
+                                                    id="tutorialTitle"
+                                                    placeholder="Enter Tutorial Title"
+                                                    {...getFieldProps('tutorialTitle')}
+                                                    error={Boolean(touched.tutorialTitle && errors.tutorialTitle)}
+                                                    helperText={touched.tutorialTitle && errors.tutorialTitle}
+                                                />
+                                            </Stack>
+                                        </Grid>
+                                        <Grid item xs={12}>
+                                            <Stack spacing={1.25}>
+                                                <InputLabel htmlFor="tutorialImage">Tutorial Image</InputLabel>
+                                                <TextField
+                                                    fullWidth
+                                                    id="tutorialImage"
+                                                    placeholder="Enter Tutorial Image"
+                                                    {...getFieldProps('tutorialImage')}
+                                                    error={Boolean(touched.tutorialImage && errors.tutorialImage)}
+                                                    helperText={touched.tutorialImage && errors.tutorialImage}
+                                                />
+                                            </Stack>
+                                        </Grid>
+                                        <Grid item xs={12}>
+                                            <Stack spacing={1.25}>
+                                                <InputLabel htmlFor="tutorialDescription">Tutorial Description</InputLabel>
+                                                <TextField
+                                                    multiline
+                                                    rows={2}
+                                                    fullWidth
+                                                    id="tutorialDescription"
+                                                    placeholder="Enter Tutorial Description"
+                                                    {...getFieldProps('tutorialDescription')}
+                                                    error={Boolean(touched.tutorialDescription && errors.tutorialDescription)}
+                                                    helperText={touched.tutorialDescription && errors.tutorialDescription}
+                                                />
+                                            </Stack>
+                                        </Grid>
+                                        <Grid item xs={12}>
+                                            <FieldArray name="taskItems">
+                                                {({ insert, remove, push, }) => {
+                                                    return (
+                                                        <>
+                                                            <MainCard content={false} title="Tasks" sx={{ '& .MuiInputLabel-root': { fontSize: '0.875rem' } }}
+                                                                secondary={
+                                                                    <Button
+                                                                        style={{
+                                                                            float: "right"
+                                                                        }}
+                                                                        onClick={() => push(
+                                                                            {
+                                                                                _id: undefined,
+                                                                                title: "",
+                                                                                description: "",
+                                                                                howToDo: "",
+                                                                                referenceImage: "",
+                                                                                referenceVideo: ""
+                                                                            }
+                                                                        )}
+                                                                        variant="contained"
+                                                                    >
+                                                                        Add Task
+                                                                    </Button>
+                                                                }
+                                                            >
+                                                                <Box sx={{ p: 2.5 }}>
+                                                                    <Grid container spacing={3}>
+                                                                        <Grid item xs={12}>
+                                                                            {values.taskItems.length > 0 &&
+                                                                                values.taskItems.map((item, index) => {
+                                                                                    return (
+                                                                                        <>
+                                                                                            <Box
+                                                                                                sx={{
+                                                                                                    '& .MuiAccordion-root': {
+                                                                                                        borderColor: theme.palette.divider,
+                                                                                                        '& .MuiAccordionSummary-root': {
+                                                                                                            bgcolor: 'transparent',
+                                                                                                            flexDirection: 'row',
+                                                                                                            '&:focus-visible': {
+                                                                                                                bgcolor: 'primary.lighter'
+                                                                                                            }
+                                                                                                        },
+                                                                                                        '& .MuiAccordionDetails-root': {
+                                                                                                            borderColor: theme.palette.divider
+                                                                                                        },
+                                                                                                        '& .Mui-expanded': {
+                                                                                                            color: theme.palette.primary.main
+                                                                                                        }
+                                                                                                    }
+                                                                                                }}
+                                                                                            >
+                                                                                                <Accordion expanded={expanded === `panel${index}`} onChange={handleChange(`panel${index}`)}>
+                                                                                                    <AccordionSummary aria-controls={`panel${index}d-content`} id={`panel${index}d-header`}>
+                                                                                                        <Stack direction="row" spacing={1.5} alignItems="center">
+                                                                                                            <DeleteFilled
+                                                                                                                onClick={() => { remove(index) }}
+                                                                                                            />
+                                                                                                            <Typography variant="h6"> {values.taskItems[index].title ? values.taskItems[index].title : "N/A"}</Typography>
+                                                                                                        </Stack>
+                                                                                                    </AccordionSummary>
+                                                                                                    <AccordionDetails>
+                                                                                                        <Grid container spacing={2}>
+                                                                                                            <Grid item xs={12}>
+                                                                                                                <Stack spacing={1.25}>
+                                                                                                                    <InputLabel htmlFor={`taskItems.${index}.title`}>Task Title</InputLabel>
+                                                                                                                    <TextField
+                                                                                                                        fullWidth
+                                                                                                                        id={`taskItems.${index}.title`}
+                                                                                                                        placeholder="Enter Task Title"
+                                                                                                                        {...getFieldProps(`taskItems.${index}.title`)}
+                                                                                                                    // error={Boolean(touched.ingredientNutritions![index].nutritionCategory && errors.ingredientNutritions![index].nutritionCategory)}
+                                                                                                                    // helperText={touched.ingredientNutritions![index].nutritionCategory && errors.ingredientNutritions![index].nutritionCategory}
+                                                                                                                    />
+                                                                                                                </Stack>
+                                                                                                            </Grid>
+                                                                                                            <Grid item xs={6}>
+                                                                                                                <Stack spacing={1.25}>
+                                                                                                                    <InputLabel htmlFor={`taskItems.${index}.referenceImage`}>Task Reference Image</InputLabel>
+                                                                                                                    <TextField
+                                                                                                                        fullWidth
+                                                                                                                        id={`taskItems.${index}.referenceImage`}
+                                                                                                                        placeholder="Enter Task Reference Image"
+                                                                                                                        {...getFieldProps(`taskItems.${index}.referenceImage`)}
+                                                                                                                    // error={Boolean(touched.ingredientNutritions![index].nutritionCategory && errors.ingredientNutritions![index].nutritionCategory)}
+                                                                                                                    // helperText={touched.ingredientNutritions![index].nutritionCategory && errors.ingredientNutritions![index].nutritionCategory}
+                                                                                                                    />
+                                                                                                                </Stack>
+                                                                                                            </Grid>
+                                                                                                            <Grid item xs={6}>
+                                                                                                                <Stack spacing={1.25}>
+                                                                                                                    <InputLabel htmlFor={`taskItems.${index}.referenceVideo`}>Task Reference Video</InputLabel>
+                                                                                                                    <TextField
+                                                                                                                        fullWidth
+                                                                                                                        id={`taskItems.${index}.referenceVideo`}
+                                                                                                                        placeholder="Enter Task Reference Video"
+                                                                                                                        {...getFieldProps(`taskItems.${index}.referenceVideo`)}
+                                                                                                                    // error={Boolean(touched.ingredientNutritions![index].nutritionCategory && errors.ingredientNutritions![index].nutritionCategory)}
+                                                                                                                    // helperText={touched.ingredientNutritions![index].nutritionCategory && errors.ingredientNutritions![index].nutritionCategory}
+                                                                                                                    />
+                                                                                                                </Stack>
+                                                                                                            </Grid>
+                                                                                                            <Grid item xs={12}>
+                                                                                                                <Stack spacing={1.25}>
+                                                                                                                    <InputLabel htmlFor={`taskItems.${index}.description`}>Task Description</InputLabel>
+                                                                                                                    <TextField
+                                                                                                                        fullWidth
+                                                                                                                        id={`taskItems.${index}.description`}
+                                                                                                                        placeholder="Enter Task Description"
+                                                                                                                        {...getFieldProps(`taskItems.${index}.description`)}
+                                                                                                                    // error={Boolean(touched.ingredientNutritions![index].nutritionCategory && errors.ingredientNutritions![index].nutritionCategory)}
+                                                                                                                    // helperText={touched.ingredientNutritions![index].nutritionCategory && errors.ingredientNutritions![index].nutritionCategory}
+                                                                                                                    />
+                                                                                                                </Stack>
+                                                                                                            </Grid>
+                                                                                                            <Grid item xs={12}>
+                                                                                                                <Stack spacing={1.25}>
+                                                                                                                    <InputLabel htmlFor={`taskItems.${index}.howToDo`}>Task How To Do</InputLabel>
+                                                                                                                    <TextField
+                                                                                                                        fullWidth
+                                                                                                                        id={`taskItems.${index}.howToDo`}
+                                                                                                                        placeholder="Enter Task How To Do"
+                                                                                                                        {...getFieldProps(`taskItems.${index}.howToDo`)}
+                                                                                                                    // error={Boolean(touched.ingredientNutritions![index].nutritionCategory && errors.ingredientNutritions![index].nutritionCategory)}
+                                                                                                                    // helperText={touched.ingredientNutritions![index].nutritionCategory && errors.ingredientNutritions![index].nutritionCategory}
+                                                                                                                    />
+                                                                                                                </Stack>
+                                                                                                            </Grid>
+                                                                                                        </Grid>
+                                                                                                    </AccordionDetails>
+                                                                                                </Accordion>
+                                                                                            </Box>
+                                                                                        </>
+                                                                                    )
+                                                                                })
+                                                                            }
+                                                                        </Grid >
+                                                                    </Grid>
+                                                                </Box>
+                                                            </MainCard>
+                                                        </>
+                                                    )
+                                                }}
+                                            </FieldArray>
+                                        </Grid>
                                    </Grid>
                                </Grid>
                            </Grid>