hyde_admin 0.0.4 → 0.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cb95670b96fd382d5e1f1ae437e50b055de1e1196192cb5438cb8a5b9da2a553
-  data.tar.gz: f2febcd67319f60a862b79e88e06290df9495dd2388d85900e38eb9486c76f50
+  metadata.gz: 7b6c1b4aa57c65ae8ea48b7317b4d8c53b6dacc5162f9cf413b086213e8d16b9
+  data.tar.gz: e92ce331dd7fcb499084f1aff3dda0db7ac2093bb864c7a024068aa9ab29d0b1
 SHA512:
-  metadata.gz: fb71c84a6420d278a484fb14a08ff24d155c926140838c243ba9fdd8df8d0495ed5d182fd12b58c9e5ab2981adbeaacb053e0f9e40f16f30ca812b564d7bde51
-  data.tar.gz: cac253c8000aa874cd925df410d3d4174032c573ffe3d359d7f09128d129be23e7a4d8b76c23354f3ef62b4074f6ae5df8af80b64ec133150228b715fab28f7f
+  metadata.gz: 76426f6867cebd4884ab7cd5e589e3a72c0f14e7b8b5df64d16c3d98c08890c38d708cb4e55a840070604e957afcd6285818b82a7d0961375f17cf3ef5d000db
+  data.tar.gz: f94cb4bd9aa9d8337c5ebf7d86dc1e77ff257192bd724c84bb0fb2fd7190b9ffb2741e529d0c9ee4efe0d541f21630cba4685cefe4283df0d588252ee33854de

data/.gitignore

@@ -0,0 +1 @@
+*.gem

data/.idea/hyde_admin.iml

@@ -12,7 +12,11 @@
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="library" scope="PROVIDED" name="concurrent-ruby (v1.1.9, RVM: ruby-2.7.0) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="ffi (v1.15.4, RVM: ruby-2.7.0) [gem]" level="application" />
     <orderEntry type="library" scope="PROVIDED" name="i18n (v1.8.10, RVM: ruby-2.7.0) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="image_processing (v1.12.1, RVM: ruby-2.7.0) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="mini_magick (v4.11.0, RVM: ruby-2.7.0) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="ruby-vips (v2.0.17, RVM: ruby-2.7.0) [gem]" level="application" />
   </component>
   <component name="RModuleSettingsStorage">
     <LOAD_PATH number="0" />

data/CHANGELOG.md

@@ -1,3 +1,30 @@
+# 0.0.9
+
+Hide deploy button if 'deploy_dest_address' is empty.
+hyde_admin_config allow you to install the latest default config file.
+
+# 0.0.8
+
+Resize image at upload with ImageProcessing (MiniMagick)
+
+# 0.0.7
+
+Post edit : bugfix, keep layout & format when we don't show input.
+CodeMirror editor : form-control style
+Locales shows possible value for config.
+
+# 0.0.6
+
+Form upload image + style images selector
+Menu follows workflow
+Configuration remove beforeSend
+Rsync params
+Publish only for drafts
+
+# 0.0.5
+
+Sometimes no tags
+
 # 0.0.4
 
 Correct images selector

data/README.md

@@ -1,3 +1,7 @@
+## Hyde admin
+
+Hyde_admin is a administration frontend for Jekyll (static site generator in Ruby).
+
 ## Getting Started with Hyde Admin
 
 Add
@@ -20,4 +24,10 @@ You can visit localhost:9292 !
 hyde_admin.yml is automatically generated in your jekyll directory.
 (you can change settings with hyde_admin ou directly)
 
-Hyde_admin allow ssh deployment.
+Hyde_admin allow ssh deployment.
+
+## New version of hyde_admin ?
+
+Just install the lastest config file (your config file will be renamed, and latest config file will be installed), run :
+
+`hyde_admin_config`

data/bin/admin_views/admin_layout.html.erb

@@ -32,12 +32,6 @@
         <nav id="sidebarMenu" class="col-md-3 col-lg-2 d-md-block bg-light sidebar collapse">
           <div class="position-sticky pt-3">
             <ul class="nav flex-column">
-              <li class="nav-item">
-                <a class="nav-link active" aria-current="page" href="/<%= @hyde_parameters['site_index'] %>">
-                  <span data-feather="home" class="fas fa-eye"></span>
-                  <%= EscapeUtils.escape_html t.overview.capitalize %>
-                </a>
-              </li>
               <li class="nav-item">
               </li>
               <li class="nav-item">
@@ -64,14 +58,20 @@
                   <%= EscapeUtils.escape_html t.posts.capitalize %>
                 </a>
               </li>
-              <li class="nav-item"></li>
               <li class="nav-item">
                 <a class="nav-link" href="/files/index">
                   <span data-feather="users" class="fas fa-copy"></span>
                   <%= EscapeUtils.escape_html t.files.capitalize %>
                 </a>
               </li>
-              <li class="nav-item"></li>
+              <li></li>
+              <li class="nav-item mb-4 mt-4">
+                <a class="nav-link" href="/configuration">
+                  <span data-feather="layers" class="fas fa-tools"></span>
+                  <%= EscapeUtils.escape_html t.configuration.capitalize %>
+                </a>
+              </li>
+              <li></li>
               <li class="nav-item">
                 <a class="nav-link active" aria-current="page" href="/rebuild" id="btn-rebuild">
                   <span data-feather="home" class="fas fa-hammer"></span>
