refactor & bug fixed

th3cyb3rhub · Oct 10, 2024 · 01a4694 · 01a4694
1 parent 95f5842
commit 01a4694
Show file tree

Hide file tree

Showing 28 changed files with 181 additions and 114 deletions.
diff --git a/jsconfig.json b/jsconfig.json
@@ -1,5 +1,5 @@
 {
     "compilerOptions": {
-        "baseUrl": "."
+        "baseUrl": ""
     }
 }
diff --git a/src/components/AIChat/AIChat.jsx b/src/components/AIChat/AIChat.jsx
@@ -70,7 +70,7 @@ const AiChat = () => {
                 {
                     headers: {
                         "Content-Type": "application/json",
-                        Authorization: `Bearer ${user.token}`,
+                        Authorization: `Bearer ${user?.token}`,
                     },
                 },
             );
@@ -109,7 +109,7 @@ const AiChat = () => {
                 {
                     headers: {
                         "Content-Type": "application/json",
-                        Authorization: `Bearer ${user.token}`,
+                        Authorization: `Bearer ${user?.token}`,
                     },
                 },
             );
@@ -144,7 +144,7 @@ const AiChat = () => {
             const response = await axios.get(`${API_BASE_URL}/get`, {
                 headers: {
                     "Content-Type": "application/json",
-                    Authorization: `Bearer ${user.token}`,
+                    Authorization: `Bearer ${user?.token}`,
                 },
             });
             setChats(response.data);
@@ -160,15 +160,15 @@ const AiChat = () => {
             const response = await axios.get(`${API_BASE_URL}/${selectedChatId}`, {
                 headers: {
                     "Content-Type": "application/json",
-                    Authorization: `Bearer ${user.token}`,
+                    Authorization: `Bearer ${user?.token}`,
                 },
             });
             setChat(response.data);
         } catch (error) {
             console.error("Error fetching chat:", error);
             setFetchError("Failed to load chat. Please try again.");
         }
-    }, [API_BASE_URL, selectedChatId, user.token]);
+    }, [API_BASE_URL, selectedChatId, user?.token]);
 
     useEffect(() => {
         if (!user) return;
@@ -203,7 +203,7 @@ const AiChat = () => {
                 {
                     headers: {
                         "Content-Type": "application/json",
-                        Authorization: `Bearer ${user.token}`,
+                        Authorization: `Bearer ${user?.token}`,
                     },
                 },
             );
@@ -225,7 +225,7 @@ const AiChat = () => {
             await axios.delete(`${API_BASE_URL}/delete/${chatId}`, {
                 headers: {
                     "Content-Type": "application/json",
-                    Authorization: `Bearer ${user.token}`,
+                    Authorization: `Bearer ${user?.token}`,
                 },
             });
 

diff --git a/src/components/Blogs/BlogCard/BlogCard.jsx b/src/components/Blogs/BlogCard/BlogCard.jsx
@@ -30,11 +30,14 @@ import { BsBookmarks, BsBookmarksFill } from "react-icons/bs";
 import { addBookmark, removeBookmark } from "src/features/bookmarks/bookmarkSlice.js";
 
 const image = "https://user-images.githubusercontent.com/44284877/210166161-ad2f71a7-df74-43b9-8330-af9740d9e8ba.png";
+const darkImage =
+    "https://thecyberhub-assets.s3.ap-south-1.amazonaws.com/thecyberhub-assets/development/blog/1727036400323.png";
 
 const BlogCard = ({ blog, bookmarks, isDashboard, user }) => {
     const dispatch = useDispatch();
     const coverImage = blog?.coverImage;
     const coverImageUrl = cdnContentImagesUrl(`/blog/${coverImage}`) || image;
+    const coverErrorImageUrl = darkImage;
 
     const userId = user?._id;
 
@@ -72,7 +75,14 @@ const BlogCard = ({ blog, bookmarks, isDashboard, user }) => {
                 <DetailsSection>
                     <BlogImageSection>
                         <RouterLink to={{ pathname: blogURL }}>
-                            <BlogCardImage src={coverImageUrl || image} alt={""} />
+                            <BlogCardImage
+                                src={coverImageUrl || image}
+                                alt="Blog Cover"
+                                onError={(e) => {
+                                    e.target.onerror = null;
+                                    e.target.src = coverErrorImageUrl;
+                                }}
+                            />
                         </RouterLink>
                         <Username> @{blog?.username}</Username>
                     </BlogImageSection>

diff --git a/src/components/Blogs/Blogs.jsx b/src/components/Blogs/Blogs.jsx
@@ -114,22 +114,24 @@ const Blogs = () => {
                                     wordWrap: "break-word",
                                 }}
                             >
-                                {categories.map((category, index) => (
-                                    <li
-                                        key={index}
-                                        onClick={() => handleCategoryClick(category)}
-                                        style={{
-                                            cursor: "pointer",
-                                            fontWeight: selectedCategory === category ? "bold" : "normal",
-                                            backgroundColor: "#1d1d1d",
-                                            padding: "0.5rem 1rem", // Use rem for padding
-                                            borderRadius: "5px",
-                                            fontSize: "1rem", // Use rem for font size
-                                        }}
-                                    >
-                                        {category}
-                                    </li>
-                                ))}
+                                {categories.map((category, index) =>
+                                    category && category.length > 0 ? (
+                                        <li
+                                            key={index}
+                                            onClick={() => handleCategoryClick(category)}
+                                            style={{
+                                                cursor: "pointer",
+                                                fontWeight: selectedCategory === category ? "bold" : "normal",
+                                                backgroundColor: "#1d1d1d",
+                                                padding: "0.5rem 1rem",
+                                                borderRadius: "5px",
+                                                fontSize: "1rem",
+                                            }}
+                                        >
+                                            {category}
+                                        </li>
+                                    ) : null,
+                                )}
                             </ul>
                         </header>
 

diff --git a/src/components/Blogs/ManageBlogs/CreateBlogV2/CreateBlogV2.jsx b/src/components/Blogs/ManageBlogs/CreateBlogV2/CreateBlogV2.jsx
@@ -29,6 +29,7 @@ import { ImageInput, useUploadImages } from "src/components/Common/ImageUpload";
 
 const MAX_IMAGE_SIZE_BYTES = 1048576;
 const CreateBlogV2 = () => {
+    const { user } = useSelector((state) => state.auth);
     const {
         images,
         imagesName,
@@ -42,10 +43,10 @@ const CreateBlogV2 = () => {
         maxImageSizeByte: MAX_IMAGE_SIZE_BYTES,
         pageName: "blog",
         requiredImageWidth: 1280,
+        user,
     });
     const dispatch = useDispatch();
     const navigate = useNavigate();
-    const { user } = useSelector((state) => state.auth);
     const [showAuthPopup, setShowAuthPopup] = useState(false);
     const {
         // blogs,

diff --git a/src/components/CaptureTheFlag/CTF.jsx b/src/components/CaptureTheFlag/CTF.jsx
@@ -1,5 +1,4 @@
-import React from // ,{useEffect, useState}
-"react";
+import React from "react"; // ,{useEffect, useState}
 import { Wrapper } from "src/components/Dashboard/Profile/ProfileElements";
 // import {getAllCTFs} from "src/features/ctf/ctfSlice";
 // import {useDispatch, useSelector} from "react-redux";
@@ -8,8 +7,8 @@ import { CTFContainer, CTFHeader, CTFHeading, Option, SearchContainer, SearchDif
 // import UnderMaintenance from "src/components/Other/UnderMaintenance/UnderMaintenance";
 // import apiStatus from "src/features/apiStatus";
 // import CtfChallenges from "./CTFCards/CtfChallenges";
-import { RankTrophy } from "src/components/Header/Navbar/NavbarElements";
-import { RouteLink } from "src/components/Common/GeneralDashboardSidebar/GeneralDashboardSidebarElements";
+// import { RankTrophy } from "src/components/Header/Navbar/NavbarElements";
+// import { RouteLink } from "src/components/Common/GeneralDashboardSidebar/GeneralDashboardSidebarElements";
 // import LoadingSpinner from "src/components/Other/MixComponents/Spinner/LoadingSpinner";
 import SearchInputBox from "src/components/Common/SearchInputBox";
 // import {Link} from "react-router-dom";
@@ -70,7 +69,7 @@ const CTF = () => {
                     <CTFHeading> Capture The Flag</CTFHeading>
                 </CTFHeader>
 
-                {/* {user && user.role === 'admin' || user.role === 'team' ? ( */}
+                {/* {user && user.role === 'admin' || user.role !== 'team' ? ( */}
                 {/*    <Link to={`create`}> */}
                 {/*        <Heading2>Create</Heading2> */}
                 {/*    </Link> */}
@@ -111,39 +110,39 @@ const CTF = () => {
                         </Select>
                     </SearchDifficulty>
 
-                    <RouteLink to="teams">
-                        <SearchDifficulty
-                            style={{
-                                display: "flex",
-                                justifyContent: "center",
-                                textDecoration: "none",
-                                gap: "5px",
-                                padding: "6px 15px 6px 10px",
-                                borderRadius: "5px",
-                                backgroundColor: "#252525",
-                            }}
-                        >
-                            <RankTrophy style={{ fontSize: "1rem" }} />
-                            <span> Teams </span>
-                        </SearchDifficulty>
-                    </RouteLink>
-
-                    <RouteLink to="/leaderboard">
-                        <SearchDifficulty
-                            style={{
-                                display: "flex",
-                                justifyContent: "center",
-                                textDecoration: "none",
-                                gap: "5px",
-                                padding: "6px 15px 6px 10px",
-                                borderRadius: "5px",
-                                backgroundColor: "#252525",
-                            }}
-                        >
-                            <RankTrophy style={{ fontSize: "1rem" }} />
-                            <span> Leaderboard </span>
-                        </SearchDifficulty>
-                    </RouteLink>
+                    {/* <RouteLink to="teams"> */}
+                    {/*    <SearchDifficulty */}
+                    {/*        style={{ */}
+                    {/*            display: "flex", */}
+                    {/*            justifyContent: "center", */}
+                    {/*            textDecoration: "none", */}
+                    {/*            gap: "5px", */}
+                    {/*            padding: "6px 15px 6px 10px", */}
+                    {/*            borderRadius: "5px", */}
+                    {/*            backgroundColor: "#252525", */}
+                    {/*        }} */}
+                    {/*    > */}
+                    {/*        <RankTrophy style={{ fontSize: "1rem" }} /> */}
+                    {/*        <span> Teams </span> */}
+                    {/*    </SearchDifficulty> */}
+                    {/* </RouteLink> */}
+                    {/**/}
+                    {/* <RouteLink to="/leaderboard"> */}
+                    {/*    <SearchDifficulty */}
+                    {/*        style={{ */}
+                    {/*            display: "flex", */}
+                    {/*            justifyContent: "center", */}
+                    {/*            textDecoration: "none", */}
+                    {/*            gap: "5px", */}
+                    {/*            padding: "6px 15px 6px 10px", */}
+                    {/*            borderRadius: "5px", */}
+                    {/*            backgroundColor: "#252525", */}
+                    {/*        }} */}
+                    {/*    > */}
+                    {/*        <RankTrophy style={{ fontSize: "1rem" }} /> */}
+                    {/*        <span> Leaderboard </span> */}
+                    {/*    </SearchDifficulty> */}
+                    {/* </RouteLink> */}
                 </SearchContainer>
 
                 <CTFHeader>

diff --git a/src/components/Common/ImageUpload/useUploadImages.jsx b/src/components/Common/ImageUpload/useUploadImages.jsx
@@ -8,10 +8,12 @@ const useUploadImages = ({
     requiredImageWidth,
     initImages = [],
     requiredImageHeight = 0,
+    user,
 }) => {
     const [images, setImages] = useState([]);
     const [imagesName, setImagesName] = useState(initImages || []);
     const [workerAction, setWorkerAction] = useState(null);
+
     useEffect(() => {
         const imageUploadWorker = new Worker("/src/utils/workers/imageUploadWorker.js");
         imageUploadWorker.onmessage = (event) => {
@@ -133,7 +135,7 @@ const useUploadImages = ({
     const handleSubmit = async (file) => {
         const formData = new FormData();
         formData.append("image", file);
-        await uploadImages(formData);
+        await uploadImages(formData, user.token);
     };
 
     const handleSubmitManyImages = async (files) => {

diff --git a/src/components/Dashboard/FormData/FormData.jsx b/src/components/Dashboard/FormData/FormData.jsx
@@ -11,7 +11,7 @@ import { getApiUrl } from "src/features/apiUrl";
 const FormData = () => {
     const { user } = useSelector((state) => state.auth);
 
-    if (!user || user.role !== "admin" || user.role === "team") {
+    if (!user || user.role !== "admin" || user.role !== "team") {
         return <NotFound />;
     }
 

diff --git a/src/components/Dashboard/FormData/InternshipResponse.jsx b/src/components/Dashboard/FormData/InternshipResponse.jsx
@@ -17,7 +17,7 @@ import {
 
 const InternshipResponse = () => {
     const { user } = useSelector((state) => state.auth);
-    if (!user || user.role !== "admin" || user.role === "team") {
+    if (!user || user.role !== "admin" || user.role !== "team") {
         return <NotFound />;
     }
 

diff --git a/src/components/Dashboard/Notetaker/NoteApp.jsx b/src/components/Dashboard/Notetaker/NoteApp.jsx
@@ -58,6 +58,10 @@ const NoteApp = () => {
         dispatch(pinNote({ id: noteId, noteData }));
     };
 
+    if (isNoteLoading) {
+        return "loading";
+    }
+
     return (
         <NotesContainer>
             <CategorySidebar

diff --git a/src/components/Dashboard/Notetaker/NoteDescription.jsx b/src/components/Dashboard/Notetaker/NoteDescription.jsx
@@ -17,6 +17,7 @@ import { FaSave } from "react-icons/fa";
 import { TbEditCircle } from "react-icons/tb";
 import { AiTwotoneDelete } from "react-icons/ai";
 import { RiMore2Fill } from "react-icons/ri";
+import DOMPurify from "dompurify";
 
 const NoteDescription = ({
     children,
@@ -94,6 +95,9 @@ const NoteDescription = ({
         onChangePickedNote(newNote);
         handleClose();
     };
+
+    const purifiedCode = DOMPurify.sanitize(showNote.content);
+
     return (
         <NotesDescriptionContainer>
             <NotesDescriptionHeader>
@@ -153,7 +157,7 @@ const NoteDescription = ({
                             pageName="notes"
                         />
                     ) : (
-                        <MarkdownEditor content={showNote.content || ""} previewModeOnly pageName="notes" />
+                        <MarkdownEditor content={purifiedCode || ""} previewModeOnly pageName="notes" />
                     )}
                 </div>
             </NotesDescription>

diff --git a/src/components/Dashboard/Profile/UserLinks/UserLinks.jsx b/src/components/Dashboard/Profile/UserLinks/UserLinks.jsx
@@ -8,13 +8,11 @@ import {
 } from "src/components/Dashboard/Profile/UserSocialLinks/UserSocialLinksElements";
 import { FaGithub, FaInstagram, FaLinkedin, FaMedium, FaTwitter } from "react-icons/fa";
 import { CgWebsite } from "react-icons/cg";
+import ConnectionsAndFollows from "src/components/Dashboard/Profile/ConnectionsAndFollows/ConnectionsAndFollows.jsx";
 // import ConnectionsAndFollows from "src/components/Dashboard/Profile/ConnectionsAndFollows/ConnectionsAndFollows";
 // import ExternalLinkPopUp from "src/components/Common/ExternalLink/ExternalLink.jsx";
 
-const UserLinks = ({
-    userDetail,
-    // , isUserDetailsLoading, setShowAuthPopup
-}) => {
+const UserLinks = ({ userDetail, isUserDetailsLoading, setShowAuthPopup }) => {
     const socialUsernames = userDetail?.socialLinks?.map(
         (item) => item?.profileUsername !== "" && item?.profileUsername,
     );
@@ -25,13 +23,13 @@ const UserLinks = ({
         <UserLinksContainer>
             <UserInfo>{userDetail}</UserInfo>
 
-            {/* {userDetail?.user && ( */}
-            {/*    <ConnectionsAndFollows */}
-            {/*        isUserDetailsLoading={isUserDetailsLoading} */}
-            {/*        userDetail={userDetail} */}
-            {/*        setShowAuthPopup={setShowAuthPopup} */}
-            {/*    /> */}
-            {/* )} */}
+            {userDetail?.user && (
+                <ConnectionsAndFollows
+                    isUserDetailsLoading={isUserDetailsLoading}
+                    userDetail={userDetail}
+                    setShowAuthPopup={setShowAuthPopup}
+                />
+            )}
 
             {userDetail?.bio?.length === 0 || !userDetail?.bio ? null : (
                 <UserBio>

diff --git a/src/components/Feeds/FeedPage/FeedComments/ReplyCard.jsx b/src/components/Feeds/FeedPage/FeedComments/ReplyCard.jsx
@@ -38,7 +38,12 @@ const ReplyCard = ({ reply, user, comments, likes, bookmarks, views, displayAt,
                 <PostHeaderImg src={avatar} alt={reply?.username + `avatar`} />
             </LeftSection>
             {editMode ? (
-                <ModifyFeed showPostTags={true} editFeed={reply} onModifyFeed={handleSaveEditedFeed} />
+                <ModifyFeed
+                    showPostTags={true}
+                    editFeed={reply}
+                    onModifyFeed={handleSaveEditedFeed}
+                    token={user?.token}
+                />
             ) : (
                 <RightSection>
                     {/* <RouteLink to={`/feeds/${reply?._id}`}> */}