🍁 Fixed: Bugs In Broadcasts (#1082)

HITK-TECH-Community · Jul 28, 2024 · 62f960e · 62f960e
1 parent 0a946e5
commit 62f960e
Show file tree

Hide file tree

Showing 4 changed files with 27 additions and 14 deletions.
diff --git a/backend/app/routes/broadcast/getBroadcasts.js b/backend/app/routes/broadcast/getBroadcasts.js
@@ -18,6 +18,7 @@ const getBroadcastsAggregate = (startIndex, match) => {
         expiresOn: 1,
         createdAt: 1,
         updatedAt: 1,
+        isApproved: 1,
         year: { $year: '$createdAt' },
         month: { $month: '$createdAt' },
       },

diff --git a/frontend/src/pages/Admin/Components/Broadcast/ManageBroadcasts/Card/Card.jsx b/frontend/src/pages/Admin/Components/Broadcast/ManageBroadcasts/Card/Card.jsx
@@ -87,8 +87,8 @@ export function Card(props) {
   const sanitizedContent = DOMPurify.sanitize(props.project.content);
 
   const truncatedContent =
-    sanitizedContent.length > 400
-      ? sanitizedContent.substring(0, 400) + "..."
+    sanitizedContent.length > 250
+      ? sanitizedContent.substring(0, 250) + "..."
       : sanitizedContent;
 
   return (
@@ -167,17 +167,16 @@ export function Card(props) {
             >
               View Details
             </button>
+
             <div className={style["button-group"]}>
-              <button
-                className={
-                  !props?.project?.isApproved
-                    ? style["button-approve"]
-                    : style["button-info"]
-                }
-                onClick={!props?.project?.isApproved && handleApprove}
-              >
-                {props?.project?.isApproved ? "Approved" : "Approve"}
-              </button>
+            {!props?.project?.isApproved && (
+                <button
+                  className={style["button-approve"]}
+                  onClick={handleApprove}
+                >
+                  Approve
+                </button>
+              )}
               <button
                 className={style["button-delete"]}
                 onClick={() => deleteCard(props.id)}

diff --git a/frontend/src/pages/Admin/Components/Broadcast/ManageBroadcasts/Card/card.module.scss b/frontend/src/pages/Admin/Components/Broadcast/ManageBroadcasts/Card/card.module.scss
@@ -116,6 +116,7 @@
   text-align: center;
   font-size: 1.2rem;
   width: 100%;
+  word-wrap: break-word;
 }
 
 .card-item-light:hover {

diff --git a/frontend/src/pages/Broadcast/Component/Carousel/Carousel.jsx b/frontend/src/pages/Broadcast/Component/Carousel/Carousel.jsx
@@ -9,6 +9,8 @@ import { Modals } from "./Modal/index.js";
 import Loader from "../../../../components/util/Loader";
 import { boardcast } from "../../../../service/Broadcast.jsx";
 import { SimpleToast } from "../../../../components/util/Toast/Toast.jsx";
+import DOMPurify from "dompurify";
+
 export function Carousel(props) {
   const head = props.head;
   let dark = props.theme;
@@ -87,7 +89,8 @@ export function Carousel(props) {
   const getData = async () => {
     setLoaded(false);
     const result = await boardcast(setToast,toast)
-    setDataa(result);
+    const approvedBroadcasts = result.filter(broadcast => broadcast.isApproved);
+    setDataa(approvedBroadcasts);
     setLoaded(true);
   }
   const handleCloseToast = (event,reason) => {
@@ -96,6 +99,14 @@ export function Carousel(props) {
     }
     setToast({ ...toast, toastStatus: false });
   };
+
+  const truncatedContent = (content, maxLength) => {
+    if (content.length > maxLength) {
+      return content.substring(0, maxLength) + '...';
+    }
+    return content;
+  };
+
   return !isLoaded ? (
     <Loader />
   ) : (
@@ -143,7 +154,8 @@ export function Carousel(props) {
               ></div>
 
               <h3 className={style["card-head"]}>{item.title}</h3>
-              <div className={style["card-text"]} dangerouslySetInnerHTML={{__html: item.content}} />
+              <div className={style["card-text"]} 
+              dangerouslySetInnerHTML={{__html: DOMPurify.sanitize(truncatedContent(item.content, 250)),}} />
             </div>
           ))}
         </OwlCarousel>