Visual + data-encoding overhaul (Lakes 0-8)

client/src/App.tsx

@@ -1,4 +1,4 @@
-import { Switch, Route } from "wouter";
+import { Switch, Route, Redirect } from "wouter";
 import { queryClient } from "./lib/queryClient";
 import { QueryClientProvider } from "@tanstack/react-query";
 import { Toaster } from "@/components/ui/toaster";
@@ -13,21 +13,15 @@ import ComputeFrontierMethodology from "@/pages/ComputeFrontierMethodology";
 import ComputeFrontierCompare from "@/pages/ComputeFrontierCompare";
 import ComputeFrontierDetail from "@/pages/ComputeFrontierDetail";
 import NeocloudIntel from "@/pages/neocloud-intel";
-import GpuEconomics from "@/pages/gpu-economics";
-import PowerDeals from "@/pages/power-deals";
-import BriefPage from "@/pages/brief";
-import TheTrade from "@/pages/TheTrade";
-import PortfolioOverlay from "@/pages/PortfolioOverlay";
+import Analyze from "@/pages/Analyze";
 import CatalystTracker from "@/pages/CatalystTracker";
 import StockPage from "@/pages/StockPage";
 import SectorPage from "@/pages/SectorPage";
 import RegionPage from "@/pages/RegionPage";
 import OperatorPage from "@/pages/OperatorPage";
 import BlogIndex from "@/pages/BlogIndex";
 import BlogPost from "@/pages/BlogPost";
-import SupplyChain from "@/pages/SupplyChain";
 import Subscribe from "@/pages/Subscribe";
-import Queue from "@/pages/Queue";
 import AdminDatacenters from "@/pages/AdminDatacenters";
 import AdminSocial from "@/pages/AdminSocial";
 import { NewsTicker } from "@/components/NewsTicker";
@@ -49,36 +43,24 @@ const PAGE_TITLES: Record<string, string> = {
   "/": "GridTilt",
   "/overview": "Tilt Overview",
   "/stack": "The Stack",
-  "/power-map": "Power Map",
+  "/power-map": "Power",
   "/compute-frontier": "Compute Frontier",
-  "/neocloud-intel": "Neocloud Intel",
-  "/gpu-economics": "GPU Economics",
-  "/power-deals": "AI Power Deals",
-  "/brief": "The Buildout Brief",
-  "/supply-chain": "Supply Chain",
-  "/trade": "Scenario Calculator",
-  "/portfolio": "Portfolio Overlay",
+  "/neocloud-intel": "GPU Prices",
+  "/analyze": "Analyze",
   "/catalysts": "Catalyst Tracker",
-  "/queue": "Interconnection Backlog",
   "/blog": "Analysis",
   "/subscribe": "Subscribe",
 };
 
 const SHORTCUTS = [
   { keys: ["G", "1"], description: "Go to Tilt Overview", path: "/overview" },
   { keys: ["G", "2"], description: "Go to The Stack", path: "/stack" },
-  { keys: ["G", "3"], description: "Go to Power Map", path: "/power-map" },
-  { keys: ["G", "4"], description: "Go to Supply Chain", path: "/supply-chain" },
-  { keys: ["G", "5"], description: "Go to Portfolio Overlay", path: "/portfolio" },
-  { keys: ["G", "6"], description: "Go to Scenario Calculator", path: "/trade" },
-  { keys: ["G", "7"], description: "Go to Catalyst Tracker", path: "/catalysts" },
+  { keys: ["G", "3"], description: "Go to Power", path: "/power-map" },
+  { keys: ["G", "4"], description: "Go to Compute Frontier", path: "/compute-frontier" },
+  { keys: ["G", "5"], description: "Go to GPU Prices", path: "/neocloud-intel" },
+  { keys: ["G", "6"], description: "Go to Catalyst Tracker", path: "/catalysts" },
+  { keys: ["G", "7"], description: "Go to Analyze", path: "/analyze" },
   { keys: ["G", "8"], description: "Go to Analysis", path: "/blog" },
-  { keys: ["G", "9"], description: "Go to Interconnection Backlog", path: "/queue" },
-  { keys: ["G", "0"], description: "Go to Compute Frontier", path: "/compute-frontier" },
-  { keys: ["G", "N"], description: "Go to Neocloud Intel", path: "/neocloud-intel" },
-  { keys: ["G", "D"], description: "Go to AI Power Deals", path: "/power-deals" },
-  { keys: ["G", "B"], description: "Go to The Buildout Brief", path: "/brief" },
-  { keys: ["G", "E"], description: "Go to GPU Economics", path: "/gpu-economics" },
   { keys: ["?"], description: "Show this keyboard shortcuts panel", path: null },
 ];
 
