generated from nhcarrigan/template
feat: add cloud save timestamp and force sync button
Shows a relative time label (e.g. "βοΈ 2m ago") in the resource bar seeded from the server on load and updated after every auto-save or manual save. A πΎ button lets players trigger an immediate cloud save outside the 30-second auto-save cycle, with a β³ spinner and disabled state while the request is in-flight.
This commit is contained in:
@@ -27,7 +27,7 @@ const TABS: { id: Tab; label: string }[] = [
|
|||||||
];
|
];
|
||||||
|
|
||||||
export const GameLayout = (): React.JSX.Element => {
|
export const GameLayout = (): React.JSX.Element => {
|
||||||
const { state, isLoading, error, battleResult, dismissBattle } = useGame();
|
const { state, isLoading, error, battleResult, dismissBattle, lastSavedAt, isSyncing, forceSync } = useGame();
|
||||||
const [activeTab, setActiveTab] = useState<Tab>("adventurers");
|
const [activeTab, setActiveTab] = useState<Tab>("adventurers");
|
||||||
const [editingProfile, setEditingProfile] = useState(false);
|
const [editingProfile, setEditingProfile] = useState(false);
|
||||||
|
|
||||||
@@ -58,6 +58,9 @@ export const GameLayout = (): React.JSX.Element => {
|
|||||||
prestigeCount={state.prestige.count}
|
prestigeCount={state.prestige.count}
|
||||||
profileUrl={profileUrl}
|
profileUrl={profileUrl}
|
||||||
onEditProfile={() => { setEditingProfile(true); }}
|
onEditProfile={() => { setEditingProfile(true); }}
|
||||||
|
lastSavedAt={lastSavedAt}
|
||||||
|
isSyncing={isSyncing}
|
||||||
|
onForceSync={forceSync}
|
||||||
/>
|
/>
|
||||||
<OfflineModal />
|
<OfflineModal />
|
||||||
<AchievementToast />
|
<AchievementToast />
|
||||||
|
|||||||
@@ -6,13 +6,29 @@ interface ResourceBarProps {
|
|||||||
prestigeCount: number;
|
prestigeCount: number;
|
||||||
profileUrl: string;
|
profileUrl: string;
|
||||||
onEditProfile: () => void;
|
onEditProfile: () => void;
|
||||||
|
lastSavedAt: number | null;
|
||||||
|
isSyncing: boolean;
|
||||||
|
onForceSync: () => Promise<void>;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
const formatRelativeTime = (timestamp: number): string => {
|
||||||
|
const seconds = Math.floor((Date.now() - timestamp) / 1000);
|
||||||
|
if (seconds < 10) return "just now";
|
||||||
|
if (seconds < 60) return `${seconds}s ago`;
|
||||||
|
const minutes = Math.floor(seconds / 60);
|
||||||
|
if (minutes < 60) return `${minutes}m ago`;
|
||||||
|
const hours = Math.floor(minutes / 60);
|
||||||
|
return `${hours}h ago`;
|
||||||
|
};
|
||||||
|
|
||||||
export const ResourceBar = ({
|
export const ResourceBar = ({
|
||||||
resources,
|
resources,
|
||||||
prestigeCount,
|
prestigeCount,
|
||||||
profileUrl,
|
profileUrl,
|
||||||
onEditProfile,
|
onEditProfile,
|
||||||
|
lastSavedAt,
|
||||||
|
isSyncing,
|
||||||
|
onForceSync,
|
||||||
}: ResourceBarProps): React.JSX.Element => (
|
}: ResourceBarProps): React.JSX.Element => (
|
||||||
<header className="resource-bar">
|
<header className="resource-bar">
|
||||||
<div className="resource">
|
<div className="resource">
|
||||||
@@ -41,6 +57,20 @@ export const ResourceBar = ({
|
|||||||
</div>
|
</div>
|
||||||
)}
|
)}
|
||||||
<div className="profile-buttons">
|
<div className="profile-buttons">
|
||||||
|
{lastSavedAt !== null && (
|
||||||
|
<span className="save-status" title={new Date(lastSavedAt).toLocaleString()}>
|
||||||
|
βοΈ {formatRelativeTime(lastSavedAt)}
|
||||||
|
</span>
|
||||||
|
)}
|
||||||
|
<button
|
||||||
|
className="force-save-button"
|
||||||
|
disabled={isSyncing}
|
||||||
|
onClick={onForceSync}
|
||||||
|
title="Force cloud save"
|
||||||
|
type="button"
|
||||||
|
>
|
||||||
|
{isSyncing ? "β³" : "πΎ"}
|
||||||
|
</button>
|
||||||
<a
|
<a
|
||||||
className="profile-link-button"
|
className="profile-link-button"
|
||||||
href={profileUrl}
|
href={profileUrl}
|
||||||
|
|||||||
@@ -10,6 +10,7 @@ import {
|
|||||||
import { challengeBoss as challengeBossApi, loadGame, saveGame } from "../api/client.js";
|
import { challengeBoss as challengeBossApi, loadGame, saveGame } from "../api/client.js";
|
||||||
import { applyTick, calculateClickPower } from "../engine/tick.js";
|
import { applyTick, calculateClickPower } from "../engine/tick.js";
|
||||||
|
|
||||||
|
|
||||||
export interface BattleResult {
|
export interface BattleResult {
|
||||||
bossName: string;
|
bossName: string;
|
||||||
result: BossChallengeResponse;
|
result: BossChallengeResponse;
|
||||||
@@ -35,6 +36,12 @@ interface GameContextValue {
|
|||||||
equipItem: (equipmentId: string) => void;
|
equipItem: (equipmentId: string) => void;
|
||||||
/** Reload state from the server */
|
/** Reload state from the server */
|
||||||
reload: () => Promise<void>;
|
reload: () => Promise<void>;
|
||||||
|
/** Unix timestamp of the last successful cloud save (null until first save response) */
|
||||||
|
lastSavedAt: number | null;
|
||||||
|
/** True whilst a forced save is in-flight */
|
||||||
|
isSyncing: boolean;
|
||||||
|
/** Immediately save to the server and reset the auto-save timer */
|
||||||
|
forceSync: () => Promise<void>;
|
||||||
/** Offline gold earned on login */
|
/** Offline gold earned on login */
|
||||||
offlineGold: number;
|
offlineGold: number;
|
||||||
/** Dismiss the offline gold notification */
|
/** Dismiss the offline gold notification */
|
||||||
@@ -60,8 +67,11 @@ export const GameProvider = ({ children }: { children: React.ReactNode }): React
|
|||||||
const [offlineGold, setOfflineGold] = useState(0);
|
const [offlineGold, setOfflineGold] = useState(0);
|
||||||
const [battleResult, setBattleResult] = useState<BattleResult | null>(null);
|
const [battleResult, setBattleResult] = useState<BattleResult | null>(null);
|
||||||
const [newAchievements, setNewAchievements] = useState<Achievement[]>([]);
|
const [newAchievements, setNewAchievements] = useState<Achievement[]>([]);
|
||||||
|
const [lastSavedAt, setLastSavedAt] = useState<number | null>(null);
|
||||||
|
const [isSyncing, setIsSyncing] = useState(false);
|
||||||
const stateRef = useRef<GameState | null>(null);
|
const stateRef = useRef<GameState | null>(null);
|
||||||
const lastSaveRef = useRef<number>(Date.now());
|
const lastSaveRef = useRef<number>(Date.now());
|
||||||
|
const isSyncingRef = useRef(false);
|
||||||
const rafRef = useRef<number | null>(null);
|
const rafRef = useRef<number | null>(null);
|
||||||
const newlyUnlockedRef = useRef<Achievement[]>([]);
|
const newlyUnlockedRef = useRef<Achievement[]>([]);
|
||||||
|
|
||||||
@@ -73,6 +83,7 @@ export const GameProvider = ({ children }: { children: React.ReactNode }): React
|
|||||||
try {
|
try {
|
||||||
const data = await loadGame();
|
const data = await loadGame();
|
||||||
setState(data.state);
|
setState(data.state);
|
||||||
|
setLastSavedAt(data.state.player.lastSavedAt);
|
||||||
if (data.offlineGold > 0) {
|
if (data.offlineGold > 0) {
|
||||||
setOfflineGold(data.offlineGold);
|
setOfflineGold(data.offlineGold);
|
||||||
}
|
}
|
||||||
@@ -119,7 +130,9 @@ export const GameProvider = ({ children }: { children: React.ReactNode }): React
|
|||||||
if (Date.now() - lastSaveRef.current >= AUTO_SAVE_INTERVAL_MS) {
|
if (Date.now() - lastSaveRef.current >= AUTO_SAVE_INTERVAL_MS) {
|
||||||
lastSaveRef.current = Date.now();
|
lastSaveRef.current = Date.now();
|
||||||
if (stateRef.current) {
|
if (stateRef.current) {
|
||||||
void saveGame({ state: stateRef.current });
|
void saveGame({ state: stateRef.current }).then((response) => {
|
||||||
|
setLastSavedAt(response.savedAt);
|
||||||
|
});
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -135,6 +148,20 @@ export const GameProvider = ({ children }: { children: React.ReactNode }): React
|
|||||||
// eslint-disable-next-line react-hooks/exhaustive-deps -- only run when state becomes available
|
// eslint-disable-next-line react-hooks/exhaustive-deps -- only run when state becomes available
|
||||||
}, [state !== null]);
|
}, [state !== null]);
|
||||||
|
|
||||||
|
const forceSync = useCallback(async () => {
|
||||||
|
if (!stateRef.current || isSyncingRef.current) return;
|
||||||
|
isSyncingRef.current = true;
|
||||||
|
setIsSyncing(true);
|
||||||
|
try {
|
||||||
|
const response = await saveGame({ state: stateRef.current });
|
||||||
|
setLastSavedAt(response.savedAt);
|
||||||
|
lastSaveRef.current = Date.now();
|
||||||
|
} finally {
|
||||||
|
isSyncingRef.current = false;
|
||||||
|
setIsSyncing(false);
|
||||||
|
}
|
||||||
|
}, []);
|
||||||
|
|
||||||
const handleClick = useCallback(() => {
|
const handleClick = useCallback(() => {
|
||||||
setState((prev) => {
|
setState((prev) => {
|
||||||
if (!prev) return prev;
|
if (!prev) return prev;
|
||||||
@@ -395,6 +422,9 @@ export const GameProvider = ({ children }: { children: React.ReactNode }): React
|
|||||||
challengeBoss,
|
challengeBoss,
|
||||||
equipItem,
|
equipItem,
|
||||||
reload,
|
reload,
|
||||||
|
lastSavedAt,
|
||||||
|
isSyncing,
|
||||||
|
forceSync,
|
||||||
offlineGold,
|
offlineGold,
|
||||||
dismissOfflineGold,
|
dismissOfflineGold,
|
||||||
battleResult,
|
battleResult,
|
||||||
|
|||||||
@@ -1171,6 +1171,38 @@ body {
|
|||||||
color: var(--colour-text);
|
color: var(--colour-text);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.save-status {
|
||||||
|
color: var(--colour-text-muted);
|
||||||
|
font-size: 0.75rem;
|
||||||
|
white-space: nowrap;
|
||||||
|
}
|
||||||
|
|
||||||
|
.force-save-button {
|
||||||
|
align-items: center;
|
||||||
|
background: rgba(255, 255, 255, 0.06);
|
||||||
|
border: 1px solid rgba(147, 51, 234, 0.4);
|
||||||
|
border-radius: 50%;
|
||||||
|
color: var(--colour-text);
|
||||||
|
cursor: pointer;
|
||||||
|
display: flex;
|
||||||
|
font-size: 0.9rem;
|
||||||
|
height: 2rem;
|
||||||
|
justify-content: center;
|
||||||
|
padding: 0;
|
||||||
|
transition: all 0.2s;
|
||||||
|
width: 2rem;
|
||||||
|
}
|
||||||
|
|
||||||
|
.force-save-button:hover:not(:disabled) {
|
||||||
|
background: rgba(147, 51, 234, 0.2);
|
||||||
|
border-color: var(--colour-accent-light);
|
||||||
|
}
|
||||||
|
|
||||||
|
.force-save-button:disabled {
|
||||||
|
cursor: not-allowed;
|
||||||
|
opacity: 0.5;
|
||||||
|
}
|
||||||
|
|
||||||
/* ββ Public Profile Page ββββββββββββββββββββββββββββββββββββββββββββββββββ */
|
/* ββ Public Profile Page ββββββββββββββββββββββββββββββββββββββββββββββββββ */
|
||||||
|
|
||||||
.profile-page {
|
.profile-page {
|
||||||
|
|||||||
Reference in New Issue
Block a user