fix(articles): update notifications button

HoseaCodes · May 22, 2024 · 7fb4d13 · 7fb4d13
1 parent 8541bee
commit 7fb4d13
Show file tree

Hide file tree

Showing 2 changed files with 56 additions and 18 deletions.
diff --git a/controllers/user.js b/controllers/user.js
@@ -231,7 +231,6 @@ async function getUser(req, res) {
 
 async function updateProfile(req, res) {
   try {
-
     const originalBody = req.body;
     const {
       notifications,
@@ -242,20 +241,44 @@ async function updateProfile(req, res) {
     } = originalBody;
 
     const originalUser = await Users.findOne({ _id: req.params.id });
+
     if (notifications) {
-      const newNotifications = originalUser.notifications.concat(notifications);
-      const uniqueNotifications = [...new Set(newNotifications)];
-      await Users.findOneAndUpdate(
-        { _id: req.params.id },
-        {
-          notifications: uniqueNotifications,
-        }
+      const existingNotificationsArticle = originalUser.notifications.filter(
+        (notification) => notification !== req.params.id
       );
+      if (existingNotificationsArticle.length == 1) {
+        const removeNotificationsArticles = originalUser.notifications.filter(
+          (notification) => notification == req.params.id
+        );
+        console.log(
+          "removeNotificationsArticles",
+          req.params.id,
+          removeNotificationsArticles
+        );
+        await Users.findOneAndUpdate(
+          { _id: req.params.id },
+          {
+            notifications: removeNotificationsArticles,
+          }
+        );
+      } else {
+        const newNotifications =
+          originalUser.notifications.concat(notifications);
+        const uniqueNotifications = [...new Set(newNotifications)];
+        console.log({notifications})
+        console.log("uniqueNotifications", req.params.id, uniqueNotifications);
+        await Users.findOneAndUpdate(
+          { _id: req.params.id },
+          {
+            notifications: uniqueNotifications,
+          }
+        );
+      }
     }
-    
+
     if (favoriteArticles) {
       const newFavoriteArticles =
-      originalUser.favoriteArticles.concat(favoriteArticles);
+        originalUser.favoriteArticles.concat(favoriteArticles);
       const uniqueFavoriteArticles = [...new Set(newFavoriteArticles)];
       await Users.findOneAndUpdate(
         { _id: req.params.id },
@@ -264,7 +287,7 @@ async function updateProfile(req, res) {
         }
       );
     }
-    
+
     if (savedArticles) {
       const existingSavedArticle = originalUser.savedArticles.filter(
         (article) => article !== req.params.id
@@ -273,17 +296,18 @@ async function updateProfile(req, res) {
         const removeSavedArticles = originalUser.savedArticles.filter(
           (article) => article == req.params.id
         );
-        console.log('removeSavedArticles', req.params.id, removeSavedArticles);
+        console.log("removeSavedArticles", req.params.id, removeSavedArticles);
         await Users.findOneAndUpdate(
           { _id: req.params.id },
           {
             savedArticles: removeSavedArticles,
           }
         );
       } else {
-        const newSavedArticles = originalUser.savedArticles.concat(savedArticles);
+        const newSavedArticles =
+          originalUser.savedArticles.concat(savedArticles);
         const uniqueSavedArticles = [...new Set(newSavedArticles)];
-        console.log('uniqueSavedArticles', req.params.id, uniqueSavedArticles);
+        console.log("uniqueSavedArticles", req.params.id, uniqueSavedArticles);
         await Users.findOneAndUpdate(
           { _id: req.params.id },
           {

diff --git a/src/Components/NavBar/SideBar.jsx b/src/Components/NavBar/SideBar.jsx
@@ -7,7 +7,7 @@ import { LogoImage } from "../../Layout/Image/styledImage";
 import { StackedAlignn } from "../../Layout/Icon/styledIcons";
 import { ArticleHr } from "../../Layout/Hr/styledHr";
 import { HiOutlinePencilAlt } from "react-icons/hi";
-import { BsHouseDoor, BsBell } from "react-icons/bs";
+import { BsHouseDoor, BsBell, BsBellFill } from "react-icons/bs";
 import { MdBookmarkBorder, MdBookmark } from "react-icons/md";
 import logo from "../../Assets/Images/newLogo.png";
 import { Link } from "react-router-dom";
@@ -19,6 +19,9 @@ const SideBar = (props) => {
   const [savedArticleState, setSavedArticleState] = useState(
     props.user.savedArticles.includes(props.article._id)
   );
+  const [notifications, setNotifications] = useState(
+    props.user.notifications.includes(props.article._id)
+  );
   const param = useParams();
   const state = useContext(GlobalState);
 
@@ -34,6 +37,7 @@ const SideBar = (props) => {
 
   const handleSave = async (e) => {
     e.preventDefault();
+    alert("Start being alerted when user makes posts.");
     if (props.user) {
       await axios.put(`/api/user/${props.user._id}`, {
         savedArticles: [props.article._id],
@@ -49,11 +53,11 @@ const SideBar = (props) => {
     if (props.user) {
       console.log(props.user);
       await axios.put(`/api/user/${props.user._id}`, {
-        notifications: [props.user._id],
+        notifications: [props.article._id],
       });
+      setNotifications(!notifications);
     }
   };
-  console.log(props);
   return (
     <StyledLeftContainer>
       <JustifyContent>
@@ -65,7 +69,17 @@ const SideBar = (props) => {
         <Link to="/">
           <BsHouseDoor style={{ marginBottom: "5rem" }} />
         </Link>
-        <BsBell onClick={handleNotification} style={{ marginBottom: "5rem" }} />
+        {notifications ? (
+          <BsBellFill
+            onClick={handleNotification}
+            style={{ marginBottom: "5rem" }}
+          />
+        ) : (
+          <BsBell
+            onClick={handleNotification}
+            style={{ marginBottom: "5rem" }}
+          />
+        )}
         {!savedArticleState ? (
           <MdBookmarkBorder
             onClick={handleSave}