Group learning goals

app/assets/stylesheets/learning_goals.css

@@ -13,3 +13,14 @@
 ul#learning_goals {
   list-style-type: none;
 }
+
+ul.todos {
+  list-style-type: none;
+}
+
+ul.tags {
+  list-style-type: none;
+  > li {
+    display: inline;
+  }
+}

app/assets/stylesheets/todos.css

@@ -0,0 +1,44 @@
+form#blog_post_form, form#learning_goal_form, form#todo_form {
+  display: flex;
+  flex-direction: column;
+  max-width: 55em;
+
+  > h2 {
+    width: 100%;
+  }
+
+  > trix-toolbar {
+    max-width: 95%;
+  }
+
+  > trix-editor {
+    width: 95%;
+    > ul {
+      list-style-type: disc;
+    }
+  }
+
+  input[type=text] {
+    width: 95%;
+  }
+
+  > input[type=submit] {
+    width: 95%;
+  }
+}
+
+.blog_post {
+  margin: 1em auto;
+  padding: .5em;
+  background-color: var(--inset-background-color);
+  border: 1px solid var(--border-color);
+
+  > .created_at {
+    text-align: right;
+    font-size: .8em;
+  }
+}
+
+ul#blog_posts {
+  list-style-type: none;
+}

app/controllers/learning_goals_controller.rb

@@ -4,11 +4,7 @@ class LearningGoalsController < ApplicationController
   skip_before_action :require_login, only: [:index, :show]
   before_action :set_learning_goal, only: [:show, :edit, :update, :destroy]
 
-  def index
+  def index ; end
-    @learning_goals = LearningGoal.all
-                                  .order(created_at: :desc)
-                                  .page(params[:page])
-  end
 
   def new
     @learning_goal = LearningGoal.new

app/models/learning_goal.rb

@@ -7,9 +7,12 @@ class LearningGoal < ApplicationRecord
   has_rich_text :description
   has_rich_text :retrospective
   validates :completed, inclusion: { in: [true, false] }
-
   validates :title, presence: true
 
+  scope :current, -> { where(starts_on: ..Date.today, ends_on: Date.today..) }
+  scope :past, -> { where(ends_on: ..Date.today) }
+  scope :future, -> { where(starts_on: Date.today..) }
+
   def microposts
     microposts = Micropost.none
     tags.each { |tag| microposts = microposts.or(tag.microposts) }

app/views/learning_goals/_learning_goal.html.erb

@@ -0,0 +1,4 @@
+<div id="learning_goal_<%= learning_goal.id %>" class="learning_goal">
+  <h2><%= link_to learning_goal.title, learning_goal %></h2>
+  <%= learning_goal.description %>
+</div>

app/views/learning_goals/index.html.erb

@@ -3,13 +3,23 @@
 <%= link_to t(".new"), new_learning_goal_path if logged_in? %>
 <%= link_to t(".new_todo"), new_todo_path if logged_in? %>
 
-<% if @learning_goals.empty? %>
+<h3><%= t(".current") %></h3>
-  <p><%= t(".empty") %></p>
+<% if LearningGoal.current.any? %>
+  <%= render LearningGoal.current %>
 <% else %>
-  <ul id="learning_goals">
+  <p><%= t(".no_current_goals") %></p>
-    <% @learning_goals.each do |learning_goal| %>
+<% end %>
-      <li><%= link_to learning_goal.title, learning_goal %></li>
+
-    <% end %>
+<h3><%= t(".future") %></h3>
-  </ul>
+<% if LearningGoal.future.any? %>
-  <%= paginate @learning_goals %>
+  <%= render LearningGoal.future %>
+<% else %>
+  <p><%= t(".no_future_goals") %></p>
+<% end %>
+
+<h3><%= t(".past") %></h3>
+<% if LearningGoal.past.any? %>
+  <%= render LearningGoal.past %>
+<% else %>
+  <p><%= t(".no_past_goals") %></p>
 <% end %>

app/views/learning_goals/show.html.erb

@@ -10,14 +10,14 @@
   <% end %>
 
   <h3><%= t(".todos") %></h3>
-  <ul>
+  <ul class="todos">
     <% @learning_goal.todos.each do |todo| %>
       <li><%= render todo %></li>
     <% end %>
   </ul>
 
   <h3><%= t(".tags") %></h3>
-  <ul>
+  <ul class="tags">
     <% @learning_goal.tags.each do |tag| %>
       <li><%= link_to tag.name, tag %></li>
     <% end %>

app/views/todos/_todo.html.erb

@@ -3,8 +3,8 @@
          checked
        <% end %>>
 <%= todo.title %>
-<%= todo.description %>
 <% if todo.user == current_user %>
   <%= link_to t(".edit"), edit_todo_path(todo) %>
   <%= link_to t(".delete"), todo, data: { turbo_method: :delete, turbo_confirm: t(".confirm") } %>
 <% end %>
+<%= todo.description %>

config/locales/views/learning_goals/en.yml

@@ -2,9 +2,14 @@ en:
   learning_goals:
     index:
       learning_goals: Learning Goals
-      empty: You have no learning goals yet.
       new: New learning goal
       new_todo: New todo
+      current: Current
+      future: Future
+      past: Past
+      no_current_goals: You have no current goals
+      no_future_goals: You have no future goals
+      no_past_goals: You have no past goals
     new:
       create: Create learning goal
     edit:

config/locales/views/todos/en.yml

@@ -9,6 +9,6 @@ en:
     form:
       title: Title
     todo:
-      edit: Edit todo
+      edit: Edit
-      delete: Delete todo
+      delete: Delete
       confirm: Are you sure you want to delete this todo?