From 7d1fc8f2c3058216e971df4b9fa5a295c83f3e46 Mon Sep 17 00:00:00 2001 From: codecreator127 Date: Fri, 30 Aug 2024 17:32:12 +1200 Subject: [PATCH] chore: ran prettier and lint --- backend/src/db/daos/resourcesDao.js | 12 +++++++++--- backend/src/routes/api/navigate/group.js | 4 ++-- backend/src/routes/api/resources.js | 11 ++++++++--- frontend/src/components/ResourcesModal.jsx | 7 +++---- 4 files changed, 22 insertions(+), 12 deletions(-) diff --git a/backend/src/db/daos/resourcesDao.js b/backend/src/db/daos/resourcesDao.js index cd836bce..1a010afb 100644 --- a/backend/src/db/daos/resourcesDao.js +++ b/backend/src/db/daos/resourcesDao.js @@ -11,7 +11,7 @@ const createResource = async (type, content, name, requiredFlags) => { name, textContent: content, imageContent: "", - requiredFlags: requiredFlags, + requiredFlags, }); await dbResource.save(); break; @@ -20,7 +20,7 @@ const createResource = async (type, content, name, requiredFlags) => { name, textContent: "", imageContent: content, - requiredFlags: requiredFlags, + requiredFlags, }); await dbResource.save(); break; @@ -76,7 +76,13 @@ const removeFlag = async (groupId, flag) => { return group.currentFlags; }; -const updateResourceById = async (resourceId, name, type, content, requiredFlags) => { +const updateResourceById = async ( + resourceId, + name, + type, + content, + requiredFlags +) => { const resource = await Resource.findById(resourceId); resource.name = name; diff --git a/backend/src/routes/api/navigate/group.js b/backend/src/routes/api/navigate/group.js index 0166ef16..903d4e02 100644 --- a/backend/src/routes/api/navigate/group.js +++ b/backend/src/routes/api/navigate/group.js @@ -227,12 +227,12 @@ export const groupGetResources = async (req) => { if (flags.length > 0) { // Fetch all resources from the database const allResources = await Resource.find({}); - + // Filter resources where all requiredFlags are present in the group's current flags const matchingResources = allResources.filter((resource) => resource.requiredFlags.every((flag) => flags.includes(flag)) ); - + // Push the filtered resources to the resources array resources.push(...matchingResources); } diff --git a/backend/src/routes/api/resources.js b/backend/src/routes/api/resources.js index b86b34d5..58fe45e8 100644 --- a/backend/src/routes/api/resources.js +++ b/backend/src/routes/api/resources.js @@ -22,7 +22,7 @@ const HTTP_NOT_FOUND = 404; const HTTP_INTERNAL_SERVER_ERROR = 500; // Apply auth middleware to all routes below this point -// router.use(auth); +router.use(auth); /** * @route POST / @@ -37,7 +37,12 @@ router.post( "/", handle(async (req, res) => { const { type, content, name, requiredFlags } = req.body; - const newResource = await createResource(type, content, name, requiredFlags); + const newResource = await createResource( + type, + content, + name, + requiredFlags + ); return res.status(HTTP_CREATED).json(newResource).send(); }) ); @@ -146,7 +151,7 @@ router.delete("/group/:groupId/:flag", async (req, res) => { router.put("/:resourceId", async (req, res) => { const { resourceId } = req.params; - const { name, type, content, requiredFlags } = req.body; + const { name, type, content, requiredFlags } = req.body; if (!content || !name || !type) { return res.status(HTTP_BAD_REQUEST).send("Bad Request"); diff --git a/frontend/src/components/ResourcesModal.jsx b/frontend/src/components/ResourcesModal.jsx index 85c9e749..3ad6236a 100644 --- a/frontend/src/components/ResourcesModal.jsx +++ b/frontend/src/components/ResourcesModal.jsx @@ -19,15 +19,14 @@ function ResourcesModal({ handleClose, resources }) { ); const ResourceContent = ({ item }) => { - const hasTextContent = item.textContent?.length > 0 && item.textContent[0] !== ""; + const hasTextContent = + item.textContent?.length > 0 && item.textContent[0] !== ""; const hasImageContent = item.imageContent && item.imageContent !== ""; return (
{hasTextContent && - item.textContent.map((textItem) => ( -

{textItem}

- ))} + item.textContent.map((textItem) =>

{textItem}

)} {hasImageContent && (