Rebuilds the look around the spec: an ice scene, one shared glass recipe, icy accents and glass on every large surface. Visual only — layout, behaviour, copy and functionality are untouched. Background - .ice-scene: fixed, z-index -1, pointer-events none. Navy base (#070b16 to #0c1426) in dark, pale (#f4f9ff to #e6f1fb) in light, four drifting glacier blobs (#38bdf8/#60a5fa/#818cf8, 30-60s transform-only loops), five glossy ice orbs (40-220px radial gradients with a highlight at 30% 25% and a blue shadow) placed so the glass blurs them, and an SVG feTurbulence grain at 4-5%. - prefers-reduced-motion stops the drift; phones get two blobs and two orbs fewer. Glass - One shared recipe (.glass-panel, .card, .sidebar-surface, .study-chrome, .tabbar, .glass, .gate-card): rgba(255,255,255,.06) dark / .55 light, blur(24px) saturate(140%) (16px on phones), a bright 1px rim, an inset top highlight and a blue-tinted outer shadow. - Nested glass (chips, inputs, secondary buttons) is more opaque and never adds a second blur layer. @supports fallback for no backdrop-filter. Radii: 24-28px cards/sheets, 14px inputs/buttons, pills for chips. Cards hover brighter + cyan rim + 2px lift, 180ms. Colour and type - Accent is glacier cyan (#38bdf8) to ice blue (#0ea5e9); progress bars and selected states use the gradient; the active sidebar item is a frosted highlight with a cyan rim. - Primary CTA: icy gradient — white to #bfe3ff with ink text in dark, deep blue in light (biased so the label sits on the darker half and keeps 5.6:1). - Leftover slate/black greys replaced with navy-tinted frost tokens. - Headings are semibold with tighter tracking. Screens - Dashboard: the sidebar is one tall inset rounded glass panel; deck cards are glass. - Gate: one centred glass card over the scene, orbs visible behind it. - Sheets/modals: glass over the dimmed, lightly blurred backdrop. - Study view: question card more opaque (.glass-solid); top bar and pager are slim glass pills. Perf: measured on a phone viewport with 4x CPU throttling. The animated blobs' filter: blur() was the whole cost (150ms vs 33ms per frame), so they are soft radial gradients with no filter now; idle 60fps, ~17ms median while scrolling. Tests updated for the new tokens: contrast 18/18 AA, deck chrome 15/15, key gate 49/49, install sheet 64/64, deck fixes 15/15, retry 14/14, zoom 6/6, final ux 12/12, security 8/8, pwa 16/16.
189 lines
6.9 KiB
TypeScript
189 lines
6.9 KiB
TypeScript
"use client";
|
|
|
|
import { useEffect, useRef, useState } from "react";
|
|
|
|
import { ApiError, gradeAnswer } from "@/lib/client-api";
|
|
import type { Activity } from "@/lib/schemas";
|
|
import { cn } from "@/lib/utils";
|
|
import { Button, Spinner } from "@/components/ui";
|
|
|
|
import {
|
|
ActivityHeader,
|
|
FeedbackPanel,
|
|
Hint,
|
|
PromptCard,
|
|
QuestionText,
|
|
type ActivityComponentProps,
|
|
} from "./shared";
|
|
|
|
type ShortAnswerActivity = Extract<Activity, { type: "short_answer" }>;
|
|
|
|
type GradeState =
|
|
| { status: "idle" }
|
|
| { status: "grading" }
|
|
| { status: "graded"; correct: boolean; feedback: string; missing: string[] }
|
|
| { status: "error"; message: string }
|
|
| { status: "self-check" };
|
|
|
|
export function ShortAnswer({ activity, active, language, onAnswered, onNext, isLast }: ActivityComponentProps<ShortAnswerActivity>) {
|
|
const [value, setValue] = useState("");
|
|
const [state, setState] = useState<GradeState>({ status: "idle" });
|
|
const textareaRef = useRef<HTMLTextAreaElement>(null);
|
|
|
|
useEffect(() => {
|
|
if (active && state.status === "idle") {
|
|
const timer = window.setTimeout(() => textareaRef.current?.focus(), 350);
|
|
return () => window.clearTimeout(timer);
|
|
}
|
|
}, [active, state.status]);
|
|
|
|
const grade = async () => {
|
|
if (!value.trim() || state.status === "grading") return;
|
|
setState({ status: "grading" });
|
|
try {
|
|
const result = await gradeAnswer({
|
|
question: activity.question,
|
|
referenceAnswer: activity.referenceAnswer,
|
|
keyPoints: activity.keyPoints,
|
|
userAnswer: value.trim(),
|
|
language,
|
|
});
|
|
setState({
|
|
status: "graded",
|
|
correct: result.correct,
|
|
feedback: result.feedback,
|
|
missing: result.missing,
|
|
});
|
|
onAnswered(result.correct, { userAnswer: value.trim() });
|
|
} catch (error) {
|
|
setState({
|
|
status: "error",
|
|
message:
|
|
error instanceof ApiError
|
|
? error.message
|
|
: "Grading failed. Check that Ollama is reachable and try again.",
|
|
});
|
|
}
|
|
};
|
|
|
|
const selfCheck = (correct: boolean) => {
|
|
setState({ status: "graded", correct, feedback: "Self-checked — you judged this one yourself.", missing: [] });
|
|
onAnswered(correct, { userAnswer: value.trim() });
|
|
};
|
|
|
|
return (
|
|
<>
|
|
<ActivityHeader type="short_answer" topic={activity.topic} />
|
|
<PromptCard>
|
|
<QuestionText>{activity.question}</QuestionText>
|
|
</PromptCard>
|
|
|
|
<label className="sr-only" htmlFor={`answer-${activity.id}`}>
|
|
Your answer
|
|
</label>
|
|
<textarea
|
|
id={`answer-${activity.id}`}
|
|
ref={textareaRef}
|
|
value={value}
|
|
onChange={(event) => setValue(event.target.value)}
|
|
onKeyDown={(event) => {
|
|
event.stopPropagation();
|
|
if (event.key === "Enter" && (event.metaKey || event.ctrlKey)) {
|
|
event.preventDefault();
|
|
void grade();
|
|
}
|
|
}}
|
|
disabled={state.status === "grading" || state.status === "graded"}
|
|
rows={3}
|
|
placeholder="Type your answer in your own words…"
|
|
className="w-full resize-none rounded-2xl border-2 border-[var(--glass-border)] bg-[var(--surface-strong)] px-4 py-3 text-[15px] font-medium text-frost-950 shadow-sm outline-none transition placeholder:text-frost-400 focus:border-[var(--focus)] disabled:opacity-70 dark:border-[var(--glass-border)] dark:bg-[var(--surface-strong)] dark:text-frost-50 dark:placeholder:text-frost-400"
|
|
/>
|
|
|
|
{state.status === "idle" ? (
|
|
<div className="flex items-center justify-between gap-3">
|
|
<Hint>Ctrl/⌘ + Enter to submit.</Hint>
|
|
<Button size="lg" onClick={() => void grade()} disabled={!value.trim()}>
|
|
Submit answer
|
|
</Button>
|
|
</div>
|
|
) : null}
|
|
|
|
{state.status === "grading" ? (
|
|
<div className="flex items-center gap-3 rounded-2xl border border-white/60 bg-white/50 backdrop-blur-xl px-4 py-3 text-sm font-semibold text-frost-800 dark:border-white/15 dark:bg-white/10 dark:text-frost-100">
|
|
<Spinner className="size-5" />
|
|
Grading your answer…
|
|
</div>
|
|
) : null}
|
|
|
|
{state.status === "error" ? (
|
|
<div className="rounded-2xl border-2 border-amber-300 bg-amber-50 p-4 text-sm text-amber-900 dark:border-amber-400/40 dark:bg-amber-400/10 dark:text-amber-100">
|
|
<p className="font-bold">Couldn't grade that answer</p>
|
|
<p className="mt-1">{state.message}</p>
|
|
<div className="mt-3 flex flex-wrap gap-2">
|
|
<Button size="sm" onClick={() => void grade()}>
|
|
Retry
|
|
</Button>
|
|
<Button size="sm" variant="secondary" onClick={() => setState({ status: "self-check" })}>
|
|
Show answer & self-check
|
|
</Button>
|
|
</div>
|
|
</div>
|
|
) : null}
|
|
|
|
{state.status === "self-check" ? (
|
|
<div className="card space-y-3 p-4">
|
|
<p className="text-sm font-bold text-frost-900 dark:text-frost-100">Model answer</p>
|
|
<p className="text-sm leading-relaxed text-frost-700 dark:text-frost-200">{activity.referenceAnswer}</p>
|
|
<p className="text-xs text-frost-500 dark:text-frost-400">Key points: {activity.keyPoints.join(" · ")}</p>
|
|
<div className="grid grid-cols-2 gap-3">
|
|
<Button variant="secondary" onClick={() => selfCheck(false)}>
|
|
😅 I missed it
|
|
</Button>
|
|
<Button variant="success" onClick={() => selfCheck(true)}>
|
|
🧊 I had it right
|
|
</Button>
|
|
</div>
|
|
</div>
|
|
) : null}
|
|
|
|
{state.status === "graded" ? (
|
|
<>
|
|
<div
|
|
className={cn(
|
|
"rounded-2xl border-2 p-3 text-sm font-semibold",
|
|
state.correct
|
|
? "border-emerald-300 bg-emerald-50 text-emerald-900 dark:border-emerald-400/40 dark:bg-emerald-400/10 dark:text-emerald-100"
|
|
: "border-rose-300 bg-rose-50 text-rose-900 dark:border-rose-400/40 dark:bg-rose-400/10 dark:text-rose-100",
|
|
)}
|
|
>
|
|
<p className="font-extrabold uppercase tracking-wide">
|
|
{state.correct ? "Accepted" : "Needs work"}
|
|
</p>
|
|
<p className="mt-1 font-normal">{state.feedback}</p>
|
|
{state.missing.length ? (
|
|
<ul className="mt-2 list-inside list-disc font-normal">
|
|
{state.missing.map((item) => (
|
|
<li key={item}>{item}</li>
|
|
))}
|
|
</ul>
|
|
) : null}
|
|
{!state.correct ? (
|
|
<p className="mt-2 font-normal">
|
|
<span className="font-bold">Model answer: </span>
|
|
{activity.referenceAnswer}
|
|
</p>
|
|
) : null}
|
|
</div>
|
|
|
|
<FeedbackPanel
|
|
correct={state.correct}
|
|
explanation={activity.explanation}
|
|
xp={activity.xp}
|
|
isLast={isLast}
|
|
onNext={onNext}
|
|
/>
|
|
</>
|
|
) : null}
|
|
</>
|
|
);
|
|
}
|