diff --git a/week-2/week-2-async-js/solutions/easy/1-counter.js b/week-2/week-2-async-js/solutions/easy/1-counter.js
index da2806780..80cade2d8 100644
--- a/week-2/week-2-async-js/solutions/easy/1-counter.js
+++ b/week-2/week-2-async-js/solutions/easy/1-counter.js
@@ -1,9 +1,13 @@
let counter = 0;
+// const updateCounter = () => {
+// counter++;
+// console.log(counter);
+// };
-const updateCounter = () => {
+function updateCounter() {
counter++;
console.log(counter);
-};
+}
setInterval(updateCounter, 1000);
diff --git a/week-2/week-2-async-js/solutions/easy/2-counter.js b/week-2/week-2-async-js/solutions/easy/2-counter.js
index 95896a264..38e3a69b7 100644
--- a/week-2/week-2-async-js/solutions/easy/2-counter.js
+++ b/week-2/week-2-async-js/solutions/easy/2-counter.js
@@ -1,10 +1,16 @@
let counter = 0;
-const updateCounter = () => {
- counter++;
- console.log(counter);
+// const updateCounter = () => {
+// counter++;
+// console.log(counter);
+
+// setTimeout(updateCounter, 1000);
+// };
+function updateCounter() {
+ counter++;
+ console.log(counter);
setTimeout(updateCounter, 1000);
-};
+}
updateCounter();
diff --git a/week-2/week-2-async-js/solutions/easy/example.txt b/week-2/week-2-async-js/solutions/easy/example.txt
index a542373a3..5dd01c177 100644
--- a/week-2/week-2-async-js/solutions/easy/example.txt
+++ b/week-2/week-2-async-js/solutions/easy/example.txt
@@ -1 +1 @@
-Hello, world!!!
\ No newline at end of file
+Hello, world!
\ No newline at end of file
diff --git a/week-2/week-2-async-js/solutions/hard/1-promisify-setTimeout.js b/week-2/week-2-async-js/solutions/hard/1-promisify-setTimeout.js
index 1362af622..94f15cc7a 100644
--- a/week-2/week-2-async-js/solutions/hard/1-promisify-setTimeout.js
+++ b/week-2/week-2-async-js/solutions/hard/1-promisify-setTimeout.js
@@ -7,4 +7,14 @@ function wait(n) {
return p;
}
-module.exports = wait;
\ No newline at end of file
+module.exports = wait;
+
+function randomAfter3S(resolve, n) {
+ setTimeout(resolve, n*1000);
+}
+
+function callbackAfter3S() {
+ console.log("promise succeeded after 3 seconds!")
+}
+p = new Promise((resolve) => randomAfter3S(resolve, 3));
+p.then(callbackAfter3S);
\ No newline at end of file
diff --git a/week-2/week-2-async-js/solutions/hard/2-sleep-completely.js b/week-2/week-2-async-js/solutions/hard/2-sleep-completely.js
index 42e80a1a4..3cb056fea 100644
--- a/week-2/week-2-async-js/solutions/hard/2-sleep-completely.js
+++ b/week-2/week-2-async-js/solutions/hard/2-sleep-completely.js
@@ -6,4 +6,16 @@ function sleep(milliseconds) {
});
}
-module.exports = sleep;
\ No newline at end of file
+module.exports = sleep;
+
+function randomAfterSleep(resolve, n) {
+ let startTime = new Date().getTime();
+ while (new Date().getTime() < startTime + n*1000);
+ resolve();
+}
+
+function callbackAfterSleep() {
+ console.log("promise succeeded after sleeping for 3 seconds!")
+}
+p = new Promise((resolve) => randomAfterSleep(resolve, 3));
+p.then(callbackAfterSleep);
\ No newline at end of file
diff --git a/week-2/week-2-async-js/solutions/hard/3-promise-all.js b/week-2/week-2-async-js/solutions/hard/3-promise-all.js
index 5ca428d5a..3ce15a9a6 100644
--- a/week-2/week-2-async-js/solutions/hard/3-promise-all.js
+++ b/week-2/week-2-async-js/solutions/hard/3-promise-all.js
@@ -25,5 +25,53 @@ function wait1(t) {
return totalTime;
}
- module.exports = calculateTime;
-
\ No newline at end of file
+module.exports = calculateTime;
+
+
+// function randomAfter1S(resolve, n) {
+// setTimeout(resolve, n*1000);
+// }
+
+function callbackAfter1S() {
+ console.log("promise succeeded after 1 seconds!")
+}
+let p1 = new Promise((resolve) => randomAfterNS(resolve, 1));
+p1.then(callbackAfter1S);
+
+
+
+// function randomAfter2S(resolve, n) {
+// setTimeout(resolve, n*1000);
+// }
+
+function callbackAfter2S() {
+ console.log("promise succeeded after 2 seconds!")
+}
+let p2 = new Promise((resolve) => randomAfterNS(resolve, 2));
+p2.then(callbackAfter2S);
+
+
+
+// function randomAfter3S(resolve, n) {
+// setTimeout(resolve, n*1000);
+// }
+
+function callbackAfter3S() {
+ console.log("promise succeeded after 3 seconds!")
+}
+let p3 = new Promise((resolve) => randomAfterNS(resolve, 3));
+p3.then(callbackAfter3S);
+
+console.log("hello")
+
+function randomAfterNS(resolve, n) {
+ setTimeout(resolve, n*1000);
+}
+
+const startTime = Date.now();
+
+function callback() {
+ console.log("all promises succeeded after " + (Date.now() - startTime)/1000 + " seconds!")
+}
+
+Promise.all([p1, p2, p3]).then(callback);
\ No newline at end of file
diff --git a/week-2/week-2-async-js/solutions/hard/4-promise-chain.js b/week-2/week-2-async-js/solutions/hard/4-promise-chain.js
index f3608d78d..92756d918 100644
--- a/week-2/week-2-async-js/solutions/hard/4-promise-chain.js
+++ b/week-2/week-2-async-js/solutions/hard/4-promise-chain.js
@@ -32,4 +32,93 @@ function call(t1, t2, t3) {
});
}
-module.exports = calculateTime;
\ No newline at end of file
+module.exports = calculateTime;
+
+// function randomAfter1S(resolve, n) {
+// setTimeout(resolve, n*1000);
+// }
+
+function callbackAfter1S() {
+ console.log("promise succeeded after 1 seconds!")
+}
+let p1 = new Promise((resolve) => randomAfterNS(resolve, 1));
+// p1.then(callbackAfter1S);
+
+
+
+// function randomAfter2S(resolve, n) {
+// setTimeout(resolve, n*1000);
+// }
+
+function callbackAfter2S() {
+ console.log("promise succeeded after 2 seconds!")
+}
+// let p2 = new Promise((resolve) => randomAfterNS(resolve, 2));
+// p2.then(callbackAfter2S);
+
+
+
+// function randomAfter3S(resolve, n) {
+// setTimeout(resolve, n*1000);
+// }
+
+function callbackAfter3S() {
+ console.log("promise succeeded after 3 seconds!")
+}
+// let p3 = new Promise((resolve) => randomAfterNS(resolve, 3));
+// p3.then(callbackAfter3S);
+
+console.log("hello")
+
+function randomAfterNS(resolve, n) {
+ setTimeout(resolve, n*1000);
+}
+
+const startTime = Date.now();
+
+function callback() {
+ console.log("all promises succeeded after " + (Date.now() - startTime)/1000 + " seconds!")
+}
+
+p1
+ .then(() => {
+ callbackAfter1S();
+ return new Promise((resolve) => randomAfterNS(resolve, 2));
+ })
+ .then(() => {
+ callbackAfter2S();
+ return new Promise((resolve) => randomAfterNS(resolve, 3));
+ })
+ .then(() => {
+ callbackAfter3S();
+ callback();
+ });
+
+
+p1 = new Promise((resolve) => randomAfterNS(resolve, 1));
+p1.then(() => {
+ callbackAfter1S();
+ p2 = new Promise((resolve) => randomAfterNS(resolve, 2));
+ p2.then(() => {
+ callbackAfter2S();
+ p3 = new Promise((resolve) => randomAfterNS(resolve, 3));
+ p3.then(() => {
+ callbackAfter3S();
+ callback();
+ })
+ })
+ })
+
+ async function solve() {
+ await new Promise((resolve) => randomAfterNS(resolve, 1));
+ callbackAfter1S();
+ await new Promise((resolve) => randomAfterNS(resolve, 2));
+ callbackAfter2S();
+ await new Promise((resolve) => randomAfterNS(resolve, 3));
+ callbackAfter3S();
+ callback();
+ }
+
+ solve()
+
+ console.log("whatsup")
\ No newline at end of file
diff --git "a/week-3/easy/The-Pok\303\251mon/index.html" "b/week-3/easy/The-Pok\303\251mon/index.html"
new file mode 100644
index 000000000..a8a7ab2f4
--- /dev/null
+++ "b/week-3/easy/The-Pok\303\251mon/index.html"
@@ -0,0 +1,16 @@
+
+
+
+
+ index
+
+
+
+ Hello world
+ Start Pokemon
+
+
+
+
+
+
\ No newline at end of file
diff --git "a/week-3/easy/The-Pok\303\251mon/script.js" "b/week-3/easy/The-Pok\303\251mon/script.js"
new file mode 100644
index 000000000..dc19e10c4
--- /dev/null
+++ "b/week-3/easy/The-Pok\303\251mon/script.js"
@@ -0,0 +1,50 @@
+let score = 0;
+
+function startPokemon() {
+ document.querySelector("#input").innerHTML = ""
+ document.querySelector("#pokemon-list").innerHTML = ""
+ document.querySelector("#input").appendChild(submitPokemonId())
+}
+
+function submitPokemonId() {
+ const div = document.createElement("div");
+ const form = document.createElement("form");
+ const label = document.createElement("label");
+ const input = document.createElement("input");
+ const button = document.createElement("button");
+ label.setAttribute("for", "pokemonId")
+ label.innerHTML = "Enter pokemon id"
+ input.setAttribute("id", "pokemonId")
+ input.setAttribute("placeholder", "Enter pokemon id")
+ button.innerHTML = "Submit"
+ button.type = "button";
+ button.addEventListener("click", () => pokemonComponent(input.value));
+ form.appendChild(label)
+ form.appendChild(input)
+ form.appendChild(button)
+ div.appendChild(form)
+ return div
+}
+
+async function pokemonComponent(id) {
+ console.log(id)
+ document.querySelector("#pokemon-list").innerHTML = ""
+ try {
+ const response = await fetch("https://pokeapi.co/api/v2/pokemon-form/" + id + "/");
+ const pokemonData = await response.json(); // <-- JSON stored here
+ const h1 = document.createElement("h1");
+ const imgFront = document.createElement("img");
+ const imgBack = document.createElement("img");
+ h1.innerHTML = pokemonData.pokemon.name;
+ imgFront.setAttribute("src", pokemonData.sprites.front_default)
+ imgBack.setAttribute("src", pokemonData.sprites.back_default)
+ document.querySelector("#pokemon-list").appendChild(h1)
+ document.querySelector("#pokemon-list").appendChild(imgFront)
+ document.querySelector("#pokemon-list").appendChild(imgBack)
+ } catch (err) {
+ console.error("Error fetching Pokémon data:", err);
+ }
+}
+
+// Attach event listener in JavaScript (module-safe)
+document.getElementById("start-btn").addEventListener("click", startPokemon);
\ No newline at end of file
diff --git a/week-3/easy/bg-color-changer/index.html b/week-3/easy/bg-color-changer/index.html
new file mode 100644
index 000000000..48a7cabae
--- /dev/null
+++ b/week-3/easy/bg-color-changer/index.html
@@ -0,0 +1,21 @@
+
+
+
+
+ index
+ Red
+ Blue
+ Green
+ hellooooo
+
+
+
+
\ No newline at end of file
diff --git a/week-3/easy/bg-color-changer/script.js b/week-3/easy/bg-color-changer/script.js
new file mode 100644
index 000000000..642b06c3c
--- /dev/null
+++ b/week-3/easy/bg-color-changer/script.js
@@ -0,0 +1,12 @@
+function changeBackground(colour) {
+ document.querySelector("body").style.backgroundColor = colour
+ render();
+}
+
+// react
+function render() {
+
+}
+
+// THIS makes the default appear immediately
+render();
\ No newline at end of file
diff --git a/week-3/easy/quiz-app/index.html b/week-3/easy/quiz-app/index.html
new file mode 100644
index 000000000..7382f4a96
--- /dev/null
+++ b/week-3/easy/quiz-app/index.html
@@ -0,0 +1,35 @@
+
+
+
+
+ index
+
+
+
+ Hello world
+
+
+ Start Quiz
+
+
+
+
+
+
\ No newline at end of file
diff --git a/week-3/easy/quiz-app/script.js b/week-3/easy/quiz-app/script.js
new file mode 100644
index 000000000..8c4ea93d6
--- /dev/null
+++ b/week-3/easy/quiz-app/script.js
@@ -0,0 +1,99 @@
+import { quizData } from "./data.js";
+
+let score = 0;
+
+function startQuiz() {
+ score = 0;
+ render(0);
+}
+
+function submitAnswer(i) {
+ calculateScore(document.getElementById(quizData[i].correct).checked)
+ i = i + 1;
+ if (i == quizData.length) {
+ document.querySelector("#quiz-list").innerHTML = "Your final score is " + score + " out of " + quizData.length;
+ }
+ else
+ render(i)
+}
+
+function calculateScore(i) {
+ score = score + i;
+ console.log("score")
+ console.log(score)
+}
+
+function quizComponent(i) {
+ const div = document.createElement("div");
+ const h1 = document.createElement("h1");
+ const form = document.createElement("form");
+ const label1 = document.createElement("label");
+ const label2 = document.createElement("label");
+ const label3 = document.createElement("label");
+ const label4 = document.createElement("label");
+ const input1 = document.createElement("input");
+ const input2 = document.createElement("input");
+ const input3 = document.createElement("input");
+ const input4 = document.createElement("input");
+ const button = document.createElement("button");
+ h1.innerHTML = quizData[i].question;
+ button.innerHTML = "Submit"
+ button.type = "button";
+ button.addEventListener("click", () => submitAnswer(i));
+
+ input1.setAttribute("type", "radio")
+ input1.setAttribute("name", "selection")
+ input1.setAttribute("value", "a")
+ input1.setAttribute("id", "a");
+
+ input2.setAttribute("type", "radio")
+ input2.setAttribute("name", "selection")
+ input2.setAttribute("value", "b")
+ input2.setAttribute("id", "b");
+
+ input3.setAttribute("type", "radio")
+ input3.setAttribute("name", "selection")
+ input3.setAttribute("value", "c")
+ input3.setAttribute("id", "c");
+
+ input4.setAttribute("type", "radio")
+ input4.setAttribute("name", "selection")
+ input4.setAttribute("value", "d")
+ input4.setAttribute("id", "d");
+
+ label1.setAttribute("for", "a")
+ label2.setAttribute("for", "b")
+ label3.setAttribute("for", "c")
+ label4.setAttribute("for", "d")
+
+ div.appendChild(h1)
+ label1.innerHTML = quizData[i].a;
+ label2.innerHTML = quizData[i].b;
+ label3.innerHTML = quizData[i].c;
+ label4.innerHTML = quizData[i].d;
+ label1.appendChild(input1)
+ label2.appendChild(input2)
+ label3.appendChild(input3)
+ label4.appendChild(input4)
+ form.appendChild(label1)
+ form.appendChild(document.createElement("br"))
+ form.appendChild(label2)
+ form.appendChild(document.createElement("br"))
+ form.appendChild(label3)
+ form.appendChild(document.createElement("br"))
+ form.appendChild(label4)
+ form.appendChild(document.createElement("br"))
+ form.appendChild(button)
+ div.appendChild(form)
+ return div
+
+}
+
+// react
+function render(i) {
+ document.querySelector("#quiz-list").innerHTML = ""
+ document.querySelector("#quiz-list").appendChild(quizComponent(i))
+}
+
+// Attach event listener in JavaScript (module-safe)
+document.getElementById("start-btn").addEventListener("click", startQuiz);
\ No newline at end of file
diff --git a/week-5/README.md b/week-5/README.md
index b447375dc..4dec5e74d 100644
--- a/week-5/README.md
+++ b/week-5/README.md
@@ -20,14 +20,16 @@ cp .env.example .env
3. run the server.
```
-npm run dev
+C:\Users\tavis\OneDrive\Desktop\cohort\assignments\week-5\solution\backend> npm run dev
```
start building.
#### Frontend Setup
- go inside week-5/frontend and run:
-
+```
+C:\Users\tavis\OneDrive\Desktop\cohort\assignments\week-5\solution\frontend> serve .
+```
### Reference UI:
diff --git a/week-5/package-lock.json b/week-5/package-lock.json
new file mode 100644
index 000000000..493386486
--- /dev/null
+++ b/week-5/package-lock.json
@@ -0,0 +1,6 @@
+{
+ "name": "week-5",
+ "lockfileVersion": 3,
+ "requires": true,
+ "packages": {}
+}
diff --git a/week-5/solution/backend/middleware/user.js b/week-5/solution/backend/middleware/user.js
index 4ed77ad15..404fa1e60 100644
--- a/week-5/solution/backend/middleware/user.js
+++ b/week-5/solution/backend/middleware/user.js
@@ -2,6 +2,12 @@ const jwt = require('jsonwebtoken');
const SECRET = process.env.SECRET || 'secret000';
const authenticateJwt = (req, res, next) => {
+ /*
+ receive req.headers from script.js (submit button of todo)
+ {
+ Authorization: "Bearer abcdefghijklmnopqrstuvwxyz" (from local storage)
+ }
+ */
const authHeader = req.headers.authorization;
if (authHeader) {
const token = authHeader.split(' ')[1];
diff --git a/week-5/solution/backend/package-lock.json b/week-5/solution/backend/package-lock.json
index 8598f9788..20c22c522 100644
--- a/week-5/solution/backend/package-lock.json
+++ b/week-5/solution/backend/package-lock.json
@@ -9,17 +9,22 @@
"version": "1.0.0",
"license": "ISC",
"dependencies": {
+ "bcrypt": "^6.0.0",
"cors": "^2.8.5",
"dotenv": "^16.4.5",
"express": "^4.21.0",
"jsonwebtoken": "^9.0.2",
- "mongoose": "^8.6.3"
+ "mongoose": "^8.20.1",
+ "zod": "^4.1.13"
+ },
+ "devDependencies": {
+ "nodemon": "^3.1.11"
}
},
"node_modules/@mongodb-js/saslprep": {
- "version": "1.1.9",
- "resolved": "https://registry.npmjs.org/@mongodb-js/saslprep/-/saslprep-1.1.9.tgz",
- "integrity": "sha512-tVkljjeEaAhCqTzajSdgbQ6gE6f3oneVwa3iXR6csiEwXXOFsiC6Uh9iAjAhXPtqa/XMDHWjjeNH/77m/Yq2dw==",
+ "version": "1.3.2",
+ "resolved": "https://registry.npmjs.org/@mongodb-js/saslprep/-/saslprep-1.3.2.tgz",
+ "integrity": "sha512-QgA5AySqB27cGTXBFmnpifAi7HxoGUeezwo6p9dI03MuDB6Pp33zgclqVb6oVK3j6I9Vesg0+oojW2XxB59SGg==",
"license": "MIT",
"dependencies": {
"sparse-bitfield": "^3.0.3"
@@ -53,12 +58,60 @@
"node": ">= 0.6"
}
},
+ "node_modules/anymatch": {
+ "version": "3.1.3",
+ "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.3.tgz",
+ "integrity": "sha512-KMReFUr0B4t+D+OBkjR3KYqvocp2XaSzO55UcB6mgQMd3KbcE+mWTyvVV7D/zsdEbNnV6acZUutkiHQXvTr1Rw==",
+ "dev": true,
+ "license": "ISC",
+ "dependencies": {
+ "normalize-path": "^3.0.0",
+ "picomatch": "^2.0.4"
+ },
+ "engines": {
+ "node": ">= 8"
+ }
+ },
"node_modules/array-flatten": {
"version": "1.1.1",
"resolved": "https://registry.npmjs.org/array-flatten/-/array-flatten-1.1.1.tgz",
"integrity": "sha512-PCVAQswWemu6UdxsDFFX/+gVeYqKAod3D3UVm91jHwynguOwAvYPhx8nNlM++NqRcK6CxxpUafjmhIdKiHibqg==",
"license": "MIT"
},
+ "node_modules/balanced-match": {
+ "version": "1.0.2",
+ "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz",
+ "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==",
+ "dev": true,
+ "license": "MIT"
+ },
+ "node_modules/bcrypt": {
+ "version": "6.0.0",
+ "resolved": "https://registry.npmjs.org/bcrypt/-/bcrypt-6.0.0.tgz",
+ "integrity": "sha512-cU8v/EGSrnH+HnxV2z0J7/blxH8gq7Xh2JFT6Aroax7UohdmiJJlxApMxtKfuI7z68NvvVcmR78k2LbT6efhRg==",
+ "hasInstallScript": true,
+ "license": "MIT",
+ "dependencies": {
+ "node-addon-api": "^8.3.0",
+ "node-gyp-build": "^4.8.4"
+ },
+ "engines": {
+ "node": ">= 18"
+ }
+ },
+ "node_modules/binary-extensions": {
+ "version": "2.3.0",
+ "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.3.0.tgz",
+ "integrity": "sha512-Ceh+7ox5qe7LJuLHoY0feh3pHuUDHAcRUeyL2VYghZwfpkNIy/+8Ocg0a3UuSoYzavmylwuLWQOf3hl0jjMMIw==",
+ "dev": true,
+ "license": "MIT",
+ "engines": {
+ "node": ">=8"
+ },
+ "funding": {
+ "url": "https://github.com/sponsors/sindresorhus"
+ }
+ },
"node_modules/body-parser": {
"version": "1.20.3",
"resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.20.3.tgz",
@@ -82,10 +135,34 @@
"npm": "1.2.8000 || >= 1.4.16"
}
},
+ "node_modules/brace-expansion": {
+ "version": "1.1.12",
+ "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.12.tgz",
+ "integrity": "sha512-9T9UjW3r0UW5c1Q7GTwllptXwhvYmEzFhzMfZ9H7FQWt+uZePjZPjBP/W1ZEyZ1twGWom5/56TF4lPcqjnDHcg==",
+ "dev": true,
+ "license": "MIT",
+ "dependencies": {
+ "balanced-match": "^1.0.0",
+ "concat-map": "0.0.1"
+ }
+ },
+ "node_modules/braces": {
+ "version": "3.0.3",
+ "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.3.tgz",
+ "integrity": "sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA==",
+ "dev": true,
+ "license": "MIT",
+ "dependencies": {
+ "fill-range": "^7.1.1"
+ },
+ "engines": {
+ "node": ">=8"
+ }
+ },
"node_modules/bson": {
- "version": "6.8.0",
- "resolved": "https://registry.npmjs.org/bson/-/bson-6.8.0.tgz",
- "integrity": "sha512-iOJg8pr7wq2tg/zSlCCHMi3hMm5JTOxLTagf3zxhcenHsFp+c6uOs6K7W5UE7A4QIJGtqh/ZovFNMP4mOPJynQ==",
+ "version": "6.10.4",
+ "resolved": "https://registry.npmjs.org/bson/-/bson-6.10.4.tgz",
+ "integrity": "sha512-WIsKqkSC0ABoBJuT1LEX+2HEvNmNKKgnTAyd0fL8qzK4SH2i9NXg+t08YtdZp/V9IZ33cxe3iV4yM0qg8lMQng==",
"license": "Apache-2.0",
"engines": {
"node": ">=16.20.1"
@@ -122,6 +199,38 @@
"url": "https://github.com/sponsors/ljharb"
}
},
+ "node_modules/chokidar": {
+ "version": "3.6.0",
+ "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.6.0.tgz",
+ "integrity": "sha512-7VT13fmjotKpGipCW9JEQAusEPE+Ei8nl6/g4FBAmIm0GOOLMua9NDDo/DWp0ZAxCr3cPq5ZpBqmPAQgDda2Pw==",
+ "dev": true,
+ "license": "MIT",
+ "dependencies": {
+ "anymatch": "~3.1.2",
+ "braces": "~3.0.2",
+ "glob-parent": "~5.1.2",
+ "is-binary-path": "~2.1.0",
+ "is-glob": "~4.0.1",
+ "normalize-path": "~3.0.0",
+ "readdirp": "~3.6.0"
+ },
+ "engines": {
+ "node": ">= 8.10.0"
+ },
+ "funding": {
+ "url": "https://paulmillr.com/funding/"
+ },
+ "optionalDependencies": {
+ "fsevents": "~2.3.2"
+ }
+ },
+ "node_modules/concat-map": {
+ "version": "0.0.1",
+ "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
+ "integrity": "sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==",
+ "dev": true,
+ "license": "MIT"
+ },
"node_modules/content-disposition": {
"version": "0.5.4",
"resolved": "https://registry.npmjs.org/content-disposition/-/content-disposition-0.5.4.tgz",
@@ -315,6 +424,19 @@
"node": ">= 0.10.0"
}
},
+ "node_modules/fill-range": {
+ "version": "7.1.1",
+ "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.1.1.tgz",
+ "integrity": "sha512-YsGpe3WHLK8ZYi4tWDg2Jy3ebRz2rXowDxnld4bkQB00cc/1Zw9AWnC0i9ztDJitivtQvaI9KaLyKrc+hBW0yg==",
+ "dev": true,
+ "license": "MIT",
+ "dependencies": {
+ "to-regex-range": "^5.0.1"
+ },
+ "engines": {
+ "node": ">=8"
+ }
+ },
"node_modules/finalhandler": {
"version": "1.3.1",
"resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.3.1.tgz",
@@ -349,6 +471,21 @@
"node": ">= 0.6"
}
},
+ "node_modules/fsevents": {
+ "version": "2.3.3",
+ "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.3.tgz",
+ "integrity": "sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==",
+ "dev": true,
+ "hasInstallScript": true,
+ "license": "MIT",
+ "optional": true,
+ "os": [
+ "darwin"
+ ],
+ "engines": {
+ "node": "^8.16.0 || ^10.6.0 || >=11.0.0"
+ }
+ },
"node_modules/function-bind": {
"version": "1.1.2",
"resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.2.tgz",
@@ -375,6 +512,19 @@
"url": "https://github.com/sponsors/ljharb"
}
},
+ "node_modules/glob-parent": {
+ "version": "5.1.2",
+ "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz",
+ "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==",
+ "dev": true,
+ "license": "ISC",
+ "dependencies": {
+ "is-glob": "^4.0.1"
+ },
+ "engines": {
+ "node": ">= 6"
+ }
+ },
"node_modules/gopd": {
"version": "1.0.1",
"resolved": "https://registry.npmjs.org/gopd/-/gopd-1.0.1.tgz",
@@ -386,6 +536,16 @@
"url": "https://github.com/sponsors/ljharb"
}
},
+ "node_modules/has-flag": {
+ "version": "3.0.0",
+ "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
+ "integrity": "sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw==",
+ "dev": true,
+ "license": "MIT",
+ "engines": {
+ "node": ">=4"
+ }
+ },
"node_modules/has-property-descriptors": {
"version": "1.0.2",
"resolved": "https://registry.npmjs.org/has-property-descriptors/-/has-property-descriptors-1.0.2.tgz",
@@ -456,6 +616,13 @@
"node": ">=0.10.0"
}
},
+ "node_modules/ignore-by-default": {
+ "version": "1.0.1",
+ "resolved": "https://registry.npmjs.org/ignore-by-default/-/ignore-by-default-1.0.1.tgz",
+ "integrity": "sha512-Ius2VYcGNk7T90CppJqcIkS5ooHUZyIQK+ClZfMfMNFEF9VSE73Fq+906u/CWu92x4gzZMWOwfFYckPObzdEbA==",
+ "dev": true,
+ "license": "ISC"
+ },
"node_modules/inherits": {
"version": "2.0.4",
"resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz",
@@ -470,6 +637,52 @@
"node": ">= 0.10"
}
},
+ "node_modules/is-binary-path": {
+ "version": "2.1.0",
+ "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-2.1.0.tgz",
+ "integrity": "sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==",
+ "dev": true,
+ "license": "MIT",
+ "dependencies": {
+ "binary-extensions": "^2.0.0"
+ },
+ "engines": {
+ "node": ">=8"
+ }
+ },
+ "node_modules/is-extglob": {
+ "version": "2.1.1",
+ "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz",
+ "integrity": "sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ==",
+ "dev": true,
+ "license": "MIT",
+ "engines": {
+ "node": ">=0.10.0"
+ }
+ },
+ "node_modules/is-glob": {
+ "version": "4.0.3",
+ "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz",
+ "integrity": "sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==",
+ "dev": true,
+ "license": "MIT",
+ "dependencies": {
+ "is-extglob": "^2.1.1"
+ },
+ "engines": {
+ "node": ">=0.10.0"
+ }
+ },
+ "node_modules/is-number": {
+ "version": "7.0.0",
+ "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz",
+ "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==",
+ "dev": true,
+ "license": "MIT",
+ "engines": {
+ "node": ">=0.12.0"
+ }
+ },
"node_modules/jsonwebtoken": {
"version": "9.0.2",
"resolved": "https://registry.npmjs.org/jsonwebtoken/-/jsonwebtoken-9.0.2.tgz",
@@ -622,26 +835,39 @@
"node": ">= 0.6"
}
},
+ "node_modules/minimatch": {
+ "version": "3.1.2",
+ "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
+ "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
+ "dev": true,
+ "license": "ISC",
+ "dependencies": {
+ "brace-expansion": "^1.1.7"
+ },
+ "engines": {
+ "node": "*"
+ }
+ },
"node_modules/mongodb": {
- "version": "6.8.0",
- "resolved": "https://registry.npmjs.org/mongodb/-/mongodb-6.8.0.tgz",
- "integrity": "sha512-HGQ9NWDle5WvwMnrvUxsFYPd3JEbqD3RgABHBQRuoCEND0qzhsd0iH5ypHsf1eJ+sXmvmyKpP+FLOKY8Il7jMw==",
+ "version": "6.20.0",
+ "resolved": "https://registry.npmjs.org/mongodb/-/mongodb-6.20.0.tgz",
+ "integrity": "sha512-Tl6MEIU3K4Rq3TSHd+sZQqRBoGlFsOgNrH5ltAcFBV62Re3Fd+FcaVf8uSEQFOJ51SDowDVttBTONMfoYWrWlQ==",
"license": "Apache-2.0",
"dependencies": {
- "@mongodb-js/saslprep": "^1.1.5",
- "bson": "^6.7.0",
- "mongodb-connection-string-url": "^3.0.0"
+ "@mongodb-js/saslprep": "^1.3.0",
+ "bson": "^6.10.4",
+ "mongodb-connection-string-url": "^3.0.2"
},
"engines": {
"node": ">=16.20.1"
},
"peerDependencies": {
"@aws-sdk/credential-providers": "^3.188.0",
- "@mongodb-js/zstd": "^1.1.0",
+ "@mongodb-js/zstd": "^1.1.0 || ^2.0.0",
"gcp-metadata": "^5.2.0",
"kerberos": "^2.0.1",
"mongodb-client-encryption": ">=6.0.0 <7",
- "snappy": "^7.2.2",
+ "snappy": "^7.3.2",
"socks": "^2.7.1"
},
"peerDependenciesMeta": {
@@ -669,23 +895,24 @@
}
},
"node_modules/mongodb-connection-string-url": {
- "version": "3.0.1",
- "resolved": "https://registry.npmjs.org/mongodb-connection-string-url/-/mongodb-connection-string-url-3.0.1.tgz",
- "integrity": "sha512-XqMGwRX0Lgn05TDB4PyG2h2kKO/FfWJyCzYQbIhXUxz7ETt0I/FqHjUeqj37irJ+Dl1ZtU82uYyj14u2XsZKfg==",
+ "version": "3.0.2",
+ "resolved": "https://registry.npmjs.org/mongodb-connection-string-url/-/mongodb-connection-string-url-3.0.2.tgz",
+ "integrity": "sha512-rMO7CGo/9BFwyZABcKAWL8UJwH/Kc2x0g72uhDWzG48URRax5TCIcJ7Rc3RZqffZzO/Gwff/jyKwCU9TN8gehA==",
"license": "Apache-2.0",
"dependencies": {
"@types/whatwg-url": "^11.0.2",
- "whatwg-url": "^13.0.0"
+ "whatwg-url": "^14.1.0 || ^13.0.0"
}
},
"node_modules/mongoose": {
- "version": "8.6.3",
- "resolved": "https://registry.npmjs.org/mongoose/-/mongoose-8.6.3.tgz",
- "integrity": "sha512-++yRmm7hjMbqVA/8WeiygTnEfrFbiy+OBjQi49GFJIvCQuSYE56myyQWo4j5hbpcHjhHQU8NukMNGTwAWFWjIw==",
+ "version": "8.20.1",
+ "resolved": "https://registry.npmjs.org/mongoose/-/mongoose-8.20.1.tgz",
+ "integrity": "sha512-G+n3maddlqkQrP1nXxsI0q20144OSo+pe+HzRRGqaC4yK3FLYKqejqB9cbIi+SX7eoRsnG23LHGYNp8n7mWL2Q==",
+ "license": "MIT",
"dependencies": {
- "bson": "^6.7.0",
+ "bson": "^6.10.4",
"kareem": "2.6.3",
- "mongodb": "6.8.0",
+ "mongodb": "~6.20.0",
"mpath": "0.9.0",
"mquery": "5.0.0",
"ms": "2.1.3",
@@ -763,6 +990,90 @@
"node": ">= 0.6"
}
},
+ "node_modules/node-addon-api": {
+ "version": "8.5.0",
+ "resolved": "https://registry.npmjs.org/node-addon-api/-/node-addon-api-8.5.0.tgz",
+ "integrity": "sha512-/bRZty2mXUIFY/xU5HLvveNHlswNJej+RnxBjOMkidWfwZzgTbPG1E3K5TOxRLOR+5hX7bSofy8yf1hZevMS8A==",
+ "license": "MIT",
+ "engines": {
+ "node": "^18 || ^20 || >= 21"
+ }
+ },
+ "node_modules/node-gyp-build": {
+ "version": "4.8.4",
+ "resolved": "https://registry.npmjs.org/node-gyp-build/-/node-gyp-build-4.8.4.tgz",
+ "integrity": "sha512-LA4ZjwlnUblHVgq0oBF3Jl/6h/Nvs5fzBLwdEF4nuxnFdsfajde4WfxtJr3CaiH+F6ewcIB/q4jQ4UzPyid+CQ==",
+ "license": "MIT",
+ "bin": {
+ "node-gyp-build": "bin.js",
+ "node-gyp-build-optional": "optional.js",
+ "node-gyp-build-test": "build-test.js"
+ }
+ },
+ "node_modules/nodemon": {
+ "version": "3.1.11",
+ "resolved": "https://registry.npmjs.org/nodemon/-/nodemon-3.1.11.tgz",
+ "integrity": "sha512-is96t8F/1//UHAjNPHpbsNY46ELPpftGUoSVNXwUfMk/qdjSylYrWSu1XavVTBOn526kFiOR733ATgNBCQyH0g==",
+ "dev": true,
+ "license": "MIT",
+ "dependencies": {
+ "chokidar": "^3.5.2",
+ "debug": "^4",
+ "ignore-by-default": "^1.0.1",
+ "minimatch": "^3.1.2",
+ "pstree.remy": "^1.1.8",
+ "semver": "^7.5.3",
+ "simple-update-notifier": "^2.0.0",
+ "supports-color": "^5.5.0",
+ "touch": "^3.1.0",
+ "undefsafe": "^2.0.5"
+ },
+ "bin": {
+ "nodemon": "bin/nodemon.js"
+ },
+ "engines": {
+ "node": ">=10"
+ },
+ "funding": {
+ "type": "opencollective",
+ "url": "https://opencollective.com/nodemon"
+ }
+ },
+ "node_modules/nodemon/node_modules/debug": {
+ "version": "4.4.3",
+ "resolved": "https://registry.npmjs.org/debug/-/debug-4.4.3.tgz",
+ "integrity": "sha512-RGwwWnwQvkVfavKVt22FGLw+xYSdzARwm0ru6DhTVA3umU5hZc28V3kO4stgYryrTlLpuvgI9GiijltAjNbcqA==",
+ "dev": true,
+ "license": "MIT",
+ "dependencies": {
+ "ms": "^2.1.3"
+ },
+ "engines": {
+ "node": ">=6.0"
+ },
+ "peerDependenciesMeta": {
+ "supports-color": {
+ "optional": true
+ }
+ }
+ },
+ "node_modules/nodemon/node_modules/ms": {
+ "version": "2.1.3",
+ "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz",
+ "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==",
+ "dev": true,
+ "license": "MIT"
+ },
+ "node_modules/normalize-path": {
+ "version": "3.0.0",
+ "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz",
+ "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==",
+ "dev": true,
+ "license": "MIT",
+ "engines": {
+ "node": ">=0.10.0"
+ }
+ },
"node_modules/object-assign": {
"version": "4.1.1",
"resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
@@ -806,6 +1117,19 @@
"resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.10.tgz",
"integrity": "sha512-7lf7qcQidTku0Gu3YDPc8DJ1q7OOucfa/BSsIwjuh56VU7katFvuM8hULfkwB3Fns/rsVF7PwPKVw1sl5KQS9w=="
},
+ "node_modules/picomatch": {
+ "version": "2.3.1",
+ "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz",
+ "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==",
+ "dev": true,
+ "license": "MIT",
+ "engines": {
+ "node": ">=8.6"
+ },
+ "funding": {
+ "url": "https://github.com/sponsors/jonschlinkert"
+ }
+ },
"node_modules/proxy-addr": {
"version": "2.0.7",
"resolved": "https://registry.npmjs.org/proxy-addr/-/proxy-addr-2.0.7.tgz",
@@ -819,6 +1143,13 @@
"node": ">= 0.10"
}
},
+ "node_modules/pstree.remy": {
+ "version": "1.1.8",
+ "resolved": "https://registry.npmjs.org/pstree.remy/-/pstree.remy-1.1.8.tgz",
+ "integrity": "sha512-77DZwxQmxKnu3aR542U+X8FypNzbfJ+C5XQDk3uWjWxn6151aIMGthWYRXTqT1E5oJvg+ljaa2OJi+VfvCOQ8w==",
+ "dev": true,
+ "license": "MIT"
+ },
"node_modules/punycode": {
"version": "2.3.1",
"resolved": "https://registry.npmjs.org/punycode/-/punycode-2.3.1.tgz",
@@ -864,6 +1195,19 @@
"node": ">= 0.8"
}
},
+ "node_modules/readdirp": {
+ "version": "3.6.0",
+ "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.6.0.tgz",
+ "integrity": "sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA==",
+ "dev": true,
+ "license": "MIT",
+ "dependencies": {
+ "picomatch": "^2.2.1"
+ },
+ "engines": {
+ "node": ">=8.10.0"
+ }
+ },
"node_modules/safe-buffer": {
"version": "5.2.1",
"resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz",
@@ -994,6 +1338,19 @@
"integrity": "sha512-Rtlj66/b0ICeFzYTuNvX/EF1igRbbnGSvEyT79McoZa/DeGhMyC5pWKOEsZKnpkqtSeovd5FL/bjHWC3CIIvCQ==",
"license": "MIT"
},
+ "node_modules/simple-update-notifier": {
+ "version": "2.0.0",
+ "resolved": "https://registry.npmjs.org/simple-update-notifier/-/simple-update-notifier-2.0.0.tgz",
+ "integrity": "sha512-a2B9Y0KlNXl9u/vsW6sTIu9vGEpfKu2wRV6l1H3XEas/0gUIzGzBoP/IouTcUQbm9JWZLH3COxyn03TYlFax6w==",
+ "dev": true,
+ "license": "MIT",
+ "dependencies": {
+ "semver": "^7.5.3"
+ },
+ "engines": {
+ "node": ">=10"
+ }
+ },
"node_modules/sparse-bitfield": {
"version": "3.0.3",
"resolved": "https://registry.npmjs.org/sparse-bitfield/-/sparse-bitfield-3.0.3.tgz",
@@ -1011,6 +1368,32 @@
"node": ">= 0.8"
}
},
+ "node_modules/supports-color": {
+ "version": "5.5.0",
+ "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
+ "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
+ "dev": true,
+ "license": "MIT",
+ "dependencies": {
+ "has-flag": "^3.0.0"
+ },
+ "engines": {
+ "node": ">=4"
+ }
+ },
+ "node_modules/to-regex-range": {
+ "version": "5.0.1",
+ "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz",
+ "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==",
+ "dev": true,
+ "license": "MIT",
+ "dependencies": {
+ "is-number": "^7.0.0"
+ },
+ "engines": {
+ "node": ">=8.0"
+ }
+ },
"node_modules/toidentifier": {
"version": "1.0.1",
"resolved": "https://registry.npmjs.org/toidentifier/-/toidentifier-1.0.1.tgz",
@@ -1019,16 +1402,26 @@
"node": ">=0.6"
}
},
+ "node_modules/touch": {
+ "version": "3.1.1",
+ "resolved": "https://registry.npmjs.org/touch/-/touch-3.1.1.tgz",
+ "integrity": "sha512-r0eojU4bI8MnHr8c5bNo7lJDdI2qXlWWJk6a9EAFG7vbhTjElYhBVS3/miuE0uOuoLdb8Mc/rVfsmm6eo5o9GA==",
+ "dev": true,
+ "license": "ISC",
+ "bin": {
+ "nodetouch": "bin/nodetouch.js"
+ }
+ },
"node_modules/tr46": {
- "version": "4.1.1",
- "resolved": "https://registry.npmjs.org/tr46/-/tr46-4.1.1.tgz",
- "integrity": "sha512-2lv/66T7e5yNyhAAC4NaKe5nVavzuGJQVVtRYLyQ2OI8tsJ61PMLlelehb0wi2Hx6+hT/OJUWZcw8MjlSRnxvw==",
+ "version": "5.1.1",
+ "resolved": "https://registry.npmjs.org/tr46/-/tr46-5.1.1.tgz",
+ "integrity": "sha512-hdF5ZgjTqgAntKkklYw0R03MG2x/bSzTtkxmIRw/sTNV8YXsCJ1tfLAX23lhxhHJlEf3CRCOCGGWw3vI3GaSPw==",
"license": "MIT",
"dependencies": {
- "punycode": "^2.3.0"
+ "punycode": "^2.3.1"
},
"engines": {
- "node": ">=14"
+ "node": ">=18"
}
},
"node_modules/type-is": {
@@ -1043,6 +1436,13 @@
"node": ">= 0.6"
}
},
+ "node_modules/undefsafe": {
+ "version": "2.0.5",
+ "resolved": "https://registry.npmjs.org/undefsafe/-/undefsafe-2.0.5.tgz",
+ "integrity": "sha512-WxONCrssBM8TSPRqN5EmsjVrsv4A8X12J4ArBiiayv3DyyG3ZlIg6yysuuSYdZsVz3TKcTg2fd//Ujd4CHV1iA==",
+ "dev": true,
+ "license": "MIT"
+ },
"node_modules/unpipe": {
"version": "1.0.0",
"resolved": "https://registry.npmjs.org/unpipe/-/unpipe-1.0.0.tgz",
@@ -1079,16 +1479,25 @@
}
},
"node_modules/whatwg-url": {
- "version": "13.0.0",
- "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-13.0.0.tgz",
- "integrity": "sha512-9WWbymnqj57+XEuqADHrCJ2eSXzn8WXIW/YSGaZtb2WKAInQ6CHfaUUcTyyver0p8BDg5StLQq8h1vtZuwmOig==",
+ "version": "14.2.0",
+ "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-14.2.0.tgz",
+ "integrity": "sha512-De72GdQZzNTUBBChsXueQUnPKDkg/5A5zp7pFDuQAj5UFoENpiACU0wlCvzpAGnTkj++ihpKwKyYewn/XNUbKw==",
"license": "MIT",
"dependencies": {
- "tr46": "^4.1.1",
+ "tr46": "^5.1.0",
"webidl-conversions": "^7.0.0"
},
"engines": {
- "node": ">=16"
+ "node": ">=18"
+ }
+ },
+ "node_modules/zod": {
+ "version": "4.1.13",
+ "resolved": "https://registry.npmjs.org/zod/-/zod-4.1.13.tgz",
+ "integrity": "sha512-AvvthqfqrAhNH9dnfmrfKzX5upOdjUVJYFqNSlkmGf64gRaTzlPwz99IHYnVs28qYAybvAlBV+H7pn0saFY4Ig==",
+ "license": "MIT",
+ "funding": {
+ "url": "https://github.com/sponsors/colinhacks"
}
}
}
diff --git a/week-5/solution/backend/package.json b/week-5/solution/backend/package.json
index 006b08316..ca7d5459b 100644
--- a/week-5/solution/backend/package.json
+++ b/week-5/solution/backend/package.json
@@ -3,17 +3,23 @@
"version": "1.0.0",
"main": "index.js",
"scripts": {
- "test": "echo \"Error: no test specified\" && exit 1"
+ "start": "node index.js",
+ "dev": "nodemon index.js"
},
"keywords": [],
"author": "",
"license": "ISC",
"description": "",
"dependencies": {
+ "bcrypt": "^6.0.0",
"cors": "^2.8.5",
"dotenv": "^16.4.5",
"express": "^4.21.0",
"jsonwebtoken": "^9.0.2",
- "mongoose": "^8.6.3"
+ "mongoose": "^8.20.1",
+ "zod": "^4.1.13"
+ },
+ "devDependencies": {
+ "nodemon": "^3.1.11"
}
}
diff --git a/week-5/solution/backend/routes/todo.js b/week-5/solution/backend/routes/todo.js
index cd8671c59..a9ed70fa7 100644
--- a/week-5/solution/backend/routes/todo.js
+++ b/week-5/solution/backend/routes/todo.js
@@ -3,11 +3,19 @@ const { Todo } = require("../db");
const { authenticateJwt } = require("../middleware/user");
const router = express.Router();
+// authenticateJwt middleware before every todo route
router.use(authenticateJwt);
router.post("/", async (req, res) => {
+ /*
+ receive req.body from script.js (submit button of todo)
+ {
+ title: "go to gym" (from todo-input input box)
+ }
+ */
const createPayload = req.body;
console.log(req.userId);
+ // req.userId from authenticateJwt middleware
if (!createPayload.title) {
return res.status(400).json({
@@ -36,6 +44,7 @@ router.post("/", async (req, res) => {
});
router.get("/", async (req, res) => {
+ // req.userId from authenticateJwt middleware
try {
const todos = await Todo.find({ userId: req.userId });
diff --git a/week-5/solution/backend/routes/user.js b/week-5/solution/backend/routes/user.js
index d058e32a7..0525cace8 100644
--- a/week-5/solution/backend/routes/user.js
+++ b/week-5/solution/backend/routes/user.js
@@ -1,40 +1,76 @@
const express = require('express');
const jwt = require('jsonwebtoken');
+const bcrypt = require('bcrypt');
+const { z } = require('zod');
const { authenticateJwt, SECRET } = require("../middleware/user");
const { User } = require("../db");
const router = express.Router();
+//const app = express()
+// app.use(express.json())
router.post('/signup', async (req, res) => {
+ const requiredBody = z.object({
+ username: z.email(),
+ password: z.string().min(3).max(30)
+ })
+ const result = requiredBody.safeParse(req.body)
+
+ if (!result.success) {
+ res.json({
+ message: "Incorrect format: " + result.error.issues[0].message
+ })
+ return
+ }
+ /*
+ receive req.body from script.js (submit button of signup)
+ {
+ username: username (from signup-username),
+ password: password (from signup-password)
+ }
+ */
const { username, password } = req.body;
+ // check if username already exists
try {
const user = await User.findOne({ username });
if (user) {
return res.status(403).json({ message: 'User already exists' });
}
- const newUser = new User({ username, password });
+ const hashedPassword = await bcrypt.hash(password, 5);
+ const newUser = new User({ username, password: hashedPassword });
await newUser.save();
+ /*
+ const user = await User.create({
+ username: username,
+ password: password
+ })
+ */
const token = jwt.sign({ userId: newUser._id }, SECRET, { expiresIn: '1h' });
res.json({ message: 'User created successfully', token });
} catch (error) {
- res.status(500).json({ message: 'Error creating user', error });
+ res.status(500).json({ message: 'Error creating user', error: error.message });
}
});
router.post('/signin', async (req, res) => {
const { username, password } = req.body;
try {
- const user = await User.findOne({ username, password });
- if (user) {
- const token = jwt.sign({ userId: user._id }, SECRET, { expiresIn: '1h' });
+ const user = await User.findOne({ username });
+ if (!user) {
+ return res.status(403).json({ message: "Invalid username" });
+ }
- res.json({ message: 'Logged in successfully', token });
- } else {
- res.status(403).json({ message: 'Invalid username or password' });
+ const isPasswordValid = await bcrypt.compare(password, user.password);
+ if (!isPasswordValid) {
+ return res.status(403).json({ message: "Invalid password" });
}
+
+ const token = jwt.sign({ userId: user._id }, SECRET, { expiresIn: "1h" });
+ res.json({ message: "Logged in successfully", token });
+
} catch (error) {
- res.status(500).json({ message: 'Error signing in', error });
+ res.status(500).json({ message: "Error signing in", error: error.message });
}
});
diff --git a/week-5/solution/frontend/index.html b/week-5/solution/frontend/index.html
index a64cb0435..ee3e65775 100644
--- a/week-5/solution/frontend/index.html
+++ b/week-5/solution/frontend/index.html
@@ -20,9 +20,16 @@ Signup
Password:
Signup
+
Already have an account? Sign In
+
@@ -34,9 +41,16 @@ Signin
Password:
Signin
+
Don't have an account? Sign Up
+
@@ -46,8 +60,10 @@ Your Todo List
Add Todo
-
-
+
+ Logout
diff --git a/week-5/solution/frontend/package-lock.json b/week-5/solution/frontend/package-lock.json
new file mode 100644
index 000000000..65e317057
--- /dev/null
+++ b/week-5/solution/frontend/package-lock.json
@@ -0,0 +1,46 @@
+{
+ "name": "frontend",
+ "lockfileVersion": 3,
+ "requires": true,
+ "packages": {
+ "": {
+ "dependencies": {
+ "bcrypt": "^6.0.0"
+ }
+ },
+ "node_modules/bcrypt": {
+ "version": "6.0.0",
+ "resolved": "https://registry.npmjs.org/bcrypt/-/bcrypt-6.0.0.tgz",
+ "integrity": "sha512-cU8v/EGSrnH+HnxV2z0J7/blxH8gq7Xh2JFT6Aroax7UohdmiJJlxApMxtKfuI7z68NvvVcmR78k2LbT6efhRg==",
+ "hasInstallScript": true,
+ "license": "MIT",
+ "dependencies": {
+ "node-addon-api": "^8.3.0",
+ "node-gyp-build": "^4.8.4"
+ },
+ "engines": {
+ "node": ">= 18"
+ }
+ },
+ "node_modules/node-addon-api": {
+ "version": "8.5.0",
+ "resolved": "https://registry.npmjs.org/node-addon-api/-/node-addon-api-8.5.0.tgz",
+ "integrity": "sha512-/bRZty2mXUIFY/xU5HLvveNHlswNJej+RnxBjOMkidWfwZzgTbPG1E3K5TOxRLOR+5hX7bSofy8yf1hZevMS8A==",
+ "license": "MIT",
+ "engines": {
+ "node": "^18 || ^20 || >= 21"
+ }
+ },
+ "node_modules/node-gyp-build": {
+ "version": "4.8.4",
+ "resolved": "https://registry.npmjs.org/node-gyp-build/-/node-gyp-build-4.8.4.tgz",
+ "integrity": "sha512-LA4ZjwlnUblHVgq0oBF3Jl/6h/Nvs5fzBLwdEF4nuxnFdsfajde4WfxtJr3CaiH+F6ewcIB/q4jQ4UzPyid+CQ==",
+ "license": "MIT",
+ "bin": {
+ "node-gyp-build": "bin.js",
+ "node-gyp-build-optional": "optional.js",
+ "node-gyp-build-test": "build-test.js"
+ }
+ }
+ }
+}
diff --git a/week-5/solution/frontend/package.json b/week-5/solution/frontend/package.json
new file mode 100644
index 000000000..8da26fb6d
--- /dev/null
+++ b/week-5/solution/frontend/package.json
@@ -0,0 +1,5 @@
+{
+ "dependencies": {
+ "bcrypt": "^6.0.0"
+ }
+}
diff --git a/week-5/solution/frontend/script.js b/week-5/solution/frontend/script.js
index 0ad89d693..c19466473 100644
--- a/week-5/solution/frontend/script.js
+++ b/week-5/solution/frontend/script.js
@@ -11,19 +11,34 @@ document.getElementById('signup-form').addEventListener('submit', async (e) => {
const password = document.getElementById('signup-password').value;
try {
- const response = await fetch('http://localhost:3000/user/signup', {
+ const response = await fetch('http://localhost:3003/user/signup', {
method: 'POST',
headers: {
'Content-Type': 'application/json',
},
body: JSON.stringify({ username, password }),
+ /*
+ send req.body to http://localhost:3003/user/signup
+ {
+ username: username (from signup-username),
+ password: password (from signup-password)
+ }
+ */
});
const result = await response.json();
+ /*
+ receive response.json() and response.status() from http://localhost:3003/user/signup
+ {
+ "message": "User created successfully/User already exists/Error creating user",
+ "token": "abcdefghijklmnopqrstuvwxyz"
+ }
+ */
isSigningUp = false;
if (response.ok) {
document.getElementById('response-message').innerText = result.message || 'Signup successful, please sign in';
document.getElementById('signup-container').style.display = 'none';
+ // The CSS property display: none; is used to completely hide an HTML element from the document.
document.getElementById('signin-container').style.display = 'block';
} else {
document.getElementById('response-message').innerText = result.message || 'Signup failed';
@@ -43,21 +58,36 @@ document.getElementById('signin-form').addEventListener('submit', async (e) => {
const password = document.getElementById('signin-password').value;
try {
- const response = await fetch('http://localhost:3000/user/signin', {
+ const response = await fetch('http://localhost:3003/user/signin', {
method: 'POST',
headers: {
'Content-Type': 'application/json',
},
body: JSON.stringify({ username, password }),
});
+ /*
+ send req.body to http://localhost:3003/user/signup
+ {
+ username: username (from signup-username),
+ password: password (from signup-password)
+ }
+ */
const result = await response.json();
+ /*
+ response.json()
+ {
+ "message": "Logged in successfully/Invalid username or password/Error signing in",
+ "token": "abcdefghijklmnopqrstuvwxyz"
+ }
+ */
if (response.ok) {
localStorage.setItem('token', result.token);
document.getElementById('signin-container').style.display = 'none';
+ // The CSS property display: none; is used to completely hide an HTML element from the document.
document.getElementById('todo-container').style.display = 'block';
document.getElementById('response-message').innerHTML =
- `Logged in successfully. Logout `;
+ `Logged in successfully.`;
loadTodos();
// Add event listener for the logout link
@@ -65,6 +95,7 @@ document.getElementById('signin-form').addEventListener('submit', async (e) => {
e.preventDefault();
localStorage.removeItem('token'); // Clear token
document.getElementById('todo-container').style.display = 'none';
+ // The CSS property display: none; is used to completely hide an HTML element from the document.
document.getElementById('signin-container').style.display = 'block';
document.getElementById('response-message').innerText = '';
});
@@ -92,8 +123,9 @@ document.getElementById('todo-form').addEventListener('submit', async (e) => {
const token = localStorage.getItem('token');
+ // router.post
try {
- const response = await fetch('http://localhost:3000/todo', {
+ const response = await fetch('http://localhost:3003/todo', {
method: 'POST',
headers: {
'Content-Type': 'application/json',
@@ -101,11 +133,31 @@ document.getElementById('todo-form').addEventListener('submit', async (e) => {
},
body: JSON.stringify({ title: todoText }),
});
+ /*
+ send req.headers to http://localhost:3003/user/todo
+ {
+ Authorization: "Bearer abcdefghijklmnopqrstuvwxyz" (from local storage)
+ }
+ send req.body to http://localhost:3003/user/todo
+ {
+ title: "go to gym" (from todo-input input box)
+ }
+ */
const result = await response.json();
+ /*
+ response.json()
+ {
+ msg: "Todo created",
+ todo: newTodo where newTodo contains {
+ title: "go to gym",
+ completed: false,
+ userId: req.userId,
+ }
+ */
isAddingTodo = false;
if (response.ok) {
- todoInput.value = '';
+ todoInput.value = ''; // clear todo input box
loadTodos();
} else {
console.error(result.msg);
@@ -120,12 +172,19 @@ document.getElementById('todo-form').addEventListener('submit', async (e) => {
async function loadTodos() {
const token = localStorage.getItem('token');
try {
- const response = await fetch('http://localhost:3000/todo', {
+ // router.get
+ const response = await fetch('http://localhost:3003/todo', {
headers: {
'Authorization': `Bearer ${token}`,
},
});
const { todos } = await response.json();
+ /*
+ response.json()
+ {
+ todos: todos
+ }
+ */
const todoList = document.getElementById('todo-list');
todoList.innerHTML = '';
@@ -158,7 +217,7 @@ async function loadTodos() {
async function completeTodo(id, completed) {
const token = localStorage.getItem('token');
try {
- await fetch(`http://localhost:3000/todo/${id}`, {
+ await fetch(`http://localhost:3003/todo/${id}`, {
method: 'PUT',
headers: {
'Content-Type': 'application/json',
@@ -166,6 +225,16 @@ async function completeTodo(id, completed) {
},
body: JSON.stringify({ completed }),
});
+ /*
+ send req.headers to http://localhost:3003/user/todo/{todo._id}
+ {
+ Authorization: "Bearer abcdefghijklmnopqrstuvwxyz" (from local storage)
+ }
+ send req.body to http://localhost:3003/user/todo/{todo._id}
+ {
+ completed: !todo.completed
+ }
+ */
loadTodos();
} catch (error) {
console.error('Error completing todo:', error);
@@ -176,11 +245,13 @@ async function completeTodo(id, completed) {
document.getElementById('show-signin').addEventListener('click', (e) => {
e.preventDefault();
document.getElementById('signup-container').style.display = 'none';
+ // The CSS property display: none; is used to completely hide an HTML element from the document.
document.getElementById('signin-container').style.display = 'block';
});
document.getElementById('show-signup').addEventListener('click', (e) => {
e.preventDefault();
document.getElementById('signin-container').style.display = 'none';
+ // The CSS property display: none; is used to completely hide an HTML element from the document.
document.getElementById('signup-container').style.display = 'block';
});
diff --git a/week-5/solution/package-lock.json b/week-5/solution/package-lock.json
new file mode 100644
index 000000000..c7fa1c889
--- /dev/null
+++ b/week-5/solution/package-lock.json
@@ -0,0 +1,6 @@
+{
+ "name": "solution",
+ "lockfileVersion": 3,
+ "requires": true,
+ "packages": {}
+}
diff --git a/week-7/client/src/App.jsx b/week-7/client/src/App.jsx
index 8cc387045..9a24d9666 100644
--- a/week-7/client/src/App.jsx
+++ b/week-7/client/src/App.jsx
@@ -1,13 +1,52 @@
-// firstly, Don't get overwhelmed and if you are then go with client-easy.
-import Home from "./pages/Home"
+import React, { useState, useEffect } from "react";
+import Home from "./pages/Home";
+import AdminHome from "./pages/AdminHome";
+
function App() {
+ const [isAdminView, setIsAdminView] = useState(false);
+
+ // Automatically set view based on login state
+ useEffect(() => {
+ const adminToken = localStorage.getItem("adminToken");
+ const userToken = localStorage.getItem("token");
+
+ if (adminToken) {
+ setIsAdminView(true); // admin logged in → show admin view
+ } else if (userToken) {
+ setIsAdminView(false); // user logged in → show user view
+ }
+ }, []); // runs only once when app loads
+
+ const toggleView = () => {
+ setIsAdminView(prev => !prev);
+ };
return (
- <>
- {/* start writing from here */}
-
+
Online Courses Platform
+
+ {/* Toggle button */}
+
+ Switch to {isAdminView ? "User" : "Admin"} View
+
+
+ {/* Render view */}
+
+
+
Login
+
+
+
+
+
+
+ Login
+
+
+ {message &&
{message}
}
+
Courses
- )
-}
+
+
Available Courses
+ {message &&
{message}
}
+
+ {courses.map(course => (
+
+
{course.title}
+
{course.description}
+
Price: ${course.price}
+ {purchased.includes(course._id) ? (
+
+ Purchased
+
+ ) : (
+
purchaseCourse(course._id)}
+ style={styles.purchaseButton}
+ >
+ Purchase
+
+ )}
+
+ ))}
+
+
Login
- )
-}
+ }
+
+ return (
+
+
Login
+
+
+
+
+
+
+ Login
+
+
+ {message &&
{message}
}
+
Register
- )
-}
+ } catch (error) {
+ setMessage(error.response?.data?.message || "Error occurred");
+ }
+ }
+
+ return (
+
+ );
+};
+
+const styles = {
+ container: {
+ display: "flex",
+ flexDirection: "column",
+ gap: "10px",
+ width: "100%",
+ marginTop: "10px",
+ },
+ input: {
+ padding: "10px",
+ border: "1px solid #ccc",
+ borderRadius: "5px",
+ },
+ button: {
+ padding: "10px",
+ background: "#4CAF50",
+ color: "white",
+ border: "none",
+ borderRadius: "5px",
+ cursor: "pointer",
+ fontWeight: "bold",
+ },
+};
-export default Register
\ No newline at end of file
+export default Register;
\ No newline at end of file
diff --git a/week-7/client/src/pages/AdminHome.jsx b/week-7/client/src/pages/AdminHome.jsx
new file mode 100644
index 000000000..d10ce15d1
--- /dev/null
+++ b/week-7/client/src/pages/AdminHome.jsx
@@ -0,0 +1,71 @@
+import React, { useState, useEffect } from "react";
+import AdminLogin from "../components/AdminLogin";
+import AdminRegister from "../components/AdminRegister";
+import AdminCourses from "../components/AdminCourses";
+
+const AdminHome = () => {
+ const [isLoggedIn, setIsLoggedIn] = useState(false);
+
+ useEffect(() => {
+ const token = localStorage.getItem("adminToken");
+ setIsLoggedIn(!!token);
+ }, []);
+ /*
+ Runs once when the component loads.
+ Looks for adminToken in localStorage.
+ If it exists → isLoggedIn = true
+ If not → isLoggedIn = false
+ */
+
+ const handleLogout = () => {
+ localStorage.removeItem("adminToken");
+ setIsLoggedIn(false);
+ };
+ /*
+ Removes the admin token from local storage.
+ Updates isLoggedIn to false, which re-renders the component and shows login/register forms again.
+ */
+
+ /*
+ Admin logged in (isLoggedIn === true):
+ Logout button
+ AdminCourses component (to manage or view courses)
+
+ Admin not logged in (isLoggedIn === false):
+ AdminRegister and AdminLogin forms side by side
+ */
+ return (
+
+
Admin Dashboard
+
+ {isLoggedIn ? (
+
+ ) : (
+
+ )}
+
Home
- )
-}
+
+
User Dashboard
+
+ {isLoggedIn ? (
+
+
+ Logout
+
+
+ ) : (
+ <>
+
+
+
+ {/* Public Courses view */}
+
+
+ )}
+
');
-
-
-// Admin routes
-app.post('/admin/signup', (req, res) => {
- // logic to sign up admin
-});
-
-app.post('/admin/login', (req, res) => {
- // logic to log in admin
-});
-
-app.post('/admin/courses', (req, res) => {
- // logic to create a course
-});
-
-app.put('/admin/courses/:courseId', (req, res) => {
- // logic to edit a course
-});
-
-app.get('/admin/courses', (req, res) => {
- // logic to get all courses
-});
-
-// User routes
-app.post('/users/signup', (req, res) => {
- // logic to sign up user
-});
+app.use("/users", userRouter);
+app.use("/admin", adminRouter);
-app.post('/users/login', (req, res) => {
- // logic to log in user
+app.listen(PORT, () => {
+ // Connect to MongoDB
+ mongoose.connect(process.env.MONGO_URI);
+ console.log(`Server running on port ${PORT}`);
});
-
-app.get('/users/courses', (req, res) => {
- // logic to list all courses
-});
-
-app.post('/users/courses/:courseId', (req, res) => {
- // logic to purchase a course
-});
-
-app.get('/users/purchasedCourses', (req, res) => {
- // logic to view purchased courses
-});
-
-app.listen(port, () => {
- console.log('Server is listening on port 3000');
-});
\ No newline at end of file