From 9812e56536c3c9e012d7ce9811adde7082b9ee80 Mon Sep 17 00:00:00 2001
From: Taisir Hassan <85134103+taisirhassan@users.noreply.github.com>
Date: Mon, 29 Jan 2024 17:30:39 -0500
Subject: [PATCH 1/7] Implemented CRUD actions, including create, read, update,
 and delete on an article model.

---
 .gitignore                                   |  2 +
 Gemfile                                      |  2 +-
 Gemfile.lock                                 |  2 +-
 app/controllers/articles_controller.rb       | 49 ++++++++++++++++++++
 app/helpers/articles_helper.rb               |  2 +
 app/models/article.rb                        |  3 ++
 app/views/articles/_form.html.erb            | 21 +++++++++
 app/views/articles/edit.html.erb             |  3 ++
 app/views/articles/index.html.erb            | 11 +++++
 app/views/articles/new.html.erb              |  3 ++
 app/views/articles/show.html.erb             | 11 +++++
 config/routes.rb                             |  3 ++
 db/migrate/20240129213444_create_articles.rb | 10 ++++
 db/schema.rb                                 | 21 +++++++++
 test/controllers/articles_controller_test.rb |  7 +++
 15 files changed, 148 insertions(+), 2 deletions(-)
 create mode 100644 app/controllers/articles_controller.rb
 create mode 100644 app/helpers/articles_helper.rb
 create mode 100644 app/models/article.rb
 create mode 100644 app/views/articles/_form.html.erb
 create mode 100644 app/views/articles/edit.html.erb
 create mode 100644 app/views/articles/index.html.erb
 create mode 100644 app/views/articles/new.html.erb
 create mode 100644 app/views/articles/show.html.erb
 create mode 100644 db/migrate/20240129213444_create_articles.rb
 create mode 100644 db/schema.rb
 create mode 100644 test/controllers/articles_controller_test.rb

diff --git a/.gitignore b/.gitignore
index 5fb66c9f0..a35e445cc 100644
--- a/.gitignore
+++ b/.gitignore
@@ -33,3 +33,5 @@
 
 # Ignore master key for decrypting credentials and more.
 /config/master.key
+Gemfile
+Gemfile.lock
diff --git a/Gemfile b/Gemfile
index 7abd44d7a..28697d2a0 100644
--- a/Gemfile
+++ b/Gemfile
@@ -1,6 +1,6 @@
 source "https://rubygems.org"
 
-ruby "3.2.3"
+ruby "3.3.0"
 
 # Bundle edge Rails instead: gem "rails", github: "rails/rails", branch: "main"
 gem "rails", "~> 7.1.2"
diff --git a/Gemfile.lock b/Gemfile.lock
index ac898c77c..fb9a62683 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -276,7 +276,7 @@ DEPENDENCIES
   webdrivers
 
 RUBY VERSION
-   ruby 3.2.3p157
+   ruby 3.3.0p0
 
 BUNDLED WITH
    2.5.5
diff --git a/app/controllers/articles_controller.rb b/app/controllers/articles_controller.rb
new file mode 100644
index 000000000..993244079
--- /dev/null
+++ b/app/controllers/articles_controller.rb
@@ -0,0 +1,49 @@
+class ArticlesController < ApplicationController
+  def index
+    @articles = Article.all
+  end
+
+  def show
+    @article = Article.find(params[:id])
+  end
+
+  def new
+    @article = Article.new
+  end
+
+  def create
+    @article = Article.new(article_params)
+
+    if @article.save
+      redirect_to @article
+    else
+      render :new, status: :unprocessable_entity
+    end
+  end
+
+  def edit
+    @article = Article.find(params[:id])
+  end
+
+  def update
+    @article = Article.find(params[:id])
+
+    if @article.update(article_params)
+      redirect_to @article
+    else
+      render :edit, status: :unprocessable_entity
+    end
+  end
+
+  def destroy
+    @article = Article.find(params[:id])
+    @article.destroy
+
+    redirect_to root_path, status: :see_other
+  end
+
+  private
+    def article_params
+      params.require(:article).permit(:title, :body)
+    end
+end
diff --git a/app/helpers/articles_helper.rb b/app/helpers/articles_helper.rb
new file mode 100644
index 000000000..296827759
--- /dev/null
+++ b/app/helpers/articles_helper.rb
@@ -0,0 +1,2 @@
+module ArticlesHelper
+end
diff --git a/app/models/article.rb b/app/models/article.rb
new file mode 100644
index 000000000..a2d854933
--- /dev/null
+++ b/app/models/article.rb
@@ -0,0 +1,3 @@
+class Article < ApplicationRecord
+
+end
diff --git a/app/views/articles/_form.html.erb b/app/views/articles/_form.html.erb
new file mode 100644
index 000000000..346888c21
--- /dev/null
+++ b/app/views/articles/_form.html.erb
@@ -0,0 +1,21 @@
+<%= form_with model: article do |form| %>
+  <div>
+    <%= form.label :title %><br>
+    <%= form.text_field :title %>
+    <% article.errors.full_messages_for(:title).each do |message| %>
+      <div><%= message %></div>
+    <% end %>
+  </div>
+
+  <div>
+    <%= form.label :body %><br>
+    <%= form.text_area :body %><br>
+    <% article.errors.full_messages_for(:body).each do |message| %>
+      <div><%= message %></div>
+    <% end %>
+  </div>
+
+  <div>
+    <%= form.submit %>
+  </div>
+<% end %>
diff --git a/app/views/articles/edit.html.erb b/app/views/articles/edit.html.erb
new file mode 100644
index 000000000..808fb655d
--- /dev/null
+++ b/app/views/articles/edit.html.erb
@@ -0,0 +1,3 @@
+<h1>Edit Article</h1>
+
+<%= render "form", article: @article %>
diff --git a/app/views/articles/index.html.erb b/app/views/articles/index.html.erb
new file mode 100644
index 000000000..41a6340c6
--- /dev/null
+++ b/app/views/articles/index.html.erb
@@ -0,0 +1,11 @@
+<h1>Articles</h1>
+
+<ul>
+  <% @articles.each do |article| %>
+    <li>
+      <%= link_to article.title, article %>
+    </li>
+  <% end %>
+</ul>
+
+<%= link_to "New Article", new_article_path %>
diff --git a/app/views/articles/new.html.erb b/app/views/articles/new.html.erb
new file mode 100644
index 000000000..b0e398dd7
--- /dev/null
+++ b/app/views/articles/new.html.erb
@@ -0,0 +1,3 @@
+<h1>New Article</h1>
+
+<%= render "form", article: @article %>
diff --git a/app/views/articles/show.html.erb b/app/views/articles/show.html.erb
new file mode 100644
index 000000000..887d66042
--- /dev/null
+++ b/app/views/articles/show.html.erb
@@ -0,0 +1,11 @@
+<h1><%= @article.title %></h1>
+
+<p><%= @article.body %></p>
+
+<ul>
+  <li><%= link_to "Edit", edit_article_path(@article) %></li>
+  <li><%= link_to "Destroy", article_path(@article), data: {
+                    turbo_method: :delete,
+                    turbo_confirm: "Are you sure?"
+                  } %></li>
+</ul>
diff --git a/config/routes.rb b/config/routes.rb
index a125ef085..f42a51a2b 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -7,4 +7,7 @@
 
   # Defines the root path route ("/")
   # root "posts#index"
