From bfa390e44d5103d1d09540568be97bb6db9be5a6 Mon Sep 17 00:00:00 2001 From: Paul Makles Date: Wed, 26 Jun 2024 10:20:53 +0100 Subject: [PATCH] refactor(settings): rename 'client' to 'user' because that makes more sense --- packages/client/components/app/interface/settings/index.tsx | 4 ++-- .../app/interface/settings/{client => user}/Accessibility.tsx | 0 .../app/interface/settings/{client => user}/Account.tsx | 0 .../app/interface/settings/{client => user}/Appearance.tsx | 0 .../app/interface/settings/{client => user}/Bots.tsx | 0 .../app/interface/settings/{client => user}/Experiments.tsx | 0 .../app/interface/settings/{client => user}/Feedback.tsx | 0 .../app/interface/settings/{client => user}/Keybinds.tsx | 0 .../app/interface/settings/{client => user}/Language.tsx | 0 .../app/interface/settings/{client => user}/Native.tsx | 0 .../app/interface/settings/{client => user}/Notifications.tsx | 0 .../app/interface/settings/{client => user}/Sessions.tsx | 0 .../app/interface/settings/{client => user}/Sync.tsx | 0 .../app/interface/settings/{client => user}/_AccountCard.tsx | 0 .../app/interface/settings/{client => user}/index.tsx | 0 packages/client/components/modal/modals/Settings.tsx | 2 +- packages/client/src/Interface.tsx | 2 +- packages/client/src/index.tsx | 2 +- packages/client/src/interface/Home.tsx | 2 +- 19 files changed, 6 insertions(+), 6 deletions(-) rename packages/client/components/app/interface/settings/{client => user}/Accessibility.tsx (100%) rename packages/client/components/app/interface/settings/{client => user}/Account.tsx (100%) rename packages/client/components/app/interface/settings/{client => user}/Appearance.tsx (100%) rename packages/client/components/app/interface/settings/{client => user}/Bots.tsx (100%) rename packages/client/components/app/interface/settings/{client => user}/Experiments.tsx (100%) rename packages/client/components/app/interface/settings/{client => user}/Feedback.tsx (100%) rename packages/client/components/app/interface/settings/{client => user}/Keybinds.tsx (100%) rename packages/client/components/app/interface/settings/{client => user}/Language.tsx (100%) rename packages/client/components/app/interface/settings/{client => user}/Native.tsx (100%) rename packages/client/components/app/interface/settings/{client => user}/Notifications.tsx (100%) rename packages/client/components/app/interface/settings/{client => user}/Sessions.tsx (100%) rename packages/client/components/app/interface/settings/{client => user}/Sync.tsx (100%) rename packages/client/components/app/interface/settings/{client => user}/_AccountCard.tsx (100%) rename packages/client/components/app/interface/settings/{client => user}/index.tsx (100%) diff --git a/packages/client/components/app/interface/settings/index.tsx b/packages/client/components/app/interface/settings/index.tsx index 88e8ff34..adc2c182 100644 --- a/packages/client/components/app/interface/settings/index.tsx +++ b/packages/client/components/app/interface/settings/index.tsx @@ -2,8 +2,8 @@ import { Accessor, JSX } from "solid-js"; import { Settings, SettingsProps } from "./Settings"; import channel from "./channel"; -import client from "./client"; import server from "./server"; +import user from "./user"; export { Settings } from "./Settings"; @@ -61,7 +61,7 @@ export const SettingsConfigurations: Record< string, SettingsConfiguration > = { - client, + user, server, channel, }; diff --git a/packages/client/components/app/interface/settings/client/Accessibility.tsx b/packages/client/components/app/interface/settings/user/Accessibility.tsx similarity index 100% rename from packages/client/components/app/interface/settings/client/Accessibility.tsx rename to packages/client/components/app/interface/settings/user/Accessibility.tsx diff --git a/packages/client/components/app/interface/settings/client/Account.tsx b/packages/client/components/app/interface/settings/user/Account.tsx similarity index 100% rename from packages/client/components/app/interface/settings/client/Account.tsx rename to packages/client/components/app/interface/settings/user/Account.tsx diff --git a/packages/client/components/app/interface/settings/client/Appearance.tsx b/packages/client/components/app/interface/settings/user/Appearance.tsx similarity index 100% rename from packages/client/components/app/interface/settings/client/Appearance.tsx rename to packages/client/components/app/interface/settings/user/Appearance.tsx diff --git a/packages/client/components/app/interface/settings/client/Bots.tsx b/packages/client/components/app/interface/settings/user/Bots.tsx similarity index 100% rename from packages/client/components/app/interface/settings/client/Bots.tsx rename to packages/client/components/app/interface/settings/user/Bots.tsx diff --git a/packages/client/components/app/interface/settings/client/Experiments.tsx b/packages/client/components/app/interface/settings/user/Experiments.tsx similarity index 100% rename from packages/client/components/app/interface/settings/client/Experiments.tsx rename to packages/client/components/app/interface/settings/user/Experiments.tsx diff --git a/packages/client/components/app/interface/settings/client/Feedback.tsx b/packages/client/components/app/interface/settings/user/Feedback.tsx similarity index 100% rename from packages/client/components/app/interface/settings/client/Feedback.tsx rename to packages/client/components/app/interface/settings/user/Feedback.tsx diff --git a/packages/client/components/app/interface/settings/client/Keybinds.tsx b/packages/client/components/app/interface/settings/user/Keybinds.tsx similarity index 100% rename from packages/client/components/app/interface/settings/client/Keybinds.tsx rename to packages/client/components/app/interface/settings/user/Keybinds.tsx diff --git a/packages/client/components/app/interface/settings/client/Language.tsx b/packages/client/components/app/interface/settings/user/Language.tsx similarity index 100% rename from packages/client/components/app/interface/settings/client/Language.tsx rename to packages/client/components/app/interface/settings/user/Language.tsx diff --git a/packages/client/components/app/interface/settings/client/Native.tsx b/packages/client/components/app/interface/settings/user/Native.tsx similarity index 100% rename from packages/client/components/app/interface/settings/client/Native.tsx rename to packages/client/components/app/interface/settings/user/Native.tsx diff --git a/packages/client/components/app/interface/settings/client/Notifications.tsx b/packages/client/components/app/interface/settings/user/Notifications.tsx similarity index 100% rename from packages/client/components/app/interface/settings/client/Notifications.tsx rename to packages/client/components/app/interface/settings/user/Notifications.tsx diff --git a/packages/client/components/app/interface/settings/client/Sessions.tsx b/packages/client/components/app/interface/settings/user/Sessions.tsx similarity index 100% rename from packages/client/components/app/interface/settings/client/Sessions.tsx rename to packages/client/components/app/interface/settings/user/Sessions.tsx diff --git a/packages/client/components/app/interface/settings/client/Sync.tsx b/packages/client/components/app/interface/settings/user/Sync.tsx similarity index 100% rename from packages/client/components/app/interface/settings/client/Sync.tsx rename to packages/client/components/app/interface/settings/user/Sync.tsx diff --git a/packages/client/components/app/interface/settings/client/_AccountCard.tsx b/packages/client/components/app/interface/settings/user/_AccountCard.tsx similarity index 100% rename from packages/client/components/app/interface/settings/client/_AccountCard.tsx rename to packages/client/components/app/interface/settings/user/_AccountCard.tsx diff --git a/packages/client/components/app/interface/settings/client/index.tsx b/packages/client/components/app/interface/settings/user/index.tsx similarity index 100% rename from packages/client/components/app/interface/settings/client/index.tsx rename to packages/client/components/app/interface/settings/user/index.tsx diff --git a/packages/client/components/modal/modals/Settings.tsx b/packages/client/components/modal/modals/Settings.tsx index 3cdd1d00..cde815b9 100644 --- a/packages/client/components/modal/modals/Settings.tsx +++ b/packages/client/components/modal/modals/Settings.tsx @@ -14,7 +14,7 @@ const SettingsModal: PropGenerator<"settings"> = ({ config: configKey, context, }) => { - const config = SettingsConfigurations[configKey ?? "client"]; + const config = SettingsConfigurations[configKey]; return { _children: (props) => { diff --git a/packages/client/src/Interface.tsx b/packages/client/src/Interface.tsx index 294b1bd8..02e45681 100644 --- a/packages/client/src/Interface.tsx +++ b/packages/client/src/Interface.tsx @@ -26,7 +26,7 @@ const Interface = (props: { children: JSX.Element }) => { e.preventDefault(); modalController.push({ type: "settings", - config: "client", + config: "user", }); } else if (typeof e.to === "string") { state.layout.setLastActivePath(e.to); diff --git a/packages/client/src/index.tsx b/packages/client/src/index.tsx index 7f7ead74..e1876946 100644 --- a/packages/client/src/index.tsx +++ b/packages/client/src/index.tsx @@ -78,7 +78,7 @@ function PWARedirect() { * Open settings and redirect to last active path */ function SettingsRedirect() { - onMount(() => modalController.push({ type: "settings", config: "client" })); + onMount(() => modalController.push({ type: "settings", config: "user" })); return ; } diff --git a/packages/client/src/interface/Home.tsx b/packages/client/src/interface/Home.tsx index 723c6937..b921756d 100644 --- a/packages/client/src/interface/Home.tsx +++ b/packages/client/src/interface/Home.tsx @@ -184,7 +184,7 @@ export function HomePage() { - modalController.push({ type: "settings", config: "client" }) + modalController.push({ type: "settings", config: "user" }) } description={t("app.home.settings-tooltip")} icon={}