fixes: network

vishalkondle-dev · Jul 16, 2024 · 9b5141e · 9b5141e
1 parent 74dc0fc
commit 9b5141e
Show file tree

Hide file tree

Showing 11 changed files with 228 additions and 127 deletions.
diff --git a/app/(private)/network/[username]/page.tsx b/app/(private)/network/[username]/page.tsx
@@ -31,9 +31,9 @@ const ProfilePage = ({ params: { username } }: { params: { username: string } })
       <ProfileInfo username={username} profile={profile} />
       {Array.isArray(profile?.posts) && (
         <Paper p="md" mt="lg" withBorder>
-          {profile?.posts.length ? (
+          {profile?.posts?.length ? (
             <SimpleGrid cols={{ base: 1, xs: 2, md: 3 }}>
-              {profile?.posts.map((post: any) => (
+              {profile?.posts?.map((post: any) => (
                 <Image
                   key={String(post?._id)}
                   src={post?.url}
@@ -49,19 +49,21 @@ const ProfilePage = ({ params: { username } }: { params: { username: string } })
           )}
         </Paper>
       )}
-      <Modal
-        size="md"
-        styles={{ body: { padding: 0 } }}
-        opened={!!opened}
-        onClose={() => setOpened(0)}
-        withCloseButton={false}
-      >
-        <Post
-          post={profile?.posts.find((post: any) => post?._id === opened)}
-          user={session?.data?.user._id}
-          refetch={() => getProfile()}
-        />
-      </Modal>
+      {Array.isArray(profile?.posts) && profile?.posts?.length && (
+        <Modal
+          size="md"
+          styles={{ body: { padding: 0 } }}
+          opened={!!opened}
+          onClose={() => setOpened(0)}
+          withCloseButton={false}
+        >
+          <Post
+            post={profile?.posts?.find((post: any) => post?._id === opened)}
+            user={session?.data?.user._id}
+            refetch={() => getProfile()}
+          />
+        </Modal>
+      )}
     </Container>
   );
 };

diff --git a/app/(private)/network/page.tsx b/app/(private)/network/page.tsx
@@ -44,7 +44,7 @@ const NetworkPage = () => {
   };
 
   return (
-    <Container px={0} size="sm">
+    <Container px={0} size="md">
       <Group mb="md" justify="space-between">
         <Title order={3}>Network</Title>
         <Button
@@ -54,7 +54,7 @@ const NetworkPage = () => {
           Upload
         </Button>
       </Group>
-      <Container px={0} size="xs">
+      <Container mt="md" px={0} size="xs">
         {Array.isArray(posts) && (
           <Stack>
             {posts?.map((post) => (

diff --git a/app/(private)/network/suggested/page.tsx b/app/(private)/network/suggested/page.tsx
@@ -0,0 +1,10 @@
+import React from 'react';
+import { Suggested } from '@/components/Network';
+
+const page = () => (
+  <>
+    <Suggested />
+  </>
+);
+
+export default page;
diff --git a/app/api/network/posts/route.ts b/app/api/network/posts/route.ts
@@ -29,10 +29,12 @@ export async function GET() {
     const to = await Spark.find({ by: session.user?._id, isAccepted: true }).select('to');
     const posts = await Post.find({
       $or: [{ user: { $in: to.map((t) => t.to) } }, { user: session.user?._id }],
-    }).populate({
-      path: 'user',
-      select: 'name username image',
-    });
+    })
+      .populate({
+        path: 'user',
+        select: 'name username image',
+      })
+      .sort('-createdAt');
     return NextResponse.json(posts, { status: 200 });
   } catch (error: any) {
     return NextResponse.json({ error: error?.message }, { status: 500 });

diff --git a/app/api/profile/route.ts b/app/api/profile/route.ts
@@ -31,18 +31,28 @@ export async function GET(req: NextRequest) {
         'name username image bio city interests dob'
       );
     }
-    const by = await Spark.find({ by: user?._id });
-    const to = await Spark.find({ to: user?._id });
+    const by = await Spark.find({ by: user?._id })
+      .populate({
+        path: 'to',
+        select: 'name username image',
+      })
+      .select('-createdAt -updatedAt -__v');
+    const to = await Spark.find({ to: user?._id })
+      .populate({
+        path: 'by',
+        select: 'name username image',
+      })
+      .select('-createdAt -updatedAt -__v');
     const posts = await Post.find({ user: user?._id }).populate({
       path: 'user',
       select: 'name username image',
     });
     const isSparked = await Spark.findOne({
       to: user?._id,
       by: session?.user._id,
-      //! isAccepted: true,
+      // isAccepted: true,
     });
-    if (!isSparked) {
+    if (!isSparked && user?._id === session?.user._id) {
       return NextResponse.json(
         { user, by: by?.length, to: to?.length, posts: posts?.length, isSparked: !!isSparked },
         { status: 200 }

diff --git a/app/api/upload/route.ts b/app/api/upload/route.ts
@@ -11,7 +11,7 @@ export const dynamic = 'force-dynamic';
 export async function POST(req: Request) {
   try {
     const session: UserDataTypes | null = await getServerSession(authOptions);
-    if (!session?.user || !session?.user?.isAdmin) {
+    if (!session?.user) {
       return NextResponse.json({ error: 'Unauthorized' }, { status: 401 });
     }
     await startDb();

diff --git a/components/Layout/Layout.tsx b/components/Layout/Layout.tsx
@@ -222,7 +222,7 @@ export default function Layout({ children }: { children: React.ReactNode }) {
                         {data?.user?.username}
                       </Text>
                       <Stack align="center" gap={rem(4)}>
-                        <FileButton accept="image/png,image/jpeg" onChange={setFile}>
+                        <FileButton accept="image/*" onChange={setFile}>
                           {(props) => (
                             <Avatar
                               variant="filled"

diff --git a/components/Network/Post.tsx b/components/Network/Post.tsx
@@ -77,23 +77,25 @@ export const Post = ({ post, user, refetch }: Props) => {
           </Group>
         </Paper>
         {post?.caption && (
-          <Spoiler
-            maxHeight={50}
-            showLabel={
-              <Text size="sm" px="xs">
-                Show more
+          <Paper radius={0} withBorder>
+            <Spoiler
+              maxHeight={50}
+              showLabel={
+                <Text size="sm" px="xs">
+                  Show more
+                </Text>
+              }
+              hideLabel={
+                <Text size="sm" px="xs">
+                  Hide
+                </Text>
+              }
+            >
+              <Text size="sm" p="xs">
+                {post?.caption}
               </Text>
-            }
-            hideLabel={
-              <Text size="sm" px="xs">
-                Hide
-              </Text>
-            }
-          >
-            <Text size="sm" p="xs">
-              {post?.caption}
-            </Text>
-          </Spoiler>
+            </Spoiler>
+          </Paper>
         )}
       </Card>
     </>