From bde1252ea3948905e3547ea895ebdd2cf9d99713 Mon Sep 17 00:00:00 2001 From: Wyvest Date: Sat, 27 Dec 2025 21:53:52 +0900 Subject: [PATCH] Make back button always go to home page Closes #441 --- apps/oneclient/frontend/src/bindings.gen.ts | 16 ++++++++-------- .../frontend/src/components/SheetPage.tsx | 4 ++-- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/apps/oneclient/frontend/src/bindings.gen.ts b/apps/oneclient/frontend/src/bindings.gen.ts index 1a527cca..a1461f88 100644 --- a/apps/oneclient/frontend/src/bindings.gen.ts +++ b/apps/oneclient/frontend/src/bindings.gen.ts @@ -303,8 +303,11 @@ export type VersionType = */ "old_beta" -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":[]}' } -export type Router = { 'oneclient': { getClustersGroupedByMajor: () => Promise>, +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"]}' } +export type Router = { 'events': { ingress: (event: IngressPayload) => Promise, +message: (event: MessagePayload) => Promise, +process: (event: ProcessPayload) => Promise }, +'oneclient': { getClustersGroupedByMajor: () => Promise>, getBundlesFor: (clusterId: number) => Promise, getVersions: () => Promise, checkForUpdate: () => Promise, @@ -320,11 +323,6 @@ getOsVersion: () => Promise, getGitCommitHash: () => Promise, getBuildTimestamp: () => Promise, getPackageVersion: () => Promise }, -'folders': { fromCluster: (folderName: string) => Promise, -openCluster: (folderName: string) => Promise }, -'events': { ingress: (event: IngressPayload) => Promise, -message: (event: MessagePayload) => Promise, -process: (event: ProcessPayload) => Promise }, 'core': { getClusters: () => Promise, getClusterById: (id: number) => Promise, removeCluster: (id: number) => Promise, @@ -373,7 +371,9 @@ changeCape: (accessToken: string, capeUuid: string) => Promise Promise, convertUsernameUUID: (usernameUuid: string) => Promise, setDiscordRPCMessage: (message: string) => Promise, -open: (input: string) => Promise } }; +open: (input: string) => Promise }, +'folders': { fromCluster: (folderName: string) => Promise, +openCluster: (folderName: string) => Promise } }; export type { InferCommandOutput } diff --git a/apps/oneclient/frontend/src/components/SheetPage.tsx b/apps/oneclient/frontend/src/components/SheetPage.tsx index 9320101c..862f2a68 100644 --- a/apps/oneclient/frontend/src/components/SheetPage.tsx +++ b/apps/oneclient/frontend/src/components/SheetPage.tsx @@ -1,6 +1,6 @@ import type { HTMLMotionProps, MotionValue } from 'motion/react'; import { Button } from '@onelauncher/common/components'; -import { useCanGoBack, useRouter } from '@tanstack/react-router'; +import { useCanGoBack, useLocation, useRouter } from '@tanstack/react-router'; import { ArrowLeftIcon } from '@untitled-theme/icons-react'; import { motion, useScroll, useTransform } from 'motion/react'; import { OverlayScrollbarsComponent } from 'overlayscrollbars-react'; @@ -126,7 +126,7 @@ export function GoBackButton() { return undefined; const onClick = () => { - router.history.back(); + router.navigate({ to: '/' }); }; return (