Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Feat]: Implement productivity table for app usage statistics #3606

Merged
merged 4 commits into from
Feb 11, 2025
Merged

[Feat]: Implement productivity table for app usage statistics #3606

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
bd0b8c8
feat: implement productivity table for app usage statistics
Innocent-Akim Feb 11, 2025
49e3809
feat: replace hardcoded dates with dynamic data.
Innocent-Akim Feb 11, 2025
c9a4369
feat: Add error handling for empty names in AvatarFallback.
Innocent-Akim Feb 11, 2025
51f9912
Improve data generation logic for more realistic scenarios.
Innocent-Akim Feb 11, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
219 changes: 105 additions & 114 deletions apps/web/app/[locale]/dashboard/app-url/[teamId]/page.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,133 +16,124 @@ import { useReportActivity } from '@/app/hooks/features/useReportActivity';
import { ProductivityStats } from '../components/ProductivityStats';
import { ProductivityChart } from '../components/ProductivityChart';
import { ProductivityHeader } from '../components/ProductivityHeader';
import { ProductivityTable } from '../components/ProductivityTable';

interface ProductivityData {
date: string;
productive: number;
neutral: number;
unproductive: number;
date: string;
productive: number;
neutral: number;
unproductive: number;
}

function AppUrls() {
const { isTrackingEnabled } = useOrganizationTeams();
const { updateDateRange, updateFilters, isManage } = useReportActivity();
const { isTrackingEnabled } = useOrganizationTeams();
const { updateDateRange, updateFilters, isManage } = useReportActivity();

// eslint-disable-next-line @typescript-eslint/no-unused-vars
const [groupBy, setGroupBy] = useState<string>('date');
// eslint-disable-next-line @typescript-eslint/no-unused-vars
const [groupBy, setGroupBy] = useState<string>('date');

const router = useRouter();
const t = useTranslations();
const fullWidth = useAtomValue(fullWidthState);
const paramsUrl = useParams<{ locale: string }>();
const currentLocale = paramsUrl?.locale;
const router = useRouter();
const t = useTranslations();
const fullWidth = useAtomValue(fullWidthState);
const paramsUrl = useParams<{ locale: string }>();
const currentLocale = paramsUrl?.locale;

const monthData: ProductivityData[] = [
{ date: '2024-10-01', productive: 70, neutral: 20, unproductive: 10 },
{ date: '2024-10-02', productive: 75, neutral: 15, unproductive: 10 },
{ date: '2024-10-03', productive: 80, neutral: 15, unproductive: 5 },
{ date: '2024-10-04', productive: 85, neutral: 10, unproductive: 5 },
{ date: '2024-10-05', productive: 75, neutral: 20, unproductive: 5 },
{ date: '2024-10-06', productive: 65, neutral: 25, unproductive: 10 },
{ date: '2024-10-07', productive: 90, neutral: 5, unproductive: 5 },
{ date: '2024-10-08', productive: 85, neutral: 10, unproductive: 5 },
{ date: '2024-10-09', productive: 80, neutral: 15, unproductive: 5 },
{ date: '2024-10-10', productive: 70, neutral: 20, unproductive: 10 },
{ date: '2024-10-11', productive: 60, neutral: 30, unproductive: 10 },
{ date: '2024-10-12', productive: 75, neutral: 15, unproductive: 10 },
{ date: '2024-10-13', productive: 85, neutral: 10, unproductive: 5 },
{ date: '2024-10-14', productive: 80, neutral: 15, unproductive: 5 },
{ date: '2024-10-15', productive: 75, neutral: 20, unproductive: 5 },
{ date: '2024-10-16', productive: 70, neutral: 20, unproductive: 10 },
{ date: '2024-10-17', productive: 65, neutral: 25, unproductive: 10 },
{ date: '2024-10-18', productive: 85, neutral: 10, unproductive: 5 },
{ date: '2024-10-19', productive: 80, neutral: 15, unproductive: 5 },
{ date: '2024-10-20', productive: 90, neutral: 5, unproductive: 5 },
{ date: '2024-10-21', productive: 85, neutral: 10, unproductive: 5 },
{ date: '2024-10-22', productive: 80, neutral: 15, unproductive: 5 },
{ date: '2024-10-23', productive: 75, neutral: 20, unproductive: 5 },
{ date: '2024-10-24', productive: 70, neutral: 20, unproductive: 10 },
{ date: '2024-10-25', productive: 85, neutral: 10, unproductive: 5 },
{ date: '2024-10-26', productive: 80, neutral: 15, unproductive: 5 },
{ date: '2024-10-27', productive: 75, neutral: 20, unproductive: 5 },
{ date: '2024-10-28', productive: 70, neutral: 20, unproductive: 10 },
{ date: '2024-10-29', productive: 90, neutral: 5, unproductive: 5 },
{ date: '2024-10-30', productive: 85, neutral: 10, unproductive: 5 }
];

const monthTotals = monthData.reduce(
(acc, day) => ({
productive: acc.productive + day.productive,
neutral: acc.neutral + day.neutral,
unproductive: acc.unproductive + day.unproductive
}),
{ productive: 0, neutral: 0, unproductive: 0 }
);

const totalTime = monthTotals.productive + monthTotals.neutral + monthTotals.unproductive;
const productivePercentage = Math.round((monthTotals.productive / totalTime) * 100);
const neutralPercentage = Math.round((monthTotals.neutral / totalTime) * 100);
const unproductivePercentage = Math.round((monthTotals.unproductive / totalTime) * 100);
const generateMonthData = (date: Date): ProductivityData[] => {
const year = date.getFullYear();
const month = date.getMonth();
const daysInMonth = new Date(year, month + 1, 0).getDate();

const breadcrumbPath = useMemo(
() => [
{ title: JSON.parse(t('pages.home.BREADCRUMB')), href: '/' },
{ title: 'Apps & URLs', href: `/${currentLocale}/dashboard/app-url` }
],
[currentLocale, t]
);
console.log("=====>",groupBy)
return Array.from({ length: daysInMonth }, (_, i) => ({
date: new Date(year, month, i + 1).toISOString().split('T')[0],
productive: Math.floor(Math.random() * 30) + 60,
neutral: Math.floor(Math.random() * 20) + 10,
unproductive: Math.floor(Math.random() * 10) + 5,
}));
};
const monthData = generateMonthData(new Date());

return (
<MainLayout
className="items-start pb-1 !overflow-hidden w-full"
childrenClassName="w-full"
showTimer={isTrackingEnabled}
mainHeaderSlot={
<div className="flex flex-col pb-4 bg-gray-100 dark:bg-dark--theme">
<Container fullWidth={fullWidth} className={cn('flex flex-col gap-4 items-center w-full')}>
<div className="flex items-center pt-6 w-full">
<button
onClick={() => router.back()}
className="p-1 rounded-full transition-colors hover:bg-gray-100"
>
<ArrowLeftIcon className="text-dark dark:text-[#6b7280] h-6 w-6" />
</button>
<Breadcrumb paths={breadcrumbPath} className="text-sm" />
</div>
<div className="flex flex-col gap-6 w-full">
<DashboardHeader
onUpdateDateRange={updateDateRange}
onUpdateFilters={updateFilters}
title="Apps & URLs Dashboard"
isManage={isManage}
showGroupBy={true}
onGroupByChange={setGroupBy}
/>
<Card shadow="bigger" className="bg-white rounded-xl border border-gray-100 dark:border-gray-700 dark:bg-dark--theme-light h-[403px] p-8 py-0 px-0">
<div className="flex flex-col gap-6 w-full">
<div className="flex justify-between items-center h-[105px] w-full border-b border-b-gray-200 dark:border-b-gray-700">
<ProductivityHeader month="October" year={2024} />
<ProductivityStats
productivePercentage={productivePercentage}
neutralPercentage={neutralPercentage}
unproductivePercentage={unproductivePercentage}
/>
</div>
<div className="flex flex-col px-8 w-full">
<ProductivityChart data={monthData} />
</div>
</div>
</Card>
</div>
</Container>
</div>
}
/>
);
const monthTotals = monthData.reduce(
(acc, day) => ({
productive: acc.productive + day.productive,
neutral: acc.neutral + day.neutral,
unproductive: acc.unproductive + day.unproductive
}),
{ productive: 0, neutral: 0, unproductive: 0 }
);

const totalTime = monthTotals.productive + monthTotals.neutral + monthTotals.unproductive;
const productivePercentage = Math.round((monthTotals.productive / totalTime) * 100);
const neutralPercentage = Math.round((monthTotals.neutral / totalTime) * 100);
const unproductivePercentage = Math.round((monthTotals.unproductive / totalTime) * 100);

const breadcrumbPath = useMemo(
() => [
{ title: JSON.parse(t('pages.home.BREADCRUMB')), href: '/' },
{ title: 'Apps & URLs', href: `/${currentLocale}/dashboard/app-url` }
],
[currentLocale, t]
);
console.log('=====>', groupBy);

return (
<MainLayout
className="items-start pb-1 !overflow-hidden w-full"
childrenClassName="w-full"
showTimer={isTrackingEnabled}
mainHeaderSlot={
<div className="flex flex-col pb-4 bg-gray-100 dark:bg-dark--theme">
<Container fullWidth={fullWidth} className={cn('flex flex-col gap-4 items-center w-full')}>
<div className="flex items-center pt-6 w-full">
<button
onClick={() => router.back()}
className="p-1 rounded-full transition-colors hover:bg-gray-100"
>
<ArrowLeftIcon className="text-dark dark:text-[#6b7280] h-6 w-6" />
</button>
<Breadcrumb paths={breadcrumbPath} className="text-sm" />
</div>
<div className="flex flex-col gap-6 w-full">
<DashboardHeader
onUpdateDateRange={updateDateRange}
onUpdateFilters={updateFilters}
title="Apps & URLs Dashboard"
isManage={isManage}
showGroupBy={true}
onGroupByChange={setGroupBy}
/>
<Card
shadow="bigger"
className="bg-white rounded-xl border border-gray-100 dark:border-gray-700 dark:bg-dark--theme-light h-[403px] p-8 py-0 px-0"
>
<div className="flex flex-col gap-6 w-full">
<div className="flex justify-between items-center h-[105px] w-full border-b border-b-gray-200 dark:border-b-gray-700">
<ProductivityHeader month="October" year={2024} />
<ProductivityStats
productivePercentage={productivePercentage}
neutralPercentage={neutralPercentage}
unproductivePercentage={unproductivePercentage}
/>
</div>
<div className="flex flex-col px-8 w-full">
<ProductivityChart data={monthData} />
</div>
</div>
</Card>
</div>
</Container>
</div>
}
>
<Container fullWidth={fullWidth} className={cn('flex flex-col gap-8 !px-4 py-6 w-full')}>
<ProductivityTable />
</Container>
</MainLayout>
);
}

