From 403ea1fab15beb3a44f16b039b4d9f5f8ab8b920 Mon Sep 17 00:00:00 2001
From: Jacob <55346310+Kathund@users.noreply.github.com>
Date: Fri, 26 Sep 2025 12:06:28 +0000
Subject: [PATCH] feat: oneclient onboarding prompt for account (#372)

---
 apps/oneclient/frontend/src/bindings.gen.ts   | 18 ++--
 .../src/routes/onboarding/account.tsx         | 94 ++++++++++++++++++-
 2 files changed, 98 insertions(+), 14 deletions(-)

diff --git a/apps/oneclient/frontend/src/bindings.gen.ts b/apps/oneclient/frontend/src/bindings.gen.ts
index 4cafb6f3..607296c2 100644
--- a/apps/oneclient/frontend/src/bindings.gen.ts
+++ b/apps/oneclient/frontend/src/bindings.gen.ts
@@ -244,8 +244,14 @@ export type VersionType =
  */
 "old_beta"
 
-const ARGS_MAP = { 'core':'{"getLogs":["id"],"getMultiplePackages":["provider","slugs"],"installModpack":["modpack","cluster_id"],"removeUser":["uuid"],"createCluster":["options"],"getGlobalProfile":[],"getRunningProcesses":[],"getDefaultUser":["fallback"],"updateClusterProfile":["name","profile"],"setDefaultUser":["uuid"],"getPackage":["provider","slug"],"downloadPackage":["provider","package_id","version_id","cluster_id","skip_compatibility"],"removeCluster":["id"],"getLogByName":["id","name"],"getProfileOrDefault":["name"],"getWorlds":["id"],"open":["input"],"getLoadersForVersion":["mc_version"],"readSettings":[],"writeSettings":["setting"],"fetchMinecraftProfile":["uuid"],"getGameVersions":[],"updateClusterById":["id","request"],"openMsaLogin":[],"getPackageVersions":["provider","slug","mc_version","loader","offset","limit"],"getUser":["uuid"],"getScreenshots":["id"],"getClusters":[],"killProcess":["pid"],"getPackageBody":["provider","body"],"getRunningProcessesByClusterId":["cluster_id"],"isClusterRunning":["cluster_id"],"launchCluster":["id","uuid"],"searchPackages":["provider","query"],"getUsers":[],"getUsersFromAuthor":["provider","author"],"getClusterById":["id"]}', 'oneclient':'{"getBundlesFor":["cluster_id"],"openDevTools":[],"getClustersGroupedByMajor":[]}', 'events':'{"message":["event"],"ingress":["event"],"process":["event"]}', 'folders':'{"openCluster":["folder_name"],"fromCluster":["folder_name"]}' }
-export type Router = { 'core': { getClusters: () => Promise<ClusterModel[]>, 
+const ARGS_MAP = { 'events':'{"message":["event"],"ingress":["event"],"process":["event"]}', 'folders':'{"openCluster":["folder_name"],"fromCluster":["folder_name"]}', 'oneclient':'{"getBundlesFor":["cluster_id"],"openDevTools":[],"getClustersGroupedByMajor":[]}', 'core':'{"getLogs":["id"],"getMultiplePackages":["provider","slugs"],"installModpack":["modpack","cluster_id"],"removeUser":["uuid"],"createCluster":["options"],"getGlobalProfile":[],"getRunningProcesses":[],"getDefaultUser":["fallback"],"updateClusterProfile":["name","profile"],"setDefaultUser":["uuid"],"getPackage":["provider","slug"],"downloadPackage":["provider","package_id","version_id","cluster_id","skip_compatibility"],"removeCluster":["id"],"getLogByName":["id","name"],"getProfileOrDefault":["name"],"getWorlds":["id"],"open":["input"],"getLoadersForVersion":["mc_version"],"readSettings":[],"writeSettings":["setting"],"fetchMinecraftProfile":["uuid"],"getGameVersions":[],"updateClusterById":["id","request"],"openMsaLogin":[],"getPackageVersions":["provider","slug","mc_version","loader","offset","limit"],"getUser":["uuid"],"getScreenshots":["id"],"getClusters":[],"killProcess":["pid"],"getPackageBody":["provider","body"],"getRunningProcessesByClusterId":["cluster_id"],"isClusterRunning":["cluster_id"],"launchCluster":["id","uuid"],"searchPackages":["provider","query"],"getUsers":[],"getUsersFromAuthor":["provider","author"],"getClusterById":["id"]}' }
+export type Router = { 'oneclient': { openDevTools: () => Promise<void>, 
+getClustersGroupedByMajor: () => Promise<Partial<{ [key in number]: ClusterModel[] }>>, 
+getBundlesFor: (clusterId: number) => Promise<ModpackArchive[]> },
+'events': { ingress: (event: IngressPayload) => Promise<void>, 
+message: (event: MessagePayload) => Promise<void>, 
+process: (event: ProcessPayload) => Promise<void> },
+'core': { getClusters: () => Promise<ClusterModel[]>, 
 getClusterById: (id: number) => Promise<ClusterModel | null>, 
 removeCluster: (id: number) => Promise<null>, 
 createCluster: (options: CreateCluster) => Promise<ClusterModel>, 
@@ -283,13 +289,7 @@ installModpack: (modpack: ModpackArchive, clusterId: number) => Promise<null>,
 fetchMinecraftProfile: (uuid: string) => Promise<MojangPlayerProfile>, 
 open: (input: string) => Promise<null> },
 'folders': { fromCluster: (folderName: string) => Promise<string>, 
-openCluster: (folderName: string) => Promise<null> },
-'events': { ingress: (event: IngressPayload) => Promise<void>, 
-message: (event: MessagePayload) => Promise<void>, 
-process: (event: ProcessPayload) => Promise<void> },
-'oneclient': { openDevTools: () => Promise<void>, 
-getClustersGroupedByMajor: () => Promise<Partial<{ [key in number]: ClusterModel[] }>>, 
-getBundlesFor: (clusterId: number) => Promise<ModpackArchive[]> } };
+openCluster: (folderName: string) => Promise<null> } };
 
 
 export type { InferCommandOutput }
diff --git a/apps/oneclient/frontend/src/routes/onboarding/account.tsx b/apps/oneclient/frontend/src/routes/onboarding/account.tsx
index 60a283e7..3159f724 100644
--- a/apps/oneclient/frontend/src/routes/onboarding/account.tsx
+++ b/apps/oneclient/frontend/src/routes/onboarding/account.tsx
@@ -1,9 +1,93 @@
-import { createFileRoute } from '@tanstack/react-router'
+import type { MinecraftCredentials } from '@/bindings.gen';
+import { AccountAvatar, SkinViewer } from '@/components';
+import { usePlayerProfile } from '@/hooks/usePlayerProfile';
+import { bindings } from '@/main';
+import { useCommandMut } from '@onelauncher/common';
+import { Button } from '@onelauncher/common/components';
+import { useQueryClient } from '@tanstack/react-query';
+import { createFileRoute } from '@tanstack/react-router';
 
 export const Route = createFileRoute('/onboarding/account')({
-  component: RouteComponent,
-})
+	component: RouteComponent,
+});
 
