From 8995a6b943a00a868062da4d8fe52a556dfae01c Mon Sep 17 00:00:00 2001
From: Chris Veleris <chrisveleris@gmail.com>
Date: Tue, 14 Nov 2023 10:43:13 +0200
Subject: [PATCH] Apply minor UI changes

---
 app/views/projects/index.erb |  2 +-
 app/views/tasks/_task.erb    | 50 ++++++++++++++++++++----------------
 app/views/tasks/index.erb    |  4 +--
 3 files changed, 31 insertions(+), 25 deletions(-)

diff --git a/app/views/projects/index.erb b/app/views/projects/index.erb
index 9a4d50f..55bb168 100644
--- a/app/views/projects/index.erb
+++ b/app/views/projects/index.erb
@@ -18,7 +18,7 @@
           <div id="edit_task_form_<%= task.id %>" class="d-none">
             <%= partial :'tasks/_form', locals: { task: task } %>
           </div>
-          <div class="ms-4">
+          <div class="">
             <%= partial :'tasks/_task', locals: { task: task } %>
           </div>
         <% end %>
diff --git a/app/views/tasks/_task.erb b/app/views/tasks/_task.erb
index 504634e..eb3ed6c 100644
--- a/app/views/tasks/_task.erb
+++ b/app/views/tasks/_task.erb
@@ -1,25 +1,31 @@
 <div class="border-0 bg-white shadow-sm px-3 py-2 mb-1 d-flex align-items-center task-item <%= 'opacity-50' if task.completed %>" data-task-id="<%= task.id %>">
-  <div class="flex-grow-1 d-flex align-items-center">
-    <span onclick="toggleTaskCompletion(event, <%= task.id %>)" class="toggle-completion">
-      <i class="fs-6 bi <%= task.completed ? 'bi-check-circle-fill' : 'bi-circle' %> <%= priority_class task %> me-2"></i>
-    </span>
-    <%= task.name %>
-  </div>
-  <div class="">
-    <% if task.due_date %>
-      <% if task.due_date.to_date == Date.today %>
-        <span class="badge bg-primary rounded ms-2">
-          <i class="bi bi-clock me-2"></i> TODAY
-        </span>
-      <% elsif task.due_date && task.due_date.to_date < Date.today %>
-        <span class="badge bg-danger rounded ms-2">
-          <i class="bi bi-clock me-2"></i> <%= task.due_date.strftime("%Y-%m-%d") %>
-        </span>
-      <% else %>
-        <span class="badge bg-warning text-dark rounded ms-2">
-          <i class="bi bi-clock me-2"></i> <%= task.due_date.strftime("%Y-%m-%d") %>
-        </span>
+  <span onclick="toggleTaskCompletion(event, <%= task.id %>)" class="toggle-completion">
+    <i class="fs-6 bi <%= task.completed ? 'bi-check-circle-fill' : 'bi-circle' %> <%= priority_class(task) %> me-2"></i>
+  </span>
+  <div class="row flex-grow-1 align-items-center">
+    <div class="col-md-5">
+      <%= task.name %>
+    </div>
+    <div class="col-md-3">
+      <% if task.due_date %>
+        <% if task.due_date.to_date == Date.today %>
+          <span class="badge bg-primary rounded">
+            <i class="bi bi-clock me-2"></i> TODAY
+          </span>
+        <% elsif task.due_date.to_date < Date.today %>
+          <span class="badge bg-danger rounded">
+            <i class="bi bi-clock me-2"></i> <%= task.due_date.strftime("%Y-%m-%d") %>
+          </span>
+         <% elsif task.due_date.to_date == Date.today + 1 %>
+          <span class="badge bg-info rounded">
+            <i class="bi bi-clock me-2"></i> TOMORROW
+          </span>
+        <% else %>
+          <span class="badge bg-light text-dark rounded">
+            <i class="bi bi-clock me-2"></i> <%= task.due_date.strftime("%Y-%m-%d") %>
+          </span>
+        <% end %>
       <% end %>
-    <% end %>
+    </div>
   </div>
-</div>
\ No newline at end of file
+</div>
diff --git a/app/views/tasks/index.erb b/app/views/tasks/index.erb
index d84a947..4e5586b 100644
--- a/app/views/tasks/index.erb
+++ b/app/views/tasks/index.erb
@@ -22,14 +22,14 @@
   <% if @projects_with_tasks.any? %>
     <% @projects_with_tasks.each do |project| %>
       <% if project.tasks.any? %>
-        <h5 class="mt-4 ms-4 mb-2">
+        <h5 class="mt-4 mb-2">
           <div class="px-2 py-1 mb-1 border border-dark d-inline-block"><%= project.name.upcase %></div>
         </h5>
         <% project.tasks.each do |task| %>
           <div id="edit_task_form_<%= task.id %>" class="d-none">
             <%= partial :'tasks/_form', locals: { task: task } %>
           </div>
-          <div class="ms-4">
+          <div class="">
             <%= partial :'tasks/_task', locals: { task: task } %>
           </div>
         <% end %>