+  root "articles#index"
+
+resources :articles
 end
diff --git a/db/migrate/20240129213444_create_articles.rb b/db/migrate/20240129213444_create_articles.rb
new file mode 100644
index 000000000..6cdcb67a8
--- /dev/null
+++ b/db/migrate/20240129213444_create_articles.rb
@@ -0,0 +1,10 @@
+class CreateArticles < ActiveRecord::Migration[7.1]
+  def change
+    create_table :articles do |t|
+      t.string :title
+      t.text :body
+
+      t.timestamps
+    end
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
new file mode 100644
index 000000000..bb1ba7940
--- /dev/null
+++ b/db/schema.rb
@@ -0,0 +1,21 @@
+# This file is auto-generated from the current state of the database. Instead
+# of editing this file, please use the migrations feature of Active Record to
+# incrementally modify your database, and then regenerate this schema definition.
+#
+# This file is the source Rails uses to define your schema when running `bin/rails
+# db:schema:load`. When creating a new database, `bin/rails db:schema:load` tends to
+# be faster and is potentially less error prone than running all of your
+# migrations from scratch. Old migrations may fail to apply correctly if those
+# migrations use external dependencies or application code.
+#
+# It's strongly recommended that you check this file into your version control system.
+
+ActiveRecord::Schema[7.1].define(version: 2024_01_29_213444) do
+  create_table "articles", force: :cascade do |t|
+    t.string "title"
+    t.text "body"
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
+  end
+
+end
diff --git a/test/controllers/articles_controller_test.rb b/test/controllers/articles_controller_test.rb
new file mode 100644
index 000000000..0a82cbb19
--- /dev/null
+++ b/test/controllers/articles_controller_test.rb
@@ -0,0 +1,7 @@
+require "test_helper"
+
+class ArticlesControllerTest < ActionDispatch::IntegrationTest
+  # test "the truth" do
+  #   assert true
+  # end
+end

From 5442eede7840bc4f4c1c8042ad5be9259cc647bc Mon Sep 17 00:00:00 2001
From: Taisir Hassan <85134103+taisirhassan@users.noreply.github.com>
Date: Mon, 29 Jan 2024 20:00:25 -0500
Subject: [PATCH 2/7] Implemented search functionality & also renamed body
 column to content column in articles table

---
 app/controllers/articles_controller.rb             |  6 +++---
 app/models/article.rb                              |  9 +++++++++
 app/views/articles/_form.html.erb                  |  6 +++---
 app/views/articles/index.html.erb                  | 13 +++++++++++--
 app/views/articles/show.html.erb                   |  3 ++-
 ...130005402_rename_body_to_content_in_articles.rb |  6 ++++++
 db/schema.rb                                       | 14 +++++++++++++-
 7 files changed, 47 insertions(+), 10 deletions(-)
 create mode 100644 db/migrate/20240130005402_rename_body_to_content_in_articles.rb

diff --git a/app/controllers/articles_controller.rb b/app/controllers/articles_controller.rb
index 993244079..caa4ae333 100644
--- a/app/controllers/articles_controller.rb
+++ b/app/controllers/articles_controller.rb
@@ -1,6 +1,6 @@
 class ArticlesController < ApplicationController
   def index
-    @articles = Article.all
+    @articles = Article.search(params[:term])
   end
 
   def show
@@ -15,7 +15,7 @@ def create
     @article = Article.new(article_params)
 
     if @article.save
-      redirect_to @article
+      redirect_to articles_path
     else
       render :new, status: :unprocessable_entity
     end
@@ -44,6 +44,6 @@ def destroy
 
   private
     def article_params
-      params.require(:article).permit(:title, :body)
+      params.require(:article).permit(:title, :content)
     end
 end
diff --git a/app/models/article.rb b/app/models/article.rb
index a2d854933..585541f33 100644
--- a/app/models/article.rb
+++ b/app/models/article.rb
@@ -1,3 +1,12 @@
 class Article < ApplicationRecord
+validates :title, presence: true
+validates :content, presence: true
 
+def self.search(term)
+  if term
+    where('title LIKE ? OR content LIKE ?'  , "%#{term}%", "%#{term}%")
+  else
+    all
+  end
+end
 end
diff --git a/app/views/articles/_form.html.erb b/app/views/articles/_form.html.erb
index 346888c21..94c774410 100644
--- a/app/views/articles/_form.html.erb
+++ b/app/views/articles/_form.html.erb
@@ -8,9 +8,9 @@
   </div>
 
   <div>