@@ -79,18 +79,19 @@
                 </a>
               </li>
               <li class="nav-item">
-                <a class="nav-link active" aria-current="page" href="/deploy" id="btn-deploy">
-                  <span data-feather="home" class="fas fa-cloud-upload-alt"></span>
-                  <%= EscapeUtils.escape_html t.deploy.capitalize %>
-                </a>
-              </li>
-              <li class="nav-item"></li>
-              <li class="nav-item">
-                <a class="nav-link" href="/configuration">
-                  <span data-feather="layers" class="fas fa-tools"></span>
-                  <%= EscapeUtils.escape_html t.configuration.capitalize %>
+                <a class="nav-link active" aria-current="page" target="_blank" href="/<%= @hyde_parameters['site_index'] %>">
+                  <span data-feather="home" class="fas fa-eye"></span>
+                  <%= EscapeUtils.escape_html t.overview.capitalize %>
                 </a>
               </li>
+              <% if !@hyde_parameters['deploy_dest_address'].blank? %>
+                <li class="nav-item">
+                  <a class="nav-link active" aria-current="page" href="/deploy" id="btn-deploy">
+                    <span data-feather="home" class="fas fa-cloud-upload-alt"></span>
+                    <%= EscapeUtils.escape_html t.deploy.capitalize %>
+                  </a>
+                </li>
+              <% end %>
             </ul>
             <p class="text-center text-muted"><br><br><em>Hyde Admin V.<%= HydeAdmin::VERSION %></em>&nbsp;&nbsp;&nbsp;<a href="https://github.com/rivsc/hyde_admin" class="link-secondary"><i class="fab fa-github"></i></a></p>
           </div>
@@ -124,43 +125,45 @@
       <div class="modal-dialog" role="document">
         <div class="modal-content">
           <div class="modal-header">
-            <h5 class="modal-title">Images</h5>
+            <h5 class="modal-title"><%= t.images.capitalize %></h5>
             <!--
             <button type="button" class="btn btn-default close" data-dismiss="modal" aria-label="Close">
               <span aria-hidden="true">&times;</span>
             </button>
             -->
+            <button type="button" class="btn btn-outline-secondary btn-sm load-image">
+              <%= t.load_images.capitalize %>
+            </button>
           </div>
           <div class="modal-body">
             <div>
               <div class="image-selector-search d-block" data-page="0">
                 <form action="" class="form-inline">
                   <div class="form-group mb-2">
-                    <label for="inputPassword2" class="sr-only"><%= EscapeUtils.escape_html t.sort_by_date %></label>
                     <label>
-                      <input class="form-check-input" type="radio" name="sort_date" value="asc"> <%= EscapeUtils.escape_html t.older %>
+                      <input class="form-check-input" type="radio" name="sort_date" value="asc"> <%= EscapeUtils.escape_html t.newer.capitalize %>
                     </label>
                     &nbsp;&nbsp;&nbsp;
                     <label>
-                      <input class="form-check-input" type="radio" name="sort_date" value="desc"> <%= EscapeUtils.escape_html t.newer %>
+                      <input class="form-check-input" type="radio" name="sort_date" value="desc" checked> <%= EscapeUtils.escape_html t.older.capitalize %>
                     </label>
                   </div>
                   <div class="form-group mb-2">
-                    <label for="inputFilename" class="sr-only"><%= EscapeUtils.escape_html t.filename %></label>
-                    <input type="text" class="form-control" name="filename" id="inputFilename" placeholder="Filename...">
+                    <label for="inputFilename" class="sr-only"><%= EscapeUtils.escape_html t.filename.capitalize %></label>
+                    <input type="text" class="form-control" name="filename" id="inputFilename" placeholder="<%= EscapeUtils.escape_html t.filename_placeholder.capitalize %>">
                   </div>
-                  <button type="submit" class="btn btn-primary image-selector-search-submit d-block mb-2"><%= EscapeUtils.escape_html t.search %></button>
+                  <button type="submit" class="btn btn-primary image-selector-search-submit d-block mb-2"><%= EscapeUtils.escape_html t.search.capitalize %></button>
                 </form>
               </div>
               <div class="image-selector-content">
-                <% path = File.join(Pathname.new(App.gem_source_path), 'admin_views', 'partials', 'images_page.html.erb') %>
+                <% path = File.join(Pathname.new(Mid.gem_source_path), 'admin_views', 'partials', 'images_page.html.erb') %>
                 <%= ERB.new(File.read(path)).result(binding) %>
               </div>
-              <div class="image-selector-page">
-                <a href="#" title="<%= EscapeUtils.escape_html t.previous_images %>" class="btn btn-secondary image-selector-page-prev">
+              <div class="image-selector-page text-center">
+                <a href="#" title="<%= EscapeUtils.escape_html t.previous_images %>" class="btn btn-secondary image-selector-page-prev px-4">
                   <i class="fas fa-chevron-left"></i>
                 </a>
-                <a href="#" title="<%= EscapeUtils.escape_html t.next_images %>"class="btn btn-secondary image-selector-page-next">
+                <a href="#" title="<%= EscapeUtils.escape_html t.next_images %>" class="btn btn-secondary image-selector-page-next px-4">
                   <i class="fas fa-chevron-right"></i>
                 </a>
               </div>
