Fixed routes and split file blog.js

Author: vb-cmd

app/assets/javascripts/blog.js

@@ -1,67 +1,3 @@
 //*= require "bootstrap"
-
-// Comments
-const comment_form = document.getElementById('comment_form');
-const comment_message = document.getElementById('comment_message');
-
-function addComment() {
-    fetch(comment_form.action, {
-        method: 'POST',
-        body: new FormData(comment_form),
-    }).then(response => {
-        response.text().then(text => {
-
-            switch (response.status) {
-                case 201:
-                    createCommentCreated(text);
-                    break;
-
-                case 403, 422:
-                    createError(text);
-                    break;
-            }
-        });
-    });
-}
-
-
-function createError(body) {
-    comment_message.innerHTML = '';
-    comment_message.classList.remove('alert-success');
-    
-    comment_message.classList.add('alert-danger');
-    comment_message.innerHTML = body;
-}
-
-function createCommentCreated(body) {
-    comment_message.innerHTML = '';
-    comment_message.classList.remove('alert-danger');
-
-    comment_message.classList.add('alert-success');
-    comment_message.innerHTML = body;
-
-    comment_form.reset();
-}
-
-// likes
-const likes = document.getElementById('likes');
-
-function updateLikes(href_patch) {
-    console.log(href_patch);
-    fetch(href_patch, {
-        method: 'PATCH',
-    }).then(response => {
-        response.text().then(text => {
-            switch (response.status) {
-                case 200:
-                    console.log(text)
-                    likes.innerHTML = text;
-                    break;
-
-                case 403, 422:
-                    likes.innerHTML = 'Error';
-                    break;
-            }
-        });
-    });
-}
+//*= require "blog/likes"
+//*= require "blog/comments"

app/assets/javascripts/blog/comments.js

@@ -0,0 +1,41 @@
+// Comments
+const comment_form = document.getElementById('comment_form');
+const comment_message = document.getElementById('comment_message');
+
+function addComment() {
+    fetch(comment_form.action, {
+        method: 'POST',
+        body: new FormData(comment_form),
+    }).then(response => {
+        response.text().then(text => {
+            switch (response.status) {
+                case 201:
+                    createComment(text);
+                    break;
+
+                case 403, 422:
+                    createError(text);
+                    break;
+            }
+        });
+    });
+}
+
+
+function createError(body) {
+    comment_message.innerHTML = '';
+    comment_message.classList.remove('alert-success');
+    
+    comment_message.classList.add('alert-danger');
+    comment_message.innerHTML = body;
+}
+
+function createComment(body) {
+    comment_message.innerHTML = '';
+    comment_message.classList.remove('alert-danger');
+
+    comment_message.classList.add('alert-success');
+    comment_message.innerHTML = body;
+
+    comment_form.reset();
+}

app/assets/javascripts/blog/likes.js

@@ -0,0 +1,16 @@
+// likes
+const likes = document.getElementById('likes');
+
+function updateLikes(link) {
+    fetch(link, {
+        method: 'PATCH',
+    }).then(response => {
+        response.text().then(text => {
+            if (response.ok) {
+                likes.innerHTML = text;
+            }else {
+                console.log("Likes not updated");
+            }
+        });
+    });
+}

app/controllers/blog/sitemap_controller.rb

@@ -1,29 +1,5 @@
 module Blog
   class SitemapController < BaseController
-    def index
-      @url_and_date = [hash_home].concat(hash_pages, hash_categories, hash_posts)
-    end
-
-    private
-
-    def hash_url_and_updated(url, date_updated)
-      { url:, date_updated: }
-    end
-
-    def hash_home
-      hash_url_and_updated(home_url, DateTime.now.strftime('%d/%m/%Y'))
-    end
-
-    def hash_pages
-      Page.all.map { |page| hash_url_and_updated page_url(page), page.date_updated }
-    end
-
-    def hash_categories
-      Category.all.map { |category| hash_url_and_updated category_url(category), category.date_updated }
-    end
-
-    def hash_posts
-      Post.all.map { |post| hash_url_and_updated post_url(post), post.date_updated }
-    end
+    def index; end
   end
 end

app/helpers/application_helper.rb

