From f6331c8aea0972da4471a327b07da68b5911eb7d Mon Sep 17 00:00:00 2001
From: kjuulh <contact@kjuulh.io>
Date: Mon, 15 Nov 2021 13:50:38 +0100
Subject: [PATCH] Add base project

---
 .../Todo.Api/Controllers/TodosController.cs   |  2 +-
 .../src/Todo.Api/Hubs/Models/TodoResponse.cs  |  5 ++-
 .../server/src/Todo.Api/Hubs/TodoHub.cs       | 13 ++++---
 .../server/src/Todo.Core/Entities/Todo.cs     |  1 +
 .../Interfaces/Persistence/ITodoRepository.cs |  2 +-
 .../Mongo/Repositories/Dtos/MongoTodo.cs      |  1 +
 .../Mongo/Repositories/TodoRepository.cs      | 11 +++---
 src/client/src/components/todos/addTodo.tsx   |  4 +-
 .../todos/collapsed/addTodoForm.tsx           | 37 +++++++++++++------
 src/client/src/components/todos/todoItem.tsx  |  8 +++-
 src/client/src/components/todos/todoList.tsx  |  1 +
 src/client/src/core/entities/todo.tsx         |  1 +
 .../presentation/contexts/SocketContext.tsx   |  8 ++--
 .../src/presentation/hooks/socketHooks.tsx    |  4 +-
 14 files changed, 63 insertions(+), 35 deletions(-)

diff --git a/src/backend/server/src/Todo.Api/Controllers/TodosController.cs b/src/backend/server/src/Todo.Api/Controllers/TodosController.cs
index 2cfa88b..a5fdc9f 100644
--- a/src/backend/server/src/Todo.Api/Controllers/TodosController.cs
+++ b/src/backend/server/src/Todo.Api/Controllers/TodosController.cs
@@ -17,7 +17,7 @@ public class TodosController : ControllerBase
 
     [HttpPost]
     public async Task<ActionResult<Core.Entities.Todo>> CreateTodo([FromBody] CreateTodoRequest request) =>
-        Ok(await _todoRepository.CreateTodoAsync(request.Title));
+        Ok(await _todoRepository.CreateTodoAsync(request.Title, String.Empty));
 
     [HttpGet]
     public async Task<ActionResult<IEnumerable<Core.Entities.Todo>>> GetTodos() =>
diff --git a/src/backend/server/src/Todo.Api/Hubs/Models/TodoResponse.cs b/src/backend/server/src/Todo.Api/Hubs/Models/TodoResponse.cs
index ae5d28a..ca9f681 100644
--- a/src/backend/server/src/Todo.Api/Hubs/Models/TodoResponse.cs
+++ b/src/backend/server/src/Todo.Api/Hubs/Models/TodoResponse.cs
@@ -11,5 +11,8 @@ public record TodoResponse
     public string Title { get; init; }   
     
     [JsonPropertyName("status")]
-    public bool Status { get; init; }   
+    public bool Status { get; init; }
+
+    [JsonPropertyName("project")]
+    public string Project { get; set; }
 }
\ No newline at end of file
diff --git a/src/backend/server/src/Todo.Api/Hubs/TodoHub.cs b/src/backend/server/src/Todo.Api/Hubs/TodoHub.cs
index 101f049..59a6523 100644
--- a/src/backend/server/src/Todo.Api/Hubs/TodoHub.cs
+++ b/src/backend/server/src/Todo.Api/Hubs/TodoHub.cs
@@ -14,14 +14,14 @@ namespace Todo.Api.Hubs
             _todoRepository = todoRepository;
         }
 
