From 90da67cf89fd3fc78347cc76cef6b3642ad66851 Mon Sep 17 00:00:00 2001 From: hablethedev Date: Fri, 19 Sep 2025 14:51:55 +0100 Subject: [PATCH 1/3] feat: simple fades on recent cards --- apps/oneclient/frontend/src/bindings.gen.ts | 14 +++++++------- apps/oneclient/frontend/src/routes/app/index.tsx | 6 ++++-- 2 files changed, 11 insertions(+), 9 deletions(-) diff --git a/apps/oneclient/frontend/src/bindings.gen.ts b/apps/oneclient/frontend/src/bindings.gen.ts index 8bf45ac8..7ee3d7e3 100644 --- a/apps/oneclient/frontend/src/bindings.gen.ts +++ b/apps/oneclient/frontend/src/bindings.gen.ts @@ -169,7 +169,7 @@ export type SettingProfileModel = { name: string; java_id: number | null; res: R export type Settings = { global_game_settings: SettingProfileModel; allow_parallel_running_clusters: boolean; enable_gamemode: boolean; discord_enabled: boolean; max_concurrent_requests: number; settings_version: number; native_window_frame: boolean } -export type SettingsOsExtra = { enable_gamemode: boolean | null } +export type SettingsOsExtra = Record export type Sort = "Relevance" | "Downloads" | "Newest" | "Updated" @@ -232,10 +232,9 @@ export type VersionType = */ "old_beta" -const ARGS_MAP = { 'core':'{"getUser":["uuid"],"readSettings":[],"searchPackages":["provider","query"],"writeSettings":["setting"],"createCluster":["options"],"fetchMinecraftProfile":["uuid"],"getLoadersForVersion":["mc_version"],"launchCluster":["id","uuid"],"getGlobalProfile":[],"openMsaLogin":[],"open":["input"],"getPackageVersions":["provider","slug","mc_version","loader","offset","limit"],"isClusterRunning":["cluster_id"],"getGameVersions":[],"getMultiplePackages":["provider","slugs"],"setDefaultUser":["uuid"],"downloadPackage":["provider","package_id","version_id","cluster_id","skip_compatibility"],"getLogs":["id"],"getRunningProcesses":[],"getUsersFromAuthor":["provider","author"],"getClusterById":["id"],"getScreenshots":["id"],"getProfileOrDefault":["name"],"getPackageBody":["provider","body"],"getRunningProcessesByClusterId":["cluster_id"],"updateClusterProfile":["name","profile"],"getPackage":["provider","slug"],"removeUser":["uuid"],"updateClusterById":["id","request"],"getWorlds":["id"],"getLogByName":["id","name"],"killProcess":["pid"],"getClusters":[],"removeCluster":["id"],"getDefaultUser":["fallback"],"getUsers":[]}', 'events':'{"message":["event"],"ingress":["event"],"process":["event"]}', 'folders':'{"fromCluster":["folder_name"],"openCluster":["folder_name"]}', 'oneclient':'{"getClustersGroupedByMajor":[],"openDevTools":[]}' } -export type Router = { 'events': { ingress: (event: IngressPayload) => Promise, -message: (event: MessagePayload) => Promise, -process: (event: ProcessPayload) => Promise }, +const ARGS_MAP = { 'core':'{"writeSettings":["setting"],"getUsers":[],"createCluster":["options"],"openMsaLogin":[],"searchPackages":["provider","query"],"killProcess":["pid"],"getGameVersions":[],"open":["input"],"getWorlds":["id"],"launchCluster":["id","uuid"],"removeUser":["uuid"],"isClusterRunning":["cluster_id"],"getPackage":["provider","slug"],"getDefaultUser":["fallback"],"getRunningProcessesByClusterId":["cluster_id"],"getClusterById":["id"],"getMultiplePackages":["provider","slugs"],"readSettings":[],"fetchMinecraftProfile":["uuid"],"getLoadersForVersion":["mc_version"],"setDefaultUser":["uuid"],"getUsersFromAuthor":["provider","author"],"getScreenshots":["id"],"getLogByName":["id","name"],"updateClusterById":["id","request"],"getGlobalProfile":[],"getUser":["uuid"],"updateClusterProfile":["name","profile"],"getPackageBody":["provider","body"],"getPackageVersions":["provider","slug","mc_version","loader","offset","limit"],"removeCluster":["id"],"downloadPackage":["provider","package_id","version_id","cluster_id","skip_compatibility"],"getProfileOrDefault":["name"],"getLogs":["id"],"getClusters":[],"getRunningProcesses":[]}', 'events':'{"ingress":["event"],"message":["event"],"process":["event"]}', 'folders':'{"openCluster":["folder_name"],"fromCluster":["folder_name"]}', 'oneclient':'{"openDevTools":[],"getClustersGroupedByMajor":[]}' } +export type Router = { 'oneclient': { openDevTools: () => Promise, +getClustersGroupedByMajor: () => Promise> }, 'core': { getClusters: () => Promise, getClusterById: (id: number) => Promise, removeCluster: (id: number) => Promise, @@ -272,8 +271,9 @@ downloadPackage: (provider: Provider, packageId: string, versionId: string, clus getUsersFromAuthor: (provider: Provider, author: PackageAuthor) => Promise, fetchMinecraftProfile: (uuid: string) => Promise, open: (input: string) => Promise }, -'oneclient': { openDevTools: () => Promise, -getClustersGroupedByMajor: () => Promise> }, +'events': { ingress: (event: IngressPayload) => Promise, +message: (event: MessagePayload) => Promise, +process: (event: ProcessPayload) => Promise }, 'folders': { fromCluster: (folderName: string) => Promise, openCluster: (folderName: string) => Promise } }; diff --git a/apps/oneclient/frontend/src/routes/app/index.tsx b/apps/oneclient/frontend/src/routes/app/index.tsx index 68adbb77..d90eef6e 100644 --- a/apps/oneclient/frontend/src/routes/app/index.tsx +++ b/apps/oneclient/frontend/src/routes/app/index.tsx @@ -129,13 +129,15 @@ function RecentsCard({ return ( -
+
@@ -160,7 +162,7 @@ function Card({ return ( Date: Fri, 19 Sep 2025 16:05:18 +0100 Subject: [PATCH 2/3] fix: #1 --- apps/oneclient/frontend/src/bindings.gen.ts | 12 ++++----- .../frontend/src/routes/app/index.tsx | 26 ++++++++++--------- 2 files changed, 20 insertions(+), 18 deletions(-) diff --git a/apps/oneclient/frontend/src/bindings.gen.ts b/apps/oneclient/frontend/src/bindings.gen.ts index 7ee3d7e3..b14dd3e9 100644 --- a/apps/oneclient/frontend/src/bindings.gen.ts +++ b/apps/oneclient/frontend/src/bindings.gen.ts @@ -232,10 +232,8 @@ export type VersionType = */ "old_beta" -const ARGS_MAP = { 'core':'{"writeSettings":["setting"],"getUsers":[],"createCluster":["options"],"openMsaLogin":[],"searchPackages":["provider","query"],"killProcess":["pid"],"getGameVersions":[],"open":["input"],"getWorlds":["id"],"launchCluster":["id","uuid"],"removeUser":["uuid"],"isClusterRunning":["cluster_id"],"getPackage":["provider","slug"],"getDefaultUser":["fallback"],"getRunningProcessesByClusterId":["cluster_id"],"getClusterById":["id"],"getMultiplePackages":["provider","slugs"],"readSettings":[],"fetchMinecraftProfile":["uuid"],"getLoadersForVersion":["mc_version"],"setDefaultUser":["uuid"],"getUsersFromAuthor":["provider","author"],"getScreenshots":["id"],"getLogByName":["id","name"],"updateClusterById":["id","request"],"getGlobalProfile":[],"getUser":["uuid"],"updateClusterProfile":["name","profile"],"getPackageBody":["provider","body"],"getPackageVersions":["provider","slug","mc_version","loader","offset","limit"],"removeCluster":["id"],"downloadPackage":["provider","package_id","version_id","cluster_id","skip_compatibility"],"getProfileOrDefault":["name"],"getLogs":["id"],"getClusters":[],"getRunningProcesses":[]}', 'events':'{"ingress":["event"],"message":["event"],"process":["event"]}', 'folders':'{"openCluster":["folder_name"],"fromCluster":["folder_name"]}', 'oneclient':'{"openDevTools":[],"getClustersGroupedByMajor":[]}' } -export type Router = { 'oneclient': { openDevTools: () => Promise, -getClustersGroupedByMajor: () => Promise> }, -'core': { getClusters: () => Promise, +const ARGS_MAP = { 'core':'{"writeSettings":["setting"],"getUsers":[],"createCluster":["options"],"openMsaLogin":[],"searchPackages":["provider","query"],"killProcess":["pid"],"getGameVersions":[],"open":["input"],"getWorlds":["id"],"launchCluster":["id","uuid"],"removeUser":["uuid"],"isClusterRunning":["cluster_id"],"getPackage":["provider","slug"],"getDefaultUser":["fallback"],"getRunningProcessesByClusterId":["cluster_id"],"getClusterById":["id"],"getMultiplePackages":["provider","slugs"],"readSettings":[],"fetchMinecraftProfile":["uuid"],"getLoadersForVersion":["mc_version"],"setDefaultUser":["uuid"],"getUsersFromAuthor":["provider","author"],"getScreenshots":["id"],"getLogByName":["id","name"],"updateClusterById":["id","request"],"getGlobalProfile":[],"getUser":["uuid"],"updateClusterProfile":["name","profile"],"getPackageBody":["provider","body"],"getPackageVersions":["provider","slug","mc_version","loader","offset","limit"],"removeCluster":["id"],"downloadPackage":["provider","package_id","version_id","cluster_id","skip_compatibility"],"getProfileOrDefault":["name"],"getLogs":["id"],"getClusters":[],"getRunningProcesses":[]}', 'oneclient':'{"openDevTools":[],"getClustersGroupedByMajor":[]}', 'folders':'{"openCluster":["folder_name"],"fromCluster":["folder_name"]}', 'events':'{"ingress":["event"],"message":["event"],"process":["event"]}' } +export type Router = { 'core': { getClusters: () => Promise, getClusterById: (id: number) => Promise, removeCluster: (id: number) => Promise, createCluster: (options: CreateCluster) => Promise, @@ -271,11 +269,13 @@ downloadPackage: (provider: Provider, packageId: string, versionId: string, clus getUsersFromAuthor: (provider: Provider, author: PackageAuthor) => Promise, fetchMinecraftProfile: (uuid: string) => Promise, open: (input: string) => Promise }, +'folders': { fromCluster: (folderName: string) => Promise, +openCluster: (folderName: string) => Promise }, 'events': { ingress: (event: IngressPayload) => Promise, message: (event: MessagePayload) => Promise, process: (event: ProcessPayload) => Promise }, -'folders': { fromCluster: (folderName: string) => Promise, -openCluster: (folderName: string) => Promise } }; +'oneclient': { openDevTools: () => Promise, +getClustersGroupedByMajor: () => Promise> } }; export type { InferCommandOutput } diff --git a/apps/oneclient/frontend/src/routes/app/index.tsx b/apps/oneclient/frontend/src/routes/app/index.tsx index d90eef6e..52d1fc66 100644 --- a/apps/oneclient/frontend/src/routes/app/index.tsx +++ b/apps/oneclient/frontend/src/routes/app/index.tsx @@ -129,20 +129,22 @@ function RecentsCard({ return ( -
- - -
+
+
+ + +
-

{version} {prettifyLoader(loader)}

+

{version} {prettifyLoader(loader)}

); From 93635e7ec2db2975a684d5339183912cfd00e76e Mon Sep 17 00:00:00 2001 From: hablethedev Date: Fri, 19 Sep 2025 16:27:19 +0100 Subject: [PATCH 3/3] fix: give pages descriptions that aren't descriptions of descriptions --- apps/oneclient/frontend/src/bindings.gen.ts | 10 +++++----- apps/oneclient/frontend/src/routes/app/accounts.tsx | 2 +- apps/oneclient/frontend/src/routes/app/clusters.tsx | 2 +- .../src/routes/onboarding/preferences/mods.tsx | 3 +-- .../src/routes/onboarding/preferences/versions.tsx | 3 +-- 5 files changed, 9 insertions(+), 11 deletions(-) diff --git a/apps/oneclient/frontend/src/bindings.gen.ts b/apps/oneclient/frontend/src/bindings.gen.ts index b14dd3e9..46a673c3 100644 --- a/apps/oneclient/frontend/src/bindings.gen.ts +++ b/apps/oneclient/frontend/src/bindings.gen.ts @@ -232,8 +232,10 @@ export type VersionType = */ "old_beta" -const ARGS_MAP = { 'core':'{"writeSettings":["setting"],"getUsers":[],"createCluster":["options"],"openMsaLogin":[],"searchPackages":["provider","query"],"killProcess":["pid"],"getGameVersions":[],"open":["input"],"getWorlds":["id"],"launchCluster":["id","uuid"],"removeUser":["uuid"],"isClusterRunning":["cluster_id"],"getPackage":["provider","slug"],"getDefaultUser":["fallback"],"getRunningProcessesByClusterId":["cluster_id"],"getClusterById":["id"],"getMultiplePackages":["provider","slugs"],"readSettings":[],"fetchMinecraftProfile":["uuid"],"getLoadersForVersion":["mc_version"],"setDefaultUser":["uuid"],"getUsersFromAuthor":["provider","author"],"getScreenshots":["id"],"getLogByName":["id","name"],"updateClusterById":["id","request"],"getGlobalProfile":[],"getUser":["uuid"],"updateClusterProfile":["name","profile"],"getPackageBody":["provider","body"],"getPackageVersions":["provider","slug","mc_version","loader","offset","limit"],"removeCluster":["id"],"downloadPackage":["provider","package_id","version_id","cluster_id","skip_compatibility"],"getProfileOrDefault":["name"],"getLogs":["id"],"getClusters":[],"getRunningProcesses":[]}', 'oneclient':'{"openDevTools":[],"getClustersGroupedByMajor":[]}', 'folders':'{"openCluster":["folder_name"],"fromCluster":["folder_name"]}', 'events':'{"ingress":["event"],"message":["event"],"process":["event"]}' } -export type Router = { 'core': { getClusters: () => Promise, +const ARGS_MAP = { 'core':'{"writeSettings":["setting"],"getUsers":[],"createCluster":["options"],"openMsaLogin":[],"searchPackages":["provider","query"],"killProcess":["pid"],"getGameVersions":[],"open":["input"],"getWorlds":["id"],"launchCluster":["id","uuid"],"removeUser":["uuid"],"isClusterRunning":["cluster_id"],"getPackage":["provider","slug"],"getDefaultUser":["fallback"],"getRunningProcessesByClusterId":["cluster_id"],"getClusterById":["id"],"getMultiplePackages":["provider","slugs"],"readSettings":[],"fetchMinecraftProfile":["uuid"],"getLoadersForVersion":["mc_version"],"setDefaultUser":["uuid"],"getUsersFromAuthor":["provider","author"],"getScreenshots":["id"],"getLogByName":["id","name"],"updateClusterById":["id","request"],"getGlobalProfile":[],"getUser":["uuid"],"updateClusterProfile":["name","profile"],"getPackageBody":["provider","body"],"getPackageVersions":["provider","slug","mc_version","loader","offset","limit"],"removeCluster":["id"],"downloadPackage":["provider","package_id","version_id","cluster_id","skip_compatibility"],"getProfileOrDefault":["name"],"getLogs":["id"],"getClusters":[],"getRunningProcesses":[]}', 'folders':'{"openCluster":["folder_name"],"fromCluster":["folder_name"]}', 'events':'{"ingress":["event"],"message":["event"],"process":["event"]}', 'oneclient':'{"openDevTools":[],"getClustersGroupedByMajor":[]}' } +export type Router = { 'oneclient': { openDevTools: () => Promise, +getClustersGroupedByMajor: () => Promise> }, +'core': { getClusters: () => Promise, getClusterById: (id: number) => Promise, removeCluster: (id: number) => Promise, createCluster: (options: CreateCluster) => Promise, @@ -273,9 +275,7 @@ open: (input: string) => Promise }, openCluster: (folderName: string) => Promise }, 'events': { ingress: (event: IngressPayload) => Promise, message: (event: MessagePayload) => Promise, -process: (event: ProcessPayload) => Promise }, -'oneclient': { openDevTools: () => Promise, -getClustersGroupedByMajor: () => Promise> } }; +process: (event: ProcessPayload) => Promise } }; export type { InferCommandOutput } diff --git a/apps/oneclient/frontend/src/routes/app/accounts.tsx b/apps/oneclient/frontend/src/routes/app/accounts.tsx index 9bcad5de..a7e7aa53 100644 --- a/apps/oneclient/frontend/src/routes/app/accounts.tsx +++ b/apps/oneclient/frontend/src/routes/app/accounts.tsx @@ -40,7 +40,7 @@ function HeaderLarge() {

Accounts

-

Something something in corporate style fashion about picking your preferred gamemodes and versions and optionally loader so that oneclient can pick something for them

+

Login to your Minecraft account here.

diff --git a/apps/oneclient/frontend/src/routes/app/clusters.tsx b/apps/oneclient/frontend/src/routes/app/clusters.tsx index eb415ce1..66d9ddf4 100644 --- a/apps/oneclient/frontend/src/routes/app/clusters.tsx +++ b/apps/oneclient/frontend/src/routes/app/clusters.tsx @@ -221,7 +221,7 @@ function HeaderLarge() {

Clusters

-

Something something in corporate style fashion about picking your preferred gamemodes and versions and optionally loader so that oneclient can pick something for them

+

Pick what you play and we'll do the rest.

); diff --git a/apps/oneclient/frontend/src/routes/onboarding/preferences/mods.tsx b/apps/oneclient/frontend/src/routes/onboarding/preferences/mods.tsx index ba01587d..bd606b16 100644 --- a/apps/oneclient/frontend/src/routes/onboarding/preferences/mods.tsx +++ b/apps/oneclient/frontend/src/routes/onboarding/preferences/mods.tsx @@ -13,8 +13,7 @@ function RouteComponent() {

Choose Mods

- Something something in corporate style fashion about picking your preferred gamemodes and versions and - optionally loader so that oneclient can pick something for them + Add mods to your game and experience something new.

diff --git a/apps/oneclient/frontend/src/routes/onboarding/preferences/versions.tsx b/apps/oneclient/frontend/src/routes/onboarding/preferences/versions.tsx index e75e7427..82560b79 100644 --- a/apps/oneclient/frontend/src/routes/onboarding/preferences/versions.tsx +++ b/apps/oneclient/frontend/src/routes/onboarding/preferences/versions.tsx @@ -29,8 +29,7 @@ function RouteComponent() {

Starting Versions

- Something something in corporate style fashion about picking your preferred gamemodes and versions and - optionally loader so that oneclient can pick something for them + Pick your preferred version to get going.