From 789d8926062f6a8ad1fd8c358ac74924b7e71720 Mon Sep 17 00:00:00 2001
From: Arnaud Levy <contact@arnaudlevy.com>
Date: Thu, 2 Feb 2023 11:03:53 +0100
Subject: [PATCH] plural
---
.../{photo_import => photo_imports}/pexels.png | Bin
.../{photo_import => photo_imports}/unsplash.svg | 0
...rt_controller.rb => photo_imports_controller.rb} | 2 +-
.../admin/application/featured_image/_edit.html.erb | 2 +-
.../_selector.html.erb | 4 ++--
.../pexels.json.jbuilder | 0
.../unsplash.json.jbuilder | 0
config/routes/admin/communication.rb | 6 +++---
8 files changed, 7 insertions(+), 7 deletions(-)
rename app/assets/images/communication/{photo_import => photo_imports}/pexels.png (100%)
rename app/assets/images/communication/{photo_import => photo_imports}/unsplash.svg (100%)
rename app/controllers/admin/communication/{photo_import_controller.rb => photo_imports_controller.rb} (90%)
rename app/views/admin/communication/{photo_import => photo_imports}/_selector.html.erb (97%)
rename app/views/admin/communication/{photo_import => photo_imports}/pexels.json.jbuilder (100%)
rename app/views/admin/communication/{photo_import => photo_imports}/unsplash.json.jbuilder (100%)
diff --git a/app/assets/images/communication/photo_import/pexels.png b/app/assets/images/communication/photo_imports/pexels.png
similarity index 100%
rename from app/assets/images/communication/photo_import/pexels.png
rename to app/assets/images/communication/photo_imports/pexels.png
diff --git a/app/assets/images/communication/photo_import/unsplash.svg b/app/assets/images/communication/photo_imports/unsplash.svg
similarity index 100%
rename from app/assets/images/communication/photo_import/unsplash.svg
rename to app/assets/images/communication/photo_imports/unsplash.svg
diff --git a/app/controllers/admin/communication/photo_import_controller.rb b/app/controllers/admin/communication/photo_imports_controller.rb
similarity index 90%
rename from app/controllers/admin/communication/photo_import_controller.rb
rename to app/controllers/admin/communication/photo_imports_controller.rb
index 9d606a133..231e78b1d 100644
--- a/app/controllers/admin/communication/photo_import_controller.rb
+++ b/app/controllers/admin/communication/photo_imports_controller.rb
@@ -1,4 +1,4 @@
-class Admin::Communication::PhotoImportController < Admin::Communication::ApplicationController
+class Admin::Communication::PhotoImportsController < Admin::Communication::ApplicationController
layout false
def unsplash
diff --git a/app/views/admin/application/featured_image/_edit.html.erb b/app/views/admin/application/featured_image/_edit.html.erb
index 7e5d81300..d06e8ba72 100644
--- a/app/views/admin/application/featured_image/_edit.html.erb
+++ b/app/views/admin/application/featured_image/_edit.html.erb
@@ -16,5 +16,5 @@
input_html: {
data: { 'summernote-config' => 'link' }
} %>
- <%= render 'admin/communication/photo_import/selector', about: about, f:f %>
+ <%= render 'admin/communication/photo_imports/selector', about: about, f:f %>
<% end %>
diff --git a/app/views/admin/communication/photo_import/_selector.html.erb b/app/views/admin/communication/photo_imports/_selector.html.erb
similarity index 97%
rename from app/views/admin/communication/photo_import/_selector.html.erb
rename to app/views/admin/communication/photo_imports/_selector.html.erb
index 822be6de0..80a83bb03 100644
--- a/app/views/admin/communication/photo_import/_selector.html.erb
+++ b/app/views/admin/communication/photo_imports/_selector.html.erb
@@ -106,7 +106,7 @@ pexels_path = admin_communication_pexels_path(website_id: nil, format: :json)
</a>
</div>
<div class="col-lg-2 text-center">
- <%= image_tag 'communication/photo_import/unsplash.svg', width: 100, alt: 'Unsplash' %>
+ <%= image_tag 'communication/photo_imports/unsplash.svg', width: 100, alt: 'Unsplash' %>
</div>
<div class="col-lg-5 text-end">
<a href="#" v-if="unsplash.page < unsplash.data.total_pages"
@@ -128,7 +128,7 @@ pexels_path = admin_communication_pexels_path(website_id: nil, format: :json)
</a>
</div>
<div class="col-lg-2 text-center">
- <%= image_tag 'communication/photo_import/pexels.png', width: 100, alt: 'Unsplash' %>
+ <%= image_tag 'communication/photo_imports/pexels.png', width: 100, alt: 'Unsplash' %>
</div>
<div class="col-lg-5 text-end">
<a href="#"
diff --git a/app/views/admin/communication/photo_import/pexels.json.jbuilder b/app/views/admin/communication/photo_imports/pexels.json.jbuilder
similarity index 100%
rename from app/views/admin/communication/photo_import/pexels.json.jbuilder
rename to app/views/admin/communication/photo_imports/pexels.json.jbuilder
diff --git a/app/views/admin/communication/photo_import/unsplash.json.jbuilder b/app/views/admin/communication/photo_imports/unsplash.json.jbuilder
similarity index 100%
rename from app/views/admin/communication/photo_import/unsplash.json.jbuilder
rename to app/views/admin/communication/photo_imports/unsplash.json.jbuilder
diff --git a/config/routes/admin/communication.rb b/config/routes/admin/communication.rb
index eb13c2897..6e5ee1727 100644
--- a/config/routes/admin/communication.rb
+++ b/config/routes/admin/communication.rb
@@ -1,7 +1,7 @@
namespace :communication do
- scope 'photo-import' do
- get 'unsplash' => 'photo_import#unsplash'
- get 'pexels' => 'photo_import#pexels'
+ scope 'photo-imports' do
+ get 'unsplash' => 'photo_imports#unsplash'
+ get 'pexels' => 'photo_imports#pexels'
end
resources :websites do
member do
--
GitLab