-        public async Task CreateTodo(string todoTitle)
+        public async Task CreateTodo(string todoTitle, string projectName)
         {
-            var _ = await _todoRepository.CreateTodoAsync(todoTitle);
+            var _ = await _todoRepository.CreateTodoAsync(todoTitle, projectName);
 
             var todos = await _todoRepository.GetNotDoneTodos();
             var serializedTodos =
                 JsonSerializer.Serialize(todos
-                    .Select(t => new TodoResponse { Id = t.Id, Title = t.Title })
+                    .Select(t => new TodoResponse { Id = t.Id, Title = t.Title, Project = t.Project })
                     .ToList());
 
             await Clients.Caller.SendAsync("getInboxTodos", serializedTodos);
@@ -34,7 +34,8 @@ namespace Todo.Api.Hubs
             var todos = await _todoRepository.GetNotDoneTodos();
             var serializedTodos =
                 JsonSerializer.Serialize(todos
-                    .Select(t => new TodoResponse { Id = t.Id, Title = t.Title, Status = t.Status })
+                    .Select(t => new TodoResponse
+                        { Id = t.Id, Title = t.Title, Status = t.Status, Project = t.Project })
                     .ToList());
 
             await Clients.Caller.SendAsync("getInboxTodos", serializedTodos);
@@ -44,7 +45,7 @@ namespace Todo.Api.Hubs
         {
             var todos = await _todoRepository.GetTodosAsync();
             var serializedTodos = JsonSerializer.Serialize(todos
-                .Select(t => new TodoResponse { Id = t.Id, Title = t.Title, Status = t.Status })
+                .Select(t => new TodoResponse { Id = t.Id, Title = t.Title, Status = t.Status, Project = t.Project })
                 .ToList());
 
             await Clients.Caller.SendAsync("todos", serializedTodos);
@@ -55,7 +56,7 @@ namespace Todo.Api.Hubs
         {
             var todos = await _todoRepository.GetNotDoneTodos();
             var serializedTodos = JsonSerializer.Serialize(todos
-                .Select(t => new TodoResponse { Id = t.Id, Title = t.Title, Status = t.Status })
+                .Select(t => new TodoResponse { Id = t.Id, Title = t.Title, Status = t.Status, Project = t.Project })
                 .ToList());
 
             await Clients.Caller.SendAsync("getInboxTodos", serializedTodos);
diff --git a/src/backend/server/src/Todo.Core/Entities/Todo.cs b/src/backend/server/src/Todo.Core/Entities/Todo.cs
index ef0c713..11e8b24 100644
--- a/src/backend/server/src/Todo.Core/Entities/Todo.cs
+++ b/src/backend/server/src/Todo.Core/Entities/Todo.cs
@@ -5,4 +5,5 @@ public record Todo
     public string Id { get; init; }
     public string Title { get; init; }
     public bool Status { get; init; }
+    public string Project { get; init; }
 }
\ No newline at end of file
diff --git a/src/backend/server/src/Todo.Core/Interfaces/Persistence/ITodoRepository.cs b/src/backend/server/src/Todo.Core/Interfaces/Persistence/ITodoRepository.cs
index 3a722dc..149ccf0 100644
--- a/src/backend/server/src/Todo.Core/Interfaces/Persistence/ITodoRepository.cs
+++ b/src/backend/server/src/Todo.Core/Interfaces/Persistence/ITodoRepository.cs
@@ -2,7 +2,7 @@ namespace Todo.Core.Interfaces.Persistence;
 
 public interface ITodoRepository
 {
-    Task<Entities.Todo> CreateTodoAsync(string title);
+    Task<Entities.Todo> CreateTodoAsync(string title, string projectName);
     Task<IEnumerable<Entities.Todo>> GetTodosAsync();
     Task UpdateTodoStatus(string todoId, bool todoStatus);
     Task<IEnumerable<Entities.Todo>> GetNotDoneTodos();
diff --git a/src/backend/server/src/Todo.Persistence/Mongo/Repositories/Dtos/MongoTodo.cs b/src/backend/server/src/Todo.Persistence/Mongo/Repositories/Dtos/MongoTodo.cs
index 7f291f1..c9d645e 100644
--- a/src/backend/server/src/Todo.Persistence/Mongo/Repositories/Dtos/MongoTodo.cs
+++ b/src/backend/server/src/Todo.Persistence/Mongo/Repositories/Dtos/MongoTodo.cs
@@ -11,4 +11,5 @@ public record MongoTodo
 
     [BsonRequired] public string Title { get; init; }
     [BsonRequired] public bool Status { get; set; }
+    public string ProjectName { get; set; } = String.Empty;
 }
\ No newline at end of file
diff --git a/src/backend/server/src/Todo.Persistence/Mongo/Repositories/TodoRepository.cs b/src/backend/server/src/Todo.Persistence/Mongo/Repositories/TodoRepository.cs
index b475b39..ccc7c5e 100644
--- a/src/backend/server/src/Todo.Persistence/Mongo/Repositories/TodoRepository.cs
+++ b/src/backend/server/src/Todo.Persistence/Mongo/Repositories/TodoRepository.cs
@@ -15,11 +15,12 @@ public class TodoRepository : ITodoRepository
         _todosCollection = database.GetCollection<MongoTodo>("todos");
     }
 
-    public async Task<Core.Entities.Todo> CreateTodoAsync(string title)
+    public async Task<Core.Entities.Todo> CreateTodoAsync(string title, string projectName)
     {
-        var todo = new MongoTodo() { Title = title };
+        var todo = new MongoTodo() { Title = title, ProjectName = projectName };
         await _todosCollection.InsertOneAsync(todo);
-        return new Core.Entities.Todo() { Id = todo.Id, Title = todo.Title, Status = false};
+        return new Core.Entities.Todo()
+            { Id = todo.Id, Title = todo.Title, Status = false, Project = todo.ProjectName };
     }
 
     public async Task<IEnumerable<Core.Entities.Todo>> GetTodosAsync()
@@ -28,14 +29,14 @@ public class TodoRepository : ITodoRepository
         return todos
             .ToEnumerable()
             .Select(t =>
-                new Core.Entities.Todo() { Id = t.Id, Title = t.Title, Status = t.Status});
+                new Core.Entities.Todo() { Id = t.Id, Title = t.Title, Status = t.Status, Project = t.ProjectName });
     }
 
     public async Task UpdateTodoStatus(string todoId, bool todoStatus)
     {
         await _todosCollection
             .UpdateOneAsync(t => t.Id == todoId,
-            Builders<MongoTodo>.Update.Set(t => t.Status, todoStatus));
+                Builders<MongoTodo>.Update.Set(t => t.Status, todoStatus));
     }
 
     public async Task<IEnumerable<Core.Entities.Todo>> GetNotDoneTodos()
