Merge pull request #7651 from fjordllc/feature/rewrite-external-entri…

…es-from-vue-to-html みんなのブログを非Vue化（HTMLに変更）
fjordllc · Jun 7, 2024 · 1bf80e9 · 1bf80e9
2 parents d567790 + c02cdef
commit 1bf80e9
Show file tree

Hide file tree

Showing 12 changed files with 34 additions and 165 deletions.
diff --git a/app/controllers/api/external_entries_controller.rb b/app/controllers/api/external_entries_controller.rb
diff --git a/app/controllers/external_entries_controller.rb b/app/controllers/external_entries_controller.rb
@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
 class ExternalEntriesController < ApplicationController
-  def index; end
+  def index
+    @external_entries = ExternalEntry.with_avatar.order(published_at: :desc).page(params[:page])
+  end
 end
diff --git a/app/javascript/components/external-entries.vue b/app/javascript/components/external-entries.vue
diff --git a/app/javascript/components/external-entry.vue b/app/javascript/components/external-entry.vue
diff --git a/app/javascript/packs/application.js b/app/javascript/packs/application.js
@@ -60,7 +60,6 @@ import '../invitation-url-updater.js'
 
 import VueMounter from '../VueMounter.js'
 import Books from '../components/books.vue'
-import ExternalEntries from '../components/external-entries.vue'
 import Questions from '../components/questions.vue'
 import WorriedUsers from '../components/worried-users.vue'
 import UsersAnswers from '../components/users-answers.vue'
@@ -79,7 +78,6 @@ import '../stylesheets/application'
 
 const mounter = new VueMounter()
 mounter.addComponent(Books)
-mounter.addComponent(ExternalEntries)
 mounter.addComponent(Questions)
 mounter.addComponent(WorriedUsers)
 mounter.addComponent(UsersAnswers)

diff --git a/app/models/external_entry.rb b/app/models/external_entry.rb
@@ -2,6 +2,7 @@
 
 class ExternalEntry < ApplicationRecord
   include ActionView::Helpers::AssetUrlHelper
+  include WithAvatar
 
   belongs_to :user
 

diff --git a/app/views/api/external_entries/_external_entry.json.jbuilder b/app/views/api/external_entries/_external_entry.json.jbuilder
diff --git a/app/views/api/external_entries/index.json.jbuilder b/app/views/api/external_entries/index.json.jbuilder
diff --git a/app/views/external_entries/_external_entries.html.slim b/app/views/external_entries/_external_entries.html.slim
@@ -0,0 +1,7 @@
+.page-main
+  .page-body
+    .container.is-md
+      = paginate(@external_entries)
+      .card-list.a-card
+        = render(@external_entries)
+      = paginate(@external_entries)
diff --git a/app/views/external_entries/_external_entry.html.slim b/app/views/external_entries/_external_entry.html.slim
@@ -0,0 +1,22 @@
+.card-list-item
+  .card-list-item__inner
+    .card-list-item__user
+      = render('users/icon', user: external_entry.user, image_class: 'card-list-item__user-icon')
+    .card-list-item__rows
+      .card-list-item__row
+        .card-list-item-title
+          h2.card-list-item-title__title
+            = link_to external_entry.title, external_entry.url, rel: 'noopener', target: '_blank', class: 'card-list-item-title__link a-text-link'
+      .card-list-item__row
+        .card-list-item__summary
+          p
+            | #{external_entry.summary}
+      .card-list-item__row
+        .card-list-item-meta
+          .card-list-item-meta__items
+            .card-list-item-meta__item
+              time.a-meta
+                = l(external_entry.published_at)
+    .card-list-item__thumbnail
+      = link_to external_entry.url, class: 'card-list-item__thumbnail-inner', target: '_blank', rel: 'noopener' do
+        = image_tag(external_entry.thumbnail_url, class: 'card-list-item__thumbnail-image')
diff --git a/app/views/external_entries/index.html.slim b/app/views/external_entries/index.html.slim
@@ -22,4 +22,4 @@ header.page-header
             | ブログのフィード URL の登録
           | をしてください。
 
-div(data-vue="ExternalEntries")
+= render('external_entries')
diff --git a/config/routes/api.rb b/config/routes/api.rb
@@ -89,7 +89,6 @@
     resources :books, only: %i(index)
     resources :courses, only: %i(index)
     resources :footprints, only: %i(index)
-    resources :external_entries, only: %i(index)
     resources :survey_question_listings, only: %i() do
       resource :position, only: %i(update), controller: "survey_question_listings/position"
     end