-    <%= form.label :body %><br>
-    <%= form.text_area :body %><br>
-    <% article.errors.full_messages_for(:body).each do |message| %>
+    <%= form.label :content  %><br>
+    <%= form.text_area :content  %><br>
+    <% article.errors.full_messages_for(:content ).each do |message| %>
       <div><%= message %></div>
     <% end %>
   </div>
diff --git a/app/views/articles/index.html.erb b/app/views/articles/index.html.erb
index 41a6340c6..a025082b6 100644
--- a/app/views/articles/index.html.erb
+++ b/app/views/articles/index.html.erb
@@ -1,10 +1,19 @@
 <h1>Articles</h1>
 
+
+<%= form_with(url: articles_path, method: "get", local: true) do %>
+<%= label_tag(:term, "Search for: ")%>
+<%= text_field_tag(:term, params[:term])%>
+<%= submit_tag("Search")%>
+<% end %>
+
+
 <ul>
   <% @articles.each do |article| %>
-    <li>
+    <h2>
       <%= link_to article.title, article %>
-    </li>
+    </h2>
+    <p> <%= article.content  %> </p>
   <% end %>
 </ul>
 
diff --git a/app/views/articles/show.html.erb b/app/views/articles/show.html.erb
index 887d66042..e42ed1642 100644
--- a/app/views/articles/show.html.erb
+++ b/app/views/articles/show.html.erb
@@ -1,6 +1,6 @@
 <h1><%= @article.title %></h1>
 
-<p><%= @article.body %></p>
+<p><%= @article.content  %></p>
 
 <ul>
   <li><%= link_to "Edit", edit_article_path(@article) %></li>
@@ -8,4 +8,5 @@
                     turbo_method: :delete,
                     turbo_confirm: "Are you sure?"
                   } %></li>
+  <li><%= link_to "Back to Index", articles_path %></li>
 </ul>
diff --git a/db/migrate/20240130005402_rename_body_to_content_in_articles.rb b/db/migrate/20240130005402_rename_body_to_content_in_articles.rb
new file mode 100644
index 000000000..a7b10f94e
--- /dev/null
+++ b/db/migrate/20240130005402_rename_body_to_content_in_articles.rb
@@ -0,0 +1,6 @@
+class RenameBodyToContentInArticles < ActiveRecord::Migration[7.1]
+  def change
+    rename_column :articles, :body, :content
+
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index bb1ba7940..3aa5f75fc 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -10,12 +10,24 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema[7.1].define(version: 2024_01_29_213444) do
+ActiveRecord::Schema[7.1].define(version: 2024_01_30_005402) do
   create_table "articles", force: :cascade do |t|
     t.string "title"
+    t.text "content"
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
+    t.string "status"
+  end
+
+  create_table "comments", force: :cascade do |t|
+    t.string "commenter"
     t.text "body"
+    t.integer "article_id", null: false
     t.datetime "created_at", null: false
     t.datetime "updated_at", null: false
+    t.string "status"
+    t.index ["article_id"], name: "index_comments_on_article_id"
   end
 
+  add_foreign_key "comments", "articles"
 end

From 77c160744fcf793fa2f6e63e56a3b47cf4b3de87 Mon Sep 17 00:00:00 2001
From: Taisir Hassan <85134103+taisirhassan@users.noreply.github.com>
Date: Mon, 29 Jan 2024 20:19:57 -0500
Subject: [PATCH 3/7] Implemented Author Integration to articles

---
 app/controllers/articles_controller.rb              | 2 +-
 app/models/article.rb                               | 3 ++-
 app/views/articles/_form.html.erb                   | 3 +++
 app/views/articles/index.html.erb                   | 1 +
 app/views/articles/show.html.erb                    | 1 +
 db/migrate/20240130010108_add_author_to_articles.rb | 5 +++++
 db/schema.rb                                        | 3 ++-
 7 files changed, 15 insertions(+), 3 deletions(-)
 create mode 100644 db/migrate/20240130010108_add_author_to_articles.rb

diff --git a/app/controllers/articles_controller.rb b/app/controllers/articles_controller.rb
index caa4ae333..309daba8e 100644
--- a/app/controllers/articles_controller.rb
+++ b/app/controllers/articles_controller.rb
@@ -44,6 +44,6 @@ def destroy
 
   private
     def article_params
-      params.require(:article).permit(:title, :content)
+      params.require(:article).permit(:title, :content, :author)
     end
 end
diff --git a/app/models/article.rb b/app/models/article.rb
index 585541f33..2dd05bb49 100644
--- a/app/models/article.rb
+++ b/app/models/article.rb
@@ -1,10 +1,11 @@
 class Article < ApplicationRecord
+validates :author, presence: true
 validates :title, presence: true
 validates :content, presence: true
 
 def self.search(term)
   if term
-    where('title LIKE ? OR content LIKE ?'  , "%#{term}%", "%#{term}%")
+    where('title LIKE ? OR content LIKE ? OR author LIKE ?'  , "%#{term}%", "%#{term}%", "%#{term}%")
   else
     all
   end
diff --git a/app/views/articles/_form.html.erb b/app/views/articles/_form.html.erb
index 94c774410..66b11b3fe 100644
--- a/app/views/articles/_form.html.erb
+++ b/app/views/articles/_form.html.erb
@@ -1,5 +1,8 @@
 <%= form_with model: article do |form| %>
   <div>
+    <%= form.label :author %>
+    <%= form.text_field :author %>
+    </div>
     <%= form.label :title %><br>
     <%= form.text_field :title %>
     <% article.errors.full_messages_for(:title).each do |message| %>
diff --git a/app/views/articles/index.html.erb b/app/views/articles/index.html.erb
index a025082b6..294487fd3 100644
--- a/app/views/articles/index.html.erb
+++ b/app/views/articles/index.html.erb
@@ -13,6 +13,7 @@
     <h2>
       <%= link_to article.title, article %>
     </h2>
+    <h3><%= article.author %></h3>
     <p> <%= article.content  %> </p>
   <% end %>
 </ul>
