Merge branch 'main' of http://git.sepehrdata.com/Saeed0920/inogen
This commit is contained in:
commit
082856170a
|
|
@ -62,12 +62,6 @@ export function DashboardHome() {
|
||||||
setLoading(true);
|
setLoading(true);
|
||||||
setError(null);
|
setError(null);
|
||||||
|
|
||||||
// First authenticate if needed
|
|
||||||
const token = localStorage.getItem("auth_token");
|
|
||||||
if (!token) {
|
|
||||||
await apiService.login("inogen_admin", "123456");
|
|
||||||
}
|
|
||||||
|
|
||||||
// Fetch top cards data
|
// Fetch top cards data
|
||||||
const topCardsResponse = await apiService.call({
|
const topCardsResponse = await apiService.call({
|
||||||
main_page_first_function: {
|
main_page_first_function: {
|
||||||
|
|
|
||||||
|
|
@ -6,7 +6,27 @@ import { cn, formatNumber } from "~/lib/utils"
|
||||||
const Progress = React.forwardRef<
|
const Progress = React.forwardRef<
|
||||||
React.ElementRef<typeof ProgressPrimitive.Root>,
|
React.ElementRef<typeof ProgressPrimitive.Root>,
|
||||||
React.ComponentPropsWithoutRef<typeof ProgressPrimitive.Root>
|
React.ComponentPropsWithoutRef<typeof ProgressPrimitive.Root>
|
||||||
>(({ className, value, ...props }, ref) => (
|
>(({ 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 (
|
||||||
<ProgressPrimitive.Root
|
<ProgressPrimitive.Root
|
||||||
ref={ref}
|
ref={ref}
|
||||||
className={cn(
|
className={cn(
|
||||||
|
|
@ -16,14 +36,16 @@ const Progress = React.forwardRef<
|
||||||
{...props}
|
{...props}
|
||||||
>
|
>
|
||||||
<span className="left-0 text-sm absolute z-10 px-2 text-[#5F6284]">۰%</span>
|
<span className="left-0 text-sm absolute z-10 px-2 text-[#5F6284]">۰%</span>
|
||||||
<span className="w-full right-0 text-sm absolute z-10 px-2 text-[#5F6284]"
|
<span className="w-full right-0 text-sm absolute z-10 px-2 text-[#5F6284]">
|
||||||
>{formatNumber(Math.ceil(value || 0 * 10) / 10)}%</span>
|
{formatNumber(displayValue.toFixed(2))}%
|
||||||
|
</span>
|
||||||
<ProgressPrimitive.Indicator
|
<ProgressPrimitive.Indicator
|
||||||
className="h-full w-full flex-1 bg-pr-green transition-all"
|
className="h-full w-full flex-1 bg-pr-green transition-all z-20"
|
||||||
style={{ transform: `translateX(-${15 - (value || 0)}%)` }}
|
style={{ transform: `translateX(-${100-scaledValue}%)` }}
|
||||||
/>
|
/>
|
||||||
</ProgressPrimitive.Root>
|
</ProgressPrimitive.Root>
|
||||||
))
|
)
|
||||||
|
})
|
||||||
Progress.displayName = ProgressPrimitive.Root.displayName
|
Progress.displayName = ProgressPrimitive.Root.displayName
|
||||||
|
|
||||||
export { Progress }
|
export { Progress }
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue
Block a user