Новое измнений в код
This commit is contained in:
Web-serfer
parent
735146fbfb
commit
aa40fac43b
4 changed files with 337 additions and 274 deletions
|
|
@ -27,6 +27,12 @@ interface ApiComment {
|
|||
};
|
||||
}
|
||||
|
||||
// Тип для toast-уведомлений
|
||||
interface ToastMessage {
|
||||
type: "success" | "error";
|
||||
message: string;
|
||||
}
|
||||
|
||||
export default function Comments(props: CommentsProps) {
|
||||
const [isAuthenticated, setIsAuthenticated] = createSignal(false);
|
||||
const [currentUser, setCurrentUser] = createSignal<{
|
||||
|
|
@ -39,6 +45,15 @@ export default function Comments(props: CommentsProps) {
|
|||
const [replyTo, setReplyTo] = createSignal<string | null>(null);
|
||||
const [commentAuthors, setCommentAuthors] = createSignal<Record<string, string>>({});
|
||||
const [toastVisible, setToastVisible] = createSignal<string | null>(null);
|
||||
// Добавляем сигнал для toast-уведомлений
|
||||
const [toast, setToast] = createSignal<ToastMessage | null>(null);
|
||||
|
||||
// Функция показа toast-уведомлений
|
||||
const showToast = (message: ToastMessage): void => {
|
||||
setToast(message);
|
||||
// Автоматически скрываем через 3 секунды
|
||||
setTimeout(() => setToast(null), 3000);
|
||||
};
|
||||
|
||||
onMount(async () => {
|
||||
console.log("[Comments] Начало проверки авторизации...");
|
||||
|
|
@ -68,8 +83,8 @@ export default function Comments(props: CommentsProps) {
|
|||
} finally {
|
||||
setIsLoading(false);
|
||||
console.log(
|
||||
"[Comments] Загрузка завершена, isAuthenticated:",
|
||||
isAuthenticated()
|
||||
"[Comments] Загрузка завершена, isAuthenticated:",
|
||||
isAuthenticated()
|
||||
);
|
||||
}
|
||||
});
|
||||
|
|
@ -77,11 +92,11 @@ export default function Comments(props: CommentsProps) {
|
|||
const loadComments = async () => {
|
||||
try {
|
||||
const response = await fetch(
|
||||
`/api/comments?post_slug=${encodeURIComponent(props.postSlug)}&parent=null`,
|
||||
{
|
||||
method: "GET",
|
||||
credentials: "include",
|
||||
}
|
||||
`/api/comments?post_slug=${encodeURIComponent(props.postSlug)}&parent=null`,
|
||||
{
|
||||
method: "GET",
|
||||
credentials: "include",
|
||||
}
|
||||
);
|
||||
|
||||
if (!response.ok) {
|
||||
|
|
@ -101,20 +116,20 @@ export default function Comments(props: CommentsProps) {
|
|||
setCommentAuthors(authors);
|
||||
|
||||
const commentsWithReplies: CommentWithReplies[] = await Promise.all(
|
||||
data.items.map(async (comment: ApiComment) => {
|
||||
const repliesResponse = await fetch(
|
||||
`/api/comments?post_slug=${encodeURIComponent(props.postSlug)}&parent=${comment.id}`,
|
||||
{
|
||||
method: "GET",
|
||||
credentials: "include",
|
||||
}
|
||||
);
|
||||
const repliesData = await repliesResponse.json();
|
||||
return {
|
||||
...comment,
|
||||
replies: repliesData.items || [],
|
||||
};
|
||||
})
|
||||
data.items.map(async (comment: ApiComment) => {
|
||||
const repliesResponse = await fetch(
|
||||
`/api/comments?post_slug=${encodeURIComponent(props.postSlug)}&parent=${comment.id}`,
|
||||
{
|
||||
method: "GET",
|
||||
credentials: "include",
|
||||
}
|
||||
);
|
||||
const repliesData = await repliesResponse.json();
|
||||
return {
|
||||
...comment,
|
||||
replies: repliesData.items || [],
|
||||
};
|
||||
})
|
||||
);
|
||||
|
||||
setComments(commentsWithReplies);
|
||||
|
|
@ -157,8 +172,8 @@ export default function Comments(props: CommentsProps) {
|
|||
};
|
||||
|
||||
const handleReply = async (
|
||||
commentId: string,
|
||||
data: { content: string }
|
||||
commentId: string,
|
||||
data: { content: string }
|
||||
) => {
|
||||
try {
|
||||
const response = await fetch("/api/comments", {
|
||||
|
|
@ -228,22 +243,22 @@ export default function Comments(props: CommentsProps) {
|
|||
const sizeClasses = { sm: "w-8 h-8 text-sm", md: "w-12 h-12 text-lg" };
|
||||
|
||||
return (
|
||||
<Show
|
||||
when={props.avatar}
|
||||
fallback={
|
||||
<div
|
||||
class={`${sizeClasses[size]} rounded-full bg-linear-to-br from-blue-400 to-blue-600 flex items-center justify-center text-white font-bold shrink-0`}
|
||||
>
|
||||
{props.author.charAt(0)}
|
||||
</div>
|
||||
}
|
||||
>
|
||||
<img
|
||||
src={props.avatar}
|
||||
alt={props.author}
|
||||
class={`${sizeClasses[size]} rounded-full object-cover shrink-0`}
|
||||
/>
|
||||
</Show>
|
||||
<Show
|
||||
when={props.avatar}
|
||||
fallback={
|
||||
<div
|
||||
class={`${sizeClasses[size]} rounded-full bg-linear-to-br from-blue-400 to-blue-600 flex items-center justify-center text-white font-bold shrink-0`}
|
||||
>
|
||||
{props.author.charAt(0)}
|
||||
</div>
|
||||
}
|
||||
>
|
||||
<img
|
||||
src={props.avatar}
|
||||
alt={props.author}
|
||||
class={`${sizeClasses[size]} rounded-full object-cover shrink-0`}
|
||||
/>
|
||||
</Show>
|
||||
);
|
||||
};
|
||||
|
||||
|
|
@ -259,164 +274,179 @@ export default function Comments(props: CommentsProps) {
|
|||
};
|
||||
|
||||
return (
|
||||
<>
|
||||
{isLoading() ? (
|
||||
<div class="max-w-4xl mx-auto mt-12 pt-8 border-t border-gray-200">
|
||||
<div class="flex items-center gap-3 mb-8">
|
||||
<h3 class="text-2xl font-bold text-gray-900">Комментарии</h3>
|
||||
<span class="px-3 py-1 bg-blue-100 text-blue-700 text-sm font-medium rounded-full">
|
||||
<>
|
||||
{/* Глобальное toast-уведомление */}
|
||||
<Show when={toast()}>
|
||||
{(t) => (
|
||||
<div
|
||||
class={`fixed bottom-4 right-4 px-6 py-3 rounded-xl shadow-lg transition-all duration-300 z-50 ${
|
||||
t().type === "success"
|
||||
? "bg-green-500 text-white"
|
||||
: "bg-red-500 text-white"
|
||||
}`}
|
||||
>
|
||||
{t().message}
|
||||
</div>
|
||||
)}
|
||||
</Show>
|
||||
|
||||
{isLoading() ? (
|
||||
<div class="max-w-4xl mx-auto mt-12 pt-8 border-t border-gray-200">
|
||||
<div class="flex items-center gap-3 mb-8">
|
||||
<h3 class="text-2xl font-bold text-gray-900">Комментарии</h3>
|
||||
<span class="px-3 py-1 bg-blue-100 text-blue-700 text-sm font-medium rounded-full">
|
||||
0
|
||||
</span>
|
||||
</div>
|
||||
<div class="text-center py-12">
|
||||
<div class="inline-block animate-spin rounded-full h-12 w-12 border-4 border-blue-600 border-t-transparent"></div>
|
||||
<p class="mt-4 text-gray-600">Загрузка...</p>
|
||||
</div>
|
||||
</div>
|
||||
) : (
|
||||
<Show when={isAuthenticated()} fallback={<CommentLock />}>
|
||||
<div class="max-w-4xl mx-auto mt-12 pt-8 border-t border-gray-200">
|
||||
<div class="flex items-center gap-3 mb-8">
|
||||
<h3 class="text-2xl font-bold text-gray-900">Комментарии</h3>
|
||||
<span class="px-3 py-1 bg-blue-100 text-blue-700 text-sm font-medium rounded-full">
|
||||
</div>
|
||||
<div class="text-center py-12">
|
||||
<div class="inline-block animate-spin rounded-full h-12 w-12 border-4 border-blue-600 border-t-transparent"></div>
|
||||
<p class="mt-4 text-gray-600">Загрузка...</p>
|
||||
</div>
|
||||
</div>
|
||||
) : (
|
||||
<Show when={isAuthenticated()} fallback={<CommentLock />}>
|
||||
<div class="max-w-4xl mx-auto mt-12 pt-8 border-t border-gray-200">
|
||||
<div class="flex items-center gap-3 mb-8">
|
||||
<h3 class="text-2xl font-bold text-gray-900">Комментарии</h3>
|
||||
<span class="px-3 py-1 bg-blue-100 text-blue-700 text-sm font-medium rounded-full">
|
||||
{comments().length}
|
||||
</span>
|
||||
</div>
|
||||
|
||||
<Show
|
||||
when={comments().length > 0}
|
||||
fallback={
|
||||
<div class="text-center py-12 text-gray-500">
|
||||
<p>Пока нет комментариев. Будьте первым!</p>
|
||||
</div>
|
||||
}
|
||||
>
|
||||
<div class="space-y-6 mb-10">
|
||||
<For each={comments()}>
|
||||
{(comment) => (
|
||||
<div class="bg-white rounded-2xl p-6 shadow-sm border border-gray-100">
|
||||
<div class="flex items-start gap-4">
|
||||
<Avatar
|
||||
author={comment.expand?.user?.name || "Аноним"}
|
||||
avatar={comment.expand?.user?.avatar}
|
||||
/>
|
||||
<div class="flex-1 min-w-0">
|
||||
<div class="flex items-center gap-2 mb-2 flex-wrap">
|
||||
|
||||
<Show
|
||||
when={comments().length > 0}
|
||||
fallback={
|
||||
<div class="text-center py-12 text-gray-500">
|
||||
<p>Пока нет комментариев. Будьте первым!</p>
|
||||
</div>
|
||||
}
|
||||
>
|
||||
<div class="space-y-6 mb-10">
|
||||
<For each={comments()}>
|
||||
{(comment) => (
|
||||
<div class="bg-white rounded-2xl p-6 shadow-sm border border-gray-100">
|
||||
<div class="flex items-start gap-4">
|
||||
<Avatar
|
||||
author={comment.expand?.user?.name || "Аноним"}
|
||||
avatar={comment.expand?.user?.avatar}
|
||||
/>
|
||||
<div class="flex-1 min-w-0">
|
||||
<div class="flex items-center gap-2 mb-2 flex-wrap">
|
||||
<span class="font-semibold text-gray-900">
|
||||
{comment.expand?.user?.name || "Аноним"}
|
||||
</span>
|
||||
<Show when={comment.is_verified}>
|
||||
<svg
|
||||
class="w-4 h-4 text-blue-500"
|
||||
fill="currentColor"
|
||||
viewBox="0 0 20 20"
|
||||
>
|
||||
<path
|
||||
fill-rule="evenodd"
|
||||
d="M10 18a8 8 0 100-16 8 8 0 000 16zm3.707-9.293a1 1 0 00-1.414-1.414L9 10.586 7.707 9.293a1 1 0 00-1.414 1.414l2 2a1 1 0 001.414 0l4-4z"
|
||||
clip-rule="evenodd"
|
||||
/>
|
||||
</svg>
|
||||
</Show>
|
||||
<span class="text-sm text-gray-400 ml-auto">
|
||||
{formatDate(comment.created)}
|
||||
</span>
|
||||
</div>
|
||||
<p class="text-gray-700 leading-relaxed mb-3">
|
||||
{comment.content}
|
||||
</p>
|
||||
<div class="flex items-center gap-1">
|
||||
<button
|
||||
onClick={() => handleReplyClick(comment.id)}
|
||||
class="text-sm text-blue-600 hover:text-blue-800 font-medium flex items-center gap-1 transition-colors hover:cursor-pointer"
|
||||
>
|
||||
<svg
|
||||
class="w-4 h-4"
|
||||
fill="none"
|
||||
stroke="currentColor"
|
||||
viewBox="0 0 24 24"
|
||||
>
|
||||
<path
|
||||
stroke-linecap="round"
|
||||
stroke-linejoin="round"
|
||||
stroke-width="2"
|
||||
d="M3 10h10a8 8 0 018 8v2M3 10l6 6m-6-6l6-6"
|
||||
/>
|
||||
</svg>
|
||||
{replyTo() === comment.id ? "Отменить" : "Ответить"}
|
||||
</button>
|
||||
<Show when={toastVisible() === comment.id}>
|
||||
<span class="text-xs text-yellow-700 bg-yellow-100 px-2 py-1 rounded-md whitespace-nowrap animate-slide-in">
|
||||
⚠️ Нельзя ответить на свой комментарий
|
||||
</span>
|
||||
</Show>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<Show when={replyTo() === comment.id}>
|
||||
<div class="mt-4 ml-16 pl-4 border-l-2 border-blue-200">
|
||||
<CommentForm
|
||||
isReply={true}
|
||||
onSubmit={(data) => handleReply(comment.id, data)}
|
||||
onCancel={() => setReplyTo(null)}
|
||||
user={currentUser()}
|
||||
/>
|
||||
</div>
|
||||
</Show>
|
||||
|
||||
<Show when={comment.replies && comment.replies.length > 0}>
|
||||
<div class="mt-4 ml-16 space-y-4">
|
||||
<For each={comment.replies}>
|
||||
{(reply) => (
|
||||
<div class="flex items-start gap-3 pl-4 border-l-2 border-gray-200">
|
||||
<Avatar
|
||||
author={reply.expand?.user?.name || "Аноним"}
|
||||
avatar={reply.expand?.user?.avatar}
|
||||
size="sm"
|
||||
/>
|
||||
<div class="flex-1 bg-gray-50 rounded-xl p-4">
|
||||
<div class="flex items-center gap-2 mb-1 flex-wrap">
|
||||
<span class="font-semibold text-gray-900 text-sm">
|
||||
{reply.expand?.user?.name || "Аноним"}
|
||||
</span>
|
||||
<Show when={reply.is_verified}>
|
||||
<svg
|
||||
class="w-3 h-3 text-blue-500"
|
||||
<Show when={comment.is_verified}>
|
||||
<svg
|
||||
class="w-4 h-4 text-blue-500"
|
||||
fill="currentColor"
|
||||
viewBox="0 0 20 20"
|
||||
>
|
||||
<path
|
||||
>
|
||||
<path
|
||||
fill-rule="evenodd"
|
||||
d="M10 18a8 8 0 100-16 8 8 0 000 16zm3.707-9.293a1 1 0 00-1.414-1.414L9 10.586 7.707 9.293a1 1 0 00-1.414 1.414l2 2a1 1 0 001.414 0l4-4z"
|
||||
clip-rule="evenodd"
|
||||
/>
|
||||
</svg>
|
||||
</Show>
|
||||
<span class="text-xs text-gray-400 ml-auto">
|
||||
{formatDate(reply.created)}
|
||||
</span>
|
||||
</div>
|
||||
<p class="text-gray-700 text-sm leading-relaxed">
|
||||
{reply.content}
|
||||
</p>
|
||||
/>
|
||||
</svg>
|
||||
</Show>
|
||||
<span class="text-sm text-gray-400 ml-auto">
|
||||
{formatDate(comment.created)}
|
||||
</span>
|
||||
</div>
|
||||
<p class="text-gray-700 leading-relaxed mb-3">
|
||||
{comment.content}
|
||||
</p>
|
||||
<div class="flex items-center gap-1">
|
||||
<button
|
||||
onClick={() => handleReplyClick(comment.id)}
|
||||
class="text-sm text-blue-600 hover:text-blue-800 font-medium flex items-center gap-1 transition-colors hover:cursor-pointer"
|
||||
>
|
||||
<svg
|
||||
class="w-4 h-4"
|
||||
fill="none"
|
||||
stroke="currentColor"
|
||||
viewBox="0 0 24 24"
|
||||
>
|
||||
<path
|
||||
stroke-linecap="round"
|
||||
stroke-linejoin="round"
|
||||
stroke-width="2"
|
||||
d="M3 10h10a8 8 0 018 8v2M3 10l6 6m-6-6l6-6"
|
||||
/>
|
||||
</svg>
|
||||
{replyTo() === comment.id ? "Отменить" : "Ответить"}
|
||||
</button>
|
||||
<Show when={toastVisible() === comment.id}>
|
||||
<span class="text-xs text-yellow-700 bg-yellow-100 px-2 py-1 rounded-md whitespace-nowrap animate-slide-in">
|
||||
⚠️ Нельзя ответить на свой комментарий
|
||||
</span>
|
||||
</Show>
|
||||
</div>
|
||||
</div>
|
||||
)}
|
||||
</For>
|
||||
</div>
|
||||
</Show>
|
||||
</div>
|
||||
)}
|
||||
</For>
|
||||
</div>
|
||||
|
||||
<Show when={replyTo() === comment.id}>
|
||||
<div class="mt-4 ml-16 pl-4 border-l-2 border-blue-200">
|
||||
<CommentForm
|
||||
isReply={true}
|
||||
onSubmit={(data) => handleReply(comment.id, data)}
|
||||
onCancel={() => setReplyTo(null)}
|
||||
user={currentUser()}
|
||||
/>
|
||||
</div>
|
||||
</Show>
|
||||
|
||||
<Show when={comment.replies && comment.replies.length > 0}>
|
||||
<div class="mt-4 ml-16 space-y-4">
|
||||
<For each={comment.replies}>
|
||||
{(reply) => (
|
||||
<div class="flex items-start gap-3 pl-4 border-l-2 border-gray-200">
|
||||
<Avatar
|
||||
author={reply.expand?.user?.name || "Аноним"}
|
||||
avatar={reply.expand?.user?.avatar}
|
||||
size="sm"
|
||||
/>
|
||||
<div class="flex-1 bg-gray-50 rounded-xl p-4">
|
||||
<div class="flex items-center gap-2 mb-1 flex-wrap">
|
||||
<span class="font-semibold text-gray-900 text-sm">
|
||||
{reply.expand?.user?.name || "Аноним"}
|
||||
</span>
|
||||
<Show when={reply.is_verified}>
|
||||
<svg
|
||||
class="w-3 h-3 text-blue-500"
|
||||
fill="currentColor"
|
||||
viewBox="0 0 20 20"
|
||||
>
|
||||
<path
|
||||
fill-rule="evenodd"
|
||||
d="M10 18a8 8 0 100-16 8 8 0 000 16zm3.707-9.293a1 1 0 00-1.414-1.414L9 10.586 7.707 9.293a1 1 0 00-1.414 1.414l2 2a1 1 0 001.414 0l4-4z"
|
||||
clip-rule="evenodd"
|
||||
/>
|
||||
</svg>
|
||||
</Show>
|
||||
<span class="text-xs text-gray-400 ml-auto">
|
||||
{formatDate(reply.created)}
|
||||
</span>
|
||||
</div>
|
||||
<p class="text-gray-700 text-sm leading-relaxed">
|
||||
{reply.content}
|
||||
</p>
|
||||
</div>
|
||||
</div>
|
||||
)}
|
||||
</For>
|
||||
</div>
|
||||
</Show>
|
||||
</div>
|
||||
)}
|
||||
</For>
|
||||
</div>
|
||||
</Show>
|
||||
|
||||
{/* Основная форма с передачей данных пользователя */}
|
||||
<CommentForm onSubmit={handleNewComment} user={currentUser()} />
|
||||
</div>
|
||||
</Show>
|
||||
|
||||
{/* Основная форма с передачей данных пользователя */}
|
||||
<CommentForm onSubmit={handleNewComment} user={currentUser()} />
|
||||
</div>
|
||||
</Show>
|
||||
)}
|
||||
</>
|
||||
)}
|
||||
</>
|
||||
);
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue