+
{children}
diff --git a/src/app/myfeed/page.tsx b/src/app/myfeed/page.tsx
new file mode 100644
index 00000000..49f4dc84
--- /dev/null
+++ b/src/app/myfeed/page.tsx
@@ -0,0 +1,50 @@
+import { redirect } from 'next/navigation'
+import CustomFeed from '@/components/homepage/CustomFeed'
+import { buttonVariants } from '@/components/ui/Button'
+import { Home as HomeIcon } from 'lucide-react'
+import Link from 'next/link'
+import { authOptions, getAuthSession } from '@/lib/auth'
+
+export default async function MyFeed() {
+ const session = await getAuthSession()
+ if (!session?.user) {
+ redirect(authOptions?.pages?.signIn || '/login')
+ }
+ const PostCustomFeed = await CustomFeed();
+ return (
+ <>
+
我的关注
+
+ {/* @ ts-expect-error server component */}
+ {/* {session ?
:
} */}
+ {PostCustomFeed}
+
+
+ {/* subreddit info */}
+
+
+
+ )
+}
diff --git a/src/app/page.tsx b/src/app/page.tsx
index 1f388356..37ba5dd6 100644
--- a/src/app/page.tsx
+++ b/src/app/page.tsx
@@ -1,4 +1,4 @@
-import CustomFeed from '@/components/homepage/CustomFeed'
+// import CustomFeed from '@/components/homepage/CustomFeed'
import GeneralFeed from '@/components/homepage/GeneralFeed'
import { buttonVariants } from '@/components/ui/Button'
import { getAuthSession } from '@/lib/auth'
@@ -10,27 +10,31 @@ export const fetchCache = 'force-no-store'
export default async function Home() {
const session = await getAuthSession()
-
+ const PostFeed = await GeneralFeed();
return (
<>
-
Your feed
+
+ 开始分享你的绘画
+
+ {/*
分享你的绘画
*/}
- {/* @ts-expect-error server component */}
- {session ?
:
}
+ {/* @ ts-expect-error server component */}
+ {/* {session ?
:
} */}
+ {PostFeed}
+
{/* subreddit info */}
-
+ { session &&
- Your personal Breadit frontpage. Come here to check in with your
- favorite communities.
+ 创建属于你的版块
@@ -39,10 +43,10 @@ export default async function Home() {
className: 'w-full mt-4 mb-6',
})}
href={`/r/create`}>
- Create Community
+ 创建版块
-
+
}
)
diff --git a/src/app/r/[slug]/layout.tsx b/src/app/r/[slug]/layout.tsx
index 824b5faf..b122cee2 100644
--- a/src/app/r/[slug]/layout.tsx
+++ b/src/app/r/[slug]/layout.tsx
@@ -10,7 +10,7 @@ import { notFound } from 'next/navigation'
import { ReactNode } from 'react'
export const metadata: Metadata = {
- title: 'Breadit',
+ title: '绘园',
description: 'A Reddit clone built with Next.js and TypeScript.',
}
@@ -22,9 +22,10 @@ const Layout = async ({
params: { slug: string }
}) => {
const session = await getAuthSession()
+ const decodedSlug = decodeURIComponent(slug);
const subreddit = await db.subreddit.findFirst({
- where: { name: slug },
+ where: { name: decodedSlug },
include: {
posts: {
include: {
@@ -40,7 +41,7 @@ const Layout = async ({
: await db.subscription.findFirst({
where: {
subreddit: {
- name: slug,
+ name: decodedSlug,
},
user: {
id: session.user.id,
@@ -55,13 +56,13 @@ const Layout = async ({
const memberCount = await db.subscription.count({
where: {
subreddit: {
- name: slug,
+ name: decodedSlug,
},
},
})
return (
-
+
@@ -71,26 +72,26 @@ const Layout = async ({
{/* info sidebar */}
-
About r/{subreddit.name}
+
版块/{subreddit.name}
-
- Created
+ - 创建于
-
-
- Members
+
- 已关注
-
-
{memberCount}
+ {memberCount}人
-
- You created this community
+ - 你创造了这个版块
) : null}
@@ -106,8 +107,8 @@ const Layout = async ({
variant: 'outline',
className: 'w-full mb-6',
})}
- href={`r/${slug}/submit`}>
- Create Post
+ href={`r/${decodedSlug}/submit`}>
+ 发布帖子
diff --git a/src/app/r/[slug]/page.tsx b/src/app/r/[slug]/page.tsx
index f823b64f..f82c07ac 100644
--- a/src/app/r/[slug]/page.tsx
+++ b/src/app/r/[slug]/page.tsx
@@ -13,11 +13,11 @@ interface PageProps {
const page = async ({ params }: PageProps) => {
const { slug } = params
-
+ const decodedSlug = decodeURIComponent(slug);
const session = await getAuthSession()
const subreddit = await db.subreddit.findFirst({
- where: { name: slug },
+ where: { name: decodedSlug },
include: {
posts: {
include: {
@@ -38,8 +38,9 @@ const page = async ({ params }: PageProps) => {
return (
<>
+ {/*
版块/ */}
- r/{subreddit.name}
+ {subreddit.name}
diff --git a/src/app/r/[slug]/post/[postId]/page.tsx b/src/app/r/[slug]/post/[postId]/page.tsx
index 484fab15..8de5f5bb 100644
--- a/src/app/r/[slug]/post/[postId]/page.tsx
+++ b/src/app/r/[slug]/post/[postId]/page.tsx
@@ -1,31 +1,47 @@
-import CommentsSection from '@/components/CommentsSection'
-import EditorOutput from '@/components/EditorOutput'
-import PostVoteServer from '@/components/post-vote/PostVoteServer'
-import { buttonVariants } from '@/components/ui/Button'
-import { db } from '@/lib/db'
-import { redis } from '@/lib/redis'
-import { formatTimeToNow } from '@/lib/utils'
-import { CachedPost } from '@/types/redis'
-import { Post, User, Vote } from '@prisma/client'
-import { ArrowBigDown, ArrowBigUp, Loader2 } from 'lucide-react'
-import { notFound } from 'next/navigation'
-import { Suspense } from 'react'
+import CommentsSection from "@/components/CommentsSection";
+import EditorOutput from "@/components/EditorOutput";
+import PostVoteServer from "@/components/post-vote/PostVoteServer";
+import { buttonVariants } from "@/components/ui/Button";
+import { db } from "@/lib/db";
+import { redis } from "@/lib/redis";
+import { formatTimeToNow } from "@/lib/utils";
+import { CachedPost } from "@/types/redis";
+import { Post, User, Vote } from "@prisma/client";
+import { ArrowBigDown, ArrowBigUp, Loader2 } from "lucide-react";
+import { notFound } from "next/navigation";
+import { Suspense } from "react";
interface SubRedditPostPageProps {
params: {
- postId: string
- }
+ postId: string;
+ };
}
-export const dynamic = 'force-dynamic'
-export const fetchCache = 'force-no-store'
+export const dynamic = "force-dynamic";
+export const fetchCache = "force-no-store";
const SubRedditPostPage = async ({ params }: SubRedditPostPageProps) => {
- const cachedPost = (await redis.hgetall(
- `post:${params.postId}`
- )) as CachedPost
-
- let post: (Post & { votes: Vote[]; author: User }) | null = null
+ let cachedPost: CachedPost | null = null;
+ console.log("params", params)
+ try {
+ const result = await redis.hGetAll(`post:${params.postId}`);
+ console.log("result")
+ console.log(result)
+ if (Object.keys(result).length) {
+ // Ensure the result is of the expected type, or convert it as necessary
+ cachedPost = result as unknown as CachedPost;
+ console.log("cachedPost");
+ console.log(cachedPost);
+ } else {
+ // Handle the case where the hash does not exist or is empty
+ console.log(`Post with ID ${params.postId} not found in cache.`);
+ }
+ } catch (error) {
+ console.error(`Error fetching post from Redis: ${error}`);
+ }
+ let post: (Post & { votes: Vote[]; author: User }) | null = null;
+ console.log(post);
+ console.log(!cachedPost);
if (!cachedPost) {
post = await db.post.findFirst({
@@ -36,18 +52,42 @@ const SubRedditPostPage = async ({ params }: SubRedditPostPageProps) => {
votes: true,
author: true,
},
- })
+ });
}
+ console.log("2");
- if (!post && !cachedPost) return notFound()
+ const postId = post?.id ?? cachedPost?.id;
+ console.log(postId);
+ if (!postId) return notFound();
return (
-
+
+
+
+
+
+ 发表于
+ {(post?.createdAt ?? cachedPost?.createdAt) &&
+ formatTimeToNow(
+ new Date((post?.createdAt ?? cachedPost?.createdAt)!)
+ )}{" "}
+ /{" "}{post?.author.name ?? cachedPost?.authorUsername}
+
+
+ {post?.title ?? cachedPost?.title}
+
+
+
+ {/*
comment here
*/}
+
+
+
+
}>
{/* @ts-expect-error server component */}
{
return await db.post.findUnique({
where: {
@@ -56,53 +96,43 @@ const SubRedditPostPage = async ({ params }: SubRedditPostPageProps) => {
include: {
votes: true,
},
- })
+ });
}}
/>
-
-
-
- Posted by u/{post?.author.username ?? cachedPost.authorUsername}{' '}
- {formatTimeToNow(new Date(post?.createdAt ?? cachedPost.createdAt))}
-
-
- {post?.title ?? cachedPost.title}
-
-
-
-
- }>
- {/* @ts-expect-error Server Component */}
-
-
-
+
+
+ }
+ >
+ {/* @ts-expect-error Server Component */}
+
+
- )
-}
+ );
+};
function PostVoteShell() {
return (
-
+
{/* upvote */}
-
-
+
{/* score */}
-
-
+
+
{/* downvote */}
-
- )
+ );
}
-export default SubRedditPostPage
+export default SubRedditPostPage;
\ No newline at end of file
diff --git a/src/app/r/[slug]/submit/page.tsx b/src/app/r/[slug]/submit/page.tsx
index 9acde787..783a3314 100644
--- a/src/app/r/[slug]/submit/page.tsx
+++ b/src/app/r/[slug]/submit/page.tsx
@@ -10,9 +10,10 @@ interface pageProps {
}
const page = async ({ params }: pageProps) => {
+ const decodedSlug = decodeURIComponent(params.slug);
const subreddit = await db.subreddit.findFirst({
where: {
- name: params.slug,
+ name: decodedSlug,
},
})
@@ -24,10 +25,10 @@ const page = async ({ params }: pageProps) => {
- Create Post
+ 创建帖子
- in r/{params.slug}
+ 版块/{decodedSlug}
@@ -37,7 +38,7 @@ const page = async ({ params }: pageProps) => {
diff --git a/src/app/r/create/page.tsx b/src/app/r/create/page.tsx
index 1b6c42aa..5a5c3f71 100644
--- a/src/app/r/create/page.tsx
+++ b/src/app/r/create/page.tsx
@@ -28,16 +28,16 @@ const Page = () => {
if (err instanceof AxiosError) {
if (err.response?.status === 409) {
return toast({
- title: 'Subreddit already exists.',
- description: 'Please choose a different name.',
+ title: '版块名已存在.',
+ description: '请重新输入一个版块名称.',
variant: 'destructive',
})
}
if (err.response?.status === 422) {
return toast({
- title: 'Invalid subreddit name.',
- description: 'Please choose a name between 3 and 21 letters.',
+ title: '版块名错误.',
+ description: '版块名长度需要在1到21个字符之间.',
variant: 'destructive',
})
}
@@ -48,8 +48,8 @@ const Page = () => {
}
toast({
- title: 'There was an error.',
- description: 'Could not create subreddit.',
+ title: '出错了.',
+ description: '不能创版块.',
variant: 'destructive',
})
},
@@ -62,24 +62,24 @@ const Page = () => {
-
Create a Community
+ 创建新版块
-
Name
+
请填写版块名称
- Community names including capitalization cannot be changed.
+ 名称不能为空
-
- r/
+
+ 版块/
setInput(e.target.value)}
- className='pl-6'
+ className='pl-10'
/>
@@ -89,13 +89,13 @@ const Page = () => {
disabled={isLoading}
variant='subtle'
onClick={() => router.back()}>
- Cancel
+ 取消
diff --git a/src/app/settings/page.tsx b/src/app/settings/page.tsx
index f9f3160d..57be2423 100644
--- a/src/app/settings/page.tsx
+++ b/src/app/settings/page.tsx
@@ -16,15 +16,15 @@ export default async function SettingsPage() {
}
return (
-
+
-
Settings
+
设置
diff --git a/src/app/weixin-callback/page.tsx b/src/app/weixin-callback/page.tsx
new file mode 100644
index 00000000..17733c5c
--- /dev/null
+++ b/src/app/weixin-callback/page.tsx
@@ -0,0 +1,64 @@
+'use client'
+
+import { signIn } from 'next-auth/react';
+import { FC,useEffect } from 'react'
+
+const page : FC = () => {
+
+ // eslint-disable-next-line react-hooks/rules-of-hooks
+ useEffect(() => {
+ // 在这里处理微信回调的逻辑
+ // 解析查询参数，执行身份验证等
+ const queryParams = new URLSearchParams(window.location.search);
+ const code = queryParams.get('code');
+ const state = queryParams.get('state');
+
+ // 示例：输出获取到的 code 和 state 参数
+ console.log('code:', code);
+ console.log('state:', state);
+
+
+ if (!code) {
+ console.error('code is missing in environment variables.');
+ return;
+ }
+
+ // 调用你的自定义 API
+ fetch(`/api/weixinauth?code=${code}&state=${state}`)
+ .then(response => response.json())
+ .then(data => {
+ // 假设返回的数据中包含了必要的用户信息
+ console.log(JSON.stringify(data));
+
+ // 检查 data 是否包含必要字段
+ if (data && data.openid && data.nickname) {
+ // 使用 signIn 完成登录
+ signIn('weixin', {
+ redirect: true,
+ ...data
+ });
+ } else {
+ console.error('Required data is missing');
+ }
+
+ })
+ .catch(error => {
+ console.error('Error while signing in:', error);
+ });
+
+
+
+
+ }, []);
+
+
+ return (
+
+
绘画是心灵的事务，不是手的事务
+
+
登录中，请稍后...
+
+ );
+};
+
+export default page;
\ No newline at end of file
diff --git a/src/components/CommentsSection.tsx b/src/components/CommentsSection.tsx
index 557f5670..a8c41345 100644
--- a/src/components/CommentsSection.tsx
+++ b/src/components/CommentsSection.tsx
@@ -42,8 +42,8 @@ const CommentsSection = async ({ postId }: CommentsSectionProps) => {
})
return (
-
-
+
+
diff --git a/src/components/CreateComment.tsx b/src/components/CreateComment.tsx
index f8c94cde..ab763da1 100644
--- a/src/components/CreateComment.tsx
+++ b/src/components/CreateComment.tsx
@@ -54,14 +54,14 @@ const CreateComment: FC
= ({ postId, replyToId }) => {
return (