diff --git a/app/views/articles/show.html.erb b/app/views/articles/show.html.erb
index e42ed1642..d3db438fb 100644
--- a/app/views/articles/show.html.erb
+++ b/app/views/articles/show.html.erb
@@ -1,4 +1,5 @@
 <h1><%= @article.title %></h1>
+<p><strong>Author:</strong> <%= @article.author %></p>
 
 <p><%= @article.content  %></p>
 
diff --git a/db/migrate/20240130010108_add_author_to_articles.rb b/db/migrate/20240130010108_add_author_to_articles.rb
new file mode 100644
index 000000000..3fdc9a764
--- /dev/null
+++ b/db/migrate/20240130010108_add_author_to_articles.rb
@@ -0,0 +1,5 @@
+class AddAuthorToArticles < ActiveRecord::Migration[7.1]
+  def change
+    add_column :articles, :author, :string
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index 3aa5f75fc..3d0cf68bd 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -10,13 +10,14 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema[7.1].define(version: 2024_01_30_005402) do
+ActiveRecord::Schema[7.1].define(version: 2024_01_30_010108) do
   create_table "articles", force: :cascade do |t|
     t.string "title"
     t.text "content"
     t.datetime "created_at", null: false
     t.datetime "updated_at", null: false
     t.string "status"
+    t.string "author"
   end
 
   create_table "comments", force: :cascade do |t|

From 5c2d4b215f0b3c32d86eff39d44de2039c420df2 Mon Sep 17 00:00:00 2001
From: Taisir Hassan <85134103+taisirhassan@users.noreply.github.com>
Date: Mon, 29 Jan 2024 21:20:31 -0500
Subject: [PATCH 4/7] Added Date integration in the table.

---
 app/controllers/articles_controller.rb                | 11 ++++++++---
 app/models/article.rb                                 |  4 +---
 app/views/articles/index.html.erb                     |  2 +-
 app/views/articles/show.html.erb                      |  1 +
 db/migrate/20240130012020_add_date_to_articles.rb     |  5 +++++
 .../20240130014508_change_date_default_in_articles.rb |  9 +++++++++
 .../20240130020815_remove_timestamps_from_articles.rb |  6 ++++++
 db/schema.rb                                          |  5 ++---
 8 files changed, 33 insertions(+), 10 deletions(-)
 create mode 100644 db/migrate/20240130012020_add_date_to_articles.rb
 create mode 100644 db/migrate/20240130014508_change_date_default_in_articles.rb
 create mode 100644 db/migrate/20240130020815_remove_timestamps_from_articles.rb

diff --git a/app/controllers/articles_controller.rb b/app/controllers/articles_controller.rb
index 309daba8e..4a554f3f7 100644
--- a/app/controllers/articles_controller.rb
+++ b/app/controllers/articles_controller.rb
@@ -14,8 +14,12 @@ def new
   def create
     @article = Article.new(article_params)
 
+if @article.date.nil?
+    @article.date = Time.current
+  end
+
     if @article.save
-      redirect_to articles_path
+      redirect_to articles_path, notice: "Article was successfully created."
     else
       render :new, status: :unprocessable_entity
     end
@@ -29,7 +33,8 @@ def update
     @article = Article.find(params[:id])
 
     if @article.update(article_params)
-      redirect_to @article
+      @article.update(date: Time.current)
+      redirect_to @article, notice: "Article was successfully updated."
     else
       render :edit, status: :unprocessable_entity
     end
@@ -44,6 +49,6 @@ def destroy
 
   private
     def article_params
-      params.require(:article).permit(:title, :content, :author)
+      params.require(:article).permit(:title, :content, :author, :date)
     end
 end
diff --git a/app/models/article.rb b/app/models/article.rb
index 2dd05bb49..3513fb5cc 100644
--- a/app/models/article.rb
+++ b/app/models/article.rb
@@ -1,7 +1,5 @@
 class Article < ApplicationRecord
-validates :author, presence: true
-validates :title, presence: true
-validates :content, presence: true
+validates :title, :content, presence: true
 
 def self.search(term)
   if term
diff --git a/app/views/articles/index.html.erb b/app/views/articles/index.html.erb
index 294487fd3..2ff637d7a 100644
--- a/app/views/articles/index.html.erb
+++ b/app/views/articles/index.html.erb
@@ -1,4 +1,4 @@
-<h1>Articles</h1>
+<h1>Encyclopedia</h1>
 
 
 <%= form_with(url: articles_path, method: "get", local: true) do %>
diff --git a/app/views/articles/show.html.erb b/app/views/articles/show.html.erb
index d3db438fb..693829a4f 100644
--- a/app/views/articles/show.html.erb
+++ b/app/views/articles/show.html.erb
@@ -1,5 +1,6 @@
 <h1><%= @article.title %></h1>
 <p><strong>Author:</strong> <%= @article.author %></p>
+<p><strong>Date:</strong> <%= @article.date %></p>
 
 <p><%= @article.content  %></p>
 
diff --git a/db/migrate/20240130012020_add_date_to_articles.rb b/db/migrate/20240130012020_add_date_to_articles.rb
new file mode 100644
index 000000000..e91d1e2a9
--- /dev/null
+++ b/db/migrate/20240130012020_add_date_to_articles.rb
@@ -0,0 +1,5 @@
+class AddDateToArticles < ActiveRecord::Migration[7.1]
+  def change
+    add_column :articles, :date, :datetime
+  end
+end
diff --git a/db/migrate/20240130014508_change_date_default_in_articles.rb b/db/migrate/20240130014508_change_date_default_in_articles.rb
new file mode 100644
index 000000000..64e87dc8a
--- /dev/null
+++ b/db/migrate/20240130014508_change_date_default_in_articles.rb
@@ -0,0 +1,9 @@
+class ChangeDateDefaultInArticles < ActiveRecord::Migration[7.1]
+  def up
+    change_column :articles, :date, :datetime, default: -> { 'CURRENT_TIMESTAMP' }
+  end
+
+  def down
+    change_column :articles, :date, :datetime, default: nil
+  end
+end
diff --git a/db/migrate/20240130020815_remove_timestamps_from_articles.rb b/db/migrate/20240130020815_remove_timestamps_from_articles.rb
new file mode 100644
index 000000000..9ad768dd4
--- /dev/null
+++ b/db/migrate/20240130020815_remove_timestamps_from_articles.rb
@@ -0,0 +1,6 @@
+class RemoveTimestampsFromArticles < ActiveRecord::Migration[6.0]
+  def change
+    remove_column :articles, :created_at, :datetime
+    remove_column :articles, :updated_at, :datetime
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index 3d0cf68bd..f593b8097 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -10,14 +10,13 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema[7.1].define(version: 2024_01_30_010108) do
+ActiveRecord::Schema[7.1].define(version: 2024_01_30_020815) do
   create_table "articles", force: :cascade do |t|
     t.string "title"
     t.text "content"
