[questions][bug] add github image url to comments/answers

pull/355/head
wlren 3 years ago
parent 3a2358ab14
commit 2cebe11ae2

@ -7,10 +7,6 @@ import FullAnswerCard from '~/components/questions/card/FullAnswerCard';
import CommentListItem from '~/components/questions/CommentListItem'; import CommentListItem from '~/components/questions/CommentListItem';
import FullScreenSpinner from '~/components/questions/FullScreenSpinner'; import FullScreenSpinner from '~/components/questions/FullScreenSpinner';
import {
SAMPLE_ANSWER,
SAMPLE_ANSWER_COMMENT,
} from '~/utils/questions/constants';
import { useFormRegister } from '~/utils/questions/useFormRegister'; import { useFormRegister } from '~/utils/questions/useFormRegister';
import { trpc } from '~/utils/trpc'; import { trpc } from '~/utils/trpc';
@ -85,7 +81,7 @@ export default function QuestionPage() {
<div className="flex w-full justify-center overflow-y-auto py-4 px-5"> <div className="flex w-full justify-center overflow-y-auto py-4 px-5">
<div className="flex max-w-7xl flex-1 flex-col gap-2"> <div className="flex max-w-7xl flex-1 flex-col gap-2">
<FullAnswerCard <FullAnswerCard
authorImageUrl={SAMPLE_ANSWER.authorImageUrl} authorImageUrl={answer.userImage}
authorName={answer.user} authorName={answer.user}
content={answer.content} content={answer.content}
createdAt={answer.createdAt} createdAt={answer.createdAt}
@ -144,7 +140,7 @@ export default function QuestionPage() {
{(comments ?? []).map((comment) => ( {(comments ?? []).map((comment) => (
<CommentListItem <CommentListItem
key={comment.id} key={comment.id}
authorImageUrl={SAMPLE_ANSWER_COMMENT.authorImageUrl} authorImageUrl={comment.userImage}
authorName={comment.user} authorName={comment.user}
content={comment.content} content={comment.content}
createdAt={comment.createdAt} createdAt={comment.createdAt}

@ -8,10 +8,6 @@ import FullQuestionCard from '~/components/questions/card/FullQuestionCard';
import CommentListItem from '~/components/questions/CommentListItem'; import CommentListItem from '~/components/questions/CommentListItem';
import FullScreenSpinner from '~/components/questions/FullScreenSpinner'; import FullScreenSpinner from '~/components/questions/FullScreenSpinner';
import {
SAMPLE_ANSWER,
SAMPLE_QUESTION_COMMENT,
} from '~/utils/questions/constants';
import createSlug from '~/utils/questions/createSlug'; import createSlug from '~/utils/questions/createSlug';
import { useFormRegister } from '~/utils/questions/useFormRegister'; import { useFormRegister } from '~/utils/questions/useFormRegister';
import { trpc } from '~/utils/trpc'; import { trpc } from '~/utils/trpc';
@ -179,7 +175,7 @@ export default function QuestionPage() {
{(comments ?? []).map((comment) => ( {(comments ?? []).map((comment) => (
<CommentListItem <CommentListItem
key={comment.id} key={comment.id}
authorImageUrl={SAMPLE_QUESTION_COMMENT.authorImageUrl} authorImageUrl={comment.userImage}
authorName={comment.user} authorName={comment.user}
content={comment.content} content={comment.content}
createdAt={comment.createdAt} createdAt={comment.createdAt}
@ -239,7 +235,7 @@ export default function QuestionPage() {
{(answers ?? []).map((answer) => ( {(answers ?? []).map((answer) => (
<AnswerCard <AnswerCard
key={answer.id} key={answer.id}
authorImageUrl={SAMPLE_ANSWER.authorImageUrl} authorImageUrl={answer.userImage}
authorName={answer.user} authorName={answer.user}
commentCount={answer.numComments} commentCount={answer.numComments}
content={answer.content} content={answer.content}

@ -17,6 +17,7 @@ export const questionsAnswerCommentRouter = createProtectedRouter()
include: { include: {
user: { user: {
select: { select: {
image: true,
name: true, name: true,
}, },
}, },
@ -54,6 +55,7 @@ export const questionsAnswerCommentRouter = createProtectedRouter()
numVotes: votes, numVotes: votes,
updatedAt: data.updatedAt, updatedAt: data.updatedAt,
user: data.user?.name ?? '', user: data.user?.name ?? '',
userImage: data.user?.image ?? '',
}; };
return answerComment; return answerComment;
}); });

@ -21,6 +21,7 @@ export const questionsAnswerRouter = createProtectedRouter()
}, },
user: { user: {
select: { select: {
image: true,
name: true, name: true,
}, },
}, },
@ -58,6 +59,7 @@ export const questionsAnswerRouter = createProtectedRouter()
numComments: data._count.comments, numComments: data._count.comments,
numVotes: votes, numVotes: votes,
user: data.user?.name ?? '', user: data.user?.name ?? '',
userImage: data.user?.image ?? '',
}; };
return answer; return answer;
}); });
@ -77,6 +79,7 @@ export const questionsAnswerRouter = createProtectedRouter()
}, },
user: { user: {
select: { select: {
image: true,
name: true, name: true,
}, },
}, },
@ -116,6 +119,7 @@ export const questionsAnswerRouter = createProtectedRouter()
numComments: answerData._count.comments, numComments: answerData._count.comments,
numVotes: votes, numVotes: votes,
user: answerData.user?.name ?? '', user: answerData.user?.name ?? '',
userImage: answerData.user?.image ?? '',
}; };
return answer; return answer;
}, },

@ -17,6 +17,7 @@ export const questionsQuestionCommentRouter = createProtectedRouter()
include: { include: {
user: { user: {
select: { select: {
image: true,
name: true, name: true,
}, },
}, },
@ -53,6 +54,7 @@ export const questionsQuestionCommentRouter = createProtectedRouter()
id: data.id, id: data.id,
numVotes: votes, numVotes: votes,
user: data.user?.name ?? '', user: data.user?.name ?? '',
userImage: data.user?.image ?? '',
}; };
return questionComment; return questionComment;
}); });

@ -21,6 +21,7 @@ export type AnswerComment = {
numVotes: number; numVotes: number;
updatedAt: Date; updatedAt: Date;
user: string; user: string;
userImage: string;
}; };
export type Answer = { export type Answer = {
@ -30,6 +31,7 @@ export type Answer = {
numComments: number; numComments: number;
numVotes: number; numVotes: number;
user: string; user: string;
userImage: string;
}; };
export type QuestionComment = { export type QuestionComment = {
@ -38,4 +40,5 @@ export type QuestionComment = {
id: string; id: string;
numVotes: number; numVotes: number;
user: string; user: string;
userImage: string;
}; };

Loading…
Cancel
Save