Comparisons (synastry) of the own chart and persons
/osszevetesek compares any two of the user's charts (own and persons); the person card and the person's chart page have "Összevetés velem". The comparison page shows a double wheel (first person inside with houses, second outside, aspects between them), the aspects by character, and tabs: paid relationship analysis (synastry unit), the cross aspect grid, house overlays, composite and the full aspect list. Correcting a person within the hour now deletes the user's own comparisons with them instead of being refused; still refused after a paid analysis or when someone else's comparison uses the chart. The relationship analysis prompt is editable on /admin/promptok too, and can be tried on one of the admin's comparisons. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_012vLHzh5qUhFtmJhzkcTbXL
This commit is contained in:
@@ -0,0 +1,51 @@
|
||||
"use client";
|
||||
|
||||
import { useRouter } from "next/navigation";
|
||||
import { useState } from "react";
|
||||
|
||||
import { api, errorText } from "@/lib/api";
|
||||
|
||||
/** Deletes a comparison (and its analysis). */
|
||||
export function ComparisonActions({ id, name }: { id: string; name: string }) {
|
||||
const router = useRouter();
|
||||
const [confirm, setConfirm] = useState(false);
|
||||
const [busy, setBusy] = useState(false);
|
||||
const [error, setError] = useState<string | null>(null);
|
||||
|
||||
async function remove() {
|
||||
setBusy(true);
|
||||
setError(null);
|
||||
try {
|
||||
await api(`/synastries/${id}`, { method: "DELETE" });
|
||||
router.refresh();
|
||||
} catch (e) {
|
||||
setError(errorText(e));
|
||||
setBusy(false);
|
||||
}
|
||||
}
|
||||
|
||||
return (
|
||||
<div className="person-actions">
|
||||
{confirm ? (
|
||||
<>
|
||||
<span className="hint">Törlöd a(z) {name} összevetést és az elemzését?</span>
|
||||
<button type="button" className="btn btn-sm btn-danger" onClick={remove} disabled={busy}>
|
||||
{busy ? "Törlés…" : "Igen, törlöm"}
|
||||
</button>
|
||||
<button type="button" className="btn btn-sm btn-ghost" onClick={() => setConfirm(false)} disabled={busy}>
|
||||
Mégse
|
||||
</button>
|
||||
</>
|
||||
) : (
|
||||
<button type="button" className="btn btn-sm btn-ghost" onClick={() => setConfirm(true)}>
|
||||
Törlés
|
||||
</button>
|
||||
)}
|
||||
{error && (
|
||||
<p className="msg msg-error" role="alert">
|
||||
{error}
|
||||
</p>
|
||||
)}
|
||||
</div>
|
||||
);
|
||||
}
|
||||
@@ -0,0 +1,78 @@
|
||||
"use client";
|
||||
|
||||
import Link from "next/link";
|
||||
import { useState } from "react";
|
||||
|
||||
import { CompareButton } from "@/components/CompareButton";
|
||||
import { sideName } from "@/lib/synastry";
|
||||
import type { ChartListItem } from "@/lib/types";
|
||||
|
||||
/** Picks two of the user's charts to compare. */
|
||||
export function NewComparison({ charts }: { charts: ChartListItem[] }) {
|
||||
const own = charts.find((c) => c.is_primary);
|
||||
const [first, setFirst] = useState(own?.id ?? charts[0]?.id ?? "");
|
||||
const [second, setSecond] = useState(charts.find((c) => c.id !== (own?.id ?? charts[0]?.id))?.id ?? "");
|
||||
|
||||
if (charts.length < 2) {
|
||||
return (
|
||||
<section className="card compare-new" aria-labelledby="compare-title">
|
||||
<h2 id="compare-title">Új összevetés</h2>
|
||||
<p className="muted">
|
||||
Összevetéshez legalább két képlet kell. Vedd fel társad, családtagod vagy barátod születési adatait, és nézd meg,
|
||||
hogyan hatnak egymásra a képleteitek.
|
||||
</p>
|
||||
<div className="form-actions">
|
||||
<Link href="/szemelyek/uj" className="btn btn-primary">
|
||||
Új személy felvétele
|
||||
</Link>
|
||||
</div>
|
||||
</section>
|
||||
);
|
||||
}
|
||||
|
||||
const option = (c: ChartListItem) => (
|
||||
<option key={c.id} value={c.id}>
|
||||
{sideName(c)}
|
||||
{c.birth.time ? "" : " (idő nélkül)"}
|
||||
</option>
|
||||
);
|
||||
const swap = () => {
|
||||
setFirst(second);
|
||||
setSecond(first);
|
||||
};
|
||||
|
||||
return (
|
||||
<section className="card compare-new" aria-labelledby="compare-title">
|
||||
<h2 id="compare-title">Új összevetés</h2>
|
||||
<div className="compare-form">
|
||||
<div className="field">
|
||||
<label htmlFor="compare-first">Első fél</label>
|
||||
<select id="compare-first" className="inp" value={first} onChange={(e) => setFirst(e.target.value)}>
|
||||
{charts.map(option)}
|
||||
</select>
|
||||
</div>
|
||||
<button type="button" className="btn btn-ghost compare-swap" onClick={swap} aria-label="A két fél felcserélése">
|
||||
⇄
|
||||
</button>
|
||||
<div className="field">
|
||||
<label htmlFor="compare-second">Második fél</label>
|
||||
<select id="compare-second" className="inp" value={second} onChange={(e) => setSecond(e.target.value)}>
|
||||
{charts.map(option)}
|
||||
</select>
|
||||
</div>
|
||||
{first && second && first !== second ? (
|
||||
<CompareButton chart1={first} chart2={second} label="Összevetés" className="btn btn-primary" />
|
||||
) : (
|
||||
<button type="button" className="btn btn-primary" disabled>
|
||||
Összevetés
|
||||
</button>
|
||||
)}
|
||||
</div>
|
||||
<p className="hint">
|
||||
{first === second
|
||||
? "Két különböző képletet válassz."
|
||||
: "A körön az első fél képlete és házai vannak belül, a második fél bolygói kívül."}
|
||||
</p>
|
||||
</section>
|
||||
);
|
||||
}
|
||||
@@ -0,0 +1,166 @@
|
||||
import type { Metadata } from "next";
|
||||
import Link from "next/link";
|
||||
import { notFound } from "next/navigation";
|
||||
|
||||
import { SignTrio } from "@/components/ChartCard";
|
||||
import { DetailedAnalysis } from "@/components/DetailedAnalysis";
|
||||
import { CompositeTables, CrossGrid, HouseOverlays, InterAspectList, NatureBar } from "@/components/SynastryTables";
|
||||
import { SynastryLegend, SynastryWheel } from "@/components/SynastryWheel";
|
||||
import { Tabs } from "@/components/Tabs";
|
||||
import { ASPECTS, formatBirthDate } from "@/lib/astro";
|
||||
import { backendGet, requireMe } from "@/lib/server";
|
||||
import { sideName, sideTimeKnown } from "@/lib/synastry";
|
||||
import type { Analysis, ChartListItem, PublicConfig, Synastry, SynastrySide } from "@/lib/types";
|
||||
|
||||
export const metadata: Metadata = { title: "Összevetés" };
|
||||
|
||||
const UUID = /^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/i;
|
||||
const GRID_LEGEND = ["conjunction", "sextile", "square", "trine", "opposition"];
|
||||
|
||||
function Person({ side, which }: { side: SynastrySide; which: "p1" | "p2" }) {
|
||||
const time = sideTimeKnown(side);
|
||||
const birth = side.birth_data;
|
||||
const name = sideName(side);
|
||||
const body = (
|
||||
<>
|
||||
<span className={`pair-dot legend-${which}`} aria-hidden="true" />
|
||||
<span className="pair-text">
|
||||
<strong>{name}</strong>
|
||||
{birth && (
|
||||
<span className="hint">
|
||||
{formatBirthDate(birth.date)}
|
||||
{time && birth.time ? `, ${birth.time.slice(0, 5)}` : ", ismeretlen időpont"}
|
||||
</span>
|
||||
)}
|
||||
</span>
|
||||
{side.highlights && (
|
||||
<SignTrio chart={{ highlights: { ...side.highlights, time_known: time } } as ChartListItem} />
|
||||
)}
|
||||
</>
|
||||
);
|
||||
return side.owned ? (
|
||||
<Link href={`/kepletek/${side.id}`} className="pair-row">
|
||||
{body}
|
||||
</Link>
|
||||
) : (
|
||||
<div className="pair-row">{body}</div>
|
||||
);
|
||||
}
|
||||
|
||||
/** One comparison of two charts: the double wheel, the numbers, the analysis and the tables. */
|
||||
export default async function ComparisonPage({ params }: { params: Promise<{ id: string }> }) {
|
||||
const { id } = await params;
|
||||
const me = await requireMe(`/osszevetesek/${id}`);
|
||||
if (!UUID.test(id)) notFound();
|
||||
const [synastry, analyses, config] = await Promise.all([
|
||||
backendGet<Synastry>(`/v1/synastries/${id}`),
|
||||
backendGet<{ analyses: Analysis[] }>(`/v1/synastries/${id}/analyses`),
|
||||
backendGet<PublicConfig>("/v1/config"),
|
||||
]);
|
||||
if (!synastry) notFound();
|
||||
const list = analyses?.analyses ?? [];
|
||||
const detailed = list.find((a) => a.status !== "failed") ?? list[0] ?? null;
|
||||
|
||||
const { chart1, chart2 } = synastry;
|
||||
const name1 = sideName(chart1);
|
||||
const name2 = sideName(chart2);
|
||||
const time1 = sideTimeKnown(chart1);
|
||||
const time2 = sideTimeKnown(chart2);
|
||||
const result = synastry.synastry;
|
||||
const unknown = [!time1 && name1, !time2 && name2].filter(Boolean);
|
||||
|
||||
return (
|
||||
<main className="page" style={{ maxWidth: 1180 }}>
|
||||
<div className="page-head">
|
||||
<Link href="/osszevetesek" className="back-link">
|
||||
← Összevetések
|
||||
</Link>
|
||||
<h1>
|
||||
{name1} és {name2}
|
||||
</h1>
|
||||
<p className="muted">Összevetés · két képlet egymásra vetítve</p>
|
||||
</div>
|
||||
|
||||
<section className="chart-layout" aria-label="Kettős képletrajz">
|
||||
<div className="card chart-wheel-card">
|
||||
<SynastryWheel
|
||||
chart1={chart1.chart}
|
||||
chart2={chart2.chart}
|
||||
time1={time1}
|
||||
time2={time2}
|
||||
aspects={result.aspects}
|
||||
name1={name1}
|
||||
name2={name2}
|
||||
/>
|
||||
<SynastryLegend name1={name1} name2={name2} time1={time1} />
|
||||
</div>
|
||||
<div className="field chart-side">
|
||||
<div className="card pair-card">
|
||||
<span className="eyebrow">A két fél</span>
|
||||
<Person side={chart1} which="p1" />
|
||||
<Person side={chart2} which="p2" />
|
||||
</div>
|
||||
<div className="card summary-card">
|
||||
<span className="eyebrow">Számokban</span>
|
||||
<h2 className="summary-title">{result.summary.aspect_count} fényszög köztetek</h2>
|
||||
<NatureBar summary={result.summary} />
|
||||
{unknown.length > 0 && (
|
||||
<p className="hint">
|
||||
{unknown.join(" és ")} születési ideje ismeretlen: az ő tengelyei és házai kimaradnak, a Hold helyzete
|
||||
közelítő.
|
||||
</p>
|
||||
)}
|
||||
</div>
|
||||
</div>
|
||||
</section>
|
||||
|
||||
<section className="card chart-tabs" aria-label="Elemzés és táblázatok">
|
||||
<Tabs
|
||||
label="Összevetés részletei"
|
||||
tabs={[
|
||||
{
|
||||
id: "elemzes",
|
||||
label: "Elemzés",
|
||||
content: (
|
||||
<DetailedAnalysis
|
||||
target={{ kind: "synastry", synastryId: synastry.id }}
|
||||
initial={detailed}
|
||||
left={me.analyses_left.synastry}
|
||||
isAdmin={me.user.roles.includes("admin")}
|
||||
canPay={config?.mock_payments ?? false}
|
||||
note={`Az elemzésben az első fél: ${name1}, a második fél: ${name2}.`}
|
||||
/>
|
||||
),
|
||||
},
|
||||
{
|
||||
id: "fenyszogek",
|
||||
label: "Fényszögek",
|
||||
content: (
|
||||
<div className="field" style={{ gap: 16 }}>
|
||||
<CrossGrid synastry={synastry} name1={name1} name2={name2} />
|
||||
<ul className="grid-legend" aria-label="Jelmagyarázat">
|
||||
{GRID_LEGEND.map((k) => (
|
||||
<li key={k}>
|
||||
<span className={`sym asp asp-${k}`} aria-hidden="true">
|
||||
{ASPECTS[k]?.glyph}
|
||||
</span>{" "}
|
||||
{ASPECTS[k]?.hu}
|
||||
</li>
|
||||
))}
|
||||
</ul>
|
||||
</div>
|
||||
),
|
||||
},
|
||||
{ id: "hazak", label: "Házak", content: <HouseOverlays synastry={synastry} name1={name1} name2={name2} /> },
|
||||
{ id: "kompozit", label: "Kompozit", content: <CompositeTables synastry={synastry} /> },
|
||||
{
|
||||
id: "reszletek",
|
||||
label: "Részletek",
|
||||
content: <InterAspectList synastry={synastry} name1={name1} name2={name2} />,
|
||||
},
|
||||
]}
|
||||
/>
|
||||
</section>
|
||||
</main>
|
||||
);
|
||||
}
|
||||
@@ -0,0 +1,71 @@
|
||||
import type { Metadata } from "next";
|
||||
import Link from "next/link";
|
||||
|
||||
import { formatDate } from "@/lib/astro";
|
||||
import { backendGet, requireMe } from "@/lib/server";
|
||||
import { listName } from "@/lib/synastry";
|
||||
import type { ChartListItem, SynastryListItem } from "@/lib/types";
|
||||
|
||||
import { ComparisonActions } from "./ComparisonActions";
|
||||
import { NewComparison } from "./NewComparison";
|
||||
|
||||
export const metadata: Metadata = { title: "Összevetések" };
|
||||
|
||||
/** The user's comparisons, and a form for a new one. */
|
||||
export default async function ComparisonsPage() {
|
||||
await requireMe("/osszevetesek");
|
||||
const [chartList, synastryList] = await Promise.all([
|
||||
backendGet<{ charts: ChartListItem[] }>("/v1/charts"),
|
||||
backendGet<{ synastries: SynastryListItem[] }>("/v1/synastries"),
|
||||
]);
|
||||
const charts = chartList?.charts ?? [];
|
||||
const synastries = synastryList?.synastries ?? [];
|
||||
|
||||
return (
|
||||
<main className="page" style={{ maxWidth: 1080 }}>
|
||||
<div className="page-head">
|
||||
<h1>Összevetések</h1>
|
||||
<p className="muted">
|
||||
Két képlet egymásra vetítve: mi vonz, hol súrlódtok, és mit ad a kapcsolat. A saját és a felvett személyek
|
||||
képletei közül bármelyik kettőt összevetheted.
|
||||
</p>
|
||||
</div>
|
||||
|
||||
<NewComparison charts={charts} />
|
||||
|
||||
{synastries.length > 0 && (
|
||||
<section className="field" aria-labelledby="list-title" style={{ gap: 12 }}>
|
||||
<h2 id="list-title">Korábbi összevetések</h2>
|
||||
<div className="chart-cards">
|
||||
{synastries.map((s) => {
|
||||
const name = `${listName(s.chart1, charts)} és ${listName(s.chart2, charts)}`;
|
||||
const n = s.summary?.by_nature;
|
||||
const total = s.summary?.aspect_count || 1;
|
||||
return (
|
||||
<div key={s.id} className="chart-card">
|
||||
<Link href={`/osszevetesek/${s.id}`} className="chart-card-link">
|
||||
<strong className="chart-card-name">{name}</strong>
|
||||
<span className="muted">{formatDate(s.created_at)}</span>
|
||||
{n && (
|
||||
<>
|
||||
<span className="nature-bar nature-bar-sm" aria-hidden="true">
|
||||
<span className="nature-seg nature-harmonious" style={{ flexGrow: n.harmonious / total }} />
|
||||
<span className="nature-seg nature-challenging" style={{ flexGrow: n.challenging / total }} />
|
||||
<span className="nature-seg nature-neutral" style={{ flexGrow: n.neutral / total }} />
|
||||
</span>
|
||||
<span className="hint">
|
||||
{n.harmonious} harmonikus · {n.challenging} feszültebb · {n.neutral} együttállás
|
||||
</span>
|
||||
</>
|
||||
)}
|
||||
</Link>
|
||||
{s.owned && <ComparisonActions id={s.id} name={name} />}
|
||||
</div>
|
||||
);
|
||||
})}
|
||||
</div>
|
||||
</section>
|
||||
)}
|
||||
</main>
|
||||
);
|
||||
}
|
||||
Reference in New Issue
Block a user