-    t.datetime "created_at", null: false
-    t.datetime "updated_at", null: false
     t.string "status"
     t.string "author"
+    t.datetime "date", default: -> { "CURRENT_TIMESTAMP" }
   end
 
   create_table "comments", force: :cascade do |t|

From b7ff690cd1d9719ecce8c1719e6fc41cc10111f7 Mon Sep 17 00:00:00 2001
From: Taisir Hassan <85134103+taisirhassan@users.noreply.github.com>
Date: Mon, 29 Jan 2024 22:34:18 -0500
Subject: [PATCH 5/7] Added styling using Bootstrap to the page

---
 Gemfile                                       |  2 +
 Gemfile.lock                                  | 19 +++++++
 .../{application.css => application.scss}     |  9 ++++
 app/javascript/application.js                 |  8 ++-
 app/views/articles/_form.html.erb             | 51 +++++++++++--------
 app/views/articles/edit.html.erb              |  1 -
 app/views/articles/index.html.erb             | 45 ++++++++++------
 app/views/articles/show.html.erb              | 27 +++++-----
 config/routes.rb                              |  1 +
 9 files changed, 110 insertions(+), 53 deletions(-)
 rename app/assets/stylesheets/{application.css => application.scss} (88%)

diff --git a/Gemfile b/Gemfile
index 28697d2a0..5e25721a4 100644
--- a/Gemfile
+++ b/Gemfile
@@ -66,3 +66,5 @@ group :test do
   gem "selenium-webdriver"
   gem "webdrivers"
 end
+
+gem 'bootstrap', '~> 5.0.1'
diff --git a/Gemfile.lock b/Gemfile.lock
index fb9a62683..b9e794ce8 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -77,11 +77,17 @@ GEM
       tzinfo (~> 2.0)
     addressable (2.8.6)
       public_suffix (>= 2.0.2, < 6.0)
+    autoprefixer-rails (10.4.16.0)
+      execjs (~> 2)
     base64 (0.2.0)
     bigdecimal (3.1.6)
     bindex (0.8.1)
     bootsnap (1.17.1)
       msgpack (~> 1.2)
+    bootstrap (5.0.2)
+      autoprefixer-rails (>= 9.1.0)
+      popper_js (>= 2.9.2, < 3)
+      sassc-rails (>= 2.0.0)
     builder (3.2.4)
     capybara (3.39.2)
       addressable
@@ -102,6 +108,8 @@ GEM
     drb (2.2.0)
       ruby2_keywords
     erubi (1.12.0)
+    execjs (2.9.1)
+    ffi (1.16.3)
     globalid (1.2.1)
       activesupport (>= 6.1)
     i18n (1.14.1)
@@ -153,6 +161,7 @@ GEM
       racc (~> 1.4)
     nokogiri (1.16.0-x86_64-linux)
       racc (~> 1.4)
+    popper_js (2.11.8)
     psych (5.1.2)
       stringio
     public_suffix (5.0.4)
@@ -205,6 +214,14 @@ GEM
     rexml (3.2.6)
     ruby2_keywords (0.0.5)
     rubyzip (2.3.2)
+    sassc (2.4.0)
+      ffi (~> 1.9)
+    sassc-rails (2.1.2)
+      railties (>= 4.0.0)
+      sassc (>= 2.0)
+      sprockets (> 3.0)
+      sprockets-rails
+      tilt
     selenium-webdriver (4.10.0)
       rexml (~> 3.2, >= 3.2.5)
       rubyzip (>= 1.2.2, < 3.0)
@@ -226,6 +243,7 @@ GEM
       railties (>= 6.0.0)
     stringio (3.1.0)
     thor (1.3.0)
+    tilt (2.3.0)
     timeout (0.4.1)
     turbo-rails (1.5.0)
       actionpack (>= 6.0.0)
@@ -260,6 +278,7 @@ PLATFORMS
 
 DEPENDENCIES
   bootsnap
+  bootstrap (~> 5.0.1)
   capybara
   debug
   importmap-rails
diff --git a/app/assets/stylesheets/application.css b/app/assets/stylesheets/application.scss
similarity index 88%
rename from app/assets/stylesheets/application.css
rename to app/assets/stylesheets/application.scss
index 288b9ab71..c07201e93 100644
--- a/app/assets/stylesheets/application.css
+++ b/app/assets/stylesheets/application.scss
@@ -13,3 +13,12 @@
  *= require_tree .
  *= require_self
  */
+
+
+ //Import Bootstrap styles
+ @import "bootstrap";
+
+
+ body {
+     background-color: #333;
+ }
\ No newline at end of file
diff --git a/app/javascript/application.js b/app/javascript/application.js
index 0d7b49404..ecb58706c 100644
--- a/app/javascript/application.js
+++ b/app/javascript/application.js
@@ -1,3 +1,7 @@
+//= require bootstrap
+
+// Added bootstrap to style
+
 // Configure your import map in config/importmap.rb. Read more: https://github.com/rails/importmap-rails
-import "@hotwired/turbo-rails"
-import "controllers"
+import "@hotwired/turbo-rails";
+import "controllers";
diff --git a/app/views/articles/_form.html.erb b/app/views/articles/_form.html.erb
index 66b11b3fe..5ae8450f9 100644
--- a/app/views/articles/_form.html.erb
+++ b/app/views/articles/_form.html.erb
@@ -1,24 +1,33 @@
-<%= form_with model: article do |form| %>
-  <div>
-    <%= form.label :author %>
-    <%= form.text_field :author %>
-    </div>
-    <%= form.label :title %><br>
-    <%= form.text_field :title %>
-    <% article.errors.full_messages_for(:title).each do |message| %>
-      <div><%= message %></div>
-    <% end %>
-  </div>
+<div class="d-flex justify-content-center mt-4">
+  <div class="card" style="width: 30rem;">
+    <div class="card-body">
+      <h2 class="card-title text-center">Edit Article</h2>
+      <%= form_with model: article, class: 'needs-validation', novalidate: true do |form| %>
+       <div class="form-group mb-3">
+          <%= form.label :author, class: 'form-label' %>
+          <%= form.text_field :author, value: @article.author, class: 'form-control', style: 'color: black;' %>
+        </div>
 
-  <div>
-    <%= form.label :content  %><br>
-    <%= form.text_area :content  %><br>
-    <% article.errors.full_messages_for(:content ).each do |message| %>
-      <div><%= message %></div>
-    <% end %>
-  </div>
+        <div class="form-group mb-3">
+          <%= form.label :title, class: 'form-label' %>
+          <%= form.text_field :title, value: @article.title, class: 'form-control', style: 'color: black;' %>
+          <% article.errors.full_messages_for(:title).each do |message| %>
+            <div class="invalid-feedback"><%= message %></div>
+          <% end %>
+        </div>
 
-  <div>
-    <%= form.submit %>
+        <div class="form-group mb-3 ">
+          <%= form.label :content, class: 'form-label' %>
+          <%= form.text_area :content, value: @article.content, class: 'form-control', style: 'color: black;' %>
+          <% article.errors.full_messages_for(:content).each do |message| %>
+            <div class="invalid-feedback"><%= message %></div>
+          <% end %>
+        </div>
+
+        <div class="form-group mt-3">
+          <%= form.submit class: 'btn btn-primary' %>
+        </div>
+      <% end %>
+    </div>
   </div>
-<% end %>
+</div>
\ No newline at end of file
diff --git a/app/views/articles/edit.html.erb b/app/views/articles/edit.html.erb
index 808fb655d..1004b5802 100644
--- a/app/views/articles/edit.html.erb
+++ b/app/views/articles/edit.html.erb
@@ -1,3 +1,2 @@
-<h1>Edit Article</h1>
 
 <%= render "form", article: @article %>
diff --git a/app/views/articles/index.html.erb b/app/views/articles/index.html.erb
index 2ff637d7a..93ad682f8 100644
--- a/app/views/articles/index.html.erb
+++ b/app/views/articles/index.html.erb
@@ -1,21 +1,36 @@
-<h1>Encyclopedia</h1>
+<header class="py-3 bg-dark text-white text-center">
+  <h1>Shopify Encyclopedia</h1>
+</header>
 
+<div class="containe mt-4">
+  <div class="row justify-content-center">
+    <div class="col-lg-6">
+      <%= form_with(url: articles_path, method: "get", local: true, class: "mb-3") do %>
+        <div class="input-group">
+          <%= text_field_tag(:term, params[:term], class: "form-control", placeholder: "Search", style: "margin-right: 20px;") %>
+          <%= submit_tag("Search", class: "btn btn-primary") %>
+        </div>
+      <% end %>
+    </div>
+  </div>
+</div>
 
-<%= form_with(url: articles_path, method: "get", local: true) do %>
-<%= label_tag(:term, "Search for: ")%>
-<%= text_field_tag(:term, params[:term])%>
-<%= submit_tag("Search")%>
-<% end %>
+<div class="d-flex justify-content-center mb-4">
+  <%= link_to 'New Article', new_article_path, class: 'btn btn-success' %>
+</div>
 
-
-<ul>
+<div class="row mt-4">
   <% @articles.each do |article| %>
-    <h2>
-      <%= link_to article.title, article %>
-    </h2>
-    <h3><%= article.author %></h3>
-    <p> <%= article.content  %> </p>
+    <div class="col-md-4 mb-4">
+      <div class="card">
+        <div class="card-body">
+          <h2 class="card-title"><%= article.title %></h2>
+          <h3 class="card-subtitle mb-2 text-muted">Author: <%= article.author %></h3>
+          <p class="card-text"> <%= article.content  %> </p>
+          <%= link_to 'Read', article, class: 'btn btn-primary' %>
+        </div>
+      </div>
+    </div>
   <% end %>
-</ul>
+</div>
 
-<%= link_to "New Article", new_article_path %>
diff --git a/app/views/articles/show.html.erb b/app/views/articles/show.html.erb
index 693829a4f..ab8d8c66b 100644
--- a/app/views/articles/show.html.erb
+++ b/app/views/articles/show.html.erb
@@ -1,14 +1,13 @@
-<h1><%= @article.title %></h1>
-<p><strong>Author:</strong> <%= @article.author %></p>
-<p><strong>Date:</strong> <%= @article.date %></p>
-
-<p><%= @article.content  %></p>
-
-<ul>
-  <li><%= link_to "Edit", edit_article_path(@article) %></li>
-  <li><%= link_to "Destroy", article_path(@article), data: {
-                    turbo_method: :delete,
-                    turbo_confirm: "Are you sure?"
-                  } %></li>
-  <li><%= link_to "Back to Index", articles_path %></li>
-</ul>
+<div class="d-flex justify-content-center mt-4">
+  <div class="card" style="width: 30rem;">
+    <div class="card-body">
+      <h2 class="card-title"><%= @article.title %></h2>
+      <h3 class="card-subtitle mb-2 text-muted">Author: <%= @article.author %></h3>
+      <p class="card-text"><strong>Publishing Date:</strong> <%= @article.date %></p>
+      <p class="card-text"> <%= @article.content  %> </p>
+      <%= link_to 'Edit', edit_article_path(@article), class: 'btn btn-primary' %>
+      <%= link_to 'Delete', article_path(@article), data: { turbo_method: :delete, turbo_confirm: 'Are you sure?' }, class: 'btn btn-danger' %>
+      <%= link_to 'Back', articles_path, class: 'btn btn-secondary' %>
+    </div>
+  </div>
+</div>
\ No newline at end of file
diff --git a/config/routes.rb b/config/routes.rb
index f42a51a2b..c8167edc8 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -9,5 +9,6 @@
   # root "posts#index"
   root "articles#index"
 
