Skip to content

Commit 6ef5e63

Browse files
authored
fix: oneclient building (#377)
Fixes a bunch of ts errors that stop it from building. Their are still more but I cannot fix them currently
1 parent 3e06a33 commit 6ef5e63

File tree

10 files changed

+7
-13
lines changed

10 files changed

+7
-13
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import { useCommand } from '@onelauncher/common';
66
import { Button, Popup } from '@onelauncher/common/components';
77
import { Link, useNavigate } from '@tanstack/react-router';
88
import { Window } from '@tauri-apps/api/window';
9-
import { MinusIcon, Settings01Icon, Settings02Icon, SquareIcon, XCloseIcon } from '@untitled-theme/icons-react';
9+
import { MinusIcon, Settings02Icon, SquareIcon, XCloseIcon } from '@untitled-theme/icons-react';
1010
import { twMerge } from 'tailwind-merge';
1111
import { AccountAvatar } from './AccountAvatar';
1212
import { AccountPopup } from './overlay/AccountPopup';

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
import type { useSettings } from '@/hooks/useSettings';
21
import { Switch } from '@onelauncher/common/components';
32

43
type BooleanSetting = [

apps/oneclient/frontend/src/components/overlay/AccountPopup.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import type { MinecraftCredentials } from '@/bindings.gen';
22
import { bindings } from '@/main';
3-
import { useCommand, useCommandMut } from '@onelauncher/common';
3+
import { useCommand } from '@onelauncher/common';
44
import { Button } from '@onelauncher/common/components';
55
import { Link } from '@tanstack/react-router';
66
import { Pencil01Icon, PlusIcon, Settings01Icon, Trash01Icon } from '@untitled-theme/icons-react';
@@ -43,7 +43,7 @@ export function AccountPopup() {
4343
<AccountEntry
4444
loggedIn
4545
onClick={() => { }}
46-
onDelete={() => deleteUser(defaultUser.data)}
46+
onDelete={() => deleteUser(defaultUser.data as MinecraftCredentials)}
4747
user={defaultUser.data}
4848
/>
4949
</div>

apps/oneclient/frontend/src/hooks/useSettings.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import type { ClusterModel, ProfileUpdate, SettingProfileModel, Settings } from '@/bindings.gen';
1+
import type { ClusterModel, ProfileUpdate, Settings } from '@/bindings.gen';
22
import { bindings } from '@/main';
33
import { useCommandSuspense } from '@onelauncher/common';
44
import { useEffect, useMemo, useState } from 'react';

apps/oneclient/frontend/src/routes/app/cluster/settings.tsx

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
import { SheetPage } from '@/components';
22
import SettingsRow from '@/components/SettingsRow';
33
import { useClusterProfile } from '@/hooks/useSettings';
4-
import { bindings } from '@/main';
54
import { Switch, TextField } from '@onelauncher/common/components';
65
import { createFileRoute } from '@tanstack/react-router';
76
import { Database01Icon, FilePlus02Icon, FileX02Icon, LayoutTopIcon, Maximize01Icon, ParagraphWrapIcon, XIcon } from '@untitled-theme/icons-react';

apps/oneclient/frontend/src/routes/app/settings/appearance.tsx

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,7 @@
22
import SettingsRow from '@/components/SettingsRow';
33
import SettingsSwitch from '@/components/SettingSwitch';
44
import { useSettings } from '@/hooks/useSettings';
5-
import { bindings } from '@/main';
65
import { THEMES } from '@/utils/theming';
7-
import { Switch } from '@onelauncher/common/components';
86
import { createFileRoute } from '@tanstack/react-router';
97
import { Monitor01Icon, PackageIcon, Speedometer04Icon } from '@untitled-theme/icons-react';
108
import Sidebar from './route';

apps/oneclient/frontend/src/routes/app/settings/index.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import SettingsSwitch from '@/components/SettingSwitch';
44
import { useSettings } from '@/hooks/useSettings';
55
import { bindings } from '@/main';
66
// import useSettings from '@/hooks/useSettings';
7-
import { Button, Switch } from '@onelauncher/common/components';
7+
import { Button } from '@onelauncher/common/components';
88
import { createFileRoute } from '@tanstack/react-router';
99
import { dataDir, join } from '@tauri-apps/api/path';
1010
import { FolderIcon, Link03Icon, LinkExternal01Icon } from '@untitled-theme/icons-react';

apps/oneclient/frontend/src/routes/app/settings/route.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import type { JSX } from 'react';
22
import { createFileRoute, Outlet, useNavigate, useRouterState } from '@tanstack/react-router';
3-
import { Brush01Icon, CodeSnippet02Icon, MessageTextSquare01Icon, RefreshCcw02Icon, Rocket02Icon, Sliders04Icon, Users01Icon } from '@untitled-theme/icons-react';
3+
import { Brush01Icon, CodeSnippet02Icon, MessageTextSquare01Icon, RefreshCcw02Icon, Rocket02Icon, Sliders04Icon } from '@untitled-theme/icons-react';
44
import { useEffect } from 'react';
55

66
export const Route = createFileRoute('/app/settings')({

apps/oneclient/frontend/src/routes/onboarding/route.tsx

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,9 @@
11
import type { PropsWithChildren } from 'react';
2-
import Logo from '@/assets/logos/Logo.svg';
32
import LauncherLogo from '@/assets/logos/oneclient.svg?react';
43
import { LoaderSuspense, NavbarButton } from '@/components';
54
import { GameBackground } from '@/components/GameBackground';
65
import { Stepper } from '@/components/Stepper';
76
import { bindings } from '@/main';
8-
import useAppShellStore from '@/stores/appShellStore';
97
import { useCommandSuspense } from '@onelauncher/common';
108
import { Button } from '@onelauncher/common/components';
119
import { createFileRoute, Link, Outlet } from '@tanstack/react-router';

apps/oneclient/frontend/src/utils/browser.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import type { PackageCategories, PackageModCategory, PackageType, Provider } from '@/bindings.gen';
1+
import type { PackageCategories } from '@/bindings.gen';
22

33
export const BROWSER_VIEWS: Array<string> = ['grid', 'list'] as const;
44

0 commit comments

Comments
 (0)