Fix route bugs

JumboCode · Apr 4, 2024 · 3a13cdf · 3a13cdf
1 parent 28c3863
commit 3a13cdf
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 13 deletions.
diff --git a/src/app/private/[uid]/user/home/page.tsx b/src/app/private/[uid]/user/home/page.tsx
@@ -25,9 +25,16 @@ const UserHomePage = async ({ params }: UserHomePageParams) => {
     include: {
       students: {
         where: {
-          position: {
-            not: "",
-          },
+          OR: [
+            {
+              position: {
+                not: "",
+              },
+            },
+            {
+              role: "CHAPTER_LEADER",
+            },
+          ],
         },
       },
     },

diff --git a/src/components/DisplayChapterInfo.tsx b/src/components/DisplayChapterInfo.tsx
@@ -69,7 +69,7 @@ const DisplayChapterInfo = ({
                   <PendingCard
                     key={index}
                     name={fullName(user.user)}
-                    uid={user.id}
+                    uid={user.user.id}
                   />
                 );
               })}
@@ -91,15 +91,15 @@ const DisplayChapterInfo = ({
                 : "Executive Board"}
             </div>
           }
-          tiles={students.map((student) => (
-            <UserTile
-              key={student.id}
-              student={student}
-              link={`/private/${user.id}/${RoleToUrlSegment[user.role]}/users/${
-                student.id
-              }`}
-            />
-          ))}
+          tiles={students.map((student) => {
+            const link =
+              user.role === "USER"
+                ? ""
+                : `/private/${user.id}/${RoleToUrlSegment[user.role]}` +
+                  `${user.role === "ADMIN" && `/home/chapters/${chapter.id}`}` +
+                  `/users/${student.id}`;
+            return <UserTile key={student.id} student={student} link={link} />;
+          })}
         />
       </div>
       <div className="flex flex-col gap-y-6">