@@ -1,2 +1,5 @@
 module ApplicationHelper
+  def pages_navbar
+    Page.where(published: true)
+  end
 end

app/helpers/blog/sitemap_helper.rb

@@ -1,2 +1,27 @@
 module Blog::SitemapHelper
+  def urls_with_dates
+    [hash_home].concat(hash_pages, hash_categories, hash_posts)
+  end
+
+  private
+
+  def hash_url_and_updated(url, date_updated)
+    { url:, date_updated: }
+  end
+
+  def hash_home
+    hash_url_and_updated(home_url, DateTime.now.strftime('%d/%m/%Y'))
+  end
+
+  def hash_pages
+    Page.all.map { |page| hash_url_and_updated page_url(page), page.date_updated }
+  end
+
+  def hash_categories
+    Category.all.map { |category| hash_url_and_updated category_url(category), category.date_updated }
+  end
+
+  def hash_posts
+    Post.all.map { |post| hash_url_and_updated post_url(post), post.date_updated }
+  end
 end

app/views/blog/sitemap/index.xml.builder

@@ -1,6 +1,6 @@
 xml.instruct!
 xml.urlset xmlns: 'http://www.sitemaps.org/schemas/sitemap/0.9' do
-  @url_and_date.each do |page|
+  urls_with_dates.each do |page|
     xml.url do
       xml.loc page[:url]
       xml.lastmod page[:date_updated]

app/views/layouts/blog/_header.html.erb

@@ -1,7 +1,7 @@
 <header class="container text-center">
   <nav class="navbar navbar-expand-lg bg-body-tertiary">
     <div class="container-fluid">
-      <%= link_to t('site.name'), home_path, class: "navbar-brand", style: 'font-family: var(--bs-body-font-family); font-weight: bold;' %>
+      <%= content_tag :div, t('site.name'), class: "navbar-brand", style: 'font-family: var(--bs-body-font-family); font-weight: bold;' %>
       <button class="navbar-toggler" type="button" data-bs-toggle="collapse"
               data-bs-target="#navbarSupportedContent"
               aria-controls="navbarSupportedContent" aria-expanded="false" aria-label="Toggle navigation">
@@ -10,17 +10,18 @@
       <div class="collapse navbar-collapse" id="navbarSupportedContent">
         <ul class="navbar-nav me-auto mb-2 mb-lg-0">
           <li class="nav-item">
-            <%= link_to t('navbar.home'), home_path, class: "nav-link" %>
+            <%= link_to t('site.navbar.home'), home_path, class: "nav-link" %>
           </li>
-          <li class="nav-item">
-            <%= link_to t('navbar.search'), search_path, class: "nav-link" %>
-          </li>
-          <% Page.where(published: true).each do |page| %>
+          <% pages_navbar.each do |page| %>
             <li class="nav-item">
               <%= link_to page.title, page_path(page), class: "nav-link" %>
             </li>
           <% end %>
         </ul>
+        <%= form_with url:search_path, method: 'GET', role: 'search', class: 'd-flex' do |f| %>
+          <%= f.search_field 'query[title_cont]', class: "form-control me-2" %>
+          <%= f.submit t('site.navbar.search'), class: "btn btn-outline-success" %>
+        <% end %>
       </div>
     </div>
   </nav>

config/routes.rb

@@ -17,9 +17,11 @@
     resources :authors, only: %i[show]
     get 'sitemap', to: 'sitemap#index', as: 'sitemap', format: :xml
     get 'search', to: 'search#index', as: 'search'
-    get 'categories/:id', to: 'categories#show', as: 'category'
-    get 'categories/:id/page/:page', to: 'categories#show', as: 'categories_page'
-
+    resources :categories, only: %i[show] do
+      member do
+        get '/page/:page', to: 'categories#show', as: 'page'
+      end
+    end
     resources :pages, only: %i[show]
     resources :posts, only: %i[show index] do
       match :likes, to: 'likes#update', via: %i[patch put]

db/seeds.rb

@@ -103,7 +103,7 @@ def production
                published: true,
                comments_enabled: true,
                admin_user: AdminUser.all.sample)
-               
+
   puts 'Create a page'
   title = 'Page'
   Page.create!(title:,