From 2604dec0f4df295b154482bf488aff49ec3e37ca Mon Sep 17 00:00:00 2001 From: Lncvrt Date: Sat, 19 Jul 2025 16:15:35 -0700 Subject: [PATCH] Disable download button when downloading --- src/Globals.css | 7 ++----- src/main.tsx | 3 ++- src/routes/Installs.tsx | 3 ++- src/types/DownloadProgress.ts | 6 +++--- src/types/InstallsProps.ts | 6 ++++-- src/types/LauncherVersion.ts | 10 +++++----- src/types/SidebarProps.ts | 4 ++-- 7 files changed, 20 insertions(+), 19 deletions(-) diff --git a/src/Globals.css b/src/Globals.css index 0510f93..c7c05be 100644 --- a/src/Globals.css +++ b/src/Globals.css @@ -7,7 +7,7 @@ body { } .button { - @apply bg-[#0a6ec8] hover:bg-[#1361ad] rounded-md cursor-pointer text-[16px] py-1.5 px-3 transition-colors duration-[0.25s]; + @apply bg-[#0a6ec8] hover:bg-[#1361ad] disabled:bg-[#124c7e] disabled:hover:bg-[#1b3f63] disabled:text-[#bdbdbd] disabled:hover:text-[#e6e6e6] rounded-md cursor-pointer text-[16px] py-1.5 px-3 transition-colors duration-[0.25s]; } ::-webkit-scrollbar { @@ -19,9 +19,6 @@ body { } ::-webkit-scrollbar-thumb { - @apply bg-[#555] w-1 rounded-lg; + @apply bg-[#555] w-1 rounded-lg active:bg-[#888]; } -::-webkit-scrollbar-thumb:active { - @apply bg-[#888]; -} diff --git a/src/main.tsx b/src/main.tsx index 5cd5f3c..4717ff2 100644 --- a/src/main.tsx +++ b/src/main.tsx @@ -16,6 +16,7 @@ function App () { ...prev, ...versions.map(v => new DownloadProgress(v, 0, false)) ]) + return; } @@ -33,7 +34,7 @@ function App () { function renderContent () { if (hash === '#installs') { - return + return } else if (hash === '#settings') { return } diff --git a/src/routes/Installs.tsx b/src/routes/Installs.tsx index b552e87..5a505d2 100644 --- a/src/routes/Installs.tsx +++ b/src/routes/Installs.tsx @@ -6,7 +6,7 @@ import { LauncherVersion } from '../types/LauncherVersion' import axios from 'axios' import { InstallsProps } from '../types/InstallsProps' -export default function Installs({ downloadVersions }: InstallsProps) { +export default function Installs({ downloadVersions, downloadProgress }: InstallsProps) { const [showPopup, setShowPopup] = useState(false) const [fadeOut, setFadeOut] = useState(false) const [versionList, setVersionList] = useState(null); @@ -39,6 +39,7 @@ export default function Installs({ downloadVersions }: InstallsProps) { diff --git a/src/types/DownloadProgress.ts b/src/types/DownloadProgress.ts index 4eb6c96..5bbe87f 100644 --- a/src/types/DownloadProgress.ts +++ b/src/types/DownloadProgress.ts @@ -1,9 +1,9 @@ -import { LauncherVersion } from "./LauncherVersion"; +import { LauncherVersion } from './LauncherVersion' export class DownloadProgress { - constructor( + constructor ( public version: LauncherVersion, public progress: number, public done: boolean ) {} -} \ No newline at end of file +} diff --git a/src/types/InstallsProps.ts b/src/types/InstallsProps.ts index 564f375..53aed51 100644 --- a/src/types/InstallsProps.ts +++ b/src/types/InstallsProps.ts @@ -1,5 +1,7 @@ -import { LauncherVersion } from "./LauncherVersion" +import { DownloadProgress } from './DownloadProgress' +import { LauncherVersion } from './LauncherVersion' export type InstallsProps = { downloadVersions: (versions: LauncherVersion[]) => void -} \ No newline at end of file + downloadProgress: DownloadProgress[] +} diff --git a/src/types/LauncherVersion.ts b/src/types/LauncherVersion.ts index 083b335..3a6aefa 100644 --- a/src/types/LauncherVersion.ts +++ b/src/types/LauncherVersion.ts @@ -1,6 +1,6 @@ export interface LauncherVersion { - version: string, - displayName: string, - platforms: string[], - downloadUrls: string[] -} \ No newline at end of file + version: string + displayName: string + platforms: string[] + downloadUrls: string[] +} diff --git a/src/types/SidebarProps.ts b/src/types/SidebarProps.ts index 567eba4..810cbb5 100644 --- a/src/types/SidebarProps.ts +++ b/src/types/SidebarProps.ts @@ -1,5 +1,5 @@ -import { DownloadProgress } from "./DownloadProgress" +import { DownloadProgress } from './DownloadProgress' export type SidebarProps = { downloadProgress: DownloadProgress[] -} \ No newline at end of file +}