+  # Defines the routes for the articles controller
 resources :articles
 end

From 5333a7a3854ad9c5cca30c3809b515aab4ccef35 Mon Sep 17 00:00:00 2001
From: Taisir Hassan <85134103+taisirhassan@users.noreply.github.com>
Date: Mon, 29 Jan 2024 23:03:29 -0500
Subject: [PATCH 6/7] Added documentation to the models, view, and controllers.

---
 app/controllers/articles_controller.rb | 16 ++++++++++++++++
 app/models/article.rb                  |  4 ++++
 app/views/articles/_form.html.erb      | 14 +++++++++++++-
 app/views/articles/edit.html.erb       |  4 +++-
 app/views/articles/index.html.erb      | 13 +++++++++++++
 app/views/articles/new.html.erb        |  4 ++--
 app/views/articles/show.html.erb       |  9 +++++++++
 7 files changed, 60 insertions(+), 4 deletions(-)

diff --git a/app/controllers/articles_controller.rb b/app/controllers/articles_controller.rb
index 4a554f3f7..75bc64925 100644
--- a/app/controllers/articles_controller.rb
+++ b/app/controllers/articles_controller.rb
@@ -1,23 +1,32 @@
+# The ArticlesController is responsible for managing the lifecycle of articles in the application.
+# It handles the standard CRUD operations: create, read, update, and delete.
+
 class ArticlesController < ApplicationController
+  # The 'index' action is responsible for listing all articles in the application.
   def index
     @articles = Article.search(params[:term])
   end
 
+  # The 'show' action retrieves a single article by its ID and displays it.
   def show
     @article = Article.find(params[:id])
   end
 
+  # The `new` action initializes a new, unsaved article for the form.
   def new
     @article = Article.new
   end
 
+  # The `create` action attempts to save a new article to the database from the form data.
   def create
     @article = Article.new(article_params)
 
+    # Set the article's date to the current time if it is not provided. This is to ensure that the article's date is always accurate.
 if @article.date.nil?
     @article.date = Time.current
   end
 
+  # If the article is successfully saved, redirect to the article's page. Otherwise, render the `new` template with the provided errors.
     if @article.save
       redirect_to articles_path, notice: "Article was successfully created."
     else
@@ -25,21 +34,26 @@ def create
     end
   end
 
+  # The 'edit' action retrieves an existing article by its ID for the form.
   def edit
     @article = Article.find(params[:id])
   end
 
+  # The `update` action attempts to save changes to an existing article to the database from the form data.
   def update
     @article = Article.find(params[:id])
 
+    # Set the article's date to the current time if it is not provided. This is to ensure that the article's date is always accurate.
     if @article.update(article_params)
       @article.update(date: Time.current)
+      # If the article is successfully saved, redirect to the article's page. Otherwise, render the `edit` template with the provided errors.
       redirect_to @article, notice: "Article was successfully updated."
     else
       render :edit, status: :unprocessable_entity
     end
   end
 
+  #  The `destroy` action deletes an existing article by its ID from the database.
   def destroy
     @article = Article.find(params[:id])
     @article.destroy
@@ -48,6 +62,8 @@ def destroy
   end
 
   private
+
+  # Strong Parameters: only allow the whitelisted parameters to be used to create/update an article.
     def article_params
       params.require(:article).permit(:title, :content, :author, :date)
     end
diff --git a/app/models/article.rb b/app/models/article.rb
index 3513fb5cc..9cfd53f59 100644
--- a/app/models/article.rb
+++ b/app/models/article.rb
@@ -1,6 +1,10 @@
 class Article < ApplicationRecord
+  # Validate rules checking to see the presence of the title and content.
 validates :title, :content, presence: true
 
+# The `search` class method allows for searching articles by title, content, or author.
+# If a search term is provided, it returns all articles where the title, content, or author matches the term.
+# If no term is provided, it returns all articles.
 def self.search(term)
   if term
     where('title LIKE ? OR content LIKE ? OR author LIKE ?'  , "%#{term}%", "%#{term}%", "%#{term}%")
diff --git a/app/views/articles/_form.html.erb b/app/views/articles/_form.html.erb
index 5ae8450f9..590cbc113 100644
--- a/app/views/articles/_form.html.erb
+++ b/app/views/articles/_form.html.erb
@@ -1,13 +1,21 @@
+<%# This is a form partial for articles. It's used in the new and edit views. %>
+
 <div class="d-flex justify-content-center mt-4">
   <div class="card" style="width: 30rem;">
     <div class="card-body">
-      <h2 class="card-title text-center">Edit Article</h2>
+
+      <h2 class="card-title text-center"> <%= @article.persisted? ? 'Edit Article' : 'New Article' %> </h2>
+      <%# Use the form_with helper to start the form. If @article is a new record, this will post to the create action. 
+      If @article is an existing record, this will patch to the update action. %>
       <%= form_with model: article, class: 'needs-validation', novalidate: true do |form| %>
+
+      <%# A form group for the author %>
        <div class="form-group mb-3">
           <%= form.label :author, class: 'form-label' %>
           <%= form.text_field :author, value: @article.author, class: 'form-control', style: 'color: black;' %>
         </div>
 
+      <%# A form group for the article title %>
         <div class="form-group mb-3">
           <%= form.label :title, class: 'form-label' %>
           <%= form.text_field :title, value: @article.title, class: 'form-control', style: 'color: black;' %>