@@ -92,7 +74,7 @@ function KeyboardShortcutsModal({ onClose }: { onClose: () => void }) {
       <div className="relative bg-card border border-card-border rounded-lg p-6 shadow-2xl w-full max-w-sm mx-4">
         <div className="flex items-center justify-between mb-5">
           <div className="flex items-center gap-2">
-            <Keyboard className="h-4 w-4 text-[#F07800]" />
+            <Keyboard className="h-4 w-4 text-brand" />
             <h2 className="text-sm font-semibold text-foreground">Keyboard Shortcuts</h2>
           </div>
           <button
@@ -110,19 +92,19 @@ function KeyboardShortcutsModal({ onClose }: { onClose: () => void }) {
               <div className="flex items-center gap-1">
                 {sc.keys.map((k, j) => (
                   <span key={j} className="flex items-center gap-1">
-                    <kbd className="px-1.5 py-0.5 text-[10px] font-mono font-semibold bg-muted border border-border rounded text-foreground">
+                    <kbd className="px-1.5 py-0.5 text-10 font-mono font-semibold bg-muted border border-border rounded text-foreground">
                       {k}
                     </kbd>
                     {j < sc.keys.length - 1 && (
-                      <span className="text-[10px] text-muted-foreground">then</span>
+                      <span className="text-10 text-muted-foreground">then</span>
                     )}
                   </span>
                 ))}
               </div>
             </div>
           ))}
         </div>
-        <p className="text-[10px] text-muted-foreground/50 mt-4 pt-3 border-t border-border text-center">
+        <p className="text-10 text-muted-foreground/50 mt-4 pt-3 border-t border-border text-center">
           Press Esc or click outside to close
         </p>
       </div>
@@ -169,14 +151,17 @@ function Router() {
       <Route path="/compute-frontier/compare" component={ComputeFrontierCompare} />
       <Route path="/compute-frontier/:id" component={ComputeFrontierDetail} />
       <Route path="/neocloud-intel" component={NeocloudIntel} />
-      <Route path="/gpu-economics" component={GpuEconomics} />
-      <Route path="/power-deals" component={PowerDeals} />
-      <Route path="/brief" component={BriefPage} />
-      <Route path="/supply-chain" component={SupplyChain} />
-      <Route path="/trade" component={TheTrade} />
-      <Route path="/portfolio" component={PortfolioOverlay} />
+      {/* Consolidation: GPU Economics is now the economics tab of GPU Prices */}
+      <Route path="/gpu-economics">{() => <Redirect to="/neocloud-intel?tab=economics" replace />}</Route>
+      {/* Consolidation: Deals and Queue are tabs of Power; Brief lives in Analysis */}
+      <Route path="/power-deals">{() => <Redirect to="/power-map?tab=deals" replace />}</Route>
+      <Route path="/brief">{() => <Redirect to="/blog" replace />}</Route>
+      <Route path="/supply-chain">{() => <Redirect to="/stack?view=flow" replace />}</Route>
+      <Route path="/analyze" component={Analyze} />
+      <Route path="/trade">{() => <Redirect to="/analyze?tab=scenario" replace />}</Route>
+      <Route path="/portfolio">{() => <Redirect to="/analyze?tab=portfolio" replace />}</Route>
       <Route path="/catalysts" component={CatalystTracker} />
-      <Route path="/queue" component={Queue} />
+      <Route path="/queue">{() => <Redirect to="/power-map?tab=queue" replace />}</Route>
       <Route path="/stock/:ticker" component={StockPage} />
       <Route path="/sector/:slug" component={SectorPage} />
       <Route path="/region/:slug" component={RegionPage} />
@@ -249,9 +234,8 @@ function App() {
       if (gPressed) {
         const routes: Record<string, string> = {
           "1": "/overview", "2": "/stack", "3": "/power-map",
-          "4": "/supply-chain", "5": "/portfolio", "6": "/trade",
-          "7": "/catalysts", "8": "/blog", "9": "/queue",
-          "0": "/compute-frontier", "n": "/neocloud-intel", "d": "/power-deals", "b": "/brief", "e": "/gpu-economics",
+          "4": "/compute-frontier", "5": "/neocloud-intel", "6": "/catalysts",
+          "7": "/analyze", "8": "/blog",
         };
         if (routes[e.key]) {
           navigate(routes[e.key]);