diff --git a/src/app/(withLayout)/layout.tsx b/src/app/(withLayout)/layout.tsx index 1d13a81..46a5af4 100644 --- a/src/app/(withLayout)/layout.tsx +++ b/src/app/(withLayout)/layout.tsx @@ -53,7 +53,7 @@ export default function Layout({ children }: { children: React.ReactNode }) { return (
-
+
diff --git a/src/app/(withLayout)/notifications/page.tsx b/src/app/(withLayout)/notifications/page.tsx index bb475a6..d3b2a8e 100644 --- a/src/app/(withLayout)/notifications/page.tsx +++ b/src/app/(withLayout)/notifications/page.tsx @@ -1,6 +1,13 @@ +import Card from '@/components/atoms/Card' import NotificationContainer from '@/components/organisms/NotificationContainer' import React from 'react' export default function NotificationsPage() { - return + return ( +
+
+ +
+
+ ) } diff --git a/src/components/Notifiaction/CommunityAndCommunityGroupJoinNotification.tsx b/src/components/Notifiaction/CommunityAndCommunityGroupJoinNotification.tsx index 4554fac..22819bd 100644 --- a/src/components/Notifiaction/CommunityAndCommunityGroupJoinNotification.tsx +++ b/src/components/Notifiaction/CommunityAndCommunityGroupJoinNotification.tsx @@ -60,7 +60,7 @@ const CommunityAndCommunityGroupJoinNotification = ({ data }: Props) => { } return ( -
+
{ return (
handleUpdateIsRead(data?._id)} - className={`flex flex-col gap-2 border-b-2 border-neutral-300 pb-5 me-10 hover:bg-neutral-200 hover:p-5 transition-all duration-200 cursor-pointer`} + className={`flex flex-col gap-2 border-b-2 border-neutral-300 p-4 hover:bg-neutral-200 transition-all duration-200 cursor-pointer`} >
diff --git a/src/components/Notifiaction/ReactionToCommunityPostNotification.tsx b/src/components/Notifiaction/ReactionToCommunityPostNotification.tsx index 287b14d..ba43800 100644 --- a/src/components/Notifiaction/ReactionToCommunityPostNotification.tsx +++ b/src/components/Notifiaction/ReactionToCommunityPostNotification.tsx @@ -56,7 +56,7 @@ const ReactionToCommunityPostNotification = ({ data }: Props) => { return (
handleUpdateIsRead(data?._id)} - className={`flex flex-col gap-2 border-b-2 border-neutral-300 pb-5 me-10 hover:bg-neutral-200 hover:p-5 transition-all duration-200 cursor-pointer`} + className={`flex flex-col gap-2 border-b-2 border-neutral-300 p-4 hover:bg-neutral-200 transition-all duration-200 cursor-pointer`} >
diff --git a/src/components/Notifiaction/ReactionToPostNotification.tsx b/src/components/Notifiaction/ReactionToPostNotification.tsx index 7b68149..c9b50f6 100644 --- a/src/components/Notifiaction/ReactionToPostNotification.tsx +++ b/src/components/Notifiaction/ReactionToPostNotification.tsx @@ -56,7 +56,7 @@ const ReactionToPostNotification = ({ data }: Props) => { return (
handleUpdateIsRead(data?._id)} - className={`flex flex-col gap-2 border-b-2 border-neutral-300 pb-5 me-10 hover:bg-neutral-200 hover:p-5 transition-all duration-200 cursor-pointer`} + className={`flex flex-col gap-2 border-b-2 border-neutral-300 p-4 hover:bg-neutral-200 transition-all duration-200 cursor-pointer`} >
diff --git a/src/components/Notifiaction/StartedFollowingYouNotification.tsx b/src/components/Notifiaction/StartedFollowingYouNotification.tsx index 3422781..8def2b1 100644 --- a/src/components/Notifiaction/StartedFollowingYouNotification.tsx +++ b/src/components/Notifiaction/StartedFollowingYouNotification.tsx @@ -54,7 +54,7 @@ const StartedFollowingYouNotification = ({ data }: Props) => { return (
handleUpdateIsRead(data?._id)} - className={`flex flex-col gap-2 border-b-2 border-neutral-300 pb-5 me-10 hover:bg-neutral-200 hover:p-5 transition-all duration-200 cursor-pointer`} + className={`flex flex-col gap-2 border-b-2 border-neutral-300 p-4 hover:bg-neutral-200 transition-all duration-200 cursor-pointer`} >
diff --git a/src/components/Notifiaction/UserPostCommentNotification.tsx b/src/components/Notifiaction/UserPostCommentNotification.tsx index d81c471..22d17cb 100644 --- a/src/components/Notifiaction/UserPostCommentNotification.tsx +++ b/src/components/Notifiaction/UserPostCommentNotification.tsx @@ -55,7 +55,7 @@ const UserPostCommentNotification = ({ data }: Props) => { return (
handleUpdateIsRead(data?._id)} - className={`flex flex-col gap-2 border-b-2 border-neutral-300 pb-5 me-10 hover:bg-neutral-200 hover:p-5 transition-all duration-200 cursor-pointer`} + className={`flex flex-col gap-2 border-b-2 border-neutral-300 p-4 hover:bg-neutral-200 transition-all duration-200 cursor-pointer`} >
diff --git a/src/components/atoms/PostImageSlider/index.tsx b/src/components/atoms/PostImageSlider/index.tsx index c51d521..dd3bc92 100644 --- a/src/components/atoms/PostImageSlider/index.tsx +++ b/src/components/atoms/PostImageSlider/index.tsx @@ -22,8 +22,8 @@ type prop = { export default function PostImageSlider({ images, initialSlide, messageImage }: prop) { return ( -
-

closeImageModal()}> +

+

closeImageModal()}>

@@ -39,7 +39,7 @@ export default function PostImageSlider({ images, initialSlide, messageImage }: navigation={true} modules={[Keyboard, Navigation]} initialSlide={initialSlide || 0} - className="mySwiper " + className="mySwiper rounded-xl" > {images?.map((item: any) => ( diff --git a/src/components/molecules/CommunityGroupBanner/index.tsx b/src/components/molecules/CommunityGroupBanner/index.tsx index 6bcc82d..7517cee 100644 --- a/src/components/molecules/CommunityGroupBanner/index.tsx +++ b/src/components/molecules/CommunityGroupBanner/index.tsx @@ -66,22 +66,6 @@ export default function CommunityGroupBanner({ communityID, communityGroupID, is const [dataToDisplay, setDataToDisplay] = useState({ title: '', desc: '', membersCount: 0, coverImage: '', logoImage: '', adminId: '', id: '' }) - const userVerifiedCommunityIds = useMemo(() => { - return userData?.userVerifiedCommunities?.map((c) => c.communityId.toString()) || [] - }, [userData]) - - const userUnverifiedVerifiedCommunityIds = useMemo(() => { - return userData?.userUnVerifiedCommunities?.map((c) => c.communityId.toString()) || [] - }, [userData]) - - const userVerifiedCommunityGroupIds = useMemo(() => { - return userData?.userVerifiedCommunities?.flatMap((x) => x.communityGroups.map((y) => y.communityGroupId.toString())) || [] - }, [userData]) - - const userUnverifiedVerifiedCommunityGroupIds = useMemo(() => { - return userData?.userUnVerifiedCommunities?.flatMap((x) => x.communityGroups.map((y) => y.communityGroupId.toString())) || [] - }, [userData]) - const handleEditCommunityGroupModal = () => { if (!communityGroups) return openModal() @@ -115,36 +99,10 @@ export default function CommunityGroupBanner({ communityID, communityGroupID, is } } - //group image - // const handleGroupCoverImageUpload = async (e: any) => { - // const files = e.target.files - - // if (files && files[0]) { - // const imagedata: any = await replaceImage(files[0], selectedCommunityGroupData?.communityGroupLogoCoverUrl?.publicId) - - // const dataToPush = { communityGroupLogoCoverUrl: { imageUrl: imagedata?.imageUrl, publicId: imagedata?.publicId } } - - // UpdateCommunityGroup({ dataToPush, id: selectedCommunityGroupData?._id }) - // } else { - // console.error('No file selected.') - // } - // } - - // const handleGroupLogoImageUpload = async (e: any) => { - // const files = e.target.files - - // if (files && files[0]) { - // const imagedata: any = await replaceImage(files[0], selectedCommunityGroupData?.communityGroupLogoUrl?.publicId) - - // const dataToPush = { communityGroupLogoUrl: { imageUrl: imagedata?.imageUrl, publicId: imagedata?.publicId } } - // UpdateCommunityGroup({ dataToPush, id: selectedCommunityGroupData?._id }) - // } else { - // console.error('No file selected.') - // } - // } - if (isCommunityGroupsLoading) return + const { communityGroupCategory } = communityGroups || {} + return ( <>
diff --git a/src/components/molecules/CreateNewGroupBox/index.tsx b/src/components/molecules/CreateNewGroupBox/index.tsx index 0ea66f6..d9c4fb5 100644 --- a/src/components/molecules/CreateNewGroupBox/index.tsx +++ b/src/components/molecules/CreateNewGroupBox/index.tsx @@ -112,9 +112,9 @@ const CreateNewGroup = ({ setNewGroup, communityId = '' }: Props) => { !coverImage ? 'border-2 border-neutral-200' : '' } rounded-md relative flex flex-col w-full items-center justify-center h-40 `} > - {coverImage && } + {coverImage && } setCoverImage(e.target.files[0])} /> -