@@ -16,6 +24,7 @@
           <% end %>
         </div>
 
+      <%# A form group for the article content %>
         <div class="form-group mb-3 ">
           <%= form.label :content, class: 'form-label' %>
           <%= form.text_area :content, value: @article.content, class: 'form-control', style: 'color: black;' %>
@@ -24,6 +33,9 @@
           <% end %>
         </div>
 
+
+        <%# The form submit button. The button text will be "Create Article" or "Update Article" based on
+          whether @article is a new record or an existing record. %>
         <div class="form-group mt-3">
           <%= form.submit class: 'btn btn-primary' %>
         </div>
diff --git a/app/views/articles/edit.html.erb b/app/views/articles/edit.html.erb
index 1004b5802..3648bd172 100644
--- a/app/views/articles/edit.html.erb
+++ b/app/views/articles/edit.html.erb
@@ -1,2 +1,4 @@
-
+<%# Render the _form partial, passing in the @article instance variable. 
+    The _form partial uses this variable to display the form and populate the fields with the existing article data. %>
+<% renders %>
 <%= render "form", article: @article %>
diff --git a/app/views/articles/index.html.erb b/app/views/articles/index.html.erb
index 93ad682f8..a7cf8ded1 100644
--- a/app/views/articles/index.html.erb
+++ b/app/views/articles/index.html.erb
@@ -1,7 +1,10 @@
+<%# This is the index view for the articles. It displays a list of all articles. %>
+
 <header class="py-3 bg-dark text-white text-center">
   <h1>Shopify Encyclopedia</h1>
 </header>
 
+<%# Creates a div class for a container for a search bar%>
 <div class="containe mt-4">
   <div class="row justify-content-center">
     <div class="col-lg-6">
@@ -16,18 +19,28 @@
 </div>
 
 <div class="d-flex justify-content-center mb-4">
+  <%# Display a link to the new article form %>
   <%= link_to 'New Article', new_article_path, class: 'btn btn-success' %>
 </div>
 
 <div class="row mt-4">
+    <%# Loop over each article in the @articles array %>
   <% @articles.each do |article| %>
+  <%# Creates a bootstrap card class that displays each article in the view separately %>
     <div class="col-md-4 mb-4">
       <div class="card">
         <div class="card-body">
           <h2 class="card-title"><%= article.title %></h2>
           <h3 class="card-subtitle mb-2 text-muted">Author: <%= article.author %></h3>
           <p class="card-text"> <%= article.content  %> </p>
+          <%# Link to the article's show page with a 'Read' button %>
           <%= link_to 'Read', article, class: 'btn btn-primary' %>
+          <%# Link to the article's edit page with an 'Edit' button %>
+          <%= link_to 'Edit', edit_article_path(article), class: 'btn btn-primary' %>
+          <%# Link to delete the article with a 'Delete' button. 
+          This will trigger a DELETE HTTP request to /articles/:id. 
+          A confirmation dialog will be displayed before the article is deleted. %>
+    <%= link_to 'Delete', article_path(article), data: { turbo_method: :delete, turbo_confirm: 'Are you sure?' }, class: 'btn btn-danger' %>
         </div>
       </div>
     </div>
diff --git a/app/views/articles/new.html.erb b/app/views/articles/new.html.erb
index b0e398dd7..3b10ef3de 100644
--- a/app/views/articles/new.html.erb
+++ b/app/views/articles/new.html.erb
@@ -1,3 +1,3 @@
-<h1>New Article</h1>
-
+<%# Render the _form partial, passing in the @article instance variable. 
+    The _form partial uses this variable to display the form and populate the fields with the existing article data. %>
 <%= render "form", article: @article %>
diff --git a/app/views/articles/show.html.erb b/app/views/articles/show.html.erb
index ab8d8c66b..eb95187f1 100644
--- a/app/views/articles/show.html.erb
+++ b/app/views/articles/show.html.erb
@@ -1,12 +1,21 @@
+<%# This is the show view for the articles. It displays the details of a single article. %>
+
 <div class="d-flex justify-content-center mt-4">
   <div class="card" style="width: 30rem;">
     <div class="card-body">
+      <%# Display the title of the article %>
       <h2 class="card-title"><%= @article.title %></h2>
+      <%# Display the author of the article %>
       <h3 class="card-subtitle mb-2 text-muted">Author: <%= @article.author %></h3>
+      <%# Display the date the article was published %> 
       <p class="card-text"><strong>Publishing Date:</strong> <%= @article.date %></p>
+      <%# Display the content of the article %>
       <p class="card-text"> <%= @article.content  %> </p>
       <%= link_to 'Edit', edit_article_path(@article), class: 'btn btn-primary' %>
+      <%# Display a link to delete the article. This will trigger a DELETE HTTP request to /articles/:id. 
+    A confirmation dialog will be displayed before the article is deleted. %>
       <%= link_to 'Delete', article_path(@article), data: { turbo_method: :delete, turbo_confirm: 'Are you sure?' }, class: 'btn btn-danger' %>
+      <%# Display a link to the articles index page %>
       <%= link_to 'Back', articles_path, class: 'btn btn-secondary' %>
     </div>
   </div>

From 30ce8a4e7d591c04ef26dc126e253c93f735d9fe Mon Sep 17 00:00:00 2001
From: Taisir Hassan <85134103+taisirhassan@users.noreply.github.com>
Date: Mon, 29 Jan 2024 23:22:59 -0500
Subject: [PATCH 7/7] Fixed Error with Edit not rendering properly.

---
 app/views/articles/edit.html.erb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/articles/edit.html.erb b/app/views/articles/edit.html.erb
index 3648bd172..449a6da8a 100644
--- a/app/views/articles/edit.html.erb
+++ b/app/views/articles/edit.html.erb
@@ -1,4 +1,4 @@
 <%# Render the _form partial, passing in the @article instance variable. 
     The _form partial uses this variable to display the form and populate the fields with the existing article data. %>
-<% renders %>
+
 <%= render "form", article: @article %>