app/assets/stylesheets/learning_goals.css

@@ -13,14 +13,3 @@
 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

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

app/controllers/todos_controller.rb

@@ -1,51 +0,0 @@
-class TodosController < ApplicationController
-  before_action :set_todo, only: [:edit, :update, :destroy]
-
-  def new
-    @todo = Todo.new
-  end
-
-  def create
-    @todo = Todo.new(todo_params)
-    if @todo.save
-      redirect_to @todo.learning_goal, notice: t(".created")
-    else
-      render :new, status: :unprocessable_entity
-    end
-  end
-
-  def edit ; end
-
-  def update
-    if @todo.update(todo_params)
-      redirect_to @todo.learning_goal, notice: t(".updated")
-    else
-      render :edit, status: :unprocessable_entity
-    end
-  end
-
-  def destroy
-    learning_goal = @todo.learning_goal
-    if @todo.destroy
-      redirect_to learning_goal, notice: t(".deleted")
-    else
-      render :edit, status: :unprocessable_entity
-    end
-  end
-
-  private
-
-  def set_todo
-    @todo = Todo.find(params[:id])
-  end
-
-  def todo_params
-    params.require(:todo).permit(
-      :learning_goal_id,
-      :description,
-      :done,
-      :title,
-      :due,
-    )
-  end
-end

app/helpers/todos_helper.rb

@@ -1,2 +0,0 @@
-module TodosHelper
-end

app/models/learning_goal.rb

@@ -1,21 +1,17 @@
 class LearningGoal < ApplicationRecord
   belongs_to :user
-  has_many :todos
-  has_and_belongs_to_many :tags
-  accepts_nested_attributes_for :tags
 
   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..) }
+  has_and_belongs_to_many :tags
-  scope :past, -> { where(ends_on: ..Date.today) }
+  accepts_nested_attributes_for :tags
-  scope :future, -> { where(starts_on: Date.today..) }
 
   def microposts
     microposts = Micropost.none
     tags.each { |tag| microposts = microposts.or(tag.microposts) }
-    microposts.uniq
+    microposts
   end
 end

app/models/todo.rb

@@ -1,6 +0,0 @@
-class Todo < ApplicationRecord
-  belongs_to :learning_goal
-  validates :done, inclusion: { in: [true, false] }
-  has_rich_text :description
-  has_one :user, through: :learning_goal
-end

app/views/layouts/application.html.erb

@@ -22,7 +22,6 @@
           <li><%= link_to t(".microposts"), microposts_path %></li>
           <% if logged_in? %>
             <li><%= link_to t(".diary_entries"), diary_entries_path %></li>
-            <li><%= link_to t(".learning_goals"), learning_goals_path %></li>
             <li><%= link_to t(".profile"), user_path(current_user) %></li>
             <li><%= link_to t(".log_out"), log_out_path, data: { turbo_method: :delete } %></li>
           <% end %>

app/views/learning_goals/_learning_goal.html.erb

@@ -1,4 +0,0 @@
-<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

@@ -1,25 +1,14 @@
 <h2><%= t(".learning_goals") %></h2>
 
 <%= link_to t(".new"), new_learning_goal_path if logged_in? %>
-<%= link_to t(".new_todo"), new_todo_path if logged_in? %>
 
-<h3><%= t(".current") %></h3>
+<% if @learning_goals.empty? %>
-<% if LearningGoal.current.any? %>
+  <p><%= t(".empty") %></p>
-  <%= render LearningGoal.current %>
 <% else %>
-  <p><%= t(".no_current_goals") %></p>
+  <ul id="learning_goals">
-<% end %>
+    <% @learning_goals.each do |learning_goal| %>
-
+      <li><%= link_to learning_goal.title, learning_goal %></li>
-<h3><%= t(".future") %></h3>
+    <% end %>
-<% if LearningGoal.future.any? %>
+  </ul>
-  <%= render LearningGoal.future %>
+  <%= paginate @learning_goals %>
-<% 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

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

app/views/todos/_form.html.erb

@@ -1,18 +0,0 @@
-<%= form_with model: @todo, id: "todo_form" do |f| %>
-  <h2><%= title %></h2>
-
-  <%= f.text_field :title, placeholder: t(".title") %>
-
-  <%= f.label :learning_goal %>
-  <%= f.collection_select :learning_goal_id, LearningGoal.all, :id, :title %>
-
-  <%= f.rich_text_area :description %>
-
-  <%= f.label :due %>
-  <%= f.date_field :due %>
-
-  <%= f.label :done %>
-  <%= f.check_box :done %>
-
-  <%= f.submit button_text %>
-<% end %>

app/views/todos/_todo.html.erb

