Fix student questions pages: CSS tokens, scroll, upload guard, S3 path
- Replace non-existent --surface/--surface-muted/--border-strong with actual design-system tokens (--color-surface, --background, --foreground, --muted) - Remove tmp/ segment from S3 upload key in question-upload route - Add auto-scroll to bottom on new message in QuestionThread - Block Send while file upload is in progress (uploading guard) - Replace <a> with Next.js <Link> in new question page back-link - Replace hardcoded #c00 error color with var(--destructive) in both files - Replace hardcoded #E8E8E0/#F5F5F0 hex backgrounds with CSS tokens
This commit is contained in:
@@ -2,6 +2,7 @@
|
||||
|
||||
import { useState } from "react";
|
||||
import { useRouter } from "next/navigation";
|
||||
import Link from "next/link";
|
||||
|
||||
export default function NewQuestionPage() {
|
||||
const router = useRouter();
|
||||
@@ -38,13 +39,13 @@ export default function NewQuestionPage() {
|
||||
return (
|
||||
<div className="max-w-xl mx-auto px-4 py-8">
|
||||
<div className="flex items-center gap-3 mb-6">
|
||||
<a
|
||||
<Link
|
||||
href="/questions"
|
||||
className="text-sm"
|
||||
style={{ color: "var(--muted-foreground)", textDecoration: "underline" }}
|
||||
>
|
||||
← Все вопросы
|
||||
</a>
|
||||
</Link>
|
||||
</div>
|
||||
|
||||
<h1 className="text-xl font-bold mb-6" style={{ color: "var(--foreground)" }}>
|
||||
@@ -68,7 +69,7 @@ export default function NewQuestionPage() {
|
||||
className="w-full text-sm px-3 py-2 outline-none"
|
||||
style={{
|
||||
border: "2px solid var(--border)",
|
||||
background: "var(--surface)",
|
||||
background: "var(--color-surface)",
|
||||
color: "var(--foreground)",
|
||||
}}
|
||||
/>
|
||||
@@ -90,14 +91,14 @@ export default function NewQuestionPage() {
|
||||
className="w-full text-sm px-3 py-2 outline-none resize-none"
|
||||
style={{
|
||||
border: "2px solid var(--border)",
|
||||
background: "var(--surface)",
|
||||
background: "var(--color-surface)",
|
||||
color: "var(--foreground)",
|
||||
}}
|
||||
/>
|
||||
</div>
|
||||
|
||||
{error && (
|
||||
<p className="text-sm" style={{ color: "#c00" }}>
|
||||
<p className="text-sm" style={{ color: "var(--destructive)" }}>
|
||||
{error}
|
||||
</p>
|
||||
)}
|
||||
|
||||
@@ -37,8 +37,8 @@ export default async function QuestionsPage() {
|
||||
href="/questions/new"
|
||||
className="text-sm font-bold px-4 py-2"
|
||||
style={{
|
||||
background: "var(--surface)",
|
||||
border: "2px solid var(--border-strong)",
|
||||
background: "var(--color-surface)",
|
||||
border: "2px solid var(--foreground)",
|
||||
color: "var(--foreground)",
|
||||
}}
|
||||
>
|
||||
@@ -62,8 +62,8 @@ export default async function QuestionsPage() {
|
||||
href={`/questions/${q.id}`}
|
||||
className="block p-3 rounded-sm transition-colors"
|
||||
style={{
|
||||
border: unread ? "2px solid var(--border-strong)" : "1px solid var(--border)",
|
||||
background: q.status === "CLOSED" ? "var(--surface-muted)" : "var(--surface)",
|
||||
border: unread ? "2px solid var(--foreground)" : "1px solid var(--border)",
|
||||
background: q.status === "CLOSED" ? "var(--background)" : "var(--color-surface)",
|
||||
opacity: q.status === "CLOSED" ? 0.7 : 1,
|
||||
}}
|
||||
>
|
||||
@@ -82,7 +82,7 @@ export default async function QuestionsPage() {
|
||||
style={
|
||||
q.status === "OPEN"
|
||||
? { background: "#E8F0D8", border: "1px solid var(--border)", color: "var(--foreground)" }
|
||||
: { background: "var(--surface-muted)", color: "var(--muted-foreground)" }
|
||||
: { background: "var(--background)", color: "var(--muted-foreground)" }
|
||||
}
|
||||
>
|
||||
{q.status === "OPEN" ? "● ОТКРЫТ" : "✓ ЗАКРЫТ"}
|
||||
|
||||
@@ -35,7 +35,7 @@ export async function POST(req: NextRequest) {
|
||||
return NextResponse.json({ error: "Недопустимое расширение файла" }, { status: 415 });
|
||||
}
|
||||
|
||||
const key = `questions/tmp/${session.user.id}/${randomUUID()}.${ext}`;
|
||||
const key = `questions/${session.user.id}/${randomUUID()}.${ext}`;
|
||||
const buffer = Buffer.from(await file.arrayBuffer());
|
||||
const url = await uploadFile(key, buffer, file.type);
|
||||
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
"use client";
|
||||
|
||||
import { useState, useRef } from "react";
|
||||
import { useState, useRef, useEffect } from "react";
|
||||
|
||||
interface FileAttachment {
|
||||
name: string;
|
||||
@@ -53,6 +53,11 @@ export function QuestionThread({
|
||||
const [sending, setSending] = useState(false);
|
||||
const [error, setError] = useState("");
|
||||
const fileInputRef = useRef<HTMLInputElement>(null);
|
||||
const messagesEndRef = useRef<HTMLDivElement>(null);
|
||||
|
||||
useEffect(() => {
|
||||
messagesEndRef.current?.scrollIntoView({ behavior: "smooth" });
|
||||
}, [messages]);
|
||||
|
||||
async function handleFileSelect(e: React.ChangeEvent<HTMLInputElement>) {
|
||||
const selected = Array.from(e.target.files ?? []);
|
||||
@@ -82,6 +87,7 @@ export function QuestionThread({
|
||||
}
|
||||
|
||||
async function handleSend() {
|
||||
if (uploading) return;
|
||||
if (!text.trim() && files.length === 0) return;
|
||||
setSending(true);
|
||||
setError("");
|
||||
@@ -120,7 +126,7 @@ export function QuestionThread({
|
||||
className="max-w-[88%] px-3 py-2 rounded-sm text-sm"
|
||||
style={{
|
||||
alignSelf: isMine ? "flex-end" : "flex-start",
|
||||
background: isMine ? "#E8E8E0" : "#F5F5F0",
|
||||
background: isMine ? "var(--muted)" : "var(--background)",
|
||||
border: isMine ? "none" : `2px solid #E8F0D8`,
|
||||
borderLeft: !isMine && isNew ? "3px solid #323232" : undefined,
|
||||
}}
|
||||
@@ -145,7 +151,7 @@ export function QuestionThread({
|
||||
rel="noreferrer"
|
||||
className="flex items-center gap-1.5 text-xs px-2 py-1 rounded-sm"
|
||||
style={{
|
||||
background: "#F5F5F0",
|
||||
background: "var(--background)",
|
||||
border: "1px solid #AAAAAA",
|
||||
color: "var(--foreground)",
|
||||
width: "fit-content",
|
||||
@@ -160,6 +166,7 @@ export function QuestionThread({
|
||||
</div>
|
||||
);
|
||||
})}
|
||||
<div ref={messagesEndRef} />
|
||||
</div>
|
||||
|
||||
{/* Queued files preview */}
|
||||
@@ -169,7 +176,7 @@ export function QuestionThread({
|
||||
<div
|
||||
key={i}
|
||||
className="flex items-center gap-1 text-xs px-2 py-1 rounded-sm"
|
||||
style={{ background: "var(--surface)", border: "1px solid var(--border)" }}
|
||||
style={{ background: "var(--color-surface)", border: "1px solid var(--border)" }}
|
||||
>
|
||||
📎 {f.name}
|
||||
<button
|
||||
@@ -189,7 +196,7 @@ export function QuestionThread({
|
||||
className="rounded-sm p-2"
|
||||
style={{
|
||||
border: "2px solid #AAAAAA",
|
||||
background: "var(--surface)",
|
||||
background: "var(--color-surface)",
|
||||
opacity: questionStatus === "CLOSED" ? 0.5 : 1,
|
||||
pointerEvents: questionStatus === "CLOSED" ? "none" : "auto",
|
||||
}}
|
||||
@@ -205,7 +212,7 @@ export function QuestionThread({
|
||||
/>
|
||||
<div
|
||||
className="flex items-center justify-between pt-2 mt-1"
|
||||
style={{ borderTop: "1px solid #E8E8E0" }}
|
||||
style={{ borderTop: "1px solid var(--muted)" }}
|
||||
>
|
||||
<div className="flex items-center gap-2">
|
||||
<input
|
||||
@@ -221,7 +228,7 @@ export function QuestionThread({
|
||||
onClick={() => fileInputRef.current?.click()}
|
||||
disabled={uploading}
|
||||
className="text-xs px-2 py-1 rounded-sm"
|
||||
style={{ background: "var(--surface)", border: "1px solid #AAAAAA" }}
|
||||
style={{ background: "var(--color-surface)", border: "1px solid #AAAAAA" }}
|
||||
>
|
||||
{uploading ? "Загрузка..." : "📎 Прикрепить"}
|
||||
</button>
|
||||
@@ -245,7 +252,7 @@ export function QuestionThread({
|
||||
</button>
|
||||
</div>
|
||||
{error && (
|
||||
<p className="text-xs mt-1" style={{ color: "#c00" }}>
|
||||
<p className="text-xs mt-1" style={{ color: "var(--destructive)" }}>
|
||||
{error}
|
||||
</p>
|
||||
)}
|
||||
|
||||
Reference in New Issue
Block a user