attempt new formula

.gitattributes

@@ -1,2 +0,0 @@
-*.png filter=lfs diff=lfs merge=lfs -text
-*.ico filter=lfs diff=lfs merge=lfs -text

.gitea/workflows/check.yml

@@ -1,31 +0,0 @@
-name: Lint
-
-on:
-  pull_request:
-  push:
-    branches:
-      - "**" # matches every branch
-
-jobs:
-  lint_and_typecheck:
-    name: Lint and Typecheck
-    runs-on: ubuntu-latest
-
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
-
-      - name: Install pnpm
-        uses: pnpm/action-setup@a7487c7e89a18df4991f7f222e4898a00d66ddda # v4
-
-      - name: Setup Node.js
-        uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020 # v4
-        with:
-          node-version: 22
-          cache: "pnpm"
-
-      - name: Install dependencies
-        run: pnpm install
-
-      - name: Run check
-        run: pnpm run check

README.md

@@ -1,108 +1,3 @@
-![InvestingFIRE logo](/src/app/apple-icon.png)
+# fire
 
-# InvestingFIRE 🔥 — The #1 Interactive FIRE Calculator
+FIRE calculator
-
-**InvestingFIRE** is a responsive web application for calculating your path to Financial Independence and Early Retirement (FIRE). It features a year-by-year projection engine that simulates both accumulation (savings and investment growth) and retirement (withdrawals) phases, allowing users to:
-
-- Input starting capital, monthly savings, expected annual growth rate, inflation rate, current age, desired retirement age, life expectancy, and desired monthly retirement allowance.
-- View a dynamic chart displaying projected portfolio balance and monthly allowance over time.
-- Instantly see their estimated “FIRE number” (required capital at retirement), how long their capital will last, and compare results to the “4% rule.”
-- Adjust assumptions live, with all calculations and visualizations updating automatically.
-- Access explanatory content about FIRE methodology, key variables, and additional community resources, all on a single, consolidated page.
-
-The project’s code is structured using React/Next.js with TypeScript, focusing on user experience, modern UI components, and clarity of financial assumptions.
-
----
-
-## 🚀 Features at a Glance
-
-- **⚡️ Real-Time Projections:** Every field updates the chart _as you type_. Experiment with savings, growth rates, inflation, or retirement age and see your future instantly.
-- **📈 Interactive Chart:** Dual-area plots for portfolio value and future monthly spending, plus reference lines for FIRE milestones and “4% rule” legends.
-- **🧠 Education Baked In:** Contextual tooltips, deep-dive sections on how FIRE works, FAQs, and must-read resources included.
-- **🔎 Detailed Methodology:** Not just a 25x rule — runs a full, year-by-year simulation with inflation-adjusted withdrawals and optional 4%-rule overlays.
-- **👌 Modern UX:** Typing, sliding, or clicking feels _good_. Responsive on all devices.
-
----
-
-## 🧰 How It Works
-
-The calculator models your FIRE journey in two phases:
-
-1. **Accumulation:**
-   - Your starting capital is grown by your expected CAGR (~7% by default).
-   - Monthly savings are added for each year until retirement.
-   - Every variable can be adjusted live (capital, savings, age, growth, inflation, spending, target retirement).
-
-2. **Retirement:**
-   - Your balance continues to grow by CAGR.
-   - Each year, an inflation-adjusted monthly allowance is withdrawn.
-   - The simulation runs until your selected life expectancy, showing the possibility of portfolio depletion.
-
-**Key Outputs:**
-
-- 🔥 “FIRE Number”: Portfolio value at your defined retirement age
-- 📊 Interactive projection chart: See how your nest egg and withdrawals evolve over time
-- 4️⃣ “4% Rule” overlays: Compare dynamic results to classic rule-of-thumb
-
----
-
-## 🌟 Try It For Yourself
-
-To run locally:
-
-1. **Clone the repo**
-   ```bash
-   git clone https://git.schulze.network/schulze/fire.git
-   cd fire
-   ```
-2. **Install dependencies**
-   ```bash
-   pnpm install
-   ```
-3. **Run the app**
-   ```bash
-   pnpm run dev
-   ```
-4. Visit [http://localhost:3000](http://localhost:3000) and unleash the fire.
-
-Deployed version: [https://investingfire.com](https://investingfire.com)
-
----
-
-## ✏️ Inputs & Variables
-
-- **Starting Capital** — How much you’ve already invested
-- **Monthly Savings** — What you’ll add each month
-- **Current Age & Retirement Age** — Your FI timeline
-- **Life Expectancy** — How long do you want income to last?
-- **Expected Growth Rate (CAGR)** — Portfolio annual % return, before inflation
-- **Inflation Rate** — Cost of living increases
-- **Desired Monthly Allowance** — Your lifestyle, today’s dollars
-
-As you adjust these, all projections update instantly _without needing to hit “Calculate.”_
-
-Try many “what ifs” fast.
-
----
-
-## 👩‍💻 Contributing
-
-Pull requests are welcome! Open issues for bugs, new features, or debate about safe withdrawal rates and tax assumptions.
-
----
-
-## 📄 License
-
-[GPL-3.0](./LICENSE)
-
----
-
-## 🥇 Why Use InvestingFIRE?
-
-- You want the truth — not just a 4% fantasy.
-- You want to learn, not just punch in numbers.
-- You want clarity, speed, and modern UI.
-- You want to show your friends the best FIRE tool on the web.
-
-Enjoy the _rocket ride_ to financial independence.  
-**InvestingFIRE — Know your number. Change your future.**

package.json

@@ -6,52 +6,52 @@
   "scripts": {
     "build": "next build",
     "check": "next lint && tsc --noEmit",
-    "dev": "next dev --turbopack",
+    "dev": "next dev --turbo",
     "format:check": "prettier --check \"**/*.{ts,tsx,js,jsx,mdx}\" --cache",
     "format:write": "prettier --write \"**/*.{ts,tsx,js,jsx,mdx}\" --cache",
+    "lint": "next lint",
     "lint:fix": "next lint --fix",
     "preview": "next build && next start",
-    "start": "next start"
+    "start": "next start",
+    "typecheck": "tsc --noEmit"
   },
   "dependencies": {
     "@hookform/resolvers": "^5.0.1",
     "@radix-ui/react-accordion": "^1.2.8",
     "@radix-ui/react-label": "^2.1.4",
     "@radix-ui/react-select": "^2.2.2",
-    "@radix-ui/react-slider": "^1.3.2",
     "@radix-ui/react-slot": "^1.2.0",
-    "@t3-oss/env-nextjs": "^0.13.0",
+    "@t3-oss/env-nextjs": "^0.12.0",
     "class-variance-authority": "^0.7.1",
     "clsx": "^2.1.1",
-    "lucide-react": "^0.525.0",
+    "lucide-react": "^0.503.0",
-    "next": "^15.4.1",
+    "next": "^15.2.3",
     "next-plausible": "^3.12.4",
     "react": "^19.0.0",
     "react-dom": "^19.0.0",
     "react-hook-form": "^7.56.1",
     "recharts": "^2.15.3",
     "tailwind-merge": "^3.2.0",
-    "zod": "^4.0.0"
+    "zod": "^3.24.3"
   },
   "devDependencies": {
-    "@eslint/eslintrc": "3.3.1",
+    "@eslint/eslintrc": "^3.3.1",
-    "@tailwindcss/postcss": "4.1.11",
+    "@tailwindcss/postcss": "^4.0.15",
-    "@types/node": "22.16.3",
+    "@types/node": "^20.14.10",
-    "@types/react": "19.1.8",
+    "@types/react": "^19.0.0",
-    "@types/react-dom": "19.1.6",
+    "@types/react-dom": "^19.0.0",
-    "eslint": "9.31.0",
+    "eslint": "^9.23.0",
-    "eslint-config-next": "15.4.1",
+    "eslint-config-next": "^15.2.3",
-    "eslint-plugin-react-hooks": "5.2.0",
+    "postcss": "^8.5.3",
-    "postcss": "8.5.6",
+    "prettier": "^3.5.3",
-    "prettier": "3.6.2",
+    "prettier-plugin-tailwindcss": "^0.6.11",
-    "prettier-plugin-tailwindcss": "0.6.14",
+    "tailwindcss": "^4.0.15",
-    "tailwindcss": "4.1.11",
+    "tw-animate-css": "^1.2.8",
-    "tw-animate-css": "1.3.5",
+    "typescript": "^5.8.2",
-    "typescript": "5.8.3",
+    "typescript-eslint": "^8.27.0"
-    "typescript-eslint": "8.36.0"
   },
   "ct3aMetadata": {
     "initVersion": "7.39.3"
   },
-  "packageManager": "pnpm@10.13.1"
+  "packageManager": "npm@11.2.0"
 }

pnpm-workspace.yaml

@@ -1,6 +0,0 @@
-ignoredBuiltDependencies:
-  - unrs-resolver
-
-onlyBuiltDependencies:
-  - '@tailwindcss/oxide'
-  - sharp

public/investingfire_logo_no-bg.svg

@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xml:space="preserve" width="1000" height="1000" viewBox="0 0 264.58 264.58"><defs><linearGradient id="b"><stop offset="0" stop-color="#fd8315"/><stop offset="1" stop-color="#fa6b14"/></linearGradient><linearGradient id="a"><stop offset="0" stop-color="#f24b1b"/><stop offset="1" stop-color="#dc2f12"/></linearGradient><linearGradient xlink:href="#a" id="d" x1="172.49" x2="179.1" y1="64.48" y2="197.19" gradientUnits="userSpaceOnUse"/><linearGradient xlink:href="#b" id="c" x1="118.9" x2="117.99" y1="14.21" y2="194.34" gradientUnits="userSpaceOnUse"/></defs><g stroke-linecap="round" stroke-linejoin="round" stroke-width=".13"><path fill="url(#c)" stroke="#f14a1b" d="m115.13 9.96-.26.01c-.97.11-1.29 1.02-.75 2.38a45.6 45.6 0 0 1 3.02 15.68c-.09 8.46.04 12.87-7.31 23.68s-23.16 21.9-33.96 34.66c-10.8 12.76-12.28 16.6-16.1 26.2A90.42 90.42 0 0 0 53.05 146c0 41.29 27.68 76.09 65.49 86.91 35.3-25.9 55.47-125.62 55.47-125.62s-14.45-10.54-18.57-18.89c-1.26-2.56-1.97-6.15-1.97-9.58.01-2.54 1.3-8.72 1.47-9.41a42.4 42.4 0 0 0 .94-12.14c-.07-.95-.17-1.9-.3-2.84v-.01a59.45 59.45 0 0 0-7.6-19h0a60.34 60.34 0 0 0-10.24-12.13 66.97 66.97 0 0 0-21.7-13.15 2.94 2.94 0 0 0-.92-.18z"/><path fill="url(#d)" stroke="#510a0c" d="M170.01 58.08a66.66 66.66 0 0 0-10.24 15.94 66.66 66.66 0 0 0-6.3 27.82 66.8 66.8 0 0 0 3.66 20.86h-.08l7.08 105.8s37.38-25.1 45.9-61a74.13 74.13 0 0 0 2.04-25.93c-1.34-14.35-4.35-21.67-9.85-30.3-5.5-8.62-10.36-14-17.63-22.78-6.17-7.43-9.44-18.25-10.39-28.87-.28-3.13-2.13-3.91-4.19-1.54z"/></g><path fill="#510a0c" d="M93.45 115.81h77.91c9.81 0 17.71 7.9 17.71 17.7v104.53c0 9.81-7.9 17.71-17.7 17.71H93.44c-9.81 0-17.71-7.9-17.71-17.7V133.51c0-9.81 7.9-17.71 17.7-17.71z"/><path fill="#e83c1b" d="M91.95 163.12h29.23c3.7 0 6.68 2.98 6.68 6.68v24.8c0 3.7-2.98 6.68-6.68 6.68H91.95a6.67 6.67 0 0 1-6.68-6.68v-24.8c0-3.7 2.98-6.68 6.68-6.68zm0 45.92h29.23c3.7 0 6.68 2.98 6.68 6.68v24.8c0 3.7-2.98 6.68-6.68 6.68H91.95a6.67 6.67 0 0 1-6.68-6.69v-24.8c0-3.7 2.98-6.67 6.68-6.67zm51.25-45.92h29.23c3.7 0 6.68 2.98 6.68 6.68v24.8c0 3.7-2.98 6.68-6.68 6.68H143.2a6.67 6.67 0 0 1-6.68-6.68v-24.8c0-3.7 2.98-6.68 6.68-6.68zm0 45.92h29.23c3.7 0 6.68 2.98 6.68 6.68v24.8c0 3.7-2.98 6.68-6.68 6.68H143.2a6.67 6.67 0 0 1-6.68-6.69v-24.8c0-3.7 2.98-6.67 6.68-6.67z"/><g fill="#520a0c"><path d="M148.74 179.98h18.29a2.41 2.41 0 1 1 0 4.84h-18.29a2.41 2.41 0 1 1 0-4.84zm-51.54.04h18.29a2.41 2.41 0 1 1 0 4.83h-18.3a2.41 2.41 0 1 1 0-4.83z"/><path d="M108.76 173.3v18.28a2.41 2.41 0 1 1-4.84 0V173.3a2.41 2.41 0 1 1 4.84 0zm-10.59 59.18 12.93-12.93a2.41 2.41 0 1 1 3.42 3.42l-12.93 12.93a2.41 2.41 0 1 1-3.42-3.42z"/><path d="m101.59 219.55 12.93 12.93a2.41 2.41 0 1 1-3.42 3.42l-12.93-12.93a2.41 2.41 0 1 1 3.42-3.42zm47.15 1.49h18.29a2.41 2.41 0 1 1 0 4.84h-18.29a2.41 2.41 0 1 1 0-4.84zm0 10.73h18.29a2.41 2.41 0 1 1 0 4.84h-18.29a2.41 2.41 0 1 1 0-4.84z"/></g><path fill="#fcf2e4" d="M92.35 125.2h79.67a7.07 7.07 0 0 1 7.09 7.1v14.36a7.07 7.07 0 0 1-7.09 7.1H92.35a7.07 7.07 0 0 1-7.08-7.1V132.3a7.07 7.07 0 0 1 7.08-7.09z"/></svg>

public/wgu5fuk8d5j5wp3pjtta9vrw8d9by9qk.txt

@@ -1 +0,0 @@
-wgu5fuk8d5j5wp3pjtta9vrw8d9by9qk

renovate.json

@@ -1,11 +0,0 @@
-{
-  "extends": ["config:best-practices", ":semanticCommits"],
-  "$schema": "https://docs.renovatebot.com/renovate-schema.json",
-  "packageRules": [
-    {
-      "matchUpdateTypes": ["minor", "patch", "pin", "digest"],
-      "automerge": true,
-      "automergeType": "branch"
-    }
-  ]
-}

src/app/components/BackgroundPattern.tsx

@@ -1,157 +0,0 @@
-"use client";
-import { useState, useEffect } from "react";
-import {
-  type LucideIcon,
-  HandCoins,
-  Bitcoin,
-  Coins,
-  DollarSign,
-  Euro,
-  IndianRupee,
-  JapaneseYen,
-  PiggyBank,
-  PoundSterling,
-  Wallet,
-  Banknote,
-  ChartCandlestick,
-  CirclePercent,
-  CreditCard,
-  Gem,
-  Receipt,
-  ShoppingBasket,
-  Rocket,
-  RockingChair,
-  Sparkles,
-  ChartPie,
-  ChartBar,
-  BarChart3,
-  ChartLine,
-  TrendingDown,
-  TrendingUp,
-  Vault,
-  Landmark,
-  Briefcase,
-  Handshake,
-  Shield,
-  Lock,
-  CalendarRange,
-  Hourglass,
-  Sprout,
-  Target,
-} from "lucide-react";
-
-export default function MultiIconPattern({ opacity = 0.2, spacing = 160 }) {
-  const [width, setWidth] = useState(0);
-  const [height, setHeight] = useState(0);
-  const [rows, setRows] = useState(0);
-  const [columns, setColumns] = useState(0);
-
-  useEffect(() => {
-    const updateDimensions = () => {
-      if (window.innerWidth > width + spacing * 2) {
-        setWidth(window.innerWidth);
-      }
-      if (window.innerHeight > height + spacing * 2) {
-        setHeight(window.innerHeight);
-      }
-    };
-
-    updateDimensions();
-    window.addEventListener("resize", updateDimensions);
-
-    return () => {
-      window.removeEventListener("resize", updateDimensions);
-    };
-  }, [height, width, spacing]);
-
-  useEffect(() => {
-    setColumns(Math.ceil(width / spacing) + 3);
-  }, [width, spacing]);
-
-  useEffect(() => {
-    setRows(Math.ceil(height / spacing) + 3);
-  }, [height, spacing]);
-
-  // Explicitly type the array as LucideIcon[]
-  const iconComponents: LucideIcon[] = [
-    HandCoins,
-    Bitcoin,
-    Coins,
-    DollarSign,
-    Euro,
-    IndianRupee,
-    JapaneseYen,
-    PiggyBank,
-    PoundSterling,
-    Wallet,
-    Banknote,
-    ChartCandlestick,
-    CirclePercent,
-    CreditCard,
-    Gem,
-    Receipt,
-    ShoppingBasket,
-    Rocket,
-    RockingChair,
-    Sparkles,
-    ChartPie,
-    ChartBar,
-    BarChart3,
-    ChartLine,
-    TrendingDown,
-    TrendingUp,
-    Vault,
-    Landmark,
-    Briefcase,
-    Handshake,
-    Shield,
-    Lock,
-    CalendarRange,
-    Hourglass,
-    Sprout,
-    Target,
-  ];
-
-  const renderIcons = ({
-    rows,
-    columns,
-  }: {
-    rows: number;
-    columns: number;
-  }) => {
-    const icons = [];
-    for (let y = 0; y < rows; y++) {
-      for (let x = 0; x < columns; x++) {
-        // Pick a random icon component from the array
-        const randomIndex = Math.floor(Math.random() * iconComponents.length);
-        const IconComponent = iconComponents[randomIndex]!;
-
-        // Slightly randomize size and position for more organic feel
-        const size = 28 + Math.floor(Math.random() * 8);
-        const xOffset = Math.floor(Math.random() * (spacing / 1.618));
-        const yOffset = Math.floor(Math.random() * (spacing / 1.618));
-
-        icons.push(
-          <IconComponent
-            key={`icon-${x}-${y}`}
-            size={size}
-            className="text-primary fixed"
-            style={{
-              left: `${x * spacing + xOffset}px`,
-              top: `${y * spacing + yOffset}px`,
-              opacity: opacity,
-              transform: `rotate(${Math.round((Math.random() - 0.5) * 30)}deg)`,
-            }}
-          />,
-        );
-      }
-    }
-    return icons;
-  };
-
-  return (
-    <div className="absolute h-full w-full">
-      {width > 0 && renderIcons({ rows, columns })}
-    </div>
-  );
-}

src/app/components/footer.tsx

@@ -1,16 +0,0 @@
-export default function Footer() {
-  return (
-    <footer className="w-full py-8 text-center text-xs">
-      <p className="text-xs">
-        © {new Date().getFullYear()} InvestingFIRE. All rights reserved.{" "}
-        <a
-          href="https://schulze.network"
-          target="_blank"
-          className="text-primary hover:underline"
-        >
-          Hosting by Schulze.network
-        </a>
-      </p>
-    </footer>
-  );
-}

src/app/icon0.svg

@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xml:space="preserve" width="1000" height="1000" viewBox="0 0 264.58 264.58"><defs><linearGradient id="b"><stop offset="0" stop-color="#fd8315"/><stop offset="1" stop-color="#fa6b14"/></linearGradient><linearGradient id="a"><stop offset="0" stop-color="#f24b1b"/><stop offset="1" stop-color="#dc2f12"/></linearGradient><linearGradient xlink:href="#a" id="d" x1="172.49" x2="179.1" y1="64.48" y2="197.19" gradientUnits="userSpaceOnUse"/><linearGradient xlink:href="#b" id="c" x1="118.9" x2="117.99" y1="14.21" y2="194.34" gradientUnits="userSpaceOnUse"/></defs><rect width="264.58" height="264.58" fill="#fdf2e4" ry="42.08" style="-inkscape-stroke:none"/><g stroke-linecap="round" stroke-linejoin="round" stroke-width=".13"><path fill="url(#c)" stroke="#f14a1b" d="m115.13 9.96-.26.01c-.97.11-1.29 1.02-.75 2.38a45.6 45.6 0 0 1 3.02 15.68c-.09 8.46.04 12.87-7.31 23.68s-23.16 21.9-33.96 34.66c-10.8 12.76-12.28 16.6-16.1 26.2A90.42 90.42 0 0 0 53.05 146c0 41.29 27.68 76.09 65.49 86.91 35.3-25.9 55.47-125.62 55.47-125.62s-14.45-10.54-18.57-18.89c-1.26-2.56-1.97-6.15-1.97-9.58.01-2.54 1.3-8.72 1.47-9.41a42.4 42.4 0 0 0 .94-12.14c-.07-.95-.17-1.9-.3-2.84v-.01a59.45 59.45 0 0 0-7.6-19h0a60.34 60.34 0 0 0-10.24-12.13 66.97 66.97 0 0 0-21.7-13.15 2.94 2.94 0 0 0-.92-.18z"/><path fill="url(#d)" stroke="#510a0c" d="M170.01 58.08a66.66 66.66 0 0 0-10.24 15.94 66.66 66.66 0 0 0-6.3 27.82 66.8 66.8 0 0 0 3.66 20.86h-.08l7.08 105.8s37.38-25.1 45.9-61a74.13 74.13 0 0 0 2.04-25.93c-1.34-14.35-4.35-21.67-9.85-30.3-5.5-8.62-10.36-14-17.63-22.78-6.17-7.43-9.44-18.25-10.39-28.87-.28-3.13-2.13-3.91-4.19-1.54z"/></g><path fill="#510a0c" d="M93.45 115.81h77.91c9.81 0 17.71 7.9 17.71 17.7v104.53c0 9.81-7.9 17.71-17.7 17.71H93.44c-9.81 0-17.71-7.9-17.71-17.7V133.51c0-9.81 7.9-17.71 17.7-17.71z"/><path fill="#e83c1b" d="M91.95 163.12h29.23c3.7 0 6.68 2.98 6.68 6.68v24.8c0 3.7-2.98 6.68-6.68 6.68H91.95a6.67 6.67 0 0 1-6.68-6.68v-24.8c0-3.7 2.98-6.68 6.68-6.68zm0 45.92h29.23c3.7 0 6.68 2.98 6.68 6.68v24.8c0 3.7-2.98 6.68-6.68 6.68H91.95a6.67 6.67 0 0 1-6.68-6.69v-24.8c0-3.7 2.98-6.67 6.68-6.67zm51.25-45.92h29.23c3.7 0 6.68 2.98 6.68 6.68v24.8c0 3.7-2.98 6.68-6.68 6.68H143.2a6.67 6.67 0 0 1-6.68-6.68v-24.8c0-3.7 2.98-6.68 6.68-6.68zm0 45.92h29.23c3.7 0 6.68 2.98 6.68 6.68v24.8c0 3.7-2.98 6.68-6.68 6.68H143.2a6.67 6.67 0 0 1-6.68-6.69v-24.8c0-3.7 2.98-6.67 6.68-6.67z"/><g fill="#520a0c"><path d="M148.74 179.98h18.29a2.41 2.41 0 1 1 0 4.84h-18.29a2.41 2.41 0 1 1 0-4.84zm-51.54.04h18.29a2.41 2.41 0 1 1 0 4.83h-18.3a2.41 2.41 0 1 1 0-4.83z"/><path d="M108.76 173.3v18.28a2.41 2.41 0 1 1-4.84 0V173.3a2.41 2.41 0 1 1 4.84 0zm-10.59 59.18 12.93-12.93a2.41 2.41 0 1 1 3.42 3.42l-12.93 12.93a2.41 2.41 0 1 1-3.42-3.42z"/><path d="m101.59 219.55 12.93 12.93a2.41 2.41 0 1 1-3.42 3.42l-12.93-12.93a2.41 2.41 0 1 1 3.42-3.42zm47.15 1.49h18.29a2.41 2.41 0 1 1 0 4.84h-18.29a2.41 2.41 0 1 1 0-4.84zm0 10.73h18.29a2.41 2.41 0 1 1 0 4.84h-18.29a2.41 2.41 0 1 1 0-4.84z"/></g><path fill="#fcf2e4" d="M92.35 125.2h79.67a7.07 7.07 0 0 1 7.09 7.1v14.36a7.07 7.07 0 0 1-7.09 7.1H92.35a7.07 7.07 0 0 1-7.08-7.1V132.3a7.07 7.07 0 0 1 7.08-7.09z"/></svg>

src/app/layout.tsx

@@ -1,17 +1,15 @@
 import "@/styles/globals.css";
 import PlausibleProvider from "next-plausible";
-import { type Metadata, type Viewport } from "next";
+import { type Metadata } from "next";
 import { Geist } from "next/font/google";
 import { WebVitals } from "./components/web-vitals";
 
-export const viewport: Viewport = {
-  themeColor: [{ color: "oklch(0.97 0.0228 95.96)" }],
-};
-
 export const metadata: Metadata = {
-  title: "InvestingFIRE | Finance and Retirement Calculator",
+  title:
+    "InvestingFIRE Calculator | Plan Your Financial Independence & Early Retirement",
   description:
-    "Achieve Financial Independence & Early Retirement! Plan your FIRE journey with the InvestingFIRE calculator and get personalized projections in buttersmooth graphs.",
+    "Achieve Financial Independence, Retire Early (FIRE) with the InvestingFIRE calculator. Get personalized projections and investing advice to plan your journey.",
+  icons: [{ rel: "icon", url: "/favicon.ico" }],
 };
 
 const geist = Geist({
@@ -24,18 +22,16 @@ export default function RootLayout({
 }: Readonly<{ children: React.ReactNode }>) {
   return (
     <html lang="en" className={geist.variable}>
-      <head>
-        <meta name="apple-mobile-web-app-title" content="FIRE" />
       <PlausibleProvider
         domain="investingfire.com"
         customDomain="https://analytics.schulze.network"
         selfHosted={true}
         enabled={true}
         trackOutboundLinks={true}
-        />
+      >
-      </head>
         <WebVitals />
         <body>{children}</body>
+      </PlausibleProvider>
     </html>
   );
 }

src/app/manifest.json

@@ -1,21 +0,0 @@
-{
-  "name": "InvestingFIRE",
-  "short_name": "FIRE",
-  "icons": [
-    {
-      "src": "/web-app-manifest-192x192.png",
-      "sizes": "192x192",
-      "type": "image/png",
-      "purpose": "maskable"
-    },
-    {
-      "src": "/web-app-manifest-512x512.png",
-      "sizes": "512x512",
-      "type": "image/png",
-      "purpose": "maskable"
-    }
-  ],
-  "theme_color": "#fdf2e4",
-  "background_color": "#fdf2e4",
-  "display": "standalone"
-}

src/app/page.tsx

@@ -1,4 +1,3 @@
-import Image from "next/image";
 import FireCalculatorForm from "./components/FireCalculatorForm";
 import {
   Accordion,
@@ -6,27 +5,14 @@ import {
   AccordionItem,
   AccordionTrigger,
 } from "@/components/ui/accordion";
-import Footer from "./components/footer";
-import BackgroundPattern from "./components/BackgroundPattern";
 
 export default function HomePage() {
   return (
-    <main className="text-primary-foreground to-destructive from-secondary flex min-h-screen flex-col items-center bg-gradient-to-b p-2">
+    <main className="text-primary-foreground to-destructive from-secondary flex min-h-screen flex-col items-center bg-gradient-to-b p-4">
-      <BackgroundPattern />
+      <div className="container mx-auto flex flex-col items-center justify-center gap-4 px-4 py-16 text-center">
-      <div className="z-10 mx-auto flex flex-col items-center justify-center gap-4 text-center">
-        <div className="mt-8 flex flex-row flex-wrap items-center justify-center gap-4 align-middle">
-          <Image
-            priority
-            unoptimized
-            src="/investingfire_logo_no-bg.svg"
-            alt="InvestingFIRE Logo"
-            width={100}
-            height={100}
-          />
         <h1 className="from-primary via-primary-foreground to-primary bg-gradient-to-r bg-clip-text text-5xl font-extrabold tracking-tight text-transparent drop-shadow-md sm:text-[5rem]">
           InvestingFIRE
         </h1>
-        </div>
         <p className="text-primary-foreground/90 text-xl font-semibold md:text-2xl">
           The #1 FIRE Calculator
         </p>
@@ -36,35 +22,29 @@ export default function HomePage() {
       </div>
 
       {/* Added SEO Content Sections */}
-      <div className="z-10 mx-auto max-w-2xl py-12 text-left">
+      <div className="container mx-auto max-w-4xl px-4 py-8 text-left">
         <section className="mb-12">
           <h2 className="mb-4 text-3xl font-bold">
-            What Is FIRE? Understanding Financial Independence and Early
+            What is FIRE? Understanding Financial Independence and Early
             Retirement
           </h2>
           <p className="mb-4 text-lg leading-relaxed">
-            FIRE stands for{" "}
+            FIRE stands for &quot;Financial Independence, Retire Early.&quot;
-            <strong>Financial Independence, Retire Early</strong>. It&apos;s a
+            It&apos;s a movement focused on aggressive saving and strategic
-            lifestyle movement built around two core ideas:
+            investing to build a substantial portfolio. The goal is for
+            investment returns to cover living expenses indefinitely, freeing
+            you from traditional employment. Achieving FIRE means gaining the
+            freedom to pursue passions, travel, or simply enjoy life without
+            needing a regular paycheck. Sound investing advice is crucial for
+            building the wealth needed.
           </p>
-          <ul className="mb-4 ml-6 list-disc space-y-2 text-lg">
-            <li>
-              <strong>Aggressive saving & investing</strong>—often 50%+ of
-              income—so your capital grows rapidly.
-            </li>
-            <li>
-              <strong>Passive-income coverage</strong>—when your investment
-              returns exceed your living expenses, you gain freedom from a
-              traditional 9-5.
-            </li>
-          </ul>
           <p className="text-lg leading-relaxed">
-            By reaching your personal <em>FIRE Number</em>—the nest egg needed
+            The core principle involves maximizing your savings rate (often
-            to cover your inflation-adjusted spending—you unlock the option to
+            50%+) and investing wisely, typically in low-cost, diversified
-            step away from a daily paycheck and pursue passion projects, travel,
+            assets like index funds. Your &quot;FIRE number&quot; – the capital
-            family, or anything else. This calculator helps you simulate your
+            needed – is often estimated as 25 times your desired annual
-            journey, estimate how much you need, and visualize both your
+            spending, derived from the 4% safe withdrawal rate guideline. This
-            accumulation phase and your retirement withdrawals over time.
+            FIRE calculator helps you personalize this estimate.
           </p>
         </section>
 
@@ -73,58 +53,51 @@ export default function HomePage() {
             How This FIRE Calculator Provides Investing Insights
           </h2>
           <p className="mb-4 text-lg leading-relaxed">
-            Our interactive tool goes beyond a simple “25x annual spending”
+            This calculator helps visualize your path to FIRE by projecting
-            rule. It runs a <strong>year-by-year simulation</strong> of your
+            investment growth based on your inputs. Understanding these
-            portfolio, combining:
+            projections is a key piece of investing advice for long-term
+            planning. Here&apos;s a breakdown of the inputs:
           </p>
           <ul className="mb-4 ml-6 list-disc space-y-2 text-lg">
             <li>
-              <strong>Starting Capital</strong>—your current invested balance
+              <strong>Starting Capital:</strong> The total amount you currently
+              have invested.
             </li>
             <li>
-              <strong>Monthly Savings</strong>—ongoing contributions to your
+              <strong>Monthly Savings:</strong> The amount you consistently save
-              portfolio
+              and invest each month.
             </li>
             <li>
-              <strong>Expected Annual Growth Rate (CAGR)</strong>—compounding
+              <strong>Current Age:</strong> Your current age in years.
-              returns before inflation
             </li>
             <li>
-              <strong>Annual Inflation Rate</strong>—to inflate your target
+              <strong>Expected Annual Growth Rate (%):</strong> The average
-              withdrawal each year
+              annual return you expect from your investments (after fees, before
+              inflation).
             </li>
             <li>
-              <strong>Desired Monthly Allowance</strong>—today&apos;s-value
+              <strong>Desired Monthly Allowance (Today&apos;s Value):</strong>{" "}
-              spending goal
+              How much you want to be able to spend each month in retirement, in
+              today&apos;s money value.
             </li>
             <li>
-              <strong>Retirement Age & Life Expectancy</strong>—defines your
+              <strong>Annual Inflation Rate (%):</strong> The expected average
-              accumulation horizon and payout period
+              rate at which the cost of living will increase.
-            </li>
-          </ul>
-          <p className="text-lg leading-relaxed">Key features:</p>
-          <ul className="mb-4 ml-6 list-disc space-y-2 text-lg">
-            <li>
-              <strong>Real-time calculation</strong>—as you tweak any input,
-              your FIRE Number and chart update instantly.
             </li>
             <li>
-              <strong>Interactive chart</strong> with area plots for both{" "}
+              <strong>Life Expectancy (Age):</strong> The age until which you
-              <em>portfolio balance</em> and{" "}
+              want your funds to last.
-              <em>inflation-adjusted allowance</em>, plus reference lines
-              showing your retirement date and required FIRE Number.
-            </li>
-            <li>
-              <strong>Custom simulation</strong>—switches from accumulation
-              (adding savings) to retirement (withdrawing allowance),
-              compounding each year based on your growth rate.
             </li>
           </ul>
           <p className="text-lg leading-relaxed">
-            With this level of granularity, you can confidently experiment with
+            The calculator simulates your investment growth year by year,
-            savings rate, target retirement age, and investment assumptions to
+            incorporating monthly contributions, the power of compound growth (a
-            discover how small tweaks speed up or delay your path to financial
+            core investing principle), and inflation&apos;s impact on your
-            independence.
+            target allowance. It estimates the age at which your capital could
+            sustain your desired, inflation-adjusted monthly spending throughout
+            your expected retirement until your specified life expectancy. It
+            calculates your potential &quot;FIRE Number&quot; and the age you
+            might reach financial independence.
           </p>
         </section>
 
@@ -135,106 +108,86 @@ export default function HomePage() {
           <Accordion type="single" collapsible className="w-full">
             <AccordionItem value="item-1">
               <AccordionTrigger className="text-xl font-semibold">
-                What methodology does this calculator use?
+                What is the 4% rule?
               </AccordionTrigger>
               <AccordionContent className="text-lg leading-relaxed">
-                We run a multi-year projection in two phases:
+                The 4% rule is a guideline suggesting that you can safely
-                <ol className="ml-6 list-decimal space-y-1">
+                withdraw 4% of your investment portfolio&apos;s value in your
-                  <li>
+                first year of retirement, and then adjust that amount for
-                    <strong>Accumulation:</strong> Your balance grows by CAGR
+                inflation each subsequent year, with a high probability of your
-                    and you add monthly savings.
+                money lasting for at least 30 years. This calculator uses a more
-                  </li>
+                dynamic simulation based on your life expectancy but is related
-                  <li>
+                to this concept.
-                    <strong>Retirement:</strong> The balance continues
-                    compounding, but you withdraw an inflation-adjusted monthly
-                    allowance.
-                  </li>
-                </ol>
-                The result: a precise estimate of the capital you&apos;ll have
-                at retirement (your “FIRE Number”) and how long it will last
-                until your chosen life expectancy.
               </AccordionContent>
             </AccordionItem>
 
             <AccordionItem value="item-2">
               <AccordionTrigger className="text-xl font-semibold">
-                Why isn&apos;t this just the 4% rule?
+                Is the Expected Growth Rate realistic? Finding the right
+                investing advice often starts here.
               </AccordionTrigger>
               <AccordionContent className="text-lg leading-relaxed">
-                The 4% rule is a useful starting point (25× annual spending),
+                Historically, diversified stock market investments have returned
-                but it assumes a fixed withdrawal rate with inflation
+                around 7-10% annually long-term (before inflation). A rate of 7%
-                adjustments and doesn&apos;t model ongoing savings or dynamic
+                (after fees) is common, but remember past performance
-                market returns. Our calculator simulates each year&apos;s
+                doesn&apos;t guarantee future results, a fundamental piece of
-                growth, contributions, and inflation-indexed withdrawals to give
+                investing advice. Choose a rate reflecting your risk tolerance
-                you a tailored picture.
+                and investment strategy.
               </AccordionContent>
             </AccordionItem>
 
             <AccordionItem value="item-3">
               <AccordionTrigger className="text-xl font-semibold">
-                How do I choose a realistic growth rate?
+                How does inflation impact my FIRE number?
               </AccordionTrigger>
               <AccordionContent className="text-lg leading-relaxed">
-                Historically, a diversified portfolio of equities and bonds has
+                Inflation erodes the purchasing power of money over time. Your
-                returned around 7-10% per year before inflation. We recommend
+                desired monthly allowance needs to increase each year just to
-                starting around 6-8% (net of fees), then running “what-if”
+                maintain the same standard of living. This calculator accounts
-                scenarios—5% on the conservative side, 10% on the aggressive
+                for this by adjusting your target allowance upwards based on the
-                side—to see how they affect your timeline.
+                inflation rate you provide, ensuring the calculated FIRE number
+                supports your desired lifestyle in future dollars.
               </AccordionContent>
             </AccordionItem>
 
             <AccordionItem value="item-4">
               <AccordionTrigger className="text-xl font-semibold">
-                How does inflation factor into my FIRE Number?
+                Can I really retire early with FIRE?
               </AccordionTrigger>
               <AccordionContent className="text-lg leading-relaxed">
-                Cost of living rises. To maintain today&apos;s lifestyle, your
+                Retiring significantly early is achievable but demands
-                monthly allowance must grow each year by your inflation rate.
+                discipline, a high savings rate, and smart investing. Success
-                This calculator automatically inflates your desired monthly
+                depends on income, expenses, savings habits, and investment
-                spending and subtracts it from your portfolio during retirement,
+                returns. Use this FIRE calculator as a planning tool,
-                ensuring your FIRE Number keeps pace with rising expenses.
+                understanding it provides estimates based on your assumptions
+                and chosen investing approach.
               </AccordionContent>
             </AccordionItem>
 
             <AccordionItem value="item-5">
               <AccordionTrigger className="text-xl font-semibold">
-                Can I really retire early with FIRE?
+                What does FIRE stand for?
               </AccordionTrigger>
               <AccordionContent className="text-lg leading-relaxed">
-                Early retirement is achievable with disciplined saving, smart
+                FIRE stands for Financial Independence, Retire Early. It
-                investing, and realistic assumptions. This tool helps you set
+                represents a lifestyle movement aimed at maximizing your savings
-                targets, visualize outcomes, and adjust inputs—so you can build
+                rate through increased income and/or decreased expenses to
-                confidence in your plan and make informed trade-offs between
+                achieve financial independence and retire much earlier than
-                lifestyle, risk, and timeline.
+                traditional retirement age.
               </AccordionContent>
             </AccordionItem>
 
             <AccordionItem value="item-6">
               <AccordionTrigger className="text-xl font-semibold">
-                How should I use this calculator effectively?
+                How much should I save each month?
               </AccordionTrigger>
               <AccordionContent className="text-lg leading-relaxed">
-                <ul className="ml-6 list-disc space-y-1">
+                FIRE enthusiasts typically aim to save 50-70% of their income.
-                  <li>
+                The more you can save, the faster you&apos;ll reach your FIRE
-                    Start with your actual numbers (capital, savings, age).
+                goal. However, the right amount depends on your income,
-                  </li>
+                lifestyle, and target retirement age. Use the calculator to
-                  <li>
+                experiment with different monthly savings amounts to see their
-                    Set conservative - mid - aggressive growth rates to bound
+                impact on your retirement timeline.
-                    possibilities.
-                  </li>
-                  <li>
-                    Slide your retirement age to explore “early” vs.
-                    “traditional” scenarios.
-                  </li>
-                  <li>
-                    Review the chart—especially the reference lines—to see when
-                    you hit FI and how withdrawals impact your balance.
-                  </li>
-                  <li>
-                    Experiment with higher savings rates or lower target
-                    spending to accelerate your path.
-                  </li>
-                </ul>
               </AccordionContent>
             </AccordionItem>
           </Accordion>
@@ -246,58 +199,50 @@ export default function HomePage() {
             FIRE Journey & Investing Resources
           </h2>
           <p className="mb-6 text-lg leading-relaxed">
-            Ready to deepen your knowledge and build a bullet-proof plan? Below
+            Ready to dive deeper into FIRE and solidify your investing strategy?
-            are some of our favorite blogs, books, tools, and communities for
+            Explore these valuable resources for financial independence planning
-            financial independence and smart investing.
+            and investing advice:
           </p>
 
-          <div className="bg-foreground my-8 rounded-md p-4 text-lg">
+          <div className="bg-secondary/20 my-8 rounded-md p-4 text-lg">
             <p className="font-semibold">Getting Started with FIRE:</p>
             <ol className="ml-6 list-decimal space-y-1">
               <li>
-                Run your first projection above to find your target FIRE Number.
+                Calculate your personal numbers using this FIRE calculator and
-              </li>
+                other tools.
-              <li>Identify areas to boost savings or reduce expenses.</li>
-              <li>
-                Study index-fund strategies and low-cost investing advice.
               </li>
               <li>
-                Join{" "}
+                Seek sound investing advice and consider joining communities
-                <a
+                like r/Fire for support.
-                  href="https://www.reddit.com/r/Fire/"
-                  target="_blank"
-                  className="text-primary hover:underline"
-                >
-                  supportive communities like r/Fire
-                </a>{" "}
-                to learn from real journeys.
               </li>
+              <li>Explore books and podcasts to deepen your understanding</li>
             </ol>
           </div>
 
           <div className="grid gap-8 md:grid-cols-2">
             <div>
-              <h3 className="mb-3 text-xl font-semibold">Blogs & Websites</h3>
+              <h3 className="mb-3 text-xl font-semibold">
+                Blogs & Investing Websites
+              </h3>
               <ul className="ml-6 list-disc space-y-2 text-lg">
                 <li>
                   <a
-                    href="https://www.mrmoneymustache.com/"
+                    href="https://www.mrmoneymustache.com/2012/01/13/the-shockingly-simple-math-behind-early-retirement/"
                     target="_blank"
                     className="text-primary hover:underline"
                   >
-                    Mr. Money Mustache
+                    Mr. Money Mustache - Simple Math Behind Early Retirement &
-                  </a>{" "}
+                    Investing
-                  - Hardcore frugality & early retirement success stories.
+                  </a>
                 </li>
                 <li>
                   <a
-                    href="https://www.playingwithfire.co/"
+                    href="https://www.playingwithfire.co/resources"
                     target="_blank"
                     className="text-primary hover:underline"
                   >
-                    Playing With FIRE
+                    Playing With FIRE - Comprehensive Resources
-                  </a>{" "}
+                  </a>
-                  - Community resources & real-life case studies.
                 </li>
                 <li>
                   <a
@@ -305,15 +250,16 @@ export default function HomePage() {
                     target="_blank"
                     className="text-primary hover:underline"
                   >
-                    r/Fire
+                    r/Fire Reddit Community
-                  </a>{" "}
+                  </a>
-                  - Active forum for questions, tips, and support.
                 </li>
               </ul>
             </div>
 
             <div>
-              <h3 className="mb-3 text-xl font-semibold">Books & Podcasts</h3>
+              <h3 className="mb-3 text-xl font-semibold">
+                Books & Investment Learning
+              </h3>
               <ul className="ml-6 list-disc space-y-2 text-lg">
                 <li>
                   <a
@@ -321,19 +267,18 @@ export default function HomePage() {
                     target="_blank"
                     className="text-primary hover:underline"
                   >
-                    Your Money or Your Life
+                    Your Money or Your Life - Foundational FIRE & Investing
-                  </a>{" "}
+                    Principles
-                  - The classic guide to aligning money with values.
+                  </a>
                 </li>
                 <li>
                   <a
-                    href="https://podcasts.apple.com/us/podcast/biggerpockets-money-podcast/id1330225136"
+                    href="https://www.playingwithfire.co/"
                     target="_blank"
                     className="text-primary hover:underline"
                   >
-                    BiggerPockets Money Podcast
+                    Playing With FIRE Documentary
-                  </a>{" "}
+                  </a>
-                  - Interviews on FIRE strategies and wealth building.
                 </li>
                 <li>
                   <a
@@ -341,39 +286,37 @@ export default function HomePage() {
                     target="_blank"
                     className="text-primary hover:underline"
                   >
-                    InvestingFIRE Calculator Demo
+                    BiggerPockets Money Podcast - FIRE Calculators & Investing
-                  </a>{" "}
+                    Strategies
-                  - Deep dive on how interactive projections can guide your
+                  </a>
-                  plan.
                 </li>
               </ul>
             </div>
 
             <div>
               <h3 className="mb-3 text-xl font-semibold">
-                Additional Calculators & Tools
+                Additional FIRE & Investing Calculators
               </h3>
               <ul className="ml-6 list-disc space-y-2 text-lg">
-                <li>
-                  <a
-                    href="https://ghostfol.io"
-                    target="_blank"
-                    className="text-primary hover:underline"
-                  >
-                    Ghostfolio
-                  </a>{" "}
-                  - Wealth management application for individuals.
-                </li>
                 <li>
                   <a
                     href="https://walletburst.com/tools/coast-fire-calculator/"
                     target="_blank"
                     className="text-primary hover:underline"
                   >
-                    Coast FIRE Calculator
+                    Coast FIRE Calculator - For those considering a partial
-                  </a>{" "}
+                    early retirement
-                  - When you “max out” early contributions but let compounding
+                  </a>
-                  do the rest.
+                </li>
+                <li>
+                  <a
+                    href="https://www.empower.com/retirement-calculator"
+                    target="_blank"
+                    className="text-primary hover:underline"
+                  >
+                    Empower Retirement Planner - Free portfolio analysis and net
+                    worth tracking
+                  </a>
                 </li>
                 <li>
                   <a
@@ -381,16 +324,43 @@ export default function HomePage() {
                     target="_blank"
                     className="text-primary hover:underline"
                   >
-                    Compound Interest Calculator
+                    CAGR Compound Interest Calculator - Understand Investment
-                  </a>{" "}
+                    Growth
-                  - Explore the power of growth rates in isolation.
+                  </a>
+                </li>
+              </ul>
+            </div>
+
+            <div>
+              <h3 className="mb-3 text-xl font-semibold">
+                Recent Investing & FIRE Articles
+              </h3>
+              <ul className="ml-6 list-disc space-y-2 text-lg">
+                <li>
+                  <a
+                    href="https://www.businessinsider.com/retiring-tech-early-coast-fire-make-me-millionaire-2025-4"
+                    target="_blank"
+                    className="text-primary hover:underline"
+                  >
+                    Coast FIRE: Retiring in your 30s while becoming a
+                    millionaire by 60
+                  </a>
+                </li>
+                <li>
+                  <a
+                    href="https://www.businessinsider.com/financial-independence-retire-early-saving-loneliness-retreat-bali-making-friends-2025-2"
+                    target="_blank"
+                    className="text-primary hover:underline"
+                  >
+                    The Social Side of FIRE: Finding Community in Financial
+                    Independence
+                  </a>
                 </li>
               </ul>
             </div>
           </div>
         </section>
       </div>
-      <Footer />
     </main>
   );
 }

src/app/robots.ts

@@ -1,11 +0,0 @@
-import type { MetadataRoute } from "next";
-
-export default function robots(): MetadataRoute.Robots {
-  return {
-    rules: {
-      userAgent: "*",
-      allow: "/",
-    },
-    sitemap: "https://investingfire.com/sitemap.xml",
-  };
-}

src/app/sitemap.ts

@@ -1,13 +0,0 @@
-import { BASE_URL } from "@/lib/constants";
-import { type MetadataRoute } from "next";
-
-export default function sitemap(): MetadataRoute.Sitemap {
-  return [
-    {
-      url: BASE_URL,
-      lastModified: new Date(),
-      changeFrequency: "yearly",
-      priority: 1,
-    },
-  ];
-}

src/components/ui/accordion.tsx

@@ -44,7 +44,7 @@ function AccordionTrigger({
         {...props}
       >
         {children}
-        <ChevronDownIcon className="text-primary-foreground pointer-events-none size-4 shrink-0 translate-y-0.5 transition-transform duration-200" />
+        <ChevronDownIcon className="text-muted-foreground pointer-events-none size-4 shrink-0 translate-y-0.5 transition-transform duration-200" />
       </AccordionPrimitive.Trigger>
     </AccordionPrimitive.Header>
   );

src/components/ui/chart.tsx

@@ -1,4 +1,3 @@
-/* eslint-disable @typescript-eslint/no-unsafe-assignment */
 "use client";
 
 import * as React from "react";
@@ -9,16 +8,15 @@ import { cn } from "@/lib/utils";
 // Format: { THEME_NAME: CSS_SELECTOR }
 const THEMES = { light: "", dark: ".dark" } as const;
 
-export type ChartConfig = Record<
+export type ChartConfig = {
-  string,
+  [k in string]: {
-  {
     label?: React.ReactNode;
     icon?: React.ComponentType;
   } & (
     | { color?: string; theme?: never }
     | { color?: never; theme: Record<keyof typeof THEMES, string> }
-  )
+  );
->;
+};
 
 type ChartContextProps = {
   config: ChartConfig;
@@ -49,7 +47,7 @@ function ChartContainer({
   >["children"];
 }) {
   const uniqueId = React.useId();
-  const chartId = `chart-${id ?? uniqueId.replace(/:/g, "")}`;
+  const chartId = `chart-${id || uniqueId.replace(/:/g, "")}`;
 
   return (
     <ChartContext.Provider value={{ config }}>
@@ -73,7 +71,7 @@ function ChartContainer({
 
 const ChartStyle = ({ id, config }: { id: string; config: ChartConfig }) => {
   const colorConfig = Object.entries(config).filter(
-    ([, config]) => config.theme ?? config.color,
+    ([, config]) => config.theme || config.color,
   );
 
   if (!colorConfig.length) {
@@ -90,7 +88,7 @@ ${prefix} [data-chart=${id}] {
 ${colorConfig
   .map(([key, itemConfig]) => {
     const color =
-      itemConfig.theme?.[theme as keyof typeof itemConfig.theme] ??
+      itemConfig.theme?.[theme as keyof typeof itemConfig.theme] ||
       itemConfig.color;
     return color ? `  --color-${key}: ${color};` : null;
   })
@@ -136,11 +134,11 @@ function ChartTooltipContent({
     }
 
     const [item] = payload;
-    const key = `${labelKey ?? item?.dataKey ?? item?.name ?? "value"}`;
+    const key = `${labelKey || item?.dataKey || item?.name || "value"}`;
     const itemConfig = getPayloadConfigFromPayload(config, item, key);
     const value =
       !labelKey && typeof label === "string"
-        ? (config[label]?.label ?? label)
+        ? config[label as keyof typeof config]?.label || label
         : itemConfig?.label;
 
     if (labelFormatter) {
@@ -182,11 +180,9 @@ function ChartTooltipContent({
       {!nestLabel ? tooltipLabel : null}
       <div className="grid gap-1.5">
         {payload.map((item, index) => {
-          const key = `${nameKey ?? item.name ?? item.dataKey ?? "value"}`;
+          const key = `${nameKey || item.name || item.dataKey || "value"}`;
           const itemConfig = getPayloadConfigFromPayload(config, item, key);
-          const indicatorColor: string | undefined =
+          const indicatorColor = color || item.payload.fill || item.color;
-            // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
-            color ?? item.payload.fill ?? item.color;
 
           return (
             <div
@@ -197,7 +193,6 @@ function ChartTooltipContent({
               )}
             >
               {formatter && item?.value !== undefined && item.name ? (
-                // eslint-disable-next-line @typescript-eslint/no-unsafe-argument
                 formatter(item.value, item.name, item, index, item.payload)
               ) : (
                 <>
@@ -234,7 +229,7 @@ function ChartTooltipContent({
                     <div className="grid gap-1.5">
                       {nestLabel ? tooltipLabel : null}
                       <span className="text-muted-foreground">
-                        {itemConfig?.label ?? item.name}
+                        {itemConfig?.label || item.name}
                       </span>
                     </div>
                     {item.value && (
@@ -281,8 +276,7 @@ function ChartLegendContent({
       )}
     >
       {payload.map((item) => {
-        // eslint-disable-next-line @typescript-eslint/restrict-template-expressions
+        const key = `${nameKey || item.dataKey || "value"}`;
-        const key = `${nameKey ?? item.dataKey ?? "value"}`;
         const itemConfig = getPayloadConfigFromPayload(config, item, key);
 
         return (
@@ -344,7 +338,9 @@ function getPayloadConfigFromPayload(
     ] as string;
   }
 
-  return configLabelKey in config ? config[configLabelKey] : config[key];
+  return configLabelKey in config
+    ? config[configLabelKey]
+    : config[key as keyof typeof config];
 }
 
 export {

src/components/ui/select.tsx

@@ -1,27 +1,27 @@
-"use client";
+"use client"
 
-import * as React from "react";
+import * as React from "react"
-import * as SelectPrimitive from "@radix-ui/react-select";
+import * as SelectPrimitive from "@radix-ui/react-select"
-import { CheckIcon, ChevronDownIcon, ChevronUpIcon } from "lucide-react";
+import { CheckIcon, ChevronDownIcon, ChevronUpIcon } from "lucide-react"
 
-import { cn } from "@/lib/utils";
+import { cn } from "@/lib/utils"
 
 function Select({
   ...props
 }: React.ComponentProps<typeof SelectPrimitive.Root>) {
-  return <SelectPrimitive.Root data-slot="select" {...props} />;
+  return <SelectPrimitive.Root data-slot="select" {...props} />
 }
 
 function SelectGroup({
   ...props
 }: React.ComponentProps<typeof SelectPrimitive.Group>) {
-  return <SelectPrimitive.Group data-slot="select-group" {...props} />;
+  return <SelectPrimitive.Group data-slot="select-group" {...props} />
 }
 
 function SelectValue({
   ...props
 }: React.ComponentProps<typeof SelectPrimitive.Value>) {
-  return <SelectPrimitive.Value data-slot="select-value" {...props} />;
+  return <SelectPrimitive.Value data-slot="select-value" {...props} />
 }
 
 function SelectTrigger({
@@ -30,7 +30,7 @@ function SelectTrigger({
   children,
   ...props
 }: React.ComponentProps<typeof SelectPrimitive.Trigger> & {
-  size?: "sm" | "default";
+  size?: "sm" | "default"
 }) {
   return (
     <SelectPrimitive.Trigger
@@ -38,7 +38,7 @@ function SelectTrigger({
       data-size={size}
       className={cn(
         "border-input data-[placeholder]:text-muted-foreground [&_svg:not([class*='text-'])]:text-muted-foreground focus-visible:border-ring focus-visible:ring-ring/50 aria-invalid:ring-destructive/20 dark:aria-invalid:ring-destructive/40 aria-invalid:border-destructive dark:bg-input/30 dark:hover:bg-input/50 flex w-fit items-center justify-between gap-2 rounded-md border bg-transparent px-3 py-2 text-sm whitespace-nowrap shadow-xs transition-[color,box-shadow] outline-none focus-visible:ring-[3px] disabled:cursor-not-allowed disabled:opacity-50 data-[size=default]:h-9 data-[size=sm]:h-8 *:data-[slot=select-value]:line-clamp-1 *:data-[slot=select-value]:flex *:data-[slot=select-value]:items-center *:data-[slot=select-value]:gap-2 [&_svg]:pointer-events-none [&_svg]:shrink-0 [&_svg:not([class*='size-'])]:size-4",
-        className,
+        className
       )}
       {...props}
     >
@@ -47,7 +47,7 @@ function SelectTrigger({
         <ChevronDownIcon className="size-4 opacity-50" />
       </SelectPrimitive.Icon>
     </SelectPrimitive.Trigger>
-  );
+  )
 }
 
 function SelectContent({
@@ -64,7 +64,7 @@ function SelectContent({
           "bg-popover text-popover-foreground data-[state=open]:animate-in data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=open]:fade-in-0 data-[state=closed]:zoom-out-95 data-[state=open]:zoom-in-95 data-[side=bottom]:slide-in-from-top-2 data-[side=left]:slide-in-from-right-2 data-[side=right]:slide-in-from-left-2 data-[side=top]:slide-in-from-bottom-2 relative z-50 max-h-(--radix-select-content-available-height) min-w-[8rem] origin-(--radix-select-content-transform-origin) overflow-x-hidden overflow-y-auto rounded-md border shadow-md",
           position === "popper" &&
             "data-[side=bottom]:translate-y-1 data-[side=left]:-translate-x-1 data-[side=right]:translate-x-1 data-[side=top]:-translate-y-1",
-          className,
+          className
         )}
         position={position}
         {...props}
@@ -74,7 +74,7 @@ function SelectContent({
           className={cn(
             "p-1",
             position === "popper" &&
-              "h-[var(--radix-select-trigger-height)] w-full min-w-[var(--radix-select-trigger-width)] scroll-my-1",
+              "h-[var(--radix-select-trigger-height)] w-full min-w-[var(--radix-select-trigger-width)] scroll-my-1"
           )}
         >
           {children}
@@ -82,7 +82,7 @@ function SelectContent({
         <SelectScrollDownButton />
       </SelectPrimitive.Content>
     </SelectPrimitive.Portal>
-  );
+  )
 }
 
 function SelectLabel({
@@ -95,7 +95,7 @@ function SelectLabel({
       className={cn("text-muted-foreground px-2 py-1.5 text-xs", className)}
       {...props}
     />
-  );
+  )
 }
 
 function SelectItem({
@@ -108,7 +108,7 @@ function SelectItem({
       data-slot="select-item"
       className={cn(
         "focus:bg-accent focus:text-accent-foreground [&_svg:not([class*='text-'])]:text-muted-foreground relative flex w-full cursor-default items-center gap-2 rounded-sm py-1.5 pr-8 pl-2 text-sm outline-hidden select-none data-[disabled]:pointer-events-none data-[disabled]:opacity-50 [&_svg]:pointer-events-none [&_svg]:shrink-0 [&_svg:not([class*='size-'])]:size-4 *:[span]:last:flex *:[span]:last:items-center *:[span]:last:gap-2",
-        className,
+        className
       )}
       {...props}
     >
@@ -119,7 +119,7 @@ function SelectItem({
       </span>
       <SelectPrimitive.ItemText>{children}</SelectPrimitive.ItemText>
     </SelectPrimitive.Item>
-  );
+  )
 }
 
 function SelectSeparator({
@@ -132,7 +132,7 @@ function SelectSeparator({
       className={cn("bg-border pointer-events-none -mx-1 my-1 h-px", className)}
       {...props}
     />
-  );
+  )
 }
 
 function SelectScrollUpButton({
@@ -144,13 +144,13 @@ function SelectScrollUpButton({
       data-slot="select-scroll-up-button"
       className={cn(
         "flex cursor-default items-center justify-center py-1",
-        className,
+        className
       )}
       {...props}
     >
       <ChevronUpIcon className="size-4" />
     </SelectPrimitive.ScrollUpButton>
-  );
+  )
 }
 
 function SelectScrollDownButton({
@@ -162,13 +162,13 @@ function SelectScrollDownButton({
       data-slot="select-scroll-down-button"
       className={cn(
         "flex cursor-default items-center justify-center py-1",
-        className,
+        className
       )}
       {...props}
     >
       <ChevronDownIcon className="size-4" />
     </SelectPrimitive.ScrollDownButton>
-  );
+  )
 }
 
 export {
@@ -182,4 +182,4 @@ export {
   SelectSeparator,
   SelectTrigger,
   SelectValue,
-};
+}

src/components/ui/slider.tsx

@@ -1,63 +0,0 @@
-"use client";
-
-import * as React from "react";
-import * as SliderPrimitive from "@radix-ui/react-slider";
-
-import { cn } from "@/lib/utils";
-
-function Slider({
-  className,
-  defaultValue,
-  value,
-  min = 0,
-  max = 100,
-  ...props
-}: React.ComponentProps<typeof SliderPrimitive.Root>) {
-  const _values = React.useMemo(
-    () =>
-      Array.isArray(value)
-        ? value
-        : Array.isArray(defaultValue)
-          ? defaultValue
-          : [min, max],
-    [value, defaultValue, min, max],
-  );
-
-  return (
-    <SliderPrimitive.Root
-      data-slot="slider"
-      defaultValue={defaultValue}
-      value={value}
-      min={min}
-      max={max}
-      className={cn(
-        "relative flex w-full touch-none items-center select-none data-[disabled]:opacity-50 data-[orientation=vertical]:h-full data-[orientation=vertical]:min-h-44 data-[orientation=vertical]:w-auto data-[orientation=vertical]:flex-col",
-        className,
-      )}
-      {...props}
-    >
-      <SliderPrimitive.Track
-        data-slot="slider-track"
-        className={cn(
-          "bg-muted relative grow overflow-hidden rounded-full data-[orientation=horizontal]:h-1.5 data-[orientation=horizontal]:w-full data-[orientation=vertical]:h-full data-[orientation=vertical]:w-1.5",
-        )}
-      >
-        <SliderPrimitive.Range
-          data-slot="slider-range"
-          className={cn(
-            "bg-primary absolute data-[orientation=horizontal]:h-full data-[orientation=vertical]:w-full",
-          )}
-        />
-      </SliderPrimitive.Track>
-      {Array.from({ length: _values.length }, (_, index) => (
-        <SliderPrimitive.Thumb
-          data-slot="slider-thumb"
-          key={index}
-          className="border-primary bg-background ring-ring/50 block size-4 shrink-0 rounded-full border shadow-sm transition-[color,box-shadow] hover:ring-4 focus-visible:ring-4 focus-visible:outline-hidden disabled:pointer-events-none disabled:opacity-50"
-        />
-      ))}
-    </SliderPrimitive.Root>
-  );
-}
-
-export { Slider };

src/lib/constants.ts

@@ -1 +0,0 @@
-export const BASE_URL = "https://investingfire.com/";