diff --git a/app/components/dashboard/dashboard-home.tsx b/app/components/dashboard/dashboard-home.tsx index 900a8df..1402953 100644 --- a/app/components/dashboard/dashboard-home.tsx +++ b/app/components/dashboard/dashboard-home.tsx @@ -62,12 +62,6 @@ export function DashboardHome() { setLoading(true); setError(null); - // First authenticate if needed - const token = localStorage.getItem("auth_token"); - if (!token) { - await apiService.login("inogen_admin", "123456"); - } - // Fetch top cards data const topCardsResponse = await apiService.call({ main_page_first_function: { diff --git a/app/components/ui/progress.tsx b/app/components/ui/progress.tsx index 9a82b53..c4ef601 100644 --- a/app/components/ui/progress.tsx +++ b/app/components/ui/progress.tsx @@ -6,24 +6,46 @@ import { cn, formatNumber } from "~/lib/utils" const Progress = React.forwardRef< React.ElementRef, React.ComponentPropsWithoutRef ->(({ className, value, ...props }, ref) => ( - - ۰% - {formatNumber(Math.ceil(value || 0 * 10) / 10)}% - - -)) +>(({ className, value, ...props }, ref) => { + // Dynamic scaling logic based on value ranges + const getScaledValue = (inputValue: number) => { + const numValue = Number(inputValue); + if (numValue <= 1) { + return numValue * 100; + } + else if (numValue <= 10) { + return (numValue / 10) * 100; + } else if (numValue <= 50) { + return (numValue / 50) * 100; + } + else { + return numValue + } + }; + + const scaledValue = getScaledValue(Number(value) || 0); + const displayValue = Number(value) || 0; + + return ( + + ۰% + + {formatNumber(displayValue.toFixed(2))}% + + + + ) +}) Progress.displayName = ProgressPrimitive.Root.displayName export { Progress }