feat: add individual post page

This commit is contained in:
Stevan Freeborn
2023-09-11 22:05:12 -05:00
parent 41401cd3c5
commit 5389a86ed1
5 changed files with 85 additions and 10 deletions
+22 -2
View File
@@ -1,5 +1,6 @@
import { paginationOptsValidator } from 'convex/server'; import { paginationOptsValidator } from 'convex/server';
import { v } from 'convex/values'; import { v } from 'convex/values';
import { PostWithUserDto } from '../src/app/types';
import { mutation, query } from './_generated/server'; import { mutation, query } from './_generated/server';
import { userQuery } from './users'; import { userQuery } from './users';
@@ -59,13 +60,32 @@ export const deletePostById = mutation({
export const getPostById = query({ export const getPostById = query({
args: { id: v.id('posts') }, args: { id: v.id('posts') },
handler: async (ctx, args) => { handler: async (
ctx,
args
): Promise<
PostWithUserDto | 'POST_NOT_FOUND' | 'USER_FOR_POST_NOT_FOUND'
> => {
const post = await ctx.db.get(args.id); const post = await ctx.db.get(args.id);
if (post === null) { if (post === null) {
return 'POST_NOT_FOUND'; return 'POST_NOT_FOUND';
} }
return post; const user = await ctx.db.get(post.userId);
if (user === null) {
return 'USER_FOR_POST_NOT_FOUND';
}
return {
...post,
user: {
_id: user._id,
_creationTime: user._creationTime,
clerkUsername: user.clerkUser.username,
clerkImageUrl: user.clerkUser.image_url,
},
};
}, },
}); });
+18
View File
@@ -32,6 +32,24 @@ export const getUserByClerkId = query({
}, },
}); });
export const getUserById = query({
args: { id: v.id('users') },
async handler(ctx, args): Promise<UserDto | 'USER_NOT_FOUND'> {
const user = await ctx.db.get(args.id);
if (user === null) {
return 'USER_NOT_FOUND';
}
return {
_id: user._id,
_creationTime: user._creationTime,
clerkUsername: user.clerkUser.username,
clerkImageUrl: user.clerkUser.image_url,
};
},
});
export const getUser = internalQuery({ export const getUser = internalQuery({
args: { subject: v.string() }, args: { subject: v.string() },
async handler(ctx, args) { async handler(ctx, args) {
+1 -1
View File
@@ -13,7 +13,7 @@ export default async function EditPostPage({
id: params.id as Id<'posts'>, id: params.id as Id<'posts'>,
}); });
if (post === 'POST_NOT_FOUND') { if (post === 'POST_NOT_FOUND' || post === 'USER_FOR_POST_NOT_FOUND') {
// TODO: Return actual not found component // TODO: Return actual not found component
return <h1>Not Found</h1>; return <h1>Not Found</h1>;
} }
+31 -1
View File
@@ -1,3 +1,33 @@
'use client';
import Post from '@/components/Post';
import SpinningLoader from '@/components/SpinningLoader';
import { useQuery } from 'convex/react';
import { api } from '../../../../convex/_generated/api';
import { Id } from '../../../../convex/_generated/dataModel';
export default function PostPage({ params }: { params: { id: string } }) { export default function PostPage({ params }: { params: { id: string } }) {
return <h1>{params.id}</h1>; const post = useQuery(api.posts.getPostById, {
id: params.id as Id<'posts'>,
});
if (post === 'POST_NOT_FOUND' || post === 'USER_FOR_POST_NOT_FOUND') {
// TODO: Return actual not found component
return <h1>Not Found</h1>;
}
return (
<main className='flex flex-col flex-1 w-full items-center'>
<div className='w-full max-w-4xl'>
{post === undefined ? (
<SpinningLoader className='animate-spin w-5 h-5' />
) : (
<Post
post={post}
limit={false}
/>
)}
</div>
</main>
);
} }
+13 -6
View File
@@ -11,7 +11,13 @@ import { GoDotFill } from 'react-icons/go';
import { api } from '../../convex/_generated/api'; import { api } from '../../convex/_generated/api';
import PostContent from './PostContent'; import PostContent from './PostContent';
export default function Post({ post }: { post: PostWithUserDto }) { export default function Post({
post,
limit = true,
}: {
post: PostWithUserDto;
limit?: boolean;
}) {
const deletePostById = useMutation(api.posts.deletePostById); const deletePostById = useMutation(api.posts.deletePostById);
const modalRef = useRef<HTMLDivElement>(null); const modalRef = useRef<HTMLDivElement>(null);
const [modalOpen, setModalOpen] = useState(false); const [modalOpen, setModalOpen] = useState(false);
@@ -22,6 +28,7 @@ export default function Post({ post }: { post: PostWithUserDto }) {
month: 'short', month: 'short',
}); });
const dayOfMonth = createdPostDate.getDate(); const dayOfMonth = createdPostDate.getDate();
const content = limit ? post.content.slice(0, 10) : post.content;
// TODO: Add reply and like buttons // TODO: Add reply and like buttons
@@ -102,13 +109,13 @@ export default function Post({ post }: { post: PostWithUserDto }) {
</div> </div>
</div> </div>
</div> </div>
<div className='max-h-80 overflow-hidden text-ellipsis'> <div
<PostContent className={`${limit ? 'max-h-80' : ''} overflow-hidden text-ellipsis`}
content={Text.of(post.content.slice(0, 10)).toString()} >
/> <PostContent content={Text.of(content).toString()} />
</div> </div>
<div> <div>
{post.content.length > 10 ? ( {limit && post.content.length > 10 ? (
<Link <Link
className='font-semibold text-primary-accent' className='font-semibold text-primary-accent'
href={`/posts/${post._id}`} href={`/posts/${post._id}`}