Added user names in the backend; fixed request page and members list

client/src/pages/CreateProj.tsx

@@ -63,6 +63,7 @@ export default function CreateProj() {
         ownerId: user?.id,
         imageUrl: url,
         startDate: formState.startDate,
+        creatorName: (user?.firstName + ' ' + user?.lastName),
         tags: addedTags,
       });
     },

client/src/pages/Project.tsx

@@ -12,6 +12,7 @@ import Markdown from 'react-markdown';
 import { RouterOutputs, trpc } from '../utils/trpc';
 import { z } from 'zod';
 
+
 dayjjs.extend(relativeTime);
 
 function useGetProjectData() {
@@ -24,6 +25,7 @@ function useGetProjectData() {
   };
 }
 
+
 export default function Project() {
   const { data, isLoading, projectId } = useGetProjectData();
   const { data: role, isLoading: roleIsLoading } =
@@ -32,6 +34,9 @@ export default function Project() {
   const [showModal, setShowModal] = useState(false);
   const utils = trpc.useUtils();
 
+  // const name = user?.getUser(data?.ownerId);
+
+
   const sendJoinReqMutation =
     trpc.memberships.sendProjectJoinRequest.useMutation({
       onSuccess() {
@@ -57,13 +62,15 @@ export default function Project() {
         ownerId: data.ownerId,
         userId: user?.id,
         description: description,
+        userName: (user?.firstName + ' ' + user?.lastName),
       });
     } else if (role.status === 'REJECTED') {
       sendJoinReqMutation.mutate({
         projectId: projectId,
         ownerId: data.ownerId,
         userId: user?.id,
         description: description,
+        userName: (user?.firstName + ' ' + user?.lastName),
         role: {
           status: role.status,
           id: role.id,
@@ -473,6 +480,8 @@ export function CreatePost() {
 
 export function ProjectInfo() {
   const { data, isLoading } = useGetProjectData();
+  // const { owner } = trpc.projects.getOwnerByID.useQuery(data?.ownerId ?? '',);
+
 
   if (isLoading) return <div>loading</div>;
 
@@ -482,6 +491,12 @@ export function ProjectInfo() {
     <div className="flex justify-between w-full gap-16">
       <div className="flex flex-col gap-4">
         <p className="text-zinc-800 leading-7">{data.description} </p>
+        <p>
+          <span className="underline font-semibold mr-3 underline-offset-4">
+            Posted By:
+          </span>
+          {data.creatorName}
+        </p>
         <p>
           <span className="underline font-semibold mr-3 underline-offset-4">
             Meet Location:
@@ -573,6 +588,7 @@ export function ProjectPostsLayout() {
   );
 }
 
+
 export function ProjectPost() {
   const params = useParams();
   const { data, isLoading } = trpc.posts.getById.useQuery(params.postId ?? '');
@@ -625,7 +641,7 @@ export function MemberList() {
           key={member.userId}
           className="flex justify-between w-full border-2 py-5 px-4 rounded-xl"
         >
-          {member.userId}
+          {member.userName}
 
           <div className="flex gap-4 items-center">
             <button

client/src/pages/Requests.tsx

@@ -84,6 +84,7 @@ export default function Requests() {
       </h1>
     );
 
+
   return (   
     <div className="w-full flex flex-col gap-4 ml-8">
       {data.map((request) => (
@@ -105,6 +106,11 @@ export default function Requests() {
               <h1 className="text-2xl font-bold text-zinc-800 mb-5">
                 <ProjectName projectId={request.projectId} />
               </h1>
+
+              <p className="text-2xl font-bold text-zinc-800 mb-5">
+                {request.userName}
+              </p>
+
               <p className="text-xl text-zinc-800 mb-5">
                 {request.description}
               </p>

server/prisma/schema.prisma

@@ -26,7 +26,7 @@ model Project {
   memberships  Memberships[]
   imageUrl     String
   startDate    String
-
+  creatorName  String
 }
 
 model Tag {
@@ -78,6 +78,7 @@ model Memberships {
   // User      User             @relation(fields: [userId], references: [id])
   // User      User             @relation(fields: [userId], references: [id])
   description String?
+  userName    String
 
   @@unique([projectId, userId])
   @@index([projectId])

server/src/routers/membershipsRouter.ts

@@ -9,6 +9,7 @@ export const membershipsRouter = router({
         ownerId: z.string(),
         userId: z.string(),
         description: z.optional(z.string()),
+        userName: z.string(),
         role: z.optional(
           z.object({
             status: z.string(),
@@ -25,6 +26,7 @@ export const membershipsRouter = router({
             ownerId: input.ownerId,
             userId: input.userId,
             description: input.description,
+            userName: input.userName,
           },
         });
       } else if (input.role.status === 'REJECTED') {
@@ -35,6 +37,7 @@ export const membershipsRouter = router({
           data: {
             status: 'PENDING',
             description: input.description,
+            userName: input.userName,
           },
         });
       }

server/src/routers/projectsRouter.ts

@@ -77,6 +77,7 @@ export const projectsRouter = router({
             select: {
               id: true,
               userId: true,
+              userName: true,
             },
           },
         },
@@ -143,7 +144,7 @@ export const projectsRouter = router({
         projectId: input,
       },
     });
-  }),
+  }),  
 
   // must be owner
   createPost: authedProcedure
@@ -168,6 +169,7 @@ export const projectsRouter = router({
         meetLocation: z.string(),
         imageUrl: z.string(),
         startDate: z.string(),
+        creatorName: z.string(),
         tags: z.array(z.string()),
       }),
     )