diff --git a/services/frontend/src/app/globals.css b/services/frontend/src/app/globals.css index 47c944a..5d75a24 100644 --- a/services/frontend/src/app/globals.css +++ b/services/frontend/src/app/globals.css @@ -239,8 +239,11 @@ td.num { font-variant-numeric: tabular-nums; white-space: nowrap; } } .aspect-grid th { color: var(--ink); font-weight: 400; font-size: 17px; background: var(--panel-2); } .aspect-grid .grid-angle { font: 600 11px var(--font-body); color: var(--gold); letter-spacing: 0.3px; } -.aspect-grid td.void, .aspect-grid td.corner { border: 0; background: none; } -.aspect-grid tbody td:not(.void):hover { background: var(--panel-2); } +.aspect-grid td.corner { border: 0; background: none; } +.aspect-grid td.diag { background: var(--line); } +.aspect-grid tbody td:not(.diag):hover { background: var(--panel-2); } +.grid-legend { list-style: none; margin: 0; padding: 0; display: flex; flex-wrap: wrap; gap: 6px 18px; font-size: 14px; color: var(--ink-2); } +.grid-legend .sym { font-size: 17px; } .asp-conjunction { color: var(--gold); } .asp-trine, .asp-sextile { color: var(--harmonic); } .asp-square { color: var(--square); } @@ -248,10 +251,11 @@ td.num { font-variant-numeric: tabular-nums; white-space: nowrap; } .details > summary { cursor: pointer; color: var(--gold); min-height: 44px; display: flex; align-items: center; } .details[open] > summary { margin-bottom: 8px; } @media (max-width: 640px) { - .aspect-grid { font-size: 13px; } - .aspect-grid td, .aspect-grid th { width: 23px; min-width: 23px; height: 23px; } - .aspect-grid th { font-size: 14px; } - .aspect-grid .grid-angle { font-size: 9px; } + .aspect-grid { font-size: 12px; } + .aspect-grid td, .aspect-grid th { width: 19px; min-width: 19px; height: 19px; } + .aspect-grid th { font-size: 13px; } + .aspect-grid .grid-angle { font-size: 8px; letter-spacing: 0; } + .chart-tabs { padding: 4px 12px 16px; } } .aspect-harmonic { color: var(--harmonic); } .aspect-tense { color: var(--tense); } @@ -302,3 +306,16 @@ td.num { font-variant-numeric: tabular-nums; white-space: nowrap; } } .sr-only { position: absolute; width: 1px; height: 1px; padding: 0; margin: -1px; overflow: hidden; clip: rect(0, 0, 0, 0); white-space: nowrap; border: 0; } + +/* Tabs */ +.chart-tabs { padding-top: 8px; } +.tab-list { display: flex; gap: 4px; border-bottom: 1px solid var(--line); overflow-x: auto; scrollbar-width: none; } +.tab { + background: none; border: 0; border-bottom: 2px solid transparent; margin-bottom: -1px; padding: 12px 16px; min-height: 44px; + color: var(--muted); font: 500 15px var(--font-body); cursor: pointer; white-space: nowrap; +} +.tab:hover { color: var(--ink); } +.tab[aria-selected="true"] { color: var(--gold); border-bottom-color: var(--gold); } +.tab:focus-visible, .tab-panel:focus-visible { outline: 2px solid var(--gold); outline-offset: 2px; } +.tab-panel { padding-top: 20px; } +@media (max-width: 640px) { .tab { padding: 12px 10px; font-size: 14px; } } diff --git a/services/frontend/src/app/kepletek/[id]/page.tsx b/services/frontend/src/app/kepletek/[id]/page.tsx index 4db55ba..da8a1cb 100644 --- a/services/frontend/src/app/kepletek/[id]/page.tsx +++ b/services/frontend/src/app/kepletek/[id]/page.tsx @@ -1,16 +1,19 @@ import type { Metadata } from "next"; import { notFound } from "next/navigation"; -import { BigThree, ChartTables } from "@/components/ChartTables"; +import { AspectGrid, AspectList, BigThree, PositionTables } from "@/components/ChartTables"; import { ChartSummary } from "@/components/ChartSummary"; import { DetailedAnalysis } from "@/components/DetailedAnalysis"; import { ChartWheel, WheelLegend } from "@/components/ChartWheel"; -import { ELEMENTS, MODALITIES, MOON_PHASES, countryName, formatBirthDate, pointName } from "@/lib/astro"; +import { Tabs } from "@/components/Tabs"; +import { ASPECTS, ELEMENTS, MODALITIES, MOON_PHASES, countryName, formatBirthDate, pointName } from "@/lib/astro"; import { backendGet, requireMe } from "@/lib/server"; import type { Analysis, Chart, PublicConfig } from "@/lib/types"; export const metadata: Metadata = { title: "Képlet" }; +const GRID_LEGEND = ["conjunction", "sextile", "square", "trine", "opposition"]; + const UUID = /^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/i; /** One saved chart: the wheel and the tables, read from the database (not recalculated). */ @@ -105,17 +108,46 @@ export default async function ChartPage({ params }: { params: Promise<{ id: stri - - -
-

Pozíciók

- +
+ + ), + }, + { id: "bolygok", label: "Bolygók", content: }, + { + id: "matrix", + label: "Mátrix", + content: ( +
+ +
    + {GRID_LEGEND.map((k) => ( +
  • + {" "} + {ASPECTS[k]?.hu} +
  • + ))} +
+
+ ), + }, + { id: "reszletek", label: "Részletek", content: }, + ]} + />
); diff --git a/services/frontend/src/components/ChartTables.tsx b/services/frontend/src/components/ChartTables.tsx index 3a2c194..ca378d6 100644 --- a/services/frontend/src/components/ChartTables.tsx +++ b/services/frontend/src/components/ChartTables.tsx @@ -67,8 +67,8 @@ const GRID_ANGLES: [string, string][] = [ ["midheaven", "MC"], ]; -/** The usual triangular aspect grid: only the aspect symbols, the values are in the details below. */ -function AspectGrid({ chart }: { chart: Chart }) { +/** The aspect grid: a square matrix with the points on both sides, only the aspect symbols in it. */ +export function AspectGrid({ chart }: { chart: Chart }) { const result = chart.chart; const present = new Set(result.points.map((p) => p.id)); const rows: [string, string][] = GRID_POINTS.filter((id) => present.has(id)).map((id) => [ @@ -83,14 +83,11 @@ function AspectGrid({ chart }: { chart: Chart }) { byPair.set(`${a.point1}|${a.point2}`, a); byPair.set(`${a.point2}|${a.point1}`, a); } - const label = ([id, text]: [string, string]) => ( 2 ? "sym" : "grid-angle"} aria-label={pointName(id)} role="img"> {text} ); - // Lower triangle with both headers: rows from the 2nd point, columns up to the last but one. - const cols = rows.slice(0, -1); return (
@@ -98,7 +95,7 @@ function AspectGrid({ chart }: { chart: Chart }) { - {cols.map((c) => ( + {rows.map((c) => ( {label(c)} @@ -106,18 +103,18 @@ function AspectGrid({ chart }: { chart: Chart }) { - {rows.slice(1).map((row, r) => { + {rows.map((row) => { const [id] = row; return ( {label(row)} - {cols.map(([other], j) => { - if (j > r) return ; + {rows.map(([other]) => { + if (other === id) return ; const a = byPair.get(`${id}|${other}`); const info = a ? ASPECTS[a.aspect] : undefined; - const text = a ? `${pointName(other)} ${info?.hu ?? a.aspect} ${pointName(id)}` : undefined; + const text = a ? `${pointName(id)} ${info?.hu ?? a.aspect} ${pointName(other)}` : undefined; return ( {a && ( @@ -137,15 +134,14 @@ function AspectGrid({ chart }: { chart: Chart }) { ); } -/** Positions, angles, house cusps and aspects of a natal chart. */ -export function ChartTables({ chart }: { chart: Chart }) { +/** Positions, angles and house cusps of a natal chart. */ +export function PositionTables({ chart }: { chart: Chart }) { const result = chart.chart; const timeKnown = chart.highlights.time_known; const angles = ANGLES.map(([key, label]) => [label, result.angles?.[key]] as const).filter( (a): a is readonly [string, Position] => typeof a[1] === "object" && a[1] !== null, ); const fortune = result.lots?.fortune; - const aspects = [...(result.aspects ?? [])].sort((a, b) => a.orb - b.orb); return (
@@ -230,57 +226,6 @@ export function ChartTables({ chart }: { chart: Chart }) {
)}
- {aspects.length > 0 && ( -
-

Fényszögek

- -
- Részletek: orbisz, közeledő vagy távolodó -
- - - - - - - - - - {aspects.map((a) => { - const info = ASPECTS[a.aspect]; - return ( - - - - - - ); - })} - -
FényszögOrbisz - Közeledő vagy távolodó -
- {" "} - {pointName(a.point1)}{" "} - - {" "} - {info?.hu ?? a.aspect} - {" "} - {" "} - {pointName(a.point2)} - {orbText(a.orb)} - {a.applying === true ? "közeledő" : a.applying === false ? "távolodó" : ""} -
-
-
-
- )} {!timeKnown && (

Születési idő nélkül a házak, a tengelyek és az Aszcendens nem számolhatók; a Hold helyzete a nap folyamán akár @@ -290,3 +235,53 @@ export function ChartTables({ chart }: { chart: Chart }) { ); } + +/** Every aspect with its orb and whether it is applying, closest first. */ +export function AspectList({ chart }: { chart: Chart }) { + const aspects = [...(chart.chart.aspects ?? [])].sort((a, b) => a.orb - b.orb); + if (aspects.length === 0) return

Nincs fényszög.

; + return ( +
+ + + + + + + + + + {aspects.map((a) => { + const info = ASPECTS[a.aspect]; + return ( + + + + + + ); + })} + +
FényszögOrbisz + Közeledő vagy távolodó +
+ {" "} + {pointName(a.point1)}{" "} + + {" "} + {info?.hu ?? a.aspect} + {" "} + {" "} + {pointName(a.point2)} + {orbText(a.orb)} + {a.applying === true ? "közeledő" : a.applying === false ? "távolodó" : ""} +
+
+ ); +} diff --git a/services/frontend/src/components/DetailedAnalysis.tsx b/services/frontend/src/components/DetailedAnalysis.tsx index 5d9f949..3e454fb 100644 --- a/services/frontend/src/components/DetailedAnalysis.tsx +++ b/services/frontend/src/components/DetailedAnalysis.tsx @@ -78,7 +78,7 @@ export function DetailedAnalysis({ if (analysis?.status === "done" && analysis.content) { return ( -
+
Részletes elemzés
@@ -87,7 +87,7 @@ export function DetailedAnalysis({ if (waiting) { return ( -
+
Részletes elemzés +
Részletes elemzés

Az egész képleted, fejezetekre bontva

diff --git a/services/frontend/src/components/Tabs.tsx b/services/frontend/src/components/Tabs.tsx new file mode 100644 index 0000000..f8976f5 --- /dev/null +++ b/services/frontend/src/components/Tabs.tsx @@ -0,0 +1,73 @@ +"use client"; + +import { type KeyboardEvent, type ReactNode, useEffect, useRef, useState } from "react"; + +export type Tab = { id: string; label: string; content: ReactNode }; + +/** + * Tabs with the chosen one kept in the URL hash (#matrix), so a reload or a + * shared link opens the same tab. Hidden panels stay mounted: a running + * analysis keeps polling while another tab is open. + */ +export function Tabs({ tabs, label }: { tabs: Tab[]; label: string }) { + const [active, setActive] = useState(tabs[0]?.id); + const buttons = useRef<(HTMLButtonElement | null)[]>([]); + + useEffect(() => { + const fromHash = window.location.hash.slice(1); + if (tabs.some((t) => t.id === fromHash)) setActive(fromHash); + }, [tabs]); + + function choose(id: string) { + setActive(id); + history.replaceState(null, "", `#${id}`); + } + + function onKey(e: KeyboardEvent, i: number) { + const step = e.key === "ArrowRight" ? 1 : e.key === "ArrowLeft" ? -1 : 0; + const to = e.key === "Home" ? 0 : e.key === "End" ? tabs.length - 1 : step ? (i + step + tabs.length) % tabs.length : -1; + if (to < 0) return; + e.preventDefault(); + choose(tabs[to].id); + buttons.current[to]?.focus(); + } + + return ( +

+
+ {tabs.map((t, i) => ( + + ))} +
+ {tabs.map((t) => ( + + ))} +
+ ); +}