Merge pull request #2475 from TheMas3212/refactor-gameroot-v2

Refactor GameRoot.tsx to use a switch case statement instead of 20 nested ternarys
This commit is contained in:
hydroflame 2022-01-08 15:29:47 -05:00 committed by GitHub
commit d74efd6a4a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

@ -300,81 +300,125 @@ export function GameRoot({ player, engine, terminal }: IProps): React.ReactEleme
if (page !== Page.Terminal) window.scrollTo(0, 0);
});
return (
<Context.Player.Provider value={player}>
<Context.Router.Provider value={Router}>
<SnackbarProvider>
<Overview>
{!ITutorial.isRunning ? (
<CharacterOverview save={() => saveObject.saveGame()} killScripts={killAllScripts} />
) : (
<InteractiveTutorialRoot />
)}
</Overview>
{page === Page.Recovery ? (
<RecoveryRoot router={Router} />
) : page === Page.BitVerse ? (
<BitverseRoot flume={flume} enter={enterBitNode} quick={quick} />
) : page === Page.Infiltration ? (
<InfiltrationRoot location={location} />
) : page === Page.BladeburnerCinematic ? (
<BladeburnerCinematic />
) : page === Page.Work ? (
<WorkInProgressRoot />
) : (
<Box display="flex" flexDirection="row" width="100%">
<SidebarRoot player={player} router={Router} page={page} />
<Box className={classes.root} flexGrow={1} display="block" px={1} min-height="100vh">
{page === Page.Terminal ? (
<TerminalRoot terminal={terminal} router={Router} player={player} />
) : page === Page.Sleeves ? (
<SleeveRoot />
) : page === Page.StaneksGift ? (
<StaneksGiftRoot staneksGift={staneksGift} />
) : page === Page.Stats ? (
<CharacterStats />
) : page === Page.ScriptEditor ? (
<ScriptEditorRoot
let mainPage = <Typography>Cannot load</Typography>;
let withSidebar = true;
let withPopups = true;
switch (page) {
case Page.Recovery: {
mainPage = <RecoveryRoot router={Router} />;
withSidebar = false;
withPopups = false;
break;
}
case Page.BitVerse: {
mainPage = <BitverseRoot flume={flume} enter={enterBitNode} quick={quick} />;
withSidebar = false;
withPopups = false;
break
}
case Page.Infiltration: {
mainPage = <InfiltrationRoot location={location} />;
withSidebar = false;
withPopups = false;
break;
}
case Page.BladeburnerCinematic: {
mainPage = <BladeburnerCinematic />;
withSidebar = false;
withPopups = false;
break;
}
case Page.Work: {
mainPage = <WorkInProgressRoot />;
withSidebar = false;
break;
}
case Page.Terminal: {
mainPage = <TerminalRoot terminal={terminal} router={Router} player={player} />;
break;
}
case Page.Sleeves: {
mainPage = <SleeveRoot />;
break;
}
case Page.StaneksGift: {
mainPage = <StaneksGiftRoot staneksGift={staneksGift} />;
break;
}
case Page.Stats: {
mainPage = <CharacterStats />;
break;
}
case Page.ScriptEditor: {
mainPage = <ScriptEditorRoot
files={files}
hostname={player.getCurrentServer().hostname}
player={player}
router={Router}
vim={vim}
/>
) : page === Page.ActiveScripts ? (
<ActiveScriptsRoot workerScripts={workerScripts} />
) : page === Page.Hacknet ? (
<HacknetRoot player={player} />
) : page === Page.CreateProgram ? (
<ProgramsRoot />
) : page === Page.Factions ? (
<FactionsRoot player={player} router={Router} />
) : page === Page.Faction ? (
<FactionRoot faction={faction} />
) : page === Page.Milestones ? (
<MilestonesRoot player={player} />
) : page === Page.Tutorial ? (
<TutorialRoot
/>;
break;
}
case Page.ActiveScripts: {
mainPage = <ActiveScriptsRoot workerScripts={workerScripts} />;
break;
}
case Page.Hacknet: {
mainPage = <HacknetRoot player={player} />;
break;
}
case Page.CreateProgram: {
mainPage = <ProgramsRoot />;
break;
}
case Page.Factions: {
mainPage = <FactionsRoot player={player} router={Router} />;
break;
}
case Page.Faction: {
mainPage = <FactionRoot faction={faction} />;
break;
}
case Page.Milestones: {
mainPage = <MilestonesRoot player={player} />;
break;
}
case Page.Tutorial: {
mainPage = <TutorialRoot
reactivateTutorial={() => {
prestigeAugmentation();
Router.toTerminal();
iTutorialStart();
}}
/>
) : page === Page.DevMenu ? (
<DevMenuRoot player={player} engine={engine} router={Router} />
) : page === Page.Gang ? (
<GangRoot />
) : page === Page.Corporation ? (
<CorporationRoot />
) : page === Page.Bladeburner ? (
<BladeburnerRoot />
) : page === Page.Resleeves ? (
<ResleeveRoot />
) : page === Page.Travel ? (
<TravelAgencyRoot p={player} router={Router} />
) : page === Page.StockMarket ? (
<StockMarketRoot
/>;
break;
}
case Page.DevMenu: {
mainPage = <DevMenuRoot player={player} engine={engine} router={Router} />;
break;
}
case Page.Gang: {
mainPage = <GangRoot />;
break;
}
case Page.Corporation: {
mainPage = <CorporationRoot />;
break;
}
case Page.Bladeburner: {
mainPage = <BladeburnerRoot />;
break;
}
case Page.Resleeves: {
mainPage = <ResleeveRoot />;
break;
}
case Page.Travel: {
mainPage = <TravelAgencyRoot p={player} router={Router} />;
break;
}
case Page.StockMarket: {
mainPage = <StockMarketRoot
buyStockLong={buyStock}
buyStockShort={shortStock}
cancelOrder={cancelOrder}
@ -385,15 +429,20 @@ export function GameRoot({ player, engine, terminal }: IProps): React.ReactEleme
sellStockLong={sellStock}
sellStockShort={sellShort}
stockMarket={StockMarket}
/>
) : page === Page.City ? (
<LocationCity />
) : page === Page.Job ? (
<GenericLocation loc={location} />
) : page === Page.Location ? (
<GenericLocation loc={location} />
) : page === Page.Options ? (
<GameOptionsRoot
/>;
break;
}
case Page.City: {
mainPage = <LocationCity />;
break;
}
case Page.Job:
case Page.Location: {
mainPage = <GenericLocation loc={location} />;
break;
}
case Page.Options: {
mainPage = <GameOptionsRoot
player={player}
save={() => saveObject.saveGame()}
export={() => {
@ -407,9 +456,11 @@ export function GameRoot({ player, engine, terminal }: IProps): React.ReactEleme
prestigeAugmentation();
Router.toTerminal();
}}
/>
) : page === Page.Augmentations ? (
<AugmentationsRoot
/>;
break;
}
case Page.Augmentations: {
mainPage = <AugmentationsRoot
exportGameFn={() => {
// Apply the export bonus before saving the game
onExport(player);
@ -419,23 +470,44 @@ export function GameRoot({ player, engine, terminal }: IProps): React.ReactEleme
installAugmentations();
Router.toTerminal();
}}
/>
) : page === Page.Achievements ? (
<AchievementsRoot />
/>;
break;
}
case Page.Achievements: {
mainPage = <AchievementsRoot />;
break;
}
}
return (
<Context.Player.Provider value={player}>
<Context.Router.Provider value={Router}>
<SnackbarProvider>
<Overview>
{!ITutorial.isRunning ? (
<CharacterOverview save={() => saveObject.saveGame()} killScripts={killAllScripts} />
) : (
<>
<Typography>Cannot load</Typography>
</>
<InteractiveTutorialRoot />
)}
</Overview>
{withSidebar ? (
<Box display="flex" flexDirection="row" width="100%">
<SidebarRoot player={player} router={Router} page={page} />
<Box className={classes.root} flexGrow={1} display="block" px={1} min-height="100vh">
{mainPage}
</Box>
</Box>
)}
) : mainPage }
<Unclickable />
{withPopups && (
<>
<LogBoxManager />
<AlertManager />
<PromptManager />
<InvitationModal />
<Snackbar />
</>
)}
</SnackbarProvider>
</Context.Router.Provider>
</Context.Player.Provider>