Skip to content

Commit

Permalink
[Fix]: Timesheet-UI (#3203)
Browse files Browse the repository at this point in the history
* fix:timesheet-ui

* Update FrequencySelect.tsx

---------

Co-authored-by: Ruslan Konviser <[email protected]>
  • Loading branch information
Innocent-Akim and evereq authored Oct 30, 2024
1 parent 4c4508b commit 87e40f7
Show file tree
Hide file tree
Showing 5 changed files with 178 additions and 160 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import {
SelectItem,
SelectTrigger,
SelectValue,
} from "@components/ui/select"
} from "@components/ui/select";
import {
DropdownMenu,
DropdownMenuContent,
Expand All @@ -16,7 +16,7 @@ import {
DropdownMenuSubContent,
DropdownMenuSubTrigger,
DropdownMenuTrigger,
} from "@components/ui/dropdown-menu"
} from "@components/ui/dropdown-menu";
import { Button } from "lib/components/button";

export function FrequencySelect() {
Expand Down Expand Up @@ -44,16 +44,11 @@ export function FrequencySelect() {
);
}




export const FilterTaskActionMenu = () => {
// const handleCopyPaymentId = () => navigator.clipboard.writeText(idTasks);
return (
<DropdownMenu open={true} >
<DropdownMenuTrigger asChild>
<Button variant="ghost" className="h-8 w-8 p-0 text-sm sm:text-base">
{/* <span className="sr-only">Open menu</span> */}
<span>Today</span>
</Button>
</DropdownMenuTrigger>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
import { clsxm } from '@app/utils';
import { ArrowRightIcon } from 'assets/svg';
import { Button, Card } from 'lib/components';
import React, { ReactNode } from 'react'
import { ReactNode } from 'react';

interface ITimesheetCard {
title?: string;
Expand Down
9 changes: 7 additions & 2 deletions apps/web/app/[locale]/timesheet/page.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,9 @@ type ViewToggleButtonProps = {
icon: React.ReactNode;
onClick: () => void;
};
interface FooterTimeSheetProps {
fullWidth: boolean;
}

function TimeSheetPage() {
const t = useTranslations();
Expand Down Expand Up @@ -84,7 +87,7 @@ function TimeSheetPage() {
count={8}
title='Members Worked'
description='People worked since last time'
icon={<User2 className='text-[16px] font-bold' />}
icon={<User2 className='font-bold' />}
classNameIcon='bg-[#30B366] shadow-[#30b3678f]'
/>
</div>
Expand All @@ -107,6 +110,8 @@ function TimeSheetPage() {
<div className='flex items-center h-9 w-[700px] bg-white gap-x-2 px-2 border border-gray-200 rounded-sm mb-2'>
<GoSearch className='text-[#7E7991]' />
<input
role="searchbox"
aria-label="Search timesheet"
className="h-10 w-full bg-transparent focus:border-transparent focus:ring-2 focus:ring-transparent placeholder-gray-500 outline-none"
placeholder="Search.." />
</div>
Expand All @@ -132,7 +137,7 @@ function TimeSheetPage() {
export default withAuthentication(TimeSheetPage, { displayName: 'TimeSheet' });


const FooterTimeSheet = ({ fullWidth }: { fullWidth: boolean }) => {
const FooterTimeSheet: React.FC<FooterTimeSheetProps> = ({ fullWidth }) => {
return (
<div className="bg-white dark:bg-[#1e2025] w-screen z-[5000] fixed bottom-0">
<Divider />
Expand Down
Loading

0 comments on commit 87e40f7

Please sign in to comment.