@@ -213,6 +216,13 @@
           search(1);
           return false;
       });
+      $(document).on('click', '.load-image', function(){
+          var windowObjectReference = window.open("/upload_image_form", "update_image", "dialog=yes,menubar=no,location=no,resizable=no,scrollbars=yes,status=yes,outerWidth=800,innerHeight=300,width=800,height=300");
+          return false;
+      });
+      function reload_image(){
+          $('.load-image').click();
+      }
     </script>
     <script src="/fslightbox/fslightbox.js"></script>
   </body>

data/bin/admin_views/configuration.erb

@@ -3,9 +3,9 @@
 <form action="/configuration" method="post">
   <% @hyde_parameters.each_pair do |setting, value| %>
     <div class="mb-3">
-      <label for="i-<%= setting %>" class="form-label"><%= EscapeUtils.escape_html t.send(setting).capitalize %></label>
+      <label for="i-<%= setting %>" class="form-label"><%= (EscapeUtils.escape_html t.send(setting).capitalize rescue setting) %></label>
       <input type="text" class="form-control" value="<%= value %>" name="<%= setting %>" id="i-<%= setting %>">
-      <div id="i-<%= setting %>-help" class="form-text"><%= EscapeUtils.escape_html t.send("help_#{setting}").capitalize %></div>
+      <div id="i-<%= setting %>-help" class="form-text"><%= (EscapeUtils.escape_html t.send("help_#{setting}").capitalize rescue '') %></div>
     </div>
   <% end %>
   <button type="submit" class="btn btn-primary"><%= EscapeUtils.escape_html t.submit.capitalize %></button>

data/bin/admin_views/files/edit.erb

@@ -15,14 +15,14 @@
     </label>
 
     <% if @has_editor %>
-      <% path = File.join(Pathname.new(App.gem_source_path), 'admin_views', 'editor_html.erb') %>
+      <% path = File.join(Pathname.new(Mid.gem_source_path), 'admin_views', 'editor_html.erb') %>
       <%= ERB.new(File.read(path)).result(binding) %>
     <% end %>
 
   <textarea class="form-control text-editor" id="i-content" rows="3" name="content" style="font-family: <%= (['.html', '.xml', '.yml', '.js', '.md'].include?(File.extname(@file)) ? 'monospace' : 'inherit') %>"><%= @content %></textarea>
 
     <script type="text/javascript" charset="utf-8">
-        <% path = File.join(Pathname.new(App.gem_source_path), 'admin_views', 'editor_js.erb') %>
+        <% path = File.join(Pathname.new(Mid.gem_source_path), 'admin_views', 'editor_js.erb') %>
         <%= ERB.new(File.read(path)).result(binding) %>
     </script>
   </div>

data/bin/admin_views/partials/image_element.html.erb

@@ -1,4 +1,4 @@
-<div class="image-element">
+<div class="image-element mb-4">
   <img src="<%= @img %>" alt="<%= @img %>">
   <span class="font-size:8px;"><%= @img.split('/').last %></span>
 </div>

data/bin/admin_views/partials/images_page.html.erb

@@ -1,4 +1,4 @@
-<% path = File.join(Pathname.new(App.gem_source_path), 'admin_views', 'partials', 'image_element.html.erb') %>
+<% path = File.join(Pathname.new(Mid.gem_source_path), 'admin_views', 'partials', 'image_element.html.erb') %>
 <% myerb = ERB.new(File.read(path), eoutvar: "@bidule") %>
 <% # Why %= don't work !? Need to do a loop concat... %>
 <% $stderr.puts @images %>

data/bin/admin_views/posts/edit.erb

@@ -18,6 +18,7 @@
       <div id="i-path-help" class="form-text"><%= EscapeUtils.escape_html t.help_path %></div>
     </div>
   <% end %>
+
   <div class="mb-3">
     <label for="i-title" class="form-label"><%= EscapeUtils.escape_html t.title.capitalize %></label>
     <input type="text" value="<%= @headers.delete('title') %>" class="form-control" name="title" id="i-title">
@@ -33,49 +34,50 @@
   </div>
   <div class="mb-3">
     <label for="i-tags" class="form-label"><%= EscapeUtils.escape_html t.tags.capitalize %></label>
-    <input type="text" value="<%= App.extract_tags(@headers.delete('tags')).join(',') %>" class="form-control" name="tags" id="i-tags">
-    <div id="i-tags-help" class="form-text"><%= EscapeUtils.escape_html t.help_tags %></div>
-  </div>
-  <div class="mb-3 form-check">
-    <input type="checkbox" class="form-check-input" name="publish" value="publish" id="i-publish">
-    <label class="form-check-label" for="i-publish"><%= EscapeUtils.escape_html t.publish.capitalize %></label>
+    <input type="text" value="<%= Mid.extract_tags(@headers.delete('tags')).join(',') %>" class="form-control" name="tags" id="i-tags">
+    <div id="i-tags-help" class="form-text"><%= EscapeUtils.escape_html t.help_tags.capitalize %></div>
   </div>
 
