From 5406e6b8ec631764f0b534a41ee1098ecaeac58e Mon Sep 17 00:00:00 2001
From: jude <judesouthworth@pm.me>
Date: Thu, 11 Apr 2024 15:26:24 +0100
Subject: [PATCH] Show all channels and filter todos accordingly

---
 .../src/components/Guild/GuildTodos.tsx       | 41 +++++++------------
 1 file changed, 15 insertions(+), 26 deletions(-)

diff --git a/reminder-dashboard/src/components/Guild/GuildTodos.tsx b/reminder-dashboard/src/components/Guild/GuildTodos.tsx
index 4e9ff8f..8eb9b77 100644
--- a/reminder-dashboard/src/components/Guild/GuildTodos.tsx
+++ b/reminder-dashboard/src/components/Guild/GuildTodos.tsx
@@ -15,10 +15,7 @@ export const GuildTodos = () => {
         return <Loader />;
     }
 
-    const sortedTodos = guildTodos
-        .sort((a, b) => (a.id > b.id ? -1 : 1))
-        .sort((a, b) => (a.channel_id === b.channel_id ? 0 : a.channel_id > b.channel_id ? -1 : 1));
-    let prevChannel: string;
+    const sortedTodos = guildTodos.sort((a, b) => (a.id > b.id ? -1 : 1));
 
     return (
         <>
@@ -26,28 +23,20 @@ export const GuildTodos = () => {
             <CreateTodo />
             <br />
             <strong>Todo list</strong>
-            {sortedTodos.map((todo) => {
-                if (prevChannel !== todo.channel_id) {
-                    prevChannel = todo.channel_id;
-                    if (todo.channel_id === null) {
-                        return (
-                            <>
-                                <h2>Server Todos</h2>
-                                <Todo todo={todo} key={todo.id} />
-                            </>
-                        );
-                    } else {
-                        const channel = channels.find((ch) => ch.id === todo.channel_id);
-                        return (
-                            <>
-                                <h2>#{channel.name} Todos</h2>
-                                <Todo todo={todo} key={todo.id} />
-                            </>
-                        );
-                    }
-                }
-
-                return <Todo todo={todo} key={todo.id} />;
+            <h2>Server</h2>
+            {channels.map((channel) => {
+                return (
+                    <>
+                        <h2>#{channel.name}</h2>
+                        {sortedTodos
+                            .filter((todo) => todo.channel_id == channel.id)
+                            .map((todo) => (
+                                <>
+                                    <Todo todo={todo} key={todo.id} />
+                                </>
+                            ))}
+                    </>
+                );
             })}
         </>
     );