Compare commits
5
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
b0b0347b04 | ||
|
|
d2a24ca42d | ||
|
|
7d961fd70b | ||
|
|
a75712a60a | ||
|
|
90fd87ab4a |
@@ -168,7 +168,7 @@ td.num { font-variant-numeric: tabular-nums; white-space: nowrap; }
|
||||
|
||||
/* Detailed analysis */
|
||||
.analysis-card { gap: 14px; }
|
||||
.analysis { display: flex; flex-direction: column; gap: 28px; max-width: 72ch; }
|
||||
.analysis { display: flex; flex-direction: column; gap: 28px; }
|
||||
.analysis-head { display: flex; flex-direction: column; gap: 12px; }
|
||||
.analysis-head h2 { font-size: 34px; }
|
||||
.analysis-lead { font-size: 17px; line-height: 1.7; color: var(--ink-2); font-style: italic; }
|
||||
@@ -207,10 +207,19 @@ td.num { font-variant-numeric: tabular-nums; white-space: nowrap; }
|
||||
/* Payment step */
|
||||
.pay-box { display: flex; flex-direction: column; gap: 12px; padding: 16px; border: 1px solid var(--line-2); border-radius: var(--radius); background: var(--panel-2); }
|
||||
.pay-line { display: flex; justify-content: space-between; gap: 12px; }
|
||||
.chart-layout { display: grid; grid-template-columns: minmax(0, 1.35fr) minmax(280px, 1fr); gap: 24px; align-items: start; }
|
||||
.chart-wheel-card { padding: 16px; gap: 10px; }
|
||||
.chart-layout { display: grid; grid-template-columns: minmax(0, 1.35fr) minmax(280px, 1fr); gap: 24px; align-items: stretch; }
|
||||
.chart-side { gap: 16px; }
|
||||
.chart-side .summary-card { flex: 1 1 auto; }
|
||||
.chart-wheel-card { padding: 16px; gap: 10px; justify-content: center; }
|
||||
.chart-wheel { width: 100%; height: auto; display: block; max-width: 680px; margin: 0 auto; }
|
||||
.chart-layout .big3 { grid-template-columns: 1fr; }
|
||||
.chart-layout .big3 {
|
||||
grid-template-columns: repeat(3, 1fr); gap: 0; background: var(--panel); border: 1px solid var(--line); border-radius: 14px;
|
||||
}
|
||||
.chart-layout .big3 > div { background: none; border: 0; border-radius: 0; padding: 14px 16px; min-width: 0; }
|
||||
.chart-layout .big3 > div + div { border-left: 1px solid var(--line); }
|
||||
.chart-layout .big3 .glyph { font-size: 20px; }
|
||||
.chart-layout .big3 strong { font-size: 21px; }
|
||||
.chart-layout .big3 .muted { font-size: 13px; }
|
||||
.wheel-legend { display: flex; flex-direction: column; align-items: center; gap: 4px; text-align: center; }
|
||||
.wheel-legend-items { display: flex; flex-wrap: wrap; justify-content: center; gap: 4px 16px; }
|
||||
.legend-item { display: inline-flex; align-items: center; gap: 6px; white-space: nowrap; }
|
||||
@@ -220,6 +229,30 @@ td.num { font-variant-numeric: tabular-nums; white-space: nowrap; }
|
||||
.legend-square { background: var(--square); }
|
||||
.legend-opposition { background: var(--tense); }
|
||||
.aspect-tag { white-space: nowrap; }
|
||||
|
||||
/* Aspect grid */
|
||||
.aspect-grid-wrap { overflow-x: auto; }
|
||||
.aspect-grid { width: auto; border-collapse: collapse; font-size: 16px; }
|
||||
.aspect-grid td, .aspect-grid th {
|
||||
width: 30px; min-width: 30px; height: 30px; padding: 0; text-align: center; vertical-align: middle;
|
||||
border: 1px solid var(--line); line-height: 1;
|
||||
}
|
||||
.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); }
|
||||
.asp-conjunction { color: var(--gold); }
|
||||
.asp-trine, .asp-sextile { color: var(--harmonic); }
|
||||
.asp-square { color: var(--square); }
|
||||
.asp-opposition { color: var(--tense); }
|
||||
.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-harmonic { color: var(--harmonic); }
|
||||
.aspect-tense { color: var(--tense); }
|
||||
.aspect-neutral { color: var(--gold); }
|
||||
@@ -253,7 +286,6 @@ td.num { font-variant-numeric: tabular-nums; white-space: nowrap; }
|
||||
|
||||
@media (max-width: 900px) {
|
||||
.chart-layout { grid-template-columns: 1fr; }
|
||||
.chart-layout .big3 { grid-template-columns: repeat(3, 1fr); }
|
||||
}
|
||||
|
||||
@media (max-width: 640px) {
|
||||
@@ -263,7 +295,9 @@ td.num { font-variant-numeric: tabular-nums; white-space: nowrap; }
|
||||
.card { padding: 18px; }
|
||||
.auth-aside { padding: 28px 20px; min-height: 0; }
|
||||
.wheel { width: 60%; }
|
||||
.big3, .chart-layout .big3 { grid-template-columns: 1fr; }
|
||||
.big3 { grid-template-columns: 1fr; }
|
||||
.chart-layout .big3 > div { padding: 12px 10px; }
|
||||
.chart-layout .big3 strong { font-size: 18px; }
|
||||
.chart-wheel-card { padding: 8px; }
|
||||
}
|
||||
|
||||
|
||||
@@ -55,7 +55,7 @@ export default async function ChartPage({ params }: { params: Promise<{ id: stri
|
||||
<ChartWheel chart={result} timeKnown={timeKnown} />
|
||||
<WheelLegend />
|
||||
</div>
|
||||
<div className="field" style={{ gap: 16 }}>
|
||||
<div className="field chart-side">
|
||||
<ChartSummary chartId={chart.id} initial={summary} />
|
||||
<BigThree chart={chart} />
|
||||
{(elements || modalities || phase) && (
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
import { ANGLES, ASPECTS, POINTS, SIGNS, dms, orbText, pointName, signName } from "@/lib/astro";
|
||||
import type { Chart, Position } from "@/lib/types";
|
||||
import type { Aspect, Chart, Position } from "@/lib/types";
|
||||
|
||||
function Pos({ p }: { p: Position }) {
|
||||
return (
|
||||
@@ -46,6 +46,97 @@ export function BigThree({ chart }: { chart: Chart }) {
|
||||
);
|
||||
}
|
||||
|
||||
// Rows and columns of the aspect grid: the points drawn on the wheel, then the angles.
|
||||
const GRID_POINTS = [
|
||||
"sun",
|
||||
"moon",
|
||||
"mercury",
|
||||
"venus",
|
||||
"mars",
|
||||
"jupiter",
|
||||
"saturn",
|
||||
"uranus",
|
||||
"neptune",
|
||||
"pluto",
|
||||
"north_node",
|
||||
"lilith",
|
||||
"chiron",
|
||||
];
|
||||
const GRID_ANGLES: [string, string][] = [
|
||||
["ascendant", "AC"],
|
||||
["midheaven", "MC"],
|
||||
];
|
||||
|
||||
/** The usual triangular aspect grid: only the aspect symbols, the values are in the details below. */
|
||||
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) => [
|
||||
id,
|
||||
POINTS[id]?.glyph ?? id,
|
||||
]);
|
||||
if (chart.highlights.time_known) {
|
||||
for (const [key, label] of GRID_ANGLES) if (result.angles?.[key]) rows.push([key, label]);
|
||||
}
|
||||
const byPair = new Map<string, Aspect>();
|
||||
for (const a of result.aspects ?? []) {
|
||||
byPair.set(`${a.point1}|${a.point2}`, a);
|
||||
byPair.set(`${a.point2}|${a.point1}`, a);
|
||||
}
|
||||
|
||||
const label = ([id, text]: [string, string]) => (
|
||||
<span className={text.length > 2 ? "sym" : "grid-angle"} aria-label={pointName(id)} role="img">
|
||||
{text}
|
||||
</span>
|
||||
);
|
||||
// Lower triangle with both headers: rows from the 2nd point, columns up to the last but one.
|
||||
const cols = rows.slice(0, -1);
|
||||
|
||||
return (
|
||||
<div className="aspect-grid-wrap">
|
||||
<table className="aspect-grid" aria-label="Fényszögmátrix">
|
||||
<thead>
|
||||
<tr>
|
||||
<td className="corner" />
|
||||
{cols.map((c) => (
|
||||
<th key={c[0]} scope="col" title={pointName(c[0])}>
|
||||
{label(c)}
|
||||
</th>
|
||||
))}
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
{rows.slice(1).map((row, r) => {
|
||||
const [id] = row;
|
||||
return (
|
||||
<tr key={id}>
|
||||
<th scope="row" title={pointName(id)}>
|
||||
{label(row)}
|
||||
</th>
|
||||
{cols.map(([other], j) => {
|
||||
if (j > r) return <td key={other} className="void" />;
|
||||
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;
|
||||
return (
|
||||
<td key={other} title={text}>
|
||||
{a && (
|
||||
<span className={`sym asp asp-${a.aspect}`} aria-label={text} role="img">
|
||||
{info?.glyph ?? "?"}
|
||||
</span>
|
||||
)}
|
||||
</td>
|
||||
);
|
||||
})}
|
||||
</tr>
|
||||
);
|
||||
})}
|
||||
</tbody>
|
||||
</table>
|
||||
</div>
|
||||
);
|
||||
}
|
||||
|
||||
/** Positions, angles, house cusps and aspects of a natal chart. */
|
||||
export function ChartTables({ chart }: { chart: Chart }) {
|
||||
const result = chart.chart;
|
||||
@@ -140,48 +231,54 @@ export function ChartTables({ chart }: { chart: Chart }) {
|
||||
)}
|
||||
</div>
|
||||
{aspects.length > 0 && (
|
||||
<div className="table-wrap">
|
||||
<h3 style={{ marginBottom: 8 }}>Fényszögek</h3>
|
||||
<table>
|
||||
<thead>
|
||||
<tr>
|
||||
<th scope="col">Fényszög</th>
|
||||
<th scope="col">Orbisz</th>
|
||||
<th scope="col">
|
||||
<span className="sr-only">Közeledő vagy távolodó</span>
|
||||
</th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
{aspects.map((a) => {
|
||||
const info = ASPECTS[a.aspect];
|
||||
return (
|
||||
<tr key={`${a.point1}-${a.point2}-${a.aspect}`}>
|
||||
<td>
|
||||
<span className="sym" aria-hidden="true">
|
||||
{POINTS[a.point1]?.glyph}
|
||||
</span>{" "}
|
||||
{pointName(a.point1)}{" "}
|
||||
<span className={`aspect-tag aspect-${info?.kind ?? "neutral"}`}>
|
||||
<span className="sym" aria-hidden="true">
|
||||
{info?.glyph}
|
||||
</span>{" "}
|
||||
{info?.hu ?? a.aspect}
|
||||
</span>{" "}
|
||||
<span className="sym" aria-hidden="true">
|
||||
{POINTS[a.point2]?.glyph}
|
||||
</span>{" "}
|
||||
{pointName(a.point2)}
|
||||
</td>
|
||||
<td className="num">{orbText(a.orb)}</td>
|
||||
<td className="muted" style={{ fontSize: 13 }}>
|
||||
{a.applying === true ? "közeledő" : a.applying === false ? "távolodó" : ""}
|
||||
</td>
|
||||
<div className="field" style={{ gap: 12 }}>
|
||||
<h3>Fényszögek</h3>
|
||||
<AspectGrid chart={chart} />
|
||||
<details className="details">
|
||||
<summary>Részletek: orbisz, közeledő vagy távolodó</summary>
|
||||
<div className="table-wrap">
|
||||
<table>
|
||||
<thead>
|
||||
<tr>
|
||||
<th scope="col">Fényszög</th>
|
||||
<th scope="col">Orbisz</th>
|
||||
<th scope="col">
|
||||
<span className="sr-only">Közeledő vagy távolodó</span>
|
||||
</th>
|
||||
</tr>
|
||||
);
|
||||
})}
|
||||
</tbody>
|
||||
</table>
|
||||
</thead>
|
||||
<tbody>
|
||||
{aspects.map((a) => {
|
||||
const info = ASPECTS[a.aspect];
|
||||
return (
|
||||
<tr key={`${a.point1}-${a.point2}-${a.aspect}`}>
|
||||
<td>
|
||||
<span className="sym" aria-hidden="true">
|
||||
{POINTS[a.point1]?.glyph}
|
||||
</span>{" "}
|
||||
{pointName(a.point1)}{" "}
|
||||
<span className={`aspect-tag aspect-${info?.kind ?? "neutral"}`}>
|
||||
<span className="sym" aria-hidden="true">
|
||||
{info?.glyph}
|
||||
</span>{" "}
|
||||
{info?.hu ?? a.aspect}
|
||||
</span>{" "}
|
||||
<span className="sym" aria-hidden="true">
|
||||
{POINTS[a.point2]?.glyph}
|
||||
</span>{" "}
|
||||
{pointName(a.point2)}
|
||||
</td>
|
||||
<td className="num">{orbText(a.orb)}</td>
|
||||
<td className="muted" style={{ fontSize: 13 }}>
|
||||
{a.applying === true ? "közeledő" : a.applying === false ? "távolodó" : ""}
|
||||
</td>
|
||||
</tr>
|
||||
);
|
||||
})}
|
||||
</tbody>
|
||||
</table>
|
||||
</div>
|
||||
</details>
|
||||
</div>
|
||||
)}
|
||||
{!timeKnown && (
|
||||
|
||||
Reference in New Issue
Block a user