diff --git a/README.md b/README.md index 2f95d61d..801e206c 100644 --- a/README.md +++ b/README.md @@ -65,6 +65,7 @@ Whether you prefer the **CLI**, **Web Frontend**, or **Flutter Mobile App**, CCS +

diff --git a/assets/01_backend_docs.png b/assets/01_backend_docs.png new file mode 100644 index 00000000..4179bb4b Binary files /dev/null and b/assets/01_backend_docs.png differ diff --git a/assets/01_home.png b/assets/01_home.png index 2bfa970d..8b8768e3 100644 Binary files a/assets/01_home.png and b/assets/01_home.png differ diff --git a/assets/01_home_mobile.png b/assets/01_home_mobile.png index 46489abe..c83354a9 100644 Binary files a/assets/01_home_mobile.png and b/assets/01_home_mobile.png differ diff --git a/assets/02_home.png b/assets/02_home.png index e543be4f..17acad4e 100644 Binary files a/assets/02_home.png and b/assets/02_home.png differ diff --git a/assets/02_home_mobile.png b/assets/02_home_mobile.png index d46ad2a0..4f2b9ee0 100644 Binary files a/assets/02_home_mobile.png and b/assets/02_home_mobile.png differ diff --git a/assets/03_home.png b/assets/03_home.png index f0f28d7d..bd0c0988 100644 Binary files a/assets/03_home.png and b/assets/03_home.png differ diff --git a/assets/03_home_mobile.png b/assets/03_home_mobile.png index 6ba4eb0e..669af94b 100644 Binary files a/assets/03_home_mobile.png and b/assets/03_home_mobile.png differ diff --git a/assets/04_home.png b/assets/04_home.png index c7515f6a..2fd92211 100644 Binary files a/assets/04_home.png and b/assets/04_home.png differ diff --git a/assets/04_home_mobile.png b/assets/04_home_mobile.png index bf764512..7a9b42d5 100644 Binary files a/assets/04_home_mobile.png and b/assets/04_home_mobile.png differ diff --git a/frontend/src/components/HomeComponents/BottomBar/BottomBar.tsx b/frontend/src/components/HomeComponents/BottomBar/BottomBar.tsx index 70a04ab6..78fab316 100644 --- a/frontend/src/components/HomeComponents/BottomBar/BottomBar.tsx +++ b/frontend/src/components/HomeComponents/BottomBar/BottomBar.tsx @@ -54,9 +54,8 @@ const BottomBar: React.FC = ({ {/* Filters */} - diff --git a/frontend/src/components/HomeComponents/Footer/Footer.tsx b/frontend/src/components/HomeComponents/Footer/Footer.tsx index 5a65e7ac..4ece8790 100644 --- a/frontend/src/components/HomeComponents/Footer/Footer.tsx +++ b/frontend/src/components/HomeComponents/Footer/Footer.tsx @@ -90,7 +90,7 @@ export const Footer = () => {

- © 2024{' '} + © 2025{' '} - + Export Tasks diff --git a/frontend/src/components/HomeComponents/Tasks/Tasks.tsx b/frontend/src/components/HomeComponents/Tasks/Tasks.tsx index 689aa10a..34b758e9 100644 --- a/frontend/src/components/HomeComponents/Tasks/Tasks.tsx +++ b/frontend/src/components/HomeComponents/Tasks/Tasks.tsx @@ -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) => { @@ -450,6 +457,23 @@ export const Tasks = ( + {/* Mobile-only Sync button (desktop already shows a Sync button with filters) */} + {showReports ? ( @@ -686,13 +710,12 @@ export const Tasks = ( - - {getTimeSinceLastSync(lastSyncTime)} - - + + {getTimeSinceLastSync(lastSyncTime)} +

@@ -1280,12 +1303,12 @@ export const Tasks = ( 'Sync' )} - - {getTimeSinceLastSync(lastSyncTime)} - + + {getTimeSinceLastSync(lastSyncTime)} +
Add a new task or sync tasks from taskwarrior to view tasks.
diff --git a/frontend/src/components/LandingComponents/Footer/Footer.tsx b/frontend/src/components/LandingComponents/Footer/Footer.tsx index 80696fa1..62e7213a 100644 --- a/frontend/src/components/LandingComponents/Footer/Footer.tsx +++ b/frontend/src/components/LandingComponents/Footer/Footer.tsx @@ -88,7 +88,7 @@ export const Footer = () => {

- © 2024{' '} + © 2025{' '}