@@ -1,10 +0,0 @@
-<input type="checkbox" class="todo" disabled
-       <% if todo.done? %>
-         checked
-       <% end %>>
-<%= todo.title %>
-<% 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 %>

app/views/todos/edit.html.erb

@@ -1,10 +0,0 @@
-<% @title = t(".edit") %>
-
-<%= render partial: "form",
-           locals: {
-             user: @user,
-             button_text: t(".edit"),
-             title: t(".edit"),
-           } %>
-
-<%= link_to t(".delete"), @todo, data: { turbo_method: :delete, turbo_confirm: t(".confirm") } %>

app/views/todos/new.html.erb

@@ -1,8 +0,0 @@
-<% @title = t(".create") %>
-
-<%= render partial: "form",
-  locals: {
-    user: @user,
-    button_text: t(".create"),
-    title: t(".create"),
-  } %>

config/locales/controllers/todos/en.yml

@@ -1,5 +0,0 @@
-en:
-  todos:
-    created: Successfully created todo
-    updated: Successfully updated todo
-    deleted: Successfully deleted todo

config/locales/views/layouts/application.yml

@@ -10,4 +10,3 @@ en:
       blog_posts: Blog
       microposts: μposts
       diary_entries: Diary
-      learning_goals: Learning Goals

config/locales/views/learning_goals/en.yml

@@ -2,14 +2,8 @@ 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:
@@ -25,5 +19,4 @@ en:
       description: Description
       retrospective: Retrospective
       tags: Tags
-      todos: Todos
       related_microposts: Related μposts

config/locales/views/todos/en.yml

@@ -1,14 +0,0 @@
-en:
-  todos:
-    new:
-      create: Create todo
-    edit:
-      edit: Edit todo
-      delete: Delete todo
-      confirm: Are you sure you want to delete this todo?
-    form:
-      title: Title
-    todo:
-      edit: Edit
-      delete: Delete
-      confirm: Are you sure you want to delete this todo?

config/routes.rb

@@ -16,7 +16,6 @@ Rails.application.routes.draw do
   resources :learning_goals
   resources :microposts
   resources :tags, only: [:index, :show]
-  resources :todos, only: [:new, :create, :edit, :update, :destroy]
   resources :diary_entries, except: [:destroy]
 
   get "up" => "rails/health#show", as: :rails_health_check

db/migrate/20240107131738_create_todos.rb

@@ -1,12 +0,0 @@
-class CreateTodos < ActiveRecord::Migration[7.1]
-  def change
-    create_table :todos do |t|
-      t.belongs_to :learning_goal, null: false, foreign_key: true
-      t.boolean :done, null: false, default: false
-      t.string :title, null: false, default: ''
-      t.date :due
-
-      t.timestamps
-    end
-  end
-end

db/schema.rb

@@ -10,7 +10,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema[7.1].define(version: 2024_01_07_131738) do
+ActiveRecord::Schema[7.1].define(version: 2024_01_06_103226) do
   # These are extensions that must be enabled in order to support this database
   enable_extension "plpgsql"
 
@@ -140,16 +140,6 @@ ActiveRecord::Schema[7.1].define(version: 2024_01_07_131738) do
     t.datetime "updated_at", null: false
   end
 
-  create_table "todos", force: :cascade do |t|
-    t.bigint "learning_goal_id", null: false
-    t.boolean "done", default: false, null: false
-    t.string "title", default: "", null: false
-    t.date "due"
-    t.datetime "created_at", null: false
-    t.datetime "updated_at", null: false
-    t.index ["learning_goal_id"], name: "index_todos_on_learning_goal_id"
-  end
-
   create_table "users", force: :cascade do |t|
     t.string "username", null: false
     t.string "password_digest", null: false
@@ -171,5 +161,4 @@ ActiveRecord::Schema[7.1].define(version: 2024_01_07_131738) do
   add_foreign_key "exercises", "exercise_types"
   add_foreign_key "learning_goals", "users"
   add_foreign_key "microposts", "users"
-  add_foreign_key "todos", "learning_goals"
 end

test/controllers/todos_controller_test.rb

@@ -1,7 +0,0 @@
-require "test_helper"
-
-class TodosControllerTest < ActionDispatch::IntegrationTest
-  # test "the truth" do
-  #   assert true
-  # end
-end

test/fixtures/todos.yml

@@ -1,10 +0,0 @@
-one:
-  learning_goal: sql
-  done: false
-  title: Read ‘SQL for Mere Mortals’
-  due: <%= 3.years.from_now %>
-
-two:
-  learning_goal: linux
-  done: true
-  title: Install Debian

test/models/todo_test.rb

@@ -1,7 +0,0 @@
-require "test_helper"
-
-class TodoTest < ActiveSupport::TestCase
-  # test "the truth" do
-  #   assert true
-  # end
-end