+  <% if @type_file == 'drafts' %>
+    <div class="mb-3 form-check">
+      <input type="checkbox" class="form-check-input" name="publish" value="publish" id="i-publish">
+      <label class="form-check-label" for="i-publish"><%= EscapeUtils.escape_html t.publish.capitalize %></label>
+    </div>
+  <% end %>
+
+  <% selected_layout = @headers.delete('layout') %>
+  <% selected_layout = @hyde_parameters['default_layout'] if selected_layout.nil? || selected_layout.empty? %>
   <% if @hyde_parameters['display_layout'].to_s == 'true' %>
     <div class="mb-3">
       <label for="i-layout" class="form-label"><%= EscapeUtils.escape_html t.layout.capitalize %></label>
       <select class="form-select" aria-label="Choice layout" name="layout">
         <% Dir.glob(File.join(Dir.pwd, '_layouts', '*')).each do |f| %>
-          <% layout = File.basename(f, File.extname(f)) %>
-          <option <%= ((@headers['layout'] == f || (@headers['layout'].to_s.empty? && layout == @hyde_parameters['default_layout'])) ? 'selected' : '') %> value="<%= layout %>"><%= layout %></option>
+          <% layout_loop = File.basename(f, File.extname(f)) %>
+          <option <%= (layout_loop == selected_layout ? 'selected' : '') %> value="<%= layout_loop %>"><%= layout_loop %></option>
         <% end %>
       </select>
     </div>
-    <% @headers.delete('layout') %>
   <% else %>
-    <input type="hidden" name="layout" value="<%= @hyde_parameters['default_layout'] %>">
+    <input type="hidden" name="layout" value="<%= selected_layout %>">
   <% end %>
 
+  <% selected_format = File.extname(@file) %>
+  <% selected_format = ".#{@hyde_parameters['default_format']}" if selected_format.empty? %>
   <% if @hyde_parameters['display_format'].to_s == 'true' %>
     <div class="mb-3">
       <label for="i-format" class="form-label"><%= EscapeUtils.escape_html t.format.capitalize %></label>
       <select class="form-select" id="select-format" aria-label="Choice format" name="format">
-        <% format = File.extname(@file) %>
-        <% format = ".#{@hyde_parameters['default_format']}" if format.empty? %>
         <% { 'html' => 'html', 'markdown' => 'md' }.each do |k, v| %>
-          <option <%= (format == ".#{v}" ? 'selected' : '') %> value="<%= v %>"><%= k %></option>
+          <option <%= (selected_format == ".#{v}" ? 'selected' : '') %> value="<%= v %>"><%= k %></option>
         <% end %>
       </select>
     </div>
-    <script type="text/javascript" charset="utf-8">
-        window.mode_markdown = '<%= format %>' === '.md';
-    </script>
   <% else %>
-    <input type="hidden" name="format" value="<%= @hyde_parameters['default_format'] %>">
-    <script type="text/javascript" charset="utf-8">
-      window.mode_markdown = '<%= @hyde_parameters['default_format'] %>' === 'md';
-    </script>
+    <input type="hidden" name="format" value="<%= selected_format.gsub('.','') %>">
   <% end %>
+  <script type="text/javascript" charset="utf-8">
+      window.mode_markdown = '<%= selected_format %>' === '.md';
+  </script>
 
   <% @headers.each do |k,v| %>
     <div class="mb-3">
@@ -89,8 +91,8 @@
 
   <div class="mb-3 template-header" style="display: none">
     <div class="row">
-      <div class="col-sm-4"><input type="text" class="col-sm-6 form-control header-name" name="" placeholder="header name"></div>
-      <div class="col-sm-8"><input type="text" class="col-sm-6 form-control header-value" name="" placeholder="header value"></div>
+      <div class="col-sm-4"><input type="text" class="col-sm-6 form-control header-name" name="" placeholder="<%= EscapeUtils.escape_html t.header_name.capitalize %>"></div>
+      <div class="col-sm-8"><input type="text" class="col-sm-6 form-control header-value" name="" placeholder="<%= EscapeUtils.escape_html t.header_value.capitalize %>"></div>
     </div>
   </div>
 
@@ -111,7 +113,7 @@
   <div class="mb-3">
     <label for="i-content" class="form-label"><%= EscapeUtils.escape_html t.content.capitalize %> <a href="https://jekyllrb.com/docs/liquid/" class="text-secondary" target="_blank"><i class="fas fa-question-circle"></i></a></label>
 
-    <% path = File.join(Pathname.new(App.gem_source_path), 'admin_views', 'editor_html.erb') %>
+    <% path = File.join(Pathname.new(Mid.gem_source_path), 'admin_views', 'editor_html.erb') %>
     <%= ERB.new(File.read(path)).result(binding) %>
 
     <textarea class="form-control text-editor" id="i-content" rows="3" name="content"><%= @content %></textarea>
@@ -150,7 +152,7 @@
         return false;
     });
 
-    <% path = File.join(Pathname.new(App.gem_source_path), 'admin_views', 'editor_js.erb') %>
+    <% path = File.join(Pathname.new(Mid.gem_source_path), 'admin_views', 'editor_js.erb') %>
     <%= ERB.new(File.read(path)).result(binding) %>
 
 </script>

data/bin/admin_views/posts/listing.erb

