-
Upgrades
-
Level L{upgradeLevel}
+
+ Upgrades
+
+
+ {UPGRADE_BONUS_LABELS.map((bonus) => (
+ {bonus}
+ ))}
+
+
+ {UPGRADE_LEVELS.map((level) => {
+ const state = upgradeLevelState(level, upgradeLevel, nextUpgrade);
+ const filled = state === 'complete' || state === 'current';
+ return (
+
+ {level}
+
+ );
+ })}
+
{!upgradesEnabled ? (
- Upgrades are disabled.
+
+ Upgrades are disabled.
+
) : nextUpgrade === null ? (
Maximum level reached.
- ) : (() => {
- const insufficientBalance = balanceMicros < BigInt(nextUpgrade.costMicros);
- const disabled = isPending || insufficientBalance;
- return (
- <>
-
- Next upgrade: L{nextUpgrade.targetLevel}
- {formatMinerals(BigInt(nextUpgrade.costMicros))} minerals
-
- {error ? {error.message}
: null}
- {insufficientBalance ? Insufficient balance.
: null}
-
- >
- );
- })()}
+ ) : (
+ (() => {
+ const insufficientBalance = balanceMicros < BigInt(nextUpgrade.costMicros);
+ const disabled = isPending || insufficientBalance;
+ const costLabel = formatMinerals(BigInt(nextUpgrade.costMicros));
+ const buttonLabel = `Upgrade · ${costLabel} minerals`;
+ const bonusLabel = UPGRADE_BONUS_LABELS[nextUpgrade.targetLevel - 1] ?? '—';
+ return (
+ <>
+ {error ? (
+
+ {error.message}
+
+ ) : null}
+ {insufficientBalance ? (
+
+ Insufficient balance.
+
+ ) : null}
+
+
+
+ >
+ );
+ })()
+ )}
);
}
diff --git a/src/components/tickets/TicketStatusBadge.tsx b/src/components/tickets/TicketStatusBadge.tsx
index 75f724a..2ed98d1 100644
--- a/src/components/tickets/TicketStatusBadge.tsx
+++ b/src/components/tickets/TicketStatusBadge.tsx
@@ -21,7 +21,7 @@ function ClockIcon() {
}
const BASE = 'inline-flex items-center gap-1 rounded-full border px-2 py-0.5 text-[10px] font-semibold uppercase tracking-wide';
-const COMPACT_BASE = 'inline-flex min-h-8 items-center gap-1 rounded-full border px-3 py-1 text-[10px] font-semibold uppercase tracking-wide';
+const COMPACT_BASE = 'inline-flex min-h-10 items-center gap-1 rounded-full border px-3 py-2 text-[10px] font-semibold uppercase tracking-wide';
export function TicketStatusBadge({ status, appearance = 'default' }: { status: TicketStatus; appearance?: 'default' | 'compact' }) {
const base = appearance === 'compact' ? COMPACT_BASE : BASE;
diff --git a/src/hooks/useMiningLeaderboard.test.ts b/src/hooks/useMiningLeaderboard.test.ts
index 4a70ac1..72cc416 100644
--- a/src/hooks/useMiningLeaderboard.test.ts
+++ b/src/hooks/useMiningLeaderboard.test.ts
@@ -15,7 +15,7 @@ describe('backend mining fetchers', () => {
});
it('loads one aggregated wallet mining snapshot', async () => {
- const payload = { mining: { ownerAddress: ADDRESS, asOf: '2026-08-12T12:00:00.000Z', ownedPlanetCount: 1, currentBalanceMicros: '2', effectiveMineralsPerDayMicros: '3', upgradesEnabled: false, planets: [] } };
+ const payload = { mining: { ownerAddress: ADDRESS, asOf: '2026-08-12T12:00:00.000Z', ownedPlanetCount: 1, currentBalanceMicros: '2', effectiveMineralsPerDayMicros: '3', upgradesEnabled: false, galaxyPulse: null, planets: [] } };
const fetchMock = vi.fn().mockResolvedValue(new Response(JSON.stringify(payload), { status: 200 }));
vi.stubGlobal('fetch', fetchMock);
diff --git a/src/hooks/useWalletMining.test.ts b/src/hooks/useWalletMining.test.ts
index 5d27413..2ffeec8 100644
--- a/src/hooks/useWalletMining.test.ts
+++ b/src/hooks/useWalletMining.test.ts
@@ -21,6 +21,16 @@ describe('wallet mining refresh', () => {
currentBalanceMicros: '5000000',
effectiveMineralsPerDayMicros: '86400000000',
upgradesEnabled: true,
+ galaxyPulse: {
+ drawingId: '150',
+ settledAt: '2026-08-21T17:00:11.000Z',
+ slots: [
+ { planetType: 'gaia', modifierBps: 5_000 },
+ { planetType: 'nebula', modifierBps: -2_000 },
+ { planetType: 'gaia', modifierBps: 1_000 },
+ { planetType: 'void', modifierBps: 0 },
+ ],
+ },
planets: [{
planetId: 'planet-1',
planetType: 'Nebula',
@@ -30,6 +40,7 @@ describe('wallet mining refresh', () => {
effectiveMineralsPerDayMicros: '25200000',
upgradeLevel: 1,
upgradeBonusBps: 1000,
+ galaxyPulseBps: -2_000,
nextUpgrade: { targetLevel: 2, bonusBpsAfter: 2500, costMicros: '300000' },
}],
},
diff --git a/src/hooks/useWalletMining.ts b/src/hooks/useWalletMining.ts
index 5c80ab7..d6cfd8a 100644
--- a/src/hooks/useWalletMining.ts
+++ b/src/hooks/useWalletMining.ts
@@ -16,9 +16,16 @@ export type PlanetMiningSnapshot = {
effectiveMineralsPerDayMicros: string;
upgradeLevel: number;
upgradeBonusBps: number;
+ galaxyPulseBps: number;
nextUpgrade: PlanetUpgradeSnapshot | null;
};
+export type GalaxyPulseSnapshot = {
+ drawingId: string;
+ settledAt: string;
+ slots: Array<{ planetType: string; modifierBps: number }>;
+};
+
export type WalletMiningSnapshot = {
ownerAddress: `0x${string}`;
asOf: string;
@@ -26,6 +33,7 @@ export type WalletMiningSnapshot = {
currentBalanceMicros: string;
effectiveMineralsPerDayMicros: string;
upgradesEnabled: boolean;
+ galaxyPulse: GalaxyPulseSnapshot | null;
planets: PlanetMiningSnapshot[];
};
@@ -60,6 +68,13 @@ function requiredInteger(value: unknown, label: string, minimum: number): number
return value;
}
+function requiredSignedInteger(value: unknown, label: string, minimum: number, maximum: number): number {
+ if (typeof value !== 'number' || !Number.isInteger(value) || value < minimum || value > maximum) {
+ throw new Error(`Wallet mining ${label} is malformed.`);
+ }
+ return value;
+}
+
function isWalletAddress(value: unknown): value is `0x${string}` {
return typeof value === 'string' && /^0x[\da-fA-F]{40}$/.test(value);
}
@@ -89,6 +104,30 @@ function parseNextUpgrade(value: unknown): PlanetUpgradeSnapshot | null {
};
}
+function parseGalaxyPulse(value: unknown): GalaxyPulseSnapshot | null {
+ if (value === null || value === undefined) return null;
+ const pulse = requiredObject(value, 'galaxyPulse');
+ if (!Array.isArray(pulse.slots) || pulse.slots.length !== 4) {
+ throw new Error('Wallet mining galaxyPulse.slots is malformed.');
+ }
+ return {
+ drawingId: requiredMicros(pulse.drawingId, 'galaxyPulse.drawingId'),
+ settledAt: requiredTimestamp(pulse.settledAt, 'galaxyPulse.settledAt'),
+ slots: pulse.slots.map((value) => {
+ const slot = requiredObject(value, 'galaxyPulse slot');
+ return {
+ planetType: requiredString(slot.planetType, 'galaxyPulse slot planetType'),
+ modifierBps: requiredSignedInteger(
+ slot.modifierBps,
+ 'galaxyPulse slot modifierBps',
+ -5_000,
+ 5_000,
+ ),
+ };
+ }),
+ };
+}
+
function parsePlanet(value: unknown, upgradesEnabled: boolean): PlanetMiningSnapshot {
const planet = requiredObject(value, 'Planet');
const upgradeLevel = planet.upgradeLevel === undefined && !upgradesEnabled
@@ -111,6 +150,9 @@ function parsePlanet(value: unknown, upgradesEnabled: boolean): PlanetMiningSnap
effectiveMineralsPerDayMicros: requiredMicros(planet.effectiveMineralsPerDayMicros, 'Planet effectiveMineralsPerDayMicros'),
upgradeLevel,
upgradeBonusBps,
+ galaxyPulseBps: planet.galaxyPulseBps === undefined
+ ? 0
+ : requiredSignedInteger(planet.galaxyPulseBps, 'Planet galaxyPulseBps', -20_000, 20_000),
nextUpgrade,
};
}
@@ -128,6 +170,7 @@ export function parseWalletMiningSnapshot(value: unknown): WalletMiningSnapshot
currentBalanceMicros: requiredMicros(mining.currentBalanceMicros, 'currentBalanceMicros'),
effectiveMineralsPerDayMicros: requiredMicros(mining.effectiveMineralsPerDayMicros, 'effectiveMineralsPerDayMicros'),
upgradesEnabled,
+ galaxyPulse: parseGalaxyPulse(mining.galaxyPulse),
planets: mining.planets.map((planet) => parsePlanet(planet, upgradesEnabled)),
};
}
diff --git a/src/pages/Landing.css b/src/pages/Landing.css
index 72a3246..07813c1 100644
--- a/src/pages/Landing.css
+++ b/src/pages/Landing.css
@@ -98,25 +98,31 @@
gap: 14px;
min-height: 52px;
padding: 0 22px;
+ border-radius: 8px;
border: 1px solid var(--landing-mineral);
- background: var(--landing-mineral);
- color: var(--landing-void);
+ background: transparent;
+ color: var(--landing-mineral);
cursor: pointer;
font-size: 0.72rem;
font-weight: 700;
letter-spacing: 0.08em;
text-decoration: none;
text-transform: uppercase;
- transition: transform 180ms ease, background-color 180ms ease, color 180ms ease;
+ transition:
+ transform 180ms ease,
+ background-color 180ms ease,
+ color 180ms ease,
+ box-shadow 180ms ease;
}
.landing a.landing-button {
- color: var(--landing-void);
+ color: var(--landing-mineral);
}
.landing-button:hover {
- background: var(--landing-dust);
border-color: var(--landing-dust);
+ background: rgb(174 185 255 / 0.08);
+ color: var(--landing-dust);
transform: translateY(-2px);
}
@@ -243,7 +249,9 @@
width: fit-content;
border-radius: 4px;
filter: drop-shadow(0 3px 10px rgb(255 255 255 / 0.12));
- transition: transform 200ms ease, filter 200ms ease;
+ transition:
+ transform 200ms ease,
+ filter 200ms ease;
}
.landing-powered-by:hover {
@@ -294,22 +302,18 @@
}
.landing-live-jackpot-layout {
- display: grid;
- grid-template-columns: minmax(0, 1fr) minmax(220px, 0.34fr);
- align-items: end;
- gap: clamp(26px, 5vw, 80px);
+ display: block;
}
.landing-live-jackpot-main {
min-width: 0;
}
-.landing-live-jackpot-header,
-.landing-live-jackpot-footer {
+.landing-live-jackpot-header {
display: flex;
- align-items: end;
- justify-content: space-between;
- gap: 18px;
+ align-items: flex-start;
+ flex-direction: column;
+ gap: 8px;
}
.landing-live-jackpot-status,
@@ -330,13 +334,14 @@
.landing-live-jackpot-echo {
min-width: 0;
padding: 24px 0 18px;
- overflow: visible;
+ overflow: hidden;
}
.landing-live-jackpot-echo .depth-text {
display: block;
width: fit-content;
max-width: 100%;
+ transform-origin: left center;
filter: saturate(1.08) drop-shadow(0 20px 34px rgb(0 0 0 / 0.24));
}
@@ -348,20 +353,14 @@
letter-spacing: -0.07em;
}
-.landing-live-jackpot-footer {
- align-items: end;
- min-height: 126px;
- padding: 18px 0 12px 28px;
- border-top: 0;
- border-left: 1px solid rgb(244 247 255 / 0.16);
-}
-
-.landing-live-jackpot-footer > div {
- display: grid;
- gap: 5px;
+.landing-live-jackpot-countdown-line {
+ display: flex;
+ align-items: baseline;
+ gap: 12px;
+ white-space: nowrap;
}
-.landing-live-jackpot-footer [role="timer"] {
+.landing-live-jackpot-drawing-panel [role="timer"] {
margin: 0;
color: var(--landing-dust);
font-family: "JetBrains Mono", ui-monospace, monospace;
@@ -372,10 +371,7 @@
}
.landing-live-jackpot-drawing-panel {
- display: grid;
- align-content: end;
- justify-content: space-between;
- gap: 22px;
+ display: block;
}
.landing-live-generator {
@@ -427,6 +423,7 @@
min-height: 40px;
padding: 0 15px;
overflow: hidden;
+ border-radius: 6px;
border: 1px solid rgb(174 185 255 / 0.54);
background: var(--landing-mineral);
color: var(--landing-void);
@@ -437,8 +434,13 @@
letter-spacing: 0.08em;
text-align: center;
text-transform: uppercase;
- box-shadow: 0 0 0 1px rgb(174 185 255 / 0.42), 0 0 22px rgb(174 185 255 / 0.2);
- transition: transform 180ms ease, box-shadow 180ms ease, color 180ms ease;
+ box-shadow:
+ 0 0 0 1px rgb(174 185 255 / 0.42),
+ 0 0 22px rgb(174 185 255 / 0.2);
+ transition:
+ transform 180ms ease,
+ box-shadow 180ms ease,
+ color 180ms ease;
}
.landing-live-generator-button::before {
@@ -456,7 +458,9 @@
.landing-live-generator-button:hover {
color: var(--landing-void);
- box-shadow: 0 0 0 1px rgb(242 241 233 / 0.62), 0 0 24px rgb(174 185 255 / 0.34);
+ box-shadow:
+ 0 0 0 1px rgb(242 241 233 / 0.62),
+ 0 0 24px rgb(174 185 255 / 0.34);
transform: translateY(-2px);
}
@@ -472,7 +476,21 @@
min-width: 148px;
min-height: 64px;
padding-inline: 30px;
+ background: var(--landing-mineral);
+ color: var(--landing-void);
font-size: 0.78rem;
+ box-shadow: 0 5px 14px rgb(0 0 0 / 0.28);
+}
+
+.landing a.landing-button-primary {
+ color: var(--landing-void);
+}
+
+.landing-button-primary:hover {
+ border-color: var(--landing-dust);
+ background: var(--landing-dust);
+ color: var(--landing-void);
+ box-shadow: 0 8px 18px rgb(0 0 0 / 0.34);
}
.landing-live-jackpot-powered-by {
@@ -725,7 +743,11 @@
border-radius: 1rem;
background: var(--landing-graphite);
box-shadow: 0 18px 42px rgb(0 0 0 / 0.52);
- transition: transform 200ms ease, background-color 200ms ease, box-shadow 200ms ease, filter 200ms ease;
+ transition:
+ transform 200ms ease,
+ background-color 200ms ease,
+ box-shadow 200ms ease,
+ filter 200ms ease;
}
.landing-my-planet-card:hover {
@@ -1030,6 +1052,66 @@
white-space: nowrap;
}
+.landing-mining-active-players {
+ display: flex;
+ align-items: baseline;
+ justify-content: space-between;
+ gap: 12px;
+ padding: 11px 18px;
+ border-bottom: 1px solid rgb(244 247 255 / 0.12);
+ color: var(--landing-haze);
+ font-family: "JetBrains Mono", ui-monospace, monospace;
+ font-size: 0.56rem;
+ letter-spacing: 0.12em;
+}
+
+.landing-mining-active-players strong {
+ color: var(--landing-dust);
+ font-size: 0.82rem;
+ letter-spacing: 0;
+}
+
+.landing-mining-standings-footer {
+ display: grid;
+ gap: 14px;
+ padding: 16px 18px 18px;
+ border-top: 1px solid rgb(244 247 255 / 0.16);
+}
+
+.landing-mining-prizes {
+ display: grid;
+ gap: 8px;
+ color: var(--landing-dust);
+ font-family: "JetBrains Mono", ui-monospace, monospace;
+ font-size: 0.58rem;
+}
+
+.landing-mining-prizes > span:not(.landing-mining-prizes-title) {
+ display: flex;
+ align-items: center;
+ gap: 8px;
+}
+
+.landing-mining-prizes svg {
+ width: 14px;
+ height: 14px;
+ color: var(--warning);
+}
+
+.landing-mining-prizes small,
+.landing-mining-prizes-title {
+ color: var(--landing-haze);
+}
+
+.landing-mining-prizes-title {
+ letter-spacing: 0.12em;
+}
+
+.landing-mining-standings-footer .landing-button {
+ width: 100%;
+ min-width: 0;
+}
+
.landing-mining-standings-empty {
display: grid;
min-height: 180px;
@@ -1247,7 +1329,6 @@
.landing-planet-mechanic {
border-top: 0;
}
-
}
@media (max-width: 700px) {
@@ -1281,20 +1362,12 @@
gap: 0;
}
- .landing-live-jackpot-header,
- .landing-live-jackpot-footer {
+ .landing-live-jackpot-header {
align-items: flex-start;
flex-direction: column;
gap: 9px;
}
- .landing-live-jackpot-footer {
- min-height: 0;
- padding: 18px 0 0;
- border-top: 1px solid rgb(244 247 255 / 0.12);
- border-left: 0;
- }
-
.landing-live-jackpot-status,
.landing-live-jackpot-drawing {
text-align: left;
@@ -1388,5 +1461,594 @@
animation-duration: 0.01ms;
animation-iteration-count: 1;
}
+}
+/* Narrow polish for the approved Planet discovery deck. */
+.landing-button-small {
+ min-width: 144px;
+ min-height: 46px;
+ padding-inline: 18px;
+ font-size: 0.65rem;
+}
+
+.landing-header .landing-button-small {
+ min-width: 0;
+ min-height: 42px;
+ padding-inline: 16px;
+ font-size: 0.62rem;
+}
+
+.landing-button-primary {
+ min-width: 184px;
+ min-height: 64px;
+}
+
+.landing-planet-mechanic > .landing-planet-stack-shell {
+ display: grid;
+ min-height: 444px;
+ margin-block: 30px 28px;
+ padding: 22px 16px 18px;
+ border: 1px solid rgb(244 247 255 / 0.16);
+ background: var(--landing-void);
+ place-items: center;
+}
+
+.landing-planet-stack {
+ position: relative;
+ width: min(100%, 326px);
+ aspect-ratio: 0.78;
+ perspective: 900px;
+}
+
+.landing-planet-stack-item {
+ position: absolute;
+ inset: 0;
+ cursor: grab;
+ transform-origin: 10% 10%;
+}
+
+.landing-planet-stack-item:active {
+ cursor: grabbing;
+}
+
+.landing-planet-card {
+ display: grid;
+ grid-template-rows: 1fr auto;
+ height: 100%;
+ overflow: hidden;
+ border: 1px solid var(--landing-border-strong);
+ background: var(--landing-graphite);
+ clip-path: polygon(
+ 0 0,
+ calc(100% - 20px) 0,
+ 100% 20px,
+ 100% 100%,
+ 20px 100%,
+ 0 calc(100% - 20px)
+ );
+ box-shadow: 18px 18px 45px rgb(0 0 0 / 0.46);
+}
+
+.landing-planet-card--legendary {
+ border-color: var(--landing-mineral);
+}
+
+.landing-planet-card--epic {
+ border-color: var(--landing-rare);
+}
+
+.landing-planet-card--uncommon {
+ border-color: var(--landing-success);
+}
+
+.landing-planet-card-media {
+ position: relative;
+ height: auto;
+ aspect-ratio: 1;
+ overflow: hidden;
+ border-bottom: 1px solid var(--landing-border);
+ background: var(--landing-void);
+}
+
+.landing-planet-card-media::after {
+ position: absolute;
+ inset: 0;
+ background: repeating-linear-gradient(0deg, transparent 0 3px, rgb(0 0 0 / 0.14) 4px);
+ content: "";
+ pointer-events: none;
+}
+
+.landing-planet-card-media img {
+ display: block;
+ width: 100%;
+ height: 100%;
+ object-fit: cover;
+ image-rendering: pixelated;
+ pointer-events: none;
+}
+
+.landing-planet-card-type {
+ position: absolute;
+ top: 16px;
+ left: 16px;
+ z-index: 2;
+ padding: 6px 9px;
+ border-left: 2px solid var(--landing-mineral);
+ color: var(--landing-dust);
+ background: rgb(5 7 8 / 0.84);
+ font-family: "JetBrains Mono", ui-monospace, monospace;
+ font-size: 0.58rem;
+ letter-spacing: 0.12em;
+ text-transform: uppercase;
+}
+
+.landing-planet-card-body {
+ display: grid;
+ gap: 12px;
+ padding: 16px 18px 18px;
+}
+
+.landing-planet-card-heading,
+.landing-planet-card-metrics {
+ display: flex;
+ align-items: center;
+ justify-content: space-between;
+ gap: 14px;
+}
+
+.landing-planet-card-heading h3 {
+ min-width: 0;
+ margin: 0;
+ overflow-wrap: anywhere;
+ color: var(--landing-dust);
+ font-size: 1.08rem;
+ font-weight: 600;
+ letter-spacing: -0.03em;
+}
+
+.landing-planet-card-heading > span,
+.landing-planet-card-metrics {
+ color: var(--landing-haze);
+ font-family: "JetBrains Mono", ui-monospace, monospace;
+ font-size: 0.56rem;
+ letter-spacing: 0.08em;
+ text-transform: uppercase;
+}
+
+.landing-planet-card-metrics > span:first-child {
+ display: inline-flex;
+ align-items: center;
+ gap: 7px;
+ color: var(--landing-dust);
+}
+
+.landing-planet-card-metrics img {
+ width: 15px;
+ height: 15px;
+ image-rendering: pixelated;
+}
+
+.landing-planet-stack-controls {
+ display: flex;
+ align-items: center;
+ gap: 14px;
+ margin-top: 20px;
+ color: var(--landing-haze);
+ font-family: "JetBrains Mono", ui-monospace, monospace;
+ font-size: 0.56rem;
+ letter-spacing: 0.12em;
+}
+
+.landing-planet-stack-drag-cue {
+ display: grid;
+ min-width: 112px;
+ gap: 5px;
+ place-items: center;
+}
+
+.landing-planet-stack-drag-visual {
+ display: grid;
+ grid-template-columns: auto 34px auto;
+ align-items: center;
+ gap: 6px;
+ color: var(--landing-mineral);
+ font-size: 0.72rem;
+}
+
+.landing-planet-stack-drag-visual b {
+ position: relative;
+ height: 1px;
+ background: currentColor;
+}
+
+.landing-planet-stack-drag-visual b::after {
+ position: absolute;
+ top: -2px;
+ left: 50%;
+ width: 5px;
+ height: 5px;
+ border: 1px solid currentColor;
+ background: var(--landing-void);
+ content: "";
+ transform: translateX(-50%) rotate(45deg);
+}
+
+@media (prefers-reduced-motion: no-preference) {
+ .landing-planet-stack-drag-visual {
+ animation: landing-drag-cue 1.8s ease-in-out infinite;
+ }
+}
+
+@keyframes landing-drag-cue {
+ 0%, 100% { transform: translateX(-3px); }
+ 50% { transform: translateX(3px); }
+}
+
+.landing-planet-stack-controls button {
+ display: grid;
+ width: 44px;
+ height: 40px;
+ border-radius: 6px;
+ border: 1px solid var(--landing-border-strong);
+ color: var(--landing-dust);
+ background: transparent;
+ cursor: pointer;
+ place-items: center;
+}
+
+.landing-planet-stack-controls button:hover,
+.landing-planet-stack-controls button:focus-visible {
+ border-color: var(--landing-mineral);
+ color: var(--landing-mineral);
+ outline: none;
+}
+
+@media (max-width: 700px) {
+ .landing-planet-mechanic > .landing-planet-stack-shell {
+ min-height: 420px;
+ margin-block: 36px 28px;
+ padding-inline: 10px;
+ }
+
+ .landing-planet-stack {
+ width: min(78vw, 300px);
+ }
+
+ .landing-planet-card-body {
+ gap: 10px;
+ padding: 14px;
+ }
+
+ .landing-planet-card-heading h3 {
+ font-size: 0.98rem;
+ }
+
+ .landing-planet-card-heading > span,
+ .landing-planet-card-metrics {
+ font-size: 0.52rem;
+ }
+}
+
+.landing-mining-stage {
+ grid-template-columns: minmax(0, 1.45fr) minmax(250px, 0.85fr);
+ align-items: stretch;
+}
+
+.landing-mining-upgrade-preview {
+ position: relative;
+ isolation: isolate;
+ display: grid;
+ grid-template-rows: auto auto minmax(112px, 1fr) auto auto;
+ min-width: 0;
+ padding: 18px;
+ border: 1px solid rgb(244 247 255 / 0.16);
+ background: var(--landing-graphite);
+}
+
+.landing-mining-upgrade-preview::before {
+ position: absolute;
+ z-index: -1;
+ inset: 0;
+ background:
+ linear-gradient(90deg, transparent 0 49.8%, rgb(174 185 255 / 0.06) 50%, transparent 50.2%),
+ linear-gradient(180deg, rgb(174 185 255 / 0.04), transparent 34%);
+ content: "";
+ pointer-events: none;
+}
+
+.landing-mining-upgrade-header,
+.landing-mining-upgrade-footer {
+ display: flex;
+ align-items: center;
+ justify-content: space-between;
+ gap: 14px;
+ color: var(--landing-mineral);
+ font-family: "JetBrains Mono", ui-monospace, monospace;
+ font-size: 0.56rem;
+ letter-spacing: 0.12em;
+ text-transform: uppercase;
+}
+
+.landing-mining-upgrade-header span:last-child {
+ color: var(--landing-haze);
+}
+
+.landing-mining-upgrade-gallery {
+ display: grid;
+ grid-template-columns: repeat(3, minmax(0, 1fr));
+ gap: 10px;
+ margin-block: 28px 16px;
+ align-items: stretch;
+}
+
+.landing-mining-upgrade-stage {
+ position: relative;
+ display: grid;
+ grid-template-rows: minmax(0, 1fr) auto;
+ min-width: 0;
+ margin: 0;
+ overflow: visible;
+ border: 1px solid var(--landing-border-strong);
+ background: var(--landing-void);
+ box-shadow: 0 18px 40px rgb(0 0 0 / 0.16);
+ transition:
+ border-color 180ms ease,
+ transform 180ms ease,
+ box-shadow 180ms ease;
+}
+
+.landing-mining-upgrade-stage:hover {
+ border-color: rgb(174 185 255 / 0.72);
+ box-shadow: 0 22px 48px rgb(0 0 0 / 0.28);
+ transform: translateY(-3px);
+}
+
+.landing-mining-upgrade-media,
+.landing-mining-upgrade-media > *,
+.landing-mining-upgrade-media img,
+.landing-mining-upgrade-media canvas {
+ display: block;
+ width: 100%;
+ aspect-ratio: 1;
+}
+
+.landing-mining-upgrade-media {
+ overflow: hidden;
+ background: #050610;
+}
+
+.landing-mining-upgrade-media img,
+.landing-mining-upgrade-media canvas {
+ object-fit: cover;
+ image-rendering: pixelated;
+}
+
+.landing-mining-upgrade-ornament {
+ position: absolute;
+ z-index: 3;
+ top: -8px;
+ left: 50%;
+ display: flex;
+ min-width: 34px;
+ height: 18px;
+ align-items: center;
+ justify-content: center;
+ gap: 5px;
+ padding-inline: 7px;
+ background: var(--landing-void);
+ transform: translateX(-50%);
+}
+
+.landing-mining-upgrade-ornament::before,
+.landing-mining-upgrade-ornament::after {
+ width: 8px;
+ height: 1px;
+ background: var(--landing-border-strong);
+ content: "";
+}
+
+.landing-mining-upgrade-stage--crystal .landing-mining-upgrade-ornament::before,
+.landing-mining-upgrade-stage--crystal .landing-mining-upgrade-ornament::after {
+ display: none;
+}
+
+.landing-mining-upgrade-ornament i {
+ width: 9px;
+ height: 9px;
+ border: 1px solid var(--landing-mineral);
+ background: color-mix(in srgb, var(--landing-mineral) 70%, transparent);
+ box-shadow: 0 0 12px rgb(174 185 255 / 0.38);
+ transform: rotate(45deg);
+ animation: landing-upgrade-signal 2.8s ease-in-out infinite;
+}
+
+.landing-mining-upgrade-stage--crowned .landing-mining-upgrade-ornament i:nth-child(2) {
+ width: 12px;
+ height: 12px;
+ background: var(--landing-dust);
+}
+
+.landing-mining-upgrade-stage figcaption {
+ display: flex;
+ justify-content: space-between;
+ gap: 8px;
+ padding: 9px 8px 10px;
+ color: var(--landing-haze);
+ font-family: "JetBrains Mono", ui-monospace, monospace;
+ font-size: 0.5rem;
+ letter-spacing: 0.08em;
+ text-transform: uppercase;
+}
+
+.landing-mining-upgrade-stage figcaption span:first-child {
+ color: var(--landing-dust);
+}
+
+.landing-mining-upgrade-stage--crystal { border-color: var(--landing-haze); }
+.landing-mining-upgrade-stage--winged { border-color: var(--landing-mineral); }
+.landing-mining-upgrade-stage--crowned { border-color: var(--landing-dust); }
+
+.landing-mining-upgrade-impact {
+ display: grid;
+ align-content: center;
+ gap: 14px;
+ min-height: 112px;
+ padding: 14px 0 16px;
+ border-top: 1px solid rgb(244 247 255 / 0.1);
+}
+
+.landing-mining-upgrade-impact-header,
+.landing-mining-upgrade-impact li {
+ display: grid;
+ grid-template-columns: 28px minmax(0, 1fr) 38px;
+ align-items: center;
+ gap: 10px;
+ color: var(--landing-haze);
+ font-family: "JetBrains Mono", ui-monospace, monospace;
+ font-size: 0.5rem;
+ letter-spacing: 0.08em;
+}
+
+.landing-mining-upgrade-impact-header {
+ grid-template-columns: 1fr auto;
+ letter-spacing: 0.12em;
+}
+
+.landing-mining-upgrade-impact-header span:first-child,
+.landing-mining-upgrade-impact strong {
+ color: var(--landing-dust);
+}
+
+.landing-mining-upgrade-impact ol {
+ display: grid;
+ gap: 9px;
+ margin: 0;
+ padding: 0;
+ list-style: none;
+}
+
+.landing-mining-upgrade-impact-meter {
+ height: 4px;
+ overflow: hidden;
+ border-radius: 2px;
+ background: rgb(244 247 255 / 0.1);
+}
+
+.landing-mining-upgrade-impact-meter i {
+ display: block;
+ height: 100%;
+ border-radius: inherit;
+ background: var(--landing-mineral);
+ box-shadow: 0 0 10px rgb(174 185 255 / 0.42);
+}
+
+.landing-mining-upgrade-impact li:nth-child(1) i { width: 20%; }
+.landing-mining-upgrade-impact li:nth-child(2) i { width: 50%; }
+.landing-mining-upgrade-impact li:nth-child(3) i { width: 100%; }
+
+.landing-mining-upgrade-track {
+ display: grid;
+ grid-template-columns: repeat(3, minmax(0, 1fr));
+ gap: 5px;
+ margin: 0 0 16px;
+ padding: 0;
+ list-style: none;
+}
+
+.landing-mining-upgrade-track li {
+ position: relative;
+ min-height: 20px;
+ border-top: 2px solid var(--landing-border-strong);
+}
+
+.landing-mining-upgrade-track li:nth-child(1) {
+ border-color: var(--landing-haze);
+}
+
+.landing-mining-upgrade-track li:nth-child(2) {
+ border-color: var(--landing-mineral);
+}
+
+.landing-mining-upgrade-track li:nth-child(3) {
+ border-color: var(--landing-dust);
+}
+
+.landing-mining-upgrade-track span {
+ position: absolute;
+ top: 7px;
+ left: 0;
+ color: var(--landing-haze);
+ font-family: "JetBrains Mono", ui-monospace, monospace;
+ font-size: 0.56rem;
+}
+
+.landing-mining-upgrade-footer {
+ justify-content: flex-start;
+ color: var(--landing-dust);
+ font-size: 0.52rem;
+ letter-spacing: 0.08em;
+}
+
+.landing-mining-upgrade-footer img {
+ width: 16px;
+ height: 16px;
+ filter: invert(1);
+ image-rendering: pixelated;
+}
+
+.landing-mining-copy .landing-mining-upgrade-note {
+ max-width: 420px;
+ margin-top: 16px;
+ padding-left: 14px;
+ border-left: 2px solid var(--landing-mineral);
+ color: var(--landing-dust);
+ font-size: 0.78rem;
+ line-height: 1.55;
+}
+
+.landing-mining-standings-list li {
+ transition:
+ background-color 180ms ease,
+ transform 180ms ease;
+}
+
+.landing-mining-standings-list li:hover {
+ transform: translateX(3px);
+}
+
+.landing-mining-standings-list li[data-rank="1"] {
+ background: linear-gradient(90deg, rgb(240 190 86 / 0.16), transparent 72%);
+}
+
+.landing-mining-standings-list li[data-rank="2"] {
+ background: linear-gradient(90deg, rgb(201 211 229 / 0.12), transparent 72%);
+}
+
+.landing-mining-standings-list li[data-rank="3"] {
+ background: linear-gradient(90deg, rgb(190 123 78 / 0.14), transparent 72%);
+}
+
+.landing-mining-standings-list li[data-rank="4"],
+.landing-mining-standings-list li[data-rank="5"] {
+ background: linear-gradient(90deg, rgb(174 185 255 / 0.06), transparent 72%);
+}
+
+@keyframes landing-upgrade-signal {
+ 0%, 100% { opacity: 0.66; filter: brightness(0.9); }
+ 50% { opacity: 1; filter: brightness(1.35); }
+}
+
+@media (max-width: 700px) {
+ .landing-mining-stage {
+ grid-template-columns: 1fr;
+ }
+ .landing-mining-upgrade-preview {
+ padding: 14px;
+ }
+
+ .landing-mining-upgrade-gallery {
+ grid-template-columns: repeat(3, minmax(88px, 1fr));
+ overflow-x: auto;
+ padding-top: 2px;
+ }
}
diff --git a/src/pages/Landing.test.tsx b/src/pages/Landing.test.tsx
index 3aa3a31..de3553f 100644
--- a/src/pages/Landing.test.tsx
+++ b/src/pages/Landing.test.tsx
@@ -29,7 +29,9 @@ describe('Landing', () => {
const { container } = render(
);
expect(screen.getByRole('heading', { name: /Explore\.\s*Mine\.\s*Win\./ })).toBeInTheDocument();
- expect(screen.getByText('Every ticket becomes a Planet and enters the draw.')).toBeInTheDocument();
+ expect(
+ screen.getByText('Every ticket becomes a Planet and enters the draw.'),
+ ).toBeInTheDocument();
expect(container.textContent).not.toContain('Explore Planets. Win prizes.');
const poweredBy = screen.getByRole('link', { name: 'Powered by Megapot' });
expect(poweredBy).toHaveAttribute('href', 'https://megapot.io/ecosystem');
@@ -85,31 +87,60 @@ describe('Landing', () => {
const ctas = screen.getAllByRole('link', { name: 'Play' });
expect(ctas.length).toBeGreaterThanOrEqual(2);
expect(ctas.every((cta) => cta.getAttribute('href') === '/play')).toBe(true);
- expect(container.querySelectorAll('.landing-button > span[aria-hidden="true"]')).toHaveLength(0);
- expect(container.querySelector('.landing-hero-actions .landing-button')).toHaveClass('landing-button-primary');
+ expect(container.querySelectorAll('.landing-button > span[aria-hidden="true"]')).toHaveLength(
+ 0,
+ );
+ expect(container.querySelector('.landing-hero-actions .landing-button')).toHaveClass(
+ 'landing-button-primary',
+ );
expect(screen.queryByText('Mint Planet')).not.toBeInTheDocument();
expect(
- [...container.querySelectorAll('img')]
- .filter((image) => image.getAttribute('src')?.includes('/artifacts/'))
- .every((image) => image.closest('.landing-planet-card, .landing-mining-planet')),
+ [...container.querySelectorAll('img')].some((image) =>
+ image.getAttribute('src')?.includes('/landing/'),
+ ),
).toBe(true);
+ expect(
+ [...container.querySelectorAll('img')].some((image) =>
+ image.getAttribute('src')?.includes('/artifacts/'),
+ ),
+ ).toBe(false);
});
- it('explains the two linked mechanics in one compact block', () => {
+ it('explains the two linked mechanics in one compact block and keeps the discovery deck in the Planet slot', () => {
const { container } = render(
);
const landing = within(container);
expect(container.querySelectorAll('.landing > main > section')).toHaveLength(4);
- expect(landing.getByRole('region', { name: /One ticket\.\s*One Planet\./ })).toBeInTheDocument();
- expect(landing.getByRole('heading', { name: /One ticket\.\s*One Planet\./ })).toBeInTheDocument();
+ expect(
+ landing.getByRole('region', { name: /One ticket\.\s*One Planet\./ }),
+ ).toBeInTheDocument();
+ expect(
+ landing.getByRole('heading', { name: /One ticket\.\s*One Planet\./ }),
+ ).toBeInTheDocument();
expect(landing.getByRole('heading', { name: 'Megapot Tickets' })).toBeInTheDocument();
expect(landing.getByRole('heading', { name: 'Planets' })).toBeInTheDocument();
- expect(landing.getByRole('region', { name: /Keep mining\.\s*Climb higher\./ })).toBeInTheDocument();
- expect(landing.getByRole('heading', { name: /Keep mining\.\s*Climb higher\./ })).toBeInTheDocument();
- expect(landing.getByText(/ticket numbers become the coordinates that generate your Planet/i)).toBeInTheDocument();
- expect(landing.getByText(/Every Planet is unique and keeps mining minerals after the draw/i)).toBeInTheDocument();
- expect(landing.getByText(/enters the Megapot draw and can win the jackpot/i)).toBeInTheDocument();
- expect(landing.queryByText(/tied to that ticket, mines minerals and competes on the leaderboard/i)).not.toBeInTheDocument();
+ expect(
+ landing.getByRole('region', { name: /Keep mining\.\s*Upgrade\.\s*Climb higher\./ }),
+ ).toBeInTheDocument();
+ expect(
+ landing.getByRole('heading', { name: /Keep mining\.\s*Upgrade\.\s*Climb higher\./ }),
+ ).toBeInTheDocument();
+ expect(
+ landing.getByText(/Spend mined Minerals to upgrade production and climb the leaderboard/i),
+ ).toBeInTheDocument();
+ expect(container.querySelectorAll('[data-testid="landing-upgrade-stage"]')).toHaveLength(3);
+ expect(
+ landing.getByText(/ticket numbers become the coordinates that generate your Planet/i),
+ ).toBeInTheDocument();
+ expect(
+ landing.getByText(/Every Planet is unique and keeps mining minerals after the draw/i),
+ ).toBeInTheDocument();
+ expect(
+ landing.getByText(/enters the Megapot draw and can win the jackpot/i),
+ ).toBeInTheDocument();
+ expect(
+ landing.queryByText(/tied to that ticket, mines minerals and competes on the leaderboard/i),
+ ).not.toBeInTheDocument();
expect(landing.queryByText('PLANET COORDINATES')).not.toBeInTheDocument();
expect(container.textContent).not.toContain('01 / MEGAPOT TICKET');
expect(container.textContent).not.toContain('ONE TICKET');
@@ -118,6 +149,7 @@ describe('Landing', () => {
expect(container.querySelector('.landing-mechanics-connection')).not.toBeInTheDocument();
expect(landing.queryByText('PLANET = TICKET')).not.toBeInTheDocument();
expect(landing.queryByText('MEGAPOT · IN DRAW')).not.toBeInTheDocument();
+
const generatePlanetButton = landing.getByRole('button', { name: 'Tap' });
expect(generatePlanetButton).toBeInTheDocument();
expect(generatePlanetButton).not.toHaveTextContent('↗');
@@ -125,36 +157,65 @@ describe('Landing', () => {
expect(generatePlanetButton).not.toHaveAttribute('title');
expect(generatePlanetButton.closest('.landing-live-generator-art')).toBeTruthy();
expect(container.querySelector('.landing-megapot-ticket')).toBeInTheDocument();
- expect(container.querySelector('.landing-ticket-visual-stack')).toHaveClass('landing-ticket-visual-stack--vertical');
+ expect(container.querySelector('.landing-ticket-visual-stack')).toHaveClass(
+ 'landing-ticket-visual-stack--vertical',
+ );
expect(container.querySelectorAll('.landing-megapot-ticket')).toHaveLength(3);
expect(container.querySelectorAll('.landing-ticket-ball')).toHaveLength(18);
expect(container.querySelectorAll('.landing-ticket-ball-bonus')).toHaveLength(3);
- expect(container.querySelectorAll('.landing-my-planet-card')).toHaveLength(3);
- expect(container.querySelector('.landing-my-planet-card')).toHaveAttribute('data-rarity', 'Common');
- expect(container.querySelectorAll('.landing-my-planet-card-media')).toHaveLength(3);
- expect(container.querySelectorAll('.landing-my-planet-card-minerals')).toHaveLength(3);
- expect(landing.getByText('Draheunia')).toBeInTheDocument();
- expect(landing.getByText('Ticket #5001')).toBeInTheDocument();
- expect(landing.getByText('TICKET / 5001')).toBeInTheDocument();
- expect(landing.getByText('TICKET / 5005')).toBeInTheDocument();
- expect(landing.getByText('TICKET / 5009')).toBeInTheDocument();
- expect(landing.getByText('25')).toBeInTheDocument();
+
+ const carousel = landing.getByRole('region', { name: 'Planet discovery carousel' });
+ expect(carousel.closest('.landing-planet-mechanic')).toBeTruthy();
+ expect(carousel.querySelectorAll('.landing-planet-card')).toHaveLength(7);
+ expect(carousel.querySelectorAll('[data-active="true"]')).toHaveLength(1);
+ expect(carousel.querySelector('[data-active="true"] img')).toHaveAttribute(
+ 'src',
+ expect.stringContaining('/landing/gifs-512/'),
+ );
+ expect(
+ [...carousel.querySelectorAll('[data-active="false"] img')].every((image) =>
+ image.getAttribute('src')?.endsWith('.png'),
+ ),
+ ).toBe(true);
+
expect(landing.getByRole('region', { name: /How it works/i })).toBeInTheDocument();
expect(container.querySelectorAll('.landing-how-it-works details')).toHaveLength(8);
expect(landing.queryByText('The core loop')).not.toBeInTheDocument();
expect(landing.queryByText('Explore. Reveal. Compete.')).not.toBeInTheDocument();
expect(landing.queryByText('No two discoveries')).not.toBeInTheDocument();
expect(landing.queryByText('feel the same.')).not.toBeInTheDocument();
- expect(landing.queryByRole('region', { name: /Circular Planet gallery/ })).not.toBeInTheDocument();
+ expect(
+ landing.queryByRole('region', { name: /Circular Planet gallery/ }),
+ ).not.toBeInTheDocument();
expect(container.querySelector('.landing-hero-lightfall')).not.toBeInTheDocument();
expect(container.querySelector('.landing-live-jackpot')).toBeInTheDocument();
expect(landing.getByText('LIVE JACKPOT')).toBeInTheDocument();
expect(landing.getByText('DRAWING IN')).toBeInTheDocument();
expect(container.querySelector('.landing-mystery-orbit')).not.toBeInTheDocument();
expect(container.querySelectorAll('.landing-mystery-orbit .orbit-item')).toHaveLength(0);
- expect(container.querySelectorAll('.landing-hero-title .split-parent')).toHaveLength(2);
- expect([...container.querySelectorAll('img')].filter((image) => image.getAttribute('src')?.includes('/artifacts/')).length).toBeGreaterThanOrEqual(3);
- expect([...container.querySelectorAll('img')].filter((image) => image.getAttribute('alt')?.startsWith('Unrevealed'))).toHaveLength(0);
+ expect(
+ [...container.querySelectorAll('img')].filter((image) =>
+ image.getAttribute('src')?.includes('/landing/'),
+ ).length,
+ ).toBeGreaterThanOrEqual(3);
+ expect(
+ [...container.querySelectorAll('img')].some((image) =>
+ image.getAttribute('src')?.includes('/artifacts/'),
+ ),
+ ).toBe(false);
+ expect(
+ [...container.querySelectorAll('img')].filter((image) =>
+ image.getAttribute('alt')?.startsWith('Unrevealed'),
+ ),
+ ).toHaveLength(0);
+ });
+
+ it('does not retain the rejected full-page game-loop copy or stage', () => {
+ render(
);
+
+ expect(screen.queryByText('A ticket is only the beginning.')).not.toBeInTheDocument();
+ expect(screen.queryByRole('region', { name: 'How the game works' })).not.toBeInTheDocument();
+ expect(screen.queryByRole('figure', { name: 'Planet mining monitor' })).not.toBeInTheDocument();
});
it('uses SplitText across every landing copy block', () => {
@@ -166,9 +227,7 @@ describe('Landing', () => {
'.landing-hero-subtitle.split-parent',
'.landing-hero-actions .landing-button .split-parent',
'.landing-live-jackpot-header .landing-kicker.split-parent',
- '.landing-live-jackpot-status.split-parent',
- '.landing-live-jackpot-footer .landing-micro-label.split-parent',
- '.landing-live-jackpot-drawing.split-parent',
+ '.landing-live-jackpot-header .landing-micro-label.split-parent',
'.landing-live-generator-button .split-parent',
'.landing-mechanics-heading .landing-kicker.split-parent',
'.landing-mechanics-heading h2 .split-parent',
@@ -185,7 +244,6 @@ describe('Landing', () => {
'.landing-how-it-works .landing-faq-question.split-parent',
'.landing-how-it-works .landing-faq-answer.split-parent',
'.landing-footer .landing-wordmark .split-parent',
- '.landing-footer .landing-footer-meta.split-parent',
];
for (const selector of animatedCopySelectors) {
diff --git a/src/pages/Landing.tsx b/src/pages/Landing.tsx
index f12b12b..2209c4b 100644
--- a/src/pages/Landing.tsx
+++ b/src/pages/Landing.tsx
@@ -1,18 +1,42 @@
import './Landing.css';
import { useEffect } from 'react';
-import { COPY } from '@/config/copy';
-import { LandingLiveJackpot } from '@/components/landing/LandingLiveJackpot';
import { LandingHowItWorks } from '@/components/landing/LandingHowItWorks';
+import { LandingLiveJackpot } from '@/components/landing/LandingLiveJackpot';
import { LandingMiningLeaderboard } from '@/components/landing/LandingMiningLeaderboard';
-import { LandingPlanetCard } from '@/components/landing/LandingPlanetCard';
import { LandingSplitText } from '@/components/landing/LandingSplitText';
+import { PlanetCardStack } from '@/components/landing/PlanetCardStack';
import { PlanetGeneratorHero } from '@/components/landing/PlanetGeneratorHero';
import { FOOTER_LINKS } from '@/components/layout/Footer';
+import { COPY } from '@/config/copy';
const generatedPlanetAssets = [
- { image: '/artifacts/megastera-generated/planet-01.gif', name: 'Draheunia', rarity: 'Common', ticketId: '5001', minerals: 25, numbers: [7, 14, 18, 23, 29], bonus: 3 },
- { image: '/artifacts/megastera-generated/planet-05.gif', name: 'Wheuagawa III', rarity: 'Uncommon', ticketId: '5005', minerals: 75, numbers: [4, 11, 19, 27, 36], bonus: 8 },
- { image: '/artifacts/megastera-generated/planet-09.gif', name: 'Auclagua-94', rarity: 'Common', ticketId: '5009', minerals: 10, numbers: [2, 13, 21, 30, 37], bonus: 6 },
+ {
+ image: '/landing/gifs-512/planet-006.gif',
+ name: 'Draheunia',
+ rarity: 'Common',
+ ticketId: '5001',
+ minerals: 25,
+ numbers: [7, 14, 18, 23, 29],
+ bonus: 3,
+ },
+ {
+ image: '/landing/gifs-512/planet-055.gif',
+ name: 'Wheuagawa III',
+ rarity: 'Uncommon',
+ ticketId: '5005',
+ minerals: 75,
+ numbers: [4, 11, 19, 27, 36],
+ bonus: 8,
+ },
+ {
+ image: '/landing/gifs-512/planet-092.gif',
+ name: 'Auclagua-94',
+ rarity: 'Common',
+ ticketId: '5009',
+ minerals: 10,
+ numbers: [2, 13, 21, 30, 37],
+ bonus: 6,
+ },
] as const;
export function Landing() {
@@ -26,7 +50,9 @@ export function Landing() {
return (
-
+
-
+
-
-
+
+
-
+
- {ticket.numbers.map((number) => {number})}
- {ticket.bonus}
+ {ticket.numbers.map((number) => (
+
+ {number}
+
+ ))}
+
+ {ticket.bonus}
+
-
-
+
+
))}
-