diff --git a/app.rb b/app.rb index e4bea26..e1cb56e 100644 --- a/app.rb +++ b/app.rb @@ -103,7 +103,7 @@ get '/' do end get '/inbox' do - @tasks = current_user.tasks.incomplete.where(project_id: nil).order(:name) + @tasks = current_user.tasks.incomplete.where(project_id: nil).where(due_date: nil).order(:name) erb :inbox end diff --git a/app/helpers/task_helper.rb b/app/helpers/task_helper.rb index 3afc78d..0ccc15a 100644 --- a/app/helpers/task_helper.rb +++ b/app/helpers/task_helper.rb @@ -20,10 +20,12 @@ module TaskHelper 'bg-primary' when Date.tomorrow 'bg-info' - when Date.yesterday..Date.today - 'bg-danger' else - 'bg-light text-dark' + if due_date.to_date < Date.today + 'bg-danger' + else + 'bg-light text-dark' + end end end diff --git a/app/views/notes/_form.erb b/app/views/notes/_form.erb index ea81836..2d67dda 100644 --- a/app/views/notes/_form.erb +++ b/app/views/notes/_form.erb @@ -39,7 +39,7 @@ <%= note.new_record? ? 'Create Note' : 'Update Note' %> <% unless note.new_record? %> - <% end %> diff --git a/app/views/notes/_note.erb b/app/views/notes/_note.erb index 5377929..b458aa4 100644 --- a/app/views/notes/_note.erb +++ b/app/views/notes/_note.erb @@ -1,4 +1,4 @@ -
+
@@ -20,7 +20,7 @@
<% if note.project && params[:id].blank? %> - + <%= note.project.name %> <% end %> diff --git a/app/views/notes/index.erb b/app/views/notes/index.erb index 2ad3fd8..f16cb51 100644 --- a/app/views/notes/index.erb +++ b/app/views/notes/index.erb @@ -22,11 +22,17 @@
-