@@ -14,12 +14,15 @@
       </th>
     </tr>
     <% @files.each do |f| %>
+      <% edit_path = "/#{@type_file}?file=#{f}" %>
     <tr>
       <td>
-        <%= f.gsub(File.join(Dir.pwd, ''),'') %>
+        <a href="<%= edit_path %>" class="link-dark">
+          <%= f.gsub(File.join(Dir.pwd, ''),'') %>
+        </a>
       </td>
       <td>
-        <a href="/<%= @type_file %>?file=<%= f %>" class="btn btn-default"><i class="fa fa-edit" title="<%= EscapeUtils.escape_html t.edit.capitalize %>"></i></a>
+        <a href="<%= edit_path %>" class="btn btn-default"><i class="fa fa-edit" title="<%= EscapeUtils.escape_html t.edit.capitalize %>"></i></a>
       </td>
       <td>
         <form method="post" action="/<%= @type_file %>/delete" class="inline form-confirm" data-confirm="<%= EscapeUtils.escape_html t.are_you_sure %>">

data/bin/admin_views/upload_image_form.erb

@@ -0,0 +1,49 @@
+<!DOCTYPE html>
+<html lang="fr">
+  <head>
+    <meta charset="utf-8">
+    <title>Hyde for Jekyll</title>
+
+    <meta name="description" content="Hyde for Jekyll">
+    <meta name="author" content="Sylvain Claudel (https://blog.rivsc.ovh)">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+
+    <link href="https://cdn.jsdelivr.net/npm/bootstrap@5.1.1/dist/css/bootstrap.min.css" rel="stylesheet" integrity="sha384-F3w7mX95PdgyTmZZMECAngseQB83DfGTowi0iMjiWaeVhAn4FJkqJByhZMI3AhiU" crossorigin="anonymous">
+    <script src="https://cdn.jsdelivr.net/npm/bootstrap@5.1.1/dist/js/bootstrap.bundle.min.js" integrity="sha384-/bQdsTh/da6pkI1MST/rWKFNjaCP5gBSY4sEBT38Q/9RBh9AH40zEOg7Hlq2THRZ" crossorigin="anonymous"></script>
+    <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/5.15.4/css/all.min.css" integrity="sha512-1ycn6IcaQQ40/MKBW2W4Rhis/DbILU74C1vSrLJxCq57o941Ym01SwNsOMqvEBFlcgUa6xLiPY/NS5R+E6ztJQ==" crossorigin="anonymous" referrerpolicy="no-referrer" />
+
+    <script src="https://code.jquery.com/jquery-3.6.0.min.js" integrity="sha256-/xUj+3OJU5yExlq6GSYGSHk7tPXikynS7ogEvDej/m4=" crossorigin="anonymous"></script>
+
+    <script type="text/javascript" charset="utf-8">
+      $(function(){
+          $(document).on('click', '.btn-return-to-editor', function(){
+              //don't work
+              //window.opener.reload_image();
+              window.close();
+          });
+      });
+    </script>
+  </head>
+  <body style="width:800px;" class="p-4">
+    <div class="container-fluid">
+      <div class="row">
+        <h1><%= t.upload_image_form.capitalize %></h1>
+
+        <% if @filenames %>
+          <%= t.pictures_has_been_uploaded.capitalize %> : <%= @filenames.join(', ') %>
+        <% end %>
+
+        <form enctype="multipart/form-data" method="post" action="/upload_image" class="row g-3">
+          <div class="col-10">
+            <input type="file" name="files[]" multiple class="form-control">
+          </div>
+          <div class="col-2">
+            <button class="btn btn-primary"><%= t.upload.capitalize %></button>
+          </div>
+        </form>
+
+        <button class="btn btn-secondary btn-return-to-editor fixed-bottom mb-4 ms-4"><%= t.quit.capitalize %></button>
+      </div>
+    </div>
+  </body>
+</html>

data/bin/hyde_admin.ru

@@ -6,11 +6,15 @@ require 'fileutils'
 require 'i18n'
 require 'date'
 require 'escape_utils'
+require 'image_processing/mini_magick'
 require_relative '../lib/hyde_admin/version'
 
 # TODO détecter format nouveau post (pour codemirror)
+# Serve
+
+class Mid < Roda
+  plugin :middleware
 
-class App < Roda
   YML_FILE_NAME = "hyde_admin.yml"
 
   plugin :render,
@@ -56,7 +60,7 @@ class App < Roda
   end
 
   def self.extract_header(str)
-    headers = App.extract_header_str(str).to_s.split("\n")
+    headers = Mid.extract_header_str(str).to_s.split("\n")
     headers = headers.select{ |header| !header.empty? }.map{ |header| header.scan(/([a-zA-Z0-9]*): (.*)/).flatten }.select{ |header| !header.empty? }
     hsh_headers = {}
     if !headers.flatten.empty?
@@ -76,7 +80,27 @@ class App < Roda
   end
 
   def self.extract_tags(str)
