feat: display user's posts on profile page

This commit is contained in:
Stevan Freeborn
2023-09-11 00:40:14 -05:00
parent 8b350c9809
commit 4b74f47e75
18 changed files with 397 additions and 67 deletions
+13 -1
View File
@@ -1,5 +1,6 @@
import { paginationOptsValidator } from 'convex/server';
import { v } from 'convex/values';
import { mutation } from './_generated/server';
import { mutation, query } from './_generated/server';
import { userQuery } from './users';
export const createPost = mutation({
@@ -31,3 +32,14 @@ export const createPost = mutation({
});
},
});
export const getUsersPostById = query({
args: { userId: v.id('users'), paginationOpts: paginationOptsValidator },
handler: async (ctx, args) => {
return await ctx.db
.query('posts')
.withIndex('by_user_id', q => q.eq('userId', args.userId))
.order('desc')
.paginate(args.paginationOpts);
},
});
+31 -1
View File
@@ -3,7 +3,37 @@ import { v } from 'convex/values';
export default defineSchema(
{
users: defineTable({
clerkUser: v.any(),
clerkUser: v.object({
id: v.string(),
object: v.string(),
username: v.union(v.string(), v.null()),
first_name: v.string(),
last_name: v.string(),
gender: v.string(),
birthday: v.string(),
profile_image_url: v.string(),
image_url: v.string(),
has_image: v.boolean(),
primary_email_address_id: v.boolean(),
primary_phone_number_id: v.union(v.string(), v.null()),
primary_web3_wallet_id: v.union(v.string(), v.null()),
password_enabled: v.boolean(),
totp_enabled: v.boolean(),
backup_code_enabled: v.boolean(),
two_factor_enabled: v.boolean(),
banned: v.boolean(),
email_addresses: v.any(),
phone_numbers: v.any(),
web3_wallets: v.any(),
external_accounts: v.any(),
external_id: v.union(v.string(), v.null()),
last_sign_in_at: v.union(v.number(), v.null()),
public_metadata: v.any(),
private_metadata: v.any(),
unsafe_metadata: v.any(),
created_at: v.number(),
updated_at: v.number(),
}),
}).index('by_clerk_id', ['clerkUser.id']),
posts: defineTable({
parentPostId: v.optional(v.id('posts')),
+34 -14
View File
@@ -1,7 +1,37 @@
import { UserJSON } from '@clerk/nextjs/dist/types/server';
import { v } from 'convex/values';
import { Doc } from './_generated/dataModel';
import { QueryCtx, internalMutation, internalQuery } from './_generated/server';
import {
QueryCtx,
internalMutation,
internalQuery,
query,
} from './_generated/server';
export async function userQuery(ctx: QueryCtx, clerkUserId: string) {
return await ctx.db
.query('users')
.withIndex('by_clerk_id', q => q.eq('clerkUser.id', clerkUserId))
.unique();
}
export const getUserByClerkId = query({
args: { clerkUserId: v.string() },
async handler(ctx, args) {
return await userQuery(ctx, args.clerkUserId);
},
});
export const getUserById = query({
args: { id: v.id('users') },
async handler(ctx, args) {
const user = await ctx.db.get(args.id);
if (user === null) {
return 'USER_NOT_FOUND';
}
return user;
},
});
export const getUser = internalQuery({
args: { subject: v.string() },
@@ -10,19 +40,9 @@ export const getUser = internalQuery({
},
});
export async function userQuery(
ctx: QueryCtx,
clerkUserId: string
): Promise<(Omit<Doc<'users'>, 'clerkUser'> & { clerkUser: UserJSON }) | null> {
return await ctx.db
.query('users')
.withIndex('by_clerk_id', q => q.eq('clerkUser.id', clerkUserId))
.unique();
}
export const updateOrCreateUser = internalMutation({
args: { clerkUser: v.any() },
async handler(ctx, { clerkUser }: { clerkUser: UserJSON }) {
async handler(ctx, { clerkUser }) {
const userRecord = await userQuery(ctx, clerkUser.id);
if (userRecord === null) {
+13 -3
View File
@@ -1,4 +1,14 @@
/** @type {import('next').NextConfig} */
const nextConfig = {}
const { hostname } = require('os');
module.exports = nextConfig
/** @type {import('next').NextConfig} */
const nextConfig = {
images: {
remotePatterns: [
{
hostname: '*',
},
],
},
};
module.exports = nextConfig;
+67 -21
View File
@@ -19,6 +19,7 @@
"@types/node": "20.6.0",
"@types/react": "18.2.21",
"@types/react-dom": "18.2.7",
"@types/react-syntax-highlighter": "^15.5.7",
"autoprefixer": "10.4.15",
"codemirror": "^6.0.1",
"convex": "^1.2.1",
@@ -38,7 +39,7 @@
"typescript": "5.2.2"
},
"devDependencies": {
"@types/react-syntax-highlighter": "^15.5.7"
"encoding": "^0.1.13"
}
},
"node_modules/@aashutoshrathi/word-wrap": {
@@ -1486,7 +1487,6 @@
"version": "15.5.7",
"resolved": "https://registry.npmjs.org/@types/react-syntax-highlighter/-/react-syntax-highlighter-15.5.7.tgz",
"integrity": "sha512-bo5fEO5toQeyCp0zVHBeggclqf5SQ/Z5blfFmjwO5dkMVGPgmiwZsJh9nu/Bo5L7IHTuGWrja6LxJVE2uB5ZrQ==",
"dev": true,
"dependencies": {
"@types/react": "*"
}
@@ -2272,6 +2272,25 @@
}
}
},
"node_modules/convex/node_modules/node-fetch": {
"version": "2.7.0",
"resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.7.0.tgz",
"integrity": "sha512-c4FRfUm/dbcWZ7U+1Wq0AwCyFL+3nt2bEw05wfxSz+DWpWsitgmSgYmy2dQdWyKC1694ELPqMs/YzUSNozLt8A==",
"dependencies": {
"whatwg-url": "^5.0.0"
},
"engines": {
"node": "4.x || >=6.0.0"
},
"peerDependencies": {
"encoding": "^0.1.0"
},
"peerDependenciesMeta": {
"encoding": {
"optional": true
}
}
},
"node_modules/cookie": {
"version": "0.5.0",
"resolved": "https://registry.npmjs.org/cookie/-/cookie-0.5.0.tgz",
@@ -2450,6 +2469,15 @@
"resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-9.2.2.tgz",
"integrity": "sha512-L18DaJsXSUk2+42pv8mLs5jJT2hqFkFE4j21wOmgbUqsZ2hL72NsUU785g9RXgo3s0ZNgVl42TiHp3ZtOv/Vyg=="
},
"node_modules/encoding": {
"version": "0.1.13",
"resolved": "https://registry.npmjs.org/encoding/-/encoding-0.1.13.tgz",
"integrity": "sha512-ETBauow1T35Y/WZMkio9jiM0Z5xjHHmJ4XmjZOq1l/dXz3lr2sRn87nJy20RupqSh1F2m3HHPSp8ShIPQJrJ3A==",
"devOptional": true,
"dependencies": {
"iconv-lite": "^0.6.2"
}
},
"node_modules/enhanced-resolve": {
"version": "5.15.0",
"resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.15.0.tgz",
@@ -3529,6 +3557,18 @@
"node": "*"
}
},
"node_modules/iconv-lite": {
"version": "0.6.3",
"resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.6.3.tgz",
"integrity": "sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw==",
"devOptional": true,
"dependencies": {
"safer-buffer": ">= 2.1.2 < 3.0.0"
},
"engines": {
"node": ">=0.10.0"
}
},
"node_modules/ignore": {
"version": "5.2.4",
"resolved": "https://registry.npmjs.org/ignore/-/ignore-5.2.4.tgz",
@@ -5148,25 +5188,6 @@
"tslib": "^2.0.3"
}
},
"node_modules/node-fetch": {
"version": "2.7.0",
"resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.7.0.tgz",
"integrity": "sha512-c4FRfUm/dbcWZ7U+1Wq0AwCyFL+3nt2bEw05wfxSz+DWpWsitgmSgYmy2dQdWyKC1694ELPqMs/YzUSNozLt8A==",
"dependencies": {
"whatwg-url": "^5.0.0"
},
"engines": {
"node": "4.x || >=6.0.0"
},
"peerDependencies": {
"encoding": "^0.1.0"
},
"peerDependenciesMeta": {
"encoding": {
"optional": true
}
}
},
"node_modules/node-fetch-native": {
"version": "1.0.1",
"resolved": "https://registry.npmjs.org/node-fetch-native/-/node-fetch-native-1.0.1.tgz",
@@ -6022,6 +6043,12 @@
"url": "https://github.com/sponsors/ljharb"
}
},
"node_modules/safer-buffer": {
"version": "2.1.2",
"resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz",
"integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==",
"devOptional": true
},
"node_modules/scheduler": {
"version": "0.23.0",
"resolved": "https://registry.npmjs.org/scheduler/-/scheduler-0.23.0.tgz",
@@ -6350,6 +6377,25 @@
"whatwg-fetch": "^3.4.1"
}
},
"node_modules/svix-fetch/node_modules/node-fetch": {
"version": "2.7.0",
"resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.7.0.tgz",
"integrity": "sha512-c4FRfUm/dbcWZ7U+1Wq0AwCyFL+3nt2bEw05wfxSz+DWpWsitgmSgYmy2dQdWyKC1694ELPqMs/YzUSNozLt8A==",
"dependencies": {
"whatwg-url": "^5.0.0"
},
"engines": {
"node": "4.x || >=6.0.0"
},
"peerDependencies": {
"encoding": "^0.1.0"
},
"peerDependenciesMeta": {
"encoding": {
"optional": true
}
}
},
"node_modules/swr": {
"version": "2.2.0",
"resolved": "https://registry.npmjs.org/swr/-/swr-2.2.0.tgz",
+2 -1
View File
@@ -20,6 +20,7 @@
"@types/node": "20.6.0",
"@types/react": "18.2.21",
"@types/react-dom": "18.2.7",
"@types/react-syntax-highlighter": "^15.5.7",
"autoprefixer": "10.4.15",
"codemirror": "^6.0.1",
"convex": "^1.2.1",
@@ -37,6 +38,6 @@
"svix": "^1.11.0",
"tailwindcss": "3.3.3",
"typescript": "5.2.2",
"@types/react-syntax-highlighter": "^15.5.7"
"encoding": "^0.1.13"
}
}
+23 -2
View File
@@ -1,8 +1,29 @@
import UserPosts from '@/components/UserPosts';
import UserProfile from '@/components/UserProfile';
import { getConvexClient } from '@/lib/convex';
import { api } from '../../../../convex/_generated/api';
export default async function UserProfilePage({
params,
}: {
params: { id: string };
}) {
// TODO: Profile page. Display profile and user's post
return <h1>{params.id}</h1>;
const client = await getConvexClient();
const user = await client.query(api.users.getUserByClerkId, {
clerkUserId: params.id,
});
if (user === null) {
// TODO: Show real not found component
return <div>Not Found</div>;
}
return (
<main className='flex flex-col w-full h-full items-center'>
<div className='w-full max-w-4xl'>
<UserProfile user={user} />
<UserPosts user={user} />
</div>
</main>
);
}
+10 -5
View File
@@ -17,12 +17,13 @@ import { api } from '../../convex/_generated/api';
import PostContent from './PostContent';
export default function Editor() {
const user = useUser();
const { user, isSignedIn } = useUser();
const { theme } = useTheme();
const editorTheme = new Compartment();
const [currentDoc, setCurrentDoc] = useState(['']);
const createPost = useMutation(api.posts.createPost);
const router = useRouter();
const [creating, setCreating] = useState(false);
const doc = [''];
const extensions = [
@@ -55,13 +56,15 @@ export default function Editor() {
async function handleSubmit(e: FormEvent<HTMLFormElement>) {
e.preventDefault();
try {
if (user.isSignedIn !== true) {
if (isSignedIn !== true) {
router.push('/login');
return;
}
setCreating(true);
const result = await createPost({
clerkUserId: user.user.id,
clerkUserId: user.id,
content: currentDoc,
});
@@ -76,6 +79,8 @@ export default function Editor() {
}
} catch (error) {
console.log(error);
} finally {
setCreating(false);
}
}
@@ -121,8 +126,8 @@ export default function Editor() {
<div className='flex items-center justify-end p-4 pt-0'>
<button
type='submit'
disabled={!currentDoc.join() || !currentDoc.join().trim()}
className='py-1 px-4 bg-primary-accent text-white rounded-md disabled:opacity-50'
disabled={!currentDoc.join() || !currentDoc.join().trim() || creating}
className='py-1 px-4 bg-primary-accent text-white rounded-md disabled:opacity-50 flex items-center justify-center gap-2'
>
Post
</button>
+3 -14
View File
@@ -1,7 +1,8 @@
import { SignedIn, SignedOut, UserButton, currentUser } from '@clerk/nextjs';
import { SignedIn, SignedOut, currentUser } from '@clerk/nextjs';
import Link from 'next/link';
import { BiSolidMessageSquareAdd } from 'react-icons/bi';
import ThemeButton from './ThemeButton';
import UserButton from './UserButton';
export default async function Navbar() {
const user = await currentUser();
@@ -50,19 +51,7 @@ export default async function Navbar() {
</li>
<SignedIn>
<li>
<UserButton
appearance={{
elements: {
card: 'dark:bg-secondary-gray [&_*]:dark:text-white',
userButtonTrigger:
'border-solid border-2 border-primary-accent focus:shadow-none',
},
}}
userProfileMode='navigation'
userProfileUrl='/account'
signInUrl='/login'
afterSignOutUrl='/'
/>
<UserButton />
</li>
</SignedIn>
<SignedOut>
+55
View File
@@ -0,0 +1,55 @@
import { Text } from '@codemirror/state';
import { useQuery } from 'convex/react';
import Image from 'next/image';
import { api } from '../../convex/_generated/api';
import { Doc } from '../../convex/_generated/dataModel';
import PostContent from './PostContent';
import SpinningLoader from './SpinningLoader';
export default function Post({ post }: { post: Doc<'posts'> }) {
const user = useQuery(api.users.getUserById, { id: post.userId });
if (user === undefined) {
return (
<div>
<SpinningLoader className='animate-spin w-5 h-5' />
</div>
);
}
if (user === 'USER_NOT_FOUND') {
return <div>User for post not found</div>;
}
const username = user.clerkUser.username ?? user._id;
const createdPostDate = new Date(post._creationTime);
const postYear = createdPostDate.getFullYear();
const postMonth = createdPostDate.toLocaleString(undefined, {
month: 'short',
});
const dayOfMonth = createdPostDate.getDate();
return (
<div className='flex w-full h-full gap-4 p-8 bg-white dark:bg-secondary-gray border border-gray-600'>
<div>
<Image
alt='user profile image'
src={user.clerkUser.image_url}
width={40}
height={40}
className='rounded-full object-cover border-4 border-primary-accent'
/>
</div>
<div className='flex flex-col gap-2'>
<div className='flex items-center gap-2'>
<div>{username}</div>
<div className='text-xs'>{`${postMonth} ${dayOfMonth}, ${postYear}`}</div>
</div>
<div>
<PostContent content={Text.of(post.content).toString()} />
</div>
<div></div>
</div>
</div>
);
}
+5
View File
@@ -0,0 +1,5 @@
import { ImSpinner2 } from 'react-icons/im';
export default function SpinningLoader({ className }: { className: string }) {
return <ImSpinner2 className={className} />;
}
+3 -4
View File
@@ -1,16 +1,15 @@
'use client';
import { useMountedEffect } from '@/hooks';
import { useTheme } from 'next-themes';
import { useEffect, useState } from 'react';
import { BsMoonStarsFill, BsSunFill } from 'react-icons/bs';
import { ImSpinner2 } from 'react-icons/im';
export default function ThemeButton() {
const [mounted, setMounted] = useState(false);
const { mounted, Loader } = useMountedEffect();
const { theme, setTheme } = useTheme();
useEffect(() => setMounted(true), []);
const isDark = theme === 'dark';
return (
@@ -19,7 +18,7 @@ export default function ThemeButton() {
onClick={() => setTheme(isDark ? 'light' : 'dark')}
>
{mounted === false ? (
<ImSpinner2 className='w-5 h-5 animate-spin' />
<Loader className='animate-spin w-5 h-5' />
) : isDark ? (
<BsMoonStarsFill className='w-5 h-5' />
) : (
+27
View File
@@ -0,0 +1,27 @@
'use client';
import { useMountedEffect } from '@/hooks';
import { UserButton as ClerkUserButton } from '@clerk/nextjs';
export default function UserButton() {
const { mounted } = useMountedEffect();
if (mounted === false) {
return;
}
return (
<ClerkUserButton
appearance={{
elements: {
card: 'dark:bg-secondary-gray [&_*]:dark:text-white',
userButtonTrigger:
'border-solid border-2 border-primary-accent focus:shadow-none',
},
}}
userProfileMode='navigation'
userProfileUrl='/account'
signInUrl='/login'
afterSignOutUrl='/'
/>
);
}
+38
View File
@@ -0,0 +1,38 @@
'use client';
import { usePaginatedQuery } from 'convex/react';
import { api } from '../../convex/_generated/api';
import { Doc } from '../../convex/_generated/dataModel';
import Post from './Post';
export default function UserPosts({ user }: { user: Doc<'users'> }) {
const PAGE_SIZE = 10;
const pager = usePaginatedQuery(
api.posts.getUsersPostById,
{
userId: user._id,
},
{ initialNumItems: 10 }
);
return (
<div className='flex flex-col w-full h-full'>
{pager.results.map(post => (
<Post
key={post._id}
post={post}
/>
))}
{pager.isLoading ? (
<div>Loading...</div>
) : (
<button
onClick={() => pager.loadMore(10)}
disabled={pager.status !== 'CanLoadMore'}
>
Load More
</button>
)}
</div>
);
}
+38
View File
@@ -0,0 +1,38 @@
import Image from 'next/image';
import { AiFillCalendar } from 'react-icons/ai';
import { Doc } from '../../convex/_generated/dataModel';
export default function UserProfile({ user }: { user: Doc<'users'> }) {
const username = user.clerkUser.username ?? user._id;
const userCreatedDate = new Date(user._creationTime);
const monthJoined = userCreatedDate.toLocaleString(undefined, {
month: 'short',
});
const yearJoined = userCreatedDate.getFullYear();
return (
<div className='w-full'>
<div className='shadow-md bg-gradient-to-r from-violet-600 via-violet-600 to-indigo-600 rounded-t-md pt-20 pl-5 pr-40'>
<div className='flex items-center gap-4 -mb-[25px]'>
<div>
<Image
alt='user profile image'
src={user.clerkUser.image_url}
width={100}
height={100}
className='rounded-full object-cover border-4 border-primary-accent'
/>
</div>
<div>
<h1 className='font-bold'>{username}</h1>
<div className='flex gap-2 items-center text-sm'>
<AiFillCalendar className='w-4 h-4' />
{`Joined ${monthJoined} ${yearJoined}`}
</div>
</div>
</div>
</div>
<div className='h-[50px] bg-white dark:bg-primary-gray pl-5 pr-40 border border-gray-600'></div>
</div>
);
}
+10 -1
View File
@@ -1,3 +1,4 @@
import SpinningLoader from '@/components/SpinningLoader';
import { EditorState, Extension, Text } from '@codemirror/state';
import { EditorView } from '@codemirror/view';
import { useEffect, useRef, useState } from 'react';
@@ -30,7 +31,15 @@ export function useCodeMirror({
setEditorView(view);
return () => view.destroy();
// eslint-disable-next-line react-hooks/exhaustive-deps
}, [editorRef]);
}, [editorRef.current]);
return { editorRef, editorView };
}
export function useMountedEffect() {
const [mounted, setMounted] = useState(false);
useEffect(() => setMounted(true), []);
return { mounted, Loader: SpinningLoader };
}
+22
View File
@@ -0,0 +1,22 @@
import { auth } from '@clerk/nextjs';
import { ConvexHttpClient } from 'convex/browser';
export async function getConvexClient() {
const { user, getToken } = auth();
const token = await getToken({ template: 'convex' });
if (token === null || user === null) {
throw new Error('NOT_AUTHORIZED');
}
const CONVEX_URL = process.env.NEXT_PUBLIC_CONVEX_URL;
if (CONVEX_URL === undefined) {
throw new Error('NEXT_PUBLIC_CONVEX_URL is undefined');
}
const client = new ConvexHttpClient(CONVEX_URL);
client.setAuth(token);
return client;
}
+3
View File
@@ -0,0 +1,3 @@
export function getFullMonth() {
const monthMap = {};
}