-function RouteComponent() {
-  return <div>Hello "/onboarding/account"!</div>
+function Viewer({
+	credentials,
+}: {
+	credentials: MinecraftCredentials;
+}) {
+	const { data: profile } = usePlayerProfile(credentials.id);
+	return (
+		<SkinViewer
+			capeUrl={profile?.cape_url}
+			className="h-full w-full max-w-1/4"
+			height={400}
+			skinUrl={profile?.skin_url}
+			width={250}
+		/>
+	);
+}
+
+function AccountPreview({
+	profile,
+}: {
+	profile: MinecraftCredentials;
+}) {
+	return (
+		<div className="flex flex-row gap-2">
+			<div>
+				<Viewer credentials={profile} />
+			</div>
+			<div className="flex flex-row justify-start gap-2">
+				<AccountAvatar className="aspect-square h-12 rounded-sm " uuid={profile.id} />
+				<div className="text-left flex flex-col">
+					<p className="flex items-center gap-1 text-fg-primary font-semibold">{profile.username}</p>
+					<p className="text-fg-secondary text-sm">{profile.id}</p>
+				</div>
+			</div>
+		</div>
+	);
+}
+
+// TODO: Block the next button until the user logs in (beg lynith to do it coz I spent 20 minutes on it)
+function RouteComponent() {
+	const queryClient = useQueryClient();
+
+	const { data: profile, isPending, mutate: login } = useCommandMut(bindings.core.openMsaLogin, {
+		onSuccess() {
+			queryClient.invalidateQueries({
+				queryKey: ['getUsers'],
+			});
+			queryClient.invalidateQueries({
+				queryKey: ['getDefaultUser'],
+			});
+		},
+	});
+
+	const onClick = () => {
+		login();
+	};
+
+	return (
+		<div className="flex flex-col h-full px-12 gap-8">
+			<h1 className="text-4xl font-semibold mb-2">Account</h1>
+			<p className="text-slate-400 text-lg mb-2">Before you continue, we require you to own a copy of Minecraft: Java Edition.</p>
+			{profile
+				? (
+					<>
+						<AccountPreview profile={profile} />
+					</>
+				)
+				: (
+					<Button
+						color="primary"
+						isPending={isPending}
+						onClick={onClick}
+						size="large"
+					>
+						Add Account
+					</Button>
+				)}
+		</div >
+	);
 }