diff --git a/src/app/GlobalProvider.tsx b/src/app/GlobalProvider.tsx index 43d3500..110ba9a 100644 --- a/src/app/GlobalProvider.tsx +++ b/src/app/GlobalProvider.tsx @@ -7,12 +7,12 @@ import { Dispatch, SetStateAction } from 'react' -import { DownloadProgress } from '../types/DownloadProgress' -import { VersionsConfig } from '../types/VersionsConfig' -import { NormalConfig } from '../types/NormalConfig' -import { ServerVersionsResponse } from '../types/ServerVersionsResponse' -import { GameVersion } from '../types/GameVersion' -import { Game } from '../types/Game' +import { DownloadProgress } from '@/types/DownloadProgress' +import { VersionsConfig } from '@/types/VersionsConfig' +import { NormalConfig } from '@/types/NormalConfig' +import { ServerVersionsResponse } from '@/types/ServerVersionsResponse' +import { GameVersion } from '@/types/GameVersion' +import { Game } from '@/types/Game' type GlobalCtxType = { serverVersionList: ServerVersionsResponse | null diff --git a/src/app/game/page.tsx b/src/app/game/page.tsx index 6c16b69..a27af46 100644 --- a/src/app/game/page.tsx +++ b/src/app/game/page.tsx @@ -1,9 +1,9 @@ 'use client' import { useEffect } from 'react' -import '../Installs.css' +import '@/app/Installs.css' import { invoke } from '@tauri-apps/api/core' -import { useGlobal } from '../GlobalProvider' +import { useGlobal } from '@/app/GlobalProvider' import { useSearchParams } from 'next/navigation' import { platform } from '@tauri-apps/plugin-os' import { faWarning } from '@fortawesome/free-solid-svg-icons' diff --git a/src/app/layout.tsx b/src/app/layout.tsx index 9b07688..e351ec3 100644 --- a/src/app/layout.tsx +++ b/src/app/layout.tsx @@ -1,9 +1,9 @@ 'use client' import { useCallback, useEffect, useRef, useState } from 'react' -import Sidebar from './componets/Sidebar' +import Sidebar from '@/componets/Sidebar' import './Globals.css' -import { DownloadProgress } from '../types/DownloadProgress' +import { DownloadProgress } from '@/types/DownloadProgress' import { invoke } from '@tauri-apps/api/core' import { FontAwesomeIcon } from '@fortawesome/react-fontawesome' import { @@ -23,22 +23,22 @@ import { readVersionsConfig, writeVersionsConfig } from '@/lib/BazookaManager' -import { VersionsConfig } from '../types/VersionsConfig' -import { NormalConfig } from '../types/NormalConfig' +import { VersionsConfig } from '@/types/VersionsConfig' +import { NormalConfig } from '@/types/NormalConfig' import { app } from '@tauri-apps/api' import axios from 'axios' import { openUrl } from '@tauri-apps/plugin-opener' import { GlobalProvider } from './GlobalProvider' import { Roboto } from 'next/font/google' -import { ServerVersionsResponse } from '../types/ServerVersionsResponse' -import { GameVersion } from '../types/GameVersion' -import { Game } from '../types/Game' +import { ServerVersionsResponse } from '@/types/ServerVersionsResponse' +import { GameVersion } from '@/types/GameVersion' +import { Game } from '@/types/Game' import { listen } from '@tauri-apps/api/event' import { usePathname } from 'next/navigation' import { arch, platform } from '@tauri-apps/plugin-os' -import VersionInfo from './componets/VersionInfo' +import VersionInfo from '@/componets/popups/VersionInfo' import prettyBytes from 'pretty-bytes' -import ProgressBar from './componets/ProgressBar' +import ProgressBar from '@/componets/ProgressBar' import { notifyUser } from '@/lib/Notifications' import { isPermissionGranted, diff --git a/src/app/settings/page.tsx b/src/app/settings/page.tsx index d14e5e0..f3a8136 100644 --- a/src/app/settings/page.tsx +++ b/src/app/settings/page.tsx @@ -1,9 +1,9 @@ 'use client' import { useEffect, useState } from 'react' -import { Setting } from '../componets/Setting' +import { Setting } from '@/componets/Setting' import { writeNormalConfig } from '@/lib/BazookaManager' -import { useGlobal } from '../GlobalProvider' +import { useGlobal } from '@/app/GlobalProvider' import { copyToClipboard } from '@/lib/Clipboard' import { platform } from '@tauri-apps/plugin-os' diff --git a/src/app/componets/ProgressBar.tsx b/src/componets/ProgressBar.tsx similarity index 100% rename from src/app/componets/ProgressBar.tsx rename to src/componets/ProgressBar.tsx diff --git a/src/app/componets/Setting.css b/src/componets/Setting.css similarity index 100% rename from src/app/componets/Setting.css rename to src/componets/Setting.css diff --git a/src/app/componets/Setting.tsx b/src/componets/Setting.tsx similarity index 92% rename from src/app/componets/Setting.tsx rename to src/componets/Setting.tsx index 5fe648b..b889348 100644 --- a/src/app/componets/Setting.tsx +++ b/src/componets/Setting.tsx @@ -1,7 +1,7 @@ import './Setting.css' import { FontAwesomeIcon } from '@fortawesome/react-fontawesome' import { faCheck } from '@fortawesome/free-solid-svg-icons' -import { SettingProps } from '../../types/SettingProps' +import { SettingProps } from '@/types/SettingProps' export function Setting ({ label, diff --git a/src/app/componets/Sidebar.css b/src/componets/Sidebar.css similarity index 100% rename from src/app/componets/Sidebar.css rename to src/componets/Sidebar.css diff --git a/src/app/componets/Sidebar.tsx b/src/componets/Sidebar.tsx similarity index 99% rename from src/app/componets/Sidebar.tsx rename to src/componets/Sidebar.tsx index ec2753b..ab2744a 100644 --- a/src/app/componets/Sidebar.tsx +++ b/src/componets/Sidebar.tsx @@ -13,7 +13,7 @@ import { } from '@fortawesome/free-solid-svg-icons' import { faDiscord } from '@fortawesome/free-brands-svg-icons' import { platform } from '@tauri-apps/plugin-os' -import { useGlobal } from '../GlobalProvider' +import { useGlobal } from '@/app/GlobalProvider' import Image from 'next/image' import Link from 'next/link' import { usePathname, useRouter, useSearchParams } from 'next/navigation' diff --git a/src/app/componets/VersionInfo.tsx b/src/componets/popups/VersionInfo.tsx similarity index 98% rename from src/app/componets/VersionInfo.tsx rename to src/componets/popups/VersionInfo.tsx index 540ee58..64bff30 100644 --- a/src/app/componets/VersionInfo.tsx +++ b/src/componets/popups/VersionInfo.tsx @@ -9,7 +9,7 @@ import { faWarning } from '@fortawesome/free-solid-svg-icons' import { FontAwesomeIcon } from '@fortawesome/react-fontawesome' -import { useGlobal } from '../GlobalProvider' +import { useGlobal } from '@/app/GlobalProvider' import { invoke } from '@tauri-apps/api/core' import { useEffect, useState } from 'react' import prettyBytes from 'pretty-bytes' diff --git a/src/types/LeaderboardEntry.ts b/src/types/LeaderboardEntry.ts deleted file mode 100644 index c464a57..0000000 --- a/src/types/LeaderboardEntry.ts +++ /dev/null @@ -1,10 +0,0 @@ -export interface LeaderboardEntry { - username: string - userid: bigint - value: bigint - icon: number - overlay: number - birdColor: number[] - overlayColor: number[] - customIcon: string | null -} diff --git a/src/types/LeaderboardResponse.ts b/src/types/LeaderboardResponse.ts deleted file mode 100644 index 81f3e74..0000000 --- a/src/types/LeaderboardResponse.ts +++ /dev/null @@ -1,6 +0,0 @@ -import { LeaderboardEntry } from './LeaderboardEntry' - -export interface LeaderboardResponse { - entries: LeaderboardEntry[] - customIcons: Record -}