From 80b6cdcbcfa25de1506c5119904ca55d10b4fff2 Mon Sep 17 00:00:00 2001
From: Arnaud Levy <contact@arnaudlevy.com>
Date: Fri, 17 Jun 2022 07:30:15 +0200
Subject: [PATCH] posts wip
---
Gemfile.lock | 7 ++++---
.../communication/block/component/category.rb | 3 +++
.../communication/block/template/post.rb | 1 +
.../blocks/components/category/_edit.html.erb | 12 ++++++++++++
.../components/category/_preview.html.erb | 0
.../components/category/_static.html.erb | 0
.../blocks/templates/posts/_edit.html.erb | 18 ++++++------------
config/locales/communication/fr.yml | 3 +++
8 files changed, 29 insertions(+), 15 deletions(-)
create mode 100644 app/models/communication/block/component/category.rb
create mode 100644 app/views/admin/communication/blocks/components/category/_edit.html.erb
create mode 100644 app/views/admin/communication/blocks/components/category/_preview.html.erb
create mode 100644 app/views/admin/communication/blocks/components/category/_static.html.erb
diff --git a/Gemfile.lock b/Gemfile.lock
index 1c7b01ce4..2e69e0738 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,9 +1,10 @@
GIT
remote: https://github.com/noesya/summernote-rails.git
- revision: d8f1155a64d995228b1949d7ef95b3cff5b00fc3
+ revision: 9a4e669ae6c4f50f7d08cd6939cdff719d135c9d
branch: activestorage
specs:
- summernote-rails (0.8.20.5)
+ summernote-rails (0.8.20.6)
+ nokogiri
rails (>= 6.0)
GIT
@@ -88,7 +89,7 @@ GEM
autoprefixer-rails (10.4.7.0)
execjs (~> 2)
aws-eventstream (1.2.0)
- aws-partitions (1.598.0)
+ aws-partitions (1.599.0)
aws-sdk-core (3.131.1)
aws-eventstream (~> 1, >= 1.0.2)
aws-partitions (~> 1, >= 1.525.0)
diff --git a/app/models/communication/block/component/category.rb b/app/models/communication/block/component/category.rb
new file mode 100644
index 000000000..9e8f192a9
--- /dev/null
+++ b/app/models/communication/block/component/category.rb
@@ -0,0 +1,3 @@
+class Communication::Block::Component::Category < Communication::Block::Component::Base
+
+end
diff --git a/app/models/communication/block/template/post.rb b/app/models/communication/block/template/post.rb
index 68d191d32..9427f7c5e 100644
--- a/app/models/communication/block/template/post.rb
+++ b/app/models/communication/block/template/post.rb
@@ -2,6 +2,7 @@ class Communication::Block::Template::Post < Communication::Block::Template::Bas
has_component :mode, :option, options: [:all, :category, :selection]
has_component :posts_quantity, :number, options: 3
+ has_component :category, :category
def build_git_dependencies
add_dependency category unless category.nil?
diff --git a/app/views/admin/communication/blocks/components/category/_edit.html.erb b/app/views/admin/communication/blocks/components/category/_edit.html.erb
new file mode 100644
index 000000000..06d6fb728
--- /dev/null
+++ b/app/views/admin/communication/blocks/components/category/_edit.html.erb
@@ -0,0 +1,12 @@
+<%
+categories = collection_tree(@block.about&.website.categories)
+%>
+<label class="form-label"
+ for="category_id">Sélectionnez une catégorie</label>
+<select id="category_id"
+ class="form-select select mb-3"
+ v-model="data.category_id">
+ <% categories.each_with_index do |category, index| %>
+ <option value="<%= category[:id] %>"><%= category[:label].html_safe %></option>
+ <% end %>
+</select>
diff --git a/app/views/admin/communication/blocks/components/category/_preview.html.erb b/app/views/admin/communication/blocks/components/category/_preview.html.erb
new file mode 100644
index 000000000..e69de29bb
diff --git a/app/views/admin/communication/blocks/components/category/_static.html.erb b/app/views/admin/communication/blocks/components/category/_static.html.erb
new file mode 100644
index 000000000..e69de29bb
diff --git a/app/views/admin/communication/blocks/templates/posts/_edit.html.erb b/app/views/admin/communication/blocks/templates/posts/_edit.html.erb
index 4e7b25c37..82d434f11 100644
--- a/app/views/admin/communication/blocks/templates/posts/_edit.html.erb
+++ b/app/views/admin/communication/blocks/templates/posts/_edit.html.erb
@@ -3,28 +3,22 @@
<div class="row mb-1">
<div class="col-md-6">
<%= block_component_edit :mode %>
+ <div v-if="data.mode === 'category' || data.mode === 'all'">
+ <%= block_component_edit :posts_quantity %>
+ </div>
- <div v-if="data.mode === 'category'" class="mb-3">
+ <div v-if="data.mode === 'category'">
+ <%= block_component_edit :category %>
<label class="form-label"
for="category_id">Sélectionnez une catégorie</label>
<select id="category_id"
- class="form-select select"
+ class="form-select select mb-3"
v-model="data.category_id">
<% categories.each_with_index do |category, index| %>
<option value="<%= category[:id] %>"><%= category[:label].html_safe %></option>
<% end %>
</select>
</div>
- <div v-if="data.mode === 'category' || data.mode === 'all'">
- <label class="form-label"
- for="posts_quantity">Choisissez la quantité d'articles à afficher</label>
- <input type="number"
- placeholder="Quantité"
- class="form-control"
- id="posts_quantity"
- min="0" max="30"
- v-model="data.posts_quantity"/>
- </div>
</div>
</div>
<div v-if="data.mode === 'selection'">
diff --git a/config/locales/communication/fr.yml b/config/locales/communication/fr.yml
index 3b6ae12e7..c5192ce76 100644
--- a/config/locales/communication/fr.yml
+++ b/config/locales/communication/fr.yml
@@ -336,6 +336,9 @@ fr:
all: Toutes les actualités
category: Une catégorie spécifique
selection: Une sélection d'actualités
+ posts_quantity:
+ label: Quantité d'articles à afficher
+ placeholder: Entrer la quantité
testimonials:
description: Un ou plusieurs témoignages, avec le texte, l'auteur, sa fonction et sa photo.
edit:
--
GitLab