Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
14 changes: 8 additions & 6 deletions frontend/src/components/HomeComponents/Tasks/ReportChart.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -39,33 +39,35 @@ export const ReportChart: React.FC<ReportChartProps> = ({
return (
<div
id={chartId}
className="flex-1 min-w-[300px] p-4 bg-[#1c1c1c] rounded-lg h-[350px] relative"
className="flex-1 min-w-[300px] p-4 border border[1px] bg-black/15 dark:bg-[#1c1c1c] rounded-lg h-[350px] relative"
>
<div className="flex justify-between items-center mb-4">
<h3 className="text-center text-xl text-white flex-1">{title}</h3>
<h3 className="text-center text-xl text-black dark:text-white flex-1">
{title}
</h3>
<div className="flex gap-2">
<Button
variant="ghost"
size="icon"
onClick={handleCSVExport}
disabled={isExporting}
title="Download as CSV"
className="h-8 w-8 hover:bg-gray-700"
className="h-8 w-8 hover:bg-transparent dark:hover:bg-gray-700"
>
<FileText className="h-4 w-4 text-gray-400 hover:text-white" />
<FileText className="h-4 w-4 text-black dark:text-gray-400 dark:hover:text-white m-1" />
</Button>
<Button
variant="ghost"
size="icon"
onClick={handlePNGExport}
disabled={isExporting}
title="Download as PNG"
className="h-8 w-8 hover:bg-gray-700"
className="h-8 w-8 hover:bg-transparent dark:hover:bg-gray-700"
>
{isExporting ? (
<Loader2 className="h-4 w-4 animate-spin text-gray-400" />
) : (
<Image className="h-4 w-4 text-gray-400 hover:text-white" />
<Image className="h-4 w-4 text-black dark:text-gray-400 dark:hover:text-white" />
)}
</Button>
</div>
Expand Down
9 changes: 6 additions & 3 deletions frontend/src/components/HomeComponents/Tasks/Tasks.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -1163,6 +1163,7 @@ export const Tasks = (
</div>
<DialogFooter>
<Button
className="dark:bg-white/5 bg-black hover:bg-black text-white"
variant="secondary"
onClick={() => setIsAddTaskOpen(false)}
>
Expand Down Expand Up @@ -1274,7 +1275,7 @@ export const Tasks = (
task.status === 'pending' &&
isOverdue(task.due)
? 'bg-red-600/80 text-white'
: ''
: 'dark:text-white text-black'
}`}
>
{task.id}
Expand Down Expand Up @@ -2405,7 +2406,9 @@ export const Tasks = (
</Dialog>
) : null}
<DialogClose asChild>
<Button className="bg-white">Close</Button>
<Button className="dark:bg-white bg-black ">
Close
</Button>
</DialogClose>
</DialogFooter>
</DialogContent>
Expand Down Expand Up @@ -2437,7 +2440,7 @@ export const Tasks = (
onChange={(e) =>
handleTasksPerPageChange(parseInt(e.target.value, 10))
}
className="border rounded-md px-2 py-1 bg-black text-white h-10 text-sm"
className="border border[1px] rounded-md px-2 py-1 bg-white dark:bg-black text-black dark:text-white h-10 text-sm"
>
<option value="5">5</option>
<option value="10">10</option>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,26 +3,26 @@
exports[`ReportChart Component using Snapshot renders correctly with one data entry: one data entry 1`] = `
<DocumentFragment>
<div
class="flex-1 min-w-[300px] p-4 bg-[#1c1c1c] rounded-lg h-[350px] relative"
class="flex-1 min-w-[300px] p-4 border border[1px] bg-black/15 dark:bg-[#1c1c1c] rounded-lg h-[350px] relative"
id="chart-1"
>
<div
class="flex justify-between items-center mb-4"
>
<h3
class="text-center text-xl text-white flex-1"
class="text-center text-xl text-black dark:text-white flex-1"
>
One project
</h3>
<div
class="flex gap-2"
>
<button
class="inline-flex items-center justify-center whitespace-nowrap rounded-md text-sm font-medium ring-offset-background transition-colors focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-2 disabled:pointer-events-none disabled:opacity-50 hover:text-accent-foreground h-8 w-8 hover:bg-gray-700"
class="inline-flex items-center justify-center whitespace-nowrap rounded-md text-sm font-medium ring-offset-background transition-colors focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-2 disabled:pointer-events-none disabled:opacity-50 hover:text-accent-foreground h-8 w-8 hover:bg-transparent dark:hover:bg-gray-700"
title="Download as CSV"
>
<svg
class="lucide lucide-file-text h-4 w-4 text-gray-400 hover:text-white"
class="lucide lucide-file-text h-4 w-4 text-black dark:text-gray-400 dark:hover:text-white m-1"
fill="none"
height="24"
stroke="currentColor"
Expand Down Expand Up @@ -60,11 +60,11 @@ exports[`ReportChart Component using Snapshot renders correctly with one data en
</svg>
</button>
<button
class="inline-flex items-center justify-center whitespace-nowrap rounded-md text-sm font-medium ring-offset-background transition-colors focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-2 disabled:pointer-events-none disabled:opacity-50 hover:text-accent-foreground h-8 w-8 hover:bg-gray-700"
class="inline-flex items-center justify-center whitespace-nowrap rounded-md text-sm font-medium ring-offset-background transition-colors focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-2 disabled:pointer-events-none disabled:opacity-50 hover:text-accent-foreground h-8 w-8 hover:bg-transparent dark:hover:bg-gray-700"
title="Download as PNG"
>
<svg
class="lucide lucide-image h-4 w-4 text-gray-400 hover:text-white"
class="lucide lucide-image h-4 w-4 text-black dark:text-gray-400 dark:hover:text-white"
fill="none"
height="24"
stroke="currentColor"
Expand Down Expand Up @@ -137,26 +137,26 @@ exports[`ReportChart Component using Snapshot renders correctly with one data en
exports[`ReportChart Component using Snapshot renders correctly with several data entries: several data entries 1`] = `
<DocumentFragment>
<div
class="flex-1 min-w-[300px] p-4 bg-[#1c1c1c] rounded-lg h-[350px] relative"
class="flex-1 min-w-[300px] p-4 border border[1px] bg-black/15 dark:bg-[#1c1c1c] rounded-lg h-[350px] relative"
id="chart-2"
>
<div
class="flex justify-between items-center mb-4"
>
<h3
class="text-center text-xl text-white flex-1"
class="text-center text-xl text-black dark:text-white flex-1"
>
Multiple projects
</h3>
<div
class="flex gap-2"
>
<button
class="inline-flex items-center justify-center whitespace-nowrap rounded-md text-sm font-medium ring-offset-background transition-colors focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-2 disabled:pointer-events-none disabled:opacity-50 hover:text-accent-foreground h-8 w-8 hover:bg-gray-700"
class="inline-flex items-center justify-center whitespace-nowrap rounded-md text-sm font-medium ring-offset-background transition-colors focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-2 disabled:pointer-events-none disabled:opacity-50 hover:text-accent-foreground h-8 w-8 hover:bg-transparent dark:hover:bg-gray-700"
title="Download as CSV"
>
<svg
class="lucide lucide-file-text h-4 w-4 text-gray-400 hover:text-white"
class="lucide lucide-file-text h-4 w-4 text-black dark:text-gray-400 dark:hover:text-white m-1"
fill="none"
height="24"
stroke="currentColor"
Expand Down Expand Up @@ -194,11 +194,11 @@ exports[`ReportChart Component using Snapshot renders correctly with several dat
</svg>
</button>
<button
class="inline-flex items-center justify-center whitespace-nowrap rounded-md text-sm font-medium ring-offset-background transition-colors focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-2 disabled:pointer-events-none disabled:opacity-50 hover:text-accent-foreground h-8 w-8 hover:bg-gray-700"
class="inline-flex items-center justify-center whitespace-nowrap rounded-md text-sm font-medium ring-offset-background transition-colors focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-2 disabled:pointer-events-none disabled:opacity-50 hover:text-accent-foreground h-8 w-8 hover:bg-transparent dark:hover:bg-gray-700"
title="Download as PNG"
>
<svg
class="lucide lucide-image h-4 w-4 text-gray-400 hover:text-white"
class="lucide lucide-image h-4 w-4 text-black dark:text-gray-400 dark:hover:text-white"
fill="none"
height="24"
stroke="currentColor"
Expand Down
Loading
Loading