export default withAuthentication(AppUrls, {
displayName: 'Apps & URLs',
showPageSkeleton: true
displayName: 'Apps & URLs',
showPageSkeleton: true
});
58 changes: 37 additions & 21 deletions apps/web/app/[locale]/dashboard/app-url/components/ProductivityChart.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,29 +12,45 @@ interface ProductivityChartProps {
}

export const ProductivityChart: React.FC<ProductivityChartProps> = ({ data }) => {
const getDateNumber = (dateString: string) => {
return new Date(dateString).getDate();
};

return (
<div className="flex gap-[2px] h-[220px] w-full justify-between">
{data.map((day) => (
<div
key={day.date}
className="flex relative flex-col flex-1 justify-end cursor-pointer group"
>
<div className="flex overflow-hidden absolute inset-0 flex-col justify-end">
<div
style={{ height: `${day.productive}%` }}
className="w-full bg-[#1554E0] rounded-t-lg group-hover:opacity-80 transition-opacity duration-200"
></div>
<div
style={{ height: `${day.unproductive}%` }}
className="w-full bg-[#F56D58] group-hover:opacity-80 transition-opacity duration-200"
></div>
<div
style={{ height: `${day.neutral}%` }}
className="w-full bg-[#F5B458] group-hover:opacity-80 transition-opacity duration-200"
></div>
<div className="flex flex-col gap-2">
<div className="flex gap-[2px] h-[220px] w-full justify-between">
{data.map((day) => (
<div
key={day.date}
className="flex relative flex-col flex-1 justify-end cursor-pointer group"
>
<div className="flex overflow-hidden absolute inset-0 flex-col justify-end">
<div
style={{ height: `${day.productive}%` }}
className="w-full bg-[#1554E0] rounded-t-lg group-hover:opacity-80 transition-opacity duration-200"
></div>
<div
style={{ height: `${day.unproductive}%` }}
className="w-full bg-[#F56D58] group-hover:opacity-80 transition-opacity duration-200"
></div>
<div
style={{ height: `${day.neutral}%` }}
className="w-full bg-[#F5B458] group-hover:opacity-80 transition-opacity duration-200"
></div>
</div>
</div>
))}
</div>
<div className="flex gap-[2px] w-full justify-between px-1">
{data.map((day) => (
<div
key={`label-${day.date}`}
className="flex-1 text-xs text-center text-gray-500"
>
{getDateNumber(day.date)}
</div>
</div>
))}
))}
</div>
</div>
);
};
2 changes: 1 addition & 1 deletion apps/web/app/[locale]/dashboard/app-url/components/ProductivityHeader.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ interface ProductivityHeaderProps {
export const ProductivityHeader: React.FC<ProductivityHeaderProps> = ({ month, year }) => {
return (
<div className="flex flex-col">
<h2 className="text-xl font-semibold">{`${month} ${year}`}</h2>
<h2 className="text-xl font-bold">{`${month} ${year}`}</h2>
<p className="text-gray-500">{`Productivity breakdown for ${month}`}</p>
</div>
);
Expand Down
Loading