-    str.scan(/^\[?(.*?)\]?$/).flatten.first.split(',')
+    str.to_s.scan(/^\[?(.*?)\]?$/).flatten.first.split(',')
+  end
+
+  def self.resize_image(image_path,params)
+    dir = File.dirname(image_path)
+    basename = File.basename(image_path, File.extname(image_path))
+    while File.exist?("#{File.join(dir, "#{basename}_#{params['resize_size']}")}.#{params['resize_format']}")
+      basename += '_'
+    end
+    output_path = "#{File.join(dir, "#{basename}_#{params['resize_size']}")}.#{params['resize_format']}"
+
+    width,height = params['resize_size'].split("x")
+    ip = ImageProcessing::MiniMagick
+      .source(image_path)
+      .convert(params['resize_format'])
+      .resize_to_limit(width.to_i, height.to_i)
+    if params['resize_format'] == 'jpg'
+      ip = ip.saver(quality: 80, interlace: "Line")
+    end
+
+    ip.call(destination: output_path)
   end
 
   FORMAT_DATE_FILENAME = '%Y-%m-%d'
@@ -114,12 +138,13 @@ class App < Roda
     end
 
     r.on "deploy" do
-      `#{@hyde_parameters['rsync_fullpath']} #{Dir.pwd}/_site/ #{@hyde_parameters['deploy_dest_user']}@#{@hyde_parameters['deploy_dest_address']}:#{@hyde_parameters['deploy_dest_path']}`
+      `#{@hyde_parameters['rsync_fullpath']} -avzr #{Dir.pwd}/_site/ #{@hyde_parameters['deploy_dest_user']}@#{@hyde_parameters['deploy_dest_address']}:#{@hyde_parameters['deploy_dest_path']}`
       r.redirect "/dashboard"
     end
 
     r.post "configuration" do
       r.params.each_pair do |k,v|
+        next if k.to_s == "beforeSend"
         @hyde_parameters[k] = v
       end
       File.open(File.join(Dir.pwd, YML_FILE_NAME),"w+") do |f|
@@ -136,6 +161,29 @@ class App < Roda
       view("dashboard")
     end
 
+    r.on "upload_image_form" do
+      render("upload_image_form")
+    end
+
+    r.post "upload_image" do
+      files = [r.params['files']].flatten # 1 or more files
+      @filenames = []
+      files.each do |file|
+        filename = file[:filename]
+        while File.exist?(File.join(@hyde_parameters['images_path'], filename))
+          filename = "#{File.basename(filename, File.extname(filename))}_#{File.extname(filename)}"
+        end
+        @filenames << filename
+        File.open(File.join(@hyde_parameters['images_path'], filename), 'wb') do |f|
+          f.write(file[:tempfile].read)
+        end
+        if @hyde_parameters['resize_enable'] == 'true'
+          Mid.resize_image(File.join(@hyde_parameters['images_path'], filename), @hyde_parameters)
+        end
+      end
+      render("upload_image_form")
+    end
+
     r.on "files" do
       @dir_path = r.params['dir_path'] || Dir.pwd
 
@@ -150,6 +198,7 @@ class App < Roda
       r.post "create" do
         files = [r.params['files']].flatten # 1 or more files
         files.each do |file|
+          # TODO rename file if exist
           File.open(File.join(@dir_path, file[:filename]), 'wb') do |f|
             f.write(file[:tempfile].read)
           end
@@ -176,8 +225,8 @@ class App < Roda
       r.get "edit" do
         @file = r.params['file']
         @content = File.read(@file)
-        @header = App.extract_header_str(@content)
-        @content = App.remove_header(@content)
+        @header = Mid.extract_header_str(@content)
+        @content = Mid.remove_header(@content)
         @has_header = (!@header.nil? && !@header.empty?)
         @has_editor = ['.html','.md'].include?(File.extname(@file))
         view("files/edit")
@@ -219,7 +268,7 @@ class App < Roda
         path = r.params['path']
         title = r.params['title']
         I18n.config.available_locales = :en
-        new_path = path.gsub(REGEXP_EXTRACT_DATE_TITLE_FROM_FILENAME, "\\1#{App.transliterate_title_for_url(title)}\\3")
+        new_path = path.gsub(REGEXP_EXTRACT_DATE_TITLE_FROM_FILENAME, "\\1#{Mid.transliterate_title_for_url(title)}\\3")
         response.write(new_path)
       end
       r.post "update_date_today" do
@@ -242,7 +291,7 @@ class App < Roda
         all_images = all_images.reverse if sort_date == 'asc'
         @images = all_images[start_elts, nb_elements_per_page]
 
-        path = File.join(Pathname.new(App.gem_source_path), 'admin_views', 'partials', 'images_page.html.erb')
+        path = File.join(Pathname.new(Mid.gem_source_path), 'admin_views', 'partials', 'images_page.html.erb')
         data = ERB.new(File.read(path)).result(binding)
 
         response.write(data)
@@ -286,7 +335,7 @@ class App < Roda
           @file = r.params['file']
 
           content_file = File.read(@file)
-          @headers = App.extract_header(content_file)
+          @headers = Mid.extract_header(content_file)
           @content = File.read(@file).gsub(/---(.*?)---/m, "")
 
           # for page
@@ -316,7 +365,7 @@ class App < Roda
           #$stderr.puts "---->"
 
           if @new_file.nil? || @new_file.empty?
-            filename = App.urlize(@date, @title, (@type_file != 'pages'))
+            filename = Mid.urlize(@date, @title, (@type_file != 'pages'))
             @new_file = File.join(Dir.pwd,"_#{@type_file}", "#{filename}.#{@format}")
           end
 
@@ -358,4 +407,11 @@ class App < Roda
   end
 end
 
+# https://roda.jeremyevans.net/rdoc/classes/Roda/RodaPlugins/Middleware.html
+class App < Roda
+  use Mid
+  use Rack::Static, :urls => [''], root: Dir.pwd # allow to match all files in Dir.pwd
+end
+
 run App.freeze.app
+

data/bin/hyde_admin.yml

@@ -6,10 +6,13 @@ deploy_dest_path: "/absolute/remote/path/mysite"
 rsync_fullpath: rsync
 site_index: index.html
 hyde_admin_language: en
-hyde_admin_auth: false
+hyde_admin_auth: 'false'
 hyde_admin_user: admin
 hyde_admin_password: admin
 default_format: html
-display_layout: true
-display_format: true
-images_path: assets/images/
+display_layout: 'true'
+display_format: 'true'
+images_path: assets/images/
+resize_format: jpg
+resize_size: 1500x1000
+resize_enable: 'true'

data/bin/hyde_admin_config

@@ -0,0 +1,16 @@
+#!/bin/env ruby
+
+require 'fileutils'
+
+local_config_file = File.join(Dir.pwd, 'hyde_admin.yml')
+old_filename = "hyde_admin_old_#{Time.now.strftime('%Y_%m_%d')}.yml"
+
+# Backup actual config file
+if File.exist?(local_config_file)
+  FileUtils.mv(local_config_file, old_filename)
+end
+
+# Copy the default config file
+FileUtils.copy(File.join(File.expand_path(File.dirname(__FILE__)), 'hyde_admin.yml'), local_config_file)
+
+puts "#{local_config_file} copied, you can find your old config file here : #{old_filename} !"

data/bin/hyde_assets/hyde_admin.css

@@ -12,6 +12,7 @@
     height: 100%;
     object-fit: contain;
     overflow: hidden;
+    border:2px solid white;
 }
 .image-selector-content .image-element img:hover{
     border:2px solid gray;
@@ -23,9 +24,14 @@
 
 .image-element span{
     position: absolute;
-    bottom:5px;
+    bottom:0px;
     left:5px;
     z-index: 10;
     font-weight: bold;
-    text-shadow:white 0px 0px 3px, white 0px 0px 2px;
+    margin-bottom: -20px;
+}
+
+.CodeMirror{
+    border: 1px solid #ced4da;
+    border-radius: 4px;
 }

data/bin/i18n/en.yml

@@ -39,7 +39,7 @@ help_default_layout: default layout for jekyll posts/pages
 deploy_dest_user: deploy remote user
 help_deploy_dest_user: Ssh user for rsync
 deploy_dest_address: deploy remote domain
-help_deploy_dest_address: remote domain for ssh deployment
+help_deploy_dest_address: remote domain for ssh deployment (example.com)
 deploy_dest_path: deploy remote path
 help_deploy_dest_path: remote path on disk for ssh deployment
 rsync_fullpath: rsync path
@@ -47,24 +47,24 @@ help_rsync_fullpath: if rsync is not in PATH, othervise just let 'rsync'
 site_index: index file name of site
 help_site_index: link to open when we click on overview
 hyde_admin_language: hyde admin language
-help_hyde_admin_language: To change hyde admin language interface
+help_hyde_admin_language: To change hyde admin language interface (fr = french, en = english)
 set_date_today: set date at today
 change_date_path: update date in path
 change_title_path: update title in path
 directory_input_placeholder: directory name to create
 file_input_placeholder: file name to create
 hyde_admin_auth: enable BasicAuth
-help_hyde_admin_auth: enable BasicAuth
+help_hyde_admin_auth: enable BasicAuth (true/false)
 hyde_admin_user: BasicAuth user
 help_hyde_admin_user: BasicAuth user
 hyde_admin_password: BasicAuth password
 help_hyde_admin_password: BasicAuth password
 default_format: default format
-help_default_format: default format
+help_default_format: default format (html = html, md = markdown)
 display_layout: display the layout input on edit form
-help_display_layout: display the layout input on edit form
+help_display_layout: display the layout input on edit form (true/false)
 display_format: display the format input on edit form
-help_display_format: display the format input on edit form
+help_display_format: display the format input on edit form (true/false)
 images_path: pictures path
 help_images_path: relative local picture path
 editor_undo: Undo
@@ -93,3 +93,17 @@ previous_images: previous images
 next_images: next images
 search: search
 filename: filename
+filename_placeholder: filename...
+upload_image_form: upload image form
+pictures_has_been_uploaded: pictures has been uploaded
+quit: quit
+header_name: header name
+header_value: header value
+images: images
+load_images: load images
+resize_format: jpg
+help_resize_format: jpg or png
+resize_size: "size to fit, example : 1500x1000"
+help_resize_size: Downsize to fit to the specified size (resize preserve ratio), example 1500x1000
+resize_enable: Enable resizing for images
+help_resize_enable: enable feature resize image at upload

data/bin/i18n/fr.yml

@@ -39,7 +39,7 @@ help_default_layout: présentation par défaut pour les posts et pages
 deploy_dest_user: Utilisateur pour déploiement
 help_deploy_dest_user: Utilisateur pour déploiement par ssh
 deploy_dest_address: Adresse pour déploiement
-help_deploy_dest_address: Domaine ou adresse IP pour déploiement à travers ssh
+help_deploy_dest_address: Domaine ou adresse IP pour déploiement à travers ssh (example.com)
 deploy_dest_path: chemin distant pour déploiement
 help_deploy_dest_path: chemin distant pour déploiement du site
 rsync_fullpath: chemin rsync
@@ -47,24 +47,24 @@ help_rsync_fullpath: si rsync n'est pas dans le PATH, sinon laissez 'rsync'
 site_index: nom du fichier index pour le site
 help_site_index: Lien pour le lien aperçu, pensez à l'extention si nécessaire
 hyde_admin_language: hyde admin langue
-help_hyde_admin_language: Pour changer la langue d'interface de hyde admin
+help_hyde_admin_language: Pour changer la langue d'interface de hyde admin (fr = français, en = anglais)
 set_date_today: mets la date du jour
 change_date_path: mets à jour la date dans le chemin de fichier
 change_title_path: mets à jour le titre dans le chemin de fichier
 directory_input_placeholder: nom du dossier à créer
 file_input_placeholder: nom du fichier à créer
 hyde_admin_auth: enable BasicAuth
-help_hyde_admin_auth: enable BasicAuth
+help_hyde_admin_auth: enable BasicAuth (true/false)
 hyde_admin_user: BasicAuth user
 help_hyde_admin_user: BasicAuth user
 hyde_admin_password: BasicAuth password
 help_hyde_admin_password: BasicAuth password
 default_format: format par défaut
-help_default_format: format par défaut pour les posts
+help_default_format: format par défaut pour les posts (html = html, md = markdown)
 display_layout: affiche le choix du layout sur le formulaire d'édition
-help_display_layout: affiche le choix du layout sur le formulaire d'édition
+help_display_layout: affiche le choix du layout sur le formulaire d'édition (true/false)
 display_format: affiche le choix du format sur le formulaire d'édition
-help_display_format: affiche le choix du format sur le formulaire d'édition
+help_display_format: affiche le choix du format sur le formulaire d'édition (true/false)
 images_path: chemin des images
 help_images_path: chemin local relatif des images
 editor_undo: Annuler
@@ -92,4 +92,18 @@ newer: récente d'abord
 previous_images: images précédentes " lol
 next_images: images suivantes
 search: recherche
-filename: nom de fichier
+filename: nom de fichier
+filename_placeholder: nom de fichier...
+upload_image_form: formulaire d'upload d'image
+pictures_has_been_uploaded: les images ont été uploadées
+quit: quitter
+header_name: nom d'entête
+header_value: valeur d'entête
+images: images
+load_images: charger images
+resize_format: jpg
+help_resize_format: jpg ou png
+resize_size: "Recadrer en (example : 1500x1000)"
+help_resize_size: Réduit les image pour coller à la taille spécifiée (le redimensionnement préserve le ratio), exemple 1500x1000
+resize_enable: activer redimensionnement
+help_resize_enable: active la fonctionnalité de redimensionnement d'image à l'upload

data/hyde_admin.gemspec

@@ -11,7 +11,7 @@ Gem::Specification.new do |s|
   all_files     = `git ls-files`.split("\n").reject{ |filepath| filepath.start_with? 'test/' }
   s.files       = all_files
 
-  s.executables   = ['hyde_admin']
+  s.executables   = ['hyde_admin','hyde_admin_config']
   s.bindir        = "bin"
   s.require_paths = ["lib"]
 
@@ -31,4 +31,5 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency("escape_utils") # escape_javascript / escape_html
   #s.add_runtime_dependency("i18n", "~> 0.4.0") # I18n.transliterate (already required by jekyll)
   s.add_runtime_dependency('jekyll') # Because we call jekyll binary
+  s.add_runtime_dependency('image_processing') # JPEG quality
 end

data/lib/hyde_admin/version.rb

@@ -1,3 +1,3 @@
 module HydeAdmin
-  VERSION = "0.0.4"
+  VERSION = "0.0.9"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hyde_admin
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.9
 platform: ruby
 authors:
 - Sylvain Claudel
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-10-21 00:00:00.000000000 Z
+date: 2021-11-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: roda
@@ -80,14 +80,30 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: image_processing
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: A Jekyll admin interface
 email: claudel.sylvain@gmail.com
 executables:
 - hyde_admin
+- hyde_admin_config
 extensions: []
 extra_rdoc_files: []
 files:
 - ".gitattributes"
+- ".gitignore"
 - ".idea/.gitignore"
 - ".idea/hyde_admin.iml"
 - ".idea/misc.xml"
@@ -107,10 +123,12 @@ files:
 - bin/admin_views/partials/images_page.html.erb
 - bin/admin_views/posts/edit.erb
 - bin/admin_views/posts/listing.erb
+- bin/admin_views/upload_image_form.erb
 - bin/fslightbox/fslightbox.js
 - bin/hyde_admin
 - bin/hyde_admin.ru
 - bin/hyde_admin.yml
+- bin/hyde_admin_config
 - bin/hyde_assets/hyde_admin.css
 - bin/hyde_assets/hyde_admin.js
 - bin/i18n/en.yml