Skip to content

fix: Idle income stops when navigating away from the Index page #8

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
MrJacob12 merged 1 commit into from
Mar 10, 2026
Merged

fix: Idle income stops when navigating away from the Index page #8

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
87 changes: 67 additions & 20 deletions src/App.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,27 +11,74 @@ import Dimension from "./pages/Dimension";
import Upgrades from "./pages/Upgrades";
import NotFound from "./pages/NotFound";

import { useEffect, useRef } from "react";
import { useGameStore } from "@/store/gameStore";
import { toast } from "sonner";
import { formatCurrency } from "@/lib/utils";
import { GAME_CONFIG, calculateCurrentIncome } from "@/config/gameConfig";

const queryClient = new QueryClient();

const App = () => (
<QueryClientProvider client={queryClient}>
<TooltipProvider>
<Toaster />
<Sonner />
<BrowserRouter>
<Routes>
<Route path="/" element={<Index />} />
<Route path="/collection" element={<Collection />} />
<Route path="/packs" element={<Packs />} />
<Route path="/settings" element={<Settings />} />
<Route path="/dimension" element={<Dimension />} />
<Route path="/upgrades" element={<Upgrades />} />
{/* ADD ALL CUSTOM ROUTES ABOVE THE CATCH-ALL "*" ROUTE */}
<Route path="*" element={<NotFound />} />
</Routes>
</BrowserRouter>
</TooltipProvider>
</QueryClientProvider>
);
const App = () => {
const offlineProcessed = useRef(false);

// Offline income calculation — runs once on mount
useEffect(() => {
if (offlineProcessed.current) return;
offlineProcessed.current = true;

const state = useGameStore.getState();
const elapsed = Math.min(
(Date.now() - state.lastSaved) / 1000,
GAME_CONFIG.MAX_OFFLINE_SECONDS,
);

if (elapsed > 10) {
const incomePerSecond = calculateCurrentIncome(state);
const earned = Math.floor(incomePerSecond * elapsed);

if (earned > 0) {
state.updateSeeds(earned);
toast.success(`Welcome back!`, {
description: `You earned ${formatCurrency(earned)} Mega Seeds while away (${Math.floor(elapsed / 60)} min).`,
});
}
}
}, []);

// Idle tick — every 1s
useEffect(() => {
const interval = setInterval(() => {
const state = useGameStore.getState();
const incomePerSecond = calculateCurrentIncome(state);

if (incomePerSecond > 0) {
state.updateSeeds(incomePerSecond);
}
}, 1000);
return () => clearInterval(interval);
}, []);

return (
<QueryClientProvider client={queryClient}>
<TooltipProvider>
<Toaster />
<Sonner />
<BrowserRouter>
<Routes>
<Route path="/" element={<Index />} />
<Route path="/collection" element={<Collection />} />
<Route path="/packs" element={<Packs />} />
<Route path="/settings" element={<Settings />} />
<Route path="/dimension" element={<Dimension />} />
<Route path="/upgrades" element={<Upgrades />} />
{/* ADD ALL CUSTOM ROUTES ABOVE THE CATCH-ALL "*" ROUTE */}
<Route path="*" element={<NotFound />} />
</Routes>
</BrowserRouter>
</TooltipProvider>
</QueryClientProvider>
);
};

export default App;
44 changes: 0 additions & 44 deletions src/pages/Index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,56 +1,12 @@
import { useEffect, useRef } from "react";
import { useGameStore } from "@/store/gameStore";
import { Header } from "@/components/game/Header";
import { PortalArea } from "@/components/game/PortalArea";
import { CollectionTab } from "@/components/game/CollectionTab";
import { Footer } from "@/components/game/Footer";
import { Link } from "react-router-dom";
import { Button } from "@/components/ui/button";
import { Package, Map, Beaker } from "lucide-react";
import { toast } from "sonner";
import { formatCurrency } from "@/lib/utils";
import { GAME_CONFIG, calculateCurrentIncome } from "@/config/gameConfig";

const Index = () => {
const offlineProcessed = useRef(false);

// Offline income calculation — runs once on mount
useEffect(() => {
if (offlineProcessed.current) return;
offlineProcessed.current = true;

const state = useGameStore.getState();
const elapsed = Math.min(
(Date.now() - state.lastSaved) / 1000,
GAME_CONFIG.MAX_OFFLINE_SECONDS,
);

if (elapsed > 10) {
const incomePerSecond = calculateCurrentIncome(state);
const earned = Math.floor(incomePerSecond * elapsed);

if (earned > 0) {
state.updateSeeds(earned);
toast.success(`Welcome back!`, {
description: `You earned ${formatCurrency(earned)} Mega Seeds while away (${Math.floor(elapsed / 60)} min).`,
});
}
}
}, []);

// Idle tick — every 1s
useEffect(() => {
const interval = setInterval(() => {
const state = useGameStore.getState();
const incomePerSecond = calculateCurrentIncome(state);

if (incomePerSecond > 0) {
state.updateSeeds(incomePerSecond);
}
}, 1000);
return () => clearInterval(interval);
}, []);

return (
<div className="min-h-screen bg-background">
<Header />
Expand Down