Implement platform settings (Stage 9)
- Wire settings to actual platform behavior: maintenance mode, registration toggle, notification emails, curator feedback emails, email verification flag - Add logo (logoUrl, showLogo) and social network links (YouTube, VK, Telegram) settings - Show logo + school name dynamically in student layout header - Add footer to student layout with org requisites and social links - Register page: read settings server-side, validate terms checkbox with legal links - Login page: show notice when redirected from closed registration - Settings form: add Logo and Social Networks sections Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
This commit is contained in:
@@ -1,17 +1,35 @@
|
||||
import { getSetting } from "@/lib/settings";
|
||||
import { LoginForm } from "./login-form";
|
||||
|
||||
export default function LoginPage() {
|
||||
export default async function LoginPage({
|
||||
searchParams,
|
||||
}: {
|
||||
searchParams: Promise<{ notice?: string }>;
|
||||
}) {
|
||||
const [schoolName, { notice }] = await Promise.all([
|
||||
getSetting("schoolName"),
|
||||
searchParams,
|
||||
]);
|
||||
|
||||
return (
|
||||
<div className="min-h-screen flex items-center justify-center" style={{ backgroundColor: "var(--background)" }}>
|
||||
<div className="w-full max-w-sm">
|
||||
<div className="text-center mb-8">
|
||||
<h1 className="text-2xl font-bold tracking-wide" style={{ color: "var(--foreground)" }}>
|
||||
Second Brain
|
||||
{schoolName}
|
||||
</h1>
|
||||
<p className="mt-1 text-sm uppercase tracking-widest" style={{ color: "var(--muted-foreground)", fontSize: "0.65rem" }}>
|
||||
Образовательная платформа
|
||||
</p>
|
||||
</div>
|
||||
{notice === "registration_closed" && (
|
||||
<div
|
||||
className="mb-4 px-4 py-3 text-sm text-center"
|
||||
style={{ border: "2px solid var(--border)", color: "var(--muted-foreground)" }}
|
||||
>
|
||||
Регистрация временно закрыта. Обратитесь к администратору.
|
||||
</div>
|
||||
)}
|
||||
<div className="card-aubade p-8">
|
||||
<LoginForm />
|
||||
</div>
|
||||
|
||||
@@ -1,19 +1,32 @@
|
||||
import { redirect } from "next/navigation";
|
||||
import { getSettings } from "@/lib/settings";
|
||||
import { RegisterForm } from "./register-form";
|
||||
|
||||
export default function RegisterPage() {
|
||||
export default async function RegisterPage() {
|
||||
const settings = await getSettings();
|
||||
|
||||
if (settings.registrationEnabled !== "true") {
|
||||
redirect("/login?notice=registration_closed");
|
||||
}
|
||||
|
||||
return (
|
||||
<div className="min-h-screen flex items-center justify-center" style={{ backgroundColor: "var(--background)" }}>
|
||||
<div className="w-full max-w-sm">
|
||||
<div className="text-center mb-8">
|
||||
<h1 className="text-2xl font-bold tracking-wide" style={{ color: "var(--foreground)" }}>
|
||||
Second Brain
|
||||
{settings.schoolName}
|
||||
</h1>
|
||||
<p className="mt-1 text-sm uppercase tracking-widest" style={{ color: "var(--muted-foreground)", fontSize: "0.65rem" }}>
|
||||
Образовательная платформа
|
||||
</p>
|
||||
</div>
|
||||
<div className="card-aubade p-8">
|
||||
<RegisterForm />
|
||||
<RegisterForm
|
||||
showTermsCheckbox={settings.showTermsCheckbox === "true"}
|
||||
privacyPolicyUrl={settings.privacyPolicyUrl}
|
||||
termsUrl={settings.termsUrl}
|
||||
offerUrl={settings.offerUrl}
|
||||
/>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
@@ -4,10 +4,18 @@ import { useState } from "react";
|
||||
import Link from "next/link";
|
||||
import { signUp } from "@/lib/auth-client";
|
||||
|
||||
export function RegisterForm() {
|
||||
interface Props {
|
||||
showTermsCheckbox: boolean;
|
||||
privacyPolicyUrl: string;
|
||||
termsUrl: string;
|
||||
offerUrl: string;
|
||||
}
|
||||
|
||||
export function RegisterForm({ showTermsCheckbox, privacyPolicyUrl, termsUrl, offerUrl }: Props) {
|
||||
const [name, setName] = useState("");
|
||||
const [email, setEmail] = useState("");
|
||||
const [password, setPassword] = useState("");
|
||||
const [termsAccepted, setTermsAccepted] = useState(false);
|
||||
const [error, setError] = useState("");
|
||||
const [loading, setLoading] = useState(false);
|
||||
const [success, setSuccess] = useState(false);
|
||||
@@ -22,8 +30,18 @@ export function RegisterForm() {
|
||||
fontFamily: "inherit",
|
||||
} as React.CSSProperties;
|
||||
|
||||
const legalLinks = [
|
||||
{ url: privacyPolicyUrl, label: "Политику конфиденциальности" },
|
||||
{ url: termsUrl, label: "Согласие на обработку данных" },
|
||||
{ url: offerUrl, label: "Договор-оферту" },
|
||||
].filter((l) => l.url);
|
||||
|
||||
async function handleSubmit(e: React.FormEvent) {
|
||||
e.preventDefault();
|
||||
if (showTermsCheckbox && !termsAccepted) {
|
||||
setError("Необходимо принять условия для продолжения");
|
||||
return;
|
||||
}
|
||||
setError("");
|
||||
setLoading(true);
|
||||
|
||||
@@ -102,6 +120,38 @@ export function RegisterForm() {
|
||||
placeholder="Минимум 8 символов"
|
||||
/>
|
||||
</div>
|
||||
|
||||
{showTermsCheckbox && (
|
||||
<label className="flex items-start gap-2 cursor-pointer">
|
||||
<input
|
||||
type="checkbox"
|
||||
checked={termsAccepted}
|
||||
onChange={(e) => setTermsAccepted(e.target.checked)}
|
||||
className="mt-0.5 flex-shrink-0"
|
||||
style={{ width: "16px", height: "16px", accentColor: "var(--foreground)" }}
|
||||
/>
|
||||
<span className="text-xs" style={{ color: "var(--muted-foreground)" }}>
|
||||
Я принимаю{" "}
|
||||
{legalLinks.length > 0
|
||||
? legalLinks.map((l, i) => (
|
||||
<span key={l.url}>
|
||||
<a
|
||||
href={l.url}
|
||||
target="_blank"
|
||||
rel="noopener noreferrer"
|
||||
className="underline"
|
||||
style={{ color: "var(--foreground)" }}
|
||||
>
|
||||
{l.label}
|
||||
</a>
|
||||
{i < legalLinks.length - 1 ? ", " : ""}
|
||||
</span>
|
||||
))
|
||||
: "условия использования платформы"}
|
||||
</span>
|
||||
</label>
|
||||
)}
|
||||
|
||||
{error && (
|
||||
<p className="text-xs py-2 px-3" style={{ border: "2px solid oklch(0.577 0.245 27.325)", color: "oklch(0.577 0.245 27.325)" }}>
|
||||
{error}
|
||||
|
||||
@@ -16,6 +16,17 @@ export default async function StudentLayout({ children }: { children: React.Reac
|
||||
if (maintenance === "true") redirect("/maintenance");
|
||||
}
|
||||
|
||||
const [schoolName, logoUrl, showLogo, socialYoutube, socialVk, socialTelegram, orgRequisites] =
|
||||
await Promise.all([
|
||||
getSetting("schoolName"),
|
||||
getSetting("logoUrl"),
|
||||
getSetting("showLogo"),
|
||||
getSetting("socialYoutube"),
|
||||
getSetting("socialVk"),
|
||||
getSetting("socialTelegram"),
|
||||
getSetting("orgRequisites"),
|
||||
]);
|
||||
|
||||
const isImpersonating = !!(session.session as { impersonatedBy?: string }).impersonatedBy;
|
||||
|
||||
return (
|
||||
@@ -25,8 +36,12 @@ export default async function StudentLayout({ children }: { children: React.Reac
|
||||
className="sticky top-0 z-10 flex items-center justify-between px-6 py-3"
|
||||
style={{ borderBottom: "2px solid var(--border)", backgroundColor: "var(--background)" }}
|
||||
>
|
||||
<Link href="/dashboard" className="font-bold tracking-wide" style={{ color: "var(--foreground)" }}>
|
||||
Second Brain
|
||||
<Link href="/dashboard" className="flex items-center gap-2 font-bold tracking-wide" style={{ color: "var(--foreground)" }}>
|
||||
{logoUrl && showLogo === "true" && (
|
||||
// eslint-disable-next-line @next/next/no-img-element
|
||||
<img src={logoUrl} alt={schoolName} className="h-6 w-auto object-contain" />
|
||||
)}
|
||||
{schoolName}
|
||||
</Link>
|
||||
<div className="flex items-center gap-4">
|
||||
<span className="text-sm" style={{ color: "var(--muted-foreground)" }}>{session.user.name}</span>
|
||||
@@ -34,6 +49,35 @@ export default async function StudentLayout({ children }: { children: React.Reac
|
||||
</div>
|
||||
</header>
|
||||
<div className="flex-1 flex flex-col">{children}</div>
|
||||
{(socialYoutube || socialVk || socialTelegram || orgRequisites) && (
|
||||
<footer
|
||||
className="px-6 py-4 flex flex-col sm:flex-row items-center justify-between gap-3 text-xs"
|
||||
style={{ borderTop: "2px solid var(--border)", color: "var(--muted-foreground)" }}
|
||||
>
|
||||
{orgRequisites && (
|
||||
<p className="whitespace-pre-line text-center sm:text-left">{orgRequisites}</p>
|
||||
)}
|
||||
{(socialYoutube || socialVk || socialTelegram) && (
|
||||
<div className="flex items-center gap-4 flex-shrink-0">
|
||||
{socialYoutube && (
|
||||
<a href={socialYoutube} target="_blank" rel="noopener noreferrer" className="hover:underline">
|
||||
YouTube
|
||||
</a>
|
||||
)}
|
||||
{socialVk && (
|
||||
<a href={socialVk} target="_blank" rel="noopener noreferrer" className="hover:underline">
|
||||
VK
|
||||
</a>
|
||||
)}
|
||||
{socialTelegram && (
|
||||
<a href={socialTelegram} target="_blank" rel="noopener noreferrer" className="hover:underline">
|
||||
Telegram
|
||||
</a>
|
||||
)}
|
||||
</div>
|
||||
)}
|
||||
</footer>
|
||||
)}
|
||||
</div>
|
||||
);
|
||||
}
|
||||
|
||||
@@ -5,6 +5,7 @@ import { auth } from "@/lib/auth";
|
||||
import { headers } from "next/headers";
|
||||
import { revalidatePath } from "next/cache";
|
||||
import { sendFeedbackReceivedEmail } from "@/lib/email";
|
||||
import { getSetting, asBool } from "@/lib/settings";
|
||||
|
||||
async function requireCurator() {
|
||||
const session = await auth.api.getSession({ headers: await headers() });
|
||||
@@ -78,14 +79,17 @@ export async function submitFeedback(
|
||||
});
|
||||
|
||||
const { lesson } = submission.homework;
|
||||
const lessonUrl = `${process.env.BETTER_AUTH_URL ?? "https://school.second-brain.ru"}/courses/${lesson.module.course.slug}/lessons/${lesson.id}`;
|
||||
await sendFeedbackReceivedEmail(
|
||||
submission.user.email,
|
||||
submission.user.name,
|
||||
lesson.title,
|
||||
data.text,
|
||||
lessonUrl
|
||||
);
|
||||
const notifySetting = await getSetting("notifyStudentOnFeedback");
|
||||
if (asBool(notifySetting)) {
|
||||
const lessonUrl = `${process.env.BETTER_AUTH_URL ?? "https://school.second-brain.ru"}/courses/${lesson.module.course.slug}/lessons/${lesson.id}`;
|
||||
await sendFeedbackReceivedEmail(
|
||||
submission.user.email,
|
||||
submission.user.name,
|
||||
lesson.title,
|
||||
data.text,
|
||||
lessonUrl
|
||||
);
|
||||
}
|
||||
|
||||
revalidatePath("/curator/homework");
|
||||
revalidatePath(`/curator/homework/${submissionId}`);
|
||||
|
||||
Reference in New Issue
Block a user