Skip to content

Commit bde1252

Browse files
committed
Make back button always go to home page
Closes #441
1 parent 45859d1 commit bde1252

File tree

2 files changed

+10
-10
lines changed

2 files changed

+10
-10
lines changed

apps/oneclient/frontend/src/bindings.gen.ts

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -303,8 +303,11 @@ export type VersionType =
303303
*/
304304
"old_beta"
305305

306-
const ARGS_MAP = { 'core':'{"getDefaultUser":["fallback"],"removeCluster":["id"],"readSettings":[],"getPackageBody":["provider","body"],"downloadExternalPackage":["package","cluster_id","force","skip_compatibility"],"getUser":["uuid"],"fetchLoggedInProfile":["access_token"],"getUsersFromAuthor":["provider","author"],"changeSkin":["access_token","skin_url","skin_variant"],"setDiscordRPCMessage":["message"],"getClusters":[],"updateClusterById":["id","request"],"searchPackages":["provider","query"],"downloadPackage":["provider","package_id","version_id","cluster_id","skip_compatibility"],"changeCape":["access_token","cape_uuid"],"getScreenshots":["id"],"getRunningProcesses":[],"getProfileOrDefault":["name"],"createSettingsProfile":["name"],"writeSettings":["setting"],"removePackage":["cluster_id","package_hash"],"uploadSkinBytes":["access_token","skin_data","image_format","skin_variant"],"open":["input"],"getGameVersions":[],"getMultiplePackages":["provider","slugs"],"getLogByName":["id","name"],"removeUser":["uuid"],"getPackageVersions":["provider","slug","mc_version","loader","offset","limit"],"updateClusterProfile":["name","profile"],"openMsaLogin":[],"isClusterRunning":["cluster_id"],"getLoadersForVersion":["mc_version"],"getWorlds":["id"],"getRunningProcessesByClusterId":["cluster_id"],"getGlobalProfile":[],"installModpack":["modpack","cluster_id"],"setClusterStage":["id","stage"],"fetchMinecraftProfile":["uuid"],"setDefaultUser":["uuid"],"convertUsernameUUID":["username_uuid"],"getLogs":["id"],"launchCluster":["id","uuid","search_for_java"],"getLinkedPackages":["cluster_id"],"getClusterById":["id"],"createCluster":["options"],"killProcess":["pid"],"getUsers":[],"getPackage":["provider","slug"],"removeCape":["access_token"]}', 'events':'{"ingress":["event"],"message":["event"],"process":["event"]}', 'oneclient':'{"getVersions":[],"getBundlesFor":["cluster_id"],"getClustersGroupedByMajor":[],"checkForUpdate":[],"installUpdate":[]}', 'folders':'{"openCluster":["folder_name"],"fromCluster":["folder_name"]}', 'debug':'{"getPlatform":[],"getArch":[],"getLocale":[],"getPackageVersion":[],"isInDev":[],"openDevTools":[],"getBuildTimestamp":[],"getGitCommitHash":[],"getType":[],"getFamily":[],"getOsVersion":[]}' }
307-
export type Router = { 'oneclient': { getClustersGroupedByMajor: () => Promise<Partial<{ [key in number]: ClusterModel[] }>>,
306+
const ARGS_MAP = { 'events':'{"ingress":["event"],"message":["event"],"process":["event"]}', 'debug':'{"getPlatform":[],"getArch":[],"getLocale":[],"getPackageVersion":[],"isInDev":[],"openDevTools":[],"getBuildTimestamp":[],"getGitCommitHash":[],"getType":[],"getFamily":[],"getOsVersion":[]}', 'core':'{"getDefaultUser":["fallback"],"removeCluster":["id"],"readSettings":[],"getPackageBody":["provider","body"],"downloadExternalPackage":["package","cluster_id","force","skip_compatibility"],"getUser":["uuid"],"fetchLoggedInProfile":["access_token"],"getUsersFromAuthor":["provider","author"],"changeSkin":["access_token","skin_url","skin_variant"],"setDiscordRPCMessage":["message"],"getClusters":[],"updateClusterById":["id","request"],"searchPackages":["provider","query"],"downloadPackage":["provider","package_id","version_id","cluster_id","skip_compatibility"],"changeCape":["access_token","cape_uuid"],"getScreenshots":["id"],"getRunningProcesses":[],"getProfileOrDefault":["name"],"createSettingsProfile":["name"],"writeSettings":["setting"],"removePackage":["cluster_id","package_hash"],"uploadSkinBytes":["access_token","skin_data","image_format","skin_variant"],"open":["input"],"getGameVersions":[],"getMultiplePackages":["provider","slugs"],"getLogByName":["id","name"],"removeUser":["uuid"],"getPackageVersions":["provider","slug","mc_version","loader","offset","limit"],"updateClusterProfile":["name","profile"],"openMsaLogin":[],"isClusterRunning":["cluster_id"],"getLoadersForVersion":["mc_version"],"getWorlds":["id"],"getRunningProcessesByClusterId":["cluster_id"],"getGlobalProfile":[],"installModpack":["modpack","cluster_id"],"setClusterStage":["id","stage"],"fetchMinecraftProfile":["uuid"],"setDefaultUser":["uuid"],"convertUsernameUUID":["username_uuid"],"getLogs":["id"],"launchCluster":["id","uuid","search_for_java"],"getLinkedPackages":["cluster_id"],"getClusterById":["id"],"createCluster":["options"],"killProcess":["pid"],"getUsers":[],"getPackage":["provider","slug"],"removeCape":["access_token"]}', 'oneclient':'{"getVersions":[],"getBundlesFor":["cluster_id"],"getClustersGroupedByMajor":[],"checkForUpdate":[],"installUpdate":[]}', 'folders':'{"openCluster":["folder_name"],"fromCluster":["folder_name"]}' }
307+
export type Router = { 'events': { ingress: (event: IngressPayload) => Promise<void>,
308+
message: (event: MessagePayload) => Promise<void>,
309+
process: (event: ProcessPayload) => Promise<void> },
310+
'oneclient': { getClustersGroupedByMajor: () => Promise<Partial<{ [key in number]: ClusterModel[] }>>,
308311
getBundlesFor: (clusterId: number) => Promise<ModpackArchive[]>,
309312
getVersions: () => Promise<OnlineClusterManifest>,
310313
checkForUpdate: () => Promise<Update | null>,
@@ -320,11 +323,6 @@ getOsVersion: () => Promise<string>,
320323
getGitCommitHash: () => Promise<string>,
321324
getBuildTimestamp: () => Promise<string>,
322325
getPackageVersion: () => Promise<string> },
323-
'folders': { fromCluster: (folderName: string) => Promise<string>,
324-
openCluster: (folderName: string) => Promise<null> },
325-
'events': { ingress: (event: IngressPayload) => Promise<void>,
326-
message: (event: MessagePayload) => Promise<void>,
327-
process: (event: ProcessPayload) => Promise<void> },
328326
'core': { getClusters: () => Promise<ClusterModel[]>,
329327
getClusterById: (id: number) => Promise<ClusterModel | null>,
330328
removeCluster: (id: number) => Promise<null>,
@@ -373,7 +371,9 @@ changeCape: (accessToken: string, capeUuid: string) => Promise<MojangFullPlayerP
373371
removeCape: (accessToken: string) => Promise<MojangFullPlayerProfile>,
374372
convertUsernameUUID: (usernameUuid: string) => Promise<MowojangProfile>,
375373
setDiscordRPCMessage: (message: string) => Promise<null>,
376-
open: (input: string) => Promise<null> } };
374+
open: (input: string) => Promise<null> },
375+
'folders': { fromCluster: (folderName: string) => Promise<string>,
376+
openCluster: (folderName: string) => Promise<null> } };
377377

378378

379379
export type { InferCommandOutput }

apps/oneclient/frontend/src/components/SheetPage.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import type { HTMLMotionProps, MotionValue } from 'motion/react';
22
import { Button } from '@onelauncher/common/components';
3-
import { useCanGoBack, useRouter } from '@tanstack/react-router';
3+
import { useCanGoBack, useLocation, useRouter } from '@tanstack/react-router';
44
import { ArrowLeftIcon } from '@untitled-theme/icons-react';
55
import { motion, useScroll, useTransform } from 'motion/react';
66
import { OverlayScrollbarsComponent } from 'overlayscrollbars-react';
@@ -126,7 +126,7 @@ export function GoBackButton() {
126126
return undefined;
127127

128128
const onClick = () => {
129-
router.history.back();
129+
router.navigate({ to: '/' });
130130
};
131131

132132
return (

0 commit comments

Comments
 (0)