diff --git a/src/client/src/components/todos/addTodo.tsx b/src/client/src/components/todos/addTodo.tsx
index 83b0b0d..5020210 100644
--- a/src/client/src/components/todos/addTodo.tsx
+++ b/src/client/src/components/todos/addTodo.tsx
@@ -21,8 +21,8 @@ export function AddTodo(props: {}) {
 
   return (
     <AddTodoForm
-      onAdd={(todoName) => {
-        createTodo(todoName);
+      onAdd={(todoName, project) => {
+        createTodo(todoName, project);
       }}
       onClose={() => setCollapsed(CollapsedState.collapsed)}
     />
diff --git a/src/client/src/components/todos/collapsed/addTodoForm.tsx b/src/client/src/components/todos/collapsed/addTodoForm.tsx
index 9677962..132a371 100644
--- a/src/client/src/components/todos/collapsed/addTodoForm.tsx
+++ b/src/client/src/components/todos/collapsed/addTodoForm.tsx
@@ -1,30 +1,43 @@
 import { FC, useState } from "react";
 
 export const AddTodoForm: FC<{
-  onAdd: (todoName: string) => void;
+  onAdd: (todoName: string, project: string) => void;
   onClose: () => void;
 }> = ({ onAdd, onClose }) => {
   const [todoName, setTodoName] = useState("");
+  const [project, setProject] = useState("");
 
   return (
     <form
       onSubmit={(e) => {
         e.preventDefault();
-        onAdd(todoName);
+        onAdd(todoName, project);
         setTodoName("");
       }}
     >
       <div className="py-2 space-y-3">
-        <div className="todo-input-form py-2 px-4 bg-gray-800 border border-gray-500 rounded-lg">
-          <input
-            type="text"
-            placeholder="Todo name"
-            className="text-sm w-full"
-            autoFocus
-            value={todoName}
-            tabIndex={1}
-            onChange={(e) => setTodoName(e.target.value)}
-          />
+        <div className="flex flex-col md:flex-row gap-4">
+          <div className="todo-input-form md:flex-grow py-2 px-4 bg-gray-800 border border-gray-500 rounded-lg">
+            <input
+              type="text"
+              placeholder="Todo name"
+              className="text-sm w-full"
+              autoFocus
+              value={todoName}
+              tabIndex={1}
+              onChange={(e) => setTodoName(e.target.value)}
+            />
+          </div>
+          <div className="todo-project py-2 px-4 bg-gray-700 border border-gray-500 rounded-lg ">
+            <input
+              type="text"
+              placeholder="Project name"
+              className="text-sm w-full placeholder-gray-400"
+              value={project}
+              tabIndex={2}
+              onChange={(e) => setProject(e.target.value)}
+            />
+          </div>
         </div>
         <div className="space-x-2">
           <button
diff --git a/src/client/src/components/todos/todoItem.tsx b/src/client/src/components/todos/todoItem.tsx
index 7197c1d..bb5be29 100644
--- a/src/client/src/components/todos/todoItem.tsx
+++ b/src/client/src/components/todos/todoItem.tsx
@@ -5,13 +5,19 @@ import { TodoCheckmark } from "@src/components/todos/todoCheckmark";
 interface TodoItemProps {
   todo: Todo;
   updateTodo: (todo: Todo) => void;
+  displayProject: boolean;
 }
 
 export const TodoItem: FC<TodoItemProps> = (props) => (
   <div className="py-3 border-b border-gray-300 dark:border-gray-600">
     <div className="flex items-center space-x-4">
       <TodoCheckmark {...props} />
-      <span className="pb-1">{props.todo.title}</span>
+      <div className="flex flex-row flex-grow gap-2 pr-6">
+        <div className="flex-grow w-full break-all">{props.todo.title}</div>
+        {props.displayProject && props.todo.project && (
+          <div className="text-gray-500  text-right">{props.todo.project}</div>
+        )}
+      </div>
     </div>
   </div>
 );
diff --git a/src/client/src/components/todos/todoList.tsx b/src/client/src/components/todos/todoList.tsx
index 8ff0ddd..e773bdd 100644
--- a/src/client/src/components/todos/todoList.tsx
+++ b/src/client/src/components/todos/todoList.tsx
@@ -18,6 +18,7 @@ export const TodoList = (props: { todos: Todo[]; hideDone: boolean }) => {
                 updateTodo={(todo) => {
                   updateTodoState(todo.id, todo.status);
                 }}
+                displayProject={false}
               />
             </li>
           ))}
diff --git a/src/client/src/core/entities/todo.tsx b/src/client/src/core/entities/todo.tsx
index e4a8924..c6747f8 100644
--- a/src/client/src/core/entities/todo.tsx
+++ b/src/client/src/core/entities/todo.tsx
@@ -10,6 +10,7 @@ export interface Todo {
   id: string;
   title: string;
   status: StatusState;
+  project?: string;
 }
 
 export const asTodo = (item: Todo): Todo => {
diff --git a/src/client/src/presentation/contexts/SocketContext.tsx b/src/client/src/presentation/contexts/SocketContext.tsx
index f1a7558..28acee6 100644
--- a/src/client/src/presentation/contexts/SocketContext.tsx
+++ b/src/client/src/presentation/contexts/SocketContext.tsx
@@ -12,7 +12,7 @@ interface SocketContextProps {
   inboxTodos: Todo[];
   getTodos: () => void;
   getInboxTodos: () => void;
-  createTodo: (todoName: string) => void;
+  createTodo: (todoName: string, project: string) => void;
   updateTodo: (todoId: string, todoStatus: StatusState) => void;
 }
 
@@ -22,7 +22,7 @@ export const SocketContext = createContext<SocketContextProps>({
   inboxTodos: [],
   getTodos: () => {},
   getInboxTodos: () => {},
-  createTodo: (todoName) => {},
+  createTodo: (todoName, project) => {},
   updateTodo: (todoId, todoStatus) => {},
 });
 
@@ -72,8 +72,8 @@ export const SocketProvider: FC = (props) => {
         getInboxTodos: () => {
           conn.invoke("GetInboxTodos").catch(console.error);
         },
-        createTodo: (todoName) => {
-          conn.invoke("CreateTodo", todoName).catch(console.error);
+        createTodo: (todoName, project) => {
+          conn.invoke("CreateTodo", todoName, project).catch(console.error);
         },
         updateTodo: (todoId, todoStatus) => {
           conn.invoke("UpdateTodo", todoId, todoStatus).catch(console.error);
diff --git a/src/client/src/presentation/hooks/socketHooks.tsx b/src/client/src/presentation/hooks/socketHooks.tsx
index 4f5434d..fd1f317 100644
--- a/src/client/src/presentation/hooks/socketHooks.tsx
+++ b/src/client/src/presentation/hooks/socketHooks.tsx
@@ -19,8 +19,8 @@ export const useCreateTodo = () => {
   const socketContext = useContext(SocketContext);
 
   return {
-    createTodo: (todoName: string) => {
-      socketContext.createTodo(todoName);
+    createTodo: (todoName: string, project: string) => {
+      socketContext.createTodo(todoName, project);
     },
   };
 };