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
1 change: 1 addition & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,7 @@ Whether you prefer the **CLI**, **Web Frontend**, or **Flutter Mobile App**, CCS
<img src="./assets/02_home.png">
<img src="./assets/03_home.png">
<img src="./assets/04_home.png">
<img src="./assets/01_backend_docs.png">
<p align="center">
<table align="center">
<tr>
Expand Down
Binary file added assets/01_backend_docs.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified assets/01_home.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified assets/01_home_mobile.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified assets/02_home.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified assets/02_home_mobile.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified assets/03_home.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified assets/03_home_mobile.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified assets/04_home.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified assets/04_home_mobile.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
Expand Up @@ -54,9 +54,8 @@ const BottomBar: React.FC<BottomBarProps> = ({
{/* Filters */}
<Popover>
<PopoverTrigger asChild>
<Button variant="ghost" className="w-auto px-3">
<Button variant="ghost" className="w-auto px-3" aria-label="Filter">
<Icons.Filter className="h-4 w-4 mr-2" />
Filter
</Button>
</PopoverTrigger>
<PopoverContent className="w-auto p-4 flex flex-col gap-4 bg-background border shadow-lg rounded-lg">
Expand Down
2 changes: 1 addition & 1 deletion frontend/src/components/HomeComponents/Footer/Footer.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ export const Footer = () => {

<section className="container pb-14 text-center">
<h3>
&copy; 2024{' '}
&copy; 2025{' '}
<a
rel="noreferrer noopener"
target="_blank"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@ export const NavbarMobile = (
variant: 'secondary',
})}`}
>
<FileDown className="mr-2 w-5 h-5" />
<FileDown />
Export Tasks
</div>
</DialogTrigger>
Expand Down
41 changes: 32 additions & 9 deletions frontend/src/components/HomeComponents/Tasks/Tasks.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -305,13 +305,20 @@ export const Tasks = (
const handleIdSort = () => {
const newOrder = idSortOrder === 'asc' ? 'desc' : 'asc';
setIdSortOrder(newOrder);
setTasks(sortTasksById([...tasks], newOrder));
const sorted = sortTasksById([...tasks], newOrder);
setTasks(sorted);
setTempTasks(sorted);
setCurrentPage(1);
};

const handleSort = () => {
const newOrder = sortOrder === 'asc' ? 'desc' : 'asc';
setSortOrder(newOrder);
setTasks(sortTasks([...tasks], newOrder));
const sorted = sortTasks([...tasks], newOrder);
// Keep both states in sync so the table (which renders from tempTasks) reflects the new order
setTasks(sorted);
setTempTasks(sorted);
setCurrentPage(1);
};

const handleEditClick = (description: string) => {
Expand Down Expand Up @@ -450,6 +457,23 @@ export const Tasks = (
<Button variant="outline" onClick={() => setShowReports(!showReports)}>
{showReports ? 'Show Tasks' : 'Show Reports'}
</Button>
{/* Mobile-only Sync button (desktop already shows a Sync button with filters) */}
<Button
className="sm:hidden ml-2"
variant="outline"
onClick={async () => {
props.setIsLoading(true);
await syncTasksWithTwAndDb();
props.setIsLoading(false);
}}
disabled={props.isLoading}
>
{props.isLoading ? (
<Loader2 className="mx-1 size-5 animate-spin" />
) : (
'Sync'
)}
</Button>
</div>
{showReports ? (
<ReportsView tasks={tasks} />
Expand Down Expand Up @@ -686,13 +710,12 @@ export const Tasks = (
<Button variant="outline" onClick={syncTasksWithTwAndDb}>
Sync
</Button>
<span className="text-xs text-muted-foreground">
{getTimeSinceLastSync(lastSyncTime)}
</span>
</div>
</div>
</div>

<span className="text-xs text-muted-foreground ml-4">
{getTimeSinceLastSync(lastSyncTime)}
</span>
<div className="overflow-x-auto">
<Table className="w-full text-white">
<TableHeader>
Expand Down Expand Up @@ -1280,12 +1303,12 @@ export const Tasks = (
'Sync'
)}
</Button>
<span className="text-xs text-muted-foreground">
{getTimeSinceLastSync(lastSyncTime)}
</span>
</div>
</div>
</div>
<span className="text-xs text-muted-foreground ml-4">
{getTimeSinceLastSync(lastSyncTime)}
</span>
<div className="text-l ml-5 text-muted-foreground mt-5 mb-5">
Add a new task or sync tasks from taskwarrior to view tasks.
</div>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ export const Footer = () => {

<section className="container pb-14 text-center">
<h3>
&copy; 2024{' '}
&copy; 2025{' '}
<a
rel="noreferrer noopener"
target="_blank"
Expand Down
2 changes: 1 addition & 1 deletion frontend/tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
"noUnusedLocals": true,
"noUnusedParameters": true,
"noFallthroughCasesInSwitch": true,

"ignoreDeprecations": "6.0",
"baseUrl": ".",
"paths": {
"@/*": ["./src/*"]
Expand Down
Loading